diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-01 11:51:02 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-01 11:51:02 +0000 |
| commit | aa4353b499e6950b7333578f936455a628145c31 (patch) | |
| tree | c6332cedece2327a18d08794755b3fc0f9f1905b /nixpkgs | |
| parent | ac456d475f4e50818499b804359355c0f3b4bbf7 (diff) | |
| parent | 52185f4d76c18d8348f963795dfed1de018e8dfe (diff) | |
| download | nixlib-aa4353b499e6950b7333578f936455a628145c31.tar nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.gz nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.bz2 nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.lz nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.xz nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.zst nixlib-aa4353b499e6950b7333578f936455a628145c31.zip | |
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs')
1747 files changed, 48113 insertions, 18625 deletions
diff --git a/nixpkgs/.github/CODEOWNERS b/nixpkgs/.github/CODEOWNERS index ba5bf4eef25d..f5679a1a1420 100644 --- a/nixpkgs/.github/CODEOWNERS +++ b/nixpkgs/.github/CODEOWNERS @@ -47,6 +47,9 @@ /pkgs/build-support/setup-hooks/auto-patchelf.py @layus /pkgs/pkgs-lib @infinisil +# pkgs/by-name +/pkgs/test/nixpkgs-check-by-name @infinisil + # Nixpkgs build-support /pkgs/build-support/writers @lassulus @Profpatsch diff --git a/nixpkgs/.github/workflows/update-terraform-providers.yml b/nixpkgs/.github/workflows/update-terraform-providers.yml index e7767dbffa65..e843b1404df5 100644 --- a/nixpkgs/.github/workflows/update-terraform-providers.yml +++ b/nixpkgs/.github/workflows/update-terraform-providers.yml @@ -1,8 +1,8 @@ name: "Update terraform-providers" on: - schedule: - - cron: "0 3 * * *" + #schedule: + # - cron: "0 3 * * *" workflow_dispatch: permissions: diff --git a/nixpkgs/CONTRIBUTING.md b/nixpkgs/CONTRIBUTING.md index 2d3f274847de..177e6a4a687e 100644 --- a/nixpkgs/CONTRIBUTING.md +++ b/nixpkgs/CONTRIBUTING.md @@ -129,7 +129,7 @@ When a PR is created, it will be pre-populated with some checkboxes detailed bel #### Tested using sandboxing -When sandbox builds are enabled, Nix will setup an isolated environment for each build process. It is used to remove further hidden dependencies set by the build environment to improve reproducibility. This includes access to the network during the build outside of `fetch*` functions and files outside the Nix store. Depending on the operating system access to other resources are blocked as well (ex. inter process communication is isolated on Linux); see [sandbox](https://nixos.org/nix/manual/#conf-sandbox) in Nix manual for details. +When sandbox builds are enabled, Nix will setup an isolated environment for each build process. It is used to remove further hidden dependencies set by the build environment to improve reproducibility. This includes access to the network during the build outside of `fetch*` functions and files outside the Nix store. Depending on the operating system access to other resources are blocked as well (ex. inter process communication is isolated on Linux); see [sandbox](https://nixos.org/manual/nix/stable/command-ref/conf-file#conf-sandbox) in the Nix manual for details. Sandboxing is not enabled by default in Nix due to a small performance hit on each build. In pull requests for [nixpkgs](https://github.com/NixOS/nixpkgs/) people are asked to test builds with sandboxing enabled (see `Tested using sandboxing` in the pull request template) because in [Hydra](https://nixos.org/hydra/) sandboxing is also used. diff --git a/nixpkgs/doc/builders/fetchers.chapter.md b/nixpkgs/doc/builders/fetchers.chapter.md index 4d4f3f427cd4..ba105764904c 100644 --- a/nixpkgs/doc/builders/fetchers.chapter.md +++ b/nixpkgs/doc/builders/fetchers.chapter.md @@ -82,6 +82,53 @@ Note that because the checksum is computed after applying these effects, using o Most other fetchers return a directory rather than a single file. + +## `fetchDebianPatch` {#fetchdebianpatch} + +A wrapper around `fetchpatch`, which takes: +- `patch` and `hash`: the patch's filename without the `.patch` suffix, + and its hash after normalization by `fetchpatch` ; +- `pname`: the Debian source package's name ; +- `version`: the upstream version number ; +- `debianRevision`: the [Debian revision number] if applicable ; +- the `area` of the Debian archive: `main` (default), `contrib`, or `non-free`. + +Here is an example of `fetchDebianPatch` in action: + +```nix +{ lib +, fetchDebianPatch +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "pysimplesoap"; + version = "1.16.2"; + src = ...; + + patches = [ + (fetchDebianPatch { + inherit pname version; + debianRevision = "5"; + name = "Add-quotes-to-SOAPAction-header-in-SoapClient"; + hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0="; + }) + ]; + + ... +} +``` + +Patches are fetched from `sources.debian.org`, and so must come from a +package version that was uploaded to the Debian archive. Packages may +be removed from there once that specific version isn't in any suite +anymore (stable, testing, unstable, etc.), so maintainers should use +`copy-tarballs.pl` to archive the patch if it needs to be available +longer-term. + +[Debian revision number]: https://www.debian.org/doc/debian-policy/ch-controlfields.html#version + + ## `fetchsvn` {#fetchsvn} Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `hash`. diff --git a/nixpkgs/doc/builders/packages/emacs.section.md b/nixpkgs/doc/builders/packages/emacs.section.md index d46f890858f4..c50c7815537d 100644 --- a/nixpkgs/doc/builders/packages/emacs.section.md +++ b/nixpkgs/doc/builders/packages/emacs.section.md @@ -26,10 +26,6 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t { packageOverrides = pkgs: with pkgs; rec { myEmacsConfig = writeText "default.el" '' - ;; initialize package - - (require 'package) - (package-initialize 'noactivate) (eval-when-compile (require 'use-package)) @@ -103,7 +99,7 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t This provides a fairly full Emacs start file. It will load in addition to the user's personal config. You can always disable it by passing `-q` to the Emacs command. -Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control these priorities when some package is installed as a dependency. You can override it on a per-package-basis, providing all the required dependencies manually, but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package, you can use `overrideScope`. +Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to GNU-devel ELPA, and the highest for packages manually defined in `pkgs/applications/editors/emacs/elisp-packages/manual-packages`). But you can't control these priorities when some package is installed as a dependency. You can override it on a per-package-basis, providing all the required dependencies manually, but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package, you can use `overrideScope`. ```nix overrides = self: super: rec { diff --git a/nixpkgs/doc/default.nix b/nixpkgs/doc/default.nix index f4270ae856d5..58b945c692fc 100644 --- a/nixpkgs/doc/default.nix +++ b/nixpkgs/doc/default.nix @@ -21,6 +21,7 @@ let { name = "filesystem"; description = "filesystem functions"; } { name = "sources"; description = "source filtering functions"; } { name = "cli"; description = "command-line serialization functions"; } + { name = "gvariant"; description = "GVariant formatted string serialization functions"; } ]; }; diff --git a/nixpkgs/doc/hooks/index.md b/nixpkgs/doc/hooks/index.md index 602febaf9d9b..8100e91c8b48 100644 --- a/nixpkgs/doc/hooks/index.md +++ b/nixpkgs/doc/hooks/index.md @@ -17,6 +17,7 @@ installShellFiles.section.md libiconv.section.md libxml2.section.md meson.section.md +mpi-check-hook.section.md ninja.section.md patch-rc-path-hooks.section.md perl.section.md diff --git a/nixpkgs/doc/hooks/mpi-check-hook.section.md b/nixpkgs/doc/hooks/mpi-check-hook.section.md new file mode 100644 index 000000000000..e3fb5c40dada --- /dev/null +++ b/nixpkgs/doc/hooks/mpi-check-hook.section.md @@ -0,0 +1,24 @@ +# mpiCheckPhaseHook {#setup-hook-mpi-check} + + +This hook can be used to setup a check phase that +requires running a MPI application. It detects the +used present MPI implementaion type and exports +the neceesary environment variables to use +`mpirun` and `mpiexec` in a Nix sandbox. + + +Example: + +```nix + { mpiCheckPhaseHook, mpi, ... }: + + ... + + nativeCheckInputs = [ + openssh + mpiCheckPhaseHook + ]; +``` + + diff --git a/nixpkgs/doc/hooks/waf.section.md b/nixpkgs/doc/hooks/waf.section.md index ee1bccff1d0a..8cacb30ea85f 100644 --- a/nixpkgs/doc/hooks/waf.section.md +++ b/nixpkgs/doc/hooks/waf.section.md @@ -1,3 +1,50 @@ # wafHook {#wafhook} -Overrides the configure, build, and install phases. This will run the “waf” script used by many projects. If `wafPath` (default `./waf`) doesn’t exist, it will copy the version of waf available in Nixpkgs. `wafFlags` can be used to pass flags to the waf script. +[Waf](https://waf.io) is a Python-based software building system. + +In Nixpkgs, `wafHook` overrides the default configure, build, and install phases. + +## Variables controlling wafHook {#variablesControllingWafHook} + +### `wafPath` {#wafPath} + +Location of the `waf` tool. It defaults to `./waf`, to honor software projects that include it directly inside their source trees. + +If `wafPath` doesn't exist, then `wafHook` will copy the `waf` provided from Nixpkgs to it. + +### `wafConfigureFlags` {#wafConfigureFlags} + +Controls the flags passed to waf tool during configure phase. + +### `wafFlags` {#wafFlags} + +Controls the flags passed to waf tool during build and install phases. + +### `dontAddWafCrossFlags` {#dontAddWafCrossFlags} + +When set to `true`, don't add cross compilation flags during configure phase. + +### `dontUseWafConfigure` {#dontUseWafConfigure} + +When set to true, don't use the predefined `wafConfigurePhase`. + +### `dontUseWafBuild` {#dontUseWafBuild} + +When set to true, don't use the predefined `wafBuildPhase`. + +### `dontUseWafInstall` {#dontUseWafInstall} + +When set to true, don't use the predefined `wafInstallPhase`. + +### Variables honored by wafHook {#variablesHonoredByWafHook} + +The following variables commonly used by `stdenv.mkDerivation` are also honored by `wafHook`. + +- `prefixKey` +- `configureTargets` +- `enableParallelBuilding` +- `enableParallelInstalling` +- `buildFlags` +- `buildTargets` +- `installFlags` +- `installTargets` diff --git a/nixpkgs/doc/languages-frameworks/chicken.section.md b/nixpkgs/doc/languages-frameworks/chicken.section.md index d329943dc3c2..72c2642a6478 100644 --- a/nixpkgs/doc/languages-frameworks/chicken.section.md +++ b/nixpkgs/doc/languages-frameworks/chicken.section.md @@ -47,3 +47,32 @@ To include more eggs, edit `pkgs/development/compilers/chicken/5/eggs.scm`. The first section of this file lists eggs which are required by `egg2nix` itself; all other eggs go into the second section. After editing, follow the procedure for updating eggs. + +## Override Scope {#sec-chicken-override-scope} + +The chicken package and its eggs, respectively, reside in a scope. This means, +the scope can be overridden to effect other packages in it. + +This example shows how to use a local copy of `srfi-180` and have it affect +all the other eggs: + +```nix +let + myChickenPackages = pkgs.chickenPackages.overrideScope' (self: super: { + # The chicken package itself can be overridden to effect the whole ecosystem. + # chicken = super.chicken.overrideAttrs { + # src = ... + # }; + + chickenEggs = super.chickenEggs.overrideScope' (eggself: eggsuper: { + srfi-180 = eggsuper.srfi-180.overrideAttrs { + # path to a local copy of srfi-180 + src = ... + }; + }); + }); +in +# Here, `myChickenPackages.chickenEggs.json-rpc`, which depends on `srfi-180` will use +# the local copy of `srfi-180`. +# ... +``` diff --git a/nixpkgs/doc/languages-frameworks/cuda.section.md b/nixpkgs/doc/languages-frameworks/cuda.section.md index 2d680ea6b3b6..01a4f20da982 100644 --- a/nixpkgs/doc/languages-frameworks/cuda.section.md +++ b/nixpkgs/doc/languages-frameworks/cuda.section.md @@ -54,3 +54,65 @@ for your specific card(s). Library maintainers should consult [NVCC Docs](https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/) and release notes for their software package. + +## Adding a new CUDA release {#adding-a-new-cuda-release} + +> **WARNING** +> +> This section of the docs is still very much in progress. Feedback is welcome in GitHub Issues tagging @NixOS/cuda-maintainers or on [Matrix](https://matrix.to/#/#cuda:nixos.org). + +The CUDA Toolkit is a suite of CUDA libraries and software meant to provide a development environment for CUDA-accelerated applications. Until the release of CUDA 11.4, NVIDIA had only made the CUDA Toolkit available as a multi-gigabyte runfile installer, which we provide through the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute. From CUDA 11.4 and onwards, NVIDIA has also provided CUDA redistributables (“CUDA-redist”): individually packaged CUDA Toolkit components meant to facilitate redistribution and inclusion in downstream projects. These packages are available in the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set. + +All new projects should use the CUDA redistributables available in [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) in place of [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit), as they are much easier to maintain and update. + +### Updating CUDA redistributables {#updating-cuda-redistributables} + +1. Go to NVIDIA's index of CUDA redistributables: <https://developer.download.nvidia.com/compute/cuda/redist/> +2. Copy the `redistrib_*.json` corresponding to the release to `pkgs/development/compilers/cudatoolkit/redist/manifests`. +3. Generate the `redistrib_features_*.json` file by running: + + ```bash + nix run github:ConnorBaker/cuda-redist-find-features -- <path to manifest> + ``` + + That command will generate the `redistrib_features_*.json` file in the same directory as the manifest. + +4. Include the path to the new manifest in `pkgs/development/compilers/cudatoolkit/redist/extension.nix`. + +### Updating the CUDA Toolkit runfile installer {#updating-the-cuda-toolkit} + +> **WARNING** +> +> While the CUDA Toolkit runfile installer is still available in Nixpkgs as the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute, its use is not recommended and should it be considered deprecated. Please migrate to the CUDA redistributables provided by the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set. +> +> To ensure packages relying on the CUDA Toolkit runfile installer continue to build, it will continue to be updated until a migration path is available. + +1. Go to NVIDIA's CUDA Toolkit runfile installer download page: <https://developer.nvidia.com/cuda-downloads> +2. Select the appropriate OS, architecture, distribution, and version, and installer type. + + - For example: Linux, x86_64, Ubuntu, 22.04, runfile (local) + - NOTE: Typically, we use the Ubuntu runfile. It is unclear if the runfile for other distributions will work. + +3. Take the link provided by the installer instructions on the webpage after selecting the installer type and get its hash by running: + + ```bash + nix store prefetch-file --hash-type sha256 <link> + ``` + +4. Update `pkgs/development/compilers/cudatoolkit/versions.toml` to include the release. + +### Updating the CUDA package set {#updating-the-cuda-package-set} + +1. Include a new `cudaPackages_<major>_<minor>` package set in `pkgs/top-level/all-packages.nix`. + + - NOTE: Changing the default CUDA package set should occur in a separate PR, allowing time for additional testing. + +2. Successfully build the closure of the new package set, updating `pkgs/development/compilers/cudatoolkit/redist/overrides.nix` as needed. Below are some common failures: + +| Unable to ... | During ... | Reason | Solution | Note | +| --- | --- | --- | --- | --- | +| Find headers | `configurePhase` or `buildPhase` | Missing dependency on a `dev` output | Add the missing dependency | The `dev` output typically contain the headers | +| Find libraries | `configurePhase` | Missing dependency on a `dev` output | Add the missing dependency | The `dev` output typically contain CMake configuration files | +| Find libraries | `buildPhase` or `patchelf` | Missing dependency on a `lib` or `static` output | Add the missing dependency | The `lib` or `static` output typically contain the libraries | + +In the scenario you are unable to run the resulting binary: this is arguably the most complicated as it could be any combination of the previous reasons. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. As a first step, ensure that dependencies are patched with [`cudaPackages.autoAddOpenGLRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.autoAddOpenGLRunpath). Failing that, try running the application with [`nixGL`](https://github.com/guibou/nixGL) or a similar wrapper tool. If that works, it likely means that the application is attempting to load a library that is not in the `RPATH` or `RUNPATH` of the binary. diff --git a/nixpkgs/doc/stdenv/stdenv.chapter.md b/nixpkgs/doc/stdenv/stdenv.chapter.md index 56843467fa4a..fe0f5daf7a07 100644 --- a/nixpkgs/doc/stdenv/stdenv.chapter.md +++ b/nixpkgs/doc/stdenv/stdenv.chapter.md @@ -1179,7 +1179,7 @@ someVar=$(stripHash $name) ### `wrapProgram` \<executable\> \<makeWrapperArgs\> {#fun-wrapProgram} -Convenience function for `makeWrapper` that replaces `<\executable\>` with a wrapper that executes the original program. It takes all the same arguments as `makeWrapper`, except for `--inherit-argv0` (used by the `makeBinaryWrapper` implementation) and `--argv0` (used by both `makeWrapper` and `makeBinaryWrapper` wrapper implementations). +Convenience function for `makeWrapper` that replaces `<executable>` with a wrapper that executes the original program. It takes all the same arguments as `makeWrapper`, except for `--inherit-argv0` (used by the `makeBinaryWrapper` implementation) and `--argv0` (used by both `makeWrapper` and `makeBinaryWrapper` wrapper implementations). If you will apply it multiple times, it will overwrite the wrapper file and you will end up with double wrapping, which should be avoided. diff --git a/nixpkgs/lib/default.nix b/nixpkgs/lib/default.nix index 136f4a4a4637..509636452b2b 100644 --- a/nixpkgs/lib/default.nix +++ b/nixpkgs/lib/default.nix @@ -41,6 +41,7 @@ let # serialization cli = callLibs ./cli.nix; + gvariant = callLibs ./gvariant.nix; generators = callLibs ./generators.nix; # misc diff --git a/nixpkgs/lib/generators.nix b/nixpkgs/lib/generators.nix index c37be1942d82..0368577d5a51 100644 --- a/nixpkgs/lib/generators.nix +++ b/nixpkgs/lib/generators.nix @@ -230,6 +230,14 @@ rec { in toINI_ (gitFlattenAttrs attrs); + # mkKeyValueDefault wrapper that handles dconf INI quirks. + # The main differences of the format is that it requires strings to be quoted. + mkDconfKeyValue = mkKeyValueDefault { mkValueString = v: toString (lib.gvariant.mkValue v); } "="; + + # Generates INI in dconf keyfile style. See https://help.gnome.org/admin/system-admin-guide/stable/dconf-keyfiles.html.en + # for details. + toDconfINI = toINI { mkKeyValue = mkDconfKeyValue; }; + /* Generates JSON from an arbitrary (non-function) value. * For more information see the documentation of the builtin. */ diff --git a/nixpkgs/lib/gvariant.nix b/nixpkgs/lib/gvariant.nix new file mode 100644 index 000000000000..3142ffc5f149 --- /dev/null +++ b/nixpkgs/lib/gvariant.nix @@ -0,0 +1,290 @@ +# This file is based on https://github.com/nix-community/home-manager +# Copyright (c) 2017-2022 Home Manager contributors +# + + +{ lib }: + +/* A partial and basic implementation of GVariant formatted strings. + See https://docs.gtk.org/glib/gvariant-format-strings.html for detauls. + + Note, this API is not considered fully stable and it might therefore + change in backwards incompatible ways without prior notice. +*/ +let + inherit (lib) + concatMapStringsSep concatStrings escape head replaceStrings; + + mkPrimitive = t: v: { + _type = "gvariant"; + type = t; + value = v; + __toString = self: "@${self.type} ${toString self.value}"; # https://docs.gtk.org/glib/gvariant-text.html + }; + + type = { + arrayOf = t: "a${t}"; + maybeOf = t: "m${t}"; + tupleOf = ts: "(${concatStrings ts})"; + dictionaryEntryOf = nameType: valueType: "{${nameType}${valueType}}"; + string = "s"; + boolean = "b"; + uchar = "y"; + int16 = "n"; + uint16 = "q"; + int32 = "i"; + uint32 = "u"; + int64 = "x"; + uint64 = "t"; + double = "d"; + variant = "v"; + }; + + /* Check if a value is a GVariant value + + Type: + isGVariant :: Any -> Bool + */ + isGVariant = v: v._type or "" == "gvariant"; + +in +rec { + + inherit type isGVariant; + + /* Returns the GVariant value that most closely matches the given Nix value. + If no GVariant value can be found unambiguously then error is thrown. + + Type: + mkValue :: Any -> gvariant + */ + mkValue = v: + if builtins.isBool v then + mkBoolean v + else if builtins.isFloat v then + mkDouble v + else if builtins.isString v then + mkString v + else if builtins.isList v then + mkArray v + else if isGVariant v then + v + else + throw "The GVariant type of ${v} can't be inferred."; + + /* Returns the GVariant array from the given type of the elements and a Nix list. + + Type: + mkArray :: [Any] -> gvariant + + Example: + # Creating a string array + lib.gvariant.mkArray [ "a" "b" "c" ] + */ + mkArray = elems: + let + vs = map mkValue (lib.throwIf (elems == [ ]) "Please create empty array with mkEmptyArray." elems); + elemType = lib.throwIfNot (lib.all (t: (head vs).type == t) (map (v: v.type) vs)) + "Elements in a list should have same type." + (head vs).type; + in + mkPrimitive (type.arrayOf elemType) vs // { + __toString = self: + "@${self.type} [${concatMapStringsSep "," toString self.value}]"; + }; + + /* Returns the GVariant array from the given empty Nix list. + + Type: + mkEmptyArray :: gvariant.type -> gvariant + + Example: + # Creating an empty string array + lib.gvariant.mkEmptyArray (lib.gvariant.type.string) + */ + mkEmptyArray = elemType: mkPrimitive (type.arrayOf elemType) [ ] // { + __toString = self: "@${self.type} []"; + }; + + + /* Returns the GVariant variant from the given Nix value. Variants are containers + of different GVariant type. + + Type: + mkVariant :: Any -> gvariant + + Example: + lib.gvariant.mkArray [ + (lib.gvariant.mkVariant "a string") + (lib.gvariant.mkVariant (lib.gvariant.mkInt32 1)) + ] + */ + mkVariant = elem: + let gvarElem = mkValue elem; + in mkPrimitive type.variant gvarElem // { + __toString = self: "<${toString self.value}>"; + }; + + /* Returns the GVariant dictionary entry from the given key and value. + + Type: + mkDictionaryEntry :: String -> Any -> gvariant + + Example: + # A dictionary describing an Epiphany’s search provider + [ + (lib.gvariant.mkDictionaryEntry "url" (lib.gvariant.mkVariant "https://duckduckgo.com/?q=%s&t=epiphany")) + (lib.gvariant.mkDictionaryEntry "bang" (lib.gvariant.mkVariant "!d")) + (lib.gvariant.mkDictionaryEntry "name" (lib.gvariant.mkVariant "DuckDuckGo")) + ] + */ + mkDictionaryEntry = + # The key of the entry + name: + # The value of the entry + value: + let + name' = mkValue name; + value' = mkValue value; + dictionaryType = type.dictionaryEntryOf name'.type value'.type; + in + mkPrimitive dictionaryType { inherit name value; } // { + __toString = self: "@${self.type} {${name'},${value'}}"; + }; + + /* Returns the GVariant maybe from the given element type. + + Type: + mkMaybe :: gvariant.type -> Any -> gvariant + */ + mkMaybe = elemType: elem: + mkPrimitive (type.maybeOf elemType) elem // { + __toString = self: + if self.value == null then + "@${self.type} nothing" + else + "just ${toString self.value}"; + }; + + /* Returns the GVariant nothing from the given element type. + + Type: + mkNothing :: gvariant.type -> gvariant + */ + mkNothing = elemType: mkMaybe elemType null; + + /* Returns the GVariant just from the given Nix value. + + Type: + mkJust :: Any -> gvariant + */ + mkJust = elem: let gvarElem = mkValue elem; in mkMaybe gvarElem.type gvarElem; + + /* Returns the GVariant tuple from the given Nix list. + + Type: + mkTuple :: [Any] -> gvariant + */ + mkTuple = elems: + let + gvarElems = map mkValue elems; + tupleType = type.tupleOf (map (e: e.type) gvarElems); + in + mkPrimitive tupleType gvarElems // { + __toString = self: + "@${self.type} (${concatMapStringsSep "," toString self.value})"; + }; + + /* Returns the GVariant boolean from the given Nix bool value. + + Type: + mkBoolean :: Bool -> gvariant + */ + mkBoolean = v: + mkPrimitive type.boolean v // { + __toString = self: if self.value then "true" else "false"; + }; + + /* Returns the GVariant string from the given Nix string value. + + Type: + mkString :: String -> gvariant + */ + mkString = v: + let sanitize = s: replaceStrings [ "\n" ] [ "\\n" ] (escape [ "'" "\\" ] s); + in mkPrimitive type.string v // { + __toString = self: "'${sanitize self.value}'"; + }; + + /* Returns the GVariant object path from the given Nix string value. + + Type: + mkObjectpath :: String -> gvariant + */ + mkObjectpath = v: + mkPrimitive type.string v // { + __toString = self: "objectpath '${escape [ "'" ] self.value}'"; + }; + + /* Returns the GVariant uchar from the given Nix int value. + + Type: + mkUchar :: Int -> gvariant + */ + mkUchar = mkPrimitive type.uchar; + + /* Returns the GVariant int16 from the given Nix int value. + + Type: + mkInt16 :: Int -> gvariant + */ + mkInt16 = mkPrimitive type.int16; + + /* Returns the GVariant uint16 from the given Nix int value. + + Type: + mkUint16 :: Int -> gvariant + */ + mkUint16 = mkPrimitive type.uint16; + + /* Returns the GVariant int32 from the given Nix int value. + + Type: + mkInt32 :: Int -> gvariant + */ + mkInt32 = v: + mkPrimitive type.int32 v // { + __toString = self: toString self.value; + }; + + /* Returns the GVariant uint32 from the given Nix int value. + + Type: + mkUint32 :: Int -> gvariant + */ + mkUint32 = mkPrimitive type.uint32; + + /* Returns the GVariant int64 from the given Nix int value. + + Type: + mkInt64 :: Int -> gvariant + */ + mkInt64 = mkPrimitive type.int64; + + /* Returns the GVariant uint64 from the given Nix int value. + + Type: + mkUint64 :: Int -> gvariant + */ + mkUint64 = mkPrimitive type.uint64; + + /* Returns the GVariant double from the given Nix float value. + + Type: + mkDouble :: Float -> gvariant + */ + mkDouble = v: + mkPrimitive type.double v // { + __toString = self: toString self.value; + }; +} diff --git a/nixpkgs/lib/tests/modules/gvariant.nix b/nixpkgs/lib/tests/modules/gvariant.nix new file mode 100644 index 000000000000..a792ebf85b74 --- /dev/null +++ b/nixpkgs/lib/tests/modules/gvariant.nix @@ -0,0 +1,93 @@ +{ config, lib, ... }: + +let inherit (lib) concatStringsSep mapAttrsToList mkMerge mkOption types gvariant; +in { + options.examples = mkOption { type = types.attrsOf gvariant; }; + + config = { + examples = with gvariant; + mkMerge [ + { bool = true; } + { bool = true; } + + { float = 3.14; } + + { int32 = mkInt32 (- 42); } + { int32 = mkInt32 (- 42); } + + { uint32 = mkUint32 42; } + { uint32 = mkUint32 42; } + + { int16 = mkInt16 (-42); } + { int16 = mkInt16 (-42); } + + { uint16 = mkUint16 42; } + { uint16 = mkUint16 42; } + + { int64 = mkInt64 (-42); } + { int64 = mkInt64 (-42); } + + { uint64 = mkUint64 42; } + { uint64 = mkUint64 42; } + + { array1 = [ "one" ]; } + { array1 = mkArray [ "two" ]; } + { array2 = mkArray [ (mkInt32 1) ]; } + { array2 = mkArray [ (nkUint32 2) ]; } + + { emptyArray1 = [ ]; } + { emptyArray2 = mkEmptyArray type.uint32; } + + { string = "foo"; } + { string = "foo"; } + { + escapedString = '' + '\ + ''; + } + + { tuple = mkTuple [ (mkInt32 1) [ "foo" ] ]; } + + { maybe1 = mkNothing type.string; } + { maybe2 = mkJust (mkUint32 4); } + + { variant1 = mkVariant "foo"; } + { variant2 = mkVariant 42; } + + { dictionaryEntry = mkDictionaryEntry (mkInt32 1) [ "foo" ]; } + ]; + + assertions = [ + { + assertion = ( + let + mkLine = n: v: "${n} = ${toString (gvariant.mkValue v)}"; + result = concatStringsSep "\n" (mapAttrsToList mkLine config.examples); + in + result + "\n" + ) == '' + array1 = @as ['one','two'] + array2 = @au [1,2] + bool = true + dictionaryEntry = @{ias} {1,@as ['foo']} + emptyArray1 = @as [] + emptyArray2 = @au [] + escapedString = '\'\\\n' + float = 3.140000 + int = -42 + int16 = @n -42 + int64 = @x -42 + maybe1 = @ms nothing + maybe2 = just @u 4 + string = 'foo' + tuple = @(ias) (1,@as ['foo']) + uint16 = @q 42 + uint32 = @u 42 + uint64 = @t 42 + variant1 = @v <'foo'> + variant2 = @v <42> + ''; + } + ]; + }; +} diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index 0b82c9c59f77..79cca0e7b090 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -1060,6 +1060,11 @@ github = "an-empty-string"; githubId = 681716; }; + angaz = { + name = "Angus Dippenaar"; + github = "angaz"; + githubId = 10219618; + }; angristan = { email = "angristan@pm.me"; github = "angristan"; @@ -2727,9 +2732,12 @@ }; CardboardTurkey = { name = "Kiran Ostrolenk"; - email = "kostrolenk@gmail.com"; + email = "kiran@ostrolenk.co.uk"; github = "CardboardTurkey"; githubId = 34030186; + keys = [{ + fingerprint = "8BC7 74E4 A2EC 7507 3B61 A647 0BBB 1C8B 1C36 39EE"; + }]; }; carlosdagos = { email = "m@cdagostino.io"; @@ -5809,6 +5817,12 @@ githubId = 7551358; name = "Frede Emil"; }; + frederictobiasc = { + email = "dev@ntr.li"; + github = "frederictobiasc"; + githubId = 26125115; + name = "Frédéric Christ"; + }; Freed-Wu = { email = "wuzhenyu@ustc.edu"; github = "Freed-Wu"; @@ -6313,6 +6327,12 @@ githubId = 1447245; name = "Robin Gloster"; }; + gmemstr = { + email = "git@gmem.ca"; + github = "gmemstr"; + githubId = 1878840; + name = "Gabriel Simmer"; + }; gnxlxnxx = { email = "gnxlxnxx@web.de"; github = "gnxlxnxx"; @@ -8922,6 +8942,15 @@ githubId = 546087; name = "Kristoffer K. Føllesdal"; }; + kgtkr = { + email = "contact@kgtkr.net"; + github = "kgtkr"; + githubId = 17868838; + name = "kgtkr"; + keys = [{ + fingerprint = "B30D BE93 81E0 3D5D F301 88C8 1F6E B951 9F57 3241"; + }]; + }; khaneliman = { email = "khaneliman12@gmail.com"; github = "khaneliman"; @@ -9038,6 +9067,13 @@ githubId = 691290; name = "Keshav Kini"; }; + kip93 = { + name = "Leandro Reina Kiperman"; + email = "leandro@kip93.net"; + matrix = "@kip93:matrix.org"; + github = "kip93"; + githubId = 26793632; + }; kira-bruneau = { email = "kira.bruneau@pm.me"; name = "Kira Bruneau"; @@ -9484,6 +9520,12 @@ githubId = 621759; name = "Lassulus"; }; + laurailway = { + email = "laurailway.git@posteo.net"; + github = "LAURAilway"; + githubId = 118690640; + name = "Laura"; + }; laurent-f1z1 = { email = "laurent.nixpkgs@fainsin.bzh"; github = "Laurent2916"; @@ -10071,7 +10113,7 @@ name = "Ludovic Courtès"; }; ludovicopiero = { - email = "ludovicopiero@pm.me"; + email = "lewdovico@gnuweeb.org"; github = "ludovicopiero"; githubId = 44255157; name = "Ludovico Piero"; @@ -13868,6 +13910,16 @@ githubId = 33375; name = "Peter Sanford"; }; + pschmitt = { + email = "philipp@schmitt.co"; + github = "pschmitt"; + githubId = 37886; + name = "Philipp Schmitt"; + matrix = "@pschmitt:one.ems.host"; + keys = [{ + fingerprint = "9FBF 2ABF FB37 F7F3 F502 44E5 DC43 9C47 EACB 17F9"; + }]; + }; pshirshov = { email = "pshirshov@eml.cc"; github = "pshirshov"; @@ -14165,6 +14217,12 @@ githubId = 121178; name = "Raphael Robatsch"; }; + rapiteanu = { + email = "rapiteanu.catalin@gmail.com"; + github = "Steinhagen"; + githubId = 4029937; + name = "Viorel-Cătălin Răpițeanu"; + }; raquelgb = { email = "raquel.garcia.bautista@gmail.com"; github = "raquelgb"; @@ -14840,6 +14898,12 @@ githubId = 7365864; name = "Rafael Varago"; }; + rvdp = { + email = "ramses@well-founded.dev"; + github = "R-VdP"; + githubId = 141248; + name = "Ramses"; + }; rvl = { email = "dev+nix@rodney.id.au"; github = "rvl"; @@ -15501,6 +15565,15 @@ githubId = 293035; name = "Shawn Dellysse"; }; + shayne = { + email = "shaynesweeney@gmail.com"; + github = "shayne"; + githubId = 79330; + name = "Shayne Sweeney"; + keys = [{ + fingerprint = "AFCB 29A0 F12E F367 9575 DABE 69DA 13E8 6BF4 03B0"; + }]; + }; shazow = { email = "andrey.petrov@shazow.net"; github = "shazow"; @@ -17555,6 +17628,15 @@ github = "twitchyliquid64"; githubId = 6328589; }; + twz123 = { + name = "Tom Wieczorek"; + email = "tom@bibbu.net"; + github = "twz123"; + githubId = 1215104; + keys = [{ + fingerprint = "B1FD 4E2A 84B2 2379 F4BF 2EF5 FE33 A228 2371 E831"; + }]; + }; tylerjl = { email = "tyler+nixpkgs@langlois.to"; github = "tylerjl"; @@ -17883,6 +17965,12 @@ githubId = 245573; name = "Dmitry Kalinkin"; }; + victormeriqui = { + name = "Victor Meriqui"; + email = "victor.meriqui@ororatech.com"; + github = "victormeriqui"; + githubId = 1396008; + }; victormignot = { email = "root@victormignot.fr"; github = "victormignot"; @@ -17919,6 +18007,12 @@ fingerprint = "5814 50EB 6E17 E715 7C63 E7F1 9879 8C3C 4D68 8D6D"; }]; }; + viktornordling = { + email = "antique_paler_0i@icloud.com"; + github = "viktornordling"; + githubId = 90482; + name = "Viktor Nordling"; + }; viluon = { email = "nix@viluon.me"; github = "viluon"; @@ -18079,6 +18173,12 @@ githubId = 16415673; name = "Van Tuan Vo"; }; + vuimuich = { + email = "vuimuich@quantentunnel.de"; + github = "VuiMuich"; + githubId = 4779365; + name = "Johannes Mayrhofer"; + }; vyorkin = { email = "vasiliy.yorkin@gmail.com"; github = "vyorkin"; @@ -18584,6 +18684,12 @@ github = "XYenon"; githubId = 20698483; }; + xyven1 = { + name = "Xyven"; + email = "nix@xyven.dev"; + github = "xyven1"; + githubId = 35360746; + }; xzfc = { email = "xzfcpw@gmail.com"; github = "xzfc"; @@ -18899,6 +19005,12 @@ githubId = 1319905; name = "Uma Zalakain"; }; + zaldnoay = { + email = "zunway@outlook.com"; + github = "zaldnoay"; + githubId = 5986078; + name = "Zunway Liang"; + }; zanculmarktum = { name = "Azure Zanculmarktum"; email = "zanculmarktum@gmail.com"; diff --git a/nixpkgs/maintainers/team-list.nix b/nixpkgs/maintainers/team-list.nix index b0bac14705b9..01b29e32cb9d 100644 --- a/nixpkgs/maintainers/team-list.nix +++ b/nixpkgs/maintainers/team-list.nix @@ -681,6 +681,17 @@ with lib.maintainers; { shortName = "OpenStack"; }; + ororatech = { + # email: nixdevs@ororatech.com + shortName = "OroraTech GmbH. employees"; + scope = "Team for packages maintained by employees of OroraTech GmbH."; + # Edits to this list should only be done by an already existing member. + members = [ + kip93 + victormeriqui + ]; + }; + pantheon = { members = [ davidak diff --git a/nixpkgs/nixos/doc/manual/development/unit-handling.section.md b/nixpkgs/nixos/doc/manual/development/unit-handling.section.md index a7ccb3dbd042..32d44dbfff05 100644 --- a/nixpkgs/nixos/doc/manual/development/unit-handling.section.md +++ b/nixpkgs/nixos/doc/manual/development/unit-handling.section.md @@ -25,8 +25,11 @@ checks: since changes in their values are applied by systemd when systemd is reloaded. - - `.mount` units are **reload**ed. These mostly come from the `/etc/fstab` - parser. + - `.mount` units are **reload**ed if only their `Options` changed. If anything + else changed (like `What`), they are **restart**ed unless they are the mount + unit for `/` or `/nix` in which case they are reloaded to prevent the system + from crashing. Note that this is the case for `.mount` units and not for + mounts from `/etc/fstab`. These are explained in [](#sec-switching-systems). - `.socket` units are currently ignored. This is to be fixed at a later point. diff --git a/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md b/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md index 623576ce4ff2..c4ed81e0b5b6 100644 --- a/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md @@ -30,6 +30,8 @@ - [Anuko Time Tracker](https://github.com/anuko/timetracker), a simple, easy to use, open source time tracking system. Available as [services.anuko-time-tracker](#opt-services.anuko-time-tracker.enable). +- [Prometheus MySQL exporter](https://github.com/prometheus/mysqld_exporter), a MySQL server exporter for Prometheus. Available as [services.prometheus.exporters.mysqld](#opt-services.prometheus.exporters.mysqld.enable). + - [sitespeed-io](https://sitespeed.io), a tool that can generate metrics (timings, diagnostics) for websites. Available as [services.sitespeed-io](#opt-services.sitespeed-io.enable). - [Jool](https://nicmx.github.io/Jool/en/index.html), an Open Source implementation of IPv4/IPv6 translation on Linux. Available as [networking.jool.enable](#opt-networking.jool.enable). @@ -48,6 +50,11 @@ - [eris-server](https://codeberg.org/eris/eris-go). [ERIS](https://eris.codeberg.page/) is an encoding for immutable storage and this server provides block exchange as well as content decoding over HTTP and through a FUSE file-system. Available as [services.eris-server](#opt-services.eris-server.enable). +- [Honk](https://humungus.tedunangst.com/r/honk), a complete ActivityPub server with minimal setup and support costs. + Available as [services.honk](#opt-services.honk.enable). + +- [NNCP](http://www.nncpgo.org/). Added nncp-daemon and nncp-caller services. Configuration is set with [programs.nncp.settings](#opt-programs.nncp.settings) and the daemons are enabled at [services.nncp](#opt-services.nncp.caller.enable). + ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} - The `boot.loader.raspberryPi` options have been marked deprecated, with intent for removal for NixOS 24.11. They had a limited use-case, and do not work like people expect. They required either very old installs ([before mid-2019](https://github.com/NixOS/nixpkgs/pull/62462)) or customized builds out of scope of the standard and generic AArch64 support. That option set never supported the Raspberry Pi 4 family of devices. @@ -66,6 +73,8 @@ - `python3.pkgs.fetchPypi` (and `python3Packages.fetchPypi`) has been deprecated in favor of top-level `fetchPypi`. +- `pass` now does not contain `password-store.el`. Users should get `password-store.el` from Emacs lisp package set `emacs.pkgs.password-store`. + - `mariadb` now defaults to `mariadb_1011` instead of `mariadb_106`, meaning the default version was upgraded from 10.6.x to 10.11.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-6-to-mariadb-10-11/) for potential issues. - `getent` has been moved from `glibc`'s `bin` output to its own dedicated output, reducing closure size for many dependents. Dependents using the `getent` alias should not be affected; others should move from using `glibc.bin` or `getBin glibc` to `getent` (which also improves compatibility with non-glibc platforms). @@ -109,10 +118,17 @@ - The ISC DHCP package and corresponding module have been removed, because they are end of life upstream. See https://www.isc.org/blogs/isc-dhcp-eol/ for details and switch to a different DHCP implementation like kea or dnsmasq. +- `prometheus-unbound-exporter` has been replaced by the Let's Encrypt maintained version, since the previous version was archived. This requires some changes to the module configuration, most notable `controlInterface` needs migration + towards `unbound.host` and requires either the `tcp://` or `unix://` URI scheme. + +- `odoo` now defaults to 16, updated from 15. + - `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities. - `services.keyd` changed API. Now you can create multiple configuration files. +- `baloo`, the file indexer/search engine used by KDE now has a patch to prevent files from constantly being reindexed when the device ids of the their underlying storage changes. This happens frequently when using btrfs or LVM. The patch has not yet been accepted upstream but it provides a significantly improved experience. When upgrading, reset baloo to get a clean index: `balooctl disable ; balooctl purge ; balooctl enable`. + - `services.ddclient` has been removed on the request of the upstream maintainer because it is unmaintained and has bugs. Please switch to a different software like `inadyn` or `knsupdate`. - The `vlock` program from the `kbd` package has been moved into its own package output and should now be referenced explicitly as `kbd.vlock` or replaced with an alternative such as the standalone `vlock` package or `physlock`. @@ -143,6 +159,8 @@ - The `go-ethereum` package has been updated to v1.12.0. This drops support for proof-of-work. Its GraphQL API now encodes all numeric values as hex strings and the GraphQL UI is updated to version 2.0. The default database has changed from `leveldb` to `pebble` but `leveldb` can be forced with the --db.engine=leveldb flag. The `checkpoint-admin` command was [removed along with trusted checkpoints](https://github.com/ethereum/go-ethereum/pull/27147). +- The `aseprite-unfree` package has been upgraded from 1.2.16.3 to 1.2.40. The free version of aseprite has been dropped because it is EOL and the package attribute now points to the unfree version. A maintained fork of the last free version of Aseprite, named 'LibreSprite', is available in the `libresprite` package. + - The default `kops` version is now 1.27.0 and support for 1.24 and older has been dropped. - `pharo` has been updated to latest stable (PharoVM 10.0.5), which is compatible with the latest stable and oldstable images (Pharo 10 and 11). The VM in question is the 64bit Spur. The 32bit version has been dropped due to lack of maintenance. The Cog VM has been deleted because it is severily outdated. Finally, the `pharo-launcher` package has been deleted because it was not compatible with the newer VM, and due to lack of maintenance. @@ -197,6 +215,8 @@ The module update takes care of the new config syntax and the data itself (user - `services.prometheus.exporters` has a new exporter to monitor electrical power consumption based on PowercapRAPL sensor called [Scaphandre](https://github.com/hubblo-org/scaphandre), see [#239803](https://github.com/NixOS/nixpkgs/pull/239803) for more details. +- The MariaDB C client library was upgraded from 3.2.x to 3.3.x. It is recomended to review the [upstream release notes](https://mariadb.com/kb/en/mariadb-connector-c-33-release-notes/). + - The module `services.calibre-server` has new options to configure the `host`, `port`, `auth.enable`, `auth.mode` and `auth.userDb` path, see [#216497](https://github.com/NixOS/nixpkgs/pull/216497/) for more details. - `services.prometheus.exporters` has a new [exporter](https://github.com/hipages/php-fpm_exporter) to monitor PHP-FPM processes, see [#240394](https://github.com/NixOS/nixpkgs/pull/240394) for more details. @@ -211,6 +231,12 @@ The module update takes care of the new config syntax and the data itself (user - Suricata was upgraded from 6.0 to 7.0 and no longer considers HTTP/2 support as experimental, see [upstream release notes](https://forum.suricata.io/t/suricata-7-0-0-released/3715) for more details. +- `networking.nftables` now has the option `networking.nftables.table.<table>` to create tables + and have them be updated atomically, instead of flushing the ruleset. + +- `networking.nftables` is no longer flushing all rulesets on every reload. + Use `networking.nftables.flushRuleset = true;` to get back the old behaviour. + ## 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. diff --git a/nixpkgs/nixos/modules/config/update-users-groups.pl b/nixpkgs/nixos/modules/config/update-users-groups.pl index 301fd0026400..5f6b65fcd1e1 100644 --- a/nixpkgs/nixos/modules/config/update-users-groups.pl +++ b/nixpkgs/nixos/modules/config/update-users-groups.pl @@ -5,6 +5,7 @@ use File::Path qw(make_path); use File::Slurp; use Getopt::Long; use JSON; +use DateTime; # Keep track of deleted uids and gids. my $uidMapFile = "/var/lib/nixos/uid-map"; @@ -23,6 +24,22 @@ sub updateFile { write_file($path, { atomic => 1, binmode => ':utf8', perms => $perms // 0644 }, $contents) or die; } +# Converts an ISO date to number of days since 1970-01-01 +sub dateToDays { + my ($date) = @_; + my ($year, $month, $day) = split('-', $date, -3); + my $dt = DateTime->new( + year => $year, + month => $month, + day => $day, + hour => 0, + minute => 0, + second => 0, + time_zone => 'UTC', + ); + return $dt->epoch / 86400; +} + sub nscdInvalidate { system("nscd", "--invalidate", $_[0]) unless $is_dry; } @@ -287,22 +304,26 @@ my %shadowSeen; foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow", { binmode => ":utf8" }) : ()) { chomp $line; - my ($name, $hashedPassword, @rest) = split(':', $line, -9); - my $u = $usersOut{$name};; + # struct name copied from `man 3 shadow` + my ($sp_namp, $sp_pwdp, $sp_lstch, $sp_min, $sp_max, $sp_warn, $sp_inact, $sp_expire, $sp_flag) = split(':', $line, -9); + my $u = $usersOut{$sp_namp};; next if !defined $u; - $hashedPassword = "!" if !$spec->{mutableUsers}; - $hashedPassword = $u->{hashedPassword} if defined $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME - chomp $hashedPassword; - push @shadowNew, join(":", $name, $hashedPassword, @rest) . "\n"; - $shadowSeen{$name} = 1; + $sp_pwdp = "!" if !$spec->{mutableUsers}; + $sp_pwdp = $u->{hashedPassword} if defined $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME + $sp_expire = dateToDays($u->{expires}) if defined $u->{expires}; + chomp $sp_pwdp; + push @shadowNew, join(":", $sp_namp, $sp_pwdp, $sp_lstch, $sp_min, $sp_max, $sp_warn, $sp_inact, $sp_expire, $sp_flag) . "\n"; + $shadowSeen{$sp_namp} = 1; } foreach my $u (values %usersOut) { next if defined $shadowSeen{$u->{name}}; my $hashedPassword = "!"; $hashedPassword = $u->{hashedPassword} if defined $u->{hashedPassword}; + my $expires = ""; + $expires = dateToDays($u->{expires}) if defined $u->{expires}; # FIXME: set correct value for sp_lstchg. - push @shadowNew, join(":", $u->{name}, $hashedPassword, "1::::::") . "\n"; + push @shadowNew, join(":", $u->{name}, $hashedPassword, "1::::", $expires, "") . "\n"; } updateFile("/etc/shadow", \@shadowNew, 0640); diff --git a/nixpkgs/nixos/modules/config/users-groups.nix b/nixpkgs/nixos/modules/config/users-groups.nix index 4c9e286ea5fd..9629e3964c96 100644 --- a/nixpkgs/nixos/modules/config/users-groups.nix +++ b/nixpkgs/nixos/modules/config/users-groups.nix @@ -311,6 +311,17 @@ let ''; }; + expires = mkOption { + type = types.nullOr (types.strMatching "[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}"); + default = null; + description = lib.mdDoc '' + Set the date on which the user's account will no longer be + accessible. The date is expressed in the format YYYY-MM-DD, or null + to disable the expiry. + A user whose account is locked must contact the system + administrator before being able to use the system again. + ''; + }; }; config = mkMerge @@ -438,7 +449,7 @@ let name uid group description home homeMode createHome isSystemUser password passwordFile hashedPassword autoSubUidGidRange subUidRanges subGidRanges - initialPassword initialHashedPassword; + initialPassword initialHashedPassword expires; shell = utils.toShellPath u.shell; }) cfg.users; groups = attrValues cfg.groups; @@ -637,7 +648,7 @@ in { install -m 0700 -d /root install -m 0755 -d /home - ${pkgs.perl.withPackages (p: [ p.FileSlurp p.JSON ])}/bin/perl \ + ${pkgs.perl.withPackages (p: [ p.FileSlurp p.JSON p.DateTime ])}/bin/perl \ -w ${./update-users-groups.pl} ${spec} ''; }; diff --git a/nixpkgs/nixos/modules/module-list.nix b/nixpkgs/nixos/modules/module-list.nix index aec12ab21a75..dc4eb41bcddf 100644 --- a/nixpkgs/nixos/modules/module-list.nix +++ b/nixpkgs/nixos/modules/module-list.nix @@ -982,6 +982,7 @@ ./services/networking/nix-serve.nix ./services/networking/nix-store-gcs-proxy.nix ./services/networking/nixops-dns.nix + ./services/networking/nncp.nix ./services/networking/nntp-proxy.nix ./services/networking/nomad.nix ./services/networking/nsd.nix @@ -1228,6 +1229,7 @@ ./services/web-apps/healthchecks.nix ./services/web-apps/hedgedoc.nix ./services/web-apps/hledger-web.nix + ./services/web-apps/honk.nix ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix ./services/web-apps/invidious.nix diff --git a/nixpkgs/nixos/modules/programs/dconf.nix b/nixpkgs/nixos/modules/programs/dconf.nix index 7261a143528f..cf53658c4fad 100644 --- a/nixpkgs/nixos/modules/programs/dconf.nix +++ b/nixpkgs/nixos/modules/programs/dconf.nix @@ -1,55 +1,217 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.dconf; - cfgDir = pkgs.symlinkJoin { - name = "dconf-system-config"; - paths = map (x: "${x}/etc/dconf") cfg.packages; - postBuild = '' - mkdir -p $out/profile - mkdir -p $out/db - '' + ( - concatStringsSep "\n" ( - mapAttrsToList ( - name: path: '' - ln -s ${path} $out/profile/${name} - '' - ) cfg.profiles - ) - ) + '' - ${pkgs.dconf}/bin/dconf update $out/db - ''; + + # Compile keyfiles to dconf DB + compileDconfDb = dir: pkgs.runCommand "dconf-db" + { + nativeBuildInputs = [ (lib.getBin pkgs.dconf) ]; + } "dconf compile $out ${dir}"; + + # Check if dconf keyfiles are valid + checkDconfKeyfiles = dir: pkgs.runCommand "check-dconf-keyfiles" + { + nativeBuildInputs = [ (lib.getBin pkgs.dconf) ]; + } '' + if [[ -f ${dir} ]]; then + echo "dconf keyfiles should be a directory but a file is provided: ${dir}" + exit 1 + fi + + dconf compile db ${dir} || ( + echo "The dconf keyfiles are invalid: ${dir}" + exit 1 + ) + cp -R ${dir} $out + ''; + + mkAllLocks = settings: lib.flatten ( + lib.mapAttrsToList (k: v: lib.mapAttrsToList (k': _: "/${k}/${k'}") v) settings); + + # Generate dconf DB from dconfDatabase and keyfiles + mkDconfDb = val: compileDconfDb (pkgs.symlinkJoin { + name = "nixos-generated-dconf-keyfiles"; + paths = [ + (pkgs.writeTextDir "nixos-generated-dconf-keyfiles" (lib.generators.toDconfINI val.settings)) + (pkgs.writeTextDir "locks/nixos-generated-dconf-locks" (lib.concatStringsSep "\n" + (if val.lockAll then mkAllLocks val.settings else val.locks) + )) + ] ++ (map checkDconfKeyfiles val.keyfiles); + }); + + # Check if a dconf DB file is valid. The dconf cli doesn't return 1 when it can't + # open the database file so we have to check if the output is empty. + checkDconfDb = file: pkgs.runCommand "check-dconf-db" + { + nativeBuildInputs = [ (lib.getBin pkgs.dconf) ]; + } '' + if [[ -d ${file} ]]; then + echo "dconf DB should be a file but a directory is provided: ${file}" + exit 1 + fi + + echo "file-db:${file}" > profile + DCONF_PROFILE=$(pwd)/profile dconf dump / > output 2> error + if [[ ! -s output ]] && [[ -s error ]]; then + cat error + echo "The dconf DB file is invalid: ${file}" + exit 1 + fi + + cp ${file} $out + ''; + + # Generate dconf profile + mkDconfProfile = name: value: + if lib.isDerivation value || lib.isPath value then + pkgs.runCommand "dconf-profile" { } '' + if [[ -d ${value} ]]; then + echo "Dconf profile should be a file but a directory is provided." + exit 1 + fi + mkdir -p $out/etc/dconf/profile/ + cp ${value} $out/etc/dconf/profile/${name} + '' + else + pkgs.writeTextDir "etc/dconf/profile/${name}" ( + lib.concatMapStrings (x: "${x}\n") (( + lib.optional value.enableUserDb "user-db:user" + ) ++ ( + map + (value: + let + db = if lib.isAttrs value && !lib.isDerivation value then mkDconfDb value else checkDconfDb value; + in + "file-db:${db}") + value.databases + )) + ); + + dconfDatabase = with lib.types; submodule { + options = { + keyfiles = lib.mkOption { + type = listOf (oneOf [ path package ]); + default = [ ]; + description = lib.mdDoc "A list of dconf keyfile directories."; + }; + settings = lib.mkOption { + type = attrs; + default = { }; + description = lib.mdDoc "An attrset used to generate dconf keyfile."; + example = literalExpression '' + with lib.gvariant; + { + "com/raggesilver/BlackBox" = { + scrollback-lines = mkUint32 10000; + theme-dark = "Tommorow Night"; + }; + } + ''; + }; + locks = lib.mkOption { + type = with lib.types; listOf str; + default = [ ]; + description = lib.mdDoc '' + A list of dconf keys to be lockdown. This doesn't take effect if `lockAll` + is set. + ''; + example = literalExpression '' + [ "/org/gnome/desktop/background/picture-uri" ] + ''; + }; + lockAll = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc "Lockdown all dconf keys in `settings`."; + }; + }; + }; + + dconfProfile = with lib.types; submodule { + options = { + enableUserDb = lib.mkOption { + type = bool; + default = true; + description = lib.mdDoc "Add `user-db:user` at the beginning of the profile."; + }; + + databases = lib.mkOption { + type = with lib.types; listOf (oneOf [ + path + package + dconfDatabase + ]); + default = [ ]; + description = lib.mdDoc '' + List of data sources for the profile. An element can be an attrset, + or the path of an already compiled database. Each element is converted + to a file-db. + + A key is searched from up to down and the first result takes the + priority. If a lock for a particular key is installed then the value from + the last database in the profile where the key is locked will be used. + This can be used to enforce mandatory settings. + ''; + }; + }; }; + in { - ###### interface - options = { programs.dconf = { - enable = mkEnableOption (lib.mdDoc "dconf"); + enable = lib.mkEnableOption (lib.mdDoc "dconf"); - profiles = mkOption { - type = types.attrsOf types.path; - default = {}; - description = lib.mdDoc "Set of dconf profile files, installed at {file}`/etc/dconf/profiles/«name»`."; - internal = true; + profiles = lib.mkOption { + type = with lib.types; attrsOf (oneOf [ + path + package + dconfProfile + ]); + default = { }; + description = lib.mdDoc '' + Attrset of dconf profiles. By default the `user` profile is used which + ends up in `/etc/dconf/profile/user`. + ''; + example = lib.literalExpression '' + { + # A "user" profile with a database + user.databases = [ + { + settings = { }; + } + ]; + # A "bar" profile from a package + bar = pkgs.bar-dconf-profile; + # A "foo" profile from a path + foo = ''${./foo} + }; + ''; }; - packages = mkOption { - type = types.listOf types.package; - default = []; + packages = lib.mkOption { + type = lib.types.listOf lib.types.package; + default = [ ]; description = lib.mdDoc "A list of packages which provide dconf profiles and databases in {file}`/etc/dconf`."; }; }; }; - ###### implementation + config = lib.mkIf (cfg.profiles != { } || cfg.enable) { + programs.dconf.packages = lib.mapAttrsToList mkDconfProfile cfg.profiles; - config = mkIf (cfg.profiles != {} || cfg.enable) { - environment.etc.dconf = mkIf (cfg.profiles != {} || cfg.packages != []) { - source = cfgDir; + environment.etc.dconf = lib.mkIf (cfg.packages != [ ]) { + source = pkgs.symlinkJoin { + name = "dconf-system-config"; + paths = map (x: "${x}/etc/dconf") cfg.packages; + nativeBuildInputs = [ (lib.getBin pkgs.dconf) ]; + postBuild = '' + if test -d $out/db; then + dconf update $out/db + fi + ''; + }; }; services.dbus.packages = [ pkgs.dconf ]; @@ -59,8 +221,9 @@ in # For dconf executable environment.systemPackages = [ pkgs.dconf ]; - # Needed for unwrapped applications - environment.sessionVariables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ]; + environment.sessionVariables = lib.mkIf cfg.enable { + # Needed for unwrapped applications + GIO_EXTRA_MODULES = [ "${pkgs.dconf.lib}/lib/gio/modules" ]; + }; }; - } diff --git a/nixpkgs/nixos/modules/programs/tmux.nix b/nixpkgs/nixos/modules/programs/tmux.nix index 4f452f1d7f9b..0d1c7c9cdf0f 100644 --- a/nixpkgs/nixos/modules/programs/tmux.nix +++ b/nixpkgs/nixos/modules/programs/tmux.nix @@ -52,6 +52,8 @@ let set -s escape-time ${toString cfg.escapeTime} set -g history-limit ${toString cfg.historyLimit} + ${cfg.extraConfigBeforePlugins} + ${lib.optionalString (cfg.plugins != []) '' # Run plugins ${lib.concatMapStringsSep "\n" (x: "run-shell ${x.rtp}") cfg.plugins} @@ -108,10 +110,18 @@ in { description = lib.mdDoc "Time in milliseconds for which tmux waits after an escape is input."; }; + extraConfigBeforePlugins = mkOption { + default = ""; + description = lib.mdDoc '' + Additional contents of /etc/tmux.conf, to be run before sourcing plugins. + ''; + type = types.lines; + }; + extraConfig = mkOption { default = ""; description = lib.mdDoc '' - Additional contents of /etc/tmux.conf + Additional contents of /etc/tmux.conf, to be run after sourcing plugins. ''; type = types.lines; }; diff --git a/nixpkgs/nixos/modules/services/backup/restic.nix b/nixpkgs/nixos/modules/services/backup/restic.nix index 1620770e5b56..6f4cbab81726 100644 --- a/nixpkgs/nixos/modules/services/backup/restic.nix +++ b/nixpkgs/nixos/modules/services/backup/restic.nix @@ -333,6 +333,8 @@ in backup.rcloneConfig); path = [ pkgs.openssh ]; restartIfChanged = false; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; serviceConfig = { Type = "oneshot"; ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} ${backupPaths}" ]) diff --git a/nixpkgs/nixos/modules/services/editors/emacs.md b/nixpkgs/nixos/modules/services/editors/emacs.md index 72364b295144..9db1bd594175 100644 --- a/nixpkgs/nixos/modules/services/editors/emacs.md +++ b/nixpkgs/nixos/modules/services/editors/emacs.md @@ -286,11 +286,11 @@ The server should now be ready to serve Emacs clients. ### Starting the client {#module-services-emacs-starting-client} -Ensure that the emacs server is enabled, either by customizing the +Ensure that the Emacs server is enabled, either by customizing the {var}`server-mode` variable, or by adding `(server-start)` to {file}`~/.emacs`. -To connect to the emacs daemon, run one of the following: +To connect to the Emacs daemon, run one of the following: ``` emacsclient FILENAME emacsclient --create-frame # opens a new frame (window) @@ -339,24 +339,10 @@ This will add the symlink ## Configuring Emacs {#module-services-emacs-configuring} -The Emacs init file should be changed to load the extension packages at -startup: +If you want to only use extension packages from Nixpkgs, you can add +`(setq package-archives nil)` to your init file. -::: {.example #module-services-emacs-package-initialisation} -### Package initialization in `.emacs` - -``` -(require 'package) - -;; optional. makes unpure packages archives unavailable -(setq package-archives nil) - -(setq package-enable-at-startup nil) -(package-initialize) -``` -::: - -After the declarative emacs package configuration has been tested, +After the declarative Emacs package configuration has been tested, previously downloaded packages can be cleaned up by removing {file}`~/.emacs.d/elpa` (do make a backup first, in case you forgot a package). diff --git a/nixpkgs/nixos/modules/services/finance/odoo.nix b/nixpkgs/nixos/modules/services/finance/odoo.nix index fee9af574b5d..eec7c4e30cc4 100644 --- a/nixpkgs/nixos/modules/services/finance/odoo.nix +++ b/nixpkgs/nixos/modules/services/finance/odoo.nix @@ -31,6 +31,12 @@ in description = lib.mdDoc '' Odoo configuration settings. For more details see <https://www.odoo.com/documentation/15.0/administration/install/deploy.html> ''; + example = literalExpression '' + options = { + db_user = "odoo"; + db_password="odoo"; + }; + ''; }; domain = mkOption { @@ -112,11 +118,11 @@ in services.postgresql = { enable = true; + ensureDatabases = [ "odoo" ]; ensureUsers = [{ name = "odoo"; ensurePermissions = { "DATABASE odoo" = "ALL PRIVILEGES"; }; }]; - ensureDatabases = [ "odoo" ]; }; }); } diff --git a/nixpkgs/nixos/modules/services/misc/paperless.nix b/nixpkgs/nixos/modules/services/misc/paperless.nix index 0683a1f922ab..74a3b49ac9a6 100644 --- a/nixpkgs/nixos/modules/services/misc/paperless.nix +++ b/nixpkgs/nixos/modules/services/misc/paperless.nix @@ -43,6 +43,8 @@ let "-/etc/nsswitch.conf" "-/etc/hosts" "-/etc/localtime" + "-/etc/ssl/certs" + "-/etc/static/ssl/certs" "-/run/postgresql" ] ++ (optional enableRedis redisServer.unixSocket); BindPaths = [ diff --git a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix index f5b97c51186a..8bb017894ee2 100644 --- a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -50,6 +50,7 @@ let "mikrotik" "minio" "modemmanager" + "mysqld" "nextcloud" "nginx" "nginxlog" @@ -297,6 +298,12 @@ in or 'services.prometheus.exporters.mail.configFile'. ''; } { + assertion = cfg.mysqld.runAsLocalSuperUser -> config.services.mysql.enable; + message = '' + The exporter is configured to run as 'services.mysql.user', but + 'services.mysql.enable' is set to false. + ''; + } { assertion = cfg.sql.enable -> ( (cfg.sql.configFile == null) != (cfg.sql.configuration == null) ); diff --git a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix new file mode 100644 index 000000000000..849c514de681 --- /dev/null +++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix @@ -0,0 +1,60 @@ +{ config, lib, pkgs, options }: +let + cfg = config.services.prometheus.exporters.mysqld; + inherit (lib) types mkOption mdDoc mkIf mkForce cli concatStringsSep optionalString escapeShellArgs; +in { + port = 9104; + extraOpts = { + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = mdDoc '' + Path under which to expose metrics. + ''; + }; + + runAsLocalSuperUser = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + Whether to run the exporter as {option}`services.mysql.user`. + ''; + }; + + configFile = mkOption { + type = types.path; + example = "/var/lib/prometheus-mysqld-exporter.cnf"; + description = mdDoc '' + Path to the services config file. + + See <https://github.com/prometheus/mysqld_exporter#running> for more information about + the available options. + + ::: {.warn} + Please do not store this file in the nix store if you choose to include any credentials here, + as it would be world-readable. + ::: + ''; + }; + }; + + serviceOpts = { + serviceConfig = { + DynamicUser = !cfg.runAsLocalSuperUser; + User = mkIf cfg.runAsLocalSuperUser (mkForce config.services.mysql.user); + LoadCredential = mkIf (cfg.configFile != null) (mkForce ("config:" + cfg.configFile)); + ExecStart = concatStringsSep " " [ + "${pkgs.prometheus-mysqld-exporter}/bin/mysqld_exporter" + "--web.listen-address=${cfg.listenAddress}:${toString cfg.port}" + "--web.telemetry-path=${cfg.telemetryPath}" + (optionalString (cfg.configFile != null) ''--config.my-cnf=''${CREDENTIALS_DIRECTORY}/config'') + (escapeShellArgs cfg.extraFlags) + ]; + RestrictAddressFamilies = [ + # The exporter can be configured to talk to a local mysql server via a unix socket. + "AF_UNIX" + ]; + }; + }; +} + diff --git a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix index 7808c8861a76..28add020f5cc 100644 --- a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix +++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix @@ -33,6 +33,15 @@ in Make sure that this file is readable by the exporter user. ''; }; + tokenFile = mkOption { + type = types.path; + example = "/path/to/token-file"; + default = ""; + description = lib.mdDoc '' + File containing the token for connecting to Nextcloud. + Make sure that this file is readable by the exporter user. + ''; + }; timeout = mkOption { type = types.str; default = "5s"; @@ -47,12 +56,14 @@ in ExecStart = '' ${pkgs.prometheus-nextcloud-exporter}/bin/nextcloud-exporter \ --addr ${cfg.listenAddress}:${toString cfg.port} \ - --username ${cfg.username} \ --timeout ${cfg.timeout} \ --server ${cfg.url} \ - --password ${escapeShellArg "@${cfg.passwordFile}"} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; + ${if cfg.tokenFile == "" then '' + --username ${cfg.username} \ + --password ${escapeShellArg "@${cfg.passwordFile}"} \ + '' else '' + --auth-token ${escapeShellArg "@${cfg.tokenFile}"} \ + ''} ${concatStringsSep " \\\n " cfg.extraFlags}''; }; }; } diff --git a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix index f52d92a73d5d..f2336429d42f 100644 --- a/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix +++ b/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix @@ -1,4 +1,8 @@ -{ config, lib, pkgs, options }: +{ config +, lib +, pkgs +, options +}: with lib; @@ -6,17 +10,14 @@ let cfg = config.services.prometheus.exporters.unbound; in { + imports = [ + (mkRemovedOptionModule [ "controlInterface" ] "This option was removed, use the `unbound.host` option instead.") + (mkRemovedOptionModule [ "fetchType" ] "This option was removed, use the `unbound.host` option instead.") + ({ options.warnings = options.warnings; options.assertions = options.assertions; }) + ]; + port = 9167; extraOpts = { - fetchType = mkOption { - # TODO: add shm when upstream implemented it - type = types.enum [ "tcp" "uds" ]; - default = "uds"; - description = lib.mdDoc '' - Which methods the exporter uses to get the information from unbound. - ''; - }; - telemetryPath = mkOption { type = types.str; default = "/metrics"; @@ -25,34 +26,65 @@ in ''; }; - controlInterface = mkOption { - type = types.nullOr types.str; - default = null; - example = "/run/unbound/unbound.socket"; - description = lib.mdDoc '' - Path to the unbound socket for uds mode or the control interface port for tcp mode. + unbound = { + ca = mkOption { + type = types.nullOr types.path; + default = "/var/lib/unbound/unbound_server.pem"; + example = null; + description = '' + Path to the Unbound server certificate authority + ''; + }; - Example: - uds-mode: /run/unbound/unbound.socket - tcp-mode: 127.0.0.1:8953 - ''; + certificate = mkOption { + type = types.nullOr types.path; + default = "/var/lib/unbound/unbound_control.pem"; + example = null; + description = '' + Path to the Unbound control socket certificate + ''; + }; + + key = mkOption { + type = types.nullOr types.path; + default = "/var/lib/unbound/unbound_control.key"; + example = null; + description = '' + Path to the Unbound control socket key. + ''; + }; + + host = mkOption { + type = types.str; + default = "tcp://127.0.0.1:8953"; + example = "unix:///run/unbound/unbound.socket"; + description = lib.mdDoc '' + Path to the unbound control socket. Supports unix domain sockets, as well as the TCP interface. + ''; + }; }; }; serviceOpts = mkMerge ([{ serviceConfig = { + User = "unbound"; # to access the unbound_control.key ExecStart = '' - ${pkgs.prometheus-unbound-exporter}/bin/unbound-telemetry \ - ${cfg.fetchType} \ - --bind ${cfg.listenAddress}:${toString cfg.port} \ - --path ${cfg.telemetryPath} \ - ${optionalString (cfg.controlInterface != null) "--control-interface ${cfg.controlInterface}"} \ + ${pkgs.prometheus-unbound-exporter}/bin/unbound_exporter \ + --unbound.host "${cfg.unbound.host}" \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ + ${optionalString (cfg.unbound.ca != null) "--unbound.ca ${cfg.unbound.ca}"} \ + ${optionalString (cfg.unbound.certificate != null) "--unbound.cert ${cfg.unbound.certificate}"} \ + ${optionalString (cfg.unbound.key != null) "--unbound.key ${cfg.unbound.key}"} \ ${toString cfg.extraFlags} ''; RestrictAddressFamilies = [ - # Need AF_UNIX to collect data "AF_UNIX" + "AF_INET" + "AF_INET6" ]; + } // optionalAttrs (!config.services.unbound.enable) { + DynamicUser = true; }; }] ++ [ (mkIf config.services.unbound.enable { diff --git a/nixpkgs/nixos/modules/services/monitoring/vmagent.nix b/nixpkgs/nixos/modules/services/monitoring/vmagent.nix index c793bb073199..0e2ffb31c57c 100644 --- a/nixpkgs/nixos/modules/services/monitoring/vmagent.nix +++ b/nixpkgs/nixos/modules/services/monitoring/vmagent.nix @@ -62,6 +62,16 @@ in { Whether to open the firewall for the default ports. ''; }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = []; + description = lib.mdDoc '' + Extra args to pass to `vmagent`. See the docs: + <https://docs.victoriametrics.com/vmagent.html#advanced-usage> + or {command}`vmagent -help` for more information. + ''; + }; }; config = mkIf cfg.enable { @@ -90,7 +100,7 @@ in { Type = "simple"; Restart = "on-failure"; WorkingDirectory = cfg.dataDir; - ExecStart = "${cfg.package}/bin/vmagent -remoteWrite.url=${cfg.remoteWriteUrl} -promscrape.config=${prometheusConfig}"; + ExecStart = "${cfg.package}/bin/vmagent -remoteWrite.url=${cfg.remoteWriteUrl} -promscrape.config=${prometheusConfig} ${escapeShellArgs cfg.extraArgs}"; }; }; diff --git a/nixpkgs/nixos/modules/services/networking/firewall-nftables.nix b/nixpkgs/nixos/modules/services/networking/firewall-nftables.nix index 452dd97d89d2..7c7136cc96f1 100644 --- a/nixpkgs/nixos/modules/services/networking/firewall-nftables.nix +++ b/nixpkgs/nixos/modules/services/networking/firewall-nftables.nix @@ -70,10 +70,8 @@ in } ]; - networking.nftables.ruleset = '' - - table inet nixos-fw { - + networking.nftables.tables."nixos-fw".family = "inet"; + networking.nftables.tables."nixos-fw".content = '' ${optionalString (cfg.checkReversePath != false) '' chain rpfilter { type filter hook prerouting priority mangle + 10; policy drop; @@ -169,9 +167,6 @@ in } ''} - - } - ''; }; diff --git a/nixpkgs/nixos/modules/services/networking/nat-nftables.nix b/nixpkgs/nixos/modules/services/networking/nat-nftables.nix index 483910a16658..4b2317ca2ffc 100644 --- a/nixpkgs/nixos/modules/services/networking/nat-nftables.nix +++ b/nixpkgs/nixos/modules/services/networking/nat-nftables.nix @@ -145,28 +145,28 @@ in } ]; - networking.nftables.ruleset = '' - table ip nixos-nat { - ${mkTable { + networking.nftables.tables = { + "nixos-nat" = { + family = "ip"; + content = mkTable { ipVer = "ip"; inherit dest ipSet; forwardPorts = filter (x: !(isIPv6 x.destination)) cfg.forwardPorts; inherit (cfg) dmzHost; - }} - } - - ${optionalString cfg.enableIPv6 '' - table ip6 nixos-nat { - ${mkTable { - ipVer = "ip6"; - dest = destIPv6; - ipSet = ipv6Set; - forwardPorts = filter (x: isIPv6 x.destination) cfg.forwardPorts; - dmzHost = null; - }} - } - ''} - ''; + }; + }; + "nixos-nat6" = mkIf cfg.enableIPv6 { + family = "ip6"; + name = "nixos-nat"; + content = mkTable { + ipVer = "ip6"; + dest = destIPv6; + ipSet = ipv6Set; + forwardPorts = filter (x: isIPv6 x.destination) cfg.forwardPorts; + dmzHost = null; + }; + }; + }; networking.firewall.extraForwardRules = optionalString config.networking.firewall.filterForward '' ${optionalString (ifaceSet != "") '' diff --git a/nixpkgs/nixos/modules/services/networking/nftables.nix b/nixpkgs/nixos/modules/services/networking/nftables.nix index faff1dca89ba..0e4cd6fa1503 100644 --- a/nixpkgs/nixos/modules/services/networking/nftables.nix +++ b/nixpkgs/nixos/modules/services/networking/nftables.nix @@ -2,6 +2,35 @@ with lib; let cfg = config.networking.nftables; + + tableSubmodule = { name, ... }: { + options = { + enable = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc "Enable this table."; + }; + + name = mkOption { + type = types.str; + description = lib.mdDoc "Table name."; + }; + + content = mkOption { + type = types.lines; + description = lib.mdDoc "The table content."; + }; + + family = mkOption { + description = lib.mdDoc "Table family."; + type = types.enum [ "ip" "ip6" "inet" "arp" "bridge" "netdev" ]; + }; + }; + + config = { + name = mkDefault name; + }; + }; in { ###### interface @@ -54,6 +83,24 @@ in ''; }; + networking.nftables.flushRuleset = mkEnableOption (lib.mdDoc "Flush the entire ruleset on each reload."); + + networking.nftables.extraDeletions = mkOption { + type = types.lines; + default = ""; + example = '' + # this makes deleting a non-existing table a no-op instead of an error + table inet some-table; + + delete table inet some-table; + ''; + description = + lib.mdDoc '' + Extra deletion commands to be run on every firewall start, reload + and after stopping the firewall. + ''; + }; + networking.nftables.ruleset = mkOption { type = types.lines; default = ""; @@ -103,7 +150,10 @@ in lib.mdDoc '' The ruleset to be used with nftables. Should be in a format that can be loaded using "/bin/nft -f". The ruleset is updated atomically. - This option conflicts with rulesetFile. + Note that if the tables should be cleaned first, either: + - networking.nftables.flushRuleset = true; needs to be set (flushes all tables) + - networking.nftables.extraDeletions needs to be set + - or networking.nftables.tables can be used, which will clean up the table automatically ''; }; networking.nftables.rulesetFile = mkOption { @@ -113,9 +163,64 @@ in lib.mdDoc '' The ruleset file to be used with nftables. Should be in a format that can be loaded using "nft -f". The ruleset is updated atomically. - This option conflicts with ruleset and nftables based firewall. ''; }; + networking.nftables.tables = mkOption { + type = types.attrsOf (types.submodule tableSubmodule); + + default = {}; + + description = lib.mdDoc '' + Tables to be added to ruleset. + Tables will be added together with delete statements to clean up the table before every update. + ''; + + example = { + filter = { + family = "inet"; + content = '' + # Check out https://wiki.nftables.org/ for better documentation. + # Table for both IPv4 and IPv6. + # Block all incoming connections traffic except SSH and "ping". + chain input { + type filter hook input priority 0; + + # accept any localhost traffic + iifname lo accept + + # accept traffic originated from us + ct state {established, related} accept + + # ICMP + # routers may also want: mld-listener-query, nd-router-solicit + ip6 nexthdr icmpv6 icmpv6 type { destination-unreachable, packet-too-big, time-exceeded, parameter-problem, nd-router-advert, nd-neighbor-solicit, nd-neighbor-advert } accept + ip protocol icmp icmp type { destination-unreachable, router-advertisement, time-exceeded, parameter-problem } accept + + # allow "ping" + ip6 nexthdr icmpv6 icmpv6 type echo-request accept + ip protocol icmp icmp type echo-request accept + + # accept SSH connections (required for a server) + tcp dport 22 accept + + # count and drop any other traffic + counter drop + } + + # Allow all outgoing connections. + chain output { + type filter hook output priority 0; + accept + } + + chain forward { + type filter hook forward priority 0; + accept + } + ''; + }; + }; + }; }; ###### implementation @@ -124,6 +229,8 @@ in boot.blacklistedKernelModules = [ "ip_tables" ]; environment.systemPackages = [ pkgs.nftables ]; networking.networkmanager.firewallBackend = mkDefault "nftables"; + # versionOlder for backportability, remove afterwards + networking.nftables.flushRuleset = mkDefault (versionOlder config.system.stateVersion "23.11" || (cfg.rulesetFile != null || cfg.ruleset != "")); systemd.services.nftables = { description = "nftables firewall"; before = [ "network-pre.target" ]; @@ -131,18 +238,49 @@ in wantedBy = [ "multi-user.target" ]; reloadIfChanged = true; serviceConfig = let + enabledTables = filterAttrs (_: table: table.enable) cfg.tables; + deletionsScript = pkgs.writeScript "nftables-deletions" '' + #! ${pkgs.nftables}/bin/nft -f + ${if cfg.flushRuleset then "flush ruleset" + else concatStringsSep "\n" (mapAttrsToList (_: table: '' + table ${table.family} ${table.name} + delete table ${table.family} ${table.name} + '') enabledTables)} + ${cfg.extraDeletions} + ''; + deletionsScriptVar = "/var/lib/nftables/deletions.nft"; + ensureDeletions = pkgs.writeShellScript "nftables-ensure-deletions" '' + touch ${deletionsScriptVar} + chmod +x ${deletionsScriptVar} + ''; + saveDeletionsScript = pkgs.writeShellScript "nftables-save-deletions" '' + cp ${deletionsScript} ${deletionsScriptVar} + ''; + cleanupDeletionsScript = pkgs.writeShellScript "nftables-cleanup-deletions" '' + rm ${deletionsScriptVar} + ''; rulesScript = pkgs.writeTextFile { name = "nftables-rules"; executable = true; text = '' #! ${pkgs.nftables}/bin/nft -f - flush ruleset - ${if cfg.rulesetFile != null then '' + # previous deletions, if any + include "${deletionsScriptVar}" + # current deletions + include "${deletionsScript}" + ${concatStringsSep "\n" (mapAttrsToList (_: table: '' + table ${table.family} ${table.name} { + ${table.content} + } + '') enabledTables)} + ${cfg.ruleset} + ${lib.optionalString (cfg.rulesetFile != null) '' include "${cfg.rulesetFile}" - '' else cfg.ruleset} + ''} ''; checkPhase = lib.optionalString cfg.checkRuleset '' cp $out ruleset.conf + sed 's|include "${deletionsScriptVar}"||' -i ruleset.conf ${cfg.preCheckRuleset} export NIX_REDIRECTS=/etc/protocols=${pkgs.buildPackages.iana-etc}/etc/protocols:/etc/services=${pkgs.buildPackages.iana-etc}/etc/services LD_PRELOAD="${pkgs.buildPackages.libredirect}/lib/libredirect.so ${pkgs.buildPackages.lklWithFirewall.lib}/lib/liblkl-hijack.so" \ @@ -152,9 +290,11 @@ in in { Type = "oneshot"; RemainAfterExit = true; - ExecStart = rulesScript; - ExecReload = rulesScript; - ExecStop = "${pkgs.nftables}/bin/nft flush ruleset"; + ExecStart = [ ensureDeletions rulesScript ]; + ExecStartPost = saveDeletionsScript; + ExecReload = [ ensureDeletions rulesScript saveDeletionsScript ]; + ExecStop = [ deletionsScriptVar cleanupDeletionsScript ]; + StateDirectory = "nftables"; }; }; }; diff --git a/nixpkgs/nixos/modules/services/networking/nncp.nix b/nixpkgs/nixos/modules/services/networking/nncp.nix new file mode 100644 index 000000000000..3cfe41995e76 --- /dev/null +++ b/nixpkgs/nixos/modules/services/networking/nncp.nix @@ -0,0 +1,131 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + nncpCfgFile = "/run/nncp.hjson"; + programCfg = config.programs.nncp; + callerCfg = config.services.nncp.caller; + daemonCfg = config.services.nncp.daemon; + settingsFormat = pkgs.formats.json { }; + jsonCfgFile = settingsFormat.generate "nncp.json" programCfg.settings; + pkg = programCfg.package; +in { + options = { + + services.nncp = { + caller = { + enable = mkEnableOption '' + cron'ed NNCP TCP daemon caller. + The daemon will take configuration from + [](#opt-programs.nncp.settings) + ''; + extraArgs = mkOption { + type = with types; listOf str; + description = "Extra command-line arguments to pass to caller."; + default = [ ]; + example = [ "-autotoss" ]; + }; + }; + + daemon = { + enable = mkEnableOption '' + NNCP TCP synronization daemon. + The daemon will take configuration from + [](#opt-programs.nncp.settings) + ''; + socketActivation = { + enable = mkEnableOption '' + Whether to run nncp-daemon persistently or socket-activated. + ''; + listenStreams = mkOption { + type = with types; listOf str; + description = lib.mdDoc '' + TCP sockets to bind to. + See [](#opt-systemd.sockets._name_.listenStreams). + ''; + default = [ "5400" ]; + }; + }; + extraArgs = mkOption { + type = with types; listOf str; + description = "Extra command-line arguments to pass to daemon."; + default = [ ]; + example = [ "-autotoss" ]; + }; + }; + + }; + }; + + config = mkIf (programCfg.enable or callerCfg.enable or daemonCfg.enable) { + + assertions = [{ + assertion = with builtins; + let + callerCongfigured = + let neigh = config.programs.nncp.settings.neigh or { }; + in lib.lists.any (x: hasAttr "calls" x && x.calls != [ ]) + (attrValues neigh); + in !callerCfg.enable || callerCongfigured; + message = "NNCP caller enabled but call configuration is missing"; + }]; + + systemd.services."nncp-caller" = { + inherit (callerCfg) enable; + description = "Croned NNCP TCP daemon caller."; + documentation = [ "http://www.nncpgo.org/nncp_002dcaller.html" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${pkg}/bin/nncp-caller -noprogress -cfg "${nncpCfgFile}" ${ + lib.strings.escapeShellArgs callerCfg.extraArgs + }''; + Group = "uucp"; + UMask = "0002"; + }; + }; + + systemd.services."nncp-daemon" = mkIf daemonCfg.enable { + enable = !daemonCfg.socketActivation.enable; + description = "NNCP TCP syncronization daemon."; + documentation = [ "http://www.nncpgo.org/nncp_002ddaemon.html" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${pkg}/bin/nncp-daemon -noprogress -cfg "${nncpCfgFile}" ${ + lib.strings.escapeShellArgs daemonCfg.extraArgs + }''; + Restart = "on-failure"; + Group = "uucp"; + UMask = "0002"; + }; + }; + + systemd.services."nncp-daemon@" = mkIf daemonCfg.socketActivation.enable { + description = "NNCP TCP syncronization daemon."; + documentation = [ "http://www.nncpgo.org/nncp_002ddaemon.html" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = '' + ${pkg}/bin/nncp-daemon -noprogress -ucspi -cfg "${nncpCfgFile}" ${ + lib.strings.escapeShellArgs daemonCfg.extraArgs + }''; + Group = "uucp"; + UMask = "0002"; + StandardInput = "socket"; + StandardOutput = "inherit"; + StandardError = "journal"; + }; + }; + + systemd.sockets.nncp-daemon = mkIf daemonCfg.socketActivation.enable { + inherit (daemonCfg.socketActivation) listenStreams; + description = "socket for NNCP TCP syncronization."; + conflicts = [ "nncp-daemon.service" ]; + wantedBy = [ "sockets.target" ]; + socketConfig.Accept = true; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/networking/privoxy.nix b/nixpkgs/nixos/modules/services/networking/privoxy.nix index 78d02aaa1125..619490a4c020 100644 --- a/nixpkgs/nixos/modules/services/networking/privoxy.nix +++ b/nixpkgs/nixos/modules/services/networking/privoxy.nix @@ -12,7 +12,7 @@ let else "${name} ${toString val}\n"; configType = with types; - let atom = oneOf [ int bool string path ]; + let atom = oneOf [ int bool str path ]; in attrsOf (either atom (listOf atom)) // { description = '' privoxy configuration type. The format consists of an attribute diff --git a/nixpkgs/nixos/modules/services/security/kanidm.nix b/nixpkgs/nixos/modules/services/security/kanidm.nix index d8a99dee59f4..6f4d1dc382ab 100644 --- a/nixpkgs/nixos/modules/services/security/kanidm.nix +++ b/nixpkgs/nixos/modules/services/security/kanidm.nix @@ -137,7 +137,7 @@ in default = { }; description = lib.mdDoc '' Settings for Kanidm, see - [the documentation](https://github.com/kanidm/kanidm/blob/master/kanidm_book/src/server_configuration.md) + [the documentation](https://kanidm.github.io/kanidm/stable/server_configuration.html) and [example configuration](https://github.com/kanidm/kanidm/blob/master/examples/server.toml) for possible values. ''; @@ -155,7 +155,7 @@ in }; description = lib.mdDoc '' Configure Kanidm clients, needed for the PAM daemon. See - [the documentation](https://github.com/kanidm/kanidm/blob/master/kanidm_book/src/client_tools.md#kanidm-configuration) + [the documentation](https://kanidm.github.io/kanidm/stable/client_tools.html#kanidm-configuration) and [example configuration](https://github.com/kanidm/kanidm/blob/master/examples/config) for possible values. ''; @@ -173,7 +173,7 @@ in }; description = lib.mdDoc '' Configure Kanidm unix daemon. - See [the documentation](https://github.com/kanidm/kanidm/blob/master/kanidm_book/src/pam_and_nsswitch.md#the-unix-daemon) + See [the documentation](https://kanidm.github.io/kanidm/stable/integrations/pam_and_nsswitch.html#the-unix-daemon) and [example configuration](https://github.com/kanidm/kanidm/blob/master/examples/unixd) for possible values. ''; diff --git a/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix b/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix index 9261de8d4354..da2cf93d7f1c 100644 --- a/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix +++ b/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix @@ -308,8 +308,6 @@ in pools.cloudlog = { inherit (cfg) user; group = config.services.nginx.group; - # cloudlog is currently broken on php 8.2 - phpPackage = pkgs.php81; settings = { "listen.owner" = config.services.nginx.user; "listen.group" = config.services.nginx.group; diff --git a/nixpkgs/nixos/modules/services/web-apps/honk.md b/nixpkgs/nixos/modules/services/web-apps/honk.md new file mode 100644 index 000000000000..f34085f7dc52 --- /dev/null +++ b/nixpkgs/nixos/modules/services/web-apps/honk.md @@ -0,0 +1,23 @@ +# Honk {#module-services-honk} + +With Honk on NixOS you can quickly configure a complete ActivityPub server with +minimal setup and support costs. + +## Basic usage {#module-services-honk-basic-usage} + +A minimal configuration looks like this: + +```nix +{ + services.honk = { + enable = true; + host = "0.0.0.0"; + port = 8080; + username = "username"; + passwordFile = "/etc/honk/password.txt"; + servername = "honk.example.com"; + }; + + networking.firewall.allowedTCPPorts = [ 8080 ]; +} +``` diff --git a/nixpkgs/nixos/modules/services/web-apps/honk.nix b/nixpkgs/nixos/modules/services/web-apps/honk.nix new file mode 100644 index 000000000000..e8718774575b --- /dev/null +++ b/nixpkgs/nixos/modules/services/web-apps/honk.nix @@ -0,0 +1,153 @@ +{ config +, lib +, pkgs +, ... +}: +let + cfg = config.services.honk; + + honk-initdb-script = cfg: pkgs.writeShellApplication { + name = "honk-initdb-script"; + + runtimeInputs = with pkgs; [ coreutils ]; + + text = '' + PW=$(cat "$CREDENTIALS_DIRECTORY/honk_passwordFile") + + echo -e "${cfg.username}\n''$PW\n${cfg.host}:${toString cfg.port}\n${cfg.servername}" | ${lib.getExe cfg.package} -datadir "$STATE_DIRECTORY" init + ''; + }; +in +{ + options = { + services.honk = { + enable = lib.mkEnableOption (lib.mdDoc "the Honk server"); + package = lib.mkPackageOptionMD pkgs "honk" { }; + + host = lib.mkOption { + default = "127.0.0.1"; + description = lib.mdDoc '' + The host name or IP address the server should listen to. + ''; + type = lib.types.str; + }; + + port = lib.mkOption { + default = 8080; + description = lib.mdDoc '' + The port the server should listen to. + ''; + type = lib.types.port; + }; + + username = lib.mkOption { + description = lib.mdDoc '' + The admin account username. + ''; + type = lib.types.str; + }; + + passwordFile = lib.mkOption { + description = lib.mdDoc '' + Password for admin account. + NOTE: Should be string not a store path, to prevent the password from being world readable + ''; + type = lib.types.path; + }; + + servername = lib.mkOption { + description = lib.mdDoc '' + The server name. + ''; + type = lib.types.str; + }; + + extraJS = lib.mkOption { + default = null; + description = lib.mdDoc '' + An extra JavaScript file to be loaded by the client. + ''; + type = lib.types.nullOr lib.types.path; + }; + + extraCSS = lib.mkOption { + default = null; + description = lib.mdDoc '' + An extra CSS file to be loaded by the client. + ''; + type = lib.types.nullOr lib.types.path; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = cfg.username or "" != ""; + message = '' + You have to define a username for Honk (`services.honk.username`). + ''; + } + { + assertion = cfg.servername or "" != ""; + message = '' + You have to define a servername for Honk (`services.honk.servername`). + ''; + } + ]; + + systemd.services.honk-initdb = { + description = "Honk server database setup"; + requiredBy = [ "honk.service" ]; + before = [ "honk.service" ]; + + serviceConfig = { + LoadCredential = [ + "honk_passwordFile:${cfg.passwordFile}" + ]; + Type = "oneshot"; + StateDirectory = "honk"; + DynamicUser = true; + RemainAfterExit = true; + ExecStart = lib.getExe (honk-initdb-script cfg); + PrivateTmp = true; + }; + + unitConfig = { + ConditionPathExists = [ + # Skip this service if the database already exists + "!$STATE_DIRECTORY/honk.db" + ]; + }; + }; + + systemd.services.honk = { + description = "Honk server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + bindsTo = [ "honk-initdb.service" ]; + preStart = '' + mkdir -p $STATE_DIRECTORY/views + ${lib.optionalString (cfg.extraJS != null) "ln -fs ${cfg.extraJS} $STATE_DIRECTORY/views/local.js"} + ${lib.optionalString (cfg.extraCSS != null) "ln -fs ${cfg.extraCSS} $STATE_DIRECTORY/views/local.css"} + ${lib.getExe cfg.package} -datadir $STATE_DIRECTORY -viewdir ${cfg.package}/share/honk backup $STATE_DIRECTORY/backup + ${lib.getExe cfg.package} -datadir $STATE_DIRECTORY -viewdir ${cfg.package}/share/honk upgrade + ${lib.getExe cfg.package} -datadir $STATE_DIRECTORY -viewdir ${cfg.package}/share/honk cleanup + ''; + serviceConfig = { + ExecStart = '' + ${lib.getExe cfg.package} -datadir $STATE_DIRECTORY -viewdir ${cfg.package}/share/honk + ''; + StateDirectory = "honk"; + DynamicUser = true; + PrivateTmp = "yes"; + Restart = "on-failure"; + }; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ drupol ]; + doc = ./honk.md; + }; +} diff --git a/nixpkgs/nixos/modules/services/web-apps/lemmy.nix b/nixpkgs/nixos/modules/services/web-apps/lemmy.nix index 895f3a9f1b4b..20d9dcb7c266 100644 --- a/nixpkgs/nixos/modules/services/web-apps/lemmy.nix +++ b/nixpkgs/nixos/modules/services/web-apps/lemmy.nix @@ -160,7 +160,7 @@ in root * ${cfg.ui.package}/dist file_server } - handle_path /static/undefined/* { + handle_path /static/${cfg.ui.package.passthru.commit_sha}/* { root * ${cfg.ui.package}/dist file_server } diff --git a/nixpkgs/nixos/modules/services/web-apps/netbox.nix b/nixpkgs/nixos/modules/services/web-apps/netbox.nix index 5f42f42a9af9..6d89ffc2a7b7 100644 --- a/nixpkgs/nixos/modules/services/web-apps/netbox.nix +++ b/nixpkgs/nixos/modules/services/web-apps/netbox.nix @@ -169,6 +169,13 @@ in { AUTH_LDAP_FIND_GROUP_PERMS = True ''; }; + keycloakClientSecret = lib.mkOption { + type = with lib.types; nullOr path; + default = null; + description = lib.mdDoc '' + File that contains the keycloak client secret. + ''; + }; }; config = lib.mkIf cfg.enable { @@ -227,7 +234,10 @@ in { extraConfig = '' with open("${cfg.secretKeyFile}", "r") as file: SECRET_KEY = file.readline() - ''; + '' + (lib.optionalString (cfg.keycloakClientSecret != null) '' + with open("${cfg.keycloakClientSecret}", "r") as file: + SOCIAL_AUTH_KEYCLOAK_SECRET = file.readline() + ''); }; services.redis.servers.netbox.enable = true; diff --git a/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix b/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix index 676d08b93e2c..e6923bcbb56c 100644 --- a/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix @@ -231,40 +231,14 @@ in systemd.user.services.dbus.wantedBy = [ "default.target" ]; - programs.dconf.profiles.gdm = - let - customDconf = pkgs.writeTextFile { - name = "gdm-dconf"; - destination = "/dconf/gdm-custom"; - text = '' - ${optionalString (!cfg.gdm.autoSuspend) '' - [org/gnome/settings-daemon/plugins/power] - sleep-inactive-ac-type='nothing' - sleep-inactive-battery-type='nothing' - sleep-inactive-ac-timeout=0 - sleep-inactive-battery-timeout=0 - ''} - ''; - }; - - customDconfDb = pkgs.stdenv.mkDerivation { - name = "gdm-dconf-db"; - buildCommand = '' - ${pkgs.dconf}/bin/dconf compile $out ${customDconf}/dconf - ''; + programs.dconf.profiles.gdm.databases = lib.optionals (!cfg.gdm.autoSuspend) [{ + settings."org/gnome/settings-daemon/plugins/power" = { + sleep-inactive-ac-type = "nothing"; + sleep-inactive-battery-type = "nothing"; + sleep-inactive-ac-timeout = lib.gvariant.mkInt32 0; + sleep-inactive-battery-timeout = lib.gvariant.mkInt32 0; }; - in pkgs.stdenv.mkDerivation { - name = "dconf-gdm-profile"; - buildCommand = '' - # Check that the GDM profile starts with what we expect. - if [ $(head -n 1 ${gdm}/share/dconf/profile/gdm) != "user-db:user" ]; then - echo "GDM dconf profile changed, please update gdm.nix" - exit 1 - fi - # Insert our custom DB behind it. - sed '2ifile-db:${customDconfDb}' ${gdm}/share/dconf/profile/gdm > $out - ''; - }; + }] ++ [ "${gdm}/share/gdm/greeter-dconf-defaults" ]; # Use AutomaticLogin if delay is zero, because it's immediate. # Otherwise with TimedLogin with zero seconds the prompt is still diff --git a/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix b/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix index c04edd0d4b7a..47e60236eaeb 100644 --- a/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix @@ -267,6 +267,7 @@ in environment.systemPackages = [ sddm ]; services.dbus.packages = [ sddm ]; + systemd.tmpfiles.packages = [ sddm ]; # We're not using the upstream unit, so copy these: https://github.com/sddm/sddm/blob/develop/services/sddm.service.in systemd.services.display-manager.after = [ diff --git a/nixpkgs/nixos/modules/services/x11/window-managers/default.nix b/nixpkgs/nixos/modules/services/x11/window-managers/default.nix index ce1d4115f225..e180f2693e0c 100644 --- a/nixpkgs/nixos/modules/services/x11/window-managers/default.nix +++ b/nixpkgs/nixos/modules/services/x11/window-managers/default.nix @@ -35,6 +35,7 @@ in ./openbox.nix ./pekwm.nix ./notion.nix + ./ragnarwm.nix ./ratpoison.nix ./sawfish.nix ./smallwm.nix diff --git a/nixpkgs/nixos/modules/services/x11/window-managers/ragnarwm.nix b/nixpkgs/nixos/modules/services/x11/window-managers/ragnarwm.nix new file mode 100644 index 000000000000..0843b872dba5 --- /dev/null +++ b/nixpkgs/nixos/modules/services/x11/window-managers/ragnarwm.nix @@ -0,0 +1,33 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.ragnarwm; +in +{ + ###### interface + + options = { + services.xserver.windowManager.ragnarwm = { + enable = mkEnableOption (lib.mdDoc "ragnarwm"); + package = mkOption { + type = types.package; + default = pkgs.ragnarwm; + defaultText = literalExpression "pkgs.ragnarwm"; + description = lib.mdDoc '' + The ragnar package to use. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + services.xserver.displayManager.sessionPackages = [ cfg.package ]; + environment.systemPackages = [ cfg.package ]; + }; + + meta.maintainers = with lib.maintainers; [ sigmanificient ]; +} diff --git a/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl b/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl index 04d90968c4c1..8bd450d7343b 100755 --- a/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl @@ -313,7 +313,8 @@ sub unrecord_unit { # needs to be restarted or reloaded. If the units differ, the service # is restarted unless the only difference is `X-Reload-Triggers` in the # `Unit` section. If this is the only modification, the unit is reloaded -# instead of restarted. +# instead of restarted. If the only difference is `Options` in the +# `[Mount]` section, the unit is reloaded rather than restarted. # Returns: # - 0 if the units are equal # - 1 if the units are different and a restart action is required @@ -390,6 +391,11 @@ sub compare_units { ## no critic(Subroutines::ProhibitExcessComplexity) next; } } + # If this is a mount unit, check if it was only `Options` + if ($section_name eq "Mount" and $ini_key eq "Options") { + $ret = 2; + next; + } return 1; } } @@ -440,10 +446,18 @@ sub handle_modified_unit { ## no critic(Subroutines::ProhibitManyArgs, Subroutin # properties (resource limits and inotify watches) # seem to get applied on daemon-reload. } elsif ($unit =~ /\.mount$/msx) { - # Reload the changed mount unit to force a remount. - # FIXME: only reload when Options= changed, restart otherwise - $units_to_reload->{$unit} = 1; - record_unit($reload_list_file, $unit); + # Just restart the unit. We wouldn't have gotten into this subroutine + # if only `Options` was changed, in which case the unit would be reloaded. + # The only exception is / and /nix because it's very unlikely we can safely + # unmount them so we reload them instead. This means that we may not get + # all changes into the running system but it's better than crashing it. + if ($unit eq "-.mount" or $unit eq "nix.mount") { + $units_to_reload->{$unit} = 1; + record_unit($reload_list_file, $unit); + } else { + $units_to_restart->{$unit} = 1; + record_unit($restart_list_file, $unit); + } } elsif ($unit =~ /\.socket$/msx) { # FIXME: do something? # Attempt to fix this: https://github.com/NixOS/nixpkgs/pull/141192 diff --git a/nixpkgs/nixos/modules/system/boot/binfmt.nix b/nixpkgs/nixos/modules/system/boot/binfmt.nix index 5172371d0afb..fb7afce4a580 100644 --- a/nixpkgs/nixos/modules/system/boot/binfmt.nix +++ b/nixpkgs/nixos/modules/system/boot/binfmt.nix @@ -102,20 +102,28 @@ let mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00''; }; mips-linux = { - magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; + magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20''; }; mipsel-linux = { - magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00''; }; mips64-linux = { magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; }; mips64el-linux = { magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + }; + mips64-linuxabin32 = { + magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20''; + }; + mips64el-linuxabin32 = { + magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00''; }; riscv32-linux = { magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00''; diff --git a/nixpkgs/nixos/release-combined.nix b/nixpkgs/nixos/release-combined.nix index 125086294d41..29dcdab7d18e 100644 --- a/nixpkgs/nixos/release-combined.nix +++ b/nixpkgs/nixos/release-combined.nix @@ -158,6 +158,11 @@ in rec { (onFullSupported "nixpkgs.emacs") (onFullSupported "nixpkgs.jdk") ["nixpkgs.tarball"] + + # Ensure that nixpkgs-check-by-name is available in all release channels and nixos-unstable, + # so that a pre-built version can be used in CI for PR's on the corresponding development branches. + # See ../pkgs/test/nixpkgs-check-by-name/README.md + (onSystems ["x86_64-linux"] "nixpkgs.tests.nixpkgs-check-by-name") ]; }; } diff --git a/nixpkgs/nixos/tests/all-tests.nix b/nixpkgs/nixos/tests/all-tests.nix index 19aaac694594..c1e124bda5c7 100644 --- a/nixpkgs/nixos/tests/all-tests.nix +++ b/nixpkgs/nixos/tests/all-tests.nix @@ -210,6 +210,7 @@ in { custom-ca = handleTest ./custom-ca.nix {}; croc = handleTest ./croc.nix {}; darling = handleTest ./darling.nix {}; + dconf = handleTest ./dconf.nix {}; deepin = handleTest ./deepin.nix {}; deluge = handleTest ./deluge.nix {}; dendrite = handleTest ./matrix/dendrite.nix {}; @@ -345,10 +346,12 @@ in { hedgedoc = handleTest ./hedgedoc.nix {}; herbstluftwm = handleTest ./herbstluftwm.nix {}; homepage-dashboard = handleTest ./homepage-dashboard.nix {}; + honk = runTest ./honk.nix; installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {}); invidious = handleTest ./invidious.nix {}; oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {}; odoo = handleTest ./odoo.nix {}; + odoo15 = handleTest ./odoo.nix { package = pkgs.odoo15; }; # 9pnet_virtio used to mount /nix partition doesn't support # hibernation. This test happens to work on x86_64-linux but # not on other platforms. @@ -443,7 +446,7 @@ in { loki = handleTest ./loki.nix {}; luks = handleTest ./luks.nix {}; lvm2 = handleTest ./lvm2 {}; - lxd = handleTest ./lxd {}; + lxd = pkgs.recurseIntoAttrs (handleTest ./lxd {}); lxd-image-server = handleTest ./lxd-image-server.nix {}; #logstash = handleTest ./logstash.nix {}; lorri = handleTest ./lorri/default.nix {}; @@ -672,6 +675,7 @@ in { rabbitmq = handleTest ./rabbitmq.nix {}; radarr = handleTest ./radarr.nix {}; radicale = handleTest ./radicale.nix {}; + ragnarwm = handleTest ./ragnarwm.nix {}; rasdaemon = handleTest ./rasdaemon.nix {}; readarr = handleTest ./readarr.nix {}; redis = handleTest ./redis.nix {}; @@ -831,6 +835,7 @@ in { uptime-kuma = handleTest ./uptime-kuma.nix {}; usbguard = handleTest ./usbguard.nix {}; user-activation-scripts = handleTest ./user-activation-scripts.nix {}; + user-expiry = runTest ./user-expiry.nix; user-home-mode = handleTest ./user-home-mode.nix {}; uwsgi = handleTest ./uwsgi.nix {}; v2ray = handleTest ./v2ray.nix {}; diff --git a/nixpkgs/nixos/tests/dconf.nix b/nixpkgs/nixos/tests/dconf.nix new file mode 100644 index 000000000000..86f703e3b98e --- /dev/null +++ b/nixpkgs/nixos/tests/dconf.nix @@ -0,0 +1,34 @@ +import ./make-test-python.nix + ({ lib, ... }: + { + name = "dconf"; + + meta.maintainers = with lib.maintainers; [ + linsui + ]; + + nodes.machine = { config, pkgs, lib, ... }: { + users.extraUsers.alice = { isNormalUser = true; }; + programs.dconf = with lib.gvariant; { + enable = true; + profiles.user.databases = [ + { + settings = { + "test/not/locked" = mkInt32 1; + "test/is/locked" = "locked"; + }; + locks = [ + "/test/is/locked" + ]; + } + ]; + }; + }; + + testScript = '' + machine.succeed("test $(dconf read -d /test/not/locked) == 1") + machine.succeed("test $(dconf read -d /test/is/locked) == \"'locked'\"") + machine.fail("sudo -u alice dbus-run-session -- dconf write /test/is/locked \"@s 'unlocked'\"") + machine.succeed("sudo -u alice dbus-run-session -- dconf write /test/not/locked \"@i 2\"") + ''; + }) diff --git a/nixpkgs/nixos/tests/dolibarr.nix b/nixpkgs/nixos/tests/dolibarr.nix index 2f012a0c67da..4fdee9e9698f 100644 --- a/nixpkgs/nixos/tests/dolibarr.nix +++ b/nixpkgs/nixos/tests/dolibarr.nix @@ -50,7 +50,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { # Now, we have installed the machine, let's verify we still have the right configuration. assert 'nixos' in machine.succeed("cat /var/lib/dolibarr/conf.php") # We do not want any redirect now as we have installed the machine. - machine.succeed('curl -f -X POST http://localhost') + machine.succeed('curl -f -X GET http://localhost') # Test authentication to the webservice. parser = TokenParser() parser.feed(machine.succeed('curl -f -X GET http://localhost/index.php?mainmenu=login&username=root')) diff --git a/nixpkgs/nixos/tests/honk.nix b/nixpkgs/nixos/tests/honk.nix new file mode 100644 index 000000000000..71d86a592439 --- /dev/null +++ b/nixpkgs/nixos/tests/honk.nix @@ -0,0 +1,32 @@ +{ lib, ... }: + +{ + name = "honk-server"; + + nodes = { + machine = { pkgs, ... }: { + services.honk = { + enable = true; + host = "0.0.0.0"; + port = 8080; + username = "username"; + passwordFile = "${pkgs.writeText "honk-password" "secure"}"; + servername = "servername"; + }; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("honk.service") + machine.wait_for_open_port(8080) + + machine.stop_job("honk") + machine.wait_for_closed_port(8080) + + machine.start_job("honk") + machine.wait_for_open_port(8080) + ''; + + meta.maintainers = [ lib.maintainers.drupol ]; +} diff --git a/nixpkgs/nixos/tests/lxd/nftables.nix b/nixpkgs/nixos/tests/lxd/nftables.nix index b85caa9eb368..d98bd4952906 100644 --- a/nixpkgs/nixos/tests/lxd/nftables.nix +++ b/nixpkgs/nixos/tests/lxd/nftables.nix @@ -20,8 +20,8 @@ import ../make-test-python.nix ({ pkgs, ...} : { networking = { firewall.enable = false; nftables.enable = true; - nftables.ruleset = '' - table inet filter { + nftables.tables."filter".family = "inet"; + nftables.tables."filter".content = '' chain incoming { type filter hook input priority 0; policy accept; @@ -36,7 +36,6 @@ import ../make-test-python.nix ({ pkgs, ...} : { type filter hook output priority 0; policy accept; } - } ''; }; }; diff --git a/nixpkgs/nixos/tests/odoo.nix b/nixpkgs/nixos/tests/odoo.nix index 7c2cf31370f9..00ae4a2137d1 100644 --- a/nixpkgs/nixos/tests/odoo.nix +++ b/nixpkgs/nixos/tests/odoo.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, lib, ...} : { +import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.odoo, ...} : { name = "odoo"; meta.maintainers = with lib.maintainers; [ mkg20001 ]; @@ -11,6 +11,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { services.odoo = { enable = true; + package = package; domain = "localhost"; }; }; diff --git a/nixpkgs/nixos/tests/prometheus-exporters.nix b/nixpkgs/nixos/tests/prometheus-exporters.nix index d86f8ac634e8..306c5e071e75 100644 --- a/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -716,6 +716,41 @@ let ''; }; + mysqld = { + exporterConfig = { + enable = true; + runAsLocalSuperUser = true; + configFile = pkgs.writeText "test-prometheus-exporter-mysqld-config.my-cnf" '' + [client] + user = exporter + password = snakeoilpassword + ''; + }; + metricProvider = { + services.mysql = { + enable = true; + package = pkgs.mariadb; + initialScript = pkgs.writeText "mysql-init-script.sql" '' + CREATE USER 'exporter'@'localhost' + IDENTIFIED BY 'snakeoilpassword' + WITH MAX_USER_CONNECTIONS 3; + GRANT PROCESS, REPLICATION CLIENT, SLAVE MONITOR, SELECT ON *.* TO 'exporter'@'localhost'; + ''; + }; + }; + exporterTest = '' + wait_for_unit("prometheus-mysqld-exporter.service") + wait_for_open_port(9104) + wait_for_unit("mysql.service") + succeed("curl -sSf http://localhost:9104/metrics | grep 'mysql_up 1'") + systemctl("stop mysql.service") + succeed("curl -sSf http://localhost:9104/metrics | grep 'mysql_up 0'") + systemctl("start mysql.service") + wait_for_unit("mysql.service") + succeed("curl -sSf http://localhost:9104/metrics | grep 'mysql_up 1'") + ''; + }; + nextcloud = { exporterConfig = { enable = true; @@ -1387,8 +1422,7 @@ let unbound = { exporterConfig = { enable = true; - fetchType = "uds"; - controlInterface = "/run/unbound/unbound.ctl"; + unbound.host = "unix:///run/unbound/unbound.ctl"; }; metricProvider = { services.unbound = { @@ -1403,7 +1437,7 @@ let wait_for_unit("unbound.service") wait_for_unit("prometheus-unbound-exporter.service") wait_for_open_port(9167) - succeed("curl -sSf localhost:9167/metrics | grep 'unbound_up 1'") + wait_until_succeeds("curl -sSf localhost:9167/metrics | grep 'unbound_up 1'") ''; }; diff --git a/nixpkgs/nixos/tests/ragnarwm.nix b/nixpkgs/nixos/tests/ragnarwm.nix new file mode 100644 index 000000000000..f7c588b92008 --- /dev/null +++ b/nixpkgs/nixos/tests/ragnarwm.nix @@ -0,0 +1,32 @@ +import ./make-test-python.nix ({ lib, ...} : { + name = "ragnarwm"; + + meta = { + maintainers = with lib.maintainers; [ sigmanificient ]; + }; + + nodes.machine = { pkgs, lib, ... }: { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + test-support.displayManager.auto.user = "alice"; + services.xserver.displayManager.defaultSession = lib.mkForce "ragnar"; + services.xserver.windowManager.ragnarwm.enable = true; + + # Setup the default terminal of Ragnar + environment.systemPackages = [ pkgs.alacritty ]; + }; + + testScript = '' + with subtest("ensure x starts"): + machine.wait_for_x() + machine.wait_for_file("/home/alice/.Xauthority") + machine.succeed("xauth merge ~alice/.Xauthority") + + with subtest("ensure we can open a new terminal"): + # Sleeping a bit before the test, as it may help for sending keys + machine.sleep(2) + machine.send_key("meta_l-ret") + machine.wait_for_window(r"alice.*?machine") + machine.sleep(2) + machine.screenshot("terminal") + ''; +}) diff --git a/nixpkgs/nixos/tests/switch-test.nix b/nixpkgs/nixos/tests/switch-test.nix index 53595ae7d3e2..529a20864206 100644 --- a/nixpkgs/nixos/tests/switch-test.nix +++ b/nixpkgs/nixos/tests/switch-test.nix @@ -450,7 +450,7 @@ in { ]; }; - mountModified.configuration = { + mountOptionsModified.configuration = { systemd.mounts = [ { description = "Testmount"; @@ -463,6 +463,19 @@ in { ]; }; + mountModified.configuration = { + systemd.mounts = [ + { + description = "Testmount"; + what = "ramfs"; + type = "ramfs"; + where = "/testmount"; + options = "size=10M"; + wantedBy = [ "local-fs.target" ]; + } + ]; + }; + timer.configuration = { systemd.timers.test-timer = { wantedBy = [ "timers.target" ]; @@ -1137,7 +1150,8 @@ in { switch_to_specialisation("${machine}", "mount") out = machine.succeed("mount | grep 'on /testmount'") assert_contains(out, "size=1024k") - out = switch_to_specialisation("${machine}", "mountModified") + # Changing options reloads the unit + out = switch_to_specialisation("${machine}", "mountOptionsModified") assert_lacks(out, "stopping the following units:") assert_lacks(out, "NOT restarting the following changed units:") assert_contains(out, "reloading the following units: testmount.mount\n") @@ -1147,6 +1161,17 @@ in { # It changed out = machine.succeed("mount | grep 'on /testmount'") assert_contains(out, "size=10240k") + # Changing anything but `Options=` restarts the unit + out = switch_to_specialisation("${machine}", "mountModified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "\nrestarting the following units: testmount.mount\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + # It changed + out = machine.succeed("mount | grep 'on /testmount'") + assert_contains(out, "ramfs") with subtest("timers"): switch_to_specialisation("${machine}", "timer") diff --git a/nixpkgs/nixos/tests/user-expiry.nix b/nixpkgs/nixos/tests/user-expiry.nix new file mode 100644 index 000000000000..bcaed7a0ccb0 --- /dev/null +++ b/nixpkgs/nixos/tests/user-expiry.nix @@ -0,0 +1,70 @@ +let + alice = "alice"; + bob = "bob"; + eve = "eve"; + passwd = "pass1"; +in +{ + name = "user-expiry"; + + nodes = { + machine = { + users.users = { + ${alice} = { + initialPassword = passwd; + isNormalUser = true; + expires = "1990-01-01"; + }; + ${bob} = { + initialPassword = passwd; + isNormalUser = true; + expires = "2990-01-01"; + }; + ${eve} = { + initialPassword = passwd; + isNormalUser = true; + }; + }; + }; + }; + + testScript = '' + def switch_to_tty(tty_number): + machine.fail(f"pgrep -f 'agetty.*tty{tty_number}'") + machine.send_key(f"alt-f{tty_number}") + machine.wait_until_succeeds(f"[ $(fgconsole) = {tty_number} ]") + machine.wait_for_unit(f"getty@tty{tty_number}.service") + machine.wait_until_succeeds(f"pgrep -f 'agetty.*tty{tty_number}'") + + + machine.wait_for_unit("multi-user.target") + machine.wait_for_unit("getty@tty1.service") + + with subtest("${alice} cannot login"): + machine.wait_until_tty_matches("1", "login: ") + machine.send_chars("${alice}\n") + machine.wait_until_tty_matches("1", "Password: ") + machine.send_chars("${passwd}\n") + + machine.wait_until_succeeds("journalctl --grep='account ${alice} has expired \\(account expired\\)'") + machine.wait_until_tty_matches("1", "login: ") + + with subtest("${bob} can login"): + switch_to_tty(2) + machine.wait_until_tty_matches("2", "login: ") + machine.send_chars("${bob}\n") + machine.wait_until_tty_matches("2", "Password: ") + machine.send_chars("${passwd}\n") + + machine.wait_until_succeeds("pgrep -u ${bob} bash") + + with subtest("${eve} can login"): + switch_to_tty(3) + machine.wait_until_tty_matches("3", "login: ") + machine.send_chars("${eve}\n") + machine.wait_until_tty_matches("3", "Password: ") + machine.send_chars("${passwd}\n") + + machine.wait_until_succeeds("pgrep -u ${eve} bash") + ''; +} diff --git a/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix b/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix index c479ebe7ee65..f46f3053a284 100644 --- a/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix +++ b/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, lv2 }: +{ lib, stdenv, fetchFromSourcehut, meson, ninja, pkg-config, lv2 }: stdenv.mkDerivation rec { pname = "airwindows-lv2"; - version = "20.0"; - src = fetchFromGitHub { - owner = "hannesbraun"; + version = "22.0"; + src = fetchFromSourcehut { + owner = "~hannes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uflvUmUzOtF3BwiLfnd+qhz+ZYyn8AKvODFs599phhU="; + sha256 = "sha256-u62wLRrJ45ap981Q8JmMnanc8AWQb1MJHK32PEr10I4="; }; nativeBuildInputs = [ meson ninja pkg-config ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Airwindows plugins (ported to LV2)"; - homepage = "https://github.com/hannesbraun/airwindows-lv2"; + homepage = "https://sr.ht/~hannes/airwindows-lv2"; license = licenses.mit; maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/applications/audio/furnace/default.nix b/nixpkgs/pkgs/applications/audio/furnace/default.nix index f865d7c69ca8..a819cd746ed1 100644 --- a/nixpkgs/pkgs/applications/audio/furnace/default.nix +++ b/nixpkgs/pkgs/applications/audio/furnace/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "furnace"; - version = "0.6pre8"; + version = "0.6pre9"; src = fetchFromGitHub { owner = "tildearrow"; repo = "furnace"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-kV3XlZAVkb+SfGqBi7I7Br58zjSAfh4kiUk2KCcXnFA="; + sha256 = "sha256-i7/NN179Wyr1FqNlgryyFtishFr5EY1HI6BRQKby/6E="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/nixpkgs/pkgs/applications/audio/giada/default.nix b/nixpkgs/pkgs/applications/audio/giada/default.nix index 86cb565fa820..d2ccb6d47472 100644 --- a/nixpkgs/pkgs/applications/audio/giada/default.nix +++ b/nixpkgs/pkgs/applications/audio/giada/default.nix @@ -24,26 +24,16 @@ stdenv.mkDerivation rec { pname = "giada"; - version = "0.24.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-pKzc+RRW3o5vYaiGqW9/VjYZZJvr6cg1kdjP9qRkHwM="; + rev = version; + sha256 = "sha256-SW2qT+pMKTMBnkaL+Dg87tqutcLTqaY4nCeFfJjHIw4="; fetchSubmodules = true; }; - patches = [ - # Remove when updating to the next release, this PR is already merged - # Fix fmt type error: https://github.com/monocasual/giada/pull/635 - (fetchpatch { - name = "fix-fmt-type-error.patch"; - url = "https://github.com/monocasual/giada/commit/032af4334f6d2bb7e77a49e7aef5b4c4d696df9a.patch"; - hash = "sha256-QuxETvBWzA1v2ifyNzlNMGfQ6XhYQF03sGZA9rBx1xU="; - }) - ]; - env.NIX_CFLAGS_COMPILE = toString [ "-w" "-Wno-error" @@ -82,7 +72,7 @@ stdenv.mkDerivation rec { description = "A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"; homepage = "https://giadamusic.com/"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ kashw2 ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/audio/glicol-cli/default.nix b/nixpkgs/pkgs/applications/audio/glicol-cli/default.nix new file mode 100644 index 000000000000..b549b6ac4fbe --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/glicol-cli/default.nix @@ -0,0 +1,42 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, stdenv +, darwin +, alsa-lib +}: + +rustPlatform.buildRustPackage rec { + pname = "glicol-cli"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "glicol"; + repo = "glicol-cli"; + rev = "v${version}"; + hash = "sha256-v90FfF4vP5UPy8VnQFvYMKiCrledgNMpWbJR59Cv6a0="; + }; + + cargoHash = "sha256-fJ18SwVMotepUvdNPQumFWoOaotDzGTerb+Iy+qq5w0="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AudioUnit + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + ]; + + meta = with lib; { + description = "Cross-platform music live coding in terminal"; + homepage = "https://github.com/glicol/glicol-cli"; + changelog = "https://github.com/glicol/glicol-cli/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "glicol-cli"; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/jacktrip/default.nix b/nixpkgs/pkgs/applications/audio/jacktrip/default.nix index 7dd60a6c4d1b..2046233fcb46 100644 --- a/nixpkgs/pkgs/applications/audio/jacktrip/default.nix +++ b/nixpkgs/pkgs/applications/audio/jacktrip/default.nix @@ -12,17 +12,22 @@ , python3 , rtaudio , ninja +, qtquickcontrols2 +, qtnetworkauth +, qtwebsockets +, qtgraphicaleffects }: mkDerivation rec { - version = "1.5.3"; + version = "1.10.1"; pname = "jacktrip"; src = fetchFromGitHub { owner = "jacktrip"; repo = "jacktrip"; rev = "v${version}"; - sha256 = "sha256-sfAYMTnBjT4LkgksyzDGGy97NLX5ljjhNDFioQnTzLs="; + fetchSubmodules = true; + sha256 = "sha256-bdYhyLsdL4LDkCzJiWXdi+7CTtqhSiA7HNYhg190NWs="; }; preConfigure = '' @@ -46,6 +51,10 @@ mkDerivation rec { meson qmake qttools + qtquickcontrols2 + qtnetworkauth + qtwebsockets + qtgraphicaleffects pkg-config ]; diff --git a/nixpkgs/pkgs/applications/audio/losslessaudiochecker/default.nix b/nixpkgs/pkgs/applications/audio/losslessaudiochecker/default.nix index b7150d6b6771..5ec91f4260f8 100644 --- a/nixpkgs/pkgs/applications/audio/losslessaudiochecker/default.nix +++ b/nixpkgs/pkgs/applications/audio/losslessaudiochecker/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook ]; - setSourceRoot = "sourceRoot=$PWD"; + sourceRoot = "."; dontBuild = true; diff --git a/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix b/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix index 564324c6a4a0..e459e10b6db9 100644 --- a/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix +++ b/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.2.8"; + version = "1.2.10"; src = fetchurl { url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-udVYyR6rDOCAKggpvY58jjpoLmB6wXiivvdzYylkE9c="; + sha256 = "sha256-2Yf+4TYGWF/AMI1kNvVOx9g6CSIoeZKY63qC/zJNilc="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix b/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix index 4a70f96994a0..ac9d4f2e26a1 100644 --- a/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix +++ b/nixpkgs/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { - version = "10.17"; + version = "10.19"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip"; - sha256 = "sha256-yWoYeOGELXub/3kLC51SNPMC91u1aWAtdRsU6fRuX98="; + sha256 = "sha256-kuK6Uok5PAK66OtY+Uu1R7g8T7geA9edn2Sv6LN2pXc="; stripRoot = false; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/mympd/default.nix b/nixpkgs/pkgs/applications/audio/mympd/default.nix index 301c223147a1..c9f50e8bcf9b 100644 --- a/nixpkgs/pkgs/applications/audio/mympd/default.nix +++ b/nixpkgs/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "mympd"; - version = "11.0.3"; + version = "11.0.4"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${version}"; - sha256 = "sha256-pDM9igAX1iUi/yC8/Jqobaixkw6klEVcd0sAn0Ufdjk="; + sha256 = "sha256-uDr0QyyYROpaWQ7sv/JeI9IHwdJaFWorIqWMHs5XKU4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/noson/default.nix b/nixpkgs/pkgs/applications/audio/noson/default.nix index f1b932013a6e..1bcd06eec425 100644 --- a/nixpkgs/pkgs/applications/audio/noson/default.nix +++ b/nixpkgs/pkgs/applications/audio/noson/default.nix @@ -8,6 +8,7 @@ , qtgraphicaleffects , qtquickcontrols2 , wrapQtAppsHook +, makeWrapper }: stdenv.mkDerivation (finalAttrs: { @@ -24,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake wrapQtAppsHook + makeWrapper ]; buildInputs = [ @@ -36,7 +38,9 @@ stdenv.mkDerivation (finalAttrs: { # wrapQtAppsHook doesn't automatically find noson-gui dontWrapQtApps = true; + preFixup = '' + wrapProgram "$out/bin/noson-app" --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio ]} wrapQtApp "$out/lib/noson/noson-gui" ''; diff --git a/nixpkgs/pkgs/applications/audio/nuclear/default.nix b/nixpkgs/pkgs/applications/audio/nuclear/default.nix index 6fd277a39adb..605596563e0b 100644 --- a/nixpkgs/pkgs/applications/audio/nuclear/default.nix +++ b/nixpkgs/pkgs/applications/audio/nuclear/default.nix @@ -1,33 +1,38 @@ -{ - appimageTools, - lib, - fetchurl, -}: let +{ appimageTools +, lib +, fetchurl +}: +let pname = "nuclear"; - version = "0.6.27"; + version = "0.6.30"; src = fetchurl { url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}.AppImage"; - hash = "sha256-vCtGuId2yMVIQrMZcjN1i2buV4sah2qKupbr4LhqMbA="; + hash = "sha256-he1uGC1M/nFcKpMM9JKY4oeexJcnzV0ZRxhTjtJz6xw="; }; - appimageContents = appimageTools.extract {inherit pname version src;}; + appimageContents = appimageTools.extract { inherit pname version src; }; in - appimageTools.wrapType2 { - inherit pname version src; +appimageTools.wrapType2 { + inherit pname version src; - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share - ''; + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share - meta = with lib; { - description = "Streaming music player that finds free music for you"; - homepage = "https://nuclear.js.org/"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [NotAShelf ivar]; - platforms = ["x86_64-linux"]; - }; - } + # unless linked, the binary is placed in $out/bin/nuclear-someVersion + # link it to $out/bin/nuclear + ln -s $out/bin/${pname}-${version} $out/bin/${pname} + ''; + + meta = with lib; { + description = "Streaming music player that finds free music for you"; + homepage = "https://nuclear.js.org/"; + license = licenses.agpl3Plus; + maintainers = [ maintainers.NotAShelf ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "nuclear"; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix b/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix index 5524c9a53609..87f1e1512954 100644 --- a/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix +++ b/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix @@ -2,13 +2,13 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.25.2"; + version = "1.25.3"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-7D3C1W2Y7FJnLxbXKXFFPDf+EXhLgPEj0APc2ZFYUlM="; + hash = "sha256-drv+QNBmUjvlRul8PlFK4ZBIDw6BV4kJXVw287H6WT4="; }; # Remove some Electron stuff from package.json diff --git a/nixpkgs/pkgs/applications/audio/patchance/default.nix b/nixpkgs/pkgs/applications/audio/patchance/default.nix index 99e622bcf70c..7770065b3d1c 100644 --- a/nixpkgs/pkgs/applications/audio/patchance/default.nix +++ b/nixpkgs/pkgs/applications/audio/patchance/default.nix @@ -1,22 +1,23 @@ -{ lib, fetchurl, buildPythonApplication, libjack2, pyqt5, qttools, which }: +{ lib, fetchurl, buildPythonApplication, libjack2, pyqt5, qt5, which, bash }: buildPythonApplication rec { pname = "patchance"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/Houston4444/Patchance/releases/download/v${version}/Patchance-${version}-source.tar.gz"; - sha256 = "sha256-8Zn6xcDv4hBFXnaXK9xslYEB8uHEfIP+1NKvcPAyHj0="; + sha256 = "sha256-wlkEKkPH2C/y7TQicIVycWbtLUdX2hICcUWi7nFN51w="; }; format = "other"; nativeBuildInputs = [ pyqt5 # pyuic5 and pyrcc5 to build resources. - qttools # lrelease to build translations. + qt5.qttools # lrelease to build translations. which # which to find lrelease. + qt5.wrapQtAppsHook ]; - buildInputs = [ libjack2 ]; + buildInputs = [ libjack2 bash ]; propagatedBuildInputs = [ pyqt5 ]; dontWrapQtApps = true; # The program is a python script. @@ -27,8 +28,15 @@ buildPythonApplication rec { "--prefix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ libjack2 ]) ]; + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + postFixup = '' wrapPythonProgramsIn "$out/share/patchance/src" "$out $pythonPath" + for file in $out/bin/*; do + wrapQtApp "$file" + done ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/audio/praat/default.nix b/nixpkgs/pkgs/applications/audio/praat/default.nix index 352a52e42f76..e4cb6ecb690b 100644 --- a/nixpkgs/pkgs/applications/audio/praat/default.nix +++ b/nixpkgs/pkgs/applications/audio/praat/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.3.14"; + version = "6.3.15"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-HN4w7n0nh7voL/QKhGQwCcGfzn+nyFOwluESlP3B6VM="; + hash = "sha256-Lo0aJ3BbFkZxAJZyOTzso9esYnkTkeKAFNUi7Q2d/hI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index 5373f6a1276a..59317daa6e60 100644 --- a/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.61"; + version = "1.62.2"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-V3i6Bn2urd4l3O0GhOobDutnnXBTjYGYb0Bsa5URbxc="; + sha256 = "sha256-k2rX5ysV3jgCWn0ffe5xSYo9oO6RLakTapE/SnvOPVI="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/audio/raysession/default.nix b/nixpkgs/pkgs/applications/audio/raysession/default.nix index 279d0f85b218..f12fd7a15c00 100644 --- a/nixpkgs/pkgs/applications/audio/raysession/default.nix +++ b/nixpkgs/pkgs/applications/audio/raysession/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, qttools, which, bash }: +{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, which, bash, qt5 }: buildPythonApplication rec { pname = "raysession"; @@ -20,8 +20,9 @@ buildPythonApplication rec { nativeBuildInputs = [ pyqt5 # pyuic5 and pyrcc5 to build resources. - qttools # lrelease to build translations. + qt5.qttools # lrelease to build translations. which # which to find lrelease. + qt5.wrapQtAppsHook ]; buildInputs = [ libjack2 bash ]; propagatedBuildInputs = [ pydbus pyliblo pyqt5 ]; @@ -36,6 +37,9 @@ buildPythonApplication rec { postFixup = '' wrapPythonProgramsIn "$out/share/raysession/src" "$out $pythonPath" + for file in $out/bin/*; do + wrapQtApp "$file" + done ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/audio/snd/default.nix b/nixpkgs/pkgs/applications/audio/snd/default.nix index 434b8942aa8d..8cf233c37f70 100644 --- a/nixpkgs/pkgs/applications/audio/snd/default.nix +++ b/nixpkgs/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "23.5"; + version = "23.6"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-ZbGrxy494BH6QIj2sYAUEiNBsbNJHXtAVRLPVFwAcQM="; + sha256 = "sha256-3oh2kFhCYe1sl4MN336Z6pEmpluiUnlcC5aAZxn0zIE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix b/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix index 03fc6299d5c0..86746cbc5375 100644 --- a/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix +++ b/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config copyDesktopItems ]; buildInputs = [ bluez dbus glew glfw imgui ]; - sourceRoot = "./${src.name}/Client"; + sourceRoot = "${src.name}/Client"; cmakeFlags = [ "-Wno-dev" ]; diff --git a/nixpkgs/pkgs/applications/audio/spotify-player/default.nix b/nixpkgs/pkgs/applications/audio/spotify-player/default.nix index 4c5417ab99fc..963cbe3252ea 100644 --- a/nixpkgs/pkgs/applications/audio/spotify-player/default.nix +++ b/nixpkgs/pkgs/applications/audio/spotify-player/default.nix @@ -4,12 +4,30 @@ , pkg-config , openssl , cmake +# deps for audio backends , alsa-lib +, libpulseaudio +, portaudio +, libjack2 +, SDL2 +, gst_all_1 , dbus , fontconfig , libsixel + +# build options +, withStreaming ? true +, withDaemon ? true +, withAudioBackend ? "rodio" # alsa, pulseaudio, rodio, portaudio, jackaudio, rodiojack, sdl +, withMediaControl ? true +, withLyrics ? true +, withImage ? true +, withNotify ? true +, withSixel ? true }: +assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaudio" "rodio" "portaudio" "jackaudio" "rodiojack" "sdl" "gstreamer" ]; + rustPlatform.buildRustPackage rec { pname = "spotify-player"; version = "0.15.0"; @@ -30,31 +48,37 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - alsa-lib dbus fontconfig - libsixel - ]; + ] + ++ lib.optionals withSixel [ libsixel ] + ++ lib.optionals (withAudioBackend == "alsa") [ alsa-lib ] + ++ lib.optionals (withAudioBackend == "pulseaudio") [ libpulseaudio ] + ++ lib.optionals (withAudioBackend == "rodio") [ alsa-lib ] + ++ lib.optionals (withAudioBackend == "portaudio") [ portaudio ] + ++ lib.optionals (withAudioBackend == "jackaudio") [ libjack2 ] + ++ lib.optionals (withAudioBackend == "rodiojack") [ alsa-lib libjack2 ] + ++ lib.optionals (withAudioBackend == "sdl") [ SDL2 ] + ++ lib.optionals (withAudioBackend == "gstreamer") [ gst_all_1.gstreamer gst_all_1.gst-devtools gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; buildNoDefaultFeatures = true; - buildFeatures = [ - "rodio-backend" - "media-control" - "image" - "lyric-finder" - "daemon" - "notify" - "streaming" - "sixel" - ]; + buildFeatures = [ ] + ++ lib.optionals (withAudioBackend != "") [ "${withAudioBackend}-backend" ] + ++ lib.optionals withMediaControl [ "media-control" ] + ++ lib.optionals withImage [ "image" ] + ++ lib.optionals withLyrics [ "lyric-finder" ] + ++ lib.optionals withDaemon [ "daemon" ] + ++ lib.optionals withNotify [ "notify" ] + ++ lib.optionals withStreaming [ "streaming" ] + ++ lib.optionals withSixel [ "sixel" ]; - meta = with lib; { - description = "A command driven spotify player"; + meta = { + description = "A terminal spotify player that has feature parity with the official client"; homepage = "https://github.com/aome510/spotify-player"; changelog = "https://github.com/aome510/spotify-player/releases/tag/v${version}"; mainProgram = "spotify_player"; - license = licenses.mit; - maintainers = with maintainers; [ dit7ya ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dit7ya xyven1 ]; }; } diff --git a/nixpkgs/pkgs/applications/audio/squeezelite/default.nix b/nixpkgs/pkgs/applications/audio/squeezelite/default.nix index d7426020d802..d0ceec6d67a7 100644 --- a/nixpkgs/pkgs/applications/audio/squeezelite/default.nix +++ b/nixpkgs/pkgs/applications/audio/squeezelite/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation { pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "1.9.9.1430"; + version = "1.9.9.1449"; src = fetchFromGitHub { owner = "ralph-irving"; repo = "squeezelite"; - rev = "663db8f64d73dceca6a2a18cdb705ad846daa272"; - hash = "sha256-PROb6d5ixO7lk/7wsjh2vkPkPgAvd6x+orQOY078IAs="; + rev = "8581aba8b1b67af272b89b62a7a9b56082307ab6"; + hash = "sha256-/qyoc0/7Q8yiu5AhuLQFUiE88wf+/ejHjSucjpoN5bI="; }; buildInputs = [ flac libmad libvorbis mpg123 ] diff --git a/nixpkgs/pkgs/applications/audio/squeezelite/update.sh b/nixpkgs/pkgs/applications/audio/squeezelite/update.sh index 0a53ef988155..ac55144d158d 100755 --- a/nixpkgs/pkgs/applications/audio/squeezelite/update.sh +++ b/nixpkgs/pkgs/applications/audio/squeezelite/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p common-updater-scripts coreutils curl gnused jq nix nix-prefetch-github ripgrep +#!nix-shell -I nixpkgs=./. -i bash -p common-updater-scripts coreutils curl gnused jq nix nix-prefetch-git nix-prefetch-github ripgrep set -euo pipefail diff --git a/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix b/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix index 614375d6755c..2c3b4283a6a1 100644 --- a/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix +++ b/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tidal-hifi"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-HKylyYhbMxYfRRP9irGMTtB497o75M+ryikQHMJWbtU="; + sha256 = "sha256-fA6zXmLfcZJt5/umdY4gdqGdbH3afsaanmK/i+Js5HQ="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/blockchains/besu/default.nix b/nixpkgs/pkgs/applications/blockchains/besu/default.nix index 1aeb8a1eec5f..aa963a499af5 100644 --- a/nixpkgs/pkgs/applications/blockchains/besu/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/besu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "besu"; - version = "23.4.1"; + version = "23.4.4"; src = fetchurl { url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-SdOnoGnK4wdJcJPYNPhzzngEpG3VkgfV6DIUWVMtMY4="; + sha256 = "sha256-vUdtI1tv4fI2pivHCfQch962i3LEe7W1jla52Sg68sQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/blockchains/lightwalletd/default.nix b/nixpkgs/pkgs/applications/blockchains/lightwalletd/default.nix index 5d540a16f1dc..040d08e752b6 100644 --- a/nixpkgs/pkgs/applications/blockchains/lightwalletd/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/lightwalletd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lightwalletd"; - version = "0.4.15"; + version = "0.4.16"; src = fetchFromGitHub { owner = "zcash"; repo = "lightwalletd"; rev = "v${version}"; - hash = "sha256-tkM9uTmobKXD7Il/uvmLLckPgdkmgwsNsjlARJQiY5A="; + hash = "sha256-M9xfV2T8L+nssrJj29QmPiErNMpfpT8BY/30Vj8wPjY="; }; vendorHash = "sha256-z5Hs+CkPswWhz+Ya5MyHKA3MZzQkvS7WOxNckElkg6U="; diff --git a/nixpkgs/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch b/nixpkgs/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch deleted file mode 100644 index 94c70da276c9..000000000000 --- a/nixpkgs/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt -index 4909ff1..02fa145 100644 ---- a/src/she/CMakeLists.txt -+++ b/src/she/CMakeLists.txt -@@ -23,2 +23,3 @@ if(USE_ALLEG4_BACKEND) - add_definitions(-DUSE_MOUSE_POLLER) -+ add_definitions(-DALLEGRO_NO_FIX_ALIASES) - endif() diff --git a/nixpkgs/pkgs/applications/editors/aseprite/default.nix b/nixpkgs/pkgs/applications/editors/aseprite/default.nix index 58342ab1393a..36415d076d9d 100644 --- a/nixpkgs/pkgs/applications/editors/aseprite/default.nix +++ b/nixpkgs/pkgs/applications/editors/aseprite/default.nix @@ -1,8 +1,7 @@ -{ stdenv, lib, callPackage, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config +{ stdenv, lib, callPackage, fetchFromGitHub, cmake, ninja, pkg-config , curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib , harfbuzzFull, glib, fontconfig, pcre -, libX11, libXext, libXcursor, libXxf86vm, libGL -, unfree ? false +, libX11, libXext, libXcursor, libXxf86vm, libGL, libXi , cmark }: @@ -15,46 +14,35 @@ let in stdenv.mkDerivation rec { pname = "aseprite"; - version = if unfree then "1.2.16.3" else "1.1.7"; + version = "1.2.40"; src = fetchFromGitHub { owner = "aseprite"; repo = "aseprite"; rev = "v${version}"; fetchSubmodules = true; - sha256 = if unfree - then "16yn7y9xdc5jd50cq7bmsm320gv23pp71lr8hg2nmynzc8ibyda8" - else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; + hash = "sha256-KUdJA6HTAKrLT8xrwFikVDbc5RODysclcsEyQekMRZo="; }; nativeBuildInputs = [ - cmake pkg-config - ] ++ lib.optionals unfree [ ninja ]; + cmake pkg-config ninja + ]; buildInputs = [ curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib libX11 libXext libXcursor libXxf86vm - ] ++ lib.optionals unfree [ cmark harfbuzzFull glib fontconfig pcre - skia libGL + skia libGL libXi ]; - patches = if !unfree then [ - ./allegro-glibc-2.30.patch - ] else [ - (fetchpatch { - url = "https://github.com/lfont/aseprite/commit/f1ebc47012d3fed52306ed5922787b4b98cc0a7b.patch"; - sha256 = "03xg7x6b9iv7z18vzlqxhcfphmx4v3qhs9f5rgf38ppyklca5jyw"; - }) - (fetchpatch { - url = "https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c17.patch"; - sha256 = "1vwn8ivap1pzdh444sdvvkndp55iz146nhmd80xbm8cyzn3qmg91"; - }) + patches = [ + ./shared-libwebp.patch + ./shared-skia-deps.patch ]; postPatch = '' - sed -i src/config.h -e "s-\\(#define VERSION\\) .*-\\1 \"$version\"-" + sed -i src/ver/CMakeLists.txt -e "s-set(VERSION \".*\")-set(VERSION \"$version\")-" ''; cmakeFlags = [ @@ -68,20 +56,19 @@ stdenv.mkDerivation rec { "-DUSE_SHARED_PIXMAN=ON" "-DUSE_SHARED_TINYXML=ON" "-DUSE_SHARED_ZLIB=ON" - "-DWITH_DESKTOP_INTEGRATION=ON" - "-DWITH_WEBP_SUPPORT=ON" - ] ++ lib.optionals unfree [ "-DUSE_SHARED_CMARK=ON" "-DUSE_SHARED_HARFBUZZ=ON" - # Aseprite needs internal freetype headers. - "-DUSE_SHARED_FREETYPE=OFF" + "-DUSE_SHARED_WEBP=ON" # Disable libarchive programs. "-DENABLE_CAT=OFF" "-DENABLE_CPIO=OFF" "-DENABLE_TAR=OFF" # UI backend. + "-DLAF_WITH_EXAMPLES=OFF" "-DLAF_OS_BACKEND=skia" + "-DENABLE_DESKTOP_INTEGRATION=ON" "-DSKIA_DIR=${skia}" + "-DSKIA_LIBRARY_DIR=${skia}/out/Release" ]; postInstall = '' @@ -101,7 +88,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.aseprite.org/"; description = "Animated sprite editor & pixel art tool"; - license = if unfree then licenses.unfree else licenses.gpl2; + license = licenses.unfree; longDescription = ''Aseprite is a program to create animated sprites. Its main features are: @@ -115,8 +102,7 @@ stdenv.mkDerivation rec { - Multiple editors support. - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc. - Onion skinning. - '' + lib.optionalString unfree - '' + This version is not redistributable: https://dev.aseprite.org/2016/09/01/new-source-code-license/ Consider supporting the developer: https://aseprite.org/#buy ''; diff --git a/nixpkgs/pkgs/applications/editors/aseprite/shared-libwebp.patch b/nixpkgs/pkgs/applications/editors/aseprite/shared-libwebp.patch new file mode 100644 index 000000000000..20191f46b8b1 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/aseprite/shared-libwebp.patch @@ -0,0 +1,47 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index af077f6..fed17ff 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,6 +58,7 @@ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off) + option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) + option(USE_SHARED_FREETYPE "Use shared FreeType library" off) + option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off) ++option(USE_SHARED_WEBP "Use your installed copy of webp" off) + option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on) + option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off) + option(ENABLE_NEWS "Enable the news in Home tab" on) +@@ -328,14 +351,17 @@ add_subdirectory(laf) + # libwebp + if(ENABLE_WEBP) + # Use libwebp from Skia +- if(LAF_BACKEND STREQUAL "skia") ++ if(USE_SHARED_WEBP) ++ find_library(WEBP_LIBRARY NAMES webp) ++ find_library(WEBPDEMUX_LIBRARY NAMES webpdemux) ++ find_library(WEBPMUX_LIBRARY NAMES webpmux) ++ set(WEBP_LIBRARIES ${WEBP_LIBRARY} ${WEBPDEMUX_LIBRARY} ${WEBPMUX_LIBRARY}) ++ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp) ++ else() + find_library(WEBP_LIBRARIES webp + NAMES libwebp # required for Windows + PATHS "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) + set(WEBP_INCLUDE_DIR "${SKIA_DIR}/third_party/externals/libwebp/src") +- else() +- set(WEBP_LIBRARIES webp webpdemux libwebpmux) +- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) + endif() + include_directories(${WEBP_INCLUDE_DIR}) + endif() +diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt +index 4839d4097c..e8c3e83cbc 100644 +--- a/third_party/CMakeLists.txt ++++ b/third_party/CMakeLists.txt +@@ -32,7 +32,7 @@ if(NOT USE_SHARED_GIFLIB) + add_subdirectory(giflib) + endif() + +-if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia") ++if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia" AND NOT USE_SHARED_WEBP) + set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.") + add_subdirectory(libwebp) + endif() \ No newline at end of file diff --git a/nixpkgs/pkgs/applications/editors/aseprite/shared-skia-deps.patch b/nixpkgs/pkgs/applications/editors/aseprite/shared-skia-deps.patch new file mode 100644 index 000000000000..a6ab472bbe95 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/aseprite/shared-skia-deps.patch @@ -0,0 +1,21 @@ +--- src/laf/cmake/FindSkia.cmake.orig 2022-01-08 02:15:13.417619266 +0100 ++++ src/laf/cmake/FindSkia.cmake 2022-01-08 02:15:43.603960491 +0100 +@@ -32,14 +32,18 @@ + # SkShaper module + freetype + harfbuzz + find_library(SKSHAPER_LIBRARY skshaper PATH "${SKIA_LIBRARY_DIR}") + ++if(NOT USE_SHARED_FREETYPE) + set(FREETYPE_FOUND ON) + find_library(FREETYPE_LIBRARY freetype2 PATH "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) + set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY}) + set(FREETYPE_INCLUDE_DIRS "${SKIA_DIR}/third_party/externals/freetype/include") ++endif() + ++if(NOT USE_SHARED_HARFBUZZ) + find_library(HARFBUZZ_LIBRARY harfbuzz PATH "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) + set(HARFBUZZ_LIBRARIES ${HARFBUZZ_LIBRARY}) + set(HARFBUZZ_INCLUDE_DIRS "${SKIA_DIR}/third_party/externals/harfbuzz/src") ++endif() + + set(SKIA_LIBRARIES + ${SKIA_LIBRARY} \ No newline at end of file diff --git a/nixpkgs/pkgs/applications/editors/aseprite/skia-deps.nix b/nixpkgs/pkgs/applications/editors/aseprite/skia-deps.nix index e5655ca8315d..3c92c649bebf 100644 --- a/nixpkgs/pkgs/applications/editors/aseprite/skia-deps.nix +++ b/nixpkgs/pkgs/applications/editors/aseprite/skia-deps.nix @@ -2,13 +2,13 @@ { angle2 = fetchgit { url = "https://chromium.googlesource.com/angle/angle.git"; - rev = "956ab4d9fab36be9929e63829475d4d69b2c681c"; - sha256 = "0fcw04wwkn3ixr9l9k0d32n78r9g72p31ii9i5spsq2d0wlylr38"; + rev = "8718783526307a3fbb35d4c1ad4e8101262a0d73"; + sha256 = "0c90q8f4syvwcayw58743sa332dcpkmblwh3ffkjqn5ygym04xji"; }; dng_sdk = fetchgit { url = "https://android.googlesource.com/platform/external/dng_sdk.git"; - rev = "96443b262250c390b0caefbf3eed8463ba35ecae"; - sha256 = "1rsr7njhj7c5p87hfznj069fdc3qqhvvnq9sa2rb8c4q849rlzx6"; + rev = "c8d0c9b1d16bfda56f15165d39e0ffa360a11123"; + sha256 = "1nlq082aij7q197i5646bi4vd2il7fww6sdwhqisv2cs842nyfwm"; }; piex = fetchgit { url = "https://android.googlesource.com/platform/external/piex.git"; @@ -17,7 +17,7 @@ }; sfntly = fetchgit { url = "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git"; - rev = "b18b09b6114b9b7fe6fc2f96d8b15e8a72f66916"; - sha256 = "0zf1h0dibmm38ldypccg4faacvskmd42vsk6zbxlfcfwjlqm6pp4"; + rev = "b55ff303ea2f9e26702b514cf6a3196a2e3e2974"; + sha256 = "1qi5rfzmwfrji46x95g6dsb03i1v26700kifl2hpgm3pqhr7afpz"; }; } diff --git a/nixpkgs/pkgs/applications/editors/aseprite/skia-make-deps.sh b/nixpkgs/pkgs/applications/editors/aseprite/skia-make-deps.sh index 5e12c4f5c858..bee69cc40d9d 100755 --- a/nixpkgs/pkgs/applications/editors/aseprite/skia-make-deps.sh +++ b/nixpkgs/pkgs/applications/editors/aseprite/skia-make-deps.sh @@ -2,7 +2,7 @@ FILTER=$1 OUT=skia-deps.nix -REVISION=89e4ca4352d05adc892f5983b108433f29b2c0c2 +REVISION=861e4743af6d9bf6077ae6dda7274e5a136ee4e2 DEPS=$(curl -s https://raw.githubusercontent.com/aseprite/skia/$REVISION/DEPS) THIRD_PARTY_DEPS=$(echo "$DEPS" | grep third_party | grep "#" -v | sed 's/"//g') diff --git a/nixpkgs/pkgs/applications/editors/aseprite/skia.nix b/nixpkgs/pkgs/applications/editors/aseprite/skia.nix index 2de61c7e20f1..71fa62157d8a 100644 --- a/nixpkgs/pkgs/applications/editors/aseprite/skia.nix +++ b/nixpkgs/pkgs/applications/editors/aseprite/skia.nix @@ -1,37 +1,29 @@ -{ stdenv, lib, fetchFromGitHub, fetchgit, python2, gn, ninja +{ stdenv, lib, fetchFromGitHub, fetchgit, python3, gn, ninja , fontconfig, expat, icu58, libglvnd, libjpeg, libpng, libwebp, zlib -, mesa, libX11 +, mesa, libX11, harfbuzzFull }: let # skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly' depSrcs = import ./skia-deps.nix { inherit fetchgit; }; - gnOld = gn.overrideAttrs (oldAttrs: rec { - version = "20190403"; - src = fetchgit { - url = "https://gn.googlesource.com/gn"; - rev = "64b846c96daeb3eaf08e26d8a84d8451c6cb712b"; - sha256 = "1v2kzsshhxn0ck6gd5w16gi2m3higwd9vkyylmsczxfxnw8skgpy"; - }; - }); in stdenv.mkDerivation { pname = "skia"; - version = "aseprite-m71"; + version = "aseprite-m102"; src = fetchFromGitHub { owner = "aseprite"; repo = "skia"; - # latest commit from aseprite-m71 branch - rev = "89e4ca4352d05adc892f5983b108433f29b2c0c2"; # TODO: Remove the gnOld override - sha256 = "0n3vrkswvi6rib9zv2pzi18h3j5wm7flmgkgaikcm6q7iw4l2c7x"; + # latest commit from aseprite-m102 branch + rev = "861e4743af6d9bf6077ae6dda7274e5a136ee4e2"; + hash = "sha256-IlZbalmHl549uDUfPG8hlzub8TLWhG0EsV6HVAPdsl0="; }; - nativeBuildInputs = [ python2 gnOld ninja ]; + nativeBuildInputs = [ python3 gn ninja ]; buildInputs = [ fontconfig expat icu58 libglvnd libjpeg libpng libwebp zlib - mesa libX11 + mesa libX11 harfbuzzFull ]; preConfigure = with depSrcs; '' @@ -44,13 +36,13 @@ stdenv.mkDerivation { configurePhase = '' runHook preConfigure - gn gen out/Release --args="is_debug=false is_official_build=true" + gn gen out/Release --args="is_debug=false is_official_build=true extra_cflags=[\"-I${harfbuzzFull.dev}/include/harfbuzz\"]" runHook postConfigure ''; buildPhase = '' runHook preBuild - ninja -C out/Release skia + ninja -C out/Release skia modules runHook postBuild ''; @@ -69,8 +61,11 @@ stdenv.mkDerivation { include/gpu \ include/private \ include/utils \ + include/third_party/skcms/*.h \ out/Release/*.a \ src/gpu/**/*.h \ + src/core/*.h \ + modules/skshaper/include/*.h \ third_party/externals/angle2/include \ third_party/skcms/**/*.h ''; diff --git a/nixpkgs/pkgs/applications/editors/bluej/default.nix b/nixpkgs/pkgs/applications/editors/bluej/default.nix index 511928d14353..7980cf386e2b 100644 --- a/nixpkgs/pkgs/applications/editors/bluej/default.nix +++ b/nixpkgs/pkgs/applications/editors/bluej/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchurl, openjdk, glib, wrapGAppsHook }: +{ lib, stdenv, fetchurl, openjdk, glib, wrapGAppsHook, zstd }: stdenv.mkDerivation rec { pname = "bluej"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { # We use the deb here. First instinct might be to go for the "generic" JAR # download, but that is actually a graphical installer that is much harder # to unpack than the deb. url = "https://www.bluej.org/download/files/BlueJ-linux-${builtins.replaceStrings ["."] [""] version}.deb"; - sha256 = "sha256-tOb15wU9OjUt0D8l/JkaGYj84L7HV4FUnQQB5cRAxG0="; + sha256 = "sha256-sOT86opMa9ytxJlfURIsD06HiP+j+oz3lQ0DqmLV1wE="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ zstd wrapGAppsHook ]; buildInputs = [ glib ]; sourceRoot = "."; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { unpackCmdHooks+=(_tryDebData) _tryDebData() { if ! [[ "$1" =~ \.deb$ ]]; then return 1; fi - ar xf "$1" - if ! [[ -e data.tar.xz ]]; then return 1; fi - unpackFile data.tar.xz + ar xf $src + if ! [[ -e data.tar.zst ]]; then return 1; fi + unpackFile data.tar.zst } ''; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "''${gappsWrapperArgs[@]}" \ --add-flags "-Dawt.useSystemAAFontSettings=on -Xmx512M \ --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED \ - -jar $out/share/bluej/bluej.jar" + -cp $out/share/bluej/boot.jar bluej.Boot" runHook postInstall ''; diff --git a/nixpkgs/pkgs/applications/editors/codux/default.nix b/nixpkgs/pkgs/applications/editors/codux/default.nix index ff068b259353..9d487a6b0d68 100644 --- a/nixpkgs/pkgs/applications/editors/codux/default.nix +++ b/nixpkgs/pkgs/applications/editors/codux/default.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.6.1"; + version = "15.9.0"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-a8zv5pVtS80J2PTrUiW8AA3rJ+rPAAzaaT5DVBLK5JE="; + sha256 = "sha256-bKZShjWs2osyARBZrBgmEN7JZFi/YpXI3p8lM+GrIfc="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/nixpkgs/pkgs/applications/editors/emacs/default.nix b/nixpkgs/pkgs/applications/editors/emacs/default.nix index fe3c5d9ec512..81e4667c1fb0 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/default.nix @@ -4,6 +4,14 @@ lib.makeScope pkgs.newScope (self: let gconf = pkgs.gnome2.GConf; inherit (self) callPackage; + inheritedArgs = { + inherit gconf; + + inherit (pkgs.darwin) sigtool; + inherit (pkgs.darwin.apple_sdk_11_0.frameworks) + Accelerate AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit + Quartz QuartzCore UniformTypeIdentifiers WebKit; + }; in { sources = import ./sources.nix { inherit lib; @@ -12,14 +20,7 @@ lib.makeScope pkgs.newScope (self: fetchFromSavannah; }; - emacs28 = callPackage (self.sources.emacs28) { - inherit gconf; - - inherit (pkgs.darwin) sigtool; - inherit (pkgs.darwin.apple_sdk.frameworks) - AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz - QuartzCore WebKit; - }; + emacs28 = callPackage (self.sources.emacs28) inheritedArgs; emacs28-gtk2 = self.emacs28.override { withGTK2 = true; @@ -33,14 +34,7 @@ lib.makeScope pkgs.newScope (self: noGui = true; }); - emacs29 = callPackage (self.sources.emacs29) { - inherit gconf; - - inherit (pkgs.darwin) sigtool; - inherit (pkgs.darwin.apple_sdk.frameworks) - AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz - QuartzCore WebKit; - }; + emacs29 = callPackage (self.sources.emacs29) inheritedArgs; emacs29-gtk3 = self.emacs29.override { withGTK3 = true; @@ -54,21 +48,7 @@ lib.makeScope pkgs.newScope (self: withPgtk = true; }; - emacs28-macport = callPackage (self.sources.emacs28-macport) { - inherit gconf; - - inherit (pkgs.darwin) sigtool; - inherit (pkgs.darwin.apple_sdk.frameworks) - AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz - QuartzCore WebKit; - }; - - emacs29-macport = callPackage (self.sources.emacs29-macport) { - inherit gconf; + emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs; - inherit (pkgs.darwin) sigtool; - inherit (pkgs.darwin.apple_sdk.frameworks) - AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz - QuartzCore WebKit; - }; + emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs; }) diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index f4568cb121b5..fe5a20092064 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -579,10 +579,10 @@ elpaBuild { pname = "brief"; ename = "brief"; - version = "5.88.22.2.0.20230201.162442"; + version = "5.88.22.2.0.20230818.125719"; src = fetchurl { - url = "https://elpa.gnu.org/devel/brief-5.88.22.2.0.20230201.162442.tar"; - sha256 = "0aviny6xvw2riy6rx6jdym5ay4wzd5fjian9y5zrvrcri19382dc"; + url = "https://elpa.gnu.org/devel/brief-5.88.22.2.0.20230818.125719.tar"; + sha256 = "1h9kqphbzmg0jwms8zd0ch0sgg8z1g847wcggr3842xhdayxds1k"; }; packageRequires = [ cl-lib nadvice ]; meta = { @@ -688,10 +688,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "0.16.0.20230713.173507"; + version = "0.17.0.20230820.160922"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cape-0.16.0.20230713.173507.tar"; - sha256 = "0qy7crwvzkhbb3gyg3dg18gpb1x83rk6vqspz23bifrvgwyg3pxz"; + url = "https://elpa.gnu.org/devel/cape-0.17.0.20230820.160922.tar"; + sha256 = "0frqpvjlbnyylfx5l881nwpf2x2r51d967xc7yvn7mda0n2w7030"; }; packageRequires = [ compat emacs ]; meta = { @@ -966,10 +966,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.2.0.20230802.161111"; + version = "29.1.4.2.0.20230811.71752"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-29.1.4.2.0.20230802.161111.tar"; - sha256 = "17fqkg9r73gmb19nxdyx7wy9c0kyqwbzhfps7j2lfrvkfzki008l"; + url = "https://elpa.gnu.org/devel/compat-29.1.4.2.0.20230811.71752.tar"; + sha256 = "19m1cxjyz0gc1dkrdi2qvzglxmj2l4z8y6mxcqaikw40pfdng5ih"; }; packageRequires = [ emacs seq ]; meta = { @@ -981,10 +981,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.35.0.20230729.232921"; + version = "0.35.0.20230825.84919"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-0.35.0.20230729.232921.tar"; - sha256 = "196m2flc1zhdy3iac3bk59l9402zhk4c7q99iblj7zmrf4bg5x7g"; + url = "https://elpa.gnu.org/devel/consult-0.35.0.20230825.84919.tar"; + sha256 = "1mlzmb1mfv5i1hyg5y9l7sxz9w1qsa6xx8xb1v6c4qscsl3nb4gh"; }; packageRequires = [ compat emacs ]; meta = { @@ -1033,10 +1033,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.37.0.20230714.150159"; + version = "0.38.0.20230825.73620"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-0.37.0.20230714.150159.tar"; - sha256 = "0270bfs4g6fcz4sqic3dxmafr2a0fggwqsybnh3dq7z3jcp86d89"; + url = "https://elpa.gnu.org/devel/corfu-0.38.0.20230825.73620.tar"; + sha256 = "0vn7fvsxqwpi7rqqj6a5w95g7wpyxsg43w16g7s9bhrnc1yz4sjh"; }; packageRequires = [ compat emacs ]; meta = { @@ -1232,10 +1232,10 @@ elpaBuild { pname = "dash"; ename = "dash"; - version = "2.19.1.0.20230714.72308"; + version = "2.19.1.0.20230801.124436"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20230714.72308.tar"; - sha256 = "084vilvl6s74mv5p34n0hl8zif8zxzgizwd78zz6nhnlakzinqb5"; + url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20230801.124436.tar"; + sha256 = "009067xiyvh647plqbp7rbsj071rar8609px3byh93649x1k0f2v"; }; packageRequires = [ emacs ]; meta = { @@ -1295,10 +1295,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.0.0.0.20230801.45022"; + version = "2.0.0.0.20230825.44438"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-2.0.0.0.20230801.45022.tar"; - sha256 = "09qca4wqfz3gnji48gb5n0x1iv59k63xbgc53b2iggfxrfdblg4n"; + url = "https://elpa.gnu.org/devel/denote-2.0.0.0.20230825.44438.tar"; + sha256 = "1cb6wj5a8nwzlld4vyb3hypn8jyzym5rmzda38m87m92nlbb76gb"; }; packageRequires = [ emacs ]; meta = { @@ -1314,10 +1314,10 @@ elpaBuild { pname = "denote-menu"; ename = "denote-menu"; - version = "1.1.1.0.20230516.161156"; + version = "1.1.1.0.20230818.141035"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-menu-1.1.1.0.20230516.161156.tar"; - sha256 = "0bimkcfmizidgibsv68kgvql5a4njx6n5zd1n9z0hzbawzsasz29"; + url = "https://elpa.gnu.org/devel/denote-menu-1.1.1.0.20230818.141035.tar"; + sha256 = "0c9xa089ayy4nmgl0ab8prmpl6gr6p5f3vdpbqy25zlnglykpjyf"; }; packageRequires = [ denote emacs ]; meta = { @@ -1378,14 +1378,18 @@ license = lib.licenses.free; }; }) {}; - diff-hl = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + diff-hl = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.9.2.0.20230714.2731"; + version = "1.9.2.0.20230807.151654"; src = fetchurl { - url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20230714.2731.tar"; - sha256 = "0wpnbzz96j5v4pln9fh5szhjn3358b084wfmp07ld4bw07fcqpxb"; + url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20230807.151654.tar"; + sha256 = "0zzggv9h2943vm3xk1622fgksmczckmckxckgkh58l4wl9zdqm19"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1697,10 +1701,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.2.0.0.20230802.50954"; + version = "1.3.0.0.20230825.34525"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.2.0.0.20230802.50954.tar"; - sha256 = "0sfcqcccpki50fia7z4bbx93z91rd3l8jfq4xwswxqppsx4icwgj"; + url = "https://elpa.gnu.org/devel/ef-themes-1.3.0.0.20230825.34525.tar"; + sha256 = "0qqmghz3jsyyqf5gs8pas5d7my6pfdqycfzfslw5cmfyljmwaz28"; }; packageRequires = [ emacs ]; meta = { @@ -1722,10 +1726,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.15.0.20230803.101902"; + version = "1.15.0.20230819.140915"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.15.0.20230803.101902.tar"; - sha256 = "1vi1k5bps3gcp0vvl3zrysgbsccfn75mymvr8r8r062wwy6djbra"; + url = "https://elpa.gnu.org/devel/eglot-1.15.0.20230819.140915.tar"; + sha256 = "06k80zw2wkh7rphkcgsfqzrhns8bk9bslxdylg1y5v8nsa81navq"; }; packageRequires = [ eldoc @@ -1766,10 +1770,10 @@ elpaBuild { pname = "eldoc"; ename = "eldoc"; - version = "1.14.0.0.20230413.164237"; + version = "1.14.0.0.20230602.82442"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eldoc-1.14.0.0.20230413.164237.tar"; - sha256 = "07fqmdm1fl9466272y1ywnsxq6d3j3vhy6sl7zqgh9kfq0b9xdn5"; + url = "https://elpa.gnu.org/devel/eldoc-1.14.0.0.20230602.82442.tar"; + sha256 = "1wz7m96i4kdhijfcgim58w23znq1r5g9q0l0ivyjik550lmr69c7"; }; packageRequires = [ emacs ]; meta = { @@ -1850,10 +1854,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "0.22.1.0.20230805.85826"; + version = "0.22.1.0.20230824.80305"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-0.22.1.0.20230805.85826.tar"; - sha256 = "1gdh5w97qpyj4bkbifhfxbv921xy21fqks65y23y97yp618y94zg"; + url = "https://elpa.gnu.org/devel/embark-0.22.1.0.20230824.80305.tar"; + sha256 = "1mdl8nczdhswr4i6mx0vay35b474kcvfbanzxqiy5d7jkjnlqki3"; }; packageRequires = [ compat emacs ]; meta = { @@ -1870,10 +1874,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.7.0.20230805.85826"; + version = "0.7.0.20230824.80305"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-0.7.0.20230805.85826.tar"; - sha256 = "0z50h4h029qxp8rl0ipq1m41k5w0cji576rk4gfywl240cn6zgi7"; + url = "https://elpa.gnu.org/devel/embark-consult-0.7.0.20230824.80305.tar"; + sha256 = "01nck4h8n54zy5hfir3fqhyggd6fyrif55fnlqf0xmhd19qrvy3b"; }; packageRequires = [ consult emacs embark ]; meta = { @@ -1895,10 +1899,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.11pre0.20230708.75452"; + version = "0.12pre0.20230824.161156"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ement-0.11pre0.20230708.75452.tar"; - sha256 = "0lzhw99lddipmz3272kckb01qzrl72414351wxrlnvx7h6py0kx2"; + url = "https://elpa.gnu.org/devel/ement-0.12pre0.20230824.161156.tar"; + sha256 = "0ny9ihcdwf9g7l4b4mjx6qb14mxfsyzw6a6lasx59hgzr71fldd1"; }; packageRequires = [ emacs @@ -1924,10 +1928,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "16.0.20230727.114320"; + version = "16.0.20230818.103820"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-16.0.20230727.114320.tar"; - sha256 = "0zdy9wxdsxjsgm0vil0f87d21d9cdlgsbnh2d4sg58my0lnh37b6"; + url = "https://elpa.gnu.org/devel/emms-16.0.20230818.103820.tar"; + sha256 = "0p6dhvh5790q5qfyb3wm0jbbxhr3zkycnk64p6lx7r9jz03h5qxb"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -2031,10 +2035,10 @@ elpaBuild { pname = "ess"; ename = "ess"; - version = "18.10.3snapshot0.20230803.60048"; + version = "18.10.3snapshot0.20230807.142202"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ess-18.10.3snapshot0.20230803.60048.tar"; - sha256 = "0glw3kgmk6c6iv7xlq9shh6w6y34pqnbma6a6j0jwd7fq0px7j8w"; + url = "https://elpa.gnu.org/devel/ess-18.10.3snapshot0.20230807.142202.tar"; + sha256 = "0fcshc4smb3dj47rbnz21zdwxikhj1al3nism17sxchmfxx3x2sb"; }; packageRequires = [ emacs ]; meta = { @@ -2091,6 +2095,21 @@ license = lib.licenses.free; }; }) {}; + expreg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "expreg"; + ename = "expreg"; + version = "1.0.0.0.20230821.183608"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/expreg-1.0.0.0.20230821.183608.tar"; + sha256 = "0jsdnwy30s89xc9hwldfbd1713aa06ih7x5y91dnf2w9zbmy9bgz"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/expreg.html"; + license = lib.licenses.free; + }; + }) {}; external-completion = callPackage ({ elpaBuild , fetchurl , lib }: @@ -2590,10 +2609,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.1.0.20230731.130625"; + version = "0.1.0.20230815.3721"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.1.0.20230731.130625.tar"; - sha256 = "1imqwxyc76n7d1fmffbqvv7afppybwr6lzbzgsxcqzhn4gvrlkcd"; + url = "https://elpa.gnu.org/devel/greader-0.1.0.20230815.3721.tar"; + sha256 = "1322f0i6v1bmv89nqdp194n3ypvqj8rkn29w5h1c5yywyw2nkyr1"; }; packageRequires = [ emacs ]; meta = { @@ -2776,10 +2795,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "8.0.1pre0.20230803.213520"; + version = "8.0.1pre0.20230825.105451"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20230803.213520.tar"; - sha256 = "0j4yq47nk10q3lfsqr271ryq2r5j0n4nnclkvk5zrvv4abmv3v0b"; + url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20230825.105451.tar"; + sha256 = "018krzc1fikjxipdqv3cg4wmhzr3z81xgiy9m8wc05pakjk11kc3"; }; packageRequires = [ emacs ]; meta = { @@ -2809,10 +2828,10 @@ elpaBuild { pname = "inspector"; ename = "inspector"; - version = "0.31.0.20230525.102939"; + version = "0.33.0.20230821.101343"; src = fetchurl { - url = "https://elpa.gnu.org/devel/inspector-0.31.0.20230525.102939.tar"; - sha256 = "1bh0688w2qs9wawk8xfrfynx3wbhjgbmsyfkbpz2zj2xavmjqmbi"; + url = "https://elpa.gnu.org/devel/inspector-0.33.0.20230821.101343.tar"; + sha256 = "15x73qhdkwsdh3dg8n1051jrcvyjdygpx44c4k23vfrsgjwkd66i"; }; packageRequires = [ emacs ]; meta = { @@ -3020,10 +3039,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "0.9.0.20230730.120017"; + version = "0.9.0.20230816.204512"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-0.9.0.20230730.120017.tar"; - sha256 = "15wl22ias9rhihxzrf0m81hdxgpq3kc6v6mlp44cfdrx50mkm1r6"; + url = "https://elpa.gnu.org/devel/jinx-0.9.0.20230816.204512.tar"; + sha256 = "1qpd4n70822fwbg0cb8jdg4zahzwm8jlh3fq9m5482m2dk45fywb"; }; packageRequires = [ compat emacs ]; meta = { @@ -3125,10 +3144,10 @@ elpaBuild { pname = "kind-icon"; ename = "kind-icon"; - version = "0.2.0.0.20230805.145201"; + version = "0.2.0.0.20230824.91306"; src = fetchurl { - url = "https://elpa.gnu.org/devel/kind-icon-0.2.0.0.20230805.145201.tar"; - sha256 = "0calziv294vwbgqy7pjdnfhcgbx7x47129dhwnrdlim2xj5p4lj1"; + url = "https://elpa.gnu.org/devel/kind-icon-0.2.0.0.20230824.91306.tar"; + sha256 = "0v1ic3q6cc5l09b6yx3dm9xd1wc0n5n6xc5f9vakak0xnjw8c88i"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -3190,10 +3209,10 @@ elpaBuild { pname = "latex-table-wizard"; ename = "latex-table-wizard"; - version = "1.5.2.0.20230516.145709"; + version = "1.5.3.0.20230821.110703"; src = fetchurl { - url = "https://elpa.gnu.org/devel/latex-table-wizard-1.5.2.0.20230516.145709.tar"; - sha256 = "0rdk12bdra2k5wncykx3268l66sbap7kx0z2ywnbrgqfnrkcvpx2"; + url = "https://elpa.gnu.org/devel/latex-table-wizard-1.5.3.0.20230821.110703.tar"; + sha256 = "0sbzmi279hni1rk02jg6jz2gfhl0q53vgm0ck0d6444yfdd9a3cg"; }; packageRequires = [ auctex emacs transient ]; meta = { @@ -3612,10 +3631,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.2.0.0.20230804.93355"; + version = "4.2.0.0.20230825.33718"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.2.0.0.20230804.93355.tar"; - sha256 = "1vw5jfkwmn2xccvkqrfxd7glgrgm43va8fjb57wf2kqcy3hfk7dv"; + url = "https://elpa.gnu.org/devel/modus-themes-4.2.0.0.20230825.33718.tar"; + sha256 = "12f5xqxcwi0zaf3zy7anazj8xc11w0cvx6yca7hbf7anckawjqdk"; }; packageRequires = [ emacs ]; meta = { @@ -4029,10 +4048,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7pre0.20230806.72218"; + version = "9.7pre0.20230825.112644"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.7pre0.20230806.72218.tar"; - sha256 = "11hk2zc3013i3dzqpgw2apbg6hb96kc1zbwnngnf3ld0fwaw5g0j"; + url = "https://elpa.gnu.org/devel/org-9.7pre0.20230825.112644.tar"; + sha256 = "118ydjrn7sahn1x1qv2hyb3z4ijci370i1y6h2jxrxiv7lw87rsb"; }; packageRequires = [ emacs ]; meta = { @@ -4087,10 +4106,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "0.10.0.20230702.80510"; + version = "0.10.0.20230816.203404"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-modern-0.10.0.20230702.80510.tar"; - sha256 = "0jja7d7kk5ns5i5m617zqzvk2n4sxq4q323wgrzng50g2h4w505a"; + url = "https://elpa.gnu.org/devel/org-modern-0.10.0.20230816.203404.tar"; + sha256 = "0i6vqjd8cwpy2rphzx1gid1rln9ipk6pr3xclm5l44fq5lg1r075"; }; packageRequires = [ compat emacs ]; meta = { @@ -4144,10 +4163,10 @@ elpaBuild { pname = "org-remark"; ename = "org-remark"; - version = "1.1.0.0.20230731.204715"; + version = "1.2.1.0.20230821.73531"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-remark-1.1.0.0.20230731.204715.tar"; - sha256 = "0pfy42rhg4cfm55j2dlbs2dc5j6gbs7xi91nx8qcmjm57mipq53i"; + url = "https://elpa.gnu.org/devel/org-remark-1.2.1.0.20230821.73531.tar"; + sha256 = "1cfhfxm0rg3nnzdnkb85m5020fw4kg0kffzbh9s3lknlfvwvgs28"; }; packageRequires = [ emacs org ]; meta = { @@ -4163,10 +4182,10 @@ elpaBuild { pname = "org-transclusion"; ename = "org-transclusion"; - version = "1.3.2.0.20230623.103407"; + version = "1.3.2.0.20230819.63913"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-transclusion-1.3.2.0.20230623.103407.tar"; - sha256 = "121bds4h53ynpz7yyjws3j75rl7xhisminv4xx03nqj9ggv1w28i"; + url = "https://elpa.gnu.org/devel/org-transclusion-1.3.2.0.20230819.63913.tar"; + sha256 = "06kyqaaa7lw7sv0nznq7ln14dcnl8j2f31xdxzv0dn4la0fgl6mn"; }; packageRequires = [ emacs org ]; meta = { @@ -4227,10 +4246,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "0.13.0.20230703.182804"; + version = "0.13.0.20230825.91944"; src = fetchurl { - url = "https://elpa.gnu.org/devel/osm-0.13.0.20230703.182804.tar"; - sha256 = "0ypi2qar9a502wd48pag61v7fhay14f3dabb51rwg7xx7mza18j4"; + url = "https://elpa.gnu.org/devel/osm-0.13.0.20230825.91944.tar"; + sha256 = "13z4pz9q181jr9z66w2cn9ixh240x5dsyqjbjh455bqv2wf4kizl"; }; packageRequires = [ compat emacs ]; meta = { @@ -4404,6 +4423,21 @@ license = lib.licenses.free; }; }) {}; + phpinspect = callPackage ({ compat, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "phpinspect"; + ename = "phpinspect"; + version = "0.0.20230824.182634"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/phpinspect-0.0.20230824.182634.tar"; + sha256 = "1rz8f59bwg4glrm5xjmg7xpssmlc9gb2s1wg65w0zi2lxakxz7fv"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/phpinspect.html"; + license = lib.licenses.free; + }; + }) {}; phps-mode = callPackage ({ elpaBuild , emacs , fetchurl @@ -4575,10 +4609,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.9.8.0.20230805.161830"; + version = "0.9.8.0.20230824.122600"; src = fetchurl { - url = "https://elpa.gnu.org/devel/project-0.9.8.0.20230805.161830.tar"; - sha256 = "0cihdjw17jjjqw13ngsa1n5vjpvic4m3ra42x0x7nizv702ad0cx"; + url = "https://elpa.gnu.org/devel/project-0.9.8.0.20230824.122600.tar"; + sha256 = "07ssbvs9hmqcivjxyq1lycpjjdw7dvbxgw2ndw200jsrww7y065x"; }; packageRequires = [ emacs xref ]; meta = { @@ -4620,10 +4654,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "0.5.0.0.20230802.115005"; + version = "1.0.1.0.20230824.40645"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pulsar-0.5.0.0.20230802.115005.tar"; - sha256 = "17ykmwwy364m8xvbjgavi9s9nlqysjwgvfbavjrr7c6ga7lm16ha"; + url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20230824.40645.tar"; + sha256 = "113rcvnajrj6nnqzlj9fk5sc59sqn2z1ipp6xflq7q92lh8h1g3a"; }; packageRequires = [ emacs ]; meta = { @@ -4635,10 +4669,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "5.3.2.0.20230412.13407"; + version = "5.3.2.0.20230814.41841"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pyim-5.3.2.0.20230412.13407.tar"; - sha256 = "0q4rnvrhvyybyadcc4nlrvzd54i41rxacfvh0ysc2cfiqcw9mkjv"; + url = "https://elpa.gnu.org/devel/pyim-5.3.2.0.20230814.41841.tar"; + sha256 = "05075hy3q5li3qha1g6cz86aycc3fahk67p5f7r7a6pvmbfc3vch"; }; packageRequires = [ async emacs xr ]; meta = { @@ -4667,10 +4701,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.28.0.20230804.122126"; + version = "0.28.0.20230808.170856"; src = fetchurl { - url = "https://elpa.gnu.org/devel/python-0.28.0.20230804.122126.tar"; - sha256 = "0wvjdsmxajz9dl7mnj0m2hqs0ln8s98gp3h1b60bpz18fww2r90y"; + url = "https://elpa.gnu.org/devel/python-0.28.0.20230808.170856.tar"; + sha256 = "1q72n1m1bkxgxs93ma4084wn3b53cssjqg3li89g8fpicd137i7b"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -5599,10 +5633,10 @@ elpaBuild { pname = "standard-themes"; ename = "standard-themes"; - version = "1.2.0.0.20230602.54907"; + version = "1.2.0.0.20230825.34554"; src = fetchurl { - url = "https://elpa.gnu.org/devel/standard-themes-1.2.0.0.20230602.54907.tar"; - sha256 = "0fjibdx8hif1d82d4l7x3ky64b45l9qdyq1sgbv16qlyl5lbhnbb"; + url = "https://elpa.gnu.org/devel/standard-themes-1.2.0.0.20230825.34554.tar"; + sha256 = "10w1mwfzlcbmss6pm9yph5gq2xz5bcgqy9ji4ssazcg76dyj3r75"; }; packageRequires = [ emacs ]; meta = { @@ -5699,10 +5733,10 @@ elpaBuild { pname = "svg-tag-mode"; ename = "svg-tag-mode"; - version = "0.3.2.0.20230803.50443"; + version = "0.3.2.0.20230824.94303"; src = fetchurl { - url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20230803.50443.tar"; - sha256 = "1973scw129mx9v7z1ms2ai56ljj5slpckv80vxl3jjlgmjxxzg61"; + url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20230824.94303.tar"; + sha256 = "18pdzq1k3qign1rjfasfv4wfhiacgn2afycpfw5cxpdazx6hycv3"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -5871,10 +5905,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "0.8.0.20230801.91019"; + version = "0.8.0.20230810.233751"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tempel-0.8.0.20230801.91019.tar"; - sha256 = "0c4srhrb6pak34xqni0dxgi9n3la8avd0y9hgfb0n1xyzyh03v0v"; + url = "https://elpa.gnu.org/devel/tempel-0.8.0.20230810.233751.tar"; + sha256 = "0m982zs65vpk1sp9sasy4jpy3l4npqw6hzxn7687d0gplnjs1agw"; }; packageRequires = [ compat emacs ]; meta = { @@ -5982,14 +6016,17 @@ license = lib.licenses.free; }; }) {}; - tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + tramp = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.1.1.0.20230730.64606"; + version = "2.6.1.1.1.0.20230807.151320"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-2.6.1.1.0.20230730.64606.tar"; - sha256 = "1vwwqf6q54cdysxbw4hqhcs3izmlzydb3k11q4x99j626rllj5nf"; + url = "https://elpa.gnu.org/devel/tramp-2.6.1.1.1.0.20230807.151320.tar"; + sha256 = "03ng854qza04hqdi6bl3wa1ppi6djlv1bq6ws2g36gi11drbd5d2"; }; packageRequires = [ emacs ]; meta = { @@ -6058,10 +6095,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.4.1.0.20230602.212120"; + version = "0.4.3.0.20230825.201957"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.4.1.0.20230602.212120.tar"; - sha256 = "0k8f9sbx84z6gc9z41djb3yl08anlf2nq0b7sn823gskq5pna37m"; + url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20230825.201957.tar"; + sha256 = "1g39zmlpk2rc49m4swjsq321hpdrkgxaxw4jlw9rwky0q9s8q39y"; }; packageRequires = [ compat emacs ]; meta = { @@ -6129,10 +6166,10 @@ elpaBuild { pname = "triples"; ename = "triples"; - version = "0.3.4.0.20230726.211145"; + version = "0.3.5.0.20230809.231343"; src = fetchurl { - url = "https://elpa.gnu.org/devel/triples-0.3.4.0.20230726.211145.tar"; - sha256 = "0v477ja1jw8mdz5hq86p2aqlj8nmavidw02j9fj0xahv8cvcmjm7"; + url = "https://elpa.gnu.org/devel/triples-0.3.5.0.20230809.231343.tar"; + sha256 = "0fhwwagwghygg64p05r5vzj6vd2n9inv8v53y2mfjxvsbbz463rc"; }; packageRequires = [ emacs seq ]; meta = { @@ -6236,10 +6273,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.2.0snapshot0.20230804.235827"; + version = "0.2.0snapshot0.20230821.140956"; src = fetchurl { - url = "https://elpa.gnu.org/devel/urgrep-0.2.0snapshot0.20230804.235827.tar"; - sha256 = "0vlci7z2kpvrzlzlpfga0n3hbldqsi4whk73m6m3l8p8zxcidyca"; + url = "https://elpa.gnu.org/devel/urgrep-0.2.0snapshot0.20230821.140956.tar"; + sha256 = "0qx2qhd9dckagzj1vssi9kbmnzylj08d5sqhfr75pah05bb3b1sq"; }; packageRequires = [ compat emacs project ]; meta = { @@ -6470,10 +6507,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.4.0.20230725.200356"; + version = "1.4.0.20230825.92114"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.4.0.20230725.200356.tar"; - sha256 = "0csc1mdq1adzhncv7nnsi2jmnv4v994v8x0kxyr07axc069kh8hi"; + url = "https://elpa.gnu.org/devel/vertico-1.4.0.20230825.92114.tar"; + sha256 = "16kqsc82fas9pnhhmhgdnn0nqp26syl974yfczxc3qpfbapvh5nj"; }; packageRequires = [ compat emacs ]; meta = { @@ -6490,10 +6527,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.7.2.0.20230222.73835"; + version = "0.7.3.0.20230818.15224"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.2.0.20230222.73835.tar"; - sha256 = "04dj8w4mrx5fjkzc10qqgypz6dkz17kvykrbja33yqwasp1kam1v"; + url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.3.0.20230818.15224.tar"; + sha256 = "0q23yw8dy9abawqlcpwjrk668kvxyffv972j0s6579z37i643gv6"; }; packageRequires = [ emacs posframe vertico ]; meta = { @@ -6657,10 +6694,10 @@ elpaBuild { pname = "websocket"; ename = "websocket"; - version = "1.14.0.20230730.11730"; + version = "1.15.0.20230808.230535"; src = fetchurl { - url = "https://elpa.gnu.org/devel/websocket-1.14.0.20230730.11730.tar"; - sha256 = "0184cjiqprf7g03kzl57623ww4jbv1pjb786gx3n25lcsv08iryr"; + url = "https://elpa.gnu.org/devel/websocket-1.15.0.20230808.230535.tar"; + sha256 = "1li62x00jirf3z0llx262j6galpsvbcrq4daybnfkskmj4br5lhp"; }; packageRequires = [ cl-lib ]; meta = { @@ -6853,10 +6890,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.24.0.20230801.101425"; + version = "1.24.0.20230816.133012"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xr-1.24.0.20230801.101425.tar"; - sha256 = "0dzwvbs62z07fyni4xh73wd1s2ipvrhcvid3cqs7m86kwgbh3g41"; + url = "https://elpa.gnu.org/devel/xr-1.24.0.20230816.133012.tar"; + sha256 = "0fpj8sp2g54is8cz6sj93jc6cfsxfjzn8nzxz73r3fj66lcklcxz"; }; packageRequires = [ emacs ]; meta = { @@ -6868,10 +6905,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.6.3.0.20230421.72914"; + version = "1.6.3.0.20230812.3932"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20230421.72914.tar"; - sha256 = "1wbprwfadnj6kqxh8r4kbm2lg3wvfnrywih1kgjwpail5ssbm8ix"; + url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20230812.3932.tar"; + sha256 = "0dd6mmacpf1bv605dghbanilv86aaqwikbq8il3p27zcld94q8jb"; }; packageRequires = [ emacs ]; meta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index dc8faedcbc87..91b8888a4fed 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -599,10 +599,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-0.16.tar"; - sha256 = "1l9zw71dl5g3q9iysd64l27id63w3klqy9dzc1fn1q6y5gsf8bl4"; + url = "https://elpa.gnu.org/packages/cape-0.17.tar"; + sha256 = "1kby5qbw2z5c6629vfx6dx4f1a8gx58ciif9b9589drc6fnnsnlr"; }; packageRequires = [ compat emacs ]; meta = { @@ -907,10 +907,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.37"; + version = "0.38"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.37.tar"; - sha256 = "0r5c8960nxfdn0kc0x7v0sla0mqids54s5xw9rj6818w1vk9r7g7"; + url = "https://elpa.gnu.org/packages/corfu-0.38.tar"; + sha256 = "1pj7zdcqfk77fvfqgvp1gri4m11akn5hd87av28k745i7s0nq0i6"; }; packageRequires = [ compat emacs ]; meta = { @@ -1507,10 +1507,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ef-themes-1.2.0.tar"; - sha256 = "1s4kw4y8k66x76j6c03gr2my2s95ymdjxwh01lzhyy5xkggikqfj"; + url = "https://elpa.gnu.org/packages/ef-themes-1.3.0.tar"; + sha256 = "1cchc1cfp2y32d736r4523gjzvg4rd1nqddxsjsk5kialz06alms"; }; packageRequires = [ emacs ]; meta = { @@ -1696,10 +1696,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ement-0.10.tar"; - sha256 = "0iw4vk99h15zhq507praqqar9sc5yyk5hbckygbr4x6af88jc02i"; + url = "https://elpa.gnu.org/packages/ement-0.11.tar"; + sha256 = "0hsing0iwb69qmnzqii66rqb0cwy3k35ybl68a9jh7iw97jcxm73"; }; packageRequires = [ emacs @@ -1863,6 +1863,21 @@ license = lib.licenses.free; }; }) {}; + expreg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "expreg"; + ename = "expreg"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/expreg-1.0.0.tar"; + sha256 = "0fyyp1cqhgbqmyjb4dyr49zg3jpj3hkhgzl1lh2gcp08d83jl6av"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/expreg.html"; + license = lib.licenses.free; + }; + }) {}; external-completion = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "external-completion"; @@ -2524,10 +2539,10 @@ elpaBuild { pname = "inspector"; ename = "inspector"; - version = "0.31"; + version = "0.33"; src = fetchurl { - url = "https://elpa.gnu.org/packages/inspector-0.31.tar"; - sha256 = "0h6qc9g7glxvc4ap9jm0zifljgaxc3291m1dqjprl0f48li4wphd"; + url = "https://elpa.gnu.org/packages/inspector-0.33.tar"; + sha256 = "1kap3z68sjjaszmmznl4kk6mr31yd99cqv4yj34zb94vsb2xb6xj"; }; packageRequires = [ emacs ]; meta = { @@ -2864,10 +2879,10 @@ elpaBuild { pname = "latex-table-wizard"; ename = "latex-table-wizard"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/latex-table-wizard-1.5.2.tar"; - sha256 = "0vm4iv0ryff95yld8hlrlmn0wfgkj9690yiwd8pvja2w5m578mf2"; + url = "https://elpa.gnu.org/packages/latex-table-wizard-1.5.3.tar"; + sha256 = "1lwnz3c4228cnbxnqrm6g476khb0gqgh1qdjm39q8w89nw47vvfy"; }; packageRequires = [ auctex emacs transient ]; meta = { @@ -3638,10 +3653,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.6.7"; + version = "9.6.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.6.7.tar"; - sha256 = "1wj9sj9ybfkwsk6chxs4pk7fxmnw3r6ai9xj9rr0wrvk0771350c"; + url = "https://elpa.gnu.org/packages/org-9.6.8.tar"; + sha256 = "1drkpwpjkbi5q6hnifi1x6ib0fp51isga2gl0hj7q0shy161ajv0"; }; packageRequires = [ emacs ]; meta = { @@ -3728,10 +3743,10 @@ elpaBuild { pname = "org-remark"; ename = "org-remark"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-remark-1.1.0.tar"; - sha256 = "0vbs4dz86bz1s5crf7gfm4h4wpb7ibky3698ghdb4v4d5piz86ld"; + url = "https://elpa.gnu.org/packages/org-remark-1.2.1.tar"; + sha256 = "0xf10kgb0g4y9i4s1d3a1i5a119a1pijzhp5xxj2b2wyvjs2g3yk"; }; packageRequires = [ emacs org ]; meta = { @@ -4103,10 +4118,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "0.5.0"; + version = "1.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pulsar-0.5.0.tar"; - sha256 = "1bs6f8j1a7vypwm087zsrccv5kbahxyg3nhc65ffgpwrnxfp4v96"; + url = "https://elpa.gnu.org/packages/pulsar-1.0.1.tar"; + sha256 = "0qknyd6ihqg4n940yll5v2hz3w07fsp4mbdfh7drbws13c1ivnly"; }; packageRequires = [ emacs ]; meta = { @@ -5322,10 +5337,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.1.1"; + version = "2.6.1.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.6.1.1.tar"; - sha256 = "0bjj4r46jgrh72p5fxyv0h0r7cx6x0l3abfcyj91hmyfgifkc5cv"; + url = "https://elpa.gnu.org/packages/tramp-2.6.1.1.1.tar"; + sha256 = "1aclan50xl0cgsxy9l7c1dd73w4kklmap9c74gndcssdi6p1mw69"; }; packageRequires = [ emacs ]; meta = { @@ -5382,10 +5397,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.4.1"; + version = "0.4.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.4.1.tar"; - sha256 = "0mw619057spgz9rrf8rws1zywpjl8ri7hz30f4g8wxqsgrk4ph79"; + url = "https://elpa.gnu.org/packages/transient-0.4.3.tar"; + sha256 = "1aqw7fr5p2f1xs5pvfpmhhvh16491qvcbg40993siqkdi05w4i1j"; }; packageRequires = [ compat emacs ]; meta = { @@ -5442,10 +5457,10 @@ elpaBuild { pname = "triples"; ename = "triples"; - version = "0.3.4"; + version = "0.3.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/triples-0.3.4.tar"; - sha256 = "1y0qqa51iaj62yishyl3j2j9s2p1wzg6yasq417ls3x4rdccji0g"; + url = "https://elpa.gnu.org/packages/triples-0.3.5.tar"; + sha256 = "086w3izri2fvg2w9lq4srjcq9gc6amz5vj2iihhysd10ypj3zxwy"; }; packageRequires = [ emacs seq ]; meta = { @@ -5773,10 +5788,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.2.tar"; - sha256 = "1sbgg0syyk24phwzji40lyw5dmwxssgvwv2fs8mbmkhv0q44f9ny"; + url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.3.tar"; + sha256 = "1gfapchkj9jkzlyz3hzkb9kpifcak0fn4y5jw6f2cs6379sjwvzm"; }; packageRequires = [ emacs posframe vertico ]; meta = { @@ -5926,10 +5941,10 @@ elpaBuild { pname = "websocket"; ename = "websocket"; - version = "1.14"; + version = "1.15"; src = fetchurl { - url = "https://elpa.gnu.org/packages/websocket-1.14.tar"; - sha256 = "0g75kaw9bdk30apiyk09583amnw9458kkmgbbcl2myqfqspywnva"; + url = "https://elpa.gnu.org/packages/websocket-1.15.tar"; + sha256 = "0mvvq9gsx856ip2gkrvjw4k8a85vrrkp27dcpkvamxq93lfd7hin"; }; packageRequires = [ cl-lib ]; meta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index e1d1c6abbfff..2cf64953628d 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -474,6 +474,13 @@ let # part of a larger package notmuch = dontConfigure super.notmuch; + pikchr-mode = super.pikchr-mode.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace pikchr-mode.el \ + --replace '"pikchr")' '"${lib.getExe pkgs.pikchr}")' + ''; + }); + rtags = dontConfigure (externalSrc super.rtags pkgs.rtags); rtags-xref = dontConfigure super.rtags; @@ -535,6 +542,13 @@ let (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ]; }); + typst-mode = super.typst-mode.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace typst-mode.el \ + --replace 'typst-executable-location "typst"' 'typst-executable-location "${lib.getExe pkgs.typst}"' + ''; + }); + vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ]; diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index e1ad9b64093a..462c7c0a8f2b 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -306,10 +306,10 @@ elpaBuild { pname = "cdlatex"; ename = "cdlatex"; - version = "4.15"; + version = "4.18"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cdlatex-4.15.tar"; - sha256 = "1dj525adlc6qmv4msbhhlhli5603l0sgi40qfi6cs01ggqkpw64j"; + url = "https://elpa.nongnu.org/nongnu/cdlatex-4.18.tar"; + sha256 = "15jmy0m1rnpnldl5kwfkipzphgyw4l3fyh30ig3kmzyj8jnpfy4q"; }; packageRequires = []; meta = { @@ -353,10 +353,10 @@ elpaBuild { pname = "clojure-mode"; ename = "clojure-mode"; - version = "5.16.1"; + version = "5.16.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.16.1.tar"; - sha256 = "16zazwq3r6n7v7696cykf7p1pl977chwc5xijirm1p2lxbqdgy7n"; + url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.16.2.tar"; + sha256 = "08bqacpdxkapga163fcjyq0r131a5xjhi85j8v470v0gpvfwvm61"; }; packageRequires = [ emacs ]; meta = { @@ -364,6 +364,21 @@ license = lib.licenses.free; }; }) {}; + clojure-ts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "clojure-ts-mode"; + ename = "clojure-ts-mode"; + version = "0.1.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/clojure-ts-mode-0.1.4.tar"; + sha256 = "1swgcwn5wn23lbi4kjf4f1k7bayyprqm2bqvhdln7vghr5414pi0"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/clojure-ts-mode.html"; + license = lib.licenses.free; + }; + }) {}; coffee-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "coffee-mode"; @@ -406,10 +421,10 @@ elpaBuild { pname = "corfu-terminal"; ename = "corfu-terminal"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.6.tar"; - sha256 = "1ndg7ac61gi3ikzygaac8368jw0fwa0xs7kbnz1xp083095y5r0p"; + url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.7.tar"; + sha256 = "1vva3wwmczdph8dlhvwy1vlan8nmzlz6370zia6hz3adwc496a4s"; }; packageRequires = [ corfu emacs popon ]; meta = { @@ -1029,10 +1044,10 @@ elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.29"; + version = "0.29.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.29.tar"; - sha256 = "0dzqqxb83krvc6w6rwyh2i012js2qg261cgppn2dwck8cw843jx8"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.29.1.tar"; + sha256 = "0k9jvnaci23swyf3zy67f9msz205d9vdm90rgidnl81w7hg8gjm4"; }; packageRequires = [ emacs project ]; meta = { @@ -1396,16 +1411,16 @@ license = lib.licenses.free; }; }) {}; - haskell-mode = callPackage ({ elpaBuild, fetchurl, lib }: + haskell-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "haskell-mode"; ename = "haskell-mode"; - version = "17.2"; + version = "17.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.2.tar"; - sha256 = "1crq9065jy3941z9wh09n82x7bbbmxgcn9ylfj9xgn1rcvgb0cmg"; + url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.4.tar"; + sha256 = "0xf8smasbb53ddg4vxckpg5w48dnm16v2k5vimfqr73cig49z87f"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/haskell-mode.html"; license = lib.licenses.free; @@ -1426,16 +1441,16 @@ license = lib.licenses.free; }; }) {}; - helm = callPackage ({ elpaBuild, fetchurl, helm-core, lib, popup }: + helm = callPackage ({ elpaBuild, fetchurl, helm-core, lib, popup, wfnames }: elpaBuild { pname = "helm"; ename = "helm"; - version = "3.9.1"; + version = "3.9.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-3.9.1.tar"; - sha256 = "0gfhqag2f2ci3l9v504s1dv8shz5ncmiw2658q1d16w63fgakafk"; + url = "https://elpa.nongnu.org/nongnu/helm-3.9.4.tar"; + sha256 = "1x0nvzm7xx3xik3znfhsmgbprysrapviv6lf7ndqxgi2cj27jfv3"; }; - packageRequires = [ helm-core popup ]; + packageRequires = [ helm-core popup wfnames ]; meta = { homepage = "https://elpa.gnu.org/packages/helm.html"; license = lib.licenses.free; @@ -1445,10 +1460,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "3.9.3"; + version = "3.9.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.3.tar"; - sha256 = "07svs1hdj30vrncp0kbmkxlfmwmdvd7nb19851p1bk0a7llkbfpm"; + url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.4.tar"; + sha256 = "11aa019d5impf6c3apaz44hv5hjfg3g4wn4a1m7a5svr6isfa79w"; }; packageRequires = [ async emacs ]; meta = { @@ -1869,10 +1884,10 @@ elpaBuild { pname = "meow"; ename = "meow"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/meow-1.4.3.tar"; - sha256 = "0anpmgpr969lkyzmsms9pcbdhjpfpwyf865pmgl0zd23m922d8s6"; + url = "https://elpa.nongnu.org/nongnu/meow-1.4.4.tar"; + sha256 = "013nmc0jcvwfh6s1l59kld8393ld4sy5icbah9hzd0chj6l72mgh"; }; packageRequires = [ emacs ]; meta = { @@ -2156,10 +2171,10 @@ elpaBuild { pname = "org-tree-slide"; ename = "org-tree-slide"; - version = "2.8.19"; + version = "2.8.20"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-tree-slide-2.8.19.tar"; - sha256 = "0sdffwbzmf7fn2k0x9z88s48nq5wg7s9fqgazbr179v9kic1s4gr"; + url = "https://elpa.nongnu.org/nongnu/org-tree-slide-2.8.20.tar"; + sha256 = "0aiqiawflgpf56mgr6pkkkqzdc7pwaw575q0yc6f6bvg7idn14qd"; }; packageRequires = [ emacs ]; meta = { @@ -2770,16 +2785,16 @@ license = lib.licenses.free; }; }) {}; - sweeprolog = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + sweeprolog = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.22.0"; + version = "0.23.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.22.0.tar"; - sha256 = "0iqihdlypq9hs2m351pzrzc43jdxzpbws5pmb035668r38qc6v32"; + url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.23.0.tar"; + sha256 = "0l2n3411ljbsfy2b2akp30488yi2hbhkyhm8jr1fs39n9k8aks48"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/sweeprolog.html"; license = lib.licenses.free; @@ -3111,6 +3126,21 @@ license = lib.licenses.free; }; }) {}; + wfnames = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "wfnames"; + ename = "wfnames"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/wfnames-1.1.tar"; + sha256 = "04plvqn4srv1v7d7zx6qb0xm62c1hwkiqpq34w17daw9si2pvpan"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/wfnames.html"; + license = lib.licenses.free; + }; + }) {}; wgrep = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "wgrep"; @@ -3145,10 +3175,10 @@ elpaBuild { pname = "with-editor"; ename = "with-editor"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/with-editor-3.3.0.tar"; - sha256 = "1kawmx6wkkbkl87lkvjp1z88ynycql5i62rrzvrqjyscps82914j"; + url = "https://elpa.nongnu.org/nongnu/with-editor-3.3.1.tar"; + sha256 = "0pwmwx1mw8mzj45ikfz30j91765rwbkmji5j4pmgq9djcz46hn85"; }; packageRequires = [ compat emacs ]; meta = { @@ -3228,10 +3258,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "24.4.20230805215231"; + version = "24.8.20230825161727"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.4.20230805215231.tar"; - sha256 = "19r7avllf97g3s8zsv11nb4vs4j005ailm1lav48nll9zlm58j5x"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.8.20230825161727.tar"; + sha256 = "018qp7gg1nm4b54gmp8q6w5hn5d2266pvg7m574js0jjbcnai8mv"; }; packageRequires = [ emacs ]; meta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index e7800bd4a0d6..24c5203e7fea 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -31,11 +31,11 @@ "repo": "willvaughn/emacs-0x0", "unstable": { "version": [ - 20230528, - 1625 + 20230823, + 2214 ], - "commit": "09cdeda5ed91a03f26b2aedab3b75812edd1ee8d", - "sha256": "1y1fqn4a5qkiz74qixdbzx6qvmhfp8v4fbqj54pz72a7i5xp87h6" + "commit": "04f95142b25d8bb701f239539176df6617dcd982", + "sha256": "0vj9vrfkgm7plp5mvq22fm9sln11j9763g3wd2w6c82rlsk6dhva" } }, { @@ -64,11 +64,11 @@ "url": "https://hg.sr.ht/~zck/game-2048", "unstable": { "version": [ - 20200417, - 259 + 20230809, + 356 ], - "commit": "aad4a590ea91f9a3256233b9b345e9159c6993f2", - "sha256": "1jd50m5w0g0yplzms4qvkxx16f7xsbm9h7sdrw1p130gbij252l3" + "commit": "8175ca5191175183b9522141dcb55d30673d2323", + "sha256": "1wv54wpmfjv3nca00nds7jhr4widcpanaa7nfgfhdw9aihqb0l0s" } }, { @@ -1029,30 +1029,30 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20230522, - 1329 + 20230529, + 1404 ], "deps": [ "ac-php-core", "auto-complete", "yasnippet" ], - "commit": "4c678709e1e1f1673a83b9eb01875e457c6ca658", - "sha256": "01j5jz10ic67hlnrx8zdg3crswd2zc9rw5v7hyzl6548wcs48ag2" + "commit": "7b89fbf25360cc146aee9b2b2ca60f3462b21078", + "sha256": "0fmp1595v06dgmx9skxphknaagf9ds9l7ygi7lzxas1s8d05dj10" }, "stable": { "version": [ 2, - 4, - 2 + 5, + 0 ], "deps": [ "ac-php-core", "auto-complete", "yasnippet" ], - "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", - "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" + "commit": "7b89fbf25360cc146aee9b2b2ca60f3462b21078", + "sha256": "0fmp1595v06dgmx9skxphknaagf9ds9l7ygi7lzxas1s8d05dj10" } }, { @@ -1080,8 +1080,8 @@ "stable": { "version": [ 2, - 4, - 2 + 5, + 0 ], "deps": [ "dash", @@ -1091,8 +1091,8 @@ "s", "xcscope" ], - "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", - "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" + "commit": "7b89fbf25360cc146aee9b2b2ca60f3462b21078", + "sha256": "0fmp1595v06dgmx9skxphknaagf9ds9l7ygi7lzxas1s8d05dj10" } }, { @@ -1704,6 +1704,21 @@ } }, { + "ename": "ada-ts-mode", + "commit": "f67bb3c6a2c0572e50e9f6460894e0e5bb732cd5", + "sha256": "12ddrdg0m7csa8kw7a6sfc7vddny711kg8cxbnhdlrplngnb6mdz", + "fetcher": "github", + "repo": "brownts/ada-ts-mode", + "unstable": { + "version": [ + 20230814, + 1220 + ], + "commit": "4fbfc5bac2aebe6c10ba27165a1d85b85ebe5f93", + "sha256": "11f2yxpq8xafa4z7xl3qqzwhwf4jq950v90q9hmxsm8ig8nh1wm2" + } + }, + { "ename": "adafruit-wisdom", "commit": "18483af52c26f719fbfde626db84a67750bf4754", "sha256": "0ckh420cirspwg2yd5q9y1az03j2l1jzd67g8dpvqjkgdp485gad", @@ -2960,8 +2975,8 @@ "repo": "pythonic-emacs/anaconda-mode", "unstable": { "version": [ - 20230516, - 2238 + 20230821, + 2131 ], "deps": [ "dash", @@ -2969,8 +2984,8 @@ "pythonic", "s" ], - "commit": "1fd13a0f20fcc9e841e2d5c9af73c0b23f09cf39", - "sha256": "0wi148hgzcn3vbq2hdjjxyrxyzk29hrwfy0bzj0nmvbp4rydmjaz" + "commit": "9dbd65b034cef519c01f63703399ae59651f85ca", + "sha256": "14h0437i46hacnqi82rvc8bq3lgchhznq9ab5l49mmizq5fv25wq" }, "stable": { "version": [ @@ -3192,6 +3207,21 @@ } }, { + "ename": "anki-editor-view", + "commit": "a0b6e1c0ac6f28130bb53489924ef4a0d8e17e73", + "sha256": "08xlpv8ybzvpg2xyp6x56636wig43z1r2fpqcrbsn7i9dfg697nr", + "fetcher": "gitlab", + "repo": "vherrmann/anki-editor-view", + "unstable": { + "version": [ + 20230807, + 806 + ], + "commit": "6ad8c6be4f44de0c33eab012e507320b732d4800", + "sha256": "0cq960q11lpic6zcw71z2ap80jzrzgcwwy2vwhgc1zwi8k8l9i4q" + } + }, + { "ename": "anki-mode", "commit": "fc02d06e7c7e9230e4b082923b889e1e83676263", "sha256": "1d429ws6kmswcyk0dnb303z01kq475n60a520hj258x23vp8802q", @@ -3703,11 +3733,11 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20230527, - 1755 + 20230812, + 25 ], - "commit": "f85b48e2eee0983acfe5b3a2684856358714ac6f", - "sha256": "0q6znaypd9f6lw6110cyaj9kyld9b70bgl3gyslvx3q427iwgjg0" + "commit": "706d6bd347b6d25a54148666ea4d33f16b3915c6", + "sha256": "1nmlkhnvgz80634x9g107wdcqpgkrjf20g47vwax8qqnl3rnv5hw" }, "stable": { "version": [ @@ -4594,16 +4624,16 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20230707, - 1457 + 20230810, + 808 ], "deps": [ "dash", "f", "s" ], - "commit": "1019b86f5398dadef61efc76fefe8fa8be1193a8", - "sha256": "0g1zfmv9v8nfkz3y3hfspvrwh64mk6v73dsclmvpaq4lhjcdva0j" + "commit": "bb61a4bc3d85a76e807f1ecede17031b51c8caed", + "sha256": "01jf1rp1inwig72j4n752cvk29c9zi5kc68mqnsj51cqga3w42xi" }, "stable": { "version": [ @@ -4948,20 +4978,20 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20230714, - 16 + 20230825, + 2030 ], - "commit": "6ed8e29d23c6c91f8c98f18ff745d2475d6f6a38", - "sha256": "0rqyf4jz6j820jw5ky1b1phrgms48ifphk5lv02av4jsg0cvsz1q" + "commit": "113db4d7f546b2829fed23e2c9bcb4fdac63ff57", + "sha256": "1wq8kl6659yyx8gb6m95mrrqh9bjpx4y7c6injvsqil3jkaff9xv" }, "stable": { "version": [ 1, 8, - 1 + 2 ], - "commit": "3a255903643227c0db10ca2371c33ba9e8ec9924", - "sha256": "0p2znbid7a32shgh1zidrr53hv79dhw1jcjaad2aglqfqjz7a3qn" + "commit": "113db4d7f546b2829fed23e2c9bcb4fdac63ff57", + "sha256": "1wq8kl6659yyx8gb6m95mrrqh9bjpx4y7c6injvsqil3jkaff9xv" } }, { @@ -5339,8 +5369,8 @@ }, { "ename": "auto-indent-mode", - "commit": "49af78177278e7072c70fde0eaa5bb82490ebe9d", - "sha256": "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz", + "commit": "890ec47013f1638d3b12f2d08118bf64c104be2b", + "sha256": "0x171w7vba1kny3qh1fwhnkqxmadv06pv3gq7h36ljvxa9hx8jvh", "fetcher": "github", "repo": "mattfidler/auto-indent-mode.el", "unstable": { @@ -5827,11 +5857,11 @@ "repo": "avkoval/avk-emacs-themes", "unstable": { "version": [ - 20220908, - 1022 + 20230825, + 922 ], - "commit": "598a2a56601db1f474ed3f34a1cc4fb37921c21a", - "sha256": "1k8qc2hyklhbc7hjv0vpj3vwv1dszzp3xi26alz332392pls048q" + "commit": "abe6fd059e0a7e8fcf2eb95b16c3dfac5620b1e7", + "sha256": "0x98lvnkf75lf6c5vaqa6j3qi7k1p3ryf0rqq3lqgid94i2kwv3v" } }, { @@ -6138,26 +6168,26 @@ "repo": "licht1stein/babashka.el", "unstable": { "version": [ - 20230704, - 1224 + 20230808, + 2140 ], "deps": [ "parseedn" ], - "commit": "0714564d2092d37751085ac729712f05c2bb1b91", - "sha256": "1gwc7acm46ii1jx86d6rnihi3ga4601nyq411zgp8rm4xj9c1xrl" + "commit": "1721f68ea8e34e8a6ab2759a04c1a01cedfdd319", + "sha256": "0yjqwshwhcfylajfsks1xvkgqarcnlhwfdy3i587jdw799434vb0" }, "stable": { "version": [ 1, 0, - 5 + 6 ], "deps": [ "parseedn" ], - "commit": "0cf130ce8427e17389d5741ef7952c4c8334d928", - "sha256": "08ryg66kmj3l9yc3527sjyln5irs49x9ccsf1y64h2adgkbn58qr" + "commit": "1721f68ea8e34e8a6ab2759a04c1a01cedfdd319", + "sha256": "0yjqwshwhcfylajfsks1xvkgqarcnlhwfdy3i587jdw799434vb0" } }, { @@ -7781,27 +7811,48 @@ } }, { - "ename": "binky-mode", - "commit": "c83e9c76261a7de6a41ba93782a52f912120ea75", - "sha256": "0b6p43blrdb28czqxj4ykj8zbq6jix49g7rsig3c6dn7cj4rqzxv", + "ename": "binky", + "commit": "4e4f21a42809d6f8ab4eec7479a2cfffc3d9cf32", + "sha256": "1vac13hnwczqx9cx1xm8j7nzy9x5jfp7f9kz3pkairagrf7dm3yb", "fetcher": "github", - "repo": "liuyinz/binky-mode", + "repo": "liuyinz/binky.el", "unstable": { "version": [ - 20230729, - 1330 + 20230826, + 340 ], - "commit": "150f65c408f791f8a8526f6c4666dcbbbea3e219", - "sha256": "0dp3zj0dk46df3qc7dy05k822w2dnj147chvz387ldk94rqnmsb0" + "commit": "a7850d15a8c516f62e58d5e54c339a8c5e8cd0d4", + "sha256": "1ynnj9x3zp9h7hq7x7ygmwz93a05iqm2m36fb05s357rladkaxvd" }, "stable": { "version": [ 1, 2, - 1 + 2 + ], + "commit": "517cf094751004bee43f29a35939075b7555abca", + "sha256": "1rw84gfyzl70xmkxxakl1527ifpdnn6cdjknkis0s9pdp4ix7kvm" + } + }, + { + "ename": "biome", + "commit": "c5ac1eae36f6ec7aeeca2e5a829f05e9660b3e5d", + "sha256": "0qmzymfw8ysq0dvi70y0b5mdi3njik92k0bxwd8710mqn3kq4hpa", + "fetcher": "github", + "repo": "SqrtMinusOne/biome", + "unstable": { + "version": [ + 20230819, + 1424 + ], + "deps": [ + "compat", + "ct", + "request", + "transient" ], - "commit": "466699c923e9b7035ed8d5b45e2abec96838ae8f", - "sha256": "0l8zppilkwin4ww73d66nw6a2hchj05cnv2q0vczw49b7zqikyh9" + "commit": "fc52a2b7ac1a08050499c5eb378d012cd26d0856", + "sha256": "1099abqa7vwx0g9vna3rq8f02k7k3kx6w7kx0rcfwsiscqlklc52" } }, { @@ -7978,11 +8029,11 @@ "repo": "pythonic-emacs/blacken", "unstable": { "version": [ - 20230224, - 1336 + 20230821, + 1738 ], - "commit": "1e80b970b130d5c33031f2539c89eb2f13da2572", - "sha256": "0v3ny3mrnx4b1aghg7nk62hgvv6qm7lbagh7p07hysf9m1241pcg" + "commit": "15084b386561cd3672e9fc8cdce4647b60693111", + "sha256": "1a6is65q13jvzzlnvb8rmkss9akvrr8z8aa9sjixpqisia70xlz8" }, "stable": { "version": [ @@ -8002,11 +8053,11 @@ "repo": "gdonald/blackjack-el", "unstable": { "version": [ - 20230715, - 1645 + 20230821, + 41 ], - "commit": "af909a17285c3e570b6f8703518ff1f18c8bf421", - "sha256": "12lqhnidfbm0jldpi6v923l1mp4q2w2pykjiqjj2v8jvn4nv88yw" + "commit": "7f9072630a159b59a146346b5dae24ab8fb5f290", + "sha256": "1wnm2v9cv0idyks8q6qrxrsby0adpap5ywy9ab602jjidf6ajxm4" }, "stable": { "version": [ @@ -8379,6 +8430,42 @@ } }, { + "ename": "boa-ide", + "commit": "aa6e5983d110dbc1dda2c8b63158acc5011727fd", + "sha256": "176bkgz6im2rdm5yb4wgdahk0clzf3lwgdh129rw6f6zcxhj3182", + "fetcher": "github", + "repo": "boalang/syntax-highlight", + "unstable": { + "version": [ + 20230813, + 2036 + ], + "deps": [ + "boa-mode", + "json-mode", + "json-snatcher", + "project" + ], + "commit": "e1f960ada937be747ea2ec302bea155092e5c06b", + "sha256": "1ncnk58whrjrkg2xx9x54q33zs55ilnj0wrcjpj9rd6nrrg1arqi" + } + }, + { + "ename": "boa-mode", + "commit": "aa6e5983d110dbc1dda2c8b63158acc5011727fd", + "sha256": "0s57g4z1fxqa8ip1lnnb4ykg09f6i80j77wvl7mx1sxgf9g5rjdj", + "fetcher": "github", + "repo": "boalang/syntax-highlight", + "unstable": { + "version": [ + 20230730, + 2216 + ], + "commit": "892f2a33ef95db9f19b45deb8309652534f91efd", + "sha256": "1wwnfxr3rp0q5sf0921ljmq4gcb4qkfxlm1zp4y9skqdr7m20zrn" + } + }, + { "ename": "bog", "commit": "19fd0bf2f8e52c79120c492a6dcabdd51b465d35", "sha256": "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl", @@ -8559,16 +8646,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20230720, - 1235 + 20230815, + 905 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "75b30ef8703efb9ffba12e92685ad82e3ab55962", - "sha256": "1866m1zy3hm8rcmc74zxmd6xcb4jwwl9znklgs3xxdb87si86hls" + "commit": "ea3b39b6920959d8cb87698087912ab1ab9f90b3", + "sha256": "192zby67j34zfxbpgi7n5m6rkb8r2yzma5b46hy0pfm0sy3pyqyf" }, "stable": { "version": [ @@ -8664,10 +8751,10 @@ "version": [ 2, 2, - 0 + 1 ], - "commit": "7113961cbd139bd0c2122a92cc41331dbabf45a8", - "sha256": "0vv2gaav1m4z2xdk0k3ragmv4kcnzv7p3v97lkjl1wbfmk5nhz07" + "commit": "537ffcb2e1be043ddc24706d04e711fa58648f89", + "sha256": "1blni7kjskg6y9ycvhwq3srfvh891xhfnjbh5h2zl0pb5szpllqi" } }, { @@ -9416,8 +9503,8 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20221031, - 1852 + 20230810, + 1721 ], "deps": [ "dash", @@ -9426,8 +9513,8 @@ "map", "pretty-hydra" ], - "commit": "bf5fdccbae6bb6dc51e31dc282805e32bb41e412", - "sha256": "142ql507mb7w6l3mr1y4914znnikab5vh8sm2q35pfvka383k1r7" + "commit": "505784d20927f8f880746341b7d9e43ac455fe56", + "sha256": "16b3n6dwbzr5bbff9b980v3fqgm5bzilyg7dra51cv5cgz6sbcmc" }, "stable": { "version": [ @@ -10324,8 +10411,8 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20230118, - 954 + 20230809, + 927 ], "deps": [ "dash", @@ -10335,8 +10422,8 @@ "s", "transient" ], - "commit": "0ea8ccc41bbf4c6d105d9d2eddffa25d040f0e8d", - "sha256": "1dha52nv0gscy4bp1z5z40l15nzqbpl0frgjx08i7mbzf55a3nlv" + "commit": "588039aeb471c0bdabea36dab5e1c37441d38fed", + "sha256": "1kvnyc3gz6p8l0ssf9cqb9iwyf7wl3df9gnz9dp00v2hvx797y63" }, "stable": { "version": [ @@ -10503,25 +10590,25 @@ "repo": "minad/cape", "unstable": { "version": [ - 20230713, - 1735 + 20230820, + 1609 ], "deps": [ "compat" ], - "commit": "5b28cd43f2efa19dbf5053f164cce622a4b5bdae", - "sha256": "1kpyvl0c2v49b1d0lnvqi9pa20ry9889dncrqmg7h6ns5m0886rj" + "commit": "4645762f1acfa7203f587e5757d60483e7c04e4a", + "sha256": "1jaqzv7c656q5s6mvfwijsim7ds26hfbyrjd2vas1h0xfqrxppfd" }, "stable": { "version": [ 0, - 16 + 17 ], "deps": [ "compat" ], - "commit": "c8e3a75f2b1096fbb09c9f4b3f60ab1fdcfee13b", - "sha256": "1dvqfi41bkw1bi930kjww1yjrdmpk86ji9p7spa8dd0lrc3fh2c7" + "commit": "7bec22b26be62bc0dab0c2a1ba6bc4b33fcabba1", + "sha256": "1kzhiffzv20rwjcx0iywj39hxibw0wga9ck77yam9xv7ips2mav4" } }, { @@ -10542,10 +10629,10 @@ "version": [ 1, 0, - 0 + 1 ], - "commit": "928c8390d4d562bd32dc79a42eb64e9bdba572d8", - "sha256": "0fkkzxhn05sa0h0sdkm77gza07jagg6r3vq4w1jaiklfswjwbd1l" + "commit": "c7f810a76ca88ff28613fa165927e0269255aab0", + "sha256": "14fmiki4hlrxfah1j5qmlfpi2pjjn2ppzgnsk00yarhc8y58kfv6" } }, { @@ -10880,11 +10967,11 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20230711, - 1235 + 20230812, + 31 ], - "commit": "73f3e90de767a72444db424d3a10ba18b57ac1be", - "sha256": "0iawvp4pwxbnqyd6wpdawx9y5awz0pn16mz8a19kblvay412fyga" + "commit": "7bd297677be5fbcffbbcbacbb1b47a0866b22339", + "sha256": "0bm9bk3v8fimmidfkq9h3l6p7sr51qq3aklrpbzjw3fbl7hlsy8g" }, "stable": { "version": [ @@ -10948,11 +11035,11 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20230606, - 1150 + 20230810, + 1653 ], - "commit": "cf85424b305e8f89debb756dc67eebc84639f711", - "sha256": "09649ahqjp8kgi89s93qfqz3f27sf28qdmd8nyramz1yppklfia2" + "commit": "ba624ad3f8b726bee1d8dcb0a2a9e2b658bb4c9b", + "sha256": "09i7lvdjv947d1w16hxv5vskvvx4vrnv9spv808x618qd5nldls2" } }, { @@ -10993,15 +11080,15 @@ "repo": "emacs-lsp/emacs-ccls", "unstable": { "version": [ - 20230111, - 1754 + 20230815, + 731 ], "deps": [ "dash", "lsp-mode" ], - "commit": "29d231590fad39b4d658d9262859e60669edb9b0", - "sha256": "09a4hs80577mliqlb9ahgz3kc3xvr9kpw9qvlv7cycd4x56ngy0k" + "commit": "47f8caa374f38eba7d557f61aac000164387a33f", + "sha256": "0l699zav5211ac1w0jbag1x6fb4dcfpwkrinlplzyqswjji1qv00" } }, { @@ -11042,11 +11129,11 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20230709, - 1511 + 20230823, + 631 ], - "commit": "a0153ef8898b0604be5e690de02a37cad56d3f17", - "sha256": "1hs0f0sql36afpp3mfkzcxb1m8b7mswdjsfpl9m7gypmywj5a2jv" + "commit": "9177058889e2dc985737006bf019d94d63074f13", + "sha256": "0kkcbcag2wswwp3izf54qgwfvizzx01y47kyrflglavl1z5hclfc" }, "stable": { "version": [ @@ -11492,11 +11579,11 @@ "repo": "GrammarSoft/cg3", "unstable": { "version": [ - 20230804, - 1037 + 20230816, + 1122 ], - "commit": "c22f5572c0946b0d21f4d489308ea0ce9f305ea0", - "sha256": "0lz98f5lic1wlbwdj8j85kgsjrsbbmy61q9cqn2bjki272bcfzjf" + "commit": "611ffa634c5af98843fa9477bcc5d6ee657da9f1", + "sha256": "0pvj137xmdgb41pl87ws1842nlkhhfpwlzvk2ch2xf9s7xs7f43s" }, "stable": { "version": [ @@ -11663,14 +11750,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20230806, - 1418 + 20230807, + 1640 ], "deps": [ "shell-maker" ], - "commit": "c5f470a182027b6afde3e39558837e22c7fe282a", - "sha256": "0249xpryafjsp9ghacshkqiw0nf56adl60aqhnpcy5wza5mkm516" + "commit": "b2e46cfa69d7cc514b5c2f9a31c1ca63a8bdea1d", + "sha256": "058ir6pfd4jzswry9rap161rz15f59k8d1zxxwbkm9ixisqkldby" } }, { @@ -12055,14 +12142,14 @@ "repo": "breatheoutbreathein/chordpro-mode.el", "unstable": { "version": [ - 20230725, - 1841 + 20230821, + 750 ], "deps": [ "compat" ], - "commit": "e0e0840fdce7bc689a3233545d43cc4776822563", - "sha256": "1v82yablsi7ywri40gkyvx3ly3kz5jxxalgj3cqr2b9vphngn0w6" + "commit": "819a0913ca7967d4069f02fbfb24654352cb2a89", + "sha256": "18qdiz1kfwi1kf436hz82zdgi2l94h7y5lkpb21z2948hrw38a6d" }, "stable": { "version": [ @@ -12286,8 +12373,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20230804, - 1656 + 20230825, + 1358 ], "deps": [ "clojure-mode", @@ -12298,8 +12385,8 @@ "spinner", "transient" ], - "commit": "eedbab26684cb1ce01a940b5b0da9ff78aeb4eac", - "sha256": "02xm1d80z91mmg1l8pgfb4grfp7bfjk0lqsgrw35gfc49x5lf47r" + "commit": "253c22f420199ce1eb9abb104ac4222d0098bca9", + "sha256": "1yykzg6hv1qscmla4cvw2ndpwg2qain3lgf07wygjxz0a8i91s0x" }, "stable": { "version": [ @@ -12832,19 +12919,20 @@ "repo": "akater/elisp-cl-format", "unstable": { "version": [ - 20210831, - 530 + 20230818, + 1726 ], - "commit": "ad1a4fb6bc91e65ea90bcf6792cc5a1be5380f9d", - "sha256": "10z53j111wvgy0fbnxm3mpc9an75dblvy5zkq9733vjliycbbgv4" + "commit": "42b662d27eefa458c1a39bea1836d6ada740b863", + "sha256": "0z6mia20xs42i176i9d5zn8p5911bs8ibwhag8a9znwcg30kh2r1" }, "stable": { "version": [ 1, - 2 + 2, + 1 ], - "commit": "ad1a4fb6bc91e65ea90bcf6792cc5a1be5380f9d", - "sha256": "10z53j111wvgy0fbnxm3mpc9an75dblvy5zkq9733vjliycbbgv4" + "commit": "42b662d27eefa458c1a39bea1836d6ada740b863", + "sha256": "0z6mia20xs42i176i9d5zn8p5911bs8ibwhag8a9znwcg30kh2r1" } }, { @@ -12902,14 +12990,14 @@ "repo": "emacsmirror/clang-format", "unstable": { "version": [ - 20191106, - 950 + 20230809, + 2200 ], "deps": [ "cl-lib" ], - "commit": "e48ff8ae18dc7ab6118c1f6752deb48cb1fc83ac", - "sha256": "1l64r9rr59g26mlph6r8pkn8vzadmh3mh8gvv398kz8skayfa55f" + "commit": "bce0bb4ca17ecb6e6927074920945cef2a78f5b6", + "sha256": "1v99876wi8kld5wc7nhmm7gmp36i29x21y9mjzi4mq5zq2kqlpr6" } }, { @@ -13073,11 +13161,11 @@ "repo": "llaisdy/clingo-mode", "unstable": { "version": [ - 20220502, - 2020 + 20230825, + 1941 ], - "commit": "cf56ce6b5c50506f6cea27e1dde0441dd8d15ee9", - "sha256": "1v3q3zhx7vf81dkyr2z8ljw8as4c8zcycinhx915aqjj85d923h7" + "commit": "8ea6ab5fa7dca439ec0e1dca8f3cdf7ace43390d", + "sha256": "0n13i8xkwz6r42qmd7id4bbzhj0q3lnsrvq0hl6y22c1awqi9dr7" }, "stable": { "version": [ @@ -13159,14 +13247,14 @@ "repo": "Fuco1/clippy.el", "unstable": { "version": [ - 20230118, - 1924 + 20230822, + 1348 ], "deps": [ "pos-tip" ], - "commit": "85aec3129ff17f71ea4541cfadbb7b56b31a7474", - "sha256": "0zx45rlsj184v4gshnzpqzdmyl9g541z70jhhw0rj8im62pnnrbi" + "commit": "1e764902b3e9dbb11d5f02bc36c3b7ff4275f528", + "sha256": "1bc3a58xxvp9mjna47pcfnzk9h8akjwjn6jjlm2nsllmznzwa3pg" } }, { @@ -13363,8 +13451,8 @@ }, { "ename": "clmemo", - "commit": "e98b438990dc0dbda264fb4bf7a3237a2661baab", - "sha256": "03qa79ip0gqinj1kk898lcvixk98hf6gknz0yc2fnqcrm642k2vs", + "commit": "890ec47013f1638d3b12f2d08118bf64c104be2b", + "sha256": "1gg2ny2jdz58qkpp2idvh727crrvwk3007zr9mxl4b9kz1xfxbnn", "fetcher": "github", "repo": "ataka/clmemo", "unstable": { @@ -13566,20 +13654,20 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20230626, - 715 + 20230823, + 1720 ], - "commit": "0e62583b5198f71856e4d7b80e1099789d47f2ed", - "sha256": "1gzr506mj2w8jigvdpsmp9jm4kb5k5v076wda2jz5dpbw4jgj5ms" + "commit": "192a46653fdc27601905f97a044d47764fee1f4e", + "sha256": "03j44n8nj5wc1rvk3pv96wjl3fwindqadwq0w8l6g6ajjs9lz3l6" }, "stable": { "version": [ 5, 16, - 1 + 2 ], - "commit": "0e62583b5198f71856e4d7b80e1099789d47f2ed", - "sha256": "1gzr506mj2w8jigvdpsmp9jm4kb5k5v076wda2jz5dpbw4jgj5ms" + "commit": "dae21f8807c80297b9d69aefac4c3864c56d50af", + "sha256": "0axqdzq4rjjxsxx4b8n2g2gf82wrznbzdilp2kv831wyl33z29mk" } }, { @@ -13590,26 +13678,26 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20230626, - 715 + 20230823, + 1720 ], "deps": [ "clojure-mode" ], - "commit": "0e62583b5198f71856e4d7b80e1099789d47f2ed", - "sha256": "1gzr506mj2w8jigvdpsmp9jm4kb5k5v076wda2jz5dpbw4jgj5ms" + "commit": "192a46653fdc27601905f97a044d47764fee1f4e", + "sha256": "03j44n8nj5wc1rvk3pv96wjl3fwindqadwq0w8l6g6ajjs9lz3l6" }, "stable": { "version": [ 5, 16, - 1 + 2 ], "deps": [ "clojure-mode" ], - "commit": "0e62583b5198f71856e4d7b80e1099789d47f2ed", - "sha256": "1gzr506mj2w8jigvdpsmp9jm4kb5k5v076wda2jz5dpbw4jgj5ms" + "commit": "dae21f8807c80297b9d69aefac4c3864c56d50af", + "sha256": "0axqdzq4rjjxsxx4b8n2g2gf82wrznbzdilp2kv831wyl33z29mk" } }, { @@ -13682,20 +13770,20 @@ "repo": "clojure-emacs/clojure-ts-mode", "unstable": { "version": [ - 20230805, - 1336 + 20230825, + 147 ], - "commit": "2d78f6be4f37196ae3a22c51ce2b39f126f003ee", - "sha256": "1cr3l34hsz45p7y08ca8kkj5kpac0paxiyvkg5mi0zpgb93p7jwi" + "commit": "3e4c55fab14e0885a411f6018fb8aedb04afc49d", + "sha256": "14fbdckkqv7c7rwbwbs7v4ca3vf75l4lsi38sksnsf3as3byj6vf" }, "stable": { "version": [ 0, 1, - 1 + 4 ], - "commit": "019298655e0f76e5fb24150149d647bfab546eb8", - "sha256": "1jj1slchaph0x67k7jpwzyzl50c5ya4b32pzp68yjrvyz3nqnj9k" + "commit": "329a39ba3bd5d1832893416ef05bacb8c7678268", + "sha256": "0a1vhpr3zivfq11sy2pwqhxx2q5lxn2da4h0m6hlczcfn4995jlx" } }, { @@ -13741,15 +13829,15 @@ "repo": "magit/closql", "unstable": { "version": [ - 20230520, - 1519 + 20230806, + 2058 ], "deps": [ "compat", "emacsql" ], - "commit": "85ac7b8a894a4e259439d79eb6bd6f5129770905", - "sha256": "06xf5nkmzzn7rlxzg7fnc12jcyh06kkcn84a0v248kahbdsqn3sg" + "commit": "ea49aa1d12ad7fb5d8e9f87eec033732aff1ee7a", + "sha256": "1njwvgmnxcbzb3103jpzqd1ddgk84bym29295qymz01n8f1rc4qf" }, "stable": { "version": [ @@ -13934,20 +14022,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20230725, - 1758 + 20230823, + 1325 ], - "commit": "b5c54d9c8a1fdfdbf1a133040029a4924b69185e", - "sha256": "1snh1g7123f4vmjrcqjpw3a36jlysab5hxrf1jvl3r7ccxjdcm45" + "commit": "c3977582b77f8b5a4ccacf460a262ff0a75d3cc5", + "sha256": "1alrsqa2d29pshs36pbfx1r2dssagg15fjvxqc7vj2663dj12bc7" }, "stable": { "version": [ 3, 27, - 1 + 4 ], - "commit": "b5c54d9c8a1fdfdbf1a133040029a4924b69185e", - "sha256": "1snh1g7123f4vmjrcqjpw3a36jlysab5hxrf1jvl3r7ccxjdcm45" + "commit": "c3977582b77f8b5a4ccacf460a262ff0a75d3cc5", + "sha256": "1alrsqa2d29pshs36pbfx1r2dssagg15fjvxqc7vj2663dj12bc7" } }, { @@ -14822,10 +14910,10 @@ "version": [ 1, 3, - 0 + 1 ], - "commit": "3dfdd58495c46a37708344a57c5c52beca6b2c1c", - "sha256": "08pi3y12i6wx69aj09nk5qd6lplwxq5wz3m7w5701988q39x62xl" + "commit": "69415caa1a381063d3e794912dfe88f672854ab0", + "sha256": "05ypgsdrgqj8105bvd17jn7w633y3ysbr5sgz33m7kj1ca7sl9ga" } }, { @@ -15003,8 +15091,8 @@ "repo": "pythonic-emacs/company-anaconda", "unstable": { "version": [ - 20200404, - 1859 + 20230821, + 2126 ], "deps": [ "anaconda-mode", @@ -15013,8 +15101,8 @@ "dash", "s" ], - "commit": "da1566db41a68809ef7f91ebf2de28118067c89b", - "sha256": "1x260p0fj33xg6hkrz9q9dqrpibp4yn2n9is3a6s4xxfb485rz0g" + "commit": "14867265e474f7a919120bbac74870c3256cbacf", + "sha256": "0xxisqkixafbazz8ryki6yb0l3phh20h4fjnsf64i5imr742cmfs" }, "stable": { "version": [ @@ -16064,30 +16152,30 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20230522, - 1329 + 20230529, + 1404 ], "deps": [ "ac-php-core", "cl-lib", "company" ], - "commit": "4c678709e1e1f1673a83b9eb01875e457c6ca658", - "sha256": "01j5jz10ic67hlnrx8zdg3crswd2zc9rw5v7hyzl6548wcs48ag2" + "commit": "7b89fbf25360cc146aee9b2b2ca60f3462b21078", + "sha256": "0fmp1595v06dgmx9skxphknaagf9ds9l7ygi7lzxas1s8d05dj10" }, "stable": { "version": [ 2, - 4, - 2 + 5, + 0 ], "deps": [ "ac-php-core", "cl-lib", "company" ], - "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", - "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" + "commit": "7b89fbf25360cc146aee9b2b2ca60f3462b21078", + "sha256": "0fmp1595v06dgmx9skxphknaagf9ds9l7ygi7lzxas1s8d05dj10" } }, { @@ -16561,14 +16649,14 @@ "repo": "enzuru/company-spell", "unstable": { "version": [ - 20230723, - 2249 + 20230813, + 1849 ], "deps": [ "company" ], - "commit": "34c3e40af2e8b97e137478d98c5982e3fb2ceb3c", - "sha256": "11k5kzbd8kb6r4bkwlrb7c7ail5414n1skrnj6lx7yxi803hbr0b" + "commit": "67505e492def67ae7bcf438882977fd857e94785", + "sha256": "0s5na38l28njk1xbr40rq13dbaf466pk7kx5zkjwzf4hdhxcpdfx" } }, { @@ -16899,19 +16987,19 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20230616, - 2101 + 20230822, + 1933 ], - "commit": "fbf513c2e427ec1880b47dfd578128dff0f2083e", - "sha256": "0wa2f4m52p31dina83awh8xpl136dmgnp2fryclsa13pr71zw291" + "commit": "28595f31c4c9b37c2e342cd7bb4b7f1553d18943", + "sha256": "13wk8p0r79hhq68yqwg16y05idnx3q0432yhkngrmmkswk9jd2wl" }, "stable": { "version": [ 0, - 3 + 5 ], - "commit": "663ba7a263cba7706c6b9053fd8eb910e0d97699", - "sha256": "1lixbgvj41a7b3mm1hgmd9r3x3scb8wp76z6j0yg2ilm4i4wsk3j" + "commit": "28595f31c4c9b37c2e342cd7bb4b7f1553d18943", + "sha256": "13wk8p0r79hhq68yqwg16y05idnx3q0432yhkngrmmkswk9jd2wl" } }, { @@ -16922,14 +17010,25 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20230618, - 2022 + 20230822, + 1933 + ], + "deps": [ + "all-the-icons-completion" + ], + "commit": "28595f31c4c9b37c2e342cd7bb4b7f1553d18943", + "sha256": "13wk8p0r79hhq68yqwg16y05idnx3q0432yhkngrmmkswk9jd2wl" + }, + "stable": { + "version": [ + 0, + 5 ], "deps": [ "all-the-icons-completion" ], - "commit": "0625042d50dd629c62af8cdc5457fa9d7179468e", - "sha256": "05863s31hy00hpxfksm9dbky1r8yxvqg144n54gfifzrb4cz42g8" + "commit": "28595f31c4c9b37c2e342cd7bb4b7f1553d18943", + "sha256": "13wk8p0r79hhq68yqwg16y05idnx3q0432yhkngrmmkswk9jd2wl" } }, { @@ -17240,14 +17339,14 @@ "repo": "minad/consult", "unstable": { "version": [ - 20230729, - 2329 + 20230821, + 2055 ], "deps": [ "compat" ], - "commit": "be4fdb6246fb2cada13459fbabae5dd0553e1fd9", - "sha256": "0h2rqpahfay4kk9gkq5agxmx4a8na2qm6ixkls6bnbrw411yykp8" + "commit": "5b7a9d0f506374f500a1216146f3dca3cb10306b", + "sha256": "0lpfh7cwn9ivwgm9dk9ag1rvdx09gwh3030myyij5hdsppp9sfic" }, "stable": { "version": [ @@ -17347,15 +17446,27 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20230620, - 1848 + 20230822, + 1933 ], "deps": [ "compile-multi", "consult" ], - "commit": "111db49b4debe3f56b643a5917e14da3d0e36988", - "sha256": "1rjzbryggwc21mkiafp4dfcykrkhs7fbh082h10cs9jhn0z88x21" + "commit": "28595f31c4c9b37c2e342cd7bb4b7f1553d18943", + "sha256": "13wk8p0r79hhq68yqwg16y05idnx3q0432yhkngrmmkswk9jd2wl" + }, + "stable": { + "version": [ + 0, + 5 + ], + "deps": [ + "compile-multi", + "consult" + ], + "commit": "28595f31c4c9b37c2e342cd7bb4b7f1553d18943", + "sha256": "13wk8p0r79hhq68yqwg16y05idnx3q0432yhkngrmmkswk9jd2wl" } }, { @@ -17732,15 +17843,15 @@ "repo": "OlMon/consult-projectile", "unstable": { "version": [ - 20220617, - 1042 + 20230821, + 406 ], "deps": [ "consult", "projectile" ], - "commit": "5ef1ada3be767ea766255801050210f5d796deec", - "sha256": "1x0h9jbgkm32gs75hha3cwk5l24mpq0lmsik03msnc4wl2kvpnhm" + "commit": "400439c56d17bca7888f7d143d8a11f84900a406", + "sha256": "1abd2dw3zpiln9pd7l3j78wl3lwapcmf1ilijv3vin9g0wqb7hmn" } }, { @@ -18094,14 +18205,14 @@ "url": "https://code.bsdgeek.org/adam/corfu-candidate-overlay", "unstable": { "version": [ - 20230706, - 635 + 20230814, + 1537 ], "deps": [ "corfu" ], - "commit": "b1f83e3e7598d199c4691d56c768125c8cd2d157", - "sha256": "00wrqdx2khl86h8n1ahqllk5p17ybc0b4w980yg6qdshpww86an1" + "commit": "265438b16155e899d82a869aebca16105665c998", + "sha256": "0i36g2i7435pby32vcapv4ydmp6rqn0r51qm91wqyzan1f3n3qck" }, "stable": { "version": [ @@ -18274,14 +18385,14 @@ "repo": "ideasman42/emacs-counsel-at-point", "unstable": { "version": [ - 20230116, - 951 + 20230808, + 1344 ], "deps": [ "counsel" ], - "commit": "a84cc0e409325d051208c43dfcabcebaa0d98ba3", - "sha256": "1zycq0hvvi466rzfk240jzsi3gydgd8pgilsa49qnmrqf19fhb51" + "commit": "08f45559597ffbff2e9ecda35bacaaa4dae26fc2", + "sha256": "1dhq1c4m3zz2wl6wkvdc0acv9b5j1iasm2kjb3s66ci7sqlif06g" } }, { @@ -18461,14 +18572,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20221213, - 209 + 20230808, + 1227 ], "deps": [ "counsel" ], - "commit": "a65c03d2a82bae2571993b77b980f2f27c138ecb", - "sha256": "05wwy9rphwm753xxiab25dl3v9f4h59g9zydzpnrh7wpi3yldi68" + "commit": "ffa6b962204478995a3005fc825172bcdbbcc0e1", + "sha256": "0gs84gxxvfdv76glqv6zngfy5arq8by4gwzyy8rx17n3m6sifc5b" }, "stable": { "version": [ @@ -19117,14 +19228,14 @@ "repo": "emacsfodder/emacs-theme-creamsody", "unstable": { "version": [ - 20220912, - 851 + 20230818, + 130 ], "deps": [ "autothemer" ], - "commit": "ac27451f395d1718a05de636dde9a69a2f0cd558", - "sha256": "1f0ii025crk44mbpfximma0kd6hl12gg6ilhfs7pifzygywkknl8" + "commit": "f00210c2d7a85f88c604916c5e619c6270775f96", + "sha256": "1y54jv8nbszkij2mgj4332nj336hrcg19g5smz1y53srlln7wwsz" }, "stable": { "version": [ @@ -19479,8 +19590,8 @@ "repo": "hlolli/csound-mode", "unstable": { "version": [ - 20230529, - 1850 + 20230825, + 946 ], "deps": [ "dash", @@ -19488,8 +19599,8 @@ "multi", "shut-up" ], - "commit": "a40a225f5e1f807719c68f5a486998eb98a9ddeb", - "sha256": "1b9lhbprglicgaw9yrl5040vw13n6y9a3k2wp4c3cjj5jl9rzr47" + "commit": "21b2841696fed1b3d8103ad58202d5604326fcc1", + "sha256": "1kwn0hrcl23icq5phz5h6y9likpcnm54mkqrwcvsnzwvdz0jl5xd" }, "stable": { "version": [ @@ -20408,14 +20519,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20230709, - 2036 + 20230807, + 1640 ], "deps": [ "shell-maker" ], - "commit": "1ec51235295f4685f6cc1a7601255fdcabffc1b3", - "sha256": "1yijz5hx5pidl29kfzf7skdvmvkl8vj7xnlha5p1r2v9l54n5asq" + "commit": "b2e46cfa69d7cc514b5c2f9a31c1ca63a8bdea1d", + "sha256": "058ir6pfd4jzswry9rap161rz15f59k8d1zxxwbkm9ixisqkldby" } }, { @@ -20441,8 +20552,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20221116, - 840 + 20230808, + 658 ], "deps": [ "company", @@ -20453,8 +20564,8 @@ "lcr", "s" ], - "commit": "914d4f21252a66fe526abedebe24703bc73397d9", - "sha256": "07qkd90babkdffpxsp2ha0q3ixwp21szyy7c1k8frqsv0gl0dm02" + "commit": "ca47f8cc1392c7045db7da8b4fafe86b7c044e90", + "sha256": "1r6b5z4ipv5bhx153bsc2fn534vni6rnyamq5ldzyzxyb4i3m5dl" }, "stable": { "version": [ @@ -20482,8 +20593,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20230626, - 1814 + 20230822, + 603 ], "deps": [ "bui", @@ -20496,8 +20607,8 @@ "posframe", "s" ], - "commit": "450ef663a0e3333f515f974103d64fdc8e38ed5c", - "sha256": "1qj1bxyr8x1bw95dwx2q8bxwyq00f67bb6qcbvvx69q0rhil1d7d" + "commit": "096070aacff875a09c13e596e5d60a55e0f07ab1", + "sha256": "16fvhyzddyqjsnvbhr9d3fziz910jfm0ch4hqn9ddczvmnza4h4g" }, "stable": { "version": [ @@ -20663,26 +20774,26 @@ "repo": "emacsfodder/emacs-theme-darktooth", "unstable": { "version": [ - 20221014, - 1418 + 20230818, + 157 ], "deps": [ "autothemer" ], - "commit": "fd3df73a4d937fa9e12f0b18acb009a9d40f245e", - "sha256": "0dvfk9kyza6yq0jn9g2ffb5gv07xnjg6myxkqfxpll7m2s0zasi7" + "commit": "6910ebd3ec2441487a730ef98df591d6b1e0c671", + "sha256": "03jrdyvna5nbs3787dgiija4va7r6z7ynmdd0bg8isfpn2nnspzh" }, "stable": { "version": [ 1, 0, - 1 + 2 ], "deps": [ "autothemer" ], - "commit": "c64c1dd0e2364197ca9ac6410392eade27a55909", - "sha256": "1bx757mhv2vpjdxc4hna6vfvazddbj8al7p1i47kz64qvgfvnab5" + "commit": "6910ebd3ec2441487a730ef98df591d6b1e0c671", + "sha256": "03jrdyvna5nbs3787dgiija4va7r6z7ynmdd0bg8isfpn2nnspzh" } }, { @@ -21250,16 +21361,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20230429, - 429 + 20230816, + 1728 ], "deps": [ "dash", "s", "spinner" ], - "commit": "0313e17a4df7bc8a344b2bc23a319c45d14f9689", - "sha256": "1dvvyy2c3r6aycpz6dsc7pvmgj38cxv2qcgqbl0pvnhadpw55s5h" + "commit": "f720ce8cf958cf7bb5588512de9eb1b8526e417c", + "sha256": "0p8iy3dgx0zf79w936psjd4dlfjyx38kvkwvgwwdaq2r6nsmy1sv" }, "stable": { "version": [ @@ -21988,11 +22099,11 @@ "repo": "susam/devil", "unstable": { "version": [ - 20230730, - 832 + 20230816, + 2251 ], - "commit": "1985300ce84abd712be93b271b27c3bdb164231d", - "sha256": "1pr9yf6f37sz5qy1snn8ag5bvg6lza7q635jh8jhaqqfp37jvv1y" + "commit": "95677d158fba0f0248e9cf5aa1357bee4b293d8e", + "sha256": "0xi41n5m2j6hl1x4hqj8gxik99ymygvlqcvbhjq3pyq9bmazqpx2" }, "stable": { "version": [ @@ -22087,10 +22198,10 @@ }, { "ename": "dic-lookup-w3m", - "commit": "30de78c9cf83de30093a5647976eeaf552d4b2cb", - "sha256": "1kwbmzzf8sj4bn5kicmlp2hzv8ydcikwmdy7s40ggkgf1mk9zvqr", + "commit": "7831b1f80a0a8f9a804f13884d6e65150727ef3d", + "sha256": "1f3xjk744aqdyj10dkbad4wqbi69z9mg3sss4jllrnb5pw42ldhk", "fetcher": "github", - "repo": "emacsorphanage/dic-lookup-w3m", + "repo": "emacsattic/dic-lookup-w3m", "unstable": { "version": [ 20180526, @@ -22198,11 +22309,11 @@ "repo": "ideasman42/emacs-diff-ansi", "unstable": { "version": [ - 20230501, - 2304 + 20230808, + 1343 ], - "commit": "9992b0be2eac8c1bd8051f2ca8de4dc593dc6ff8", - "sha256": "0i67ryg24rdsp8hafl71fym207n8pvnzlq9rak1zrhgqqrizwp6a" + "commit": "c14d1f6c58ddf579cba86b95d160f71589c8cd04", + "sha256": "11mwkwmvdz3lwwd03ck6nsjzwxg0i0sxk8p1w8952w2dv5kdwfg0" } }, { @@ -22228,14 +22339,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20230714, - 27 + 20230807, + 1516 ], "deps": [ "cl-lib" ], - "commit": "d9e34f7b8110b7f753c237d0d0b3f267f3ca4779", - "sha256": "1y32468c9mqanscml9igfi4ypmrfswa2vqk5i4sd94isk2rr9pa9" + "commit": "b5651f1c57b42e0f38e01a8fc8c7df9bc76d5d38", + "sha256": "0w7qhdkgqkk6z306n2c0cx188bbqqsg5vdbxbv1z7pgb3nwdc8ad" }, "stable": { "version": [ @@ -23106,11 +23217,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20220916, - 1836 + 20230812, + 604 ], - "commit": "519a6a49b56978b53e88a005490175cb913ec7fa", - "sha256": "12fzpkzxk9zm0b7zmlakp2kvg400g90wp6mw1nybancncf0k27i2" + "commit": "b2639051a2cbc56be7f9b5df2f4391c159770a6d", + "sha256": "0kbfx8h53d7av46izqrhyhmn396xlf67417pcq9p3npa5yywxs19" } }, { @@ -23351,15 +23462,15 @@ "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20230714, - 1459 + 20230822, + 1350 ], "deps": [ "dash", "s" ], - "commit": "95607fc7eb84e792122b52d2b1d62f49199a2a37", - "sha256": "1zvsmpvham670i807rs8f2f0h73yk4fpaavj0hzksqcl5ykh4fgr" + "commit": "5bcb851f3bf9c4f7c07299fcc25be7c408a68cda", + "sha256": "0lgqq7lh6pkg5mr9b2ilpkyw1gjrdr4frq26vjkmrl95wwphbc32" }, "stable": { "version": [ @@ -24290,8 +24401,8 @@ "repo": "pythonic-emacs/djangonaut", "unstable": { "version": [ - 20200503, - 921 + 20230821, + 1713 ], "deps": [ "f", @@ -24299,8 +24410,8 @@ "pythonic", "s" ], - "commit": "75f642114e3997308a1e7e67c3025738cecee0fe", - "sha256": "1bka2nj2hqhpjiwdghp56y7z3jdxrpqw10s9divpa910mk33vay8" + "commit": "f360e3b39dc830a0380e82b6f3c475a466d7dda6", + "sha256": "19d29xl8m2770ag8g7djd8l7fgi494zr17ncl0imgh993r769dqd" } }, { @@ -24444,11 +24555,11 @@ "repo": "ideasman42/emacs-doc-show-inline", "unstable": { "version": [ - 20230319, - 528 + 20230808, + 1344 ], - "commit": "261554a788e9cc6c0ba538a732667e514fab70c6", - "sha256": "0mabixl9ngd6v1h6qncsgqia8dslwghramf9lw82shp7m2gfmikx" + "commit": "dc914d79b99fc76694d356ea786eb39aab74649a", + "sha256": "028z0qlnbysi3zyfh7mwgy23dzgfpl1anh8pni8zmwy7ld78idgb" } }, { @@ -24496,8 +24607,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20230302, - 2046 + 20230823, + 937 ], "deps": [ "aio", @@ -24506,8 +24617,8 @@ "tablist", "transient" ], - "commit": "4a308e6b2184a1b7745df5a8b8adafb29b3f7157", - "sha256": "0fa61yfr7bys4cmhhkkcpdbczn19x0b3gqyybhdfpn4cqsrfr83d" + "commit": "0899a56c41589e179d3b42994480802d8472e5b3", + "sha256": "00kx4dffncgf5rrcsj614dkhxlw65dmjrbrvqd1v8h02w1925p9l" }, "stable": { "version": [ @@ -24612,14 +24723,14 @@ "repo": "emacs-pe/docker-tramp.el", "unstable": { "version": [ - 20220219, - 420 + 20230809, + 511 ], "deps": [ "cl-lib" ], - "commit": "930d7b46c180d8a13240a028c1b40af84f2a3219", - "sha256": "05966l3af9lg4nlsz6wrq282ipwxh19ggirfyabjrr1syw3v2crn" + "commit": "19d0771db4e6b89e19c00af5806438e315779c15", + "sha256": "1bsmv64vzy4319wvkdljmcxk17xrghmimb9siqs6h2crq7warxhn" }, "stable": { "version": [ @@ -24884,29 +24995,30 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20230806, - 952 + 20230823, + 552 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "07bc0220582899cbecaed7d182c8ee9a9964acde", - "sha256": "1s5f5hg97fpr0i3k81dnw12xgqykj4rcic6mw82nlhsb9l5a0h5b" + "commit": "259ff6a1862b9860f9280f940fe949562766e62b", + "sha256": "0az1z6s09lwwby5anidbjghkzxk0qnhh03wyakxf93zq7jz3m303" }, "stable": { "version": [ - 3, 4, - 0 + 0, + 1 ], "deps": [ "compat", + "nerd-icons", "shrink-path" ], - "commit": "63eb9d3548c7d4be1774b50cdc2169262dd43100", - "sha256": "1z5cqn33v7sjihs05ycz1yzi5wcg90yn3cy09qj9g5g8pjs8qdki" + "commit": "87a10ad1a082996eb049d0a6236e936098172ce3", + "sha256": "0pwfmj01cqij84dig5qj86n7f4cva5mdjqahr0061byrlv9xrpzb" } }, { @@ -24959,6 +25071,36 @@ } }, { + "ename": "dot-env", + "commit": "82f93c384afed71679d93333137787885f137705", + "sha256": "141s6fi9zb5h414fql3f3wzxjf4n0vsf55ysvv5xhyzim621rn6d", + "fetcher": "github", + "repo": "amodelbello/dot-env.el", + "unstable": { + "version": [ + 20230820, + 2014 + ], + "deps": [ + "s" + ], + "commit": "83ce690e8ef9175fc621c85d5fbef4f7ace7b7a8", + "sha256": "13zhl3p2i4284fb7ivwai9c55mb8rcjgg92nz4hixlhvnq2myg7a" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "s" + ], + "commit": "83ce690e8ef9175fc621c85d5fbef4f7ace7b7a8", + "sha256": "13zhl3p2i4284fb7ivwai9c55mb8rcjgg92nz4hixlhvnq2myg7a" + } + }, + { "ename": "dot-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "039ylmbvw0wb3i2w4qn3dhckz7y3swbid4hwjcxljy4szc709p6k", @@ -25464,19 +25606,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20230725, - 1615 + 20230814, + 2156 ], - "commit": "69d8e93c33050b073228be2e8ec0b3ca52989f9b", - "sha256": "1d9bvbw31yrp14yl3yypwbxybdhzl3ybjiprbh1qcniv929lnydq" + "commit": "be07f4979a5b402a0cf5311c86c30b89ca0e1ee4", + "sha256": "19a1zsgipw2klwkjq8cxcjrv0lwfkgvyw57ixs43bxhfr315jfrm" }, "stable": { "version": [ 1, - 13 + 14 ], - "commit": "69d8e93c33050b073228be2e8ec0b3ca52989f9b", - "sha256": "1d9bvbw31yrp14yl3yypwbxybdhzl3ybjiprbh1qcniv929lnydq" + "commit": "be07f4979a5b402a0cf5311c86c30b89ca0e1ee4", + "sha256": "19a1zsgipw2klwkjq8cxcjrv0lwfkgvyw57ixs43bxhfr315jfrm" } }, { @@ -25702,11 +25844,11 @@ "repo": "sadiq/dwim-coder-mode", "unstable": { "version": [ - 20230801, - 403 + 20230826, + 450 ], - "commit": "271d9c06ecdfadf19e0eaa788c8b90626090d4c1", - "sha256": "1qssz8crzj5q8c6r4fd90ynl5jsi7drq6pkmv0a82kllzvrqvqrq" + "commit": "6d1f3846761f33f2dffc345a866d15e78606bde7", + "sha256": "1g36aqsmhvqzcjwhhnpmqnav1jn5id55ibfgw83bzgbhn1qzmmgr" } }, { @@ -26170,11 +26312,11 @@ "repo": "earthly/earthly-emacs", "unstable": { "version": [ - 20230302, - 1709 + 20230809, + 2250 ], - "commit": "a242a4d68ebefce81879823c54155e0a04d3ea4a", - "sha256": "1wycm065l60jviqvy5a5qkkcq5xdfnb8bhjcgq15ip93ks6p4bgi" + "commit": "3029e5ab06171ca5947041e95053561e10e5ba41", + "sha256": "0947czc3n6a8g065qnl8pa75sp16cs2dmc31s3gvp3c3lvnb3nkd" } }, { @@ -27165,6 +27307,21 @@ } }, { + "ename": "eff", + "commit": "a2842090e19f49dd538ed10a69430b12302e6028", + "sha256": "0mgb5w6ffh95wdbkbcbc3jqa93g54khiacpipazs5ar8pvzf3dl1", + "fetcher": "github", + "repo": "oxidase/eff", + "unstable": { + "version": [ + 20230613, + 958 + ], + "commit": "3ad6a3f3886c532149f9a1c8c740ab95940ab63b", + "sha256": "0fp4qgxw6nx90bp2mxll3qxg35sd3f4yl76fgc3bv2zj8q8349p1" + } + }, + { "ename": "efire", "commit": "4150455d424326667390f72f6edd22b274d9fa01", "sha256": "0dhgms6s0c889xx75khn1mqfn8i32z4rjlx2w7i0chm2abxbgd3m", @@ -27523,16 +27680,16 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20230702, - 2048 + 20230822, + 1534 ], "deps": [ "clomacs", "dash", "spinner" ], - "commit": "cfb2a3b00d16c6b8575b84d4963ac0c21f91fa05", - "sha256": "07b4384cgpbx98438jay5py6yir9q97djs7a0458ss9zmphr31d9" + "commit": "c99a257c18dbcca02a63172b4f1c2a947c908d8e", + "sha256": "14vkq7lnrgm7ypa6sx73jlm1k2i8y01347gd4nw7g19vdfdgx016" }, "stable": { "version": [ @@ -27573,32 +27730,32 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20230620, - 1807 + 20230810, + 316 ], "deps": [ "triples" ], - "commit": "9fa918ae4b3a7a8541e570fc358174346d875e85", - "sha256": "0zcwryxskaz3b7bfyw7651sf5rgnf1dgs9yr7mk3d1g6kwh38q2q" + "commit": "c668d397add6b84a7e35dfae04cdfb2be451f032", + "sha256": "0yyhr3wl9dxhqqbjw2c67h5y7lz4s3ww4fk810mlcrmjraymy95z" }, "stable": { "version": [ 0, 3, - 2 + 3 ], "deps": [ "triples" ], - "commit": "9fa918ae4b3a7a8541e570fc358174346d875e85", - "sha256": "0zcwryxskaz3b7bfyw7651sf5rgnf1dgs9yr7mk3d1g6kwh38q2q" + "commit": "c668d397add6b84a7e35dfae04cdfb2be451f032", + "sha256": "0yyhr3wl9dxhqqbjw2c67h5y7lz4s3ww4fk810mlcrmjraymy95z" } }, { "ename": "el-autoyas", - "commit": "cc4845343dbb8f8294394f6850788e4f1fe6b99b", - "sha256": "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c", + "commit": "890ec47013f1638d3b12f2d08118bf64c104be2b", + "sha256": "1c54c2dd4l9s868hr4cij43rk2bid7qgz93x1b7ln43mxiq95x4h", "fetcher": "github", "repo": "mattfidler/el-autoyas.el", "unstable": { @@ -28107,17 +28264,17 @@ }, { "ename": "eldev", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "1grpz4nf77bhxbzfl7b14wj1kxj759y0qbs6kwqpjgyzadfgar88", + "commit": "6d94da66938ea895c0b32bb54057c3b36bebf36d", + "sha256": "11plii1q276ravzb3qi2h25rfadvx4j5l55lj7ldjar8rxvilhij", "fetcher": "github", - "repo": "doublep/eldev", + "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20230805, - 1640 + 20230823, + 1748 ], - "commit": "5ac5f26869cf4bcd96adc00edd254a845197e77a", - "sha256": "09la42dr6pkxrbsrz4gzcf5bwrmcvyd7hbmi4fs5jfabfya2h2kp" + "commit": "9aeb720a75e58956677f548890147a59f05da136", + "sha256": "18jw8zg8dydzhsqcp1lvvyw0fb2yczhdr96n23hzvbjyap7a8806" }, "stable": { "version": [ @@ -28137,11 +28294,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20230803, - 51 + 20230810, + 503 ], - "commit": "b5aa4814326f592d15332c5da4e62ed513fa85d7", - "sha256": "1p5ffjblpz6cmnsp6km3mayqzvs2xcy1sqyxqz1zwjm7z8fzfma0" + "commit": "73345daa47a5612f298896e5eb044e10a79496e7", + "sha256": "0ra8akja47zph1fln86yrj4nmrl7qswm3fr46bl0kdqz1ijh1363" }, "stable": { "version": [ @@ -28560,18 +28717,16 @@ "repo": "remyhonig/elfeed-org", "unstable": { "version": [ - 20221118, - 852 + 20230824, + 2034 ], "deps": [ "cl-lib", - "dash", "elfeed", - "org", - "s" + "org" ], - "commit": "3242ec0519800a58f20480c8a6e3b3337d137084", - "sha256": "1qp5a7gmrf8hy9zvi237shnff2jcrs2s6iln4pd5l6hqb74akdrq" + "commit": "3438d0748063637dbe121993c7ca4f5f8f3b5a74", + "sha256": "1yzx2ndpsfxp7cvnd1rk0dfaq73wm8awbk1jn9wwzhi9qk2x9wb7" } }, { @@ -28644,15 +28799,15 @@ "repo": "SqrtMinusOne/elfeed-summary", "unstable": { "version": [ - 20221210, - 1349 + 20230823, + 925 ], "deps": [ "elfeed", "magit-section" ], - "commit": "ccbaf85d9ea442203027e784a42b21686f3a87d8", - "sha256": "124cadn3b0l5lyc0vv3wz581nhad0pa0fn82wcnjvihx5p7fg7j1" + "commit": "6bad19a7d4b2375233cd3ff571e2e6ed55d457b2", + "sha256": "0h5x8w5v8a6gs0vlmp1xs9pfnv4bg0sxa719m9q3jdrzarafqmzl" }, "stable": { "version": [ @@ -28803,14 +28958,14 @@ "repo": "TobiasZawada/elgrep", "unstable": { "version": [ - 20211221, - 852 + 20230814, + 1215 ], "deps": [ "async" ], - "commit": "f8124c699b6a4abfb471269bc26afbcc8136f476", - "sha256": "08f5kbbgmpg0nc0i148xbbm4dsp34nkr73m6ipx0fwi9dcldk8z1" + "commit": "329eaf2e9e994e5535c7f7fe2685ec21d8323384", + "sha256": "0pyj662inq00k1kpxw07gpxmiwhfj3vajg1s97a2rh97m4f7rqpz" }, "stable": { "version": [ @@ -28848,11 +29003,11 @@ "repo": "ideasman42/emacs-elisp-autofmt", "unstable": { "version": [ - 20230731, - 1350 + 20230820, + 648 ], - "commit": "f2bd5119861bbcd3ebada76d44441ce96de49bed", - "sha256": "1r1260jsr6gicnw8papm4xsnpjl8yfl7ga7cm18284qjwkqqrm6n" + "commit": "fb280f362a1ef5015841ac6b97697cba9784d86c", + "sha256": "06wh3cc90mkh81l44b1iww28ksblr3psan43fjs9d0adzmibmy04" } }, { @@ -29445,20 +29600,20 @@ "repo": "dochang/elpa-clone", "unstable": { "version": [ - 20230804, - 449 + 20230808, + 1523 ], - "commit": "e7645c5d588591d0e566d56df53ec6f0b2df53f1", - "sha256": "0r7cy7xpbiqdi2qqrkd0z2lifdi9kjws4kmc36hrhjhbsibq5kaf" + "commit": "dfbb68ac183b8c3e6e370c45032790ed7cf52165", + "sha256": "0lvwa14i1s9dhrpv35gqw3ra5bl006km0k2ygs8issy6vy9y3jll" }, "stable": { "version": [ 0, - 3, + 4, 0 ], - "commit": "1d130c251690f24c23b77a4e4570157fca881d8f", - "sha256": "0swcpvlh08mrw27yv7a5wbsvlxv72yr5gbzzap9x2bjd839d3ndf" + "commit": "dfbb68ac183b8c3e6e370c45032790ed7cf52165", + "sha256": "0lvwa14i1s9dhrpv35gqw3ra5bl006km0k2ygs8issy6vy9y3jll" } }, { @@ -29801,15 +29956,15 @@ "repo": "aki-s/elscreen-tab", "unstable": { "version": [ - 20201229, - 1428 + 20230810, + 2114 ], "deps": [ "dash", "elscreen" ], - "commit": "6ad77f972bde05e4e3d44f0d33b68ac41655e5f1", - "sha256": "0az5csc243p48g7mbx5yv16kg3171ykqy1zyw9wi3dwv07gqhyyb" + "commit": "21c1f3d3ec47f8b5e31bb0b26b4f60864e49e966", + "sha256": "10myk53igq9246166b2dvk2m3qvnbsbi9m16bs7fibwgmbrspx77" }, "stable": { "version": [ @@ -30119,8 +30274,8 @@ }, { "ename": "emacsql-sqlite-builtin", - "commit": "402d5f088111264aaca5196da9ca3ffada3220c6", - "sha256": "0zxs2vlpxa9a2c7j9s0bpab7z5hjayr9jagamnaxa5cq8a488v8s", + "commit": "62abfe3f85904858c9a1651ab98df763612f1b51", + "sha256": "10v2bf0av7li9q90csa6b478hjhfq83kr7laqvrcxxdx4kwi6cr3", "fetcher": "github", "repo": "magit/emacsql", "unstable": { @@ -30137,8 +30292,8 @@ }, { "ename": "emacsql-sqlite-module", - "commit": "402d5f088111264aaca5196da9ca3ffada3220c6", - "sha256": "1p951ya66k0va5zjg49jy2dl1il9ajc2rf6p5mnymp0iwmg76r6i", + "commit": "62abfe3f85904858c9a1651ab98df763612f1b51", + "sha256": "1nhwc1yk0w3sa9x454j8gyi77h2d31dzvfph56xvfaa7r5i4a0j0", "fetcher": "github", "repo": "magit/emacsql", "unstable": { @@ -30258,14 +30413,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20230805, - 1458 + 20230824, + 1403 ], "deps": [ "compat" ], - "commit": "d8bf793f478e2f7b314c90edb188fa3ded6dc6da", - "sha256": "0brc20ikkvlhf2c62qyrkbd06l4lzzkx3caifs37v2qi681mm4nq" + "commit": "4215d79df51e14d4fbe66237fd9264a54661c22d", + "sha256": "1n9j3hhhhjsrw4wz1ickcwm08khw5l38jg50s481ld1zrlprh8gb" }, "stable": { "version": [ @@ -30463,16 +30618,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20230727, - 1543 + 20230818, + 1438 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "8ad5cf981b24cd9c7748232a843fafd2d62f6e15", - "sha256": "06xn06srkv54midyrhdbbnmgmlk4j8djqdm80ji8d62h99a05yyh" + "commit": "4567938c2c4182ba1ad01e7b3133d32a10095fb5", + "sha256": "17c9g7f02r35fjwyqm5dyna7aq977j5lilqd94sapk4wrhxnryk5" }, "stable": { "version": [ @@ -30841,14 +30996,14 @@ "repo": "isamert/empv.el", "unstable": { "version": [ - 20230805, - 1633 + 20230820, + 1340 ], "deps": [ "s" ], - "commit": "60df27d081735a65d63c0c64207fd9a0a10683fa", - "sha256": "1mb1p29z25sdja3bbm7akh0ca40q1d6b3m44qb8qvikxpb6wkj13" + "commit": "1721a581d68f211a7f0104554858ea2afb1723ff", + "sha256": "1lhgvc0pg5q5dfqj5phqvfhzd762rp9yycif4badfgvpp804vjr6" }, "stable": { "version": [ @@ -31143,15 +31298,15 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20230804, - 652 + 20230809, + 600 ], "deps": [ "inheritenv", "seq" ], - "commit": "d8fe5d293253a0d431034cd7294e6fb561c4950f", - "sha256": "1a4ixhvs53ymcm0fjlvnh47rd0sp23w4ngns4m0ydcs5vq8hwq5m" + "commit": "dbb8f3e580909d1942fa4e27381b6f97b668b3c2", + "sha256": "03i4xjndzxdpj7f0fkmrzsyd8h8mjl3ipr0ymajwzpxvw6w729sj" }, "stable": { "version": [ @@ -31288,8 +31443,8 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20230730, - 2121 + 20230810, + 1304 ], "deps": [ "closql", @@ -31297,8 +31452,8 @@ "emacsql", "llama" ], - "commit": "dfb66853b1dabdbcda1c4565db418a644968da7d", - "sha256": "0hs1zlknm9qv29dp2a5dmsygq7l531zbd91axn4f3wl2sb1bmx5c" + "commit": "b22da65653418290dc93f7c8b167e8600cdaedb0", + "sha256": "0ww33n02av72a1c1wk2j1q2xrikmqrqzbzwnjq00m3i3z01bm3nc" }, "stable": { "version": [ @@ -32594,19 +32749,19 @@ "repo": "zwild/eshell-prompt-extras", "unstable": { "version": [ - 20210925, - 110 + 20230815, + 1251 ], - "commit": "c2078093323206b91a1b1f5786d79faa00b76be7", - "sha256": "1zchbl59jkay46w8rf2skza71al2xf9lqsssjd22s5h5vwkl64kn" + "commit": "f490ab511a36166f09b97811495b09d72c9d37f9", + "sha256": "04wgffj43lw1i853s8vkw8hvjx29vv5lnmhjyqcclwfnbj7ddvn9" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "356a540f9365b2f37f8a8cfb9c0e0e1994d12f4a", - "sha256": "0gb07mns23dgqqr6qfy7d6ndizy15sqgbgfaig6k5xbjnwi02v9g" + "commit": "f490ab511a36166f09b97811495b09d72c9d37f9", + "sha256": "04wgffj43lw1i853s8vkw8hvjx29vv5lnmhjyqcclwfnbj7ddvn9" } }, { @@ -32975,11 +33130,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20230803, - 600 + 20230807, + 1422 ], - "commit": "d3e1a54020bbb96e15376aa3e7099b2f3650f79f", - "sha256": "1zwawj6412nr9yrgrkzh01xkwzj7bsq4mk213yp74klwrnd2vh5n" + "commit": "d8914196ceb2061d850cc899aed79342519972ff", + "sha256": "11pkachbn0lj4qx8xmaaknrx8223hrmq55vqs6apl1a9s9dg62bs" }, "stable": { "version": [ @@ -33617,15 +33772,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20230806, - 1536 + 20230823, + 737 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "2b1e18552216a05014fa5ffe4cb54f595b1008a7", - "sha256": "1qwx2lym90225s1ckzjhnx6m9iv1k7h09zxg6a279kzrx4l03qn3" + "commit": "a667d8857f8a64249b53a4c45805ed6d62da4e5d", + "sha256": "0xmfm0rjw37lqma3dr09l1989wlm8v37ln3w4p9ajjx18v9cj5vr" }, "stable": { "version": [ @@ -33818,15 +33973,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20230724, - 1631 + 20230808, + 459 ], "deps": [ "annalist", "evil" ], - "commit": "286d69de179cf70c00963a998a4beb826b51414a", - "sha256": "1a91n86arx99f6qf04h9ffj2adp5r4jb070znfy9l3w7m07b4564" + "commit": "1ad283f5b7ac9320ac3d41bccfc71a52f714563a", + "sha256": "0cw6qy5xz4w0wmpf9cniy1y5s6xm2v84vl6dffvav30sn09apv5z" }, "stable": { "version": [ @@ -33917,15 +34072,15 @@ "repo": "cute-jumper/evil-embrace.el", "unstable": { "version": [ - 20220211, - 606 + 20230820, + 445 ], "deps": [ "embrace", "evil-surround" ], - "commit": "7b5a539cfe7db238d860122c793a0cb2d329cc6e", - "sha256": "03b53626ywq9qdqzsb92321lc0fzjqb674kwkssjrxlz6hhn5hlq" + "commit": "3081d37811b6a3dfaaf01d578c7ab7a746c6064d", + "sha256": "13rqkdhhzvnw3s49zm3v9xska8j8l1mr85czcfaf5vrm99lx8rl3" }, "stable": { "version": [ @@ -34929,15 +35084,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20220428, - 1432 + 20230821, + 1602 ], "deps": [ "cl-lib", "evil" ], - "commit": "c07788c35cf8cd8e652a494322fdc0643e30a89f", - "sha256": "06zhpsmn67f2n0f2yqzcv978l10nkvdr25kkl3cwkhhj9a56x62g" + "commit": "c2108d3932fcd2f75ac3e48250d6badd668f5b4f", + "sha256": "1h7vh24fvbbrq6vl2dfamfm20rxx9dx1rjfs639psksy57nj58j1" }, "stable": { "version": [ @@ -35023,14 +35178,14 @@ "repo": "emacs-evil/evil-surround", "unstable": { "version": [ - 20230627, - 2052 + 20230819, + 836 ], "deps": [ "evil" ], - "commit": "4a21d756b76a50e0c0619555836c9aa98f103d3d", - "sha256": "1ja7fylbd6zmgdffkf5nvj7f5xyd11a9359q5wfqppd4jyd8c024" + "commit": "8fad8540c490d94a820004f227552ca08e3e3857", + "sha256": "0mdqyc35hxcj2rz704nns3vyafkvd3a5lyir2cz1559p6pn89ip7" }, "stable": { "version": [ @@ -35111,14 +35266,14 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20220425, - 2132 + 20230820, + 2246 ], "deps": [ "evil" ], - "commit": "008a6cdb12f15e748979a7d1c2f26c34c84dedbf", - "sha256": "1hxhw1rsm0wbrhz85gfabncanijpxd47g5yrdnl3bbm499z1gsvg" + "commit": "4beec94d14fc4180c41314edff997dbb9c422a23", + "sha256": "1w9k9xksln82pjlgyc081vyyim6bx4bds0p81vh054d41arvkk3f" }, "stable": { "version": [ @@ -35314,20 +35469,17 @@ }, { "ename": "evil-textobj-tree-sitter", - "commit": "fcddf8865ace77c50846d55ac77c615bd8f3af63", - "sha256": "1zns7rr449m186h8br4xv77n26qjdq4whc2nyil8lmkhixr3q4ny", + "commit": "fc5b27dd4aa32f75844bf6db7e9e0f44275631ea", + "sha256": "1bfb5r758viwhknsbzgvn4ahqzyry0sxc6brjmcgj1xrja2kgld3", "fetcher": "github", "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20230704, - 1451 - ], - "deps": [ - "tree-sitter" + 20230817, + 557 ], - "commit": "e8bb9d63deeb2953ff9600e1633de667b3d7673e", - "sha256": "1fwj7ybzmdc11arcagsms7s0z8wndzr2wj6dqc9p4zxfviccck3n" + "commit": "19979843f5fc437917f9a4dae977f5e6d4793726", + "sha256": "1mqh6zqjnbdmqblqpv1409rmx7h1wqprp1z7h68mvmyl80c8r6bd" } }, { @@ -35338,14 +35490,14 @@ "repo": "mamapanda/evil-traces", "unstable": { "version": [ - 20230731, - 212 + 20230820, + 2255 ], "deps": [ "evil" ], - "commit": "d4c53bd6addbe1bce7c77fdc10314f24451a2ecf", - "sha256": "1aih7rb2cs1cdqvmncchv0hg1rv1q5y685a1hb0pv9acs5kcdjxm" + "commit": "3b4e08c522d1a4c6f458ab5dc21914fd307333a1", + "sha256": "077g5xbilq1k588ygnsagph57971xm1azlash1wxcnd8a3n1szgv" } }, { @@ -35868,8 +36020,8 @@ "repo": "anonimitoraf/exercism.el", "unstable": { "version": [ - 20230530, - 2230 + 20230822, + 1147 ], "deps": [ "a", @@ -35881,8 +36033,8 @@ "s", "transient" ], - "commit": "807ad7c9889b5a774f34ad65c6de0d40d74f253f", - "sha256": "10s1laffbdqbz0qmnrzsbr7yijf284kajcnm0s693b6ckifgqdc7" + "commit": "6b3d7ba0347aeb17098eb6d7656176a91280f88b", + "sha256": "18b0mb83dqy5vr2cw91zg3ix8bqvprpbfny6p38327s7dxdjnapb" } }, { @@ -36427,11 +36579,19 @@ "repo": "thblt/eziam-theme-emacs", "unstable": { "version": [ - 20221121, - 1609 + 20230820, + 917 ], - "commit": "7fba717293072d0afdbd1c45351ddf47b26b3064", - "sha256": "14v23aqyl971yaw00xmqymlmw6abkx1biflqy1q0908q6fzg170n" + "commit": "8223acc0218130ad2493c1476ad3736ee4fdbb8f", + "sha256": "1q37lxfskq88rp1alhfjik1grpczgxn82l3fjgy01gs17qx7k579" + }, + "stable": { + "version": [ + 5, + 1 + ], + "commit": "8223acc0218130ad2493c1476ad3736ee4fdbb8f", + "sha256": "1q37lxfskq88rp1alhfjik1grpczgxn82l3fjgy01gs17qx7k579" } }, { @@ -36442,15 +36602,15 @@ "repo": "rejeep/f.el", "unstable": { "version": [ - 20230704, - 1346 + 20230823, + 1159 ], "deps": [ "dash", "s" ], - "commit": "19e1da061e759b05e8c480b426287a063ca39484", - "sha256": "1ljamkq8hz35gbnh5hb9f7vsavn2g3m8d4qnshlbkwj5hscm72ir" + "commit": "ab3ee3811c53f9c2144ff45130361f3da242ffa2", + "sha256": "07jsgq8jx1dxwlij61pbzsmlb047jsbk1ssr1d8301kssaa9qls8" }, "stable": { "version": [ @@ -36652,11 +36812,11 @@ "repo": "ideasman42/emacs-fancy-compilation", "unstable": { "version": [ - 20230718, - 2326 + 20230824, + 22 ], - "commit": "a200d2ac5d7aa7ad04dfcf255d199415e7105702", - "sha256": "0rabjf8pplhwbzmgg7pgxp0mbh47irrv08zy1l8sz6xgmhbc2qip" + "commit": "32dc801a921428e4abaeb826449c86fc3c96c0f8", + "sha256": "1hk4dkddrgdy1l03dscmnsgghp1y92mkngkacr7vv8wx3lsixm8w" } }, { @@ -37072,6 +37232,21 @@ } }, { + "ename": "fedi", + "commit": "4dd943e9c188b820677795ab5446ddeaf37e3af4", + "sha256": "1dksh9ccpqk6c3psfd94ah4dnk0bn8wccfhpf7qnnkzamdyf23c6", + "fetcher": "codeberg", + "repo": "martianh/fedi.el", + "unstable": { + "version": [ + 20230820, + 1912 + ], + "commit": "0ff6bd3f57a799e2b3caadf0e0f1cf9ce3068dfb", + "sha256": "0lcdr03nlbrnnn3r2hzd6kmqafv8lvilik0zrlr8bp646459ikln" + } + }, + { "ename": "feebleline", "commit": "782295d8c530878bd0e20cde7e7f7f8f640953dd", "sha256": "0c604ahhv9c89r3hj7091zhhfpbykh4c23sn6ymqw4pp0dq4pgkj", @@ -37147,11 +37322,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20230715, - 1855 + 20230825, + 1315 ], - "commit": "8f721285e12382b72c2f7a769d21fd332461eb2a", - "sha256": "12yhlmc8hi7ly3qzgn8iarvhla7gaciywyxfmz5f8pm69mcgiibf" + "commit": "6afdcbaa7880fe2b0e4c3088d530d844f9af8f9a", + "sha256": "1wzsd1mkcix5hsa9j9c9sw47s3pcqgbzc42ncqv25r6byqjcmz5p" } }, { @@ -37273,27 +37448,28 @@ "repo": "Artawower/file-info.el", "unstable": { "version": [ - 20230427, - 714 + 20230822, + 1634 ], "deps": [ "browse-at-remote", "hydra" ], - "commit": "cb06d793b7e1ba769189f2002236305eba002660", - "sha256": "10yxkmbkya1gcankdbbwj0gjam8vy0h03i06hp5ivk7j6sfp22l5" + "commit": "5dcf0df5be52a264690e81d9911306879371e4d9", + "sha256": "0jcwz2zv2a4vckfxg4pjdir15j54wbibpnlasyx222x3wixq2767" }, "stable": { "version": [ 0, - 6 + 6, + 1 ], "deps": [ "browse-at-remote", "hydra" ], - "commit": "0c9eb805f5600045cd0870747abc801e8a6e3ffa", - "sha256": "1dvicckk6qb1k1nxdfss096ffxcpynj0gw9jn9cg8liw861w3y7m" + "commit": "c6892a0d3bab0c10c85f2fbdfe859547cd051eb8", + "sha256": "0marj6mvzmdyfsy0a94y46lzx703f4zxja34dz04a83gxmg1wcmh" } }, { @@ -37819,11 +37995,11 @@ "repo": "IBM/firrtl-mode", "unstable": { "version": [ - 20200329, - 2002 + 20230815, + 1312 ], - "commit": "fa40141411a876ce7a1a9d6d3fe47134bc1fa954", - "sha256": "1pj7b8ppkbjp8q5dzw5v086v8lp1gv1il6qc65l4nlm8p5iicvzq" + "commit": "45ec466d2945c2893ca4d6b24ff3816fceb8f1b2", + "sha256": "0k6n9js7af5asj1cxpplc7blw92mrdp1s3p2pdcdbxkrk9qx020r" } }, { @@ -38234,15 +38410,15 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20230805, - 1653 + 20230808, + 1453 ], "deps": [ "buffer-manage", "dash" ], - "commit": "58890e08800059550565a20dc7029e8bcccc55de", - "sha256": "1q5604da9b9gmg1ci5931fzwrqzkc5n5f02mcfvdk7vfhsakdlaj" + "commit": "17b2b16f8867312a868f338a49ba8615d2d23461", + "sha256": "0c37vzfd5c4k502bbx6qnc6046dsqy75g6nmaxx756f6p6nng5vq" }, "stable": { "version": [ @@ -38280,23 +38456,23 @@ "repo": "wanderlust/flim", "unstable": { "version": [ - 20230205, - 1423 + 20230808, + 1153 ], "deps": [ "apel", "oauth2" ], - "commit": "2cf5a7891090faca8de725b1d3743dcedf233ea2", - "sha256": "1wsnipyl3blldcl8ynmpj1mxfvl7kjmxd8gapl83vqd3r0l9cr6q" + "commit": "80b8121f05a5a0d7fcfe3e54085467a646dd2028", + "sha256": "02shd2mp9ywncn0wxgrijn0i8fa69kfx1y6nh5jjd64dyiczmskk" } }, { "ename": "flimenu", - "commit": "0ffc67a266de3d58553b27325b7fc6937df425be", - "sha256": "1xr28kprkq9xwy2f7b3wnjr25a8avm2lfcyi8853jygkm2vmnsx1", + "commit": "c6f5bc020afdb543abe1a033f657f1dc3539893a", + "sha256": "1bf7jzk4fd3slhqgk9s1kvy62cb1zm6p3vzb9h0s3aai81798ymi", "fetcher": "github", - "repo": "IvanMalison/flimenu", + "repo": "colonelpanic8/flimenu", "unstable": { "version": [ 20200810, @@ -38448,11 +38624,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20221225, - 944 + 20230811, + 458 ], - "commit": "684f15ea19c4a7947eda945cb6e58a67baec8e90", - "sha256": "0nqzy8b27nxfpg7gh5wdh1h3dbsapa4nh4gs0yx2x1a4r3v2lh0v" + "commit": "64b3f50a2008357359f1c4eea0e97c93070df7d4", + "sha256": "0vhxszc3km670aslcfmi56xvvv130g8bknh6pyqnic4x3zsvm9jz" } }, { @@ -38581,8 +38757,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20230306, - 414 + 20230813, + 620 ], "deps": [ "dash", @@ -38590,8 +38766,8 @@ "pkg-info", "seq" ], - "commit": "5f2ef177cb21ae8b73714575802beef04abd0f5e", - "sha256": "1bcd6527rnr0d51jkzvmvn1iz0z8phmm1yyvi1wjv96vf8y39cd9" + "commit": "773c3eb31ebeb6bb2f9f57d28177882ca7073df0", + "sha256": "0x01d41gqvgi7r96snswrik6l2nb1wzf6nd1wzm47a1qj0l46061" }, "stable": { "version": [ @@ -38608,6 +38784,36 @@ } }, { + "ename": "flycheck-actionlint", + "commit": "325a02f78d732e8054d091fb82a69984cd3b5385", + "sha256": "05lpvskmlrn78jy2xwb20c8fi9jv1xq2bk6prwi91lqj36k4cf0v", + "fetcher": "github", + "repo": "tirimia/flycheck-actionlint", + "unstable": { + "version": [ + 20230802, + 913 + ], + "deps": [ + "flycheck" + ], + "commit": "f3baf396b534f8b874d3ae885cc1dd53b5098dff", + "sha256": "14jjfgxgsaqnn36c51isx55lxbidyxh9dq3qa1baf44p259xy44p" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "flycheck" + ], + "commit": "f3baf396b534f8b874d3ae885cc1dd53b5098dff", + "sha256": "14jjfgxgsaqnn36c51isx55lxbidyxh9dq3qa1baf44p259xy44p" + } + }, + { "ename": "flycheck-ameba", "commit": "043b5acb0552272c523d642fd9f9dca438087068", "sha256": "0ix0rfsasnifn1l1m31242fyyg7ms251hd3k0mj1mgwrsjibyq3c", @@ -39601,14 +39807,14 @@ "repo": "flycheck/flycheck-google-cpplint", "unstable": { "version": [ - 20220616, - 1802 + 20230816, + 734 ], "deps": [ "flycheck" ], - "commit": "93c5b26ec55d0df54bc230e2de0890fe074f35d3", - "sha256": "0f0713a0d9l92cy6xc5y1cg4pg88kq58krlz37bkfq3s20yfz097" + "commit": "59feb38c47cf95176636afc65325741a2d9ae6f3", + "sha256": "0d8ncrklyb6sslp8p64wjc92qfxrb3d1mx7ja2yf3g6jhs5r9p9n" }, "stable": { "version": [ @@ -39802,6 +40008,25 @@ } }, { + "ename": "flycheck-hl-todo", + "commit": "a088fc1ccb920a9c3d1bd32e4b1c7ac886fb17fe", + "sha256": "1ivdc0fxcb4y26517awv63flwf225qym8q54b40j7hlaxglndmzx", + "fetcher": "github", + "repo": "alvarogonzalezsotillo/flycheck-hl-todo", + "unstable": { + "version": [ + 20230807, + 1500 + ], + "deps": [ + "flycheck", + "hl-todo" + ], + "commit": "16b66ea07e9d31950093ef0ff97d42b8e7ebf10f", + "sha256": "13f1anzf3013ia9ccp70sx9py2wpm64h1i9hadp504mmd14aqrgs" + } + }, + { "ename": "flycheck-hledger", "commit": "502709e2195bf0001891e438081e274fa3824af3", "sha256": "1sdglh0s00af8qiqvi583gksi2yl8z47r1hry2dbm9vs0p0sf1z8", @@ -41315,6 +41540,36 @@ } }, { + "ename": "flymake-actionlint", + "commit": "c903a2d13307aabc11a963ebc36a438ef75c4b6c", + "sha256": "0b21fdhba0xxwa0197iml6f959v84f4jbcf2s1lhridq2wlijk3n", + "fetcher": "github", + "repo": "ROCKTAKEY/flymake-actionlint", + "unstable": { + "version": [ + 20230731, + 753 + ], + "deps": [ + "flymake-easy" + ], + "commit": "98a47bc6ae2d31f699e98caf8093d5bb8cc04771", + "sha256": "1bcnqgwdyf7c8zim7jfaz2pfnldafnlqg65cklbydyhsa1rflh5b" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "flymake-easy" + ], + "commit": "59d1f17a52bd48ad39f18900c8c77255f9f37718", + "sha256": "1qg145crrkfbpfkqjisvshwr1x7xlvz4b2sj0srzcchnmrmn10l4" + } + }, + { "ename": "flymake-aspell", "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3", "sha256": "1h4s0mffhixmcrafljgnmz20vybidknn39g0ixsq0p646wg5ypqv", @@ -41330,6 +41585,21 @@ } }, { + "ename": "flymake-clippy", + "commit": "86d2018564549dfa7d67c9bc9fd9a790ec9173c2", + "sha256": "1ccv32dlzrvihq69bi3c2anryj7zafvlpbga11f4zy31qfi6ad2y", + "fetcher": "sourcehut", + "repo": "mgmarlow/flymake-clippy", + "unstable": { + "version": [ + 20230808, + 2328 + ], + "commit": "f488c7df2f56635dea0576ea2872c4c94b584a67", + "sha256": "1p43q8sqiimaz2m1hxgvb9b5l7cqiazwlw2rcivpma0xk4dhka1l" + } + }, + { "ename": "flymake-coffee", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d", @@ -41588,14 +41858,25 @@ "repo": "purcell/flymake-flycheck", "unstable": { "version": [ - 20220313, - 924 + 20230826, + 749 ], "deps": [ "flycheck" ], - "commit": "850a3f2f6908db5d4a3739e385b2c9fb3ad488f9", - "sha256": "1axr0wgmjr58fhhl2zwh5l4wd9x8h66rv2917ynxwq61p955wi87" + "commit": "cc50a97ee1384d260c56aca257a1dbf770084330", + "sha256": "05and3jmmfsdi1lhqg7lpsph5rn2p1jj036blrd762ipqb4s90v4" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "flycheck" + ], + "commit": "bd278d47ee2cc4ea6b8bd1dcf502023f39823563", + "sha256": "0crf4c3488jfka685m04pr3g2maqpfxdnjx99x39ln3p8k3ld3r1" } }, { @@ -42353,6 +42634,24 @@ } }, { + "ename": "flymake-relint", + "commit": "955201925a17e1259eb17872c772701620c43003", + "sha256": "1p67r3g8pk3fq7kqfh37k4vizpkvhs5daiq3406ljyp5q3nscij8", + "fetcher": "github", + "repo": "liuyinz/flymake-relint", + "unstable": { + "version": [ + 20230803, + 120 + ], + "deps": [ + "relint" + ], + "commit": "cded537b8208e87632e1fb5b9bdc819a736eb9a3", + "sha256": "17p3ffbjv362gbncajfpj3113h1iaz0hd7zq6svfwqhd22075xg6" + } + }, + { "ename": "flymake-ruby", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr", @@ -43199,11 +43498,11 @@ "repo": "usaoc/elisp-for", "unstable": { "version": [ - 20230507, - 702 + 20230808, + 1022 ], - "commit": "81f97e3f10c3ea9eb29759c2442dcf919d95d842", - "sha256": "08kgmd96fr4wy4win7hx213bndjy411rhnzn6cd3blhmvv2cirmz" + "commit": "9af133104995be358c019fa24301db7d8c55e9ff", + "sha256": "1jaf3qn6z3jid83srkvcj97xs44d0miv4kq8dabns6sahl51gqql" }, "stable": { "version": [ @@ -43303,8 +43602,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20230723, - 47 + 20230808, + 2212 ], "deps": [ "closql", @@ -43318,8 +43617,8 @@ "transient", "yaml" ], - "commit": "ecbcce94a5581077f8e1cda3e3f2a66c6dd52766", - "sha256": "1nq6xiq1hsrl0y7md16ddnkr2ycrsdbf2jjqjyaj3ldvdx9zbs6d" + "commit": "dc777b64ad33d0b70dc2067af8401a9598d21764", + "sha256": "16n0a2376b5516g05g4ax42bl20kylpa1sdbkwvphd7n58agvz95" }, "stable": { "version": [ @@ -43608,20 +43907,20 @@ }, { "ename": "frame-mode", - "commit": "1e83da89eeee834cc14c0b128d55ef3634f76fd0", - "sha256": "0ch58x07fnsx3v3r9cvcmqrqws121m8achjilhqk988hkg7y47c8", + "commit": "3d66f9db06b33aa019467cef0a8eba6c3fa2b530", + "sha256": "1jhzqlvl23i8y8fpzrrnjh0h7phss0wc333krd9c890c8r1q7yfc", "fetcher": "github", - "repo": "IvanMalison/frame-mode", + "repo": "colonelpanic8/frame-mode", "unstable": { "version": [ - 20190710, - 2030 + 20230823, + 1850 ], "deps": [ "s" ], - "commit": "ae2366969927c9f89ea07c999bef382b0b47cac1", - "sha256": "0fr4rc6axgk98sinsmqr6zhd2ba4djijmbpkha2vs1qn31p1z4g7" + "commit": "ab5e568a7c7259d31c252c263458bd76490241d0", + "sha256": "044ppidaapay08nw4gv85ir5ivxwwbys0gdvg6mbpf142qk093hb" } }, { @@ -44182,25 +44481,25 @@ "repo": "factor/factor", "unstable": { "version": [ - 20230120, - 1737 + 20230824, + 1321 ], "deps": [ "cl-lib" ], - "commit": "25236d56df9b39c607a6af75d4e16273201031bd", - "sha256": "0rd0hgcxafbji2gs7lwxbcchcq8qai1yrrh6rld3cfwi83qkm3jn" + "commit": "e10b64dbc53a8583098e73580a1eb9ff4ce0c709", + "sha256": "0fscknmhqc1lzjrv920wlch33vbxkys4290n51r9mrgz830lg41s" }, "stable": { "version": [ 0, - 98 + 99 ], "deps": [ "cl-lib" ], - "commit": "7999e72aecc3c5bc4019d43dc4697f49678cc3b4", - "sha256": "0d8zs78xnk1wqh821hs8zyjv9lphj2xmxclnr969y1d9axcblaxj" + "commit": "e10b64dbc53a8583098e73580a1eb9ff4ce0c709", + "sha256": "0fscknmhqc1lzjrv920wlch33vbxkys4290n51r9mrgz830lg41s" } }, { @@ -44707,11 +45006,11 @@ "repo": "wavexx/gcode-mode.el", "unstable": { "version": [ - 20221205, - 116 + 20230823, + 2141 ], - "commit": "3b17b5ba85e5a05dac79b15b5231ad41f0a0fce5", - "sha256": "1i515clygcknp3f1rcf5kl63cx29vmqqkmfg4gk78s1pdika06qi" + "commit": "4b54553a698d81e52dde14037df94774c7f30b95", + "sha256": "13nafw4rz1xfzcag0390xxs1nqadplvkrkiw72h0i8y2kwa9yya3" } }, { @@ -44823,25 +45122,26 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20230719, - 2251 + 20230806, + 1857 ], "deps": [ "project" ], - "commit": "761c65be5763a0cac161f2d9ea9dec510f58b83d", - "sha256": "1xzh5wfdgjq5ajd3siq07byy1a0hp7vmlv3qy06f87jk6k97plww" + "commit": "d743a8cd1df4101a6dc2226ccfc3b4883ec761c5", + "sha256": "1jbjhljjbwz2inh8x0ivsx6l1amm550cji6q2rdaay2jl8a8db0q" }, "stable": { "version": [ 0, - 29 + 29, + 1 ], "deps": [ "project" ], - "commit": "761c65be5763a0cac161f2d9ea9dec510f58b83d", - "sha256": "1xzh5wfdgjq5ajd3siq07byy1a0hp7vmlv3qy06f87jk6k97plww" + "commit": "d743a8cd1df4101a6dc2226ccfc3b4883ec761c5", + "sha256": "1jbjhljjbwz2inh8x0ivsx6l1amm550cji6q2rdaay2jl8a8db0q" } }, { @@ -45436,8 +45736,8 @@ "repo": "sigma/gh.el", "unstable": { "version": [ - 20221204, - 1817 + 20230825, + 1217 ], "deps": [ "cl-lib", @@ -45445,8 +45745,8 @@ "marshal", "pcache" ], - "commit": "e1423a54fc97924e75d1fde27911c3c678a7d6c3", - "sha256": "1fr4pikcjasqy41g86pjwhz3alky42m2z7ziag051xhcd8nlm51s" + "commit": "b5a8d8209340d49ad82dab22d23dae0434499fdf", + "sha256": "1vab2qdjyv4c3hfp09vbkqanfwj8ip7zi64gqbg93kf1aig1qgl9" }, "stable": { "version": [ @@ -45993,16 +46293,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20230731, - 908 + 20230821, + 1659 ], "deps": [ "compat", "transient", "with-editor" ], - "commit": "9e95c2381375cb064d54a6afe70d61140da6fa30", - "sha256": "1cyinp10lrgc3f68k55dxaaf3xj1pr28yflr2y2f6wms93yka2gs" + "commit": "6f54443aaaa0a822cc245dc6c66d2033c7dc0900", + "sha256": "17imm868lq6np7hc3w3fccfmh39ai0rdkmj8gxm81wpy8i8b7lsf" }, "stable": { "version": [ @@ -46798,10 +47098,10 @@ }, { "ename": "github-search", - "commit": "733a808400858513137e0e3d7d38b5b25e8ddc5a", - "sha256": "1pwrzbbwnq0il5494561fyvkr0vmm5jqlvpffgkk28c54vs7ms0b", + "commit": "1d8f08be65df326c35df502d819b4a4c5bff8145", + "sha256": "0bki9kwhnf54ypzxpdqlwzbz7k4yc8slv3sz1q3wqrkdi2fldiqz", "fetcher": "github", - "repo": "IvanMalison/github-search", + "repo": "colonelpanic8/github-search", "unstable": { "version": [ 20190624, @@ -47063,10 +47363,10 @@ }, { "ename": "gitolite-clone", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0mv2bdfqqq47wgikkm5kwpr8gajylf1yzk2j6cxljz09amgq6c8q", + "commit": "8095219ddb48e584df8a7c8b02ac4b80e4cd401c", + "sha256": "1ql2spba267kvlw5xmbp0wfy9qw4gz6jwbm7bmxpghxrqwm4d90q", "fetcher": "github", - "repo": "IvanMalison/gitolite-clone", + "repo": "colonelpanic8/gitolite-clone", "unstable": { "version": [ 20160609, @@ -47546,11 +47846,11 @@ "repo": "hexmode/gnus-alias", "unstable": { "version": [ - 20150316, - 42 + 20230818, + 1830 ], - "commit": "9447d3ccb4c0e75d0468899cccff7aa249657bac", - "sha256": "1i278npayv3kfxxd1ypi9n83q5l402sbc1zkm11pf8g006ifqsp4" + "commit": "cf1783a9294bc2f72bfafcaea288c159c4e3dee5", + "sha256": "0cs0cyi7hj7ga9aiqz4dafc07xrk3l5g9zzlbda9l90xbvyfssa0" } }, { @@ -48108,11 +48408,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20230624, - 2315 + 20230823, + 2304 ], - "commit": "f21347ae9cf68ea33031bf5125896e8f16c8183c", - "sha256": "17shrclbv0agz579wgsc49rlypx02x1w4zyikijdb4fz0lzq8skr" + "commit": "8dce1e3ba1cdc34a856ad53c8421413cfe33660e", + "sha256": "0l002gcjmwrfkc4972hc8sal6xaja05s50rg7cbv2q9axb18rcqj" }, "stable": { "version": [ @@ -49013,11 +49313,11 @@ "repo": "brownts/gpr-ts-mode", "unstable": { "version": [ - 20230719, - 1141 + 20230813, + 1727 ], - "commit": "2fac9f29e446c202566e0cc83042de33758aad17", - "sha256": "1w54vckl4axjr599rm8q7slkjyrrfrfgnqc0s4yczh3fh95l9i9g" + "commit": "2e4f89743b115b3e09f0574d0a6e67a7422c554c", + "sha256": "0g5pxggra2ijlfyw25bp4j8i741pmn0mxy0srqdwvhjlmpy57nhr" } }, { @@ -49117,14 +49417,14 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20230806, - 41 + 20230813, + 1808 ], "deps": [ "transient" ], - "commit": "c0ffce0849c8596d763d0ad603b9d67f75e93161", - "sha256": "11i5w3fb5x231xg4swmkgr022805rs8q3lv54g42111hv4a1d3xr" + "commit": "f0b18c5f8bad3fb67f8e2c40b97ad0104aded723", + "sha256": "0v1nafa15qqk0m7j1yb7p2dqgf33hk3a5jyihk48vi8nzrabkyrh" }, "stable": { "version": [ @@ -50441,11 +50741,11 @@ "repo": "idlip/haki", "unstable": { "version": [ - 20230802, - 729 + 20230814, + 1414 ], - "commit": "522948af6b7d562d70e366dfce152464f058b8ea", - "sha256": "0wyqagjlqnd8r40k33s5h5lm3fclgaaws48crigprf6rs307hqvm" + "commit": "bfa02d87b8b56965fbcc84d2662799a8e78198f6", + "sha256": "0kgqdzf9q3pxpmdn6kppjchv973v8nkghdp3rd83gkkjifgg7kjm" } }, { @@ -50877,19 +51177,19 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20230806, - 1107 + 20230816, + 1227 ], - "commit": "79af559b6d750aff32a916a81cc4fb63ecfd588d", - "sha256": "03j94fgw1bljbjqmikbn9mnrfifxf7g9zrb727zmnnrjwyi0wd4n" + "commit": "3e146c1a89db257bb75c7b33fa2a5a1a85aabd51", + "sha256": "1vckkl5jhijzqwfj9q26rjdkwhavci1v8wf9wjy3c5hsid3vd0bz" }, "stable": { "version": [ 17, - 3 + 4 ], - "commit": "6695ab8c601eae863b415dc3cc81d576471e3ce6", - "sha256": "0q7rqksxj0imp5mj3pb8api47fsrmcrh9graqkqg2mh9fvlprykq" + "commit": "79af559b6d750aff32a916a81cc4fb63ecfd588d", + "sha256": "03j94fgw1bljbjqmikbn9mnrfifxf7g9zrb727zmnnrjwyi0wd4n" } }, { @@ -51204,30 +51504,30 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20230806, - 1431 + 20230825, + 2026 ], "deps": [ "helm-core", "popup", "wfnames" ], - "commit": "663e98024c4ec322766010183901b2a4067fac68", - "sha256": "1a9785x2zw87zar2ywj7l7p9xc67n0bdz3vmi0325aqz4swbmfym" + "commit": "ba715602380efe758e3d1714106fc9e65ec8e793", + "sha256": "1m7x3jby0rh7103fmbigc3q4kiflns2yb7nyj32z4hy0z3fmpz3w" }, "stable": { "version": [ 3, 9, - 3 + 4 ], "deps": [ "helm-core", "popup", "wfnames" ], - "commit": "e347a2c98438e2dbb5b1f681729f00c0e816ffc6", - "sha256": "1mqr16vdlc2fqm5xkfrx5ll5iv61i7b63l1mpv48sl5rv2g8kb44" + "commit": "497f479ec113583c2570c03a526c999e3d410f95", + "sha256": "0p3031qa3vdy483yw4hvhrrs1xcfhgl7f0ab5m8kixfnr3facad9" } }, { @@ -52079,26 +52379,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20230806, - 517 + 20230824, + 817 ], "deps": [ "async" ], - "commit": "e347a2c98438e2dbb5b1f681729f00c0e816ffc6", - "sha256": "1mqr16vdlc2fqm5xkfrx5ll5iv61i7b63l1mpv48sl5rv2g8kb44" + "commit": "46819f85af7b879df1118bf7f997ffb64da3f98a", + "sha256": "0ivlcp5b2mmy6snyx7k8zkvgma66wiz00ggbkf4kfibyranx6qzp" }, "stable": { "version": [ 3, 9, - 3 + 4 ], "deps": [ "async" ], - "commit": "e347a2c98438e2dbb5b1f681729f00c0e816ffc6", - "sha256": "1mqr16vdlc2fqm5xkfrx5ll5iv61i7b63l1mpv48sl5rv2g8kb44" + "commit": "497f479ec113583c2570c03a526c999e3d410f95", + "sha256": "0p3031qa3vdy483yw4hvhrrs1xcfhgl7f0ab5m8kixfnr3facad9" } }, { @@ -53663,15 +53963,28 @@ "repo": "julienXX/helm-lobste.rs", "unstable": { "version": [ - 20150213, - 1546 + 20230820, + 1403 ], "deps": [ "cl-lib", "helm" ], - "commit": "4121b232aeded2f82ad2c8a85c7dda17ef9d97bb", - "sha256": "0nkmc17ggyfi7iz959mvzh6q7116j44zqwi7ydm9i8z49xfpzafy" + "commit": "3a1af0d063ca24fe0187daff12110171b942c7d3", + "sha256": "1kmj8nms1lsfj00n4s1bpnl8l4z3sqfrk4f03px0xwgzi77bvk4a" + }, + "stable": { + "version": [ + 0, + 8, + 0 + ], + "deps": [ + "cl-lib", + "helm" + ], + "commit": "3a1af0d063ca24fe0187daff12110171b942c7d3", + "sha256": "1kmj8nms1lsfj00n4s1bpnl8l4z3sqfrk4f03px0xwgzi77bvk4a" } }, { @@ -53682,14 +53995,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20230621, - 1538 + 20230819, + 1409 ], "deps": [ "helm" ], - "commit": "78418a73ca7e796bc95da47a0f3d6bfa0af382b5", - "sha256": "1giwvi1ds7s9ljymjmk36r10cxa1jc2gbssl67m0bqmpsi3vzxmq" + "commit": "d48113dd727073d99c2dc4ac39d5daf1676133e5", + "sha256": "00r26y6bdlhymhxrmr1ib3kl3p5c8naqsj9y29lml8b2r4phhr1i" }, "stable": { "version": [ @@ -54180,8 +54493,8 @@ }, { "ename": "helm-org-recent-headings", - "commit": "9ac277ed37b6dd8b7c9d31a283442d5365d9e7f9", - "sha256": "0n2bqiaqyk2hkbwa5wk9y1wyms9vin95f515m8crkqyh7g2rnsia", + "commit": "e6bad1e40f5598e7f910edc06592a02f3e44141f", + "sha256": "1wb2z6m63fc1491vb8265anskhs1hx5haa2gbj7mp2q7ymjvvs3d", "fetcher": "github", "repo": "alphapapa/org-recent-headings", "unstable": { @@ -54208,8 +54521,8 @@ "repo": "alphapapa/org-rifle", "unstable": { "version": [ - 20221024, - 1943 + 20230821, + 1927 ], "deps": [ "dash", @@ -54217,8 +54530,8 @@ "helm", "s" ], - "commit": "74725b63e71b1c941f354e6c8a2cf8b5ee7ef563", - "sha256": "0qfr98i07k2irxfgw92nhwpab9q7lbzfyczkj0qlkwn9lrdj6blk" + "commit": "03a52265040b8c6510a8269213d750c451779c38", + "sha256": "0wgphpa9qymrc36i4wniwm9dddx6inmj2mdv7hkb1kbld3b5apsg" }, "stable": { "version": [ @@ -54439,15 +54752,15 @@ "repo": "tumashu/helm-posframe", "unstable": { "version": [ - 20211103, - 236 + 20230822, + 2030 ], "deps": [ "helm", "posframe" ], - "commit": "87461b52b6f3f378c63642a33f584d4a4ba28351", - "sha256": "1hmf1l6hmir0kvpl5h0wk4l17nmk0lfi659lvg89jc1sm18v2xv9" + "commit": "0b6bb016f0ff4980860a9d00574de311748c40b0", + "sha256": "1asw6q53xbk7xc0da4w03f8p5z3jhfhg16ggwslgwxx8vjv5zvg7" } }, { @@ -55916,8 +56229,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20230730, - 1732 + 20230808, + 1519 ], "deps": [ "dash", @@ -55925,8 +56238,8 @@ "f", "s" ], - "commit": "6f8991a72c83d904725a9d6c00de2cabbef32de9", - "sha256": "14f1bdcpd8jq912d0rsyj9ajxf8p98rgyc7msx1c24wrknaspjh0" + "commit": "c57ff0d284b50ff430fe1f13fd48deaa0d1a910e", + "sha256": "1hw4v1nm71yzlk9pcyp1gi79fwhsadb1a8jqrf9flbglc6bpnz78" }, "stable": { "version": [ @@ -56011,8 +56324,8 @@ "repo": "licht1stein/heroku.el", "unstable": { "version": [ - 20230704, - 1217 + 20230811, + 1244 ], "deps": [ "dash", @@ -56020,14 +56333,14 @@ "transient", "ts" ], - "commit": "22b2b8442de444011fb2306f6a50bbe898cd1fc3", - "sha256": "0cv0jabbhl49dfks718bcl5hjq6niamyrsarlq87hqbw6603i5qb" + "commit": "b76db3801d759baece7865b238e99e494506dbeb", + "sha256": "1k7l7l2fhxyphbcrbdvj5rk98ma9xylcvlv9fm28ccd8ynzdfsrg" }, "stable": { "version": [ 1, 0, - 0 + 1 ], "deps": [ "dash", @@ -56035,8 +56348,8 @@ "transient", "ts" ], - "commit": "22b2b8442de444011fb2306f6a50bbe898cd1fc3", - "sha256": "0cv0jabbhl49dfks718bcl5hjq6niamyrsarlq87hqbw6603i5qb" + "commit": "b76db3801d759baece7865b238e99e494506dbeb", + "sha256": "1k7l7l2fhxyphbcrbdvj5rk98ma9xylcvlv9fm28ccd8ynzdfsrg" } }, { @@ -56983,11 +57296,11 @@ "repo": "ideasman42/emacs-hl-prog-extra", "unstable": { "version": [ - 20230709, - 2303 + 20230820, + 39 ], - "commit": "3ac2508a2220138ef97155624cb2f12e74b985a2", - "sha256": "0dm27j3m8ibrylfmmcvksimq6dl6d1xxrrfm6g105vim92rv86fv" + "commit": "b9a6a5d982b000d26ab365f16b4d5fdced2a3736", + "sha256": "0hl0bh1gnjianlx9kb451432afj9126kcqd9p03x6bicymfb67h2" } }, { @@ -57020,14 +57333,14 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20230428, - 1332 + 20230816, + 1415 ], "deps": [ "compat" ], - "commit": "b27cddf7373408681cc949c8ef829f87a01ed3f3", - "sha256": "1d9mkbd33zyx540ilp1vz8fgckvxv0qd2vyjgz11zh1qv1pfk8gh" + "commit": "0faf8569b67f5b23891416d9e7a67e3843338f2a", + "sha256": "0pl1iylf76vhfzhrqxbsknh9mw0gfqzng22i2aasjd0ljdgh4nxi" }, "stable": { "version": [ @@ -57334,11 +57647,11 @@ "repo": "axelf4/hotfuzz", "unstable": { "version": [ - 20230528, - 1112 + 20230824, + 1457 ], - "commit": "8bd60d49918995fb9640cfbc2dd149299e7756a8", - "sha256": "07ryqqjjvqsckkibx9nvzlbv5w86r136y21jdwrqvrl7adz6w42y" + "commit": "3076cb250d0cb7ac6c3ec746dc4ccfea09ccdb25", + "sha256": "0hc13big8cnqf19cjcdwq9k1plpc9401hf2ddxf4vd0gyqlxlsxn" } }, { @@ -57426,16 +57739,16 @@ "repo": "thanhvg/emacs-howdoyou", "unstable": { "version": [ - 20220715, - 1720 + 20230816, + 1650 ], "deps": [ "org", "promise", "request" ], - "commit": "f6c659a45f59a08546578c169524a12f0945c29b", - "sha256": "1iljws88j4jdqxyzcgssak3sra54645my8ls4n8lf6fygcnbvg2c" + "commit": "5a8d7878689d2c4fedbe040268bd5a43c169d16f", + "sha256": "0qmpwrw5slzrk7amicw9qj9pqz1wq1i7vkknvv85vbyvp0r6qz7b" } }, { @@ -58049,8 +58362,8 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20230725, - 2050 + 20230826, + 559 ], "deps": [ "compat", @@ -58058,8 +58371,8 @@ "persist", "plz" ], - "commit": "470684f3ef3ac49615691160ee42caaa27ca40ba", - "sha256": "0bnhjnhb1gqk4svn4r3czwzjcaxa4ca202isj2fykzdnxn1xlki0" + "commit": "74c5e32fae0077ea3cf8b4ff85a5468adf5ed953", + "sha256": "0h1shris8x9h0fsxr7mi7nwl9pi6bsc7c19arym5g8k9s2g54ihs" } }, { @@ -58262,20 +58575,20 @@ "repo": "ngraves/ibrowse.el", "unstable": { "version": [ - 20230720, - 715 + 20230813, + 2116 ], - "commit": "ed345cf0c4bd617caf8377dcf6472a4ebd68abd8", - "sha256": "043q3p7zlgnf2wiflfx63x8krdm5wxkb6zd9rzrddd6j5j2npzzh" + "commit": "0ace95c948b8fae87aaf08cc2b80ceb0b1713835", + "sha256": "0dqdldb5hmb6r99fkx1cjfr1b40nvf4i6hh44rk8y78kw9yfd4s1" }, "stable": { "version": [ 0, 2, - 0 + 3 ], - "commit": "2f82f9db95d45cb541ef22eceb7e16638d88ab36", - "sha256": "04ksiqgfg1xxych2hvqrf8yyrp3w2ah52q4sdf626pj3hp0vh1iv" + "commit": "0ace95c948b8fae87aaf08cc2b80ceb0b1713835", + "sha256": "0dqdldb5hmb6r99fkx1cjfr1b40nvf4i6hh44rk8y78kw9yfd4s1" } }, { @@ -58324,25 +58637,27 @@ "repo": "purcell/ibuffer-projectile", "unstable": { "version": [ - 20200805, - 604 + 20230817, + 610 ], "deps": [ - "projectile" + "projectile", + "seq" ], - "commit": "ecbe482804a217b1471593f6c7a8b3d64f3cdc47", - "sha256": "0gcars1zmfrysq1n3bv40nwqsk821bz3pffrsjw14fg2mwjpmaxq" + "commit": "710ecac1578273bf31debe52870f5844472e3428", + "sha256": "1n9fqkwjxilzlb86ia95pjdv8lbgvsp8lwkw47v9kjvq2vnmarv5" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ - "projectile" + "projectile", + "seq" ], - "commit": "504b0edaa0d937ce60ccc8fdf09f2dae0a90fbaf", - "sha256": "18cqxnwzzbkcj9jcaw89b210432yzhrl1dwsv48p0jbhfnr17k41" + "commit": "710ecac1578273bf31debe52870f5844472e3428", + "sha256": "1n9fqkwjxilzlb86ia95pjdv8lbgvsp8lwkw47v9kjvq2vnmarv5" } }, { @@ -58410,22 +58725,25 @@ "repo": "purcell/ibuffer-vc", "unstable": { "version": [ - 20230530, - 1713 + 20230817, + 606 ], - "commit": "ac07ed3db55059bfa4b22e762ad9475dda37f1a1", - "sha256": "1zw3pdvli3if4rl8r4mah3sbsxhl47325siqq3qs0k1bmwgyg0mf" + "deps": [ + "seq" + ], + "commit": "1388d2ea18287c74a79d053619dbdfa9090c26a2", + "sha256": "0mnxh6annmys4h1xhc2c7l7ajp4pwvdg68n30x7a21ad9qlvizil" }, "stable": { "version": [ 0, - 11 + 12 ], "deps": [ - "cl-lib" + "seq" ], - "commit": "1249c1e30cf11badfe032ac3b1058f24ba510ace", - "sha256": "1mgn7b786j4hwq1ks012hxxgvrfn5rz90adi2j190gmjz60rc5g5" + "commit": "1388d2ea18287c74a79d053619dbdfa9090c26a2", + "sha256": "0mnxh6annmys4h1xhc2c7l7ajp4pwvdg68n30x7a21ad9qlvizil" } }, { @@ -59141,28 +59459,28 @@ "repo": "KarimAziev/igist", "unstable": { "version": [ - 20230806, - 1423 + 20230819, + 1105 ], "deps": [ "ghub", "transient" ], - "commit": "87e71a596ae004f0ee3480753a03ab76f9eb927c", - "sha256": "1haq4cibqxbbj0wz51q3fbqsaz7qapjxkdal1d8yc7lmqdpjfd7d" + "commit": "64e6b1a865f51a02116a26ebac7e80b852e9e563", + "sha256": "0mk77p5iw04jrndjkz93kxsih1fqqc668w398nw9f62dir8lzl5v" }, "stable": { "version": [ 1, - 1, - 0 + 4, + 1 ], "deps": [ "ghub", "transient" ], - "commit": "b8944d96746c3a77d7a6340b679c69025a6ee840", - "sha256": "0y24i1wjhrn2mvzkbq4a6kqb372mcdvfs36qmwm08lxpwnr3s0fi" + "commit": "64e6b1a865f51a02116a26ebac7e80b852e9e563", + "sha256": "0mk77p5iw04jrndjkz93kxsih1fqqc668w398nw9f62dir8lzl5v" } }, { @@ -59752,11 +60070,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20220930, - 2107 + 20230817, + 2115 ], - "commit": "586b955dde5a0699fca76db28ad0d6c3e4141a27", - "sha256": "00jjkfa7aj5sssdsbkyh7crs2y6j3h9gyj3gmdapj8hk1wkbnc9a" + "commit": "f8f5511c4bffb1371bcb3b712b32ae6c832c15bb", + "sha256": "0wkwv2fjgsy4avarf6s4znjxaj2jscmlc8phpjhwdph627zpgyvb" }, "stable": { "version": [ @@ -59818,9 +60136,21 @@ "ename": "indent-lint", "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", "sha256": "0q2d5bbbz79krrhg60glxj62j017g3wrac66cjzlkk1zf37x8fll", - "error": "Not in archive", "fetcher": "github", "repo": "conao3/indent-lint.el", + "unstable": { + "version": [ + 20230822, + 46 + ], + "deps": [ + "async", + "async-await", + "promise" + ], + "commit": "aee76faf54a55e0bcb5dc07a667d7f5999299c9b", + "sha256": "19yixxsrwdm4wqch5011mk4gimsyh9rqzvrxkg7l7baa7am8v902" + }, "stable": { "version": [ 1, @@ -60049,11 +60379,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20230304, - 1512 + 20230822, + 1406 ], - "commit": "6f1df882ab319758af43877fa20465f6566efbf3", - "sha256": "11my63lfb3lcd2df0ych1hq3c3jcriws4ljvrmx1qqgxphli3dsm" + "commit": "03475ac1cca410ee63a523f5c63f859cfafe1aeb", + "sha256": "0dc01y4cnkv2sbk93nc4y4wk49qd38zkzr9n86qdzcaqg6qqpgz0" }, "stable": { "version": [ @@ -61209,14 +61539,14 @@ "repo": "pythonic-emacs/isortify", "unstable": { "version": [ - 20221121, - 1816 + 20230821, + 1632 ], "deps": [ "pythonic" ], - "commit": "2751fb23eea4a40437e7d9bca77cbc9c06b44f3d", - "sha256": "09j042cl7mvhbp1r1fzxl17qc9z5ba0s6h5nwjx1yph7x1f7gmcf" + "commit": "5ee404c5bee2772b4f3ee424df0a5b0aef7e6982", + "sha256": "1m4pxjxkxb8j2haxaynx7k2n8d1128jnmdbcxl63plr0x8a97z2f" } }, { @@ -62623,11 +62953,11 @@ "repo": "donderom/jazz-theme", "unstable": { "version": [ - 20230722, - 1307 + 20230814, + 1916 ], - "commit": "1905841af1df7b7075dcc8e1e3df4a9b5022f4a8", - "sha256": "08c9yhk00dwiyp73pgjdbyjngsmj8gpfkzb2x2sigsnwzv0hg8zn" + "commit": "b936b392e3ea3b6968530e3d5e5fccb9c454b5f8", + "sha256": "19gkn5i685nyzgbapfkwgyyl9av2qlgpa0r8kwnvp1ynsgl4jlxm" } }, { @@ -63064,14 +63394,14 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20230730, - 1200 + 20230816, + 2045 ], "deps": [ "compat" ], - "commit": "416b76abd9c3155797329c2204cf50e535ad566c", - "sha256": "0j49mhy9xhm79b5pi64fl1gzlqcf0vw48kjww0d7xf7g76zq5a3c" + "commit": "417d95002fbf6737d6463e56d2633badff25522c", + "sha256": "0ymnn00y5w09ccy1y9nzij8ajgpgwjnpp8c7jpdhsgsv91wj0py9" }, "stable": { "version": [ @@ -63149,11 +63479,11 @@ "repo": "ideasman42/emacs-jit-lock-stealth-progress", "unstable": { "version": [ - 20230117, - 117 + 20230808, + 1342 ], - "commit": "0a6881b887f846f224c939c598bf0807bde2018e", - "sha256": "1m57j6m9f1x79bgffgh86f9ffpmvk06vph2shk0ap1is4qbbckqx" + "commit": "46d7a8a02a01c81125e35c81fdec5295bb4cbcd2", + "sha256": "0gzp5ml553kz5abh6fby11h4f3fqrbl8p5vr21c9yifc7wwjhc37" } }, { @@ -63297,11 +63627,11 @@ "repo": "ljos/jq-mode", "unstable": { "version": [ - 20220610, - 1119 + 20230823, + 1003 ], - "commit": "071c1c29bac30351ad338136f2b625e5601365cd", - "sha256": "0idn59kab5y764vs9wnyrdfi4nf9rqyh727yv245afcq71g8zpzs" + "commit": "4d9e98e21642007bc32ba75a5c259760f1fcf451", + "sha256": "1jifbpa1wgljrzxyg93dhzcxrfmlnxnwlrgfs6627wl4sijh0msi" }, "stable": { "version": [ @@ -63687,15 +64017,15 @@ "repo": "isamert/jsdoc.el", "unstable": { "version": [ - 20230331, - 647 + 20230808, + 2224 ], "deps": [ "dash", "s" ], - "commit": "10606a37f70cbf419590bbbc292fe1e800435ed5", - "sha256": "1pzklbg7nnlh94n7npf8iykgqzias4zj8a4qpymz8viq4ar4lswh" + "commit": "98129da2d6f4b938f9833be3f760d30ebd2986aa", + "sha256": "186kp34gsb4bjjpdv9bajrg3hxhp2gqlvbnaz4gbyp4dyqmwq1fq" } }, { @@ -63790,14 +64120,14 @@ "repo": "taku0/json-par", "unstable": { "version": [ - 20230520, - 549 + 20230819, + 339 ], "deps": [ "json-mode" ], - "commit": "8d6f6adb24c08896fbc285b7144202074c2d6244", - "sha256": "0himbsm42sgjc576p45r1v5jqpr91lzi2s54lrj45gf0bixgvql3" + "commit": "9fff40e04a1956af6fcf48b5206e81143aec23f3", + "sha256": "05yxvl11b1nlv7f3wfxi7ai1q7h6pv6bqz2js0l1na9iy6qb3c7d" }, "stable": { "version": [ @@ -63946,11 +64276,11 @@ "repo": "iwahbe/jsonian", "unstable": { "version": [ - 20230724, - 1446 + 20230826, + 259 ], - "commit": "43ab410a017f01bff89f83de3b450da46691e6a2", - "sha256": "062p516gqah2bkwcci7nxb1ccj4rk8rcxxss6h1rqfifmn0i1lgp" + "commit": "75ecae8a3f449b324706700e4e336abe46b8de04", + "sha256": "1637mrcgny5afl4n117w8r2aj9gnpiwlaljh7ckl91xchamhq0qa" }, "stable": { "version": [ @@ -64159,8 +64489,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20230804, - 2013 + 20230822, + 2225 ], "deps": [ "dash", @@ -64169,8 +64499,8 @@ "s", "spinner" ], - "commit": "a88755dcb46380d6df2cf54c8e82d5aa15780768", - "sha256": "0i4f8bixhzvf7zjpyw118qdrg19kl8kh8b3fq9hfsikgjv9fancx" + "commit": "42765152415657c04a413c241d13ed736226da29", + "sha256": "0crgs46cmi2h8jxbm45916zwn0yqhi9dzwg5dfx2jwxl0k4fkcvz" }, "stable": { "version": [ @@ -64228,25 +64558,25 @@ "repo": "shg/julia-vterm.el", "unstable": { "version": [ - 20220912, - 246 + 20230815, + 2318 ], "deps": [ "vterm" ], - "commit": "e4d1c28935c47429442ddfcd735cb8d8c2d8db66", - "sha256": "0q11f5f7j7rwzd4n1r84cfzx8cw631h4nfykjqrm5zbgkc9zmfd0" + "commit": "6d67b618a6f2714d283095b088b12859fb663df9", + "sha256": "02al9s2fb9a1nf6s31szbh0pxw32rljj8fpmx9bs132c54x79ph8" }, "stable": { "version": [ 0, - 20 + 22 ], "deps": [ "vterm" ], - "commit": "738b9eb50b9febbca2bdcd5e880450eec707c1ee", - "sha256": "0fj7qxxizpz7lhq2nf47mfphcb1kjndgkvihhzjhvmhdxn0apmms" + "commit": "e4d1c28935c47429442ddfcd735cb8d8c2d8db66", + "sha256": "0q11f5f7j7rwzd4n1r84cfzx8cw631h4nfykjqrm5zbgkc9zmfd0" } }, { @@ -64442,29 +64772,30 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20230612, - 1546 + 20230821, + 318 ], "deps": [ "f", + "inheritenv", "s", "transient" ], - "commit": "e5393959ecfa935de99757ea83da2ad6777e5def", - "sha256": "0lrb1kczsnjs3ni72k912b08jssymy1hm9nj9ajz2vv9m71wjizl" + "commit": "30350ded297b74980e0cafb75030001a21531acf", + "sha256": "0gp0xfjr4a39gxx971wshd0xb0wdkkdc0lvnj87894kl3pq37fc2" }, "stable": { "version": [ 0, - 12 + 13 ], "deps": [ "f", "s", "transient" ], - "commit": "e5393959ecfa935de99757ea83da2ad6777e5def", - "sha256": "0lrb1kczsnjs3ni72k912b08jssymy1hm9nj9ajz2vv9m71wjizl" + "commit": "d8fae037a873b51e0b14b137f1c2b813dc89b853", + "sha256": "18br70n3jv6pxm3hrvlj5g01ja7lhkqw9661fz28v63liidnpbkh" } }, { @@ -64929,14 +65260,15 @@ "repo": "seokbeomKim/kconfig-ref", "unstable": { "version": [ - 20230805, - 737 + 20230814, + 1052 ], "deps": [ + "emacsql", "projectile" ], - "commit": "d2f27295053805c5ef4eea5f74e1920f4a24cb25", - "sha256": "0ypbv9ydwdkph9jhg7bzwskz6ihdwidqgxbyspb8mwwgrsq91zgi" + "commit": "a3f602032cd3b9a7167505bd8ad0f156ae34c0b8", + "sha256": "06gdjmnxl6aciclqjha56z5q4k0ix6yy4mabgy5smqnd2j2z4myk" } }, { @@ -65566,28 +65898,28 @@ "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20230802, - 655 + 20230817, + 553 ], "deps": [ "dash", "transient" ], - "commit": "e6e3acdbe41ab98a538c217309542e88b9d1d57c", - "sha256": "0pbcamjkxcs1d3n7psp0ikwg7fkll5x9sbb6392wmncsx1i441rs" + "commit": "3ff4e19dd218c57af8da05b0b7c0c7349f99bb97", + "sha256": "146q54ias8j9hjd4vfxfwspkh9di0hfxvqfavjgz0xznjr9rcg20" }, "stable": { "version": [ 0, - 10, + 11, 1 ], "deps": [ "dash", "transient" ], - "commit": "e6e3acdbe41ab98a538c217309542e88b9d1d57c", - "sha256": "0pbcamjkxcs1d3n7psp0ikwg7fkll5x9sbb6392wmncsx1i441rs" + "commit": "3ff4e19dd218c57af8da05b0b7c0c7349f99bb97", + "sha256": "146q54ias8j9hjd4vfxfwspkh9di0hfxvqfavjgz0xznjr9rcg20" } }, { @@ -65830,11 +66162,11 @@ "repo": "WammKD/emacs-klere-theme", "unstable": { "version": [ - 20230214, - 213 + 20230822, + 144 ], - "commit": "61d2cd649a1cf57ce61063f76b395f21f358372e", - "sha256": "006130dd83h5d3qxj7x8j64pxq05mq0rcyx68i5n2lfwj94k6sv5" + "commit": "fa83ea76c92705bc3c1b881b615a666ae3acae28", + "sha256": "1p5hig507vdrs9fwdhsydq00vysjyb1b4yscjfq1rfc637qqgcxl" } }, { @@ -66434,16 +66766,16 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20230805, - 30 + 20230819, + 1456 ], "deps": [ "memoize", "request", "s" ], - "commit": "01d481ca41cc122899ad94a97153f81fe6e7f65e", - "sha256": "0nyip0kli5baiyshj1389najk8zzh948i1kmq287nzsy02ljgyfv" + "commit": "44cc2630adaa02f902bcf28fa05f3a9039dda005", + "sha256": "1s027dmf2awd8qyrg33zr3slbwkpc00c586cld5kp5ky5gawaxsv" } }, { @@ -66493,11 +66825,11 @@ "repo": "zakudriver/lacquer", "unstable": { "version": [ - 20230206, - 756 + 20230824, + 725 ], - "commit": "8a4e7dc1827862ad025f2af5354ca377cc660939", - "sha256": "05h8ycdmqds016m17hz86v4xnlsy060lmfrjddy3cazwzgs1a4s1" + "commit": "c8a0fb81f18001b3d510f545ba253ed4f9a50f5b", + "sha256": "0vdaq863q0hk79y5i2j9py732b22d7vcdnlcsan88j4rr1c5zbc3" }, "stable": { "version": [ @@ -66823,14 +67155,14 @@ "repo": "slotThe/change-env", "unstable": { "version": [ - 20230220, - 637 + 20230810, + 542 ], "deps": [ "auctex" ], - "commit": "748cdbb4bbf29a2e5053cf3d965e95cc7db67fac", - "sha256": "1kca90skv4pp7j08jgbhhkmvr5aiwp88gpdx869g53nqy8ssishh" + "commit": "968f38f0699c72ed5e8be2d0531424d16280f0f4", + "sha256": "04ivfpp1rm4zf47s11qkc9g1dnvymy5xm62q842g77icf12vgv0m" } }, { @@ -66926,15 +67258,15 @@ "repo": "enricoflor/latex-table-wizard", "unstable": { "version": [ - 20230516, - 1857 + 20230821, + 1507 ], "deps": [ "auctex", "transient" ], - "commit": "2998be936aa31415051ee2a8d2912424045d966c", - "sha256": "13liqmp7s24lqkq1583qas3y0idgnplk3zjrswm8v4sn80i79vjr" + "commit": "9dcc3d62ce2be04946b67cc023f8655c0a14aa7a", + "sha256": "1db8fb995gz5ndmlp9q3gxwhnrf1gf6dsipkglm9bnacg5kv9mq2" }, "stable": { "version": [ @@ -67432,11 +67764,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20230727, - 615 + 20230810, + 1707 ], - "commit": "846dd204dbf7d181947a5b6445ca19b37b3b06b0", - "sha256": "1rc7b5l5v9d2f59n92s3rqjnsr9gclgbzn1595m2j2lvw6li7pmn" + "commit": "6ca9e1b487ba642dbc28a2d81e0dbbb1a5a617ba", + "sha256": "1rj9lq5k0h0slqs9qp1f2aqnd23ghq4g3kmi8ndwnj565zqwmz3y" }, "stable": { "version": [ @@ -67682,20 +68014,20 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20230523, - 841 + 20230812, + 1827 ], - "commit": "59123b1f0a4a1d195bf1726bf82371e3455470a8", - "sha256": "142y0x25cpagz3rgm9qzslpcc42ln3zx2fjn2n785gm3g4rhxf77" + "commit": "b73a51a71ab8424bc2da8891f28e5239eac1236c", + "sha256": "159y2l4qj5gk1c9676mm5nrmpdljb4jm6sc933gq6q4p34wvrmgc" }, "stable": { "version": [ 1, 1, - 5 + 7 ], - "commit": "59123b1f0a4a1d195bf1726bf82371e3455470a8", - "sha256": "142y0x25cpagz3rgm9qzslpcc42ln3zx2fjn2n785gm3g4rhxf77" + "commit": "b73a51a71ab8424bc2da8891f28e5239eac1236c", + "sha256": "159y2l4qj5gk1c9676mm5nrmpdljb4jm6sc933gq6q4p34wvrmgc" } }, { @@ -67931,11 +68263,11 @@ "repo": "mpdel/libmpdel", "unstable": { "version": [ - 20221229, - 916 + 20230816, + 839 ], - "commit": "e7d35ba9254ead1516133f182a01f6161ae26388", - "sha256": "03bavca89cf7dsjmg7hb48qnvca41ndiij33iw5yjjhbq1zyj8r4" + "commit": "ca5397f1d66462e11c9ff4a49d308d92aef31b29", + "sha256": "1170lmj79r3hm05j58l9fgxsn57027pa9syplbqhv37cgpram6np" }, "stable": { "version": [ @@ -68093,20 +68425,20 @@ "repo": "ligolang/ligo", "unstable": { "version": [ - 20230803, - 1446 + 20230815, + 1212 ], - "commit": "bdd69fa7cd9adc8756ca9e688ede0335672e29cf", - "sha256": "1625fwwc7n02zgppshmqqvzw0792527irnwx1qhdslx5pvcjbljp" + "commit": "d59593717f7600faba4d20d4a2a2fe851df96317", + "sha256": "0gz0wlsf3mm7fx9axizvp2g7n921qai5lxawa3fkbf9xsvc3adwi" }, "stable": { "version": [ 0, - 71, + 72, 0 ], - "commit": "bdd69fa7cd9adc8756ca9e688ede0335672e29cf", - "sha256": "1625fwwc7n02zgppshmqqvzw0792527irnwx1qhdslx5pvcjbljp" + "commit": "d59593717f7600faba4d20d4a2a2fe851df96317", + "sha256": "0gz0wlsf3mm7fx9axizvp2g7n921qai5lxawa3fkbf9xsvc3adwi" } }, { @@ -69485,28 +69817,27 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20230730, - 1641 + 20230818, + 1411 ], "deps": [ "datetime", "extmap" ], - "commit": "32d833559100da489896e8791c9c6284ccb32ea5", - "sha256": "021363pgvapvmb08dy0x6m4lb8bvd6nvwix075hm7hxg03a9kvkb" + "commit": "cabaf93f1df86c92aa022dde4a92d92371d72572", + "sha256": "0l09ayjwj5fwampbpfzdfn83h2vcj1l8n0hh91r9p1lvl1kz9lsw" }, "stable": { "version": [ 0, - 16, - 4 + 17 ], "deps": [ "datetime", "extmap" ], - "commit": "ae54a3f4d86be541d3d25e36db3f615cb2d7c4f6", - "sha256": "1454dhy3nzhbqfg02n4kx9q5q99a9299gjwlx94zd6i5yhvi3b6c" + "commit": "a0f0ad3e0145eab382ff325cc95ec8ccbd6d68e3", + "sha256": "0i23hyxypagz0rs7wb5l77xwz38wxng21p57n5f0vnz4p24yv108" } }, { @@ -69642,16 +69973,16 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20230506, - 2230 + 20230812, + 1837 ], "deps": [ "compat", "map", "seq" ], - "commit": "fdc5f6cf687bdde7b19f9252d1d6c0f49d0ede54", - "sha256": "1arkrg9rx7dd8lnwa6y3qrl4z3r81mmdl3mg9had230mpd9bwij5" + "commit": "9cae74c01fff32b02e8b4ac082a8fca5d8da7a7d", + "sha256": "1b44f9n0h21z3nfd8nfq4hqzcg29s3wwmics0730r6y5h87sjbjf" }, "stable": { "version": [ @@ -69826,8 +70157,8 @@ "repo": "emacs-lsp/lsp-docker", "unstable": { "version": [ - 20230627, - 1601 + 20230824, + 947 ], "deps": [ "dash", @@ -69837,8 +70168,8 @@ "s", "yaml" ], - "commit": "175b587e0def23d4560abdb06b12e05ea469aaea", - "sha256": "16rzvz159zc963via5bajrs2xhhl0d73ycw3i7calqsp31x4747q" + "commit": "6b7701917417e4e74961185051c147e1bf003750", + "sha256": "0xnc9lbjflwdhslp8z44dk0dqsq4x9zirwbzgfg95ai2z76ldmny" } }, { @@ -69881,8 +70212,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20221231, - 1655 + 20230814, + 1827 ], "deps": [ "grammarly", @@ -69891,8 +70222,8 @@ "request", "s" ], - "commit": "6d111728f9d062d723bb88bd462b6eafe5cafe3f", - "sha256": "05gqsz3jdvh1ni11jkvzy6qghz9nwr25yr21dabqcmc2zxld0j6n" + "commit": "ac651a717af5e1effcd853846957fa0e85d82061", + "sha256": "0rzl1qv1q2sjizxwxx8i1v4wjr0h04xz96aklvg8z810gi3vf92g" }, "stable": { "version": [ @@ -69919,15 +70250,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20230104, - 1508 + 20230824, + 850 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "3249cde75fb411f95fe173c222b848182fd0b752", - "sha256": "06n16v278wzzh1iq4lp0k508dnynrz5c0qbv86hksm7sa4a4w4s7" + "commit": "c443f1536404c252dbd16cf44eb47cabdcd6c45f", + "sha256": "05gmys1sljpn4lx8c5rn8gyfyjdiyyzj3rc4qwyaqz6db915p3pv" } }, { @@ -69989,8 +70320,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20230801, - 943 + 20230815, + 717 ], "deps": [ "dap-mode", @@ -70002,8 +70333,8 @@ "request", "treemacs" ], - "commit": "79882a2d2956c00a15b9497903ba0cc4da754cba", - "sha256": "1nifbr9pg75x3f4npp6lyy59j8r61r7sga536yn3afk6wf75kip9" + "commit": "08d41ba445f2830a51995de11f7f2c0ba9a826fd", + "sha256": "0ippkg4sly57hrqlap6bp0j7m5a9n4prd075zyxz2ln36c4fgqm7" }, "stable": { "version": [ @@ -70052,14 +70383,14 @@ "repo": "fredcamps/lsp-jedi", "unstable": { "version": [ - 20220430, - 18 + 20230824, + 1908 ], "deps": [ "lsp-mode" ], - "commit": "5e3eb3e160c2d38b8bd2b5cd3b86fa4f823f9330", - "sha256": "0kax988drrzsx103v71bz4vczh4bg0n80arrzm4r6sgrk01219j0" + "commit": "3c828df8dd422dbb94856cc99db6f9acb52b871d", + "sha256": "0a89328vnarndv0a4xfpb4yap6i00q9prlxijg66bkg5l5gchlcl" }, "stable": { "version": [ @@ -70178,8 +70509,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20230721, - 1656 + 20230817, + 827 ], "deps": [ "dap-mode", @@ -70192,8 +70523,8 @@ "scala-mode", "treemacs" ], - "commit": "926e680add8a9648b20962bc97336343456236a1", - "sha256": "1hz1hxqrkmr9xkpdbvl0ngjmm6r762s0yfc4sxkbxxiacb11g5ix" + "commit": "811f02e4416d208102350ea48404e0310ffea647", + "sha256": "0q5piqh9k6sg8788dg3s0q59drgbj5d2sf444f413ryr3dph2gbk" }, "stable": { "version": [ @@ -70223,8 +70554,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20230806, - 1507 + 20230823, + 446 ], "deps": [ "dash", @@ -70235,8 +70566,8 @@ "markdown-mode", "spinner" ], - "commit": "5c36d25a4f411bfbe01ced442a186b75c661c1f1", - "sha256": "1z69rwp0dhz1l714b60xzcqh0nga760fyiwfzhsn3wcb0fb91mxf" + "commit": "f8ed844b6e23c7717fb69d6c645aa41f0772c557", + "sha256": "0xra5cvaw4ai4zbf2xvkw5jlmbgm56cgkhzdzbyrkai57phjmd8y" }, "stable": { "version": [ @@ -70286,15 +70617,15 @@ "repo": "emacs-lsp/lsp-origami", "unstable": { "version": [ - 20211016, - 1045 + 20230815, + 704 ], "deps": [ "lsp-mode", "origami" ], - "commit": "5b88ab77dc2696c93fa5dd9debe183821c533b71", - "sha256": "0chf7b8qdgzm173crpbz3vl3kjhgcdsmkprz8bf6w3qb5lpvaysw" + "commit": "86aa06517910141c3d5054eea5f7723461fce6a6", + "sha256": "1nvz60iwdh5wkcflyk53lfwsd2yjniribvw95x9968sf9icf2dqw" }, "stable": { "version": [ @@ -70498,16 +70829,16 @@ "repo": "emacs-lsp/lsp-sonarlint", "unstable": { "version": [ - 20220510, - 1802 + 20230814, + 1954 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "a429be2aea7797369a3c751ef54e3554733117be", - "sha256": "11rgfn9sdwxsncc4xrchiqn9dbqi3zirjvbz91kc5rvjv436077b" + "commit": "d131779950d5d45c3129eb088cef5fd11099f47c", + "sha256": "0qr9cmk148rcvn0swnvhicyy89n6lw8gkchxvvd8lwwl4ky6x9pb" }, "stable": { "version": [ @@ -70532,14 +70863,14 @@ "repo": "emacs-lsp/lsp-sourcekit", "unstable": { "version": [ - 20210905, - 2017 + 20230815, + 717 ], "deps": [ "lsp-mode" ], - "commit": "97ff36b228a61e69734c7180f33cc6951b1a600f", - "sha256": "1pal3mga7nwfcvri1cffsjgcbbhk7wd1icd622qspqgq0zkfs8jd" + "commit": "1cd5e7d2699598a97bdbcd289d9a88b249db474c", + "sha256": "173xqk02k3sh0xblnj12zyj8fh79z1my4vm0yv5mdddyq15b1pqy" } }, { @@ -70580,8 +70911,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20230703, - 629 + 20230811, + 611 ], "deps": [ "dash", @@ -70590,8 +70921,8 @@ "lsp-mode", "treemacs" ], - "commit": "7be7f30c2ddc6d392a1ff0304d439d0cf14b2771", - "sha256": "1g5sp5bcv1cks48rvvw0j8cczhnlnpx7lx05pvalaxxhlnyvx9zj" + "commit": "e66ae2196503d4e84334519e56b4388feffa5060", + "sha256": "1x3qylhhk862l88s80r6paagyjh8bw8kamx4hpwh429r88mb9l6v" }, "stable": { "version": [ @@ -70617,16 +70948,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20230116, - 2024 + 20230811, + 552 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "295d8984da06a745b0a36c56e28ce915bc389adb", - "sha256": "1s3vc0rpwwck1g61gh55nq6sqaf7rq16yqg5ayj45z3gd4gd29xf" + "commit": "0dd39900c8ed8145d207985cb2f65cedd1ffb410", + "sha256": "1p6lrxvbrq3lv7a1xmbbrsjmgw75p2ay7bpbgdvimrv56fcdys96" }, "stable": { "version": [ @@ -70651,11 +70982,11 @@ "repo": "immerrr/lua-mode", "unstable": { "version": [ - 20221218, - 605 + 20230810, + 931 ], - "commit": "ad639c62e38a110d8d822c4f914af3e20b40ccc4", - "sha256": "1p653jbijnjfcgv66k2gjzcg6flqhzfyab8l7b0sf89zwbmkil3r" + "commit": "7eb8eaa420c25477c830623b830fd18dc350cdfb", + "sha256": "12bv7rlhz8gncg142780ri4mhzrzd06xjrg8i0mwxb2rn8i0nidc" }, "stable": { "version": [ @@ -70745,11 +71076,11 @@ "repo": "hawk/lux", "unstable": { "version": [ - 20220328, - 1301 + 20230823, + 844 ], - "commit": "f9335e885611c2a5d65c449facdad72c28b3ff9c", - "sha256": "1vm92yaicxafb2c9lw9q1f2012aj9c7pz4g30nv0i0qrygyffg05" + "commit": "f3b8efa86568e88c71da92fd44b1000bfe006825", + "sha256": "0z9qkdkn4mhpxv9vl3jwdmybl7507lvdiw8mp4hixrqkc1cck1hl" } }, { @@ -70976,14 +71307,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20230427, - 1110 + 20230814, + 1525 ], "deps": [ "transient" ], - "commit": "1bd8406c84a80204f69f8bc328ab842a049a1aab", - "sha256": "1sdyw8ry9vjwygzvx9g1siilxvzax7hsj305dxn0dzxk1h8mcwly" + "commit": "0a99de715b1f62a01d8128dfaef263a168ee05e4", + "sha256": "1nh92wm6w0a1jl7j5kabwqi56q86j66577z9252kv61cdzy74lb5" } }, { @@ -71017,14 +71348,14 @@ "repo": "emacsorphanage/macrostep", "unstable": { "version": [ - 20230518, - 1911 + 20230813, + 2123 ], "deps": [ "cl-lib" ], - "commit": "633586421e7fc14072cc1ca1655c1103b81a9093", - "sha256": "1sxvp1q8naf0328l9fs90nk8bzsv485sajx4khh77nwkz3v4sr9f" + "commit": "0b04a89f698c335c9ea492553470a8d45c113edd", + "sha256": "1735wqjb1n5q0pckh2sch2vqr7z2ycl6ns4rr5q3wvf5njpb22sv" }, "stable": { "version": [ @@ -71147,14 +71478,14 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20230804, - 949 + 20230817, + 1258 ], "deps": [ "compat" ], - "commit": "aa75213fad924a2ca72c6e2ac526f4d40a53682c", - "sha256": "0g0k0fxbkjkkbkajkymrwigfb381kvy6vfan6hlkbjhqp5y631fp" + "commit": "327be988d4c9938ca5d04b6e37bc922525b6de93", + "sha256": "0jp3fkgd6jdg1zqpfycd7ry94n7cl1pp8m0mxii6rx52pnrw520c" }, "stable": { "version": [ @@ -71174,8 +71505,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20230804, - 1052 + 20230821, + 1700 ], "deps": [ "compat", @@ -71186,8 +71517,8 @@ "transient", "with-editor" ], - "commit": "dd6ecd5fe59087b5658f0a99e1d946e7fbf2dbea", - "sha256": "031ss0ls8z1wwz7kzasrdwrnvbs21fcyqmhxr8w4k39yanhlh7x8" + "commit": "f8353f575e9ed968715a685d69501e5c105f2aee", + "sha256": "0ycd0hqv80pkbk9gjvz44y7v0bilq2z0hij3yrbbmghhwvr58hgd" }, "stable": { "version": [ @@ -71677,15 +72008,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20230731, - 912 + 20230805, + 1908 ], "deps": [ "compat", "dash" ], - "commit": "e8152c76bf636805c0eb9027083d0ff10d28d1a8", - "sha256": "0i1wi8gbngdykbzrv9pf111qbcwi52lyhr1a3vmswwcr9d33z2qf" + "commit": "d73a3b11db7c25175cf710b1b135ff7e07125115", + "sha256": "1334jllz1lsjqdxgs4bz6yv6yywnn4jbgp24c1n50n10mngnp66s" }, "stable": { "version": [ @@ -71817,8 +72148,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20230307, - 549 + 20230826, + 213 ], "deps": [ "async", @@ -71830,8 +72161,8 @@ "s", "transient" ], - "commit": "7724259a008144b8cfc6cacdae3e764f207a03e7", - "sha256": "184b650lsq9h93ibx8lmr9xn5kjmr0czxx2vzdn8frkbrhdig0sw" + "commit": "8da7a8e9008281999567a2fb39f2d13d102abfbb", + "sha256": "1kssa48w53hn1a92m5j5qh2pp0snvpa3c3y3kcyjl5qyv6cczp3p" }, "stable": { "version": [ @@ -72631,11 +72962,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20230804, - 305 + 20230820, + 2349 ], - "commit": "50ac14ffe4e23224c74adf2b90a4833ccb62a416", - "sha256": "1jcygpcf6mwjhs8bzzl7zkvs0zfvm1r9rp9ngjji55av1ypz2ncn" + "commit": "c71548a58f9b611a6670ba8e9036d3d8e8435bf8", + "sha256": "0zbja5wi4dy1brhz982cw4if3xjrfnsqdr5nbl0kh78f0fz8kc9r" }, "stable": { "version": [ @@ -72705,30 +73036,30 @@ "repo": "jasonm23/markdown-soma", "unstable": { "version": [ - 20220802, - 956 + 20230819, + 340 ], "deps": [ "dash", "f", "s" ], - "commit": "e604b9e4a65bbd2057befbfaebfa73d00bd9826a", - "sha256": "1rz96x42g5cigzhmpvimxh8c9hb576kyzgnnbkd0jbn8ag0aw4zw" + "commit": "a80ed319a835efeaf7d71f49df0be143939bcc13", + "sha256": "11p486r79rklfqad7ar9cbyg4czla59fl0zcc0asa5zgdav17mww" }, "stable": { "version": [ 0, - 3, - 1 + 4, + 0 ], "deps": [ "dash", "f", "s" ], - "commit": "e604b9e4a65bbd2057befbfaebfa73d00bd9826a", - "sha256": "1rz96x42g5cigzhmpvimxh8c9hb576kyzgnnbkd0jbn8ag0aw4zw" + "commit": "a80ed319a835efeaf7d71f49df0be143939bcc13", + "sha256": "11p486r79rklfqad7ar9cbyg4czla59fl0zcc0asa5zgdav17mww" } }, { @@ -72961,16 +73292,16 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20230725, - 1217 + 20230822, + 1652 ], "deps": [ "persist", "request", "ts" ], - "commit": "20dec8871c9bb5f5e418bfc197e7533b5e3065e3", - "sha256": "15cfjny99yw5frdp8nlyazlwgscvfvbinsj0fbdfprxf50k2zjs6" + "commit": "b54fc1b6d405024c2b5c6019e60ee7ed0744b66c", + "sha256": "02gwahrpy6lz50iaicbqyj9q496200iw3prbkm00jp18vqlpxdgn" }, "stable": { "version": [ @@ -73236,20 +73567,20 @@ "repo": "dochang/mb-url", "unstable": { "version": [ - 20230804, - 504 + 20230811, + 442 ], - "commit": "f4512a7f85dcc858404922deda1aaa952baf4e00", - "sha256": "08adj17bigsrf7jjrsvk4cg0ipj9a430cgi4h7ickarns2wwlia2" + "commit": "a9f1e8ab46858c35a600ce304748a7db65400bef", + "sha256": "1bihsi0qlvkz817jbbw3352rvmb9iy73l4m9gqr33ca3sxs6qavq" }, "stable": { "version": [ 0, - 11, + 12, 0 ], - "commit": "a6e5209a3569857836c5f6e58eb33ec98a9f6700", - "sha256": "0rypc37pr2v57fqkr50aaqrp2159lxw8llmvflkxl9zk3fwnrm80" + "commit": "a9f1e8ab46858c35a600ce304748a7db65400bef", + "sha256": "1bihsi0qlvkz817jbbw3352rvmb9iy73l4m9gqr33ca3sxs6qavq" } }, { @@ -73701,20 +74032,20 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20230801, - 37 + 20230822, + 2304 ], - "commit": "5af47984895fb7b9a5a65a8d919ba62680a975da", - "sha256": "0q0yyhqrmvxqf4kw37rk9a44csyb2w88xw19z2r2w04lflp9qs8d" + "commit": "f553db183a47b23d037b1a7f1cab48b0b4798a37", + "sha256": "1xd9v2ac44kxkbd1va70v7mfccmpnchgl7ipnhikq9y8jha02brr" }, "stable": { "version": [ 1, 4, - 3 + 4 ], - "commit": "023183656e86165c293359969ddf6f2566b4cb65", - "sha256": "12361i7g1kg7hyhxzq3swxjad64zxj33dkjgwx6gc7zd640hqphx" + "commit": "f553db183a47b23d037b1a7f1cab48b0b4798a37", + "sha256": "1xd9v2ac44kxkbd1va70v7mfccmpnchgl7ipnhikq9y8jha02brr" } }, { @@ -75119,20 +75450,20 @@ "repo": "DCsunset/modaled", "unstable": { "version": [ - 20230625, - 1448 + 20230825, + 152 ], - "commit": "fc520f46780736147ab015d825c7332a9dd1a855", - "sha256": "1hps3klzl17sjdsjkgy35b7akvqs5cs8xwh9jnvcak4sfzdgzz0b" + "commit": "98f58e6857877bc1b593e86ee0ee61ad64daaf24", + "sha256": "1x9zc9c2w7slihc2zkbc5msx48fjhcmsmc6kp7ljhgnz8v1dlvig" }, "stable": { "version": [ 0, - 4, + 6, 0 ], - "commit": "fc520f46780736147ab015d825c7332a9dd1a855", - "sha256": "1hps3klzl17sjdsjkgy35b7akvqs5cs8xwh9jnvcak4sfzdgzz0b" + "commit": "98f58e6857877bc1b593e86ee0ee61ad64daaf24", + "sha256": "1x9zc9c2w7slihc2zkbc5msx48fjhcmsmc6kp7ljhgnz8v1dlvig" } }, { @@ -75394,11 +75725,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20230804, - 933 + 20230825, + 337 ], - "commit": "a42240aa71dd80336b62868b16effbbbbb280a4b", - "sha256": "0sas3zymw5n8gs4jn3k9cbd7lsgrwzq51kc18dnffx3ijq27gl7r" + "commit": "b23c84e6b44e13ed12758eda05ab9d5f75928315", + "sha256": "1k2mh9sqamwa3xcd3rf3i0r29qww2bdbihhq4kc8yqwpvn605n6a" }, "stable": { "version": [ @@ -75418,11 +75749,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20230518, - 1108 + 20230818, + 554 ], - "commit": "41bab7a3974b81dc40226bfd1e0190e2d7e57db0", - "sha256": "0svzk4czirvjpfr1s00wdksnpd0hqj64xwlxnl33jmpnkscp29yz" + "commit": "51795cd85ea5f01f3b2a82476914419a5bd89a55", + "sha256": "157mqrlwwkf5pzpnxf5y69qjr0nf4rb6xj40pph8h5gdb9pqdchh" }, "stable": { "version": [ @@ -75585,11 +75916,11 @@ "repo": "ideasman42/emacs-mono-complete", "unstable": { "version": [ - 20230405, - 529 + 20230808, + 1345 ], - "commit": "29436788b9ebe8a147b1deece6e86151528880f5", - "sha256": "1x423ga1p8svfwizaj3bd84q2f3qnvlq880zrni7r2fh3jizxwqf" + "commit": "d22df33d3523f1c0adf62bc0546da22792a2852d", + "sha256": "0g0xlxn33yi8v0smncwjz46mxnc742zryssmf1w4k00856ydd6bm" } }, { @@ -76127,11 +76458,11 @@ "repo": "google/mozc", "unstable": { "version": [ - 20230804, - 1700 + 20230807, + 1644 ], - "commit": "e6bc2b6c959758bbec5125e6f478aad437572699", - "sha256": "0mhrxxfyjzvrb8q26m9kqlrc40xfnryh0vl77r3h1z4sx7ywyh5q" + "commit": "9a925ee918e4b9c0266fb61b5cb2735f21ee6f1a", + "sha256": "1lfkn09jrw50slzd127vwypflhyd1sjl38sd98k3nksnkdp4kski" }, "stable": { "version": [ @@ -76905,10 +77236,10 @@ }, { "ename": "multi-line", - "commit": "0f8eee6798a0ba71d437a1cbf82e360a5b60eafb", - "sha256": "1aadmijnjr029s1qq4gk8xyl9m8xb5x5774b8i3jyfixyjqvhvwp", + "commit": "8871b78c8a5e370108b2ad73dec9a0332db08cbf", + "sha256": "0zhfk8svv563ql85k52jsyr0llpynq65dyki5m7mnk9yix9ngw8d", "fetcher": "github", - "repo": "IvanMalison/multi-line", + "repo": "colonelpanic8/multi-line", "unstable": { "version": [ 20230721, @@ -77411,26 +77742,26 @@ "repo": "redguardtoo/mybigword", "unstable": { "version": [ - 20221219, - 1033 + 20230809, + 904 ], "deps": [ "avy" ], - "commit": "b070c907455e4edd129d3471f338172a5868cc04", - "sha256": "1l9km7rgidz1ppqrkrnxqzm1c4gjhdp9sxphxv45rqlz9xxllk53" + "commit": "13574e2c47a670df4b776b88bd633b2e8a82b2b2", + "sha256": "1dpbgm1800l2hb656830z682s4kpdyyd6g8acq1mig1synixspkh" }, "stable": { "version": [ 0, - 2, - 4 + 3, + 0 ], "deps": [ "avy" ], - "commit": "b070c907455e4edd129d3471f338172a5868cc04", - "sha256": "1l9km7rgidz1ppqrkrnxqzm1c4gjhdp9sxphxv45rqlz9xxllk53" + "commit": "13574e2c47a670df4b776b88bd633b2e8a82b2b2", + "sha256": "1dpbgm1800l2hb656830z682s4kpdyyd6g8acq1mig1synixspkh" } }, { @@ -77614,11 +77945,11 @@ "repo": "kenranunderscore/emacs-naga-theme", "unstable": { "version": [ - 20230619, - 417 + 20230824, + 1740 ], - "commit": "ae4f53eac2c16024f845faace9f43d9a656489b5", - "sha256": "1y4hagnqpwry2k10zisnr3q6gy97fwl69r369ramx4cl0fd3bn04" + "commit": "00f3bac7bc11fde37fa60e66442e8c13a6159a81", + "sha256": "110r3zkcgj2qilsrq4x4ivqrhf9sda70qnha58hwyhiyacnlazk4" } }, { @@ -78286,26 +78617,26 @@ "repo": "jaypei/emacs-neotree", "unstable": { "version": [ - 20200324, - 1946 + 20230815, + 219 ], "deps": [ "cl-lib" ], - "commit": "98fe21334affaffe2334bf7c987edaf1980d2d0b", - "sha256": "1m4d5l48k1frbkspk6wlzhbjn133bj7spp5chlgv8p4p9rpnc2zr" + "commit": "2b0cb8285352202c62b1e46a8aa265a5e4f9d966", + "sha256": "1ar32yv9mrvg2q0wdi3da9hzk70ml5jj7wjrcnnmhdmi4sigzjpg" }, "stable": { "version": [ 0, - 5, - 2 + 6, + 0 ], "deps": [ "cl-lib" ], - "commit": "5e1271655170f4cdc6849258e383c548a4e6e3d0", - "sha256": "0hx72fq10772bbyqrj7mhhp02k26cccjxdadiqm1ykainhfmn1x0" + "commit": "53c0e55034644236ee3761037e0dcfcd1c881c45", + "sha256": "1rwm8j48ks9fa5q3g8crpfzbikxfjj5m13w9ylimg34xniycrlq2" } }, { @@ -78316,11 +78647,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20230801, - 747 + 20230825, + 322 ], - "commit": "60ed056a72a4a93e75be32d4727be047eb2bce40", - "sha256": "1l5ns4fhqpzxw09x87xbxkvwpmsrldh0735ka432z2pczgnpqn71" + "commit": "4cce6882c852e5370bca27cb2255a2a83f094cc7", + "sha256": "1ix5dl9rc34b0w64hsj0c253fa5hl2rnqypl2brmszbdfxmx50cc" } }, { @@ -79058,6 +79389,30 @@ } }, { + "ename": "nix-ts-mode", + "commit": "568c5226265ec062c71818f74197b5620589b46a", + "sha256": "1aa4grbk9rqfw37zivakv5a4fs8rrlrfdqg4ajnbafd320d0jfm2", + "fetcher": "github", + "repo": "remi-gelinas/nix-ts-mode", + "unstable": { + "version": [ + 20230821, + 1334 + ], + "commit": "670023ec3d4e2f667a387a27990b4879e06ef60b", + "sha256": "0rwimbq6mp3z2xhhp535ysq44rcljc8swvaxsgfr5zvidpl2xh43" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "commit": "670023ec3d4e2f667a387a27990b4879e06ef60b", + "sha256": "0rwimbq6mp3z2xhhp535ysq44rcljc8swvaxsgfr5zvidpl2xh43" + } + }, + { "ename": "nix-update", "commit": "c59e828d4cad3d75344b34b9666349250e53b6ea", "sha256": "0if83pvjvr0347301j553bsxrrxniyykq20457cdkzlvva52c0b3", @@ -79583,20 +79938,20 @@ "url": "https://git.sr.ht/~ashton314/nordic-night", "unstable": { "version": [ - 20230727, - 1928 + 20230822, + 1608 ], - "commit": "ae953b9c4046901e269dedcb62276c035efc2098", - "sha256": "0q0j52fw2lk0az993f40l9sx50bmhzp9bag76avglkcm4kgbxmgm" + "commit": "66aa555af2552fe6d1efd3170f199edd0d44fced", + "sha256": "1hjmdsr9v0pcci94ivhcc71mqjmrp8l4zj7p7s9rlg0l2yh3gaxd" }, "stable": { "version": [ - 1, - 1, - 0 + 2, + 0, + 2 ], - "commit": "424a6eee0c3e1d18dacc60e4ae341d0816d95a49", - "sha256": "0qsdf06p49r2lavl7pvgaxb2233f3ikzap1f8ir5fhpcj5gyi0ps" + "commit": "012dc83458dd3d453106806b2590058d5d0f1fdd", + "sha256": "1mffyld638k488zwbn64q17xl9ihaa5dyjvyq74yp4yfn72dsyvc" } }, { @@ -79636,18 +79991,19 @@ "repo": "p3r7/norns.el", "unstable": { "version": [ - 20230715, - 858 + 20230820, + 2157 ], "deps": [ "dash", "f", + "lua-mode", "request", "s", "websocket" ], - "commit": "1a342900d70b306578f6e1ab8daabc62a8a610fd", - "sha256": "1z84g5wy38zsimkw485l33vd75b602w42v9hm7irjrcnspwpyspq" + "commit": "7e8b73b621db7494a22914b16c614ef80521f7f7", + "sha256": "06aqqnzwjb0ldy2k00qvy7iv5ihsx5vwbcqvnmwv3rh5xbzdhsnw" } }, { @@ -79914,11 +80270,11 @@ "repo": "muirmanders/emacs-nova-theme", "unstable": { "version": [ - 20210512, - 1802 + 20230824, + 401 ], - "commit": "1498f756a4c1c9ea9740cd3208f74d071283b930", - "sha256": "0jbk5wwv5dfcp4y19azl3jjcjlzr1547w1g1grq6kwpc69r5x2bf" + "commit": "c11aea3ce572cc940bc201cb5a33c0d2014cf8c4", + "sha256": "1d6bxaww8djmd0va8i8nih1d5w5g9ai6jnzhv4hwg3b46clv13j0" } }, { @@ -80257,15 +80613,15 @@ "repo": "douglasdavis/numpydoc.el", "unstable": { "version": [ - 20230725, - 212 + 20230811, + 1708 ], "deps": [ "dash", "s" ], - "commit": "5cb26db4f6b63a588ad7b8d2ec22ebf0f56f1076", - "sha256": "1ld5m75mmfb7kp18sww5blvlazk0j1j0yhdkhsx1m624dq5rag1c" + "commit": "77e2893442c6e20af9c99b9ba2c6c11988fe0e80", + "sha256": "03mfvgb1kbz0a90app8gsp8h2s0qhizdkrzafxp0pwmppxiaadg2" }, "stable": { "version": [ @@ -81182,15 +81538,15 @@ "repo": "shg/ob-julia-vterm.el", "unstable": { "version": [ - 20221102, - 756 + 20230815, + 2332 ], "deps": [ "julia-vterm", "queue" ], - "commit": "e0069ff1d8ebf0be13cc24b980579577b5e343d8", - "sha256": "10ljjgraasg34mfj2dfcl4bb3mnd4bwizxbzfjdw9w9hhbdf9icn" + "commit": "22f8825185231654397ae31e2a586ec39f98ab6f", + "sha256": "1pvb602lrgrncbzqly9ga0rzxvlypysqzp2njf808jipdd9b2bja" }, "stable": { "version": [ @@ -81993,8 +82349,8 @@ "repo": "licht1stein/obsidian.el", "unstable": { "version": [ - 20230722, - 632 + 20230821, + 1111 ], "deps": [ "dash", @@ -82003,14 +82359,14 @@ "s", "yaml" ], - "commit": "907e38cfe1f4c781b66d156862ac26cdb9c1cff0", - "sha256": "1xkc7ax2v6m5xr1912k0xb2fv7xy119nzhl570l8nlrz5ggqv5xd" + "commit": "c7cec01bcc4bbee18c9e5b5e7ddb33e4b09d03ff", + "sha256": "12f2ldr9ywniqygs0wdvmmd1fb42pmqzw7zdmlfk32qqvcg09nfp" }, "stable": { "version": [ 1, 3, - 2 + 4 ], "deps": [ "dash", @@ -82019,8 +82375,8 @@ "s", "yaml" ], - "commit": "907e38cfe1f4c781b66d156862ac26cdb9c1cff0", - "sha256": "1xkc7ax2v6m5xr1912k0xb2fv7xy119nzhl570l8nlrz5ggqv5xd" + "commit": "659ae9fc8dd17c5315a325b1639e7d881ec6e9c2", + "sha256": "0ykggbmi0p5xxgsr3090fa67axdgrg8nj3fzqwqdj9r64jjkpn2v" } }, { @@ -82115,14 +82471,14 @@ "repo": "k32/occurx-mode", "unstable": { "version": [ - 20230605, - 1357 + 20230822, + 1841 ], "deps": [ "rbit" ], - "commit": "e17c67b3701339270b3428172cce0ea237810e5f", - "sha256": "1i9gpzphr5iy4q82mln4amh7i0hds49z8j9v1zari4nrpc7r897j" + "commit": "71ecab6b1cdf6159a02cef3dd7d2610c45cbaf02", + "sha256": "0lm9m44h7ppclnxl9x6zjzxlj3nya64njpxjlwqqwicd0r8bc0fr" } }, { @@ -83210,20 +83566,20 @@ "repo": "rksm/org-ai", "unstable": { "version": [ - 20230803, - 2124 + 20230820, + 1230 ], - "commit": "be19a2cefca360629eeb61e3cea0dc60e55cf897", - "sha256": "104ihjbnlx6pjc8sslp4bmqpq4p5syzqf50lsn9a4n9r7bmfd4k4" + "commit": "e188f2b3506da47452142746f7ea9e08e97a9c09", + "sha256": "1lhkq98yjs64p8r6zwvazv9ip853qh3j2vzapwf0cmxh5j02r55k" }, "stable": { "version": [ 0, 3, - 11 + 12 ], - "commit": "be19a2cefca360629eeb61e3cea0dc60e55cf897", - "sha256": "104ihjbnlx6pjc8sslp4bmqpq4p5syzqf50lsn9a4n9r7bmfd4k4" + "commit": "ff17ddddb6f37647cbb39878261661372012c5f5", + "sha256": "0g6bgdf7r8a1zm08sx9736gg6wa3mvcmjnfy8x5ncpggc0gjnhz0" } }, { @@ -83761,32 +84117,32 @@ }, { "ename": "org-category-capture", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "1sl5kxnvzhd5xzfr75spyk9334n8njd253j653d9xky7ipl2fhdg", + "commit": "e6a147fc61c16efbb5750460a8cae8bcec9e6bea", + "sha256": "0m1nzn6ibgdwbrk337id8fwwc147pliq7kk950bysadjpqqckgxi", "fetcher": "github", - "repo": "IvanMalison/org-projectile", + "repo": "colonelpanic8/org-project-capture", "unstable": { "version": [ - 20220114, - 730 + 20230817, + 816 ], "deps": [ "org" ], - "commit": "bc5a2401b456c42c4346d59fa77d633770b6efea", - "sha256": "11x7v60cx9i03q20d3chgdqlvlx1k3m68zkrghkcf7jxdhxv7259" + "commit": "ad8daa991698df265a21b161e62a41e04979d98f", + "sha256": "0sdj9iwl1nsq0d3fqkpna6343zp09l4ffk4jqf0w3lmsnm62wf8a" }, "stable": { "version": [ - 1, + 3, 1, 0 ], "deps": [ "org" ], - "commit": "48f621b595e748c5e03431f237facf258ffc9443", - "sha256": "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89" + "commit": "214a6068c467323a795b27996c1e7b75ae42dc68", + "sha256": "1fdbxwmrs96118hrm8sbfdbpfigankdqklq011pykf9lhc4627nv" } }, { @@ -83815,14 +84171,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20220422, - 300 + 20230814, + 1312 ], "deps": [ "org" ], - "commit": "6a786e77e67a715b3cd4f5128b59d501614928af", - "sha256": "0ik5akhsh9aji6n477i1jnk0wnljj7n1d0ybp8szgj2nr5258mhk" + "commit": "66d434b52a306222fe7e13ce4c0cec4a0408fbac", + "sha256": "1ccd6y5323mjsfga79lii4kx3lg183g8vj796yz076ggbfi4nm6s" } }, { @@ -84608,11 +84964,11 @@ "repo": "minshall/org-grep", "unstable": { "version": [ - 20230424, - 2005 + 20230821, + 2356 ], - "commit": "428cfc2e2c35867272d32f82cadaea46772e3609", - "sha256": "0gq7nvyydc0lvdf51m8p9k4cacggnalxni504bx3278av78qxk73" + "commit": "64d23c2ca11ca68db85fc2c500377c9151e8e40b", + "sha256": "1jgy0p6ih4sc7y68cd38pwydbck30km1l0142rvfgg4w4q0ld451" }, "stable": { "version": [ @@ -84868,14 +85224,14 @@ "repo": "shg/org-inline-pdf.el", "unstable": { "version": [ - 20230522, - 1428 + 20230815, + 2356 ], "deps": [ "org" ], - "commit": "cd61240b598c6c175b84a670f9362f37b4d5589c", - "sha256": "0dm4j5fx88hr1a7s6kk4f4fbrqd0an2xr5mqki5wmrwsl9wl4698" + "commit": "3a22dca889e8fa815274adcc73bb31a31f5ed992", + "sha256": "04rfv4qsyhc8w23hbzw8k5f292lafkgf1n0gbbkgc93gifx91s4f" }, "stable": { "version": [ @@ -84955,16 +85311,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20230413, - 441 + 20230816, + 2037 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "63a74d4458f512f0825e9f55491baad3ee4e9c4b", - "sha256": "0hk1w0bsf100qc3wvfa2a90qi98g0fz9hw1lpp34m71cig1wz5lj" + "commit": "ad60d2834eb37d55f4ee89788818c9bc4b2125b1", + "sha256": "0y6340w9vdglqrkky5zvq8l7p6ilxyhviczkpcnvgpy612fawcy3" }, "stable": { "version": [ @@ -85142,15 +85498,15 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20230806, - 817 + 20230807, + 1144 ], "deps": [ "fb2-reader", "nerd-icons" ], - "commit": "9c6d4c832419d91d0ab2fc5395239d33cc47f2ec", - "sha256": "0iswjq8q6lf07v3r0xsb01z2wll6vz3879jq4r4qgcil023n239x" + "commit": "af5fdf59fb77424845ac98416826bb9c42e15528", + "sha256": "0ysfxw9by3ykf8z6vz5f432vfayzxk1zlcp970a41hd1r7l64sij" } }, { @@ -85390,14 +85746,14 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20230702, - 805 + 20230816, + 2034 ], "deps": [ "compat" ], - "commit": "63372bda43a9d0dd9940c1ec3c53f752b642ac41", - "sha256": "0fpc6pf1chjs9bb4m9hzacny3cdxvnpvwsf0vrbbz3vy9sf1a30c" + "commit": "905a601796d02283e94a603b6011a537ee7e6090", + "sha256": "1c71vl3hz4m6r1jylxa0jx7lqyabi2ljacxcfi4w3rjvihr9bffp" }, "stable": { "version": [ @@ -85728,8 +86084,8 @@ "repo": "emacsorphanage/org-page", "unstable": { "version": [ - 20170807, - 224 + 20230825, + 1118 ], "deps": [ "cl-lib", @@ -85741,8 +86097,8 @@ "org", "simple-httpd" ], - "commit": "50430ababf73a2d090881a952e9770badaf7478b", - "sha256": "1xph0pdcbzlxfnbhhad2jgkznrl2vs76yl3jd29ny4xsl0n3gglw" + "commit": "e1788a84dd918f025149b64c02a90919742281e2", + "sha256": "0xwnmrsxgg2v80kn8vdqq3hw1h44qp1xk0966vdgygymb1rq7rj8" }, "stable": { "version": [ @@ -85948,62 +86304,96 @@ } }, { - "ename": "org-projectile", - "commit": "9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689", - "sha256": "0xdkd5pkyi6yfqi4przgp5mpklyxfxv0cww285zdlh00rzl935cw", + "ename": "org-project-capture", + "commit": "184abaf387666122a5a1cf43ec0fff511b451f90", + "sha256": "0x7h808vgz5a28dvk26qfmgdp633wy3j2fa7370s4w2allw9la8j", "fetcher": "github", - "repo": "IvanMalison/org-projectile", + "repo": "colonelpanic8/org-project-capture", "unstable": { "version": [ - 20230802, - 2300 + 20230817, + 816 ], "deps": [ "dash", "org-category-capture", - "projectile", "s" ], - "commit": "b2a6ab28acef4a70d0305c29df41f682c4144533", - "sha256": "0dkvz2p420ffiy7mmx21nfwc8x324fh6hyirdhg1m19zi7rjagvb" + "commit": "ad8daa991698df265a21b161e62a41e04979d98f", + "sha256": "0sdj9iwl1nsq0d3fqkpna6343zp09l4ffk4jqf0w3lmsnm62wf8a" }, "stable": { "version": [ - 1, + 3, 1, 0 ], "deps": [ "dash", "org-category-capture", - "projectile", "s" ], - "commit": "48f621b595e748c5e03431f237facf258ffc9443", - "sha256": "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89" + "commit": "214a6068c467323a795b27996c1e7b75ae42dc68", + "sha256": "1fdbxwmrs96118hrm8sbfdbpfigankdqklq011pykf9lhc4627nv" + } + }, + { + "ename": "org-projectile", + "commit": "d7cefcb02ab49c4505228262101fc23cb1db0c79", + "sha256": "1j5cm8pynyxaar0dl9bv58xh72q2n0v68amavw22acjff4sziicd", + "fetcher": "github", + "repo": "colonelpanic8/org-project-capture", + "unstable": { + "version": [ + 20230817, + 851 + ], + "deps": [ + "dash", + "org-category-capture", + "org-project-capture", + "projectile" + ], + "commit": "4ca2667d498fa259772e46ff5e101285446d70b6", + "sha256": "1p56ng1v0795bkgkk18w6494hvq5j3j6h48yhr8smz69k46amm3y" + }, + "stable": { + "version": [ + 3, + 1, + 0 + ], + "deps": [ + "dash", + "org-category-capture", + "org-project-capture", + "projectile" + ], + "commit": "214a6068c467323a795b27996c1e7b75ae42dc68", + "sha256": "1fdbxwmrs96118hrm8sbfdbpfigankdqklq011pykf9lhc4627nv" } }, { "ename": "org-projectile-helm", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "1zs3f4g5pn2l1gz1yfbbldm6d8ypzn8581ppgzbw3mvhcxxz23bj", + "commit": "e6a147fc61c16efbb5750460a8cae8bcec9e6bea", + "sha256": "19l314nrx9ivqb8k7myg3nlh7a96r15l89a5q68x9wj8jh32k6cx", "fetcher": "github", - "repo": "IvanMalison/org-projectile", + "repo": "colonelpanic8/org-project-capture", "unstable": { "version": [ - 20180601, - 1822 + 20230817, + 801 ], "deps": [ "helm", "org-projectile" ], - "commit": "674e3cdda4a3ea4bdcc369dae032d49dfb5c5765", - "sha256": "02ia5i8aal9gck248v6kqzffsp09mmf4cispdbhqkp83mz96bxdn" + "commit": "214a6068c467323a795b27996c1e7b75ae42dc68", + "sha256": "1fdbxwmrs96118hrm8sbfdbpfigankdqklq011pykf9lhc4627nv" }, "stable": { "version": [ - 1, + 3, 1, 0 ], @@ -86011,8 +86401,8 @@ "helm", "org-projectile" ], - "commit": "48f621b595e748c5e03431f237facf258ffc9443", - "sha256": "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89" + "commit": "214a6068c467323a795b27996c1e7b75ae42dc68", + "sha256": "1fdbxwmrs96118hrm8sbfdbpfigankdqklq011pykf9lhc4627nv" } }, { @@ -86179,28 +86569,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20230607, - 1503 + 20230824, + 1005 ], "deps": [ "htmlize", "org" ], - "commit": "592985019905447d5f1fd6e24d14bfa9f4adf2f3", - "sha256": "124f59yj0w5linph4k38fil42jc6nvkzhx73312farkmn4p9r9zk" + "commit": "d12b4acd6e1d9b1bec7e253bc417bcc830ed9da1", + "sha256": "06i7a64yqlcwzpbk7fdsz16q99nxfizhl4944cc7mg7hh53fbqrs" }, "stable": { "version": [ 3, - 18, - 3 + 19, + 2 ], "deps": [ "htmlize", "org" ], - "commit": "592985019905447d5f1fd6e24d14bfa9f4adf2f3", - "sha256": "124f59yj0w5linph4k38fil42jc6nvkzhx73312farkmn4p9r9zk" + "commit": "d12b4acd6e1d9b1bec7e253bc417bcc830ed9da1", + "sha256": "06i7a64yqlcwzpbk7fdsz16q99nxfizhl4944cc7mg7hh53fbqrs" } }, { @@ -86358,8 +86748,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20230613, - 1849 + 20230824, + 1748 ], "deps": [ "avy", @@ -86374,8 +86764,8 @@ "parsebib", "s" ], - "commit": "26c06912c7833104c7b4c7b96b8f200e98067a68", - "sha256": "1mqpcp16jbyhl1jxrxr4k00k93mfvbp54y8hwf67zyv21a1g2sj2" + "commit": "a0d943e420f7441a42c32ce1f88475a309b5e288", + "sha256": "07c87z76dvqzvqv4dm11r1waf6iqfj3rjd4j3r8isx68ks6yjz7g" }, "stable": { "version": [ @@ -86584,6 +86974,43 @@ } }, { + "ename": "org-roam-ql", + "commit": "2f0141e7ce7fdba9d6b66967524eeaba0e25a260", + "sha256": "04nk716r64ik4970i3lj1hir1pkawsvxmz2461bd9m9hmdvjij47", + "fetcher": "github", + "repo": "ahmed-shariff/org-roam-ql", + "unstable": { + "version": [ + 20230823, + 2249 + ], + "deps": [ + "magit-section", + "org-roam", + "org-super-agenda", + "s", + "transient" + ], + "commit": "85d46926b15946c894fc19044dcf869116de94d6", + "sha256": "1wdn0plw6valrfkv8qfmgw46j13dics3j4xipal2b2gx75fdxkbh" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "magit-section", + "org-roam", + "org-super-agenda", + "s", + "transient" + ], + "commit": "b45260649453779c87688f5dae4041a338c53744", + "sha256": "12bdadwwj69bbv676jb706ik9slp7rwb5mhrbsl0plmwq9mv6ii6" + } + }, + { "ename": "org-roam-timestamps", "commit": "817320c7a52e78f89746694b62fead6260175c3f", "sha256": "17yi95pdfk9z1zhiz8338mjpvbh7n0pfbdw7i50i5b3gifl2sfnh", @@ -87644,28 +88071,28 @@ "repo": "unhammer/org-upcoming-modeline", "unstable": { "version": [ - 20230707, - 847 + 20230809, + 957 ], "deps": [ "org-ql", "ts" ], - "commit": "c3e4705ff2ade869e229f33090c92ac671362623", - "sha256": "1kib6c9426qkfrmhnhqw47r5y9z082xjw1qvbhqwrip69mi06yd7" + "commit": "1f39a71fa04d6ee2808bced6dcacfed0f98b2e7e", + "sha256": "02k2df8h9rvliw5xwp43xm75ibnr4f38h1b5val28qy01xn2vm44" }, "stable": { "version": [ 0, 1, - 4 + 5 ], "deps": [ "org-ql", "ts" ], - "commit": "51a45167e826944a3f01d1142714de62a050daed", - "sha256": "0m40firrm377zblc2hsdn2m12y0hbv37cznd6xxrps20mqfcnpcn" + "commit": "1f39a71fa04d6ee2808bced6dcacfed0f98b2e7e", + "sha256": "02k2df8h9rvliw5xwp43xm75ibnr4f38h1b5val28qy01xn2vm44" } }, { @@ -88576,14 +89003,14 @@ "repo": "minad/osm", "unstable": { "version": [ - 20230703, - 1828 + 20230825, + 919 ], "deps": [ "compat" ], - "commit": "75a7ede98a3df8d99e861ddd14765d3b3da1fdb9", - "sha256": "0a2xizwg9mhnyxsr6p799cxj896a6zf8cpxfxl3v3b9a5ry776nn" + "commit": "7961f5bf615a994a6ca756218c809bb998790946", + "sha256": "01cvaa6yk66wqi40ci0lr822f8yqwxsiyg0wh85cr4zp0h9lbbk2" }, "stable": { "version": [ @@ -90017,26 +90444,26 @@ "repo": "ox-tufte/ox-tufte", "unstable": { "version": [ - 20230802, - 2339 + 20230811, + 1348 ], "deps": [ "org" ], - "commit": "352d5ff5d5cd5edcb0d50ce50a5b2aaa8ae6862a", - "sha256": "12hwd2q8w75ha4cs587nmasfxhsnmaacpyznrjpwk8vmwz2ncr43" + "commit": "f1a25aa7cbb59f08962e9b9a8becb8c7729414db", + "sha256": "0axwlikac8adkcldv7byhh38607fff8m8b66npfbs21vp9z5rlm4" }, "stable": { "version": [ 2, 0, - 0 + 4 ], "deps": [ "org" ], - "commit": "352d5ff5d5cd5edcb0d50ce50a5b2aaa8ae6862a", - "sha256": "12hwd2q8w75ha4cs587nmasfxhsnmaacpyznrjpwk8vmwz2ncr43" + "commit": "f1a25aa7cbb59f08962e9b9a8becb8c7729414db", + "sha256": "0axwlikac8adkcldv7byhh38607fff8m8b66npfbs21vp9z5rlm4" } }, { @@ -90285,11 +90712,11 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20230717, - 2320 + 20230820, + 1650 ], - "commit": "20ca024ebe18c47f23af135b5adac2627595e9bf", - "sha256": "1kbvdnfr9jwgi7vd2rz6dr0sndisz60yzlfz848b4a1kjqql5280" + "commit": "c399e2cf1f7de6e078efd68043db62740c771299", + "sha256": "03w6dzkmjy4v2j7q65iv9lwi2h9nf6l0hbgidfvsgichk8q5pkss" }, "stable": { "version": [ @@ -90384,11 +90811,11 @@ "repo": "tttuuu888/package-loading-notifier", "unstable": { "version": [ - 20220130, - 318 + 20230809, + 446 ], - "commit": "bc06ba97a0537aa202f277e5597ac96ca39307ab", - "sha256": "0wp3jdbzcjpbx4720nd31fzs5app6phdrbcwisw89361wvmmnhkj" + "commit": "f64f994cb1a55f9d59444deaec884bff0ed2b26e", + "sha256": "0jwchlkij4fiw3c5xfn04frhpc35ax11ch64mv03rkx5dzqkblqc" } }, { @@ -91829,13 +92256,10 @@ "stable": { "version": [ 1, - 8 - ], - "deps": [ - "cl-lib" + 9 ], - "commit": "166a10472002010692dbc35f323ffb8110a294c5", - "sha256": "1dpfhrxbaqpgjzac3m9hclbzlnrxq9b8bx6za53aqvml72yzxc6i" + "commit": "b941ed8a96299868171fac625ecffec77de3e986", + "sha256": "0s6by4arny1w4i0hm4xghhjgjgb4iy7n189ddqdcsh4jrgwjyaxl" } }, { @@ -91964,15 +92388,15 @@ "repo": "kimim/pdf-view-pagemark", "unstable": { "version": [ - 20230607, - 144 + 20230825, + 1247 ], "deps": [ "pdf-tools", "posframe" ], - "commit": "90a2908795bd4bf1015ff18ab338b50a785a1843", - "sha256": "16yg9ar6i7h1m5d9gizx7rh3hhj2d71ry03dc4lf8f1ri1i2lwfj" + "commit": "eadbc335aa57627c6075b23922cfcafb56ca59b0", + "sha256": "01jm1gn5yrzlifzxq39a1r11rv3sxyl35qzix5nfvdrxyh61k90c" } }, { @@ -92197,11 +92621,11 @@ "repo": "kentaro/perlbrew.el", "unstable": { "version": [ - 20161109, - 709 + 20230823, + 1652 ], - "commit": "3a3406c3307c92aa30f9400d430925c434a3b6f0", - "sha256": "0kxz8ljc7w69ywp0bb15010sgrr13i1p05hcvhfr9c35l0n62r6p" + "commit": "527b7f6a6a5edd2b779ae98029e60994391c0903", + "sha256": "04hvq3ii7x6xv54fvbrn6h0zdvv68wcc47zl3kyrgv0jlcmsgz1y" } }, { @@ -92547,14 +92971,14 @@ "repo": "wyuenho/emacs-pet", "unstable": { "version": [ - 20230705, - 2132 + 20230824, + 1919 ], "deps": [ "f" ], - "commit": "4f5ca245531053f10ea234bc5e95fc7efcabe251", - "sha256": "1ypnqqdxxgm0kad37lqfi2q9a6263rx0li3v8dya5f7915sjsccj" + "commit": "eb0c01380f1930825844027d9af6f4a263238a89", + "sha256": "0yw3pp0b9p1c3cz0j3klhvkyff9388ki5vcm1jq0cgfg53lh0kgz" }, "stable": { "version": [ @@ -92601,11 +93025,11 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20230716, - 1440 + 20230820, + 1414 ], - "commit": "44e7adf94ff19448592bf52595aec73c7278e900", - "sha256": "0chfqvf0260izy73xf8zy4ryq1gzlc1vapk9an2g5mp94ac0im7b" + "commit": "e6b71c4c2315e186c53796ffdbc6533d5bcd40c5", + "sha256": "0d7vx9j5ypnd2ar9n2dby2i9drs2lyddkrv67agsxfl2yb0fyyib" }, "stable": { "version": [ @@ -92967,11 +93391,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20230730, - 1735 + 20230815, + 1051 ], - "commit": "38fd6ec205a02ccad6b3006afef0988e380adfa6", - "sha256": "11i9mr2bmqqd5wryg24im86f287g94yva359rg0szm1fmxgrxw8z" + "commit": "c421658d7049a2b1dfe04e75c1e8a9e4a9e5e21e", + "sha256": "05gddb5bzvnpz8dwfjg2mmxqw97ajlf4lvs57rnrpqxrmi8bzjfd" }, "stable": { "version": [ @@ -94207,11 +94631,11 @@ "repo": "emacsmirror/po-mode", "unstable": { "version": [ - 20230309, - 2313 + 20230617, + 1058 ], - "commit": "e70aab72a6331bd55f69893fa152be80c44d1bf6", - "sha256": "13kx0dc5nhc0rxcfnhlin7kj9ip3nbagdh7hlhxr29jrsh2766w2" + "commit": "d68aa1da2b95a17d7fe400afd414ce3ede09db86", + "sha256": "1px8bd3m4s20f5qzg1g3gvql1wipr6sxgppz1avjrxwvjd92l0ds" }, "stable": { "version": [ @@ -95081,11 +95505,11 @@ "repo": "auto-complete/popup-el", "unstable": { "version": [ - 20221231, - 1634 + 20230819, + 2306 ], - "commit": "71cede0588c10526f88dd0375bce776ec2eed05e", - "sha256": "07rnncg8x1a2kk158pnqazj3hiqf1rf3bmwlhadajqbfb0vv96hv" + "commit": "769318d0391e6d9a718e227678234f27f7c13a47", + "sha256": "166v7h5ysark4d953yar0lvds14xjdr1199f6hi5xm16h5h5n56r" }, "stable": { "version": [ @@ -96470,6 +96894,30 @@ } }, { + "ename": "project-tasks", + "commit": "dff27ea4cff5348271e89a876338cbfda728b4e4", + "sha256": "0zy3mz2crfs727xqkbjxp7nc3y7zrcf46xn6dpgn58b0f2ss9151", + "fetcher": "github", + "repo": "TxGVNN/project-tasks", + "unstable": { + "version": [ + 20230808, + 314 + ], + "commit": "36b7b9e3acb3399aec6c8ef89bf389a12fc87600", + "sha256": "1fwwh709ff660ii43nd0prq2jcc8gmn1v8sg9jki00xn9yas8hsi" + }, + "stable": { + "version": [ + 0, + 4, + 1 + ], + "commit": "36b7b9e3acb3399aec6c8ef89bf389a12fc87600", + "sha256": "1fwwh709ff660ii43nd0prq2jcc8gmn1v8sg9jki00xn9yas8hsi" + } + }, + { "ename": "project-treemacs", "commit": "412d7597cfcdfeed7bd12313dc5e8a4890b1dcc3", "sha256": "1v4bc6nljfnk881i2rdsdynz8d006s00h6wvqqfrppwklxx4rr1m", @@ -96760,15 +97208,15 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20230624, - 1315 + 20230822, + 2132 ], "deps": [ "compat", "project" ], - "commit": "369ef38490065d6b951981c0fa4b69d49dbb4b95", - "sha256": "1sj9k2cx1qwvvaqhzz0sjj2ql099dr1x59qzhwwixdai6akjf3bk" + "commit": "d043418c707d5637d869c488e8abe2186e55b5fe", + "sha256": "1nypw1l6bzlnwzkg288ykbg2ll16ygyi7zs7g9myg9pf1vf0z29y" } }, { @@ -96779,15 +97227,15 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20230624, - 1315 + 20230822, + 2132 ], "deps": [ "compile-multi", "projection" ], - "commit": "369ef38490065d6b951981c0fa4b69d49dbb4b95", - "sha256": "1sj9k2cx1qwvvaqhzz0sjj2ql099dr1x59qzhwwixdai6akjf3bk" + "commit": "d043418c707d5637d869c488e8abe2186e55b5fe", + "sha256": "1nypw1l6bzlnwzkg288ykbg2ll16ygyi7zs7g9myg9pf1vf0z29y" } }, { @@ -97066,11 +97514,11 @@ }, "stable": { "version": [ - 23, - 4 + 24, + 2 ], - "commit": "2c5fa078d8e86e5f4bd34e6f4c9ea9e8d7d4d44a", - "sha256": "1n0mn082lxm2skqn62ksppgc6s7qi8gxrhi4fwnb2f20qspad3vq" + "commit": "54a2e5caa9d1a0a714fb2aa99753a1444414292a", + "sha256": "18ajp6q0sw78r1a50aaa65cydvg01cm953ip1d13vcvd4p7yqln9" } }, { @@ -97268,15 +97716,15 @@ "repo": "emacs-php/psysh.el", "unstable": { "version": [ - 20220607, - 1642 + 20230815, + 730 ], "deps": [ "php-runtime", "s" ], - "commit": "796b26a5cd75df9d2ecb206718b310ff21787063", - "sha256": "01j8dfgck3wlayh5spklfwvkzzckd0zwa4d5mrhpii2xsjy28r8a" + "commit": "8bf82fa68ca90fc72528ea406f0e57718bcb1cbf", + "sha256": "0ssbzw7g24i60qghrlz57kma691k2lq16bz1c6wxc3y8zqjn5hvk" }, "stable": { "version": [ @@ -97973,14 +98421,14 @@ "repo": "pythonic-emacs/pyenv-mode", "unstable": { "version": [ - 20200518, - 1521 + 20230821, + 1645 ], "deps": [ "pythonic" ], - "commit": "d191037fe62ed8d4fee5888845da3e2c386d8e89", - "sha256": "0dipwjdkx4887g61gn22wga4pvvkwv6rx7izq73l8b6x1mc17c0h" + "commit": "6820aa6673e6a51ace88611a58b423b5b1effb19", + "sha256": "1d1br30f0287wa63ii7zxvch5yyc602v44960gmml6frrvi4n4pz" }, "stable": { "version": [ @@ -98332,14 +98780,14 @@ "repo": "ionrock/pytest-el", "unstable": { "version": [ - 20200330, - 41 + 20230810, + 1218 ], "deps": [ "s" ], - "commit": "6934047242db79b1c53e9fe3e0734cc9719ed1c4", - "sha256": "1gh5sqmhw7hl67m7nqgd4wwns7a10j0sfmabm97k1cmmbwdj0vca" + "commit": "8692f965bf4ddf3d755cf1fbf77a7a768e22460e", + "sha256": "13s3zqxjlas4rq70gxgl8nrhasrx8j8ml9xls7lgghk12ppiqil9" } }, { @@ -98554,14 +99002,14 @@ "repo": "jdtsmith/python-mls", "unstable": { "version": [ - 20230522, - 2131 + 20230811, + 1519 ], "deps": [ "compat" ], - "commit": "449122636573217fc8e45753f829a96d8b170f66", - "sha256": "06yyk8dljgnwmv104f6r2nphp31x44q1xfiwcwfamyzymd3q24s5" + "commit": "2b7ef51d5dee57dfeb30bc8ebe10a7e4d12e7700", + "sha256": "0sl0ldsjf7zx1n4b3nfz5gw2k4w1svhrpmbh6zg8yasq80avib0w" }, "stable": { "version": [ @@ -98725,15 +99173,15 @@ "repo": "pythonic-emacs/pythonic", "unstable": { "version": [ - 20220723, - 1741 + 20230821, + 1733 ], "deps": [ "f", "s" ], - "commit": "c18a5bd8cb2ba59014b6b29b5bf1903bd2476a07", - "sha256": "11fps8ah3xmacfd9bglq8yaafzh37i1qpiyhfdphhsy0jqy990wz" + "commit": "f6e0bec552319341f260a5c4740288799c2b3a5b", + "sha256": "1xr37qabvjljdkcgdnark5fyf0d11502vy2nrhqg9z1yhbp65988" }, "stable": { "version": [ @@ -100535,11 +100983,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20230601, - 15 + 20230808, + 1342 ], - "commit": "296ed0ecce65066f513182bbde2045fca9c1e035", - "sha256": "0kna0r161pfpz3m9q7hmn7gfl6w2qhwkvg0zlwvqvlpdr987hjm3" + "commit": "0369b805d36462103eed6f87d9db870bdf0dbcd7", + "sha256": "0swz2m602k71k7mzgyg82r35z3mzx2s4s8m3by1hd6mwchfrah09" } }, { @@ -100709,8 +101157,8 @@ "repo": "thanhvg/emacs-reddigg", "unstable": { "version": [ - 20220829, - 1449 + 20230810, + 2059 ], "deps": [ "ht", @@ -100718,8 +101166,8 @@ "promise", "request" ], - "commit": "7b5445d3101bd8c9fa4a456ad37a19bba840a2cb", - "sha256": "19k0bqsk1lhm7g405dyzb9qkfvm12dlg3h88vn98q2iydfxj43dk" + "commit": "37f048ec03d02acaf6f5c73802677f10b2dfe031", + "sha256": "11w1p3z4mr8wly96a0jianf7qfzb0la2jnv6iwhqdx4752h0zq2v" } }, { @@ -101384,11 +101832,11 @@ "repo": "canatella/repo-el", "unstable": { "version": [ - 20220820, - 1554 + 20230821, + 1032 ], - "commit": "e504aa831bfa38ddadce293face28b3c9d9ff9b7", - "sha256": "1clmh8khr7i95zw1m64pjch8zwnr8gd7vcrzz5rx0xlqrd3hd3d7" + "commit": "529623db7c38917709e84d89d518873231139c10", + "sha256": "19ms55dd5j2jm0ln5ba1w63q1g348xjwiykng82n5cblvnvpdidp" }, "stable": { "version": [ @@ -102667,15 +103115,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20230616, - 145 + 20230819, + 154 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "3f039ae3fda9e52433a8c31d4b6c78c89e559906", - "sha256": "0dw3v7ikggy11j7p5hdv7hj1dgkh0hsbci79xakxr7xr0802amcs" + "commit": "29df3d081c6a1cbdf840cd13d45ea1c100c5bbaa", + "sha256": "0fyqlsj91j1fks16bx8zy0ly3mc6nk4fk2vbf0yjc2fa14hda41m" }, "stable": { "version": [ @@ -103182,16 +103630,16 @@ "repo": "semenInRussia/emacs-run-command-recipes", "unstable": { "version": [ - 20230728, - 1157 + 20230823, + 1307 ], "deps": [ "dash", "f", "run-command" ], - "commit": "1141a0066b0f28cb6814fb0e42e98a3712857a8a", - "sha256": "0z37wl2r9zwlfnirm08ly53mvy8m4i51c01d30yw6yrmfq3fd758" + "commit": "ccc4022431ed82dbfcfe4e8b6aa1e9f2d0f76eab", + "sha256": "1f6jin8fxn9yixs3wdcgq4fwjbykgydzzadcynhbcnvrh7bqszvj" } }, { @@ -103283,6 +103731,15 @@ ], "commit": "1d86134d04ecf2305969c7546ead7ad425cd7243", "sha256": "1d170cjlrpabivqy5xdlq9hykhr6gxmghvhacp1sj8288jv63jjs" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "1d86134d04ecf2305969c7546ead7ad425cd7243", + "sha256": "1d170cjlrpabivqy5xdlq9hykhr6gxmghvhacp1sj8288jv63jjs" } }, { @@ -104880,15 +105337,15 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20230104, - 1321 + 20230810, + 1523 ], "deps": [ "apel", "flim" ], - "commit": "7d8df0ef2f483e2dc063a72099295f467e6bc2c8", - "sha256": "01dn91xjcl7p5rnbgyh5l4kdlqx31s0gw5vh7hhcapbiq8rihmjd" + "commit": "9370961ddcee78e389e44b36d38c3d93f8351619", + "sha256": "13f267j0mrji9cvjhq129nslrj2gwvq7ibsz384a4qilxf5rhccc" } }, { @@ -105124,15 +105581,28 @@ "repo": "MaximeWack/seriestracker", "unstable": { "version": [ - 20220731, - 2330 + 20230821, + 1858 + ], + "deps": [ + "dash", + "transient" + ], + "commit": "49b1e7a822c973c48007dc6461577ee68124ddc8", + "sha256": "0gfm7ss3bwj3m2y1mb4sdmsv85mjnpkgmzasa3yfj69zbq46glhn" + }, + "stable": { + "version": [ + 1, + 3, + 1 ], "deps": [ "dash", "transient" ], - "commit": "1b4fe12d2fff15e3646a2d7cbe528ad1f95c4f19", - "sha256": "1ib5vxsm292b0ivp3bwm638qshcf6gr8gs24pywm7mimy8y1nplc" + "commit": "49b1e7a822c973c48007dc6461577ee68124ddc8", + "sha256": "0gfm7ss3bwj3m2y1mb4sdmsv85mjnpkgmzasa3yfj69zbq46glhn" } }, { @@ -105234,10 +105704,10 @@ }, { "ename": "session", - "commit": "5f2a50f62475639af011c99c6cc38928b74b3b0a", - "sha256": "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx", + "commit": "861d01098815b7f26ce3dd58b224e505145e28d9", + "sha256": "0anbqjz0branqpidl6ld705djq227jjl7l46wxicdaqfqlk0wbhb", "fetcher": "github", - "repo": "emacsorphanage/session", + "repo": "emacsattic/session", "unstable": { "version": [ 20210422, @@ -106220,8 +106690,8 @@ }, { "ename": "shroud", - "commit": "261a5b2c77288cf38bc309504215fb23c719f09b", - "sha256": "03226c2v76zdscxlbhq32wp5wgpg385phqnxcsibn1apk2rb4s4m", + "commit": "39d3ed2b86dd26c92dd0ecbe4b7d68ccc2b4deff", + "sha256": "0vv3fiy9cpa4i68h8bashkgd2pmc9i9wx5m8h739grdsl1r7y98b", "fetcher": "git", "url": "https://git.savannah.nongnu.org/git/emacs-shroud.git", "unstable": { @@ -106346,14 +106816,14 @@ "repo": "rnkn/side-hustle", "unstable": { "version": [ - 20210627, - 701 + 20230814, + 1047 ], "deps": [ "seq" ], - "commit": "1f4cd5e7cfbabb00c6d87e913770f21e3d16c957", - "sha256": "0qcaqfsnw90prch3x1flccanys4bh72x2pdmf27nh5b3i9jbrbv2" + "commit": "602557d74229b377ee0e7d43ec70a6f9f84c81e0", + "sha256": "0ilgyg8dzvk2xqvm22jkydhw2a463g85mhhfx5sin42jvl8pi122" }, "stable": { "version": [ @@ -106376,11 +106846,11 @@ "repo": "rnkn/side-notes", "unstable": { "version": [ - 20210709, - 1403 + 20230814, + 302 ], - "commit": "41fe8544661a772f764a0924e04080f258053955", - "sha256": "14xm2a465mgdbp47hwb1dpxw4w5vl0rdlc4m5bxd5z1l4s06nc32" + "commit": "fbe409066df83a7e64a6a9ddf6d99ce7177fcdbb", + "sha256": "14jmki9lrcf78g362sxjvs1a55cz99p2pvnrvvr0hnn7lh6rfd4l" }, "stable": { "version": [ @@ -106415,11 +106885,11 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20230411, - 1926 + 20230808, + 2230 ], - "commit": "77c363239e3edce287eb15d59e3c28b21d8ddb79", - "sha256": "1i02v8plyhjhqqn9y4f9llvpbhv3fvrb70vbqbyxqcqz0i1vgp53" + "commit": "e4e97c1ca9fecec104c24f707c3d910af53fb976", + "sha256": "0yxi9wj4yfmf4fqdpwyif4cvg5clwbz29jnj9madn4g0kjv8q9gx" }, "stable": { "version": [ @@ -106699,14 +107169,14 @@ "repo": "skeeto/emacs-web-server", "unstable": { "version": [ - 20230619, - 642 + 20230821, + 1458 ], "deps": [ "cl-lib" ], - "commit": "6260232da8b53c4e214bc5e427ec00c3ebdd9869", - "sha256": "1lykq4pr6723k98mrnh3c2schpnsy0rjjrxzmb00pagcqhvvmc8c" + "commit": "347c30494d3bcfc79de35e54538f92f4e4a46ecd", + "sha256": "1dj2w5yx2dzv6gv4iwahr3mx46dhjfaimw5yycdhb0iljr97a4lp" }, "stable": { "version": [ @@ -106789,14 +107259,14 @@ "repo": "andreas-roehler/simple-paren", "unstable": { "version": [ - 20220713, - 902 + 20230810, + 729 ], "deps": [ "cl-lib" ], - "commit": "feac5e500f49e3825e2e3017d94459e663ebd5ff", - "sha256": "0c2h7fnssmfwlg768g1pg8762nk1h9ywwn0l0qvnz7z6gw2l4mgl" + "commit": "206d8f3f82123f61e7133a14f66c83a9632bd99e", + "sha256": "1vgan91fkmncw9bfis354iccv8vm7wgb35wp1qdvq4977nrivkv9" } }, { @@ -107006,8 +107476,8 @@ "repo": "magit/sisyphus", "unstable": { "version": [ - 20230415, - 1850 + 20230813, + 1454 ], "deps": [ "compat", @@ -107015,8 +107485,8 @@ "llama", "magit" ], - "commit": "c75298b35c40a2267e5b37689e4df7c8c970908b", - "sha256": "16b5sqf0ag387c2mbhjgdc0v7wvhzbhqy3r23gi0yvwlva860ppp" + "commit": "84d6d6fcd99fbe6630da0bcb1e61904954cb3a72", + "sha256": "0zbdqy1pchdnhbhc6s3xzryzgq6jr5h4mr1zybbsknakl54ipgfj" }, "stable": { "version": [ @@ -107563,8 +108033,8 @@ }, { "ename": "sly", - "commit": "4a916e44049cf8c5616c7394389ef91e2a2b3e21", - "sha256": "1pylaiy016yiyvd27m38wymw1k3bq7sfsd2d23idrgybc8miqqp6", + "commit": "28d1f6bc44ef8ab731b37c3eb6bdc29b68465e50", + "sha256": "0rmglbkq3fhmaqm8gar3mn6f5r9cdb14anrnvr4n44x2d2qgrbn7", "fetcher": "github", "repo": "joaotavora/sly", "unstable": { @@ -107574,6 +108044,15 @@ ], "commit": "df62abae73bd511885c9c7ec0ea7ea1469a00923", "sha256": "1nxijv52bja6la2i3asq7kklpj5li25454n52sgsc6xnnfvakbsv" + }, + "stable": { + "version": [ + 1, + 0, + 43 + ], + "commit": "eb67be9698794ba66a09f46b7cfffab742863a91", + "sha256": "11yclc8i6gpy26m1yj6bid6da22639zpil1qzj87m5gfvxiv4zg6" } }, { @@ -107738,11 +108217,11 @@ "repo": "zenitani/elisp", "unstable": { "version": [ - 20230507, - 2309 + 20230822, + 1208 ], - "commit": "dfa6a49ced30720336be3d1fabbab4d6e0c787f0", - "sha256": "10fcr8v3cff9l1y9y0vw1hcnsar255nqdipw1da84x093rfm1j8r" + "commit": "8dcf2d1639f662c355c3fe2f533995042dce0ca8", + "sha256": "0acha536crf59mjpdir1yxh9hk9pnxdjpjggzaj51f7y9hncf43j" } }, { @@ -108344,10 +108823,10 @@ }, { "ename": "sml-modeline", - "commit": "4728fce21f03c95bcc2b562648e99c537fb09cd8", - "sha256": "00kz03ixkfnm4id8dd8aij2rhakzd4arzd790jdac1y3yyd5pp3y", + "commit": "7990ffafb1d4b3e431f095bc02673ac6ccfde56d", + "sha256": "1pcj4hv7fhnarirg393y4fqgxvcs9nl7gnxn2adyrm3727ri6gjh", "fetcher": "github", - "repo": "emacsorphanage/sml-modeline", + "repo": "emacsattic/sml-modeline", "unstable": { "version": [ 20170614, @@ -108639,15 +109118,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20220404, - 307 + 20230822, + 358 ], "deps": [ "dash", "s" ], - "commit": "afe4286dec79ef45a42a343033f69d90dd308535", - "sha256": "1nq1w4vxcb1sv0gbdfrmjxjk07vailjrigk6yhjms65ansy7qfsq" + "commit": "cb5468ab6792654d18c50d80a2ec0f4b603e21b7", + "sha256": "1p42qsjyx1073588w34g2bdnjwc60r4la4g8cpwdc8v02yb2snyc" } }, { @@ -108883,20 +109362,20 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20230805, - 726 + 20230816, + 1732 ], - "commit": "100542418b19859f9828114eeaed2be1071367bb", - "sha256": "18r651hj05vrmwnyhgdy1v8sfq9izb7r4b6mvfnq0my7pwbxck73" + "commit": "07a681fff27ff22d268b726b05576ef93fc4e615", + "sha256": "0mip5da7glzylmagxkmi2f68i19phbbzn72vh3jd3w76labcvbzm" }, "stable": { "version": [ 2, 0, - 2 + 3 ], - "commit": "100542418b19859f9828114eeaed2be1071367bb", - "sha256": "18r651hj05vrmwnyhgdy1v8sfq9izb7r4b6mvfnq0my7pwbxck73" + "commit": "07a681fff27ff22d268b726b05576ef93fc4e615", + "sha256": "0mip5da7glzylmagxkmi2f68i19phbbzn72vh3jd3w76labcvbzm" } }, { @@ -109362,6 +109841,24 @@ } }, { + "ename": "sozluk", + "commit": "be23b41a7f6e469bb5fa72ae6864898a0ce3c201", + "sha256": "13vajy9fimqjpc1nkcab5pz5vydpyfg102bah2vp5xc0qbimapvv", + "fetcher": "github", + "repo": "isamert/sozluk.el", + "unstable": { + "version": [ + 20230730, + 1749 + ], + "deps": [ + "dash" + ], + "commit": "420ace999fa0d27fbc6aa6011313488c8664a925", + "sha256": "16q3bnicj10gkh0kh7sv8arf09vai5fy44g4a1ykhizi9l04pwy6" + } + }, + { "ename": "space-theming", "commit": "5529fcf16b877b01ee0aff710ebfb0ad5da8dba1", "sha256": "0khjdmqv1q2pdas0xjfqs68xjg2nqms6g21bplg54ynsqcp7asv9", @@ -109417,8 +109914,8 @@ "repo": "TheBB/spaceline", "unstable": { "version": [ - 20230221, - 2314 + 20230821, + 1443 ], "deps": [ "cl-lib", @@ -109426,8 +109923,8 @@ "powerline", "s" ], - "commit": "e0f848cc116d9046a04a09f5728fabf892863b7e", - "sha256": "0pbx1s4g6hwwbf0wg8lb58h2iidrr9fpzvybjvd2yb5p9mz4l1nl" + "commit": "3b1ae4d429f12bac65b0f3764f84eace2903a417", + "sha256": "09v2i6i1r5456gpp8dw9bkxyz1ca9nbmim0nnbjaswzf2x8mixwr" }, "stable": { "version": [ @@ -109630,11 +110127,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20230805, - 107 + 20230826, + 56 ], - "commit": "9faa42c161f18e79cdab6d796eaa33bfebbf9418", - "sha256": "1ypgvw63yqxaz7ay99xkjhjbyymi8x0sq4lniyhbrr7aix0zn7dp" + "commit": "b0f6e16790c723a0d19e2eb9e4772192c85b3609", + "sha256": "0q3857bzw8vndryypxgi24wrmhfb4kj1sgj3m61yvds7z2v50chp" } }, { @@ -109666,8 +110163,8 @@ }, { "ename": "speechd-el", - "commit": "96669a664122c2fb69acd4cad2d7bf75d3e8272d", - "sha256": "0p8zih9s2x6l2xcfjbzriyhsicaiwxz54iq9h3c8szlzq708mayc", + "commit": "890ec47013f1638d3b12f2d08118bf64c104be2b", + "sha256": "08lammsi7p99d1nsd76ha2fg09wzbfd0drw69waq6v3zvh0yb8ik", "fetcher": "github", "repo": "brailcom/speechd-el", "unstable": { @@ -109758,11 +110255,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20230326, - 736 + 20230808, + 1342 ], - "commit": "67a26b7a00449ee8ef3a80ab662c93a32adef679", - "sha256": "0gbfzd4zpqn0kbag3a6axc7y17r5qgwgpprsd1x5hnixji1vzhxr" + "commit": "540141a5764ceb403e78e22f6714e2dab3597bc7", + "sha256": "0m4ml9x4mc3h3ychjgnqcg4nwdxxr5qq6hrlwam7yb3ggndh19vq" } }, { @@ -110206,14 +110703,14 @@ "repo": "purcell/sqlformat", "unstable": { "version": [ - 20230524, - 843 + 20230808, + 543 ], "deps": [ "reformatter" ], - "commit": "aa6dc933efe2e7df77fa1259ec82d62ac1b1e81a", - "sha256": "1227pv73q33ykzb87yw59y63kfmrrf1amglw0018bihf2r0d40rz" + "commit": "c28c5f85828b25f7f36320b585056ea4b7181a9f", + "sha256": "0shspminb6j5fjp34qqvglcn2i22fhs8if3f36sws3rzwhfml7jc" }, "stable": { "version": [ @@ -110343,11 +110840,11 @@ "repo": "srcery-colors/srcery-emacs", "unstable": { "version": [ - 20210601, - 1247 + 20230825, + 1133 ], - "commit": "58dd21cd63e4a2eed15e0082c2547069363f107b", - "sha256": "128ri2g7jjgpacvaxhwwv4f2h3kdzf5vv3p01yqbs23m8mri8d9w" + "commit": "31f5ef9b85d39f720fcd874041ddbe3d8616caf4", + "sha256": "1vhbv7w0xb8kmxcybsyq6r934qbq2665l1cs79bj3nbpkgdcyhx9" } }, { @@ -110853,20 +111350,20 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20230725, - 1528 + 20230819, + 2343 ], - "commit": "cee9dfd7d12b86178bcbf1d48679f298f94113b3", - "sha256": "1dxzsdmwqlkgk1q3l803mpy50amda2kqfsgfjv9lc31cx6h36jma" + "commit": "505ddcd2f01b563187da5f901da1fc9825e797b3", + "sha256": "0q0c5wkbd4nlri5xq39qqh5spl2nnai3a52ilr57cm76ikkmf0xd" }, "stable": { "version": [ 2, 3, - 1 + 2 ], - "commit": "cee9dfd7d12b86178bcbf1d48679f298f94113b3", - "sha256": "1dxzsdmwqlkgk1q3l803mpy50amda2kqfsgfjv9lc31cx6h36jma" + "commit": "505ddcd2f01b563187da5f901da1fc9825e797b3", + "sha256": "0q0c5wkbd4nlri5xq39qqh5spl2nnai3a52ilr57cm76ikkmf0xd" } }, { @@ -111063,14 +111560,26 @@ "repo": "magnars/string-edit.el", "unstable": { "version": [ - 20220913, - 712 + 20230118, + 1933 ], "deps": [ "dash" ], - "commit": "e285ada415b975a9eb70a7e065123923d9bf8798", - "sha256": "1ad7vc0ba09mnahhjr29gg8agjvdzminxsdblwldld726y4prr6f" + "commit": "87936d816ae24184dd83688136531b6b6f1943fe", + "sha256": "0ggn7l3bisjx1ab4jrhija3z3bh6zbafhzjl5cq92n7i2plz8qdm" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "dash" + ], + "commit": "87936d816ae24184dd83688136531b6b6f1943fe", + "sha256": "0ggn7l3bisjx1ab4jrhija3z3bh6zbafhzjl5cq92n7i2plz8qdm" } }, { @@ -111755,14 +112264,14 @@ "repo": "rougier/svg-tag-mode", "unstable": { "version": [ - 20230803, - 504 + 20230824, + 943 ], "deps": [ "svg-lib" ], - "commit": "0e0ea48799d8911ed6c1ef60565a20fd5cf3dae4", - "sha256": "1imsj3hwjx6rlcf9a66r4n1jzgxckhaq7y03mf5lii7kdrgrj26i" + "commit": "c914980f09a9c7e2ba4faf64874ef17505bdc861", + "sha256": "06jvq2ry71zk63kcncibs8ajzq32p9jn9rw29wdgyqgkww43b5rd" } }, { @@ -111877,14 +112386,11 @@ "repo": "thblt/sway.el", "unstable": { "version": [ - 20230731, - 1819 - ], - "deps": [ - "dash" + 20230812, + 1306 ], - "commit": "be38a30e41ea1d1ac670679c7e890cff6204f581", - "sha256": "05gav2vqymfybr613k1c42brk2n7sqnvfzfd1a3cs8hjsx07wr2c" + "commit": "fc1c09fe30cf33e8755c3b6c9749783923f2cb9b", + "sha256": "16clh6zd4k3575817gmzjfn13s14sf4prk8r6pyaz01jpjir1s3n" }, "stable": { "version": [ @@ -112022,14 +112528,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20230724, - 1335 + 20230819, + 333 ], "deps": [ "seq" ], - "commit": "d900694d0194df4c8b0993d383e3b6bb0f71ef31", - "sha256": "0y372d97jgw2f3i44iyih8xxsaw935s4sfjydfmcdh2dsf8ljhc7" + "commit": "609471e9e242261de1d80231c58a469df7530be3", + "sha256": "0k2q70kjws6rlzwcc6bmi4nz1qxpizgj29gzzr3lxq1a9j8cjphi" }, "stable": { "version": [ @@ -112380,6 +112886,21 @@ } }, { + "ename": "symbols-outline", + "commit": "914b5060fa2b97789ecd0e0a80aac7e7e86d2bee", + "sha256": "16qv9pgn099bzzsl58zsywkw5z4q684sqchiaad6x92v5mgdq83s", + "fetcher": "github", + "repo": "liushihao456/symbols-outline.el", + "unstable": { + "version": [ + 20230824, + 857 + ], + "commit": "c5b077d79846bb7507ca5cb11795403a5eda71dd", + "sha256": "0zc5wgljhhxzad3mqlk3kg9q5ir95vn5gsqpw5vfflb84drzp7va" + } + }, + { "ename": "symbolword-mode", "commit": "be2018e0206c3f39c1b67e83000b030d70a72ceb", "sha256": "1fs1irnmlbrn76b4gdsy0v65nz8av85iqm0b7g9nm2rm8azcr050", @@ -113438,15 +113959,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20230806, - 1040 + 20230823, + 1026 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "c9d51f23bf2d4cf00b3b8686394333ae3ede27b2", - "sha256": "0cnjm4awb7y6fjp2i0wxsks2vd8vvnscrym4rc97gmhc3dlpjn9b" + "commit": "cfc216ac8f8da5f313c1831c23b83cff2fa9301d", + "sha256": "05z3xrli9p3mkysixvsp60qig4dqqdz1sm0dgqf7l0235r0qcp8m" }, "stable": { "version": [ @@ -113577,14 +114098,14 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20230801, - 910 + 20230810, + 2303 ], "deps": [ "compat" ], - "commit": "eece42f153487238a6745e0ce2e57a606669bc17", - "sha256": "1cc087a58x84jwr14ac8hn7hjhhb1bpp8xbwba553y91ldxbqww1" + "commit": "93deb89ac1b1b6d789779432cfae5c76d9939c44", + "sha256": "0ks0fnxs9giwp6ly410m5m1v3icgpgs5zj0axi7g37984nnqkq42" }, "stable": { "version": [ @@ -113830,58 +114351,70 @@ }, { "ename": "term-manager", - "commit": "0b2f7d8c8fcbb535432f8e70729d69a572e49a1a", - "sha256": "0ab388ki7vr1wpz81bvbl2fskq9zz5bicdf5gqfg01qzv5l75iza", + "commit": "03596f65dd277c299a8f79d135771a7423eecec6", + "sha256": "1z5zch6k85p4yf246hz78vmavcdqrgcbvjkh8h1wq9rshsx5dcap", "fetcher": "github", - "repo": "IvanMalison/term-manager", + "repo": "colonelpanic8/term-manager", "unstable": { "version": [ - 20230724, - 8 + 20230727, + 2308 ], "deps": [ "dash" ], - "commit": "c6da6a36d30525cf054f4d78912957c2f1952197", - "sha256": "11hbm1c81py4mg1kh05ih5h5wxgqqbvdq5qcc1x9nsp807j0r17f" + "commit": "31a3d16ba5a4f9e6f4bc52275eaedf55a96154a8", + "sha256": "1c2fxsqfvyh0g77vsjc7qmpfc8d5vnwlxkb1gah57i6sri5c8hj0" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], "deps": [ "dash" ], - "commit": "0bca2e7e3b6e906ec67696bc0be952988ca7f733", - "sha256": "0ybmszjb2lrgqp3zixpxy0lp2l9axw3mz2d4n2kmajh8ckbr576v" + "commit": "31a3d16ba5a4f9e6f4bc52275eaedf55a96154a8", + "sha256": "1c2fxsqfvyh0g77vsjc7qmpfc8d5vnwlxkb1gah57i6sri5c8hj0" } }, { "ename": "term-project", - "commit": "20d9871d8f90c8de5431baf6765151e475af55d3", - "sha256": "07fax7xzf3imc3gi6kmaxyscykq0vd25p4mz28lzq0g0z2lkvqfg", + "commit": "1f364ddac0044d26283e414b4d34b1777517cb2b", + "sha256": "04zk3k3qdfndh5ykkwnsh2qznvzazj5fzsx6nxxn373jp8y26rm0", "fetcher": "github", - "repo": "IvanMalison/term-manager", + "repo": "colonelpanic8/term-manager", "unstable": { "version": [ - 20230724, - 1651 + 20230727, + 2308 ], "deps": [ "term-manager" ], - "commit": "f6e55491aedac15b9bf1ef92aaebf35ba9c9dd94", - "sha256": "0ra4kjzh64kmv3f4lc31sh5r84ands5rvj3hhpmzr157dm9zsj4c" + "commit": "31a3d16ba5a4f9e6f4bc52275eaedf55a96154a8", + "sha256": "1c2fxsqfvyh0g77vsjc7qmpfc8d5vnwlxkb1gah57i6sri5c8hj0" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "term-manager" + ], + "commit": "31a3d16ba5a4f9e6f4bc52275eaedf55a96154a8", + "sha256": "1c2fxsqfvyh0g77vsjc7qmpfc8d5vnwlxkb1gah57i6sri5c8hj0" } }, { "ename": "term-projectile", - "commit": "5260876280148fae28a459f07932cebb059b560e", - "sha256": "1mzyzjxkdfvf1kq9m3c1f6y6xzj1qq53rixawmnzmil5cmznvwag", + "commit": "1f364ddac0044d26283e414b4d34b1777517cb2b", + "sha256": "0ncl3sciis680sqxl640fjkg7cpsq7cmpf8m0xmzyv48w3lk5wpf", "fetcher": "github", - "repo": "IvanMalison/term-manager", + "repo": "colonelpanic8/term-manager", "unstable": { "version": [ 20230727, @@ -113897,15 +114430,15 @@ "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], "deps": [ "projectile", "term-manager" ], - "commit": "0bca2e7e3b6e906ec67696bc0be952988ca7f733", - "sha256": "0ybmszjb2lrgqp3zixpxy0lp2l9axw3mz2d4n2kmajh8ckbr576v" + "commit": "31a3d16ba5a4f9e6f4bc52275eaedf55a96154a8", + "sha256": "1c2fxsqfvyh0g77vsjc7qmpfc8d5vnwlxkb1gah57i6sri5c8hj0" } }, { @@ -114376,8 +114909,8 @@ }, { "ename": "textmate-to-yas", - "commit": "487c461bf658d50135428d72fbfbb2573a00eb7d", - "sha256": "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l", + "commit": "890ec47013f1638d3b12f2d08118bf64c104be2b", + "sha256": "0rkv4afc1yxvv7y0wr0g4ad881qcr7dsyiwg8r1025m2rg7501l3", "fetcher": "github", "repo": "mattfidler/textmate-to-yas.el", "unstable": { @@ -114685,21 +115218,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20230726, - 1838 + 20230813, + 1935 ], - "commit": "c51cb5780198089ea5997e825f7bf72d249ec8ef", - "sha256": "0iba83a8hbgvdjvw9jp8daydg1d165m6zkjdmvhrpmnsp3fq6kiz" + "commit": "733edc209c7f7247a7ead46084346caa46c18867", + "sha256": "1rlqzb15an7x7cpjk1fqp5s5gxqiv4lyyqrm0kgigp8xd0a1w6za" }, "stable": { "version": [ 2023, - 7, - 31, + 8, + 14, 0 ], - "commit": "c51cb5780198089ea5997e825f7bf72d249ec8ef", - "sha256": "0iba83a8hbgvdjvw9jp8daydg1d165m6zkjdmvhrpmnsp3fq6kiz" + "commit": "733edc209c7f7247a7ead46084346caa46c18867", + "sha256": "1rlqzb15an7x7cpjk1fqp5s5gxqiv4lyyqrm0kgigp8xd0a1w6za" } }, { @@ -114854,10 +115387,10 @@ }, { "ename": "tile", - "commit": "424cfd28378ef328721bb0dc3651808e64c01306", - "sha256": "1795048ilpg6y9pn0jj0js5446hwxhwm6qmk50hds0hpcb396vbv", + "commit": "bdb191b4cd65bd60a905ec2866471031abec7f23", + "sha256": "0adc35i2j1n8dkjv7bdq4i7kcl0bc0r894aq7d7abis7xdlw0wbq", "fetcher": "github", - "repo": "IvanMalison/tile", + "repo": "colonelpanic8/tile", "unstable": { "version": [ 20161225, @@ -115317,11 +115850,11 @@ "repo": "vifon/tmsu.el", "unstable": { "version": [ - 20230430, - 1243 + 20230807, + 2218 ], - "commit": "c92497b9b5282864cde2a9e0f507fd8b78e0400e", - "sha256": "05vnjm7l6ajlrcjb0gz1iyvpgwra6cvsymlshd4k3bjks151xj27" + "commit": "8207b4140fd1b3eff2ec4b9818e67148139cb72f", + "sha256": "02ipyb19s961k05kmbika302rfipzcgpvm0g1q3pxn7arxs9s3kl" } }, { @@ -115503,11 +116036,11 @@ "repo": "topikettunen/tok-theme", "unstable": { "version": [ - 20230730, - 1922 + 20230816, + 1246 ], - "commit": "b926f4a5891be2428489601b0de7e475dd1b697d", - "sha256": "0cyy5jnm767c5vavsjhds4ar2zfs8h8gvf3kkjmg4ip64qlmygw2" + "commit": "dba88cf798b1483e3459de170fe8bbfd4fe57095", + "sha256": "0h9d2pgl8j01wcxznzd9nz8k9xllxli7id06xrzhnpsg0ps6dm7l" } }, { @@ -116017,26 +116550,26 @@ "repo": "magit/transient", "unstable": { "version": [ - 20230723, - 1411 + 20230825, + 2019 ], "deps": [ "compat" ], - "commit": "323d6b6c84e6ae55e578efa1efb6bb4d42a69cac", - "sha256": "1l5pjq3iq6hmlc2zc30zhcvdf5l07778fvkg4b6qw8q0rl3a6mi5" + "commit": "8cf1238181d57504e68f42fa0d4ef66784b197a9", + "sha256": "03qs1bj7dxgdppzcnhzmldpdam1h8kzd0ps2bk82slypm7d63nay" }, "stable": { "version": [ 0, 4, - 1 + 3 ], "deps": [ "compat" ], - "commit": "a1575e58331b1ff85ac97667df0130ae822ccf5f", - "sha256": "1aq4bb83pdkbkbqh6ba0r7sadaq45qqg2q5jlqyvsn8akcsq65iq" + "commit": "8cf1238181d57504e68f42fa0d4ef66784b197a9", + "sha256": "03qs1bj7dxgdppzcnhzmldpdam1h8kzd0ps2bk82slypm7d63nay" } }, { @@ -116252,20 +116785,20 @@ "repo": "shingo256/trashed", "unstable": { "version": [ - 20220106, - 1358 + 20230811, + 157 ], - "commit": "ddf5830730544435a068f2dc9ac75a81ea69df1d", - "sha256": "08v7g2zgrad0r0n4pla8j3i2aql46byq82jr712cvxhydd5gnzf9" + "commit": "52a52a363ce53855790e7a59aed6976eec18c9ea", + "sha256": "091c9b4glx7d5svwgr3jvqv1d8lw10mw4hvv4mq7kx1j54zmbnbf" }, "stable": { "version": [ 2, 1, - 3 + 4 ], - "commit": "ddf5830730544435a068f2dc9ac75a81ea69df1d", - "sha256": "08v7g2zgrad0r0n4pla8j3i2aql46byq82jr712cvxhydd5gnzf9" + "commit": "52a52a363ce53855790e7a59aed6976eec18c9ea", + "sha256": "091c9b4glx7d5svwgr3jvqv1d8lw10mw4hvv4mq7kx1j54zmbnbf" } }, { @@ -116491,26 +117024,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20230705, - 525 + 20230824, + 954 ], "deps": [ "tree-sitter" ], - "commit": "944a734b7c3a5922a7e9a2009a9165e2dc195b18", - "sha256": "1sn9rdmj4pndswqq19f0y9g5s2i8kbwvkg2azx0kmf9y269j6z2a" + "commit": "974e9034d6432f76efe634ea552b6ec0be6c0c2f", + "sha256": "1ya6mscwfil1gqg6wnzfzrw2fsvycnvcr9ldwiz1fzsxi03g5b4s" }, "stable": { "version": [ 0, 12, - 22 + 26 ], "deps": [ "tree-sitter" ], - "commit": "944a734b7c3a5922a7e9a2009a9165e2dc195b18", - "sha256": "1sn9rdmj4pndswqq19f0y9g5s2i8kbwvkg2azx0kmf9y269j6z2a" + "commit": "974e9034d6432f76efe634ea552b6ec0be6c0c2f", + "sha256": "1ya6mscwfil1gqg6wnzfzrw2fsvycnvcr9ldwiz1fzsxi03g5b4s" } }, { @@ -116557,8 +117090,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20230719, - 2015 + 20230822, + 2039 ], "deps": [ "ace-window", @@ -116570,8 +117103,8 @@ "pfuture", "s" ], - "commit": "aa0944a29eee48302fd76b6c3a59c5aece114fa6", - "sha256": "09finy1y3jc72f5ar891bi2xsynd31g7pl8f27m2zbpc7r4la8mi" + "commit": "147594c4b84952a9897261420fea97b725bb6bac", + "sha256": "0kal2x7dzsx9cnwlwr84r61f9fxzx38fi0gn27j377dyyksr0wzz" }, "stable": { "version": [ @@ -116631,15 +117164,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20230510, - 1644 + 20230822, + 2039 ], "deps": [ "evil", "treemacs" ], - "commit": "12193dfa41d73f26386eacaeafd9ffaeee6491bd", - "sha256": "1s9y9y5xjbqr7yk3qvrc664mqwmzwshlhbvjkvlma33zzaa655lq" + "commit": "76a20a456cbbf45a317e1e5f6f5b970f938a3bfe", + "sha256": "0qg0pp8qbvcpaspwl17biad5zmzc8418fcwlv7fzrxz6bc72hqfh" }, "stable": { "version": [ @@ -117643,14 +118176,14 @@ "repo": "Ziqi-Yang/typst-mode.el", "unstable": { "version": [ - 20230610, - 1237 + 20230819, + 928 ], "deps": [ "polymode" ], - "commit": "846317529628ef5881e39a47080cb91e971b43b8", - "sha256": "0izh7h3fgaiq9ff7g3rylhhaq3wzqzsfb1srq1m6yhqcnm31ksbb" + "commit": "bbc08e88b5454849debb1c4022af56ff3a7f916e", + "sha256": "1ss8wb9jg6l81jrm151d2yybcfbjxq97yhgcwk7dc1pypajldfzc" } }, { @@ -117993,11 +118526,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20230109, - 2256 + 20230808, + 1340 ], - "commit": "d59bba01de48a808a42d6e29e011ef641cdb6a77", - "sha256": "0bnwhcybvcb60wh3q71fy2jsprzy00g2ipcksnjdpqcwaqvjwdl8" + "commit": "0e74116fd5c7797811a91ba4eadef50d67523eb6", + "sha256": "0m5kj393jvg7r7mxjkg1riahxk20fc323agwdb86026z2cv2xl2x" } }, { @@ -118682,6 +119215,29 @@ } }, { + "ename": "ursa-ts-mode", + "commit": "5f0db5a7ba14fff9dbfa584374728df341beebac", + "sha256": "1q8vwzcsvkbwxd80svi89qw44fkp1fgsw1q81bisl3f0kbbnv7f7", + "fetcher": "github", + "repo": "ursalang/ursa-ts-mode", + "unstable": { + "version": [ + 20230814, + 1337 + ], + "commit": "a1141c424e607850b12059d95f7f9eebeb409b89", + "sha256": "035rqzw5jazn9nbzqw2vwd27pwk575axkmy1s7g023z15ldy9b44" + }, + "stable": { + "version": [ + 1, + 2 + ], + "commit": "a1141c424e607850b12059d95f7f9eebeb409b89", + "sha256": "035rqzw5jazn9nbzqw2vwd27pwk575axkmy1s7g023z15ldy9b44" + } + }, + { "ename": "urscript-mode", "commit": "b4ae680b51a85749ed254215bbd4a35909961049", "sha256": "1jjmpg9r7vwa8284chx9yc1ifn36m7ml1ks4ls8hnsxachbv7wlh", @@ -119744,11 +120300,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20230711, - 1636 + 20230825, + 2151 ], - "commit": "db122b8847b1c1896f3cf9512fd0ec9f79927715", - "sha256": "0srlbbih7flmbipmp1w21pc7440pca918n4n6ja1rwigsh3zz5cl" + "commit": "e1e551f6340d58e7782f2c1df7b397229a1c4fe3", + "sha256": "0d22h72mnngi55v1ksa22gwxbyw8flwi6x8wx1c5hfvl59ww8nsl" }, "stable": { "version": [ @@ -119805,8 +120361,8 @@ "repo": "gmlarumbe/verilog-ext", "unstable": { "version": [ - 20230627, - 1748 + 20230824, + 1614 ], "deps": [ "ag", @@ -119820,15 +120376,16 @@ "outshine", "ripgrep", "verilog-mode", + "verilog-ts-mode", "yasnippet" ], - "commit": "308c95d187e236972cad405d5251462c6a825809", - "sha256": "05pxf8bw6vs87rx891ndaajhysqmvvl55x27222h64h2cg9xhg0x" + "commit": "0be4886cf24ef372601fb2aaf2569a89adc85875", + "sha256": "1lxsmwrbnpv8l87iawqbj7nkm5vda2dsjmnrpb5zydrjszh4kv8a" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ @@ -119845,8 +120402,35 @@ "verilog-mode", "yasnippet" ], - "commit": "dfb4bc4265e7b06cddd4ecdc8b4a7fb9d5da135a", - "sha256": "088c0gag4l4iha6gdsap42g2kw219s00lsnkicbky0km3sxmm1ac" + "commit": "9a5abc9b1886c51cf3b3190bb77bd47be05749d8", + "sha256": "1ck5mfvb01cl8gf12wwxqh9x333c9ck3vc2fb7q02r3yam822mq9" + } + }, + { + "ename": "verilog-ts-mode", + "commit": "1db97a1b9af5074ea9adf60fe1b922ab9aebb937", + "sha256": "099j1yyvx1fzyv8q04rqxfgpgabydyaaagkgj3md29pgp9a4gn7q", + "fetcher": "github", + "repo": "gmlarumbe/verilog-ext", + "unstable": { + "version": [ + 20230824, + 1615 + ], + "commit": "268121ce614f79cb228e69add59e6e653759c0e1", + "sha256": "1g6kz38qji6hggqgh6rjyr3nakqk4132p2rp2g193znqkb97ralg" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "async" + ], + "commit": "9a5abc9b1886c51cf3b3190bb77bd47be05749d8", + "sha256": "1ck5mfvb01cl8gf12wwxqh9x333c9ck3vc2fb7q02r3yam822mq9" } }, { @@ -120010,37 +120594,42 @@ "repo": "gmlarumbe/vhdl-ext", "unstable": { "version": [ - 20230618, - 1337 + 20230824, + 1557 ], "deps": [ "ag", + "async", "company", "eglot", "flycheck", "hydra", "lsp-mode", + "outshine", "ripgrep" ], - "commit": "4e2702723111f4a8cfc300ce502e6a177929f117", - "sha256": "1vrvfzgnd72914gq2k4qcvx7vk2vqsn5ywm3i10vvq8in6fvrp4p" + "commit": "04ba439b6c429bf16d6cc86ea96eff44c8468dc4", + "sha256": "1caf4v8m0117bhffgdm88cbqhmfh8qf526hbh001qdl2zag6flw8" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "ag", + "async", + "company", "eglot", "flycheck", "hydra", "lsp-mode", + "outshine", "ripgrep" ], - "commit": "7785be558c5128ec05bc4ebb6e81f27841aba237", - "sha256": "14s8ksrsjyqw8dqf3mcparn3lgsazswxcs4w23n0pyls4x9bxlfb" + "commit": "b571cce006ccaaa48949f1750c64bde4a187c0d8", + "sha256": "0y7xgd7zfn5j56034fh0gvpy0sxmm143z232yy5l33fxkgg70kzp" } }, { @@ -120864,14 +121453,14 @@ "repo": "embed-me/vunit-mode", "unstable": { "version": [ - 20220316, - 1812 + 20230813, + 815 ], "deps": [ "hydra" ], - "commit": "5643460a7011d6bc13c2d4762f329d19f6c7d46b", - "sha256": "1zzlfscnzvck658ylsmqwk30jdf9qnrnmhvghd3xinlhglnmwrp7" + "commit": "24c43fbc1daddadeecea64276dbd9c6ba769e850", + "sha256": "11ki2fpgms8ipj3yhfkwwl3r1khdmlb28k6z0jl5lmdwj4q3ldjq" } }, { @@ -120937,17 +121526,17 @@ }, { "ename": "w3m", - "commit": "85c53c48caab0845101c487e4fee7e2cda15f706", - "sha256": "1fnib1y79g50jz9wll63j0xf2awgkrlk6hwx0w6nzg0xsbfbkdvk", + "commit": "890ec47013f1638d3b12f2d08118bf64c104be2b", + "sha256": "1157pn0syhhpkjkxyz05lcw49pac0xql04rsp91yxx1ykw0fck2l", "fetcher": "github", "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20230801, - 18 + 20230818, + 722 ], - "commit": "1388eadc914bed79b0e06a6565388c5e8aff8014", - "sha256": "09l3mllq7p56r3srlfiyry4qgvpl5vijc63ccqpigdlzy758p8r1" + "commit": "e19e72815a3256d6de5347d8878ea6a00f01bc0b", + "sha256": "0kphl08wysq2q19c592h5c99sr2fpqasl512krv194vvvrfp6gcl" } }, { @@ -121734,14 +122323,14 @@ "repo": "ahyatt/emacs-websocket", "unstable": { "version": [ - 20230730, - 517 + 20230809, + 305 ], "deps": [ "cl-lib" ], - "commit": "a39ea953f27f6ae105ac5b1343852ddf13438048", - "sha256": "03g472k7nv0w10ap1z0vvjiwwfmxzkl8nfh6jpcsbvr2c0n8bb7h" + "commit": "40c208eaab99999d7c1e4bea883648da24c03be3", + "sha256": "0bq0y63rriwsw6v8mn72773iqic2q52vx1j7mfa8br27sm6y1pd4" }, "stable": { "version": [ @@ -121873,11 +122462,11 @@ "repo": "thierryvolpiatto/wfnames", "unstable": { "version": [ - 20230805, - 1952 + 20230819, + 1122 ], - "commit": "7b50001525b477a66e74bb1f749195d59f800872", - "sha256": "08sv0vy0niknwwgz95fdf1k5cd4mr0cmf9j752w54imjh047mj8b" + "commit": "ea336972227a5ffe29fed0aaa1ccaadf90743db3", + "sha256": "15np6d09081a84y3ildgadmkqjpmbwmd7rrgaa2lxvcj8r1gb2pn" } }, { @@ -122462,19 +123051,19 @@ "repo": "habamax/wildcharm-theme", "unstable": { "version": [ - 20230805, - 1207 + 20230825, + 610 ], - "commit": "eb518d68956494396bfad5effb6b0b5ff24a4a70", - "sha256": "0n6cyi46cqnm6azqc2744sscf1cxhpa1qrxi6n1xq3lvmpnrgnkh" + "commit": "5a8f420493b68c7bc460bc1fdc41b26c3ad1a738", + "sha256": "0wdajxfgzbin0njgfbjhawgl3gfb0rlm90v62zxr1xsb59rl9wv1" }, "stable": { "version": [ 0, - 4 + 6 ], - "commit": "00dee3a5e9d0db15bfa386a6e9ff74a62252adce", - "sha256": "0xrng2q9pc7ayrifsjcddjfh9vzzvgll6rm57as4hxgvj3qm52z0" + "commit": "297c72eef2b4ec48abc8cb99640c101e4e164c94", + "sha256": "08s4a7msg8vaf7mrarbxl8wdrjzx7aj7mzb3zgq810w0l5snl4mh" } }, { @@ -122485,19 +123074,19 @@ "repo": "habamax/wildcharm-theme", "unstable": { "version": [ - 20230805, - 1207 + 20230825, + 610 ], - "commit": "eb518d68956494396bfad5effb6b0b5ff24a4a70", - "sha256": "0n6cyi46cqnm6azqc2744sscf1cxhpa1qrxi6n1xq3lvmpnrgnkh" + "commit": "5a8f420493b68c7bc460bc1fdc41b26c3ad1a738", + "sha256": "0wdajxfgzbin0njgfbjhawgl3gfb0rlm90v62zxr1xsb59rl9wv1" }, "stable": { "version": [ 0, - 4 + 6 ], - "commit": "00dee3a5e9d0db15bfa386a6e9ff74a62252adce", - "sha256": "0xrng2q9pc7ayrifsjcddjfh9vzzvgll6rm57as4hxgvj3qm52z0" + "commit": "297c72eef2b4ec48abc8cb99640c101e4e164c94", + "sha256": "08s4a7msg8vaf7mrarbxl8wdrjzx7aj7mzb3zgq810w0l5snl4mh" } }, { @@ -122918,26 +123507,26 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20230711, - 1217 + 20230825, + 2028 ], "deps": [ "compat" ], - "commit": "a4853781835346aabf083d2d9cb87f656d01ccac", - "sha256": "19cw4swz2v9wyy54fffnh8vdyb8irzqmd3wzgzfbk3kiksapk7ns" + "commit": "2dc557b668203e718502e28573c45659cc8c0a78", + "sha256": "1g7m2vsg5asn9jqbgkymip46mkg2cm8bf38jzizzmrizirxnngq4" }, "stable": { "version": [ 3, 3, - 0 + 1 ], "deps": [ "compat" ], - "commit": "bce8d1bf3faf5237332aada3bb0920bbbc037fe7", - "sha256": "1p0mrx4cixjpw34x8m8f8wna5f9rh8h3s4kpsycyvzmpmz3jicr9" + "commit": "2dc557b668203e718502e28573c45659cc8c0a78", + "sha256": "1g7m2vsg5asn9jqbgkymip46mkg2cm8bf38jzizzmrizirxnngq4" } }, { @@ -123175,11 +123764,11 @@ "repo": "progfolio/wordel", "unstable": { "version": [ - 20230528, - 1902 + 20230818, + 1324 ], - "commit": "dd87d7c1b66eaceb6ebedbbff6ab6d8523004de2", - "sha256": "1k4r7i6zachkifimhwimcwbrax0d4mxvr2n5kadxr4m11cjgrl90" + "commit": "70171a21cbe53e407b86440bf7ee93d39cb5ebde", + "sha256": "1irmabp8zdlp08mvf2xlamf8kg4qbvydm1h4a6ca0b8v53jpd95f" } }, { @@ -123689,11 +124278,14 @@ "repo": "jobbflykt/x509-mode", "unstable": { "version": [ - 20230430, - 1518 + 20230818, + 634 + ], + "deps": [ + "compat" ], - "commit": "3830cbfdadab4cd68e6f0b6a3a7a4931be8328ea", - "sha256": "0ff6kpnh9bzhxx15p18fijjjsqv0mcqwsd5pidyx8v2yzq699k7x" + "commit": "fa9245fade7762c5550bac5608125dc64c93769e", + "sha256": "0395bngy92znr2vk4ki8fpi3fn6klwdlz1xx0w39agsp26vkqcp7" } }, { @@ -124030,19 +124622,19 @@ "repo": "ndw/xmlunicode", "unstable": { "version": [ - 20210829, - 1631 + 20230820, + 814 ], - "commit": "6e91a39114ae6ec98b26c9670db916a02c721b1f", - "sha256": "07qkp4igbsdxffcm1hlprf0jgvq1mc714q85pbpby5kfir9f2lbd" + "commit": "5f1c3e48b90588eb56cec67d3efc869a4e95b03a", + "sha256": "1clvq3hqipryk7x15z1k76wxs48fms6i5z196hq2ik1a3ka8027y" }, "stable": { "version": [ 1, - 25 + 26 ], - "commit": "6e91a39114ae6ec98b26c9670db916a02c721b1f", - "sha256": "07qkp4igbsdxffcm1hlprf0jgvq1mc714q85pbpby5kfir9f2lbd" + "commit": "5f1c3e48b90588eb56cec67d3efc869a4e95b03a", + "sha256": "1clvq3hqipryk7x15z1k76wxs48fms6i5z196hq2ik1a3ka8027y" } }, { @@ -124812,6 +125404,24 @@ } }, { + "ename": "yasnippet-capf", + "commit": "ac25b9a1dfaaff1c683902670eb533bbe18e7db8", + "sha256": "03dilvxsp5qzi2jwzfc09mfxd90206gk2fz8mqklb2q4p4d8lxnq", + "fetcher": "github", + "repo": "elken/yasnippet-capf", + "unstable": { + "version": [ + 20230813, + 1906 + ], + "deps": [ + "yasnippet" + ], + "commit": "40654214db7a44db3a99321447632b43a10fae57", + "sha256": "1kywl7jblrmixr0vwycpil5hyk4p5qlc3gxg9w25xga4jj91r663" + } + }, + { "ename": "yasnippet-lean", "commit": "e1cdcf88a7ff90570d8b09901de8b8b8a153c52e", "sha256": "0mhlg6ya4b232hgq5wh5w9h0ww35qi9br4501sc379zqwflvqcm7", @@ -124837,14 +125447,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20230622, - 1323 + 20230815, + 820 ], "deps": [ "yasnippet" ], - "commit": "bec49fa129ae8c0104ba150f9b8352a39c54dbd6", - "sha256": "14pwcs4qc3xfsxbjbi0518hnzp531i4m2h4ia75v9kibjfrk48x0" + "commit": "063f54cea33f59defe9123549bf55ca342457a1c", + "sha256": "0xnfy6ppnraxgj1kpq7kwyiyznih12xz0xvim6wz7bx9sjw31lch" }, "stable": { "version": [ @@ -125024,20 +125634,20 @@ "repo": "thanosapollo/yeetube.el", "unstable": { "version": [ - 20230804, - 1322 + 20230825, + 2152 ], - "commit": "2364a3e120b461fc6f5fbbf91cd0ab1ae805be15", - "sha256": "0vfap6sri6qnswrjsp6qvmrp98bvrfh58gwdqbjiakq1fzvcrm03" + "commit": "11c85c1daf0684ff074fd1decdf5eda3b7caf309", + "sha256": "1h2r8hp8i30x39585ngfbf4w2jvhznqj1a8q89pqhb9x16x42pz2" }, "stable": { "version": [ - 1, - 4, - 2 + 2, + 0, + 0 ], - "commit": "2364a3e120b461fc6f5fbbf91cd0ab1ae805be15", - "sha256": "0vfap6sri6qnswrjsp6qvmrp98bvrfh58gwdqbjiakq1fzvcrm03" + "commit": "eef53f8d1f382554654815ad089e1a38a4854959", + "sha256": "0a41r1gfs8zxizgpazwvighjwvv4xmf9p9x0cfglkahyqk89hn47" } }, { @@ -125833,14 +126443,14 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20230722, - 2023 + 20230815, + 2033 ], "deps": [ "reformatter" ], - "commit": "0ced3ffb6d76c906c62d7f8f97272aa577fb0c3a", - "sha256": "0sqh4a1yzvqfjs72blcshaqlqs2qxmk1yx25h9xl3iqaajns883z" + "commit": "079149a19fc869343130e69d7b944afd3a1813cc", + "sha256": "1r8mysp3q4zj9mm1hxj00vnycasi0hlmdgqqjl540jcyn86jqw9a" } }, { @@ -125891,19 +126501,19 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20230712, - 1103 + 20230821, + 2127 ], - "commit": "5be59ca972f3f624d444b7b7d7ca75a06bcd2ce5", - "sha256": "0hijdi10l44ky8j66qz6bxmg1vnfhikkd65iqfb3ycg1kwzd4r9p" + "commit": "05b253b60d86799e839239316b660efe69e0268f", + "sha256": "03b7ql8894l4i6s7rp15xfwfrbn23nlbskd6dz7wva2qs967nb4d" }, "stable": { "version": [ 0, - 4 + 6 ], - "commit": "9a3ed5e743c38725e7d9a7e4eaecfe624654c68d", - "sha256": "1az7n1f0203kk7x50ljjz3dcirkbk0zxzc54b3xxv64sd806vfw6" + "commit": "5be59ca972f3f624d444b7b7d7ca75a06bcd2ce5", + "sha256": "0hijdi10l44ky8j66qz6bxmg1vnfhikkd65iqfb3ycg1kwzd4r9p" } }, { @@ -125914,15 +126524,27 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20230609, - 742 + 20230712, + 1103 + ], + "deps": [ + "zk", + "zk-index" + ], + "commit": "5be59ca972f3f624d444b7b7d7ca75a06bcd2ce5", + "sha256": "0hijdi10l44ky8j66qz6bxmg1vnfhikkd65iqfb3ycg1kwzd4r9p" + }, + "stable": { + "version": [ + 0, + 6 ], "deps": [ "zk", "zk-index" ], - "commit": "6ba90de2b33a8717fb1e263fe6df7b3831d3bd8e", - "sha256": "1hihanix3jklpcfxyfl2hs58q4z2hqsgavk7bf3zq0x4g3sd9k8m" + "commit": "5be59ca972f3f624d444b7b7d7ca75a06bcd2ce5", + "sha256": "0hijdi10l44ky8j66qz6bxmg1vnfhikkd65iqfb3ycg1kwzd4r9p" } }, { @@ -125933,25 +126555,25 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20230709, - 1112 + 20230712, + 1103 ], "deps": [ "zk" ], - "commit": "91f1d4a3ad29e06d97d9a5fa3a4d1e6705ca828c", - "sha256": "15q51bcprv3pgy0sapkvf90as0my8jck720nz1hm3lqa1ibb1xz0" + "commit": "5be59ca972f3f624d444b7b7d7ca75a06bcd2ce5", + "sha256": "0hijdi10l44ky8j66qz6bxmg1vnfhikkd65iqfb3ycg1kwzd4r9p" }, "stable": { "version": [ 0, - 4 + 6 ], "deps": [ "zk" ], - "commit": "9a3ed5e743c38725e7d9a7e4eaecfe624654c68d", - "sha256": "1az7n1f0203kk7x50ljjz3dcirkbk0zxzc54b3xxv64sd806vfw6" + "commit": "5be59ca972f3f624d444b7b7d7ca75a06bcd2ce5", + "sha256": "0hijdi10l44ky8j66qz6bxmg1vnfhikkd65iqfb3ycg1kwzd4r9p" } }, { @@ -126321,6 +126943,21 @@ } }, { + "ename": "zotra", + "commit": "fd1f123e65c55ebf7ffe917700b868adff06e101", + "sha256": "149fw1xr1d0d492rdb3i9173jxnwjbhkmf6943041pkbsc659jgh", + "fetcher": "github", + "repo": "mpedramfar/zotra", + "unstable": { + "version": [ + 20230819, + 1747 + ], + "commit": "9cd9eb36bbc65efcc38ca38fc96730dbbe882fd8", + "sha256": "0n3iw00ip4hrmg8c2j5m7v67ib3fjr19g8ijgnf8m3rrvhjriss2" + } + }, + { "ename": "zotxt", "commit": "b633453e77a719f6b6b6564e66c1c1260db38aa6", "sha256": "18jla05g2k8zfrmp7q9kpr1mpw6smxzdyn8nfghm306wvv9ff8y5", diff --git a/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/nixpkgs/pkgs/applications/editors/emacs/generic.nix index 9da821de3f54..77adcd27f500 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/generic.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/generic.nix @@ -42,7 +42,7 @@ , libtiff , libwebp , libxml2 -, llvmPackages_6 +, llvmPackages_14 , m17n_lib , makeWrapper , motif @@ -99,6 +99,7 @@ else "lucid") # macOS dependencies for NS and macPort +, Accelerate , AppKit , Carbon , Cocoa @@ -109,6 +110,7 @@ , OSAKit , Quartz , QuartzCore +, UniformTypeIdentifiers , WebKit }: @@ -135,15 +137,10 @@ let ]; inherit (if variant == "macport" - then llvmPackages_6.stdenv + then llvmPackages_14.stdenv else stdenv) mkDerivation; in -mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation { - env = { - NATIVE_FULL_AOT = "1"; - LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths; - }; -} // { +mkDerivation (finalAttrs: { pname = pname + (if noGui then "-nox" else if variant == "macport" then "-macport" @@ -287,6 +284,7 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation { GSS ImageIO ] ++ lib.optionals (variant == "macport") [ + Accelerate AppKit Carbon Cocoa @@ -294,6 +292,7 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation { OSAKit Quartz QuartzCore + UniformTypeIdentifiers WebKit # TODO are these optional? GSS @@ -337,6 +336,15 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation { ++ lib.optional withXwidgets "--with-xwidgets" ; + env = lib.optionalAttrs withNativeCompilation { + NATIVE_FULL_AOT = "1"; + LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths; + } // lib.optionalAttrs (variant == "macport") { + # Fixes intermittent segfaults when compiled with LLVM >= 7.0. + # See https://github.com/NixOS/nixpkgs/issues/127902 + NIX_CFLAGS_COMPILE = "-include ${./macport_noescape_noop.h}"; + }; + enableParallelBuilding = true; installTargets = [ "tags" "install" ]; @@ -396,4 +404,4 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation { meta = meta // { broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); }; -})) +}) diff --git a/nixpkgs/pkgs/applications/editors/emacs/macport_noescape_noop.h b/nixpkgs/pkgs/applications/editors/emacs/macport_noescape_noop.h new file mode 100644 index 000000000000..64c65bd90f88 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/emacs/macport_noescape_noop.h @@ -0,0 +1,31 @@ +#ifndef NOESCAPE_NOOP_H_ +#define NOESCAPE_NOOP_H_ + +// First, do some work to get definitions for *_WIDTH. Normally, Emacs would +// have these defined by headers in-tree, but clang's headers clash with those. +// Due to how include paths work, we have to include clang headers if we want to +// mess with CoreFoundation definitions. +#pragma push_macro("__STDC_VERSION__") +// Make the preprocessor think that we're on C2x. The macros we want are gated +// on it. +#undef __STDC_VERSION__ +#define __STDC_VERSION__ 202000L +// Include limits.h first, as stdint.h includes it. +#include <limits.h> + +// XX: clang's stdint.h is shy and won't give us its defs unless it thinks it's +// in freestanding mode. +#undef __STDC_HOSTED__ +#include <stdint.h> +#define __STDC_HOSTED__ 1 + +#pragma pop_macro("__STDC_VERSION__") + +// Now, pull in the header that defines CF_NOESCAPE. +#include <CoreFoundation/CFBase.h> + +// Redefine CF_NOESCAPE as empty. +#undef CF_NOESCAPE +#define CF_NOESCAPE + +#endif // NOESCAPE_NOOP_H_ diff --git a/nixpkgs/pkgs/applications/editors/emacs/site-start.el b/nixpkgs/pkgs/applications/editors/emacs/site-start.el index acc6833b98c9..b0694a90af0e 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/site-start.el +++ b/nixpkgs/pkgs/applications/editors/emacs/site-start.el @@ -8,8 +8,11 @@ least specific (the system profile)" ;;; Extend `load-path' to search for elisp files in subdirectories of all folders in `NIX_PROFILES'. ;;; Non-Nix distros have similar logic in /usr/share/emacs/site-lisp/subdirs.el. ;;; See https://www.gnu.org/software/emacs/manual/html_node/elisp/Library-Search.html -(dolist (profile (nix--profile-paths)) - (let ((default-directory (expand-file-name "share/emacs/site-lisp/" profile))) +(dolist (profile (reverse (nix--profile-paths))) + ;; `directory-file-name' is important to add sub dirs to the right place of `load-path' + ;; see the source code of `normal-top-level-add-to-load-path' + (let ((default-directory (directory-file-name + (expand-file-name "share/emacs/site-lisp/" profile)))) (when (file-exists-p default-directory) (setq load-path (cons default-directory load-path)) (normal-top-level-add-subdirs-to-load-path)))) @@ -37,13 +40,19 @@ least specific (the system profile)" (mapconcat 'identity new-env-list ":")))))) ;;; Set up native-comp load path. -(when (featurep 'comp) +(when (featurep 'native-compile) ;; Append native-comp subdirectories from `NIX_PROFILES'. + ;; Emacs writes asynchronous native-compilation files to the first writable directory[1]. + ;; At this time, (car native-comp-eln-load-path) is a writable one in `user-emacs-directory'[2]. + ;; So we keep that one unchanged. + ;; [1]: info "(elisp) Native-Compilation Variables" + ;; [2]: https://git.savannah.gnu.org/cgit/emacs.git/tree/lisp/startup.el?id=3685387e609753293c4518be75e77c659c3b2d8d#n601 (setq native-comp-eln-load-path - (append (mapcar (lambda (profile-dir) + (append (list (car native-comp-eln-load-path)) + (mapcar (lambda (profile-dir) (concat profile-dir "/share/emacs/native-lisp/")) (nix--profile-paths)) - native-comp-eln-load-path))) + (cdr native-comp-eln-load-path)))) ;;; Make `woman' find the man pages (defvar woman-manpath) diff --git a/nixpkgs/pkgs/applications/editors/emacs/sources.nix b/nixpkgs/pkgs/applications/editors/emacs/sources.nix index b9b18a98ac88..318e633d6ebb 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/sources.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/sources.nix @@ -4,14 +4,29 @@ }: let - metaFor = variant: version: rev: { - homepage = { - "mainline" = "https://www.gnu.org/software/emacs/"; - "macport" = "https://bitbucket.org/mituharu/emacs-mac/"; + mkArgs = { pname, version, variant, rev, hash }: { + inherit pname version variant; + + src = { + "mainline" = (fetchFromSavannah { + repo = "emacs"; + inherit rev hash; + }); + "macport" = (fetchFromBitbucket { + owner = "mituharu"; + repo = "emacs-mac"; + inherit rev hash; + }); }.${variant}; - description = "The extensible, customizable GNU text editor" - + lib.optionalString (variant == "macport") " - macport variant"; - longDescription = '' + + meta = { + homepage = { + "mainline" = "https://www.gnu.org/software/emacs/"; + "macport" = "https://bitbucket.org/mituharu/emacs-mac/"; + }.${variant}; + description = "The extensible, customizable GNU text editor" + + lib.optionalString (variant == "macport") " - macport variant"; + longDescription = '' GNU Emacs is an extensible, customizable text editor—and more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp programming language with extensions to support text editing. @@ -30,79 +45,57 @@ let This release is built from Mitsuharu Yamamoto's patched source code tailored for macOS. ''; - changelog = { - "mainline" = "https://www.gnu.org/savannah-checkouts/gnu/emacs/news/NEWS.${version}"; - "macport" = "https://bitbucket.org/mituharu/emacs-mac/raw/${rev}/NEWS-mac"; - }.${variant}; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ - AndersonTorres - adisbladis - atemu - jwiegley - lovek323 - matthewbauer - ]; - platforms = { - "mainline" = lib.platforms.all; - "macport" = lib.platforms.darwin; - }.${variant}; - mainProgram = "emacs"; + changelog = { + "mainline" = "https://www.gnu.org/savannah-checkouts/gnu/emacs/news/NEWS.${version}"; + "macport" = "https://bitbucket.org/mituharu/emacs-mac/raw/${rev}/NEWS-mac"; + }.${variant}; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + AndersonTorres + adisbladis + atemu + jwiegley + lovek323 + matthewbauer + ]; + platforms = { + "mainline" = lib.platforms.all; + "macport" = lib.platforms.darwin; + }.${variant}; + mainProgram = "emacs"; + }; }; in { - emacs28 = import ./generic.nix { + emacs28 = import ./generic.nix (mkArgs { pname = "emacs"; version = "28.2"; variant = "mainline"; - src = fetchFromSavannah { - repo = "emacs"; - rev = "28.2"; - hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag="; - }; - - meta = metaFor "mainline" "28.2" "28.2"; - }; + rev = "28.2"; + hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag="; + }); - emacs29 = import ./generic.nix { + emacs29 = import ./generic.nix (mkArgs { pname = "emacs"; version = "29.1"; variant = "mainline"; - src = fetchFromSavannah { - repo = "emacs"; - rev = "29.1"; - hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg="; - }; + rev = "29.1"; + hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg="; + }); - meta = metaFor "mainline" "29.1" "29.1"; - }; - - emacs28-macport = import ./generic.nix { + emacs28-macport = import ./generic.nix (mkArgs { pname = "emacs-mac"; version = "28.2"; variant = "macport"; - src = fetchFromBitbucket { - owner = "mituharu"; - repo = "emacs-mac"; - rev = "emacs-28.2-mac-9.1"; - hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE="; - }; - - meta = metaFor "macport" "28.2" "emacs-28.2-mac-9.1"; - }; + rev = "emacs-28.2-mac-9.1"; + hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE="; + }); - emacs29-macport = import ./generic.nix { + emacs29-macport = import ./generic.nix (mkArgs { pname = "emacs-mac"; version = "29.1"; variant = "macport"; - - src = fetchFromBitbucket { - owner = "mituharu"; - repo = "emacs-mac"; - rev = "emacs-29.1-mac-10.0"; - hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU="; - }; - - meta = metaFor "macport" "29.1" "emacs-29.1-mac-10.0"; - }; + rev = "emacs-29.1-mac-10.0"; + hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU="; + }); } diff --git a/nixpkgs/pkgs/applications/editors/howl/default.nix b/nixpkgs/pkgs/applications/editors/howl/default.nix index ff9a30074120..030c6666e11d 100644 --- a/nixpkgs/pkgs/applications/editors/howl/default.nix +++ b/nixpkgs/pkgs/applications/editors/howl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1qc58l3rkr37cj6vhf8c7bnwbz93nscyraz7jxqwjq6k4gj0cjw3"; }; - sourceRoot = "./howl-${version}/src"; + sourceRoot = "howl-${version}/src"; # The Makefile uses "/usr/local" if not explicitly overridden installFlags = [ "PREFIX=$(out)" ]; diff --git a/nixpkgs/pkgs/applications/editors/mg/default.nix b/nixpkgs/pkgs/applications/editors/mg/default.nix index 8545be13e3b9..0dc52b863014 100644 --- a/nixpkgs/pkgs/applications/editors/mg/default.nix +++ b/nixpkgs/pkgs/applications/editors/mg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mg"; - version = "7.0"; + version = "7.3"; src = fetchFromGitHub { owner = "ibara"; repo = "mg"; rev = "mg-${version}"; - sha256 = "sha256-qnb0yB/NNJV257dsLmP84brajoRG03U+Ja1ACYbBvbE="; + sha256 = "sha256-88FrXN7h5uRLY8YMKSzUjBF4n18DEiiiDyoYr+7qXdQ="; }; postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' diff --git a/nixpkgs/pkgs/applications/editors/molsketch/default.nix b/nixpkgs/pkgs/applications/editors/molsketch/default.nix index d688a50f28d3..55db4096ce15 100644 --- a/nixpkgs/pkgs/applications/editors/molsketch/default.nix +++ b/nixpkgs/pkgs/applications/editors/molsketch/default.nix @@ -3,11 +3,11 @@ , fetchurl , cmake , pkg-config +, qttools , wrapQtAppsHook , hicolor-icon-theme , openbabel , desktop-file-utils -, qttranslations }: mkDerivation rec { @@ -37,12 +37,11 @@ mkDerivation rec { mv $out/lib/molsketch/* $out/lib ''; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ hicolor-icon-theme openbabel desktop-file-utils - qttranslations ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/editors/pulsar/default.nix b/nixpkgs/pkgs/applications/editors/pulsar/default.nix index 0cdc2d81e75b..e0b967f8043c 100644 --- a/nixpkgs/pkgs/applications/editors/pulsar/default.nix +++ b/nixpkgs/pkgs/applications/editors/pulsar/default.nix @@ -17,19 +17,19 @@ , makeDesktopItem , copyDesktopItems , makeWrapper -, nodePackages +, asar , python3 }: let pname = "pulsar"; - version = "1.107.1"; + version = "1.108.0"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-stY/sutbFVWQuN6C/tkT/G5MMVypgm3Um78jk8RHF6k="; + x86_64-linux.hash = "sha256-9wxMKekowNkFX+m3h2ZeTXu/uMLyPi6IIbseJ16shG4="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-umL60+FJKT8ThnzxgzzVzsY0nhJwsNF4YvrKoruxz7U="; + aarch64-linux.hash = "sha256-GdPnmhMZR3Y2WB2j98JEWomdKFZuTgxN8oga/tBwA4U="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); additionalLibs = lib.makeLibraryPath [ @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook copyDesktopItems - nodePackages.asar + asar ]; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/editors/teehee/default.nix b/nixpkgs/pkgs/applications/editors/teehee/default.nix new file mode 100644 index 000000000000..271609c4464a --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/teehee/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "teehee"; + version = "0.2.8"; + + src = fetchFromGitHub { + owner = "Gskartwii"; + repo = "teehee"; + rev = "v${version}"; + hash = "sha256-yTterXAev6eOnUe1/MJV8s8dUYJcXHDKVJ6T0G/JHzI="; + }; + + cargoHash = "sha256-hEc7MaqTXMrKiosYacPw/b1ANnfZKdlhThOp2h14fg4="; + + meta = with lib; { + description = "A modal terminal hex editor"; + homepage = "https://github.com/Gskartwii/teehee"; + changelog = "https://github.com/Gskartwii/teehee/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "teehee"; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix index a5f1a1bf4a0a..6713cd46e5e9 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPluginFrom2Nix { pname = "LazyVim"; - version = "2023-07-30"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "566049aa4a26a86219dd1ad1624f9a1bf18831b6"; - sha256 = "12y7fxwlcia92q12wj50k5bdlyhjm70hn3kkibn5a1xf4f9vkwkg"; + rev = "f9dadc11b39fb0b027473caaab2200b35c9f0c8b"; + sha256 = "1j05knmyjmh3n1b8f4wbniy3vgzv9s5kkqa3v5h9jbz0gwkaigz8"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2023-08-04"; + version = "2023-08-21"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "6a4e01d85337c781cf6fe37e19f87e41869adfad"; - sha256 = "02lpzjk5vdlxcbvgvmk8xap2hnq1wmqgb6j6mni58vxw061wqzi8"; + rev = "3ded37f92807d8c6ad831d5af2c4ff22bfd32fc8"; + sha256 = "0ajc1bpdikc4751wbq9f6wwy72102gjz46bj8rysffkvak7jhbgm"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-08-19"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "e71b32faec68f04a0f0a27fe8c15c96503039b1f"; - sha256 = "0pdr8ympcsdlhb0w4sq5w0gwgnl4k5g190q8cjx1pcm6q20a38hj"; + rev = "c7c6353db3208608786503cbade1e9f8d3531f15"; + sha256 = "1nji29s3gjdrfdj21x1vpsfs7ai7q1a8k76mk90nppf2dx15ixpw"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -365,24 +365,24 @@ final: prev: SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2023-06-22"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "3e37187e1e5731d7d36980db3f92e7332406813a"; - sha256 = "0akdf7zv9pywdnqf4zp345irsbdfhy2rqvx759n13d403hwwya6z"; + rev = "8945b4a2bfaaa16fbcee9f1d7c00cb9c1256b591"; + sha256 = "1c57cpdkhq15yzzfpk4pi2d5bjmb9j2gx1np3v23wgmfzhmkj6d1"; }; meta.homepage = "https://github.com/jaredgorski/SpaceCamp/"; }; SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-08-09"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "100aa31e52b13e69d61caeb1796581e4bbb3b9ca"; - sha256 = "1ygswc0l9q8m3h3b42ik5zkhf820xpzs1iiivf2x7wpqc8589j2v"; + rev = "7e81ce1019626977f7dbab44fb2abb5517993359"; + sha256 = "11pz313swwv065nkvk2z7hgakijjg696dq7g1a056abk33hs9rh9"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -496,14 +496,26 @@ final: prev: meta.homepage = "https://github.com/eikenb/acp/"; }; + adwaita-nvim = buildVimPluginFrom2Nix { + pname = "adwaita.nvim"; + version = "2023-06-22"; + src = fetchFromGitHub { + owner = "Mofiqul"; + repo = "adwaita.nvim"; + rev = "bb421a3439a515862ecb57970f10722cdcc4d089"; + sha256 = "1fw7kbgzqif40vks3h3n5jgachnimcbv7gpv85z7mw07hc0g7h33"; + }; + meta.homepage = "https://github.com/Mofiqul/adwaita.nvim/"; + }; + aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-08-13"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "ffb5fd0aa7fcd5c3f68df38f89af3aa007f76604"; - sha256 = "08r2y6rnv6ackwm1m5q4300q68fy1pb39synsiq0crzv5mg59fjc"; + rev = "dc17cfd401689337124c75270677fd3b7639cf23"; + sha256 = "006c3ly5vidlbiv0wixijzlacqbzkslbddnz85h8jvy9xvm0lq9s"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -559,12 +571,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-08-15"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "fe38101db7253e450f67893583d1a5dfeefd9ee5"; - sha256 = "05njcamri4ql4xf48ms563g74x1aq4c9g1fvkmdpv8z99aybqwqw"; + rev = "115ad17ace047cab20ccc67f79c943aaf3f0f291"; + sha256 = "0jjvrq43dcl055rjsiwpm2qka9qsn1ldlcg7i45vhbg2jzqih97g"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -583,12 +595,12 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2023-08-16"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "7a6b9487dba044a43fde534bf5036f0fda5b6b23"; - sha256 = "11yp7zncby1wmic5hji1vb6b62l2xvi30cycbds05y11xycgdcm0"; + rev = "63a860e7ed3ae41ee92481ea65a48fb35431ae21"; + sha256 = "0mns3cymfisnd603mwxc30psbsm9m41gwqaai1r3w9iijy5axfkz"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -751,24 +763,24 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2023-08-04"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "0f99f96b1a408c37ea6f78e5990554328bc22dd1"; - sha256 = "0g60ibvdkyw7ybx45b7x8rkbrzy0lsi245g6n5vqd1fcfk6m7n4d"; + rev = "42385d54b8546c163b946fd50eed2103ef7993c9"; + sha256 = "1brqg6315z4rwsjv28yf86lynzshzpwxys248mpfzyhkz5jfad1y"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; asynctasks-vim = buildVimPluginFrom2Nix { pname = "asynctasks.vim"; - version = "2023-08-17"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "f47d55b4ce43bd80ad6e64cfc47e7dfa2cd2ad3e"; - sha256 = "0lkhzf03i3g20470afgqblj4vcwb8pwppr36lyaipfn9kaaqx4gy"; + rev = "8bd5e987c84ed6a16b9fd4ca96ed54f05bb45662"; + sha256 = "1ryvxfq65vb9rk8jig6fkhv81inqfh2gvy4l50ggqw35ksd0mj3c"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; @@ -847,12 +859,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2023-08-14"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "f6d111f3c7ff2fb89c8a39b6280c8f90234196d9"; - sha256 = "1f8kksvsv9pc1k9wrh7mj7bmh8r4n34rah9hj7hksn6y21lzx6cs"; + rev = "3eb26b949e1b90798e84926848551046e2eb0721"; + sha256 = "06lyapgg0fdz6p6bas9cjrsi6qx2b8rjn8ivc3yxhp2940bqqrlf"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -931,12 +943,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-07-05"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "8cca17ea0ced3ba564e5da972a25600edafe7d7b"; - sha256 = "1fr0207nxmcdpc7whlmmryy4qs7nl5mp1p6h1qi0jv51r705xrpw"; + rev = "dd852401ee902745b67fc09a83d113b3fe82a96f"; + sha256 = "0hbfi5876s8zfghlgxqb187cgp3ssarnaapg5n636zyv6m4wyiii"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -967,12 +979,12 @@ final: prev: base46 = buildVimPluginFrom2Nix { pname = "base46"; - version = "2023-08-16"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "673b13166dceb59f02123ade4765df877ada920c"; - sha256 = "0prhlx9qjyr6xy5j267wkxkm2ibdz2s08yzfkg7khjg6v9vqzvv4"; + rev = "87a3054bd5cf4f50d42038f3060e5d41bb2d5d8d"; + sha256 = "0iisisfn805mydq2nlx82lwlwj1f4sjc92py1m48ag50vmf62ip5"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1147,12 +1159,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2023-08-11"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "417b303328118b6d836ae330142e88771c48a8a3"; - sha256 = "0cylncv3z34z76178whji62nsvrs55n8xrmz8bymdc0nlvkx7j4f"; + rev = "9961d87bb3ec008213c46ba14b3f384a5f520eb5"; + sha256 = "0g521d6ngl7wajipqpksarxld0pwdk7878yjw64j7lc6p80si3js"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1231,12 +1243,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2023-08-19"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "aada30b77949729de049a2ff5b5b3c189e3dae88"; - sha256 = "0c62hwb5z5ccga51sh33i6ldpra5h0fqdnam716xcpvkb0mn8kip"; + rev = "17cc6d5a8e772f681718a7d4f8a7437a8e6c0508"; + sha256 = "0zclpqj7yxjvbbh6crdgwd3jk6swqk10ql6zy08x0zd4a4y7xlg0"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1303,12 +1315,12 @@ final: prev: clangd_extensions-nvim = buildVimPluginFrom2Nix { pname = "clangd_extensions.nvim"; - version = "2023-08-10"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "5c8a7d6311ae6b0ed1e1fc66569fe67278a418fc"; - sha256 = "0vxrkyymhmf29xdkfffxbp1z66in6cf2yajmrj0mssy6d1ag9cvj"; + rev = "323b00de2ee18cad1ac45eb95e680386c4ff4366"; + sha256 = "1q0ah3q15cfybrb2anf7c1jc0v72r5f2fmnc01dsm9y3wyyix8ch"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1507,12 +1519,12 @@ final: prev: cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; - version = "2023-08-19"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "f076c6b071e6117d2cbb26d53327ff21fc22fdb8"; - sha256 = "19rc7d2xlsxd7a7slrv4ajydgw7nv8q2qp1yc4bl74xg3cn1mks3"; + rev = "363ce91a198ea255d847a189c723c6d4e3bc4a91"; + sha256 = "033wa4sgg2hmn2wi7g7mwl0cpw4mlnr53x8b0diqlyv5v7wax302"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -2023,12 +2035,12 @@ final: prev: codeium-vim = buildVimPluginFrom2Nix { pname = "codeium.vim"; - version = "2023-08-18"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "436a7aa6f15502b20d06c420ba6cd944cc65ea8a"; - sha256 = "0fdmqd6d7i4bp40q1xhxvjfzaj8llw94fkl7gc22pspl0vh9w1rd"; + rev = "70ba94ac71ead53a9442aca1a86c0c10a16b587a"; + sha256 = "002883k8fvwzc4nlbm3myl560029dlccsvwbqwkggl70qp8hgva8"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2311,48 +2323,48 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-08-15"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "b3798d85322b1aaa56cad9d651d2d1aaec6298e9"; - sha256 = "1r5g9ps6s7by4ilv9qyp2q2dxwm4wmf08va5n0gj7amgzqlvj51g"; + rev = "0fa30d6846aae1af1c94a9ead93fa7dcf8affbe6"; + sha256 = "1m0kchzg84rps19fiwb3sddhf6gzmfyzcpdh7h9b34ma4qdga5gv"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2023-08-17"; + version = "2023-08-21"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "f2a4acd62587c62910bda0b79405c585af43c002"; - sha256 = "07bdhssinhnd6ff3b2glq93nb0i6sfjwd6b1q3bsacxkvy686wwj"; + rev = "172955782814a49fbebca2d1a2ccce2059103329"; + sha256 = "12pynm0v1ci5yjwqlkljbq4wpc7w4gpilg0iagb3b3ihmzi1wvcx"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-08-13"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "2068660517dc7a3e46d15ae1f349464d3120d3a4"; - sha256 = "01pr1q4qfnf1v6b3bchra67x6qwlbq53qfhdzmynw5zl6mwa4v4w"; + rev = "af92b636ceee8c657463fd816146b28d43ace732"; + sha256 = "1s959yh5fh6d20im54ihn9a4b7pp036r6s7g0vacylg6975s5dd1"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-08-13"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "61110d912431713240633322fe9bb57f5668c23d"; - sha256 = "1wj0pkqfgj90isq0s1iaxyrw7ybas7flkg1lj4ylimy2108lvqr6"; + rev = "47a748c18d6378df7aa033527d1b56d6dec94dc5"; + sha256 = "1jzxrkbynpr4nazjkw9b72liamzyb5ziqww51hc1lby72y4q0llc"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2371,12 +2383,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-08-19"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "8050a9baa964f71594f81358ce84d38cee1cd0ad"; - sha256 = "0qgwga52sw8kv8b38mkpy77b3irrnbpb3c5jsd35vkn4j0vsq319"; + rev = "cb44d4df9caa4a5a1534f4919d9f595e7c9bf6bf"; + sha256 = "19li3q3qbbak06ll2wclzyfmygdi521b6yizpdqhmc3k49fr8il0"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2527,12 +2539,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-07-26"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "c17d3210b3dec8798b4fc82a11c542989251f85d"; - sha256 = "1ay3jap0darihkwd71iszw939k8vpjb0chs58p75kxh07212wlv9"; + rev = "9134d7befd50ff920ede5b0f7d6c3dbb9f7c0ecb"; + sha256 = "09mys6n9hwlbwy48nxndjrr6y0bg67nai36fpjxydqq2i3ijq897"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; @@ -2623,24 +2635,24 @@ final: prev: denops-vim = buildVimPluginFrom2Nix { pname = "denops.vim"; - version = "2023-08-06"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "9f1b8cf0d516ee0a0e26f50bdbd935c29a8f4588"; - sha256 = "0a1q365cs3p90x0b8rdqja9ssgcl7ndqpb37pqldrmwccxik953c"; + rev = "a80e4d83fc7922f79886126d505790ad1da30ab2"; + sha256 = "1rai29r30v4xc512nfnx4nvbwqjmqc64lxdc45dj396b9kfkyvii"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2023-08-03"; + version = "2023-08-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "8b82f690c65450a391dc16e7567ab0627293701c"; - sha256 = "0xjq9k74k4vjk6ndsfh5sq69d6gnzdj06i3d2l53rd4qjr78f9mp"; + rev = "51d2367d3373457327e583819c00381387b8c51e"; + sha256 = "1pns3j5f4ls2hdcwydka3r9qp43rr4p392pkcxz807jyrzjzrbdi"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2913,24 +2925,24 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2023-07-10"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "c6657df5453a6cbe4e8356e1675e9652cadc332f"; - sha256 = "1gz5zg7rfx1j468ysa5b5nnlnsj22pkkkhq4z0n63hp2s09ys2c3"; + rev = "5b9763eaa483250650eb4f60c96db62abbb250aa"; + sha256 = "1ikkhvsxqs3hlcvf7kahjlbfp7s7hkpyqky0c9m6nc0jrlld0lwb"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-08-16"; + version = "2023-08-21"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "db97e667e03294bfa9f15e544e78f3082247bf79"; - sha256 = "1nfyp8zbc6d2j3k4x16iblc3vvfdhvfqcqx7p576cjz61ll8ww34"; + rev = "7e5a85c186027cab1e825d018f07c350177077fc"; + sha256 = "0jzlrk8dbijwzv5gc80s4bh3ji3bcxxdfffk5jbzlijjs76cpwl9"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2997,24 +3009,24 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2023-08-19"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "ee571505f3566f84fd252e76c4ce6df6eaf2fb94"; - sha256 = "0xahisrz7yz0838ijvg2s6wbskdb443fal72yxjr2h5z1dvzxswq"; + rev = "c7b035de7f91bb6b62b4308f105c56d1a968b8c5"; + sha256 = "07qqgczd6vyqj0cg0g3nx4qd23951i265227d9xjf6g47g1zi3dk"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPluginFrom2Nix { pname = "dropbar.nvim"; - version = "2023-08-13"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "c47d7644a8a4bb0acbd9178d197cd245b238d45d"; - sha256 = "0pp4jbg20cz7rbixzb0g8xn5hinr04lls2q62sa4h31r9p43lsrr"; + rev = "e36009c5f2873186edf6a10e60e789f95d8009e4"; + sha256 = "1vax3axg2iim2fagwi3w2q7ggf2a69hbx0cb1yr5lwi5ar48l048"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3069,12 +3081,12 @@ final: prev: editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2023-08-07"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "e014708e917b457e8f6c57f357d55dd3826880d4"; - sha256 = "04p9rqp7glgqfxajad32lrh96cwx2kfwf5v8qvy0bnqbrhc3yv5x"; + rev = "14856573a09f1ddb570bfd8734e34e8018e8aa97"; + sha256 = "0pvxvm56m8q6vl5509r0c045c3hhqnwfm82c6z99x2iwnrw0s39w"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -3094,24 +3106,24 @@ final: prev: efmls-configs-nvim = buildVimPluginFrom2Nix { pname = "efmls-configs-nvim"; - version = "2023-08-17"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "cc0a737ccd69fcb85cb2dfd7f3133a8b4c7adc9c"; - sha256 = "0wxm588q5yqab6pbwz3acqychbzncdixv3clk7gb4knh44v59lp1"; + rev = "e244c307f520dc70627523759386d387c73803b8"; + sha256 = "1w0ralyyz2m11hp7ij44cchibbx0z8p81z4fjvizvcpcjs5xriir"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; elixir-tools-nvim = buildVimPluginFrom2Nix { pname = "elixir-tools.nvim"; - version = "2023-08-10"; + version = "2023-08-21"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "25872cb8bdb840484933abc0c2a3444800716cc6"; - sha256 = "198jdgfdrs2rpbv8g4np15pj6iybwbjq7xg0v2xr1hdgvndc7nx1"; + rev = "8b13b298691ae8cfdcaf66deb43b509a49d202c0"; + sha256 = "0vw4nsaifr3hq9b5jyhv1bnv3dndw1rp922vw8jlhysbpp8hpii2"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3287,12 +3299,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2023-05-27"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "cdec1327ec99f0155d0a53aee1beae4c58071558"; - sha256 = "1vkjr1cfj2313v3gcj8bf8iki13gxdqa9qb7szg6wjzfavx191k2"; + rev = "e295f0df5735a042f63b05218118646809ba9d27"; + sha256 = "1qldf9k9h5jjn5gyadpln6mc8qsw9f18qqmfrdbl88rr99kx9c32"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -3360,24 +3372,24 @@ final: prev: flash-nvim = buildVimPluginFrom2Nix { pname = "flash.nvim"; - version = "2023-07-22"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "967117690bd677cb7b6a87f0bc0077d2c0be3a27"; - sha256 = "1rl7lgiwkrjay2zsf97xbp964iqxvqrqc31az6n59pw720rsqn6m"; + rev = "8a8e74922a383c253b7f92e042b749150140c8d1"; + sha256 = "19a1i4lh4ij5x7pqrvs43yw24li1zajxrm6zrlbiffwppl7903dl"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; flatten-nvim = buildVimPluginFrom2Nix { pname = "flatten.nvim"; - version = "2023-08-10"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "6813ad3c49b74fbeb5bc851c7d269b611fc86dd3"; - sha256 = "0xk7pyysmq1w1dicq2pml3ls08wwzxaa9fq7fyhziivy7a8qv2ps"; + rev = "b362e13e22a452db913aab1fb2ee2d8546526d90"; + sha256 = "10vxc5bk0zykfg5dhgmsqmw2k6701b7ppg80y3krnn7phzi3hwr8"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; @@ -3492,12 +3504,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-08-14"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "377d45475b49e37460a902d6d569d2093d4037d0"; - sha256 = "0yk612n3ayn0kv1smv945hz8rl395ask4wp45iqymvzia6jp6k4a"; + rev = "00e191fea2cfbbdd378243f35b5953296537a116"; + sha256 = "1gndxhlx2qfxg2hrxz82vsy0f2v2v25j6yg35ylscs0dkvh7aq05"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3600,12 +3612,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-08-14"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "257aafb3c3a3475821db74d1a48ea5b097ac53a9"; - sha256 = "0d1pijv7x8ylapisq7i6bsznx8hd6syyfqakgj1pfykw8s474b1l"; + rev = "b7bda51ba7d0c07aaa30e8428a6531e939f6c3a3"; + sha256 = "073mgny8xfv1ndhqh241092g6xv1mw4r16ybjjkifv89kdzz53rj"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3708,12 +3720,12 @@ final: prev: git-conflict-nvim = buildVimPluginFrom2Nix { pname = "git-conflict.nvim"; - version = "2023-08-14"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "akinsho"; repo = "git-conflict.nvim"; - rev = "562e8fdf5a4a2c73c55640bcf660be33db669d2a"; - sha256 = "1jw28m6r7yvv2lsr4m7c7q7jrc46rpibz5kd4iziig0q9gsqk5s5"; + rev = "d084646ef4c40e24eb9cac3eed1f1c8bd140431c"; + sha256 = "0sf5flwraiby8dknfphyq1k8xyzz2h18illr7m7snx28dhll2cja"; }; meta.homepage = "https://github.com/akinsho/git-conflict.nvim/"; }; @@ -3768,12 +3780,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-08-19"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "749267aaa863c30d721c9913699c5d94e0c07dd3"; - sha256 = "1ysc9igrzxin0s16bk71l72ql1jzilhps0pc6mbj9padk3xi3iy4"; + rev = "d8590288417fef2430f85bc8b312fae8b1cf2c40"; + sha256 = "1ly0hij1ccbvmcx4axdq0bi9iay5ms1597ng84vmx6bnsd0hlfx3"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3792,12 +3804,12 @@ final: prev: glance-nvim = buildVimPluginFrom2Nix { pname = "glance.nvim"; - version = "2023-08-16"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "ec19dbdabd47fc2f094f7457a84ae78e7c9b5610"; - sha256 = "1iw5b6zdwrbi01k13zsmin8x0hs2i3jyfnpfl568lahkcjx4bdxz"; + rev = "8ed5cf3b3b1231ea696d88c9efd977027429d869"; + sha256 = "0r2n9q687dvsc5w06v4a90cjcpi0gvjigjf9j27b864m118xj9x3"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; @@ -3816,23 +3828,23 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2023-07-28"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "8942dfb05794f436af4fbc90a34393f1fd36f361"; - sha256 = "1lqfdfmmqygk2ljlp8gi647j1bij51i85hwl7adx1as749ym0fb4"; + rev = "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5"; + sha256 = "0fa2g6r3kf103jh5vx493bkkbxssizm8i4lri1pl24mnha871ndx"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; go-nvim = buildVimPluginFrom2Nix { pname = "go.nvim"; - version = "2023-08-15"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "a370cb932749d071a6bca20211533044c262e66d"; + rev = "c9acdf488d324ac5d86febe522a5d3a0310a4c76"; sha256 = "0k3rpy9kz9y9a56155fpj15pd200vldswhx43mfkmis23vv6r454"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; @@ -3960,12 +3972,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2023-08-16"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "6d409ee8af4e84d2327b4b5856f843b97a85a567"; - sha256 = "15k67lc73r5dvv9a2wmpkaacngmxld7djq50g2qmgm6aqsqxxj0q"; + rev = "7fb36e0f67aa6f3d7f3e54f37ca7032ea1af0b59"; + sha256 = "0i9aivg66fg9rp9m9z8vzg3g15yfki5c9hrwhd5j577k5m8bybj6"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -4008,23 +4020,23 @@ final: prev: hardtime-nvim = buildVimPluginFrom2Nix { pname = "hardtime.nvim"; - version = "2023-08-20"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "6826c1fe8bebc63a6886833ca4ffed2fc6ec3382"; - sha256 = "0xdyh7xd58jnh97p0vps5pzpfpzd2yifrfj4crgxhq8vm3bp2w6b"; + rev = "ab488faf43d477f544e6880cd9c1ba51f0fd7995"; + sha256 = "1li49j0dpah5bjxqa8abjxhmlgl5xr6b7gv9md5430zsf9gvikyb"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; hare-vim = buildVimPluginFrom2Nix { pname = "hare.vim"; - version = "2023-08-07"; + version = "2023-08-21"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "78ad3aef2d9ba3371fde0978de27393930799847"; - sha256 = "14biq4v52pavpag87g2y8ygb74qril55lf7s4xbbr4wg37fbji7q"; + rev = "fed1a198b4abdfd7c0f68ab7c6b369460e08fd8d"; + sha256 = "1md59105irdzlzwiqfl53hlvqj1a4zn21wqvxcbfc937wvk1xsw7"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; @@ -4043,12 +4055,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-08-06"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "a5481383f82a8f866552bc75b4295351ea3ad905"; - sha256 = "16a41a9b31x5hax5iqyj1lxc4fxhcrp4ig54f77s4czwfd08qj2j"; + rev = "9b7e2bb7af2032f115b6b5c591c6bbca5fc65f4a"; + sha256 = "1cpxkrgcw396k13ni284x7swwnsig987yj2wx4kzghannspm3d2d"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4306,12 +4318,12 @@ final: prev: image-nvim = buildVimPluginFrom2Nix { pname = "image.nvim"; - version = "2023-07-22"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "5d8b8b3acbe2ec6fcfe782cbda3a8ebdad9c1b51"; - sha256 = "0s7s803gg2b4wilfx973kf4c2gppsyr747wkwjlms3yjbx8iyb8k"; + rev = "6fcf4a9aa2bae1e8319e5c87b0d180c27af3026e"; + sha256 = "1a8k8pvd9l9zrw8pmfykbn2zva13hf1a8zqyd6pb4b56wyf2vbr7"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4378,12 +4390,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2023-07-07"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "4541d690816cb99a7fc248f1486aa87f3abce91c"; - sha256 = "1f83fwbd97a26wsnfilv7fq2a3vb19yi5012j4xsmbyv329i3wvr"; + rev = "9637670896b68805430e2f72cf5d16be5b97a22a"; + sha256 = "01h49q9j3hh5mi3hxsaipfsc03ypgg14r79fbm6sy63rh8a66jnl"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -4619,12 +4631,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2023-06-21"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "1749cea392acb7d1548a946fcee1e6f1304cd3cb"; - sha256 = "0ycypsagk3aq9rf5y234bwrj2fw9h1hd73phavjbazi3zhi8yb6y"; + rev = "0a24e504a3a278849ad0aef31cd6dd24c73ca3db"; + sha256 = "1k75i1rjv8xxbd8wr5ll6pk1sabgyylv0h9dhznrrza1g3zkrqv0"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -4739,12 +4751,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-07-30"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "dac844ed617dda4f9ec85eb88e9629ad2add5e05"; - sha256 = "1sd7xg2ql1frr293x976phv6k1r9r01jn48ip60b6pmq80x7gvj6"; + rev = "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01"; + sha256 = "01c09qqzjlmsksac39g2bqygx0xh5ibzb3s4v35b9mlhfyylaxyk"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4763,12 +4775,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2023-08-11"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "67580fab5bed73920fa3fdd712fc8e805c389c3d"; - sha256 = "1wpklaiyk0hcipmrc1ampqn6x4qhag2srrb7cz22smh74bhw66cd"; + rev = "ae64b8df32599f7bb32cfd8d6edccccc98971226"; + sha256 = "0ar6rprk7q1vv2qynb5f213mag9z1avy0d9ixws4pkl22nzj15za"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5147,12 +5159,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-08-08"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "fc3a15047a5b831c83143d90cd25d0b7bcfd0111"; - sha256 = "0rzipjbzb57hwgclbpjww9vgn3x2arp8a831lfc4a0ij8cr223cc"; + rev = "60b0e84f3793f7e8bcc9ec52f9c239fd497b2cd2"; + sha256 = "1dxlqn3zi0vwi8180gz4ang5hm0ds4faiii03kw88xsnzkzlrd6h"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5218,12 +5230,12 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2023-08-19"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "93a2ae4c03d1f1c138f5a38f1cbc3808479b434e"; - sha256 = "0pzpqlb5q253md220whnj7llchh7w174vn9f7d3d4n5cldninkmn"; + rev = "34fd54bd4fff12ce748c9f3644ebb5052fdbe17d"; + sha256 = "0cpghg6kzzq7ygj518n2izavckhkhmxzfdhr4q6i434hd7g6ih0a"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5375,12 +5387,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-08-19"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "7e8208a4d936f93303cc229af865a2cd226c807f"; - sha256 = "0g3jcssr9603i0khqyijgizb3427h67x2zqwrrcwsmm6c4n7c7mg"; + rev = "dfdd771b792fbb4bad8e057d72558255695aa1a7"; + sha256 = "0chrr4n4qjnf6556qxmw41k36v0sbwrk62mkrr1r6q1cjk9wifh5"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5399,12 +5411,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-08-19"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "a51c2d063c5377ee9e58c5f9cda7c7436787be72"; - sha256 = "041fpyaxjgpd9aqy0afd16pg0ph9vxf5nr7247hgdzrlfs83kxyd"; + rev = "0942198fb9a998b6ccee36fb8dd7495eb8ba659c"; + sha256 = "0bl2i91za59xl3s1vwmn056ixdw05bwpk9jqrlw3w23rh70s7rzn"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5495,12 +5507,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-08-19"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "ab94192dd36b35c6752aac7154c7130922c27af7"; - sha256 = "0pyrrfhhwcvbp9g729krjf0hf0a5qnjpggxqwmmbdarfkw5lwkv0"; + rev = "a1b96721dea1e9c7aeeb4bd402b9debebf38ed23"; + sha256 = "0m52p2k4ghc9mcqv9cpnw2p657vdw1svn69hjfh0dgb6s1nd6vll"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5543,24 +5555,24 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2023-08-01"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "d4202fea214267ed4e31ce9c8df3115600db28c7"; - sha256 = "0z5zmmyaph1h6aakdjxn2c7wi3hsshwvdafxbk8iijc31n37lf6n"; + rev = "4a8067468b4372d58f519eb55708b524a893d67d"; + sha256 = "19x472gv6x7pz3ln91s2n4r31b0s435g5rzwrdvzv5dmairgxxiq"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; modicator-nvim = buildVimPluginFrom2Nix { pname = "modicator.nvim"; - version = "2023-06-29"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "2c19ec450532159fa4cf8f89a01d3de07d929c59"; - sha256 = "0k40hxc8vi745rpxnsrwlv437rfydgiad7nmzi44iskarm0la257"; + rev = "f0edf906a230a4ca37a32aa510d4cd346db46548"; + sha256 = "1gk97yr60s7i6kc7z4m2vxcqb6s5lb9ypgib6vy61g34vk6fld1d"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; @@ -5867,12 +5879,12 @@ final: prev: neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2023-08-19"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "71e36bb4e3e964de35121ec2c1c83f0992e429ec"; - sha256 = "17jd2p3y9gm69dli1180lcbhsw3ab5x6xvzcq9q3sas64bhn88al"; + rev = "2c992760f154285dff9f798647954b363cf35963"; + sha256 = "03gads1fim5lv90sgxvv16gn3hm32qq9hlm31qjs2hs2qiminsj0"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5891,12 +5903,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-06-29"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "08f146d53e075055500dca35e93281faff95716b"; - sha256 = "1qrb9pk2m0zfdm6qsdlhp2jjqbk8sg3h2s5lmvd0q14ixb26bxbv"; + rev = "1075bd7f23d244f14d691c261b14c38209abf02d"; + sha256 = "114m39r7zy62z3ri6lr0gcj9c1p6mq131234c0im24z0wkb93czy"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5915,24 +5927,24 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-08-18"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "47dacc6d8f74936f7719351b025421df740c789b"; - sha256 = "07g3jdigjk6mgwmmgmr1v97kfrb9iljgi4dbl62f6slcyq0jz6n1"; + rev = "183f5a7357397260b631d6cccceccc3621b50f78"; + sha256 = "1mlvpmhllj2if82bir04bfx3nfzzcxng3rp5mzryqlzvpi6a50yd"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2023-08-12"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "159e3e24fc018e16a937286488be17602aff8e3c"; - sha256 = "1fyg3s8sqavmg5gqvpfdrywbyx8rfg2qrkc7qlhgs767k6dnp1vw"; + rev = "0c285d7a7c06a6ee88db70871a274797693fce42"; + sha256 = "1vmgj3dd728wbg4hxzaqrvzypbpkxhawdsqy43lp1bbq27b008bf"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -5951,12 +5963,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-08-19"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "7cba95de79476d28c19e8ee34b303ad60fdef59f"; - sha256 = "18jixqv9mcvc873gs39g6fd84s0lpyglqk25gy00siznyjl2mcis"; + rev = "dc7e5d005287ee410b0a791897fd98131f9105c3"; + sha256 = "0iqq1a9fdrn904a94ggbhyjb0n1mkndxvmkqm0d7yla5h2wm46rp"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6107,12 +6119,12 @@ final: prev: neotest-dart = buildVimPluginFrom2Nix { pname = "neotest-dart"; - version = "2023-05-29"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "sidlatau"; repo = "neotest-dart"; - rev = "f404d558c0ef8a463bf2b9882b6116b6b2301030"; - sha256 = "1ybzva7qk9h58i5l114977lc6dd17w0zjy1dgfiz2rqckryhrmlv"; + rev = "178c62282d5fa82f3d564b3c256b4d316804da67"; + sha256 = "14305ynm3pf6lx0gym40wc1wcphyja1i21lvdnz5yh65x512z2nj"; }; meta.homepage = "https://github.com/sidlatau/neotest-dart/"; }; @@ -6143,12 +6155,13 @@ final: prev: neotest-elixir = buildVimPluginFrom2Nix { pname = "neotest-elixir"; - version = "2023-02-03"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "jfpedroza"; repo = "neotest-elixir"; - rev = "72ead0e41aa88582631ff7a14c13095b87c7ff75"; - sha256 = "1ys33qrgs5iw2f00k8d3da2dy49bxfp1yanzk9l6970q8mq9xfd3"; + rev = "7904f8c0fedbe615ee3d75beb810d3e1426b05c6"; + sha256 = "13lsns5wdkp9ay4a11pp6hvhd8isqd5vzag89alwlazsdnmirmvd"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/jfpedroza/neotest-elixir/"; }; @@ -6167,12 +6180,12 @@ final: prev: neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-08-16"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "c01757f54365208a63f54cea989206060f02b746"; - sha256 = "18marmxy907x9anxjjq9jddbbvmn4g3qcl2b37n9gl5lkfadfbjh"; + rev = "48bb3cfbeb2ad7990382fcd1dc6a903433fd4dac"; + sha256 = "1h38v40py51mwdqdjrddm6ib2cvwm22kprapvgch5zgdn946478h"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -6227,24 +6240,24 @@ final: prev: neotest-python = buildVimPluginFrom2Nix { pname = "neotest-python"; - version = "2023-07-04"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-python"; - rev = "054f22129405e747adfc2cbeddfcc59537df50ba"; - sha256 = "163p8wqx81dsxj1vjgpkdk0sj8hgf725rfrhx70rfdrx8sn2cdv9"; + rev = "81d2265efac717bb567bc15cc652ae10801286b3"; + sha256 = "0ymi6rkb7qsqh1jvyvnpvnqix3c0p79kydww9va0cnj1ylfhqwp4"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-python/"; }; neotest-rspec = buildVimPluginFrom2Nix { pname = "neotest-rspec"; - version = "2023-08-19"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "e3ca0279b721a704cf1fb9f3560fc2474256d3a4"; - sha256 = "0bp65cbkljnl7aa5s15va982w4xa7wabsa4h3bv32w9d7bc81ahz"; + rev = "5638880f0adcdb5366fe57a477dfa94074463709"; + sha256 = "17104fdfiv8iw9g2l2yvkakmqa1pkyb6dj6yh5qnczpylwilkgci"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; @@ -6467,12 +6480,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-06-29"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "64976a5ac70a9a43f3b1b42c5b1564f7f0e4077e"; - sha256 = "0gvhazyc9cdzd1c6a2i740h1b50h947vbk3rz195sryi3zb7l2pb"; + rev = "2a52e793d4f293c0e1d61ee5794e3ff62bfbbb5d"; + sha256 = "0fnc2kbxi8bs939dqbjgggx8nhs9qjbvqvj3rbbxbab902pzhgi6"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -6515,12 +6528,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-07-25"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "894db25ec726d32047799d4d0a982b701bec453b"; - sha256 = "1vpdl0905vxxbcc354v4g2m2nrpc7fmzpn2yjwgmwz34wacvmik5"; + rev = "74c2902146b080035beb19944baf6f014a954720"; + sha256 = "10sjrxvnhrx1bi77lcdn5qz9kww4qcanajqzp2v8d3jlm5p2cc2c"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -6575,12 +6588,12 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2023-07-20"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "9e3916e784660f55f47daa6f26053ad044db5d6a"; - sha256 = "14a73dwl56kah9h36b40ir6iylvfs261ysz17qvi9vhp63vjq9cx"; + rev = "aa1b4c1e05983ff7debd2b4b2788651db099de2f"; + sha256 = "1ray6dk61n1g0vjfvdp9ln98pmf54gjrwrffazfv2gwbwllkj9jf"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -6599,24 +6612,24 @@ final: prev: numb-nvim = buildVimPluginFrom2Nix { pname = "numb.nvim"; - version = "2023-03-04"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nacro90"; repo = "numb.nvim"; - rev = "2c89245d1185e02fec1494c45bc765a38b6b40b3"; - sha256 = "1js9d16736dcrx1v1x4syxpb3g815mc0y4k09hd8mi97qcincwa9"; + rev = "3f7d4a74bd456e747a1278ea1672b26116e0824d"; + sha256 = "1h4ap13q85vy7mz44z1q8wzzvs7arbafkml9nwfx5vhyfyw4c8sn"; }; meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; nvchad = buildVimPluginFrom2Nix { pname = "nvchad"; - version = "2023-08-10"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "d3d9aa251a9dd94881cdbc48c5852b3eaba969b8"; - sha256 = "0wcigy2xbffx45gzdj383y8y671x8hnj1fb123l22i8whb6vd69w"; + rev = "3f1e6d71d4c6c98380d5383d5e1bf1f6eaa3399f"; + sha256 = "18g985bq6r5n36m0043xrdclqrm6dg6p9pz94lrabmqvl2kgda3f"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6635,12 +6648,12 @@ final: prev: nvim-FeMaco-lua = buildVimPluginFrom2Nix { pname = "nvim-FeMaco.lua"; - version = "2023-05-23"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-FeMaco.lua"; - rev = "c06f8befe4b9438aa4f4b763e70d77cabf5093f1"; - sha256 = "04wsbra1hmqv2sv566bn8b0v6ylkz1srzhg4f3017879gdsyipxr"; + rev = "c4e9c71c9ca595772a360435bdf91bee3f9d32b1"; + sha256 = "0ri3bx03vzl9m0q5dbkr85cax2vm1abk1hiiwxzbdmc759p6mxvq"; }; meta.homepage = "https://github.com/AckslD/nvim-FeMaco.lua/"; }; @@ -6731,12 +6744,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2023-08-12"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "51f1e11a89ec701221877532ee1a23557d291dd5"; - sha256 = "11v940v6md7sj1digh7kwckb80zbxxp3shlszi44c43iw9viznxi"; + rev = "5dce1b778b85c717f6614e3f4da45e9f19f54435"; + sha256 = "1yl5b680p6vhk1741riiwjnw7a4wn0nimjvcab0ij6mx3kf28rsq"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -6851,24 +6864,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-08-01"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "1c63f37f95cd4fb54512898168138d9a75d1516a"; - sha256 = "1z2l62byg7676m8kzg3539cf3r0wdm3rxlc0ibq45pl1pnx20wb9"; + rev = "4377a05b9476587b7b485d6a9d9745768c4e4b37"; + sha256 = "0mvlh0wdycdk07384i68gyxsafy437pbyryaqf3zbnw95r0z1va9"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPluginFrom2Nix { pname = "nvim-dap-go"; - version = "2023-08-18"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "9c0eb2b3c8ca63b54009a42a915be657fe7a8734"; - sha256 = "0dnlpad2qbd1k9343b4jn6f9iyl1a8jzarl3pjylch4scb6b5k9v"; + rev = "1b508e9db330108d3b5d62a6d9cc01fe6bbdd4e0"; + sha256 = "00dfcskbj25w4wilrpbq6g1l2zrxf1awplsfqp9nhnzs1ivbg9yb"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; @@ -6983,12 +6996,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-08-17"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "ff22bcc0eccbccf5f7e1a1bc88293299977fc65f"; - sha256 = "1dganblpbfdr2nwbamam5r1fds8ryaqjfzbkh2m2ccdpp8jw2q5f"; + rev = "b93d2c63ed39f76c4fea9348bb0ad3e261e89695"; + sha256 = "00jgq2qiqp6i8mm1vrp3g4g9kvb42yvfr0d37afg97jwkim0k3g5"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -7088,14 +7101,26 @@ final: prev: meta.homepage = "https://github.com/josa42/nvim-lightline-lsp/"; }; + nvim-lilypond-suite = buildVimPluginFrom2Nix { + pname = "nvim-lilypond-suite"; + version = "2023-08-29"; + src = fetchFromGitHub { + owner = "martineausimon"; + repo = "nvim-lilypond-suite"; + rev = "ef1f81f25ac319d87de22fe45100441ad6b24abc"; + sha256 = "1anrqzwjm53mlr5zikawzxsarylc5n6vpa9nna13r88ni349ilda"; + }; + meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; + }; + nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-08-19"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "30325d8fc3ce985395f22598c8b4f0b092e644ba"; - sha256 = "1sa6z0dg65sx96vd35rqnv9jcxpnr83nsb6v79vr0nkxy26jambl"; + rev = "9b6cb72660114e5f188907be0d866a8ca2b0ef23"; + sha256 = "09j1q2ajav4vxcgd2a5i0i3g72j4y8j7amqx08ss9l9mw7j1lgjc"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7126,12 +7151,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-08-19"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "67f151e84daddc86cc65f5d935e592f76b9f4496"; - sha256 = "1wxlk3ymrm53ippw203q43rqvbc27zjy1ncda1qyhrl00dzgvv0p"; + rev = "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6"; + sha256 = "17xq7h9d9zx0pbnhhxxqsp2n6rlz16dvdg6cjaylrm7r60ll9215"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7210,12 +7235,12 @@ final: prev: nvim-navbuddy = buildVimPluginFrom2Nix { pname = "nvim-navbuddy"; - version = "2023-07-31"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "SmiteshP"; repo = "nvim-navbuddy"; - rev = "15184582a786d6b32b2724a4799891d0d69f0cdd"; - sha256 = "0rfw1alah02ws569akhkq8rfkwy89p30mzh4pr4v8d70d42zy2kr"; + rev = "46670b27a21ae26d25d3ee2b71f31729162f9de7"; + sha256 = "1adh5dybdgh24mc6in3rabydm1ap0k0dsjrjy626007j57m6agwc"; }; meta.homepage = "https://github.com/SmiteshP/nvim-navbuddy/"; }; @@ -7342,12 +7367,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2023-08-17"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "f826e74d6c20f535a7fa6a94308eacb99c07aba8"; - sha256 = "1kais5iqm4s4i6mwl02rn2ji1c58ni25fq4w0jd9n9cf2w7n8bch"; + rev = "46d0937e5ccf8a71d3f18e4d226864f0ee3e4d1b"; + sha256 = "0c84klbi7z94ck3pq3dskaqa6lzzdyyv6cy7a3mclqqckpqmy2g6"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7366,12 +7391,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2023-05-15"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "7b50933b44ebefc85bf1734eadc4fcfcbbc781c7"; - sha256 = "0pgwr8c3qkrg5zjyy0i99yclh7s2fbinr2nkwi3w2i9i6q04jmcx"; + rev = "ee3b830787538f259b84867c8971c4284abc4a8d"; + sha256 = "1la88yl3k8nbjskqxhy494d0a4mdhnvxglxsqc225jsyx6h6pj42"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -7390,12 +7415,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-08-19"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "eb17a856a6f17e03d8d610cbc00cd9f2f39e3fd7"; - sha256 = "0lbdbcck08bca9pgm6kspwfpqpjlyv6295cfdjy1936yfiia5gpc"; + rev = "411cee67fe3f8242023eb8d9edafefbbfb2d06f1"; + sha256 = "0xsyca5sw0shql0d1lf8vrr2pfmr0a0k1cl7sspan2f56qsckb2y"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -7462,36 +7487,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-08-18"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "dea82ae2071a8d6412ca31e8fc48da5accad1a1d"; - sha256 = "1qsm11mas5b0n13zlvq4w7xl250y9cqwwvxk2g47154y61bq2jpd"; + rev = "00741206c2df9c4b538055def19b99790f0c95c8"; + sha256 = "0cngsv6ic4lb4igk0aidd0lypgm4jb3khda60ddqbnwwr6ma1497"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-08-19"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "8fa7ce35afe88b8294e6ced757aa14ec98414568"; - sha256 = "1v1s75r9y9lxdi67xcrlqrgp1cjx607wjvvnk5abk7z6p9w0x6g4"; + rev = "7f6ff292e3f53e7b12554ee92264c23762dc7906"; + sha256 = "0y0z43cnwh5ssrvqrxqmzvhq0nymczxbivjzc3n0dcpk60609j14"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-08-18"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "5dd8c2121170f806c3d0689d9e0dd24250e4f342"; - sha256 = "1fs0j613g9pz3k4xmang10qrdrlnc6lysy3my6z0ary8wqws45ax"; + rev = "3e7c60982c98a9f5e7b6b0fb7c9ba5318f752fe1"; + sha256 = "11wf7fbdbj2sbddkyz1nl5c1ri4d81mmhd9pmj3gds3d61ld6szf"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7534,12 +7559,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-08-17"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "56272167a6dead91c47c02dbdbfe1ae5643c59f5"; - sha256 = "0jxsmg1xw0jfy8i9y3anpbdr8c1smcab82kh22nz9www6pa4m2xs"; + rev = "bd103502252027434ec42f628d2dbf54821d4ce6"; + sha256 = "030z020v4g140a72mv1q7l6bshhrkgisbd6w3hiwlv9a1mgz4bbc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -7605,12 +7630,12 @@ final: prev: nvim-ufo = buildVimPluginFrom2Nix { pname = "nvim-ufo"; - version = "2023-08-14"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "aebd36bf5447862671356fcd5d4a8708ce6c9470"; - sha256 = "0bfsm0dvjd2i5qhs0j3kilsiw4bxdi33n0520yw6brlhr0k2v954"; + rev = "8b01594c29bd01e7b49b647a663c819ed909714f"; + sha256 = "1vw1nprs4kgz9y3r294ws3axbsgnfbjnvin7ja6xsg4fsaxqy8fw"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -7665,14 +7690,14 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2023-07-05"; + version = "2023-08-26"; src = fetchFromGitHub { - owner = "haringsrob"; + owner = "andersevenrud"; repo = "nvim_context_vt"; - rev = "f44f46ecad6e6983fd04dac84c5a5c03815d3427"; - sha256 = "0a8bdi6d58m5v851gkyph4qngxzsa5saizhsp1klpjnj57akz078"; + rev = "a14f9292b4bd68ceed433fc513f287641816dc6d"; + sha256 = "0rwnmifli01h5aakz440k3g136y3l5f3c16sdvd0k8q4xcdiibs1"; }; - meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; + meta.homepage = "https://github.com/andersevenrud/nvim_context_vt/"; }; nvimdev-nvim = buildVimPluginFrom2Nix { @@ -7725,24 +7750,24 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2023-06-30"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "22328c578bc013fa4b0cef3d00af35efe0c0f256"; - sha256 = "08ik7v5gfpy52z09wbx1rbdhcz1v1c41i5l9kx4p25rxw8g9cl8v"; + rev = "d1e52f9b3c755fcebb93d635821663a2c0f53281"; + sha256 = "0gvb7g6844w9ll6w7qwh5ian0vz5sr90nyw7x3pybms8w74wvcrn"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-08-13"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "8f7807946a67b5f1a515946f82251e33651bae29"; - sha256 = "0sbbghvwyw0zxwpvasci8cz7waf5zbvncvajjc2mbv4d1lvr82vc"; + rev = "c12a12c34da2a04465308f410095bcbe47996f0b"; + sha256 = "15ppj91x40cd7hbhv0jxbb8n8496d8l72c1jrbn132rslqvxkz7w"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7774,12 +7799,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2023-08-07"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "09b71d84bd2524438e48c0aa5b54d855cc72af32"; - sha256 = "1crlzkgdpxsvcvc1djc9ai3abm1szkrwrsknzxa7zdx4w1jlvpvs"; + rev = "7bd3558c17045b95c961d28861c1b3bd9bdc992a"; + sha256 = "0nf1x635a2g8jj16mq1w3gsbidg7paglivasizspa8dsfxw36rag"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -7798,12 +7823,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-08-15"; + version = "2023-08-21"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "45d12deedc61a19f9e3ed0e8dcb0be91928f723b"; - sha256 = "1z6ih5ng29m8xsg11y3rl0211g202sppgdz674ls5z1fwk8kaf5y"; + rev = "c81dff789f7623c431d1f43cf334237e52bbfd61"; + sha256 = "193yw6bk7psa979cpp1ram0ipw49kj0xsr25mk5m78xh8pivgg1g"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -7858,12 +7883,12 @@ final: prev: openingh-nvim = buildVimPluginFrom2Nix { pname = "openingh.nvim"; - version = "2023-06-19"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "Almo7aya"; repo = "openingh.nvim"; - rev = "2719e5759ecf4b9a2d492fbf52d03d2e6fc6126a"; - sha256 = "0646wmi4z0yrdrmy96zq5q7f2vl0030scwbh4ywrhwzfk6rjjmxa"; + rev = "27655e19d4cad90f2ceed4f0a08cf7ebfb3a8e40"; + sha256 = "0jl5y6pgwdjin7rcrw8p2xv7x6z8gz9wkn7ijx3ixs5278q8wijb"; }; meta.homepage = "https://github.com/Almo7aya/openingh.nvim/"; }; @@ -7882,12 +7907,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2023-07-25"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "6b6eb8eabbed4d95568fd1f5374a3dff7ed51a3b"; - sha256 = "1snqqrpck8wgkc67dzcy6y0y9n37sipkaq6fxxy1h71d8363vkwd"; + rev = "6cbebbdeb4e6e2b76c6dff338c294eb1fc037427"; + sha256 = "17d5ph21di8wl0jivdpnmhv08gjik7h63pkip03a05q5kw59plh8"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -7904,14 +7929,26 @@ final: prev: meta.homepage = "https://github.com/rgroli/other.nvim/"; }; + otter-nvim = buildVimPluginFrom2Nix { + pname = "otter.nvim"; + version = "2023-08-27"; + src = fetchFromGitHub { + owner = "jmbuhr"; + repo = "otter.nvim"; + rev = "849259c0458a13a1018e7a04e5d30d84e23c2333"; + sha256 = "18rdra1bs51mgs6zk8cdn6yhl2pazkcqf96p5qnp2lhdy6gy6h84"; + }; + meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; + }; + overseer-nvim = buildVimPluginFrom2Nix { pname = "overseer.nvim"; - version = "2023-08-13"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "667dc5f0048d299fc41c13c8c3b5ef2cb2909a4d"; - sha256 = "1yh64phvxkra171a8948bfddx7jgrvw38z1apagkczczg06r8imm"; + rev = "2f4b05b553867259bfcf19d8631af4d9318a561f"; + sha256 = "1r7fi1c1i9lqxknh1bgprj748k810fpkklgf0klfc95bzzjc4njp"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -7943,12 +7980,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2023-08-18"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "90f794d01dd5f50404f8ef6e1d22377ba5180787"; - sha256 = "0mhg4z99ksbnf1hhcnyg7v9rsrzsmr81z3jry1jifflwcc9s7fcw"; + rev = "ea0cc3c59f67c440c5ff0bbe4fb9420f4350b9a3"; + sha256 = "0lvpflpm7mhv39dglxdvmilj72xgxx5j614ll06mcxycv2k3xcvw"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -8087,24 +8124,24 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2023-04-15"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "2b81a018a49f8e476341dfcb228b7b808baba68b"; - sha256 = "1b7h4sih8dc55w12f0v5knk9cxfpy0iffhbvmg0g84if55ar616v"; + rev = "429f3e76cbb1c59fe000b690f7a5bea617b890c0"; + sha256 = "1flqiycr7dm4cyp2gpy3dmkk8xcdk4268kgmp5qz43qf7fi8m7iy"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2023-07-17"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "267282a9ce242bbb0c5dc31445b6d353bed978bb"; - sha256 = "10pw38dfzjrwzwkby9jmghafwwcph3az5z3h9c8v5kjh8iqls6x1"; + rev = "0dbe561ae023f02c2fb772b879e905055b939ce3"; + sha256 = "0j42b4q25l8yypa92zkdf9jargjszyvw5f83l3qxbh0vy9ly1j2d"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -8303,6 +8340,18 @@ final: prev: meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/"; }; + quarto-nvim = buildVimPluginFrom2Nix { + pname = "quarto-nvim"; + version = "2023-08-27"; + src = fetchFromGitHub { + owner = "quarto-dev"; + repo = "quarto-nvim"; + rev = "93b09591763e6ec7e3c1d5f4594e30bbdf934b46"; + sha256 = "12ymirc0dygsvhavvn53swdfcp7jiswmcq0d57czlq5118nlgwix"; + }; + meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; + }; + quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; version = "2023-08-08"; @@ -8363,6 +8412,17 @@ final: prev: meta.homepage = "https://github.com/luochen1990/rainbow/"; }; + rainbow-delimiters-nvim = buildVimPluginFrom2Nix { + pname = "rainbow-delimiters.nvim"; + version = "2023-08-26"; + src = fetchgit { + url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; + rev = "9cbd3dc409af1f5531778ccd1ea6bce668241f39"; + sha256 = "0qz4my1xw1vww2109s8icscwfysa2aak3kjq2wym2smm259gd8g1"; + }; + meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; + }; + rainbow_parentheses-vim = buildVimPluginFrom2Nix { pname = "rainbow_parentheses.vim"; version = "2013-03-05"; @@ -8437,12 +8497,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2023-08-18"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "b1cc851bcb4e3c624abbe2a725237eef6bea765c"; - sha256 = "1y13ayb48hnz7fpw3ani56pbibkbq99fdaf3llbh0gs4m1j23923"; + rev = "2cfd6ddb0acece95d9658560ae9740b98ef70dbb"; + sha256 = "1pcfxl5350qwrlrr5j784pzy4w5b1v9w1yjjcpk0fghv2wi99isk"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -8653,12 +8713,12 @@ final: prev: scope-nvim = buildVimPluginFrom2Nix { pname = "scope.nvim"; - version = "2023-08-16"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "tiagovla"; repo = "scope.nvim"; - rev = "48c88376a9dbed96aaf33268b369c14850836fad"; - sha256 = "0s6ai8hnsm4wy5x61ylf0fxn6cxv00shmddwbjy5f3hbdp9rxsd6"; + rev = "b783c77175a3026d19152fd938a5cc066c2f6676"; + sha256 = "1v6j30vd21lmrrdrw2hza9mwph078n0h0fcby44ri8p0f900kpfr"; }; meta.homepage = "https://github.com/tiagovla/scope.nvim/"; }; @@ -8761,12 +8821,12 @@ final: prev: sg-nvim = buildVimPluginFrom2Nix { pname = "sg.nvim"; - version = "2023-08-16"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "6fc56ef3b488531243f071645ebf3caa5d93e7f0"; - sha256 = "1991bpipndjnn2gc6igcw2q65675nm49mcdxmdp33ingrjlkny6v"; + rev = "bd4efc10ab92b83443df06dda7b8ac95d462c2c0"; + sha256 = "0x2xlv49j7g7xhrhkj20qz63xw28mg6zm4wkd26j1j7gb0kgjm97"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -9002,12 +9062,12 @@ final: prev: sphinx-nvim = buildVimPluginFrom2Nix { pname = "sphinx.nvim"; - version = "2022-10-27"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "stsewd"; repo = "sphinx.nvim"; - rev = "ec53a6e7104c6bef75982fce15bcab546c590f7e"; - sha256 = "15pxzq74sx9zwwpcfy478mq558s2kwv78pgzqz4jw03hd0ms2c1k"; + rev = "d4eceb35975d379c6b380111627c5d4531f77d08"; + sha256 = "0j4v1ckc7p5bsh81yhcc35yv1lqkn2kicy84pbk556ksx60pgvgs"; }; meta.homepage = "https://github.com/stsewd/sphinx.nvim/"; }; @@ -9063,12 +9123,12 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2023-07-26"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "cf2c61ff3448be41b264ee850eeac16cacd7e5a9"; - sha256 = "0gpdsnzwk9hvr2302rc62nxsvv895525q6iy7pzracjqlh29ljbq"; + rev = "cb1647d170eaa76d7a1919e38a7b6f89a77a3a87"; + sha256 = "1i27s2gxky3l2wxfg22gi1dj9hjx41xff2211fhbwxmswwlkjj1v"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -9087,12 +9147,12 @@ final: prev: ssr-nvim = buildVimPluginFrom2Nix { pname = "ssr.nvim"; - version = "2023-08-11"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "027a89f84283a9051427d4f319720336535c2e82"; - sha256 = "1b8nllqvi12kg1ixzipwdxnc68qr034s9r4wqnydwccdi1cw6pdd"; + rev = "b2f35df231c6b090f6eb023ddf2ad0cb88d90eb4"; + sha256 = "1zkpzf82ln9ymwrrm3zyy763idmm3bqg6vswbgh2sac8xsdfnj56"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; @@ -9147,12 +9207,12 @@ final: prev: statuscol-nvim = buildVimPluginFrom2Nix { pname = "statuscol.nvim"; - version = "2023-06-20"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "9f1ff2dcf614544c5022e876d83b4894c1944e87"; - sha256 = "1gw8c2aw3s99xxjyh0j62z91g68258gjbz172jh7vkfvqxpbxy3d"; + rev = "0944234914438695050eec6f83b4669864680c1a"; + sha256 = "0ia4s68xwjsr9zrn8h48d5bhpcj3qqvcdwak6pwjvg4hxrq7183p"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; @@ -9243,12 +9303,12 @@ final: prev: swayconfig-vim = buildVimPluginFrom2Nix { pname = "swayconfig.vim"; - version = "2023-01-28"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "jamespeapen"; repo = "swayconfig.vim"; - rev = "ce04a8e8c494590382d1b32a20ed3b451d608623"; - sha256 = "0lirihvrx0qn59nbg5s3sh1jgv0v3q4ag7kgvc3r7q9a2fbjg46y"; + rev = "29a5e74bdd4d2958818e15b2926e408c6cd85c75"; + sha256 = "1gqvrrx8lz0pzfkc2rkz2ifpfif278cpklnrn3xvnhfzwbg6j27y"; }; meta.homepage = "https://github.com/jamespeapen/swayconfig.vim/"; }; @@ -9267,12 +9327,12 @@ final: prev: switch-vim = buildVimPluginFrom2Nix { pname = "switch.vim"; - version = "2023-04-25"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "switch.vim"; - rev = "6b6cfda7ba751617599fcf3a96c1694e7924255d"; - sha256 = "1filijmx87g6yiv9bfgf89yiffqwq2qmvw5f73zfq0sh3pyxk6ja"; + rev = "68d269301181835788dcdcb6d5bca337fb954395"; + sha256 = "0llpr59wgagr1mvaml80pqbci025phgdfn84zn82s1mmgaa4xjl3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/switch.vim/"; @@ -9304,12 +9364,12 @@ final: prev: tabby-nvim = buildVimPluginFrom2Nix { pname = "tabby.nvim"; - version = "2023-08-16"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "c7a7819af7016d5afb741e425ee65626c36f90d6"; - sha256 = "01a37a0v7n3yq2lpv47mnxr0v8ywvgrz1vs6ckw9qs37awv9fing"; + rev = "e0a20dc4c0e16ca755184c34a27391f31a91e463"; + sha256 = "16bh1wbdvp2zlk2aq5b7xplirqlqg4mwldspapsmahjjh3mdzg8m"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -9521,12 +9581,12 @@ final: prev: telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2023-08-13"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "3aee7e0c6b05f85729cfae2fb62941088e47fe53"; - sha256 = "1byf6biwmcbawnwp03ms42kn41g9c3abgij8y9yxmdia5pms0zm2"; + rev = "fbda5d91d6e787f5977787fa4a81da5c8e22160a"; + sha256 = "1cm2jr0f719jhr4q5w8fh0c8qjncrvhck18h4g42xsgyhrkvfy2g"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -9582,12 +9642,12 @@ final: prev: telescope-live-grep-args-nvim = buildVimPluginFrom2Nix { pname = "telescope-live-grep-args.nvim"; - version = "2023-04-05"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-live-grep-args.nvim"; - rev = "0f75ea809c46af8997c64f49c52e3c641d887885"; - sha256 = "1dnr5ap329xzx3g6arwz7np1achwihwl2ryd4q5g3r8w1sbm3mbg"; + rev = "851c0997d55601f2afd7290db0f90dc364e29f58"; + sha256 = "0c3hrbrxkcf1qz8djlkmf10fzn34i637sy3ijkdc0ywx1cqr6r1g"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-live-grep-args.nvim/"; }; @@ -9751,12 +9811,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-08-10"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "2d92125620417fbea82ec30303823e3cd69e90e8"; - sha256 = "01373bppxb3zw68kz91acbm1g4453sdyfli137hx1855zcaqnkh5"; + rev = "32e6792f865221dfaf2a3751fd3cfeac96557433"; + sha256 = "1rbm8sb8cvmvgbcqkiy9j507hh47xvbd5s91j6kiqwng04c5mf63"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -9907,12 +9967,12 @@ final: prev: tint-nvim = buildVimPluginFrom2Nix { pname = "tint.nvim"; - version = "2023-05-30"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "levouh"; repo = "tint.nvim"; - rev = "80b15a91087991068d5834419437f652d1d4bc8e"; - sha256 = "14p909q7xlgapgjafpiwd71bf4f83xcrcikn6mlzlnhwrbmxmcns"; + rev = "862835626941d263466754b9c8e2ce2cb004f5ac"; + sha256 = "0m00zy9ihmwh1f28sk92rbrfd3h4azc41zzpy4jbh82gbnq8k4ks"; }; meta.homepage = "https://github.com/levouh/tint.nvim/"; }; @@ -9943,12 +10003,12 @@ final: prev: tmux-nvim = buildVimPluginFrom2Nix { pname = "tmux.nvim"; - version = "2023-05-29"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "aserowy"; repo = "tmux.nvim"; - rev = "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9"; - sha256 = "0hr8f385mdr9dpf7fzyf4a2swm7pyrwl64pzihqphccsjwijiwj1"; + rev = "cb12b31a6b8aea1b39e4735ed70f7c73c2a938b0"; + sha256 = "0nv0px0ycg128bddc9z7dchzmfhma9q2gqxbrkh321zsakb2wc9p"; }; meta.homepage = "https://github.com/aserowy/tmux.nvim/"; }; @@ -10004,12 +10064,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2023-07-13"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "1ee11019f8a81dac989ae1db1a013e3d582e2033"; - sha256 = "0ygrwps4riq37wxwzplw2jyxi7qc7yagypfd444vp0vklqnslvn7"; + rev = "9a01eada39558dc3243278e6805d90e8dff45dc0"; + sha256 = "1rd7d16gqy9g2dixnsk186lqc17a4d1h5c2409s0xi7wzj7czw68"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -10040,12 +10100,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-08-13"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "7ee1250292491dfdd8ac7eda4e1d373a8c2be7de"; - sha256 = "1yqm5f4g3r02a6pkvpx35v9ls45j3hj0qgdmh2wdw72lq8c6ww4x"; + rev = "bff8c32b826e188fa558e94c7c93ac17a8ef0365"; + sha256 = "0m30d7d9bgs7ni2npgzd7h83l47a9phi4qs3g1za4znqsjj2wmbd"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -10076,12 +10136,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-07-29"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3"; - sha256 = "1i99lvxbr1kmfcz414zg8xdn8n0b1ad9v3hwsbac00xzqhrh1v8i"; + rev = "3f85d8ed30e97ceeddbbcf80224245d347053711"; + sha256 = "0l1mf8mpf2q2wk983baj75hy30dm7hwncbfazrnimycqdyarxn6x"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -10160,12 +10220,12 @@ final: prev: typst-vim = buildVimPluginFrom2Nix { pname = "typst.vim"; - version = "2023-08-17"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "97f21818cb8d3d5ed6bb4b672ddb5af975aab71a"; - sha256 = "048n69wyiv9p8gwbhpcjf6i876v60r11wpv7j7jb2dg8l1m8gp73"; + rev = "555b76ceb3e5d4fbd040e2948646204501ecfdad"; + sha256 = "1r3pbw2pkph4gwpyszk20zv0wd23bb4812ql3f2xh7brzwcglbgi"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -10208,12 +10268,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-08-19"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "1f1536341db8ac33615c35463f609818679e6d5f"; - sha256 = "0fjach9262xylvbbq4plwgjph0bq0afq1l4i6j923n9pd9y75d62"; + rev = "a8cc552bad9f6bf5de1d5c62c4aa2d4c270a7541"; + sha256 = "1l4zdj36dsi5vhx7m21wb5kjdn5yljjw526hgc86ws5l1xq1vngb"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -10304,12 +10364,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-08-13"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "38acf1128b0bd4f8b2f79c8644d1cda9dc297d9d"; - sha256 = "1n023my6hb856l8369sgqs6mc36lr47acjlimyadfd4m9s555sya"; + rev = "8b671c02525b6772ba9a8a38d17d0f06bfcb06bd"; + sha256 = "1v7gav6nzlzsv9jwyqbwbw73cch9m5ccq47nkrgmk702nyv7sq7s"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -10700,12 +10760,12 @@ final: prev: vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2022-08-22"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "8911f86284315cd574e807424bcea62fd99c588a"; - sha256 = "013f2p7jf9gj4xxs789906zrflpjv2kqa1whbg7y4viqs6j62y9l"; + rev = "31c593b8025f62f184418dd658c3a358a8d0ef70"; + sha256 = "14l7v8jg4kq8qh9j64nxir4a7d9ls0zp6zk3rjzbzf9viqyw1bp5"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -10808,12 +10868,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2023-04-17"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "7b35295b519f5f69be2e10b936db7fbac290b813"; - sha256 = "1cwxnbq4pngfi8151ycp9d78gybq70snrikv1nsxqmlk4k3wdipk"; + rev = "99dc8d5030945c01a7e04b1e44d107a9bd15af67"; + sha256 = "00a1j7snyz0gc3pxks26axhdwcbd5iqs9s2crhs6vwvcj5fymmr1"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -11156,12 +11216,12 @@ final: prev: vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2023-07-28"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "4c233043b4bfd5fde2d65f72db01e53e8726c5df"; - sha256 = "15a9dz459z01j1h1p13fls04j8jbbzkypmw9axk03ld2g0h47yxk"; + rev = "03b8f306895137721d9e34ff8d3054cced89661a"; + sha256 = "059z2gmi32vl078nna58w56fkgn66y80jjb30qigr4gxlgn4r1y5"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -11766,6 +11826,18 @@ final: prev: meta.homepage = "https://github.com/wsdjeg/vim-fetch/"; }; + vim-figlet = buildVimPluginFrom2Nix { + pname = "vim-figlet"; + version = "2022-12-08"; + src = fetchFromGitHub { + owner = "fadein"; + repo = "vim-figlet"; + rev = "f3141c1961e8c991cdc5ee5d9c070727d6013648"; + sha256 = "0h4lavkg57q7cwsrlj36q2624sm7n7k6n70pl47vbwyl7d0cbga8"; + }; + meta.homepage = "https://github.com/fadein/vim-figlet/"; + }; + vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; version = "2023-03-26"; @@ -11792,12 +11864,12 @@ final: prev: vim-flagship = buildVimPluginFrom2Nix { pname = "vim-flagship"; - version = "2022-04-21"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-flagship"; - rev = "6726cac1374c5a32e0b63f7f66007d33fdf3e21b"; - sha256 = "036w6b1wn6kamdjmakgchzwpzm0mwjpp1fpmc3bm79mc4q63cd06"; + rev = "56782f897db49b832a63669ca5398a1923da1371"; + sha256 = "0g40an83b0phkqkn81i80lw3fd6hxcykhy2ajhi580b08ygaw2lq"; }; meta.homepage = "https://github.com/tpope/vim-flagship/"; }; @@ -11828,12 +11900,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2023-07-10"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "bcaeabf89a92a924031d471395054d84bd88ce2f"; - sha256 = "0sf3imx44igw7ih0xah9c2ssqsfjsilk9z4ws6pfv5c4qxz32gn0"; + rev = "3bf0beb10a5a6f7a878195c93711515f2b7bdc99"; + sha256 = "0112kz8mx28sb3hhx4sa8yllajf9jk20d59a32kqb38ccycrqzcb"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -11900,12 +11972,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2023-07-04"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "b3b838d690f315a503ec4af8c634bdff3b200aaf"; - sha256 = "1y4jvrja0d77hsr24mb9bfgls5vy12r8g2bmsbsx40zvmwnlh294"; + rev = "572c8510123cbde02e8a1dafcd376c98e1e13f43"; + sha256 = "0kii9kfswyhp7zl5a26n9s3hlqkiyc5zih4yyzxm76sbhi3j00fq"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -12056,12 +12128,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-08-10"; + version = "2023-08-21"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "ca29cf84515431ba74dcf9abe6d403809b513e3b"; - sha256 = "13nsq9ch0jn79xnmhah3hi4v2dyaaypqgkw1x95az20apr19sv0f"; + rev = "ec8f05bb24eb8324253b97f75d99114ad6565231"; + sha256 = "045rby8wwhfb32bf6mla2imzbq1a2mn5ikqi1mmyl5as6hvhs0i2"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -12658,12 +12730,12 @@ final: prev: vim-lastplace = buildVimPluginFrom2Nix { pname = "vim-lastplace"; - version = "2023-08-17"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "farmergreg"; repo = "vim-lastplace"; - rev = "54fa1450f5c7c93f2793e5e8fffbd1863c002ad1"; - sha256 = "0mbzg1j2cwj9i5qr550gcg2cf0wiiz0rfbmkv9s4kj1wjrm9213b"; + rev = "bb3191b134ade9d1f01014e17c3df91e8911dd5c"; + sha256 = "0sv05v6q1lkc4xklqly0hf2p4w4schan3gvcf1s6493697hvcc4h"; }; meta.homepage = "https://github.com/farmergreg/vim-lastplace/"; }; @@ -12958,12 +13030,12 @@ final: prev: vim-markbar = buildVimPluginFrom2Nix { pname = "vim-markbar"; - version = "2023-07-18"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "Yilin-Yang"; repo = "vim-markbar"; - rev = "00f8620cd53f569dca26594e9c94534f03fe16d6"; - sha256 = "0h0m7mmc5x15mpq3af3n95nqfzhhb2mnw0rbxpr0xizjc2hcpg9z"; + rev = "7df6d0e918b610b798368a5af33825b787e0d20f"; + sha256 = "0814n9jqcv62hky04fywgby86ibfp434w4ij03vk5y2z9hgii8bd"; }; meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; @@ -13043,12 +13115,12 @@ final: prev: vim-merginal = buildVimPluginFrom2Nix { pname = "vim-merginal"; - version = "2022-10-29"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "idanarye"; repo = "vim-merginal"; - rev = "8ec5976aa4bd647c64504ff535eb06a8b709b051"; - sha256 = "0z43gdgm3vjbq4whwj6dm218fldkjlhp5kwks79w6x6rx84nnj6v"; + rev = "a4becdf09178c3c557b7069252b6df617ff04de3"; + sha256 = "060fcdbscb0984ma9pqjlv4jmrmqks2lmg0jffbw6zzw1fs4c72q"; }; meta.homepage = "https://github.com/idanarye/vim-merginal/"; }; @@ -13859,12 +13931,12 @@ final: prev: vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; - version = "2023-06-13"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "vim-qml"; - rev = "8b775e922ebfd198b30d379339dd4a0cfcae4d6f"; - sha256 = "12rn9p5pl7qmimfgfg5ynyfpybildnps86p7q7c1fpvdgr1lyzha"; + rev = "fb29fa044acaca8ce50825b8795d70acf3f604ce"; + sha256 = "1accbzy6hb0jhxqhm21b9d7rr43hfpca1444g1dcy1p2r0i32j72"; }; meta.homepage = "https://github.com/peterhoeg/vim-qml/"; }; @@ -14207,12 +14279,12 @@ final: prev: vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2023-07-28"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "c1f6a5bdd86f2beceaaf694e34a2587aca76319a"; - sha256 = "0lf3b25c3sx0ykqf7vpqk3wa87x6dsn8c6lbdj7pw9bkqfcw842f"; + rev = "7cfe5ac9f5d5512a7aeeb2e0a13a64975ac129e5"; + sha256 = "1lzvsdzpmrsdacxy73a6jnji3b3rjq3qm1r3qk4l46291xn8b9cw"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -14315,12 +14387,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2023-05-06"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "76e35f37aa9e47a8b7f2909de222844ae38c7007"; - sha256 = "0dz3z8aldwy6zg0abscm8x3w2f6h0sichysb9cm2nrn3gkmv21bq"; + rev = "d37486881a0a771b844a235bc3e025046088690d"; + sha256 = "0f16mlg18i6gp51w8pmq18dkvbylfnz916za4ahjjpwwcg7sg6ni"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -14736,12 +14808,12 @@ final: prev: vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2023-01-10"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "cdd66d6a37d991bba7997d593586fc51a5b37aa8"; - sha256 = "12jb59c9x3xbhfc9xps64dq3h9a5gsjfb60hv8kd8k2hl3jmnpc0"; + rev = "addb64a772cb4a3ae1f1363583012b2cada2cd66"; + sha256 = "0vnsjcslz3w02jlkvpnld8wjb73qpninylp0alpniwqyjm43nrl9"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -14772,12 +14844,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-08-19"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "0fcbe14fdfc3b86b8a41f7cdaa67dd2041cb77fe"; - sha256 = "04jgb3l84767c6b485475fddgz5vhf3268h07xbdq4pdkykmxafw"; + rev = "e56cd62aeb13681c7c0be86b6b0e99baa157a984"; + sha256 = "1mr08wqr1li1h19xs12s4xidsaiggvizjbvp4za1pkb7gw2hfn6h"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -15048,12 +15120,12 @@ final: prev: vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2023-08-13"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "a98626b2bf88d6fc97a8276d02c75961ce2b35fa"; - sha256 = "0bda58d83p5mv2gribzq9xhqvlrncx1ngc7n5fi67v7k0c6b84r9"; + rev = "0b901c91ed2f18c745d34cf827e03e9d552ca348"; + sha256 = "0di7kllrdpyfnf39pz3zf4m6bqmf2lbr09hd70mpillbdrq2rrh2"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -15264,12 +15336,12 @@ final: prev: vimoutliner = buildVimPluginFrom2Nix { pname = "vimoutliner"; - version = "2021-04-24"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "vimoutliner"; repo = "vimoutliner"; - rev = "6d849acb977fc2d008f9cd2edf4f1356537794fe"; - sha256 = "1hy4zgxrc0zn6dnbdv7zy2cn4ny99srsvrgkyvwhg4pzd9rwcqpp"; + rev = "c3efbd58926aec490f5f1e87aa14f63f778f488a"; + sha256 = "0rs0w8x0wckakabz9sv836zgvvlpslvrb4xb049liryabk0w5578"; }; meta.homepage = "https://github.com/vimoutliner/vimoutliner/"; }; @@ -15649,12 +15721,12 @@ final: prev: yats-vim = buildVimPluginFrom2Nix { pname = "yats.vim"; - version = "2023-08-12"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "8878bdd7fc01eec647267d4433a763474b6a5db4"; - sha256 = "0070r63v9kjl3cx9w8xsilyww9nwyharc6l274y7mg4bfhddpbr3"; + rev = "2b6950c7143790e6930b8cf32d60c6858a50d47c"; + sha256 = "0385gak2sil6z8n20s5kdmnnpyw7ds5c2qcfr0pmyaz3dlyfx2ih"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -15794,12 +15866,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-08-10"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "490078b1593c6609e6a50ad5001e7902ea601824"; - sha256 = "03nwnc8q65nqjvrxj5fg8c95ywqb94xyim2hxald95agiickv6rd"; + rev = "2e3e5ebcdc24ef0d5b14a0a999dbbe7936512c46"; + sha256 = "0h8byffxzd0kjj01j928hj0jkqkq0rjwz90fpq0si9n0yk2zdlnj"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -15818,12 +15890,12 @@ final: prev: dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2023-06-19"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "3e52a0682a53dd7c2c53133d45948f5a49c5fd9a"; - sha256 = "1rvfafi9l2m7bhr4lpccvmyyrf572k61y1bj3jr8vh10i21pmxf0"; + rev = "248e649f2fbd262292ee4196cadb5b7f38168f37"; + sha256 = "0lmch8zyxcq22v4988sb1wasvfj9fgq869wlpzi2kg60fw9d8zpd"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -15866,12 +15938,12 @@ final: prev: nightfly = buildVimPluginFrom2Nix { pname = "nightfly"; - version = "2023-08-19"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "456d7b392cd0fa6c94aefe8aa083ab1a7b4083bc"; - sha256 = "1qj78f7d3ahhlqfbx5dw69x20v7jnjccdnrfk93c3yjn25bhd677"; + rev = "06eaaaa8717538a7ce96b13c137da8c9eaa84ec8"; + sha256 = "08g7dwa1qlg7gj10y2sggq4558fl3cywvq4zhqnzygxlnb66rjpd"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -15890,12 +15962,12 @@ final: prev: nvchad-ui = buildVimPluginFrom2Nix { pname = "nvchad-ui"; - version = "2023-08-15"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "e973096c282d14d1832d54345ad591048444fb17"; - sha256 = "06bfb9kbwf0cwm87j72zkaa7qnj4ly1q6b5547z8df206f6d3vsq"; + rev = "b3a343e866f1b31d61193ea6e21c417e2e7a5355"; + sha256 = "001d2kfxqb4nb0d5nykv1192cq5aspniv0ljlw710gsya91ym504"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 3e64ae39c4ec..e93147e5351d 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -5,12 +5,12 @@ { ada = buildGrammar { language = "ada"; - version = "0.0.0+rev=ba7951a"; + version = "0.0.0+rev=0f572c4"; src = fetchFromGitHub { owner = "briot"; repo = "tree-sitter-ada"; - rev = "ba7951a8f3fb08f9ea923625153e7670c89f30b4"; - hash = "sha256-Rs+7wSsoV9ol0zV8occOeuvJaIofAe7qDXLmOxrjVw0="; + rev = "0f572c4dccac8cd6a149bbc88c9d8423e9c71ce9"; + hash = "sha256-LNpzqyafrh1JKj0VXaq3Hf3IZHqM1UcUAXy2xVXeSEQ="; }; meta.homepage = "https://github.com/briot/tree-sitter-ada"; }; @@ -27,12 +27,12 @@ }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=a2aa2b3"; + version = "0.0.0+rev=db929fc"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "a2aa2b38301960822c5384cd10a07c2026e9d44e"; - hash = "sha256-VtY+SaWIkLHv48jewmU0k1AtPwqpthWbNkpTHtCS98Y="; + rev = "db929fc6822b9b9e1211678d508f187894ce0345"; + hash = "sha256-PXBXtsyqAIgykaU/LLIakokmmWqTdicsUG4A8hA28yU="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; @@ -60,12 +60,12 @@ }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=8077be4"; + version = "0.0.0+rev=4798bc6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "8077be4c5504f2618f1280295bc4ae20a75988c1"; - hash = "sha256-i31QbosmsI1CUGAHOqeNGVeqoct13+i24CUtaGwdT7o="; + rev = "4798bc61410fcb3ae725bab24f96f5c4684cea71"; + hash = "sha256-VHzmBJc9Y3T0jRnOLDJEDVsC/ufGTryWzz/uxgHX2ck="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -225,12 +225,12 @@ }; commonlisp = buildGrammar { language = "commonlisp"; - version = "0.0.0+rev=338db38"; + version = "0.0.0+rev=5153dbb"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-commonlisp"; - rev = "338db38330f0d25cba8e2c6428240ebc5e020264"; - hash = "sha256-mTBxnj/kqrHx8q7cAKTjfD0FOyVKjDub01Y50DXXjg0="; + rev = "5153dbbc70e4cc2324320c1bdae020d31079c7c0"; + hash = "sha256-0eC2cm/cP9BLfNKsubJd4S4BHF2nJdx/OCNJNC4ur6Q="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp"; }; @@ -280,12 +280,12 @@ }; css = buildGrammar { language = "css"; - version = "0.0.0+rev=5f2c94b"; + version = "0.0.0+rev=fec7d37"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-css"; - rev = "5f2c94b897601b4029fedcce7db4c6d76ce8a128"; - hash = "sha256-HBCxnetErHqhSJeEIHFTaSqt8aJgJ4+OOgw8p+NDVDo="; + rev = "fec7d3757ab8f46a0ffe298be99b16ad5b9fa229"; + hash = "sha256-f3+pvJtULuJ6SHcmrMYyvreSAeEsq3L2+5V3dhloaj8="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-css"; }; @@ -337,12 +337,12 @@ }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=e398400"; + version = "0.0.0+rev=bcef6d5"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "e398400a0b785af3cf571f5a57eccab242f0cdf9"; - hash = "sha256-+DFqJFR5raOnNG1oyGfO+tzpBXYBk0BBc8GbEkpEBhU="; + rev = "bcef6d57d0dd4df37bc9d8b1920ea4963c724826"; + hash = "sha256-wTeHw/7og4GJSXISCBSL6foxzecFFB/fK03bzGup0sM="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; @@ -401,6 +401,17 @@ }; meta.homepage = "https://github.com/rydesun/tree-sitter-dot"; }; + doxygen = buildGrammar { + language = "doxygen"; + version = "0.0.0+rev=7ac6203"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-doxygen"; + rev = "7ac6203cc018ff440b45b6d5aeba596f02eec4d5"; + hash = "sha256-QgmbdB9byVxLpsKB+FaQyyqUO8YuTfnYSTP9hDj5OOU="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-doxygen"; + }; dtd = buildGrammar { language = "dtd"; version = "0.0.0+rev=9deacbf"; @@ -546,6 +557,17 @@ }; meta.homepage = "https://github.com/FoamScience/tree-sitter-foam"; }; + forth = buildGrammar { + language = "forth"; + version = "0.0.0+rev=e7d1f8a"; + src = fetchFromGitHub { + owner = "AlexanderBrevig"; + repo = "tree-sitter-forth"; + rev = "e7d1f8a351fd5e95d9a89a8e87878c49ca14a5b0"; + hash = "sha256-AoV/DoQl2j4U0evWrM7ke544sei8VpdednWojwbhicU="; + }; + meta.homepage = "https://github.com/AlexanderBrevig/tree-sitter-forth"; + }; fortran = buildGrammar { language = "fortran"; version = "0.0.0+rev=6828cf3"; @@ -658,12 +680,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=8302c98"; + version = "0.0.0+rev=a59aadf"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "8302c98ed78128b22f946fadefaf4af5ba5d5850"; - hash = "sha256-rWNReuod+P7/Wq+zJoJNo9tWLLpo9Xu7B5MYxjWdp0I="; + rev = "a59aadf3d7c11702cad244e7cd6b67b34ca9c16a"; + hash = "sha256-HZJGKJ5KGcNIW6VEKHZLi9ai2bhklCNlbYAyz232+Ek="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -680,12 +702,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=4780c2b"; + version = "0.0.0+rev=4296be4"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "4780c2b689a5a5bd0ccfd78403510e9cf4a0f2fc"; - hash = "sha256-lbdQSqLtjM1AtdmlAebCH0CewYPENIQHb7oyXNuUM6U="; + rev = "4296be48e59be05284be2f79d62b155b61b20518"; + hash = "sha256-AimWXes1VTmFELDsTwYpZdyHsdBOL0rfg8ScauWvWQM="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -779,12 +801,12 @@ }; hack = buildGrammar { language = "hack"; - version = "0.0.0+rev=2887d39"; + version = "0.0.0+rev=fca1e29"; src = fetchFromGitHub { owner = "slackhq"; repo = "tree-sitter-hack"; - rev = "2887d3927c5fadebfd71c604922d0c59748e9901"; - hash = "sha256-rScvFdoyv0odnAcoKhS+iBaBziV/uaKJa51zPnxMBFQ="; + rev = "fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2"; + hash = "sha256-XTcsqCvlwbAAi7/TXrYX8wT56Ie+0OW5+eNRMH7XNyk="; }; meta.homepage = "https://github.com/slackhq/tree-sitter-hack"; }; @@ -834,12 +856,12 @@ }; heex = buildGrammar { language = "heex"; - version = "0.0.0+rev=9bf4ae4"; + version = "0.0.0+rev=4a36c9a"; src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-heex"; - rev = "9bf4ae444a8779839ecbca3b6b896dee426b10ae"; - hash = "sha256-ghknZmki1eBSzxY9omZN6wgLpvoJEYXBpvkVxxqLiIc="; + rev = "4a36c9a388505180da6ee0eda1d8afb8c83481c8"; + hash = "sha256-6gdAxNI81jbN8XZALRw31kFQRZg8ge/O7QRprLZpWOg="; }; meta.homepage = "https://github.com/connorlay/tree-sitter-heex"; }; @@ -922,12 +944,12 @@ }; hurl = buildGrammar { language = "hurl"; - version = "0.0.0+rev=0eca909"; + version = "0.0.0+rev=cd1a0ad"; src = fetchFromGitHub { owner = "pfeiferj"; repo = "tree-sitter-hurl"; - rev = "0eca909c8338364992e04c4862ac6afc5342cbb8"; - hash = "sha256-6FiLZKnZ2DMS1Gcaelw5bJxflfZSyPzGV1pJfvO1pcM="; + rev = "cd1a0ada92cc73dd0f4d7eedc162be4ded758591"; + hash = "sha256-vu/zK/AILJXPn18TmQSKoap7BtUOwhCxAX9v8ekVrIo="; }; meta.homepage = "https://github.com/pfeiferj/tree-sitter-hurl"; }; @@ -966,23 +988,23 @@ }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=0b3f9cf"; + version = "0.0.0+rev=ca4afaa"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "0b3f9cfe10a973df0530533313fdbef6c2c92bfa"; - hash = "sha256-dSRXjHfJOCrwm6HXlEz+prlKH7k+5B99S8vWyH49KzQ="; + rev = "ca4afaaa41dd7735b35edc0a77629cf932e95799"; + hash = "sha256-b87WFvpboNcQUt3W7tbsfkxzIfc27D0djBgMiF68/EA="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=c69aaba"; + version = "0.0.0+rev=f1e5a09"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "c69aabab53609d00e8e198ab902e4fde4b8e449f"; - hash = "sha256-6cyKT4yASueb+nNj8EqZbF7LZYZasMOYvq5ki2a0zQk="; + rev = "f1e5a09b8d02f8209a68249c93f0ad647b228e6e"; + hash = "sha256-VbK2asd1CavcBYGia30MomQh+KOgKgz5ax10V6nEVEs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -999,12 +1021,12 @@ }; jsdoc = buildGrammar { language = "jsdoc"; - version = "0.0.0+rev=189a6a4"; + version = "0.0.0+rev=d01984d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-jsdoc"; - rev = "189a6a4829beb9cdbe837260653b4a3dfb0cc3db"; - hash = "sha256-Zhl9mEpJE9Qy3MVScE2JK4i8OFZUXl5KMhKMS4bw+mI="; + rev = "d01984de49927c979b46ea5c01b78c8ddd79baf9"; + hash = "sha256-O7iDoOlXi+HLesS/sKcYfb+EJLR6gfRkwA657aRRg4c="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-jsdoc"; }; @@ -1054,12 +1076,12 @@ }; julia = buildGrammar { language = "julia"; - version = "0.0.0+rev=ab0f70c"; + version = "0.0.0+rev=bb7e587"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "ab0f70c0a919d38b41822305a8ca80e527c94e4f"; - hash = "sha256-+rD3kL3nSzdsj/P6pWf5i+XQugZsxUc0vz6JZIk/lr8="; + rev = "bb7e587837fdeda74dd510256253d60f59a1e2cd"; + hash = "sha256-rtv2rNBUYcp8vwicMbX2ZQBB1vH7SKc+Lsc0LF1oFYA="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; @@ -1221,12 +1243,12 @@ }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=c8723b3"; + version = "0.0.0+rev=6071891"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "c8723b33970deda54257e640779714fb181d4d5f"; - hash = "sha256-iSpOB5hnd7iKmuhAzAYYbFgP5MiiD57yvAHHG8PS9HA="; + rev = "6071891a8c39600203eba20513666cf93b4d650a"; + hash = "sha256-H6eCCZtE1MbSpHyvdcVbG3piBijM499imiNDIhCoTJA="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1675,6 +1697,17 @@ }; meta.homepage = "https://github.com/Fymyte/tree-sitter-rasi"; }; + re2c = buildGrammar { + language = "re2c"; + version = "0.0.0+rev=47aa19c"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-re2c"; + rev = "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"; + hash = "sha256-Mwnm8kN0xfAdGG00aUYrqPU0zyWbc6QH9Zlgb4on+do="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-re2c"; + }; regex = buildGrammar { language = "regex"; version = "0.0.0+rev=2354482"; @@ -1765,23 +1798,23 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=0a70e15"; + version = "0.0.0+rev=17a6b15"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "0a70e15da977489d954c219af9b50b8a722630ee"; - hash = "sha256-CrNY+4nsYQOzzVR7X+yuo4+5s6K3VHtVQyWfledKJ1U="; + rev = "17a6b15562b09db1f27b8f5f26f17edbb2aac097"; + hash = "sha256-seWoMuA87ZWCq3mUXopVeDCcTxX/Bh+B4PFLVa0CBQA="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=3a67773"; + version = "0.0.0+rev=d50b6ca"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "3a67773e205eb43c993cc5d43f633ddb79eb1653"; - hash = "sha256-S5vXtvdpQMh8Beacpm07zRaHoJCa+ZiH2j5IB6idOng="; + rev = "d50b6ca5cc3d925e3d1f497199cb8d8383ddae8a"; + hash = "sha256-fzruLddcKTqC47CKCZhznDoyGIA1fPdqxqmzgmd9RkM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1876,12 +1909,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=3dfa1b1"; + version = "0.0.0+rev=6fa7161"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "3dfa1b1fafac51e3ffc39064eafb26b5111861a2"; - hash = "sha256-sDXYfILv+7/fGIaWp4SOfsjZ67Mi3UPnpt9NEapKZ+M="; + rev = "6fa716163fcf183e4938c75f427379ceba881fbe"; + hash = "sha256-AmfWf7qJyoUVBLxZuIdNSWP1C7GAcKeO9EoV3HFUzwI="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -1907,6 +1940,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-starlark"; }; + strace = buildGrammar { + language = "strace"; + version = "0.0.0+rev=ef4a74c"; + src = fetchFromGitHub { + owner = "sigmaSd"; + repo = "tree-sitter-strace"; + rev = "ef4a74c43565572db9c06596d99ccb0210db13e5"; + hash = "sha256-H/zu440AcF1l0yW4a3PEMfUMsJUxW0UEohOQPlX1rD0="; + }; + meta.homepage = "https://github.com/sigmaSd/tree-sitter-strace"; + }; supercollider = buildGrammar { language = "supercollider"; version = "0.0.0+rev=3b35bd0"; @@ -2033,12 +2077,12 @@ }; tiger = buildGrammar { language = "tiger"; - version = "0.0.0+rev=4a09924"; + version = "0.0.0+rev=a7f11d9"; src = fetchFromGitHub { owner = "ambroisie"; repo = "tree-sitter-tiger"; - rev = "4a099243ed68a4fc72fdad8ea3ce57ec411ebfe3"; - hash = "sha256-y3bpfBPwvkFNMl1qZtlnpVhi5nnOqo0K9XGS2bCWPmY="; + rev = "a7f11d946b44244f71df41d2a78af0665d618dae"; + hash = "sha256-zGrbf5cCkgKGw+dQiEqUyHqj8Fu42MfAhEEADoC8DIA="; }; meta.homepage = "https://github.com/ambroisie/tree-sitter-tiger"; }; @@ -2268,12 +2312,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=f30b02c"; + version = "0.0.0+rev=915f263"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "f30b02c4bf363b797de39ae63375a4f357718ae9"; - hash = "sha256-562MgzH/hGvCBctNj34jXrsmwHXJt4Hxb2lsZ/IeN74="; + rev = "915f263722a6a74e5a30be82310d3843ed203058"; + hash = "sha256-wUYw3RS0brNbdFcb3ojs6gkrxBuOdRquTEmHTwAzc8w="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix index 0751740059af..f14853648c87 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -966,7 +966,7 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-f14cGAGZFs4DG8FBKYDz1NY38TOuENW9Co2fywGc74E="; + cargoHash = "sha256-BXmf/eUxfsqq49K31k1+KjMHTV7KBTh0Sse/hCcFjqw="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names index 2c92d2c9d6fc..4c50a22689b3 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -40,6 +40,7 @@ https://github.com/ycm-core/YouCompleteMe/,, https://github.com/vim-scripts/a.vim/,, https://github.com/mileszs/ack.vim/,, https://github.com/eikenb/acp/,, +https://github.com/Mofiqul/adwaita.nvim/,HEAD, https://github.com/stevearc/aerial.nvim/,, https://github.com/Numkil/ag.nvim/,, https://github.com/derekelkins/agda-vim/,, @@ -595,6 +596,7 @@ https://gitlab.com/usmcamp0811/nvim-julia-autotest,HEAD, https://github.com/ethanholz/nvim-lastplace/,HEAD, https://github.com/kosayoda/nvim-lightbulb/,, https://github.com/josa42/nvim-lightline-lsp/,, +https://github.com/martineausimon/nvim-lilypond-suite/,HEAD, https://github.com/mfussenegger/nvim-lint/,, https://github.com/mrded/nvim-lsp-notify/,HEAD, https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,, @@ -628,7 +630,7 @@ https://github.com/norcalli/nvim-terminal.lua/,, https://github.com/klen/nvim-test/,, https://github.com/kyazdani42/nvim-tree.lua/,, https://github.com/nvim-treesitter/nvim-treesitter/,, -https://github.com/romgrk/nvim-treesitter-context/,, +https://github.com/nvim-treesitter/nvim-treesitter-context/,, https://github.com/RRethy/nvim-treesitter-endwise/,HEAD, https://github.com/eddiebergman/nvim-treesitter-pyfold/,, https://github.com/nvim-treesitter/nvim-treesitter-refactor/,, @@ -663,6 +665,7 @@ https://github.com/Almo7aya/openingh.nvim/,, https://github.com/salkin-mada/openscad.nvim/,HEAD, https://github.com/nvim-orgmode/orgmode/,, https://github.com/rgroli/other.nvim/,HEAD, +https://github.com/jmbuhr/otter.nvim/,, https://github.com/stevearc/overseer.nvim/,HEAD, https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD, https://github.com/vuki656/package-info.nvim/,, @@ -696,11 +699,13 @@ https://github.com/purescript-contrib/purescript-vim/,, https://github.com/python-mode/python-mode/,, https://github.com/vim-python/python-syntax/,, https://github.com/AlphaTechnolog/pywal.nvim/,, +https://github.com/quarto-dev/quarto-nvim/,, https://github.com/unblevable/quick-scope/,, https://github.com/stefandtw/quickfix-reflector.vim/,, https://github.com/dannyob/quickfixstatus/,, https://github.com/jbyuki/quickmath.nvim/,HEAD, https://github.com/luochen1990/rainbow/,, +https://gitlab.com/HiPhish/rainbow-delimiters.nvim,HEAD, https://github.com/kien/rainbow_parentheses.vim/,, https://github.com/vim-scripts/random.vim/,, https://github.com/winston0410/range-highlight.nvim/,, @@ -873,7 +878,6 @@ https://github.com/catppuccin/vim/,HEAD,catppuccin-vim https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters https://github.com/Konfekt/vim-CtrlXA/,, https://github.com/konfekt/vim-DetectSpellLang/,, -https://github.com/fadein/vim-figlet/,HEAD, https://github.com/dpelle/vim-LanguageTool/,, https://github.com/inkarkat/vim-ReplaceWithRegister/,, https://github.com/inkarkat/vim-ReplaceWithSameIndentRegister/,, @@ -993,6 +997,7 @@ https://github.com/tommcdo/vim-exchange/,, https://github.com/terryma/vim-expand-region/,, https://github.com/int3/vim-extradite/,, https://github.com/wsdjeg/vim-fetch/,, +https://github.com/fadein/vim-figlet/,HEAD, https://github.com/tpope/vim-fireplace/,, https://github.com/dag/vim-fish/,, https://github.com/tpope/vim-flagship/,, diff --git a/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index d0bd58584798..6a4ee4ca3041 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -700,8 +700,8 @@ let mktplcRef = { name = "ruff"; publisher = "charliermarsh"; - version = "2023.32.0"; - sha256 = "sha256-phyPQqDgsYunF5FLqPevw8ZZG4Tw9qxjTOU4/kNGKU8="; + version = "2023.34.0"; + sha256 = "sha256-KOntjiE+n1yf9047XDldGg2pT+zknI/aEg6h71LwEB8="; }; meta = { license = lib.licenses.mit; @@ -2610,6 +2610,22 @@ let }; }; + ms-vscode-remote.remote-containers = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "remote-containers"; + publisher = "ms-vscode-remote"; + version = "0.305.0"; + sha256 = "sha256-srSRD/wgDbQo9P1uJk8YtcXPZO62keG5kRnp1TmHqOc="; + }; + meta = { + description = "Open any folder or repository inside a Docker container."; + downloadPage = "Use a container as your development environment"; + homepage = "https://code.visualstudio.com/docs/devcontainers/containers"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.anthonyroussel ]; + }; + }; + ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; @@ -2961,6 +2977,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=RoweWilsonFrederiskHolme.wikitext"; homepage = "https://github.com/Frederisk/Wikitext-VSCode-Extension"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.rapiteanu ]; }; }; diff --git a/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/nixpkgs/pkgs/applications/editors/vscode/generic.nix index 1742c1e0a0af..39e4fbc966d7 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -8,7 +8,7 @@ , tests # needed to fix "Save as Root" -, nodePackages, bash +, asar, bash # Attributes inherit from specific versions , version, src, meta, sourceRoot, commandLineArgs @@ -74,7 +74,7 @@ let nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook - nodePackages.asar + asar # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 (buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; }) ]; diff --git a/nixpkgs/pkgs/applications/emulators/box64/default.nix b/nixpkgs/pkgs/applications/emulators/box64/default.nix index 38ff3db999f6..35ed421469a9 100644 --- a/nixpkgs/pkgs/applications/emulators/box64/default.nix +++ b/nixpkgs/pkgs/applications/emulators/box64/default.nix @@ -15,13 +15,13 @@ assert withDynarec -> stdenv.hostPlatform.isAarch64; stdenv.mkDerivation rec { pname = "box64"; - version = "0.2.2"; + version = "0.2.4"; src = fetchFromGitHub { owner = "ptitSeb"; repo = pname; rev = "v${version}"; - hash = "sha256-aIvL0H0k0/lz2lCLxB17RxNm0cxVozYthy0z85/FuUE="; + hash = "sha256-iCZv/WvqZkH6i23fSLA/p0nG5/CgzjyU5glVgje4c3w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix b/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix index 37d995334af0..9da865057739 100644 --- a/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix +++ b/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "x16-emulator"; - version = "43"; + version = "44"; src = fetchFromGitHub { owner = "X16Community"; repo = "x16-emulator"; rev = "r${finalAttrs.version}"; - hash = "sha256-cZB7MRYlchD3zcBSWBIzyBiGHJobJvozkVT/7ftFkNg="; + hash = "sha256-NDtfbhqGldxtvWQf/t6UnMRjI2DR7JYKbm2KFAMZhHY="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix b/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix index 8c9c1d1b505a..c272faa706aa 100644 --- a/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix +++ b/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "x16-rom"; - version = "43"; + version = "44"; src = fetchFromGitHub { owner = "X16Community"; repo = "x16-rom"; rev = "r${finalAttrs.version}"; - hash = "sha256-LkGHfralxlishG1oyBojDnLMJ3c3KYp5YwJSZ2SIrbM="; + hash = "sha256-x/U+8e869mkWZKmCiW2fZKGB9un2cFXNclemwxbAjLQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/emulators/openmsx/default.nix b/nixpkgs/pkgs/applications/emulators/openmsx/default.nix index 9def450b0345..c9f7827d09ab 100644 --- a/nixpkgs/pkgs/applications/emulators/openmsx/default.nix +++ b/nixpkgs/pkgs/applications/emulators/openmsx/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openmsx"; - version = "19.0"; + version = "19.1"; src = fetchFromGitHub { owner = "openMSX"; repo = "openMSX"; rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] finalAttrs.version}"; - sha256 = "sha256-NR0+vOUkbyuVWdHLmKEewDDmR1ibi3dtbSq+6RaxrGo="; + sha256 = "sha256-5ULljLmEDGFp32rnrXKLfL6P3ad2STJUNngBuWlRCbc="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix b/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix index fea7bf17ef7b..1b016e0559dd 100644 --- a/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix +++ b/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix @@ -18,7 +18,6 @@ , qtbase , qtsvg , qttools -, qttranslations , qtwayland , rapidyaml , SDL2 @@ -83,7 +82,6 @@ llvmPackages_16.stdenv.mkDerivation rec { qtbase qtsvg qttools - qttranslations qtwayland rapidyaml SDL2 diff --git a/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix b/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix index 19e9ea8026d8..8136be89601d 100644 --- a/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix +++ b/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix @@ -28,13 +28,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.986"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.999"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "33f544fd9248361440afd6013e0ef9d69971d6da"; - sha256 = "1cnz3j8qndfrm1iifbzswyf4vcii939naj29bvr2mp6bdwrbqi49"; + rev = "7f96dbc0242f169caeb8461237bc01a23c115f56"; + sha256 = "1fi1bfbz07k9n8civ7gv0rlksdm59wpjcq50hrj7dgwnkrlmxdi2"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; diff --git a/nixpkgs/pkgs/applications/emulators/wine/base.nix b/nixpkgs/pkgs/applications/emulators/wine/base.nix index bc8051d6de5f..8b1b4966ddab 100644 --- a/nixpkgs/pkgs/applications/emulators/wine/base.nix +++ b/nixpkgs/pkgs/applications/emulators/wine/base.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] ++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ - CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security + CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon ]) ++ lib.optionals (stdenv.isLinux && !waylandSupport) (with pkgs.xorg; [ @@ -103,14 +103,27 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { patches = [ ] ++ lib.optionals stdenv.isDarwin [ - # Wine requires `MTLDevice.registryID` for `winemac.drv`, but that property is not available - # in the 10.12 SDK (current SDK on x86_64-darwin). Work around that by using selector syntax. + # Wine uses `MTLDevice.registryID` in `winemac.drv`, but that property is not available in + # the 10.12 SDK (current SDK on x86_64-darwin). That can be worked around by using selector + # syntax. As of Wine 8.12, the logic has changed and uses selector syntax, but it still + # uses property syntax in one place. The first patch is necessary only with older + # versions of Wine. The second is needed on all versions of Wine. + (lib.optional (lib.versionOlder version "8.12") ./darwin-metal-compat-pre8.12.patch) ./darwin-metal-compat.patch # Wine requires `qos.h`, which is not included by default on the 10.12 SDK in nixpkgs. ./darwin-qos.patch ] ++ patches'; + # Because the 10.12 SDK doesn’t define `registryID`, clang assumes the undefined selector returns + # `id`, which is a pointer. This causes implicit pointer to integer errors in clang 15+. + # The following post-processing step adds a cast to `uint64_t` before the selector invocation to + # silence these errors. + postPatch = lib.optionalString stdenv.isDarwin '' + sed -e 's|\(\[[A-Za-z_][][A-Za-z_0-9]* registryID\]\)|(uint64_t)\1|' \ + -i dlls/winemac.drv/cocoa_display.m + ''; + configureFlags = prevConfigFlags ++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ] ++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ] @@ -192,7 +205,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ]; description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms; - maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira ]; + maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira reckenrode ]; inherit mainProgram; }; }) diff --git a/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.12.patch b/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.12.patch new file mode 100644 index 000000000000..aaf8a1b89bfd --- /dev/null +++ b/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.12.patch @@ -0,0 +1,22 @@ +diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m +--- a/dlls/winemac.drv/cocoa_display.m ++++ b/dlls/winemac.drv/cocoa_display.m +@@ -289,7 +289,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) + * the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps + * using the integrated GPU. This is the behavior of Windows on a Mac. */ + primary_device = [MTLCreateSystemDefaultDevice() autorelease]; +- if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, primary_device.registryID)) ++ if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, [primary_device registryID])) + goto done; + + /* Hide the integrated GPU if the system default device is a dedicated GPU */ +@@ -301,7 +301,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) + + for (i = 0; i < devices.count; i++) + { +- if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], devices[i].registryID)) ++ if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], [devices[i] registryID])) + goto done; + + if (hide_integrated && devices[i].isLowPower) + diff --git a/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat.patch b/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat.patch index aeee7533bbd4..181b2a0d1a47 100644 --- a/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat.patch +++ b/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat.patch @@ -1,31 +1,12 @@ diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m -index f64a6c0f6ad..6da0391e3fa 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m -@@ -289,7 +289,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) - * the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps - * using the integrated GPU. This is the behavior of Windows on a Mac. */ - primary_device = [MTLCreateSystemDefaultDevice() autorelease]; -- if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, primary_device.registryID)) -+ if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, (uint64_t)[primary_device registryID])) - goto done; - - /* Hide the integrated GPU if the system default device is a dedicated GPU */ -@@ -301,7 +301,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) - - for (i = 0; i < devices.count; i++) - { -- if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], devices[i].registryID)) -+ if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], (uint64_t)[devices[i] registryID])) - goto done; - - if (hide_integrated && devices[i].isLowPower) @@ -354,7 +354,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; if (device && [device respondsToSelector:@selector(registryID)]) - ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); -+ ret = macdrv_get_gpu_info_from_registry_id(gpu, (uint64_t)[device registryID]); ++ ret = macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]); done: [pool release]; diff --git a/nixpkgs/pkgs/applications/emulators/wine/sources.nix b/nixpkgs/pkgs/applications/emulators/wine/sources.nix index 1bfb35e76d78..aca987417558 100644 --- a/nixpkgs/pkgs/applications/emulators/wine/sources.nix +++ b/nixpkgs/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "8.13"; + version = "8.14"; url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz"; - hash = "sha256-JuXTqD0lxUGMbA9USORD0gh2OiZDqrSw8a01KSKkwnU="; + hash = "sha256-4YNu9msYJfqdoEKDDASVsqw5SBVENkNGaXnuif3X+vQ="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - hash = "sha256-5upC+IWHBJE5DeFv96lD1hr4LYYaqAAzfxIroK9KlOY="; + hash = "sha256-ct/RGXt9B6F3PHbirX8K03AZ0Kunitd2HmI0N5k6VHI="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix b/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix index 71306bdc43b5..3fdd6db84661 100644 --- a/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix +++ b/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix @@ -110,7 +110,7 @@ in stdenv.mkDerivation { # This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt` # making the build fail, as that path does not exist dontFixCmake = true; - patches = [./vulkan_version.patch]; + cmakeFlags = [ # actually has a noticeable performance impact "-DYUZU_ENABLE_LTO=ON" diff --git a/nixpkgs/pkgs/applications/emulators/yuzu/sources.nix b/nixpkgs/pkgs/applications/emulators/yuzu/sources.nix index d417dc6f035f..9322090e7941 100644 --- a/nixpkgs/pkgs/applications/emulators/yuzu/sources.nix +++ b/nixpkgs/pkgs/applications/emulators/yuzu/sources.nix @@ -1,19 +1,19 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2023-08-14 +# Last updated: 2023-08-27 { compatList = { - rev = "fbecbb568ce45c2d118a76ff41f9e817a8b899e6"; + rev = "f440391993fe499c79d647ed0a20d117c0db0c27"; hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1"; }; mainline = { - version = "1522"; - hash = "sha256:15ka5lg9mdfgwngmsjm3dk74c64hxak2zkf36jdgqcjlwxdx81qk"; + version = "1538"; + hash = "sha256:1wynpcx6gwdbahf7nm22jslk9hbcy17nxbr6qnzagndrws30csx5"; }; ea = { - version = "3805"; - distHash = "sha256:1hxq4aifnncilnxmymgbz73m558y8v5f72cpgdfaqr450vlc5sks"; - fullHash = "sha256:1psivknzv1kycpnl81g0b9d9ck70lxddkn1gaimic37a7kxpg395"; + version = "3838"; + distHash = "sha256:0riwahdlhi4a96ya4pi7g0anwa35z8zhbax87m2mk89vwrjnf2am"; + fullHash = "sha256:1a1cq4dg624y3ixgc05ihlhy1fnpp98xnc60cssrdmmzyp79hrjp"; }; } diff --git a/nixpkgs/pkgs/applications/emulators/yuzu/vulkan_version.patch b/nixpkgs/pkgs/applications/emulators/yuzu/vulkan_version.patch deleted file mode 100644 index 7b77179e9f4e..000000000000 --- a/nixpkgs/pkgs/applications/emulators/yuzu/vulkan_version.patch +++ /dev/null @@ -1,13 +0,0 @@ -Yuzu requires a version of Vulkan that has not yet been released as a stable Vulkan SDK. In case this patch fails, check which version Yuzu is currently using and verify that it still works with the version shipped in Nixpkgs. - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -314,7 +314,7 @@ - find_package(zstd 1.5 REQUIRED) - - if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) -- find_package(Vulkan 1.3.256 REQUIRED) -+ find_package(Vulkan 1.3.250 REQUIRED) - endif() - - if (ENABLE_LIBUSB) diff --git a/nixpkgs/pkgs/applications/file-managers/doublecmd/default.nix b/nixpkgs/pkgs/applications/file-managers/doublecmd/default.nix index 35f7855e53aa..6ab824049683 100644 --- a/nixpkgs/pkgs/applications/file-managers/doublecmd/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/doublecmd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.0.11"; + version = "1.1.1"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-UV5LooVkCBzUk9E7dYje6t19HOuMCO8jY+fNGTES0KA="; + hash = "sha256-IccM7AwPiOtGHjAzvjQ99mrLFh8iZu8G7Rf71LJHB/g="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix b/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix index a3572e782b0d..b0b7c34127b3 100644 --- a/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.7.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "kyoheiu"; - repo = pname; + repo = "felix"; rev = "v${version}"; - sha256 = "sha256-3oXF9BG3BjGOeXqJHo3+fpcqcTOKrLED7Y3VQ06tnNA="; + hash = "sha256-RDCX5+Viq/VRb0SXUYxCtWF+aVahI5WGhp9/Vn+uHqI="; }; - cargoHash = "sha256-2XMVappHbf1ZPtQO8zy8Z0n9wshDM4d30qkmG8OBoUY="; + cargoHash = "sha256-kgI+afly+/Ag0witToM95L9b3yQXP5Gskwl4Lf4SusY="; nativeBuildInputs = [ pkg-config ]; @@ -37,6 +37,11 @@ rustPlatform.buildRustPackage rec { "--skip=state::tests::test_has_write_permission" ]; + # Cargo.lock is outdated + postConfigure = '' + cargo metadata --offline + ''; + meta = with lib; { description = "A tui file manager with vim-like key mapping"; homepage = "https://github.com/kyoheiu/felix"; diff --git a/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix b/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix index e85631d1965e..937991ede40b 100644 --- a/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix @@ -22,6 +22,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kamiyaa/joshuto"; changelog = "https://github.com/kamiyaa/joshuto/releases/tag/${src.rev}"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ figsoda totoroot ]; + maintainers = with maintainers; [ figsoda totoroot xrelkd ]; + mainProgram = "joshuto"; }; } diff --git a/nixpkgs/pkgs/applications/file-managers/mc/default.nix b/nixpkgs/pkgs/applications/file-managers/mc/default.nix index 65211bb54391..e83dd0379a19 100644 --- a/nixpkgs/pkgs/applications/file-managers/mc/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/mc/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.29"; + version = "4.8.30"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-AdijuU9YGAzKW/FyV7UHjR/W/SeptcDpcOx2dUlUCtQ="; + sha256 = "sha256-Xrw8shRLlwxRSf2lVsStULeHgElGls3y0UpTIEyVx98="; }; nativeBuildInputs = [ pkg-config unzip ] diff --git a/nixpkgs/pkgs/applications/file-managers/walk/default.nix b/nixpkgs/pkgs/applications/file-managers/walk/default.nix index 85069eaf7e41..2a15b12a9f30 100644 --- a/nixpkgs/pkgs/applications/file-managers/walk/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/walk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "walk"; - version = "1.5.2"; + version = "1.6.2"; src = fetchFromGitHub { owner = "antonmedv"; repo = "walk"; rev = "v${version}"; - hash = "sha256-lcXNGmDCXq73gAWFKHHsIb578b1EhznYaGC0myFQym8="; + hash = "sha256-Wo8i0nPAuzADLXlsEho9TSSbNh3d13iNsXXx5onPnIs="; }; - vendorHash = "sha256-EYwfoTVcgV12xF/cv9O6QgXq9Gtc9qK9EmZNjXS4kC8="; + vendorHash = "sha256-AmgCyq+N+EMdpIUCe6Lzd8bDXHsbOzclsHPp+H5ROMc="; meta = with lib; { description = "Terminal file manager"; diff --git a/nixpkgs/pkgs/applications/file-managers/ytree/default.nix b/nixpkgs/pkgs/applications/file-managers/ytree/default.nix index fcfbdbd10da1..4ba320919ef3 100644 --- a/nixpkgs/pkgs/applications/file-managers/ytree/default.nix +++ b/nixpkgs/pkgs/applications/file-managers/ytree/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "ytree"; - version = "2.04"; + version = "2.05"; src = fetchurl { url = "https://han.de/~werner/${pname}-${version}.tar.gz"; - sha256 = "sha256-bnqLf2jv5tNlq+M6HQbXOa2F8io9VN3QrsJKNHjWZkI="; + sha256 = "sha256-jPixUeSRO1t/epHf/VxzBhBqQkd+xE5x1ix19mq2Glc="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/finance/denaro/default.nix b/nixpkgs/pkgs/applications/finance/denaro/default.nix index 65d501a9ca36..4339f35efdbc 100644 --- a/nixpkgs/pkgs/applications/finance/denaro/default.nix +++ b/nixpkgs/pkgs/applications/finance/denaro/default.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "denaro"; - version = "2023.6.2"; + version = "2023.8.1"; src = fetchFromGitHub { owner = "NickvisionApps"; repo = "Denaro"; rev = version; - hash = "sha256-wnqk+UuOQc/Yph9MbQU8FRsNC/8ZQ9FxgF205pdHf+s="; + hash = "sha256-wq5dwSgfmEHy38LPjWOE+J+prjIYy2z4Hezq/45Ddjk="; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; @@ -54,6 +54,7 @@ buildDotnetModule rec { gtk4 libadwaita glib # Fixes "Could not retrieve parent type - is the typeid valid?" + gdk-pixbuf ]; passthru.updateScript = ./update.sh; diff --git a/nixpkgs/pkgs/applications/finance/denaro/deps.nix b/nixpkgs/pkgs/applications/finance/denaro/deps.nix index cf53b42d9ebc..6946d3e2240b 100644 --- a/nixpkgs/pkgs/applications/finance/denaro/deps.nix +++ b/nixpkgs/pkgs/applications/finance/denaro/deps.nix @@ -2,33 +2,43 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Cake.Tool"; version = "3.0.0"; sha256 = "0gjacqdgnh1d40sm9vrdb8vr6jv3vyh6j265gj1aaf9af2569637"; }) + (fetchNuGet { pname = "Cake.Tool"; version = "3.1.0"; sha256 = "1kv9zz0qsx40wiygydw5z6vkj8hfayvgy9bsii2lamdas9z0vmbc"; }) (fetchNuGet { pname = "Docnet.Core"; version = "2.3.1"; sha256 = "03b39x0vlymdknwgwhsmnpw4gj3njmbl9pd57ls3rhfn9r832d44"; }) + (fetchNuGet { pname = "FuzzySharp"; version = "2.0.2"; sha256 = "1xq3q4s9d5p1yn4j91a90hawk9wcrz1bl6zj9866y01yx9aamr8s"; }) (fetchNuGet { pname = "GetText.NET"; version = "1.8.7"; sha256 = "0djn5sc7p33ayjmxmxs4hqagh51bg70wqs6mwbhlhsrc67bvgj9a"; }) - (fetchNuGet { pname = "GirCore.Adw-1"; version = "0.3.0"; sha256 = "1bsjqxck58dff9hnw21cp3xk1afly8721sfsbnxcr5i39hlrbl37"; }) - (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.3.0"; sha256 = "1zb8ilgywpwgjrzrbdvzvy70f46fb05iy49592mkjg2lv24q5l3y"; }) - (fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.3.0"; sha256 = "1bc78409bdhfqqbirwr1lkzxl27adndv05q5fcm5sivmlzr7fbkm"; }) - (fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.3.0"; sha256 = "1dz7f29jbmkzcwbggjwsx6r4nmw5xvvyfmia0xpjvpx1zzmfvmc4"; }) - (fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.3.0"; sha256 = "1jgwhqghg14z5qkgakd42dnyk6n8cj7nkgf0hbj9zxbd0my9vv6p"; }) - (fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.3.0"; sha256 = "0hv55x8snr4fk0z8dn52n8p030f02i3gfysin0bsrlmi879gn9ln"; }) - (fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.3.0"; sha256 = "1aibc13yb96bbirh25jv5gp0cqvz1ya9drrdhirfsrn41274ikpm"; }) - (fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.3.0"; sha256 = "1xd4yfppr34ngmal3s16f08mqdn7mra97jmjpk13aa9yjbp0avij"; }) - (fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.3.0"; sha256 = "065fg5dj97sidrr7n2a6gv8vmylhpfznhw3zazra6krcvzgf1gcz"; }) - (fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.3.0"; sha256 = "1r68lfxj98y3fvcxl33lk2cbjz7dn9grqb6c5axdlfjjgnkwjvlj"; }) - (fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.3.0"; sha256 = "0c9im9sbiqsykrj4yq93x5nlsj9c5an7dj1j6yirb874zqq6jhsp"; }) - (fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.3.0"; sha256 = "12nva0xzykvf102m69gn19ap1cyiap3i93n9gha9pnl4d5g4b4k1"; }) - (fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.3.0"; sha256 = "1waiqs52gmpfqxc7yfdz7lp4jr3462js8hrs6acfr47vzddksymi"; }) + (fetchNuGet { pname = "GirCore.Adw-1"; version = "0.4.0"; sha256 = "1wy780mwvl7n1kr85r2icwsz9p3vsw749603x0wm3ka5ywbzv91k"; }) + (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.4.0"; sha256 = "11rg8hgran23b4m1116sfvfss0fgz874imafrv3h9w7c76f6hhci"; }) + (fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.4.0"; sha256 = "101qr6kijslzqd6dcmpjzrbdp8nr6ibi8958frvkpxifqa4xyp4c"; }) + (fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.4.0"; sha256 = "1bws3zry4awy73lwzllbdljl8wybmxfm870m175wl38c7pa18sav"; }) + (fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.4.0"; sha256 = "05maiqg2qxsg56zb8zamv241gqkskli8laa7i0dxl3f93ddc78f6"; }) + (fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.4.0"; sha256 = "1gy8gx7vy070nc2afj1zsn3d004y9d3gwn7zdj9g2fbhavbc4snk"; }) + (fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.4.0"; sha256 = "05q00p06kn97143az2xi5zhfpi30qqcds1n1zfj87gi5w0jla4ib"; }) + (fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.4.0"; sha256 = "06vrkjyzj4rjvlni3ixj12zpky2mah8v1q8nbbkfwca08k5hdz7p"; }) + (fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.4.0"; sha256 = "06b2c35ynmkknk5zbhs75081dki0zm165xa659mg8i88cyxsgrh4"; }) + (fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.4.0"; sha256 = "1hwmd3j4gllzjwkqq3m4wbl3v7hh2nsa7i1d2ziw3fvgbnbnb1vi"; }) + (fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.4.0"; sha256 = "1r8hkr7vm32cjmw092l67kaysqa5jzyn7v518502nljlm9ivil6f"; }) + (fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.4.0"; sha256 = "1wyq9s18gfs73z01gaqm87i7h71ir2n0jz1dyi26hj6b3qp0p34a"; }) + (fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.4.0"; sha256 = "0qifms5nlljzccgzvnyx5vcdgvfdyp2q7s0zdglay5x5g4zrl8fv"; }) + (fetchNuGet { pname = "GirCore.PangoCairo-1.0"; version = "0.4.0"; sha256 = "1vn8bgi9ijnw25id5vis15gv9h0d4y03scr4jv03scisv411jrl8"; }) (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.4-preview.84"; sha256 = "1kk2ja6lsfmx00sliniyky9fimrk9pcq2ql7j72310kx3qaad45v"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.4-preview.84"; sha256 = "0q5nmqhvdyg112c6q5h2h407d11g7sickbrn3fc5036n7svij13z"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.4-preview.84"; sha256 = "1jkkjj2p8wiabc6m5m88kf1ykq5wdjihyn27279mvw8vyrp4zp5d"; }) (fetchNuGet { pname = "Hazzik.Qif"; version = "1.0.3"; sha256 = "16v6cfy3pa0qy699v843pss3418rvq5agz6n43sikzh69vzl2azy"; }) + (fetchNuGet { pname = "LiveChartsCore"; version = "2.0.0-beta.910"; sha256 = "0yw54yd1kp4j8js1g405m4lvv84zx4zkx4m64iiqsc765a4alvvy"; }) + (fetchNuGet { pname = "LiveChartsCore.SkiaSharpView"; version = "2.0.0-beta.910"; sha256 = "1ifhvcsa0319mip98xbmlib3k7fkn24igfxxyfi2d31rajqv970r"; }) + (fetchNuGet { pname = "Markdig"; version = "0.31.0"; sha256 = "0iic44i47wp18jbbpl44iifhj2mfnil9gakkw3bzp7zif3rhl19m"; }) (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.5"; sha256 = "11gkdlf2apnzvwfd7bxdhjvb4qd0p2ridp4rrz44f7h76x1sb0gk"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "Nickvision.Aura"; version = "2023.8.8"; sha256 = "0l8khkg0df26dqra26wl74s73cxidbqw3k5l7jv0579gvkkv9893"; }) + (fetchNuGet { pname = "Nickvision.GirExt"; version = "2023.7.3"; sha256 = "1ahf4mld9khk2gaja30zfcjmhclz2l2nims0q4l7jk2nm9p7rzi9"; }) (fetchNuGet { pname = "OfxSharp.NetStandard"; version = "1.0.0"; sha256 = "1v7yw2glyywb4s0y5fw306bzh2vw175bswrhi5crvd92wf93makj"; }) (fetchNuGet { pname = "PdfSharpCore"; version = "1.3.56"; sha256 = "0a01b2a14gygh25rq3509rky85331l8808q052br2fzidhb2vc10"; }) (fetchNuGet { pname = "QuestPDF"; version = "2023.5.1"; sha256 = "1yfjwb7aj975aars7mcp1dxvarxl8aq122bndpw808b4cx3058gl"; }) @@ -53,10 +63,14 @@ (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0-beta17"; sha256 = "1qm8q82wzj54nbv63kx3ybln51k47sl18hia3jnzk1zrb6wdsw9a"; }) (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.3"; sha256 = "12qb0r7v2v91vw8q8ygr67y527gwhbas6d6zdvrv4ksxwjx9dzp9"; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.4-preview.84"; sha256 = "1isyjmmfqzbvqiypsvvnqrwf6ifr2ypngzvzj41m5nbk1jr8nn6m"; }) (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.4-preview.84"; sha256 = "132n0sq2fjk53mc89yx6qn20w194145sv9367s623di7ysz467br"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.4-preview.84"; sha256 = "0vqwc2wh8brzn99cc61qgcyf3gd8vqlbdkjcmc3bcb07bc8k16v7"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.4-preview.84"; sha256 = "0m48d87cp2kvrhxvykxnhbzgm7xrw8jkdagvma80bag5gzdiicy2"; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.5"; sha256 = "0xnzpkhm9z09yay76wxgn4j8js260pansx8r10lrksxv2b4b0n4x"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.5"; sha256 = "03181hahmxv8jlaikx0nkzfc2q1l1cdp3chgx5q6780nhqyjkhhx"; }) @@ -120,4 +134,5 @@ (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.15.0"; sha256 = "1bz5j6wfp9hn4fg5vjxl6mr9lva4gx6zqncqyqxrcb8lw7hvhwc6"; }) ] diff --git a/nixpkgs/pkgs/applications/finance/odoo/default.nix b/nixpkgs/pkgs/applications/finance/odoo/default.nix index cfd181aa4d76..f00118fdf75a 100644 --- a/nixpkgs/pkgs/applications/finance/odoo/default.nix +++ b/nixpkgs/pkgs/applications/finance/odoo/default.nix @@ -1,9 +1,9 @@ { stdenv , lib , fetchFromGitHub -, fetchurl +, fetchzip , python310 -, nodePackages +, rtlcss , wkhtmltopdf , nixosTests }: @@ -44,31 +44,26 @@ let }; }; - odoo_version = "15.0"; - odoo_release = "20230317"; + odoo_version = "16.0"; + odoo_release = "20230722"; in python.pkgs.buildPythonApplication rec { pname = "odoo"; version = "${odoo_version}.${odoo_release}"; format = "setuptools"; - # latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile - src = fetchurl { - url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.tar.gz"; + # latest release is at https://github.com/odoo/docker/blob/master/16.0/Dockerfile + src = fetchzip { + url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; name = "${pname}-${version}"; - hash = "sha256-nJEFPtZhq7DLLDCL9xt0RV75d/a45o6hBKsUlQAWh1U="; # odoo + hash = "sha256-pSycpYSiqJ6DKENvCWwLz+JaPUXT5dmaq8x4Aency60="; # odoo }; - unpackPhase = '' - tar xfz $src - cd odoo* - ''; - # needs some investigation doCheck = false; makeWrapperArgs = [ - "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}" + "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf rtlcss ]}" ]; propagatedBuildInputs = with python.pkgs; [ diff --git a/nixpkgs/pkgs/applications/finance/odoo/odoo15.nix b/nixpkgs/pkgs/applications/finance/odoo/odoo15.nix new file mode 100644 index 000000000000..a3255c4aa101 --- /dev/null +++ b/nixpkgs/pkgs/applications/finance/odoo/odoo15.nix @@ -0,0 +1,121 @@ +{ stdenv, lib, fetchFromGitHub, fetchzip, python310, rtlcss, wkhtmltopdf +, nixosTests }: + +let + python = python310.override { + packageOverrides = self: super: { + pypdf2 = super.pypdf2.overridePythonAttrs (old: rec { + version = "1.28.6"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "py-pdf"; + repo = "pypdf"; + rev = version; + fetchSubmodules = true; + hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4="; + }; + + nativeBuildInputs = [ ]; + + nativeCheckInputs = with self; [ pytestCheckHook pillow ]; + }); + flask = super.flask.overridePythonAttrs (old: rec { + version = "2.1.3"; + src = old.src.override { + inherit version; + hash = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss="; + }; + }); + werkzeug = super.werkzeug.overridePythonAttrs (old: rec { + version = "2.1.2"; + src = old.src.override { + inherit version; + hash = "sha256-HOCOgJPtZ9Y41jh5/Rujc1gX96gN42dNKT9ZhPJftuY="; + }; + }); + }; + }; + + odoo_version = "15.0"; + odoo_release = "20230816"; +in python.pkgs.buildPythonApplication rec { + pname = "odoo15"; + version = "${odoo_version}.${odoo_release}"; + + format = "setuptools"; + + # latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile + src = fetchzip { + url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; + name = "${pname}-${version}"; + hash = "sha256-h81JA0o44DVtl/bZ52rGQfg54TigwQcNpcMjQbi0zIQ="; # odoo + }; + + # needs some investigation + doCheck = false; + + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + "${lib.makeBinPath [ wkhtmltopdf rtlcss ]}" + ]; + + propagatedBuildInputs = with python.pkgs; [ + babel + chardet + decorator + docutils + ebaysdk + freezegun + gevent + greenlet + idna + jinja2 + libsass + lxml + markupsafe + mock + num2words + ofxparse + passlib + pillow + polib + psutil + psycopg2 + pydot + pyopenssl + pypdf2 + pyserial + python-dateutil + python-ldap + python-stdnum + pytz + pyusb + qrcode + reportlab + requests + setuptools + vobject + werkzeug + xlrd + xlsxwriter + xlwt + zeep + ]; + + # takes 5+ minutes and there are not files to strip + dontStrip = true; + + passthru = { + tests = { inherit (nixosTests) odoo15; }; + }; + + meta = with lib; { + description = "Open Source ERP and CRM"; + homepage = "https://www.odoo.com/"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/nixpkgs/pkgs/applications/finance/odoo/update.sh b/nixpkgs/pkgs/applications/finance/odoo/update.sh index 1bec751ae7e7..0f7ee144cf8a 100755 --- a/nixpkgs/pkgs/applications/finance/odoo/update.sh +++ b/nixpkgs/pkgs/applications/finance/odoo/update.sh @@ -1,9 +1,9 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix coreutils +#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch set -euo pipefail -DOCKER=$(curl -s https://raw.githubusercontent.com/odoo/docker/master/15.0/Dockerfile) +DOCKER=$(curl -s https://raw.githubusercontent.com/odoo/docker/master/16.0/Dockerfile) get_var() { echo "$DOCKER" | grep -E "^[A-Z][A-Z][A-Z] ODOO_$1" | sed -r "s|^[A-Z]{3} ODOO_$1.||g" @@ -22,6 +22,6 @@ fi cd "$(dirname "${BASH_SOURCE[0]}")" -sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch-url --type sha256 "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.tar.gz")\"; # odoo|g" default.nix +sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" default.nix sed -ri "s| odoo_version.+| odoo_version = \"$VERSION\";|" default.nix sed -ri "s| odoo_release.+| odoo_release = \"$RELEASE\";|" default.nix diff --git a/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix b/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix index b73fb71f698f..9722c3cb4dee 100644 --- a/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -14,8 +14,6 @@ , qtlocation , qtsensors , qttools -, qttranslations -, substituteAll , zlib }: @@ -31,11 +29,6 @@ mkDerivation rec { }; patches = [ - # https://github.com/NixOS/nixpkgs/issues/86054 - (substituteAll { - src = ./fix-qttranslations-path.diff; - inherit qttranslations; - }) # https://github.com/OpenOrienteering/mapper/pull/1907 (fetchpatch { url = "https://github.com/OpenOrienteering/mapper/commit/bc52aa567e90a58d6963b44d5ae1909f3f841508.patch"; diff --git a/nixpkgs/pkgs/applications/gis/openorienteering-mapper/fix-qttranslations-path.diff b/nixpkgs/pkgs/applications/gis/openorienteering-mapper/fix-qttranslations-path.diff deleted file mode 100644 index 06c465a8fb33..000000000000 --- a/nixpkgs/pkgs/applications/gis/openorienteering-mapper/fix-qttranslations-path.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/src/util/translation_util.cpp w/src/util/translation_util.cpp -index da03d216..c1f12751 100644 ---- i/src/util/translation_util.cpp -+++ w/src/util/translation_util.cpp -@@ -103,7 +103,7 @@ TranslationUtil::TranslationUtil(const QString& code, QString translation_file) - } - - QString translation_name = QLatin1String("qt_") + language.code; -- if (!qt_translator.load(translation_name, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) -+ if (!qt_translator.load(translation_name, QLatin1String("@qttranslations@/translations"))) - load(qt_translator, translation_name); - - load(app_translator, translation_file); diff --git a/nixpkgs/pkgs/applications/gis/qgis/default.nix b/nixpkgs/pkgs/applications/gis/qgis/default.nix index b3220f8d7081..8fa7338c6eaf 100644 --- a/nixpkgs/pkgs/applications/gis/qgis/default.nix +++ b/nixpkgs/pkgs/applications/gis/qgis/default.nix @@ -1,8 +1,11 @@ -{ lib, makeWrapper, symlinkJoin +{ lib +, makeWrapper +, symlinkJoin + , extraPythonPackages ? (ps: [ ]) + , libsForQt5 }: -with lib; let qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix { }; in symlinkJoin rec { @@ -12,7 +15,10 @@ in symlinkJoin rec { paths = [ qgis-unwrapped ]; - nativeBuildInputs = [ makeWrapper qgis-unwrapped.py.pkgs.wrapPython ]; + nativeBuildInputs = [ + makeWrapper + qgis-unwrapped.py.pkgs.wrapPython + ]; # extend to add to the python environment of QGIS without rebuilding QGIS application. pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.py.pkgs); diff --git a/nixpkgs/pkgs/applications/gis/qgis/ltr.nix b/nixpkgs/pkgs/applications/gis/qgis/ltr.nix index d34e1e69833b..9288f6ee607e 100644 --- a/nixpkgs/pkgs/applications/gis/qgis/ltr.nix +++ b/nixpkgs/pkgs/applications/gis/qgis/ltr.nix @@ -1,8 +1,11 @@ -{ lib, makeWrapper, symlinkJoin +{ lib +, makeWrapper +, symlinkJoin + , extraPythonPackages ? (ps: [ ]) + , libsForQt5 }: -with lib; let qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix { }; in symlinkJoin rec { @@ -12,7 +15,10 @@ in symlinkJoin rec { paths = [ qgis-ltr-unwrapped ]; - nativeBuildInputs = [ makeWrapper qgis-ltr-unwrapped.py.pkgs.wrapPython ]; + nativeBuildInputs = [ + makeWrapper + qgis-ltr-unwrapped.py.pkgs.wrapPython + ]; # extend to add to the python environment of QGIS without rebuilding QGIS application. pythonInputs = qgis-ltr-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-ltr-unwrapped.py.pkgs); diff --git a/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch b/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch new file mode 100644 index 000000000000..5553f80fbc5b --- /dev/null +++ b/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch @@ -0,0 +1,59 @@ +diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake +index b51fd0075e..87ee317e05 100644 +--- a/cmake/FindPyQt5.cmake ++++ b/cmake/FindPyQt5.cmake +@@ -25,7 +25,7 @@ ELSE(EXISTS PYQT5_VERSION_STR) + IF(SIP_BUILD_EXECUTABLE) + # SIP >= 5.0 path + +- FILE(GLOB _pyqt5_metadata "${Python_SITEARCH}/PyQt5-*.dist-info/METADATA") ++ FILE(GLOB _pyqt5_metadata "@pyQt5PackageDir@/PyQt5-*.dist-info/METADATA") + IF(_pyqt5_metadata) + FILE(READ ${_pyqt5_metadata} _pyqt5_metadata_contents) + STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" PYQT5_VERSION_STR ${_pyqt5_metadata_contents}) +@@ -34,8 +34,8 @@ ELSE(EXISTS PYQT5_VERSION_STR) + ENDIF(_pyqt5_metadata) + + IF(PYQT5_VERSION_STR) +- SET(PYQT5_MOD_DIR "${Python_SITEARCH}/PyQt5") +- SET(PYQT5_SIP_DIR "${Python_SITEARCH}/PyQt5/bindings") ++ SET(PYQT5_MOD_DIR "@pyQt5PackageDir@/PyQt5") ++ SET(PYQT5_SIP_DIR "@pyQt5PackageDir@/PyQt5/bindings") + FIND_PROGRAM(__pyuic5 "pyuic5") + GET_FILENAME_COMPONENT(PYQT5_BIN_DIR ${__pyuic5} DIRECTORY) + +diff --git a/cmake/FindQsci.cmake b/cmake/FindQsci.cmake +index 69e41c1fe9..5456c3d59b 100644 +--- a/cmake/FindQsci.cmake ++++ b/cmake/FindQsci.cmake +@@ -24,7 +24,7 @@ ELSE(QSCI_MOD_VERSION_STR) + IF(SIP_BUILD_EXECUTABLE) + # SIP >= 5.0 path + +- FILE(GLOB _qsci_metadata "${Python_SITEARCH}/QScintilla*.dist-info/METADATA") ++ FILE(GLOB _qsci_metadata "@qsciPackageDir@/QScintilla*.dist-info/METADATA") + IF(_qsci_metadata) + FILE(READ ${_qsci_metadata} _qsci_metadata_contents) + STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" QSCI_MOD_VERSION_STR ${_qsci_metadata_contents}) +@@ -33,7 +33,7 @@ ELSE(QSCI_MOD_VERSION_STR) + ENDIF(_qsci_metadata) + + IF(QSCI_MOD_VERSION_STR) +- SET(QSCI_SIP_DIR "${PYQT5_SIP_DIR}") ++ SET(QSCI_SIP_DIR "@qsciPackageDir@/PyQt5/bindings") + SET(QSCI_FOUND TRUE) + ENDIF(QSCI_MOD_VERSION_STR) + +diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt +index 4cd19c3af4..668cc6a5e6 100644 +--- a/python/CMakeLists.txt ++++ b/python/CMakeLists.txt +@@ -206,7 +206,7 @@ if (WITH_GUI) + install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_gui.pyi DESTINATION ${QGIS_PYTHON_DIR}) + endif() + if(QSCI_SIP_DIR) +- set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${QSCI_SIP_DIR}) ++ set(SIP_BUILD_EXTRA_OPTIONS ${SIP_BUILD_EXTRA_OPTIONS} --include-dir=${QSCI_SIP_DIR}) + else() + message(STATUS "Qsci sip file not found - disabling bindings for derived classes") + set(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_QSCI_SIP) diff --git a/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch b/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch index 5553f80fbc5b..725c0b350e82 100644 --- a/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch +++ b/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch @@ -39,7 +39,7 @@ index 69e41c1fe9..5456c3d59b 100644 ENDIF(_qsci_metadata) IF(QSCI_MOD_VERSION_STR) -- SET(QSCI_SIP_DIR "${PYQT5_SIP_DIR}") +- SET(QSCI_SIP_DIR "${PYQT_SIP_DIR}") + SET(QSCI_SIP_DIR "@qsciPackageDir@/PyQt5/bindings") SET(QSCI_FOUND TRUE) ENDIF(QSCI_MOD_VERSION_STR) @@ -48,7 +48,7 @@ diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 4cd19c3af4..668cc6a5e6 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt -@@ -206,7 +206,7 @@ if (WITH_GUI) +@@ -212,7 +212,7 @@ if (WITH_GUI) install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_gui.pyi DESTINATION ${QGIS_PYTHON_DIR}) endif() if(QSCI_SIP_DIR) diff --git a/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 1506f0bb9e28..71b0030dba78 100644 --- a/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -1,45 +1,47 @@ { lib -, mkDerivation , fetchFromGitHub +, makeWrapper +, mkDerivation +, substituteAll +, wrapGAppsHook + +, withGrass ? true +, withWebKit ? false + +, bison , cmake -, ninja +, exiv2 +, fcgi , flex -, bison -, proj , geos -, sqlite +, grass , gsl -, qwt -, fcgi -, python3 +, hdf5 , libspatialindex , libspatialite -, postgresql -, txt2tags -, openssl , libzip -, hdf5 , netcdf -, exiv2 +, ninja +, openssl +, pdal +, postgresql +, proj , protobuf -, qtbase -, qtsensors +, python3 , qca-qt5 -, qtkeychain -, qt3d , qscintilla +, qt3d +, qtbase +, qtkeychain , qtlocation +, qtsensors , qtserialport -, qtxmlpatterns -, withGrass ? true -, grass -, withWebKit ? false , qtwebkit -, pdal +, qtxmlpatterns +, qwt +, sqlite +, txt2tags , zstd -, makeWrapper -, wrapGAppsHook -, substituteAll }: let @@ -53,34 +55,34 @@ let }; pythonBuildInputs = with py.pkgs; [ - qscintilla-qt5 + chardet gdal jinja2 numpy + owslib psycopg2 - chardet + pygments + pyqt-builder + pyqt5 python-dateutil - pyyaml pytz + pyyaml + qscintilla-qt5 requests - urllib3 - pygments - pyqt5 - pyqt-builder - sip setuptools - owslib + sip six + urllib3 ]; in mkDerivation rec { - version = "3.28.7"; + version = "3.28.10"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-RWQ3RlE8fPMuDGosxKNVgbjRTigZRolqNyaJoC1xdec="; + hash = "sha256-5TGcXYfOJonpqecV59dhFcl4rNXbBSofdoTz5o5FFcc="; }; passthru = { @@ -88,6 +90,16 @@ in mkDerivation rec { inherit py; }; + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + + bison + cmake + flex + ninja + ]; + buildInputs = [ openssl proj @@ -120,11 +132,9 @@ in mkDerivation rec { ++ lib.optional withWebKit qtwebkit ++ pythonBuildInputs; - nativeBuildInputs = [ makeWrapper wrapGAppsHook cmake flex bison ninja ]; - patches = [ (substituteAll { - src = ./set-pyqt-package-dirs.patch; + src = ./set-pyqt-package-dirs-ltr.patch; pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}"; qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}"; }) @@ -133,6 +143,7 @@ in mkDerivation rec { cmakeFlags = [ "-DWITH_3D=True" "-DWITH_PDAL=TRUE" + "-DENABLE_TESTS=False" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass (let gmajor = lib.versions.major grass.version; @@ -143,10 +154,10 @@ in mkDerivation rec { dontWrapGApps = true; # wrapper params passed below postFixup = lib.optionalString withGrass '' - # grass has to be availble on the command line even though we baked in + # GRASS has to be availble on the command line even though we baked in # the path at build time using GRASS_PREFIX. - # using wrapGAppsHook also prevents file dialogs from crashing the program - # on non-NixOS + # Using wrapGAppsHook also prevents file dialogs from crashing the program + # on non-NixOS. wrapProgram $out/bin/qgis \ "''${gappsWrapperArgs[@]}" \ --prefix PATH : ${lib.makeBinPath [ grass ]} diff --git a/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index c2d51f5b9817..46fe2e333e65 100644 --- a/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,49 +1,52 @@ { lib -, mkDerivation , fetchFromGitHub +, makeWrapper +, mkDerivation +, substituteAll +, wrapGAppsHook +, wrapQtAppsHook + +, withGrass ? true +, withWebKit ? false + +, bison , cmake -, ninja +, exiv2 +, fcgi , flex -, bison -, proj , geos -, sqlite +, grass , gsl -, qwt -, fcgi -, python3 +, hdf5 , libspatialindex , libspatialite -, postgresql -, txt2tags -, openssl , libzip -, hdf5 , netcdf -, exiv2 +, ninja +, openssl +, pdal +, postgresql +, proj , protobuf -, qtbase -, qtsensors +, python3 , qca-qt5 -, qtkeychain -, qt3d , qscintilla +, qt3d +, qtbase +, qtkeychain , qtlocation +, qtmultimedia +, qtsensors , qtserialport -, qtxmlpatterns -, withGrass ? true -, grass -, withWebKit ? false , qtwebkit -, pdal +, qtxmlpatterns +, qwt +, sqlite +, txt2tags , zstd -, makeWrapper -, wrapGAppsHook -, substituteAll }: let - py = python3.override { packageOverrides = self: super: { pyqt5 = super.pyqt5.override { @@ -53,34 +56,34 @@ let }; pythonBuildInputs = with py.pkgs; [ - qscintilla-qt5 + chardet gdal jinja2 numpy + owslib psycopg2 - chardet + pygments + pyqt-builder + pyqt5 python-dateutil - pyyaml pytz + pyyaml + qscintilla-qt5 requests - urllib3 - pygments - pyqt5 - pyqt-builder - sip setuptools - owslib + sip six + urllib3 ]; in mkDerivation rec { - version = "3.28.3"; + version = "3.32.2"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-nXauZSC78BX1fcx0SXniwQpRmdSLfoqZ5jlbXeHgRGI="; + hash = "sha256-4Hcppzgst6v7SR/06ZICSujC4Gfckd/X5Mj40fh9OOU="; }; passthru = { @@ -88,40 +91,50 @@ in mkDerivation rec { inherit py; }; + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + wrapQtAppsHook + + cmake + flex + bison + ninja + ]; + buildInputs = [ - openssl - proj - geos - sqlite - gsl - qwt exiv2 - protobuf fcgi + geos + gsl + hdf5 libspatialindex libspatialite - postgresql - txt2tags libzip - hdf5 netcdf - qtbase - qtsensors + openssl + pdal + postgresql + proj + protobuf qca-qt5 - qtkeychain qscintilla + qt3d + qtbase + qtkeychain qtlocation + qtmultimedia + qtsensors qtserialport qtxmlpatterns - qt3d - pdal + qwt + sqlite + txt2tags zstd ] ++ lib.optional withGrass grass ++ lib.optional withWebKit qtwebkit ++ pythonBuildInputs; - nativeBuildInputs = [ makeWrapper wrapGAppsHook cmake flex bison ninja ]; - patches = [ (substituteAll { src = ./set-pyqt-package-dirs.patch; @@ -130,9 +143,16 @@ in mkDerivation rec { }) ]; + # Add path to Qt platform plugins + # (offscreen is needed by "${APIS_SRC_DIR}/generate_console_pap.py") + preBuild = '' + export QT_QPA_PLATFORM_PLUGIN_PATH=${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms + ''; + cmakeFlags = [ "-DWITH_3D=True" "-DWITH_PDAL=TRUE" + "-DENABLE_TESTS=False" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass (let gmajor = lib.versions.major grass.version; @@ -140,13 +160,17 @@ in mkDerivation rec { in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" ); + qtWrapperArgs = [ + "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms" + ]; + dontWrapGApps = true; # wrapper params passed below postFixup = lib.optionalString withGrass '' - # grass has to be availble on the command line even though we baked in + # GRASS has to be availble on the command line even though we baked in # the path at build time using GRASS_PREFIX. - # using wrapGAppsHook also prevents file dialogs from crashing the program - # on non-NixOS + # Using wrapGAppsHook also prevents file dialogs from crashing the program + # on non-NixOS. wrapProgram $out/bin/qgis \ "''${gappsWrapperArgs[@]}" \ --prefix PATH : ${lib.makeBinPath [ grass ]} diff --git a/nixpkgs/pkgs/applications/gis/qmapshack/default.nix b/nixpkgs/pkgs/applications/gis/qmapshack/default.nix index 2665e74ed395..3460f60d2b63 100644 --- a/nixpkgs/pkgs/applications/gis/qmapshack/default.nix +++ b/nixpkgs/pkgs/applications/gis/qmapshack/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, cmake, substituteAll, wrapQtAppsHook -, qtscript, qttranslations, qtwebengine, gdal, proj, routino, quazip }: +{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook +, qtscript, qtwebengine, gdal, proj, routino, quazip }: stdenv.mkDerivation rec { pname = "qmapshack"; @@ -12,14 +12,6 @@ stdenv.mkDerivation rec { hash = "sha256-qG/fiR2J5wQZaR+xvBGjdp3L7viqki2ktkzBUf6fZi8="; }; - patches = [ - # See https://github.com/NixOS/nixpkgs/issues/86054 - (substituteAll { - src = ./fix-qttranslations-path.patch; - inherit qttranslations; - }) - ]; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtscript qtwebengine gdal proj routino quazip ]; diff --git a/nixpkgs/pkgs/applications/gis/qmapshack/fix-qttranslations-path.patch b/nixpkgs/pkgs/applications/gis/qmapshack/fix-qttranslations-path.patch deleted file mode 100644 index 9f05611f5a28..000000000000 --- a/nixpkgs/pkgs/applications/gis/qmapshack/fix-qttranslations-path.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git i/src/qmapshack/setup/CAppSetupLinux.cpp w/src/qmapshack/setup/CAppSetupLinux.cpp -index 7581ef32..26eba3c8 100644 ---- i/src/qmapshack/setup/CAppSetupLinux.cpp -+++ w/src/qmapshack/setup/CAppSetupLinux.cpp -@@ -30,7 +30,7 @@ void CAppSetupLinux::initQMapShack() { - prepareGdal("", ""); - - // setup translators -- QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); -+ QLatin1String resourceDir = QLatin1String("@qttranslations@/translations"); - QString translationPath = QCoreApplication::applicationDirPath(); - translationPath.replace(QRegExp("bin$"), "share/qmapshack/translations"); - prepareTranslator(resourceDir, "qt_"); -diff --git i/src/qmapshack/setup/CAppSetupMac.cpp w/src/qmapshack/setup/CAppSetupMac.cpp -index 37602802..ae4a5a23 100644 ---- i/src/qmapshack/setup/CAppSetupMac.cpp -+++ w/src/qmapshack/setup/CAppSetupMac.cpp -@@ -56,7 +56,7 @@ void CAppSetupMac::initQMapShack() { - - // setup translators - QString translationPath = getApplicationDir(relTranslationDir).absolutePath(); -- prepareTranslator(translationPath, "qt_"); -+ prepareTranslator(QLatin1String("@qttranslations@/translations"), "qt_"); - prepareTranslator(translationPath, "qmapshack_"); - - // load and apply style sheet -diff --git i/src/qmaptool/setup/CAppSetupLinux.cpp w/src/qmaptool/setup/CAppSetupLinux.cpp -index b703e7bb..637d653e 100644 ---- i/src/qmaptool/setup/CAppSetupLinux.cpp -+++ w/src/qmaptool/setup/CAppSetupLinux.cpp -@@ -29,7 +29,7 @@ void CAppSetupLinux::initQMapTool() { - prepareGdal("", ""); - - // setup translators -- QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); -+ QLatin1String resourceDir = QLatin1String("@qttranslations@/translations"); - QString translationPath = QCoreApplication::applicationDirPath(); - translationPath.replace(QRegExp("bin$"), "share/qmaptool/translations"); - prepareTranslator(resourceDir, "qt_"); -diff --git i/src/qmaptool/setup/CAppSetupMac.cpp w/src/qmaptool/setup/CAppSetupMac.cpp -index dd68b9c1..84351cf4 100644 ---- i/src/qmaptool/setup/CAppSetupMac.cpp -+++ w/src/qmaptool/setup/CAppSetupMac.cpp -@@ -57,7 +57,7 @@ void CAppSetupMac::initQMapTool() { - - // setup translators - QString translationPath = getApplicationDir(relTranslationDir).absolutePath(); -- prepareTranslator(translationPath, "qt_"); -+ prepareTranslator(QLatin1String("@qttranslations@/translations"), "qt_"); - prepareTranslator(translationPath, "qmaptool_"); - - migrateDirContent(defaultCachePath()); -diff --git i/src/qmt_rgb2pct/main.cpp w/src/qmt_rgb2pct/main.cpp -index 589d3d52..5f7c12f8 100644 ---- i/src/qmt_rgb2pct/main.cpp -+++ w/src/qmt_rgb2pct/main.cpp -@@ -47,7 +47,7 @@ static void prepareTranslator(QString translationPath, QString translationPrefix - static void loadTranslations() { - #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(__GNU__) || \ - defined(Q_OS_CYGWIN) -- QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); -+ QLatin1String resourceDir = QLatin1String("@qttranslations@/translations"); - QString translationPath = QCoreApplication::applicationDirPath(); - translationPath.replace(QRegExp("bin$"), "share/" APP_STR "/translations"); - prepareTranslator(resourceDir, "qt_"); -@@ -58,7 +58,7 @@ static void loadTranslations() { - // os x - static QString relTranslationDir = "Resources/translations"; // app - QString translationPath = getApplicationDir(relTranslationDir).absolutePath(); -- prepareTranslator(translationPath, "qt_"); -+ prepareTranslator(QLatin1String("@qttranslations@/translations"), "qt_"); - prepareTranslator(translationPath, APP_STR "_"); - #endif - diff --git a/nixpkgs/pkgs/applications/graphics/artem/default.nix b/nixpkgs/pkgs/applications/graphics/artem/default.nix index cd59cfb60f15..de6f593fc453 100644 --- a/nixpkgs/pkgs/applications/graphics/artem/default.nix +++ b/nixpkgs/pkgs/applications/graphics/artem/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "artem"; - version = "2.0.1_2"; + version = "2.0.2"; src = fetchFromGitHub { owner = "finefindus"; repo = "artem"; rev = "v${version}"; - hash = "sha256-R7ouOFeLKnTZI6NbAg8SkkSo4zh9AwPiMPNqhPthpCk="; + hash = "sha256-t8L1lylaacEHGg3wxVgiB2XmBHDGzql774oHrg/vUC0="; }; - cargoHash = "sha256-sbIINbuIbu38NrYr87ljJJD7Y9Px0o6Qv/MGX8N54Rc="; + cargoHash = "sha256-rsgl8g6AqNmdq2gJ3PHvKMb7eid8ewtheajGWSWbeBw="; nativeBuildInputs = [ installShellFiles @@ -36,11 +36,6 @@ rustPlatform.buildRustPackage rec { "--skip=full_file_compare_html" ]; - # Cargo.lock is outdated - postConfigure = '' - cargo metadata --offline - ''; - postInstall = '' installManPage $releaseDir/build/artem-*/out/artem.1 installShellCompletion $releaseDir/build/artem-*/out/artem.{bash,fish} \ diff --git a/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix b/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix index 5afd0f1d876f..50a10310546d 100644 --- a/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix +++ b/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_22 }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_25 }: stdenv.mkDerivation rec { pname = "blockbench-electron"; - version = "4.5.2"; + version = "4.8.1"; src = fetchurl { url = "https://github.com/JannisX11/blockbench/releases/download/v${version}/Blockbench_${version}.AppImage"; - sha256 = "sha256-uUgVBdYMCF31+L/FV4ADIpUdEAmnW59KfscQxUStPWM="; + sha256 = "sha256-CE2wDOt1WBcYmPs4sEyZ3LYvKLequFZH0B3huMYHlwA="; name = "${pname}-${version}.AppImage"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_22}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_25}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" ''; diff --git a/nixpkgs/pkgs/applications/graphics/flaca/Cargo.lock b/nixpkgs/pkgs/applications/graphics/flaca/Cargo.lock index 459059ea20ad..af1e061d3caa 100644 --- a/nixpkgs/pkgs/applications/graphics/flaca/Cargo.lock +++ b/nixpkgs/pkgs/applications/graphics/flaca/Cargo.lock @@ -38,6 +38,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] name = "bitvec" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -69,11 +75,12 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -152,9 +159,9 @@ dependencies = [ [[package]] name = "dactyl" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee53db074fe946dcfb43408f19964425827d2967f74c5f4509c48a91bd2899f" +checksum = "72f762271c6826d426c3fd2e37aa827fa039596bc7050e9289cb713265be3d7f" dependencies = [ "num-traits", ] @@ -177,15 +184,15 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -204,12 +211,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "fdeflate" @@ -222,7 +226,7 @@ dependencies = [ [[package]] name = "flaca" -version = "2.2.1" +version = "2.2.2" dependencies = [ "argyle", "cc", @@ -239,9 +243,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -255,9 +259,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "fyi_msg" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34a6cc16a2874d6da616ed0766edc29ed01f51ed4121f6d8c723d622433f4298" +checksum = "64175e76ad270dcde1566c16eb7d0f6cc2cbb575e5721dbd899e7f3a86b92718" dependencies = [ "ahash", "bytecount", @@ -274,24 +278,15 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -312,26 +307,6 @@ dependencies = [ ] [[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys", -] - -[[package]] name = "itertools" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -351,9 +326,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libdeflate-sys" @@ -375,15 +350,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memoffset" @@ -431,7 +406,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "static_assertions", @@ -460,20 +435,20 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] @@ -503,11 +478,11 @@ dependencies = [ [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", @@ -548,7 +523,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -577,13 +552,12 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.20" +version = "0.38.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys", @@ -591,21 +565,21 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "static_assertions" @@ -621,11 +595,10 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "autocfg", "cfg-if", "fastrand", "redox_syscall", @@ -688,9 +661,9 @@ dependencies = [ [[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", "windows_aarch64_msvc", @@ -703,51 +676,51 @@ 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 = "write_atomic" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12c8ddcf39a6adf57b643d28dd93e9e04c9f3df6af8aaf924c4c4622172cc103" +checksum = "e0ccffd0975630df843ef6124fdfb5032f86b6110d4913b7c85cab7d597dd49f" dependencies = [ "rustix", "tempfile", diff --git a/nixpkgs/pkgs/applications/graphics/flaca/default.nix b/nixpkgs/pkgs/applications/graphics/flaca/default.nix index 039ddcfecc31..0fcb0f7d21d1 100644 --- a/nixpkgs/pkgs/applications/graphics/flaca/default.nix +++ b/nixpkgs/pkgs/applications/graphics/flaca/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "flaca"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "Blobfolio"; repo = pname; rev = "v${version}"; - hash = "sha256-RXMqPpQM2h6EtIIH8Ix31euC7zK3v2QohZqouNlK7rM="; + hash = "sha256-YLJ8jeJhpxmSfF0PObd7FSFdVbEVhHYIaUJusAIEIx4="; }; # upstream does not provide a Cargo.lock diff --git a/nixpkgs/pkgs/applications/graphics/hugin/default.nix b/nixpkgs/pkgs/applications/graphics/hugin/default.nix index d5feb67f4b15..29535438ec7e 100644 --- a/nixpkgs/pkgs/applications/graphics/hugin/default.nix +++ b/nixpkgs/pkgs/applications/graphics/hugin/default.nix @@ -2,6 +2,7 @@ , stdenv , cmake , fetchurl +, fetchpatch , gnumake , makeWrapper , pkg-config @@ -41,9 +42,17 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; - sha256 = "sha256-l8hWKgupp0PguVWkPf3gSLHGDNnl8u4rad4agWRuBac="; + hash = "sha256-l8hWKgupp0PguVWkPf3gSLHGDNnl8u4rad4agWRuBac="; }; + patches = [ + (fetchpatch { + name = "hugin-2022.0.0-exiv2-0.28.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch?id=d18335caa756f5e5c1478d5fe3ba17f011a78c80"; + hash = "sha256-Y+79bFb926GW5oLOL0e5y7kLhqU/vZcry+kLL4H2fUE="; + }) + ]; + buildInputs = [ boost cairo diff --git a/nixpkgs/pkgs/applications/graphics/komikku/default.nix b/nixpkgs/pkgs/applications/graphics/komikku/default.nix index 48ef9fc8c010..eb37adba6b42 100644 --- a/nixpkgs/pkgs/applications/graphics/komikku/default.nix +++ b/nixpkgs/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.22.0"; + version = "1.23.0"; format = "other"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-6Pqa3qNnH8WF/GK4CLyEmLoPm4A6Q3Gri2x0whf6WTY="; + hash = "sha256-duWAOod2co62NJ5Jk+7eWTf2LcfV5ZbFw0BhrbdGdUY="; }; nativeBuildInputs = [ @@ -87,6 +87,7 @@ python3.pkgs.buildPythonApplication rec { description = "Manga reader for GNOME"; homepage = "https://valos.gitlab.io/Komikku/"; license = licenses.gpl3Plus; + changelog = "https://gitlab.com/valos/Komikku/-/releases/v${version}"; maintainers = with maintainers; [ chuangzhu infinitivewitch ]; }; } diff --git a/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix b/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix index 97d889c285c6..257878d20f63 100644 --- a/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "luminance-hdr"; - version = "2.6.0"; + version = "2.6.1.1"; src = fetchFromGitHub { owner = "LuminanceHDR"; repo = "LuminanceHDR"; rev = "v.${version}"; - sha256 = "1izmgjjp8mgyxv57sjjr05z7g7059ykb5wchlcn4wrnnb6aslnvn"; + sha256 = "sha256-PWqtYGx8drfMVp7D7MzN1sIUTQ+Xz5yyeHN87p2r6PY="; }; env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; diff --git a/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix b/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix index 34a9bcd161c6..3cb4b001124f 100644 --- a/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix +++ b/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libpng, zlib, nasm }: stdenv.mkDerivation rec { - version = "4.1.3"; + version = "4.1.4"; pname = "mozjpeg"; src = fetchFromGitHub { owner = "mozilla"; repo = "mozjpeg"; rev = "v${version}"; - sha256 = "sha256-KbePLQu/BfPCZ4edTyo5NbFvvwd0h8ZfaLE25CDJjmw="; + sha256 = "sha256-F9W7tWfcNP2UNuwMbYiSvS8BnFq4ob//b8AXXrRjVuA="; }; cmakeFlags = [ "-DENABLE_STATIC=NO" "-DPNG_SUPPORTED=TRUE" ]; # See https://github.com/mozilla/mozjpeg/issues/351 diff --git a/nixpkgs/pkgs/applications/graphics/mypaint/default.nix b/nixpkgs/pkgs/applications/graphics/mypaint/default.nix index 48cc00d008e9..6381c399315f 100644 --- a/nixpkgs/pkgs/applications/graphics/mypaint/default.nix +++ b/nixpkgs/pkgs/applications/graphics/mypaint/default.nix @@ -29,7 +29,7 @@ in buildPythonApplication rec { owner = "mypaint"; repo = "mypaint"; rev = "v${version}"; - sha256 = "rVKcxzWZRLcuxK8xRyRgvitXAh4uOEyqHswLeTdA2Mk="; + hash = "sha256-rVKcxzWZRLcuxK8xRyRgvitXAh4uOEyqHswLeTdA2Mk="; fetchSubmodules = true; }; @@ -38,7 +38,13 @@ in buildPythonApplication rec { # https://github.com/mypaint/mypaint/pull/1183 (fetchpatch { url = "https://github.com/mypaint/mypaint/commit/423950bec96d6057eac70442de577364d784a847.patch"; - sha256 = "OxJJOi20bFMRibL59zx6svtMrkgeMYyEvbdSXbZHqpc="; + hash = "sha256-OxJJOi20bFMRibL59zx6svtMrkgeMYyEvbdSXbZHqpc="; + }) + # https://github.com/mypaint/mypaint/pull/1193 + (fetchpatch { + name = "python-3.11-compatibility.patch"; + url = "https://github.com/mypaint/mypaint/commit/032a155b72f2b021f66a994050d83f07342d04af.patch"; + hash = "sha256-EI4WJbpZrCtFMKd6QdXlWpRpIHi37gJffDjclzTLaLc="; }) ]; diff --git a/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix b/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix index 9c81314daf1a..eb1d89a0083f 100644 --- a/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4crBl0aQFsSB1D3iuAVcwcet8KSUB3/tUi1kD1VmpAI="; + sha256 = "sha256-dEAlOKjNXL7zqlll6lqGmbopjdplDR3ewMMNu9TMsmw="; }; - vendorHash = "sha256-qFupm0ymDw9neAu6Xl3fQ/mMWn9f40Vdf7uOLOBkcaE="; + vendorHash = "sha256-WZsm2wiKedMP0miwnzhnSrF7Qw+jqd8dnpcehlsdMCA="; # No tests doCheck = false; diff --git a/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix b/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix index 131dd4457d58..8d376730a90b 100644 --- a/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -9,15 +9,15 @@ , cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pineapple-pictures"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; - rev = version; - hash = "sha256-6peNZc+rrQrUFSrn1AK8lZsy4RQf9DwpmXY0McfEus8="; + rev = finalAttrs.version; + hash = "sha256-dD0pHqw1Gxp+yxzYdm2ZgxiHKyuJKBGYpjv99B1Da1g="; }; nativeBuildInputs = [ @@ -36,12 +36,12 @@ stdenv.mkDerivation rec { "-DPREFER_QT_5=OFF" ]; - meta = with lib; { + meta = { description = "Homebrew lightweight image viewer"; homepage = "https://github.com/BLumia/pineapple-pictures"; - license = licenses.mit; - platforms = platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; mainProgram = "ppic"; - maintainers = with maintainers; [ rewine ]; + maintainers = with lib.maintainers; [ rewine ]; }; -} +}) diff --git a/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix b/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix index 1b0b2a1516f0..1c2dd7c95c37 100644 --- a/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix +++ b/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , python3 , qt5 +, stdenv , installShellFiles }: @@ -18,7 +19,9 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles qt5.wrapQtAppsHook python3.pkgs.setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ pyqt5 py3exiv2 qt5.qtsvg ]; + propagatedBuildInputs = with python3.pkgs; [ pyqt5 py3exiv2 ]; + + buildInputs = [ qt5.qtsvg ] ++ lib.optionals stdenv.isLinux [ qt5.qtwayland ]; postInstall = '' install -Dm644 misc/vimiv.desktop $out/share/applications/vimiv.desktop @@ -35,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { # Vimiv has to be wrapped manually because it is a non-ELF executable. dontWrapQtApps = true; preFixup = '' - wrapQtApp $out/bin/vimiv + wrapQtApp $out/bin/vimiv ''; meta = with lib; { @@ -43,6 +46,7 @@ python3.pkgs.buildPythonApplication rec { license = licenses.gpl3Plus; homepage = "https://github.com/karlch/vimiv-qt"; maintainers = with maintainers; [ dschrempf ]; + mainProgram = "vimiv"; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix b/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix index cd3b73b6b482..fbc99ad20852 100644 --- a/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix +++ b/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0xsNfnKdGl34qeN0KZbII9w6PzC1HvvO7mtlNlRvUqQ="; + sha256 = "sha256-dnFNGWPpK/eoW4Ib1E5w/kPy5okPxAja1v4rf0KpVKM="; }; nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/kde/akonadi-calendar.nix b/nixpkgs/pkgs/applications/kde/akonadi-calendar.nix index 95ee121b59f1..c149ac905dd8 100644 --- a/nixpkgs/pkgs/applications/kde/akonadi-calendar.nix +++ b/nixpkgs/pkgs/applications/kde/akonadi-calendar.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-contacts, kcalendarcore, kcalutils, kcontacts, - kidentitymanagement, kio, kmailtransport, + kidentitymanagement, kio, kmailtransport, messagelib }: mkDerivation { @@ -14,7 +14,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ akonadi akonadi-contacts kcalendarcore kcalutils kcontacts kidentitymanagement - kio kmailtransport + kio kmailtransport messagelib ]; outputs = [ "out" "dev" ]; postInstall = '' diff --git a/nixpkgs/pkgs/applications/kde/angelfish.nix b/nixpkgs/pkgs/applications/kde/angelfish.nix index f5fa9f66412b..7e187fe5c3fd 100644 --- a/nixpkgs/pkgs/applications/kde/angelfish.nix +++ b/nixpkgs/pkgs/applications/kde/angelfish.nix @@ -4,6 +4,7 @@ , cmake , corrosion , extra-cmake-modules +, futuresql , kconfig , kcoreaddons , kdbusaddons @@ -13,6 +14,7 @@ , knotifications , kpurpose , kwindowsystem +, qcoro , qtfeedback , qtquickcontrols2 , qqc2-desktop-style @@ -22,7 +24,7 @@ , srcs # provided as callPackage input to enable easier overrides through overlays -, cargoSha256 ? "sha256-Wthw7foadXO6jYJO1TB4OOYtpwnp8iCdda4tdiYg41A=" +, cargoSha256 ? "sha256-FI94TU3MgIl1tcjwJnzb2PKO1rbZ3uRB1mzXXkNU95I=" }: mkDerivation rec { @@ -45,6 +47,7 @@ mkDerivation rec { ]; buildInputs = [ + futuresql kconfig kcoreaddons kdbusaddons @@ -54,6 +57,7 @@ mkDerivation rec { knotifications kpurpose kwindowsystem + qcoro qtfeedback qtquickcontrols2 qqc2-desktop-style diff --git a/nixpkgs/pkgs/applications/misc/arianna/default.nix b/nixpkgs/pkgs/applications/kde/arianna.nix index d8faf1e9a292..e1a099800380 100644 --- a/nixpkgs/pkgs/applications/misc/arianna/default.nix +++ b/nixpkgs/pkgs/applications/kde/arianna.nix @@ -1,51 +1,52 @@ { lib , mkDerivation -, fetchurl , cmake , extra-cmake-modules -, pkg-config +, qtbase +, qtdeclarative +, qtquickcontrols2 +, qtwebchannel +, qtwebengine +, qtwebsockets , baloo +, karchive +, kconfig +, kcoreaddons +, kdbusaddons , kfilemetadata -, kirigami2 +, ki18n , kirigami-addons -, kitemmodels , kquickcharts -, plasma-framework +, kwindowsystem , qqc2-desktop-style -, qtbase -, qtquickcontrols2 -, qtwebsockets -, qtwebengine }: -mkDerivation rec { +mkDerivation { pname = "arianna"; - version = "1.1.0"; - - src = fetchurl { - url = "mirror://kde/stable/arianna/arianna-${version}.tar.xz"; - hash = "sha256-C60PujiUTyw2DwImu8PVmU687CP9CuWZ+d8LuZKthKY="; - }; nativeBuildInputs = [ cmake extra-cmake-modules - pkg-config ]; buildInputs = [ + qtbase + qtdeclarative + qtquickcontrols2 + qtwebchannel + qtwebengine + qtwebsockets baloo + karchive + kconfig + kcoreaddons + kdbusaddons kfilemetadata - kirigami2 + ki18n kirigami-addons - kitemmodels kquickcharts - plasma-framework + kwindowsystem qqc2-desktop-style - qtbase - qtquickcontrols2 - qtwebsockets - qtwebengine ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/kde/audiotube.nix b/nixpkgs/pkgs/applications/kde/audiotube.nix index 0bd22ee06f63..ca36d51ac3c9 100644 --- a/nixpkgs/pkgs/applications/kde/audiotube.nix +++ b/nixpkgs/pkgs/applications/kde/audiotube.nix @@ -4,12 +4,14 @@ , extra-cmake-modules , wrapGAppsHook +, futuresql , gst_all_1 , kcoreaddons , kcrash , ki18n , kirigami2 , kirigami-addons +, qcoro , qtimageformats , qtmultimedia , qtquickcontrols2 @@ -27,11 +29,13 @@ mkDerivation rec { ]; buildInputs = [ + futuresql kcoreaddons kcrash ki18n kirigami2 kirigami-addons + qcoro qtimageformats qtmultimedia qtquickcontrols2 diff --git a/nixpkgs/pkgs/applications/kde/cantor.nix b/nixpkgs/pkgs/applications/kde/cantor.nix index 1c9a9f718a76..0acfa430eaa7 100644 --- a/nixpkgs/pkgs/applications/kde/cantor.nix +++ b/nixpkgs/pkgs/applications/kde/cantor.nix @@ -93,12 +93,7 @@ mkDerivation { qtWrapperArgs = [ "--prefix PATH : ${placeholder "out"}/bin" - ]; - - postInstall = lib.optionalString withSage '' - wrapProgram $out/share/cantor/sagebackend/cantor-execsage \ - --prefix PATH : ${sage-with-env}/bin - ''; + ] ++ lib.optional withSage "--prefix PATH : ${sage-with-env}/bin"; meta = with lib; { description = "Front end to powerful mathematics and statistics packages"; diff --git a/nixpkgs/pkgs/applications/kde/colord-kde.nix b/nixpkgs/pkgs/applications/kde/colord-kde.nix index 07f34c84d6f1..7b3c783995c6 100644 --- a/nixpkgs/pkgs/applications/kde/colord-kde.nix +++ b/nixpkgs/pkgs/applications/kde/colord-kde.nix @@ -1,8 +1,8 @@ { mkDerivation, lib , extra-cmake-modules, ki18n -, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils -, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem -, kitemmodels, kitemviews, lcms2, libXrandr, qtx11extras +, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kirigami-addons +, kcmutils, kio, knotifications, plasma-framework, kwidgetsaddons +, kwindowsystem, kitemmodels, kitemviews, lcms2, libXrandr, qtx11extras }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes + kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes kirigami-addons kcmutils ki18n kio knotifications plasma-framework kwidgetsaddons kwindowsystem kitemmodels kitemviews lcms2 libXrandr qtx11extras ]; diff --git a/nixpkgs/pkgs/applications/kde/default.nix b/nixpkgs/pkgs/applications/kde/default.nix index f6988f9831df..e61e99751d0d 100644 --- a/nixpkgs/pkgs/applications/kde/default.nix +++ b/nixpkgs/pkgs/applications/kde/default.nix @@ -73,6 +73,7 @@ let akonadiconsole = callPackage ./akonadiconsole.nix {}; akregator = callPackage ./akregator.nix {}; analitza = callPackage ./analitza.nix {}; + arianna = callPackage ./arianna.nix {}; ark = callPackage ./ark {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; bomber = callPackage ./bomber.nix {}; @@ -99,7 +100,7 @@ let kaccounts-providers = callPackage ./kaccounts-providers.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; - kalendar = callPackage ./kalendar.nix {}; + merkuro = callPackage ./merkuro.nix {}; kalzium = callPackage ./kalzium.nix {}; kamoso = callPackage ./kamoso.nix {}; kapman = callPackage ./kapman.nix {}; @@ -134,7 +135,6 @@ let kdiamond = callPackage ./kdiamond.nix {}; keditbookmarks = callPackage ./keditbookmarks.nix {}; kfind = callPackage ./kfind.nix {}; - kfloppy = callPackage ./kfloppy.nix {}; kgeography = callPackage ./kgeography.nix {}; kget = callPackage ./kget.nix {}; kgpg = callPackage ./kgpg.nix {}; diff --git a/nixpkgs/pkgs/applications/kde/fetch.sh b/nixpkgs/pkgs/applications/kde/fetch.sh index 0acdb529fc38..393a3a440d26 100644 --- a/nixpkgs/pkgs/applications/kde/fetch.sh +++ b/nixpkgs/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.3/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.0/src -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/applications/kde/kdenlive/default.nix b/nixpkgs/pkgs/applications/kde/kdenlive/default.nix index 885b1c1d8cc4..bcd8ba360a82 100644 --- a/nixpkgs/pkgs/applications/kde/kdenlive/default.nix +++ b/nixpkgs/pkgs/applications/kde/kdenlive/default.nix @@ -17,6 +17,7 @@ , knotifyconfig , kplotting , ktextwidgets +, mediainfo , mlt , shared-mime-info , libv4l @@ -58,6 +59,7 @@ mkDerivation { knotifyconfig kplotting ktextwidgets + mediainfo mlt phonon-backend-gstreamer qtdeclarative @@ -77,9 +79,11 @@ mkDerivation { # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it # doesn't find them. See: # https://github.com/NixOS/nixpkgs/issues/83885 - patches = [ ./mlt-path.patch ./ffmpeg-path.patch ]; - inherit mlt; + patches = [ ./dependency-paths.patch ]; + + inherit mlt mediainfo; ffmpeg = ffmpeg-full; + postPatch = # Module Qt5::Concurrent must be included in `find_package` before it is used. '' diff --git a/nixpkgs/pkgs/applications/kde/kdenlive/dependency-paths.patch b/nixpkgs/pkgs/applications/kde/kdenlive/dependency-paths.patch new file mode 100644 index 000000000000..ba3f7e6c8de9 --- /dev/null +++ b/nixpkgs/pkgs/applications/kde/kdenlive/dependency-paths.patch @@ -0,0 +1,46 @@ +diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg +index 029849e5f..8befe4888 100644 +--- a/src/kdenlivesettings.kcfg ++++ b/src/kdenlivesettings.kcfg +@@ -517,7 +517,7 @@ + <group name="env"> + <entry name="mltpath" type="Path"> + <label>Mlt framework install path.</label> +- <default></default> ++ <default>@mlt@/share/mlt/profiles</default> + </entry> + + <entry name="kdenliverendererpath" type="Path"> +@@ -527,27 +527,27 @@ + + <entry name="meltpath" type="Path"> + <label>Mlt melt renderer install path.</label> +- <default></default> ++ <default>@mlt@/bin/melt</default> + </entry> + + <entry name="ffmpegpath" type="Path"> + <label>FFmpeg / Libav binary path.</label> +- <default></default> ++ <default>@ffmpeg@/bin/ffmpeg</default> + </entry> + + <entry name="ffplaypath" type="Path"> + <label>FFplay / avplay binary path.</label> +- <default></default> ++ <default>@ffmpeg@/bin/ffplay</default> + </entry> + + <entry name="ffprobepath" type="Path"> + <label>FFprobe / avprobe binary path.</label> +- <default></default> ++ <default>@ffmpeg@/bin/ffprobe</default> + </entry> + + <entry name="mediainfopath" type="Path"> + <label>mediaInfo binary path.</label> +- <default></default> ++ <default>@mediainfo@/bin/mediainfo</default> + </entry> + + <entry name="processingthreads" type="Int"> diff --git a/nixpkgs/pkgs/applications/kde/kdenlive/ffmpeg-path.patch b/nixpkgs/pkgs/applications/kde/kdenlive/ffmpeg-path.patch deleted file mode 100644 index a0cef882f596..000000000000 --- a/nixpkgs/pkgs/applications/kde/kdenlive/ffmpeg-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg -index 5edad5ae7..d35347a40 100644 ---- a/src/kdenlivesettings.kcfg -+++ b/src/kdenlivesettings.kcfg -@@ -403,17 +403,17 @@ - - <entry name="ffmpegpath" type="Path"> - <label>FFmpeg / Libav binary path.</label> -- <default></default> -+ <default>@ffmpeg@/bin/ffmpeg</default> - </entry> - - <entry name="ffplaypath" type="Path"> - <label>FFplay / avplay binary path.</label> -- <default></default> -+ <default>@ffmpeg@/bin/ffplay</default> - </entry> - - <entry name="ffprobepath" type="Path"> - <label>FFprobe / avprobe binary path.</label> -- <default></default> -+ <default>@ffmpeg@/bin/ffprobe</default> - </entry> - - <entry name="mltthreads" type="Int"> diff --git a/nixpkgs/pkgs/applications/kde/kdenlive/mlt-path.patch b/nixpkgs/pkgs/applications/kde/kdenlive/mlt-path.patch deleted file mode 100644 index 9bfb66c1a839..000000000000 --- a/nixpkgs/pkgs/applications/kde/kdenlive/mlt-path.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ruN old/src/kdenlivesettings.kcfg new/src/kdenlivesettings.kcfg ---- old/src/kdenlivesettings.kcfg 2019-09-10 23:20:27.555392353 -0400 -+++ new/src/kdenlivesettings.kcfg 2019-09-10 23:25:47.533964155 -0400 -@@ -378,14 +378,14 @@ - </group> - - <group name="env"> -- <entry name="mltpath" type="Path"> -+ <entry name="mltpath" type="Path" hidden="true"> - <label>Mlt framework install path.</label> -- <default></default> -+ <default>@mlt@/share/mlt/profiles</default> - </entry> - -- <entry name="rendererpath" type="Path"> -+ <entry name="rendererpath" type="Path" hidden="true"> - <label>Mlt melt renderer install path.</label> -- <default></default> -+ <default>@mlt@/bin/melt</default> - </entry> - - <entry name="ffmpegpath" type="Path"> diff --git a/nixpkgs/pkgs/applications/kde/kfloppy.nix b/nixpkgs/pkgs/applications/kde/kfloppy.nix deleted file mode 100644 index a88fd9283e06..000000000000 --- a/nixpkgs/pkgs/applications/kde/kfloppy.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcompletion, kxmlgui }: - -mkDerivation { - pname = "kfloppy"; - meta = with lib; { - homepage = "https://kde.org/applications/en/utilities/org.kde.kfloppy"; - description = "Utility to format 3.5\" and 5.25\" floppy disks"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kdoctools - kcompletion - kxmlgui - ]; -} diff --git a/nixpkgs/pkgs/applications/kde/kalendar.nix b/nixpkgs/pkgs/applications/kde/merkuro.nix index 30303cc497b2..b8d3107eb614 100644 --- a/nixpkgs/pkgs/applications/kde/kalendar.nix +++ b/nixpkgs/pkgs/applications/kde/merkuro.nix @@ -41,8 +41,8 @@ , messagelib }: -mkDerivation rec { - pname = "kalendar"; +mkDerivation { + pname = "merkuro"; nativeBuildInputs = [ cmake @@ -89,14 +89,11 @@ mkDerivation rec { ]; propagatedUserEnvPkgs = [ akonadi kdepim-runtime akonadi-search ]; - postFixup = '' - wrapProgram "$out/bin/kalendar" \ - --prefix PATH : "${lib.makeBinPath [ akonadi kdepim-runtime akonadi-search ]}" - ''; + qtWrapperArgs = [''--prefix PATH : "${lib.makeBinPath [ akonadi kdepim-runtime akonadi-search ]}"'']; meta = with lib; { description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)"; - homepage = "https://apps.kde.org/kalendar/"; + homepage = "https://invent.kde.org/pim/merkuro"; license = licenses.gpl3Plus; maintainers = with maintainers; [ Thra11 ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/kde/neochat.nix b/nixpkgs/pkgs/applications/kde/neochat.nix index 0b9f3c57f610..4df33add6795 100644 --- a/nixpkgs/pkgs/applications/kde/neochat.nix +++ b/nixpkgs/pkgs/applications/kde/neochat.nix @@ -1,6 +1,5 @@ { mkDerivation , lib -, fetchpatch , cmake , extra-cmake-modules @@ -33,14 +32,6 @@ mkDerivation { pname = "neochat"; - patches = [ - (fetchpatch { - name = "libquotient-0.8.patch"; - url = "https://invent.kde.org/network/neochat/-/commit/d9d5e17be2a2057ab2ee545561fab721cb211f7f.patch"; - hash = "sha256-y1PEehFCW+69OH8YvL3SUGOb8Hhyf8xwRvSZzJ5J5Wc="; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/nixpkgs/pkgs/applications/kde/skanpage.nix b/nixpkgs/pkgs/applications/kde/skanpage.nix index d06ff7746bb9..fc16723ce4de 100644 --- a/nixpkgs/pkgs/applications/kde/skanpage.nix +++ b/nixpkgs/pkgs/applications/kde/skanpage.nix @@ -1,15 +1,15 @@ { lib , mkDerivation -, fetchurl , extra-cmake-modules , kirigami2 , ktextwidgets , libksane , qtquickcontrols2 , kpurpose +, kquickimageedit }: -mkDerivation rec { +mkDerivation { pname = "skanpage"; nativeBuildInputs = [ extra-cmake-modules ]; @@ -20,13 +20,13 @@ mkDerivation rec { libksane qtquickcontrols2 kpurpose + kquickimageedit ]; meta = with lib; { description = "KDE utility to scan images and multi-page documents"; homepage = "https://apps.kde.org/skanpage"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/kde/spectacle.nix b/nixpkgs/pkgs/applications/kde/spectacle.nix index 7e9c80cd64ab..8505e34920df 100644 --- a/nixpkgs/pkgs/applications/kde/spectacle.nix +++ b/nixpkgs/pkgs/applications/kde/spectacle.nix @@ -5,21 +5,12 @@ , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi , qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator , qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire -, wrapGAppsHook, fetchpatch +, wrapGAppsHook }: mkDerivation { pname = "spectacle"; - patches = [ - # backport fix for region capture with multi-display high-dpi setups - # FIXME: remove in 23.08 - (fetchpatch { - url = "https://invent.kde.org/graphics/spectacle/-/commit/d0886c85445fad227b256152a549cb33bd97b776.patch"; - hash = "sha256-t0+X1pzjlS2OWduMwQBoYbjh+o/SF4hOkAqzz/MJw3E="; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications diff --git a/nixpkgs/pkgs/applications/kde/srcs.nix b/nixpkgs/pkgs/applications/kde/srcs.nix index 32de119a7b14..26f1ceb121f5 100644 --- a/nixpkgs/pkgs/applications/kde/srcs.nix +++ b/nixpkgs/pkgs/applications/kde/srcs.nix @@ -1,2054 +1,1958 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/kde +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/kde/fetch.sh { fetchurl, mirror }: { akonadi = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-23.04.3.tar.xz"; - sha256 = "0jpp91d5rlblq6r981wxizmsv512kc43lfk8y29bdky6j4idflrb"; - name = "akonadi-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadi-23.08.0.tar.xz"; + sha256 = "1qv1fwjmqxwwfp4xvrvv60jyy1vvayc9x320jgmr78rp2cizi602"; + name = "akonadi-23.08.0.tar.xz"; }; }; akonadi-calendar = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-calendar-23.04.3.tar.xz"; - sha256 = "166xm57jcy7d2dv2pfy4lllzic4giin31szxz7xq3a7ixsd6g7cs"; - name = "akonadi-calendar-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadi-calendar-23.08.0.tar.xz"; + sha256 = "1a7s5rd2h50i1wxl0fl99139c4alday69j13gdmw87v5swn0lskf"; + name = "akonadi-calendar-23.08.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-calendar-tools-23.04.3.tar.xz"; - sha256 = "1msbvmq664wij1rcivmgw14kpw5x4xz57567xl0q60j584v2wq07"; - name = "akonadi-calendar-tools-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadi-calendar-tools-23.08.0.tar.xz"; + sha256 = "02mjbncx66bw64i0n2kmfk7b3w5ki7b54jhc3wvqlk8bd8rbswx4"; + name = "akonadi-calendar-tools-23.08.0.tar.xz"; }; }; akonadi-contacts = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-contacts-23.04.3.tar.xz"; - sha256 = "10vlzj56ps1pysf7g6i14v8wp2wkxh53055r2v4iq4cpq3mzayc6"; - name = "akonadi-contacts-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadi-contacts-23.08.0.tar.xz"; + sha256 = "01r7h5dxqjq4lzjf5lw52hcli6gapvnixhksj8igl279pm33p4kp"; + name = "akonadi-contacts-23.08.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-import-wizard-23.04.3.tar.xz"; - sha256 = "0dj7cvxnvld2h9nbg6v0bn3p81fx73dgj6kbpginavci52kgk240"; - name = "akonadi-import-wizard-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadi-import-wizard-23.08.0.tar.xz"; + sha256 = "01rsc25vfm4iwiyan27780lim0jiqfrszkkh0a14cg93kmakndsm"; + name = "akonadi-import-wizard-23.08.0.tar.xz"; }; }; akonadi-mime = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-mime-23.04.3.tar.xz"; - sha256 = "1r33v2q49s7l90id4jqg0lar9p1j5k0cbnzsaqdksavzpzkcklh5"; - name = "akonadi-mime-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadi-mime-23.08.0.tar.xz"; + sha256 = "0lbkygq2hrpb2yz5mwchnxzzr09m7lvl4y115bg33yp4iqb1bvwa"; + name = "akonadi-mime-23.08.0.tar.xz"; }; }; akonadi-notes = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-notes-23.04.3.tar.xz"; - sha256 = "0s5a414cdcz37srys2w3c2z5c63ha9ivsqj0srnfwwv0pxix266v"; - name = "akonadi-notes-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadi-notes-23.08.0.tar.xz"; + sha256 = "0gb8pydmh484n7ds6vwb3pblhjbbwip747vflnsf749c21vhqn5c"; + name = "akonadi-notes-23.08.0.tar.xz"; }; }; akonadi-search = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-search-23.04.3.tar.xz"; - sha256 = "1hpclfcb7almvajscm2az36bw9rrhkp3ywb9h0j9h8ims2gm60m7"; - name = "akonadi-search-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadi-search-23.08.0.tar.xz"; + sha256 = "1vvb65a290zarhb7jzga9d0xyg1xpz52ln83ygf95m6awwjprl59"; + name = "akonadi-search-23.08.0.tar.xz"; }; }; akonadiconsole = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadiconsole-23.04.3.tar.xz"; - sha256 = "005wq3rxgi37zb2gg6vawyav473q23q0d6l6pilnzsjw5rc1r3lk"; - name = "akonadiconsole-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadiconsole-23.08.0.tar.xz"; + sha256 = "1af0s3jwn5vgl88rvavqgnzx7mbqxdp3kxraqhhi8h3ngxdf0l6y"; + name = "akonadiconsole-23.08.0.tar.xz"; }; }; akregator = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akregator-23.04.3.tar.xz"; - sha256 = "0g916453zip8i5g61pf8ib68fiqfbmr1i1lhbnwmsv1cryx035w9"; - name = "akregator-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akregator-23.08.0.tar.xz"; + sha256 = "0l6ycd8dygy46s1g0cy5harj4wqll1pklcp8zb3bc751jfcrajr8"; + name = "akregator-23.08.0.tar.xz"; }; }; alligator = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/alligator-23.04.3.tar.xz"; - sha256 = "0xnykm6m4mab9vdlbc0dfik6iizb032n1rcyj6mxkj2q5k0gl8h4"; - name = "alligator-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/alligator-23.08.0.tar.xz"; + sha256 = "014d43ivaql21mz6jxdbyg1j2gccpv2d39cmn55dm08djv22xk1d"; + name = "alligator-23.08.0.tar.xz"; }; }; analitza = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/analitza-23.04.3.tar.xz"; - sha256 = "1lcs0bncn8pl593dh0kki7knwbzyyai5dz3kf2gb7wp4liz48k1m"; - name = "analitza-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/analitza-23.08.0.tar.xz"; + sha256 = "00b2cgksy1whn42li6ky3jdznwkxaa9ndncw1rfydg220db6zi6v"; + name = "analitza-23.08.0.tar.xz"; }; }; angelfish = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/angelfish-23.04.3.tar.xz"; - sha256 = "0pk6rzy0i5sx2yg8pdc36jvamxah7j2czxb0njjycx760pzn61ah"; - name = "angelfish-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/angelfish-23.08.0.tar.xz"; + sha256 = "00xvpi3jba8gxp3hzlm1rb4m3qf1fx2ixz1lyvamkyvm8rp6b9pj"; + name = "angelfish-23.08.0.tar.xz"; + }; + }; + arianna = { + version = "23.08.0"; + src = fetchurl { + url = "${mirror}/stable/release-service/23.08.0/src/arianna-23.08.0.tar.xz"; + sha256 = "1iyzsa10750dyw5l4mhsz11la6i2217kzj7alkz258nai3bj69s4"; + name = "arianna-23.08.0.tar.xz"; }; }; ark = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ark-23.04.3.tar.xz"; - sha256 = "081swq9f87yxg4dxdl5i4hszhr0q4ph402in397zfa5vpyspzy41"; - name = "ark-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ark-23.08.0.tar.xz"; + sha256 = "09i58hzn83g30zln3wgwcjp2k0ygkgabnfq4izhsvgkkm4bgkz21"; + name = "ark-23.08.0.tar.xz"; }; }; artikulate = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/artikulate-23.04.3.tar.xz"; - sha256 = "0klp20clcpdm14wc2r14h6f7zrma34a22cz16mdc5c9k8dmalsz9"; - name = "artikulate-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/artikulate-23.08.0.tar.xz"; + sha256 = "1rwyxg7h4bfmd3mb9ddv818sq78k84clb0kdz4jacs0601vycp89"; + name = "artikulate-23.08.0.tar.xz"; }; }; audiocd-kio = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/audiocd-kio-23.04.3.tar.xz"; - sha256 = "0kl0j5qy54q88cbclwqj0rn8hj3gzjhzk7bimjgw5w0xy3cw6kql"; - name = "audiocd-kio-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/audiocd-kio-23.08.0.tar.xz"; + sha256 = "1kkcny6dqd7a64j60znbadx6s6wa6jriah8a7dggr4kzr9p6fbx2"; + name = "audiocd-kio-23.08.0.tar.xz"; }; }; audiotube = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/audiotube-23.04.3.tar.xz"; - sha256 = "1qbb34qi81j2r2sblgs0qry9diijizlbs12gwg9hmiybrdkk6qh4"; - name = "audiotube-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/audiotube-23.08.0.tar.xz"; + sha256 = "1y06c0qyl1amll2dwjwaffnjag6lz9fypwl20rzwd1k2ivsssv0v"; + name = "audiotube-23.08.0.tar.xz"; }; }; baloo-widgets = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/baloo-widgets-23.04.3.tar.xz"; - sha256 = "01k8kmzr2vgd567v4js080cnyl2i43zh6zz25ml76z77lywlfzz6"; - name = "baloo-widgets-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/baloo-widgets-23.08.0.tar.xz"; + sha256 = "0p6n05v92rb8dnss3zx08xqhadg8vf2cd0n80xq169flvvf6syzl"; + name = "baloo-widgets-23.08.0.tar.xz"; }; }; blinken = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/blinken-23.04.3.tar.xz"; - sha256 = "1bxw0bp6cj93gcwcb19ansz6xz4y53rah2pa6kq18xzafkrzrihm"; - name = "blinken-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/blinken-23.08.0.tar.xz"; + sha256 = "1wlyybv1x2qcffiq0hx9pcsc8zc4iiswa8390apcr415shrfd334"; + name = "blinken-23.08.0.tar.xz"; }; }; bomber = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/bomber-23.04.3.tar.xz"; - sha256 = "0qgixhmlkcjni5i9391hjg3sfc3ps24lmk9v8199lmnplrybklqj"; - name = "bomber-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/bomber-23.08.0.tar.xz"; + sha256 = "19n0n4m4jr9x5jf35w5ylhh2ip7ax3vymjsma868z27kidpkssc2"; + name = "bomber-23.08.0.tar.xz"; }; }; bovo = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/bovo-23.04.3.tar.xz"; - sha256 = "1zds6d4rmcf4sa2sfhyp1i5n7s7cgslikvbra4pz2kpi0hmvihi1"; - name = "bovo-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/bovo-23.08.0.tar.xz"; + sha256 = "01glqz3qfd4mpq6wmhqwr0gx2dxbgzsi9jwfqvzwp3ch3snpri38"; + name = "bovo-23.08.0.tar.xz"; }; }; calendarsupport = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/calendarsupport-23.04.3.tar.xz"; - sha256 = "1zk6kv5nhcd7a5llzh31890xpqdg522ahjdgbwsm7pcp62y0nbsj"; - name = "calendarsupport-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/calendarsupport-23.08.0.tar.xz"; + sha256 = "0cqjmq1v9g87z0qmjwk5k32i0kg2dzr1dsvpyhkgr022gd02qxdr"; + name = "calendarsupport-23.08.0.tar.xz"; }; }; calindori = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/calindori-23.04.3.tar.xz"; - sha256 = "1vadyrpf0f6mkgplwpfyn8z13fj7ny2zac85583czhnjci3aqvdd"; - name = "calindori-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/calindori-23.08.0.tar.xz"; + sha256 = "17dzlgs3n5404iaq6c6ghyvh8pp0myxmjzwwqk9l0k10wq8zr3df"; + name = "calindori-23.08.0.tar.xz"; }; }; cantor = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/cantor-23.04.3.tar.xz"; - sha256 = "0c1drzkvmk4ifxzhch8qz5la14nbv7q0scx0vldp9k78ldgliwlw"; - name = "cantor-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/cantor-23.08.0.tar.xz"; + sha256 = "04yzh8i61nj0s1qpiry0qhjpjj5z1qqv6vpslyw365sx737mklz5"; + name = "cantor-23.08.0.tar.xz"; }; }; cervisia = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/cervisia-23.04.3.tar.xz"; - sha256 = "18dc0441lq87cz9xwwph5vqbqkhq291r3dpkik8894rkxsmkja1c"; - name = "cervisia-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/cervisia-23.08.0.tar.xz"; + sha256 = "0qiv9klnkrxf5vrcjxz4b29hyi52w1dgb1fvw22p0sqpkc8gph68"; + name = "cervisia-23.08.0.tar.xz"; }; }; colord-kde = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/colord-kde-23.04.3.tar.xz"; - sha256 = "19hnmlwmms1jlk6b7z88fsibf80sl462wgx1gin8czp0f7v5pkz0"; - name = "colord-kde-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/colord-kde-23.08.0.tar.xz"; + sha256 = "0nz76ikygvwvjjjx3sc3abq2aafq8fr5hhfb7gmcjpcz6w8vgw7z"; + name = "colord-kde-23.08.0.tar.xz"; }; }; dolphin = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/dolphin-23.04.3.tar.xz"; - sha256 = "0bys24i2a3a65ahq5p3q1zr2px8jqip1gjn5m7rngq4hcddb1ji8"; - name = "dolphin-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/dolphin-23.08.0.tar.xz"; + sha256 = "1pjrzzj0hrzsmlzxxhl5clph1m2pdba805q38rrjzin0hgpg7c2a"; + name = "dolphin-23.08.0.tar.xz"; }; }; dolphin-plugins = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/dolphin-plugins-23.04.3.tar.xz"; - sha256 = "0h1b559icj5g3xrx5697a9rncpdcmsjg774c6m36ild56bwc048v"; - name = "dolphin-plugins-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/dolphin-plugins-23.08.0.tar.xz"; + sha256 = "1piz4jqxz2smn3fkyaqg48jbk76s4vsrgnhskvib515cfr4hhhy4"; + name = "dolphin-plugins-23.08.0.tar.xz"; }; }; dragon = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/dragon-23.04.3.tar.xz"; - sha256 = "0mliddp0nyxz91wzy8md0p0i45mlhffip4zqjl4db55x4p6wh4y8"; - name = "dragon-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/dragon-23.08.0.tar.xz"; + sha256 = "185rwi0l49spnbrzcafv4z90zj10c38r5li53aba3pqsk6ff6n0p"; + name = "dragon-23.08.0.tar.xz"; }; }; elisa = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/elisa-23.04.3.tar.xz"; - sha256 = "1ry4mhj7wc31xq9fip3amv8fj631m213zz0qg44h68q77sik4422"; - name = "elisa-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/elisa-23.08.0.tar.xz"; + sha256 = "19kdchfcw3pvcyaib2fac46zsfa6gnj2sw5wjm7wwbks5af7kck4"; + name = "elisa-23.08.0.tar.xz"; }; }; eventviews = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/eventviews-23.04.3.tar.xz"; - sha256 = "1nh8a7jy0sjsyi41pxhxwjkq6fr4yy9rqgcjjbj01dnx1ykz3d7l"; - name = "eventviews-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/eventviews-23.08.0.tar.xz"; + sha256 = "0ghilcv9m8q2k0myc6l14nz5rg1nkvp2aypb58lma6fi8x8111b2"; + name = "eventviews-23.08.0.tar.xz"; }; }; falkon = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/falkon-23.04.3.tar.xz"; - sha256 = "11r1iwimdzabfah68gsvw6xi67cj539anqa6s1rg33agsi5y56d3"; - name = "falkon-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/falkon-23.08.0.tar.xz"; + sha256 = "0wg5n53si1ybajzh5nnsfx9z9dkhrzl05l1q19004m62z3l8d9b2"; + name = "falkon-23.08.0.tar.xz"; }; }; ffmpegthumbs = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ffmpegthumbs-23.04.3.tar.xz"; - sha256 = "02wvhjqqird55xcs4kkj0s7nam4vqh3khjz5f1mjqfnk62sj1plx"; - name = "ffmpegthumbs-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ffmpegthumbs-23.08.0.tar.xz"; + sha256 = "1vdywm5r21ag287xihhzzrybni9p3kcy45d0a1nn65ll2285mqnh"; + name = "ffmpegthumbs-23.08.0.tar.xz"; }; }; filelight = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/filelight-23.04.3.tar.xz"; - sha256 = "1mwl1dkknvqw9hd5jsh4cdx1zd8f6rxca0vyq01wrx44q9p6dn1n"; - name = "filelight-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/filelight-23.08.0.tar.xz"; + sha256 = "1qknny5jivzm9ac7r4z957hprnj1qq08ghi42l395lmqfpwwy5ic"; + name = "filelight-23.08.0.tar.xz"; }; }; ghostwriter = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ghostwriter-23.04.3.tar.xz"; - sha256 = "1q3rhm6jnkbfylifj5km7hiygyib9c3m718kdsmyxas6k6vjx9rp"; - name = "ghostwriter-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ghostwriter-23.08.0.tar.xz"; + sha256 = "1bxcb1dx3xf0lv13wk3qkzq071gwl9p1npmkmdbjx2q6vrrfzxy4"; + name = "ghostwriter-23.08.0.tar.xz"; }; }; granatier = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/granatier-23.04.3.tar.xz"; - sha256 = "1zyadmgnpgsx728gzd55qyijsm13pb9cxs1y4l4c4m9lnz4y183v"; - name = "granatier-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/granatier-23.08.0.tar.xz"; + sha256 = "0hyv3jv0bcmilmd28bhpah0lm0si34n27lmwm4fm80wkcr3n7jwr"; + name = "granatier-23.08.0.tar.xz"; }; }; grantlee-editor = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/grantlee-editor-23.04.3.tar.xz"; - sha256 = "1skv2hki0rck7596ci026bi3kss5fl4zrh3walsh44422yqkbj2a"; - name = "grantlee-editor-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/grantlee-editor-23.08.0.tar.xz"; + sha256 = "0pbdl2n1ym1cksv5j5ifhi10p5hhnmrismrrhq8v9xpw7bpc627b"; + name = "grantlee-editor-23.08.0.tar.xz"; }; }; grantleetheme = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/grantleetheme-23.04.3.tar.xz"; - sha256 = "01kkj3y6xhc792jaxnkglkwvlqx9ckn5yhlfrpqff5hlf5x9vn4w"; - name = "grantleetheme-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/grantleetheme-23.08.0.tar.xz"; + sha256 = "1mq0afzqgid2vkpdskkdbcx1ylfmcrbw4m9gzkfaa7c8ffmlp57s"; + name = "grantleetheme-23.08.0.tar.xz"; }; }; gwenview = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/gwenview-23.04.3.tar.xz"; - sha256 = "0vijsq4174p4asdjq47bzdp2xkfn8hpg7b4dgp3yvapfxwjgp148"; - name = "gwenview-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/gwenview-23.08.0.tar.xz"; + sha256 = "19wa33r1vk45dbnr64l3nlixr5vppypk2h11limvm2ndhwzxwzq2"; + name = "gwenview-23.08.0.tar.xz"; }; }; incidenceeditor = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/incidenceeditor-23.04.3.tar.xz"; - sha256 = "1pqfl7gqz7ibpns2gpwqpvzhsba7xj4ilhi4ax1vn3m086iyh3a0"; - name = "incidenceeditor-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/incidenceeditor-23.08.0.tar.xz"; + sha256 = "1p1v65qglrwf0q4brwvmq4328i9dfnjspv001ip56bnxrps2kfpn"; + name = "incidenceeditor-23.08.0.tar.xz"; }; }; itinerary = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/itinerary-23.04.3.tar.xz"; - sha256 = "132x68wc4pallxgkvridfsimfq5m2g47fj9lcgz1kq4gdsidzf6i"; - name = "itinerary-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/itinerary-23.08.0.tar.xz"; + sha256 = "0y87md72yd6f9yn31kj09ibfril5pj3cyds5cq3j3z59yhhgd665"; + name = "itinerary-23.08.0.tar.xz"; }; }; juk = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/juk-23.04.3.tar.xz"; - sha256 = "1q0r0iv4nn6jd0g8db54r7xdw7kdw1ja0z1ggxl1sy0k60m9c4q3"; - name = "juk-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/juk-23.08.0.tar.xz"; + sha256 = "04dppr21vj4nnb0jmbnc9afk4jwhfj3dj0cf375l1kdglxa4ncc1"; + name = "juk-23.08.0.tar.xz"; }; }; k3b = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/k3b-23.04.3.tar.xz"; - sha256 = "1kr1hw4pws87zzwyrwrg2ysdn11qf0qhwi1vc9b0k8jkjmmdplmb"; - name = "k3b-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/k3b-23.08.0.tar.xz"; + sha256 = "1zvwlxf3k63b29d0xzq4bgi206g0wnp5j0z00lxy9rnm275gwhz6"; + name = "k3b-23.08.0.tar.xz"; }; }; kaccounts-integration = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kaccounts-integration-23.04.3.tar.xz"; - sha256 = "1mn64xw5r2magy5y0qmg5r907jz1y8jar0qqkc6s1zjjr3s3knac"; - name = "kaccounts-integration-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kaccounts-integration-23.08.0.tar.xz"; + sha256 = "1by9pjjd6zpjjd9j5w8h8aqhzib5d0l3xp9dgvlw4afhbp5dv73g"; + name = "kaccounts-integration-23.08.0.tar.xz"; }; }; kaccounts-providers = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kaccounts-providers-23.04.3.tar.xz"; - sha256 = "1lrmj6r09ypnpl2s586i4rd3fk3760qlxyrhh91k43wkb8i6m8f0"; - name = "kaccounts-providers-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kaccounts-providers-23.08.0.tar.xz"; + sha256 = "08jv0z1586rfwrd9jrs7fk2xwjfmkmia1kaz904linxmmhv97zsh"; + name = "kaccounts-providers-23.08.0.tar.xz"; }; }; kaddressbook = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kaddressbook-23.04.3.tar.xz"; - sha256 = "0zjbri91dh9vnwi6jqkbmyq667yzn8g4kw5v47qn8id2629zj6jq"; - name = "kaddressbook-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kaddressbook-23.08.0.tar.xz"; + sha256 = "1aw3zwjxyml6bvsld1qndkarvr11y43dif296qr21cplns48d5r1"; + name = "kaddressbook-23.08.0.tar.xz"; }; }; kajongg = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kajongg-23.04.3.tar.xz"; - sha256 = "16v87x0qikfk9jpp8dfxnb7mnjzzi0qlkp5lbn2xypkfhqaz99fi"; - name = "kajongg-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kajongg-23.08.0.tar.xz"; + sha256 = "1x7gx6fg1irdrwp7lbgm5m2vair2zyijcj1bbabvm4kl28d3r85j"; + name = "kajongg-23.08.0.tar.xz"; }; }; kalarm = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kalarm-23.04.3.tar.xz"; - sha256 = "120q5y889i9wdg9mxl51v8wz6nvdbhv178bhpscrb307ing538g0"; - name = "kalarm-23.04.3.tar.xz"; - }; - }; - kalendar = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kalendar-23.04.3.tar.xz"; - sha256 = "1w56glv8m1rlk86v78h69d21ydxb6i61g1dk6mcizjr5rvi4liy0"; - name = "kalendar-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kalarm-23.08.0.tar.xz"; + sha256 = "0wghnj5g3sq7vg9r328dqkqzl0hizxs93l9kma8h85hnf5ns9any"; + name = "kalarm-23.08.0.tar.xz"; }; }; kalgebra = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kalgebra-23.04.3.tar.xz"; - sha256 = "04ygs073za4jjfp38am962jmyycx3hs8yswcnl91v9nx2lcpzdw5"; - name = "kalgebra-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kalgebra-23.08.0.tar.xz"; + sha256 = "0rrzhnrjmc0fjgbpbw3mpfbspbyfa4gr6pqkhgy3sb313wamvk9r"; + name = "kalgebra-23.08.0.tar.xz"; }; }; kalk = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kalk-23.04.3.tar.xz"; - sha256 = "191x0vgbbq26qm36fph246alhyw3afdbbnyjg95mh3y0f3lw1n8d"; - name = "kalk-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kalk-23.08.0.tar.xz"; + sha256 = "15jig1y7s21aiv3dg2702qvdxy6k6k5yrrz9nhq5n839kgy3jn8g"; + name = "kalk-23.08.0.tar.xz"; }; }; kalzium = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kalzium-23.04.3.tar.xz"; - sha256 = "041mrly5yzdxxlj9r04s10a6i4amlslw57j1ysj0k4vzh5js27zw"; - name = "kalzium-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kalzium-23.08.0.tar.xz"; + sha256 = "0vj69kc4svw3c0l7j7kasrcn8dj7ky5qryg6aydmbbckbikj778y"; + name = "kalzium-23.08.0.tar.xz"; }; }; kamera = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kamera-23.04.3.tar.xz"; - sha256 = "09qqigcklp8d2pqibf8kxfras025zhpviwaaky69sd7nmqqd7gi9"; - name = "kamera-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kamera-23.08.0.tar.xz"; + sha256 = "1i4rchmj188acavi9yx7w8pmpqsdkz0iza60w2p3x32p5saw5arq"; + name = "kamera-23.08.0.tar.xz"; }; }; kamoso = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kamoso-23.04.3.tar.xz"; - sha256 = "1f06331qigf5wi6lgir5ij8h1fsdn54v32fyw2mgf0hg05xndrcl"; - name = "kamoso-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kamoso-23.08.0.tar.xz"; + sha256 = "1izvgzsxy680cqz1j9j9haj5lfr9nas7xzjlwj1p7zfhawrqb75j"; + name = "kamoso-23.08.0.tar.xz"; }; }; kanagram = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kanagram-23.04.3.tar.xz"; - sha256 = "1w6qmm32m9j0ffqlqhn95q899pxvgx2xckd1s11n8v8f4s193p9k"; - name = "kanagram-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kanagram-23.08.0.tar.xz"; + sha256 = "18yajg5mx9frab79amgxdf096kkn91hcfh04b0bipbn6k36kkl9n"; + name = "kanagram-23.08.0.tar.xz"; }; }; kapman = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kapman-23.04.3.tar.xz"; - sha256 = "0ildsd7pig3lm9n616kw5mpl8hbwidsnbzdfifx8nnffslrr4bv7"; - name = "kapman-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kapman-23.08.0.tar.xz"; + sha256 = "027c2w72ljy8xlb3gqpab818j23qf7qsldxssflzlj0mh7igvgwh"; + name = "kapman-23.08.0.tar.xz"; }; }; kapptemplate = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kapptemplate-23.04.3.tar.xz"; - sha256 = "1kdi948w5x328nalxcf17rnmxsp7mx3p7a58f7c65cf2y4ap9vwm"; - name = "kapptemplate-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kapptemplate-23.08.0.tar.xz"; + sha256 = "1r2kbh9r1b0nhzsipsnp2ppa817g324p39pwpnrsc0zyi52mdack"; + name = "kapptemplate-23.08.0.tar.xz"; }; }; kasts = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kasts-23.04.3.tar.xz"; - sha256 = "0qpc04c841ry2f12pb1bc22qk9ncxmb0b2ji3m60il4ivgwarq9b"; - name = "kasts-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kasts-23.08.0.tar.xz"; + sha256 = "0sayr85lwj2xwmcx8r1kdmf7isjdn5a5shn58n930sishpcplhjn"; + name = "kasts-23.08.0.tar.xz"; }; }; kate = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kate-23.04.3.tar.xz"; - sha256 = "0yyhh21pvzsaz7swmghdchzsfk089axhqkjwjv1m8j4q3q3rhv86"; - name = "kate-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kate-23.08.0.tar.xz"; + sha256 = "1cb8il661x9s7cn5dzc8az073s30s119mlnwglisglawzqn0v4ry"; + name = "kate-23.08.0.tar.xz"; }; }; katomic = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/katomic-23.04.3.tar.xz"; - sha256 = "0a571058r9s2y6pyyapxfvlbpr6grabpl7x1lqlg3hfzyc7gl2h1"; - name = "katomic-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/katomic-23.08.0.tar.xz"; + sha256 = "0arryssaaw5m5mhq6hym8zjzxx0zr45jyh07ya1cmcx5r2505xl8"; + name = "katomic-23.08.0.tar.xz"; }; }; kbackup = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kbackup-23.04.3.tar.xz"; - sha256 = "121w54ivmq8qnxc97g47i8vq4nkivypp84pqs9rs5bid4cpfvh9p"; - name = "kbackup-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kbackup-23.08.0.tar.xz"; + sha256 = "0i91rr2sh8qs4gxwv1bmfarjppyvbba1pv7i0wcvj6lmaz6h3yna"; + name = "kbackup-23.08.0.tar.xz"; }; }; kblackbox = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kblackbox-23.04.3.tar.xz"; - sha256 = "0h7byd7g52yvmz3gxrzp2frs4iifm0r6lq8fjz2nxbl1rkw9ljbp"; - name = "kblackbox-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kblackbox-23.08.0.tar.xz"; + sha256 = "1axyzchy4cv5gci01w2kj7vg0sddafcx4zvwy07m2nb46niahcvy"; + name = "kblackbox-23.08.0.tar.xz"; }; }; kblocks = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kblocks-23.04.3.tar.xz"; - sha256 = "1z5f2zpnmfh05vlmjw85jj2d0sfxl5w1kg30ky6gmgmmfzj2sjzx"; - name = "kblocks-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kblocks-23.08.0.tar.xz"; + sha256 = "1fr54i2jw058pxsrba8vy48yyzqcipb3aw40zw3093bglmiig1ql"; + name = "kblocks-23.08.0.tar.xz"; }; }; kbounce = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kbounce-23.04.3.tar.xz"; - sha256 = "06b0q4f4yn8m8gy7wgax54ldwnkgykr8yfr2h0ih8mfg3w8xsx7s"; - name = "kbounce-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kbounce-23.08.0.tar.xz"; + sha256 = "13lwykx2dvjqa8qviwpr5w3dvprb6p5mf1ygqvw7476mdp8709jx"; + name = "kbounce-23.08.0.tar.xz"; }; }; kbreakout = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kbreakout-23.04.3.tar.xz"; - sha256 = "08fq0s1c71ag6jzyxz6spc5ylmzpbqpyqi9lqjk0x7y7brkfk9fq"; - name = "kbreakout-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kbreakout-23.08.0.tar.xz"; + sha256 = "1mwdajfaxfawswk0c9r5b78q1rhh6q1v3wbfbllg4k2lnmp40b4x"; + name = "kbreakout-23.08.0.tar.xz"; }; }; kbruch = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kbruch-23.04.3.tar.xz"; - sha256 = "0gr5d5xlrca71lrjqxnllsw4wji21y8wnzpq685f1nkkkhamxk37"; - name = "kbruch-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kbruch-23.08.0.tar.xz"; + sha256 = "0ipmbzy9iqb5mng80vv8hcj8ay7v9yj762xzsscf444dhdy78vad"; + name = "kbruch-23.08.0.tar.xz"; }; }; kcachegrind = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcachegrind-23.04.3.tar.xz"; - sha256 = "175bag1mfidp7bdsjb3zinib76jy8h881rqxgmkn90gmv4fqy62b"; - name = "kcachegrind-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kcachegrind-23.08.0.tar.xz"; + sha256 = "1087a4mwq3a2fqii0kcxl4i94wcni491n3x53i3c25bi5qypsmvw"; + name = "kcachegrind-23.08.0.tar.xz"; }; }; kcalc = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcalc-23.04.3.tar.xz"; - sha256 = "04mqicwqn6h99jgh1zl0wsgk1rdkswzxaq8b8yz5hq654dsyq6y1"; - name = "kcalc-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kcalc-23.08.0.tar.xz"; + sha256 = "1q7c7v2m84c7kbgfjgsm0qy8jyz19l0plk6rff1qmfqx3y20glny"; + name = "kcalc-23.08.0.tar.xz"; }; }; kcalutils = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcalutils-23.04.3.tar.xz"; - sha256 = "1j7f5ai25zcxggw3dvky624asxim5bkd6a35rcdzkjhj1qwk3vll"; - name = "kcalutils-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kcalutils-23.08.0.tar.xz"; + sha256 = "1wqp0d40pqn1vaqhv7x5qzp9nx43a96l9yk9vyh3yg9q8jfgajgy"; + name = "kcalutils-23.08.0.tar.xz"; }; }; kcharselect = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcharselect-23.04.3.tar.xz"; - sha256 = "05z80j8bwrj1zfpy376gsx30bv7bxsa3lyvrqsz197w1g8vp5gix"; - name = "kcharselect-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kcharselect-23.08.0.tar.xz"; + sha256 = "0b4ay70rc0wzz05ld3rm8yf2wq2gkmxgysnak34nj62iadz52rf5"; + name = "kcharselect-23.08.0.tar.xz"; }; }; kclock = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kclock-23.04.3.tar.xz"; - sha256 = "1rn1v7y7kjmly703qlk0jhsqk5kiixrf7z339h38l7b32r8vdm9r"; - name = "kclock-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kclock-23.08.0.tar.xz"; + sha256 = "08v180yl7da7i8q5ll0i3dqlh6pqnirsrcq5lfbb2mvczxsr1frw"; + name = "kclock-23.08.0.tar.xz"; }; }; kcolorchooser = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcolorchooser-23.04.3.tar.xz"; - sha256 = "1ripvn2li74rwngicay9c78j0slia1rpsi1f43rbb36p9af02lwq"; - name = "kcolorchooser-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kcolorchooser-23.08.0.tar.xz"; + sha256 = "15vxyd8xwg8m1jbmag5897094hs8a7ipsa04ss3yd4zd9g4bx0fp"; + name = "kcolorchooser-23.08.0.tar.xz"; }; }; kcron = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcron-23.04.3.tar.xz"; - sha256 = "107rx45d4gzkxiab8i87jk0qvyagwlrynq0k7098w5zfxg603vgg"; - name = "kcron-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kcron-23.08.0.tar.xz"; + sha256 = "1y9zga7mniadnzkqpyqy61hiznzib5p0ycfv8bbx1q5bx7cnkslh"; + name = "kcron-23.08.0.tar.xz"; }; }; kde-dev-scripts = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kde-dev-scripts-23.04.3.tar.xz"; - sha256 = "079wvyr7qjbxgywdzd9mydn7l4wq9jx20dv2j3iwq5cq9scwfgvm"; - name = "kde-dev-scripts-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kde-dev-scripts-23.08.0.tar.xz"; + sha256 = "0mdi1jpx6lxg7g8jfz8z5sdyv7kf6yfk8mhr3xv3mmmnb3qpkkx0"; + name = "kde-dev-scripts-23.08.0.tar.xz"; }; }; kde-dev-utils = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kde-dev-utils-23.04.3.tar.xz"; - sha256 = "0gadxs9qxqkla6rwirpyckfh718m8lslvwi4lc0xsn3nkjprj7kl"; - name = "kde-dev-utils-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kde-dev-utils-23.08.0.tar.xz"; + sha256 = "0x03czwbr134kp9b6bgm91jqyja6wh5mkfs95afirb0h4v7xmr0i"; + name = "kde-dev-utils-23.08.0.tar.xz"; }; }; kde-inotify-survey = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kde-inotify-survey-23.04.3.tar.xz"; - sha256 = "1l9lvjwqrc05fz75d7whkkxk5hy1ra6n5mf8dj0p8k0xxnxhs178"; - name = "kde-inotify-survey-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kde-inotify-survey-23.08.0.tar.xz"; + sha256 = "1hc8rlbrb7k5m3j3cwbxi5a51c15ax1lv593il5bbbz6yr36dhiq"; + name = "kde-inotify-survey-23.08.0.tar.xz"; }; }; kdebugsettings = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdebugsettings-23.04.3.tar.xz"; - sha256 = "02igg8ry1cxa83pdj6pgwzw7hpjwfrfk57d9ybgfvy2x08d5kvqz"; - name = "kdebugsettings-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdebugsettings-23.08.0.tar.xz"; + sha256 = "1a8h8fn55jsyf56l5s6y3cag1v4wm1cwk2hdfrjl3zi5j0vqln4d"; + name = "kdebugsettings-23.08.0.tar.xz"; }; }; kdeconnect-kde = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdeconnect-kde-23.04.3.tar.xz"; - sha256 = "1gcmqqj752h3lmcpvc7cm6k6bpb158ha7i5ysp0kqvf8cmpi5ydz"; - name = "kdeconnect-kde-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdeconnect-kde-23.08.0.tar.xz"; + sha256 = "1sfm04k81992skb5s1n968nj8zd07yyk0p5qqnhyyacrz5scchcb"; + name = "kdeconnect-kde-23.08.0.tar.xz"; }; }; kdeedu-data = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdeedu-data-23.04.3.tar.xz"; - sha256 = "0qki2anbhwrmfcyin0n2hx2xmax3ybks59g4lcxbganyk3k64yfc"; - name = "kdeedu-data-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdeedu-data-23.08.0.tar.xz"; + sha256 = "1322hc5iavnv181i5kydvfvfdap3j6a5m9q2id7g6il5iwvpq04d"; + name = "kdeedu-data-23.08.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdegraphics-mobipocket-23.04.3.tar.xz"; - sha256 = "13hn6dh5d4vsblvg6wyyvbmcyl0yyqr8srilik86wilp58qbsrdv"; - name = "kdegraphics-mobipocket-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdegraphics-mobipocket-23.08.0.tar.xz"; + sha256 = "1yvrg6z9gjicqnr64la5k3acb8p1x0d9mc1xrhy8gsxpj67wdb8m"; + name = "kdegraphics-mobipocket-23.08.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdegraphics-thumbnailers-23.04.3.tar.xz"; - sha256 = "16z6sf8v9874ng5b6b6wzvnlqncp7xz2fqpc93vs7sby8rwsdpy0"; - name = "kdegraphics-thumbnailers-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdegraphics-thumbnailers-23.08.0.tar.xz"; + sha256 = "0csl6kh2j6sdsq812an10vlrg6cirm5v195dxgc3na1y6ncjk250"; + name = "kdegraphics-thumbnailers-23.08.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdenetwork-filesharing-23.04.3.tar.xz"; - sha256 = "19izy4bjz5xzibabhf0dvijag7ig7vf3pz1c2dphspsbqkgpjanb"; - name = "kdenetwork-filesharing-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdenetwork-filesharing-23.08.0.tar.xz"; + sha256 = "0airv4vgb6ivl74hhhsm26f6isjkrr7222l01kqcxv4dwf0jkmyf"; + name = "kdenetwork-filesharing-23.08.0.tar.xz"; }; }; kdenlive = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdenlive-23.04.3.tar.xz"; - sha256 = "0jy95mbsifcv5kg80dw6nn86qcs5vy1652w4ig2wd2f7q864wfri"; - name = "kdenlive-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdenlive-23.08.0.tar.xz"; + sha256 = "01yjwikvjs75khr12s86sw2ly9c51vrb7zgh9q0phxbz3p6gcqsz"; + name = "kdenlive-23.08.0.tar.xz"; }; }; kdepim-addons = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdepim-addons-23.04.3.tar.xz"; - sha256 = "1nai47wccf1shrgvywslqdkxk066zdkpb1grf3qzh8q77za2kmqz"; - name = "kdepim-addons-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdepim-addons-23.08.0.tar.xz"; + sha256 = "189fmzgvshnld3j7y98g70z9qyrkizk0nfl5im5wamrcn77vwpv1"; + name = "kdepim-addons-23.08.0.tar.xz"; }; }; kdepim-runtime = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdepim-runtime-23.04.3.tar.xz"; - sha256 = "1wvwibq6zzjlhh8yqrlqras0m8i01ynlwj9z6l3f0g0hyyz5nkw4"; - name = "kdepim-runtime-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdepim-runtime-23.08.0.tar.xz"; + sha256 = "16i2sbqzvmsjb20xjlbp92jaig66bg9ws52dk7d45r2j8ppb9qli"; + name = "kdepim-runtime-23.08.0.tar.xz"; }; }; kdesdk-kio = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdesdk-kio-23.04.3.tar.xz"; - sha256 = "0sxdjpwxwbbinmpz0pq2icm2h9cv9k0yzha0szf1ighfc7kyqwbs"; - name = "kdesdk-kio-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdesdk-kio-23.08.0.tar.xz"; + sha256 = "17wmzkbmq6p60dabnb3bkx7f6z04wkj271fpyhlijj5ma3w6dl88"; + name = "kdesdk-kio-23.08.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdesdk-thumbnailers-23.04.3.tar.xz"; - sha256 = "04fw6lrilccvi71y70zz0nag41gdpfp49556c6vx3nv3ndm28wfa"; - name = "kdesdk-thumbnailers-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdesdk-thumbnailers-23.08.0.tar.xz"; + sha256 = "1add5r1vaqp1r5m37636pzvik15imz7k3qnskyrw60jzyk9fyq9m"; + name = "kdesdk-thumbnailers-23.08.0.tar.xz"; }; }; kdev-php = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdev-php-23.04.3.tar.xz"; - sha256 = "1nrdf5iyhcfy77fynaq65y06z3n3z7v2qzd9zp74ngb4j3x3ks1p"; - name = "kdev-php-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdev-php-23.08.0.tar.xz"; + sha256 = "0dwxczpbxn3in08cmyf393k7xh83qmj95kbm0fbxigpadxy76ykg"; + name = "kdev-php-23.08.0.tar.xz"; }; }; kdev-python = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdev-python-23.04.3.tar.xz"; - sha256 = "1i1rba7405gfzywh7in915s27b6gn2f8m76kc6ra63dvh75qpyyi"; - name = "kdev-python-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdev-python-23.08.0.tar.xz"; + sha256 = "1s0zw2b8kb16nii2da8sx2vx1x4s130nlc9fwvc63jin8f01ynmx"; + name = "kdev-python-23.08.0.tar.xz"; }; }; kdevelop = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdevelop-23.04.3.tar.xz"; - sha256 = "0m1q5nhx7wd4b8850ikw7dk6zka57gapf78wawjv2h1hijxcyf4v"; - name = "kdevelop-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdevelop-23.08.0.tar.xz"; + sha256 = "0spfg8a4carrdl9fmf60qr85dzxah2g6vy3zxhqaadd4kcsrjz1h"; + name = "kdevelop-23.08.0.tar.xz"; }; }; kdf = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdf-23.04.3.tar.xz"; - sha256 = "11ndcbfkq5fhb1lfij0mmm43fw49sh0z3nw644sll0smcwic76aa"; - name = "kdf-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdf-23.08.0.tar.xz"; + sha256 = "1x5gfa7bs8fyq2pqvnriswwlak78pq61np2whsmh07njq8s6frdq"; + name = "kdf-23.08.0.tar.xz"; }; }; kdialog = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdialog-23.04.3.tar.xz"; - sha256 = "042az7d9ngar6xp7gv3xcmlns9hpbvs39dkymanqgc0riwa1mvsx"; - name = "kdialog-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdialog-23.08.0.tar.xz"; + sha256 = "1h4mid01v732iw8gd86r88l8n9yq55dwlixk9lz239i17hzr8l0n"; + name = "kdialog-23.08.0.tar.xz"; }; }; kdiamond = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdiamond-23.04.3.tar.xz"; - sha256 = "038lpp387m45zcy49rgmisiz5ajrvxwxnf424wllrjkihxy1siyn"; - name = "kdiamond-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdiamond-23.08.0.tar.xz"; + sha256 = "0ps4wf3gz7zrkplsqa9b5a0523f55a5m2b41vnfmkcg3fkdpn4n0"; + name = "kdiamond-23.08.0.tar.xz"; }; }; keditbookmarks = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/keditbookmarks-23.04.3.tar.xz"; - sha256 = "08cgyfbnszr5l3xg8a15rml3n8ldszdzm9xqnmjpifrzj5qbw9va"; - name = "keditbookmarks-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/keditbookmarks-23.08.0.tar.xz"; + sha256 = "1fvi81qpf3nvgp0lqyqgbk1mhwf6s4m6k6ivd1d4zhlcq93wwjf6"; + name = "keditbookmarks-23.08.0.tar.xz"; }; }; keysmith = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/keysmith-23.04.3.tar.xz"; - sha256 = "1rfp516adliyc57nx4ha1rp8v2z340ygsvblh5sqmsdsg2ivjklj"; - name = "keysmith-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/keysmith-23.08.0.tar.xz"; + sha256 = "1xa0r9c28m87chk90kaxs1xs73s6y6m6a9na1j6p15zad1lxjn81"; + name = "keysmith-23.08.0.tar.xz"; }; }; kfind = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kfind-23.04.3.tar.xz"; - sha256 = "03g9cn0wp3f2n9zwzbc5sbcria4hcp2ls77fbxyj3wkady3m50if"; - name = "kfind-23.04.3.tar.xz"; - }; - }; - kfloppy = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kfloppy-23.04.3.tar.xz"; - sha256 = "1q33bjvp376amgryjwday3qqkx41q5p7vyqkbwpgb2x97gk7q94x"; - name = "kfloppy-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kfind-23.08.0.tar.xz"; + sha256 = "0wsym0gi32fr35dr0c2ib6h7pgm5h9cbibgm5knrs18fsncqkj5i"; + name = "kfind-23.08.0.tar.xz"; }; }; kfourinline = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kfourinline-23.04.3.tar.xz"; - sha256 = "0chfjp0k4ps5f6vy8nxqc2xlj4xql08llxnzsz6c2x611n69aszm"; - name = "kfourinline-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kfourinline-23.08.0.tar.xz"; + sha256 = "17xx3yraiarkll24yxw0n7vg1ygsix8kjiwk3w2dc8xlgg36smhh"; + name = "kfourinline-23.08.0.tar.xz"; }; }; kgeography = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kgeography-23.04.3.tar.xz"; - sha256 = "16vvfz7rw2d5zslifrk4s6vvm5502rcjjg60z67nplfckx1vi4a5"; - name = "kgeography-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kgeography-23.08.0.tar.xz"; + sha256 = "1rz973mlc5jiyn0xgxpwvvk015g68mmk71xwgdhd785al1hi0nwi"; + name = "kgeography-23.08.0.tar.xz"; }; }; kget = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kget-23.04.3.tar.xz"; - sha256 = "1n9wnm1si4g4rv8zaqpr8m3c2aav0mj8i7z96m78dk1apippx77r"; - name = "kget-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kget-23.08.0.tar.xz"; + sha256 = "1w5y5cphzjz2j9vfc9qnzxn6wcbp2gw9i30jxchnvrp0lzzfi30n"; + name = "kget-23.08.0.tar.xz"; }; }; kgoldrunner = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kgoldrunner-23.04.3.tar.xz"; - sha256 = "0acavby9lwbqbx577a3az9lcahchngcs15571va2ndnq1r16paxf"; - name = "kgoldrunner-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kgoldrunner-23.08.0.tar.xz"; + sha256 = "1sn5h0ng1ixislq010x6yv6npby19i9abg4swk3dadij52fgm4yd"; + name = "kgoldrunner-23.08.0.tar.xz"; }; }; kgpg = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kgpg-23.04.3.tar.xz"; - sha256 = "1ihxw1s4sq7cp5pm6rddcmvqk0v5gfg4v38b6yg8hyjg655x63jz"; - name = "kgpg-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kgpg-23.08.0.tar.xz"; + sha256 = "14qqv67vp16v3i9bhyhjvbgpr4c7xsfmn4pzcdwpjrqscy54713a"; + name = "kgpg-23.08.0.tar.xz"; }; }; khangman = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/khangman-23.04.3.tar.xz"; - sha256 = "1rzl6kfb7457w4s0wgkk07s0vr8nngivhpfr6q0m4261qf7b17zw"; - name = "khangman-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/khangman-23.08.0.tar.xz"; + sha256 = "1xjsmf161z0xlaxpxm9p7n1477qcka8fzvcdj7gsrk55p519idsl"; + name = "khangman-23.08.0.tar.xz"; }; }; khelpcenter = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/khelpcenter-23.04.3.tar.xz"; - sha256 = "10rivj5c14v5hwk87z41gwk830sy35fz0jg1jpay43jzw0ss995y"; - name = "khelpcenter-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/khelpcenter-23.08.0.tar.xz"; + sha256 = "1g1y4hcxcd2aw7f5wymsdma1zjpmkhqvsnwn8yj1yj9gzh35wwcn"; + name = "khelpcenter-23.08.0.tar.xz"; }; }; kidentitymanagement = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kidentitymanagement-23.04.3.tar.xz"; - sha256 = "03bfz0x35wiynla39iysxa5g3rckmy9nj2z1f439v9sblcqbvz3p"; - name = "kidentitymanagement-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kidentitymanagement-23.08.0.tar.xz"; + sha256 = "10hnbnc2iwa73m2nk4b2vj1r1g6y29cqijkx0ldqxim3q6f2pqi6"; + name = "kidentitymanagement-23.08.0.tar.xz"; }; }; kig = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kig-23.04.3.tar.xz"; - sha256 = "18ml5ca8mmqb1a0j18pf9ajpj20rs5i0knvz4rssjfzibf9v6cbs"; - name = "kig-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kig-23.08.0.tar.xz"; + sha256 = "1gf5ffxaxz26pbawc0j2ymkasg7r55dinp9n267x31ljfk96vl16"; + name = "kig-23.08.0.tar.xz"; }; }; kigo = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kigo-23.04.3.tar.xz"; - sha256 = "0qx9plrs588210rdgvb2bkm5yjw4pna9q7v38cb166nfgkh6gv63"; - name = "kigo-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kigo-23.08.0.tar.xz"; + sha256 = "1klhc1lyl32av1bzrd0j6y3n2vjf3ng1jkx6pr95w0mys3nz3z0w"; + name = "kigo-23.08.0.tar.xz"; }; }; killbots = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/killbots-23.04.3.tar.xz"; - sha256 = "0ygg2cmp7wqzw9nsn768vzgjs8i44k3skwcn2abg1jj5k64wp9cb"; - name = "killbots-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/killbots-23.08.0.tar.xz"; + sha256 = "0ihrrb1zngr1b9xwl65b631cb5d7w3na9f7k0dhih32j2rd1mc6z"; + name = "killbots-23.08.0.tar.xz"; }; }; kimagemapeditor = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kimagemapeditor-23.04.3.tar.xz"; - sha256 = "05c30x7gihljw9vxpq2ag68bfyikh5gj17xbckkkg6l01qk6lqdc"; - name = "kimagemapeditor-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kimagemapeditor-23.08.0.tar.xz"; + sha256 = "1lj7pbccghniakbxcb4dyffb2q5s62r880cls08pw1hmnih558cq"; + name = "kimagemapeditor-23.08.0.tar.xz"; }; }; kimap = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kimap-23.04.3.tar.xz"; - sha256 = "08s2891f2cnf5f7q034lmqv3vnh3v61l7bsyssdx711jfbswg9ik"; - name = "kimap-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kimap-23.08.0.tar.xz"; + sha256 = "0rn2xg6nrnr33d6lljfqdvc65dn2rmglv6j03cqml5cqck1cm0l7"; + name = "kimap-23.08.0.tar.xz"; }; }; kio-admin = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kio-admin-23.04.3.tar.xz"; - sha256 = "1vpl0bmgf23zvigbmxvmmpl01p99n81g4640qdjfx2f9854qqzz0"; - name = "kio-admin-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kio-admin-23.08.0.tar.xz"; + sha256 = "157l499087gcw70wmdiaapqf5yipknsbqvpv2jjbb8p2vgp8q1pc"; + name = "kio-admin-23.08.0.tar.xz"; }; }; kio-extras = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kio-extras-23.04.3.tar.xz"; - sha256 = "1ygxfq62idpgf1dlic1245y5gf0fnkrpbqxd230xmxi7a35za8qd"; - name = "kio-extras-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kio-extras-23.08.0.tar.xz"; + sha256 = "02a84v4d9d2rns65j4yq1dspmifbh5h0mr1v14i9znffz3pfn72s"; + name = "kio-extras-23.08.0.tar.xz"; }; }; kio-gdrive = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kio-gdrive-23.04.3.tar.xz"; - sha256 = "0s7kz25z46gh1rv85i2ndbgv8nhbjlwc7ypd8fsd4lqgf025h0ns"; - name = "kio-gdrive-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kio-gdrive-23.08.0.tar.xz"; + sha256 = "1cngw7hyyryr0d1yj8r7l5ijdx9xxjw43c426m8rxm8w6x640mcz"; + name = "kio-gdrive-23.08.0.tar.xz"; }; }; kio-zeroconf = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kio-zeroconf-23.04.3.tar.xz"; - sha256 = "0b7p5ivfcggs63y5hmyy5fwjxs63ghhkrs603h7hmj24apfwk15a"; - name = "kio-zeroconf-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kio-zeroconf-23.08.0.tar.xz"; + sha256 = "1920kl6r8jm8zp0q9c5civ7gx0a3kj13i9hlingjp042lwbww9z2"; + name = "kio-zeroconf-23.08.0.tar.xz"; }; }; kipi-plugins = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kipi-plugins-23.04.3.tar.xz"; - sha256 = "12785nyni2jj6phyr7xwnspr179pkaq17pzs985azxjm4wsjn5bz"; - name = "kipi-plugins-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kipi-plugins-23.08.0.tar.xz"; + sha256 = "0v9sm5c4d8g5ih9wbsmbfvxgjk7divjklfbwkv3pyhzvbqspai0p"; + name = "kipi-plugins-23.08.0.tar.xz"; }; }; kirigami-gallery = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kirigami-gallery-23.04.3.tar.xz"; - sha256 = "0j719ggd1kd9qwqsc5wd256l8yiqivq1ifkfsisc14llawb7m0h2"; - name = "kirigami-gallery-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kirigami-gallery-23.08.0.tar.xz"; + sha256 = "06l6izavxlsgdkmi798ynk9b1sfw74cwhhdga4q92qvy3ick311x"; + name = "kirigami-gallery-23.08.0.tar.xz"; }; }; kiriki = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kiriki-23.04.3.tar.xz"; - sha256 = "13lzpbhkp48r9m0bcrzfqacz9xvc89xavf3yn3ql50g3jjlkq41v"; - name = "kiriki-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kiriki-23.08.0.tar.xz"; + sha256 = "030nw63s8xmvmgngb6w04yv6h0yj6cqvl7qybwhrrahxr3906jzs"; + name = "kiriki-23.08.0.tar.xz"; }; }; kiten = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kiten-23.04.3.tar.xz"; - sha256 = "0l3cgcamkrfyjdqy4x38lc18p1acn97xyhm01q91pbr644gyiy25"; - name = "kiten-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kiten-23.08.0.tar.xz"; + sha256 = "1fhx9hbciw622wpqj5lhdb9vws4p2l6zrbmzmxkx7djxdym41hra"; + name = "kiten-23.08.0.tar.xz"; }; }; kitinerary = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kitinerary-23.04.3.tar.xz"; - sha256 = "0fcqix7hgmv7qcfxzmqy61kg7dqi5zas5vqfs7pfycgcxma0g869"; - name = "kitinerary-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kitinerary-23.08.0.tar.xz"; + sha256 = "1m7yhm4yrvhbpggigfrm2xd41rg91zwvs0rbnfsrpnhr2wm8qb1r"; + name = "kitinerary-23.08.0.tar.xz"; }; }; kjournald = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kjournald-23.04.3.tar.xz"; - sha256 = "0mnfn3b8792hajfwfxm701n67knvvz46kvr6pm1jwwz5l6hbwncq"; - name = "kjournald-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kjournald-23.08.0.tar.xz"; + sha256 = "19mcj53gxlipd6ny6dzyqxq0i6v1838wxl79dj9gwgvmqrr1vd4i"; + name = "kjournald-23.08.0.tar.xz"; }; }; kjumpingcube = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kjumpingcube-23.04.3.tar.xz"; - sha256 = "09bh57vzjnn56dnhpp4szx72wyskc5g714vlyp6c27vr27xry8fi"; - name = "kjumpingcube-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kjumpingcube-23.08.0.tar.xz"; + sha256 = "0grzrw3mi94fc00flq8alrf1z2pksk0r0xafazi1i9ibv789d899"; + name = "kjumpingcube-23.08.0.tar.xz"; }; }; kldap = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kldap-23.04.3.tar.xz"; - sha256 = "0hp5j02kwh91xf0n6zqzgam7g50r54hzbkli5i7c0rxdb1g28ihm"; - name = "kldap-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kldap-23.08.0.tar.xz"; + sha256 = "14457ld8rdvs2s2nrbpnvf7vcqrpbxxnzbqbxg8z7swpn695w235"; + name = "kldap-23.08.0.tar.xz"; }; }; kleopatra = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kleopatra-23.04.3.tar.xz"; - sha256 = "0lcl20yihsa8dq0s24akp5z0290vh9nxjjjdwqk88nz8vmsr29i0"; - name = "kleopatra-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kleopatra-23.08.0.tar.xz"; + sha256 = "0pr56q1cb26453zxxya8lxhchp2v05631ic4v9fqbwfmgchj13xq"; + name = "kleopatra-23.08.0.tar.xz"; }; }; klettres = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/klettres-23.04.3.tar.xz"; - sha256 = "09vklxcj7hhbb1m9b5gpd73qcxnkvh94v49cn84d9hdnm7gbsb23"; - name = "klettres-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/klettres-23.08.0.tar.xz"; + sha256 = "1wqnmpl9ilv4bl8cp55kqbcnbqm9k2g93z0ilv313k8wlx79djld"; + name = "klettres-23.08.0.tar.xz"; }; }; klickety = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/klickety-23.04.3.tar.xz"; - sha256 = "0ngbjn3dlw4257p2gzlhm8rlljqgzjmb160wiw6j4yz1mxd75fr2"; - name = "klickety-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/klickety-23.08.0.tar.xz"; + sha256 = "118pf0zj4a0q1hca0ym70q85ac5fsjkki2g04x1hjrzkcv51q8zz"; + name = "klickety-23.08.0.tar.xz"; }; }; klines = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/klines-23.04.3.tar.xz"; - sha256 = "1dny7wsj90c3vbgbrpxvxfy44j9ip3vdylc7889ckzbliivipxk4"; - name = "klines-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/klines-23.08.0.tar.xz"; + sha256 = "0al1ri7g20r8w7ijk1pdgpvn32z9nfrr19rj2hrm2wg2349kvqdq"; + name = "klines-23.08.0.tar.xz"; }; }; kmag = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmag-23.04.3.tar.xz"; - sha256 = "13ar37yv3gk5451cdqrgbm91jm50qw4559sx25fv95g2i9wa7z74"; - name = "kmag-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmag-23.08.0.tar.xz"; + sha256 = "0swj9zaamrv8jp38hmd8fisnaljjr1i1vplrbvipxr2sg2f3zlip"; + name = "kmag-23.08.0.tar.xz"; }; }; kmahjongg = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmahjongg-23.04.3.tar.xz"; - sha256 = "1q2aq8y3c4a84rjvqk4gz6mlyflfnzw6im68p96wmcn98s5gsc22"; - name = "kmahjongg-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmahjongg-23.08.0.tar.xz"; + sha256 = "1i20mxciwvgb5d0zg7via8rk4yzx7n35c8gphd0lyf27s8rc0kpr"; + name = "kmahjongg-23.08.0.tar.xz"; }; }; kmail = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmail-23.04.3.tar.xz"; - sha256 = "16gz0i7na1pkyly9jnvavyffkawxf5irr92rd50w68p01b82dhc6"; - name = "kmail-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmail-23.08.0.tar.xz"; + sha256 = "052pz9rhb2s0cf86ms1br8sl3f7iwb6k864d64b3wd5xvhbcsf55"; + name = "kmail-23.08.0.tar.xz"; }; }; kmail-account-wizard = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmail-account-wizard-23.04.3.tar.xz"; - sha256 = "1840zjgrqwk2zgqbb33gl9nvigsrmk5grzvzg5cw116h7lb7z7xx"; - name = "kmail-account-wizard-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmail-account-wizard-23.08.0.tar.xz"; + sha256 = "14y0q8xm0m59pqh783y9iji5ngf7ckhyfrh9kmj2i972m3dzh2db"; + name = "kmail-account-wizard-23.08.0.tar.xz"; }; }; kmailtransport = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmailtransport-23.04.3.tar.xz"; - sha256 = "14vmm9vla8i477jq40z73lc4klx6mm03y2xnljvx1v4inm3cpw2c"; - name = "kmailtransport-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmailtransport-23.08.0.tar.xz"; + sha256 = "0ifaqbjpfmislngl92qssnssjd9maz44lzlihp8cnnn2kd1xw3pg"; + name = "kmailtransport-23.08.0.tar.xz"; }; }; kmbox = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmbox-23.04.3.tar.xz"; - sha256 = "05hdfjwp6ay2j16rxp55k3fywwf7kxiig4dv9fh51iysglmzzn76"; - name = "kmbox-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmbox-23.08.0.tar.xz"; + sha256 = "1v5s0vs2n316qk0kr737i9kcmx15b7z1yhgbdwhmllyb2cybn6s4"; + name = "kmbox-23.08.0.tar.xz"; }; }; kmime = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmime-23.04.3.tar.xz"; - sha256 = "1i38g0s98d24882kxyjay965nz3d3fjhb3mv1p4sllm2lnffrq2d"; - name = "kmime-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmime-23.08.0.tar.xz"; + sha256 = "0z7zk9q0j0i4ddcnlgqb8p82vnwwxqw5l9hpmlyd8bsdxghd8wp4"; + name = "kmime-23.08.0.tar.xz"; }; }; kmines = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmines-23.04.3.tar.xz"; - sha256 = "0x301dsppn0sav31ds5hpbfkbbisjg640ri13103s1jn0y2b90b9"; - name = "kmines-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmines-23.08.0.tar.xz"; + sha256 = "10wrx0xlnx3d27hyb3j33cdrqis8lvmd8h0x6vm7xrw9pbfnhfzk"; + name = "kmines-23.08.0.tar.xz"; }; }; kmix = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmix-23.04.3.tar.xz"; - sha256 = "09pfsa6y1phm6z24da60s47gc18w4cvv7r8sxh5qfww7b0dnhixj"; - name = "kmix-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmix-23.08.0.tar.xz"; + sha256 = "013jwxd0l3vdfqjqd3g52p5jpql67f50qhnfnr2vygmz5xb65p8k"; + name = "kmix-23.08.0.tar.xz"; }; }; kmousetool = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmousetool-23.04.3.tar.xz"; - sha256 = "1prh9xdzwx0mx93g9cbjy55hxwcci90hvrv2ckj4dqdnv5fv4h21"; - name = "kmousetool-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmousetool-23.08.0.tar.xz"; + sha256 = "1nijq9d2chvil677npx9pj155v6xl5iklyi2696jndfw9v30hsy1"; + name = "kmousetool-23.08.0.tar.xz"; }; }; kmouth = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmouth-23.04.3.tar.xz"; - sha256 = "0qyzq4cvcsacb7hr6n79i3rzyjr0m3c8lrf8fwbzdivswpk8wss3"; - name = "kmouth-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmouth-23.08.0.tar.xz"; + sha256 = "031kj9n1p9x927z373b1yhfnhi2r8spp5lb4gxfngfxnh41cadrx"; + name = "kmouth-23.08.0.tar.xz"; }; }; kmplot = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmplot-23.04.3.tar.xz"; - sha256 = "1wln4agx0mkbs82nynb5m63z798s3rlyymf9llcvrhqqpvi9416b"; - name = "kmplot-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmplot-23.08.0.tar.xz"; + sha256 = "0if00w89a4zjsbjxagz49jkqbir9l4fqn7rzrxx3ji6pgk5817yf"; + name = "kmplot-23.08.0.tar.xz"; }; }; knavalbattle = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/knavalbattle-23.04.3.tar.xz"; - sha256 = "1brj2dvymgpf74vbsrs2m81lxxfxsly9pafd13g8rkzdx3hn1n0q"; - name = "knavalbattle-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/knavalbattle-23.08.0.tar.xz"; + sha256 = "0vfzp4bcmxgz1llza7vigffa2zcgs2k2qmxahqbb076fy6qmqgqr"; + name = "knavalbattle-23.08.0.tar.xz"; }; }; knetwalk = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/knetwalk-23.04.3.tar.xz"; - sha256 = "1xqqwsbm3f8bmid7afbnacxlg1hih644f0nw0i87pr746m1sskgz"; - name = "knetwalk-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/knetwalk-23.08.0.tar.xz"; + sha256 = "0wh746q4hnyf4zq2rh1i8y22b3a8a5qwrp3rwl1b8aq6fwhfwypl"; + name = "knetwalk-23.08.0.tar.xz"; }; }; knights = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/knights-23.04.3.tar.xz"; - sha256 = "09vc765fb01vqcxyg1qqik8z76r9mmb02axy9a5wmjdf1k4y9cia"; - name = "knights-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/knights-23.08.0.tar.xz"; + sha256 = "1qjlssvdiri6y4grl4w1dzg65gnkwdpvlamhz7q8fbrbifr10im6"; + name = "knights-23.08.0.tar.xz"; }; }; knotes = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/knotes-23.04.3.tar.xz"; - sha256 = "0f2a9xy2w909y792hwwnmsqvxx91azn6f0j0xl2mlmav00a4w6za"; - name = "knotes-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/knotes-23.08.0.tar.xz"; + sha256 = "03mvz47c8arjzmjlmr91gw9gnad6f6smspbzr0niwhsgns7brcqq"; + name = "knotes-23.08.0.tar.xz"; }; }; koko = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/koko-23.04.3.tar.xz"; - sha256 = "1n76fpj955rqg98z46plhv2lwlvwskvgwqws0fslmn9vxfnzv989"; - name = "koko-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/koko-23.08.0.tar.xz"; + sha256 = "18i7kw8x6wg1ak1l0qn83kdfkq5p7fc0zkf71jyzbs30jgx3lird"; + name = "koko-23.08.0.tar.xz"; }; }; kolf = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kolf-23.04.3.tar.xz"; - sha256 = "0wbdpclc6nimjzs2pqbzaxnqn516hci1yk1dgig0jgdy1jv2nyhv"; - name = "kolf-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kolf-23.08.0.tar.xz"; + sha256 = "1k6zv6lgld5cvv73bkr1sb50hihvrjhwf8irw11wing808fcg1w9"; + name = "kolf-23.08.0.tar.xz"; }; }; kollision = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kollision-23.04.3.tar.xz"; - sha256 = "0g9nz3df8nibcwlrjlyw306dnrx58nlga2lljn7a9acpmvbp6qgi"; - name = "kollision-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kollision-23.08.0.tar.xz"; + sha256 = "0j8fyh0k48wh3rhbv0vid4lh9a439cyiqg7d0kpz5v93271vj99b"; + name = "kollision-23.08.0.tar.xz"; }; }; kolourpaint = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kolourpaint-23.04.3.tar.xz"; - sha256 = "1ab9v6ksb185f6jfhhk578qazhmy8hx6s8vjr9xyh7k3jilayj9v"; - name = "kolourpaint-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kolourpaint-23.08.0.tar.xz"; + sha256 = "1d53m63nmphd81vv5a75kaqx75z8sdfgasbi8yrppgp423157j8v"; + name = "kolourpaint-23.08.0.tar.xz"; }; }; kompare = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kompare-23.04.3.tar.xz"; - sha256 = "058rr0n5r9czxqs6ixacx0bm8hglwjmhfpf5xf1zr0fjgcirlrwy"; - name = "kompare-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kompare-23.08.0.tar.xz"; + sha256 = "1fkhb3ap3xmyjy8ixybdgbllq4948zsjxqypxczjxjalc3mpijz1"; + name = "kompare-23.08.0.tar.xz"; }; }; kongress = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kongress-23.04.3.tar.xz"; - sha256 = "1yns427iivbn7s3lw11jpf9qgsv6wdbc827apdsg5lp35n8dvr0p"; - name = "kongress-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kongress-23.08.0.tar.xz"; + sha256 = "1773qavz9g4jxwxb5qvj64pcfr0j4yd3r9wqb3a291p3fspi5flk"; + name = "kongress-23.08.0.tar.xz"; }; }; konqueror = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/konqueror-23.04.3.tar.xz"; - sha256 = "0qynyslgjqa0yqcfsq7957i7a2rbqc0fbr5vcycmib9593wi9ip0"; - name = "konqueror-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/konqueror-23.08.0.tar.xz"; + sha256 = "1xgrmag0x9hhhxwih1zzcf89jm2f60cbih5sc291daayfjb907x3"; + name = "konqueror-23.08.0.tar.xz"; }; }; konquest = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/konquest-23.04.3.tar.xz"; - sha256 = "0svzaibs8v1xd36ysj3wk7sxma26fl5pz6yp774jg0g9zi9rlkff"; - name = "konquest-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/konquest-23.08.0.tar.xz"; + sha256 = "090ksydgn56f1hym1s3sv58n5l3n990idl9149xpf7q33zfvwnlp"; + name = "konquest-23.08.0.tar.xz"; }; }; konsole = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/konsole-23.04.3.tar.xz"; - sha256 = "1k68y1i3g3bsz1dz81jhkx1q2fb13rbm5ywh632bcyln0c6l0vz0"; - name = "konsole-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/konsole-23.08.0.tar.xz"; + sha256 = "177sfgs5jpaih6zpk4wfax6ic9qh3zlq6bi2h7mr7jsd8pcnplii"; + name = "konsole-23.08.0.tar.xz"; }; }; kontact = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kontact-23.04.3.tar.xz"; - sha256 = "05kfdz0pfyfq28cvxjc05v2j89n4yj2hik1qx1qp99ydb0hbk69y"; - name = "kontact-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kontact-23.08.0.tar.xz"; + sha256 = "116dmf6pkcix00dwj7rajxbb3jjfp7xiwd6w2g08w6ir9n2fgncr"; + name = "kontact-23.08.0.tar.xz"; }; }; kontactinterface = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kontactinterface-23.04.3.tar.xz"; - sha256 = "16fg24hz9vx912cffc94x5zx4jv3k72mbxgp5ck50lydypx6rfns"; - name = "kontactinterface-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kontactinterface-23.08.0.tar.xz"; + sha256 = "1q4yc240hzmdqg2y384cg8gfqbq0hf93fn2y8ihq02chn1iqyxp3"; + name = "kontactinterface-23.08.0.tar.xz"; }; }; kontrast = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kontrast-23.04.3.tar.xz"; - sha256 = "08qwvc2b5bj3012lvwxainbw7d34mkbwwznj3661ydsnfjyxxs92"; - name = "kontrast-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kontrast-23.08.0.tar.xz"; + sha256 = "018p2k8b332pgc0lc0jrhpajy6wdz3va77g59x6yjq16qkm3njxa"; + name = "kontrast-23.08.0.tar.xz"; }; }; konversation = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/konversation-23.04.3.tar.xz"; - sha256 = "1ip0jlz71fad5l0ppbc6w914hqk7h626s12ssbb9p1c2yvlr1j1v"; - name = "konversation-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/konversation-23.08.0.tar.xz"; + sha256 = "1zjl9fppl8k53i5f5fpgnnxqg7dmfh8kv0a19x9dm5wrxv4rf60x"; + name = "konversation-23.08.0.tar.xz"; }; }; kopeninghours = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kopeninghours-23.04.3.tar.xz"; - sha256 = "14m4wl79b4qad42l1capz59pslfcrm25jshyhmcqzhqb0wzwkav9"; - name = "kopeninghours-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kopeninghours-23.08.0.tar.xz"; + sha256 = "15vx9qq93vbq9lpynmvysbqa5cdr83547mrs6zhjzz9s0xm05qy9"; + name = "kopeninghours-23.08.0.tar.xz"; }; }; kopete = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kopete-23.04.3.tar.xz"; - sha256 = "1ps6g440p1dy2zwbj23f0mzw1d78r02aj88fy3i5sws9p9ra92gi"; - name = "kopete-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kopete-23.08.0.tar.xz"; + sha256 = "13sygr3bq7ynwijcw7mjv8b9vsvhk0fsz5jzl9zlpg7z8mv9wf89"; + name = "kopete-23.08.0.tar.xz"; }; }; korganizer = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/korganizer-23.04.3.tar.xz"; - sha256 = "1vp1jsmna059vvfj7xaj9fhhhq0lz9k0pphczkfbwm3gy6nzcavz"; - name = "korganizer-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/korganizer-23.08.0.tar.xz"; + sha256 = "18213j807nbmyjr2583pcmvp7mql35fgwg2ngn4la30q2b1av4l8"; + name = "korganizer-23.08.0.tar.xz"; }; }; kosmindoormap = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kosmindoormap-23.04.3.tar.xz"; - sha256 = "1winrgc3698wjpil0hblw7bgbgaxgjh6h3dsl1kwc77w14f6vql3"; - name = "kosmindoormap-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kosmindoormap-23.08.0.tar.xz"; + sha256 = "1w9h7rbsb4dwxbbp0jx5cp1fvnzaj0bl2bqpvcyc6n2203v6dkad"; + name = "kosmindoormap-23.08.0.tar.xz"; }; }; kpat = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kpat-23.04.3.tar.xz"; - sha256 = "15c34vv0vdlsgrjy4i0v6ghk95c0x0h6jl0qn2bin9lgvvba3bkl"; - name = "kpat-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kpat-23.08.0.tar.xz"; + sha256 = "1q7lygdzklh6gqlm0hjd4qyw6bfglaq0d04r9yqw2ihy5dyn7wcp"; + name = "kpat-23.08.0.tar.xz"; }; }; kpimtextedit = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kpimtextedit-23.04.3.tar.xz"; - sha256 = "1rrs19bwl8qvasridysbbgsgdy9hyjlpi26hw77hli5ixkflj85b"; - name = "kpimtextedit-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kpimtextedit-23.08.0.tar.xz"; + sha256 = "15xq92d0ximnln1yk0s4fa4byhkbbgm3m0c6f4dsjdim2x57ldk3"; + name = "kpimtextedit-23.08.0.tar.xz"; }; }; kpkpass = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kpkpass-23.04.3.tar.xz"; - sha256 = "1l3k33yzfjzarc2rpf576ib86ifzrfmsvpcdmv060dy0k8lbm1k9"; - name = "kpkpass-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kpkpass-23.08.0.tar.xz"; + sha256 = "02s6gzq4qny9n5k5jcrvlpsjf6ac0wla9q24cgn52cvf85z704wp"; + name = "kpkpass-23.08.0.tar.xz"; }; }; kpmcore = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kpmcore-23.04.3.tar.xz"; - sha256 = "0cz0pz84sxa7lvkq8v25775z7x7g6pz9sq7c90pfv8h9qsz8q1l9"; - name = "kpmcore-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kpmcore-23.08.0.tar.xz"; + sha256 = "11wkcwf8971v37pz678lcx04darh5x6pzr8qdxdgf00sfv27lcld"; + name = "kpmcore-23.08.0.tar.xz"; }; }; kpublictransport = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kpublictransport-23.04.3.tar.xz"; - sha256 = "04fa9ismgkhskpmjf6b8gvra2z0jpsigz79b93m1snxm4046xihb"; - name = "kpublictransport-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kpublictransport-23.08.0.tar.xz"; + sha256 = "0lzjczj9lpxq00ady02xmdnclqg6sdhw08smhxa59pzj50m5qffg"; + name = "kpublictransport-23.08.0.tar.xz"; }; }; kqtquickcharts = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kqtquickcharts-23.04.3.tar.xz"; - sha256 = "12812djkanz0y4sxnpm3xmkjpjf4spvjsykaxby4cnsag3jpjr1v"; - name = "kqtquickcharts-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kqtquickcharts-23.08.0.tar.xz"; + sha256 = "0x9j2xggc7rw1nqyy66qx61fksqcrmzgns90an7yrcckmgivllfl"; + name = "kqtquickcharts-23.08.0.tar.xz"; }; }; krdc = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/krdc-23.04.3.tar.xz"; - sha256 = "0jva74n11fpm4ix4sbi0y1xnbly97lnap7dfj0bliw5s2d0sdjr0"; - name = "krdc-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/krdc-23.08.0.tar.xz"; + sha256 = "1ii828489kijdfnc4ac5i9mj89mcq2zw8qmf965yalagxphjp3sx"; + name = "krdc-23.08.0.tar.xz"; }; }; krecorder = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/krecorder-23.04.3.tar.xz"; - sha256 = "1dxz896jkammfigwg3nyz5mzm4npxxzgdnpqimi06swd76bjyd3k"; - name = "krecorder-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/krecorder-23.08.0.tar.xz"; + sha256 = "078nq5y0vrvzpqpbh10yg6p3w8g82z69xqlysc6vy8nvkcs3ghm6"; + name = "krecorder-23.08.0.tar.xz"; }; }; kreversi = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kreversi-23.04.3.tar.xz"; - sha256 = "1mb1xrywk5p7ipjml1g2mjqfs7rlpa41if3yc7p9zcrkcasnbffv"; - name = "kreversi-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kreversi-23.08.0.tar.xz"; + sha256 = "1b4i74i7fvkscxp2i8jjdm5f0rnggilcl8l75xvrjz3h06h0576s"; + name = "kreversi-23.08.0.tar.xz"; }; }; krfb = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/krfb-23.04.3.tar.xz"; - sha256 = "0qbrvf2wa3af1z1dpq3pqkngfbrfdgqfz8xs1qpdpyb7jxnphry7"; - name = "krfb-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/krfb-23.08.0.tar.xz"; + sha256 = "0j5qz5yb0xvlzyy6sm3v1xk4m9h1aqb4xx0k2mxpcy4m23lhyi60"; + name = "krfb-23.08.0.tar.xz"; }; }; kross-interpreters = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kross-interpreters-23.04.3.tar.xz"; - sha256 = "1cr78xz318dnqjrkfr4xbvbra6d5fssgj57vl8zybz15dyh6fbic"; - name = "kross-interpreters-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kross-interpreters-23.08.0.tar.xz"; + sha256 = "09dl86ll5v8k19sfg4jhvzl4g9f2ypnq6v9wiads41051bgx987h"; + name = "kross-interpreters-23.08.0.tar.xz"; }; }; kruler = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kruler-23.04.3.tar.xz"; - sha256 = "079kmi66xms6a9x6p3csrvqia57ip9d8r9cjdgdqx6bnn0gfc0w3"; - name = "kruler-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kruler-23.08.0.tar.xz"; + sha256 = "010yifsv5mcg9idsvfjziy2qdfqhzna2nwpzc22kfpxc3fgcfnha"; + name = "kruler-23.08.0.tar.xz"; }; }; ksanecore = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksanecore-23.04.3.tar.xz"; - sha256 = "19dd54y9mkb8lmxwz8wvmnvgq9gky3md2la9fpanxwzq2bh4237i"; - name = "ksanecore-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ksanecore-23.08.0.tar.xz"; + sha256 = "1nmx6490yr49lm39jwh941b25y5i3p7f4j66v0zbg7mq3752ggsn"; + name = "ksanecore-23.08.0.tar.xz"; }; }; kshisen = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kshisen-23.04.3.tar.xz"; - sha256 = "0bfk6nbwl35sfqxhf7cdv3n61ybi5962i2lvg7m1vlpp21q0diz8"; - name = "kshisen-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kshisen-23.08.0.tar.xz"; + sha256 = "1p4c4k3qzs6mpf53fr7crnif0l1gs4f5licd715fbv2ral874w5n"; + name = "kshisen-23.08.0.tar.xz"; }; }; ksirk = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksirk-23.04.3.tar.xz"; - sha256 = "1sp5mhnf8r3fvifz0kw74436j5kwsmiw66myygb4rsggb8amh5x4"; - name = "ksirk-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ksirk-23.08.0.tar.xz"; + sha256 = "0xrbjbbscab83vvxldbfwr3aspwfyima27a5ry65clf86r40g8fi"; + name = "ksirk-23.08.0.tar.xz"; }; }; ksmtp = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksmtp-23.04.3.tar.xz"; - sha256 = "0pz17vmn38n2xl35d9di1b9138dh54wgyal9hx412nh123w13h12"; - name = "ksmtp-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ksmtp-23.08.0.tar.xz"; + sha256 = "0kfl1zrbh9114bmvby387cgqd616i21hrhbbih6diklr2xk0ramr"; + name = "ksmtp-23.08.0.tar.xz"; }; }; ksnakeduel = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksnakeduel-23.04.3.tar.xz"; - sha256 = "182z9664p0shyx4rbr1cn32mzlfzl80x96nwakvv1ss7sf7dp1x3"; - name = "ksnakeduel-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ksnakeduel-23.08.0.tar.xz"; + sha256 = "1qhplpq4ybk4zlmh92b7v5rxki4i0j7azngc2pn8awabblylhc8j"; + name = "ksnakeduel-23.08.0.tar.xz"; }; }; kspaceduel = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kspaceduel-23.04.3.tar.xz"; - sha256 = "1mpry73vvi332wxyw2wymh3lsrj2amblg50dym9ni1lj2af657ia"; - name = "kspaceduel-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kspaceduel-23.08.0.tar.xz"; + sha256 = "01fis8xzbslvwgk7f4mdf4rijjcdkiq2zza99d4qgn3zldjznxyw"; + name = "kspaceduel-23.08.0.tar.xz"; }; }; ksquares = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksquares-23.04.3.tar.xz"; - sha256 = "0b3r99hfhm5r4jxkwiji0lww703r7dj60x2m55ginvdy7ixm46rm"; - name = "ksquares-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ksquares-23.08.0.tar.xz"; + sha256 = "1yng38zvgs91qb2w4nnmyhv8adnwq4zipqpbm4nr7ipysq7acm10"; + name = "ksquares-23.08.0.tar.xz"; }; }; ksudoku = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksudoku-23.04.3.tar.xz"; - sha256 = "03hrwyvwzhxdbq7pp03c7lkz0dhv9yi6lcwvz3s63mn01wyq6iv3"; - name = "ksudoku-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ksudoku-23.08.0.tar.xz"; + sha256 = "0cz2rjwvyg062cjx9fik75ic782i0xqcs4cvcska6m1slhv93w9m"; + name = "ksudoku-23.08.0.tar.xz"; }; }; ksystemlog = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksystemlog-23.04.3.tar.xz"; - sha256 = "15c1h1dlcgbx2adhjzry2zwia0alym7vc251zymyzhl2xjacvqlm"; - name = "ksystemlog-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ksystemlog-23.08.0.tar.xz"; + sha256 = "0k8cncpp27l7n6s7aq3iwacf41jjskxs03204y2i877nv9xg6j3x"; + name = "ksystemlog-23.08.0.tar.xz"; }; }; kteatime = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kteatime-23.04.3.tar.xz"; - sha256 = "02c3j21f0adilvwyy20pmkbrq4h33vdmrp00cqjbncsk6il5xym7"; - name = "kteatime-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kteatime-23.08.0.tar.xz"; + sha256 = "0nw9ly0jvkl9m3fr7cgmycg28379vl2n547n9k2sh8p5va545dj1"; + name = "kteatime-23.08.0.tar.xz"; }; }; ktimer = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktimer-23.04.3.tar.xz"; - sha256 = "1n5az5cgb0q28lz5f7afqjlfga32q232g836nkl1sfq8n5whj5z5"; - name = "ktimer-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ktimer-23.08.0.tar.xz"; + sha256 = "06dlhfxr3amrvbdrdq3k85i477i7qan913dqp577nlbf3wlblvsc"; + name = "ktimer-23.08.0.tar.xz"; }; }; ktnef = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktnef-23.04.3.tar.xz"; - sha256 = "00dkcmywjxzq5v2kp4klw50c3w74lmh16kbcwn8qd97kky3pd5ik"; - name = "ktnef-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ktnef-23.08.0.tar.xz"; + sha256 = "00ybqdbz5g6392yzc725pgspx8mf4123iv7pd4x7qnfzf5by91l1"; + name = "ktnef-23.08.0.tar.xz"; }; }; ktorrent = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktorrent-23.04.3.tar.xz"; - sha256 = "17q6ivnbh4zxqnbm1bdzz3hri1434sq2rs9y57lvn4bb2xdwn1z5"; - name = "ktorrent-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ktorrent-23.08.0.tar.xz"; + sha256 = "048p6lir9kk1pllpgwc5nr0laywlgd5namp70h22lmiwgaymh20r"; + name = "ktorrent-23.08.0.tar.xz"; }; }; ktouch = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktouch-23.04.3.tar.xz"; - sha256 = "1kpljbg5vjclydiymzn474wzb05bvn7587dr3pns2x09h6iv3c98"; - name = "ktouch-23.04.3.tar.xz"; - }; - }; - ktp-accounts-kcm = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-accounts-kcm-23.04.3.tar.xz"; - sha256 = "06p3fl229ks9kf820g91jb5f7qynysnybaay2pcq1yyqvv98ayrl"; - name = "ktp-accounts-kcm-23.04.3.tar.xz"; - }; - }; - ktp-approver = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-approver-23.04.3.tar.xz"; - sha256 = "0hin782xn9xdya2cv3vy79qhywjd72r2mx9sl1c69qkklqsf9xpr"; - name = "ktp-approver-23.04.3.tar.xz"; - }; - }; - ktp-auth-handler = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-auth-handler-23.04.3.tar.xz"; - sha256 = "1hn3a9rc4yzc18rxn2j6by6hjnrpnqqgzyzg7nxyrsfwcc7wgvq9"; - name = "ktp-auth-handler-23.04.3.tar.xz"; - }; - }; - ktp-call-ui = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-call-ui-23.04.3.tar.xz"; - sha256 = "1gz5a5hjsz2f9k8dyfb5k9x8n2wqps30fpf6kgv8m0mazszgy87y"; - name = "ktp-call-ui-23.04.3.tar.xz"; - }; - }; - ktp-common-internals = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-common-internals-23.04.3.tar.xz"; - sha256 = "0hhba4nwc88yhn1qai3lc0mvczw4kvqjg6h3lq4mr2zfac0g2wbs"; - name = "ktp-common-internals-23.04.3.tar.xz"; - }; - }; - ktp-contact-list = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-contact-list-23.04.3.tar.xz"; - sha256 = "1di1rbfdq28y4p0v6hdj3cyvzini6zkzzam72gffjdayp4ba5mrn"; - name = "ktp-contact-list-23.04.3.tar.xz"; - }; - }; - ktp-contact-runner = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-contact-runner-23.04.3.tar.xz"; - sha256 = "0hyj92wiaj4vzp030pfn7yr9zjx921d4x2rxgfkmhymkvj0v7pqb"; - name = "ktp-contact-runner-23.04.3.tar.xz"; - }; - }; - ktp-desktop-applets = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-desktop-applets-23.04.3.tar.xz"; - sha256 = "1sricvnmsdmh0458v04i7wkywc57vnc0w727zys9xcbbv1zc1n2r"; - name = "ktp-desktop-applets-23.04.3.tar.xz"; - }; - }; - ktp-filetransfer-handler = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-filetransfer-handler-23.04.3.tar.xz"; - sha256 = "1wnqd8xji5pykxczlgyyjf8hcxw9v131n5ssflx4wyrvkccgii95"; - name = "ktp-filetransfer-handler-23.04.3.tar.xz"; - }; - }; - ktp-kded-module = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-kded-module-23.04.3.tar.xz"; - sha256 = "1chgrjmd23kzzcrya5dch8al5x8d1ll48bb597ik2hhr8w63s3cb"; - name = "ktp-kded-module-23.04.3.tar.xz"; - }; - }; - ktp-send-file = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-send-file-23.04.3.tar.xz"; - sha256 = "1hkk88i88vwysqxbfi0ahhz6aw3snyjgz1jkcf5j5iik73xspcmb"; - name = "ktp-send-file-23.04.3.tar.xz"; - }; - }; - ktp-text-ui = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-text-ui-23.04.3.tar.xz"; - sha256 = "01rikl02cdnb77l8irz6jcbz2viq947l0wbvrqpjlvxv7x7hyvfx"; - name = "ktp-text-ui-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ktouch-23.08.0.tar.xz"; + sha256 = "0y550h945fk1jfqfyc5fyd6hfi9g7awr7ag596jjrbw552xy8ynq"; + name = "ktouch-23.08.0.tar.xz"; }; }; ktrip = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktrip-23.04.3.tar.xz"; - sha256 = "1y2gbz5jv08jjjhdy2vyvwalmj436h332dmbw8qwc06ify2r469l"; - name = "ktrip-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ktrip-23.08.0.tar.xz"; + sha256 = "1y3xkkjh8ip4mcx5y6396axbylpql1iyfz9y115r7s7n8hb1qrfp"; + name = "ktrip-23.08.0.tar.xz"; }; }; ktuberling = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktuberling-23.04.3.tar.xz"; - sha256 = "0zk7wijp425657s2j7xq7mhybgyddpam88ih8i0sbpcs0sliyz7k"; - name = "ktuberling-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ktuberling-23.08.0.tar.xz"; + sha256 = "1wc74cpvalp0xpnhsqkbqyk3gjnzmi95hqdsj4wpqj60mh78zzy7"; + name = "ktuberling-23.08.0.tar.xz"; }; }; kturtle = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kturtle-23.04.3.tar.xz"; - sha256 = "0hknmg65kafm1f6885yiz86g9jpqyycjg6208iyi6i15lyqjr4a9"; - name = "kturtle-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kturtle-23.08.0.tar.xz"; + sha256 = "064kf6apwxnv7zmpv1mal3y4i7y46rd939dfa9dk4x41d3la2mlv"; + name = "kturtle-23.08.0.tar.xz"; }; }; kubrick = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kubrick-23.04.3.tar.xz"; - sha256 = "0nank1ga4c4xfsw0m1cqhjhyz2wpbsxplyyb9x3l2vpg92gj5dbs"; - name = "kubrick-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kubrick-23.08.0.tar.xz"; + sha256 = "0y0h7l3mpijm08r13hlfy1dmx34kafndx0cr7vll0wb3b9xhlpqv"; + name = "kubrick-23.08.0.tar.xz"; }; }; kwalletmanager = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kwalletmanager-23.04.3.tar.xz"; - sha256 = "1g3yw32kv7yij2ymk52fpp0srncr2ijfckfvz5hc0nsn7xhyqdby"; - name = "kwalletmanager-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kwalletmanager-23.08.0.tar.xz"; + sha256 = "0hf3288bhyr8864k0fm6kw77rx13fbkhxlspisl4l7algc9z5qfq"; + name = "kwalletmanager-23.08.0.tar.xz"; }; }; kwave = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kwave-23.04.3.tar.xz"; - sha256 = "0s9w8jgwblljwfji2a19bqs3nx6sr2qzz35kwbi0ahwncy69k4jx"; - name = "kwave-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kwave-23.08.0.tar.xz"; + sha256 = "0a278cq9ya3cvvzllminkiw1ac8g0g5qs5ay59xh6h4mn6lxn0y4"; + name = "kwave-23.08.0.tar.xz"; }; }; kweather = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kweather-23.04.3.tar.xz"; - sha256 = "1147lagd99m5qgpy9dk5vkc500p2jw4nb50kjhr1b9yhdz8dcbwn"; - name = "kweather-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kweather-23.08.0.tar.xz"; + sha256 = "00ympmljkp8xvl8gg86dbmyd5mxasg6wfx17jgyrvwh0fdq150q5"; + name = "kweather-23.08.0.tar.xz"; }; }; kwordquiz = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kwordquiz-23.04.3.tar.xz"; - sha256 = "15abyxccp02b1bmcb79g0k7sd6j6dmhw2k8l2h9as2ja4r5xhir1"; - name = "kwordquiz-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kwordquiz-23.08.0.tar.xz"; + sha256 = "1n7lh8xyp5w0r3d4dijsl8lnv2az6vvkbnlywbhjcs28lc1s392g"; + name = "kwordquiz-23.08.0.tar.xz"; }; }; libgravatar = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libgravatar-23.04.3.tar.xz"; - sha256 = "03zhnpb114y6a6vhiv9c1fiqsinjmk52j1k9w2r04ibxp35m3xj7"; - name = "libgravatar-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libgravatar-23.08.0.tar.xz"; + sha256 = "1v8lljgawzdrfv2dcbrxkih6as67q3p2id093nxks6x3j81li223"; + name = "libgravatar-23.08.0.tar.xz"; }; }; libkcddb = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkcddb-23.04.3.tar.xz"; - sha256 = "1s10g6m6c3h14gzxvp2s0v51jxzsrh23xfn7gl51a0r50srbbz52"; - name = "libkcddb-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkcddb-23.08.0.tar.xz"; + sha256 = "0pkiy5qfmy58s6zvss1zx837jg6nv696m2z99vyj5nshz7926gv4"; + name = "libkcddb-23.08.0.tar.xz"; }; }; libkcompactdisc = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkcompactdisc-23.04.3.tar.xz"; - sha256 = "0gl21mhfz3vj89x0r8y79yiijcag1xfdnyfrjqzkx9i8yd2k45b1"; - name = "libkcompactdisc-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkcompactdisc-23.08.0.tar.xz"; + sha256 = "0m677c12hxd7n7vf887x8pp29i3y42kvvj9ah3rgza7qr7w5bnpf"; + name = "libkcompactdisc-23.08.0.tar.xz"; }; }; libkdcraw = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkdcraw-23.04.3.tar.xz"; - sha256 = "0vwr44j77c1vffsppkzdasd0l8apzx7jn6llwhzb4bjp93arx18w"; - name = "libkdcraw-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkdcraw-23.08.0.tar.xz"; + sha256 = "0iyq01ql0v0vvcca2qa7vi02kby76446qja7vg6h70524pgvdjx3"; + name = "libkdcraw-23.08.0.tar.xz"; }; }; libkdegames = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkdegames-23.04.3.tar.xz"; - sha256 = "1sicpfsrkxn5d0fdy71h7033rpkb94r5hjvv5ab7qbmzb1qa4awq"; - name = "libkdegames-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkdegames-23.08.0.tar.xz"; + sha256 = "12nb3gj8capcajb9s5qga3i58b57vv3fqn000wsqg3bb4l2wg6c7"; + name = "libkdegames-23.08.0.tar.xz"; }; }; libkdepim = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkdepim-23.04.3.tar.xz"; - sha256 = "1i5c4qqd4ghlfjvxniy8sbfqh0fsrz4sadvh0n2d207s9rsl274v"; - name = "libkdepim-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkdepim-23.08.0.tar.xz"; + sha256 = "1vhcd0r8lqwm09i95c8x913ld4f6mqm6r83d3s67m0s0gm3zhf10"; + name = "libkdepim-23.08.0.tar.xz"; }; }; libkeduvocdocument = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkeduvocdocument-23.04.3.tar.xz"; - sha256 = "04qnahyy3400ys56nvqlq5lgyp5w64bxj13jpljggja5r72ay9n0"; - name = "libkeduvocdocument-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkeduvocdocument-23.08.0.tar.xz"; + sha256 = "0ibjacd0nqgkjfn9dhr2pibh10fzmd601lp7ycr0nafn11k8fdyn"; + name = "libkeduvocdocument-23.08.0.tar.xz"; }; }; libkexiv2 = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkexiv2-23.04.3.tar.xz"; - sha256 = "16cb7cab4pyarwwn2byyvanwlakcgq5h203hkysp44flszq515cl"; - name = "libkexiv2-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkexiv2-23.08.0.tar.xz"; + sha256 = "0rkb7zfzn0m67fjcy5qmzz1hvwjrhf1ylk0rjddyvpyn7ndnnisy"; + name = "libkexiv2-23.08.0.tar.xz"; }; }; libkgapi = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkgapi-23.04.3.tar.xz"; - sha256 = "18jcrp7qi35zxzb4b7mn6519bjw47s7kwfahd6a50p40j17k09bs"; - name = "libkgapi-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkgapi-23.08.0.tar.xz"; + sha256 = "0rnzf2g66kf7krv1ab7ipz2cgzbcd87c7rkmd67q73ia3nw8r6lp"; + name = "libkgapi-23.08.0.tar.xz"; }; }; libkipi = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkipi-23.04.3.tar.xz"; - sha256 = "1g6p7nvdd1k7p5nixq7p18zd0dmr5ym6irvz7s9j879a71w444j8"; - name = "libkipi-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkipi-23.08.0.tar.xz"; + sha256 = "0bz0fhwish0ry2hxljkzj5vqv2rbapprvyv6hsvwnc9j6bzf72lj"; + name = "libkipi-23.08.0.tar.xz"; }; }; libkleo = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkleo-23.04.3.tar.xz"; - sha256 = "0l77n4dlbv9hclzvh69kdzji907if7yayxiasxnnjkzsvcm1af25"; - name = "libkleo-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkleo-23.08.0.tar.xz"; + sha256 = "0087mhn5h8zg696dwkpinvfjyn0scss7ggh2avm00qf1m5z8pbyc"; + name = "libkleo-23.08.0.tar.xz"; }; }; libkmahjongg = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkmahjongg-23.04.3.tar.xz"; - sha256 = "1a0c0q34h5yxwx76y6934ibn6hm1ip1hc2xvl11q1kaazq0alca3"; - name = "libkmahjongg-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkmahjongg-23.08.0.tar.xz"; + sha256 = "1r5qwgx5qdmb0lzbw1jbid8lyms3flr51swljbv8vd0ivyj8vh88"; + name = "libkmahjongg-23.08.0.tar.xz"; }; }; libkomparediff2 = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkomparediff2-23.04.3.tar.xz"; - sha256 = "1zkiyyrbfbr1i7zyhhayf53daaarzc8a2xz0iqjy9za7rawnmgbv"; - name = "libkomparediff2-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkomparediff2-23.08.0.tar.xz"; + sha256 = "1qg5hjga7za1j2an2qgbfg1gnngz7bbimhasaabxp1dah81z7j2l"; + name = "libkomparediff2-23.08.0.tar.xz"; }; }; libksane = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libksane-23.04.3.tar.xz"; - sha256 = "0hmsrkrcqiyhdcshln5jg9xzqn7xvyjj1g6vrx82pfs1lwsczhr6"; - name = "libksane-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libksane-23.08.0.tar.xz"; + sha256 = "1q3acb4iyqqwwkhi12xiajc4094ckkrf62s463hk8xqn1z7chm9i"; + name = "libksane-23.08.0.tar.xz"; }; }; libksieve = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libksieve-23.04.3.tar.xz"; - sha256 = "066z33v30h568bmdcsl4v478p3xhiwsmq7pr7kziilrhy3a2m7p6"; - name = "libksieve-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libksieve-23.08.0.tar.xz"; + sha256 = "0yz2539lcnhsyxq997rs25dn6djwbbmc2syhkysny3ar088drwj9"; + name = "libksieve-23.08.0.tar.xz"; }; }; libktorrent = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libktorrent-23.04.3.tar.xz"; - sha256 = "1m6gyk1bids7qr9wfh6gcfq73ac9j5b2bljvfvfsw9f1ky1cmwab"; - name = "libktorrent-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libktorrent-23.08.0.tar.xz"; + sha256 = "1xi66zrdigxw61psg8j1y1jm2qz9acynbjdiz497gq125n6cmh0g"; + name = "libktorrent-23.08.0.tar.xz"; }; }; lokalize = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/lokalize-23.04.3.tar.xz"; - sha256 = "0czkb5dk44yb5zwknq3s2m5im99fs06dmbsp60gx2m6p355m4w8z"; - name = "lokalize-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/lokalize-23.08.0.tar.xz"; + sha256 = "12xhla3kcwd6qg1f2ihwzdssv922vnzmiyldbzxxbyyd51dkqwsa"; + name = "lokalize-23.08.0.tar.xz"; }; }; lskat = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/lskat-23.04.3.tar.xz"; - sha256 = "1qphzc1r26qwc8sl5rjkw16ia3lsj7c2lg9fxnhk08k8mxncymxg"; - name = "lskat-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/lskat-23.08.0.tar.xz"; + sha256 = "11sxz0lzcc9vw1xcs5gw4as0wn9y90ibcagadq3h078awp8n2vl5"; + name = "lskat-23.08.0.tar.xz"; }; }; mailcommon = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/mailcommon-23.04.3.tar.xz"; - sha256 = "165a0qf6i2862dpsw4wvgnxi4wv7hnc9s63fsf9jp6kbwwfw9nqv"; - name = "mailcommon-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/mailcommon-23.08.0.tar.xz"; + sha256 = "0xm9qlxcjf07p086w7ajqj7ksih2v61ycajxp1qxjhjmbl5wsbd4"; + name = "mailcommon-23.08.0.tar.xz"; }; }; mailimporter = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/mailimporter-23.04.3.tar.xz"; - sha256 = "18shpxz7rg64g2mxdhdjhxhn893m0930v76cdnij339ycbcq5ypc"; - name = "mailimporter-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/mailimporter-23.08.0.tar.xz"; + sha256 = "00m3ibqyghxfh6bdq4h60b10snzgaijfss5dbyfqzd5a2c08070m"; + name = "mailimporter-23.08.0.tar.xz"; }; }; marble = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/marble-23.04.3.tar.xz"; - sha256 = "14ys9yfnwh3i64wm198gsf7z1iyxsi5wv93ygv0wy7rv9czb1zl8"; - name = "marble-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/marble-23.08.0.tar.xz"; + sha256 = "1djvylddhpvqyr6h7kq9y215a4m5fxgdz5y9yzrsr1yf16fzj6x1"; + name = "marble-23.08.0.tar.xz"; }; }; markdownpart = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/markdownpart-23.04.3.tar.xz"; - sha256 = "0w3aflbsrmbgsiin3xl7svrw3rwbj3dk9kh3ibycvvmrp03p9yp4"; - name = "markdownpart-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/markdownpart-23.08.0.tar.xz"; + sha256 = "0ddjgvnljhng71xdv6zpi0csi6q0xigwc28fv1by70x035f0z5yn"; + name = "markdownpart-23.08.0.tar.xz"; }; }; mbox-importer = { - version = "23.04.3"; + version = "23.08.0"; + src = fetchurl { + url = "${mirror}/stable/release-service/23.08.0/src/mbox-importer-23.08.0.tar.xz"; + sha256 = "1qq945m0rmrf37rnwp8a7dqchzwwhqnrsliiqz40y6qsblzigvlj"; + name = "mbox-importer-23.08.0.tar.xz"; + }; + }; + merkuro = { + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/mbox-importer-23.04.3.tar.xz"; - sha256 = "0qaz4r69gmqag6jwmxk54rih78sh88jsw2qvyjhdhdywc4r8bx32"; - name = "mbox-importer-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/merkuro-23.08.0.tar.xz"; + sha256 = "0xrrjx592vw0qxgsna08rhsj8yhq5kmg9gl138aqhaib9x05dsia"; + name = "merkuro-23.08.0.tar.xz"; }; }; messagelib = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/messagelib-23.04.3.tar.xz"; - sha256 = "0aqac0p46cwnr3qxjk0ivalfwjcgwy52s088wnk6ckp77m7r65is"; - name = "messagelib-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/messagelib-23.08.0.tar.xz"; + sha256 = "1dqzsm6i0nm565xi4nhvslkmyxcsycg36x4m3jr1njwlphpg86jy"; + name = "messagelib-23.08.0.tar.xz"; }; }; minuet = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/minuet-23.04.3.tar.xz"; - sha256 = "1lsnm52jcr37bk8lf9j1h6nvx2avc4z12g418bhg3424bwv4pmlf"; - name = "minuet-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/minuet-23.08.0.tar.xz"; + sha256 = "0g4a7r6av4bczd4ra18axlhdl25xpi7liq76bg863x4vkvcxwq86"; + name = "minuet-23.08.0.tar.xz"; }; }; neochat = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/neochat-23.04.3.tar.xz"; - sha256 = "015g42qbnj0g5n6swjj85nsxvlcih829ff11l14h1a7f4ip00yif"; - name = "neochat-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/neochat-23.08.0.tar.xz"; + sha256 = "1ywbfmiv37bxq046l85xchryv04mqmsl0x4s49rk3r88lfgimbaf"; + name = "neochat-23.08.0.tar.xz"; }; }; okular = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/okular-23.04.3.tar.xz"; - sha256 = "1vgcqkq6mzd270hzabmdqqv105iv6kr6ah2h18b15al2n9rmg0bi"; - name = "okular-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/okular-23.08.0.tar.xz"; + sha256 = "0f38k4jvbhlg0fyns6k128x91307sd9day3rxsc5423mz52cailv"; + name = "okular-23.08.0.tar.xz"; }; }; palapeli = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/palapeli-23.04.3.tar.xz"; - sha256 = "19xh03rhb48m4bbdmpga4aqij6agqg047ghl92p98z1phg5lxzrv"; - name = "palapeli-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/palapeli-23.08.0.tar.xz"; + sha256 = "19cxxcj2vzy7bd27lgvx1jlhchmn5dr9i3x13zhyqhq7fgash31l"; + name = "palapeli-23.08.0.tar.xz"; }; }; parley = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/parley-23.04.3.tar.xz"; - sha256 = "136ygvdv0p9pfpbyddc1y3jj8jaak2r5b4szrfaq051m3y54i9mb"; - name = "parley-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/parley-23.08.0.tar.xz"; + sha256 = "19w4mmi0pn167mwg49k9ldd7827vs2crg3p00lvcxbiywxc3n88w"; + name = "parley-23.08.0.tar.xz"; }; }; partitionmanager = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/partitionmanager-23.04.3.tar.xz"; - sha256 = "03xx3nh2grkgkjn8dixy529lb4gnrdhlzhzsry82g64f8c6sfqqm"; - name = "partitionmanager-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/partitionmanager-23.08.0.tar.xz"; + sha256 = "01pjka3mc0lh5s3mc8w73mjrn89yxfrzq5fyyam13dglyxcy0z3w"; + name = "partitionmanager-23.08.0.tar.xz"; }; }; picmi = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/picmi-23.04.3.tar.xz"; - sha256 = "1x1iv6a840jwldfpx44wvh1vki1jz1hixzvzhdfx2mhw05v91fjx"; - name = "picmi-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/picmi-23.08.0.tar.xz"; + sha256 = "1z6rv7zi5ywsiz9l7snrw3f79m0w7pfhf5qnp7qlz5pj6k9f3b9y"; + name = "picmi-23.08.0.tar.xz"; }; }; pim-data-exporter = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/pim-data-exporter-23.04.3.tar.xz"; - sha256 = "1bwh5srkdlqmxindci9416zmrp0gjvci59zyilvnr09kwg7lmwn0"; - name = "pim-data-exporter-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/pim-data-exporter-23.08.0.tar.xz"; + sha256 = "03rnrinkadvxgh4h75vs8aq4r7jf9vyhk14l4ixfzqbsxc6jllmf"; + name = "pim-data-exporter-23.08.0.tar.xz"; }; }; pim-sieve-editor = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/pim-sieve-editor-23.04.3.tar.xz"; - sha256 = "1yik788sniv7jh1w9wwc4rf06x1kd3bwkb3vflckinn37y2rpl4a"; - name = "pim-sieve-editor-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/pim-sieve-editor-23.08.0.tar.xz"; + sha256 = "1i750958l16jp8gikv0rxy4hzrl2dpfda069mr68ih4l1dndj6am"; + name = "pim-sieve-editor-23.08.0.tar.xz"; }; }; pimcommon = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/pimcommon-23.04.3.tar.xz"; - sha256 = "1v2nv83h9p1ajbcwfdk8b7lrr84r8c855lysknzvzkpm5z012z3l"; - name = "pimcommon-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/pimcommon-23.08.0.tar.xz"; + sha256 = "1q14yjaa51mkc5x1dccln82cw2kdkr1g5601s0pkxfy13dnqb0dv"; + name = "pimcommon-23.08.0.tar.xz"; }; }; plasmatube = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/plasmatube-23.04.3.tar.xz"; - sha256 = "0wmzzh8db3ybzhn9hh4j9c126pzcdshz4a0fzakgx93z1ph59pcg"; - name = "plasmatube-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/plasmatube-23.08.0.tar.xz"; + sha256 = "1k8xzmsg34b8xjb16mlcrq9y87b3f8pwk971dvjng1b1ml425m5c"; + name = "plasmatube-23.08.0.tar.xz"; }; }; poxml = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/poxml-23.04.3.tar.xz"; - sha256 = "11rqd7hhsy6f8qi0529cmy381bhskji6wf4fij7yjksmrsdvfw6d"; - name = "poxml-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/poxml-23.08.0.tar.xz"; + sha256 = "10qn0bz0k5sdrxd0mp75ri1dafh6djdpmypkg4y6lc27q2ghfi8p"; + name = "poxml-23.08.0.tar.xz"; }; }; print-manager = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/print-manager-23.04.3.tar.xz"; - sha256 = "1fnbkx2xk3pr3cwcji1xbswcf5b7h8r4kag8i3lv28cnjw3ahs52"; - name = "print-manager-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/print-manager-23.08.0.tar.xz"; + sha256 = "09p4bwgqg1wzns37wig4wc5304pnab1n77zs3nv55k7kqk2b58cv"; + name = "print-manager-23.08.0.tar.xz"; }; }; qmlkonsole = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/qmlkonsole-23.04.3.tar.xz"; - sha256 = "146c7rzgr3m2gw8ndac9i2kzkhpinn86h17f3vky6kph6nrmlx9j"; - name = "qmlkonsole-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/qmlkonsole-23.08.0.tar.xz"; + sha256 = "0xyzdhb0r3wilc44h7mw6bg5axw7n5pbmlq4wf1k1pjd1m910ilg"; + name = "qmlkonsole-23.08.0.tar.xz"; }; }; rocs = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/rocs-23.04.3.tar.xz"; - sha256 = "13bzxsicsylfq7kdpfik4afgkbv2g7avg3imbkiw969jbgl8qbmb"; - name = "rocs-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/rocs-23.08.0.tar.xz"; + sha256 = "15havvabqzwbqapz5lkw9wq0yl9bskya87yb0sgg3ing658i1kxq"; + name = "rocs-23.08.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/signon-kwallet-extension-23.04.3.tar.xz"; - sha256 = "067lldmvsrr1p2vp15xi2zwaq61x55yh7wqq3nhmmblpjiimywvl"; - name = "signon-kwallet-extension-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/signon-kwallet-extension-23.08.0.tar.xz"; + sha256 = "0hyp9mn52qh88dn9cf223nw917xxrzdfilxpjyxzpffsbdv7kf51"; + name = "signon-kwallet-extension-23.08.0.tar.xz"; }; }; skanlite = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/skanlite-23.04.3.tar.xz"; - sha256 = "0g6p3m16vx8cmshyj1c5qkvlhghi1az6rv6jqkzwjjk5mzchmcgj"; - name = "skanlite-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/skanlite-23.08.0.tar.xz"; + sha256 = "126l8va5kyxsa78gsj1y7d85449rwm6ccrnrpd4p9cmaxz4vld26"; + name = "skanlite-23.08.0.tar.xz"; }; }; skanpage = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/skanpage-23.04.3.tar.xz"; - sha256 = "1j5jaq67mrnrb0vgspb5rlhcvpskc3f4bfnksr84njrv0jd3gzi2"; - name = "skanpage-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/skanpage-23.08.0.tar.xz"; + sha256 = "1wgjp10yp7siklqbssxq9fm0c7bqw6fihhn0q1khn5c42dr2xbh1"; + name = "skanpage-23.08.0.tar.xz"; }; }; spectacle = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/spectacle-23.04.3.tar.xz"; - sha256 = "1fyklcvz0zndxabflkka75rham6768rp01as7m5dv0ic4lipkf9m"; - name = "spectacle-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/spectacle-23.08.0.tar.xz"; + sha256 = "1vn1w9ywkf5f4d1i02hf3qha6647cx3nwaj5cv70rxyp71x1wfrq"; + name = "spectacle-23.08.0.tar.xz"; }; }; step = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/step-23.04.3.tar.xz"; - sha256 = "0ayg41vw4ssaq1zk3a8vs8gbvvbkkq042msasas5avq1pdixl470"; - name = "step-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/step-23.08.0.tar.xz"; + sha256 = "138b5l79zzhi0yms4h4nimyfhkr4pnpn0p7xhhl0jhyqmgjpyyqv"; + name = "step-23.08.0.tar.xz"; }; }; svgpart = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/svgpart-23.04.3.tar.xz"; - sha256 = "0cc4b4iq19ylmmawapcnk5d6h0qj30x9gm81x3w4k29pp754mmli"; - name = "svgpart-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/svgpart-23.08.0.tar.xz"; + sha256 = "0ljys7hi2drz6bmk4h62d07j4jrgv6pla8aqvsxs6fckb88knsjm"; + name = "svgpart-23.08.0.tar.xz"; }; }; sweeper = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/sweeper-23.04.3.tar.xz"; - sha256 = "19b382cgdcd4qh4ppdmbhsacvcc9nlbs7spcg8ii02bdpx6qw9b7"; - name = "sweeper-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/sweeper-23.08.0.tar.xz"; + sha256 = "1g3k249zf077d6w2264szih2gvhvd2p5pbx6xvxb685p7bg0kiva"; + name = "sweeper-23.08.0.tar.xz"; }; }; telly-skout = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/telly-skout-23.04.3.tar.xz"; - sha256 = "0rnidnzv8qifb5ci3qk0sfvadycqg5wfdmiv47pgmp61jsgrqgrb"; - name = "telly-skout-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/telly-skout-23.08.0.tar.xz"; + sha256 = "1d102ldb9ycprz2x2iv7f835w4az9bi9cgsdmx2pglizi0sk7azm"; + name = "telly-skout-23.08.0.tar.xz"; }; }; tokodon = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/tokodon-23.04.3.tar.xz"; - sha256 = "021pd3r4hxa7g9jswb9c57j8c9gxyjclrk6r5fm2nnai5z7cz1ky"; - name = "tokodon-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/tokodon-23.08.0.tar.xz"; + sha256 = "1dwbx6v95pmid0pl77l798kmazjh5bmwscp15wql3nvz9p1wdj2h"; + name = "tokodon-23.08.0.tar.xz"; }; }; umbrello = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/umbrello-23.04.3.tar.xz"; - sha256 = "1mk779xl4vqk7qz7vlxyc2ddx1345pg8mz46igkragrx1kq4vbzw"; - name = "umbrello-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/umbrello-23.08.0.tar.xz"; + sha256 = "0bjaz0lig3n5vjyarydjlgc934jg35g74br5cdmn8xlmm5y73ffb"; + name = "umbrello-23.08.0.tar.xz"; }; }; yakuake = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/yakuake-23.04.3.tar.xz"; - sha256 = "17ylm5z5lzjq5g4d48s0clpl3hg4rym9sc1p5hr0wfs9jx7197jy"; - name = "yakuake-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/yakuake-23.08.0.tar.xz"; + sha256 = "1q72rcwjrrjdwx9sy4w020ydgnqg4myi6icv0vr2fkfcsxr6r0q5"; + name = "yakuake-23.08.0.tar.xz"; }; }; zanshin = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/zanshin-23.04.3.tar.xz"; - sha256 = "0f6d2wf9vly7qqbzv9nfahjvyi8db77anb9w0qfc95i69hggy2yj"; - name = "zanshin-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/zanshin-23.08.0.tar.xz"; + sha256 = "01w4m27pw6nrf5m8xfxwhfmvgr24jlbys9h3byfl1ddr9l6f3l6x"; + name = "zanshin-23.08.0.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/applications/kde/tokodon.nix b/nixpkgs/pkgs/applications/kde/tokodon.nix index bf40a5a00155..43da82e89018 100644 --- a/nixpkgs/pkgs/applications/kde/tokodon.nix +++ b/nixpkgs/pkgs/applications/kde/tokodon.nix @@ -20,6 +20,7 @@ , qtwebsockets , kitemmodels , pimcommon +, mpv }: mkDerivation { @@ -47,6 +48,7 @@ mkDerivation { qtwebsockets kitemmodels pimcommon + mpv ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/1password/default.nix b/nixpkgs/pkgs/applications/misc/1password/default.nix index 4a05bc4e3a51..82eb6fce2549 100644 --- a/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.19.0"; + version = "2.20.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-/sP5Z52fWkRcv+Wj45HTV1Ckve+jA92m91kGGJwdC6s=" "zip"; - i686-linux = fetch "linux_386" "sha256-UGPWk0I/nCaqWWz/rwG/TSDie0/tarKroGi+7Ge7kE4=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-rSZM0GuroSqVokhkjPtk3+2+C9w5/Tkh2cvB+kShyHY=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-3zVD8LUdxhzroLlnQCiCVELEQMPmCriRff85ZlfgSKI=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-D9cPNtHiofY/Fb2EO+AGexRSqY+AidZm0D9+9W9dCUY=" "zip"; + i686-linux = fetch "linux_386" "sha256-sY8kI4InFGZIFoz5rfvNMxA9C4u6Qcg3vNTsoY7X6OY=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-TkfEh75k3KzvvInPAsYDhS2OIKQpBOCaT6qRIld+wQ8=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-kytAXelvvP+SBaniHlo9JTK1LLRrefgLuWPhC8sC7U8=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix index 0dbcf051c3c9..5d335a5325d1 100644 --- a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "5.4.7.3"; + version = "5.4.8.3"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-xxHNMqFHxFVbKpy9JHHif4GZ/jk9CUUwgyPWmlTXgcc="; + hash = "sha256-ySiN5iPs+EtgzPJJpKvD7BR3Z2xa4HLnTEtqroW478w="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; diff --git a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 40c6bf53a7c0..3b621fe971be 100644 --- a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -56,12 +56,12 @@ (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; sha256 = "1k6nnawd016xpwgzdzy84z1lcv2vc1cygcksw19wbgd8dharyyk7"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.2.0"; sha256 = "0nx7nrzbg9gk9skdc9x330cbr5xbsly6z9gzxm46vywf55yp8vaj"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.31.0"; sha256 = "1amf0yp5fqdkrr2r6nscpw1h1r3gghhxbczk6j255smdhhy0dzv9"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.2"; sha256 = "1wwmg6hn4dp2mvwn2bm81wccdw149lq17xdnpz17mvg4zcwmax7g"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.3"; sha256 = "1xxzd2yxlbq2h4k6flp7lvffmmwrjlyha2z1yvrxxymiyyggk2zg"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) @@ -71,14 +71,14 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.2"; sha256 = "1a658bnh5q3lfkrr81h3lyx1mc3hggnjr1bpmim71rr2s42ad70v"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.3"; sha256 = "1f2b9ljc3l6lk2qq3ps6pzb5r4dvqvs9j1xav8kj2yy52i2dbz7r"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.2"; sha256 = "0asbrbdyyig1p034smf79lszzbfv1cn6q181i7d4p2vsiqpjp9sj"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.2"; sha256 = "0lcj8kkcnxbwiaw6j0xf4fxqpa6z0s41nq52spvckfg4367lg4fg"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.3"; sha256 = "0czzs36ybgipn9bga2swkdd653vh0wvs5hsi2lgykhblimdmb947"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.3"; sha256 = "0yi0n8jxf4l6v8bscgi8ws9zf5i84213pf1qj5d7nwx4jb05m23l"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.4"; sha256 = "02jffh6kmkccakr51v3iwwq3281sypdilpjjf845dwrsl9ksf73k"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.4"; sha256 = "0dz0mn6bp3bb650k992mr2lga7xn1xc3qfbdfivgknfccyy8d6k8"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.1.1"; sha256 = "0y3ic8jv5jhld6gan2qfa2wyk4z57f7y4y5a47njr0jvxxnarg2c"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.1.1"; sha256 = "1lbgkrbrkmw4c54g61cwbmwc4zl8hyqmp283ymvj93lq7chbxasn"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) @@ -86,9 +86,9 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.2.0"; sha256 = "1j27wrjxjpfy10s5182d477y6qb50fdak6r0vx44bbsakmv0zv3s"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.0"; sha256 = "08rlrag6ilxn1wyd5ivsny0rgidsn3imsx5bqjwv5dlwdjh5acfh"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.0"; sha256 = "1fmdp6bjzcj1nfpnlzcyszl8jnmr35gd79ngqx6cikpg8xpyczhr"; }) + (fetchNuGet { pname = "NLog"; version = "5.2.2"; sha256 = "1r3r2sm97lirfd4sb8vhshl8iy9pg006glrgagapxhrh5kapn44g"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.2"; sha256 = "1ixfyx1pg5j7id6kr3blxpbffmzhw9944ha1k6bp8l41rzcny4z8"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.2"; sha256 = "0251bi5fwqx1vvndw604lsgmhaq1sn74kfmpn5i3nr2j7rs5lyax"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.16"; sha256 = "0pwlqlq2p8my2sr8b0cvdav5cm8wpwf3s4gy7s1ba701ac2zyb9y"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.16"; sha256 = "00znhikq7valr3jaxg66cwli9hf75wkmmpf6rf8p790hf8lxq0c5"; }) diff --git a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index c04eb6811d0d..6c0e749b2085 100644 --- a/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -9,11 +9,11 @@ buildNpmPackage { repo = "ASF-ui"; # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version - rev = "0dc9b31a571fe840ac1661b9e9777f253304529d"; - hash = "sha256-gY+4H6roqqoRFTwyNboXKg8LM7BfxQYYij/eilohFNY="; + rev = "578e8eacf9eb0367d864ed741017dce23415c1be"; + hash = "sha256-It76gyrTPiZFEj9aSFKwAsj2jhV3zacJS8CNl4sr7OU="; }; - npmDepsHash = "sha256-3sRjlFuFyG8j8CPKG8Gj5QhE4YD9DJ5qaTJlNJT2Oao="; + npmDepsHash = "sha256-7404OPGhF7bgdvtyfLM/7zRXGUWPr2RLUCzeaHcCj0A="; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix b/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix index 3ab0b19f63b8..6ef313fa6def 100644 --- a/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix +++ b/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix @@ -14,6 +14,12 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; + # The build scripts copy the entire translations directory from Qt + # which ends up being read-only because it's in the store. + preBuild = '' + chmod +w resources/translations + ''; + buildInputs = [ qtsvg qttools qtwebsockets qtquickcontrols2 qtgraphicaleffects pcsclite ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/birdtray/default.nix b/nixpkgs/pkgs/applications/misc/birdtray/default.nix index f007fb71377b..5ab42d36b3a0 100644 --- a/nixpkgs/pkgs/applications/misc/birdtray/default.nix +++ b/nixpkgs/pkgs/applications/misc/birdtray/default.nix @@ -7,7 +7,6 @@ , qtbase , qttools , qtx11extras - , qttranslations }: mkDerivation rec { @@ -21,21 +20,11 @@ mkDerivation rec { sha256 = "1469ng6zk0qx0qfsihrnlz1j9i1wk0hx4vqdaplz9mdpyxvmlryk"; }; - patches = [ - # See https://github.com/NixOS/nixpkgs/issues/86054 - ./fix-qttranslations-path.diff - ]; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qtbase qttools qtx11extras ]; - postPatch = '' - substituteInPlace src/birdtrayapp.cpp \ - --subst-var-by qttranslations ${qttranslations} - ''; - # Wayland support is broken. # https://github.com/gyunaev/birdtray/issues/113#issuecomment-621742315 qtWrapperArgs = [ "--set QT_QPA_PLATFORM xcb" ]; diff --git a/nixpkgs/pkgs/applications/misc/birdtray/fix-qttranslations-path.diff b/nixpkgs/pkgs/applications/misc/birdtray/fix-qttranslations-path.diff deleted file mode 100644 index 2a379b5e2744..000000000000 --- a/nixpkgs/pkgs/applications/misc/birdtray/fix-qttranslations-path.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/birdtrayapp.cpp b/src/birdtrayapp.cpp -index 847b4d3..3a3709a 100644 ---- a/src/birdtrayapp.cpp -+++ b/src/birdtrayapp.cpp -@@ -130,7 +130,7 @@ bool BirdtrayApp::loadTranslations() { - [](QString path) { return path.append("/translations"); }); - QLocale locale = QLocale::system(); - bool success = loadTranslation( -- qtTranslator, locale, "qt", {QLibraryInfo::location(QLibraryInfo::TranslationsPath)}); -+ qtTranslator, locale, "qt", {QLatin1String("@qttranslations@/translations")}); - success &= loadTranslation(dynamicTranslator, locale, "dynamic", locations); - success &= loadTranslation(mainTranslator, locale, "main", locations); - return success; diff --git a/nixpkgs/pkgs/applications/misc/bottles/default.nix b/nixpkgs/pkgs/applications/misc/bottles/default.nix index 64f0df2e4a7f..eb0c6a841425 100644 --- a/nixpkgs/pkgs/applications/misc/bottles/default.nix +++ b/nixpkgs/pkgs/applications/misc/bottles/default.nix @@ -28,13 +28,13 @@ python3Packages.buildPythonApplication rec { pname = "bottles-unwrapped"; - version = "51.6"; + version = "51.9"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = "bottles"; rev = version; - sha256 = "sha256-9oEC+ksgHz2HP4jVwTbLzjqc8WG1+S8hmVgl2dcuPB0="; + sha256 = "sha256-iZUszwVcbVn6Xsqou6crSp9gJBRmm5vEqxS87h/s3PQ="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch b/nixpkgs/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch deleted file mode 100644 index 7ba0dab2d1e2..000000000000 --- a/nixpkgs/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 324a267b0e5505c9124874581bc48fb174fb2542 Mon Sep 17 00:00:00 2001 -From: "P. R. d. O" <d.ol.rod@tutanota.com> -Date: Fri, 4 Mar 2022 07:03:17 -0600 -Subject: [PATCH] Pillow update - ---- - pyproject.toml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 5dc25e0..b3ba397 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -11,7 +11,7 @@ readme = "README.rst" - [tool.poetry.dependencies] - python = "^3.7" - logbook = "^1.5.3" --Pillow = "^8.2.0" -+Pillow = "^9.0.0" - requests = "^2.24.0" - kiss-headers = "^2.2.3" - single-version = "^1.5.1" -@@ -33,4 +33,4 @@ skip-string-normalization = true - - [build-system] --requires = ["poetry>=0.12"] -+requires = ["poetry-core"] --build-backend = "poetry.masonry.api" -+build-backend = "poetry.core.masonry.api" --- -2.35.1 - diff --git a/nixpkgs/pkgs/applications/misc/cobang/default.nix b/nixpkgs/pkgs/applications/misc/cobang/default.nix index d8f8932fd734..d3d203b6ae01 100644 --- a/nixpkgs/pkgs/applications/misc/cobang/default.nix +++ b/nixpkgs/pkgs/applications/misc/cobang/default.nix @@ -1,49 +1,62 @@ { lib +, atk , buildPythonApplication , fetchFromGitHub -, wrapGAppsHook -, atk , gdk-pixbuf , gobject-introspection -, gtk3 , gst-plugins-good +, gst-python +, gtk3 +, kiss-headers , libhandy , librsvg +, logbook , networkmanager , pango -, gst-python -, kiss-headers -, logbook , pillow , poetry-core , pygobject3 +, pytestCheckHook , python , python-zbar +, pythonRelaxDepsHook , requests , single-version -, pytestCheckHook }: +, wrapGAppsHook +}: buildPythonApplication rec { pname = "cobang"; - version = "0.9.6"; + version = "0.10.1"; format = "pyproject"; src = fetchFromGitHub { owner = "hongquan"; repo = "CoBang"; - rev = "v${version}"; - sha256 = "sha256-YcXQ2wAgFSsJEqcaDQotpX1put4pQaF511kwq/c2yHw="; + rev = "refs/tags/v${version}"; + hash = "sha256-yNDnBTBmwcP3g51UkkLNyF4eHYjblwxPxS2lMwbFKUM="; }; - patches = [ - ./0001-Poetry-core-and-pillow-9.patch + pythonRelaxDeps = [ + "logbook" + "Pillow" ]; nativeBuildInputs = [ gobject-introspection + pythonRelaxDepsHook wrapGAppsHook ]; + buildInputs = [ + atk + gdk-pixbuf + gst-plugins-good + libhandy + networkmanager + pango + ]; + propagatedBuildInputs = [ gst-python kiss-headers @@ -56,15 +69,6 @@ buildPythonApplication rec { single-version ]; - buildInputs = [ - atk - gdk-pixbuf - gst-plugins-good - libhandy - networkmanager - pango - ]; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/applications/misc/crow-translate/default.nix b/nixpkgs/pkgs/applications/misc/crow-translate/default.nix index 77611e2da43c..9c207dcd77c7 100644 --- a/nixpkgs/pkgs/applications/misc/crow-translate/default.nix +++ b/nixpkgs/pkgs/applications/misc/crow-translate/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchzip -, substituteAll , cmake , extra-cmake-modules , qttools @@ -10,7 +9,6 @@ , tesseract4 , qtmultimedia , qtx11extras -, qttranslations , wrapQtAppsHook , gst_all_1 , testers @@ -26,14 +24,6 @@ stdenv.mkDerivation rec { hash = "sha256-PvfruCqmTBFLWLeIL9NV6+H2AifXcY97ImHzD1zEs28="; }; - patches = [ - (substituteAll { - # See https://github.com/NixOS/nixpkgs/issues/86054 - src = ./fix-qttranslations-path.patch; - inherit qttranslations; - }) - ]; - postPatch = '' substituteInPlace data/io.crow_translate.CrowTranslate.desktop \ --replace "Exec=qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" diff --git a/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch b/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch deleted file mode 100644 index 65cfbdf1acf2..000000000000 --- a/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/src/settings/appsettings.cpp w/src/settings/appsettings.cpp -index 32cabfb..aab92ea 100644 ---- i/src/settings/appsettings.cpp -+++ w/src/settings/appsettings.cpp -@@ -79,7 +79,7 @@ void AppSettings::applyLocale(const QLocale &locale) - const QLocale newLocale = locale == defaultLocale() ? QLocale::system() : locale; - QLocale::setDefault(newLocale); - s_appTranslator.load(newLocale, QStringLiteral(PROJECT_NAME), QStringLiteral("_"), QStandardPaths::locate(QStandardPaths::AppDataLocation, i18nDir, QStandardPaths::LocateDirectory)); -- s_qtTranslator.load(newLocale, QStringLiteral("qt"), QStringLiteral("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); -+ s_qtTranslator.load(newLocale, QStringLiteral("qt"), QStringLiteral("_"), QLatin1String("@qttranslations@/translations")); - } - - QLocale AppSettings::defaultLocale() diff --git a/nixpkgs/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/nixpkgs/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix index bf065bc2a5c7..760fe6b1d2c1 100644 --- a/nixpkgs/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix +++ b/nixpkgs/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corekeyboard"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zOH/w4QroMaVjWnFuWAJQ11RYlpXwIXRG9QYGDkfLVY="; + sha256 = "sha256-Hylz1x9Wsk0iVhpNBFZJChsl3gIvJDICgpITjIXDZAg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/dasel/default.nix b/nixpkgs/pkgs/applications/misc/dasel/default.nix index 836449b3a952..04804732edc4 100644 --- a/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dasel"; - version = "2.3.4"; + version = "2.3.6"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-/1CTtRTLgMlmFeubq3ebGnA9Do1mW6TtAXsCwi1JFmk="; + sha256 = "sha256-k+I4n05IbQT7tGzkJ0aPW6kLT1mGqwQOwoKDyal8L3w="; }; - vendorHash = "sha256-cLf0MzEAykmtnPjT2vGOSPwIXJP6BhxheUaicT7o/X4="; + vendorHash = "sha256-Gueo8aZS5N1rLqZweXjXv7BLrtShxGDSGfbkYXhy4DQ="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}" diff --git a/nixpkgs/pkgs/applications/misc/deadd-notification-center/default.nix b/nixpkgs/pkgs/applications/misc/deadd-notification-center/default.nix index 39630f12c0f6..44c36281fadd 100644 --- a/nixpkgs/pkgs/applications/misc/deadd-notification-center/default.nix +++ b/nixpkgs/pkgs/applications/misc/deadd-notification-center/default.nix @@ -17,13 +17,13 @@ let ''; in mkDerivation rec { pname = "deadd-notification-center"; - version = "2.0.4"; + version = "2.1.1"; src = fetchFromGitHub { owner = "phuhl"; repo = "linux_notification_center"; rev = version; - hash = "sha256-ascg31HsHeXKhvMNntiRLuZ4+T2+fokfDhZ3c8N/Gzg="; + hash = "sha256-VU9NaQVS0n8hFRjWMvCMkaF5mZ4hpnluV31+/SAK7tU="; }; isLibrary = false; diff --git a/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch b/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch new file mode 100644 index 000000000000..e305c5618d19 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch @@ -0,0 +1,105 @@ +From cd8b5c97b27a5c1dc83046498b6ca49ad20aa9b6 Mon Sep 17 00:00:00 2001 +From: Leon Bottou <leon@bottou.org> +Date: Tue, 11 May 2021 14:44:09 -0400 +Subject: [PATCH] Reviewed Fedora patches and adopted some of them (or variants + thereof) + + - Patch0: djvulibre-3.5.22-cdefs.patch (forward ported) +Does not make imuch sense. GSmartPointer.h already includes "stddef.h" + - Patch6: djvulibre-3.5.27-export-file.patch (forward ported) +Incorrect: inkscape command is --export-png, not --export-filename. + - Patch8: djvulibre-3.5.27-check-image-size.patch (forward ported) +Correct: adopted a variant of this + - Patch9: djvulibre-3.5.27-integer-overflow.patch (forward ported) +Correct: adopted a variant of this + - Patch10: djvulibre-3.5.27-check-input-pool.patch (forward ported) +Adopted: input validation never hurts + - Patch11: djvulibre-3.5.27-djvuport-stack-overflow.patch (forward ported) +Dubious: Instead I changed djvufile to prevent a file from including itself +which is the only way I can imagine to create an file creation loop. + - Patch12: djvulibre-3.5.27-unsigned-short-overflow.patch (forward ported) +Adopted: but without including limits.h +--- + libdjvu/DataPool.cpp | 3 ++- + libdjvu/DjVuFile.cpp | 2 ++ + libdjvu/GBitmap.cpp | 2 ++ + libdjvu/IW44Image.cpp | 4 ++++ + tools/ddjvu.cpp | 7 +++++-- + 5 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/libdjvu/DataPool.cpp b/libdjvu/DataPool.cpp +index 5fcbedf..b58fc45 100644 +--- a/libdjvu/DataPool.cpp ++++ b/libdjvu/DataPool.cpp +@@ -790,7 +790,8 @@ DataPool::create(const GP<DataPool> & pool, int start, int length) + { + DEBUG_MSG("DataPool::DataPool: pool=" << (void *)((DataPool *)pool) << " start=" << start << " length= " << length << "\n"); + DEBUG_MAKE_INDENT(3); +- ++ if (!pool) ++ G_THROW( ERR_MSG("DataPool.zero_DataPool") ); + DataPool *xpool=new DataPool(); + GP<DataPool> retval=xpool; + xpool->init(); +diff --git a/libdjvu/DjVuFile.cpp b/libdjvu/DjVuFile.cpp +index 143346b..2587491 100644 +--- a/libdjvu/DjVuFile.cpp ++++ b/libdjvu/DjVuFile.cpp +@@ -576,6 +576,8 @@ DjVuFile::process_incl_chunk(ByteStream & str, int file_num) + GURL incl_url=pcaster->id_to_url(this, incl_str); + if (incl_url.is_empty()) // Fallback. Should never be used. + incl_url=GURL::UTF8(incl_str,url.base()); ++ if (incl_url == url) // Infinite loop avoidance ++ G_THROW( ERR_MSG("DjVuFile.malformed") ); + + // Now see if there is already a file with this *name* created + { +diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp +index c2fdbe4..8ad64b2 100644 +--- a/libdjvu/GBitmap.cpp ++++ b/libdjvu/GBitmap.cpp +@@ -1284,6 +1284,8 @@ GBitmap::decode(unsigned char *runs) + // initialize pixel array + if (nrows==0 || ncolumns==0) + G_THROW( ERR_MSG("GBitmap.not_init") ); ++ if (ncolumns + border != (unsigned short)(ncolumns+border)) ++ G_THROW("GBitmap: image size exceeds maximum (corrupted file?)"); + bytes_per_row = ncolumns + border; + if (runs==0) + G_THROW( ERR_MSG("GBitmap.null_arg") ); +diff --git a/libdjvu/IW44Image.cpp b/libdjvu/IW44Image.cpp +index e8d4b44..4a1797e 100644 +--- a/libdjvu/IW44Image.cpp ++++ b/libdjvu/IW44Image.cpp +@@ -676,9 +676,13 @@ IW44Image::Map::image(signed char *img8, int rowsize, int pixsep, int fast) + // Allocate reconstruction buffer + short *data16; + size_t sz = bw * bh; ++ if (sz == 0) ++ G_THROW("IW44Image: image size is zero (corrupted file?)"); + if (sz / (size_t)bw != (size_t)bh) // multiplication overflow + G_THROW("IW44Image: image size exceeds maximum (corrupted file?)"); + GPBuffer<short> gdata16(data16,sz); ++ if (data16 == 0) ++ G_THROW("IW44Image: unable to allocate image buffer"); + // Copy coefficients + int i; + short *p = data16; +diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp +index 7109952..e7b489b 100644 +--- a/tools/ddjvu.cpp ++++ b/tools/ddjvu.cpp +@@ -393,8 +393,11 @@ render(ddjvu_page_t *page, int pageno) + } else if (style == DDJVU_FORMAT_GREY8) + rowsize = rrect.w; + else +- rowsize = rrect.w * 3; +- if (! (image = (char*)malloc(rowsize * rrect.h))) ++ rowsize = rrect.w * 3; ++ size_t bufsize = (size_t)rowsize * rrect.h; ++ if (bufsize / rowsize != rrect.h) ++ die(i18n("Integer overflow when allocating image buffer for page %d"), pageno); ++ if (! (image = (char*)malloc(bufsize))) + die(i18n("Cannot allocate image buffer for page %d"), pageno); + + /* Render */ \ No newline at end of file diff --git a/nixpkgs/pkgs/applications/misc/djvulibre/default.nix b/nixpkgs/pkgs/applications/misc/djvulibre/default.nix index 65591c8d8254..073a6e348c2b 100644 --- a/nixpkgs/pkgs/applications/misc/djvulibre/default.nix +++ b/nixpkgs/pkgs/applications/misc/djvulibre/default.nix @@ -30,12 +30,16 @@ stdenv.mkDerivation rec { bash ]; - # Remove uses of the `register` storage class specifier, which was removed in C++17. - # Fixes compilation with clang 16, which defaults to C++17. - patches = [ ./c++17-register-class.patch ]; - enableParallelBuilding = true; + patches = [ + # Remove uses of the `register` storage class specifier, which was removed in C++17. + # Fixes compilation with clang 16, which defaults to C++17. + ./c++17-register-class.patch + + ./CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch + ]; + meta = with lib; { description = "The big set of CLI tools to make/modify/optimize/show/export DJVU files"; homepage = "https://djvu.sourceforge.net"; diff --git a/nixpkgs/pkgs/applications/misc/edgetx/default.nix b/nixpkgs/pkgs/applications/misc/edgetx/default.nix index 785ad0ba229a..9e7cf60af1a1 100644 --- a/nixpkgs/pkgs/applications/misc/edgetx/default.nix +++ b/nixpkgs/pkgs/applications/misc/edgetx/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub , cmake, gcc-arm-embedded, python3Packages -, qtbase, qtmultimedia, qttranslations, SDL, gtest +, qtbase, qtmultimedia, qttools, SDL, gtest , dfu-util }: @@ -16,9 +16,9 @@ mkDerivation rec { sha256 = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E="; }; - nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; + nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow qttools ]; - buildInputs = [ qtbase qtmultimedia qttranslations SDL ]; + buildInputs = [ qtbase qtmultimedia SDL ]; postPatch = '' sed -i companion/src/burnconfigdialog.cpp \ @@ -27,7 +27,6 @@ mkDerivation rec { cmakeFlags = [ "-DGTEST_ROOT=${gtest.src}/googletest" - "-DQT_TRANSLATIONS_DIR=${qttranslations}/translations" "-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" # file RPATH_CHANGE could not write new RPATH "-DCMAKE_SKIP_BUILD_RPATH=ON" diff --git a/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix b/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix index 301a5eb09b22..dbf22e950830 100644 --- a/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix +++ b/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix @@ -16,6 +16,17 @@ let inherit version; hash = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; }; + + patches = [ + # Pulling in this patch lets us continue running tests without any + # other changes using setuptools >= 67.5.0. + (fetchpatch { + name = "remove-deprecated-pkg-resources.patch"; + url = "https://github.com/pallets/flask/commit/751d85f3de3f726446bb12e4ddfae885a6645ba1.patch"; + hash = "sha256-T4vKSSe3P0xtb2/iQjm0RH2Bwk1ZHWiPoX1Ycr63EqU="; + includes = [ "src/flask/cli.py" ]; + }) + ]; }); flask-wtf = super.flask-wtf.overridePythonAttrs (old: rec { version = "0.15.1"; diff --git a/nixpkgs/pkgs/applications/misc/faircamp/default.nix b/nixpkgs/pkgs/applications/misc/faircamp/default.nix index 0df585ab33ca..df9d08dacc2c 100644 --- a/nixpkgs/pkgs/applications/misc/faircamp/default.nix +++ b/nixpkgs/pkgs/applications/misc/faircamp/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , fetchgit , makeWrapper @@ -9,6 +10,7 @@ , ffmpeg , callPackage , unstableGitUpdater +, darwin }: rustPlatform.buildRustPackage { @@ -39,6 +41,8 @@ rustPlatform.buildRustPackage { glib libopus vips + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices ]; postInstall = '' diff --git a/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix b/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix index 34c0e857a448..53c4e88c3e09 100644 --- a/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "firefly-desktop"; - version = "1.3.3"; + version = "2.1.5"; src = fetchurl { url = "https://github.com/iotaledger/firefly/releases/download/desktop-${version}/${pname}-${version}.AppImage"; - sha256 = "a052efa29aa692eeafc921a2be4a5cbf71ae0b4216bd4759ea179086fb44c6d6"; + sha256 = "sha256-33LQedZTfps7uAB5LGGXM/YB7SySTJLp70+yS5pMvIk="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/nixpkgs/pkgs/applications/misc/fluidd/default.nix b/nixpkgs/pkgs/applications/misc/fluidd/default.nix index 2b0cd7de054d..5e1802d002bb 100644 --- a/nixpkgs/pkgs/applications/misc/fluidd/default.nix +++ b/nixpkgs/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.25.0"; + version = "1.25.2"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-p8NesTNwsiq4YiEHtBpYP6eljs4PvDaQ2Ot6/htvzr4="; + sha256 = "sha256-WlUTRmQ1RWI2HQ5Kn85q+/fzVnTsda2aqgTWRlA+5JY="; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix b/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix index 884ee44098bf..2483cc000f01 100644 --- a/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix +++ b/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix @@ -7,8 +7,6 @@ , perl , atomicparsley , ffmpeg -, flvstreamer -, rtmpdump }: perlPackages.buildPerlPackage rec { @@ -25,7 +23,7 @@ perlPackages.buildPerlPackage rec { nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; buildInputs = [ perl ]; propagatedBuildInputs = with perlPackages; [ - HTMLParser HTTPCookies LWP LWPProtocolHttps XMLLibXML XMLSimple Mojolicious + LWP LWPProtocolHttps XMLLibXML Mojolicious ]; preConfigure = "touch Makefile.PL"; @@ -36,7 +34,7 @@ perlPackages.buildPerlPackage rec { runHook preInstall mkdir -p $out/bin $out/share/man/man1 cp get_iplayer $out/bin - wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg ]} --prefix PERL5LIB : $PERL5LIB cp get_iplayer.1 $out/share/man/man1 runHook postInstall ''; @@ -46,9 +44,9 @@ perlPackages.buildPerlPackage rec { ''; meta = with lib; { - description = "Downloads TV and radio from BBC iPlayer"; + description = "Downloads TV and radio programmes from BBC iPlayer and BBC Sounds"; license = licenses.gpl3Plus; - homepage = "https://squarepenguin.co.uk/"; + homepage = "https://github.com/get-iplayer/get_iplayer"; platforms = platforms.all; maintainers = with maintainers; [ rika jgarcia ]; }; diff --git a/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix b/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix index fa11f7716219..49e9f9df8cdd 100644 --- a/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix +++ b/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix @@ -1,12 +1,12 @@ -{ appimageTools, lib, fetchurl, stdenv }: +{ appimageTools, lib, fetchurl, nix-update-script, stdenv }: let pname = "golden-cheetah"; - version = "3.6-RC4"; + version = "3.6"; src = fetchurl { - url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v3.6-DEV_x64.AppImage"; - hash = "sha256-I5GafK/W1djSx67xrjcMyPqMSqGW9AfrcPYcGcf0Pag="; + url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v${version}_x64.AppImage"; + hash = "sha256-PMRUDQSQxbECbF9SPOo03t4Xxj1OtYJAPXEMyyy6EVY="; }; appimageContents = appimageTools.extract { inherit pname src version; }; @@ -24,12 +24,14 @@ appimageTools.wrapType2 { cp ${appimageContents}/gc.png $out/share/pixmaps/ ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava"; - platforms = platforms.linux; + platforms = lib.platforms.linux; broken = !stdenv.isx86_64; - maintainers = with maintainers; [ gador ]; - license = licenses.gpl2Plus; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ gador adamcstephens ]; + license = lib.licenses.gpl2Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix b/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix index f13cf8a21d42..1345dc51593d 100644 --- a/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix +++ b/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, mkDerivation +{ lib, fetchFromGitHub, nix-update-script, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtconnectivity, qtcharts, libusb-compat-0_1, gsl, blas , bison, flex, zlib, qmake, makeDesktopItem, wrapQtAppsHook @@ -16,13 +16,13 @@ let }; in mkDerivation rec { pname = "golden-cheetah"; - version = "3.6-RC4"; + version = "3.6"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; rev = "refs/tags/v${version}"; - hash = "sha256-2cwxsfy4Zc9fF3fe6QcZp3LPd2yWw2rDlYrK/QGiJYw="; + hash = "sha256-Ntim1/ZPaTPCHQ5p8xF5LWpqq8+OgkPfaQqqysv9j/c="; }; buildInputs = [ @@ -72,10 +72,12 @@ in mkDerivation rec { runHook postInstall ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Performance software for cyclists, runners and triathletes. Built from source and without API tokens"; - platforms = platforms.linux; - maintainers = with maintainers; [ adamcstephens ]; - license = licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ adamcstephens ]; + license = lib.licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/applications/misc/gopacked/default.nix b/nixpkgs/pkgs/applications/misc/gopacked/default.nix index 42b886e4c72b..1af03a1528a2 100644 --- a/nixpkgs/pkgs/applications/misc/gopacked/default.nix +++ b/nixpkgs/pkgs/applications/misc/gopacked/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "tulir"; repo = "gopacked"; rev = "v${version}"; - sha256 = "03qr8rlnipziy16nbcpf631jh42gsyv2frdnh8yzsh8lm0p8p4ry"; + hash = "sha256-PpOLLqgUQf09grZlJ7bXTxAowzDusmVN8PHfaGlGGQ8="; }; - vendorSha256 = "0fklr3lxh8g7gda65wf2wdkqv15869h7m1bwbzbiv8pasrf5b352"; + vendorHash = "sha256-ooxVXNbqoh3XX3yFemAyqISNZ+PC8WJUe+ch2OnIdDo="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix b/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix index 60a1e40a614e..0898c3ccee9a 100644 --- a/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl, pkg-config, which -, qtbase, qmake, qttools, qttranslations, wrapQtAppsHook +, qmake, qttools, wrapQtAppsHook , libusb1, shapelib, zlib , withGUI ? false, qtserialport , withMapPreview ? (!stdenv.isDarwin), qtwebengine @@ -21,11 +21,6 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs testo - '' + lib.optionalString withGUI '' - # See https://github.com/NixOS/nixpkgs/issues/86054 - substituteInPlace gui/mainwindow.cc \ - --replace 'QLibraryInfo::location(QLibraryInfo::TranslationsPath)' \ - 'QLatin1String("${qttranslations}/translations")' '' + lib.optionalString withDoc '' substituteInPlace gbversion.h.qmake.in \ --replace /usr/share/doc $doc/share/doc diff --git a/nixpkgs/pkgs/applications/misc/gpxlab/default.nix b/nixpkgs/pkgs/applications/misc/gpxlab/default.nix index 8d2b95ea4f31..9d3d7c27ec8c 100644 --- a/nixpkgs/pkgs/applications/misc/gpxlab/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpxlab/default.nix @@ -1,5 +1,5 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, substituteAll -, qmake, qttools, qttranslations +{ stdenv, mkDerivation, lib, fetchFromGitHub +, qmake, qttools }: mkDerivation rec { @@ -13,12 +13,6 @@ mkDerivation rec { sha256 = "080vnwcciqblfrbfyz9gjhl2lqw1hkdpbgr5qfrlyglkd4ynjd84"; }; - patches = (substituteAll { - # See https://github.com/NixOS/nixpkgs/issues/86054 - src = ./fix-qttranslations-path.patch; - inherit qttranslations; - }); - nativeBuildInputs = [ qmake qttools ]; preConfigure = '' diff --git a/nixpkgs/pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch b/nixpkgs/pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch deleted file mode 100644 index 8dcba75d764f..000000000000 --- a/nixpkgs/pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git i/GPXLab/main.cpp w/GPXLab/main.cpp -index b12d2dd..58d37c5 100644 ---- i/GPXLab/main.cpp -+++ w/GPXLab/main.cpp -@@ -19,10 +19,10 @@ int main(int argc, char *argv[]) - app.installTranslator(&gpxlab); - - QTranslator qt; --#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) -+#if defined(Q_OS_WIN32) - qt.load(QLocale::system(), "qt", "_", TRANSLATIONS_DIR); - #else -- qt.load(QLocale::system(), "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath)); -+ qt.load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations")); - #endif - app.installTranslator(&qt); - diff --git a/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index 694323df82d9..c08deed34db0 100644 --- a/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -3,10 +3,8 @@ , fetchFromGitHub , qmake , nix-update-script -, substituteAll , qtbase , qttools -, qttranslations , qtlocation ? null # qt5 only , qtpositioning ? null # qt6 only , qtpbfimageplugin @@ -31,12 +29,6 @@ stdenv.mkDerivation rec { hash = "sha256-Zf2eyDx5QK69W6HNz/IGGHkX2qCDnxYsU8KLCgU9teY="; }; - patches = (substituteAll { - # See https://github.com/NixOS/nixpkgs/issues/86054 - src = ./fix-qttranslations-path.diff; - inherit qttranslations; - }); - buildInputs = [ qtpbfimageplugin qtserialport ] ++ (if isQt6 then [ qtbase diff --git a/nixpkgs/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff b/nixpkgs/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff deleted file mode 100644 index 757d9b8c6571..000000000000 --- a/nixpkgs/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff +++ /dev/null @@ -1,18 +0,0 @@ -diff --git i/src/GUI/app.cpp w/src/GUI/app.cpp -index 37e9d3f..d4a065c 100644 ---- i/src/GUI/app.cpp -+++ w/src/GUI/app.cpp -@@ -35,11 +35,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv) - installTranslator(gpxsee); - - QTranslator *qt = new QTranslator(this); --#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) -+#if defined(Q_OS_WIN32) - if (qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir())) - #else // Q_OS_WIN32 || Q_OS_MAC -- if (qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location( -- QLibraryInfo::TranslationsPath))) -+ if (qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations"))) - #endif // Q_OS_WIN32 || Q_OS_MAC - installTranslator(qt); - diff --git a/nixpkgs/pkgs/applications/misc/grsync/default.nix b/nixpkgs/pkgs/applications/misc/grsync/default.nix index 3a6a717b6e10..856eeea21f37 100644 --- a/nixpkgs/pkgs/applications/misc/grsync/default.nix +++ b/nixpkgs/pkgs/applications/misc/grsync/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, dee, gtk3, intltool, libdbusmenu-gtk3, libunity, pkg-config, rsync }: stdenv.mkDerivation rec { - version = "1.3.0"; + version = "1.3.1"; pname = "grsync"; src = fetchurl { url = "mirror://sourceforge/grsync/grsync-${version}.tar.gz"; - sha256 = "sha256-t8fGpi4FMC2DF8OHQefXHvmrRjnuW/8mIqODsgQ6Nfw="; + sha256 = "sha256-M8wOJdqmLlunCRyuo8g6jcdNxddyHEUB00nyEMSzxtM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/gum/default.nix b/nixpkgs/pkgs/applications/misc/gum/default.nix index b43d888fede1..96315bb50c24 100644 --- a/nixpkgs/pkgs/applications/misc/gum/default.nix +++ b/nixpkgs/pkgs/applications/misc/gum/default.nix @@ -34,5 +34,6 @@ buildGoModule rec { changelog = "https://github.com/charmbracelet/gum/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ maaslalani ]; + mainProgram = "gum"; }; } diff --git a/nixpkgs/pkgs/applications/misc/harsh/default.nix b/nixpkgs/pkgs/applications/misc/harsh/default.nix new file mode 100644 index 000000000000..bf38ae4ffe0c --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/harsh/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "harsh"; + version = "0.8.28"; + + src = fetchFromGitHub { + owner = "wakatara"; + repo = pname; + rev = "v${version}"; + hash = "sha256-6BeGyyy4RFBy4TvB3bLTyDtQGljG9xE3VFfbnq9KWcs="; + }; + + vendorHash = "sha256-zkz7X/qj8FwtQZXGuq4Oaoe5G9a4AJE1kv3j7wwQEp4="; + + meta = with lib; { + description = "CLI habit tracking for geeks"; + homepage = "https://github.com/wakatara/harsh"; + changelog = "https://github.com/wakatara/harsh/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ laurailway ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/hivemind/default.nix b/nixpkgs/pkgs/applications/misc/hivemind/default.nix index 0562e1d52d9f..adc6aa3642ef 100644 --- a/nixpkgs/pkgs/applications/misc/hivemind/default.nix +++ b/nixpkgs/pkgs/applications/misc/hivemind/default.nix @@ -12,9 +12,10 @@ buildGoModule rec { owner = "DarthSim"; repo = "hivemind"; rev = "v${version}"; - sha256 = "YUR9OwRuH1xSPs8iTsSIjLCt2TyYH357IAYULGTyYUc="; + hash = "sha256-YUR9OwRuH1xSPs8iTsSIjLCt2TyYH357IAYULGTyYUc="; }; - vendorSha256 = "KweFhT8Zueg45Q/vw3kNET35hB+0WbUPfz0FYaAiIA8="; + + vendorHash = "sha256-KweFhT8Zueg45Q/vw3kNET35hB+0WbUPfz0FYaAiIA8="; meta = with lib; { homepage = "https://github.com/DarthSim/"; diff --git a/nixpkgs/pkgs/applications/misc/hugo/default.nix b/nixpkgs/pkgs/applications/misc/hugo/default.nix index cdf75cb75cc1..a61ddb0e6e63 100644 --- a/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.117.0"; + version = "0.118.2"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WxYTlEqTWY78lHd+qEvmbRmbC6Ewph9U84SjvrlqgtY="; + hash = "sha256-kEcLcNdhUjCTBfBVMYh+/5xxiCrGWeW8my//FcyXWtA="; }; - vendorHash = "sha256-yjARpHewjCm2W/08xu7O/PlE9jIOgYmunEyGEfTHNQs="; + vendorHash = "sha256-FXL6MtZ3kQOlzFuAWdnRoj/0b+XIWy2avuXbU5gz7Bc="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/hyprnome/default.nix b/nixpkgs/pkgs/applications/misc/hyprnome/default.nix new file mode 100644 index 000000000000..906bc00dce52 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/hyprnome/default.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "hyprnome"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "donovanglover"; + repo = "hyprnome"; + rev = version; + hash = "sha256-jb21hnPSzrCTuW7Yhs6jFzS2WUVQjkn6nCCi6LvoTGA="; + }; + + cargoHash = "sha256-QM5v2hKP3E9W3Aek6kFyFFNAp9s0oTFb4CEtxEHyny0="; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installManPage man/hyprnome.1 + + installShellCompletion --cmd hyprnome \ + --bash <(cat completions/hyprnome.bash) \ + --fish <(cat completions/hyprnome.fish) \ + --zsh <(cat completions/_hyprnome) + ''; + + meta = with lib; { + description = "GNOME-like workspace switching in Hyprland"; + homepage = "https://github.com/donovanglover/hyprnome"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ donovanglover ]; + mainProgram = "hyprnome"; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/jquake/default.nix b/nixpkgs/pkgs/applications/misc/jquake/default.nix index 36b301dc4310..ce0ea2ec1c5f 100644 --- a/nixpkgs/pkgs/applications/misc/jquake/default.nix +++ b/nixpkgs/pkgs/applications/misc/jquake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jquake"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { url = "https://github.com/fleneindre/fleneindre.github.io/raw/master/downloads/JQuake_${version}_linux.zip"; - sha256 = "sha256-oIYkYmI8uG4zjnm1Jq1mzIcSwRlKbWJqvACygQyp9sA="; + sha256 = "sha256-Q9R5Qhk8Qodw2d99nL2aG5WGpIyvKmjzfkRK7xJzoc0="; }; nativeBuildInputs = [ unzip copyDesktopItems ]; diff --git a/nixpkgs/pkgs/applications/misc/klayout/default.nix b/nixpkgs/pkgs/applications/misc/klayout/default.nix index 9a535dfa8b52..6306400a3c12 100644 --- a/nixpkgs/pkgs/applications/misc/klayout/default.nix +++ b/nixpkgs/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.28.10"; + version = "0.28.11"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-CDaLKBDm4slUMZ8OWm/wNub4P8LY26P8G8oIxwzJyXY="; + hash = "sha256-PEWb2QBWK3XMuOAkSI2nAk6UJronG+3+NBU92uWO5LQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/misc/logseq/default.nix b/nixpkgs/pkgs/applications/misc/logseq/default.nix index 6eda1feff2d1..63165595da51 100644 --- a/nixpkgs/pkgs/applications/misc/logseq/default.nix +++ b/nixpkgs/pkgs/applications/misc/logseq/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "logseq"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-UFl+AqfG0OzT+lHC6Sq+gUQTyvzUQP6Enh+rLSq3Xhc="; + hash = "sha256-EOnB3AllfMAhcATEkmf/1S/gkk1ua2dDgvfT91uwohs="; name = "${pname}-${version}.AppImage"; }; diff --git a/nixpkgs/pkgs/applications/misc/mainsail/default.nix b/nixpkgs/pkgs/applications/misc/mainsail/default.nix index dd7aae237a11..48fbce686ffc 100644 --- a/nixpkgs/pkgs/applications/misc/mainsail/default.nix +++ b/nixpkgs/pkgs/applications/misc/mainsail/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "mainsail"; - version = "2.6.2"; + version = "2.7.1"; src = fetchzip { url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip"; - hash = "sha256-/ej26rLze/QaxGDtU4XhaejlkbkzZfzB+ib2I+3W8Ho="; + hash = "sha256-j2ri7PyQGzRlhpgE9qKneX00HwlDmIi2JUremz446wk="; stripRoot = false; }; diff --git a/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix b/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix index 4aebb67ac981..a830bffd7d72 100644 --- a/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { pname = "mediainfo-gui"; - version = "23.04"; + version = "23.07"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "sha256-Uiut1rHk6LV+giW6e0nvgn35ffTLaLbU/HkQ92xf32k="; + hash = "sha256-ttfanimZX9NKIhAIJbhD50wyx7xnrbARZrG+7epJ9dA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmediainfo wxGTK32 desktop-file-utils libSM imagemagick ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - sourceRoot = "./MediaInfo/Project/GNU/GUI/"; + sourceRoot = "MediaInfo/Project/GNU/GUI"; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/misc/mediainfo/default.nix b/nixpkgs/pkgs/applications/misc/mediainfo/default.nix index ffa7f68378db..b93c552e1963 100644 --- a/nixpkgs/pkgs/applications/misc/mediainfo/default.nix +++ b/nixpkgs/pkgs/applications/misc/mediainfo/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "mediainfo"; - version = "23.06"; + version = "23.07"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "sha256-TJd+6wzoN4co5k7yTyf+YrLFEW+/BUHIJKRDCfgP+Io="; + hash = "sha256-ttfanimZX9NKIhAIJbhD50wyx7xnrbARZrG+7epJ9dA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libzen libmediainfo zlib ]; - sourceRoot = "./MediaInfo/Project/GNU/CLI/"; + sourceRoot = "MediaInfo/Project/GNU/CLI"; configureFlags = [ "--with-libmediainfo=${libmediainfo}" ]; diff --git a/nixpkgs/pkgs/applications/misc/merkaartor/default.nix b/nixpkgs/pkgs/applications/misc/merkaartor/default.nix index c8ac515571c7..9d474ca91f04 100644 --- a/nixpkgs/pkgs/applications/misc/merkaartor/default.nix +++ b/nixpkgs/pkgs/applications/misc/merkaartor/default.nix @@ -5,7 +5,6 @@ , qmake , qttools , wrapQtAppsHook -, qttranslations , gdal , proj , qtsvg @@ -48,7 +47,6 @@ stdenv.mkDerivation rec { ''; qmakeFlags = [ - "TRANSDIR_SYSTEM=${qttranslations}/translations" "USEWEBENGINE=1" ] ++ lib.optional withGeoimage "GEOIMAGE=1" ++ lib.optional withGpsdlib "GPSDLIB=1" diff --git a/nixpkgs/pkgs/applications/misc/minder/default.nix b/nixpkgs/pkgs/applications/misc/minder/default.nix index 78eec56b60ce..6f3687b228a8 100644 --- a/nixpkgs/pkgs/applications/misc/minder/default.nix +++ b/nixpkgs/pkgs/applications/misc/minder/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.15.2"; + version = "1.15.6"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "sha256-aMKu59IWHjK6NlaIZgbpKPISsvGub2tQxEdvogx2XCY="; + sha256 = "sha256-vxUZo68QdeuFlQxLldWplmeGtyX2NHo3AJZmt+JLCF4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock b/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock index 3dbc6596dd91..943ee09302dc 100644 --- a/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock +++ b/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock @@ -53,6 +53,44 @@ 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-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] +name = "atomic-waker" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" + +[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -86,6 +124,21 @@ dependencies = [ ] [[package]] +name = "blocking" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", + "log", +] + +[[package]] name = "bumpalo" version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -183,6 +236,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils 0.8.16", +] + +[[package]] name = "const-random" version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -423,6 +485,12 @@ dependencies = [ ] [[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] name = "fallible-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -435,6 +503,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] name = "field-offset" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -477,6 +554,21 @@ 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", + "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" @@ -956,6 +1048,32 @@ dependencies = [ ] [[package]] +name = "interprocess" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb" +dependencies = [ + "blocking", + "cfg-if 1.0.0", + "futures-core", + "futures-io", + "intmap", + "libc 0.2.147", + "once_cell", + "rustc_version 0.4.0", + "spinning", + "thiserror", + "to_method", + "winapi", +] + +[[package]] +name = "intmap" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9" + +[[package]] name = "io-lifetimes" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1092,6 +1210,16 @@ dependencies = [ ] [[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" @@ -1153,8 +1281,9 @@ dependencies = [ [[package]] name = "missioncenter" -version = "0.2.5" +version = "0.3.1" dependencies = [ + "arrayvec 0.7.4", "drm", "egl", "errno-sys", @@ -1162,6 +1291,7 @@ dependencies = [ "gettext-rs", "gl", "gtk4", + "interprocess", "lazy_static", "libadwaita", "libc 0.2.147", @@ -1182,8 +1312,10 @@ dependencies = [ "serde", "serde_json", "sha2", + "shared_memory_extended", "sysinfo", "textdistance", + "thiserror", ] [[package]] @@ -1331,6 +1463,12 @@ dependencies = [ ] [[package]] +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + +[[package]] name = "pathfinder_canvas" version = "0.5.0" source = "git+https://github.com/servo/pathfinder?rev=21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062#21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062" @@ -1354,7 +1492,7 @@ name = "pathfinder_content" version = "0.5.0" source = "git+https://github.com/servo/pathfinder?rev=21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062#21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062" dependencies = [ - "arrayvec", + "arrayvec 0.5.2", "bitflags 1.3.2", "image", "log", @@ -1502,6 +1640,12 @@ dependencies = [ ] [[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" @@ -1569,6 +1713,36 @@ dependencies = [ ] [[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc 0.2.147", + "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 = "raw-cpuid" version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1764,6 +1938,19 @@ dependencies = [ ] [[package]] +name = "shared_memory_extended" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004d7ece9a3be64f85471d50967710b0a146144225bed5f0abd0514a3bed086f" +dependencies = [ + "cfg-if 1.0.0", + "libc 0.2.147", + "nix", + "rand", + "win-sys", +] + +[[package]] name = "slab" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1779,6 +1966,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] +name = "spinning" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d4f0e86297cad2658d92a707320d87bf4e6ae1050287f51d19b67ef3f153a7b" +dependencies = [ + "lock_api", +] + +[[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1881,6 +2077,12 @@ dependencies = [ ] [[package]] +name = "to_method" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" + +[[package]] name = "toml" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1957,6 +2159,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2080,6 +2288,15 @@ dependencies = [ ] [[package]] +name = "win-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b7b128a98c1cfa201b09eb49ba285887deb3cbe7466a98850eb1adabb452be5" +dependencies = [ + "windows", +] + +[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2102,6 +2319,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "windows" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" +dependencies = [ + "windows_aarch64_msvc 0.34.0", + "windows_i686_gnu 0.34.0", + "windows_i686_msvc 0.34.0", + "windows_x86_64_gnu 0.34.0", + "windows_x86_64_msvc 0.34.0", +] + +[[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2117,12 +2347,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", + "windows_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", - "windows_x86_64_msvc", + "windows_x86_64_msvc 0.48.0", ] [[package]] @@ -2133,24 +2363,48 @@ checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" + +[[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.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" + +[[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.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" + +[[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.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" + +[[package]] +name = "windows_x86_64_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" @@ -2163,6 +2417,12 @@ checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" + +[[package]] +name = "windows_x86_64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/nixpkgs/pkgs/applications/misc/mission-center/default.nix b/nixpkgs/pkgs/applications/misc/mission-center/default.nix index 3c4a81a509a9..87acab7b3df1 100644 --- a/nixpkgs/pkgs/applications/misc/mission-center/default.nix +++ b/nixpkgs/pkgs/applications/misc/mission-center/default.nix @@ -36,19 +36,19 @@ let nvtop = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; - rev = "9a8458b541a195a0c5cadafb66e240962c852b39"; - hash = "sha256-iFBZbESRTuwgLSUuHnjcXwmpvdeQrd3oUJd7BRyxu84="; + rev = "be47f8c560487efc6e6a419d59c69bfbdb819324"; + hash = "sha256-MdaZYLxCuVX4LvbwBYNfHHoJWqZAy4J8NBK7Guh2whc="; }; in stdenv.mkDerivation rec { pname = "mission-center"; - version = "0.2.5"; + version = "0.3.1"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; rev = "v${version}"; - hash = "sha256-f6GkwF+3USl60pUxxTu90KzdsfxBiAkiqnBSTTmC2Lc="; + hash = "sha256-fiUF1mvbnguySy2ZXTi4Z61t35FO6fljqm21dMGwQMI="; }; cargoDeps = symlinkJoin { @@ -57,11 +57,11 @@ stdenv.mkDerivation rec { (rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "pathfinder_canvas-0.5.0" = "sha256-k2Sj69hWA0UzRfv91aG1TAygVIuOX3gmipcDbuZxxc8="; + "pathfinder_canvas-0.5.0" = "sha256-k2Sj69hWA0UzRfv91aG1TAygVIuOX3gmipcDbuZxxc8="; }; }) (rustPlatform.importCargoLock { - lockFile = ./proxy-Cargo.lock; + lockFile = ./gatherer-Cargo.lock; }) ]; }; @@ -111,7 +111,10 @@ stdenv.mkDerivation rec { done cd ../.. patchShebangs data/hwdb/generate_hwdb.py - sed -i 's|cmd.arg("dmidecode")|cmd.arg("${dmidecode}/bin/dmidecode")|g' src/sys_info_v2/mem_info.rs + ''; + + postInstall = '' + wrapProgram $out/bin/missioncenter --prefix PATH : $out/bin:${dmidecode}/bin ''; meta = with lib; { @@ -120,5 +123,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ GaetanLepage ]; platforms = platforms.linux; + mainProgram = "missioncenter"; }; } diff --git a/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock b/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock new file mode 100644 index 000000000000..ba0385a515be --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock @@ -0,0 +1,591 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anyhow" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] +name = "atomic-waker" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "blocking" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", + "log", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-random" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +dependencies = [ + "getrandom", + "once_cell", + "proc-macro-hack", + "tiny-keccak", +] + +[[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 = "dlv-list" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73" +dependencies = [ + "const-random", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[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", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "gatherer" +version = "0.3.1" +dependencies = [ + "anyhow", + "arrayvec", + "interprocess", + "lazy_static", + "libc", + "num_cpus", + "rust-ini", + "shared_memory_extended", + "thiserror", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "interprocess" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb" +dependencies = [ + "blocking", + "cfg-if", + "futures-core", + "futures-io", + "intmap", + "libc", + "once_cell", + "rustc_version", + "spinning", + "thiserror", + "to_method", + "winapi", +] + +[[package]] +name = "intmap" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9" + +[[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 = "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 = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags", + "cfg-if", + "libc", + "static_assertions", +] + +[[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 = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "ordered-multimap" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" +dependencies = [ + "dlv-list", + "hashbrown", +] + +[[package]] +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + +[[package]] +name = "pin-project-lite" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" + +[[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.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +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 = "rust-ini" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" + +[[package]] +name = "shared_memory_extended" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004d7ece9a3be64f85471d50967710b0a146144225bed5f0abd0514a3bed086f" +dependencies = [ + "cfg-if", + "libc", + "nix", + "rand", + "win-sys", +] + +[[package]] +name = "spinning" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d4f0e86297cad2658d92a707320d87bf4e6ae1050287f51d19b67ef3f153a7b" +dependencies = [ + "lock_api", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "syn" +version = "2.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "thiserror" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "to_method" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" + +[[package]] +name = "unicode-ident" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "win-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b7b128a98c1cfa201b09eb49ba285887deb3cbe7466a98850eb1adabb452be5" +dependencies = [ + "windows", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" + +[[package]] +name = "windows_i686_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" + +[[package]] +name = "windows_i686_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" diff --git a/nixpkgs/pkgs/applications/misc/moolticute/default.nix b/nixpkgs/pkgs/applications/misc/moolticute/default.nix index f51d9a329cd1..faa6c2180fc6 100644 --- a/nixpkgs/pkgs/applications/misc/moolticute/default.nix +++ b/nixpkgs/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "1.01.0"; + version = "1.02.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6vqYyAJ9p0ey49kc2Tp/HZVv0mePARX2dcmcIG4bcNQ="; + sha256 = "sha256-URGAhd7u1DrGReQAwsX9LMj7Jq1GsILzP8fVFnA74O4="; }; outputs = [ "out" "udev" ]; diff --git a/nixpkgs/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch b/nixpkgs/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch index 26ed3aec9fb7..771ad0583528 100644 --- a/nixpkgs/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch +++ b/nixpkgs/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch @@ -1,25 +1,13 @@ -From b2935ed7e2962d73f3b493c38c0bb1e8659c0a60 Mon Sep 17 00:00:00 2001 -From: toonn <toonn@toonn.io> -Date: Tue, 8 Mar 2022 23:59:19 +0100 -Subject: [PATCH 1/2] Use command -v in favor of which +Use command -v in favor of which ---- - Makerules | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makerules b/Makerules -index 0fdaecb..6d52cca 100644 --- a/Makerules +++ b/Makerules -@@ -145,7 +145,7 @@ else ifeq ($(OS),MACOS) - LD = xcrun ld - RANLIB = xcrun ranlib - -- ifeq (, $(shell which pkg-config)) -+ ifeq (, $(shell command -v pkg-config)) +@@ -170,7 +170,7 @@ + ifneq ($(ARCHFLAGS),) + $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.") + HAVE_LIBCRYPTO := no +- else ifeq (, $(shell which pkg-config)) ++ else ifeq (, $(shell command -v pkg-config)) $(warning "No pkg-config found, install it for proper integration of libcrypto") else HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) --- -2.17.2 (Apple Git-113) - diff --git a/nixpkgs/pkgs/applications/misc/mupdf/default.nix b/nixpkgs/pkgs/applications/misc/mupdf/default.nix index 6e3d37e2ef38..606649d5bb12 100644 --- a/nixpkgs/pkgs/applications/misc/mupdf/default.nix +++ b/nixpkgs/pkgs/applications/misc/mupdf/default.nix @@ -27,6 +27,7 @@ , freeglut , libGLU , xcbuild +, gitUpdater # for passthru.tests , cups-filters @@ -52,12 +53,12 @@ let in stdenv.mkDerivation rec { - version = "1.22.1"; + version = "1.23.0"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "sha256-1i88DkVuu8QucfWkfw+M0SzsK/Co1yt541+jWmU4slo="; + sha256 = "sha256-3kFAaS5pMULDEeAwrBVuOO4XXXq2wb4QxcmuljhGFk4="; }; patches = [ ./0001-Use-command-v-in-favor-of-which.patch @@ -151,14 +152,22 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.tests = { - inherit cups-filters zathura; - inherit (python3.pkgs) pikepdf pymupdf; + passthru = { + tests = { + inherit cups-filters zathura; + inherit (python3.pkgs) pikepdf pymupdf; + }; + + updateScript = gitUpdater { + url = "https://git.ghostscript.com/mupdf.git"; + ignoredVersions = ".rc.*"; + }; }; meta = with lib; { homepage = "https://mupdf.com"; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; + changelog = "https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=${version}"; license = licenses.agpl3Plus; maintainers = with maintainers; [ vrthra fpletz ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/applications/misc/nwg-dock-hyprland/default.nix b/nixpkgs/pkgs/applications/misc/nwg-dock-hyprland/default.nix index b953a0376f19..2e1beb1b399e 100644 --- a/nixpkgs/pkgs/applications/misc/nwg-dock-hyprland/default.nix +++ b/nixpkgs/pkgs/applications/misc/nwg-dock-hyprland/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.1.4"; + version = "0.1.6"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aPCz9m2Qnge8XhEbvpXb2U/eT5xvJkaSoorkkoY3gp0="; + sha256 = "sha256-54ir80aSIdBnogE9a0pAq16niwXm2DFjTbb0AIijuo4="; }; - vendorHash = "sha256-GhcrIVnZRbiGTfeUAWvslOVWDZmoL0ZRnjgTtQgxe2Q="; + vendorHash = "sha256-5fN/6HASfTMb80YYAIoWRqnRGMvvX4d8C2UvOc0jQU0="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/applications/misc/nwg-dock/default.nix b/nixpkgs/pkgs/applications/misc/nwg-dock/default.nix index 1156bd4a94c9..c480a1481a71 100644 --- a/nixpkgs/pkgs/applications/misc/nwg-dock/default.nix +++ b/nixpkgs/pkgs/applications/misc/nwg-dock/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nwg-dock"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Nh6VAgQIGxNxkWnNieRope5Hj3RL0uSFuOLqg+/oucw="; + sha256 = "sha256-Ci+221sXlaqr164OYVhj8sqGSwlpFln2RRUiGoTO8Fk="; }; - vendorHash = "sha256-k/2JD25ZmVI3G9GqJnI9vz5WtRc2vo4nfAiGUt6IPyU="; + vendorHash = "sha256-GW+shKOCwU8yprEfBeAPx1RDgjA7cZZzXDG112bdZ6k="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix b/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix index ad2850910cb7..009476e6bca7 100644 --- a/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix +++ b/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "nwg-drawer"; - version = "0.3.8"; + version = "0.3.9"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-34C0JmsPuDqR3QGmGf14naGOu9xPtPbpdWUvkbilkqs="; + sha256 = "sha256-RCryDei8Tw1f+7y8iIDC3mASv5nwq4qrWRc4CudS/Cg="; }; - vendorHash = "sha256-RehZ86XuFs1kbm9V3cgPz1SPG3izK7/6fHQjPTHOYZs="; + vendorHash = "sha256-YwXX3srQdCicJlstodqOsL+dwBNVyJx/SwC2dMOUBh4="; buildInputs = [ cairo gtk3 gtk-layer-shell ]; nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ]; diff --git a/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix b/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix index 167e9a83d976..35db52a1ae7e 100644 --- a/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix +++ b/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.11"; + version = "0.9.12"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "v${version}"; - hash = "sha256-4/R/x3iQ6nsG5OLy/FMA24uxS3xKD/2901gBNe6lkk4="; + hash = "sha256-lCo58v2UGolFagci2xHcieTUvqNc1KKNj3Z92oG5WPI="; }; # No tests diff --git a/nixpkgs/pkgs/applications/misc/omegat.nix b/nixpkgs/pkgs/applications/misc/omegat.nix index 24fd23999786..da4de96fbce0 100644 --- a/nixpkgs/pkgs/applications/misc/omegat.nix +++ b/nixpkgs/pkgs/applications/misc/omegat.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, unzip, jdk, makeWrapper}: stdenv.mkDerivation { - version = "4.3.0"; + version = "6.0.0"; pname = "omegat"; src = fetchurl { # their zip has repeated files or something, so no fetchzip - url = "mirror://sourceforge/project/omegat/OmegaT%20-%20Standard/OmegaT%204.3.0/OmegaT_4.3.0_Without_JRE.zip"; - sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs"; + url = "mirror://sourceforge/project/omegat/OmegaT%20-%20Standard/OmegaT%206.0.0/OmegaT_6.0.0_Without_JRE.zip"; + sha256 = "sha256-dsbT5iuZBudUL4Kw4rdvi4y98mcvnYNj9jRvC5wJoYI="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/nixpkgs/pkgs/applications/misc/opentx/default.nix b/nixpkgs/pkgs/applications/misc/opentx/default.nix index e9a526a1f65f..0634c03e7bd7 100644 --- a/nixpkgs/pkgs/applications/misc/opentx/default.nix +++ b/nixpkgs/pkgs/applications/misc/opentx/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub , cmake, gcc-arm-embedded, python3Packages -, qtbase, qtmultimedia, qttranslations, SDL, gtest +, qtbase, qtmultimedia, qttools, SDL, gtest , dfu-util, avrdude }: @@ -15,9 +15,9 @@ mkDerivation rec { sha256 = "sha256-F3zykJhKuIpLQSTjn7mcdjEmgRAlwCZpkTaKQR9ve3g="; }; - nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; + nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow qttools ]; - buildInputs = [ qtbase qtmultimedia qttranslations SDL ]; + buildInputs = [ qtbase qtmultimedia SDL ]; postPatch = '' sed -i companion/src/burnconfigdialog.cpp \ @@ -27,7 +27,6 @@ mkDerivation rec { cmakeFlags = [ "-DGTEST_ROOT=${gtest.src}/googletest" - "-DQT_TRANSLATIONS_DIR=${qttranslations}/translations" # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed. #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude" diff --git a/nixpkgs/pkgs/applications/misc/organicmaps/default.nix b/nixpkgs/pkgs/applications/misc/organicmaps/default.nix index 236a3190c80f..f0d4a10dd6d5 100644 --- a/nixpkgs/pkgs/applications/misc/organicmaps/default.nix +++ b/nixpkgs/pkgs/applications/misc/organicmaps/default.nix @@ -1,5 +1,4 @@ { lib -, mkDerivation , stdenv , fetchFromGitHub , cmake @@ -8,6 +7,7 @@ , which , python3 , rsync +, wrapQtAppsHook , qtbase , qtsvg , libGLU @@ -19,15 +19,22 @@ , nix-update-script }: -mkDerivation rec { +let + world_feed_integration_tests_data = fetchFromGitHub { + owner = "organicmaps"; + repo = "world_feed_integration_tests_data"; + rev = "3b66e59eaae85ebc583ce20baa3bdf27811349c4"; + hash = "sha256-wOZKqwYxJLllyxCr44rAcropKhohLUIVCtsR5tz9TRw="; + }; +in stdenv.mkDerivation rec { pname = "organicmaps"; - version = "2023.06.04-13"; + version = "2023.08.18-8"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - hash = "sha256-HoEOKN99ClR1sa8YFZcS9XomtXnTRdAXS0iQEdDrhvc="; + hash = "sha256-vdleO4jNKibyDlqrfZsOCScpQ9zreuYSw2BSoNpmeLY="; fetchSubmodules = true; }; @@ -40,6 +47,9 @@ mkDerivation rec { # TODO use system boost instead, see https://github.com/organicmaps/organicmaps/issues/5345 patchShebangs 3party/boost/tools/build/src/engine/build.sh + + # Prefetch test data, or the build system will try to fetch it with git. + ln -s ${world_feed_integration_tests_data} data/world_feed_integration_tests_data ''; nativeBuildInputs = [ @@ -49,6 +59,7 @@ mkDerivation rec { which python3 rsync + wrapQtAppsHook ]; # Most dependencies are vendored diff --git a/nixpkgs/pkgs/applications/misc/parsec/bin.nix b/nixpkgs/pkgs/applications/misc/parsec/bin.nix index 7aae31152f7f..f631312b6faa 100644 --- a/nixpkgs/pkgs/applications/misc/parsec/bin.nix +++ b/nixpkgs/pkgs/applications/misc/parsec/bin.nix @@ -1,13 +1,25 @@ -{ stdenvNoCC, stdenv +{ stdenvNoCC +, stdenv , lib -, dpkg, autoPatchelfHook, makeWrapper +, dpkg +, autoPatchelfHook +, makeWrapper , fetchurl -, alsa-lib, openssl, udev +, alsa-lib +, openssl +, udev , libglvnd -, libX11, libXcursor, libXi, libXrandr +, libX11 +, libXcursor +, libXi +, libXrandr +, libXfixes , libpulseaudio , libva , ffmpeg +, libpng +, libjpeg8 +, curl }: stdenvNoCC.mkDerivation { @@ -15,7 +27,7 @@ stdenvNoCC.mkDerivation { version = "150_86e"; src = fetchurl { - url = "https://web.archive.org/web/20230124210253/https://builds.parsecgaming.com/package/parsec-linux.deb"; + url = "https://web.archive.org/web/20230531105208/https://builds.parsec.app/package/parsec-linux.deb"; sha256 = "sha256-wwBy86TdrHaH9ia40yh24yd5G84WTXREihR+9I6o6uU="; }; @@ -44,10 +56,14 @@ stdenvNoCC.mkDerivation { libpulseaudio libva ffmpeg + libpng + libjpeg8 + curl libX11 libXcursor libXi libXrandr + libXfixes ]; prepareParsec = '' @@ -74,6 +90,19 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; + # Only the main binary needs to be patched, the wrapper script handles + # everything else. The libraries in `share/parsec/skel` would otherwise + # contain dangling references when copied out of the nix store. + dontAutoPatchelf = true; + + fixupPhase = '' + runHook preFixup + + autoPatchelf $out/bin + + runHook postFixup + ''; + meta = with lib; { homepage = "https://parsecgaming.com/"; changelog = "https://parsec.app/changelog"; diff --git a/nixpkgs/pkgs/applications/misc/qcad/default.nix b/nixpkgs/pkgs/applications/misc/qcad/default.nix index 683f0eb5a8cb..f10201b4f375 100644 --- a/nixpkgs/pkgs/applications/misc/qcad/default.nix +++ b/nixpkgs/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.28.1.0"; + version = "3.28.1.3"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-NizAUyj6YbfjxXDQkVaqzkp11WMJlt4FMr72i3Cn564="; + sha256 = "sha256-4Kr/zKE2VqAblNvxT9dg1325V0OCMca3MPEiG3fTxT4="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/misc/rust-traverse/default.nix b/nixpkgs/pkgs/applications/misc/rust-traverse/default.nix new file mode 100644 index 000000000000..7d0e072ee36b --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/rust-traverse/default.nix @@ -0,0 +1,47 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, bzip2 +, zstd +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "rust-traverse"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "dmcg310"; + repo = "Rust-Traverse"; + rev = "v${version}"; + hash = "sha256-OcCWmBNDo4AA5Pk5TQqb8hen9LlHaY09Wrm4BkrU7qA="; + }; + + cargoHash = "sha256-aZ0KewzeC6o+wW2EejodHnOPbuTLjRufEYGWDyoqkq0="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + bzip2 + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Foundation + ]; + + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + meta = with lib; { + description = "Terminal based file explorer"; + homepage = "https://github.com/dmcg310/Rust-Traverse"; + changelog = "https://github.com/dmcg310/Rust-Traverse/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "rt"; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/sioyek/default.nix b/nixpkgs/pkgs/applications/misc/sioyek/default.nix index df2c7b77aee8..329bf2aada87 100644 --- a/nixpkgs/pkgs/applications/misc/sioyek/default.nix +++ b/nixpkgs/pkgs/applications/misc/sioyek/default.nix @@ -2,6 +2,7 @@ , stdenv , installShellFiles , fetchFromGitHub +, fetchurl , freetype , gumbo , harfbuzz @@ -26,6 +27,15 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-GFZaTXJhoBB+rSe7Qk6H6FZJVXr3nO9XgM+LAbS4te4="; }; + patches = [ + # Fixed compatibility with mupdf-0.23.0 + # https://github.com/ahrm/sioyek/issues/804 + (fetchurl { + url = "https://git.alpinelinux.org/aports/plain/community/sioyek/mupdf-0.23.0.patch?id=86e913eccf19b97a16f25d9b6cdf0f50232f1226"; + hash = "sha256-sEqhpk7/h6g/fIhbu5LgpKKnbnIFLInrTP1k+/GhrXE="; + }) + ]; + buildInputs = [ gumbo harfbuzz diff --git a/nixpkgs/pkgs/applications/misc/skytemple/default.nix b/nixpkgs/pkgs/applications/misc/skytemple/default.nix index d347bb3af57f..8aa1da1568f9 100644 --- a/nixpkgs/pkgs/applications/misc/skytemple/default.nix +++ b/nixpkgs/pkgs/applications/misc/skytemple/default.nix @@ -10,13 +10,13 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.4.7"; + version = "1.5.4"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-NK0yLxs7/pVpl9LCz6ggYsaUDuEAj6edBEPC+4yCxNM="; + hash = "sha256-brt1bNQonAjbqCsMLHgOS8leDb3Y8MWKIxV+BXoJ1lY="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/swaynotificationcenter/001-backport-pr296.patch b/nixpkgs/pkgs/applications/misc/swaynotificationcenter/001-backport-pr296.patch new file mode 100644 index 000000000000..61fcda5593fd --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/swaynotificationcenter/001-backport-pr296.patch @@ -0,0 +1,50 @@ +diff --git a/src/functions.vala b/src/functions.vala +index cf7fefc..9b4d82a 100644 +--- a/src/functions.vala ++++ b/src/functions.vala +@@ -102,10 +102,7 @@ namespace SwayNotificationCenter { + + public static string get_style_path (owned string ? custom_path, + bool only_system = false) { +- string[] paths = { +- // Fallback location. Specified in postinstall.py +- "/usr/local/etc/xdg/swaync/style.css" +- }; ++ string[] paths = {}; + if (custom_path != null && custom_path.length > 0) { + // Replaces the home directory relative path with a absolute path + if (custom_path.get (0) == '~') { +@@ -123,7 +120,9 @@ namespace SwayNotificationCenter { + paths += Path.build_path (Path.DIR_SEPARATOR.to_string (), + path, "swaync/style.css"); + } +- ++ // Fallback location. Specified in postinstall.py. Mostly for Debian ++ paths += "/usr/local/etc/xdg/swaync/style.css"; ++ + string path = ""; + foreach (string try_path in paths) { + if (File.new_for_path (try_path).query_exists ()) { +@@ -140,10 +139,7 @@ namespace SwayNotificationCenter { + } + + public static string get_config_path (owned string ? custom_path) { +- string[] paths = { +- // Fallback location. Specified in postinstall.py +- "/usr/local/etc/xdg/swaync/config.json" +- }; ++ string[] paths = {}; + if (custom_path != null && custom_path.length > 0) { + // Replaces the home directory relative path with a absolute path + if (custom_path.get (0) == '~') { +@@ -158,7 +154,9 @@ namespace SwayNotificationCenter { + paths += Path.build_path (Path.DIR_SEPARATOR.to_string (), + path, "swaync/config.json"); + } +- ++ // Fallback location. Specified in postinstall.py. Mostly for Debian ++ paths += "/usr/local/etc/xdg/swaync/config.json"; ++ + string path = ""; + foreach (string try_path in paths) { + if (File.new_for_path (try_path).query_exists ()) { diff --git a/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix b/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix index 639edced0fba..065ed941c386 100644 --- a/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation (finalAttrs: rec { hash = "sha256-mwwSTs4d9jUXUy33nSYJCRFlpH6naCmbRUSpfVacMBE="; }; + patches = [ + ./001-backport-pr296.patch + ]; + nativeBuildInputs = [ bash-completion # cmake # currently conflicts with meson @@ -70,6 +74,8 @@ stdenv.mkDerivation (finalAttrs: rec { postPatch = '' chmod +x build-aux/meson/postinstall.py patchShebangs build-aux/meson/postinstall.py + + substituteInPlace src/functions.vala --replace /usr/local/etc $out/etc ''; passthru.tests.version = testers.testVersion { diff --git a/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix b/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix index f05ff81a167f..aec22fdd9c9f 100644 --- a/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.25.1"; + version = "0.25.2"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-m/VExBibScZt8zlxbTSQtZdbcc1EBZ+k0DXu+pXFUnA="; + sha256 = "sha256-HC81GA/kTyppCDLo47tFU08veViGlwwi6U92CP+5X9c="; }; - cargoHash = "sha256-DFf4leS8/891YzZCkkd/rU+cUm94nOnXYDZgJK+NoCY="; + cargoHash = "sha256-M+Kgq8iSHdzAoIqnqP1NV0LWt6AComsaSlX0aypEOeA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/misc/teleprompter/default.nix b/nixpkgs/pkgs/applications/misc/teleprompter/default.nix index 7e4ac3a5701a..9e4f711d125c 100644 --- a/nixpkgs/pkgs/applications/misc/teleprompter/default.nix +++ b/nixpkgs/pkgs/applications/misc/teleprompter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, electron_10, makeDesktopItem, makeWrapper, nodePackages, autoPatchelfHook}: +{ lib, stdenv, fetchurl, electron_10, makeDesktopItem, makeWrapper, asar, autoPatchelfHook}: let electron = electron_10; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontStrip = true; - nativeBuildInputs = [ autoPatchelfHook makeWrapper nodePackages.asar ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper asar ]; installPhase = '' mkdir -p $out/bin $out/opt/teleprompter $out/share/applications asar e resources/app.asar $out/opt/teleprompter/resources/app.asar.unpacked diff --git a/nixpkgs/pkgs/applications/misc/tellico/default.nix b/nixpkgs/pkgs/applications/misc/tellico/default.nix index 2ec1097338e4..6e9d2e6cc1bb 100644 --- a/nixpkgs/pkgs/applications/misc/tellico/default.nix +++ b/nixpkgs/pkgs/applications/misc/tellico/default.nix @@ -34,11 +34,6 @@ mkDerivation rec { hash = "sha256-opg4FbfOM48eqWQUJnMHH7KSo6x4S2DHd7ucPw6iTzg="; }; - postPatch = '' - substituteInPlace src/gui/imagewidget.h \ - --replace ksane_version.h KF5/ksane_version.h - ''; - nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/nixpkgs/pkgs/applications/misc/toot/default.nix b/nixpkgs/pkgs/applications/misc/toot/default.nix index 3d85939b371e..0faa36302fc9 100644 --- a/nixpkgs/pkgs/applications/misc/toot/default.nix +++ b/nixpkgs/pkgs/applications/misc/toot/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages, nixosTests }: python3Packages.buildPythonApplication rec { pname = "toot"; @@ -20,6 +20,8 @@ python3Packages.buildPythonApplication rec { py.test ''; + passthru.tests.toot = nixosTests.pleroma; + meta = with lib; { description = "Mastodon CLI interface"; homepage = "https://github.com/ihabunek/toot"; diff --git a/nixpkgs/pkgs/applications/misc/ttdl/default.nix b/nixpkgs/pkgs/applications/misc/ttdl/default.nix index f970fe377640..795253aeda2b 100644 --- a/nixpkgs/pkgs/applications/misc/ttdl/default.nix +++ b/nixpkgs/pkgs/applications/misc/ttdl/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "ttdl"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-er2IDPVFbcuT0COBCpBymNVBKtETdWjzR2330WUBp6U="; + sha256 = "sha256-twl72feo1PpWZbs50a962pvvD5YUHfZRW9OjY/meYVo="; }; - cargoHash = "sha256-WcqkvnXRgsDJM7p2WGa5lmeeuwNwBy2ZQATVkTHRX7Q="; + cargoHash = "sha256-ZoVPC/PyMm+yuDYhVFykIBk0T5RNLAfmIT36Tl/dxCo="; meta = with lib; { description = "A CLI tool to manage todo lists in todo.txt format"; diff --git a/nixpkgs/pkgs/applications/misc/tuba/default.nix b/nixpkgs/pkgs/applications/misc/tuba/default.nix index 6d2ba9e3f54e..6af6ef09dfcf 100644 --- a/nixpkgs/pkgs/applications/misc/tuba/default.nix +++ b/nixpkgs/pkgs/applications/misc/tuba/default.nix @@ -13,6 +13,7 @@ , json-glib , glib , glib-networking +, gobject-introspection , gtksourceview5 , libxml2 , libgee @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { python3 wrapGAppsHook4 desktop-file-utils + gobject-introspection ]; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/ubpm/default.nix b/nixpkgs/pkgs/applications/misc/ubpm/default.nix index a9053374c7af..6e0d7f7f25f5 100644 --- a/nixpkgs/pkgs/applications/misc/ubpm/default.nix +++ b/nixpkgs/pkgs/applications/misc/ubpm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitea, qmake, qttools, qtbase, qtserialport -, qtconnectivity, qtcharts, qttranslations, wrapQtAppsHook }: +, qtconnectivity, qtcharts, wrapQtAppsHook }: stdenv.mkDerivation (finalAttrs: { pname = "ubpm"; @@ -15,7 +15,6 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace sources/mainapp/mainapp.pro \ - --replace '$$[QT_INSTALL_TRANSLATIONS]' '${qttranslations}/translations' \ --replace 'INSTALLDIR = /tmp/ubpm.AppDir' "INSTALLDIR = $out" \ --replace '/usr/bin' '/bin' \ --replace 'INSTALLS += target translations themes devices help lin' 'INSTALLS += target translations themes devices help' @@ -40,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { # *.so plugins are being wrapped automatically which breaks them dontWrapQtApps = true; - buildInputs = [ qtbase qtserialport qtconnectivity qtcharts qttranslations ]; + buildInputs = [ qtbase qtserialport qtconnectivity qtcharts ]; meta = with lib; { homepage = "https://codeberg.org/LazyT/ubpm"; diff --git a/nixpkgs/pkgs/applications/misc/usql/default.nix b/nixpkgs/pkgs/applications/misc/usql/default.nix index ad45adbe0a73..173e50d17518 100644 --- a/nixpkgs/pkgs/applications/misc/usql/default.nix +++ b/nixpkgs/pkgs/applications/misc/usql/default.nix @@ -10,28 +10,29 @@ buildGoModule rec { pname = "usql"; - version = "0.14.10"; + version = "0.15.0"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-4T8h4KPouhjGaeeThCULilzmPs2CVGBpiqXYmtSkCO4="; + hash = "sha256-YjRbrhJSbX1OLEc7A72ubg1KtzJSWY0KphD4d8dAKQ8="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-a+hcd0vQ0jt3Dp+YnMORe6yIohbmpN22sOUJ6G1i4P4="; + vendorHash = "sha256-OZ/eui+LR+Gn1nmu9wryGmz3jiUMuDScmTZ5G8UKWP8="; proxyVendor = true; - # Exclude broken impala & hive driver + # Exclude broken genji, hive & impala drivers (bad group) # These drivers break too often and are not used. # # See https://github.com/xo/usql/pull/347 # excludedPackages = [ - "impala" + "genji" "hive" + "impala" ]; # These tags and flags are copied from build-release.sh diff --git a/nixpkgs/pkgs/applications/misc/valent/default.nix b/nixpkgs/pkgs/applications/misc/valent/default.nix index 1b8f78cd6180..e60803e5b6ee 100644 --- a/nixpkgs/pkgs/applications/misc/valent/default.nix +++ b/nixpkgs/pkgs/applications/misc/valent/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "valent"; - version = "unstable-2023-07-31"; + version = "unstable-2023-08-26"; src = fetchFromGitHub { owner = "andyholmes"; repo = "valent"; - rev = "698f39b496957d50c68437f16e74a7ac41eb5147"; + rev = "89d1e5a0312a0371bfcd9a95486805917c3729c0"; fetchSubmodules = true; - hash = "sha256-AdW6oMRVIgat8XlH342PEwe6BfkzKVLSadGOTLGwzwo="; + hash = "sha256-28l+SkjVQkOA/5f5nT5BbqIV2BrMLmSK/YtDGYl1xjQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/valentina/default.nix b/nixpkgs/pkgs/applications/misc/valentina/default.nix index f5cd55c534c3..c00159c0c64d 100644 --- a/nixpkgs/pkgs/applications/misc/valentina/default.nix +++ b/nixpkgs/pkgs/applications/misc/valentina/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitLab, substituteAll, installShellFiles +{ lib, stdenv, fetchFromGitLab, installShellFiles , qmake, qttools -, qtsvg, qttranslations, qtxmlpatterns +, qtsvg, qtxmlpatterns , wrapQtAppsHook }: @@ -15,12 +15,6 @@ stdenv.mkDerivation rec { hash = "sha256-N9fC2tCP4TVNncatHaz5W5Mp3jOmAcEWYCl30+0myaE="; }; - patches = (substituteAll { - # See https://github.com/NixOS/nixpkgs/issues/86054 - src = ./fix-qttranslations-path.patch; - inherit qttranslations; - }); - postPatch = '' substituteInPlace src/app/translations.pri \ --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev qttools}/bin/lrelease' diff --git a/nixpkgs/pkgs/applications/misc/valentina/fix-qttranslations-path.patch b/nixpkgs/pkgs/applications/misc/valentina/fix-qttranslations-path.patch deleted file mode 100644 index de3fe05cc8b0..000000000000 --- a/nixpkgs/pkgs/applications/misc/valentina/fix-qttranslations-path.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git i/src/libs/vmisc/vabstractapplication.cpp w/src/libs/vmisc/vabstractapplication.cpp -index b64817bab..5f9aa3518 100644 ---- i/src/libs/vmisc/vabstractapplication.cpp -+++ w/src/libs/vmisc/vabstractapplication.cpp -@@ -221,26 +221,26 @@ void VAbstractApplication::LoadTranslation(const QString &locale) - ClearTranslation(); - - qtTranslator = new QTranslator(this); --#if defined(Q_OS_WIN) || defined(Q_OS_MAC) -+#if defined(Q_OS_WIN) - qtTranslator->load("qt_" + locale, translationsPath(locale)); - #else -- qtTranslator->load("qt_" + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); -+ qtTranslator->load("qt_" + locale, QLatin1String("@qttranslations@/translations")); - #endif - installTranslator(qtTranslator); - - qtxmlTranslator = new QTranslator(this); --#if defined(Q_OS_WIN) || defined(Q_OS_MAC) -+#if defined(Q_OS_WIN) - qtxmlTranslator->load("qtxmlpatterns_" + locale, translationsPath(locale)); - #else -- qtxmlTranslator->load("qtxmlpatterns_" + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); -+ qtxmlTranslator->load("qtxmlpatterns_" + locale, QLatin1String("@qttranslations@/translations")); - #endif - installTranslator(qtxmlTranslator); - - qtBaseTranslator = new QTranslator(this); --#if defined(Q_OS_WIN) || defined(Q_OS_MAC) -+#if defined(Q_OS_WIN) - qtBaseTranslator->load("qtbase_" + locale, translationsPath(locale)); - #else -- qtBaseTranslator->load("qtbase_" + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); -+ qtBaseTranslator->load("qtbase_" + locale, QLatin1String("@qttranslations@/translations")); - #endif - installTranslator(qtBaseTranslator); - diff --git a/nixpkgs/pkgs/applications/misc/whalebird/default.nix b/nixpkgs/pkgs/applications/misc/whalebird/default.nix index 36868690d81d..ce7d178f1c05 100644 --- a/nixpkgs/pkgs/applications/misc/whalebird/default.nix +++ b/nixpkgs/pkgs/applications/misc/whalebird/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, autoPatchelfHook, makeDesktopItem, copyDesktopItems, makeWrapper, gnugrep, nodePackages +, autoPatchelfHook, makeDesktopItem, copyDesktopItems, makeWrapper, gnugrep, asar , electron, python3, alsa-lib, gtk3, libdbusmenu, libxshmfence, mesa, nss }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { makeWrapper copyDesktopItems gnugrep - nodePackages.asar + asar ]; buildInputs = [ alsa-lib gtk3 libdbusmenu libxshmfence mesa nss ]; diff --git a/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix b/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix index be5d08f6ef48..99d8225f264a 100644 --- a/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.19.3-mo1"; + version = "6.20.0-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-0yH+EFhzhDS/75AIjMiFbkQuHfPaJRzdr7n4/WBkeNM="; + sha256 = "sha256-yHAipyZJXwH21u4YwjUqDCsXHVrI+eSnp4Iqt3AZC9A="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/yewtube/default.nix b/nixpkgs/pkgs/applications/misc/yewtube/default.nix index b6dfbafb1cdf..14f50e3be290 100644 --- a/nixpkgs/pkgs/applications/misc/yewtube/default.nix +++ b/nixpkgs/pkgs/applications/misc/yewtube/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yewtube"; - version = "2.10.4"; + version = "2.10.5"; src = fetchFromGitHub { owner = "mps-youtube"; repo = "yewtube"; rev = "refs/tags/v${version}"; - hash = "sha256-v0ePyY+7GUlnv1WLKn7GuIv+A2QdXObRnTyMkk5hI1U="; + hash = "sha256-a7ySRHSRHmQePaVV7HnCk8QsiAQfN4nCVRdamPMUHGo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix b/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix index 326e03721ece..9082fb11785b 100644 --- a/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix @@ -1,5 +1,6 @@ { lib -, flutter37 +, writeText +, flutter , python3 , fetchFromGitHub , pcre2 @@ -11,7 +12,7 @@ , removeReferencesTo }: -flutter37.buildFlutterApplication rec { +flutter.buildFlutterApplication rec { pname = "yubioath-flutter"; version = "6.2.0"; @@ -24,10 +25,16 @@ flutter37.buildFlutterApplication rec { passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; + pubspecLockFile = ./pubspec.lock; depsListFile = ./deps.json; - vendorHash = "sha256-q/dNj9Pu7zg0HkV2QkXBbXiTsljsSJOqXhvAQlnoLlA="; + vendorHash = "sha256-RV7NoXJnd1jYGcU5YE0VV7VlMM7bz2JTMJTImOY3m38="; postPatch = '' + rm -f pubspec.lock + ln -s "${writeText "${pname}-overrides.yaml" (builtins.toJSON { + dependency_overrides.intl = "^0.18.1"; + })}" pubspec_overrides.yaml + substituteInPlace linux/CMakeLists.txt \ --replace "../build/linux/helper" "${passthru.helper}/libexec/helper" ''; @@ -63,9 +70,6 @@ flutter37.buildFlutterApplication rec { substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \ --replace "@EXEC_PATH/authenticator" "$out/bin/yubioath-flutter" \ --replace "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "$out/share/icons/com.yubico.yubioath.png" - - # Remove unnecessary references to Flutter. - remove-references-to -t ${flutter37.unwrapped} $out/app/data/flutter_assets/shaders/ink_sparkle.frag ''; nativeBuildInputs = [ @@ -80,11 +84,6 @@ flutter37.buildFlutterApplication rec { libappindicator ]; - disallowedReferences = [ - flutter37 - flutter37.unwrapped - ]; - meta = with lib; { description = "Yubico Authenticator for Desktop"; homepage = "https://github.com/Yubico/yubioath-flutter"; diff --git a/nixpkgs/pkgs/applications/misc/yubioath-flutter/deps.json b/nixpkgs/pkgs/applications/misc/yubioath-flutter/deps.json index 6d7414da346e..5754c1e0b27c 100644 --- a/nixpkgs/pkgs/applications/misc/yubioath-flutter/deps.json +++ b/nixpkgs/pkgs/applications/misc/yubioath-flutter/deps.json @@ -39,7 +39,7 @@ }, { "name": "json_serializable", - "version": "6.6.1", + "version": "6.7.1", "kind": "dev", "source": "hosted", "dependencies": [ @@ -59,7 +59,7 @@ }, { "name": "source_helper", - "version": "1.3.3", + "version": "1.3.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -70,7 +70,7 @@ }, { "name": "source_gen", - "version": "1.2.7", + "version": "1.4.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -86,7 +86,7 @@ }, { "name": "yaml", - "version": "3.1.1", + "version": "3.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -106,7 +106,7 @@ }, { "name": "source_span", - "version": "1.9.1", + "version": "1.10.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -124,21 +124,21 @@ }, { "name": "path", - "version": "1.8.2", + "version": "1.8.3", "kind": "direct", "source": "hosted", "dependencies": [] }, { "name": "collection", - "version": "1.17.0", + "version": "1.17.2", "kind": "direct", "source": "hosted", "dependencies": [] }, { "name": "glob", - "version": "2.1.1", + "version": "2.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -161,14 +161,14 @@ }, { "name": "meta", - "version": "1.8.0", + "version": "1.9.1", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "async", - "version": "2.10.0", + "version": "2.11.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -178,7 +178,7 @@ }, { "name": "dart_style", - "version": "2.2.4", + "version": "2.3.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -191,7 +191,7 @@ }, { "name": "pub_semver", - "version": "2.1.3", + "version": "2.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -201,14 +201,14 @@ }, { "name": "args", - "version": "2.4.0", + "version": "2.4.2", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "analyzer", - "version": "5.6.0", + "version": "6.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -228,7 +228,7 @@ }, { "name": "watcher", - "version": "1.0.2", + "version": "1.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -247,7 +247,7 @@ }, { "name": "crypto", - "version": "3.0.2", + "version": "3.0.3", "kind": "direct", "source": "hosted", "dependencies": [ @@ -256,7 +256,7 @@ }, { "name": "typed_data", - "version": "1.3.1", + "version": "1.3.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -274,7 +274,7 @@ }, { "name": "_fe_analyzer_shared", - "version": "54.0.0", + "version": "64.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -283,7 +283,7 @@ }, { "name": "build", - "version": "2.3.1", + "version": "2.4.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -294,19 +294,20 @@ "glob", "logging", "meta", + "package_config", "path" ] }, { "name": "logging", - "version": "1.1.1", + "version": "1.2.0", "kind": "direct", "source": "hosted", "dependencies": [] }, { "name": "pubspec_parse", - "version": "1.2.1", + "version": "1.2.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -319,7 +320,7 @@ }, { "name": "json_annotation", - "version": "4.8.0", + "version": "4.8.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -328,7 +329,7 @@ }, { "name": "checked_yaml", - "version": "2.0.2", + "version": "2.0.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -352,7 +353,7 @@ }, { "name": "freezed", - "version": "2.3.2", + "version": "2.4.2", "kind": "dev", "source": "hosted", "dependencies": [ @@ -368,7 +369,7 @@ }, { "name": "freezed_annotation", - "version": "2.2.0", + "version": "2.4.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -379,13 +380,13 @@ }, { "name": "build_runner", - "version": "2.3.3", + "version": "2.4.6", "kind": "dev", "source": "hosted", "dependencies": [ + "analyzer", "args", "async", - "analyzer", "build", "build_config", "build_daemon", @@ -421,7 +422,7 @@ }, { "name": "web_socket_channel", - "version": "2.3.0", + "version": "2.4.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -466,7 +467,7 @@ }, { "name": "shelf_web_socket", - "version": "1.0.3", + "version": "1.0.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -477,7 +478,7 @@ }, { "name": "shelf", - "version": "1.4.0", + "version": "1.4.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -520,7 +521,7 @@ }, { "name": "js", - "version": "0.6.5", + "version": "0.6.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -549,7 +550,7 @@ }, { "name": "graphs", - "version": "2.2.0", + "version": "2.3.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -568,7 +569,7 @@ }, { "name": "code_builder", - "version": "4.4.0", + "version": "4.5.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -581,17 +582,47 @@ }, { "name": "matcher", - "version": "0.12.13", + "version": "0.12.16", "kind": "transitive", "source": "hosted", "dependencies": [ + "async", "meta", - "stack_trace" + "stack_trace", + "term_glyph", + "test_api" + ] + }, + { + "name": "test_api", + "version": "0.6.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "boolean_selector", + "collection", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "term_glyph" + ] + }, + { + "name": "boolean_selector", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span", + "string_scanner" ] }, { "name": "built_value", - "version": "8.4.3", + "version": "8.6.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -617,7 +648,7 @@ }, { "name": "build_runner_core", - "version": "7.2.7", + "version": "7.2.10", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -633,8 +664,8 @@ "json_annotation", "logging", "meta", - "path", "package_config", + "path", "pool", "timing", "watcher", @@ -643,7 +674,7 @@ }, { "name": "build_resolvers", - "version": "2.2.0", + "version": "2.2.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -654,8 +685,8 @@ "crypto", "graphs", "logging", - "path", "package_config", + "path", "pool", "pub_semver", "stream_transform", @@ -664,7 +695,7 @@ }, { "name": "build_daemon", - "version": "3.1.1", + "version": "4.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -683,7 +714,7 @@ }, { "name": "flutter_lints", - "version": "2.0.1", + "version": "2.0.2", "kind": "dev", "source": "hosted", "dependencies": [ @@ -692,7 +723,7 @@ }, { "name": "lints", - "version": "2.0.1", + "version": "2.1.1", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -705,6 +736,7 @@ "dependencies": [ "flutter", "test_api", + "matcher", "path", "fake_async", "clock", @@ -714,39 +746,37 @@ "boolean_selector", "characters", "collection", - "js", - "matcher", "material_color_utilities", "meta", "source_span", "stream_channel", "string_scanner", - "term_glyph" + "term_glyph", + "web" ] }, { - "name": "material_color_utilities", - "version": "0.2.0", + "name": "web", + "version": "0.1.4-beta", "kind": "transitive", "source": "hosted", "dependencies": [] }, { - "name": "characters", - "version": "1.2.1", + "name": "material_color_utilities", + "version": "0.5.0", "kind": "transitive", "source": "hosted", - "dependencies": [] + "dependencies": [ + "collection" + ] }, { - "name": "boolean_selector", - "version": "2.1.1", + "name": "characters", + "version": "1.3.0", "kind": "transitive", "source": "hosted", - "dependencies": [ - "source_span", - "string_scanner" - ] + "dependencies": [] }, { "name": "vector_math", @@ -773,24 +803,6 @@ ] }, { - "name": "test_api", - "version": "0.4.16", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "async", - "boolean_selector", - "collection", - "meta", - "source_span", - "stack_trace", - "stream_channel", - "string_scanner", - "term_glyph", - "matcher" - ] - }, - { "name": "flutter", "version": "0.0.0", "kind": "direct", @@ -798,10 +810,10 @@ "dependencies": [ "characters", "collection", - "js", "material_color_utilities", "meta", "vector_math", + "web", "sky_engine" ] }, @@ -823,16 +835,13 @@ "flutter_test", "path", "vm_service", - "archive", "async", "boolean_selector", "characters", "clock", "collection", - "crypto", "fake_async", "file", - "js", "matcher", "material_color_utilities", "meta", @@ -843,18 +852,17 @@ "sync_http", "term_glyph", "test_api", - "typed_data", "vector_math", + "web", "webdriver" ] }, { "name": "webdriver", - "version": "3.0.1", + "version": "3.0.2", "kind": "transitive", "source": "hosted", "dependencies": [ - "archive", "matcher", "path", "stack_trace", @@ -869,18 +877,8 @@ "dependencies": [] }, { - "name": "archive", - "version": "3.3.2", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "crypto", - "path" - ] - }, - { "name": "vm_service", - "version": "9.4.0", + "version": "11.7.1", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -899,14 +897,11 @@ "meta", "vm_service", "webdriver", - "archive", "async", "boolean_selector", "characters", "clock", "collection", - "crypto", - "js", "matcher", "material_color_utilities", "platform", @@ -918,8 +913,8 @@ "sync_http", "term_glyph", "test_api", - "typed_data", - "vector_math" + "vector_math", + "web" ] }, { @@ -1002,8 +997,30 @@ ] }, { + "name": "archive", + "version": "3.3.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "crypto", + "path", + "pointycastle" + ] + }, + { + "name": "pointycastle", + "version": "3.7.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "convert", + "js" + ] + }, + { "name": "file_picker", - "version": "5.2.7", + "version": "5.3.4", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1018,7 +1035,7 @@ }, { "name": "win32", - "version": "3.1.3", + "version": "5.0.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1027,14 +1044,14 @@ }, { "name": "ffi", - "version": "2.0.1", + "version": "2.1.0", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "plugin_platform_interface", - "version": "2.1.4", + "version": "2.1.5", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1043,7 +1060,7 @@ }, { "name": "flutter_plugin_android_lifecycle", - "version": "2.0.7", + "version": "2.0.15", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1057,17 +1074,17 @@ "source": "sdk", "dependencies": [ "flutter", - "js", "characters", "collection", "material_color_utilities", "meta", - "vector_math" + "vector_math", + "web" ] }, { "name": "vector_graphics_compiler", - "version": "1.1.4", + "version": "1.1.7", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1080,14 +1097,14 @@ }, { "name": "vector_graphics_codec", - "version": "1.1.4", + "version": "1.1.7", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "xml", - "version": "6.2.2", + "version": "6.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1098,7 +1115,7 @@ }, { "name": "petitparser", - "version": "5.1.0", + "version": "5.4.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1117,7 +1134,7 @@ }, { "name": "vector_graphics", - "version": "1.1.4", + "version": "1.1.7", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1127,7 +1144,7 @@ }, { "name": "path_provider", - "version": "2.0.14", + "version": "2.1.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1141,7 +1158,7 @@ }, { "name": "path_provider_windows", - "version": "2.1.4", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1154,7 +1171,7 @@ }, { "name": "path_provider_platform_interface", - "version": "2.0.6", + "version": "2.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1165,7 +1182,7 @@ }, { "name": "path_provider_linux", - "version": "2.1.9", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1178,18 +1195,17 @@ }, { "name": "xdg_directories", - "version": "1.0.0", + "version": "1.0.2", "kind": "transitive", "source": "hosted", "dependencies": [ "meta", - "path", - "process" + "path" ] }, { "name": "path_provider_foundation", - "version": "2.1.1", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1199,7 +1215,7 @@ }, { "name": "path_provider_android", - "version": "2.0.22", + "version": "2.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1209,7 +1225,7 @@ }, { "name": "url_launcher", - "version": "6.1.10", + "version": "6.1.12", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1225,7 +1241,7 @@ }, { "name": "url_launcher_windows", - "version": "3.0.4", + "version": "3.0.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1235,7 +1251,7 @@ }, { "name": "url_launcher_platform_interface", - "version": "2.1.2", + "version": "2.1.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1245,7 +1261,7 @@ }, { "name": "url_launcher_web", - "version": "2.0.15", + "version": "2.0.18", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1256,7 +1272,7 @@ }, { "name": "url_launcher_macos", - "version": "3.0.3", + "version": "3.0.6", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1266,7 +1282,7 @@ }, { "name": "url_launcher_linux", - "version": "3.0.3", + "version": "3.0.5", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1276,7 +1292,7 @@ }, { "name": "url_launcher_ios", - "version": "6.1.1", + "version": "6.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1286,7 +1302,7 @@ }, { "name": "url_launcher_android", - "version": "6.0.24", + "version": "6.0.38", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1296,7 +1312,7 @@ }, { "name": "desktop_drop", - "version": "0.4.1", + "version": "0.4.3", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1317,7 +1333,7 @@ }, { "name": "screen_retriever", - "version": "0.1.6", + "version": "0.1.9", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1336,7 +1352,7 @@ }, { "name": "window_manager", - "version": "0.3.2", + "version": "0.3.6", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1381,7 +1397,7 @@ }, { "name": "shared_preferences", - "version": "2.1.0", + "version": "2.2.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1396,7 +1412,7 @@ }, { "name": "shared_preferences_windows", - "version": "2.2.0", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1410,7 +1426,7 @@ }, { "name": "shared_preferences_platform_interface", - "version": "2.2.0", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1420,7 +1436,7 @@ }, { "name": "shared_preferences_web", - "version": "2.1.0", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1431,7 +1447,7 @@ }, { "name": "shared_preferences_linux", - "version": "2.2.0", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1445,7 +1461,7 @@ }, { "name": "shared_preferences_foundation", - "version": "2.2.0", + "version": "2.3.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1455,7 +1471,7 @@ }, { "name": "shared_preferences_android", - "version": "2.1.0", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1465,11 +1481,12 @@ }, { "name": "intl", - "version": "0.17.0", + "version": "0.18.1", "kind": "direct", "source": "hosted", "dependencies": [ "clock", + "meta", "path" ] }, @@ -1484,11 +1501,11 @@ "characters", "clock", "collection", - "js", "material_color_utilities", "meta", "path", - "vector_math" + "vector_math", + "web" ] } ] diff --git a/nixpkgs/pkgs/applications/misc/yubioath-flutter/pubspec.lock b/nixpkgs/pkgs/applications/misc/yubioath-flutter/pubspec.lock new file mode 100644 index 000000000000..524d76f7f233 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/yubioath-flutter/pubspec.lock @@ -0,0 +1,997 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051 + url: "https://pub.dev" + source: hosted + version: "64.0.0" + analyzer: + dependency: transitive + description: + name: analyzer + sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893" + url: "https://pub.dev" + source: hosted + version: "6.2.0" + archive: + dependency: "direct main" + description: + name: archive + sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a" + url: "https://pub.dev" + source: hosted + version: "3.3.7" + args: + dependency: transitive + description: + name: args + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" + source: hosted + version: "2.4.2" + async: + dependency: "direct main" + description: + name: async + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" + source: hosted + version: "2.11.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + build: + dependency: transitive + description: + name: build + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + build_config: + dependency: transitive + description: + name: build_config + sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + url: "https://pub.dev" + source: hosted + version: "1.1.1" + build_daemon: + dependency: transitive + description: + name: build_daemon + sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65" + url: "https://pub.dev" + source: hosted + version: "4.0.0" + build_resolvers: + dependency: transitive + description: + name: build_resolvers + sha256: "6c4dd11d05d056e76320b828a1db0fc01ccd376922526f8e9d6c796a5adbac20" + url: "https://pub.dev" + source: hosted + version: "2.2.1" + build_runner: + dependency: "direct dev" + description: + name: build_runner + sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b" + url: "https://pub.dev" + source: hosted + version: "2.4.6" + build_runner_core: + dependency: transitive + description: + name: build_runner_core + sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41" + url: "https://pub.dev" + source: hosted + version: "7.2.10" + built_collection: + dependency: transitive + description: + name: built_collection + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" + source: hosted + version: "5.1.1" + built_value: + dependency: transitive + description: + name: built_value + sha256: ff627b645b28fb8bdb69e645f910c2458fd6b65f6585c3a53e0626024897dedf + url: "https://pub.dev" + source: hosted + version: "8.6.2" + characters: + dependency: transitive + description: + name: characters + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" + source: hosted + version: "1.3.0" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + url: "https://pub.dev" + source: hosted + version: "2.0.3" + clock: + dependency: transitive + description: + name: clock + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" + source: hosted + version: "1.1.1" + code_builder: + dependency: transitive + description: + name: code_builder + sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189" + url: "https://pub.dev" + source: hosted + version: "4.5.0" + collection: + dependency: "direct main" + description: + name: collection + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + url: "https://pub.dev" + source: hosted + version: "1.17.2" + convert: + dependency: transitive + description: + name: convert + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" + source: hosted + version: "3.1.1" + cross_file: + dependency: transitive + description: + name: cross_file + sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9" + url: "https://pub.dev" + source: hosted + version: "0.3.3+4" + crypto: + dependency: "direct main" + description: + name: crypto + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + url: "https://pub.dev" + source: hosted + version: "3.0.3" + dart_style: + dependency: transitive + description: + name: dart_style + sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55" + url: "https://pub.dev" + source: hosted + version: "2.3.2" + desktop_drop: + dependency: "direct main" + description: + name: desktop_drop + sha256: ebba9c9cb0b54385998a977d741cc06fd8324878c08d5a36e9da61cd56b04cc6 + url: "https://pub.dev" + source: hosted + version: "0.4.3" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" + source: hosted + version: "1.3.1" + ffi: + dependency: transitive + description: + name: ffi + sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + file: + dependency: transitive + description: + name: file + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" + source: hosted + version: "6.1.4" + file_picker: + dependency: "direct main" + description: + name: file_picker + sha256: bdfa035a974a0c080576c4c8ed01cdf9d1b406a04c7daa05443ef0383a97bedc + url: "https://pub.dev" + source: hosted + version: "5.3.4" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_driver: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4" + url: "https://pub.dev" + source: hosted + version: "2.0.2" + flutter_localizations: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_plugin_android_lifecycle: + dependency: transitive + description: + name: flutter_plugin_android_lifecycle + sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360" + url: "https://pub.dev" + source: hosted + version: "2.0.15" + flutter_riverpod: + dependency: "direct main" + description: + name: flutter_riverpod + sha256: b3c3a8a9714b7f88dd2a41e1efbc47f76d620b06ab427c62ae7bc82298cd7dbb + url: "https://pub.dev" + source: hosted + version: "2.3.2" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + freezed: + dependency: "direct dev" + description: + name: freezed + sha256: "83462cfc33dc9680533a7f3a4a6ab60aa94f287db5f4ee6511248c22833c497f" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + freezed_annotation: + dependency: "direct main" + description: + name: freezed_annotation + sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d + url: "https://pub.dev" + source: hosted + version: "2.4.1" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + url: "https://pub.dev" + source: hosted + version: "3.2.0" + fuchsia_remote_debug_protocol: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + glob: + dependency: transitive + description: + name: glob + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + graphs: + dependency: transitive + description: + name: graphs + sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + url: "https://pub.dev" + source: hosted + version: "2.3.1" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" + source: hosted + version: "3.2.1" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + integration_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + intl: + dependency: "direct main" + description: + name: intl + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + url: "https://pub.dev" + source: hosted + version: "0.18.1" + io: + dependency: transitive + description: + name: io + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + js: + dependency: transitive + description: + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" + source: hosted + version: "0.6.7" + json_annotation: + dependency: "direct main" + description: + name: json_annotation + sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + url: "https://pub.dev" + source: hosted + version: "4.8.1" + json_serializable: + dependency: "direct dev" + description: + name: json_serializable + sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969 + url: "https://pub.dev" + source: hosted + version: "6.7.1" + lints: + dependency: transitive + description: + name: lints + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + local_notifier: + dependency: "direct main" + description: + name: local_notifier + sha256: cc855aa6362c8840e3d3b35b1c3b058a3a8becdb2b03d5a9aa3f3a1e861f0a03 + url: "https://pub.dev" + source: hosted + version: "0.1.5" + logging: + dependency: "direct main" + description: + name: logging + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + matcher: + dependency: transitive + description: + name: matcher + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + url: "https://pub.dev" + source: hosted + version: "0.12.16" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + url: "https://pub.dev" + source: hosted + version: "0.5.0" + menu_base: + dependency: transitive + description: + name: menu_base + sha256: "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405" + url: "https://pub.dev" + source: hosted + version: "0.1.1" + meta: + dependency: transitive + description: + name: meta + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + mime: + dependency: transitive + description: + name: mime + sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + url: "https://pub.dev" + source: hosted + version: "1.0.4" + package_config: + dependency: transitive + description: + name: package_config + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + path: + dependency: "direct main" + description: + name: path + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" + source: hosted + version: "1.8.3" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + url: "https://pub.dev" + source: hosted + version: "1.0.1" + path_provider: + dependency: "direct main" + description: + name: path_provider + sha256: "909b84830485dbcd0308edf6f7368bc8fd76afa26a270420f34cabea2a6467a0" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + path_provider_android: + dependency: transitive + description: + name: path_provider_android + sha256: "5d44fc3314d969b84816b569070d7ace0f1dea04bd94a83f74c4829615d22ad8" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + path_provider_foundation: + dependency: transitive + description: + name: path_provider_foundation + sha256: "1b744d3d774e5a879bb76d6cd1ecee2ba2c6960c03b1020cd35212f6aa267ac5" + url: "https://pub.dev" + source: hosted + version: "2.3.0" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3 + url: "https://pub.dev" + source: hosted + version: "2.2.0" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84 + url: "https://pub.dev" + source: hosted + version: "2.1.0" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da + url: "https://pub.dev" + source: hosted + version: "2.2.0" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + url: "https://pub.dev" + source: hosted + version: "5.4.0" + platform: + dependency: transitive + description: + name: platform + sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + url: "https://pub.dev" + source: hosted + version: "3.1.0" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd" + url: "https://pub.dev" + source: hosted + version: "2.1.5" + pointycastle: + dependency: transitive + description: + name: pointycastle + sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" + url: "https://pub.dev" + source: hosted + version: "3.7.3" + pool: + dependency: transitive + description: + name: pool + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" + source: hosted + version: "1.5.1" + process: + dependency: transitive + description: + name: process + sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + url: "https://pub.dev" + source: hosted + version: "4.2.4" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + pubspec_parse: + dependency: transitive + description: + name: pubspec_parse + sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 + url: "https://pub.dev" + source: hosted + version: "1.2.3" + qrscanner_zxing: + dependency: "direct main" + description: + path: "android/flutter_plugins/qrscanner_zxing" + relative: true + source: path + version: "1.0.0" + riverpod: + dependency: transitive + description: + name: riverpod + sha256: b0fbf7927333c5c318f7e2c22c8b4fd2542ba294de0373e80ecdb34e0dcd8dc4 + url: "https://pub.dev" + source: hosted + version: "2.3.2" + screen_retriever: + dependency: "direct main" + description: + name: screen_retriever + sha256: "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90" + url: "https://pub.dev" + source: hosted + version: "0.1.9" + shared_preferences: + dependency: "direct main" + description: + name: shared_preferences + sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1" + url: "https://pub.dev" + source: hosted + version: "2.2.0" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076 + url: "https://pub.dev" + source: hosted + version: "2.2.0" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: d29753996d8eb8f7619a1f13df6ce65e34bc107bef6330739ed76f18b22310ef + url: "https://pub.dev" + source: hosted + version: "2.3.3" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + sha256: "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1" + url: "https://pub.dev" + source: hosted + version: "2.3.0" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1" + url: "https://pub.dev" + source: hosted + version: "2.3.0" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + sha256: "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a" + url: "https://pub.dev" + source: hosted + version: "2.2.0" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + sha256: f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d + url: "https://pub.dev" + source: hosted + version: "2.3.0" + shelf: + dependency: transitive + description: + name: shelf + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + url: "https://pub.dev" + source: hosted + version: "1.4.1" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + shortid: + dependency: transitive + description: + name: shortid + sha256: d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb + url: "https://pub.dev" + source: hosted + version: "0.1.2" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" + source_gen: + dependency: transitive + description: + name: source_gen + sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + source_helper: + dependency: transitive + description: + name: source_helper + sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd" + url: "https://pub.dev" + source: hosted + version: "1.3.4" + source_span: + dependency: transitive + description: + name: source_span + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" + source: hosted + version: "1.10.0" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" + source: hosted + version: "1.11.0" + state_notifier: + dependency: transitive + description: + name: state_notifier + sha256: "8fe42610f179b843b12371e40db58c9444f8757f8b69d181c97e50787caed289" + url: "https://pub.dev" + source: hosted + version: "0.7.2+1" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + stream_transform: + dependency: transitive + description: + name: stream_transform + sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + sync_http: + dependency: transitive + description: + name: sync_http + sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961" + url: "https://pub.dev" + source: hosted + version: "0.3.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + test_api: + dependency: transitive + description: + name: test_api + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + url: "https://pub.dev" + source: hosted + version: "0.6.0" + timing: + dependency: transitive + description: + name: timing + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + url: "https://pub.dev" + source: hosted + version: "1.0.1" + tray_manager: + dependency: "direct main" + description: + name: tray_manager + sha256: b1975a05e0c6999e983cf9a58a6a098318c896040ccebac5398a3cc9e43b9c69 + url: "https://pub.dev" + source: hosted + version: "0.2.0" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" + source: hosted + version: "1.3.2" + url_launcher: + dependency: "direct main" + description: + name: url_launcher + sha256: "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e" + url: "https://pub.dev" + source: hosted + version: "6.1.12" + url_launcher_android: + dependency: transitive + description: + name: url_launcher_android + sha256: "3dd2388cc0c42912eee04434531a26a82512b9cb1827e0214430c9bcbddfe025" + url: "https://pub.dev" + source: hosted + version: "6.0.38" + url_launcher_ios: + dependency: transitive + description: + name: url_launcher_ios + sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2" + url: "https://pub.dev" + source: hosted + version: "6.1.4" + url_launcher_linux: + dependency: transitive + description: + name: url_launcher_linux + sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5" + url: "https://pub.dev" + source: hosted + version: "3.0.5" + url_launcher_macos: + dependency: transitive + description: + name: url_launcher_macos + sha256: "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1" + url: "https://pub.dev" + source: hosted + version: "3.0.6" + url_launcher_platform_interface: + dependency: transitive + description: + name: url_launcher_platform_interface + sha256: bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea + url: "https://pub.dev" + source: hosted + version: "2.1.3" + url_launcher_web: + dependency: transitive + description: + name: url_launcher_web + sha256: cc26720eefe98c1b71d85f9dc7ef0cada5132617046369d9dc296b3ecaa5cbb4 + url: "https://pub.dev" + source: hosted + version: "2.0.18" + url_launcher_windows: + dependency: transitive + description: + name: url_launcher_windows + sha256: "7967065dd2b5fccc18c653b97958fdf839c5478c28e767c61ee879f4e7882422" + url: "https://pub.dev" + source: hosted + version: "3.0.7" + uuid: + dependency: transitive + description: + name: uuid + sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + url: "https://pub.dev" + source: hosted + version: "3.0.7" + vector_graphics: + dependency: "direct main" + description: + name: vector_graphics + sha256: "670f6e07aca990b4a2bcdc08a784193c4ccdd1932620244c3a86bb72a0eac67f" + url: "https://pub.dev" + source: hosted + version: "1.1.7" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: "7451721781d967db9933b63f5733b1c4533022c0ba373a01bdd79d1a5457f69f" + url: "https://pub.dev" + source: hosted + version: "1.1.7" + vector_graphics_compiler: + dependency: "direct main" + description: + name: vector_graphics_compiler + sha256: "80a13c613c8bde758b1464a1755a7b3a8f2b6cec61fbf0f5a53c94c30f03ba2e" + url: "https://pub.dev" + source: hosted + version: "1.1.7" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f + url: "https://pub.dev" + source: hosted + version: "11.7.1" + watcher: + dependency: transitive + description: + name: watcher + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + url: "https://pub.dev" + source: hosted + version: "2.4.0" + webdriver: + dependency: transitive + description: + name: webdriver + sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49" + url: "https://pub.dev" + source: hosted + version: "3.0.2" + win32: + dependency: transitive + description: + name: win32 + sha256: "9e82a402b7f3d518fb9c02d0e9ae45952df31b9bf34d77baf19da2de03fc2aaa" + url: "https://pub.dev" + source: hosted + version: "5.0.7" + window_manager: + dependency: "direct main" + description: + name: window_manager + sha256: "6ee795be9124f90660ea9d05e581a466de19e1c89ee74fc4bf528f60c8600edd" + url: "https://pub.dev" + source: hosted + version: "0.3.6" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: f0c26453a2d47aa4c2570c6a033246a3fc62da2fe23c7ffdd0a7495086dc0247 + url: "https://pub.dev" + source: hosted + version: "1.0.2" + xml: + dependency: transitive + description: + name: xml + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + url: "https://pub.dev" + source: hosted + version: "6.3.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" +sdks: + dart: ">=3.1.0-185.0.dev <4.0.0" + flutter: ">=3.10.0" diff --git a/nixpkgs/pkgs/applications/networking/avalanchego/default.nix b/nixpkgs/pkgs/applications/networking/avalanchego/default.nix index 9a6b5a44d05d..849520543c01 100644 --- a/nixpkgs/pkgs/applications/networking/avalanchego/default.nix +++ b/nixpkgs/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.10.8"; + version = "1.10.9"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-1SD+0WkqFGInrFtVmXHz3FuOso7rooeCPMAq9eFOSDg="; + hash = "sha256-ofIpTDlD8ztC5vR975GhH/yYb4LqVs17kdfbU2UN6gg="; }; - vendorHash = "sha256-7O1ENOZUkt0NPXk0KK+ydbeLB9ht17jBSH+/cmpOg8U="; + vendorHash = "sha256-EjdlIfY5he1P1JMJNwPNHFSwhlczGZb2ygvxviggesM="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; diff --git a/nixpkgs/pkgs/applications/networking/blocky/default.nix b/nixpkgs/pkgs/applications/networking/blocky/default.nix index b18fa340b8dc..bd07776c7df0 100644 --- a/nixpkgs/pkgs/applications/networking/blocky/default.nix +++ b/nixpkgs/pkgs/applications/networking/blocky/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "blocky"; - version = "0.21"; + version = "0.22"; src = fetchFromGitHub { owner = "0xERR0R"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+88QMASMEY1pJuejFUqqW1Ky7TpoSwCzUy1oueL7FKU="; + hash = "sha256-iU7fpTn8sPtglZfqLJ6fVYbHtYp0jqItSpJsvN4iKE8="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; - vendorSha256 = "sha256-EsANifwaEi5PdY0Y2QZjD55sZqsqYWrC5Vh4uxpTs5A="; + vendorHash = "sha256-PnqpDAbHCs1wFudYy+nyG+p/E6ig7ZuhbuU4CFFoiyk="; ldflags = [ "-s" "-w" "-X github.com/0xERR0R/blocky/util.Version=${version}" ]; diff --git a/nixpkgs/pkgs/applications/networking/breitbandmessung/default.nix b/nixpkgs/pkgs/applications/networking/breitbandmessung/default.nix index 22ffc8903c4a..09ec430e6548 100644 --- a/nixpkgs/pkgs/applications/networking/breitbandmessung/default.nix +++ b/nixpkgs/pkgs/applications/networking/breitbandmessung/default.nix @@ -1,11 +1,11 @@ { lib , stdenv , fetchurl +, asar , dpkg , electron_24 , makeWrapper , nixosTests -, nodePackages , undmg }: @@ -22,9 +22,9 @@ let }; nativeBuildInputs = [ + asar dpkg makeWrapper - nodePackages.asar ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index 9c8f07d79253..42726bebb22f 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -91,11 +91,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.57.47"; + version = "1.57.53"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-u2xC+Q6tcg989S0zM2flRRiCu7kLSv1/y3N2EvFxiwM="; + sha256 = "sha256-vySznLCjEqol3FOZHvDpY9LY1UG2ExOu/shu8suKuoM="; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 908310356122..d7a8d0244130 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -2,36 +2,36 @@ beta = { deps = { gn = { - rev = "4bd1a77e67958fb7f6739bd4542641646f264e5d"; - sha256 = "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw"; + rev = "811d332bd90551342c5cbd39e133aa276022d7f8"; + sha256 = "0jlg3d31p346na6a3yk0x29pm6b7q03ck423n5n6mi8nv4ybwajq"; url = "https://gn.googlesource.com/gn"; - version = "2023-06-09"; + version = "2023-08-01"; }; }; - sha256 = "0r5m2bcrh2zpl2m8wnzyl4afh8s0dh2m2fnfjf50li94694vy4jz"; - sha256bin64 = "047wsszg4c23vxq93a335iymiqpy7lw5izzz4f0zk1a4sijafd59"; - version = "116.0.5845.50"; + sha256 = "1wf0j189cxpayy6ffmj5j6h5yg3amivryilimjc2ap0jkyj4xrbi"; + sha256bin64 = "11w1di146mjb9ql30df9yk9x4b9amc6514jzyfbf09mqsrw88dvr"; + version = "117.0.5938.22"; }; dev = { deps = { gn = { - rev = "fae280eabe5d31accc53100137459ece19a7a295"; - sha256 = "02javy4jsllwl4mxl2zmg964jvzw800w6gbmr5z6jdkip24fw0kj"; + rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4"; + sha256 = "1ly7z48v147bfdb1kqkbc98myxpgqq3g6vgr8bjx1ikrk17l82ab"; url = "https://gn.googlesource.com/gn"; - version = "2023-07-12"; + version = "2023-08-10"; }; }; - sha256 = "0pyf3k58m26lkc6v6mqpwvhyaj6bbyywl4c17cxb5zmzc1zmc5ia"; - sha256bin64 = "10w5dm68aaffgdq0xqi4ans2w7byisqqld09pz5vpk350gy16fjh"; - version = "117.0.5897.3"; + sha256 = "1z01b6w4sgndrlcd26jgimk3rhv3wzpn67nv1fd5ln7dwfwkyq20"; + sha256bin64 = "11y09hsy7y1vg65xfilq44ffsmn15dqy80fa57psj1kin4a52v2x"; + version = "118.0.5966.0"; }; stable = { chromedriver = { - sha256_darwin = "1c41cb7zh13ny4xvpwy7703cnjrkmqxd3n8zpja7n6a38mi8mgsk"; + sha256_darwin = "0gzx3zka8i2ngsdiqp8sr0v6ir978vywa1pj7j08vsf8kmb93iiy"; sha256_darwin_aarch64 = - "1kliszw10jnnlhzi8jrdzjq0r7vfn6ksk1spsh2rfn2hmghccv2d"; - sha256_linux = "1797qmb213anvp9lmrkj6wmfdwkdfswmshmk1816zankw5dl883j"; - version = "115.0.5790.98"; + "18iyapwjg0yha8qgbw7f605n0j54nd36shv3497bd84lc9k74b14"; + sha256_linux = "0d8mqzjc11g1bvxvffk0xyhxfls2ycl7ym4ssyjq752g2apjblhp"; + version = "116.0.5845.96"; }; deps = { gn = { @@ -41,9 +41,9 @@ version = "2023-06-09"; }; }; - sha256 = "108wrm64pig0v24n44zd52jfzsy2kda84r5k8abfvg4sjlm0bh8y"; - sha256bin64 = "1sr7wfssayw94x8bfn7bk03040221npj7612ccxgzdgr4x5i4adl"; - version = "116.0.5845.96"; + sha256 = "1afr0shzsxfi72xypr33r9y4rps1yfx9qf1f9pyjz5x4l5wz8pp8"; + sha256bin64 = "08hqymyzah1wiyag56iivvydy1zph4jzicjjjyh6br07lpfps7nk"; + version = "116.0.5845.110"; }; ungoogled-chromium = { deps = { @@ -54,12 +54,12 @@ version = "2023-06-09"; }; ungoogled-patches = { - rev = "116.0.5845.96-1"; - sha256 = "14smm0vmqzn2664qdbv7asm8n2gg88zcvwrjpsn54qwk0njv7zlr"; + rev = "116.0.5845.110-1"; + sha256 = "1dj8zjnd105lmrfb033hgcvw3a2jaxlp97aqnj0wzx6jw7q9y4p1"; }; }; - sha256 = "108wrm64pig0v24n44zd52jfzsy2kda84r5k8abfvg4sjlm0bh8y"; - sha256bin64 = "1sr7wfssayw94x8bfn7bk03040221npj7612ccxgzdgr4x5i4adl"; - version = "116.0.5845.96"; + sha256 = "1afr0shzsxfi72xypr33r9y4rps1yfx9qf1f9pyjz5x4l5wz8pp8"; + sha256bin64 = "08hqymyzah1wiyag56iivvydy1zph4jzicjjjyh6br07lpfps7nk"; + version = "116.0.5845.110"; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 1f9572659ca2..593724eab0ad 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1015 +1,1015 @@ { - version = "116.0.3"; + version = "117.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ach/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ach/firefox-117.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "e58bf494734c79dac12730e55aaef1c7e7f6c104df71df2f7fd035a6b8e34636"; + sha256 = "ba339edfe90506adad94365e48352f9cacede62b3bbf966b5e3238d96ca65a1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/af/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/af/firefox-117.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "64d53abc20409a0733080200b8f2d730436c0f52e317011be0e7243592b9cf15"; + sha256 = "68a4d1e61cf96631f96866f776f0585cc8d3148473637865eeea68097ac1c233"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/an/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/an/firefox-117.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "ee95034b23fce88a91abd3fe8166b86bafeecbbd89f6fbd7061dfb4f81189951"; + sha256 = "b2108af6595ce368e74435fca72c3df92474eaffb412d2cc16780f0c1dfb85f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ar/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ar/firefox-117.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "b8afc14f06bbd0a939a365010ee284feacfabf8b6dacedca6637950a23dbae1b"; + sha256 = "9e746939ba9e9c98066ff26909fcd1460264b93aad375eab7b1c317808c31c10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ast/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ast/firefox-117.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "1b39d5239d9313ec0f59e8776df0a71f4cb75fa2c9c1b1f5f9163bcee1aebdb2"; + sha256 = "e537e1db57d5496713d7739c38bcb96cd2ba9e1701f9fe9bdde0970231e3e555"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/az/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/az/firefox-117.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "0039b81aecd8f2c6e5f73d4d674a61e23040237d329308894e620caa5ecbdc59"; + sha256 = "ebec326846890b984e65b7f295ca7649829927065f0804ce2e7f99d275c4cbbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/be/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/be/firefox-117.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "43151b69ea0a17f1e00b94e520928cb4a8bdadb8104295752c984ea4ef195c22"; + sha256 = "a079039278dc6ba9a74de9df3ef62c304e31fc8cbc81b452c2bdb5fbed7e62e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/bg/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/bg/firefox-117.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "65a17e0f84c423882dfa8be984bb0ef887880fb864141ab5d3268f0b1ce8abf7"; + sha256 = "c5554f0bf2df6b0e4f7ae6b286952d8aff8623b6b510e6fcf87d077fce908e9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/bn/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/bn/firefox-117.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "a48c0b931b39506b6c50a20a641a03eed6c0dfffbb37324e97a71ff46c81e934"; + sha256 = "af70685bdc2fd1dd4c17906e83eb8ecf1c99c21c3c35f01ed2394e91a2b7d8d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/br/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/br/firefox-117.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "e14ca09ac70d627557a811948ff843d91df0389dd0b90d2d6a36705f7aaf9706"; + sha256 = "0f6fd95ab160f54258b8a6fbb3ead7d16d6485317dacc344be7812ab150aec05"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/bs/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/bs/firefox-117.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "609fcda1c03d135334e3134c69188413deabf743b19cbfe98448669b41377cbd"; + sha256 = "8b22a3880f50d1c9a3ad568ade83b49264570a09d22383762b214e4bfa94251e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ca-valencia/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ca-valencia/firefox-117.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "f79465efead74697d9abd06f6942d15b6e77bcb7c086005327c73d9c55533eed"; + sha256 = "3dbe22f54b97fbfc1a534b366301d5794dffbe40ac4475aef9e5df14de8dfadc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ca/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ca/firefox-117.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "13103f55c4bc7db872d3fc0f266f86e8aecf18d6fcab4855ca72556c6800f5a3"; + sha256 = "89fbb8b9afaa866620df2e3488669ae0f2f9f1122d476e0f7357ef07e450fc04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/cak/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/cak/firefox-117.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "c033593a669526d3df2dde63f0ed66010bb93418d772471beca49db343be83af"; + sha256 = "fc202c9300700ad1935d785cc7c9d9a958e5c0012c786b4997ea0a66ab80890b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/cs/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/cs/firefox-117.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "86260a3808095b224ac18f08be5bc5ca3a96ea43e7de9cb6589e74bbb141305a"; + sha256 = "791bbefbcb10787492bc926e30f6bf221729d2dc96fe96fa4b40502f93ab1755"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/cy/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/cy/firefox-117.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "ca53c0db2f1c5a1d73b7ee49f31de07b06364c020357eb553a373f30f966a221"; + sha256 = "6e681b01a8ce92a783787e469d37acc35a45f6f5ec47ac5bb904b991a3c6356f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/da/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/da/firefox-117.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c9353731d22bd8d558b7f369ce6292388719f77b4d56fb4c534f40c68424e42f"; + sha256 = "275cd7f519f62da241602894830186bb9ea8ddc69938a455837802052c545b92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/de/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/de/firefox-117.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "d6fc45534c5eff06eb19e3567d5fbcb2bd31cdead619e33370cee5da59db07a9"; + sha256 = "824a8457425924385c9a80b6a90a2c42e2a20d94adeb208f8ef6221c333414c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/dsb/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/dsb/firefox-117.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "5551ba6593eeefab940f2f10e651eb7cdbc11ec17d5fb9765f2b7561aef68398"; + sha256 = "c7d2edb01202b5cfcfdbb83cfbd5152130b9e6302e0e9489fb6787445d36f729"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/el/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/el/firefox-117.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "36f42f415e5a53158fffd044f25605da3cf5a6c02cd5e6a65d6a41911b1c5bc6"; + sha256 = "14a5f64f3aa2df6e54e53673c7bdac85603e43298df8f340a2cc97f67d211aba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/en-CA/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/en-CA/firefox-117.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "98beb885d18d919fce1fbdc98722b757b92524e3bcf99c2a95173be4dc43d3f6"; + sha256 = "2384f12755ab5f69dce9c4ada082d8dd0453d35fc002640d17216a7747b712ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/en-GB/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/en-GB/firefox-117.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c4b101f51a26a1c96ee410e61567a8d325538928876c45ea35388237a7f05a27"; + sha256 = "e52382a04b005df50d4e20badb5f38f513b919076617a1509e5dfad54d5a621d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/en-US/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/en-US/firefox-117.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "c13396944d1155a6884de09ff1d382c814658c69dcf23a98035d58bd77cc7c62"; + sha256 = "5acf61aed42bbf43dff8fee90c55fd3bcecb1c710b86cdd2c380b5e4db7f3998"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/eo/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/eo/firefox-117.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "4a79e9167e2d5a341111477f3dd8d9340e509169a311e4631e317f1eb569c51f"; + sha256 = "421c46f3fd43795b1f26e1771ddb7d3bd83ae5391eaa0fcf478fccfcb9b329f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/es-AR/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/es-AR/firefox-117.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "bfd9b8eccfac18de6f2879b8a7d81ddf2f7a40da4ef20dd908cb0e05a99bd241"; + sha256 = "67692c6f7f84f69b1ce9289f56331759508708a3adba0ccc6348f258e4fe04ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/es-CL/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/es-CL/firefox-117.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "17137f433dff6c0b09e7ebc00c8c85d643e8803502f832a0b865eeb7bf8be369"; + sha256 = "6b5d68b2fa9588344d9b8b55f7639ef6184af5bfade867a06ddb313770a3e8e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/es-ES/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/es-ES/firefox-117.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f8d38cedb7b3d3a8b83ad3bc65ec7abff366147c002808dcc7b7a4ff6f768c44"; + sha256 = "d77b284beebc53ae3c8da363d92d80b3eee460d74535bf359ef7e125c8060f7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/es-MX/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/es-MX/firefox-117.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "8030b3702276ff77b7ec6f2082940fbd2b23ddd150dca1c8bdae0b8e249a81e6"; + sha256 = "d051dc510b90f98389caab730b3ab99241bfd7a48a60d149a43d1d119a4160ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/et/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/et/firefox-117.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "341f85e4cf824eeb9eac6ea4e7fef9a80fb2a3cbae77918600e6981393ff7794"; + sha256 = "7c30e1ec5e390704c2cab143b56fdb436fc145dd8a7cf25e93ee5e50dc9ab6e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/eu/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/eu/firefox-117.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "4427ffdb94e8290c9632ec2e9d1757ce6293db3bc987f8f4a4cd936218f7a20a"; + sha256 = "349c0bfc55ff295de59febc87574b706e9ed17d3bb08a5c1b12f79400c09ee76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/fa/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/fa/firefox-117.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "0cbb04eebb8c14c33229816d93c18003a96682570cb1a3e10f444d1a46d61eba"; + sha256 = "a1ab529832e55971bbe74b478bd5d70135b8d30dd15c5a25347f882c4ea13cf9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ff/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ff/firefox-117.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "de5bb52c5a7c68768f893894424459193387fb3febb04f465152fd9933387e64"; + sha256 = "9a612d2fd43c45bf7fd291f749e1ba96959ae76e1bf1597a2c088068e2b9db74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/fi/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/fi/firefox-117.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e21b99490814e64852321c40841ffa97fd6ee7969d58c0c879669dc7ac32e672"; + sha256 = "f0e3dfdc37025a7a34562f5f4cd23a768e29c2b33f2b40810ce4533a4e62fa43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/fr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/fr/firefox-117.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ebe1525839e2dd4f3c8faba63af35cf7e302770c607012a613a96d39b7edb897"; + sha256 = "6f6f09652ecca191a6faa2337e9a248d859422ebf30e54960cb92ecb79b67244"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/fur/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/fur/firefox-117.0.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "d94fc6c51fdd2df37ae716e2c175adc4e984602c821e2c9c7dd1059ca18c057b"; + sha256 = "69680d429a0c9bca5acf0b6f4e9958f86d11fde3bbb538cdb3a62a6fc3929ace"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/fy-NL/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/fy-NL/firefox-117.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "16f03248f64bd0e91f63a49fd23dcaef9065e78f355178dbf657280d602fbe2d"; + sha256 = "a29e458c55e6b79c07c827027318a130875cc5b8553bebb34190bc77d33bed18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ga-IE/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ga-IE/firefox-117.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ae6112795b46484f01125515f4d89ea36d0da934920e1376dc28c29e569a792d"; + sha256 = "6e50ea66bb380725bd3a097401ff5c97c9571bb0f24cbd0de84b9503c5d1ce8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/gd/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/gd/firefox-117.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "8bfd80f21846d1d3a822d40625c086a712adbbe68a2acca078977a8ce91357c2"; + sha256 = "2f535da6d17f7834ea17fc35951081ed3def42a743f8c5950bcaa6b80fa39b97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/gl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/gl/firefox-117.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ee846d06f20b53334a37ccfea07e65b896dfd4ef39c2389e6e6d66732fd5f393"; + sha256 = "07dcb0f43931fb5b1f23e7a9e52f5ceb4a44e4080a7c360c9f54655be05056b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/gn/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/gn/firefox-117.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "aa0082fa68756b674dfcb136d31980f01769a66c063765383aebb6f89fa5b40d"; + sha256 = "84f7bbed98771bbe4437f71f28b189d9c0f7c47cb46bd0419d0ef4c6b695b7b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/gu-IN/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/gu-IN/firefox-117.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "80ad4c62110f453592a1ca8c46aa819fc3775ba5507d1c075fceb5fb89ba7f28"; + sha256 = "6fecf690ae67aecf13195eb66904a8a55dc601e25dfe748475bda140a254effd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/he/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/he/firefox-117.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "12bb6bd4ebcd9e482c1cc627154833a7cc22fd546bfc830f8a1bb020c2cc479b"; + sha256 = "8ef5b4e043073212d0bc75a6e316c4e692a0babd3eb1940d21d1f67a9fbe0b90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/hi-IN/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/hi-IN/firefox-117.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "60da9024dd93fa33207b535a9075590a5a830ad89c2465105417fa66d75d4a31"; + sha256 = "f1c6bc266eb7a22ea3bb2afccce42afba92eab09c62458833e167a8e985da770"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/hr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/hr/firefox-117.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "febfa1a724ff7417d9e1782a13cd5ced8e5247ec8dc4bf417f413cf95e8c2c80"; + sha256 = "8c80911342c34e5ba0b4b0460d63c767b71e71cb4804f2dc040aaf9111bff1cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/hsb/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/hsb/firefox-117.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e89972334f9e2a4144ba60eb4058c8a5c5e6d6f508c5a636e0b8cfcdcbc894b4"; + sha256 = "8f4337c1758de07245a4c48c9113eb3081b374eda49918d166c8ef3e9562e551"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/hu/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/hu/firefox-117.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "a2e8d1e678650c41a4c2a74de8a66972ace72d50433aa7e55173dc48e4b99115"; + sha256 = "9b08cc9f4d09673ae5513dd0d55d22a8ce69d28e0a8c563a121b6067893d20df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/hy-AM/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/hy-AM/firefox-117.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "6bbb140722a6ed047e3f4e6e2e39244b1a19ed77b50b30ae85e844659936f521"; + sha256 = "4335c748bee81559628cc5e9ac3a2a4d0b4cb2811d24b7bd63dc263e20357b38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ia/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ia/firefox-117.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "09ea62dc460216553563d2c8127d4c14b2d5103d70590cca468909d744e49827"; + sha256 = "43d6ecd94ee29c68cf51aaad8e9f96ada1c5f7c7f9680cd52e7c22208bc166ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/id/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/id/firefox-117.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "00a288b51c8bfbc1c8962ce946021181b625ee9b523be26769b9678bee8f3a7d"; + sha256 = "2570cd7f7d78b0a79a6d0729853ce28c5b0347c8c9f5daf42d9698537133de05"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/is/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/is/firefox-117.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "30d148b02f8e45560ea2d54d2167f65c88582a90822019abdd5a86cbbd00bf3a"; + sha256 = "1836f0a1409e1ca54e3174cfd64dcf21500224322e0585bca208daae7e726a6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/it/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/it/firefox-117.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "263f6f009ec6f6ac7052fa386ce730948a632d288aab0241f274f82a26ede74d"; + sha256 = "23b776a40450bdad912688b1521edc4975f53d2a8b8419962f37ac0faa4d7fd3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ja/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ja/firefox-117.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "1425e3a27867a0d071fbd79d622cd26a436f695542a2a15233722c50f60e176d"; + sha256 = "ca289fdd7b4627d04c3372248a8e67103b80b6cdcf3754c82f2d24e23556b23d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ka/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ka/firefox-117.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "56e9d3b0360d5ae8b72859e6947c5e31b505549566379a77c8149af99dc4a39c"; + sha256 = "f09dca2821c741b34150eb9bb4bc30c82f945b3602413785af5e267891a9c95f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/kab/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/kab/firefox-117.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "8ca10ad4de568ddafcba08229797ff1fe063f279116e50551d62a1be433b1cfe"; + sha256 = "4e94d1c175af3149d9abdf1eebd2c8ef3cf10d9bc376d9a51d37c576ffe76288"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/kk/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/kk/firefox-117.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a8a6eb0946681800156ac52e528176fb46e6e02e5d05c729307b1fd570112e59"; + sha256 = "978e71de4ec6a42f32befb162d1d118b259a8ddad7dcaeb7a60b396426738c09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/km/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/km/firefox-117.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "84140d4fba75fb66eb6283b20810805c73f1f2e800c5b40de045007f73a14c54"; + sha256 = "c4a3315f466b7456cf98240005d184503da00daab21cc399e30e898b4b87439f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/kn/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/kn/firefox-117.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "9b31cc9060ff02c505db223199f9b3ea57f06ee28cc72413b588847bb0766ecd"; + sha256 = "83f9f16dbdcc023e98fa185477e6254b6f0a73afcf8aea3a1b0f610622b48daf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ko/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ko/firefox-117.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "1276fc57a2236b4c1c2caf1eb7c62c029565ada0edcd26d1e5882d27060a0b1d"; + sha256 = "15bbe93e5f482a99aaee858a53564c03bd4fba8aee6b9a572608b9b99a6e26dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/lij/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/lij/firefox-117.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "1ff451c3181afe401a4e68eec9a4337fcf1792f5a027534349229f7b00b7c6d5"; + sha256 = "f05d436c0db51d756604057860b25d72cf13deb5bc11fb11d36764a3f1072533"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/lt/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/lt/firefox-117.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4e756737c4b071b17b4a8b76ecce225feb95fc88c5b7d68eedc5489e52453df0"; + sha256 = "36d640e943f18614ab56c7eeba2564cf632435c55e9cb3ccece5c58a638d26af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/lv/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/lv/firefox-117.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ff85d6b1d29d202d90f9fa5fbb4e72f57e312bf743e36f06e696cce59a773345"; + sha256 = "6e21fefadf6e98b4a37d8c905c9cc47203cec8f119da2f751e531cb6e3716abc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/mk/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/mk/firefox-117.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "374053409274b6348734ff2f4245f2769c1deeef6095159e53b7cead6528010d"; + sha256 = "29c5209581d5516e3c67cc4ecba04398f72f62882b51447acf8996b5a9df57ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/mr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/mr/firefox-117.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "23fe68db72deb96b79635b8a62fe3ee81284c21283a1b91a3985ea261b3403ba"; + sha256 = "d9a9ad83fd16e54c825b8179cc5a3147903206b386a066a955ccc8caa2fc1cc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ms/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ms/firefox-117.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "2582c9b05944806d3f6faacc5ca456e2ee40f393f15bc0c690c4a4d92a87f0d4"; + sha256 = "a94b7ee6d40a0bcd0210cf215f2b51ace80b9ac36c920d3d381468cc273f7b1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/my/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/my/firefox-117.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "5955c546552a8d0f1d0cddc172a58c039867dab9384e4ccbe420d5c490a343be"; + sha256 = "3d861a4afdb4012bd446ee12b95035b4fcb97a228b269131a1d929f86806737c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/nb-NO/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/nb-NO/firefox-117.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "20cd48fce68468bb70594e469b7027c7cc8d808ad016e0739dc1eedb11a36a0b"; + sha256 = "7c7ff7a9846a5a1866b4aa87a3c918ae7a78707541f1d9ea90c6be4531e3f344"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ne-NP/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ne-NP/firefox-117.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "a9e814a04fe6351189342e13ec5aa734bf015307cf70ba46747a06ab230ea151"; + sha256 = "c2e6828921aaf7210214aa4bd70697e13db945650272e881b6f5bd62661f2958"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/nl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/nl/firefox-117.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "2bf8d9dbd74525627b42549d61940947c9c40a898ef480c53db717af7304f4d9"; + sha256 = "d51029ef457ee57ea4c1b2e5448ecfc1a525728221ede529319479833de83b53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/nn-NO/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/nn-NO/firefox-117.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "5b70a33221f7d94bc11e22f7c9889ae281868d01688c170cb8689a8dc5024867"; + sha256 = "dee1494ad94300ec6297000129cc8de512363b2bcbd77672e7beb7c73b9bf4b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/oc/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/oc/firefox-117.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "716ee4c12393943b5ad549c23c9df6c0aecd87c7253286265675881b4affaf22"; + sha256 = "377661e87d74fbd40a7cfd8bc1e4363468a903d97ceae097b4536e4d2870e8a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/pa-IN/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/pa-IN/firefox-117.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "f8322f3035a20090f923a2057add62ac9259e876830bf47ffd5c0134b32f3724"; + sha256 = "1eee815a8189be9e0b0a6d8212714ac37ed8ada82a5385e5e141a32b4b0a541f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/pl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/pl/firefox-117.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "6eff160eeed40dce792c87e67c5921ee63fe0fc1d12fb1eb35a197acc4568198"; + sha256 = "50d1b273181efaf10fe3b458fccf80a2919b3b73d07782698f588cd48d908e47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/pt-BR/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/pt-BR/firefox-117.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "9afec46bf207185475cf5a2744ef3293e62ee688c05cbe160ed0c6cda69f14ce"; + sha256 = "ef235f2929c562b939bdb9ced25024f9255acaf95b6ca3fb4790df48f18e1831"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/pt-PT/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/pt-PT/firefox-117.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "07d7eb2cd3e3520a9fd37007e8cd58a99309a9d460599243df37ebc157cb21d2"; + sha256 = "c0f838c5f4e70667259ba099fb9551e75eb6021db15ef9ddee1a7712010b2e5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/rm/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/rm/firefox-117.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a833c9bec47310c1f3b6138dc5535547882fd512746ca05a6237af11d00e2898"; + sha256 = "21ac133e35c4add62e0c31be77b54e30df030a95277baf69a7f3c3c972f0e597"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ro/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ro/firefox-117.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c8144df46c5fde9096fbc242b6a15488bd3d869f2df9555f8730d8c0bf92de63"; + sha256 = "50546a2c85eefe780869a137131c718b69951136fd09984e3ba6e7057f30fac0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ru/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ru/firefox-117.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "997cce8d0d989b969c95fbdc78cc246e3c84d2c9e4f6b9aa7d2fc8d2ffde8c1d"; + sha256 = "585269c44dac578ef43eec09b480aa7c09e259e29df744ac258cb9456d0a15fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/sc/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/sc/firefox-117.0.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "ac1cd2a690ef1929ec6a746c117d1637a6f1092e60afc0a9efd60875c4bff728"; + sha256 = "2c7f0113adf1b0385707af29a6883b7c67bea9a36c61c03d3cf49315d152688e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/sco/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/sco/firefox-117.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "714428793fbf798371afcd81f0067efda933c85ef44b2ee7c53412469bbd8e02"; + sha256 = "ff98add9434b31bf93f84d92bcd2e8d9b1f7c487487cb91f8f7fffcace384210"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/si/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/si/firefox-117.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "8c220b5acf88bc19da0293ef6716bcc4aa67c1254dd4c1c9e86ef06300882a29"; + sha256 = "ba3bbd67c6f2a9e87b739e341d885362ad50db7543c131f8c87558489c524075"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/sk/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/sk/firefox-117.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "7c166eb51d292b3c213579dae2818742a0b4fc0c2a7ebc8bdf0af60ab54f8e78"; + sha256 = "d2490a4d1a078fd4721ee2986644d9a4567cc0f5379401c89f21e4e9acbdeb88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/sl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/sl/firefox-117.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "1c4571687ddb884c771b56a01d251ba5ce72a7d72de96d5b8c610e8e3a80be26"; + sha256 = "da6d8e459c8e0a3c069cc755e7804915f9d9bf3b9fda38abb0de5bd4db98b1bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/son/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/son/firefox-117.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "a3b9f99a2fd51c61594bc5f8c98ae998ab1856d759062f851b513548ceab8f11"; + sha256 = "2ff5b91d0462eb110cb6c362acca4a8738f490eb35245f213f7a9089639a8b02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/sq/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/sq/firefox-117.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "8d90281990992c9adc3f95a2700a4b3587822dda42b8d3fd2ed1b3492ce0009b"; + sha256 = "4f2e870b674404885cbb2edfc0f90834b2f1b93c199382f34871b9fcb4a17a31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/sr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/sr/firefox-117.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "886055b59aae66fbaf0a017bc81f6201908b6c084d47db1e6c7298888a4d82e5"; + sha256 = "02e9c7ea7d3b5a0ae605c9ffb2f3841405c90f001f1d17caecf4d28833670b51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/sv-SE/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/sv-SE/firefox-117.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "64de716379721beeb62aa24f36474949555440eeb5f7cdbcb640379dedb28424"; + sha256 = "883369a674d0ee0fbd937ac75a42f88d5b71e6d97b8f005cdcb35e03a7f1cf2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/szl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/szl/firefox-117.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "7151b0ad091911c5869bfd995fc0a24a7fa927f495067a56c449ce01f0b66657"; + sha256 = "0b8cf78918b879d1964a617540c9857722e9998b0304bfe27d4bdf3f22c4ef54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ta/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ta/firefox-117.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ff3ae2a53662b7c6273ca539cca826a361d028f78cb1e6a6aeed6bdff410db42"; + sha256 = "e8f3e336b4a0905c1d994473df789272ae554d09cdd7417445c77666d15e508c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/te/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/te/firefox-117.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "3e51c2e834deef3b814b2e9cf6564b0ad5ad7494a2ae654f53ca60fda6a3b24b"; + sha256 = "c238ebb852f0555635b9eecc0e7ad0a6a55a146d825e7f7b43fbc77932ea013d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/tg/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/tg/firefox-117.0.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "d875bf5c5f5f208de61bd111a87880db8f035b75304d70a316f9010125130434"; + sha256 = "5c143534fd474598d1f17adc1d039ff9dee700b52259a220525c58013039dba6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/th/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/th/firefox-117.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "6db362258ba08ddec07b7d09e2f31f1bf75ac49157c70a1b7eb789857fd97367"; + sha256 = "d078fff21e93e853c5e20425201296d49eeb611718e8cd3e3fdd5e17badbeadf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/tl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/tl/firefox-117.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "539c74d8f72c987360ddc26311e78f185ea9bc44ec0a90ca1e3572708a45a976"; + sha256 = "cfdfc42d1ee4d1b7a14c481fa011615bd75e3b6e191e885e16c26d2023b6bdef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/tr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/tr/firefox-117.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "9d247b36f08213d24e51aa94615fefca133657934692dcc5f7cea6aed8f029be"; + sha256 = "e7bd9864c3948d94a3f1f8fe5267a0753fd370c47f8c9ad4656293f16379bac7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/trs/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/trs/firefox-117.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "3c5b31a23c52f893139bd73ff4f4fa0699c91906df8d2abb0553ea0e5e7cab2e"; + sha256 = "61bae6974e3e881b4225c47c936a8ea7e6cfe52ff3a5fb3e3ce6e476daff77b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/uk/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/uk/firefox-117.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "5bd8973d26a525750cff4971b6b46054ca9a457ade6514669bc8e9675c213e98"; + sha256 = "7d34bb234decfd013ccd284891e2d8708802434a298aae90c7c86992923618e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ur/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/ur/firefox-117.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "90d2b11e73708c76c91a7184b793f10042977b6b261f5ea8320a871b1fb53354"; + sha256 = "c299a7db9b01979f27c33e3e0ae50e76218b2122ee110a4f98931031f7f8ad0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/uz/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/uz/firefox-117.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "73eb9907a78a9c2707186d57e826f7811f5b1c3526a93bc1fa4ee35bf826ff0a"; + sha256 = "f52886bc99486aa184da795bd1df5a898c38f5fee5911fca1d6dfb6a48b87ea5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/vi/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/vi/firefox-117.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "0b9cb19172f2f88392159f12be799ccc336b80cfc8665582fb7f18b5a9cbf043"; + sha256 = "82611748a48e2b8a967d218197203a9f0bd6aa2958d0c269d78522433b6db2fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/xh/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/xh/firefox-117.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "506d0814ebf091aea758fd69368b009c62b12a84aa9a3fe10db2375f6164a498"; + sha256 = "0eb889e0f9f0d3795c2b2c6a9d3e71e5726af05581d6b82ca881e855bbfc936a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/zh-CN/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/zh-CN/firefox-117.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "78a5c0fa19f3aecbe976f93174cc38226b7d802a17c9a9d8f1840df3b1e4069d"; + sha256 = "beb8c4be213c8454900ac492b3eb6f7f91b77b11501967dcf04bf6d0abfec65e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/zh-TW/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-x86_64/zh-TW/firefox-117.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "24e8b5eccb0ff2523ff2d91962fc317b32e2d920e69ab0ef10a202e8d389d11b"; + sha256 = "d4c48f8253204f727863cf68a4d5d17a1e0e944a3a1925f055514e41805627d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ach/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ach/firefox-117.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "1716b85f58ce794e583ec0aac92658def4fa8d816fdaf945b28e82c0e9f3b2ba"; + sha256 = "63f730355d053a296c12d629fd62e8e6a010af38c14a69b0c94ed24ab378ed40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/af/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/af/firefox-117.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "79c30a58664355127c4905325f101d05164ccceef72d6769c7320da4815d2715"; + sha256 = "8042745df4209233b2e89bdc51088680fe6a1d60fe8c8720fa694b6551ced760"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/an/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/an/firefox-117.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "3496365cece2c843de7dfb4e8022f3c2070c40e2f4d5ff8dd80f6a7b954c8f3d"; + sha256 = "506d9cef6611de8c8c81f46ac98d4adb23b55d188ee89f707396f236cf108130"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ar/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ar/firefox-117.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d1cb9d90529682d77547ade6c87e3a0e5fc4d470d42339e36bafdafeb6ab226c"; + sha256 = "1b17bdd7dea213bfab27218d7b4af7e1d2be5f028d8f9c126b07b1786a6c6b30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ast/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ast/firefox-117.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "eb418bc05c8e52faa29016718546aefff18f687bc650ee2deb1567c689cf4f0e"; + sha256 = "b5cf6420715f4172777b066dac71574e2596644ba9cfbb2b971a32c1039f59bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/az/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/az/firefox-117.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "7628dccc32e102e254f2796b5a0b1c64a62f632ece86840c8a270d5371c40220"; + sha256 = "7bbab0cf074e237bcc589c40bf94404bc6383b4bfca58a13f45a1b65b613120d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/be/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/be/firefox-117.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "b1d25de6e9063c58e2306665a983195b234bf2bf2bd6d78abe7ef6c3f4082793"; + sha256 = "0ae04813542d61afb9a02ee2e0b96d041302c2a23b2795621fd17af7793e42d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/bg/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/bg/firefox-117.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "ff2f6404fa924a26ebe0a2e6d4857c8634b3f2aa88c0809fd3d322d41208d1d7"; + sha256 = "5bf7712c2219dae81f39a383cb22c9df86bfeefde0c93a019a8486acfe08d895"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/bn/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/bn/firefox-117.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "dc2a96d60f04fa867082552d48670631b6d39efc49608b965e9d773a6fd95e47"; + sha256 = "9f97f5774fb121a5dc9c5e3aa315d5a80de294abf28198614a8109af518d92ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/br/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/br/firefox-117.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a834327d9c685528b99394cd277d181e47a7020408279fb3cd684e0b35c6653f"; + sha256 = "201f511d3bc1b937486e46e5fdf782864333d5c7a1f74b8d82e54ed3fc96039e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/bs/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/bs/firefox-117.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "e29b825778112000c9c2f6496df43b62a73c810d34b5ff0213a35ef071f80a7f"; + sha256 = "669f142fe9a8b141e684c63162d2aa7447d086aac7540b16e1eff6472aba00c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ca-valencia/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ca-valencia/firefox-117.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "d41578c118058da1affcd0b0960dec1b26791dfdaa6177dcda84a439dedb1bb8"; + sha256 = "2df53acfbf91c81173d94c3db22f1b9c44777942974e39e3c974fb571dc65489"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ca/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ca/firefox-117.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c930e97213da4e042a57f67ccd3e417a56a6df2908e92abdeb0f886f402a1b4c"; + sha256 = "056bc74cc6c6b5d0991fd0c4942f3d43d71a8c45d472520b8abfd3b0d4759606"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/cak/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/cak/firefox-117.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e533c9819f8b960cb5c129375a0e1bc212da84baa883b892538610bca7ca78d0"; + sha256 = "34592640353a5d3817bf60696f7af8dd978dca89dbf46101a30b22df10a5a581"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/cs/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/cs/firefox-117.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "bddebd7955b15b78d92a7604471bcf2b18a05f34c14b6bc9b311a340b8cfab03"; + sha256 = "e9b0e3277980ac6249c8c8dc98a36f018f79231595967dcc78411a7602316ac5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/cy/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/cy/firefox-117.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "31e3a399b5e7c8589570be5cd6458e857bc46a11ee1798b3e71fb9bb36ad9e2d"; + sha256 = "44fa3e6b7892959701fd0c59060f23ba02bc2dcc362c0a1dc408c42ba3a1fb8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/da/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/da/firefox-117.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "3a8b81fe51b906395ad24f2c600db9ac6b914605ce17deec3cc5af5586fccdc2"; + sha256 = "0bab3ca789229f64ca8525a2d6ee9895fb82b0ff3ead02b56f6ec75294b6867e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/de/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/de/firefox-117.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "318597b61eb9f8f3291a39b0a01375b80643904270aa9d5432254e42374aac6f"; + sha256 = "435652762e0a4d2f153479dadc3bb9e7d83cab9927fae6aa633d0d1b62a5d0c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/dsb/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/dsb/firefox-117.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "405155927c3bdf2ca61db392f374009b99c9b7dd6201e923f5e9802d36d2f8f7"; + sha256 = "0a9b19faa91bec1eda97cc6c5c89c7e1b5aff3242e308e115b42d0b967fac877"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/el/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/el/firefox-117.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "76c2c5c309d83e4d22ecb4c211b9ee4711401295020cb17fc727ce666f461478"; + sha256 = "554f3c44ccab94478d3dad5b500477b392bf2920b523682ad65535a501d54bff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/en-CA/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/en-CA/firefox-117.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "47dd890bbc9797e17f0e536bc0a461e2a64737602e8f68316725247780b22ccc"; + sha256 = "38529cd8094b846dcd728c70da106cee019eda762f9344ed48f4823d4392ab81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/en-GB/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/en-GB/firefox-117.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "1ea21d24f20c41dc22c3ad8bbe377b98e40eae028aa0296096cc41dd63b5fa81"; + sha256 = "8ed5c45583f6fb11e8ef4b5927563e17671b7d6a364bbc90eb6957fc824bd700"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/en-US/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/en-US/firefox-117.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "70b68ad04bbc5a36414111c6e0586a1ddf5c4d0d36d31d22ac0c0c9004e6f672"; + sha256 = "a99a1e5501a2c3b05e55b7339e300fe89447a76d8419f9dc15efdbfdf600def9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/eo/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/eo/firefox-117.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "5cddb277d9ef304fd64ee9f4fd518b7a049cbd649cc55817b78c467aa8b21dcb"; + sha256 = "76b74e4a2381e5753dc7683c61cb196bd7de6ff0a21d3ef804bcdcdbfa5f87d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/es-AR/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/es-AR/firefox-117.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "1bf6843feed997b1cf84c525c923cbf84ad2605f557c65339a9835c2b9cf7072"; + sha256 = "815026e2b2d50efdbc052cd533b0038bdabefe177a0bf81a6b9d36333c966370"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/es-CL/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/es-CL/firefox-117.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "883ba26892b62a4c306f222dd92f37677edc0f03762cceb08c06a96649ec6d84"; + sha256 = "b3ff6365d5e1578ad442bd6a20627ecf3c3ab56d2353c968563cbbfd1705c31f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/es-ES/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/es-ES/firefox-117.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "06e077bc28d0c6810c850ec5bab24ac6f4654dd1ef9d9d25c3fb546872081f9f"; + sha256 = "5e4bc98ec4a6fd08684343badcc520c5c0358cfc324c8467fae6350d4a2188d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/es-MX/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/es-MX/firefox-117.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "7ff8f849b60e377dc869fcba113315c03a221c0546424126eaa5c364c8f84091"; + sha256 = "34b8d2758b87623cf2cb5d731502a48df5877f48df837957804dcc08c17d5234"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/et/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/et/firefox-117.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "4bb05e6a68bf719e47028dc0d55e55a114b30ded34b1e15e2e718140115bafed"; + sha256 = "db61bf64ef30eb690726636c16ad74eeac8783bb4b44fdeaa47afe9a4f11e85f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/eu/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/eu/firefox-117.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "9f76ed4acdd899ab7e51d90d6737f1b1067fb9a5b89d5fcee39e04a8bac1d413"; + sha256 = "c05baa20264414aa557c7d984db52e85c3d68acefb46b793379a4bdb95277586"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/fa/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/fa/firefox-117.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "23643406ad7fde9603e3315c41960f917eef1b56617260bc586ade266903e818"; + sha256 = "fe1a89f40c5d89e6d86d63123b25bd0f2fa9ea72df062c5f43ef69b8b1a229fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ff/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ff/firefox-117.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "ffd0c7691cb88214a6f1d5448d8d43efe19247afcdaaae91c95367a37b471959"; + sha256 = "dedcaa19ff74b61c109fdda9cd19c3148ef22c6edad93dfe55a6c32c29342dfc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/fi/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/fi/firefox-117.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "538509336e17d4284e0edf56332e1f4a377c27230fb645d3d4d30b4d4db6955b"; + sha256 = "9fe5cf90fdfe977a411a0fdacc1e04aa32bff6b27234fbc449551f9785513c57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/fr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/fr/firefox-117.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "24c61635dd056cffe7fee91c969785eb778fed400e5bfec71eb8244eb278333f"; + sha256 = "7781afd9813d151f0b38b1c6d2e8ac799eebecb77343602afe227dd7c4008162"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/fur/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/fur/firefox-117.0.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "67e90c45e949ff3a5948d8ba99fac7628324a08f78c3387a119c98f3c2c93628"; + sha256 = "3999ba8f5e73d84fc9688d2b226a5668fb38876ac88802dfbc9a5d52299a8998"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/fy-NL/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/fy-NL/firefox-117.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "ec378965b25afdd82946962a51eac865559f244b1fd933449b83116270da34cf"; + sha256 = "0d914c3f8b135549e4d1678099e2e3039523f90717182fedadeb0f14d4cbfa73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ga-IE/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ga-IE/firefox-117.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "1a0e6367851eb480709ba29826738f8e79d6a53a3d0aa23246d8d5eb9eab4c66"; + sha256 = "e145a5409b6863abeb3dd2dbe49e6df450bdf19d9292294efe3790ecab3931d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/gd/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/gd/firefox-117.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "47dcbab2195d25958a3ceffcf21a3d801587e919efbc7b9c4780d2bb72c09541"; + sha256 = "00cee41298de49bcdb40e6d480e696ef9ee8a5d7f68768248f911a81866d2a0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/gl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/gl/firefox-117.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "e8b89c71f7e6dcb0f3905ad7555023cb7dc418d1dfaccf874101637f727fd8fd"; + sha256 = "c41dfcc53beace1f84b3fe381e8b05691a0e975f08de3847e959c721d719ed7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/gn/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/gn/firefox-117.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "cdc86d864b2f73fa3fdebfcb4e90ca503a198d6dc09d4d75b88d69bdad1077f1"; + sha256 = "a0e4b80f52ecf88931383dad75f04410d49c7452ab3139015cb036a8bea66c7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/gu-IN/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/gu-IN/firefox-117.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "b6bddada2977696674ba53dae823ea1bb8adf12c19715aa14240444c8a31b4c4"; + sha256 = "fa3ba5312d246368e56eeaed68014ee7b18ff93542815ee48d0e994d7b14a091"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/he/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/he/firefox-117.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "10ef13c66e747f6fa0351a27f4ae971cd988cdb3a18c4a64392dd30630a11376"; + sha256 = "c11754138b53db3aff45adef0b52922f1aa938217881dc359583347352575d9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/hi-IN/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/hi-IN/firefox-117.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "0a725c407171169f4463b7d193531c42954367342dc46cf83f9e6953e73aca9f"; + sha256 = "b78825a3108e53fe09e711cd70a6bb126322c0342f08effa06ee370b791dc7eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/hr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/hr/firefox-117.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "40f0f5cfe9d9d9ee8e54b55b4a00f3cc2b5a9d92d2171d641d49947fc72aa582"; + sha256 = "8b4682dda8528f139f659065448e03a9a3da8e2447a77341b73f3114776a5567"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/hsb/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/hsb/firefox-117.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "c8ccff675194335345c40dd6a129e6989389ea9c269d55695e7640423293a59d"; + sha256 = "7e0bc83e61fc1478e750e7fb87a33333c9aa8195fc14f257e01002d85d1426c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/hu/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/hu/firefox-117.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "f933c78ba41be9da366bf384e49f095d88fffc7f479fdc476c72c43349e82cb1"; + sha256 = "d7799e2e7e030706d5331682b970539133ea703a4494f4a9a945b35de99d695a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/hy-AM/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/hy-AM/firefox-117.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "093c6fab65984c3e78dc786de458a96e5ff35afd3014afb6ae23a47b9a8d9fc2"; + sha256 = "ec51f7bf2083e7290430d4655d7affcf67b0c8883252ca215a60e0ada4c84121"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ia/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ia/firefox-117.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "df40c6134a0cfbd4886fefa9a38f0406372dac73a002cbde7e1eed8c26869731"; + sha256 = "318b17e681dbbc5f17885e6df914f0b71f9a1a29c3eb47dc2aefaafab6d31c26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/id/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/id/firefox-117.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f2debbb1580bc0b27961aa2d783093cdb0b846be38d1f6f278cfdb7b0aabdf47"; + sha256 = "0c3866f2f2ea2035f22e31f90268ab9f261e805c44ebe0c4f3ac7d06b79ac719"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/is/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/is/firefox-117.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "0aa7d201ede9fe331ad6c3decda81f118c0ce43b8aba5a4f3c2d4cfae8f0d866"; + sha256 = "1cbea5bd8f8dab7152bcf8899856e58fcca718620c925bd7568a0ddfdf9396f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/it/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/it/firefox-117.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "85a5bdc459f432d98c3f721bf5ef8a2d2eb910e87f2ef1ae8b154b589d5cad5d"; + sha256 = "0316ca1cecf937437ac8c92afc8161dc0bfe7b8b2f6d6ad7b88ddfc7de2894cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ja/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ja/firefox-117.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "68152a0937d64ee43287a69593da4e7c6b9a63a6a710313c6257dcb90774a975"; + sha256 = "2c60375d29e62fbb6a0e6b7921399915288686f9f203647052222b94c928510a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ka/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ka/firefox-117.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "a375ba1b8ad686883f76e0665733954bbfceda8fc74c5b6a852ab6231b8be97c"; + sha256 = "4c158e12ddc6e3a435cdba8a9ad169d652a78ae8f8c4becd1ef9fc9d28411cb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/kab/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/kab/firefox-117.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2288ee68797a59c3fdbe980ce25ba3a9e2d2aeffcc594d29ee2aeb5e61fa98e1"; + sha256 = "92bf7ee0f5be60046cdfde38f589f7d6b51624c7827fef20a1bb03aa27ba6bcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/kk/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/kk/firefox-117.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b3752f1d962cc4366134302fc3d38a36c88a107e4e1f316e9fdb22358b7178c2"; + sha256 = "60b56e393e883ded0692f79bc888c1f189c57148bbfe97042ae22ce54eea01bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/km/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/km/firefox-117.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "e50ba73fa70c144ce4fadcc09c8f1deff13523fe98aeb7985f9e1b693931741d"; + sha256 = "8573db6eced732690444cfb6f85f6554412a1b2eaf8b7b65ac18e6af6d4cff12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/kn/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/kn/firefox-117.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "dc622a60679c73d729323ad14467bbc4a5ae2872321f9098b24587b07afcabbb"; + sha256 = "aee78529c04857c7445edb2b5d836baac38d3826c87ba4c9f311e80d79d67097"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ko/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ko/firefox-117.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "777b4fc7f149b30bbefe1348ded1fde3f3abf7006f36f66cd0fdbca4ba49e13d"; + sha256 = "123e1aa282424084ad905f1fc0a0de19ba8c180498a2c4c1b3ba74fb16895cb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/lij/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/lij/firefox-117.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "c8a816cdabeed2aec0e8611c0b27a23cf1f9b6d75cc72137c606db4823db0f9f"; + sha256 = "3c3518eabdf13a0aa3028cb3e6b49e2bb168057e8241ef2c795a87fb4f8d42ec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/lt/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/lt/firefox-117.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "768e9009b1a088540b28c016ec0a98efd681357db8b6c55653d2eac68b546c3e"; + sha256 = "6cc00344c97350556840672d743cad0db4eb711ee72c294fbcffe3f0172be1cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/lv/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/lv/firefox-117.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "cf7c32044bc214b5a07735bd9af22a5693cd311536869684ffc93de0eb2cc596"; + sha256 = "f5383619da09e06d7441e2450aef8098ef5942b6ffa70c6bd1043dabac88ac79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/mk/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/mk/firefox-117.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "ab349c928f21107b4256bc5650a19db1c08244849e6a0902a27b27407b287147"; + sha256 = "993d3239e6c2fe7b0581aa31d889801d4d2cda035d64d49cacbf97e155da6c7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/mr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/mr/firefox-117.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "94d74b8f8f8f0a48ff30a3f13b8179f79784efbb2283a1bfcb56fbfe810ea884"; + sha256 = "0d8313a173b1faadd2d8655c3e3c96f31ad4e33f2da1d6e745ae024c27d148c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ms/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ms/firefox-117.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "dc20619cc0b12d167dc1d7924f9bb923f72483b7f44aa44a026c716bc654768f"; + sha256 = "c4a10c63535bb579554e7a190d36794e12aaeeff8039348a075c292ad8283eea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/my/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/my/firefox-117.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "b60182878cefc18ef9e937c0e690fb942c873cdf5c2e410f4f0487d0c9f7c596"; + sha256 = "303bbbe6668ce218da2762caad95fdd46d3f79cb88328dd31adfcc7d7892948e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/nb-NO/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/nb-NO/firefox-117.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "9b72cdb536ef36683d8be285ab970cf96124fd369a39ca8f6209ffd15317b175"; + sha256 = "613fdafcbaccc591fec8f8c90a0985082f81155b762c8d165d26d0c1b07ebc22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ne-NP/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ne-NP/firefox-117.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "06896b53b1eef92357be9be896934808e377839416068b8c3258cbc10f6955a6"; + sha256 = "83515a8f02188477447a1c77095c2cb9a06db6d3b105628c00125382f4a5949b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/nl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/nl/firefox-117.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "a49598230dc30ced33343a1a51cfb6caa96f2441baebd4918947c860b64533b8"; + sha256 = "49266372294c136f49cb4f4c9522742189ae070ff55dc2aee0b81c6ab33f5848"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/nn-NO/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/nn-NO/firefox-117.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "c1b0cb8a0185ad67cffb3ebdffb34ea8e31b4a0aaedb904147793f95c3151bde"; + sha256 = "ed809cfd6ee41a4d1993782d13d0d31dec479ff8821315becfc7eb59c0d3b493"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/oc/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/oc/firefox-117.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "ec8672ce9092a3860ec6a9375b8a086265bc950218521f59ac6e651e611e5479"; + sha256 = "d90f5de260ea3dd216df4b4155915a142f2f7a549c3752a26616a1da98d20809"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/pa-IN/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/pa-IN/firefox-117.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f545b75f5ace74c981a87708194a8defe586c143b16c21f2877e4ae610e4f6b7"; + sha256 = "81070ea2df8f438a5d13fe6197390437b7f9c7ecc838793aef01457a04192192"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/pl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/pl/firefox-117.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "69b2d74f391fcc7aa7dde9f39d79aabc3414430dc6be84497ff29c0f256734ef"; + sha256 = "9ee8394cf179f7bed6fbf7afdc4acbe785a82f1f43dfeda08e2548fbb75942c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/pt-BR/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/pt-BR/firefox-117.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "3f029dbd254e889bced0650826c92bd061371a04e830b7681e3e19b7856a5e6f"; + sha256 = "54ce03e1c8afd4ff0e36487257cb6333314dd932a9bbecb52bce425fafaa6f51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/pt-PT/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/pt-PT/firefox-117.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "1c09ea0a6b914cb0f0e67331bf171cf630ae9ce085afdfa824860a7ede278ed8"; + sha256 = "df5b054a04321036d1d4db31eff3fdac3f6af6eb0ce291a188a96617ac303ab8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/rm/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/rm/firefox-117.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "3e353cb7dad67f8d4f169480c9e067da03c784ce97487253d2ed5065f39f81d6"; + sha256 = "485230109a4882924bbbc10f880ac0671e5e25c0a5854fd4f5b7112c3ef4f092"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ro/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ro/firefox-117.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "523ec63a9e1fdeab38d29802e31f2f16002e0ffe2fa1bb9eb9c5452d9f1ebc06"; + sha256 = "e25d9bafdc1b03b31d071377fac8028420d2c8ad31662087a98a84adad4db7dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ru/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ru/firefox-117.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "18c45350933963b958e02abb01e1377da88fa4940cbbc9d72218a65ae7ed35c6"; + sha256 = "5708f763806d13f28d2f74e198b94cc8390ccff7f416fc9e3a4159fd861d8976"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/sc/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/sc/firefox-117.0.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "414a9a4340084f1294477e04977da4f1319d0926e1d42ab2ad29d1c1b40624da"; + sha256 = "7d520f43e8a5b563dc021db11832707120d4e46a1714cec86130920dd525595f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/sco/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/sco/firefox-117.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "5d29a5b8a707918964e60f1de2eb568567547d832dc7c010e51f2170c69c8281"; + sha256 = "e1204a6558b3b6c82335a6b7e659febb51cd87ee40bb50a2acc763ec0507e45a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/si/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/si/firefox-117.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "24c95b1a63399292c83585e5c1e22a14657b120a1110e0d7f90aba9743008f93"; + sha256 = "ba508fc9dcf2222d5ba908cde707ccc16a1d684d434171b54fe50a1da3c374e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/sk/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/sk/firefox-117.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5bbde34f11d60796914da10ba759af3a0efe95643122511f5a02d27fc2dcb3c3"; + sha256 = "8d8ad5d45b1aa2858450adf4c3470f5070879134857f3fc5ca0fc11b3fb91064"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/sl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/sl/firefox-117.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "859b60c9495bc9fb8f83a1549258d39024658a4a7cfd226b15b0019cb0e11888"; + sha256 = "d3824ce47cb4cbc73e6035f85317ddb283905aeaf342b207d078bd4998da7cb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/son/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/son/firefox-117.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "ed3babf5346091dfbc31924be04800bd5bd1a079a89a166d4730a8d1e6d7d731"; + sha256 = "d602a8fce8e570b730ae7bddfcae9d7b14916669fb9f9715117bea6963d9b04f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/sq/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/sq/firefox-117.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2e2cd9ae5be81dd9477185e5ccce6fbed3af6615a18ff7f40a598f7e6271a662"; + sha256 = "83805acaa777999ebead094080cdc906ee1cf1223365daa954a889067b93bfbc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/sr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/sr/firefox-117.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "856320c8439a6bb11206f53b1ffdc04b3df7b3ca536c7b5534396fd0a7571da8"; + sha256 = "d5f51487bea9fe43142702d91574a77b118d6c578f7d7c424e8620ffb96a9122"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/sv-SE/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/sv-SE/firefox-117.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "dadcefa629a6bd750787067c04a7b14aff85b0675536a6a716f775998e067acc"; + sha256 = "5b4253c482e9f9163ee1f3f9c61c8a6bf1e2fe8b2e159c3eb67bb53bd6bd1a0c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/szl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/szl/firefox-117.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "94ac7b854e7814ab19e07efa226377b8850380f6b5cf958faddfbe1840d09f28"; + sha256 = "58320a930c0dc8953461df5de525d2004e8ea1a78d53d5b0e6f343f6eef23453"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ta/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ta/firefox-117.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "9b13901a530210870ef075293f69e966f4366132ac870f51516ff54eb4835d30"; + sha256 = "71946e0d47fcccd3b211db7f4059f78f53a2c6490b324dc76b595bd40786d265"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/te/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/te/firefox-117.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "98e8c6ffaa6a1830e4b38c8f502d2d74ac6373bdd3edb3c193b59883e52f5347"; + sha256 = "6b6bff47af9f25be842f2b4fdd86db0ed74f5ca38754829e22d49384cb34ace3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/tg/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/tg/firefox-117.0.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "0f37ee3b9812eccc4f29c2f9577867fab6bbc15fe155babc92fefc07b3d51f9f"; + sha256 = "fffbcfb98c9821b9e5a35cfcb8bedc63629be0a73229b1e91a7a6564e52662a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/th/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/th/firefox-117.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "cc13c6d6047c281270c3af43b611b2112b7012d868f842049e405cf06ddcab28"; + sha256 = "c1af1171d3ff9f51ef019924571af07ed9c9783fe38d55f4ea47fadebc88b8b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/tl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/tl/firefox-117.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "ca0d479ecf286fc7f5b1abc68d4050a8813769a04de490e0989daab3d0bf8fbf"; + sha256 = "8f63c791f03cabd48a59e29f526579dd57d36e81c027d37c67e6ebac9a81e91d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/tr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/tr/firefox-117.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9a04e5b7400f72b56fe130164e84e87b6d0f2e8f7f324da2dee1ed4ce10fc481"; + sha256 = "49b3840aa4365707d419d32c62d251931bf4901dc20746dccbaea192602d906b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/trs/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/trs/firefox-117.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b7a64ef799d4c02e55de858dae0e06cace36c6cd52adbfbe51f3e32bced94f5f"; + sha256 = "2ae400fd741b950481f3c8fa7d60e9880b978d05417c420ce0d93ad69fc2a55a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/uk/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/uk/firefox-117.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "89c3fe8a5aabbfc3954db02820a72710d416aa17c68c01563c88a45b38929298"; + sha256 = "ac78bf4e3f0993123e0ec6a2d0e84cdcf01eb4d65cca16457f0f63ea525d96ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ur/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/ur/firefox-117.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "3da274f7cbc5a865605dab44279d7c4f4451fe095f7986b92691d8f5c488d985"; + sha256 = "19c1784b567e663dec4c3774f3e01245127730bdd7b6e3799d8e0f321c778722"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/uz/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/uz/firefox-117.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "6cfc74ad95cd98ac58ea9306ebb69bcbbb6e6abbd8889c6b13c7ae6235965e1e"; + sha256 = "01da3c7e35db35048ecea4a3363086a2637c39ad8e3401eed47dc3d3bca6696a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/vi/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/vi/firefox-117.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "18ee078a8225ebf4f10bcf816f0b08f3f0b78e9e821439d0f773722383aeb022"; + sha256 = "cbb79c98cba0b5026def7f833471870247af98a32491845b61e892f837c1d192"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/xh/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/xh/firefox-117.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "8a1fcc5d215943b42af218d594d02d053356c4f49acc2e245df543fff4e3c948"; + sha256 = "9a509279d842e3b932a5a076ffa79b11918a2f8fcc2a6319d340fce24c2c6a89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/zh-CN/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/zh-CN/firefox-117.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "6cd5002cbe6a7c46cf2d4484abd10fb28e0a760a62aac4aada90d0a07e5e592a"; + sha256 = "45caeece0c0bed2789225f5e3465a5f5ca0c85c47829c5cea1016fe2ca322e77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/zh-TW/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/117.0/linux-i686/zh-TW/firefox-117.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "15a5d2f1e89b8f7433e209f1c0b4c00c44ce21a95de7216c56d2ca4a7cc794ac"; + sha256 = "0e0646f7a8b5e4da54e1d5e7bcbe86dd025fea90b30bacb7662d6cfa65440b72"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index b43aaf450e55..a98fbd99642b 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "116.0.3"; + version = "117.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "194c50e9ba5a918c37fbef8cd72ffb98e5e9f51955d8172b6666a758b5f20777ca0a7f79dff0328305fb6dafefb102ab002e326f47d0965a4dc6d3e9287c42b9"; + sha512 = "4d2afa9bac9d0724fb3568f77a8103d75e90635802f47f2023127de07d70ff145fb0c19e6a4fd37bfe93a7bbb1ec506955c0d4fe3b07057561ebea82b8d6c8d2"; }; meta = { @@ -90,11 +90,11 @@ firefox-esr-102 = buildMozillaMach rec { pname = "firefox-esr-102"; - version = "102.14.0esr"; + version = "102.15.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "6cabd474d0f3a768a0f12fa5c9984ed193906b503202010fd1da0e2affa091fcc5c165e6b9c4152d286410d46b72b2ddbf52d323bf5ea542f29e5267a94dfdcd"; + sha512 = "87db6e32fda215253f9b3bd233ef7fa91a64349310064b8482e5c634f34cbe99a2a111d74d2b9f2a99a0b3b510dbf9039ebe4ccfc176c2554d65bc9cfb508bf9"; }; meta = { @@ -119,11 +119,11 @@ firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.1.0esr"; + version = "115.2.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "b2abb706fef2f1aa9451e7ac7c2affa0cc92cf2b0c6629f106a94c62017476380c7b6f406861fa468f60ea898d8402f534ad74844eb3932741fbd981cec66592"; + sha512 = "df3b4efd9607e8eb4932717760c865eb31ac7a96246cb4385190c33316c9595e0793a1f3c45ebb9674a9ba4fce98d83f71b063bef09ef307d92d1cd78d30d812"; }; meta = { diff --git a/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json b/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json index a22978098c01..c9ecd3de9219 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json +++ b/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "116.0.2-1", + "packageVersion": "116.0.3-1", "source": { - "rev": "116.0.2-1", - "sha256": "08q50yjb8q168zb2y4iajjqd9ygbpywwr9i4vfn67wchqlsc1mrp" + "rev": "116.0.3-1", + "sha256": "19l5nny96p89xm8c9f5m1435sglshn7izmjnj338c8qh217zxiyq" }, "firefox": { - "version": "116.0.2", - "sha512": "2c0ae18672fe22c75002744831130e13da764f83726951e5b58cfe74f7f473e22634ce08ebc11a98bac5baec0a4ac099a3a350a8b756af9c5bea6d5f4432da6d" + "version": "116.0.3", + "sha512": "194c50e9ba5a918c37fbef8cd72ffb98e5e9f51955d8172b6666a758b5f20777ca0a7f79dff0328305fb6dafefb102ab002e326f47d0965a4dc6d3e9287c42b9" } } diff --git a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index ee31f79a5752..4cece29ef949 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -47,7 +47,7 @@ # Hardening , graphene-hardened-malloc # Whether to use graphene-hardened-malloc -, useHardenedMalloc ? true +, useHardenedMalloc ? null # Whether to disable multiprocess support , disableContentSandbox ? false @@ -56,7 +56,10 @@ , extraPrefs ? "" }: -let +lib.warnIf (useHardenedMalloc != null) + "tor-browser-bundle-bin: useHardenedMalloc is deprecated and enabling it can cause issues" + +(let libPath = lib.makeLibraryPath libPkgs; libPkgs = [ @@ -268,7 +271,7 @@ stdenv.mkDerivation rec { GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6 EOF - WRAPPER_LD_PRELOAD=${lib.optionalString useHardenedMalloc + WRAPPER_LD_PRELOAD=${lib.optionalString (useHardenedMalloc == true) "${graphene-hardened-malloc}/lib/libhardened_malloc.so"} WRAPPER_XDG_DATA_DIRS=${lib.concatMapStringsSep ":" (x: "${x}/share") [ @@ -477,4 +480,4 @@ stdenv.mkDerivation rec { license = licenses.free; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; -} +}) diff --git a/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index 7d5a7ed22eba..50ea8c168980 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "2.0.1"; - sha256 = "1smrqb2y99ml45g2n00lz7cz6vkisahl2jy7mncxvhl7s6wx5acz"; - manifestsSha256 = "0j8hlggndbbiapa4sxv3rvvhj4g8b1brgq3g55v0d9k6dzq3q6b3"; + version = "2.1.0"; + sha256 = "08g9awlgij8privpmzmrg63aygcjqmycr981ak0lkbx5chynlnmn"; + manifestsSha256 = "06iqmc5rg9l7zwcyg66fvy6h1g4bg1mr496n17piapjiqiv3j3q4"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-n0915f9mHExAEsHtplpLSPDJBWU5cFgBQC2ElToNRmA="; + vendorSha256 = "sha256-RVHDiJS1MhskVorS/SNZlXWP/oc8OXjUjApeanBkIWQ="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix b/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix index 2ab0ae308d92..3d5ab7d8dc8e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "k3sup"; - version = "0.12.14"; + version = "0.12.15"; src = fetchFromGitHub { owner = "alexellis"; repo = "k3sup"; rev = version; - sha256 = "sha256-8zXcW1jVNVpFWpVYONjc0cwRQr8YTVbLYIH1IYCe9Nw="; + sha256 = "sha256-7eO4QCCgsNWXoo/H0JdMIS7e74p+Ph62OpjBtjmvJKY="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix index 427bc8868e73..089176d7446e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kaniko"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - hash = "sha256-bzMhK60BwJ7A1sGV0rutLOfgvbH/deDQNFZ8BB1hREc="; + hash = "sha256-sDZg2eKTwy3Y7Uaky4rz7EuU1EKY/S4VAEaj7GMN6Uo="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock b/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock index cf5832b24dc0..5a930bf2c99e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.4.3) + activesupport (7.0.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) colorize (0.8.1) concurrent-ruby (1.2.2) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - ejson (1.3.1) - faraday (2.7.4) + ejson (1.4.1) + faraday (2.7.10) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) @@ -21,7 +21,7 @@ GEM ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - googleauth (1.5.2) + googleauth (1.7.0) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -37,12 +37,12 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - jsonpath (1.1.2) + jsonpath (1.1.3) multi_json - jwt (2.7.0) - krane (3.1.0) + jwt (2.7.1) + krane (3.3.0) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -50,7 +50,7 @@ GEM googleauth (~> 1.2) jsonpath (~> 1.0) kubeclient (~> 4.9) - oj (~> 3.0) + multi_json statsd-instrument (>= 2.8, < 4) thor (>= 1.0, < 2.0) kubeclient (4.11.0) @@ -62,15 +62,14 @@ GEM ffi-compiler (~> 1.0) rake (~> 13.0) memoist (0.16.2) - mime-types (3.4.1) + mime-types (3.5.1) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0218.1) - minitest (5.18.0) + mime-types-data (3.2023.0808) + minitest (5.19.0) multi_json (1.15.0) netrc (0.11.0) - oj (3.14.3) os (1.1.4) - public_suffix (5.0.1) + public_suffix (5.0.3) rake (13.0.6) recursive-open-struct (1.1.3) rest-client (2.1.0) @@ -84,8 +83,8 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - statsd-instrument (3.5.7) - thor (1.2.1) + statsd-instrument (3.5.11) + thor (1.2.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) @@ -99,4 +98,4 @@ DEPENDENCIES krane BUNDLED WITH - 2.4.10 + 2.4.18 diff --git a/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix b/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix index 37fad5926869..50c859eb7223 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp"; + sha256 = "1vlzcnyqlbchaq85phmdv73ydlc18xpvxy1cbsk191cwd29i7q32"; type = "gem"; }; - version = "7.0.4.3"; + version = "7.0.7.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; colorize = { groups = ["default"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gmfyyzzvb9k5nm1a5x83d7krajfghghfsakhxmdpvncyj2vnrpa"; + sha256 = "1bpry4i9ajh2h8fyljp0cb17iy03ar36yc9mpfxflmdznl7dwsjf"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.1"; }; faraday = { dependencies = ["faraday-net_http" "ruby2_keywords"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj"; + sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9"; type = "gem"; }; - version = "2.7.4"; + version = "2.7.10"; }; faraday-net_http = { groups = ["default"]; @@ -110,10 +110,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lj5haarpn7rybbq9s031zcn9ji3rlz5bk64bwa2j34q5s1h5gis"; + sha256 = "0h1k47vjaq37l0w9q49g3f50j1b0c1svhk07rmd1h49w38v2hxag"; type = "gem"; }; - version = "1.5.2"; + version = "1.7.0"; }; http = { dependencies = ["addressable" "http-cookie" "http-form_data" "llhttp-ffi"]; @@ -163,10 +163,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.1"; }; jsonpath = { dependencies = ["multi_json"]; @@ -174,31 +174,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fkdjic88hh0accp0sbx5mcrr9yaqwampf5c3214212d4i614138"; + sha256 = "1i1idcl0rpfkzkxngadw33a33v3gqf93a3kj52y2ha2zs26bdzjp"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p"; + sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; krane = { - dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"]; + dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "multi_json" "statsd-instrument" "thor"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d8vdj3wd2qp8agyadn0w33qf7z2p5lk3vlslb8jlph8x5y3mm70"; + sha256 = "1qf5la1w4zrbda5n3s01pb9gij5hyknwglsnqsrc0vcm6bslfygj"; type = "gem"; }; - version = "3.1.0"; + version = "3.3.0"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -238,30 +238,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; type = "gem"; }; - version = "3.4.1"; + version = "3.5.1"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9"; + sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a"; type = "gem"; }; - version = "3.2023.0218.1"; + version = "3.2023.0808"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06"; + sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; type = "gem"; }; - version = "5.18.0"; + version = "5.19.0"; }; multi_json = { groups = ["default"]; @@ -283,16 +283,6 @@ }; version = "0.11.0"; }; - oj = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0l8l90iibzrxs33vn3adrhbg8cbmbn1qfh962p7gzwwybsdw73qy"; - type = "gem"; - }; - version = "3.14.3"; - }; os = { groups = ["default"]; platforms = []; @@ -308,10 +298,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; + sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.3"; }; rake = { groups = ["default"]; @@ -370,20 +360,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pg308z3ck1vpazrmczklqa6f9qciay8nysnhc16pgfsh2npzzrz"; + sha256 = "1zpr5ms18ynygpwx73v0a8nkf41kpjylc9m3fyhvchq3ms17hcb0"; type = "gem"; }; - version = "3.5.7"; + version = "3.5.11"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; tzinfo = { dependencies = ["concurrent-ruby"]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix index 6eae71afe124..04930b997e19 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.2.7"; + version = "2.2.9"; src = fetchFromGitHub { owner = "kubefirst"; repo = pname; rev = "v${version}"; - hash = "sha256-sIX+B08JNwWr4QsWWi4kpqaY9uZbIeiM2sVvMCvSb0I="; + hash = "sha256-QxIbBxNTVONf4x06nuYhY38+pYDwsT3C6yToq7/dHIk="; }; vendorHash = "sha256-F+kzj2lBSFawfc8OyPf6V2XVB1418uhv+cv3CHpXUk0="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix index ab8c7463f037..e76b69696fe1 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-Xtyn08rlBo17ouxSLQcVT8mQQ6nuDKPjE4OHBdze8/Q="; + sha256 = "sha256-FhkeovWuDQZ7KwyIk6YY/iWfRQxTUT0fcAJcCiTZ9Cg="; }; - vendorHash = "sha256-MTueX4+cZIUdjE2BRLVGv7PJr3haV11woJmrkeKFpr0="; + vendorHash = "sha256-mtWh5nJrdy7PIk4+S+66Xgqpllg6lAyc73lW/bjV5AE="; subPackages = [ "cmd/kubeseal" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix index 9bd4747d2dcf..6f7810a0796d 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubevpn"; - version = "1.1.35"; + version = "1.1.36"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - sha256 = "sha256-fY0SKluJ1SG323rV7eDdhmDSMn49aITXYyFhR2ArFTw="; + sha256 = "sha256-wL6L94NNIPTYeUx+k78cFUdTMo9vIvzoKfXa2anCFQM="; }; - vendorHash = "sha256-aU8/C/p/VQ3JYApgr/i5dE/nBs0QjsvXBSMnEmj/Sno="; + vendorHash = "sha256-24mw5ku0pQX2QNQPA9E+wowS3y0J+oKiIxuyVGcgBro="; # TODO investigate why some config tests are failing doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix index 20bba7d405dc..f662e965ff21 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix @@ -9,27 +9,28 @@ , components ? lib.optionals isFull [ "kumactl" "kuma-cp" - "kuma-prometheus-sd" "kuma-dp" ] }: buildGoModule rec { - inherit pname ; - version = "1.8.1"; - tags = lib.optionals enableGateway ["gateway"]; - vendorSha256 = "sha256-69uXHvpQMeFwQbejMpfQPS8DDXJyVsnn59WUEJpSeng="; + inherit pname; + version = "2.3.1"; + tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - sha256 = "sha256-hNfgiMX3aMb8yjXjFKz73MczOeJyOI3Tna/NRSJBSzs="; + hash = "sha256-BayfHBTTqgc0ArD6ux9HOqaZy0GrEpqgDa7zHZtiG2I="; }; + vendorHash = "sha256-St+jGks7ojKrgecmN7UJ9FjGrmjtgEKsunSY+4itUyA="; + + # no test files doCheck = false; - nativeBuildInputs = [installShellFiles] ++ lib.optionals isFull [coredns]; + nativeBuildInputs = [ installShellFiles ] ++ lib.optionals isFull [ coredns ]; preBuild = '' export HOME=$TMPDIR @@ -59,6 +60,7 @@ buildGoModule rec { meta = with lib; { description = "Service mesh controller"; homepage = "https://kuma.io/"; + changelog = "https://github.com/kumahq/kuma/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ zbioe ]; }; diff --git a/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix index 8141b8bd87d6..413fc8b1ec75 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.13.6"; - sha256 = "1z5gcz1liyxydy227vb350k0hsq31x80kvxamx7l1xkd2p0mcmbj"; - vendorSha256 = "sha256-5T3YrYr7xeRkAADeE24BPu4PYU4mHFspqAiBpS8n4Y0="; + version = "2.14.0"; + sha256 = "0j4qzmfhi286vsngf1j3s8zhk7xj2saqr27clmjy7ypjszlz5rvm"; + vendorSha256 = "sha256-HxxekAipoWNxcLUSOSwUOXlrWMODw7gS8fcyTD3CMYE="; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix b/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix index 84b68727d23a..ca34c20a1a54 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.8.2"; - sha256 = "18lz817d1jjl8ynkdhvm32p8ja9bkh1xqkpi514cws27y3zcirrz"; - vendorSha256 = "sha256-SIyS01EGpb3yzw3NIBAO47ixAiWPX2F+9ANoeCTkbRg="; + version = "23.8.3"; + sha256 = "1mj16nzs2da530lvvsg6gh8fcgy8rwq13mryqznflgyr39x4c56i"; + vendorSha256 = "sha256-HxxekAipoWNxcLUSOSwUOXlrWMODw7gS8fcyTD3CMYE="; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index 26f0cc4e1add..924052c2d9b0 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -12,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.31.1"; + version = "1.31.2"; - vendorHash = "sha256-7Wa5Ut3n+CH4LeyRKvFC2aRf2auQXfqsi54QLKWgak8="; + vendorHash = "sha256-5ChPdSIRI+Q3OLW+joukMpIFbUjU4TKpXT4wAARVVP8="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-6vCZUDH35OclO02sV+AXv8+bj4klwoZC0abotheHSoU="; + sha256 = "sha256-Ha0liXc2oXJ3dLty1veN5xN5BUKIiNXe8NTGqWDbTD0="; }; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix index abe2e6ee7fe0..c1666e2f8002 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix @@ -82,7 +82,7 @@ rec { vendorSha256 = "sha256-y3WiQuoQn6SdwTgtPWuB6EBtsJC+YleQPzownZQNkno="; passthru.tests.nomad = nixosTests.nomad; preCheck = '' - export PATH="$PATH:/build/go/bin" + export PATH="$PATH:$NIX_BUILD_TOP/go/bin" ''; }; @@ -93,7 +93,7 @@ rec { vendorSha256 = "sha256-Y3O7ADzZPlLWFbXSYBcI6b5MAhMD0UnkhQxO9VJMpOY="; passthru.tests.nomad = nixosTests.nomad; preCheck = '' - export PATH="$PATH:/build/go/bin" + export PATH="$PATH:$NIX_BUILD_TOP/go/bin" ''; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix b/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix index baf85847875c..5a0dc0d2d97e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -3,7 +3,6 @@ , buildGoPackage , makeWrapper , fetchFromGitHub -, fetchpatch , coreutils , nettools , dmidecode @@ -28,7 +27,7 @@ let in buildGoPackage rec { pname = "amazon-ssm-agent"; - version = "3.0.755.0"; + version = "3.2.1297.0"; goPackagePath = "github.com/aws/${pname}"; @@ -38,7 +37,7 @@ buildGoPackage rec { rev = version; owner = "aws"; repo = "amazon-ssm-agent"; - hash = "sha256-yVQJL1MJ1JlAndlrXfEbNLQihlbLhSoQXTKzJMRzhao="; + hash = "sha256-zRs7RsShZPH3hb5MsADUNrTfHbJVwCELE9mCqEWaTng="; }; patches = [ @@ -48,16 +47,25 @@ buildGoPackage rec { # They used constants from another package that I couldn't figure # out how to resolve, so hardcoded the constants. ./0002-version-gen-don-t-use-unnecessary-constants.patch + ]; + + # See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.1297.0/makefile#L120-L138 + # The updater is not built because it cannot work on NixOS + subPackages = [ + "core" + "agent" + "agent/cli-main" + "agent/framework/processor/executer/outofproc/worker" + "agent/session/logging" + "agent/framework/processor/executer/outofproc/sessionworker" + ]; - (fetchpatch { - name = "CVE-2022-29527.patch"; - url = "https://github.com/aws/amazon-ssm-agent/commit/0fe8ae99b2ff25649c7b86d3bc05fc037400aca7.patch"; - sha256 = "sha256-5g14CxhsHLIgs1Vkfw8FCKEJ4AebNqZKf3ZzoAN/T9U="; - }) + ldflags = [ + "-s" + "-w" ]; preConfigure = '' - rm -r ./Tools/src/goreportcard printf "#!/bin/sh\ntrue" > ./Tools/src/checkstyle.sh substituteInPlace agent/platform/platform_unix.go \ @@ -78,8 +86,6 @@ buildGoPackage rec { ''; preBuild = '' - cp -r go/src/${goPackagePath}/vendor/src go - pushd go/src/${goPackagePath} # Note: if this step fails, please patch the code to fix it! Please only skip @@ -95,8 +101,6 @@ buildGoPackage rec { postBuild = '' pushd go/bin - rm integration-cli versiongenerator generator - mv core amazon-ssm-agent mv agent ssm-agent-worker mv cli-main ssm-cli diff --git a/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix b/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix index 0631dd1788b7..b144df23bd24 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stern"; - version = "1.25.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-E4Hs9FH+6iQ7kv6CmYUHw9HchtJghMq9tnERO2rpL1g="; + sha256 = "sha256-86XoYzw1bnIWwGiFgRl9RcZSYrF4byYKnDlJ4QSqXV0="; }; - vendorHash = "sha256-+B3cAuV+HllmB1NaPeZitNpX9udWuCKfDFv+mOVHw2Y="; + vendorHash = "sha256-LLVd9WB8ixH78CHYe0sS4sCDCD+6SQ7PxWr2MHiAOxI="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix index 2beb86e4df1e..05a4382001d5 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.4.7"; + version = "1.5.1"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-K5YuT8OTxkkv5k6bW6kFDB3NMmXM1yFGBxId0snShe4="; + hash = "sha256-HYIk1oZbtcnHLap+4AMwoQN0k44zjiiwDzGcNW+9qqM="; }; - vendorHash = "sha256-RJhsGjpSHbRXhOr2OkjY7x/Tgw+o7eJ9Ebd+NpW5KFs="; + vendorHash = "sha256-Aefwa8zdKWV9TE9rwNA4pzKZekTurkD0pTDm3QfKdUQ="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 05a097845db7..0cb84284bf80 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.31.1"; + version = "0.31.2"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-SneGlXEthl/x6n+IlMN6y/ZubgHlfseoV0PS9sGcrTM="; + sha256 = "sha256-QBJ8UoR61XOFT6u5glpL+DHaj5Kyqq73r0pyteINQNA="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix b/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix index de33dd062626..b53a6800111b 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.21.2"; + version = "1.21.5"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-4iosKxGjH2O2y2wkAs/tuCH+SXTj6FhrPqS9qgL+vTQ="; + hash = "sha256-G8HqoTdkAAGSadJRF+22hD8q0htwl21HWupfx1/5muc="; }; - vendorHash = "sha256-rgUdoFR7Qcp1h7v63DAWwx6NWSwWrJ6C6/b2tx2kCCw="; + vendorHash = "sha256-AVij8Xb729UQt8BuRf+SoGhoDFzsVELAFV5xCBwnx4c="; excludedPackages = [ "./build" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index bccc854b49a8..0031fb03971c 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -37,20 +37,20 @@ "vendorHash": "sha256-sVPby/MLAgU7DfBDACqxvkLWblBhisHcUaoOgR3fMaM=" }, "akamai": { - "hash": "sha256-LGgZF2/YCYpoDOSu0UeuPqK9wGXrvPQE4WUGGS0sx30=", + "hash": "sha256-jVl4B7YfBDri+G/cJHTvPJquCALEdKxRY1DKeJOC2p0=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v5.1.0", + "rev": "v5.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-6oPftQghM0h0pgc04Rm4PD8OZ/z+dEdcsIqWPPbSgbM=" + "vendorHash": "sha256-GjGv4q0+Yfu4Vc/eZHcch/Y5MMj1QszDrIlu/sY33Ho=" }, "alicloud": { - "hash": "sha256-hE93VV29Whh2POUz15Hcx8aq/78cw7NXDn+xUhrEA+E=", + "hash": "sha256-Ni69AvtyRgwT89OayULlqS8mWdoK+BLK35H0sQEiksg=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.209.0", + "rev": "v1.209.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -101,22 +101,22 @@ "vendorHash": "sha256-vORXHX6VKP/JHP/InB2b9Rqej2JIIDOzS3r05wO2I+c=" }, "aviatrix": { - "hash": "sha256-99y+m2U/aCYrJSTB/eQIakPR3KQzh2OqBizl3htsvL4=", + "hash": "sha256-T/GPJBcKxWhBxB7fVACkkwRm6dqixQpkAzi6UYw6TRw=", "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", - "rev": "v3.1.1", + "rev": "v3.1.2", "spdx": "MPL-2.0", "vendorHash": null }, "aws": { - "hash": "sha256-25CTfFwj/RxsFE6gpUxS1X3TbsuRhTZP89WqhsaRp8w=", + "hash": "sha256-Wt6rcHCxn1RPIxblL/Y6JWfsmOcloMZ8DMWvoVz/xrI=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.13.1", + "rev": "v5.14.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Oir+zn8UNbO3vbl3+QUIlis4K2watmWokaYdD7xGYzI=" + "vendorHash": "sha256-wF4dsQItVSXpJWBiOmdt/5ZaZeROmIxNW66Ec80PudU=" }, "azuread": { "hash": "sha256-aLckXkWxMsDS1ddPucAmjFS6+mkwHeAO1+BlPNaF6cI=", @@ -128,11 +128,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-Nw0Ep5YbipmupB53uzZHHogseHFAbvurz42Q4fPNw/o=", + "hash": "sha256-l26MIkMpB4/vO6r2u7vyepAGxRw8CNPDhcUD/USWteg=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.70.0", + "rev": "v3.71.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -146,20 +146,20 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-yV5NgymZesYE/RhXccTE2Qdf7bHO35qAI+QdPYPUPDM=", + "hash": "sha256-5tydl+IMHz1wYxNUHJY6l+yIgtjc0gy5ufa+DQHiNf0=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.13", + "rev": "v1.19.15", "spdx": "MPL-2.0", "vendorHash": null }, "bigip": { - "hash": "sha256-lC6EesN0y8TxW8jXatteY44/X8cHgRs72i8KfvN2JEM=", + "hash": "sha256-dlQRjIf2lffWqD42ykZdm6HJT0qdID9gdc0vjq2nl9k=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.18.1", + "rev": "v1.19.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -182,13 +182,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-xojTeS+p9XG+wO9thmrSOWrizF56FCg+nwRBdaXqr/4=", + "hash": "sha256-LZyfyiPyGToJMMue9049CnMnioJblko/WXt2PSNv4WE=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v0.25.1", + "rev": "v0.26.0", "spdx": "MIT", - "vendorHash": "sha256-V2BsVBhtdPOT9iseWPhPTOrUe4iMhq4YUiBWd0ne5Xg=" + "vendorHash": "sha256-G4aKekEqEZVMxXDjPgnzvXidv0u1WydZqxSPj5d+WKg=" }, "checkly": { "hash": "sha256-tOTrAi6hd4HFbHAj0p/LTYdxQl1R1WuQ9L4hzqmDVqI=", @@ -353,6 +353,15 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" }, + "doppler": { + "hash": "sha256-VwyJrgPiZW9DzAFS3SeLxV6sdVjD5MzsekOSg3ByhXk=", + "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", + "owner": "DopplerHQ", + "repo": "terraform-provider-doppler", + "rev": "v1.2.4", + "spdx": "Apache-2.0", + "vendorHash": "sha256-Z5GKIty78BUFF3VbTcsZKi437gw/kOIHEKkAYu3uB2o=" + }, "elasticsearch": { "hash": "sha256-a6kHN3w0sQCP+0+ZtFwcg9erfVBYkhNo+yOrnwweGWo=", "homepage": "https://registry.terraform.io/providers/phillbaker/elasticsearch", @@ -363,13 +372,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-SSCKl0etImK9dXhq9ycQi/U38cZ+SuaoBiaeeg/+JDA=", + "hash": "sha256-6fY1gDQLPOaq2FiuT0Mue8dcsJbFCFQ1N38tmyBcdWg=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.15.0", + "rev": "v1.16.0", "spdx": "MIT", - "vendorHash": "sha256-7oLAF+HpL/eNN6KXYp8zA9Yu6h5S+XrWJN4dE3B9H58=" + "vendorHash": "sha256-SqT25WhGmJM/ZTd7QdVPJFxo7zo5OB9AuuDK4RdjKeI=" }, "exoscale": { "hash": "sha256-93pCsHrsYLJYgg8MXHz2Gg+vaPC9gcHdLastb89/BMg=", @@ -436,11 +445,11 @@ "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-9U3vF8xunpTKbOTytUEscMeS3ya6u+PVkNVJjufhpZ0=", + "hash": "sha256-I1FOJitXPJo/mlJCTXsJ1i+UCTImbtkJtEWAvV8wUP0=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.33.0", + "rev": "v5.34.0", "spdx": "MIT", "vendorHash": null }, @@ -454,24 +463,24 @@ "vendorHash": "sha256-G7+3vqxdi4i21o1hYj2GVvoCdcmFN3ue1i4fuepucsw=" }, "google": { - "hash": "sha256-tfjrVWj+l9mNdgZ+unu4NW15OAOzViTVmSTzO/ZiqRE=", + "hash": "sha256-MysIqOj2FTxZL1K/+Ai9/Fv69kIFGEmhWJpWxvsiTcc=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.79.0", + "rev": "v4.80.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-lyOupw64LQvdTJZjJ1RvAn1JLDHAZ4qAaagASXHcEXA=" + "vendorHash": "sha256-jf7BnPmCMTMS3+vCy5AVIO4/tFBDtLDItXn9sDZNLRM=" }, "google-beta": { - "hash": "sha256-70Za/CGYv5HkkXMYtnIHzliW1551ZGF/L05RQtCtjHM=", + "hash": "sha256-xaSse89edfKWBM56oAE3r7IwJ7gdaArSw6flcFC7ZLk=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.79.0", + "rev": "v4.80.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-lyOupw64LQvdTJZjJ1RvAn1JLDHAZ4qAaagASXHcEXA=" + "vendorHash": "sha256-jf7BnPmCMTMS3+vCy5AVIO4/tFBDtLDItXn9sDZNLRM=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -510,11 +519,11 @@ "vendorHash": "sha256-r8njRjQGYESeHuD8pF6rRUe1j2VVMwoDITFi2StC5bk=" }, "helm": { - "hash": "sha256-mGrQ5YKNsv1+Vkan5ohMXnTYofhCQPuTFjemXF/g+tA=", + "hash": "sha256-pgV1xXhg8WIyF4RhJwAenTI6eAmtINveO8zqrKzLajQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", "repo": "terraform-provider-helm", - "rev": "v2.10.1", + "rev": "v2.11.0", "spdx": "MPL-2.0", "vendorHash": "sha256-a80+gjjoFOKI96pUMvTMyM90F5oCb1Ime8hPQcFedFE=" }, @@ -583,13 +592,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-z3k4H4eP5NMufkHaEUIQBQUybpEcfkUO0k3pEMvMPFQ=", + "hash": "sha256-AGAr1O6gzkEG3MQ/AQZarzYnhMK2yilyf9rtKDOwKsM=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.56.1", + "rev": "v1.56.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-djpo+9BxWUptKRephw0by4xtPABEjsnCqwcbZoRNIug=" + "vendorHash": "sha256-uUVU+2mXyhWq653ig8YlsRyqcQBHO9rrRJQwSHovQiM=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -664,11 +673,11 @@ "vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA=" }, "launchdarkly": { - "hash": "sha256-gXT/rBlucBjg+8cjpSXdlClFGNuWmq6tZuuMfsBhR2E=", + "hash": "sha256-sIu+3Vu99wxcA+fdYMXRMZzK7RpUlV37136wyn5H4WQ=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.15.0", + "rev": "v2.15.1", "spdx": "MPL-2.0", "vendorHash": "sha256-I+9hfKWBbclXXpthQc9LAHhZ7MYr/8I89mLeIVeae+Q=" }, @@ -682,13 +691,13 @@ "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { - "hash": "sha256-tSbrd+T1HOOpO4atNDcYmq0SkEureSJkjWOnxqOTdnM=", + "hash": "sha256-rGInk/2GCwd+pNnL3+009xuqhpR4kr7u8NYho1XRtqs=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.6.0", + "rev": "v2.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-dIxOvx8UpZD5I7acucxzfnq+gyDX+uqVMJRkqH5jTRI=" + "vendorHash": "sha256-KlzQ336zOsMUsCX8eanypXP32LxP+iTJDBvQdeWSv2k=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -709,13 +718,13 @@ "vendorHash": "sha256-ZjS40Xc8y2UBPn4rX3EgRoSapRvMEeVMGZE6z9tpsAQ=" }, "lxd": { - "hash": "sha256-mZ2ptpgpyNXZAS19MVxOq3cfmSjTJvTP60fbpEgk6kE=", + "hash": "sha256-0/nIdfCsmPaUkGkSkmWWioc6RZGTb0XWtvprjuDg2gU=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", "repo": "terraform-provider-lxd", - "rev": "v1.10.1", + "rev": "v1.10.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-zGVatrMqYsbGahEGJ/Gt9ub76R49m7RbLLs2XeKwQJw=" + "vendorHash": "sha256-DMOyP8BX1502a+Hd7rwhpV2/nT0ECFKmKDPtWE6o0IM=" }, "mailgun": { "hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=", @@ -790,13 +799,13 @@ "vendorHash": "sha256-BWCL84bDsfrcM9Bkc3G6r0RQ1YnonH1D9bDSywTcigw=" }, "nomad": { - "hash": "sha256-1TmcFS+ul7xpSGqQohcCdeQ2zuDD429xGI0X2Add5HQ=", + "hash": "sha256-urxTfyBv/vuX3Xowca625aNEsU4sxkmd24tis2YjR3Y=", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", "repo": "terraform-provider-nomad", - "rev": "v1.4.20", + "rev": "v2.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-jnZ7LzKgyPVCnYoWp+nDeQy2w91sBVX43KjInzqRWqc=" + "vendorHash": "sha256-L8BpkzTs5qcr31Nho66xzlNMVg2SqfZbj9pPAZrNuqA=" }, "ns1": { "hash": "sha256-faxvq99kkJS0rxNflmIhSDCO/VAVvPsIGV4MTgyRf+Y=", @@ -827,11 +836,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-S+gHfQsqnOlegd5JcuBOUKO7fynWQAWCZGrlqjY03e0=", + "hash": "sha256-xZHk/rkq2H4Bkr+ugTHrkb4Al2ky0zOWEQmZtiXV48s=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.10.0", + "rev": "v5.11.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -872,13 +881,13 @@ "vendorHash": "sha256-NnB8deqIeiB66Kba9LWT62fyI23HL57VcsTickoTRwI=" }, "opentelekomcloud": { - "hash": "sha256-WL7eER7FsuIpdFsp4K1RlrrhEEK6hMou7HYAn/XbvLU=", + "hash": "sha256-dNA6rNzbXFycKRKwJl+/HqUKCKn678KqthIRhmOe72M=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.35.5", + "rev": "v1.35.6", "spdx": "MPL-2.0", - "vendorHash": "sha256-C2wZjhO6PAiHuoKWN97QJLnC0tYNEyDXMSErGlv2Zpg=" + "vendorHash": "sha256-PHtTE3puaeIKXr9mf2bDhhHI51L4XVfOPhL7c5AvlBA=" }, "opsgenie": { "hash": "sha256-Jz3JMq39C2NvA0kvJdjjkOHNvZOMuw4Fq2+nyVHRIL4=", @@ -890,20 +899,20 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-CG7xyx3d9jPD+W0EmNVwdV2ShenfsnxykkERe/8ky3A=", + "hash": "sha256-U1gjD3NUm3/KqnbjgM91qe5gy/x/9Mn3Q4VW2XXBRw4=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.32.0", + "rev": "v0.33.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-kVz63aXl03p6T22WPB9PuZm+QllGxJNt3fDZ1H64dqw=", + "hash": "sha256-wVXGDWpKVujS5FfvDM7quCuXRFP2MBlJra7qTyFJgDM=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.16.0", + "rev": "v2.16.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1025,11 +1034,11 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-zIXlrb/2g/N/slOfvyLmNG2keGXKTes0rHXJmZLV0Sg=", + "hash": "sha256-ILh5mdTyzU0AfJzyGH9JK1QsOER0BtKn9vXyRaGeb8g=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v8.1.0", + "rev": "v9.0.0", "spdx": "MPL-2.0", "vendorHash": "sha256-PQU4VC5wHcB70UkZaRT8jtz+qOAONU2SxtRrTmml9vY=" }, @@ -1106,20 +1115,20 @@ "vendorHash": "sha256-7qDPVKcBQuJQlya6UHjo5YPLgKl0qz1NlU2TuEf8T+0=" }, "talos": { - "hash": "sha256-GRwzR2L6PKx6Us1ci3cs2+DU7TQvhEPcOLyn73dS96Y=", + "hash": "sha256-aP5hiR+b31+QjVWvNPxYkzijTUnFGpgR3f5XuN1Pzx8=", "homepage": "https://registry.terraform.io/providers/siderolabs/talos", "owner": "siderolabs", "repo": "terraform-provider-talos", - "rev": "v0.3.0", + "rev": "v0.3.2", "spdx": "MPL-2.0", "vendorHash": "sha256-0HRhwUGDE4y7UFlXyD0w8zl4NV5436L4SRhrb8vQGyc=" }, "tencentcloud": { - "hash": "sha256-9nm4x3pBHvUDyMWUZpxqbSOc4uxGZ50lKBwf8PV9UAQ=", + "hash": "sha256-OA/GnrdOv9gbnGESdMdw7sc9kRcWI4A6A79ZLOQzyJU=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.21", + "rev": "v1.81.22", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1179,11 +1188,11 @@ "vendorHash": null }, "ucloud": { - "hash": "sha256-ccQwHQlJTqNRNdcz1gd58rzauBcCgV3bGpoKIThruDQ=", + "hash": "sha256-+xqt0y/DIx+h8L+73B00ou0Cy9f60sGijgw95N8eROk=", "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.36.1", + "rev": "v1.37.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1197,12 +1206,12 @@ "vendorHash": "sha256-D7geLjmJoelbHolyS5IhnGNNl6kD8ZGtCRWcy+j2dxA=" }, "vault": { - "hash": "sha256-lnM52d7J36wu9MYh13IFSR15rMfJpXP4tw47LzRy4o4=", + "hash": "sha256-IPVD4VVC6jn3BWltqfCk2+GFSkQRNK7jkJ3/QmgBxqg=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.19.0", + "rev": "v3.20.0", "spdx": "MPL-2.0", "vendorHash": "sha256-xd2tsJ5k/8PCSegHqeyJ1ePFBS0ho8SD+4m4QyFMTL0=" }, diff --git a/nixpkgs/pkgs/applications/networking/cluster/tfautomv/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tfautomv/default.nix index 1374bfe08f36..7409ec8ea446 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tfautomv/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/tfautomv/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tfautomv"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "busser"; repo = pname; rev = "v${version}"; - hash = "sha256-/Pli1gTG/68BtPdvF+BAwxFaeBrjj69h6Mtcbfm7UZ8="; + hash = "sha256-A1/sf+QjxQ8S2Cqmw9mD0r4aqA2Ssopeni0YNLND9L8="; }; vendorHash = "sha256-zAshnSqZT9lx9EWvJsMwi6rqvhUWJ/3uJnk+44TGzlU="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix b/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix index b9e5e023fe81..607955ef5c68 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "weave-gitops"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-chL88vWUMN4kcuh8g2ckWOqYAs9JwE0vnm69zLd5KIM="; + sha256 = "sha256-d/MC+QJypLvURLRRp4U3oErf+MdyJ291Pa+gNPkV4xQ="; }; ldflags = [ "-s" "-w" "-X github.com/weaveworks/weave-gitops/cmd/gitops/version.Version=${version}" ]; - vendorHash = "sha256-EV8MDHiQBmp/mEB+ug/yALPhcqytp0W8V6IPP+nt9DA="; + vendorHash = "sha256-qwuV/c4lWjtmLp197EOScgZHMe4Wmnbj/Jy8x0n2VSo="; subPackages = [ "cmd/gitops" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix b/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix index 10ffe01467f8..632fcaee21d1 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.252"; + version = "1.2.253"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-dKbdEkC0+HFRWsOIteNDlKc1FHB24ECWyOqrVW9MITY="; + hash = "sha256-cHMMLV2NdYueL3qV0wpB4n0+2XZTvg4mfKTSgGZHqqY="; }; - vendorHash = "sha256-0PQDMncERGrPI5sSx76jE7MAz49CYvSORMa/Gc19agA="; + vendorHash = "sha256-vuEqimNRWQGwybzOkGVoevpyVpU8XyXqhAIa7I66ajs="; proxyVendor = true; diff --git a/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix b/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix index 6d367587946b..7d730763c16f 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/zarf/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-MpjxyVOouivB1FT8ejKhq3lPSfCaXwxMXpyxoaNxVEk="; + hash = "sha256-m/eyy3MpHHlxlWU9Y7tsQw5jGGZIKCvBkIgoRmvecBI="; }; - vendorHash = "sha256-h/N50x64ROW3KJ5965vauSpkIoeq8Zn26eCEmJqU0Zg="; + vendorHash = "sha256-p1QLNbkNlIwqHzLjGX5YGC2Xxu0nAjmMfGwKXhi9XkU="; proxyVendor = true; preBuild = '' diff --git a/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index c5d72a4dc236..c25092c9962d 100644 --- a/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-woiFCirM2psmwcKGgQngOJuYZDI2t81xkSzVi4svtXs="; + sha256 = "sha256-poLRt/T7BGzcIBjBcm943XnSurO3DJOx2QyqjDcqNRo="; }; vendorHash = "sha256-3xT5WPBcEclXad8zBA+T7/M6fDmfMWljV8NuxvtvTsA="; diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix index 84c579b9ca8a..95c274ab88ad 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-oUXg3BjGTJsDfA0H2RlCEyNtpld/+jzUl2n9TYiudcY="; + sha256 = "sha256-R3fw5GLQUYZUX1kH6e0IRQ/I/IsFTOK6aP5h5QVU0Ps="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/yarr/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/yarr/default.nix index 57a897118811..ab3e6af5723e 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/yarr/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/yarr/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yarr"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "nkanaev"; repo = "yarr"; rev = "v${version}"; - hash = "sha256-LW0crWdxS6zcY5rxR0F2FLDYy9Ph2ZKyB/5VFVss+tA="; + hash = "sha256-ZMQ+IX8dZuxyxQhD/eWAe4bGGCVcaCeVgF+Wqs79G+k="; }; - vendorHash = "sha256-yXnoibqa0+lHhX3I687thGgasaVeNiHpGFmtEnH7oWY="; + vendorHash = null; subPackages = [ "src" ]; diff --git a/nixpkgs/pkgs/applications/networking/flexget/default.nix b/nixpkgs/pkgs/applications/networking/flexget/default.nix index 84827d228108..649be6767c28 100644 --- a/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.9.4"; + version = "3.9.5"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-cdmW0VSWjr3rm/1T0uDy1iPm3ojR5wrgRixyjIQhodU="; + hash = "sha256-L3AQCc5ErWjMATKMSZf9r+4rfFA8SjCCcT0rW9oMmbA="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix index d5f8b3aa9da2..1f0d01b6f905 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pname = "armcord"; - version = "3.2.3"; + version = "3.2.4"; src = let @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { { x86_64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_amd64.deb"; - hash = "sha256-d8Xv9ecXxkUAIqCS82VKlLNne56hESYvYtSDvNvGul0="; + hash = "sha256-IUHcDHIJeGx7QKjxl3fUFHqUfs1JdIFxesvDXt3mVw0="; }; aarch64-linux = fetchurl { url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; - hash = "sha256-yqZ4hl+E4IEEEuKhfyDYY1Lyz5/Nekrf8uxoJr1B8w8="; + hash = "sha256-TWVlEjakdRyZmOuBq9HLO+R7y5jmgstFtyEHjf8nxxM="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/ArmCord/ArmCord"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.osl3; - maintainers = with maintainers; [ wrmilling ]; + maintainers = with maintainers; [ ludovicopiero wrmilling ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "armcord"; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix new file mode 100644 index 000000000000..c523b59fb199 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -0,0 +1,59 @@ +{ lib, fetchurl, mkDerivation, appimageTools, libsecret, makeWrapper }: +let + pname = "beeper"; + version = "3.71.16"; + name = "${pname}-${version}"; + src = fetchurl { + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-${version}.AppImage"; + hash = "sha256-Ho5zFmhNzkOmzo/btV+qZfP2GGx5XvV/1JncEKlH4vc="; + }; + appimage = appimageTools.wrapType2 { + inherit version pname src; + extraPkgs = pkgs: with pkgs; [ libsecret ]; + }; + appimageContents = appimageTools.extractType2 { + inherit version pname src; + }; +in +mkDerivation rec { + inherit name pname; + + src = appimage; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mv bin/${name} bin/${pname} + + mkdir -p $out/ + cp -r bin $out/bin + + mkdir -p $out/share/${pname} + cp -a ${appimageContents}/locales $out/share/${pname} + cp -a ${appimageContents}/resources $out/share/${pname} + cp -a ${appimageContents}/usr/share/icons $out/share/ + install -Dm 644 ${appimageContents}/${pname}.desktop -t $out/share/applications/ + + substituteInPlace $out/share/applications/${pname}.desktop --replace "AppRun" "${pname}" + + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}} --no-update" + + runHook postInstall + ''; + + meta = with lib; { + description = "Universal chat app."; + longDescription = '' + Beeper is a universal chat app. With Beeper, you can send + and receive messages to friends, family and colleagues on + many different chat networks. + ''; + homepage = "https://beeper.com"; + license = licenses.unfree; + maintainers = with maintainers; [ jshcmpbll ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 871138b7df55..c95b84a3031e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "chatterino2"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zvwvvwMPWnNT44L7g8fiY0N7H62Ot1lNCFCIkL8SxQw="; + sha256 = "sha256-ughEavlvL1/mvevbYrDG+2/JYigMhVwyy3RFysQqUNs="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 6288154f43a1..d9ee5d71c49e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,8 +1,8 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.28"; - ptb = "0.0.44"; + stable = "0.0.29"; + ptb = "0.0.45"; canary = "0.0.166"; development = "0.0.217"; } else { @@ -16,11 +16,11 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "sha256-JwxVVm/QIBLoVyQ2Ff/MX06UNgZ+dAsD960GsCg1M+U="; + sha256 = "sha256-3vjOvkqMD7qKX2zRUbKrw5gHtE/v8WfH557rtagWIWc="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "lehrB2jTvMKIDt7QWK/UAkrzYnW5pAP4LRHfIvGpnzA="; + sha256 = "cN70ZYl9hxWU5FSCpDbpOuR2Wsz6XtPSDoXOTvcCe7g="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix index 8954d363d5fc..0c4bebcab96a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nodejs, bash, nodePackages, unzip }: +{ lib, stdenv, fetchFromGitHub, nodejs, bash, asar, unzip }: stdenv.mkDerivation rec { pname = "openasar"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { bash scripts/injectPolyfills.sh substituteInPlace src/index.js --replace 'nightly' '${version}' ${nodejs}/bin/node scripts/strip.js - ${nodePackages.asar}/bin/asar pack src app.asar + ${asar}/bin/asar pack src app.asar runHook postBuild ''; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix index 54743f93b68b..ab6178bbf905 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.38"; + "version" = "1.11.40"; "hashes" = { - "desktopSrcHash" = "sha256-xDeVwDQ0/ZeqA8c052WvDyhn14TgDTg+FRYQscgxXOQ="; - "desktopYarnHash" = "1ksj99g649kvilr850rkk8nkl55z7vz7m8159777kjikakzra2ly"; - "webSrcHash" = "sha256-R/JyEVjQN4AYD0AqLJDYcrfGHwTMVGDBhNIK3AtGi2c="; - "webYarnHash" = "1znayywxzs1c4ypdv4akxy0lb7mg0i9h74wnja4d5d3vbbdgnid5"; + "desktopSrcHash" = "sha256-GbmRhdTcbwhDnFv0ljaf3SfoRmuw+zqcetKfCrnxwZ8="; + "desktopYarnHash" = "0w8m318gqm5s2ws9l314l3pm6d6biqp1h58v35zisz2j777kcp76"; + "webSrcHash" = "sha256-TCK3MqKodeIt6Nh1+QK2v6DgC1PHrcKljsN2hHMwHe4="; + "webYarnHash" = "0lx42rz9s6ssdp5d31y5pcaigbs290mn1mnpknbcfdygw0pra897"; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock b/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock index 46ac41b3a4aa..085eec078c76 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/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,6 +18,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + +[[package]] name = "aead" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -42,9 +48,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 0.4.4", @@ -83,9 +89,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -107,9 +113,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arrayref" @@ -119,15 +125,15 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[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 = "ashpd" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31688b40eb5d739049f721d8405c33d3796b3f51f2bea84421a542dafe397e41" +checksum = "7370b58af1d7e96df3ca0f454b57e69acf9aa42ed2d7337bd206923bae0d5754" dependencies = [ "async-std", "enumflags2", @@ -156,9 +162,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -174,7 +180,7 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 1.9.0", "futures-lite", "slab", ] @@ -220,17 +226,17 @@ dependencies = [ "log", "parking", "polling", - "rustix", + "rustix 0.37.23", "slab", - "socket2", + "socket2 0.4.9", "waker-fn", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -248,9 +254,9 @@ dependencies = [ "cfg-if", "event-listener", "futures-lite", - "rustix", + "rustix 0.37.23", "signal-hook", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -261,7 +267,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -298,13 +304,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -337,15 +343,15 @@ 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", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.1", "object", "rustc-demangle", ] @@ -390,10 +396,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] name = "blake3" -version = "1.3.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" dependencies = [ "arrayref", "arrayvec", @@ -462,12 +474,21 @@ dependencies = [ "async-lock", "async-task", "atomic-waker", - "fastrand", + "fastrand 1.9.0", "futures-lite", "log", ] [[package]] +name = "blurhash" +version = "0.1.1" +source = "git+https://github.com/marc0x1/blurhash-rs?branch=pixbuf-patch#c07c0cbcd29b2277e8c1d0f6ae07b2e0fad1ed52" +dependencies = [ + "gdk-pixbuf", + "image 0.23.14", +] + +[[package]] name = "bumpalo" version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -493,11 +514,11 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cairo-rs" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871" +checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cairo-sys-rs", "glib", "libc", @@ -507,9 +528,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e" +checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff" dependencies = [ "glib-sys", "libc", @@ -527,18 +548,19 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] name = "cfg-expr" -version = "0.15.2" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", "target-lexicon", @@ -634,9 +656,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" @@ -656,9 +678,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -673,23 +695,44 @@ 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" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.8.0", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -747,6 +790,16 @@ dependencies = [ ] [[package]] +name = "deflate" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" +dependencies = [ + "adler32", + "byteorder", +] + +[[package]] name = "derivative" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -778,27 +831,6 @@ dependencies = [ ] [[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] name = "displaydoc" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -806,7 +838,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -817,9 +849,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "enumflags2" @@ -839,7 +871,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -856,6 +888,12 @@ dependencies = [ ] [[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] name = "err-derive" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -871,13 +909,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -906,6 +944,12 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] name = "fdeflate" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -932,10 +976,11 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flare" -version = "0.9.1" +version = "0.10.0" dependencies = [ "ashpd", "async-trait", + "blurhash", "env_logger", "err-derive", "futures", @@ -943,9 +988,11 @@ dependencies = [ "gettext-rs", "gtk4", "hex", + "image 0.23.14", "lazy_static", "libadwaita", "libsignal-service", + "libspelling", "log", "once_cell", "oo7", @@ -957,6 +1004,7 @@ dependencies = [ "serde", "serde_json", "sled", + "sourceview5", "tokio", "tracing", "url", @@ -966,12 +1014,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] @@ -1059,7 +1107,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -1076,7 +1124,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -1120,11 +1168,10 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf" +checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" dependencies = [ - "bitflags", "gdk-pixbuf-sys", "gio", "glib", @@ -1134,9 +1181,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", "glib-sys", @@ -1147,11 +1194,10 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" +checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" dependencies = [ - "bitflags", "cairo-rs", "gdk-pixbuf", "gdk4-sys", @@ -1163,9 +1209,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" +checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1180,9 +1226,9 @@ dependencies = [ [[package]] name = "gdk4-wayland" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa73894ed86fe10157436123d8baae5f2924ebc4fa48a11d8f093e07b9ecbbd" +checksum = "0db9102ff11e55bd65e153c1192abc21ddfa45ede90622e423d4e4a0e5d5f313" dependencies = [ "gdk4", "gdk4-wayland-sys", @@ -1193,9 +1239,9 @@ dependencies = [ [[package]] name = "gdk4-wayland-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af41c5a9cd7e06f612b91ec45ecb423ab57921bbd92f56e46a67b962be198e0c" +checksum = "d48159be256ae0212d5a2b9884627197d08082c7168b28775b53a0f9885d5624" dependencies = [ "glib-sys", "libc", @@ -1204,9 +1250,9 @@ dependencies = [ [[package]] name = "gdk4-x11" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17de2c3554d5127b9dfacd4d1801e2e3c9163bce01c6e1c407c054e9b771f2ee" +checksum = "28c9bbf8ea1ea8469e74c3fdfafc142c9e14810a27f89ddb01b5e9076a60a450" dependencies = [ "gdk4", "gdk4-x11-sys", @@ -1217,9 +1263,9 @@ dependencies = [ [[package]] name = "gdk4-x11-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ca6c03d5019467d21671936edeba09f908039900af8ce4b834c19646031c72" +checksum = "a3de1709370758192369f5329aa593847797f1c693c95e8a261e9b2e06a5f125" dependencies = [ "gdk4-sys", "glib-sys", @@ -1250,9 +1296,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -1290,18 +1336,27 @@ dependencies = [ ] [[package]] +name = "gif" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" +dependencies = [ + "color_quant", + "weezl", +] + +[[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 = "gio" -version = "0.17.9" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14522e56c6bcb6f7a3aebc25cbcfb06776af4c0c25232b601b4383252d7cb92" +checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524" dependencies = [ - "bitflags", "futures-channel", "futures-core", "futures-io", @@ -1317,9 +1372,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.17.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ "glib-sys", "gobject-sys", @@ -1330,11 +1385,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.17.9" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f1de7cbde31ea4f0a919453a2dcece5d54d5b70e08f8ad254dc4840f5f09b6" +checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" dependencies = [ - "bitflags", + "bitflags 2.4.0", "futures-channel", "futures-core", "futures-executor", @@ -1353,24 +1408,23 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.17.9" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a7206c5c03851ef126ea1444990e81fdd6765fb799d5bc694e4897ca01bb97f" +checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0" dependencies = [ - "anyhow", "heck 0.4.1", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] name = "glib-sys" -version = "0.17.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", "system-deps", @@ -1396,9 +1450,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.17.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys", "libc", @@ -1407,9 +1461,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.17.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cf11565bb0e4dfc2f99d4775b6c329f0d40a2cff9c0066214d31a0e1b46256" +checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" dependencies = [ "glib", "graphene-sys", @@ -1418,9 +1472,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80a4849a8d9565410a8fec6fc3678e9c617f4ac7be182ca55ab75016e07af9" +checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" dependencies = [ "glib-sys", "libc", @@ -1430,11 +1484,10 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" +checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" dependencies = [ - "bitflags", "cairo-rs", "gdk4", "glib", @@ -1446,9 +1499,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" +checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1462,11 +1515,10 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" +checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" dependencies = [ - "bitflags", "cairo-rs", "field-offset", "futures-channel", @@ -1479,15 +1531,14 @@ dependencies = [ "gtk4-macros", "gtk4-sys", "libc", - "once_cell", "pango", ] [[package]] name = "gtk4-macros" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f" +checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", "proc-macro-crate", @@ -1499,9 +1550,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" +checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1518,9 +1569,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] name = "headers" @@ -1529,7 +1580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "bytes", "headers-core", "http", @@ -1564,18 +1615,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -1660,9 +1702,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" @@ -1672,9 +1714,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -1686,7 +1728,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1722,9 +1764,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1755,25 +1797,44 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.23.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "gif", + "jpeg-decoder", + "num-iter", + "num-rational 0.3.2", + "num-traits", + "png 0.16.8", + "scoped_threadpool", + "tiff", +] + +[[package]] +name = "image" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", "color_quant", - "num-rational", + "num-rational 0.4.1", "num-traits", - "png", + "png 0.17.10", ] [[package]] name = "indexmap" -version = "1.9.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] @@ -1802,21 +1863,20 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[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", - "windows-sys 0.48.0", + "hermit-abi", + "rustix 0.38.9", + "windows-sys", ] [[package]] @@ -1830,9 +1890,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 = "jobserver" @@ -1844,10 +1904,19 @@ dependencies = [ ] [[package]] +name = "jpeg-decoder" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" +dependencies = [ + "rayon", +] + +[[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1872,11 +1941,10 @@ dependencies = [ [[package]] name = "libadwaita" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab9c0843f9f23ff25634df2743690c3a1faffe0a190e60c490878517eb81abf" +checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253" dependencies = [ - "bitflags", "gdk-pixbuf", "gdk4", "gio", @@ -1889,9 +1957,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4231cb2499a9f0c4cdfa4885414b33e39901ddcac61150bc0bb4ff8a57ede404" +checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7" dependencies = [ "gdk4-sys", "gio-sys", @@ -1951,7 +2019,7 @@ dependencies = [ [[package]] name = "libsignal-service" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=3c65765#3c65765e8610790afc419af306aa0c1ac77e72af" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=8789920#87899201123b8095cd0f30317620a6d5b7fd652b" dependencies = [ "aes 0.7.5", "aes-gcm", @@ -1974,7 +2042,7 @@ dependencies = [ "rand 0.7.3", "serde", "serde_json", - "sha2 0.10.6", + "sha2 0.10.7", "thiserror", "url", "uuid", @@ -1984,7 +2052,7 @@ dependencies = [ [[package]] name = "libsignal-service-hyper" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=3c65765#3c65765e8610790afc419af306aa0c1ac77e72af" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=8789920#87899201123b8095cd0f30317620a6d5b7fd652b" dependencies = [ "async-trait", "async-tungstenite", @@ -2008,6 +2076,35 @@ dependencies = [ ] [[package]] +name = "libspelling" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "850363056ea48497686407e7e583c50c793896c151bbe7139ad4ea02fbf15e76" +dependencies = [ + "gio", + "glib", + "gtk4", + "libc", + "libspelling-sys", + "sourceview5", +] + +[[package]] +name = "libspelling-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "377675d9465da676ebc05742743d5e5bc53a49be1138f463583181aea97da3c6" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "sourceview5-sys", + "system-deps", +] + +[[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2020,6 +2117,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] +name = "linux-raw-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" + +[[package]] name = "locale_config" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2034,9 +2137,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -2044,9 +2147,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ "value-bag", ] @@ -2083,7 +2186,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "sha2 0.10.6", + "sha2 0.10.7", "thiserror", "zeroize", ] @@ -2105,15 +2208,6 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" @@ -2145,6 +2239,25 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" +dependencies = [ + "adler32", +] + +[[package]] +name = "miniz_oxide" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +dependencies = [ + "adler", + "autocfg", +] + +[[package]] +name = "miniz_oxide" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" @@ -2161,7 +2274,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2198,7 +2311,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", @@ -2217,23 +2330,23 @@ dependencies = [ [[package]] name = "num" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ "num-bigint", "num-complex", "num-integer", "num-iter", - "num-rational", + "num-rational 0.4.1", "num-traits", ] [[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", @@ -2242,9 +2355,9 @@ dependencies = [ [[package]] name = "num-bigint-dig" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" dependencies = [ "byteorder", "lazy_static", @@ -2260,9 +2373,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -2290,6 +2403,17 @@ dependencies = [ [[package]] name = "num-rational" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +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" @@ -2302,20 +2426,20 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] @@ -2371,9 +2495,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -2392,28 +2516,27 @@ checksum = "44d11de466f4a3006fe8a5e7ec84e93b79c70cb992ae0aa0eb631ad2df8abfe2" [[package]] name = "oo7" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1007a6c292751abc192f8dbeef8341bac074e991be7b0eb27a6aece5ee79b4dd" +checksum = "220729ba847d98e1a9902c05e41dae79ce4a0b913dad68bc540dd3120a8c2b6b" dependencies = [ - "aes 0.8.2", + "aes 0.8.3", "async-global-executor", "async-std", "byteorder", "cbc", "cipher 0.4.4", "digest 0.10.7", - "dirs", "futures-util", "hkdf 0.12.3", "hmac 0.12.1", "num", "num-bigint-dig", "once_cell", - "pbkdf2 0.12.1", + "pbkdf2 0.12.2", "rand 0.8.5", "serde", - "sha2 0.10.6", + "sha2 0.10.7", "zbus", "zeroize", ] @@ -2431,12 +2554,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] name = "ordered-stream" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2448,11 +2565,10 @@ dependencies = [ [[package]] name = "pango" -version = "0.17.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c280b82a881e4208afb3359a8e7fde27a1b272280981f1f34610bed5770d37" +checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" dependencies = [ - "bitflags", "gio", "glib", "libc", @@ -2462,9 +2578,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ "glib-sys", "gobject-sys", @@ -2523,14 +2639,14 @@ dependencies = [ "digest 0.10.7", "hmac 0.12.1", "password-hash", - "sha2 0.10.6", + "sha2 0.10.7", ] [[package]] name = "pbkdf2" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest 0.10.7", "hmac 0.12.1", @@ -2544,9 +2660,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", "indexmap", @@ -2574,9 +2690,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2592,15 +2708,27 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.8" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" +checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" dependencies = [ - "bitflags", + "bitflags 1.3.2", + "crc32fast", + "deflate", + "miniz_oxide 0.3.7", +] + +[[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", + "miniz_oxide 0.7.1", ] [[package]] @@ -2620,13 +2748,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "concurrent-queue", "libc", "log", "pin-project-lite", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2660,13 +2788,13 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pqcrypto-internals" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0127cbc0239f585139a56effd7867921eae3425a000a72dde2b0a156062346b2" +checksum = "d9d34bec6abe2283e6de7748b68b292d1ffa2203397e3e71380ff8418a49fb46" dependencies = [ "cc", "dunce", - "getrandom 0.2.9", + "getrandom 0.2.10", "libc", ] @@ -2692,7 +2820,7 @@ checksum = "97e91cb6af081c6daad5fa705f8adb0634c027662052cb3174bdf2957bf07e25" [[package]] name = "presage" version = "0.6.0-dev" -source = "git+https://github.com/whisperfish/presage?rev=9337c5c#9337c5cd9d4c20967eb233d10d8265c58a62b79f" +source = "git+https://github.com/MarcusGrass/presage?rev=d6d8fff#d6d8fff5f5e6429e6fe9d3c6d388323d094fdab6" dependencies = [ "base64 0.12.3", "futures", @@ -2711,7 +2839,7 @@ dependencies = [ [[package]] name = "presage-store-sled" version = "0.6.0-dev" -source = "git+https://github.com/whisperfish/presage?rev=9337c5c#9337c5cd9d4c20967eb233d10d8265c58a62b79f" +source = "git+https://github.com/MarcusGrass/presage?rev=d6d8fff#d6d8fff5f5e6429e6fe9d3c6d388323d094fdab6" dependencies = [ "async-trait", "base64 0.12.3", @@ -2723,7 +2851,7 @@ dependencies = [ "prost-build 0.10.4", "serde", "serde_json", - "sha2 0.10.6", + "sha2 0.10.7", "sled", "thiserror", ] @@ -2886,7 +3014,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc713c23eb7e1a5f18b84e72be88b82a617ee25783a524a38f0caa4c986b2d76" dependencies = [ "html-escape", - "image", + "image 0.24.7", "qrcodegen", ] @@ -2907,9 +3035,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", ] @@ -2973,7 +3101,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", ] [[package]] @@ -2986,39 +3114,50 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.2.16" +name = "rayon" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ - "bitflags", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] -name = "redox_users" -version = "0.4.3" +name = "redox_syscall" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "getrandom 0.2.9", - "redox_syscall 0.2.16", - "thiserror", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", @@ -3028,9 +3167,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -3093,16 +3232,29 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", - "windows-sys 0.48.0", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.5", + "windows-sys", ] [[package]] @@ -3119,12 +3271,12 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.2", + "rustls-pemfile 1.0.3", "schannel", "security-framework", ] @@ -3140,39 +3292,45 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ "base64 0.21.2", ] [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] [[package]] +name = "scoped_threadpool" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" + +[[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -3186,11 +3344,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -3199,9 +3357,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", @@ -3209,35 +3367,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.175" +version = "1.0.187" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" +checksum = "30a7fe14252655bd1e578af19f5fa00fe02fd0013b100ca6b49fde31c41bae4c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.175" +version = "1.0.187" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" +checksum = "e46b2a6ca578b3f1d4501b12f78ed4692006d79d82a1a7c561c12dbc3d625eb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -3246,20 +3404,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -3314,9 +3472,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -3342,9 +3500,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -3361,15 +3519,15 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[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", ] @@ -3392,9 +3550,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" @@ -3407,6 +3565,51 @@ dependencies = [ ] [[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "sourceview5" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88c5f976a113e947bc5ec67758b2960c0db4ca76f80fb410d7cd86cd456d9ee5" +dependencies = [ + "futures-channel", + "futures-core", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "gtk4", + "libc", + "pango", + "sourceview5-sys", +] + +[[package]] +name = "sourceview5-sys" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29637cccd56075a37ba72c0cc8b8d599dbc1d857e30dadea97eaacbc29b7fd46" +dependencies = [ + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3437,9 +3640,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -3460,9 +3663,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" +checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ "cfg-expr", "heck 0.4.1", @@ -3473,9 +3676,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "temp-dir" @@ -3485,15 +3688,15 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.5.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", - "fastrand", + "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "rustix 0.38.9", + "windows-sys", ] [[package]] @@ -3507,22 +3710,33 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", +] + +[[package]] +name = "tiff" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" +dependencies = [ + "jpeg-decoder", + "miniz_oxide 0.4.4", + "weezl", ] [[package]] @@ -3542,19 +3756,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.3", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -3575,7 +3788,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3605,9 +3818,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.3" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -3617,18 +3830,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap", "serde", @@ -3658,13 +3871,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3721,9 +3934,9 @@ dependencies = [ [[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", ] @@ -3736,9 +3949,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -3803,18 +4016,18 @@ checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" [[package]] name = "uuid" -version = "1.3.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "serde", ] [[package]] name = "value-bag" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e" +checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" [[package]] name = "version-compare" @@ -3836,11 +4049,10 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[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", ] @@ -3858,9 +4070,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3868,24 +4080,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -3895,9 +4107,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3905,28 +4117,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -3943,6 +4155,12 @@ dependencies = [ ] [[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] name = "which" version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3990,31 +4208,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-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", + "windows-targets", ] [[package]] @@ -4023,128 +4217,71 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", -] - -[[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", + "windows-targets", ] [[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", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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.2" +version = "0.48.5" 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" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[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" +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.42.2" +version = "0.48.5" 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" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.4.1" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] @@ -4253,7 +4390,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix index 0b8704c092e6..7770eb6af50c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix @@ -7,8 +7,10 @@ , pkg-config , gst_all_1 , protobuf +, libspelling , libsecret , libadwaita +, gtksourceview5 , rustPlatform , rustc , appstream-glib @@ -19,23 +21,24 @@ stdenv.mkDerivation rec { pname = "flare"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = pname; rev = version; - hash = "sha256-RceCVn2OmrHyY2DWT+5XeOc+HlQGVdtOmfo3+2r9hKs="; + hash = "sha256-+9zpYW9xjLe78c2GRL6raFDR5g+R/JWxQzU/ZS+5JtY="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { + "blurhash-0.1.1" = "sha256-SLpszTL2CupMAfUQK5KlnsHTIBDB8hbJs1d6DQXaUiA="; "curve25519-dalek-3.2.1" = "sha256-0hFRhn920tLBpo6ZNCl6DYtTMHMXY/EiDvuhOPVjvC0="; "libsignal-protocol-0.1.0" = "sha256-VQwrGTNZnlDK5p8ZleAZYtbzDiVTHxc93/CRlCUjWtE="; - "libsignal-service-0.1.0" = "sha256-azXQGC008rcqF2C8yHy5CM2NU1Hvwv2I3Kr8aI6URS8="; - "presage-0.6.0-dev" = "sha256-MNd4CvBv6htZQj2g2a3JcQ1r/kk4UPSBLFezEnRK+60="; + "libsignal-service-0.1.0" = "sha256-1ub0IPSvGhZ2tsC6IolusJ1NSWy+5SXSx8qlIdPngTE="; + "presage-0.6.0-dev" = "sha256-4isKBn/4yHoAYsYbBTULK/veZmaecU7t+PvE4Y0oNgk="; }; }; @@ -53,8 +56,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gtksourceview5 libadwaita libsecret + libspelling protobuf # To reproduce audio messages diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index f58f62a7ae17..66ba7d3ae41e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -1,24 +1,30 @@ { lib -, fetchFromGitLab +, fetchFromGitHub , imagemagick +, mesa +, libdrm , flutter +, pulseaudio , makeDesktopItem , gnome }: +let + libwebrtcRpath = lib.makeLibraryPath [ mesa libdrm ]; +in flutter.buildFlutterApplication rec { pname = "fluffychat"; - version = "1.12.1"; + version = "1.13.0"; - src = fetchFromGitLab { - owner = "famedly"; + src = fetchFromGitHub { + owner = "krille-chan"; repo = "fluffychat"; - rev = "v${version}"; - hash = "sha256-F4oVscw5L8iQZtz5K+yo4tlPYYv1wfs88oyq5Uds20I="; + rev = "refs/tags/v${version}"; + hash = "sha256-w29Nxs/d0b18jMvWnrRUjEGqY4jGtuEGodg+ncCAaVc="; }; depsListFile = ./deps.json; - vendorHash = "sha256-u0cQ5ejyxhw4du3jXRB8oWsAlMtbw5nX+SMUUCuwklE="; + vendorHash = "sha256-dkH+iI1KLsAJtSt6ndc3ZRBllZ9n21RNONqeeUzNQCE="; desktopItem = makeDesktopItem { name = "Fluffychat"; @@ -30,6 +36,7 @@ flutter.buildFlutterApplication rec { }; nativeBuildInputs = [ imagemagick ]; + runtimeDependencies = [ pulseaudio ]; extraWrapProgramArgs = "--prefix PATH : ${gnome.zenity}/bin"; postInstall = '' FAV=$out/app/data/flutter_assets/assets/favicon.png @@ -45,8 +52,12 @@ flutter.buildFlutterApplication rec { done substituteInPlace $out/share/applications/*.desktop \ --subst-var out + + patchelf --add-rpath ${libwebrtcRpath} $out/app/lib/libwebrtc.so ''; + env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}"; + meta = with lib; { description = "Chat with your friends (matrix client)"; homepage = "https://fluffychat.im/"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/deps.json b/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/deps.json index ab3c8684d557..80e26e4883ba 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/deps.json +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/deps.json @@ -1,12 +1,13 @@ [ { "name": "fluffychat", - "version": "1.12.0+3452", + "version": "1.13.0+3514", "kind": "root", "source": "root", "dependencies": [ "adaptive_dialog", "animations", + "archive", "badges", "blurhash_dart", "callkeep", @@ -61,6 +62,7 @@ "matrix_homeserver_recommendations", "native_imaging", "package_info_plus", + "pasteboard", "path_provider", "permission_handler", "pin_code_text_field", @@ -94,7 +96,6 @@ "integration_test", "msix", "translations_cleaner", - "flutter_secure_storage_windows", "geolocator_android", "wakelock_windows" ] @@ -112,7 +113,7 @@ }, { "name": "win32", - "version": "4.1.4", + "version": "5.0.5", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -121,7 +122,7 @@ }, { "name": "ffi", - "version": "2.0.1", + "version": "2.0.2", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -151,10 +152,10 @@ "dependencies": [ "characters", "collection", - "js", "material_color_utilities", "meta", "vector_math", + "web", "sky_engine" ] }, @@ -166,31 +167,31 @@ "dependencies": [] }, { - "name": "vector_math", - "version": "2.1.4", + "name": "web", + "version": "0.1.4-beta", "kind": "transitive", "source": "hosted", "dependencies": [] }, { - "name": "material_color_utilities", - "version": "0.2.0", + "name": "vector_math", + "version": "2.1.4", "kind": "transitive", "source": "hosted", "dependencies": [] }, { - "name": "js", - "version": "0.6.7", + "name": "material_color_utilities", + "version": "0.5.0", "kind": "transitive", "source": "hosted", "dependencies": [ - "meta" + "collection" ] }, { "name": "collection", - "version": "1.17.1", + "version": "1.17.2", "kind": "direct", "source": "hosted", "dependencies": [] @@ -234,13 +235,6 @@ ] }, { - "name": "flutter_secure_storage_windows", - "version": "1.1.2", - "kind": "transitive", - "source": "git", - "dependencies": [] - }, - { "name": "translations_cleaner", "version": "0.0.5", "kind": "dev", @@ -252,7 +246,7 @@ }, { "name": "glob", - "version": "2.1.1", + "version": "2.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -274,7 +268,7 @@ }, { "name": "source_span", - "version": "1.9.1", + "version": "1.10.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -319,18 +313,17 @@ }, { "name": "args", - "version": "2.4.0", + "version": "2.4.2", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "msix", - "version": "3.11.1", + "version": "3.15.0", "kind": "dev", "source": "hosted", "dependencies": [ - "flutter", "args", "yaml", "path", @@ -363,7 +356,7 @@ }, { "name": "pub_semver", - "version": "2.1.3", + "version": "2.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -384,7 +377,7 @@ }, { "name": "xml", - "version": "6.2.2", + "version": "6.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -395,7 +388,7 @@ }, { "name": "petitparser", - "version": "5.1.0", + "version": "5.4.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -404,17 +397,38 @@ }, { "name": "archive", - "version": "3.3.2", - "kind": "transitive", + "version": "3.3.7", + "kind": "direct", "source": "hosted", "dependencies": [ "crypto", - "path" + "path", + "pointycastle" ] }, { - "name": "crypto", - "version": "3.0.2", + "name": "pointycastle", + "version": "3.7.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "convert", + "js" + ] + }, + { + "name": "js", + "version": "0.6.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "convert", + "version": "3.1.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -423,7 +437,7 @@ }, { "name": "typed_data", - "version": "1.3.1", + "version": "1.3.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -431,8 +445,17 @@ ] }, { + "name": "crypto", + "version": "3.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { "name": "get_it", - "version": "7.2.0", + "version": "7.6.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -451,7 +474,7 @@ }, { "name": "yaml", - "version": "3.1.1", + "version": "3.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -478,7 +501,6 @@ "collection", "fake_async", "file", - "js", "matcher", "material_color_utilities", "meta", @@ -490,6 +512,7 @@ "term_glyph", "test_api", "vector_math", + "web", "webdriver" ] }, @@ -523,7 +546,7 @@ }, { "name": "matcher", - "version": "0.12.15", + "version": "0.12.16", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -536,7 +559,7 @@ }, { "name": "test_api", - "version": "0.5.1", + "version": "0.6.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -548,8 +571,7 @@ "stack_trace", "stream_channel", "string_scanner", - "term_glyph", - "matcher" + "term_glyph" ] }, { @@ -590,7 +612,7 @@ }, { "name": "vm_service", - "version": "11.3.0", + "version": "11.7.1", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -603,6 +625,7 @@ "dependencies": [ "flutter", "test_api", + "matcher", "path", "fake_async", "clock", @@ -612,14 +635,13 @@ "boolean_selector", "characters", "collection", - "js", - "matcher", "material_color_utilities", "meta", "source_span", "stream_channel", "string_scanner", - "term_glyph" + "term_glyph", + "web" ] }, { @@ -641,7 +663,6 @@ "characters", "clock", "collection", - "js", "matcher", "material_color_utilities", "platform", @@ -653,7 +674,8 @@ "sync_http", "term_glyph", "test_api", - "vector_math" + "vector_math", + "web" ] }, { @@ -708,7 +730,7 @@ }, { "name": "flutter_native_splash", - "version": "2.2.19", + "version": "2.3.1", "kind": "dev", "source": "hosted", "dependencies": [ @@ -727,7 +749,7 @@ }, { "name": "universal_io", - "version": "2.2.0", + "version": "2.2.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -738,7 +760,7 @@ }, { "name": "html", - "version": "0.15.3", + "version": "0.15.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -748,7 +770,7 @@ }, { "name": "csslib", - "version": "0.17.2", + "version": "0.17.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -762,17 +784,17 @@ "source": "sdk", "dependencies": [ "flutter", - "js", "characters", "collection", "material_color_utilities", "meta", - "vector_math" + "vector_math", + "web" ] }, { "name": "flutter_lints", - "version": "2.0.1", + "version": "2.0.2", "kind": "dev", "source": "hosted", "dependencies": [ @@ -781,14 +803,14 @@ }, { "name": "lints", - "version": "2.0.1", + "version": "2.1.1", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "dart_code_metrics", - "version": "4.21.3", + "version": "5.7.5", "kind": "dev", "source": "hosted", "dependencies": [ @@ -798,32 +820,45 @@ "args", "collection", "crypto", + "dart_code_metrics_presets", "file", "glob", "html", + "http", "meta", "path", "platform", "pub_updater", "source_span", + "uuid", "xml", "yaml" ] }, { + "name": "uuid", + "version": "3.0.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "crypto" + ] + }, + { "name": "pub_updater", - "version": "0.2.4", + "version": "0.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ "http", "json_annotation", - "process" + "process", + "pub_semver" ] }, { "name": "json_annotation", - "version": "4.8.0", + "version": "4.8.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -832,14 +867,13 @@ }, { "name": "http", - "version": "0.13.5", + "version": "0.13.6", "kind": "direct", "source": "hosted", "dependencies": [ "async", "http_parser", - "meta", - "path" + "meta" ] }, { @@ -855,6 +889,13 @@ ] }, { + "name": "dart_code_metrics_presets", + "version": "1.8.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { "name": "ansicolor", "version": "2.0.1", "kind": "transitive", @@ -876,7 +917,7 @@ }, { "name": "dart_style", - "version": "2.2.5", + "version": "2.3.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -889,7 +930,7 @@ }, { "name": "analyzer", - "version": "5.1.0", + "version": "5.13.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -909,7 +950,7 @@ }, { "name": "watcher", - "version": "1.0.2", + "version": "1.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -918,17 +959,8 @@ ] }, { - "name": "convert", - "version": "3.1.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "typed_data" - ] - }, - { "name": "_fe_analyzer_shared", - "version": "49.0.0", + "version": "61.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -937,7 +969,7 @@ }, { "name": "webrtc_interface", - "version": "1.0.13", + "version": "1.1.0", "kind": "direct", "source": "hosted", "dependencies": [] @@ -1002,7 +1034,7 @@ }, { "name": "url_launcher", - "version": "6.1.10", + "version": "6.1.12", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1018,7 +1050,7 @@ }, { "name": "url_launcher_windows", - "version": "3.0.6", + "version": "3.0.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1028,7 +1060,7 @@ }, { "name": "url_launcher_platform_interface", - "version": "2.1.2", + "version": "2.1.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1038,7 +1070,7 @@ }, { "name": "url_launcher_web", - "version": "2.0.16", + "version": "2.0.18", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1049,7 +1081,7 @@ }, { "name": "url_launcher_macos", - "version": "3.0.4", + "version": "3.0.5", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1069,7 +1101,7 @@ }, { "name": "url_launcher_ios", - "version": "6.1.3", + "version": "6.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1079,7 +1111,7 @@ }, { "name": "url_launcher_android", - "version": "6.0.25", + "version": "6.0.36", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1098,7 +1130,7 @@ }, { "name": "video_player", - "version": "2.6.0", + "version": "2.7.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1112,7 +1144,7 @@ }, { "name": "video_player_web", - "version": "2.0.15", + "version": "2.0.16", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1133,7 +1165,7 @@ }, { "name": "video_player_avfoundation", - "version": "2.4.2", + "version": "2.4.6", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1143,7 +1175,7 @@ }, { "name": "video_player_android", - "version": "2.4.2", + "version": "2.4.9", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1162,16 +1194,54 @@ }, { "name": "vibration", - "version": "1.7.6", + "version": "1.8.1", "kind": "direct", "source": "hosted", "dependencies": [ - "flutter" + "flutter", + "device_info_plus" + ] + }, + { + "name": "device_info_plus", + "version": "9.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "device_info_plus_platform_interface", + "ffi", + "file", + "flutter", + "flutter_web_plugins", + "meta", + "win32", + "win32_registry" + ] + }, + { + "name": "win32_registry", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "win32" + ] + }, + { + "name": "device_info_plus_platform_interface", + "version": "7.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" ] }, { "name": "universal_html", - "version": "2.2.1", + "version": "2.2.3", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1195,7 +1265,7 @@ }, { "name": "unifiedpush", - "version": "4.0.3", + "version": "5.0.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1207,7 +1277,7 @@ }, { "name": "unifiedpush_android", - "version": "1.1.2", + "version": "2.1.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1218,7 +1288,7 @@ }, { "name": "unifiedpush_platform_interface", - "version": "1.0.0", + "version": "2.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1228,15 +1298,14 @@ }, { "name": "shared_preferences", - "version": "2.0.15", + "version": "2.2.0", "kind": "direct", "source": "hosted", "dependencies": [ "flutter", "shared_preferences_android", - "shared_preferences_ios", + "shared_preferences_foundation", "shared_preferences_linux", - "shared_preferences_macos", "shared_preferences_platform_interface", "shared_preferences_web", "shared_preferences_windows" @@ -1244,7 +1313,7 @@ }, { "name": "shared_preferences_windows", - "version": "2.1.5", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1258,7 +1327,7 @@ }, { "name": "shared_preferences_platform_interface", - "version": "2.1.1", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1268,7 +1337,7 @@ }, { "name": "path_provider_windows", - "version": "2.1.6", + "version": "2.1.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1292,7 +1361,7 @@ }, { "name": "shared_preferences_web", - "version": "2.0.6", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1302,18 +1371,8 @@ ] }, { - "name": "shared_preferences_macos", - "version": "2.0.5", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "shared_preferences_platform_interface" - ] - }, - { "name": "shared_preferences_linux", - "version": "2.1.5", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1327,7 +1386,7 @@ }, { "name": "path_provider_linux", - "version": "2.1.10", + "version": "2.1.11", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1340,7 +1399,7 @@ }, { "name": "xdg_directories", - "version": "0.2.0+3", + "version": "1.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1350,8 +1409,8 @@ ] }, { - "name": "shared_preferences_ios", - "version": "2.1.1", + "name": "shared_preferences_foundation", + "version": "2.3.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1361,7 +1420,7 @@ }, { "name": "shared_preferences_android", - "version": "2.0.17", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1429,7 +1488,7 @@ }, { "name": "share_plus", - "version": "7.0.0", + "version": "7.0.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1464,17 +1523,8 @@ ] }, { - "name": "uuid", - "version": "3.0.7", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "crypto" - ] - }, - { "name": "path_provider", - "version": "2.0.13", + "version": "2.0.15", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1488,7 +1538,7 @@ }, { "name": "path_provider_foundation", - "version": "2.2.0", + "version": "2.2.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1498,7 +1548,7 @@ }, { "name": "path_provider_android", - "version": "2.0.24", + "version": "2.0.27", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1610,7 +1660,7 @@ }, { "name": "qr_flutter", - "version": "4.0.0", + "version": "4.1.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1620,7 +1670,7 @@ }, { "name": "qr", - "version": "2.1.0", + "version": "3.0.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1676,7 +1726,7 @@ }, { "name": "permission_handler", - "version": "10.2.0", + "version": "10.4.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1690,7 +1740,7 @@ }, { "name": "permission_handler_platform_interface", - "version": "3.9.0", + "version": "3.11.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1701,7 +1751,7 @@ }, { "name": "permission_handler_windows", - "version": "0.1.2", + "version": "0.1.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1711,7 +1761,7 @@ }, { "name": "permission_handler_apple", - "version": "9.0.7", + "version": "9.1.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1721,7 +1771,7 @@ }, { "name": "permission_handler_android", - "version": "10.2.0", + "version": "10.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1730,8 +1780,19 @@ ] }, { + "name": "pasteboard", + "version": "0.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "js" + ] + }, + { "name": "package_info_plus", - "version": "4.0.0", + "version": "4.0.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1778,7 +1839,7 @@ }, { "name": "matrix_api_lite", - "version": "1.6.1", + "version": "1.7.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1796,7 +1857,7 @@ }, { "name": "matrix", - "version": "0.20.5", + "version": "0.22.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1820,6 +1881,7 @@ "random_string", "sdp_transform", "slugify", + "typed_data", "webrtc_interface" ] }, @@ -1877,7 +1939,7 @@ }, { "name": "canonical_json", - "version": "1.1.1", + "version": "1.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1920,7 +1982,7 @@ }, { "name": "latlong2", - "version": "0.8.1", + "version": "0.8.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1929,7 +1991,7 @@ }, { "name": "intl", - "version": "0.18.0", + "version": "0.18.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1952,7 +2014,7 @@ }, { "name": "tuple", - "version": "2.0.1", + "version": "2.0.2", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -1996,7 +2058,7 @@ }, { "name": "just_audio_platform_interface", - "version": "4.2.0", + "version": "4.2.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2006,7 +2068,7 @@ }, { "name": "just_audio", - "version": "0.9.31", + "version": "0.9.34", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2032,7 +2094,7 @@ }, { "name": "audio_session", - "version": "0.1.13", + "version": "0.1.16", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2044,7 +2106,7 @@ }, { "name": "just_audio_web", - "version": "0.4.7", + "version": "0.4.8", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2055,7 +2117,7 @@ }, { "name": "image_picker", - "version": "0.8.7", + "version": "1.0.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2063,12 +2125,27 @@ "image_picker_android", "image_picker_for_web", "image_picker_ios", + "image_picker_linux", + "image_picker_macos", + "image_picker_platform_interface", + "image_picker_windows" + ] + }, + { + "name": "image_picker_windows", + "version": "0.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file_selector_platform_interface", + "file_selector_windows", + "flutter", "image_picker_platform_interface" ] }, { "name": "image_picker_platform_interface", - "version": "2.6.3", + "version": "2.8.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2079,8 +2156,77 @@ ] }, { + "name": "file_selector_windows", + "version": "0.9.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "file_selector_platform_interface", + "flutter" + ] + }, + { + "name": "file_selector_platform_interface", + "version": "2.6.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "flutter", + "http", + "plugin_platform_interface" + ] + }, + { + "name": "image_picker_macos", + "version": "0.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file_selector_macos", + "file_selector_platform_interface", + "flutter", + "image_picker_platform_interface" + ] + }, + { + "name": "file_selector_macos", + "version": "0.9.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "file_selector_platform_interface", + "flutter" + ] + }, + { + "name": "image_picker_linux", + "version": "0.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file_selector_linux", + "file_selector_platform_interface", + "flutter", + "image_picker_platform_interface" + ] + }, + { + "name": "file_selector_linux", + "version": "0.9.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "file_selector_platform_interface", + "flutter" + ] + }, + { "name": "image_picker_ios", - "version": "0.8.7+1", + "version": "0.8.8", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2090,18 +2236,19 @@ }, { "name": "image_picker_for_web", - "version": "2.1.12", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ "flutter", "flutter_web_plugins", - "image_picker_platform_interface" + "image_picker_platform_interface", + "mime" ] }, { "name": "image_picker_android", - "version": "0.8.6+5", + "version": "0.8.7+3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2112,7 +2259,7 @@ }, { "name": "flutter_plugin_android_lifecycle", - "version": "2.0.9", + "version": "2.0.15", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2133,7 +2280,7 @@ }, { "name": "handy_window", - "version": "0.1.9", + "version": "0.3.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2185,24 +2332,24 @@ }, { "name": "flutter_webrtc", - "version": "0.9.31", + "version": "0.9.37", "kind": "direct", - "source": "git", + "source": "hosted", "dependencies": [ "collection", "dart_webrtc", "flutter", - "js", "path_provider", "webrtc_interface" ] }, { "name": "dart_webrtc", - "version": "1.0.16", + "version": "1.1.1", "kind": "transitive", "source": "hosted", "dependencies": [ + "collection", "js", "platform_detect", "webrtc_interface" @@ -2220,7 +2367,7 @@ }, { "name": "flutter_web_auth_2", - "version": "2.1.1", + "version": "2.1.5", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2242,7 +2389,7 @@ }, { "name": "flutter_web_auth_2_platform_interface", - "version": "2.1.0", + "version": "2.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2252,17 +2399,27 @@ }, { "name": "flutter_typeahead", - "version": "4.3.7", + "version": "4.6.2", "kind": "direct", "source": "hosted", "dependencies": [ "flutter", - "flutter_keyboard_visibility" + "flutter_keyboard_visibility", + "pointer_interceptor" + ] + }, + { + "name": "pointer_interceptor", + "version": "0.9.3+4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" ] }, { "name": "flutter_keyboard_visibility", - "version": "5.4.0", + "version": "5.4.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2329,7 +2486,7 @@ }, { "name": "flutter_secure_storage", - "version": "7.0.1", + "version": "8.0.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2343,15 +2500,13 @@ ] }, { - "name": "flutter_secure_storage_web", - "version": "1.1.1", + "name": "flutter_secure_storage_windows", + "version": "2.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ "flutter", - "flutter_secure_storage_platform_interface", - "flutter_web_plugins", - "js" + "flutter_secure_storage_platform_interface" ] }, { @@ -2365,8 +2520,20 @@ ] }, { + "name": "flutter_secure_storage_web", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_secure_storage_platform_interface", + "flutter_web_plugins", + "js" + ] + }, + { "name": "flutter_secure_storage_macos", - "version": "2.0.1", + "version": "3.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2428,7 +2595,7 @@ }, { "name": "flutter_svg", - "version": "2.0.5", + "version": "2.0.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2440,7 +2607,7 @@ }, { "name": "vector_graphics_compiler", - "version": "1.1.5", + "version": "1.1.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2453,7 +2620,7 @@ }, { "name": "vector_graphics_codec", - "version": "1.1.5", + "version": "1.1.7", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -2470,7 +2637,7 @@ }, { "name": "vector_graphics", - "version": "1.1.5", + "version": "1.1.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2480,7 +2647,7 @@ }, { "name": "flutter_map", - "version": "3.1.0", + "version": "4.0.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2491,7 +2658,6 @@ "latlong2", "meta", "polylabel", - "positioned_tap_detector_2", "proj4dart", "tuple", "vector_math" @@ -2543,15 +2709,6 @@ ] }, { - "name": "positioned_tap_detector_2", - "version": "1.0.4", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter" - ] - }, - { "name": "polylabel", "version": "1.0.1", "kind": "transitive", @@ -2571,16 +2728,16 @@ "characters", "clock", "collection", - "js", "material_color_utilities", "meta", "path", - "vector_math" + "vector_math", + "web" ] }, { "name": "flutter_local_notifications", - "version": "12.0.4", + "version": "15.1.0+1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2593,7 +2750,7 @@ }, { "name": "timezone", - "version": "0.9.1", + "version": "0.9.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2602,7 +2759,7 @@ }, { "name": "flutter_local_notifications_platform_interface", - "version": "6.0.0", + "version": "7.0.0+1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2612,13 +2769,14 @@ }, { "name": "flutter_local_notifications_linux", - "version": "1.0.0", + "version": "4.0.0+1", "kind": "transitive", "source": "hosted", "dependencies": [ + "dbus", + "ffi", "flutter", "flutter_local_notifications_platform_interface", - "dbus", "path", "xdg_directories" ] @@ -2659,7 +2817,7 @@ }, { "name": "flutter_layout_grid", - "version": "2.0.3", + "version": "2.0.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2719,21 +2877,19 @@ }, { "name": "flutter_foreground_task", - "version": "3.10.0", + "version": "6.0.0+1", "kind": "direct", "source": "hosted", "dependencies": [ "flutter", "plugin_platform_interface", "platform", - "shared_preferences", - "shared_preferences_android", - "shared_preferences_ios" + "shared_preferences" ] }, { "name": "flutter_cache_manager", - "version": "3.3.0", + "version": "3.3.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2744,7 +2900,6 @@ "http", "path", "path_provider", - "pedantic", "rxdart", "sqflite", "uuid" @@ -2752,7 +2907,7 @@ }, { "name": "sqflite", - "version": "2.2.6", + "version": "2.2.8+4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2763,7 +2918,7 @@ }, { "name": "sqflite_common", - "version": "2.4.3", + "version": "2.4.5+1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2774,14 +2929,7 @@ }, { "name": "synchronized", - "version": "3.0.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "pedantic", - "version": "1.11.1", + "version": "3.1.0", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -2815,7 +2963,7 @@ }, { "name": "file_picker", - "version": "5.3.0", + "version": "5.3.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2858,14 +3006,14 @@ }, { "name": "remove_emoji", - "version": "0.0.7", + "version": "0.0.9", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "emoji_picker_flutter", - "version": "1.5.2", + "version": "1.6.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2877,7 +3025,7 @@ }, { "name": "dynamic_color", - "version": "1.6.2", + "version": "1.6.6", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2887,32 +3035,6 @@ ] }, { - "name": "device_info_plus", - "version": "8.1.0", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "device_info_plus_platform_interface", - "ffi", - "file", - "flutter", - "flutter_web_plugins", - "meta", - "win32" - ] - }, - { - "name": "device_info_plus_platform_interface", - "version": "7.0.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "meta", - "plugin_platform_interface" - ] - }, - { "name": "desktop_notifications", "version": "0.6.3", "kind": "direct", @@ -2923,7 +3045,7 @@ }, { "name": "desktop_lifecycle", - "version": "0.1.0", + "version": "0.1.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2950,7 +3072,7 @@ }, { "name": "connectivity_plus", - "version": "3.0.3", + "version": "4.0.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2984,7 +3106,7 @@ }, { "name": "chewie", - "version": "1.4.0", + "version": "1.7.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2992,7 +3114,34 @@ "flutter", "provider", "video_player", - "wakelock" + "wakelock_plus" + ] + }, + { + "name": "wakelock_plus", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "meta", + "wakelock_plus_platform_interface", + "win32", + "dbus", + "package_info_plus", + "js" + ] + }, + { + "name": "wakelock_plus_platform_interface", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface", + "meta" ] }, { @@ -3024,7 +3173,7 @@ }, { "name": "adaptive_dialog", - "version": "1.9.0-no-macos.2", + "version": "1.9.0-x-macos-beta.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -3033,10 +3182,30 @@ "dynamic_color", "flutter", "intersperse", + "macos_ui", "meta" ] }, { + "name": "macos_ui", + "version": "2.0.0-beta.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "macos_window_utils" + ] + }, + { + "name": "macos_window_utils", + "version": "1.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { "name": "intersperse", "version": "2.0.0", "kind": "transitive", diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix index 0002e1d57de5..ebf3341e309a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -12,7 +12,7 @@ , mkDerivation , qtgraphicaleffects , qtquickcontrols2 -, qttranslations +, qttools }: # How to update Linphone? (The Qt desktop app) @@ -73,11 +73,11 @@ mkDerivation rec { minizip-ng qtgraphicaleffects qtquickcontrols2 - qttranslations ]; nativeBuildInputs = [ cmake + qttools ]; cmakeFlags = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/neosay/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/neosay/default.nix new file mode 100644 index 000000000000..4d9b70dd1e2e --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/neosay/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "neosay"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "donuts-are-good"; + repo = "neosay"; + rev = "v${version}"; + hash = "sha256-Uwz6Y26AtzWXLFgJY0WVD0HBb+vbMeeMKt8gCk6viec="; + }; + + vendorHash = "sha256-w0aZnel5Obq73UXcG9wmO9t/7qQTE8ru656u349cvzQ="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Pipe stdin to matrix"; + homepage = "https://github.com/donuts-are-good/neosay"; + license = licenses.mit; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix index 659b6411b48a..8273a6fdbc6d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -12,7 +12,6 @@ , qtbase , qtsvg , qttools -, qttranslations , ffmpeg , filter-audio , libexif @@ -44,7 +43,6 @@ mkDerivation rec { libXScrnSaver qtbase qtsvg - qttranslations ffmpeg filter-audio libexif diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index 66c81f9f6b4e..0b4093735022 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -4,7 +4,7 @@ , dpkg , undmg , makeWrapper -, nodePackages +, asar , alsa-lib , at-spi2-atk , at-spi2-core @@ -143,7 +143,7 @@ let gtk3 # needed for GSETTINGS_SCHEMAS_PATH ]; - nativeBuildInputs = [ dpkg makeWrapper nodePackages.asar ]; + nativeBuildInputs = [ dpkg makeWrapper asar ]; dontUnpack = true; dontBuild = true; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix index be4334438c33..601643edcfd6 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -14,7 +14,7 @@ , gawk , xdg-utils , systemd -, nodePackages +, asar , xar , cpio , makeWrapper @@ -55,7 +55,7 @@ let hash = hashes.linux; }; - nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook nodePackages.asar ]; + nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook asar ]; unpackCmd = "dpkg -x $curSrc ."; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index bc123e212d07..73437d73015f 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2023-05-01"; + version = "unstable-2023-08-15"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "dcb5069ff76bd293e86928804208737e6cee2ccc"; - sha256 = "0c3wnx51kbpzy9x8i9wm0ng16h35kgqsigrygrmwvxxn7zgv72ma"; + rev = "0532942ac6176a66ef184fb728a4cbb02958fc0b"; + sha256 = "sha256-FcRXxu0Nc8qHQl8PoA92MeuhpV+vgl658uILEpmDy3A="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix index 00361a7e368a..6a52d7107339 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -84,6 +84,7 @@ buildNpmPackage rec { downloadPage = "https://github.com/SpacingBat3/WebCord/releases"; changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}"; license = licenses.mit; + mainProgram = "webcord"; maintainers = with maintainers; [ huantian ]; platforms = electron_25.meta.platforms; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix index 5f7956290fcb..fcb59900ff00 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "43.5.0.26155"; + version = "43.8.0.26955"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20230508235734/Webex_ubuntu.7z"; - sha256 = "94ddd66be3a44eeb6f854d0e02feec2e010d494ff9fcc81663f30fca37da4774"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20230814223338/Webex_ubuntu.7z"; + sha256 = "6c754d65fffbcbbb2ca303e1f8c1e5688da190eea3d3b67c77361abc6e2bb85b"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index f23c95feaf5a..1fa08dd530e7 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/nixpkgs/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.15.5.20753"; - versions.x86_64-darwin = "5.15.5.20753"; - versions.x86_64-linux = "5.15.5.5603"; + versions.aarch64-darwin = "5.15.11.22019"; + versions.x86_64-darwin = "5.15.11.22019"; + versions.x86_64-linux = "5.15.11.7239"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-yDdmr0lHmhsJpTpvw4Qr4ZUk7SfEZw/53bVL3yV+a/Q="; + hash = "sha256-R3QD2jo0+kwgOZ0PwHbFxAlbutSpxyDr+CzEwdKxioY="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-qZ5jiNL7I6IHwm1bZ8rgjVwwFJKPeAViQvx+qatGPug="; + hash = "sha256-nSiG2n8oN1k0xyBw4jWbrZT6AiP5VVJXkeBXppvNcAk="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-JIS+jxBiW/ek47iz+yCcmoCZ8+UBzEXMC1Yd7Px0ofg="; + hash = "sha256-pnVy+rS3NxMPwm86+ERLf1oSrsniP3i+FhSg16BuO38="; }; }; diff --git a/nixpkgs/pkgs/applications/networking/insync/default.nix b/nixpkgs/pkgs/applications/networking/insync/default.nix index 282d45513ced..4e11d9fe3863 100644 --- a/nixpkgs/pkgs/applications/networking/insync/default.nix +++ b/nixpkgs/pkgs/applications/networking/insync/default.nix @@ -1,6 +1,6 @@ { lib , writeShellScript -, buildFHSEnv +, buildFHSEnvBubblewrap , stdenvNoCC , fetchurl , autoPatchelfHook @@ -40,11 +40,12 @@ let }; insync-pkg = stdenvNoCC.mkDerivation { - inherit pname version meta; + name = "${pname}-pkg-${version}"; + inherit version meta; src = fetchurl { # Find a binary from https://www.insynchq.com/downloads/linux#ubuntu. - url = "https://cdn.insynchq.com/builds/linux/${pname}_${version}-lunar_amd64.deb"; + url = "https://cdn.insynchq.com/builds/linux/insync_${version}-lunar_amd64.deb"; sha256 = "sha256-BxTFtQ1rAsOuhKnH5vsl3zkM7WOd+vjA4LKZGxl4jk0="; }; @@ -66,7 +67,7 @@ let installPhase = '' runHook preInstall - mkdir -p $out/bin $out/lib $out/share + mkdir -p $out cp -R usr/* $out/ # use system glibc @@ -75,6 +76,9 @@ let # remove badly packaged plugins rm $out/lib/insync/PySide2/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so + # remove the unused vendor wrapper + rm $out/bin/insync + runHook postInstall ''; @@ -82,37 +86,40 @@ let dontStrip = true; }; - insync-fhsenv = buildFHSEnv { - name = "${pname}-${version}"; - inherit meta; - - # for including insync's xdg data dirs - extraOutputsToInstall = [ "share" ]; +in buildFHSEnvBubblewrap { + name = pname; + inherit meta; - targetPkgs = pkgs: with pkgs; [ - insync-pkg - libudev0-shim - ]; + targetPkgs = pkgs: with pkgs; [ + insync-pkg + libudev0-shim + ]; - runScript = writeShellScript "insync-wrapper.sh" '' + runScript = writeShellScript "insync-wrapper.sh" '' # QT_STYLE_OVERRIDE was used to suppress a QT warning, it should have no actual effect for this binary. - export QT_STYLE_OVERRIDE=Fusion + echo Unsetting QT_STYLE_OVERRIDE=$QT_STYLE_OVERRIDE + echo Unsetting QT_QPA_PLATFORMTHEME=$QT_QPA_PLATFORMTHEME + unset QT_STYLE_OVERRIDE + unset QPA_PLATFORMTHEME + # xkb configuration needed: https://github.com/NixOS/nixpkgs/issues/236365 export XKB_CONFIG_ROOT=${xkeyboard_config}/share/X11/xkb/ - exec "${insync-pkg.outPath}/lib/insync/insync" "$@" - ''; + echo XKB_CONFIG_ROOT=$XKB_CONFIG_ROOT - # "insync start" command starts a daemon. - dieWithParent = false; - }; + # For debuging: + # export QT_DEBUG_PLUGINS=1 + # find -L /usr/share -name "*insync*" -in stdenvNoCC.mkDerivation { - inherit pname version meta; + exec /usr/lib/insync/insync "$@" + ''; - dontUnpack = true; - installPhase = '' - mkdir -p $out/bin - ln -s ${insync-fhsenv}/bin/${insync-fhsenv.name} $out/bin/insync - ln -s ${insync-pkg}/share $out/share - ''; + # As intended by this bubble wrap, share as much namespaces as possible with user. + unshareUser = false; + unshareIpc = false; + unsharePid = false; + unshareNet = false; + unshareUts = false; + unshareCgroup = false; + # Since "insync start" command starts a daemon, this daemon should die with it. + dieWithParent = false; } diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 2ae0e2abce50..c1bb57b3b1bb 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wee-slack"; - version = "2.9.1"; + version = "2.10.0"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "sha256-f5CRJmvNZlKOE1XsU214R42dYo0s5xSRXC8TKOniEf4="; + sha256 = "sha256-SxmMCD7FdkmZ0ccDbuY2XUGcLxHlv62x4Pj55Wzf0AA="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/betterbird/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/betterbird/default.nix index d08bd5dfcc4a..9c63f3f37cad 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -12,13 +12,13 @@ let thunderbird-unwrapped = thunderbirdPackages.thunderbird-102; - version = "102.12.0"; + version = "102.14.0"; majVer = lib.versions.major version; betterbird-patches = fetchFromGitHub { owner = "Betterbird"; repo = "thunderbird-patches"; - rev = "${version}-bb37"; + rev = "${version}-bb39"; postFetch = '' echo "Retrieving external patches" @@ -36,7 +36,7 @@ let . ./external.sh rm external.sh ''; - sha256 = "sha256-LH0dgWqariutfaOCPIUZrHzZ8oCbZF1VaaKQIQS4aL8="; + hash = "sha256-O9nGlJs3OziQLbdbdt3eFRHvk1A9cdEsbKDtsZrnY5Q="; }; in ((buildMozillaMach { pname = "betterbird"; @@ -49,7 +49,7 @@ in ((buildMozillaMach { src = fetchurl { # https://download.cdn.mozilla.net/pub/thunderbird/releases/ url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "303787a8f22a204e48784d54320d5f4adaeeeedbe4c2294cd26ad75792272ffc9453be7f0ab1434214b61a2cc46982c23c4fd447c4d80d588df4a7800225ddee"; + sha512 = "4ae3f216833aec55421f827d55bc1b5fc2f0ad4fefecb27724a5be3318c351df24d30a4897b924e733ed2e3995be284b6d135049d46001143fb1c961fefc1830"; }; extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix index 743f8eaa9f20..643f2066678d 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -102,10 +102,11 @@ stdenv.mkDerivation rec { checkTarget = "test"; nativeCheckInputs = [ which dtach openssl bash - gdb man emacs + gdb man ] # for the test T-850.sh for notmuch-git, which is skipped when notmuch is # built without sexp-support + ++ lib.optional withEmacs emacs ++ lib.optional withSfsexp git; installTargets = [ "install" "install-man" "install-info" ]; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 698a418f270d..85d03cf20317 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "115.1.1"; + version = "115.2.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/af/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/af/thunderbird-115.2.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "872d8cd7580c31e60a8524e3e55a40907e4245192adc43411d9c343badb917bc"; + sha256 = "61aa266f12d70ed10d8d6ba410c0462f32ac6422600b72db04a3228ec0ccddc8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ar/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ar/thunderbird-115.2.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "0d53090a0100b42c3b8493fea6b32308a475cabea5a54d27baf4b3313edd645c"; + sha256 = "9c7c2ab86647eaebdf83997988d4c20a8d1c68d10951c7a200ce7a1ce8231ab6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ast/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ast/thunderbird-115.2.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "8e8dc261496632d336bc003df8e9ecf63e1b1002f5357097f4d8aee91cb803b5"; + sha256 = "83196ba09454fb9dfde6d1ea53d8602cee4523664b8bfd475bef12dbc4f63887"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/be/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/be/thunderbird-115.2.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a48c0efcc48ffea6052beb5a6be8f3155f010bfb1269bbd829d4c1026af9b562"; + sha256 = "312b8dc35dac42199722ec5e7e48bf1bd841668f3b2f3c22ebfb1ac81faade4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/bg/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/bg/thunderbird-115.2.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "dd3674ce73ad8f7cf40f2da27018104b7c3161b92ddb050bb19660fb6a4344ba"; + sha256 = "7e6d404a54c30eedf3ef131b25cbc6da1bdb0eb76ce1537274531a9d049ba2d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/br/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/br/thunderbird-115.2.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "b0c6616fb7f3f5a74ac782e3d67980e88bfb7a3773688cde9c781bcac4c0e7da"; + sha256 = "fdd7f5769a38e04d2a6e6b24a653f073306ac557d2500dcb331c006bc5e77e7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ca/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ca/thunderbird-115.2.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "d297889e32a16375306a5c8806d2fef7ee43b55d2b7209130cda174f9b26da6e"; + sha256 = "e64e76588c9616ac4a9a70d228e9aa43e295998b813e69271d4c1d623190308c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/cak/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/cak/thunderbird-115.2.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "546e3f398171a5183e3e631e67510479a4e6c93bdc816e766fc01ec275ddb948"; + sha256 = "f0b0e11953ebdd1f0eb97db8dd5870a177ff4b573d8c5017a9c8efada2b25828"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/cs/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/cs/thunderbird-115.2.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6ec212531f9fa449ead2b7cb0ef12b4539a89111a61b9e110898fdda25a3ea48"; + sha256 = "4538729529c69372ecef07c067c04240d244ca7ff744d338cdc4701be536a70b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/cy/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/cy/thunderbird-115.2.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4b76d0f87ee13952e92997c353effb1600eec640233bf047850873ee3f81a276"; + sha256 = "580af713d4db3d8006dc00b74563c7bb9d394a82c6882d6ee8855f477e3d9277"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/da/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/da/thunderbird-115.2.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "28ce47778c87ea5dfe147a1598a179a3f3f1c2e65dde87e6a0ef97eb502c12d2"; + sha256 = "0796930e9e85078dcfb9cfb41460777b2eda9a79d8befd08cc34a0a5ac054267"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/de/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/de/thunderbird-115.2.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "47863c8bc2c0879c4eaf80462088995775a511596d4bf0a427b5c1d61afb6cf5"; + sha256 = "66a476a74f29db86d4b233b750d0d68c9524c5442d66e700d9a6c6b8842b5118"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/dsb/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/dsb/thunderbird-115.2.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "8736176caf4bb23036f92b21f4f26e078fc2a63b4ecd14b9feba2f76bd59963a"; + sha256 = "77ad1962c476d1ce1b084b8e6300cb240eef669a75fb9a14eed705111014b9d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/el/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/el/thunderbird-115.2.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "6521361499b1ba1f9d187ec0e2650258d3acc859abf2a0663d0412eab71ac7c1"; + sha256 = "5a851f0063ba85f071e676fc5ed61934aaf7bd16efe30986a4b302d21e7fd2ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/en-CA/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/en-CA/thunderbird-115.2.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f6739c95c4cc08bdd34608b60c7c80de78c021ecc56ce8189f68e1decbed3daa"; + sha256 = "4862db55345da4bdd1c9d2ad26687d1329e7563f51ff97d2e158ac1144787c23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/en-GB/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/en-GB/thunderbird-115.2.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "79924357ed316530bd5ba51b433ff85536f5b28b6695e453421f18473c5c11fb"; + sha256 = "7499e5af4e8247858023f32031a53ec9e6771bf7b5ededbed2b9e4bf5792eecb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/en-US/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/en-US/thunderbird-115.2.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f64d1d997b67feb35d650c888ddc0bbff8a3864f30449088d4a519c8f845024c"; + sha256 = "7e6d8a85bb88c70e20110e400044f6286b6986196e811158932663c2525cdefb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/es-AR/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/es-AR/thunderbird-115.2.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "53c20ba1f88865138b23b519f733b70baef27df7c4f6c51b3e9756e2f311f7a9"; + sha256 = "fdb51b5ab28fadbc3c2457169b5fb6559dd3705966039a7bcc4b68fa6a97c21c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/es-ES/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/es-ES/thunderbird-115.2.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0c0fb320b95b68816bce731bab89a5839d8e23bd8167f7f9da0903340611c03d"; + sha256 = "ca3966b2000359a0d00d5cc0b81d842ef91f5c24dc0ff46b72053775a1aa6b45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/es-MX/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/es-MX/thunderbird-115.2.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "a3c8abf11b6db215454747a4f306f12eb38aa9dae60244938bb9b888dfb16f1f"; + sha256 = "bf4c9990e24f31a2551b3d9619c92421b8e4c2101135bcdeac8d37d289533763"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/et/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/et/thunderbird-115.2.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5cd8a13208f85627396a50ea2de03c0254596dafc01f6770b2e3ea5978d94f25"; + sha256 = "7666cc462a32dd8dd2344d51418cd037223b028563c83c801d86ccbe32479311"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/eu/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/eu/thunderbird-115.2.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "d117e7ff7d0ecd8c0075084ba35ab718f46f564cef3bf0afdbaa5db725143600"; + sha256 = "849a865167057f39ac52f23ac256f03daf48e822738d53f3bd8402451167b371"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/fi/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/fi/thunderbird-115.2.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d9811df05161c13c2908fec18b86249108996a3355a44e0a098d92542392ea05"; + sha256 = "746391ea471db27c662064e81a2d552b299f92b70ef6866df5668df10d2d6db9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/fr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/fr/thunderbird-115.2.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ada502c6e5b654332d00183a813db3f39a1f56ff67486dfcbdfd3034309d5082"; + sha256 = "ba1af10295023906c8c92de0518e95be2f6fa236e0ae1d6916aee7b2e105239b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/fy-NL/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/fy-NL/thunderbird-115.2.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f41c0c0c209160f11c1fc80da4df1142a4ff7373252badabd1cb3c3fec3e9fe0"; + sha256 = "4176e4a93c66d958d8ce62e9a9e942176ae708b3e4b727f2b60f300d66776818"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ga-IE/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ga-IE/thunderbird-115.2.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "615f820a11d7563a066b8b39c85ea7bc6cad8a7ec39328d3191aa1e936041904"; + sha256 = "83c6b85d725d578d748fd93bc8d77453aaceb0576de3235522ebeb73bcc9e7e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/gd/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/gd/thunderbird-115.2.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "dc72e38443d503db656efc08a65a141aa7a9973b89f69481ee26fd7df7297fca"; + sha256 = "cc46405104f7629b8ea6f4e22f21c5eff4e486f61e55f9e3f5b951571ebd850f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/gl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/gl/thunderbird-115.2.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8cf4b092bb130177e378ec06ad548b40059a91ce701f4d98f992cc8639d1ec15"; + sha256 = "3812756f77d734bd02272eef603d2f31a5a5bf1d3872244b9e50b7dd32cd640c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/he/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/he/thunderbird-115.2.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "7e367ceca2ba4b6289ee98445cda8ec8adcf22d668f7808ba555e11766a6a05c"; + sha256 = "4ca416569452f5178d892b0191ea9a0fbcf62c015889d8eb3137c7010a7c5204"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/hr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/hr/thunderbird-115.2.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9581a29a2031040976645ade6fe84006a5dd26ebfc65b289efbd9fcfc21e5e1f"; + sha256 = "68c46cb089eb49e026cf4465e3d68be735e98c7b9b95281b66c01c3b57daee9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/hsb/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/hsb/thunderbird-115.2.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "eb16e4b20199a18aa0b3610d0007e64d4c03c4533e66e606094723801d8dcfb9"; + sha256 = "77a8c524fbf8bb05c88446f5005fb0fa32fd76f1d34b9db7668452fad77cf9eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/hu/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/hu/thunderbird-115.2.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "25320a33107358a2cb3ee2f2f6841fc3474a5348c208271a654db022ea2749fb"; + sha256 = "eb20883ecbf4546c1d8e8892a13c79e00dc14724b797a2c06ac01a1d755fc2d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/hy-AM/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/hy-AM/thunderbird-115.2.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "07326ebd1420544b7954a25b8208ec3023434a49893de93ccf2c1e8e7716d279"; + sha256 = "9cc14fd4e3e842bc09e4c6c6e14c42741c4ed3d0cc4e5acbdd5339a268971321"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/id/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/id/thunderbird-115.2.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "5263bfbed08ca2c80a984ced0cd7cd83eb33ae0f33d2c49153443ee9568d6458"; + sha256 = "54403d78f24f9f1ce1195040963c36d0bac466f59956248607c8043d411fea62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/is/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/is/thunderbird-115.2.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "b085dfa757446a301630f7deebc24f67cec720b8d7200700c230b2472bb35a26"; + sha256 = "d4ed45ce1c2847002007ebe50edf59eda9bb6a286a76eb6ea38b8e90bc153c59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/it/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/it/thunderbird-115.2.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "a1ace8ac23cef4e74c4dd231125291c95f12773bd4fc5691c7ac137b325ae588"; + sha256 = "228bd4f80238e30878adf3ba1a7c9c0675c10a6a7071b7c96debba7795c41997"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ja/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ja/thunderbird-115.2.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "6ced33b4003339a09c727d664c0645ecb68d60f8c0eaa8e8c85ae3b6b737eb45"; + sha256 = "1b7326713eacfd22a9b4f33db10a386bfcfbd9c2feda032c4631aeb2ff29db7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ka/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ka/thunderbird-115.2.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "138cb5cd29d39e0e02be5ba51d45fad0f765a675465caafb3464e6e106d2a1d4"; + sha256 = "44adb3ec23783b2f7044d545eabaaa26b044d93ba3cae254c721cb6b5ce9c202"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/kab/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/kab/thunderbird-115.2.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "5e33eb61b6b2dafabff99d9ef5273ccdbe37f60add70141fb6c24a8ffd24993b"; + sha256 = "14f9341a7ec249556c0285743c6e2342bd7ef3428e5f67cbd137d9d48c176b44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/kk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/kk/thunderbird-115.2.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ee6c25bdf4ac8f35055d24217ed11c39a7cf8c9e26b25c878440ac4f3d17ba4e"; + sha256 = "2d45332e97b17a1fa3f510d583e5d889052382eb3cc51b1c1aa795abdc15cbfe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ko/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ko/thunderbird-115.2.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "44204e452f609c70c7416928d6b4224895685f64cd82b9fd1638142526abc496"; + sha256 = "e5fffae30d11aa07f124eeaaf85fcefaa493d359aada79715de7bafa28c391e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/lt/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/lt/thunderbird-115.2.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "d14e22598305a92944e1ce20a1bc59bce8afcdc5dfa2a5c0bfbda14df90b0158"; + sha256 = "7350008c0f6758d448100c910c08c70bdc3f2dc1d035917d98ea1621e811de49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/lv/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/lv/thunderbird-115.2.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "77892ac539b4a6f1e440a6f746fb29094a7e80f3160889eb7d96f7b9cf281a6c"; + sha256 = "fbae2e41d30961d6eb0332ca4874e5051f376cccfc5bbc3d45c37a310a6e2c78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ms/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ms/thunderbird-115.2.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "ee7ae86b46f46e87d274c21aa99cda6d8c586099ad8343d7771235529b370880"; + sha256 = "acf35783614d2192096e9a56568405c1a317ed4a90ba1522a4b12b7a36b5f2b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/nb-NO/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/nb-NO/thunderbird-115.2.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9ef14346d1c1c83478fc95dccb58cd1819eba9e9ffd2a0cf3ef703d5f36f0390"; + sha256 = "c1338953e49591abc7cc81c1e4ca75758a10d5c02af918a31cefb67361dcf9c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/nl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/nl/thunderbird-115.2.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "936afadbb7829b965e56c5b5d11a817e97ad529097f44cd1b8fbbe62c8c41323"; + sha256 = "72dd0db24c331e38b90a0530bbd65308f44f503cfb91830b1f0aa76af343b1c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/nn-NO/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/nn-NO/thunderbird-115.2.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "0a6a81b2e9345fbd4e88b7e2eec928f1d25a09fc92bfa1f9b96423efccf75028"; + sha256 = "e7b454f994ef122993284ff341bcb1212fcf2c81cda207751b3a7ee2478c050f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/pa-IN/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/pa-IN/thunderbird-115.2.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "8e38aa404f76523db0d6b910033b555a391811297bc9b1988ef50acdaf37c16c"; + sha256 = "57852e3458e5713777614cd82818b76a58bb229d2e56bf65c590bc7bd1e25e43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/pl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/pl/thunderbird-115.2.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "847aa25be48228821f817feaa5e7d3038058a37c5abca6d316bed9f8fbbafc26"; + sha256 = "0848d4aca97ede2dd9f2ff3797d911d9bbeba56b0caf5ea8a31b27228cd36c2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/pt-BR/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/pt-BR/thunderbird-115.2.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "0dace36f81b8ce7eae24fb5c691cd8c8b99e5e46a1f6a478d4295606b66c65c4"; + sha256 = "6c6bd5d57ad2f4dc798c5e75025fc8a822e79568d3aeebc26e084c95c2d750fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/pt-PT/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/pt-PT/thunderbird-115.2.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1b0f69f835a37d4e4921ee85828abd216cef831d1ba1ebaf6178b8e8e7905bc0"; + sha256 = "48c1c7035e7e8ae02ea9efc6539cc4262a285dff31c68bad7f1a4379f1e7ba96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/rm/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/rm/thunderbird-115.2.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b2ace86fcbf898a1512c132eb8cec006093e5f4e1f9708504f7ebc1b6b18c352"; + sha256 = "a2f69dd3668cbd3f77ed7bad7db7a75122a52373c1242045aa596acd59f06857"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ro/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ro/thunderbird-115.2.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "716787eacc023db3bfdfd03461e11a592c20527f3dce5600df9aee51e808115a"; + sha256 = "b49bf0e671e9cde206be7efd42c8c92c036b1e8e399929e93a8025e7b8ea4548"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ru/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ru/thunderbird-115.2.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "586cc5e6266794b40f46484615bd6af908147cb5efd9d41e13e4dd059ba06ace"; + sha256 = "95863a9b7087def490ee0e9dc0a4a85bdf468ff65791d6910c9a7e663bdd671d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/sk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/sk/thunderbird-115.2.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "744ba9de8b3828627915e38a03e3353dfcfd7ad46838ed7a17a77a3cbb79a2f8"; + sha256 = "7bcf570eb4f912317c97fb2fbd1ef8cfa6923145f0ffac4932e75e7535f26010"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/sl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/sl/thunderbird-115.2.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "33669faa6d691307da126c6d094e8c83a41a3ac072e7f3cb450dc5232bea4cf2"; + sha256 = "8b829344a00fc046c35684258e64720d6b2543ba459025e73e26c72701237c49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/sq/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/sq/thunderbird-115.2.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "75d91f46c85000ca42bbc537080a61a446dd6144441523fc25b3c35c2382f847"; + sha256 = "4a80b2459f96de051145c2c01310962b56605809a8dcd7aa559e1ebf3833831d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/sr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/sr/thunderbird-115.2.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "e647d2aa18d63a78c9bbef4aaca50622340795376cd779aad3dd13914543965a"; + sha256 = "bcbdb38ee9838667080ebcca7b6a0ea27d4ca749d212d657bf6e5d1eb31cc841"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/sv-SE/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/sv-SE/thunderbird-115.2.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "fb5832b2416a088ea80b2bae74072652354465b17d996015c7bf46c0da187eeb"; + sha256 = "31f5d267f66d2ac82739c0d3451e3733fa52cb7bbd9c42ea166507e93f1510b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/th/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/th/thunderbird-115.2.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "2a3dd0ec84b9982ab55594001761083656db29fbf2cabd4cd5ff823dc2031088"; + sha256 = "64855e9a737bad4506725bc27a4d3e58663b4a2492869a9aaebe1d0738b18aa0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/tr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/tr/thunderbird-115.2.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "c88b1264afc4a1aa323bf670ba164b93c725f7c96faf016a31e9de51ac227d0e"; + sha256 = "2564fc331c1f3bdbe9614cb32370bbb5b8d6ba3015af19fa938f9320e1b2ca1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/uk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/uk/thunderbird-115.2.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4c0957e036d29f72df09836dc814dccd115d05fa4d1af3c9d4c0c89bcd6e0c8b"; + sha256 = "9a751fe34659cbb237ac46b0d2a017dbe41f896024c396fb64101f165e487c6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/uz/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/uz/thunderbird-115.2.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "0c2959d777f866c49a9d34fa47056fb23727078677735db280458c73cee14655"; + sha256 = "0667a84599c8db877d7a0e0e824b9d8e0e036848033edc2d70a766d5d107f8c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/vi/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/vi/thunderbird-115.2.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "326659c38f5417b4fbfdc94b6e1316e0bf926a936882e66650ade39d2caaaff0"; + sha256 = "f53fb64857ce9bb471210850d79ce7f06d1bb0476739a1b279f95b1f64520dae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/zh-CN/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/zh-CN/thunderbird-115.2.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "a50416f5e05a48ab3a57217083ec3bcea8bc7ce89544edb0645af9e62c9d656a"; + sha256 = "6a79d33b99c4b7ec33824c02d9908827b499294e90722f250441c980aca7e6cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/zh-TW/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/zh-TW/thunderbird-115.2.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "dfa3ffa940ff68cc76a779ee36558df1431609d3f683792b9f9f1c04d9284526"; + sha256 = "5798c36bb002a6d9420713e42600690afa7cc1fea1d2df2c9a676108da51122c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/af/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/af/thunderbird-115.2.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "c1978ee67b4fb4391f1fece97de85e7843f05ef6eb58463a5bcfd21a8018bff8"; + sha256 = "91529d632a61d14d11935fddf65da701b936f6e8fe7b86da0b1df4621ebf3a87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ar/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ar/thunderbird-115.2.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "abb0a497d824df51b2d78be14c114ff2eeb27164940c4ffaa82375558b14a0a2"; + sha256 = "e73a6b62f5b5087fc3e62288f622affecb2461766257fe43f8b7c1e064ffb4cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ast/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ast/thunderbird-115.2.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "0e0a52a74e17492d39fde141cc59c6b0bfd55d9cee338d1f743608778e2cbbfc"; + sha256 = "a664089e193128bf13f5e66dbd044247b934c0c7f05ae7d2504a6751ce9f31ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/be/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/be/thunderbird-115.2.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "36a25c4ca43dd8cb23c22784288dd46f6af548bf7161588cc2b1a528f2064d18"; + sha256 = "a81e320d3614636eb0ed4b23694cd150f7fa1ae9a9fba7a345ffd3a4a7d7c05b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/bg/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/bg/thunderbird-115.2.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f81d6037ff8d2df244f0de797ae5baf598df3a55a5aecb8efbf8de93f9e67f3f"; + sha256 = "b6c1ca1a2abc4d66610f7a2c8c429adca3b709b828b2ea5da548a6e025571293"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/br/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/br/thunderbird-115.2.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "e90f883adc3c2c6a13a56ae6ddb62ae748950eab2782d96bc5fdbcf25c1c0500"; + sha256 = "ea39ef65c98c89fa0e537285fd063d1733e4c82384f69027825051f55ec14ced"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ca/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ca/thunderbird-115.2.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "0e082f0ff5ad81fc49c77ac5cd2be0abfb09f63862ed6f8c9780976c1a2b4c48"; + sha256 = "5b4c3444f5da5f5a3c66f27cb144cf1065290675eeb445a33f45dc3058d69f0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/cak/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/cak/thunderbird-115.2.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "963b9ce6127a3df5f7023b0e561dab8f07134152c458a664eef27ad1dbd48ab8"; + sha256 = "042b483bb595cc9e4b4b676f50f4011d18be100a24dc5f11e9e92459a783c232"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/cs/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/cs/thunderbird-115.2.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "df5cc5f011f80c918214fa6b5e40e8f2901c80b28b9bb55a0a82d54d043180bf"; + sha256 = "aae95000a972a569192ad1ce3ba230b3f03d09f6d54414550f9c37da14390f84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/cy/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/cy/thunderbird-115.2.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "cf445349e665e4717848ae68ebeff5b7df7a53b531e8a5e51e4345037bb909d9"; + sha256 = "eaca1be55346bff8449988f4da16c2a543211172e72f21e09ebc2d476e0bc045"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/da/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/da/thunderbird-115.2.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "783039eb62122cd9f8c206d63b2a9779e19e7c0d30d5fbce84b7a41c2199e625"; + sha256 = "4de1cfeebf2e009aefa0da49ded961ee886c1cfb37812cb0d5272bea2329ec55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/de/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/de/thunderbird-115.2.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "0db7f5d044670713dd13bc0dd059fe6f4026f1929e5767b804047731d4bf2e1e"; + sha256 = "3fdf99f3c5d6281b646ca83d83bef7b6d5f6f8e7ddca4524e035624f434ac861"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/dsb/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/dsb/thunderbird-115.2.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "592334f160a3081cfb04273a5c927259b71e6594f7bf666c18e67ec874d098ba"; + sha256 = "1cfa9f74113be33f5621920cdb7d5a3b0986936a97af70c3ab8919f938992773"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/el/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/el/thunderbird-115.2.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "78f2ee6c467f223a53ab092098d0bd003db72b89f996888d629ecfb978536a28"; + sha256 = "44b0bd6e4df10f1c954609d1e75736e03b7a4d55b1d13ed62f376c2c265c0b55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/en-CA/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/en-CA/thunderbird-115.2.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "495d9634e09315e6304bbe09539271792dc0f513308730b70727b255ac33f758"; + sha256 = "06f9c43c5fe4d9fd1e33422930eaa23ab5b2b8588a1f9fc16233302f9442b251"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/en-GB/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/en-GB/thunderbird-115.2.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "05626bde23fae4b2c9677c6ff418d8c84eb5ed5176385f63c070e27ddef83e1d"; + sha256 = "3cbbd48aab007524f210d6291dbf90e931fc8219b88ba8043792297b070dd6ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/en-US/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/en-US/thunderbird-115.2.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "594f8eef7c8368b5e7d028b089345d9e69c92eb3494247356a588354f53e917a"; + sha256 = "ebdbad72644aafded6c91902020463b4857cb5c9c26d4e60413e3c5135c6b4a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/es-AR/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/es-AR/thunderbird-115.2.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "99158b0eaa335bfbce19e5441f304cfdcbd6bf5f572138ede3230305bfe4abdf"; + sha256 = "bae033f12148a332a048ab49735c68f313b7234419e81c3073a00462b92a6e74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/es-ES/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/es-ES/thunderbird-115.2.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a68574ab121e567a2b35f223f1dea71c33fb0a76fa38b566d93121f6602202cb"; + sha256 = "518f78442eceaf9ff8f7928da764dbc9c083cfc65ef4b2bee6a68dc576d36b12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/es-MX/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/es-MX/thunderbird-115.2.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "1fa0a7ac757476895997c2203961980ee6f912c1839d6e66a29a74059bdc5c17"; + sha256 = "2c5c4f0eef368950bb6717884f0c4cf9d7960d91ea1ecb7ccaec85b5e0d4e4cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/et/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/et/thunderbird-115.2.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "aecfa2e5600351400edbd5466adfae4ff49eacce5d8439c41f75007e9a1ce3d2"; + sha256 = "5d8dcdef1ac1065989423c63f1e2e5708f09307e08a6602b5a70cf2c36a16223"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/eu/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/eu/thunderbird-115.2.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "2302d42abd183fdbfcba73baf25bf4d0b855c79d11a7fc24b24b25a18dce92a1"; + sha256 = "7c7667e0a64668288a1d26e6128b7b152ef3404c6e0762492e9b3f5e24727aa9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/fi/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/fi/thunderbird-115.2.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "314e9a7b7c581839dda8c0e031cb78931cb6b48c3740291dba7560ec21c5af99"; + sha256 = "425f2f5435bf0291f23399b3b328f36c71aaaff96cda4e8e2a5a2bba0a23496d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/fr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/fr/thunderbird-115.2.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "8c1209785c71cd8b0e80d8823c3788370bf81a01eae7f7d34272f3dc79a8aeab"; + sha256 = "41de58dca0746dc3d287ea90f392c674bf5952850971099c7a9e386ed2519d0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/fy-NL/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/fy-NL/thunderbird-115.2.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "f8183a123a64960541795c2b472ebb45c16434177eb6491487b9091a7a38bce6"; + sha256 = "2643feb7e52f6682a2601bc662007ecc013f452c4aceb846bd32b0ebe957ca3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ga-IE/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ga-IE/thunderbird-115.2.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "8cc7f3895b6306acd0b3cda7de02748dbc63c390398b515d98a8d67b1b02b901"; + sha256 = "b6685530788759744292aa55c8c916ed65dfd4d0d8f60d11498234b5331c5a98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/gd/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/gd/thunderbird-115.2.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b96b3e0e9bd2cf1e1864b39cc33214a14515f41198e52cce25cf3c5f222978d8"; + sha256 = "f85c93f45feb79d667c756c3b7a4b51c2c05d939e1a6217f97274e22cc1e900f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/gl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/gl/thunderbird-115.2.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "cc130514df833c06a097ccbff69d36a7cf9dd96e040617e4b28d7d087dd09239"; + sha256 = "344599ba40698d94b5e0633ceb7e1e22b0e0d5bdc93c2ef87f8b4969cec0659d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/he/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/he/thunderbird-115.2.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "934cacd035b4ee93d09ae6e69c03dd7e2c167ecfefd3359087399e1a20014c34"; + sha256 = "8316345181cf6396e1e4bde4e0b4690c925cb106334fd5bdd4a550f6bd5c4f6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/hr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/hr/thunderbird-115.2.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f9173f380c1b27d90132d65c5789db7b0b0fb632c680b7cdaec1e8749d74fd8c"; + sha256 = "ab678d0cd79e6e8d10e2e5db8c947b796bed8d4069a42fd9d86f5a5b752ad111"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/hsb/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/hsb/thunderbird-115.2.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "51001276bff6c87f34fc9eb9d0400425176207f7f052c51fa98d85cba96aec57"; + sha256 = "4d87ef768342eab2ce83b55774a1cb7cb0605adb0607dbb66cd1fbeafad4f0fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/hu/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/hu/thunderbird-115.2.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ac330ac95d73c909c739937fd8fd4e61d987cea8da211cbcb86c02ef13ebf1ac"; + sha256 = "96e8d4599fcf5ab4bcc178f372e3d84c9257f1e41d6e06b7975df9f4f6e8f178"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/hy-AM/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/hy-AM/thunderbird-115.2.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "71805e3ddfa74699b1c06d0dc2f3dfd3c2faf4332a5dc5f27e4a7cbb2549a4c7"; + sha256 = "72788149439cb96e3321971a6e52dfc3884a337d7b4ff9c1ac0897e9566cd123"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/id/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/id/thunderbird-115.2.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "cc25d0d5d79d592cfccb8f516c7e06132f071c61fb3e72beb07bf9d6b3ad8765"; + sha256 = "4124a860406abb86ca017597aba9c90cea9e20b8955b3367b29113efd1a16421"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/is/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/is/thunderbird-115.2.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "228e328079179a09817c00353219c8339ffbdba644cc3ad7d2bba13961d67b32"; + sha256 = "2b08e55e0204e0f49db6c128d21ebfed7073c4f85a7b33926f0f38ee0cebdab7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/it/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/it/thunderbird-115.2.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "e8aa0180d78042ee15612ba5460316daa09284acbc313c22da0a64266c522ff3"; + sha256 = "ca719ce8f719740565c79c94053ab52a3a491bfbac2b117a39b9e2f13aca4df9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ja/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ja/thunderbird-115.2.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "b36f21877ce33d928dba32f6fc307c2f46bcd6ee9f9bc66c04beae7ff2355371"; + sha256 = "4765280d30df0da1c1f3b47f8470c96445c343e1a3f87eb963847baadc501803"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ka/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ka/thunderbird-115.2.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "8eaab25f84eeb672b4ef395f71a58e721f0a6492ea89b050b23bf087d68788dc"; + sha256 = "828f764efb051f581987d98438bca3e7eb9279c14ecc65f3450632bef4b9b654"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/kab/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/kab/thunderbird-115.2.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "33f1d9380787cd09614333f2114c5992f9dbb49f1b2e0271d03916823d473017"; + sha256 = "76b77c92e347088fd1c1ae649d14dc019a9083b5ae08227204aad83da4b2a061"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/kk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/kk/thunderbird-115.2.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "61983a14c8c1d39d88656d0b88f3edc2e65d1167c2087e22e18b6b8c942cf5a0"; + sha256 = "a0f745f0bc19834c2e75fc95c4614a78538d6278f79fdc75ea4fc15242764e9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ko/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ko/thunderbird-115.2.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "2d6ffbafd5da4032e575df3ced7995d8245516b070748ab7a717bbac01e4c25b"; + sha256 = "3c5a4289618c3e6747586891f5eb47cd69ffc5f6c5f49d154a463abe37440397"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/lt/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/lt/thunderbird-115.2.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a336beddbb32cb4eb3ece06bbfe7ab14b67b97f44e73606b8a552dcb9ac73105"; + sha256 = "e731e745805b06d767998e8ac38eb39191a70236e7223e61148b6006bc81f58c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/lv/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/lv/thunderbird-115.2.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "373b581dd03ce10c72ab03e0e9db16f220daa0e7ace5490372bfe3bad7022777"; + sha256 = "a1090f2be2a884b572ee6cf181a03088a5b0b529abf3af0c0b99f669210b6750"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ms/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ms/thunderbird-115.2.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "73e6efdfe3f55257575852a1b76e4932becdd4e6c1f818e030d0ace26d4733ac"; + sha256 = "eb788a59057959d5cfee9742ad6583513b868957976f6c2d13a5520fff1bb5c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/nb-NO/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/nb-NO/thunderbird-115.2.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "b5d31e6ea54b3928857b6baffe44818d22e8e8acebe27dc217f8d1ccd79c1a4c"; + sha256 = "2112bdcb27163572c48621b5eb9a40688768b4c4951c52bf933269a4172599fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/nl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/nl/thunderbird-115.2.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "4451ac693a9c43888224710c79b7ed8838435eef35eeadb9097d3d382df7f2ea"; + sha256 = "b3d508660a044fceeb89832af32522b32eb1de88a34bb336a34bd24acb75c5bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/nn-NO/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/nn-NO/thunderbird-115.2.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "c05356371e506f92e472c7b0a759ab8f9d3b512a987fbb72312131a3d5db39e2"; + sha256 = "de84e54bd4bda94e7f930a47e34ab72b29bf8a43a6f0fdecc7464b1f3526d21a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/pa-IN/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/pa-IN/thunderbird-115.2.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c773cd3074dfc7415bea45253b50a16c872dc6e9120bdd7807ef4a964ea92707"; + sha256 = "3c05bce8ae30abeaa948b08bfa86dfd794a3b699b25240785ef61fcb65ec5699"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/pl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/pl/thunderbird-115.2.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "32c9ec263006738446d4f16c53ca9d2872ac4c152be974cdc8f2c18905120c7c"; + sha256 = "2d1aea7352155b7c739ff3073d790f2ae25e3362abc0232df76768510bb2d8f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/pt-BR/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/pt-BR/thunderbird-115.2.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "110dc01e5f4186b9f7043ea9343f2a3a59927d319da16b969b0f7c7a486e6571"; + sha256 = "dab4ed6ca4f17eeb6fca56e6b08623834ad08997a384f22321af70aaf701cbe0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/pt-PT/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/pt-PT/thunderbird-115.2.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "d5611e79e78484ad15dd2333d9c977ca6f5b00cb44bfa423cfba8a9fca7c77c8"; + sha256 = "b74bd8217c57fdce2d3dde440b467bd1066bb3b2dd320d6bb06b50ccf4795faf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/rm/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/rm/thunderbird-115.2.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "8ae35f806e5a4bc2a5559b74a7766b96833ac5ba469f310358a9d18eabeba235"; + sha256 = "85bc0641509778e489af7efcdefdf80f2fafa1f2179d4096feb63e62bfbf62e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ro/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ro/thunderbird-115.2.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "74cc9cf95a390a259540113f36fb25a5ea4b9d2325c96593f3f34df367aa0cf6"; + sha256 = "6ed9b66c1c8de5932853dcbfd7c0eaa44414ce63beda065ca42424788e58a3fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ru/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ru/thunderbird-115.2.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "06a91c59dcbefb7812515f016b03d9605a0517b9c06351ff5a6f9b6ce164d66f"; + sha256 = "a243fabbb4adb1027e1368ce6f19a9e1955ee6f42f90658cc74be902c145b11e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/sk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/sk/thunderbird-115.2.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "70fb2f45e334e91c0da1a074e4646731fa151f688049f6539d4cc63f2e755072"; + sha256 = "ed039d390a61dc3526f2c607a3260332a49db62d7e432a1fdca7fb8df58ad89e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/sl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/sl/thunderbird-115.2.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "1b04aa780472a6d51b21f15e58abf2291b94a86cb5f8e7cc3006f0f85520a88a"; + sha256 = "a0bf41738ae0d1eaaa965b7a47070f11dbc379b0f9955bc2419548b19b7b20e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/sq/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/sq/thunderbird-115.2.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "8cc0cb46414be80f1377a2eb10d535d52c854bf51bc197f137bd16adf4b95a7e"; + sha256 = "19c1ca545d4f74c2d0ca43db5d9a02bd62be29d70d671232657545cabcb18313"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/sr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/sr/thunderbird-115.2.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "c06788b23a60d3949e00b9bcb623ca8a1457c2e92e15ac8c5d29053d54852c1c"; + sha256 = "7a9c408f6be3febb9607f6771694eee38eb466f433a49bd3f5e9c25b6f06cbf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/sv-SE/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/sv-SE/thunderbird-115.2.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4de0b830eed07a2a743a9a6c4e925d0ea149a74e5b0ae164378c366f8ede7969"; + sha256 = "3c0b95887d1fa43e062c8f8a4cae9da99b2b1a0dcee1a312be12316f85cdfb28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/th/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/th/thunderbird-115.2.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "d5c8601825b47d4abeb51f386199fb23893f69f6e25870c87e962279c6daaf38"; + sha256 = "6bce19bc6ed566b129667bdac4e8f6c0252b3734167b99877512d08499d97610"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/tr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/tr/thunderbird-115.2.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "f92c52b8ef7672aa6ae8b8f33063f1acf274f41ed8852cfb66dbde4d86db7a95"; + sha256 = "ce76f224193339efe0a60aed40ccdd2d0a88fdcd7bd612a181e5df3a96c42047"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/uk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/uk/thunderbird-115.2.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "0ce05dfc43582387f349a56f6e2b34acfe459daecc77a9fc530db9798f77cfc5"; + sha256 = "3340a2dd8c0be2d65b9a0af4e6f296f3998e9ac091cc3cab6320437f246005df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/uz/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/uz/thunderbird-115.2.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "9a095f4bf86405e2a44eb0ecb0f630c050bd5c884094f4d9748b40eccc9ddaed"; + sha256 = "03cd2d1f842143a7740092ce9faf11d1865f6d5a60ea06ccc8383d654adbc1d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/vi/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/vi/thunderbird-115.2.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "a60d9c74a0f8577ad775489e581d19c112d51436c2525f235acf6aeeb4f2ab29"; + sha256 = "575be01c9b893308a3503c1cff3301b0005cff7a63027208f396c4c573e7bb18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/zh-CN/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/zh-CN/thunderbird-115.2.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "257b2ef302f202ac0a23bfcec76038f0e665c82346007a68337452bb0eaa1413"; + sha256 = "ce246d95bad26cf9c48993e7ab40518947fee5874409244e1ff9d78c62199149"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/zh-TW/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/zh-TW/thunderbird-115.2.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "25766f390cf68dd829776ab9065f5d753f42175cc454ddb7c44c96d672464bb4"; + sha256 = "595fa9fb117e4634dcd98ce259fd7c95d588753f67d32f1f75a09c667c12d9df"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index eef91d60d873..ea15f6331519 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -22,6 +22,7 @@ rec { changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; description = "A full-featured e-mail client"; homepage = "https://thunderbird.net/"; + mainProgram = "thunderbird"; maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ]; platforms = platforms.unix; badPlatforms = platforms.darwin; @@ -42,13 +43,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.1.1"; + version = "115.2.0"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "26f69dded43bd24ffce9acb0de204bef8c10c8df3cb82b33594d035e41179cb7450cb7c10470bfc92a933c1d801fb968049ea8a17d838d16de9973f5dddff9fc"; + sha512 = "31a8b16164e3bab60b62642e1adc55b3d97fc4f20cf28207b1e599275eb5a207f60b173fd642e8c52a48e83894e2ab874cb8424c22c5c712afd7169084b0a2df"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. @@ -59,6 +60,7 @@ rec { changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; description = "A full-featured e-mail client"; homepage = "https://thunderbird.net/"; + mainProgram = "thunderbird"; maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ]; platforms = platforms.unix; badPlatforms = platforms.darwin; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix index cd0a61f6636d..395e9b0f4e3f 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -16,8 +16,6 @@ , qtkeychain , qttools , qtwebkit -, qttranslations -, substituteAll , withI18n ? false }: @@ -39,12 +37,6 @@ in mkDerivation rec { sha256 = "sha256-15G9YjT3qBKbeOKfb/IgXOO+DaJaTULP9NJn/MFYZS8="; }; - patches = (substituteAll { - # See https://github.com/NixOS/nixpkgs/issues/86054 - src = ./fix-qttranslations-path.patch; - inherit qttranslations; - }); - buildInputs = [ akonadi-contacts gpgme diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/trojita/fix-qttranslations-path.patch b/nixpkgs/pkgs/applications/networking/mailreaders/trojita/fix-qttranslations-path.patch deleted file mode 100644 index c4eac3956508..000000000000 --- a/nixpkgs/pkgs/applications/networking/mailreaders/trojita/fix-qttranslations-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/src/Gui/main.cpp w/src/Gui/main.cpp -index 851db4f1..e997f46e 100644 ---- i/src/Gui/main.cpp -+++ w/src/Gui/main.cpp -@@ -52,7 +52,7 @@ int main(int argc, char **argv) - - QTranslator qtTranslator; - qtTranslator.load(QLatin1String("qt_") + QLocale::system().name(), -- QLibraryInfo::location(QLibraryInfo::TranslationsPath)); -+ QLatin1String("@qttranslations@/translations")); - app.installTranslator(&qtTranslator); - - QLatin1String localeSuffix("/locale"); diff --git a/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix b/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix index 768f56c56d5f..fc2537a3e6d5 100644 --- a/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.15.1"; + version = "1.15.2"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "QOdGltz4wns1vq0Nv/O65koMYkLmPAAP4hKp301dAKI="; + sha256 = "TpuET1VLOXwZHdpYg6vXT1MDGpV0IKbSIduf3bkNbeI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/pcloud/default.nix b/nixpkgs/pkgs/applications/networking/pcloud/default.nix index 403d1e0cf341..ff0d808e8f12 100644 --- a/nixpkgs/pkgs/applications/networking/pcloud/default.nix +++ b/nixpkgs/pkgs/applications/networking/pcloud/default.nix @@ -38,12 +38,13 @@ let pname = "pcloud"; - version = "1.12.0"; - code = "XZyc9wVZAbFzyV8ElP71D5v170CvEmVtmrB7"; + version = "1.14.0"; + code = "XZpL8AVZAqfCXz5TebJ2gcvAiHi15pYFKPey"; + # 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-QzBlpF+qtNdSZFv3gU0mQhpVyPTWdGH3c+UHKKGfvKc="; + hash = "sha256-uirj/ASOrJyE728q+SB7zq0O9O58XDNzhokvNyca+2c="; }; appimageContents = appimageTools.extractType2 { diff --git a/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix b/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix index 0fb74488f0bf..c440b9e5a76e 100644 --- a/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix @@ -34,7 +34,7 @@ let }; xrdp = stdenv.mkDerivation rec { - version = "0.9.22.1"; + version = "0.9.23"; pname = "xrdp"; src = fetchFromGitHub { @@ -42,7 +42,7 @@ let repo = "xrdp"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-8gAP4wOqSmar8JhKRt4qRRwh23coIn0Q8Tt9ClHQSt8="; + hash = "sha256-14qsRfLn+26rm+vyMmOtaBEs8mWfSTIsIVseSC2FjXc="; }; nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm perl ]; diff --git a/nixpkgs/pkgs/applications/networking/seahub/default.nix b/nixpkgs/pkgs/applications/networking/seahub/default.nix index 677405c5a295..9bd90ad928c9 100644 --- a/nixpkgs/pkgs/applications/networking/seahub/default.nix +++ b/nixpkgs/pkgs/applications/networking/seahub/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , python3 , makeWrapper , nixosTests @@ -30,6 +31,14 @@ python.pkgs.buildPythonApplication rec { sha256 = "sha256-7Exvm3EShb/1EqwA4wzWB9zCdv0P/ISmjKSoqtOMnqk="; }; + patches = [ + (fetchpatch { + # PIL update fix + url = "https://patch-diff.githubusercontent.com/raw/haiwen/seahub/pull/5570.patch"; + sha256 = "sha256-7V2aRlacJ7Qhdi9k4Bs+t/Emx+EAM/NNCI+K40bMwLA="; + }) + ]; + dontBuild = true; doCheck = false; # disabled because it requires a ccnet environment diff --git a/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix index ce01fec02e18..99839d9c99d2 100644 --- a/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -49,7 +49,7 @@ assert withQt -> qt6 != null; let - version = "4.0.7"; + version = "4.0.8"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -61,7 +61,7 @@ stdenv.mkDerivation { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-CjSf4CfzgiXvmraM3lYBVLSfdDBSuFNIgeatj0OjYSQ="; + hash = "sha256-bNg0yhNb1GRsTclNWWO+Bamm2wOnUjVKU+JftJu+LTo="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix b/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix index c88e86c529fd..ba22a71eebd3 100644 --- a/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.85.1"; + version = "1.86.2"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-WfV7n4AgZoD8rOd6UVBFRqOz9qs1frjSGLUhjxqTG08="; + hash = "sha256-peWcgME+OCa9feNKLtTmZIGCpNxl+EdQfYDXV2BbclI="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-EkB8GjWtOO3Yi0PFFE8G8swwzYmw6D6LDO24vnSrkLs="; + vendorHash = "sha256-sBez/IQzRIGQdOXr4Ikxh+dT8IQxtbxau5vo9VqGJvE="; meta = with lib; { description = "Command-line tool for Storj"; diff --git a/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix b/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix index 326f31c1d2dc..4e9bb7f82068 100644 --- a/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix +++ b/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "upnp-router-control"; - version = "0.3.2"; + version = "0.3.3"; src = fetchzip { url = "https://launchpad.net/upnp-router-control/trunk/${version}/+download/upnp-router-control-${version}.tar.xz"; - hash = "sha256-724xcIYNufmSgrHwmIk3awEAVlta9huNa0o6Z0hdBwQ="; + hash = "sha256-d5NmA1tOQtYPjGXYfH0p9CCnWM+aVTX2KuV36QCDxd8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/vnstat/default.nix b/nixpkgs/pkgs/applications/networking/vnstat/default.nix index 56a609e3de4d..6eb7271d8f30 100644 --- a/nixpkgs/pkgs/applications/networking/vnstat/default.nix +++ b/nixpkgs/pkgs/applications/networking/vnstat/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vnstat"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "vergoh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XBApdQA6E2mx9WPIEiY9z2vxJS3qR0mjBnhbft4LNuQ="; + sha256 = "sha256-IO5B+jyY6izPpam3Qt4Hu8BOGwfO10ER/GFEbsQORK0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/office/PageEdit/default.nix b/nixpkgs/pkgs/applications/office/PageEdit/default.nix index b95eb6cb51e4..0c98eaac4b37 100644 --- a/nixpkgs/pkgs/applications/office/PageEdit/default.nix +++ b/nixpkgs/pkgs/applications/office/PageEdit/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, qtsvg, qtwebengine, qttranslations, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, cmake, qtsvg, qtwebengine, wrapQtAppsHook, qttools }: stdenv.mkDerivation rec { pname = "pageedit"; - version = "1.9.20"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Sigil-Ebook"; repo = pname; rev = version; - hash = "sha256-naoflFANeMwabbdrNL3+ndvEXYT4Yqf+Mo77HcCexHE="; + hash = "sha256-zwOSt1eyvuuqfQ1G2bCB4yj6GgixFRc2FLOgcCrdg3Q="; }; - nativeBuildInputs = [ cmake qttranslations wrapQtAppsHook ]; + nativeBuildInputs = [ cmake wrapQtAppsHook qttools ]; propagatedBuildInputs = [ qtsvg qtwebengine ]; cmakeFlags = [ "-DINSTALL_BUNDLED_DICTS=0" ]; diff --git a/nixpkgs/pkgs/applications/office/appflowy/default.nix b/nixpkgs/pkgs/applications/office/appflowy/default.nix index cb81715b05e3..46d514187d52 100644 --- a/nixpkgs/pkgs/applications/office/appflowy/default.nix +++ b/nixpkgs/pkgs/applications/office/appflowy/default.nix @@ -6,7 +6,6 @@ , copyDesktopItems , makeDesktopItem , gtk3 -, openssl_1_1 , xdg-user-dirs , keybinder3 }: @@ -29,7 +28,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - openssl_1_1 keybinder3 ]; diff --git a/nixpkgs/pkgs/applications/office/morgen/default.nix b/nixpkgs/pkgs/applications/office/morgen/default.nix index 559474b7417a..b64e15e29de3 100644 --- a/nixpkgs/pkgs/applications/office/morgen/default.nix +++ b/nixpkgs/pkgs/applications/office/morgen/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron -, nodePackages, alsa-lib, gtk3, libxshmfence, mesa, nss }: +, asar, alsa-lib, gtk3, libxshmfence, mesa, nss }: stdenv.mkDerivation rec { pname = "morgen"; - version = "2.7.5"; + version = "3.0.0"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-gsH+KJt0d1Xe1JhgXuqot/vrMw9eBzIpCGlGeaeVJ+k="; + sha256 = "sha256-6d1KYUlXv+bHPITt2zs++AtyaAT8SSCG9T8ZsgOKDiw="; }; nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper - nodePackages.asar + asar ]; buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; diff --git a/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix b/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix index 407805a59d16..7d9346c153b7 100644 --- a/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix +++ b/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix @@ -19,13 +19,13 @@ }: let - version = "1.17.0"; + version = "1.17.2"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-Zv+5DMviBGyc24R+qcAlvjko7wH+Gturvw5nzFJlIfk="; + hash = "sha256-/0Ml3NRTghqNykB1RZfqDW9TtENnSRM7wqG7Vn4Kl04="; }; # Use specific package versions required by paperless-ngx @@ -51,7 +51,7 @@ let pname = "paperless-ngx-frontend"; inherit version src; - npmDepsHash = "sha256-J8oUDvcJ0fawTv9L1B9hw8l47UZvOCj16jUF+83W8W8="; + npmDepsHash = "sha256-6EvC9Ka8gl0eRgJtHooB3yQNVGYzuH/WRga4AtzQ0EY="; nativeBuildInputs = [ python3 @@ -248,6 +248,7 @@ python.pkgs.buildPythonApplication rec { pytest-django pytest-env pytest-httpx + pytest-rerunfailures pytest-xdist pytestCheckHook reportlab diff --git a/nixpkgs/pkgs/applications/office/planify/default.nix b/nixpkgs/pkgs/applications/office/planify/default.nix index 59f603a1ae36..e4cca46bbd63 100644 --- a/nixpkgs/pkgs/applications/office/planify/default.nix +++ b/nixpkgs/pkgs/applications/office/planify/default.nix @@ -23,13 +23,16 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.1"; + version = "4.1.1"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; - rev = version; - sha256 = "sha256-H8TPuqKRwbcB+2NTC5ZIK7y6uiYbTT4svtx21FbTzME="; + # The commit is named as "Release 4.1.1", published to Flathub, but not tags + # https://github.com/flathub/io.github.alainm23.planify/commit/2a353ccfcf3379add6778d569f49da37f40accfa + # https://github.com/alainm23/planify/issues/1002 + rev = "adf3629bcacfc9978f6dde5b87eff0278533ab3e"; + hash = "sha256-xqklvSYmqBQ+IQ3lRjMbV4W4vD/rLCln7rBVCbYiBGo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/nixpkgs/pkgs/applications/office/qownnotes/default.nix index e474a5de9924..5141ddc135bf 100644 --- a/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -19,14 +19,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.8.0"; + version = "23.8.1"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-ZvZOUcKtY+V0zhqsOYNi3W8yxRPUdYsp2kSHETRCTLs="; + hash = "sha256-ZS9OzC+pdtYY4xLQ3G31/Sw/xx4qgDjp+nAcPJdl0tk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/vnote/default.nix b/nixpkgs/pkgs/applications/office/vnote/default.nix index ef77a0778250..cd118c3c1d88 100644 --- a/nixpkgs/pkgs/applications/office/vnote/default.nix +++ b/nixpkgs/pkgs/applications/office/vnote/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "vnote"; - version = "3.16.0"; + version = "3.17.0"; src = fetchFromGitHub { owner = "vnotex"; repo = "vnote"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-tcu6y2DqdhFE2nbDkiANDk/Mzidcp8PLi8bWZaI6sH0="; + hash = "sha256-NUVu6tKXrrwAoT4BgxX05mmGSC9yx20lwvXzd4y19Zs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/radio/abracadabra/default.nix b/nixpkgs/pkgs/applications/radio/abracadabra/default.nix index 900d770ba41e..4c71a6a38a43 100644 --- a/nixpkgs/pkgs/applications/radio/abracadabra/default.nix +++ b/nixpkgs/pkgs/applications/radio/abracadabra/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "abracadabra"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - sha256 = "sha256-VFV2eHBvBdKrI4Zt+GCtAOSZt0++hYDWYR7AN42p85I="; + sha256 = "sha256-gpZ6ckV//fhDlpAqmMwL4XNXX7xFmGi58fkOC4oRcDM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/radio/cloudlog/default.nix b/nixpkgs/pkgs/applications/radio/cloudlog/default.nix index 680278bf0e71..0a1216ec8a3b 100644 --- a/nixpkgs/pkgs/applications/radio/cloudlog/default.nix +++ b/nixpkgs/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.4.5"; + version = "2.4.8"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - sha256 = "sha256-L68jk49lGw9LNSqIPlDp2WHoQhn8UBW6VDZwsCtjTQI="; + sha256 = "sha256-LY8kTZooBzwrrruCjwdiNhxjrmIDV4N2HcfhbSSe6o4="; }; postPath = '' diff --git a/nixpkgs/pkgs/applications/radio/flrig/default.nix b/nixpkgs/pkgs/applications/radio/flrig/default.nix index 8eb68db56ae2..c2aa051e70f1 100644 --- a/nixpkgs/pkgs/applications/radio/flrig/default.nix +++ b/nixpkgs/pkgs/applications/radio/flrig/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.02"; + version = "2.0.03"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "sha256-3I9ucz8XtGqY9I0tO9BRt1IQiOkpAkjMy3e7302gGMg="; + sha256 = "sha256-/5hOryoupl7MYWekx2hL3q+2GMXA6rohjvYy2XTkJBI="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/radio/freedv/default.nix b/nixpkgs/pkgs/applications/radio/freedv/default.nix index a8a3d0f87505..836bce7f4630 100644 --- a/nixpkgs/pkgs/applications/radio/freedv/default.nix +++ b/nixpkgs/pkgs/applications/radio/freedv/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.8.12"; + version = "1.9.1"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-5qq7EDCLAiCReFS1V8R2SkFI8CesmQclimcE3USGV/U="; + hash = "sha256-4bkT853MZL6v0/PRh0RJBhqdFBXgWFSPDtIPLgcKR8A="; }; postPatch = lib.optionalString stdenv.isDarwin '' @@ -69,7 +69,8 @@ stdenv.mkDerivation rec { "-DUSE_INTERNAL_CODEC2:BOOL=FALSE" "-DUSE_STATIC_DEPS:BOOL=FALSE" "-DUNITTEST=ON" - ] ++ lib.optionals pulseSupport [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ]; + "-DUSE_PULSEAUDIO:BOOL=${if pulseSupport then "TRUE" else "FALSE"}" + ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-DAPPLE_OLD_XCODE" diff --git a/nixpkgs/pkgs/applications/radio/rscw/default.nix b/nixpkgs/pkgs/applications/radio/rscw/default.nix index 3c42b3b81330..7fe638df61d0 100644 --- a/nixpkgs/pkgs/applications/radio/rscw/default.nix +++ b/nixpkgs/pkgs/applications/radio/rscw/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1hxwxmqc5jinr14ya1idigqigc8qhy1vimzcwy2vmwdjay2sqik2"; }; - setSourceRoot = "sourceRoot=`pwd`"; + sourceRoot = "."; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 fftw ]; diff --git a/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix b/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix index c4721c490cce..ce29c5172a29 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.6.4"; + version = "3.6.6"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-9MJqJVgSZVBzlLv08Z6i8yO4YV1exsD5+yLJjqIGD20="; + sha256 = "sha256-Z4PatRvtIJBoeRDJJYkkBTOB/R+R7nGdDT38bfAShJQ="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index 00b36de28089..e2e1cda4c259 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -11,13 +11,13 @@ , qtpositioning , qtmultimedia , qtserialport -, qttranslations , qtwayland , qtwebengine , calcmysky , qxlsx , indilib , libnova +, qttools }: stdenv.mkDerivation rec { @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { perl wrapGAppsHook wrapQtAppsHook + qttools ]; buildInputs = [ @@ -60,7 +61,6 @@ stdenv.mkDerivation rec { qtpositioning qtmultimedia qtserialport - qttranslations qtwebengine calcmysky qxlsx diff --git a/nixpkgs/pkgs/applications/science/biology/iqtree/default.nix b/nixpkgs/pkgs/applications/science/biology/iqtree/default.nix index abf9cfba45fd..37a8a58a92e1 100644 --- a/nixpkgs/pkgs/applications/science/biology/iqtree/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/iqtree/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "iqtree"; - version = "2.2.2.6"; + version = "2.2.2.7"; src = fetchFromGitHub { owner = "iqtree"; repo = "iqtree2"; rev = "v${version}"; - hash = "sha256-dce7JOPZaosRP99/xRfz88EwXR9nYXK6Z4t2i5Uje1w="; + hash = "sha256-XyjVo5TYMoB+ZOAGc4ivYqFGnEO1M7mhxXrG45TP44Y="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix b/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix index 38333cbc9988..e1722a7086d8 100644 --- a/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "sambamba"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "biod"; repo = "sambamba"; rev = "v${version}"; - sha256 = "sha256-HwAzsbT71Q35Io6H7Hzs4RTatpRpdHqV0cwPYAlsf6c="; + sha256 = "sha256-3O9bHGpMuCgdR2Wm7Dv1VUjMT1QTn8K1hdwgjvwhFDw="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/science/biology/sratoolkit/default.nix b/nixpkgs/pkgs/applications/science/biology/sratoolkit/default.nix index 8a1bb5376eaf..a36157ed5d16 100644 --- a/nixpkgs/pkgs/applications/science/biology/sratoolkit/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/sratoolkit/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { stdenv.cc.cc.lib ]; - sourceRoot = "./sratoolkit.${version}-ubuntu64/bin"; + sourceRoot = "sratoolkit.${version}-ubuntu64/bin"; installPhase = '' find -L . -executable -type f -! -name "*remote-fuser*" -exec install -m755 -D {} $out/bin/{} \; diff --git a/nixpkgs/pkgs/applications/science/chemistry/cp2k/default.nix b/nixpkgs/pkgs/applications/science/chemistry/cp2k/default.nix index 5defaafa3cd0..29b983cde536 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/cp2k/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, gfortran, blas, lapack +{ lib, stdenv, fetchFromGitHub, mpiCheckPhaseHook, python3, gfortran, blas, lapack , fftw, libint, libvori, libxc, mpi, gsl, scalapack, openssh, makeWrapper , libxsmm, spglib, which, pkg-config, plumed, zlib , enableElpa ? false @@ -88,14 +88,18 @@ in stdenv.mkDerivation rec { EOF ''; + nativeCheckInputs = [ + mpiCheckPhaseHook + openssh + ]; + checkPhase = '' - export OMP_NUM_THREADS=1 + runHook preCheck - export HYDRA_IFACE=lo # Fix to make mpich run in a sandbox - export OMPI_MCA_rmaps_base_oversubscribe=1 export CP2K_DATA_DIR=data - mpirun -np 2 exe/${arch}/libcp2k_unittest.${cp2kVersion} + + runHook postCheck ''; installPhase = '' diff --git a/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix index e4ffb94eeba7..1b77cef6b809 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "16.1.33"; + version = "16.1.35"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - hash = "sha256-vOFGmLsCQNYRBMuDRVrdjWE6/MxY7IucB1OpV4cdZrs="; + hash = "sha256-r1ydAwAdXl5RRj64W0j8L7XbgnC7VOYjFNE019BcbpY="; }; patchPhase = '' diff --git a/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix b/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix index 82daf5f85e74..2a17be9f8a92 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix @@ -3,6 +3,7 @@ , pkgs , fetchFromGitHub , fetchurl +, mpiCheckPhaseHook , which , openssh , gcc @@ -190,16 +191,15 @@ stdenv.mkDerivation rec { doCheck = false; doInstallCheck = true; + nativeCheckInputs = [ mpiCheckPhaseHook ]; installCheckPhase = '' - export OMP_NUM_THREADS=1 - - # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo - export OMPI_MCA_rmaps_base_oversubscribe=1 + runHook preInstallCheck # run a simple water test mpirun -np 2 $out/bin/nwchem $out/share/nwchem/QA/tests/h2o/h2o.nw > h2o.out grep "Total SCF energy" h2o.out | grep 76.010538 + + runHook postInstallCheck ''; passthru = { inherit mpi; }; diff --git a/nixpkgs/pkgs/applications/science/electronics/dataexplorer/default.nix b/nixpkgs/pkgs/applications/science/electronics/dataexplorer/default.nix index 596978fc9280..128a5f62eeaa 100644 --- a/nixpkgs/pkgs/applications/science/electronics/dataexplorer/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/dataexplorer/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "dataexplorer"; - version = "3.7.9"; + version = "3.8.0"; src = fetchurl { url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz"; - sha256 = "sha256-CdIWAde7mytXP9U1PfI9d/rFK7Agy5biIq5tMTW9RD4="; + sha256 = "sha256-ZluT/jCjcOrlh2nqe0j56shmtGqfm11BCnsp6mWDXkQ="; }; nativeBuildInputs = [ ant makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix b/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix index 338823bbf386..169130b41010 100644 --- a/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix @@ -13,13 +13,16 @@ let packageOverrides = self: super: { shapely = super.shapely.overridePythonAttrs (old: rec { version = "1.8.4"; + src = fetchPypi { pname = "Shapely"; inherit version; hash = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; }; + # Environment variable used in shapely/_buildcfg.py GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; + patches = [ # Patch to search form GOES .so/.dylib files in a Nix-aware way (substituteAll { @@ -28,6 +31,11 @@ let libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; }) ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'setuptools<64' 'setuptools' + ''; }); }; }; diff --git a/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 5ee77fce963a..2b74a7de24e5 100644 --- a/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,75 +1,71 @@ { lib , stdenv +, boost +, cmake , fetchFromGitHub , fetchpatch -, cmake +, graphviz +, igraph +, llvmPackages , ninja , pkg-config , python3Packages -, boost -, rapidjson , qtbase , qtsvg -, igraph +, quazip +, rapidjson , spdlog +, suitesparse , wrapQtAppsHook -, graphviz -, llvmPackages , z3 -, fmt_8 -, suitesparse }: let - igraph' = igraph.overrideAttrs (old: rec { + # hal doesn't work with igraph 0.10.x yet https://github.com/emsec/hal/pull/487 + igraph' = igraph.overrideAttrs (final: prev: { version = "0.9.10"; src = fetchFromGitHub { owner = "igraph"; - repo = "igraph"; - rev = version; + repo = final.pname; + rev = final.version; hash = "sha256-prDadHsNhDRkNp1i0niKIYxE0g85Zs0ngvUy6uK8evk="; }; - postPatch = old.postPatch + lib.optionalString stdenv.isAarch64 '' + patches = (prev.patches or []) ++ [ + # needed by clang + (fetchpatch { + name = "libxml2-2.11-compat.patch"; + url = "https://github.com/igraph/igraph/commit/5ad464be5ae2f6ebb69c97cb0140c800cc8d97d6.patch"; + hash = "sha256-adU5SctH+H54UaAmr5BZInytD3wjUzLtQbCwngAWs4o="; + }) + ]; + postPatch = prev.postPatch + lib.optionalString stdenv.isAarch64 '' # https://github.com/igraph/igraph/issues/1694 substituteInPlace tests/CMakeLists.txt \ --replace "igraph_scg_grouping3" "" \ --replace "igraph_scg_semiprojectors2" "" ''; - buildInputs = old.buildInputs ++ [ suitesparse ]; - cmakeFlags = old.cmakeFlags ++ [ "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" ]; + # general options brought back from the old 0.9.x package + buildInputs = prev.buildInputs ++ [ suitesparse ]; + cmakeFlags = prev.cmakeFlags ++ [ "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" ]; }); - # no stable hal release yet with recent spdlog/fmt support, remove - # once 4.0.0 is released - see https://github.com/emsec/hal/issues/452 - spdlog' = spdlog.override { - fmt_9 = fmt_8.overrideAttrs (_: rec { - version = "8.0.1"; - src = fetchFromGitHub { - owner = "fmtlib"; - repo = "fmt"; - rev = version; - sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw"; - }; - }); - }; + in stdenv.mkDerivation rec { - version = "3.3.0"; + version = "4.2.0"; pname = "hal-hardware-analyzer"; src = fetchFromGitHub { owner = "emsec"; repo = "hal"; rev = "v${version}"; - sha256 = "sha256-uNpELHhSAVRJL/4iypvnl3nX45SqB419r37lthd2WmQ="; + sha256 = "sha256-Yl86AClE3vWygqj1omCOXX8koJK2SjTkMZFReRThez0="; }; patches = [ (fetchpatch { - # Fix build with python 3.10 - # https://github.com/emsec/hal/pull/463 - name = "hal-fix-python-3.10.patch"; - url = "https://github.com/emsec/hal/commit/f695f55cb2209676ef76366185b7c419417fbbc9.patch"; - sha256 = "sha256-HsCdG3tPllUsLw6kQtGaaEGkEHqZPSC2v9k6ycO2I/8="; - includes = [ "plugins/gui/src/python/python_context.cpp" ]; + name = "cmake-add-no-vendored-options.patch"; + # https://github.com/emsec/hal/pull/529 + url = "https://github.com/emsec/hal/commit/37d5c1a0eacb25de57cc552c13e74f559a5aa6e8.patch"; + hash = "sha256-a30VjDt4roJOTntisixqnH17wwCgWc4VWeh1+RgqFuY="; }) ]; @@ -77,14 +73,30 @@ in stdenv.mkDerivation rec { # copies them in full to the output, bloating the package postPatch = '' shopt -s extglob - rm -rf deps/!(sanitizers-cmake)/* + rm -rf deps/!(abc|sanitizers-cmake|subprocess)/* shopt -u extglob ''; - nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ qtbase qtsvg boost rapidjson igraph' spdlog' graphviz wrapQtAppsHook z3 ] - ++ (with python3Packages; [ python pybind11 ]) - ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; + nativeBuildInputs = [ + cmake + ninja + pkg-config + wrapQtAppsHook + ]; + buildInputs = [ + qtbase + qtsvg + boost + rapidjson + igraph' + spdlog + graphviz + z3 + quazip + ] + ++ (with python3Packages; [ python pybind11 ]) + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp + ; cmakeFlags = with lib.versions; [ "-DHAL_VERSION_RETURN=${version}" @@ -96,12 +108,23 @@ in stdenv.mkDerivation rec { "-DHAL_VERSION_DIRTY=false" "-DHAL_VERSION_BROKEN=false" "-DENABLE_INSTALL_LDCONFIG=off" + "-DUSE_VENDORED_PYBIND11=off" + "-DUSE_VENDORED_SPDLOG=off" + "-DUSE_VENDORED_QUAZIP=off" + "-DUSE_VENDORED_IGRAPH=off" "-DBUILD_ALL_PLUGINS=on" ]; # needed for macos build - this is why we use wrapQtAppsHook instead of # the qt mkDerivation - the latter forcibly overrides this. cmakeBuildType = "MinSizeRel"; + # some plugins depend on other plugins and need to be able to load them + postFixup = lib.optionalString stdenv.isLinux '' + find $out/lib/hal_plugins -name '*.so*' | while read -r f ; do + patchelf --set-rpath "$(patchelf --print-rpath "$f"):$out/lib/hal_plugins" "$f" + done + ''; + meta = with lib; { description = "A comprehensive reverse engineering and manipulation framework for gate-level netlists"; homepage = "https://github.com/emsec/hal"; diff --git a/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix b/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix index 15157b11f29d..dde8f05d6239 100644 --- a/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-7Kw9irZltNE8VRnIvVX786/u0QQtmRhV8pzpba0h1JY="; + hash = "sha256-sAr51+8hFnpIq0jDd8dB5uiy00N09ufkFgWkFtW7ErU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/electronics/qucs-s/default.nix b/nixpkgs/pkgs/applications/science/electronics/qucs-s/default.nix index 9da94aa609be..0ce67ec4dbb1 100644 --- a/nixpkgs/pkgs/applications/science/electronics/qucs-s/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/qucs-s/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "qucs-s"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ra3xdh"; repo = "qucs_s"; rev = version; - sha256 = "sha256-cQ9UNCTwRW61dOQYJX0mPNtCTk0qXKx8VQ6BIXl6Fa8="; + sha256 = "sha256-9/1sgxFqn9d9zlwrzjQosFO3m+2lC83qVcCtzfqY5XY="; }; nativeBuildInputs = [ flex bison wrapQtAppsHook cmake ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://ra3xdh.github.io/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ mazurel ]; + maintainers = with maintainers; [ mazurel kashw2 ]; platforms = with platforms; linux; }; } diff --git a/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix b/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix index 4709065e45bd..aee1d25a04cc 100644 --- a/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { srcs = [ xyce_src regression_src ]; - sourceRoot = "./${xyce_src.name}"; + sourceRoot = xyce_src.name; preConfigure = "./bootstrap"; diff --git a/nixpkgs/pkgs/applications/science/logic/egglog/default.nix b/nixpkgs/pkgs/applications/science/logic/egglog/default.nix index c74594df28fd..c2e46c6801b2 100644 --- a/nixpkgs/pkgs/applications/science/logic/egglog/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/egglog/default.nix @@ -5,13 +5,13 @@ rustPlatform.buildRustPackage { pname = "egglog"; - version = "unstable-2023-08-19"; + version = "unstable-2023-08-23"; src = fetchFromGitHub { owner = "egraphs-good"; repo = "egglog"; - rev = "a4768b1751b72292b0e79e6e442d54ab270748fb"; - hash = "sha256-WTdMhtdPvBtS6WAS3S4dui/8ospJ7nkeRhLce2zY8KE="; + rev = "9e530381961a59524f2bbacd89973575b4e036d8"; + hash = "sha256-xzfa1Z7ibSO4D5zpprC7heaswA7Be5Qmb81XoDwANqw="; }; cargoLock = { diff --git a/nixpkgs/pkgs/applications/science/logic/ekrhyper/default.nix b/nixpkgs/pkgs/applications/science/logic/ekrhyper/default.nix index 187cbc9a92ae..4a5124b23582 100644 --- a/nixpkgs/pkgs/applications/science/logic/ekrhyper/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/ekrhyper/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ ocaml perl ]; - setSourceRoot = "export sourceRoot=$(echo */ekrh/src/)"; + setSourceRoot = "export sourceRoot=$(echo */ekrh/src)"; preInstall = "export INSTALLDIR=$out"; postInstall = ''for i in "$out/casc"/*; do ln -s "$i" "$out/bin/ekrh-casc-$(basename $i)"; done ''; diff --git a/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix b/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix index d5d6512c734a..09ef2d7d4637 100644 --- a/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -4,12 +4,12 @@ }: let - version = "1.6.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "tamarin-prover"; repo = "tamarin-prover"; rev = version; - sha256 = "sha256:0cz1v7k4d0im749ag632nc34n91b51b0pq4z05rzw1p59a5lza92"; + sha256 = "sha256-ujnaUdbjqajmkphOS4Fs4QBCRGX4JZkQ2p1X2jripww="; }; # tamarin has its own dependencies, but they're kept inside the repo, @@ -51,6 +51,7 @@ let doHaddock = false; # broken libraryHaskellDepends = (with haskellPackages; [ aeson aeson-pretty parallel uniplate + regex-pcre-builtin regex-posix split ]) ++ [ tamarin-prover-utils tamarin-prover-term ]; }); @@ -62,31 +63,37 @@ let ]) ++ [ tamarin-prover-theory ]; }); + tamarin-prover-accountability = mkDerivation (common "tamarin-prover-accountability" (src + "/lib/accountability") // { + postPatch = "cp --remove-destination ${src}/LICENSE ."; + doHaddock = false; # broken + libraryHaskellDepends = (with haskellPackages; [ + raw-strings-qq + ]) ++ [ + tamarin-prover-utils + tamarin-prover-term + tamarin-prover-theory + ]; + }); + + tamarin-prover-export = mkDerivation (common "tamarin-prover-export" (src + "/lib/export") // { + postPatch = "cp --remove-destination ${src}/LICENSE ."; + doHaddock = false; # broken + libraryHaskellDepends = (with haskellPackages; [ + HStringTemplate + ]) ++ [ + tamarin-prover-utils + tamarin-prover-term + tamarin-prover-theory + tamarin-prover-sapic + ]; + }); + in mkDerivation (common "tamarin-prover" src // { isLibrary = false; isExecutable = true; - patches = [ - # Backport unreleased patch allowing maude 3.2.1 - (fetchpatch { - name = "tamarin-prover-allow-maude-3.2.1.patch"; - url = "https://github.com/tamarin-prover/tamarin-prover/commit/bfcf56909479e154a203f0eeefa767f4d91b600d.patch"; - sha256 = "1zjqzyxwnfp7z3h3li8jrxn9732dx6lyq9q3w2dsphmxbzrs64dg"; - }) - # Backport unreleased patch allowing maude 3.2.2 - (fetchpatch { - name = "tamarin-prover-allow-maude-3.2.2.patch"; - url = "https://github.com/tamarin-prover/tamarin-prover/commit/df1aa9fc4fcc72b6cf0bed0f71844efe3d8ad238.patch"; - sha256 = "1bkwvyyz5d660jjh08z8wq9c3l40s0rxd2nsbn20xnl2nynyvqpy"; - }) - # Backport proposed patch allowing maude 3.3 and 3.3.1 - (fetchpatch { - name = "tamarin-prover-allow-maude-3.3.patch"; - url = "https://github.com/tamarin-prover/tamarin-prover/pull/544/commits/d0313b1a1bac7c92130773f7ccdd890f8aec286d.patch"; - sha256 = "1jhlz8vp9a3aahyhj24yjcv4l1389y9kg878yfnq0rkkgvk0m681"; - }) - ]; + patches = [ ]; # strip out unneeded deps manually doHaddock = false; @@ -118,6 +125,8 @@ mkDerivation (common "tamarin-prover" src // { resourcet shakespeare threads wai warp yesod-core yesod-static ]) ++ [ tamarin-prover-utils tamarin-prover-sapic + tamarin-prover-accountability + tamarin-prover-export tamarin-prover-term tamarin-prover-theory ]; diff --git a/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix b/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix index 970f5517c21f..405561510be0 100644 --- a/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, curl, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-Fbi+vZEyXhUZQjWUX01IXd6G1cthfiuztdbisNQ/VZU="; + sha256 = "sha256-GYy3Ot2vjXpCp89Rib3Ua0XeVGOOTejKcaqNZvPmxm0="; }; hardeningDisable = [ "format" ]; nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook ]; - buildInputs = [ libqalculate gtk3 ]; + buildInputs = [ libqalculate gtk3 curl ]; enableParallelBuilding = true; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix b/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix index abe65e413690..be9dd27695f7 100644 --- a/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-qt"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${version}"; - hash = "sha256-fMchJgxuOO2e7cOHLako26c9gsWvQY2MTRVD3JWGSAU="; + hash = "sha256-7VlaoiY+HgHCMZCegUdy2wpgfx3fKaViMtkdNRleHaA="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/applications/science/misc/golly/default.nix b/nixpkgs/pkgs/applications/science/misc/golly/default.nix index 7d91c76579f9..52b05cbb7e9b 100644 --- a/nixpkgs/pkgs/applications/science/misc/golly/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/golly/default.nix @@ -1,10 +1,10 @@ {lib, stdenv, fetchurl, wxGTK, perl, python3, zlib, libGLU, libGL, libX11, SDL2}: stdenv.mkDerivation rec { pname = "golly"; - version = "4.1"; + version = "4.2"; src = fetchurl { - sha256 = "1j30dpzy6wh8fv1j2750hzc6wb0nhk83knl9fapccxgxw9n5lrbc"; + hash = "sha256-VpEoqSPaZMP/AGIYZAbk5R/f8Crqvx8pKYN1O9Bl6V0="; url="mirror://sourceforge/project/golly/golly/golly-${version}/golly-${version}-src.tar.gz"; }; @@ -13,13 +13,10 @@ stdenv.mkDerivation rec { ]; setSourceRoot = '' - sourceRoot=$(echo */gui-wx/) + sourceRoot=$(echo */gui-wx) ''; postPatch = '' - sed -e '/gollydir =/agollydir += "/../share/golly/";' -i wxgolly.cpp - grep share/golly wxgolly.cpp - sed -e 's@PYTHON_SHLIB@${python3}/lib/libpython3.so@' -i wxprefs.cpp sed -e 's@PERL_SHLIB@'"$(find "${perl}/lib/" -name libperl.so)"'@' -i wxprefs.cpp ! grep _SHLIB *.cpp @@ -31,6 +28,7 @@ stdenv.mkDerivation rec { makeFlags=[ "-f" "makefile-gtk" "ENABLE_SOUND=1" "ENABLE_PERL=1" + "GOLLYDIR=${placeholder "out"}/share/golly" ]; installPhase = '' diff --git a/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix b/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix index 43b04ba1eedd..b3337b7f55c8 100644 --- a/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.62"; + version = "1.8.66"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XypOQNETmxg9DYcuCGkXH9/LwCq+pR23KbNfP0mfs3I="; + hash = "sha256-tIwXiDHEmFHF5Jdv25hPkzEqAdig+i5h4fW6SGIrZDM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/science/robotics/mujoco/default.nix b/nixpkgs/pkgs/applications/science/robotics/mujoco/default.nix index 4af3d6899fa9..c4f84e158399 100644 --- a/nixpkgs/pkgs/applications/science/robotics/mujoco/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/mujoco/default.nix @@ -9,18 +9,18 @@ }: let - # See https://github.com/deepmind/mujoco/blob/573d331b69845c5d651b70f5d1b0f3a0d2a3a233/cmake/MujocoDependencies.cmake#L21-L59 + # See https://github.com/deepmind/mujoco/blob/c9246e1f5006379d599e0bcddf159a8616d31441/cmake/MujocoDependencies.cmake#L17-L55 abseil-cpp = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = "8c0b94e793a66495e0b1f34a5eb26bd7dc672db0"; - hash = "sha256-Od1FZOOWEXVQsnZBwGjDIExi6LdYtomyL0STR44SsG8="; + rev = "c2435f8342c2d0ed8101cb43adfd605fdc52dca2"; + hash = "sha256-PLoI7ix+reUqkZ947kWzls8lujYqWXk9A9a55UcfahI="; }; benchmark = fetchFromGitHub { owner = "google"; repo = "benchmark"; - rev = "d845b7b3a27d54ad96280a29d61fa8988d4fddcf"; - hash = "sha256-XTnTM1k6xMGXUws/fKdJUbpCPcc4U0IelL6BPEEnpEQ="; + rev = "2dd015dfef425c866d9a43f2c67d8b52d709acb6"; + hash = "sha256-pUW9YVaujs/y00/SiPqDgK4wvVsaM7QUp/65k0t7Yr0="; }; ccd = fetchFromGitHub { owner = "danfis"; @@ -31,14 +31,14 @@ let eigen3 = fetchFromGitLab { owner = "libeigen"; repo = "eigen"; - rev = "3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e"; - hash = "sha256-k71DoEsx8JpC9AlQ0cCRI0fWMIWFBFL/Yscx+2iBtNM="; + rev = "211c5dfc6741a5570ad007983c113ef4d144f9f3"; + hash = "sha256-oT/h8QkL0vwaflh46Zsnu9Db1b65AP6p//nAga8M5jI="; }; googletest = fetchFromGitHub { owner = "google"; repo = "googletest"; - rev = "58d77fa8070e8cec2dc1ed015d66b454c8d78850"; - hash = "sha256-W+OxRTVtemt2esw4P7IyGWXOonUN5ZuscjvzqkYvZbM="; + rev = "b796f7d44681514f58a683a3a71ff17c94edb0c1"; + hash = "sha256-LVLEn+e7c8013pwiLzJiiIObyrlbBHYaioO/SWbItPQ="; }; lodepng = fetchFromGitHub { owner = "lvandeve"; @@ -49,8 +49,8 @@ let qhull = fetchFromGitHub { owner = "qhull"; repo = "qhull"; - rev = "3df027b91202cf179f3fba3c46eebe65bbac3790"; - hash = "sha256-aHO5n9Y35C7/zb3surfMyjyMjo109DoZnkozhiAKpYQ="; + rev = "0c8fc90d2037588024d9964515c1e684f6007ecc"; + hash = "sha256-Ptzxad3ewmKJbbcmrBT+os4b4SR976zlCG9F0nq0x94="; }; tinyobjloader = fetchFromGitHub { owner = "tinyobjloader"; @@ -61,12 +61,12 @@ let tinyxml2 = fetchFromGitHub { owner = "leethomason"; repo = "tinyxml2"; - rev = "1dee28e51f9175a31955b9791c74c430fe13dc82"; - hash = "sha256-AQQOctXi7sWIH/VOeSUClX6hlm1raEQUOp+VoPjLM14="; + rev = "9a89766acc42ddfa9e7133c7d81a5bda108a0ade"; + hash = "sha256-YGAe4+Ttv/xeou+9FoJjmQCKgzupTYdDhd+gzvtz/88="; }; - # See https://github.com/deepmind/mujoco/blob/573d331b69845c5d651b70f5d1b0f3a0d2a3a233/simulate/cmake/SimulateDependencies.cmake#L32-L35 - glfw = fetchFromGitHub { + # See https://github.com/deepmind/mujoco/blob/c9246e1f5006379d599e0bcddf159a8616d31441/simulate/cmake/SimulateDependencies.cmake#L32-L35 + glfw3 = fetchFromGitHub { owner = "glfw"; repo = "glfw"; rev = "7482de6071d21db77a7236155da44c172a7f6c9e"; @@ -75,13 +75,13 @@ let in stdenv.mkDerivation rec { pname = "mujoco"; - version = "2.3.0"; + version = "2.3.7"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; rev = version; - hash = "sha256-FxMaXl7yfUAyY6LE1sxaw226dBtp1DOCWNnROp0WX2I="; + hash = "sha256-LgpA+iPGqciHuWBSD6/7yvZ7p+vo48ZYKjjrDZSnAwE="; }; patches = [ ./dependencies.patch ]; @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { ln -s ${benchmark} build/_deps/benchmark-src ln -s ${ccd} build/_deps/ccd-src ln -s ${eigen3} build/_deps/eigen3-src - ln -s ${glfw} build/_deps/glfw-src + ln -s ${glfw3} build/_deps/glfw3-src ln -s ${googletest} build/_deps/googletest-src ln -s ${lodepng} build/_deps/lodepng-src ln -s ${qhull} build/_deps/qhull-src diff --git a/nixpkgs/pkgs/applications/science/robotics/mujoco/dependencies.patch b/nixpkgs/pkgs/applications/science/robotics/mujoco/dependencies.patch index 5ddbaaab5329..f7dcc06a9e05 100644 --- a/nixpkgs/pkgs/applications/science/robotics/mujoco/dependencies.patch +++ b/nixpkgs/pkgs/applications/science/robotics/mujoco/dependencies.patch @@ -1,8 +1,8 @@ diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake -index 99e4a7a..cf9a901 100644 +index 3e322ea..980aace 100644 --- a/cmake/MujocoDependencies.cmake +++ b/cmake/MujocoDependencies.cmake -@@ -82,8 +82,6 @@ set(BUILD_SHARED_LIBS +@@ -87,8 +87,6 @@ set(BUILD_SHARED_LIBS if(NOT TARGET lodepng) FetchContent_Declare( lodepng @@ -11,7 +11,7 @@ index 99e4a7a..cf9a901 100644 ) FetchContent_GetProperties(lodepng) -@@ -111,10 +109,6 @@ findorfetch( +@@ -127,10 +125,6 @@ findorfetch( qhull LIBRARY_NAME qhull @@ -21,8 +21,8 @@ index 99e4a7a..cf9a901 100644 - ${MUJOCO_DEP_VERSION_qhull} TARGETS qhull - # TODO(fraromano) Remove when https://github.com/qhull/qhull/pull/112 is merged. -@@ -146,10 +140,6 @@ findorfetch( + EXCLUDE_FROM_ALL +@@ -151,10 +145,6 @@ findorfetch( tinyxml2 LIBRARY_NAME tinyxml2 @@ -33,7 +33,7 @@ index 99e4a7a..cf9a901 100644 TARGETS tinyxml2 EXCLUDE_FROM_ALL -@@ -164,10 +154,6 @@ findorfetch( +@@ -169,10 +159,6 @@ findorfetch( tinyobjloader LIBRARY_NAME tinyobjloader @@ -44,7 +44,7 @@ index 99e4a7a..cf9a901 100644 TARGETS tinyobjloader EXCLUDE_FROM_ALL -@@ -182,10 +168,6 @@ findorfetch( +@@ -187,10 +173,6 @@ findorfetch( ccd LIBRARY_NAME ccd @@ -55,7 +55,7 @@ index 99e4a7a..cf9a901 100644 TARGETS ccd EXCLUDE_FROM_ALL -@@ -222,10 +204,6 @@ if(MUJOCO_BUILD_TESTS) +@@ -227,10 +209,6 @@ if(MUJOCO_BUILD_TESTS) absl LIBRARY_NAME abseil-cpp @@ -66,7 +66,7 @@ index 99e4a7a..cf9a901 100644 TARGETS absl::core_headers EXCLUDE_FROM_ALL -@@ -249,10 +227,6 @@ if(MUJOCO_BUILD_TESTS) +@@ -254,10 +232,6 @@ if(MUJOCO_BUILD_TESTS) GTest LIBRARY_NAME googletest @@ -77,7 +77,7 @@ index 99e4a7a..cf9a901 100644 TARGETS gtest gmock -@@ -283,10 +257,6 @@ if(MUJOCO_BUILD_TESTS) +@@ -288,10 +262,6 @@ if(MUJOCO_BUILD_TESTS) benchmark LIBRARY_NAME benchmark @@ -88,7 +88,7 @@ index 99e4a7a..cf9a901 100644 TARGETS benchmark::benchmark benchmark::benchmark_main -@@ -303,8 +273,6 @@ if(MUJOCO_TEST_PYTHON_UTIL) +@@ -308,8 +278,6 @@ if(MUJOCO_TEST_PYTHON_UTIL) FetchContent_Declare( Eigen3 @@ -98,17 +98,17 @@ index 99e4a7a..cf9a901 100644 FetchContent_GetProperties(Eigen3) diff --git a/simulate/cmake/SimulateDependencies.cmake b/simulate/cmake/SimulateDependencies.cmake -index 6616d6f..5d5a889 100644 +index fa539c2..5985d5a 100644 --- a/simulate/cmake/SimulateDependencies.cmake +++ b/simulate/cmake/SimulateDependencies.cmake @@ -81,10 +81,6 @@ findorfetch( - glfw + glfw3 LIBRARY_NAME - glfw + glfw3 - GIT_REPO - https://github.com/glfw/glfw.git - GIT_TAG -- ${MUJOCO_DEP_VERSION_glfw} +- ${MUJOCO_DEP_VERSION_glfw3} TARGETS glfw EXCLUDE_FROM_ALL diff --git a/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix index be1ccdc354ea..ffa1780b5e7c 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -132,6 +132,7 @@ rustPlatform.buildRustPackage rec { description = "A cross-platform, GPU-accelerated terminal emulator"; homepage = "https://github.com/alacritty/alacritty"; license = licenses.asl20; + mainProgram = "alacritty"; maintainers = with maintainers; [ Br1ght0ne mic92 ]; platforms = platforms.unix; changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md"; diff --git a/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix index 9b4a1be708f6..93f8aedfb6cd 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix @@ -102,9 +102,6 @@ buildPythonApplication rec { hardeningDisable = [ # causes redefinition of _FORTIFY_SOURCE "fortify3" - ] ++ lib.optionals stdenv.cc.isClang [ - # Causes build failure due to warning - "strictoverflow" ]; CGO_ENABLED = 0; @@ -239,6 +236,7 @@ buildPythonApplication rec { license = licenses.gpl3Only; changelog = "https://sw.kovidgoyal.net/kitty/changelog/"; platforms = platforms.darwin ++ platforms.linux; + mainProgram = "kitty"; maintainers = with maintainers; [ tex rvolosatovs Luflosi adamcstephens ]; }; } diff --git a/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix index 3029adbd817b..0de46add8314 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix @@ -43,16 +43,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.16"; + version = "0.0.18"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-jyfobmwDCsvhpKcAD0ivxfRENaTVjjauRBMDNPgvjVY="; + hash = "sha256-/zqJQQLpwYil4BBZJDMMC8JRAEG0vGeG0dCDzLzPk/o="; }; - cargoHash = "sha256-efMw07KH8Nic76MWTyf16Gg/8PyM9gZKSNs5cuIKBJQ="; + cargoHash = "sha256-jev4fMwCygVzvrkI1nSE5tx59nGqNKQUHCNHvkr9R90="; nativeBuildInputs = [ autoPatchelfHook diff --git a/nixpkgs/pkgs/applications/version-management/blackbox/default.nix b/nixpkgs/pkgs/applications/version-management/blackbox/default.nix index 2b4b09fd2500..bee8da850b70 100644 --- a/nixpkgs/pkgs/applications/version-management/blackbox/default.nix +++ b/nixpkgs/pkgs/applications/version-management/blackbox/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "blackbox"; - version = "2.0.0"; + version = "1.20220610"; src = fetchFromGitHub { owner = "stackexchange"; repo = pname; rev = "v${version}"; - sha256 = "1plwdmzds6dq2rlp84dgiashrfg0kg4yijhnxaapz2q4d1vvx8lq"; + hash = "sha256-g0oNV7Nj7ZMmsVQFVTDwbKtF4a/Fb3WDB+NRx9IGSWA="; }; buildInputs = [ gnupg ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { --replace "PREFIX?=/usr/local" "PREFIX=$out" substituteInPlace tools/confidence_test.sh \ - --replace 'PATH="''${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:/usr/pkg/bin:/usr/pkg/gnu/bin:''${blackbox_home}"' \ + --replace 'PATH="''${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:/usr/pkg/bin:/usr/pkg/gnu/bin:/usr/local/MacGPG2/bin:/opt/homebrew/bin:''${blackbox_home}"' \ "PATH=/build/source/bin/:$PATH" ''; diff --git a/nixpkgs/pkgs/applications/version-management/commitizen/default.nix b/nixpkgs/pkgs/applications/version-management/commitizen/default.nix index 7cdcc5bf812b..1db75b0d2d4e 100644 --- a/nixpkgs/pkgs/applications/version-management/commitizen/default.nix +++ b/nixpkgs/pkgs/applications/version-management/commitizen/default.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "commitizen"; - version = "3.5.2"; + version = "3.7.0"; format = "pyproject"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4m3NCnGUX9lHCk6czwzxXLqf8GLi2u2A/crBZYTyplA="; + hash = "sha256-KfPIGQ4kIjV/Vuza5wdzp0R62LUluJQ5tY6I8BPFmGk="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix b/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix index e853d4134dd9..d6727d327ce5 100644 --- a/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "cvs-fast-export"; - version = "1.60"; + version = "1.61"; src = fetchurl { url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz"; - sha256 = "sha256-QLMBYX2n27rcaa9Uisrr2VItgtTPv5ZWbOc5tK1VF8w="; + sha256 = "sha256-4iH8VKxVliVZKwZ40rGMb3fH1nxTBdMT5IcBzdp1mjw="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/applications/version-management/gh/default.nix b/nixpkgs/pkgs/applications/version-management/gh/default.nix index 84de388ca604..c0dfb435a24c 100644 --- a/nixpkgs/pkgs/applications/version-management/gh/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gh/default.nix @@ -47,6 +47,7 @@ buildGoModule rec { homepage = "https://cli.github.com/"; changelog = "https://github.com/cli/cli/releases/tag/v${version}"; license = licenses.mit; + mainProgram = "gh"; maintainers = with maintainers; [ zowoq ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-branchless/default.nix b/nixpkgs/pkgs/applications/version-management/git-branchless/default.nix index a1d94748e798..6bcfb0a6cdc7 100644 --- a/nixpkgs/pkgs/applications/version-management/git-branchless/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-branchless/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "git-branchless"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${version}"; - sha256 = "sha256-9kyC9Uwmc2WNHgfKpnS3v8vNF2o+168ULWqE+2eX1cE="; + hash = "sha256-ev56NzrEF7xm3WmR2a0pHPs69Lvmb4He7+kIBYiJjKY="; }; - cargoHash = "sha256-k+Jx5PcA8TaFQQDYqZ6dTy8bwNtYeALF75ucoFjVGUc="; + cargoHash = "sha256-Ppw5TN/6zMNxFAx90Q9hQ7RdGxV+TT8UlOm68ldK8oc="; nativeBuildInputs = [ pkg-config ]; @@ -52,6 +52,7 @@ rustPlatform.buildRustPackage rec { description = "A suite of tools to help you visualize, navigate, manipulate, and repair your commit history"; homepage = "https://github.com/arxanas/git-branchless"; license = licenses.gpl2Only; + mainProgram = "git-branchless"; maintainers = with maintainers; [ msfjarvis nh2 hmenke ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-mit/default.nix b/nixpkgs/pkgs/applications/version-management/git-mit/default.nix index 4c96bc13b44c..16110a69bb41 100644 --- a/nixpkgs/pkgs/applications/version-management/git-mit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.146"; + version = "5.12.147"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-VN1TbK9wi5Nt2K3yKx2lYSP30zSpwNETQ4OyHj8zxBg="; + hash = "sha256-TaYuxyezegPZPWlkYcZk+YhmHqQ/P1nO5D5JC3LN8bo="; }; - cargoHash = "sha256-YtUuRLjmehG+5kUiCo4LK0PkKAckr28UahlrAjm9MYw="; + cargoHash = "sha256-9oqw2rIAhdo5G2GsW7rwHMymgFASKE7OrVqO2ewfG2g="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index d8eed798e15f..d90028205c94 100644 --- a/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.35"; + version = "2.36"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-ZJFXQH4bF3O4oMUwBQnoZC2FyL2/DH6AHk4CcHA0fLc="; + hash = "sha256-TCCVdPhrR4NWwqNjEAySSsiW2D7gCdLAiD+UeuvBJvI="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix b/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix index 3863962fc51d..21f4d870894e 100644 --- a/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - hash = "sha256-7iJx7kE606jeaokROmOSoh0egCQUgYwvg8BAA3y1BGs="; + hash = "sha256-Ry5QvOoj4iSQZr1O+Y6qSHzhmm77nbkLjCcdPOhxR18="; }; - cargoHash = "sha256-zChqIA/KuS1aBs/g1tlymGvvJeljKMMCODijPhQYy40="; + cargoHash = "sha256-WZctsAxGojrGufF8CwUiw1xWzn9qVZUphDE3KmGTGy4="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/applications/version-management/gitui/default.nix b/nixpkgs/pkgs/applications/version-management/gitui/default.nix index 2686463da296..2cc262cb12c5 100644 --- a/nixpkgs/pkgs/applications/version-management/gitui/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitui/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.23.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - hash = "sha256-Mz4/Q1EmTg3vXIYbIdr5MtemGrBSkvBBwcfz+McEaJ8="; + hash = "sha256-FcOpLCLoeY+uZA+IMWNxUUbu9yieNVqPl4iiV8BDpTE="; }; - cargoHash = "sha256-hsu3WQfqMnD5frJP6wDcexG7HafXmzs5ZIGePGOBRVs="; + cargoHash = "sha256-UvMtA+2inMLBjQA+17nozI/VrU1NR0A7eym1VyjYoAg="; nativeBuildInputs = [ pkg-config ]; @@ -37,11 +37,19 @@ rustPlatform.buildRustPackage rec { # environment: delete them. postPatch = "rm .cargo/config"; + + # Getting app_config_path fails with a permission denied + checkFlags = [ + "--skip=keys::key_config::tests::test_symbolic_links" + ]; + + meta = with lib; { description = "Blazing fast terminal-ui for Git written in Rust"; homepage = "https://github.com/extrawurst/gitui"; changelog = "https://github.com/extrawurst/gitui/blob/${version}/CHANGELOG.md"; + mainProgram = "gitui"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne yanganto ]; + maintainers = with maintainers; [ Br1ght0ne yanganto mfrw ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/got/default.nix b/nixpkgs/pkgs/applications/version-management/got/default.nix index e3bf938303f5..ddbf9153ce84 100644 --- a/nixpkgs/pkgs/applications/version-management/got/default.nix +++ b/nixpkgs/pkgs/applications/version-management/got/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.91"; + version = "0.92"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - hash = "sha256-ebFetQhgEBjy3aq3TfK9veeevbmSAEv9kaUohsnsrlU="; + hash = "sha256-HaNCxgbl0ewvI96jr9/BgJphqoQC5P2atj5a51bj99c="; }; nativeBuildInputs = [ pkg-config bison ] @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libbsd libevent libuuid libmd zlib ncurses ] ++ lib.optionals stdenv.isDarwin [ libossp_uuid ]; + configureFlags = [ "--enable-gotd" ]; + preConfigure = lib.optionalString stdenv.isDarwin '' # The configure script assumes dependencies on Darwin are install via # Homebrew or MacPorts and hardcodes assumptions about the paths of diff --git a/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix b/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix index d6a8125f324c..928be528ce4e 100644 --- a/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix +++ b/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix @@ -109,9 +109,7 @@ let ''; # The unpack phase won't generate a directory - setSourceRoot = '' - sourceRoot=$PWD - ''; + sourceRoot = "."; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/applications/video/freetube/default.nix b/nixpkgs/pkgs/applications/video/freetube/default.nix index 389a3d06cd5e..82bcb8c85668 100644 --- a/nixpkgs/pkgs/applications/video/freetube/default.nix +++ b/nixpkgs/pkgs/applications/video/freetube/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, appimageTools, makeWrapper, electron }: +{ stdenv, lib, fetchurl, appimageTools, makeWrapper, electron_22 }: stdenv.mkDerivation rec { pname = "freetube"; @@ -35,8 +35,9 @@ stdenv.mkDerivation rec { runHook postInstall ''; + # Electron version is set to 22 in order to match upstream postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_22}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar ''; diff --git a/nixpkgs/pkgs/applications/video/haruna/default.nix b/nixpkgs/pkgs/applications/video/haruna/default.nix index 4e1bb7fa779d..f07a7b42855f 100644 --- a/nixpkgs/pkgs/applications/video/haruna/default.nix +++ b/nixpkgs/pkgs/applications/video/haruna/default.nix @@ -26,13 +26,13 @@ mkDerivation rec { pname = "haruna"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-quCkQN1IxKoGr+VzeDXs2UChJgxfgI+z56SDYc6eZDc="; + hash = "sha256-NWV3DSQkgH4cqNnHipg4S3Nf5aEVdRzD0oT8a2OyCu4="; domain = "invent.kde.org"; }; diff --git a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 0f5b7ca7a070..45a23ca7deb6 100644 --- a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation rec { "--disable-precompiled-headers" "--disable-profiling" "--disable-static-qt" + "--disable-update-check" "--enable-optimization" "--with-boost-libdir=${lib.getLib boost}/lib" "--with-docbook-xsl-root=${docbook_xsl}/share/xml/docbook-xsl" diff --git a/nixpkgs/pkgs/applications/video/multiviewer-for-f1/default.nix b/nixpkgs/pkgs/applications/video/multiviewer-for-f1/default.nix index 0c6dbe8e7a95..5dd929fcbaa5 100644 --- a/nixpkgs/pkgs/applications/video/multiviewer-for-f1/default.nix +++ b/nixpkgs/pkgs/applications/video/multiviewer-for-f1/default.nix @@ -22,17 +22,16 @@ , pango , xorg }: - let - id = "118976581"; + id = "123365359"; in stdenvNoCC.mkDerivation rec { pname = "multiviewer-for-f1"; - version = "1.24.2"; + version = "1.26.4"; src = fetchurl { url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb"; - sha256 = "sha256-zll639fQFdrNvIj/4ECqEGxQw4VgfERGlti7opSmSi0="; + sha256 = "sha256-VKpEE1o24Wc4IOagIC62kzPf7nCkgAWsXbeOQXNN4O4="; }; nativeBuildInputs = [ @@ -98,6 +97,7 @@ stdenvNoCC.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ babeuh ]; platforms = [ "x86_64-linux" ]; + mainProgram = "multiviewer-for-f1"; }; } diff --git a/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix b/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix index 086f6285a5ed..63bad0fe6459 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix @@ -20,6 +20,8 @@ obs-command-source = callPackage ./obs-command-source.nix { }; + obs-freeze-filter = qt6Packages.callPackage ./obs-freeze-filter.nix { }; + obs-gradient-source = callPackage ./obs-gradient-source.nix { }; obs-gstreamer = callPackage ./obs-gstreamer.nix { }; diff --git a/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix new file mode 100644 index 000000000000..1460e77fbf86 --- /dev/null +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix @@ -0,0 +1,40 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, obs-studio +, qtbase +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "obs-freeze-filter"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "exeldro"; + repo = "obs-freeze-filter"; + rev = finalAttrs.version; + sha256 = "sha256-CaHBTfdk8VFjmiclG61elj35glQafgz5B4ENo+7J35o="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio qtbase ]; + + postInstall = '' + rm -rf "$out/share" + mkdir -p "$out/share/obs" + mv "$out/data/obs-plugins" "$out/share/obs" + rm -rf "$out/obs-plugins" "$out/data" + ''; + + dontWrapQtApps = true; + + meta = with lib; { + description = "Plugin for OBS Studio to freeze a source using a filter"; + homepage = "https://github.com/exeldro/obs-freeze-filter"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ pschmitt ]; + }; +}) diff --git a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index a27930fcb4ac..d0eceae70525 100644 --- a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -11,18 +11,18 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-W6nqhSEoP2mDp7fCoXqwYAafjfESxymYXAdC3BnJJno="; + hash = "sha256-gdMNAU+w4u+9DZL9x96OAZihShkQdvSiqPCA+eNf600="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libseccomp systemd ] - ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; + ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; # manpage requires building the vendored go-md2man makeFlags = [ "bin/conmon" ]; diff --git a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index 8b04cda31864..7d7a2730cd24 100644 --- a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.3"; + version = "1.7.5"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-BUbZe37rBZTr6nWb4lY2HHuwtq7toDUkGaJOiOoVkWI="; + hash = "sha256-g+1JfXO1k0ijPpVTo+WxmXro4p4MbRCIZdgtgy58M60="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix index ad48ae1e0d8c..4cbc7b20d562 100644 --- a/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.27.1"; + version = "1.28.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-29lA497DTJ1AOqcfbgUCYcBqB8WUWWXBMqFOpyx93wY="; + sha256 = "sha256-vVw3mVliu9JiCgTpwBfubaOkEkNJD4Tb1M7HARg5VjA="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix b/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix index f9c15b35e43b..6a3da1f03a66 100644 --- a/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix @@ -1,31 +1,21 @@ -{ lib, rustPlatform, fetchgit, fetchpatch -, pkg-config, protobuf, python3, wayland-scanner +{ lib, rustPlatform, fetchgit, pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols }: rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "115.2"; + version = "116.1"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "d14053a211eb6753c53ced71fad2d3b402b997e6"; - sha256 = "8p6M9Q9E07zqtHYdIIi6io9LLatd+9fH4Inod2Xjy5M="; + rev = "97ac6ce38d8e5789c91fcc5bae6078d21a2afdb3"; + sha256 = "NssjHXorPGZBYqERPeLW3cqEzbXqyL9N4OnLLQMLALk="; fetchSubmodules = true; }; - patches = [ - # Backport option to not vendor virglrenderer. - (fetchpatch { - url = "https://chromium.googlesource.com/crosvm/crosvm/+/dde9aa0e6d89a090f5d5f000822f7911eba98445%5E%21/?format=TEXT"; - decode = "base64 -d"; - hash = "sha256-W/s1i2reBXsbr0AOEtL9go3TNNYMwDVEu6pz3Q9wBSU="; - }) - ]; - separateDebugInfo = true; - cargoSha256 = "ZXyMeu2forItGcsGrNBWhV1V9HzVQK6LM4TxBrxAZnU="; + cargoHash = "sha256-mlXAlq62nAW6ZVxRav+k/iU1YDecfPDTCPp7FdJBO54="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner diff --git a/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix b/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix index 1834d38d7fb1..72216d095488 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-slim"; - version = "1.40.3"; + version = "1.40.4"; src = fetchFromGitHub { owner = "slimtoolkit"; repo = "slim"; rev = version; - hash = "sha256-fXB2rMW73F12ZO1sqUIiaky6LDiMasg3QcIgeWwtkOs="; + hash = "sha256-A5qMg+mgcvK0YyJLbnFdZRS3s+OFWFaLKmnyvKj4r4g="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/docker/compose.nix b/nixpkgs/pkgs/applications/virtualization/docker/compose.nix index 950c611ca2ce..db6d5a3dadb9 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker/compose.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.20.3"; + version = "2.21.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-dCcCtQTow8S0dyAD8UT6p64erSAl7oiZdbpYsO4/Z/s="; + hash = "sha256-JekWw5YI6O+CLXc7oNIxPJsRzYimGFDGL6ACyM4D04k="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-pNCAEuaF4FkSCmW1JcDMxOtVM6mL7dYLtVu4oUBqoS8="; + vendorHash = "sha256-vVnaZLvPbhJNFn/ACuYDbXCKPKNlYoGCm+liTlPMcjs="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix b/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix index 78571451036d..284c03970761 100644 --- a/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.73.1"; + version = "1.75.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-+IFlr1xLLnk0Ox3CcHUdEEiDqk5z0MegWu6h9RW7M8Q="; + hash = "sha256-pjBAu7QyDZdZbGK2pmvF75C6M3liS0KixupUx+iCEjA="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/lima/bin.nix b/nixpkgs/pkgs/applications/virtualization/lima/bin.nix index fab9d6b68017..2400c19d40ea 100644 --- a/nixpkgs/pkgs/applications/virtualization/lima/bin.nix +++ b/nixpkgs/pkgs/applications/virtualization/lima/bin.nix @@ -9,31 +9,31 @@ }: let - version = "0.17.0"; + version = "0.17.2"; dist = { aarch64-darwin = rec { archSuffix = "Darwin-arm64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "c1b6cd12d13a67918be0f85c1036c2fbc894ef91707cbb9a8c346c0cb371a4e5"; + sha256 = "c7e328369e6842b15452b440daa5137e00da57ca7aa025b1cf7f80bd5c7843a9"; }; x86_64-darwin = rec { archSuffix = "Darwin-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "cecefed3ae3aadc25b591973db51f89278589cb53605b17282b8afb7c38febab"; + sha256 = "5b8954b3040b82016701091bed4ac99c668ffb8d362dc7a0fdf5cb9a6ed9ebb1"; }; aarch64-linux = rec { archSuffix = "Linux-aarch64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "b07fc3af272b7e86ea913a91722f46a8bc6361d74c2db9ca097c88852e444f1d"; + sha256 = "20df104067f255212cd6df82508961b20bf4c0a16a233a74d495a4b6ee3a62e8"; }; x86_64-linux = rec { archSuffix = "Linux-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "1e455d4d1a213db2521aba3b1d282fcee70e5e42482f32177488539e8b35c103"; + sha256 = "a9af3aec848ed7bc490baff2f1d785334cbbc6cd94f981705cc0aeab833288b0"; }; }; in @@ -108,5 +108,6 @@ stdenvNoCC.mkDerivation { description = "Linux virtual machines (on macOS, in most cases)"; license = licenses.asl20; maintainers = with maintainers; [ tricktron ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/lima/default.nix b/nixpkgs/pkgs/applications/virtualization/lima/default.nix index 3aed14d9ca95..9dc433c1716d 100644 --- a/nixpkgs/pkgs/applications/virtualization/lima/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/lima/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "lima"; - version = "0.17.0"; + version = "0.17.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EVPIb8+0pMDq7sRiG5ERHRW8Lq2NRdHiBj0zPouzwpc="; + sha256 = "sha256-0yWQhyDSDGZT6K/SeVntTdqnDzyGD244+r5kG1MFh1c="; }; - vendorHash = "sha256-BrfrCsVJ6ca16dyBHOUXFZHU8JZz2iUxcc2gGf3MF/U="; + vendorHash = "sha256-yA6qwnbRFR/V2Aaf53jLTejPKuNzbod2dVnLEQLoQkM="; nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; diff --git a/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix b/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix index 60808705e8dd..67baa3ab91bd 100644 --- a/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -95,6 +95,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://looking-glass.io/"; license = licenses.gpl2Plus; + mainProgram = "looking-glass-client"; maintainers = with maintainers; [ alexbakker babbaj j-brn ]; platforms = [ "x86_64-linux" ]; }; diff --git a/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix b/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix index 6c9ea55a2949..513da2279614 100644 --- a/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pm02VKqaxXVLKqChbp7MQIccwzukAG2h0QrEZftQoQo="; + sha256 = "sha256-xUQpo9KqKXKz1nT+eqmIX1domBHGsFO1DQoR/lDdncM="; }; - cargoHash = "sha256-elBLH2n+t+bixKePRmK1YiXsdDuerYzV+PbpjFEcA1g="; + cargoHash = "sha256-6OuDZzX7mCc8LiC808eu1fa1OspA5+Yk5h3VxusgFDU="; # skip test due FHS dependency doCheck = false; diff --git a/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix b/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix index 2e4d589d158e..3b110d9bc991 100644 --- a/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix +++ b/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix @@ -207,12 +207,16 @@ in substituteInPlace "$out/bin/run-singularity" \ --replace "/usr/bin/env ${projectName}" "$out/bin/${projectName}" wrapProgram "$out/bin/${projectName}" \ - --prefix PATH : "''${defaultPathInputs// /\/bin:}" + --prefix PATH : "''${defaultPathInputs// /\/bin:}''${defaultPathInputs:+/bin:}" # Make changes in the config file ${lib.optionalString enableNvidiaContainerCli '' substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \ --replace "use nvidia-container-cli = no" "use nvidia-container-cli = yes" ''} + ${lib.optionalString (enableNvidiaContainerCli && projectName == "singularity") '' + substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \ + --replace "# nvidia-container-cli path =" "nvidia-container-cli path = ${nvidia-docker}/bin/nvidia-container-cli" + ''} ${lib.optionalString (removeCompat && (projectName != "singularity")) '' unlink "$out/bin/singularity" for file in "$out"/share/man/man?/singularity*.gz; do diff --git a/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix index 1a9fe490af85..163812bdccf0 100644 --- a/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix @@ -2,6 +2,7 @@ , vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, libosinfo, gnome, gtksourceview4, docutils, cpio , e2fsprogs, findutils, gzip, cdrtools, xorriso, fetchpatch +, desktopToDarwinBundle, stdenv , spiceSupport ? true, spice-gtk ? null }: @@ -20,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { intltool file gobject-introspection # for setup hook populating GI_TYPELIB_PATH docutils - ]; + ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ wrapGAppsHook @@ -91,6 +92,7 @@ python3.pkgs.buildPythonApplication rec { ''; license = licenses.gpl2; platforms = platforms.unix; + mainProgram = "virt-manager"; maintainers = with maintainers; [ qknight offline fpletz globin ]; }; } diff --git a/nixpkgs/pkgs/applications/window-managers/dwl/default.nix b/nixpkgs/pkgs/applications/window-managers/dwl/default.nix index 848da9116f18..e4578319ee07 100644 --- a/nixpkgs/pkgs/applications/window-managers/dwl/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/dwl/default.nix @@ -12,7 +12,7 @@ , wayland-scanner , wayland , wayland-protocols -, wlroots_0_16 +, wlroots , writeText , xcbutilwm , xwayland @@ -20,9 +20,6 @@ , conf ? null }: -let - wlroots = wlroots_0_16; -in stdenv.mkDerivation (finalAttrs: { pname = "dwl"; version = "0.4"; diff --git a/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix index bd9232e32c07..b2ee683ddd54 100644 --- a/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ b/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix @@ -57,12 +57,10 @@ wlroots.overrideAttrs "${hyprland.src}/nix/patches/wlroots-nvidia.patch" ]); - postPatch = - (old.postPatch or "") - + ( - lib.optionalString enableNvidiaPatches - ''substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();"'' - ); + # don't need old.postPatch for hwdata's path in wlroots 0.16 + postPatch = lib.optionalString enableNvidiaPatches '' + substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();" + ''; buildInputs = old.buildInputs ++ [ hwdata diff --git a/nixpkgs/pkgs/tools/wayland/shotman/Cargo.lock b/nixpkgs/pkgs/applications/window-managers/i3/workstyle-Cargo.lock index ed9518ea6e28..a1bfdd08c493 100644 --- a/nixpkgs/pkgs/tools/wayland/shotman/Cargo.lock +++ b/nixpkgs/pkgs/applications/window-managers/i3/workstyle-Cargo.lock @@ -3,25 +3,79 @@ version = 3 [[package]] -name = "adler" -version = "1.0.2" +name = "aho-corasick" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] [[package]] -name = "android_system_properties" -version = "0.1.5" +name = "anstream" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" dependencies = [ - "libc", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", ] [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" + +[[package]] +name = "async-trait" +version = "0.1.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] [[package]] name = "atty" @@ -47,30 +101,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bumpalo" -version = "3.11.1" +name = "bytes" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" - -[[package]] -name = "calloop" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a59225be45a478d772ce015d9743e49e92798ece9e34eda9a6aa2a6a7f40192" -dependencies = [ - "futures-util", - "log", - "nix 0.25.1", - "slotmap", - "thiserror", - "vec_map", -] +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cc" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -79,173 +119,126 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "chrono" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" -dependencies = [ - "iana-time-zone", - "num-integer", - "num-traits", - "winapi", -] - -[[package]] name = "clap" -version = "4.1.4" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" +checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a" dependencies = [ - "bitflags", + "clap_builder", "clap_derive", - "clap_lex", - "is-terminal", "once_cell", - "strsim", - "termcolor", ] [[package]] -name = "clap_complete" -version = "4.1.1" +name = "clap_builder" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6540eedc41f8a5a76cf3d8d458057dcdf817be4158a55b5f861f7a5483de75" +checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6" dependencies = [ - "clap", + "anstream", + "anstyle", + "bitflags", + "clap_lex", + "strsim", ] [[package]] name = "clap_derive" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[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 = "colored" -version = "2.0.0" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -dependencies = [ - "atty", - "lazy_static", - "winapi", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] -name = "core-foundation-sys" -version = "0.8.3" +name = "convert_case" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] -name = "crc32fast" -version = "1.3.2" +name = "derive_more" +version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "cfg-if", + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", ] [[package]] -name = "cxx" -version = "1.0.86" +name = "dirs" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", + "dirs-sys", ] [[package]] -name = "cxx-build" -version = "1.0.86" +name = "dirs-sys" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", + "libc", + "redox_users", + "winapi", ] [[package]] -name = "cxxbridge-flags" -version = "1.0.86" +name = "doc-comment" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] -name = "cxxbridge-macro" -version = "1.0.86" +name = "either" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] -name = "dlib" -version = "0.5.0" +name = "env_logger" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ - "libloading", + "atty", + "humantime", + "log", + "regex", + "termcolor", ] [[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.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" - -[[package]] name = "errno" -version = "0.2.8" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -259,23 +252,14 @@ dependencies = [ ] [[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] name = "futures" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", + "futures-executor", "futures-io", "futures-sink", "futures-task", @@ -284,9 +268,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -294,37 +278,60 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", "futures-io", + "futures-macro", "futures-sink", "futures-task", "memchr", @@ -334,10 +341,27 @@ dependencies = [ ] [[package]] +name = "getrandom" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -358,49 +382,87 @@ dependencies = [ ] [[package]] -name = "iana-time-zone" -version = "0.1.53" +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "humantime" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyprland" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d341e36a776cd092622daf2439a484247f3dc7d25eab7b286cc88ac85120d3" dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "winapi", + "async-trait", + "derive_more", + "doc-comment", + "futures", + "hex", + "hyprland-macros", + "lazy_static", + "num-traits", + "paste", + "regex", + "serde", + "serde_json", + "serde_repr", + "strum", + "tokio", ] [[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" +name = "hyprland-macros" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "0088021091c08e29e9d1f735142ab811bd4d4d7f82fd4d4673407cb96fffb062" dependencies = [ - "cxx", - "cxx-build", + "quote", + "syn 2.0.15", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", ] [[package]] name = "io-lifetimes" -version = "1.0.4" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ + "hermit-abi 0.3.1", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "is-terminal" -version = "0.4.2" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.1", "io-lifetimes", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -414,18 +476,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" - -[[package]] -name = "js-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" -dependencies = [ - "wasm-bindgen", -] +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "lazy_static" @@ -435,34 +488,34 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] -name = "libloading" -version = "0.7.4" +name = "linux-raw-sys" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] -name = "link-cplusplus" -version = "1.0.8" +name = "lock_api" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ - "cc", + "autocfg", + "scopeguard", ] [[package]] -name = "linux-raw-sys" -version = "0.1.4" +name = "lockfile" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "0adecf427f5b6ac140a0d1c5bc9dd0eb81b6f462486b78402c0a689a317b55dc" +dependencies = [ + "log", +] [[package]] name = "log" @@ -480,113 +533,70 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] -name = "memmap2" -version = "0.5.8" +name = "mio" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", + "log", + "wasi", + "windows-sys 0.45.0", ] [[package]] -name = "memoffset" -version = "0.6.5" +name = "num-traits" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] [[package]] -name = "memoffset" -version = "0.7.1" +name = "num_cpus" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "autocfg", + "hermit-abi 0.2.6", + "libc", ] [[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.6.2" +name = "once_cell" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] -name = "nix" -version = "0.25.1" +name = "parking_lot" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "autocfg", - "bitflags", - "cfg-if", - "libc", - "memoffset 0.6.5", + "lock_api", + "parking_lot_core", ] [[package]] -name = "nix" -version = "0.26.1" +name = "parking_lot_core" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ - "bitflags", "cfg-if", "libc", - "memoffset 0.7.1", - "static_assertions", -] - -[[package]] -name = "nom" -version = "7.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", + "redox_syscall", + "smallvec", + "windows-sys 0.45.0", ] [[package]] -name = "once_cell" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" +name = "paste" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "pin-project-lite" @@ -601,131 +611,132 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "png" -version = "0.17.7" +name = "proc-macro2" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ - "bitflags", - "crc32fast", - "flate2", - "miniz_oxide", + "unicode-ident", ] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "quote" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ - "proc-macro-error-attr", "proc-macro2", - "quote", - "syn", - "version_check", ] [[package]] -name = "proc-macro-error-attr" -version = "1.0.4" +name = "redox_syscall" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "proc-macro2", - "quote", - "version_check", + "bitflags", ] [[package]] -name = "proc-macro2" -version = "1.0.49" +name = "redox_users" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "unicode-ident", + "getrandom", + "redox_syscall", + "thiserror", ] [[package]] -name = "quick-xml" -version = "0.23.1" +name = "regex" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ + "aho-corasick", "memchr", + "regex-syntax", ] [[package]] -name = "quote" -version = "1.0.23" +name = "regex-syntax" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "proc-macro2", + "semver", ] [[package]] name = "rustix" -version = "0.36.6" +version = "0.37.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" +checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] -name = "ryu" +name = "rustversion" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" + +[[package]] +name = "ryu" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] -name = "scoped-tls" -version = "1.0.1" +name = "scopeguard" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "scratch" -version = "1.0.3" +name = "semver" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -733,312 +744,216 @@ dependencies = [ ] [[package]] -name = "shotman" -version = "0.1.0" +name = "serde_repr" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ - "anyhow", - "calloop", - "chrono", - "clap", - "futures", - "itertools", - "log", - "memmap2", - "nom", - "png", - "rustix", - "serde", - "serde_json", - "simple_logger", - "smithay-client-toolkit", - "thiserror", - "wayland-client", - "wayland-protocols", - "wayland-protocols-wlr", + "proc-macro2", + "quote", + "syn 2.0.15", ] [[package]] -name = "shotman_completions" -version = "0.1.0" +name = "signal-hook" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" dependencies = [ - "clap", - "clap_complete", - "shotman", + "libc", + "signal-hook-registry", ] [[package]] -name = "simple_logger" -version = "2.3.0" +name = "signal-hook-registry" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48047e77b528151aaf841a10a9025f9459da80ba820e425ff7eb005708a76dc7" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ - "atty", - "colored", - "log", - "winapi", + "libc", ] [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" 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.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] -name = "smithay-client-toolkit" -version = "0.16.0" -source = "git+https://github.com/Smithay/client-toolkit.git#327f9cd791d8810fe7324ee1ddd48adaf3592ca4" +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ - "bitflags", - "calloop", - "dlib", - "lazy_static", - "log", - "memmap2", - "nix 0.26.1", - "pkg-config", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-cursor", - "wayland-protocols", - "wayland-protocols-wlr", - "wayland-scanner", - "xkbcommon", + "libc", + "winapi", ] [[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "syn" -version = "1.0.107" +name = "strum" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", + "strum_macros", ] [[package]] -name = "termcolor" -version = "1.1.3" +name = "strum_macros" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "winapi-util", + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", ] [[package]] -name = "thiserror" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +name = "swayipc" +version = "3.0.1" +source = "git+https://github.com/pierrechevalier83/swayipc-rs.git?branch=fix_crash_when_using_without_i3_or_sway#e8eb2d8efba285b577c5e585af203baf9096b85f" dependencies = [ - "thiserror-impl", + "serde", + "serde_json", + "swayipc-types", ] [[package]] -name = "thiserror-impl" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +name = "swayipc-types" +version = "1.3.0" +source = "git+https://github.com/pierrechevalier83/swayipc-rs.git?branch=fix_crash_when_using_without_i3_or_sway#e8eb2d8efba285b577c5e585af203baf9096b85f" dependencies = [ - "proc-macro2", - "quote", - "syn", + "serde", + "serde_json", + "thiserror", ] [[package]] -name = "unicode-ident" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[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 = "wasm-bindgen" -version = "0.2.83" +name = "syn" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "cfg-if", - "wasm-bindgen-macro", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] -name = "wasm-bindgen-backend" -version = "0.2.83" +name = "syn" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ - "bumpalo", - "log", - "once_cell", "proc-macro2", "quote", - "syn", - "wasm-bindgen-shared", + "unicode-ident", ] [[package]] -name = "wasm-bindgen-macro" -version = "0.2.83" +name = "termcolor" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ - "quote", - "wasm-bindgen-macro-support", + "winapi-util", ] [[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.83" +name = "thiserror" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", + "thiserror-impl", ] [[package]] -name = "wasm-bindgen-shared" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" - -[[package]] -name = "wayland-backend" -version = "0.1.0" +name = "thiserror-impl" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb23bfea266c92bb051ea36cce0eb1a52b743dc1c5f168021947eda79764656d" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ - "cc", - "downcast-rs", - "io-lifetimes", - "nix 0.26.1", - "scoped-tls", - "smallvec", - "wayland-sys", + "proc-macro2", + "quote", + "syn 2.0.15", ] [[package]] -name = "wayland-client" -version = "0.30.0" +name = "tokio" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a925bd68c8b652af4e6f11a32410bd31bf84061c5ef279ed081520c60f203b4" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" dependencies = [ - "bitflags", - "nix 0.26.1", - "wayland-backend", - "wayland-scanner", + "autocfg", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.45.0", ] [[package]] -name = "wayland-cursor" -version = "0.30.0" +name = "tokio-macros" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0c3a0d5b4b688b07b0442362d3ed6bf04724fcc16cd69ab6285b90dbc487aa" +checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ - "nix 0.26.1", - "wayland-client", - "xcursor", + "proc-macro2", + "quote", + "syn 2.0.15", ] [[package]] -name = "wayland-protocols" -version = "0.30.0" +name = "toml" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fefbeb8a360abe67ab7c2efe1d297a1a50ee011f5460791bc18870c26bb84e2" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "bitflags", - "wayland-backend", - "wayland-client", - "wayland-scanner", + "indexmap", + "serde", ] [[package]] -name = "wayland-protocols-wlr" -version = "0.1.0" +name = "unicode-ident" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce991093320e4a6a525876e6b629ab24da25f9baef0c2e0080ad173ec89588a" -dependencies = [ - "bitflags", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] -name = "wayland-scanner" -version = "0.30.0" +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4834c14b3edf1d9986c83ca79b1e7e3afbe9874c7c144702f6467063259ce45d" -dependencies = [ - "proc-macro2", - "quick-xml", - "quote", -] +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] -name = "wayland-sys" -version = "0.30.1" +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" -dependencies = [ - "dlib", - "log", - "pkg-config", -] +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "winapi" @@ -1073,76 +988,153 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.42.0" +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 = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows-targets 0.48.0", ] [[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +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.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +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 = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +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 = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[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_msvc" -version = "0.42.1" +name = "windows_x86_64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] -name = "xcursor" -version = "0.3.4" +name = "windows_x86_64_msvc" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" -dependencies = [ - "nom", -] +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] -name = "xkbcommon" -version = "0.5.0" +name = "windows_x86_64_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbee136714379ab22da0280207fdb7f47e0bb940adea97731b65598b8c7a92e" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "workstyle" +version = "0.8.2" dependencies = [ - "libc", - "memmap2", + "anyhow", + "clap", + "dirs", + "env_logger", + "hyprland", + "indexmap", + "itertools", + "lockfile", + "log", + "once_cell", + "serde", + "serde_derive", + "signal-hook", + "swayipc", + "toml", ] diff --git a/nixpkgs/pkgs/applications/window-managers/i3/workstyle.nix b/nixpkgs/pkgs/applications/window-managers/i3/workstyle.nix index 3f7c252c2c33..5bbac8a3c65d 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/workstyle.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/workstyle.nix @@ -5,16 +5,21 @@ rustPlatform.buildRustPackage rec { pname = "workstyle"; - version = "unstable-2021-05-09"; + version = "unstable-2023-08-23"; src = fetchFromGitHub { owner = "pierrechevalier83"; repo = pname; - rev = "f2023750d802259ab3ee7d7d1762631ec157a0b1"; - sha256 = "04xds691sw4pi2nq8xvdhn0312wwia60gkd8b1bjqy11zrqbivbx"; + rev = "8bde72d9a9dd67e0fc7c0545faca53df23ed3753"; + sha256 = "sha256-yhnt7edhgVy/cZ6FpF6AZWPoeMeEKTXP+87no2KeIYU="; }; - cargoSha256 = "0xwv8spr96z4aimjlr15bhwl6i3zqp7jr45d9zr3sbi9d8dbdja2"; + cargoLock = { + lockFile = ./workstyle-Cargo.lock; + outputHashes = { + "swayipc-3.0.1" = "sha256-3Jhz3+LhncSRvo3n7Dh5d+RWQSvEff9teuaDZLLLEHk="; + }; + }; doCheck = false; # No tests diff --git a/nixpkgs/pkgs/applications/window-managers/katriawm/default.nix b/nixpkgs/pkgs/applications/window-managers/katriawm/default.nix index fece3d808b4f..74bd269285c2 100644 --- a/nixpkgs/pkgs/applications/window-managers/katriawm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/katriawm/default.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "katriawm"; - version = "23.04"; + version = "23.06"; src = fetchzip { name = finalAttrs.pname + "-" + finalAttrs.version; url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz"; - hash = "sha256-Wi9Fv/Ms6t7tr8nxznXrn/6V04lnO1HMz4XFbuCr9+Y="; + hash = "sha256-4vdBX5biakoxiOyz7DPNgkLxlzi27kZ9rC20g+pn3N4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/window-managers/labwc/default.nix b/nixpkgs/pkgs/applications/window-managers/labwc/default.nix index b689235c7a30..07a1e1d54c35 100644 --- a/nixpkgs/pkgs/applications/window-managers/labwc/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/labwc/default.nix @@ -17,14 +17,11 @@ , wayland-scanner , wayland , wayland-protocols -, wlroots_0_16 +, wlroots , xcbutilwm , xwayland }: -let - wlroots = wlroots_0_16; -in stdenv.mkDerivation (finalAttrs: { pname = "labwc"; version = "0.6.4"; diff --git a/nixpkgs/pkgs/applications/window-managers/maui-shell/default.nix b/nixpkgs/pkgs/applications/window-managers/maui-shell/default.nix index e1abf6676b50..0b2c1b0db380 100644 --- a/nixpkgs/pkgs/applications/window-managers/maui-shell/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/maui-shell/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "maui-shell"; - version = "0.5.6"; + version = "0.6.6"; src = fetchFromGitHub { owner = "Nitrux"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-lhTtIHE+FUgZFaPYoIRgLPrBUPISeXHCg3rn0FlQg7w="; + sha256 = "sha256-8D3rlYrqLfyDZQFRSaVlxLaEblbv8w787v8Np2aW3yc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/window-managers/ragnarwm/default.nix b/nixpkgs/pkgs/applications/window-managers/ragnarwm/default.nix new file mode 100644 index 000000000000..2cb9f31e7334 --- /dev/null +++ b/nixpkgs/pkgs/applications/window-managers/ragnarwm/default.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchFromGitHub +, writeText +, fontconfig +, libX11 +, libXft +, libXcursor +, libXcomposite +, conf ? null +, nixosTests +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ragnarwm"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "cococry"; + repo = "Ragnar"; + rev = finalAttrs.version; + hash = "sha256-OZhIwrKEhTfkw9K8nZIwGZzxXBObseWS92Y+85HmdNs="; + }; + + prePatch = '' + substituteInPlace Makefile \ + --replace '/usr/bin' "$out/bin" \ + --replace '/usr/share' "$out/share" + ''; + + postPatch = + let + configFile = + if lib.isDerivation conf || builtins.isPath conf + then conf else writeText "config.h" conf; + in + lib.optionalString (conf != null) "cp ${configFile} config.h"; + + buildInputs = [ + fontconfig + libX11 + libXft + libXcursor + libXcomposite + ]; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + enableParallelBuilding = true; + + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/applications + ''; + + postInstall = '' + install -Dm644 $out/share/applications/ragnar.desktop $out/share/xsessions/ragnar.desktop + ''; + + passthru = { + tests.ragnarwm = nixosTests.ragnarwm; + providedSessions = [ "ragnar" ]; + }; + + meta = with lib; { + description = "Minimal, flexible & user-friendly X tiling window manager"; + homepage = "https://ragnar-website.vercel.app"; + changelog = "https://github.com/cococry/Ragnar/releases/tag/${finalAttrs.version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ sigmanificient ]; + mainProgram = "ragnar"; + platforms = platforms.linux; + }; +}) diff --git a/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index 3e6fc922906f..2c0c4a3d513a 100644 --- a/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -105,6 +105,7 @@ let # Force compilers and other tools to look in default search paths unset NIX_ENFORCE_PURITY + export NIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 export NIX_CFLAGS_COMPILE='-idirafter /usr/include' export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32' diff --git a/nixpkgs/pkgs/build-support/build-fhsenv-chroot/env.nix b/nixpkgs/pkgs/build-support/build-fhsenv-chroot/env.nix index abc9ac4c026f..a1a26472373f 100644 --- a/nixpkgs/pkgs/build-support/build-fhsenv-chroot/env.nix +++ b/nixpkgs/pkgs/build-support/build-fhsenv-chroot/env.nix @@ -78,6 +78,7 @@ let # Force compilers and other tools to look in default search paths unset NIX_ENFORCE_PURITY + export NIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 export NIX_CFLAGS_COMPILE='-idirafter /usr/include' export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32' diff --git a/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh b/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh index 7f5cd4cf4af3..8d02b4e5124d 100644 --- a/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/nixpkgs/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -1,4 +1,5 @@ -declare -a hardeningCFlags=() +declare -a hardeningCFlagsAfter=() +declare -a hardeningCFlagsBefore=() declare -A hardeningEnableMap=() @@ -48,15 +49,19 @@ for flag in "${!hardeningEnableMap[@]}"; do fortify | fortify3) # Use -U_FORTIFY_SOURCE to avoid warnings on toolchains that explicitly # set -D_FORTIFY_SOURCE=0 (like 'clang -fsanitize=address'). - hardeningCFlags+=('-O2' '-U_FORTIFY_SOURCE') + hardeningCFlagsBefore+=('-O2' '-U_FORTIFY_SOURCE') + # Unset any _FORTIFY_SOURCE values the command-line may have set before + # enforcing our own value, avoiding (potentially fatal) redefinition + # warnings + hardeningCFlagsAfter+=('-U_FORTIFY_SOURCE') case $flag in fortify) if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling fortify >&2; fi - hardeningCFlags+=('-D_FORTIFY_SOURCE=2') + hardeningCFlagsAfter+=('-D_FORTIFY_SOURCE=2') ;; fortify3) if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling fortify3 >&2; fi - hardeningCFlags+=('-D_FORTIFY_SOURCE=3') + hardeningCFlagsAfter+=('-D_FORTIFY_SOURCE=3') ;; *) # Ignore unsupported. @@ -65,20 +70,20 @@ for flag in "${!hardeningEnableMap[@]}"; do ;; stackprotector) if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi - hardeningCFlags+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4') + hardeningCFlagsBefore+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4') ;; pie) # NB: we do not use `+=` here, because PIE flags must occur before any PIC flags if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi - hardeningCFlags=('-fPIE' "${hardeningCFlags[@]}") + hardeningCFlagsBefore=('-fPIE' "${hardeningCFlagsBefore[@]}") if [[ ! (" ${params[*]} " =~ " -shared " || " ${params[*]} " =~ " -static ") ]]; then if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi - hardeningCFlags=('-pie' "${hardeningCFlags[@]}") + hardeningCFlagsBefore=('-pie' "${hardeningCFlagsBefore[@]}") fi ;; pic) if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling pic >&2; fi - hardeningCFlags+=('-fPIC') + hardeningCFlagsBefore+=('-fPIC') ;; strictoverflow) if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling strictoverflow >&2; fi @@ -89,14 +94,14 @@ for flag in "${!hardeningEnableMap[@]}"; do # # See: https://github.com/llvm/llvm-project/blob/llvmorg-16.0.6/clang/lib/Driver/ToolChains/Clang.cpp#L6315 # - hardeningCFlags+=('-fwrapv') + hardeningCFlagsBefore+=('-fwrapv') else - hardeningCFlags+=('-fno-strict-overflow') + hardeningCFlagsBefore+=('-fno-strict-overflow') fi ;; format) if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling format >&2; fi - hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security') + hardeningCFlagsBefore+=('-Wformat' '-Wformat-security' '-Werror=format-security') ;; *) # Ignore unsupported. Checked in Nix that at least *some* diff --git a/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 244a0bb6623b..9dcd29c64431 100644 --- a/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/nixpkgs/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -171,8 +171,8 @@ fi source @out@/nix-support/add-hardening.sh # Add the flags for the C compiler proper. -extraAfter=($NIX_CFLAGS_COMPILE_@suffixSalt@) -extraBefore=(${hardeningCFlags[@]+"${hardeningCFlags[@]}"} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@) +extraAfter=(${hardeningCFlagsAfter[@]+"${hardeningCFlagsAfter[@]}"} $NIX_CFLAGS_COMPILE_@suffixSalt@) +extraBefore=(${hardeningCFlagsBefore[@]+"${hardeningCFlagsBefore[@]}"} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@) if [ "$dontLink" != 1 ]; then diff --git a/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index c7c733a427aa..f52ac48a1a87 100644 --- a/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix @@ -69,7 +69,7 @@ let includeFortifyHeaders' = if includeFortifyHeaders != null then includeFortifyHeaders - else targetPlatform.libc == "musl"; + else (targetPlatform.libc == "musl" && isGNU); # Prefix for binaries. Customarily ends with a dash separator. # diff --git a/nixpkgs/pkgs/build-support/dart/build-dart-application/default.nix b/nixpkgs/pkgs/build-support/dart/build-dart-application/default.nix index 7e9c3f842b80..be1fd7277671 100644 --- a/nixpkgs/pkgs/build-support/dart/build-dart-application/default.nix +++ b/nixpkgs/pkgs/build-support/dart/build-dart-application/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchDartDeps, writeText, dartHooks, makeWrapper, dart, nodejs, darwin }: +{ lib, stdenv, fetchDartDeps, runCommand, writeText, dartHooks, makeWrapper, dart, cacert, nodejs, darwin }: { pubGetScript ? "dart pub get" @@ -30,7 +30,13 @@ }@args: let - dartDeps = fetchDartDeps { + dartDeps = (fetchDartDeps.override { + dart = runCommand "dart-fod" { nativeBuildInputs = [ makeWrapper ]; } '' + mkdir -p "$out/bin" + makeWrapper "${dart}/bin/dart" "$out/bin/dart" \ + --add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt" + ''; + }) { buildDrvArgs = args; inherit pubGetScript vendorHash pubspecLockFile; }; diff --git a/nixpkgs/pkgs/build-support/emacs/wrapper.nix b/nixpkgs/pkgs/build-support/emacs/wrapper.nix index ecfcc0cd52c5..6f46bb692a43 100644 --- a/nixpkgs/pkgs/build-support/emacs/wrapper.nix +++ b/nixpkgs/pkgs/build-support/emacs/wrapper.nix @@ -159,12 +159,10 @@ runCommand rm -f $siteStart $siteStartByteCompiled $subdirs $subdirsByteCompiled cat >"$siteStart" <<EOF (let ((inhibit-message t)) - (load-file "$emacs/share/emacs/site-lisp/site-start.el")) - (add-to-list 'load-path "$out/share/emacs/site-lisp") + (load "$emacs/share/emacs/site-lisp/site-start")) + ;; "$out/share/emacs/site-lisp" is added to load-path in wrapper.sh + ;; "$out/share/emacs/native-lisp" is added to native-comp-eln-load-path in wrapper.sh (add-to-list 'exec-path "$out/bin") - ${lib.optionalString withNativeCompilation '' - (add-to-list 'native-comp-eln-load-path "$out/share/emacs/native-lisp/") - ''} ${lib.optionalString withTreeSitter '' (add-to-list 'treesit-extra-load-path "$out/lib/") ''} @@ -200,7 +198,7 @@ runCommand substitute ${./wrapper.sh} $out/bin/$progname \ --subst-var-by bash ${emacs.stdenv.shell} \ --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ - --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \ + --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \ --subst-var prog chmod +x $out/bin/$progname done @@ -219,14 +217,14 @@ runCommand substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \ --subst-var-by bash ${emacs.stdenv.shell} \ --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ - --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \ + --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \ --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs fi mkdir -p $out/share # Link icons and desktop files into place - for dir in applications icons info man emacs; do + for dir in applications icons info man; do ln -s $emacs/share/$dir $out/share/$dir done '' diff --git a/nixpkgs/pkgs/build-support/emacs/wrapper.sh b/nixpkgs/pkgs/build-support/emacs/wrapper.sh index e8eecb8c8696..44762bd4582b 100644 --- a/nixpkgs/pkgs/build-support/emacs/wrapper.sh +++ b/nixpkgs/pkgs/build-support/emacs/wrapper.sh @@ -4,16 +4,17 @@ IFS=: newLoadPath=() newNativeLoadPath=() -added= +addedNewLoadPath= +addedNewNativeLoadPath= if [[ -n $EMACSLOADPATH ]] then while read -rd: entry do - if [[ -z $entry && -z $added ]] + if [[ -z $entry && -z $addedNewLoadPath ]] then newLoadPath+=(@wrapperSiteLisp@) - added=1 + addedNewLoadPath=1 fi newLoadPath+=("$entry") done <<< "$EMACSLOADPATH:" @@ -22,14 +23,19 @@ else newLoadPath+=("") fi +# NOTE: Even though we treat EMACSNATIVELOADPATH like EMACSLOADPATH in +# this wrapper, empty elements in EMACSNATIVELOADPATH have no special +# meaning for Emacs. Only non-empty elements in EMACSNATIVELOADPATH +# will be prepended to native-comp-eln-load-path. +# https://git.savannah.gnu.org/cgit/emacs.git/tree/lisp/startup.el?id=3685387e609753293c4518be75e77c659c3b2d8d#n599 if [[ -n $EMACSNATIVELOADPATH ]] then while read -rd: entry do - if [[ -z $entry && -z $added ]] + if [[ -z $entry && -z $addedNewNativeLoadPath ]] then newNativeLoadPath+=(@wrapperSiteLispNative@) - added=1 + addedNewNativeLoadPath=1 fi newNativeLoadPath+=("$entry") done <<< "$EMACSNATIVELOADPATH:" diff --git a/nixpkgs/pkgs/build-support/fetchdebianpatch/default.nix b/nixpkgs/pkgs/build-support/fetchdebianpatch/default.nix new file mode 100644 index 000000000000..c058b416d381 --- /dev/null +++ b/nixpkgs/pkgs/build-support/fetchdebianpatch/default.nix @@ -0,0 +1,19 @@ +{ lib, fetchpatch }: + +lib.makeOverridable ( + { pname, version, debianRevision ? null, patch, hash, + area ? "main", name ? "${patch}.patch" }: + let + inherit (lib.strings) hasPrefix substring; + prefix = + substring 0 (if hasPrefix "lib" pname then 4 else 1) pname; + versionString = + if debianRevision == null then version + else "${version}-${debianRevision}"; + in fetchpatch { + inherit name hash; + url = + "https://sources.debian.org/data/${area}/${prefix}/" + + "${pname}/${versionString}/debian/patches/${patch}.patch"; + } +) diff --git a/nixpkgs/pkgs/build-support/fetchdebianpatch/tests.nix b/nixpkgs/pkgs/build-support/fetchdebianpatch/tests.nix new file mode 100644 index 000000000000..58f3b395d1fc --- /dev/null +++ b/nixpkgs/pkgs/build-support/fetchdebianpatch/tests.nix @@ -0,0 +1,19 @@ +{ testers, fetchDebianPatch, ... }: + +{ + simple = testers.invalidateFetcherByDrvHash fetchDebianPatch { + pname = "pysimplesoap"; + version = "1.16.2"; + debianRevision = "5"; + patch = "Add-quotes-to-SOAPAction-header-in-SoapClient"; + hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0="; + }; + + libPackage = testers.invalidateFetcherByDrvHash fetchDebianPatch { + pname = "libfile-pid-perl"; + version = "1.01"; + debianRevision = "2"; + patch = "missing-pidfile"; + hash = "sha256-VBsIYyCnjcZLYQ2Uq2MKPK3kF2wiMKvnq0m727DoavM="; + }; +} diff --git a/nixpkgs/pkgs/build-support/fetchnextcloudapp/default.nix b/nixpkgs/pkgs/build-support/fetchnextcloudapp/default.nix index a7a3066ffab3..0ec64bbe1df6 100644 --- a/nixpkgs/pkgs/build-support/fetchnextcloudapp/default.nix +++ b/nixpkgs/pkgs/build-support/fetchnextcloudapp/default.nix @@ -1,17 +1,14 @@ -{ stdenv, fetchzip, applyPatches, ... }: +{ stdenv, fetchzip, applyPatches, lib, ... }: { url , sha256 +, appName ? null +, appVersion ? null +, license , patches ? [ ] -, name ? null -, version ? null +, description ? null +, homepage ? null }: -if name != null || version != null then throw '' - `pkgs.fetchNextcloudApp` has been changed to use `fetchzip`. - To update, please - * remove `name`/`version` - * update the hash -'' -else applyPatches { +applyPatches ({ inherit patches; src = fetchzip { inherit url sha256; @@ -23,5 +20,16 @@ else applyPatches { fi popd &>/dev/null ''; + meta = { + license = lib.licenses.${license}; + longDescription = description; + inherit homepage; + } // lib.optionalAttrs (description != null) { + longDescription = description; + } // lib.optionalAttrs (homepage != null) { + inherit homepage; + }; }; -} +} // lib.optionalAttrs (appName != null && appVersion != null) { + name = "nextcloud-app-${appName}-${appVersion}"; +}) diff --git a/nixpkgs/pkgs/build-support/flutter/default.nix b/nixpkgs/pkgs/build-support/flutter/default.nix index 8d31482900a8..c109804680f3 100644 --- a/nixpkgs/pkgs/build-support/flutter/default.nix +++ b/nixpkgs/pkgs/build-support/flutter/default.nix @@ -1,6 +1,7 @@ { lib , callPackage , stdenvNoCC +, runCommand , makeWrapper , llvmPackages_13 , cacert @@ -26,6 +27,26 @@ }@args: let flutterSetupScript = '' + # Pub needs SSL certificates. Dart normally looks in a hardcoded path. + # https://github.com/dart-lang/sdk/blob/3.1.0/runtime/bin/security_context_linux.cc#L48 + # + # Dart does not respect SSL_CERT_FILE... + # https://github.com/dart-lang/sdk/issues/48506 + # ...and Flutter does not support --root-certs-file, so the path cannot be manually set. + # https://github.com/flutter/flutter/issues/56607 + # https://github.com/flutter/flutter/issues/113594 + # + # libredirect is of no use either, as Flutter does not pass any + # environment variables (including LD_PRELOAD) to the Pub process. + # + # Instead, Flutter is patched to allow the path to the Dart binary used for + # Pub commands to be overriden. + export NIX_FLUTTER_PUB_DART="${runCommand "dart-with-certs" { nativeBuildInputs = [ makeWrapper ]; } '' + mkdir -p "$out/bin" + makeWrapper ${flutter.dart}/bin/dart "$out/bin/dart" \ + --add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt" + ''}/bin/dart" + export HOME="$NIX_BUILD_TOP" flutter config --no-analytics &>/dev/null # mute first-run flutter config --enable-linux-desktop >/dev/null @@ -129,7 +150,7 @@ let ${postFixup} ''; - passthru = { + passthru = (args.passthru or {}) // { inherit (deps) depsListFile; }; }); diff --git a/nixpkgs/pkgs/build-support/libredirect/libredirect.c b/nixpkgs/pkgs/build-support/libredirect/libredirect.c index 19211a813eb8..fdbdcb6ebb86 100644 --- a/nixpkgs/pkgs/build-support/libredirect/libredirect.c +++ b/nixpkgs/pkgs/build-support/libredirect/libredirect.c @@ -70,9 +70,12 @@ static void init() } -static const char * rewrite(const char * path, char * buf) +static const char * rewrite(const char * volatile path, char * buf) { + // Marking the path volatile is needed so the the following check isn't + // optimized away by the compiler. if (path == NULL) return path; + for (int n = 0; n < nrRedirects; ++n) { int len = strlen(from[n]); if (strncmp(path, from[n], len) != 0) continue; diff --git a/nixpkgs/pkgs/build-support/libredirect/test.c b/nixpkgs/pkgs/build-support/libredirect/test.c index 7dd384ae3ed7..20b27759f019 100644 --- a/nixpkgs/pkgs/build-support/libredirect/test.c +++ b/nixpkgs/pkgs/build-support/libredirect/test.c @@ -45,6 +45,17 @@ void test_subprocess(void) { assert(system(SUBTEST) == 0); } +void test_stat_with_null_path(void) { + // This checks whether the compiler optimizes away the null pointer check + // on the path passed to stat(). If that's the case, the following code + // should segfault. + struct stat buf; +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wnonnull" + stat(NULL, &buf); +#pragma GCC diagnostic pop +} + void assert_mktemp_path( const char * orig_prefix, const char * orig_suffix, @@ -147,6 +158,7 @@ int main(int argc, char *argv[]) test_spawn(); test_system(); + test_stat_with_null_path(); // Only run subprocess if no arguments are given // as the subprocess will be called without argument diff --git a/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix b/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix index f04eeeaa9bf5..92c71dfc059c 100644 --- a/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix +++ b/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix @@ -40,6 +40,7 @@ , autoconf , automake , libtool +, seatd # =libseat , ... }: @@ -172,6 +173,11 @@ in buildInputs = [ openssl zlib libgit2 ]; }; + libseat-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ seatd ]; + }; + libsqlite3-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ sqlite ]; diff --git a/nixpkgs/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix b/nixpkgs/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix new file mode 100644 index 000000000000..2834cfcc44ff --- /dev/null +++ b/nixpkgs/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix @@ -0,0 +1,5 @@ +{ callPackage, makeSetupHook }: + +makeSetupHook { + name = "mpi-checkPhase-hook"; +} ./mpi-check-hook.sh diff --git a/nixpkgs/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh b/nixpkgs/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh new file mode 100644 index 000000000000..fca1f7b7f932 --- /dev/null +++ b/nixpkgs/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh @@ -0,0 +1,54 @@ +preCheckHooks+=('setupMpiCheck') +preInstallCheckHooks+=('setupMpiCheck') + + +setupMpiCheck() { + # Find out which MPI implementation we are using + # and set safe defaults that are guaranteed to run + # on any build machine + + mpiType="NONE" + + # OpenMPI signature + if command ompi_info &> /dev/null; then + mpiType="openmpi" + fi + + # MPICH based implementations + if command mpichversion &> /dev/null; then + if [ "$mpiType" != "NONE" ]; then + echo "WARNING: found OpenMPI and MPICH/MVAPICH executables" + fi + + version=$(mpichversion) + if [[ "$version" == *"MPICH"* ]]; then + mpiType="MPICH" + fi + if [[ "$version" == *"MVAPICH"* ]]; then + mpiType="MVAPICH" + fi + fi + + echo "Found MPI implementation: $mpiType" + + case $mpiType in + openmpi) + # make sure the test starts even if we have less than the requested amount of cores + export OMPI_MCA_rmaps_base_oversubscribe=1 + # Disable CPU pinning + export OMPI_MCA_hwloc_base_binding_policy=none + ;; + MPICH) + # Fix to make mpich run in a sandbox + export HYDRA_IFACE=lo + ;; + MVAPICH) + # Disable CPU pinning + export MV2_ENABLE_AFFINITY=0 + ;; + esac + + # Limit number of OpenMP threads. Default is "all cores". + export OMP_NUM_THREADS=1 +} + diff --git a/nixpkgs/pkgs/build-support/trivial-builders/default.nix b/nixpkgs/pkgs/build-support/trivial-builders/default.nix index 7c4d204df407..3d2a5512c58e 100644 --- a/nixpkgs/pkgs/build-support/trivial-builders/default.nix +++ b/nixpkgs/pkgs/build-support/trivial-builders/default.nix @@ -905,13 +905,17 @@ rec { ) + "-patched" , patches ? [] , postPatch ? "" - }: stdenvNoCC.mkDerivation { + , ... + }@args: stdenvNoCC.mkDerivation { inherit name src patches postPatch; preferLocalBuild = true; allowSubstitutes = false; phases = "unpackPhase patchPhase installPhase"; installPhase = "cp -R ./ $out"; - }; + } + # Carry `meta` information from the underlying `src` if present. + // (optionalAttrs (src?meta) { inherit (src) meta; }) + // (removeAttrs args [ "src" "name" "patches" "postPatch" ]); /* An immutable file in the store with a length of 0 bytes. */ emptyFile = runCommand "empty-file" { diff --git a/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix b/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix index cd4a8b2462aa..08916f3e561f 100644 --- a/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix +++ b/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "scheme-manpages"; - version = "unstable-2023-06-04"; + version = "unstable-2023-08-13"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "d5fce963985df270cb99d020169b4f28122e6415"; - hash = "sha256-snODSEtH1K/X0MakJWcPM40cqLUA+0cbBkhAHuisCyI="; + rev = "c17abb7dfb733fede4cf776a932e9696ccc7a4f2"; + hash = "sha256-9s/1sJEA4nowzQRpySOFzY+PxiUdz1Z3D931rMet4CA="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/data/fonts/commit-mono/default.nix b/nixpkgs/pkgs/data/fonts/commit-mono/default.nix index 87d5f9dab25f..1d67beb8a240 100644 --- a/nixpkgs/pkgs/data/fonts/commit-mono/default.nix +++ b/nixpkgs/pkgs/data/fonts/commit-mono/default.nix @@ -4,11 +4,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "commit-mono"; - version = "1.132"; + version = "1.134"; src = fetchzip { url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/${version}/CommitMono-${version}.zip"; - sha256 = "sha256-a9zxzjfOFmqemSIb4Tav0l7YtKvbyizDy+1dwPuZ4d4="; + sha256 = "sha256-r2+ehmJPwiodVZGnha8uMHaWcbbONiorrOvv6WW/kio="; stripRoot = false; }; diff --git a/nixpkgs/pkgs/data/fonts/hack/default.nix b/nixpkgs/pkgs/data/fonts/hack/default.nix index 6c6bd1918dbf..e39815a2e153 100644 --- a/nixpkgs/pkgs/data/fonts/hack/default.nix +++ b/nixpkgs/pkgs/data/fonts/hack/default.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm644 *.ttf -t $out/share/fonts/hack + install -Dm644 *.ttf -t $out/share/fonts/truetype runHook postInstall ''; diff --git a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index c09cb562b763..63c7f294d3c2 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "26.2.1"; + version = "26.2.2"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index 507f342725b4..8120eda2553b 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "05kmsx5nfllnynq85m4s9smdq0zqxv2gg3k5xd67ba9c0gkyxx17"; - iosevka-aile = "11qbl5np9wf5n5yy2y6vf830bal96a2lkdhd6xv65b1kqsz6n5bp"; - iosevka-curly = "1hdr93lfm8mmm3rr6s13vvacp5h4xqyqkr2a6zl18dgm27rhp7gn"; - iosevka-curly-slab = "0yp06p379n6x9zkh9ljg1n6ia1ydm93cnp5mw8yapnhk604f4cn3"; - iosevka-etoile = "1yn743abmyifci72jsmr71swkqdy35whcs36b0a3ypakm7qlgkl9"; - iosevka-slab = "0d7972ja8flg09q28qh36v4xfavnffn2g4zjkgrzm8pxgz3skzwb"; - iosevka-ss01 = "0ir5dgw8qqzzlihvicmzplvhd4hhlja2986ppyrj8kwkbhjrczry"; - iosevka-ss02 = "0j5vrhd48hrql1jz9bdf1lqzdg7cv4nb7snl82sh4f19h2k2f2a2"; - iosevka-ss03 = "15n5kin4p31czns8l3g29hia17c8x61b55n27qbknfb17yici7g9"; - iosevka-ss04 = "1zaba7z85k75lrh8x46x77c0hp6145dpg1shh05lmgvmgzyx3s02"; - iosevka-ss05 = "1ybwb3k9gj5icc8qngzlwxvk306xssz3ax7nqlgr1kij1wawbcd7"; - iosevka-ss06 = "0d7p2kvpr3x4mlh28y13ph8v7xmziyvrksy7m4zkpll0mkxxrcc1"; - iosevka-ss07 = "1pbvikwa1nrr91aq2an9bav4allxks29ghpss6plm01c2czkjqs3"; - iosevka-ss08 = "1ilmlqbrxaz9rpparyq7lhg4c6i0hmd4az049js7rq7nif071dhb"; - iosevka-ss09 = "0f9fycpsq6fqg7x451bca5cfwwnbswmv39sl2i7ia36kmmlsbarm"; - iosevka-ss10 = "02k9kra2wqjylvblngv1v9qxfw82yhbrk5vx96bfc16jllw6pk69"; - iosevka-ss11 = "135v3i6am7hd4iwpf1yj3jszpfyzv4n900wgiqy46ld4qdlvyj0b"; - iosevka-ss12 = "032slrybd0bdnbsrsz2k7p153dcfi6064zhg292n5fk0whv712vg"; - iosevka-ss13 = "1qm8gk23ix98ciw1xn6kmwq8x3fcrg9yq1rn71v219n0jyria053"; - iosevka-ss14 = "1s34fva3bq0m0chib56bj085rwgm4d21grhnf9ca4af01i91lvdh"; - iosevka-ss15 = "0ikd1lfq8xiyqyppxf8hbvsvqdf0fg2g0056qxqa2w6nvw3f70cf"; - iosevka-ss16 = "0baada586j23mxjl6ail4fdp9p9swrnwi8q5w6gh25kgbr2gf3lp"; - iosevka-ss17 = "143ydszlic3byk5ps4ysaql72d7pmdzlhds9dcpy6bcv2m5b1bc2"; - iosevka-ss18 = "1vrpa1ah718jn5xn72r7j26mka656ik1bb31fah3vlridzkjqyxx"; - sgr-iosevka = "1f2d9d7pyq916frhr5qlzr5hjwjkfpsqcpgp1p0f2g7z4qw8rr2z"; - sgr-iosevka-aile = "01aym5ykddkypafsj2186plfp9qm0nm5lbj5vra6yiwxmac3s0fi"; - sgr-iosevka-curly = "13nklbij304vch9xcqgvcwcdchzrf010iln5022am23ny1ip13aw"; - sgr-iosevka-curly-slab = "0x2n86ysvph7cv2r5m8lm3xwhq4wds2dv2mjcs8nz66n88hvwk8i"; - sgr-iosevka-etoile = "0c3pfgwlj5nw4xpbvigwjx8z47xxkpikzyaq8a8klabymyvjg0nj"; - sgr-iosevka-fixed = "1bvy9dv70ywkdhv6jj12mqbi95ljgr6068dmi31ds5rx7cflfrbq"; - sgr-iosevka-fixed-curly = "0lcizhf935an59hrr71nrk6x0aqy0rw4xcb7n583gm8svkpkhrfc"; - sgr-iosevka-fixed-curly-slab = "0fz6q3wnk0yniyhpsm07z94s61jc46rps4925wg1nxriyl16fd21"; - sgr-iosevka-fixed-slab = "05p989w89arj8fylqdjkby9c7jdadnm6yc8xjjwj81wpmlv5is02"; - sgr-iosevka-fixed-ss01 = "0krq1wamxxcqcfk13fsdi1n2wcxvrx5kcfr95dwmddyhr46f6c8g"; - sgr-iosevka-fixed-ss02 = "0n9pfa8lfisbz0cgrii2d18sq7bfrg4gbmj4d4ncq2zxcq63y52k"; - sgr-iosevka-fixed-ss03 = "0xybkybnmqqjkrapm7sm6nr3n7f68chss1rbxp966l7bnq17zlwn"; - sgr-iosevka-fixed-ss04 = "0hs0jhfnc68xvvzmmhmc32rv4b16qiy21dv0lnrpjwc8hwqww661"; - sgr-iosevka-fixed-ss05 = "1kxcadk3z362paqian2pi9nv64k35xhhqd6jw52837g4gmq2l6cn"; - sgr-iosevka-fixed-ss06 = "0d3lx7s99j5bcdkc4a3w0axv1arlj4xrcfffa3a0z1yvj587c1gs"; - sgr-iosevka-fixed-ss07 = "06cr5h81vzchg2kx980rnw9g8a0iyxs89p15xai1fwjz8v18b6q1"; - sgr-iosevka-fixed-ss08 = "1ygni8kdnr72m4dlm0inj49x00gj6m09569sk7x1v2q840hlbka4"; - sgr-iosevka-fixed-ss09 = "0n96481gn66cs7fy43l172f0f5llysny5a8vn9p1gqr30pkjsb1c"; - sgr-iosevka-fixed-ss10 = "1dd4jwnv8s8h2r4rrsdr3fzhck86rbxz2n3cmqk8ns0ysi81a9j7"; - sgr-iosevka-fixed-ss11 = "0xaxzl5wv37dypp97wvi4pv3dzlln6pw5y7lf9jqyfxlj9nkx14m"; - sgr-iosevka-fixed-ss12 = "1lisn7jrfm444309hbf6cyag54hs7gxbdvcs8z92c3v3xl8382j1"; - sgr-iosevka-fixed-ss13 = "1lvkla942w36plh5bzwi45zw3a8cixa61kyw5q6pj69yybp6hp49"; - sgr-iosevka-fixed-ss14 = "11racg8i508dgap2pq0rvzc20612d7px7yajsqd7y3mlf8311920"; - sgr-iosevka-fixed-ss15 = "0vnhp6rm1gd7g9140lgjbpckl6ysaf4cza2h3p2i1m2mxyq8yfi3"; - sgr-iosevka-fixed-ss16 = "1xkr6afpjqgjj55a8lmzzhfld66iqszh1dig8balg5s95gm6ylnz"; - sgr-iosevka-fixed-ss17 = "06q9w6vx6dhlfnjs9hsa9k8fzd9zb9v65d9jfwfdzp54i2asrac9"; - sgr-iosevka-fixed-ss18 = "13vcnny1a0yikimajqjvc9yadrh2l98qm1bnpmpc9fny158n5nks"; - sgr-iosevka-slab = "15pj76l27g8n93f1bdn5fs3csfhlvcig11hz0x85ffwc8i8dgx60"; - sgr-iosevka-ss01 = "0x09g6hz70jrijw86s4l2cpff8ln5aljs7p8675wjc2a3lwj3d3j"; - sgr-iosevka-ss02 = "10dsvi9k65ijkhrxkm2zwmipsq74yh0wgxham70bc3rb323w5vzq"; - sgr-iosevka-ss03 = "1zccin0dj2w7rykhqb7w30rvi96gp086wln0zd40i10ah8yqw8x7"; - sgr-iosevka-ss04 = "1hky2b7ls5n3pb0jzgrxfsly126f770jysvfkcq37bpb0f14wrhj"; - sgr-iosevka-ss05 = "076v20qzcf063hdnx145iwapn884hwcim5ws0qx9qh7l3im9s5w2"; - sgr-iosevka-ss06 = "1z2qi8crsvxryn3gxn63zw67hm9fz8rygkjypw8nvbz2p64axif5"; - sgr-iosevka-ss07 = "0v2cgifv6ic2cn1c6rd8lsjiz34rmp6n3flwiq38px9pra0yh7rz"; - sgr-iosevka-ss08 = "1s7nhfznyz3hqwjh6xs1bkph9s0g7kwd54h2hx5mkagk0cg2xya6"; - sgr-iosevka-ss09 = "0j3ny30fnbr1vgcfjssln9ry8kpn8yq2nn9gi2x55cxi1gwgnbpl"; - sgr-iosevka-ss10 = "0wksbv2fj4nw452h7d5nw8gq4vwjhxrw4hxr44xrk4skkwwaakzn"; - sgr-iosevka-ss11 = "1azscl182xgfx6993rwwbhxbx4pswwwmwbarxmc775668ydifb73"; - sgr-iosevka-ss12 = "199qf4vmyjql2f1gnqdwsvxgyf8c4nyr5rwyb6d3zwz5kbqdk9cv"; - sgr-iosevka-ss13 = "0n9s94x5j3gkzcgw2w3lqphm487xs8x10nklwlz24wh6mxp6azza"; - sgr-iosevka-ss14 = "0dmnd7cfdxv9hbz3q0bir0csblkzpwfqwcz05y4b79f1fjjahiag"; - sgr-iosevka-ss15 = "036syp2d0w4gy5j7dr813amvaw2b0kr3v6175vv8y9xgy266ldv0"; - sgr-iosevka-ss16 = "1hcalq0bvpzd6jq37pqxqjmnh2wmwvmc54fajl03rkw0spf8c4j1"; - sgr-iosevka-ss17 = "154fg69nadpjd5pmnlxf6bbg86w6zpk1nvm9h604017llgz8iwqa"; - sgr-iosevka-ss18 = "0ywrj6hmhk0hp5kcdy3i6989glbd1g62s8lr2kixbjm4g27d83hd"; - sgr-iosevka-term = "12v6im4q77cs6c2ff0dfsis2zlcphcxwqjsbpvl9x9cziznv7lnv"; - sgr-iosevka-term-curly = "1999vm3y28xm6bcp3s1fksvhs8rggra6i5rfxrsh69fy4i5l7z8q"; - sgr-iosevka-term-curly-slab = "00xjqkilsrykq7my2rh046q1qdcb110dd2lyz0kq40wl1ipxxyy3"; - sgr-iosevka-term-slab = "174kyc58rb5zrrxqhkmn5ili6vlbffa4n8g68faygajmjqajnr52"; - sgr-iosevka-term-ss01 = "01l0siyzrwz56m9w8zxf9n09rv1mh0j4l6jqr6vdzqqvgj6h7k5z"; - sgr-iosevka-term-ss02 = "19rl3pxhs1g2mwfsp64krnfcfkx5x7qfja3fx5h74r1jm3p8insv"; - sgr-iosevka-term-ss03 = "04vzrfbrpb0xssr6y1cyysfra2z3g9hm4jn65rzcavmd3i1azj7d"; - sgr-iosevka-term-ss04 = "08zwnsb1d1x5rmbssyknf1fxcc14bpvcjr6qcl8igpi03bpwag27"; - sgr-iosevka-term-ss05 = "0ichgg8vfifpnd4sjj2f1snphgxk4cqpd7p3w8dbzn1bp7633jna"; - sgr-iosevka-term-ss06 = "1kdrbq0m1bdfbxwqlfnmvi98dzplc27p10jgbh877b300dpzwmap"; - sgr-iosevka-term-ss07 = "099aicmxxa3criq768ycgkcm00b6mssxjavwzc3lkq37vic55y80"; - sgr-iosevka-term-ss08 = "125m0rs16nnvxkldk8vdc7g04lb29ha0a9ip9kway460wvmjqv9x"; - sgr-iosevka-term-ss09 = "12r3dqm4y19fyd8dqxli1y8wg5cs2qmmngqbkwb66kxbx1hhgpbs"; - sgr-iosevka-term-ss10 = "0xyfllwx2m5ngr82wn2fvlbz7kj3qwcnqz43l3cfvafl54zppl4z"; - sgr-iosevka-term-ss11 = "0sa5pp8fz2fb0d4k8rln0d4l0h1mqz6rvhrcfg49ds84g28380ls"; - sgr-iosevka-term-ss12 = "08ni5rgj4gfpmalqblz5ip36a8wffk9b9igaj6grmhc8q16i88sl"; - sgr-iosevka-term-ss13 = "0zmzjzhrk2y18jk3m5pb7f2mz1dr9sdrs0pbw20kfsr70km3mv54"; - sgr-iosevka-term-ss14 = "049yr8s9adawgrqi4z5qy3xz6pbcafvsw9sd6kb0nrgv8w5y6gd1"; - sgr-iosevka-term-ss15 = "1cyzj976697m452ifvr6yh8ng9wzfs38xlqwcmy26kk5n4dm2xy8"; - sgr-iosevka-term-ss16 = "0lg9sz029hw54v6qmbv5z80gxgic6zlva4yb0jpnajn8jj9zcdam"; - sgr-iosevka-term-ss17 = "0lpynm823jrlbs3qvf5apvnzk4h8bc8axqn3cifcd419hq25n55y"; - sgr-iosevka-term-ss18 = "12bx1d9lmdv9ljqqjmkq2rjpl4hh77c616xyjx4x2q79apznf56n"; + iosevka = "14ba5s1x31cypvqlw7qlqpk1sj70sxdj6fkjwbzjmnl1q7j36sja"; + iosevka-aile = "11dd3ihij89fdxpqb0ni40gq43nzrilpw7s3nq7f1ml0dh6a0r7m"; + iosevka-curly = "1ay28cgjhw0fkp76ja5k3mks8cl5wxxzsb505jvjxxn2k48nw1lw"; + iosevka-curly-slab = "0k47hk9xfamrnfaq03is559nlmzk9cdsplm393ldh921ysx1sr69"; + iosevka-etoile = "1big9dlwdc90ld9y0sxvhrxnny8lwgihrijwc7m22js2mlvddgi4"; + iosevka-slab = "00dmnxzwmm30946rlj1gl1zp967srr238kvg1r8krk1xz2a15cqv"; + iosevka-ss01 = "083dbc3g46ivz6ywxcnyqhfr39j3gb7l74brk9afaz9nb83qlkp3"; + iosevka-ss02 = "0xcya6428cdky0gygc5i30yl9jkhw9h66ln7vlnf46jw4pkh4dki"; + iosevka-ss03 = "08fg2wiq1rzn3cz4ihn3i44n3ck5i0azr45bf0gjcisizg1snxma"; + iosevka-ss04 = "042bldpbdhv0rgzpcmsw1q6wqydb01imfwdrvjg4ylpy1vr4aclh"; + iosevka-ss05 = "1fq4drdvzq4avwmndky686x6x6vn4clzvp87mcacvfl4c5ambcvv"; + iosevka-ss06 = "0jpih8gjxhrpr5lhy5q5y51jsmw8n62mmkghaqnn1n4crbsp2adp"; + iosevka-ss07 = "0qv0qflf90acxdqr1ypfah66jijhhbhjj2nn774rys60nfphc0bv"; + iosevka-ss08 = "09hinpg6i5ghqjmvfashih14rfnp3z08v4xyan5wrkh6cyf5nnmk"; + iosevka-ss09 = "0q31af86j6wc9p5dzl76kxwr49xp0pg2a9fk5z6z56yfr8dxrc0c"; + iosevka-ss10 = "0a6wi64vafs2s5cl9px4dvrqwnjjbmw1s57g8w1jgqi7k64iara1"; + iosevka-ss11 = "19rmicj0m4i5vjhi8g4w0n2cxmnl6ssyfivgg77w6h1rx7cyfi62"; + iosevka-ss12 = "1nj3388x6yl15qg8xvzqdcp454j9wwyi3w64yvis7f22bmd288rh"; + iosevka-ss13 = "0rsf55vhkv3vx64sb9riwq711yygwiism2i956xld44x57a80b9h"; + iosevka-ss14 = "0685b5n7jl4ijf2a64v6sbxzmkaqd1rl1m6yl8ls9ppxph3pps5z"; + iosevka-ss15 = "04nbq5hrs6g7br342h4px0g68wrgdi7021znfgbmrj0ic32b3nyn"; + iosevka-ss16 = "0yp4iqz4zy3z5lwv8dfchf8qiykwa3l83dl5ipq7ci1wg3wpfppf"; + iosevka-ss17 = "1iiysz3hppfshm2yjzsfvg8gs79jcnf63lirxi8vca5afl72mhfk"; + iosevka-ss18 = "0c163m25ihan3rv1bvf7js6nhs5v19yrif7rsbjz954izp328j3l"; + sgr-iosevka = "001nm77n3599xn4ns3kaisyf1a4msmhnfcsh37k6bik621k673jl"; + sgr-iosevka-aile = "04qfjvhh5rnqbyclrw62naaw98vl1py77wz5nig7gq8yv1zm1m3x"; + sgr-iosevka-curly = "1gxbckamfyrg5spvj3fd6zrsz12cvfrd9mwr39s4ric23d9qcak5"; + sgr-iosevka-curly-slab = "0hpxia5x6pmvd6sn7ny1wnj8pq07apvaj1767iqgva6gsblf3ddw"; + sgr-iosevka-etoile = "0m4j1pjmzb416kvrzvifzv1h0rcq2pzzhyyzbzamcixkwafqgbqg"; + sgr-iosevka-fixed = "05hpjfb7w5zfdgjrpk243kc8gk7a59smzcrf3lc9sa8j4wf9y4ap"; + sgr-iosevka-fixed-curly = "1i1ihxqh99akjris5kiwspaqjjxbl3h5p4c4kxrd9j9n984q4i5y"; + sgr-iosevka-fixed-curly-slab = "0xmq3gxgv5pn8ys155kk3lwz9vcnbbj7mxhz96cgr2gjgby59b5a"; + sgr-iosevka-fixed-slab = "1pvjvwdapjwrc7vgmvvz0j6cvki1g99qzbw1kgpy9vh6kvl57nm1"; + sgr-iosevka-fixed-ss01 = "10fsl8w9kbb5vy9yj9qzyr5d6bkw1d0sdkbyvwhlynirc1nqfx8k"; + sgr-iosevka-fixed-ss02 = "0f235lz8j1s6xp99cikmf52ji9px0vrryld7qs3gasjjnqkrnl1z"; + sgr-iosevka-fixed-ss03 = "10jmd2xxy6xwkk6ckmn5qa4x0386krvhkpic6yp2bwmh3jrq10qw"; + sgr-iosevka-fixed-ss04 = "1jb6hhrciaxzwcv8n3zfh9s1ars052ssczg94sxyvaddh09qp5y0"; + sgr-iosevka-fixed-ss05 = "1jv2q3wqh7v6b53sf4ra40345i6i6yx9b2qj59jazlvlc0nindnw"; + sgr-iosevka-fixed-ss06 = "1kxnphz60n71l86x200xh6s45xb6fhdawrxvi06r7pnza027ckaj"; + sgr-iosevka-fixed-ss07 = "0asajsgrq5nj0br4d3f814kfm2lfwip33zl2yssm7z99f1kn7dzq"; + sgr-iosevka-fixed-ss08 = "0jclw1cqgxhm32zwv7ybbal7bnlpm1k0v15fz42kvf1abbj2k6mv"; + sgr-iosevka-fixed-ss09 = "0a7nazrysbvf1jyqdlk25wswhzvv8mcakjdgckjlpv65hq1fqdzw"; + sgr-iosevka-fixed-ss10 = "01l07jxhksqyb2wnljnpwpcqxaizcdbzaycq31mkv63aqmcz91vm"; + sgr-iosevka-fixed-ss11 = "1r67pfmirm43mzz9k7asaif15x43iny5qbds0wjx2z12lscpnj16"; + sgr-iosevka-fixed-ss12 = "1g4fk496npcix5q4alw1qcqd0w5iyamlg6vv82nk20axrb05gisv"; + sgr-iosevka-fixed-ss13 = "060pmmzwcfkv517r6jwz5kq0d4b3ha5bzlf4agg8b5d5003didwg"; + sgr-iosevka-fixed-ss14 = "0f1w5hcaw933jb6v4zmgvgan4k02mfhwzvyrgxyaq60f0gl8456d"; + sgr-iosevka-fixed-ss15 = "0isw2xpv8zfp145zlnf2gxbdnc54zyn0s7nvsck2qwh6ah1mqiwy"; + sgr-iosevka-fixed-ss16 = "18cwq0zrq5ih0ijb7bp8f7zvdzg5ni3pmiw18g9p2zkrswyahgnc"; + sgr-iosevka-fixed-ss17 = "0d1jbj65n4wj0d549sramf6d3jgx2hrfac7m00m5rsfrlg3l9xg3"; + sgr-iosevka-fixed-ss18 = "0iv1wwa1333v3prc3ykms6z454ypmasi8n419xl6c71n4f3haf1s"; + sgr-iosevka-slab = "0zfxx0wp00l80skiimlikibsw9iy9lq86s5jhz1dc59g2bldvqdx"; + sgr-iosevka-ss01 = "0k17663haxcnidmi5hkk9w2hmhxjxj89h4cwby1wrc52zlj491cb"; + sgr-iosevka-ss02 = "1aqsi8xa0napzsdvmy39msy8fj4nf5an7bsxwj7dgpm9p0irdncq"; + sgr-iosevka-ss03 = "0zhx2r3f55628brvz973nsikafx23m4mjw5lyzlqgig1d1d2jd58"; + sgr-iosevka-ss04 = "0ls91yih8plwgi9a00iwrxk21y8psjv7bjlzncw5fwhcyp6l8xjh"; + sgr-iosevka-ss05 = "15qabrrd2ldrkksbgifdx19zcq4hcvwvwnj7k3bga4p56ymh3jrq"; + sgr-iosevka-ss06 = "03zh49jnsiqpxi3j4f82as6c0wm14c9lnvvjq7x4q9xn6hgv87w1"; + sgr-iosevka-ss07 = "0y4m22rrqw3sq62yhrraajcqdrwpw6g3wrzcn24d66z2s0zlsk5i"; + sgr-iosevka-ss08 = "1nsx2f1572i5zj78v60mryiwiaxaj1rqmgwp8bpn95j6v45q3jbq"; + sgr-iosevka-ss09 = "04p0vbl0aa7q761a0mrkgfhv1iy3ppj5hlmr91ppc8ygc3qyy7lx"; + sgr-iosevka-ss10 = "0la09xfllcxdvhbl2r912af900w86lsxw1wz4nfaf6sx0cmq0qly"; + sgr-iosevka-ss11 = "1ivg46g0mhb27mky6ivdijq3nnx5ix2w25nnbhfl7bw4fa0yvqzr"; + sgr-iosevka-ss12 = "1v7kf3d2g52qp4jlhc6b0iqd4jcbx8fj7cxgj86nj50q7g2i2kan"; + sgr-iosevka-ss13 = "050myw7bqi8fjbc3w5wd2449gw7jbciqc0lziyc1z9rds6yihm7x"; + sgr-iosevka-ss14 = "05ligav2dp5hqk8lri8bqpklrj6s8mah5ivmclwcyd2dqpj1m2c6"; + sgr-iosevka-ss15 = "14acj64zw46fbq4d8hqx7vvd6anizg90slszrw0zpqlcp7nc96ks"; + sgr-iosevka-ss16 = "12ykdlsmax302mxrdfaas1xzrn5532dswpc2444gwfp3hzawc1df"; + sgr-iosevka-ss17 = "123xakjnvb9k0wlxgya6d7a79kyaxcdx8hdwkypv7v5b162xbnvp"; + sgr-iosevka-ss18 = "0chbcs283j4clxvx6x72ckkfp2jqklcvswn7kwm4y7yjc0fc1xqc"; + sgr-iosevka-term = "0y5kwfxn4gxqwbav58l43pcd6qspc2pakjqyhhm3202i6j1hw46w"; + sgr-iosevka-term-curly = "1ixspd969sk4af9qvmws17zmlxp1jgizbaw3549pjwwwagk4jx6p"; + sgr-iosevka-term-curly-slab = "0j326l33m4bdkwcjwiidn6liqdihm1d1kb6ccdnkmqw18qfj8hw0"; + sgr-iosevka-term-slab = "0l01nzfz1l379w73vxyjyamjqyrqp9xznkd3gy6zljzky8n1759x"; + sgr-iosevka-term-ss01 = "1fyrzd9q349q2hd4y2xchsvw2h87j3szyqyga88dasskx30z7v3q"; + sgr-iosevka-term-ss02 = "0d3wbc027p0jzajrs1vkn98f0ivl0w0p4wvkdvq2f042z4jagmm7"; + sgr-iosevka-term-ss03 = "0n3034kvwbc55gawm358g5aacpnp81krkm1d5ypacb508pjgjdyk"; + sgr-iosevka-term-ss04 = "1jdsan75k60n3w3mrgs9ciqr597jv9dgs2y99hkpdirqxfixyhga"; + sgr-iosevka-term-ss05 = "0p57qlkzh6y10klhrxfa9x1iccjn6jfq3974irhki0r6b0y0bsj1"; + sgr-iosevka-term-ss06 = "05mq1r01dnkh40jjrgj0lskqsqfcnqqzz9ssqbcbf3cihfrwfc28"; + sgr-iosevka-term-ss07 = "0gkwx1yw2ajcgnj8iifhzxcwpf8f9afs1wl240kfzwsnlr4gzr80"; + sgr-iosevka-term-ss08 = "1173gg7pfpwq2f8rq664l5l3491sj2q3i33gyr1cqpmcsfncnv1i"; + sgr-iosevka-term-ss09 = "12p3a68rd5a3s0z2vf6gbrm2jm2q4drlwb7v7jkrxyi7idhw26fi"; + sgr-iosevka-term-ss10 = "10mwk14v9d8cd162pm237hs5kkyi7vlg9dwj63i6q2a6xjlqmcdp"; + sgr-iosevka-term-ss11 = "0s055c7hmjva7sb4rm1fiwbbkwcrxh4qlzjxhqla8n2cwdyd1r08"; + sgr-iosevka-term-ss12 = "00g7038p7d187zz3sf87px6qzg4dsrcyfzag8a7r3wj84v1msx5n"; + sgr-iosevka-term-ss13 = "0v38d2jhvbd63f47krvg840v5f8cddq0imy62bfaknvp8lmdl1rl"; + sgr-iosevka-term-ss14 = "022y7rz00vjk5xhqi6rmp5mpj2gzayi9qam93ymrhk2nnm26fpr1"; + sgr-iosevka-term-ss15 = "1sr7qlr0jd5fi2avkag2ls78n37ddmfqa00jb38bpas4rcm2c1wb"; + sgr-iosevka-term-ss16 = "0wj51pvx4ijm27afh85bhw3cdhczrxhkzdnhbl18rjccvxyy121q"; + sgr-iosevka-term-ss17 = "1dcby5m73a679vl8q5ipxbqby9ivknybyjx3z24z53w5h2ad4s5p"; + sgr-iosevka-term-ss18 = "114fpyh2slwv900h7zwm07rzcx97k2153fxvnbbnyjgjhlpdkbjv"; } diff --git a/nixpkgs/pkgs/data/fonts/lxgw-neoxihei/default.nix b/nixpkgs/pkgs/data/fonts/lxgw-neoxihei/default.nix index 3632656ade81..5bb0924f0a12 100644 --- a/nixpkgs/pkgs/data/fonts/lxgw-neoxihei/default.nix +++ b/nixpkgs/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.103.1"; + version = "1.104"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-z9SzSt+GXV+9GLtzjY6EQQa6bKrixYo03kEfzGfug90="; + hash = "sha256-R2b3zc+BwX9RvabqxXbRRHV3kKh5G1bnGg0ZP4BnBMI="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/data/fonts/maple-font/default.nix b/nixpkgs/pkgs/data/fonts/maple-font/default.nix index af4746fa2c46..a90a1e830171 100644 --- a/nixpkgs/pkgs/data/fonts/maple-font/default.nix +++ b/nixpkgs/pkgs/data/fonts/maple-font/default.nix @@ -5,10 +5,9 @@ }: let - maple-font = { pname, sha256, desc }: stdenv.mkDerivation - rec{ - - inherit pname desc; + maple-font = { pname, sha256, desc }: + stdenv.mkDerivation rec{ + inherit pname; version = "6.4"; src = fetchurl { url = "https://github.com/subframe7536/Maple-font/releases/download/v${version}/${pname}.zip"; @@ -17,7 +16,7 @@ let # Work around the "unpacker appears to have produced no directories" # case that happens when the archive doesn't have a subdirectory. - setSourceRoot = "sourceRoot=`pwd`"; + sourceRoot = "."; nativeBuildInputs = [ unzip ]; installPhase = '' find . -name '*.ttf' -exec install -Dt $out/share/fonts/truetype {} \; diff --git a/nixpkgs/pkgs/data/fonts/openmoji/default.nix b/nixpkgs/pkgs/data/fonts/openmoji/default.nix index c9722f60f204..fd0d8882059c 100644 --- a/nixpkgs/pkgs/data/fonts/openmoji/default.nix +++ b/nixpkgs/pkgs/data/fonts/openmoji/default.nix @@ -4,6 +4,7 @@ , fetchpatch , scfbuild , fontforge +, node-glob , libuninameslist , nodejs , nodePackages @@ -59,7 +60,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ scfbuild-with-fontforge-20201107 nodejs - nodePackages.glob + node-glob nodePackages.lodash ]; diff --git a/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix b/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix index fd3372123c60..5d7cc57a4b43 100644 --- a/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix +++ b/nixpkgs/pkgs/data/fonts/roboto-mono/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { }) ]; - sourceRoot = "./"; + sourceRoot = "."; unpackCmd = '' ttfName=$(basename $(stripHash $curSrc)) diff --git a/nixpkgs/pkgs/data/fonts/rubik/default.nix b/nixpkgs/pkgs/data/fonts/rubik/default.nix index dec500c119f1..c9e20fa6351a 100644 --- a/nixpkgs/pkgs/data/fonts/rubik/default.nix +++ b/nixpkgs/pkgs/data/fonts/rubik/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation { }) ]; - sourceRoot = "./"; + sourceRoot = "."; unpackCmd = '' ttfName=$(basename $(stripHash $curSrc)) diff --git a/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix index 52325798033e..d6ca206b20a1 100644 --- a/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.08.09"; + version = "23.08.16"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-YLr5WQox1TzGxRZGJf7NzFRhkNIPJaYFyOYwp9MfkDQ="; + sha256 = "sha256-FXWue9CiX2zh7FXLnlG+SOto2Z4oznWNYpgZlMvVGn4="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix b/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix index 3c21a6f29560..24078799eb73 100644 --- a/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix +++ b/nixpkgs/pkgs/data/misc/unicode-character-database/default.nix @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { unzip ]; - setSourceRoot = '' - sourceRoot=$PWD - ''; + sourceRoot = "."; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/data/misc/unihan-database/default.nix b/nixpkgs/pkgs/data/misc/unihan-database/default.nix index fc0826d7f283..1dbc17463f19 100644 --- a/nixpkgs/pkgs/data/misc/unihan-database/default.nix +++ b/nixpkgs/pkgs/data/misc/unihan-database/default.nix @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { unzip ]; - setSourceRoot = '' - sourceRoot=$PWD - ''; + sourceRoot = "."; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix b/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix index 8b9fd0470569..eda7ba8c5543 100644 --- a/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230815132423"; + version = "20230825070717"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-rz7oxcmIQJ9cM7KbQ+zBcBmggGhhhGFad9k0hGLgVgY="; + hash = "sha256-xB+8WhFnaQ8YD99FcihqI58R8fxiBAzQK5b4VVdWbMo="; }; vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; meta = with lib; { diff --git a/nixpkgs/pkgs/data/themes/where-is-my-sddm-theme/default.nix b/nixpkgs/pkgs/data/themes/where-is-my-sddm-theme/default.nix new file mode 100644 index 000000000000..8151ca0cc133 --- /dev/null +++ b/nixpkgs/pkgs/data/themes/where-is-my-sddm-theme/default.nix @@ -0,0 +1,50 @@ +{ lib +, formats +, stdenvNoCC +, fetchFromGitHub +, qtgraphicaleffects + /* An example of how you can override the background on the NixOS logo + * + * environment.systemPackages = [ + * (pkgs.where-is-my-sddm-theme.override { + * themeConfig.General = { + * background = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + * backgroundMode = "none"; + * }; + * }) + * ]; + */ +, themeConfig ? null +}: + +let + user-cfg = (formats.ini { }).generate "theme.conf.user" themeConfig; +in + +stdenvNoCC.mkDerivation rec { + pname = "where-is-my-sddm-theme"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "stepanzubkov"; + repo = pname; + rev = "v${version}"; + hash = "sha256-kW6W8DELi9Xqn9xWLlcKmxk4tO5FKdApaYTZimQ+7B0="; + }; + + propagatedUserEnvPkgs = [ qtgraphicaleffects ]; + + installPhase = '' + mkdir -p $out/share/sddm/themes/ + cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/ + '' + lib.optionalString (lib.isAttrs themeConfig) '' + ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user + ''; + + meta = with lib; { + description = "The most minimalistic SDDM theme among all themes"; + homepage = "https://github.com/stepanzubkov/where-is-my-sddm-theme"; + license = licenses.mit; + maintainers = with maintainers; [ name-snrl ]; + }; +} diff --git a/nixpkgs/pkgs/data/themes/whitesur-kde/default.nix b/nixpkgs/pkgs/data/themes/whitesur-kde/default.nix new file mode 100644 index 000000000000..2e98b4165c07 --- /dev/null +++ b/nixpkgs/pkgs/data/themes/whitesur-kde/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gitUpdater +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "whitesur-kde"; + version = "unstable-2023-08-15"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = finalAttrs.pname; + rev = "d50bc20b2b78705bb9856204066affb763fa8a35"; + hash = "sha256-oG6QT4VQpBznM+gvzdiY4CldOwdHcBeHlbvlc52eFuU="; + }; + + postPatch = '' + patchShebangs install.sh + + substituteInPlace install.sh \ + --replace '$HOME/.config' $out/share \ + --replace '$HOME/.local' $out \ + --replace '"$HOME"/.Xresources' $out/doc/.Xresources + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/doc + + name= ./install.sh + + mkdir -p $out/share/sddm/themes + cp -a sddm/WhiteSur $out/share/sddm/themes/ + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "A MacOS big sur like theme for KDE Plasma desktop"; + homepage = "https://github.com/vinceliuice/WhiteSur-kde"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +}) diff --git a/nixpkgs/pkgs/desktops/budgie/magpie/default.nix b/nixpkgs/pkgs/desktops/budgie/magpie/default.nix index 15e59f801a23..79c13454eba0 100644 --- a/nixpkgs/pkgs/desktops/budgie/magpie/default.nix +++ b/nixpkgs/pkgs/desktops/budgie/magpie/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "magpie"; - version = "0.9.2"; + version = "0.9.3"; outputs = [ "out" "dev" "devdoc" ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "BuddiesOfBudgie"; repo = "magpie"; rev = "v${finalAttrs.version}"; - hash = "sha256-GoilHdESFgpwt8+Uqzrnf8jBpeaSak1uHTlkNcQdgtk="; + hash = "sha256-A8FmW2o2p5B5pxTZ6twwufyhfppuMXjnMKopZRD+XdE="; }; patches = [ @@ -124,8 +124,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs src/backends/native/gen-default-modes.py - # Magpie doesn't install any .desktop files - substituteInPlace meson/meson-postinstall.sh --replace "update-desktop-database" "# update-desktop-database" + # Magpie does not install any .desktop files + substituteInPlace scripts/mesonPostInstall.sh --replace "update-desktop-database" "# update-desktop-database" ''; postFixup = '' diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-music/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-music/default.nix index fe39459ec046..914e4e6671dc 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-music/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "deepin-music"; - version = "6.2.28"; + version = "6.2.31"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-rSaB8kIbpyPuhw3vWLWlXgY6xJpxLL8DktgcBoca0L0="; + hash = "sha256-OXyHB47orv9ix+Jg0b7wciA6DWUsXzFmIg4SM+piO3c="; }; postPatch = '' diff --git a/nixpkgs/pkgs/desktops/expidus/file-manager/default.nix b/nixpkgs/pkgs/desktops/expidus/file-manager/default.nix index 6c3285e1eb10..ef6d96e52300 100644 --- a/nixpkgs/pkgs/desktops/expidus/file-manager/default.nix +++ b/nixpkgs/pkgs/desktops/expidus/file-manager/default.nix @@ -11,7 +11,7 @@ flutter.buildFlutterApplication rec { }; depsListFile = ./deps.json; - vendorHash = "sha256-m2GCLC4ZUvDdBVKjxZjelrZZHY3+R7DilOOT84Twrxg="; + vendorHash = "sha256-7d8hsqXD7oqUN8VjQczSCyqytubDRq0os8wGnOfdSvs="; postInstall = '' rm $out/bin/file_manager diff --git a/nixpkgs/pkgs/desktops/expidus/file-manager/deps.json b/nixpkgs/pkgs/desktops/expidus/file-manager/deps.json index e1b391147a21..fa04b354c065 100644 --- a/nixpkgs/pkgs/desktops/expidus/file-manager/deps.json +++ b/nixpkgs/pkgs/desktops/expidus/file-manager/deps.json @@ -60,6 +60,7 @@ "dependencies": [ "flutter", "test_api", + "matcher", "path", "fake_async", "clock", @@ -69,17 +70,23 @@ "boolean_selector", "characters", "collection", - "js", - "matcher", "material_color_utilities", "meta", "source_span", "stream_channel", "string_scanner", - "term_glyph" + "term_glyph", + "web" ] }, { + "name": "web", + "version": "0.1.4-beta", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { "name": "term_glyph", "version": "1.2.1", "kind": "transitive", @@ -97,7 +104,7 @@ }, { "name": "source_span", - "version": "1.9.1", + "version": "1.10.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -115,7 +122,7 @@ }, { "name": "collection", - "version": "1.17.1", + "version": "1.17.2", "kind": "direct", "source": "hosted", "dependencies": [] @@ -148,50 +155,19 @@ }, { "name": "material_color_utilities", - "version": "0.2.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "matcher", - "version": "0.12.15", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "async", - "meta", - "stack_trace", - "term_glyph", - "test_api" - ] - }, - { - "name": "test_api", - "version": "0.5.1", + "version": "0.5.0", "kind": "transitive", "source": "hosted", "dependencies": [ - "async", - "boolean_selector", - "collection", - "meta", - "source_span", - "stack_trace", - "stream_channel", - "string_scanner", - "term_glyph", - "matcher" + "collection" ] }, { - "name": "stack_trace", - "version": "1.11.0", + "name": "characters", + "version": "1.3.0", "kind": "transitive", "source": "hosted", - "dependencies": [ - "path" - ] + "dependencies": [] }, { "name": "boolean_selector", @@ -204,27 +180,20 @@ ] }, { - "name": "js", - "version": "0.6.7", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "meta" - ] - }, - { - "name": "characters", - "version": "1.3.0", + "name": "vector_math", + "version": "2.1.4", "kind": "transitive", "source": "hosted", "dependencies": [] }, { - "name": "vector_math", - "version": "2.1.4", + "name": "stack_trace", + "version": "1.11.0", "kind": "transitive", "source": "hosted", - "dependencies": [] + "dependencies": [ + "path" + ] }, { "name": "clock", @@ -244,6 +213,36 @@ ] }, { + "name": "matcher", + "version": "0.12.16", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "meta", + "stack_trace", + "term_glyph", + "test_api" + ] + }, + { + "name": "test_api", + "version": "0.6.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "boolean_selector", + "collection", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "term_glyph" + ] + }, + { "name": "flutter", "version": "0.0.0", "kind": "direct", @@ -251,10 +250,10 @@ "dependencies": [ "characters", "collection", - "js", "material_color_utilities", "meta", "vector_math", + "web", "sky_engine" ] }, @@ -366,12 +365,12 @@ "source": "sdk", "dependencies": [ "flutter", - "js", "characters", "collection", "material_color_utilities", "meta", - "vector_math" + "vector_math", + "web" ] }, { @@ -434,7 +433,7 @@ }, { "name": "intl", - "version": "0.18.0", + "version": "0.18.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1010,11 +1009,11 @@ "characters", "clock", "collection", - "js", "material_color_utilities", "meta", "path", - "vector_math" + "vector_math", + "web" ] }, { diff --git a/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 5555baa92c3b..7c70759d0d5a 100644 --- a/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "44.3"; + version = "44.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-O+E7Ie66mp2jDmnfFtcYvrEw7b+9QG649AK/6hdBJgI="; + hash = "sha256-3admgmWnCVKWDElRnPv7+jV2gyb8W4CyYX8U/7LJuHM="; }; doCheck = true; diff --git a/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix b/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix index 8faa1615dc07..cfdde43ae776 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , fetchpatch , substituteAll @@ -8,7 +9,6 @@ , pkg-config , glib , itstool -, libxml2 , xorg , accountsservice , libX11 @@ -24,12 +24,12 @@ , audit , gobject-introspection , plymouth -, librsvg , coreutils , xorgserver , xwayland , dbus , nixos-icons +, runCommand }: let @@ -41,21 +41,21 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gdm"; version = "44.1"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; sha256 = "aCZrOr59KPxGnQBnqsnF2rsMp5UswffCOKBJUfPcWw0="; }; mesonFlags = [ "-Dgdm-xsession=true" # TODO: Setup a default-path? https://gitlab.gnome.org/GNOME/gdm/-/blob/6fc40ac6aa37c8ad87c32f0b1a5d813d34bf7770/meson_options.txt#L6 - "-Dinitial-vt=${passthru.initialVT}" + "-Dinitial-vt=${finalAttrs.passthru.initialVT}" "-Dudev-dir=${placeholder "out"}/lib/udev/rules.d" "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" @@ -131,21 +131,21 @@ stdenv.mkDerivation rec { ''; preInstall = '' - install -D ${override} ${DESTDIR}/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override + install -D ${override} $DESTDIR/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override ''; postInstall = '' # Move stuff from DESTDIR to proper location. # We use rsync to merge the directories. - rsync --archive "${DESTDIR}/etc" "$out" - rm --recursive "${DESTDIR}/etc" + rsync --archive "$DESTDIR/etc" "$out" + rm --recursive "$DESTDIR/etc" for o in $(getAllOutputNames); do if [[ "$o" = "debug" ]]; then continue; fi - rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")" - rm --recursive "${DESTDIR}/''${!o}" + rsync --archive "$DESTDIR/''${!o}" "$(dirname "''${!o}")" + rm --recursive "$DESTDIR/''${!o}" done # Ensure the DESTDIR is removed. - rmdir "${DESTDIR}/nix/store" "${DESTDIR}/nix" "${DESTDIR}" + rmdir "$DESTDIR/nix/store" "$DESTDIR/nix" "$DESTDIR" # We are setting DESTDIR so the post-install script does not compile the schemas. glib-compile-schemas "$out/share/glib-2.0/schemas" @@ -170,6 +170,18 @@ stdenv.mkDerivation rec { # Used in GDM NixOS module # Don't remove. initialVT = "7"; + dconfDb = "${finalAttrs.finalPackage}/share/gdm/greeter-dconf-defaults"; + dconfProfile = "user-db:user\nfile-db:${finalAttrs.passthru.dconfDb}"; + + tests = { + profile = runCommand "gdm-profile-test" { } '' + if test "${finalAttrs.passthru.dconfProfile}" != "$(cat ${finalAttrs.finalPackage}/share/dconf/profile/gdm)"; then + echo "GDM dconf profile changed, please update gdm.nix" + exit 1 + fi + touch $out + ''; + }; }; meta = with lib; { @@ -179,4 +191,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.linux; }; -} +}) diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 9d01f85e0efe..4716d217c261 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -7,7 +7,6 @@ , meson , ninja , vala -, python3 , desktop-file-utils , libcanberra , gtk3 @@ -29,7 +28,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.4.1"; + version = "6.5.0"; outputs = [ "out" "dev" ]; @@ -37,15 +36,15 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-s4Df2eLnr+RnbTwPzjt9bVA+xZ9xca2hiFdGlRUZRfU="; + sha256 = "sha256-E1e2eXGpycl2VXEUvUir5G3MRLz/4TQMvmOuWgU9JNc="; }; patches = [ - # Fix log spam with new GLib - # https://github.com/elementary/files/pull/2257 + # meson: Don't run gtk-update-icon-cache + # https://github.com/elementary/files/pull/2294 (fetchpatch { - url = "https://github.com/elementary/files/commit/7bd542fa0a646b5cb0972f5575c56a9ee4d9dce7.patch"; - hash = "sha256-C+oSx0xn3YPuwEC0K+3ZmKeQrroKreJo1tfcpLGQ1S4="; + url = "https://github.com/elementary/files/commit/758ece9fb29eb4a25f47065710dad4ac547ca2ce.patch"; + hash = "sha256-+OASDsOPH0g5Cyxw4JmVxA70zQHhcpqLMKKYP4VLTO0="; }) ]; @@ -54,7 +53,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala wrapGAppsHook ]; @@ -77,11 +75,6 @@ stdenv.mkDerivation rec { zeitgeist ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix index 69d52292f28b..cfcf4b8e8a60 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-iconbrowser/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, python3 , vala , wrapGAppsHook4 , elementary-gtk-theme @@ -18,20 +17,19 @@ stdenv.mkDerivation rec { pname = "elementary-iconbrowser"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "iconbrowser"; rev = version; - sha256 = "sha256-xooZfQmeB4rvlO8zKWnUuXPCFQNCTdjd7C53/j9EoHg="; + sha256 = "sha256-F0HxwyXAMAQyGRMhtsuKdmyyrCweM+ImJokN/KN3Kiw="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 vala wrapGAppsHook4 ]; @@ -44,11 +42,6 @@ stdenv.mkDerivation rec { gtksourceview5 ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - preFixup = '' gappsWrapperArgs+=( # The GTK theme is hardcoded. diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 2f904768f66d..79b1548c27f6 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-applications"; - version = "7.0.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-M9JMrxhMiDC/qrrnPaBm6Kf3CAkxrhGWwJF8jVm2G5c="; + sha256 = "sha256-r2JKiTewsLQSZPriC0w72CFevRQXytrFcO2VfA9BKHA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 2e5329701a0e..42e983da68f9 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -6,7 +6,6 @@ , gnome-power-manager , pkg-config , meson -, python3 , ninja , vala , gtk3 @@ -21,13 +20,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-power"; - version = "6.2.0"; + version = "6.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-TxrskbwitsilTidWifSWg9IP6BzH1y/OOrFohlENJmM="; + sha256 = "sha256-EEY32O7GeXBHSjZQ3XGogT1sUzIKGX+CzcGx8buGLq4="; }; patches = [ @@ -41,7 +40,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala ]; @@ -56,11 +54,6 @@ stdenv.mkDerivation rec { wingpanel ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 8342e2680747..660941d2b478 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -15,20 +15,19 @@ , mutter , mesa , json-glib -, python3 , elementary-gtk-theme , elementary-icon-theme }: stdenv.mkDerivation rec { pname = "wingpanel"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-dShC6SXjOJmiLI6TUEZsthv5scnm9Jzum+sG/NkWAyM="; + sha256 = "sha256-WU2TSMuR+RRleR6ZbIXymG31l2f8XLINPkh5X9rUDcY="; }; patches = [ @@ -40,7 +39,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala wrapGAppsHook ]; @@ -56,11 +54,6 @@ stdenv.mkDerivation rec { mesa # for libEGL ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - preFixup = '' gappsWrapperArgs+=( # this GTK theme is required diff --git a/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 28dfa434f7b0..aaf1519ceaeb 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -127,6 +127,7 @@ mkDerivation { ./hwclock-path.patch ./tzdir.patch ./kcm-access.patch + ./no-discover-shortcut.patch ]; CXXFLAGS = [ diff --git a/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/no-discover-shortcut.patch b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/no-discover-shortcut.patch new file mode 100644 index 000000000000..f186671c9cc5 --- /dev/null +++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/no-discover-shortcut.patch @@ -0,0 +1,13 @@ +diff --git a/applets/taskmanager/package/contents/config/main.xml b/applets/taskmanager/package/contents/config/main.xml +index 6bb27695d..25e621810 100644 +--- a/applets/taskmanager/package/contents/config/main.xml ++++ b/applets/taskmanager/package/contents/config/main.xml +@@ -85,7 +85,7 @@ + </entry> + <entry name="launchers" type="StringList"> + <label>The list of launcher tasks on the widget. Usually .desktop file or executable URLs. Special URLs such as preferred://browser that expand to default applications are supported.</label> +- <default>applications:systemsettings.desktop,applications:org.kde.discover.desktop,preferred://filemanager,preferred://browser</default> ++ <default>applications:systemsettings.desktop,preferred://filemanager,preferred://browser</default> + </entry> + <entry name="middleClickAction" type="Enum"> + <label>What to do on middle-mouse click on a task button.</label> diff --git a/nixpkgs/pkgs/desktops/rox/rox-filer/default.nix b/nixpkgs/pkgs/desktops/rox/rox-filer/default.nix index b05be287a89d..676e99b1a903 100644 --- a/nixpkgs/pkgs/desktops/rox/rox-filer/default.nix +++ b/nixpkgs/pkgs/desktops/rox/rox-filer/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; # go to the source directory after unpacking the sources - setSourceRoot = "export sourceRoot=rox-filer-${version}/ROX-Filer/"; + sourceRoot = "rox-filer-${version}/ROX-Filer"; # account for 'setSourceRoot' offset patchFlags = [ "-p2" ]; diff --git a/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix b/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix index f9e8c86b6310..0d80c6bd451e 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix @@ -58,6 +58,7 @@ let unwrapped = mkXfceDerivation { meta = with lib; { description = "Xfce file manager"; + mainProgram = "thunar"; maintainers = with maintainers; [ ] ++ teams.xfce.members; }; }; diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix index b479a574d97b..e716fab959a0 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-appfinder"; - version = "4.18.0"; + version = "4.18.1"; - sha256 = "sha256-/VYZpWk08OQPZ/DQ5SqSL4F4KDdh+IieQBDOZUxZvtw="; + sha256 = "sha256-CZEX1PzFsVt72Fkb4+5PiZjAcDisvYnbzFGFXjFL4sc="; nativeBuildInputs = [ exo ]; buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ]; diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 3c838df59303..1c0cd3f1474d 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -1,26 +1,44 @@ -{ lib, mkXfceDerivation, gettext, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: +{ mkXfceDerivation +, lib +, cmake +, accountsservice +, exo +, garcon +, gettext +, glib +, gtk-layer-shell +, gtk3 +, libxfce4ui +, libxfce4util +, xfce4-panel +, xfconf +}: mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.7.3"; + version = "2.8.0"; rev-prefix = "v"; odd-unstable = false; - sha256 = "sha256-F2mp3b1HBvI2lvwGzuE9QsqotLWgsP0NRyORrTV9FJs="; + sha256 = "sha256-5ojcIOVIa9WKL2e6iZwRgrAINSM8750zciCwpn9vzJU="; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; - buildInputs = [ gettext exo garcon gtk3 glib libxfce4ui libxfce4util xfce4-panel xfconf ]; - - postPatch = '' - substituteInPlace panel-plugin/xfce4-popup-whiskermenu.in \ - --replace gettext ${gettext}/bin/gettext - ''; - - postInstall = '' - substituteInPlace $out/bin/xfce4-popup-whiskermenu \ - --replace $out/bin/xfce4-panel ${xfce4-panel.out}/bin/xfce4-panel - ''; + buildInputs = [ + accountsservice + exo + garcon + gettext + glib + gtk-layer-shell + gtk3 + libxfce4ui + libxfce4util + xfce4-panel + xfconf + ]; meta = with lib; { description = "Alternate application launcher for Xfce"; diff --git a/nixpkgs/pkgs/development/compilers/aspectj/default.nix b/nixpkgs/pkgs/development/compilers/aspectj/default.nix index 639ca8122762..46e76e02fca6 100644 --- a/nixpkgs/pkgs/development/compilers/aspectj/default.nix +++ b/nixpkgs/pkgs/development/compilers/aspectj/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "aspectj"; - version = "1.9.19"; + version = "1.9.20"; builder = ./builder.sh; src = let versionSnakeCase = builtins.replaceStrings ["."] ["_"] version; in fetchurl { url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar"; - sha256 = "sha256-Oujyg05yvtcyfLmqonc++GX9AyFKwfIzITOHDz0px0M="; + sha256 = "sha256-zrU7JlEyUwoYxQ+sTaJM4YGVW5NucDXDiEao4glJAk0="; }; inherit jre; diff --git a/nixpkgs/pkgs/development/compilers/cairo/default.nix b/nixpkgs/pkgs/development/compilers/cairo/default.nix index 46eeaec16782..31eda13e26b0 100644 --- a/nixpkgs/pkgs/development/compilers/cairo/default.nix +++ b/nixpkgs/pkgs/development/compilers/cairo/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "2.0.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-tFWY4bqI+YVVu0E9EPl+c0UAsSn/cjgvEOQtyT9tkYg="; + hash = "sha256-X8CqiikY1/S8/WxrZbcwOB+bz0PJsNpuLWLb+k3+5kw="; }; - cargoHash = "sha256-fnkzR07MIwzjvg2ZRhhzYIUhuidEBZt0mGfxwHyhyVE="; + cargoHash = "sha256-jrUH3vmTbbxod547JAE5sOSo+FR15XNgVpM15uXAsvg="; nativeCheckInputs = [ rustfmt diff --git a/nixpkgs/pkgs/development/compilers/ccl/default.nix b/nixpkgs/pkgs/development/compilers/ccl/default.nix index cbf89d5253dc..332e0b1bccf4 100644 --- a/nixpkgs/pkgs/development/compilers/ccl/default.nix +++ b/nixpkgs/pkgs/development/compilers/ccl/default.nix @@ -2,10 +2,10 @@ let options = rec { - /* TODO: there are also FreeBSD and Windows versions */ + # TODO: there are also FreeBSD and Windows versions x86_64-linux = { arch = "linuxx86"; - sha256 = "0d5bsizgpw9hv0jfsf4bp5sf6kxh8f9hgzz9hsjzpfhs3npmmac4"; + sha256 = "0mhmm8zbk42p2b9amy702365m687k5p0xnz010yqrki6mwyxlkx9"; runtime = "lx86cl64"; kernel = "linuxx8664"; }; @@ -17,13 +17,13 @@ let }; armv7l-linux = { arch = "linuxarm"; - sha256 = throw "ccl all-in-one linuxarm archive missing upstream"; + sha256 = "1a4y07cmmn1r88b4hl4msb0bvr2fxd2vw9lf7h4j9f7a5rpq7124"; runtime = "armcl"; kernel = "linuxarm"; }; x86_64-darwin = { arch = "darwinx86"; - sha256 = "1l060719k8mjd70lfdnr0hkybk7v88zxvfrsp7ww50q808cjffqk"; + sha256 = "1xclnik6pqhkmr15cbqa2n1ddzdf0rs452lyiln3c42nmkf9jjb6"; runtime = "dx86cl64"; kernel = "darwinx8664"; }; @@ -31,49 +31,15 @@ let }; cfg = options.${stdenv.hostPlatform.system} or (throw "missing source url for platform ${stdenv.hostPlatform.system}"); - # The 1.12 github release of CCL seems to be missing the usual - # ccl-1.12-linuxarm.tar.gz tarball, so we build it ourselves here - linuxarm-src = runCommand "ccl-1.12-linuxarm.tar.gz" { - outer = fetchurl { - url = "https://github.com/Clozure/ccl/archive/v1.12.tar.gz"; - sha256 = "0lmxhll6zgni0l41h4kcf3khbih9r0f8xni6zcfvbi3dzfs0cjkp"; - }; - inner = fetchurl { - url = "https://github.com/Clozure/ccl/releases/download/v1.12/linuxarm.tar.gz"; - sha256 = "0x4bjx6cxsjvxyagijhlvmc7jkyxifdvz5q5zvz37028va65243c"; - }; - } '' - tar xf $outer - tar xf $inner -C ccl - tar czf $out ccl - ''; - -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "ccl"; - version = "1.12"; + version = "1.12.2"; - src = if cfg.arch == "linuxarm" then linuxarm-src else fetchurl { + src = fetchurl { url = "https://github.com/Clozure/ccl/releases/download/v${version}/ccl-${version}-${cfg.arch}.tar.gz"; sha256 = cfg.sha256; }; - patches = [ - # Pull upstream fiux for -fno-common toolchains: - # https://github.com/Clozure/ccl/pull/316 - (fetchpatch { - name = "fno-common-p1.patch"; - url = "https://github.com/Clozure/ccl/commit/185dc1a00e7492f8be98e5f93b561758423595f1.patch"; - sha256 = "0wqfds7346qdwdsxz3bl2p601ib94rdp9nknj7igj01q8lqfpajw"; - }) - (fetchpatch { - name = "fno-common-p2.patch"; - url = "https://github.com/Clozure/ccl/commit/997de91062d1f152d0c3b322a1e3694243e4a403.patch"; - sha256 = "10w6zw8wgalkdyya4m48lgca4p9wgcp1h44hy9wqr94dzlllq0f6"; - }) - ]; - buildInputs = if stdenv.isDarwin then [ bootstrap_cmds m4 ] else [ glibc m4 ]; CCL_RUNTIME = cfg.runtime; diff --git a/nixpkgs/pkgs/development/compilers/chicken/4/default.nix b/nixpkgs/pkgs/development/compilers/chicken/4/default.nix index 08952e028de5..de64d20d3e05 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/4/default.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/4/default.nix @@ -18,4 +18,4 @@ let egg2nix = callPackage ./egg2nix.nix { }; }; -in lib.recurseIntoAttrs self +in self diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/default.nix b/nixpkgs/pkgs/development/compilers/chicken/5/default.nix index 6aed893c97e6..e66b4940ff03 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/default.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/5/default.nix @@ -1,40 +1,42 @@ { lib, newScope, fetchurl }: -let - callPackage = newScope self; - self = with lib; { - inherit callPackage; +lib.makeScope newScope (self: { - fetchegg = { pname, version, sha256, ... }: - fetchurl { - inherit sha256; - url = - "https://code.call-cc.org/egg-tarballs/5/${pname}/${pname}-${version}.tar.gz"; - }; - - eggDerivation = callPackage ./eggDerivation.nix { }; - - chicken = callPackage ./chicken.nix { - bootstrap-chicken = self.chicken.override { bootstrap-chicken = null; }; + fetchegg = { pname, version, sha256, ... }: + fetchurl { + inherit sha256; + url = + "https://code.call-cc.org/egg-tarballs/5/${pname}/${pname}-${version}.tar.gz"; }; - chickenEggs = recurseIntoAttrs (mapAttrs (pname: - eggData@{ version, synopsis, dependencies, license, ... }: - self.eggDerivation { - name = "${pname}-${version}"; - src = self.fetchegg (eggData // { inherit pname; }); - buildInputs = map (x: self.chickenEggs.${x}) dependencies; - meta.homepage = - "https://code.call-cc.org/cgi-bin/gitweb.cgi?p=eggs-5-latest.git;a=tree;f=${pname}/${version}"; - meta.description = synopsis; - meta.license = (licenses // { - "bsd-2-clause" = licenses.bsd2; - "bsd-3-clause" = licenses.bsd3; - "public-domain" = licenses.publicDomain; - }).${license} or license; - }) (importTOML ./deps.toml)); + eggDerivation = self.callPackage ./eggDerivation.nix { }; - egg2nix = callPackage ./egg2nix.nix { }; + chicken = self.callPackage ./chicken.nix { + bootstrap-chicken = self.chicken.override { bootstrap-chicken = null; }; }; -in lib.recurseIntoAttrs self + chickenEggs = lib.recurseIntoAttrs (lib.makeScope self.newScope (eggself: + (lib.mapAttrs + (pname: + eggData@{ version, synopsis, dependencies, license, ... }: + self.eggDerivation { + name = "${pname}-${version}"; + src = self.fetchegg (eggData // { inherit pname; }); + buildInputs = map (x: eggself.${x}) dependencies; + meta.homepage = + "https://code.call-cc.org/cgi-bin/gitweb.cgi?p=eggs-5-latest.git;a=tree;f=${pname}/${version}"; + meta.description = synopsis; + meta.license = (lib.licenses // { + "bsd-1-clause" = lib.licenses.bsd1; + "bsd-2-clause" = lib.licenses.bsd2; + "bsd-3-clause" = lib.licenses.bsd3; + "lgpl-2.0+" = lib.licenses.lgpl2Plus; + "lgpl-2.1-or-later" = lib.licenses.lgpl21Plus; + "public-domain" = lib.licenses.publicDomain; + }).${license} or license; + }) + (lib.importTOML ./deps.toml)))); + + egg2nix = self.callPackage ./egg2nix.nix { }; + +}) diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml b/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml index b61c38506bb5..e54ac4691c70 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml +++ b/nixpkgs/pkgs/development/compilers/chicken/5/deps.toml @@ -107,9 +107,9 @@ version = "0.6" [apropos] dependencies = ["srfi-1", "utf8", "string-utils", "symbol-utils", "check-errors"] license = "bsd" -sha256 = "1xnqfnbnac4pzm4j3mphq09p18q962dxg11cfyxqk8k6v8qrv5nh" +sha256 = "0njkdxwd9122l9vql64nqm7dy3lggikr2bzwidwk7i8yz3nm3g6w" synopsis = "CHICKEN apropos" -version = "3.7.2" +version = "3.8.1" [arcadedb] dependencies = ["uri-common", "medea"] @@ -282,9 +282,9 @@ version = "1.37" [bitwise-utils] dependencies = [] license = "public-domain" -sha256 = "09fdcv81069br4pz0ccr2jj6xgakvwbshdiy21r85865r7r6g05m" +sha256 = "065q6ha8wsj6qhg7zxkaj2qrj5sm3iz2v7shcp5wh7j3fqwbs5q5" synopsis = "Bitwise utilities" -version = "1.2.5" +version = "1.3.0" [blas] dependencies = ["bind", "compile-file", "srfi-13"] @@ -364,11 +364,11 @@ synopsis = "Byte array utility procedures for blobs." version = "2.3" [cairo] -dependencies = [] +dependencies = ["srfi-1"] license = "lgpl-2.1" -sha256 = "1krsjlydqa9zj0bpad0w4x636kg30ng1azlyyn8j8vx3b8lcd362" +sha256 = "1x69i4aysn8mf93ic36947p6gvgglk8c0vg2m6vdhimf6y65szi1" synopsis = "Chicken bindings for Cairo, a vector graphics library" -version = "0.1.17" +version = "0.1.18" [call-table-generics] dependencies = ["brev-separate"] @@ -1157,9 +1157,9 @@ version = "0.4.2" [gochan] dependencies = ["matchable", "srfi-18", "queues"] license = "bsd" -sha256 = "1yp3yzfx97qfx8kkxvjvs1vnr2h8iffnx1zaqq05dbh5ivnx74j8" +sha256 = "1pyzr387zbbw7x9zk524qcs368hzxv4c46p24cz3x2nl30y84d5h" synopsis = "golang channels in CHICKEN" -version = "5.2.9" +version = "5.2.10" [graph-bfs] dependencies = ["srfi-1", "iset", "matchable", "yasos", "digraph"] @@ -1213,9 +1213,9 @@ version = "0.10.1" [hash-trie] dependencies = [] license = "mit" -sha256 = "0kcr99fdc0b09inq8ansb79ynblcxryvsg67zfms5y7z91v11p0c" +sha256 = "1860bp5h3kh0ra6b2qvb5pccylajq1x2hng0skqnv8ik068lnfr0" synopsis = "hash-trie" -version = "1.1.7" +version = "1.1.8" [heap-o-rama] dependencies = ["srfi-18"] @@ -1395,9 +1395,9 @@ version = "0.3" [ipfs] dependencies = ["http-client", "intarweb", "medea", "srfi-1", "srfi-13", "srfi-189", "srfi-197", "uri-common"] license = "unlicense" -sha256 = "1cxjbl5kl4xk42a4p8j3av6ip0gqvp5yxahsccvm0snc98n3ngqg" +sha256 = "1mw6z3piddy9xz494kv0243jhhirlb1dp15dph2p1ks4bhipbr4m" synopsis = "IPFS HTTP API for Scheme" -version = "0.0.12" +version = "0.0.13" [irc] dependencies = ["matchable", "regex", "srfi-1"] @@ -1556,9 +1556,9 @@ version = "1.2.1" [list-utils] dependencies = ["utf8", "srfi-1", "check-errors"] license = "bsd" -sha256 = "0wqmsvh3sfgp8ssh98n8y615lxnjlcda1k375jfss7vf8k5xn032" +sha256 = "0sbd04kmiahk7mbw1cy64n1qjz2rpldjx66aj41r964kjscm6izv" synopsis = "list-utils" -version = "2.4.3" +version = "2.5.1" [live-define] dependencies = ["matchable"] @@ -1794,9 +1794,9 @@ version = "0.7" [micro-benchmark] dependencies = ["micro-stats", "srfi-1"] license = "gplv3" -sha256 = "0ahvxdm350bc9v80gnb8ccmjqqp60jznfjkx7w5ypf0q61mnj8sj" +sha256 = "022fkwr1wm1im40rgk3g5dz8n4rvlw1zdmskqsh9idv31gbfi456" synopsis = "Easily create micro-benchmarks" -version = "0.0.19" +version = "0.0.20" [micro-stats] dependencies = ["srfi-1", "sequences", "sequences-utils"] @@ -2333,9 +2333,9 @@ version = "2.1.2" [rlimit] dependencies = ["srfi-13"] license = "bsd" -sha256 = "0jmz98253k3q9a6kyyby6jm722w3s74c5y3km7ih9ybjjmcdkyzv" +sha256 = "1yxdn9y11i8s9mj5dknlpz588d48bklylxcq73v0s48a5m7vfpwp" synopsis = "Setting resource limits" -version = "1.0.1" +version = "1.0.2" [rocksdb] dependencies = [] @@ -2368,9 +2368,9 @@ version = "0.9.12" [s9fes-char-graphics] dependencies = ["srfi-1", "utf8", "format"] license = "public-domain" -sha256 = "1h12l59860cyv8xwvvpf96dnlqwd25mrq2qapj9nyxv0vbkcs4p6" +sha256 = "1ysz8vrx7zwfv4drx955ca28avmdfilafd9a20sl67y5vwb47i8m" synopsis = "Scheme 9 from Empty Space Char Graphics" -version = "1.3.3" +version = "1.4.2" [salmonella-diff] dependencies = ["salmonella", "salmonella-html-report", "srfi-1", "srfi-13", "sxml-transforms"] @@ -2508,9 +2508,9 @@ version = "1.9.1" [sequences-utils] dependencies = ["srfi-1", "srfi-69", "sequences"] license = "bsd" -sha256 = "0s5yadn034a3g89xjcy0yxga7k60dadcnynv16yvbcfg4wjrs81k" +sha256 = "1c0yq4bzq6lkax4pwky5vyb2gl0yw88r7fzsbx37xsw14lb4fl64" synopsis = "(More) Generic sequence operators" -version = "0.4.0" +version = "0.5.0" [sequences] dependencies = ["fast-generic", "srfi-42"] @@ -3047,9 +3047,9 @@ version = "0.2.3" [srfi-18] dependencies = [] license = "bsd" -sha256 = "0v2pkdck0ji1wiqgg8sg4z6rbkj2qw4vy4b9lx0w0pmhlxqpg1xd" +sha256 = "0mkg3g045md9v74p4ac24q0c4xvvinz1nggakyg7wlg7c176i2l9" synopsis = "SRFI-18 thread library" -version = "0.1.6" +version = "0.1.7" [srfi-180] dependencies = ["r7rs", "srfi-60", "srfi-145", "srfi-121"] @@ -3068,9 +3068,9 @@ version = "1.0.3" [srfi-19] dependencies = ["srfi-1", "utf8", "srfi-18", "srfi-29", "srfi-69", "miscmacros", "locale", "record-variants", "check-errors"] license = "bsd" -sha256 = "14nyv6m67k2angmhg028rd50mq77qi1zfr5f0praiyy07k2pmcpz" +sha256 = "0mq9nd1ck1qq9bs415xw4sqlbw1jcrg9n1vrh8kiqy197xbymh0h" synopsis = "Time Data Types and Procedures" -version = "4.7.3" +version = "4.7.5" [srfi-193] dependencies = [] @@ -3159,9 +3159,9 @@ version = "4.2.2" [srfi-29] dependencies = ["srfi-1", "srfi-69", "utf8", "locale", "posix-utils", "condition-utils", "check-errors"] license = "bsd" -sha256 = "1wxz4kj6dqylfiqi035vzsphgbj68y6wwivmx25z5j11c8v3s81c" +sha256 = "15g2knq5b76f3nhxnmxidhkvbw9dyyc00hrzvsnpkmnfqzcmxbxw" synopsis = "Localization" -version = "3.0.6" +version = "3.0.7" [srfi-34] dependencies = [] @@ -3647,11 +3647,11 @@ synopsis = "tracing and breakpoints" version = "2.0" [transducers] -dependencies = ["srfi-1", "srfi-128", "srfi-133", "srfi-143", "srfi-146", "srfi-160", "check-errors"] +dependencies = ["srfi-1", "srfi-128", "srfi-133", "srfi-143", "srfi-146", "srfi-160", "check-errors", "r7rs"] license = "mit" -sha256 = "0mkrrfvskwgy5w8c9gz21np3p9857sm8fylq0hjz608jaxzybpcz" +sha256 = "162f0xvk69jha55sszdkgm47q18k3x5bc2g6psn2107im4ma45fi" synopsis = "Transducers for working with foldable data types." -version = "0.4.0" +version = "0.4.2" [transmission] dependencies = ["http-client", "intarweb", "medea", "r7rs", "srfi-1", "srfi-189", "uri-common"] @@ -3789,9 +3789,9 @@ version = "3.6.3" [uuid-lib] dependencies = ["record-variants"] license = "bsd" -sha256 = "0da71k0f3j1l9wjnfk9gqs9gw3v1192xhxbxv2gfmah3fvxf203p" +sha256 = "1hk5p2yvwq4dx93a1wnxggrbwkh050b6m9jlw44s7xvhxhvdqyns" synopsis = "OSF DCE 1.1 UUID" -version = "0.0.10" +version = "0.0.14" [uuid] dependencies = [] @@ -3915,9 +3915,9 @@ version = "0.2" [zshbrev] dependencies = ["brev"] license = "lgplv3" -sha256 = "16sn87z72x8d4ddbkwgz1jxas471r5nvazwi0klsn204v1qc30dy" +sha256 = "1id8a728ibi3fzcpfdd7ary41g7nrlb7pc3vjpmz70jp1q53qppx" synopsis = "Access Chicken functions from any shell and access zsh functions from Chicken" -version = "1.19" +version = "1.20" [zstd] dependencies = [] diff --git a/nixpkgs/pkgs/development/compilers/circt/default.nix b/nixpkgs/pkgs/development/compilers/circt/default.nix index 19765f97a174..77482b048a8d 100644 --- a/nixpkgs/pkgs/development/compilers/circt/default.nix +++ b/nixpkgs/pkgs/development/compilers/circt/default.nix @@ -13,12 +13,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.51.0"; + version = "1.52.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-IEMIFbMBLEKgntDiRfVH6qgj9a5RLWQnKrMnl5A3AYQ="; + sha256 = "sha256-ol8inyUrKezv+lhDIq2DhP4LHNJLhZylRbtIfoVAMYk="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/compilers/closure/default.nix b/nixpkgs/pkgs/development/compilers/closure/default.nix index bb8294ff6c73..02fff2b3d9b3 100644 --- a/nixpkgs/pkgs/development/compilers/closure/default.nix +++ b/nixpkgs/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20230502"; + version = "20230802"; src = fetchurl { url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; - sha256 = "sha256-h/kKVX49KuivQwrG9KQr7PG0U0heiQmZd3pSyQvanSI="; + sha256 = "sha256-IwqeBain2dqgg7H26G7bpusexkAqaiWEMv5CRc3EqV8="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh b/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh index 89801eb7c21a..e75a84a9550e 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh @@ -2,4 +2,4 @@ # CMake's enable_language(CUDA) runs a compiler test and it doesn't account for # CUDAToolkit_ROOT. We have to help it locate libcudart -export NVCC_APPEND_FLAGS+=" -L@cudartRoot@/lib -I@cudartRoot@/include" +export NVCC_APPEND_FLAGS+=" -L@cudartLib@/lib -L@cudartStatic@/lib -I@cudartInclude@/include" diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh b/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh index 89256e86f789..5ea57594211c 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh @@ -56,7 +56,7 @@ setupCUDAToolkitCompilers() { # CMake's enable_language(CUDA) runs a compiler test and it doesn't account for # CUDAToolkit_ROOT. We have to help it locate libcudart if [[ -z "${nvccDontPrependCudartFlags-}" ]] ; then - export NVCC_APPEND_FLAGS+=" -L@cudartRoot@/lib -I@cudartRoot@/include" + export NVCC_APPEND_FLAGS+=" -L@cudartLib@/lib -L@cudartStatic@/lib -I@cudartInclude@/include" fi } diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix index ec2c9cf72a9e..038841a7097d 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix @@ -1,3 +1,10 @@ +# Type Aliases +# +# See ./extension.nix: +# - ReleaseAttrs +# - ReleaseFeaturesAttrs +# +# General callPackage-supplied arguments { lib , stdenv , backendStdenv @@ -5,23 +12,58 @@ , autoPatchelfHook , autoAddOpenGLRunpathHook , markForCudatoolkitRootHook +, lndir +, symlinkJoin +}: +# Function arguments +{ + # Short package name (e.g., "cuda_cccl") + # pname : String + pname +, # Long package name (e.g., "CXX Core Compute Libraries") + # description : String + description +, # platforms : List System + platforms +, # version : Version + version +, # releaseAttrs : ReleaseAttrs + releaseAttrs +, # releaseFeaturesAttrs : ReleaseFeaturesAttrs + releaseFeaturesAttrs +, }: - -pname: -attrs: - let - arch = "linux-x86_64"; + # Useful imports + inherit (lib.lists) optionals; + inherit (lib.meta) getExe; + inherit (lib.strings) optionalString; in backendStdenv.mkDerivation { - inherit pname; - inherit (attrs) version; + # 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 + # also sensitive to the compiler flags provided to stdenv. + inherit pname version; + strictDeps = true; - src = assert (lib.hasAttr arch attrs); fetchurl { - url = "https://developer.download.nvidia.com/compute/cuda/redist/${attrs.${arch}.relative_path}"; - inherit (attrs.${arch}) sha256; + outputs = with releaseFeaturesAttrs; + [ "out" ] + ++ optionals hasBin [ "bin" ] + ++ optionals hasLib [ "lib" ] + ++ optionals hasStatic [ "static" ] + ++ optionals hasDev [ "dev" ] + ++ optionals hasDoc [ "doc" ] + ++ optionals hasSample [ "sample" ]; + + src = fetchurl { + url = "https://developer.download.nvidia.com/compute/cuda/redist/${releaseAttrs.relative_path}"; + inherit (releaseAttrs) sha256; }; + # We do need some other phases, like configurePhase, so the multiple-output setup hook works. + dontBuild = true; + nativeBuildInputs = [ autoPatchelfHook # This hook will make sure libcuda can be found @@ -46,23 +88,87 @@ backendStdenv.mkDerivation { "$ORIGIN" ]; - dontBuild = true; + installPhase = with releaseFeaturesAttrs; + # Pre-install hook + '' + runHook preInstall + '' + # doc and dev have special output handling. Other outputs need to be moved to their own + # output. + # Note that moveToOutput operates on all outputs: + # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L105-L107 + + '' + mkdir -p "$out" + rm LICENSE + mv * "$out" + '' + # Handle bin, which defaults to out + + optionalString hasBin '' + moveToOutput "bin" "$bin" + '' + # Handle lib, which defaults to out + + optionalString hasLib '' + moveToOutput "lib" "$lib" + '' + # Handle static libs, which isn't handled by the setup hook + + optionalString hasStatic '' + moveToOutput "**/*.a" "$static" + '' + # Handle samples, which isn't handled by the setup hook + + optionalString hasSample '' + moveToOutput "samples" "$sample" + '' + # Post-install hook + + '' + runHook postInstall + ''; - # TODO: choose whether to install static/dynamic libs - installPhase = '' - runHook preInstall - rm LICENSE - mkdir -p $out - mv * $out - runHook postInstall + # The out output leverages the same functionality which backs the `symlinkJoin` function in + # Nixpkgs: + # https://github.com/NixOS/nixpkgs/blob/d8b2a92df48f9b08d68b0132ce7adfbdbc1fbfac/pkgs/build-support/trivial-builders/default.nix#L510 + # + # That should allow us to emulate "fat" default outputs without having to actually create them. + # + # It is important that this run after the autoPatchelfHook, otherwise the symlinks in out will reference libraries in lib, creating a circular dependency. + postPhases = [ "postPatchelf" ]; + # For each output, create a symlink to it in the out output. + # NOTE: We must recreate the out output here, because the setup hook will have deleted it + # if it was empty. + # NOTE: Do not use optionalString based on whether `outputs` contains only `out` -- phases + # which are empty strings are skipped/unset and result in errors of the form "command not + # found: <customPhaseName>". + postPatchelf = '' + mkdir -p "$out" + for output in $outputs; do + if [ "$output" = "out" ]; then + continue + fi + ${getExe lndir} "''${!output}" "$out" + done ''; + # Make the CUDA-patched stdenv available passthru.stdenv = backendStdenv; + # Setting propagatedBuildInputs to false will prevent outputs known to the multiple-outputs + # from depending on `out` by default. + # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L196 + # Indeed, we want to do the opposite -- fat "out" outputs that contain all the other outputs. + propagatedBuildOutputs = false; + + # By default, if the dev output exists it just uses that. + # However, because we disabled propagatedBuildOutputs, dev doesn't contain libraries or + # anything of the sort. To remedy this, we set outputSpecified to true, and use + # outputsToInstall, which tells Nix which outputs to use when the package name is used + # unqualified (that is, without an explicit output). + outputSpecified = true; + meta = { - description = attrs.name; + inherit description platforms; license = lib.licenses.unfree; maintainers = lib.teams.cuda.members; - platforms = lib.optionals (lib.hasAttr arch attrs) [ "x86_64-linux" ]; + # 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/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/extension.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/extension.nix index 730ee1d28f56..58f2b205dd59 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/extension.nix +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/extension.nix @@ -1,33 +1,139 @@ -final: prev: let - +# Type Aliases +# +# ReleaseAttrs : { +# "relative_path" : String, +# "sha256" : String, +# "md5" : String, +# "size" : String, +# } +# +# NOTE: PackageAttrs must have at least one of the arches. +# PackageAttrs : { +# "name" : String, +# "license" : String, +# "version" : String, +# "license_path" : None | String, +# "linux-aarch64" : None | ReleaseAttrs, +# "linux-ppc64le" : None | ReleaseAttrs, +# "linux-sbsa" : None | ReleaseAttrs, +# "linux-x86_64" : None | ReleaseAttrs, +# "windows-x86_64" : None | ReleaseAttrs, +# } +# +# ReleaseFeaturesAttrs : { +# "hasBin" : Boolean, +# "hasDev" : Boolean, +# "hasDoc" : Boolean, +# "hasLib" : Boolean, +# "hasOut" : Boolean, +# "hasSample" : Boolean, +# "hasStatic" : Boolean, +# "rootDirs" : List String, +# } +# +# NOTE: PackageFeatureAttrs must have at least one of the arches. +# PackageFeatureAttrs : { +# "linux-aarch64" : None | ReleaseFeaturesAttrs, +# "linux-ppc64le" : None | ReleaseFeaturesAttrs, +# "linux-sbsa" : None | ReleaseFeaturesAttrs, +# "linux-x86_64" : None | ReleaseFeaturesAttrs, +# "windows-x86_64" : None | ReleaseFeaturesAttrs, +# } +# +final: prev: +let + # NOTE: We use hasAttr throughout instead of the (?) operator because hasAttr does not require + # us to interpolate our variables into strings (like ${attrName}). + inherit (builtins) attrNames concatMap hasAttr listToAttrs removeAttrs; inherit (final) callPackage; - inherit (prev) cudaVersion lib; - - ### Cuda Toolkit Redist + inherit (prev) cudaVersion; + inherit (prev.lib.attrsets) nameValuePair optionalAttrs; + inherit (prev.lib.lists) optionals; + inherit (prev.lib.trivial) flip importJSON pipe; - # Manifest files for redist cudatoolkit. These can be found at + # Manifest files for CUDA redistributables (aka redist). These can be found at # https://developer.download.nvidia.com/compute/cuda/redist/ - cudaToolkitRedistManifests = { - "11.4" = ./manifests/redistrib_11.4.4.json; - "11.5" = ./manifests/redistrib_11.5.2.json; - "11.6" = ./manifests/redistrib_11.6.2.json; - "11.7" = ./manifests/redistrib_11.7.0.json; - "11.8" = ./manifests/redistrib_11.8.0.json; - "12.0" = ./manifests/redistrib_12.0.1.json; - "12.1" = ./manifests/redistrib_12.1.1.json; - "12.2" = ./manifests/redistrib_12.2.0.json; + # Maps a cuda version to the specific version of the manifest. + cudaVersionMap = { + "11.4" = "11.4.4"; + "11.5" = "11.5.2"; + "11.6" = "11.6.2"; + "11.7" = "11.7.0"; + "11.8" = "11.8.0"; + "12.0" = "12.0.1"; + "12.1" = "12.1.1"; + "12.2" = "12.2.0"; }; - # Function to build a single cudatoolkit redist package - buildCudaToolkitRedistPackage = callPackage ./build-cuda-redist-package.nix { }; + # Check if the current CUDA version is supported. + cudaVersionMappingExists = hasAttr cudaVersion cudaVersionMap; + + # Maps a cuda version to its manifest files. + # The manifest itself is from NVIDIA, but the features manifest is generated + # by us ahead of time and allows us to split pacakges into multiple outputs. + # Package names (e.g., "cuda_cccl") are mapped to their attributes or features. + # Since we map each attribute to a package name, we need to make sure to get rid of meta + # attributes included in the manifest. Currently, these are any of the following: + # - release_date + # - release_label + # - release_product + redistManifests = + let + # Remove meta attributes from the manifest + # removeAttrs : AttrSet String b -> Attr String b + removeMetaAttrs = flip removeAttrs [ "release_date" "release_label" "release_product" ]; + # processManifest : Path -> Attr Set (String PackageAttrs) + processManifest = flip pipe [ importJSON removeMetaAttrs ]; + # fullCudaVersion : String + fullCudaVersion = cudaVersionMap.${cudaVersion}; + in + { + # features : Attr Set (String PackageFeatureAttrs) + features = processManifest ./manifests/redistrib_features_${fullCudaVersion}.json; + # manifest : Attr Set (String PackageAttrs) + manifest = processManifest ./manifests/redistrib_${fullCudaVersion}.json; + }; + + # Function to build a single redist package + buildRedistPackage = callPackage ./build-cuda-redist-package.nix { }; + + # Function that builds all redist packages given manifests + buildRedistPackages = { features, manifest }: + let + wrapper = pname: + let + # Get the redist architectures the package provides distributables for + packageAttrs = manifest.${pname}; + + # Check if supported + # TODO(@connorbaker): Currently hardcoding x86_64-linux as the only supported platform. + isSupported = packageAttrs ? linux-x86_64; + + # Build the derivation + drv = buildRedistPackage { + inherit pname; + # TODO(@connorbaker): We currently discard the license attribute. + inherit (manifest.${pname}) version; + description = manifest.${pname}.name; + platforms = [ "x86_64-linux" ]; + releaseAttrs = manifest.${pname}.linux-x86_64; + releaseFeaturesAttrs = features.${pname}.linux-x86_64; + }; - # Function that builds all cudatoolkit redist packages given a cuda version and manifest file - buildCudaToolkitRedistPackages = { version, manifest }: let - attrs = lib.filterAttrs (key: value: key != "release_date") (lib.importJSON manifest); - in lib.mapAttrs buildCudaToolkitRedistPackage attrs; + # Wrap in an optional so we can filter out the empty lists created by unsupported + # packages with concatMap. + wrapped = optionals isSupported [ (nameValuePair pname drv) ]; + in + wrapped; - # All cudatoolkit redist packages for the current cuda version - cudaToolkitRedistPackages = lib.optionalAttrs (lib.hasAttr cudaVersion cudaToolkitRedistManifests) - (buildCudaToolkitRedistPackages { version = cudaVersion; manifest = cudaToolkitRedistManifests.${cudaVersion}; }); + # concatMap provides us an easy way to filter out packages for unsupported platforms. + # We wrap the buildRedistPackage call in a list to prevent errors when the package is not + # supported (by returning an empty list). + redistPackages = listToAttrs (concatMap wrapper (attrNames manifest)); + in + redistPackages; -in cudaToolkitRedistPackages + # All redistributable packages for the current CUDA version + redistPackages = optionalAttrs cudaVersionMappingExists (buildRedistPackages redistManifests); +in +redistPackages diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.4.4.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.4.4.json new file mode 100644 index 000000000000..04a33a88a863 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.4.4.json @@ -0,0 +1,1518 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "lib32" + ] + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "src" + ] + } + }, + "libcufft": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt", + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "lib", + "lib32", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.5.2.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.5.2.json new file mode 100644 index 000000000000..f07f1826dec8 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.5.2.json @@ -0,0 +1,1536 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "lib32" + ] + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "src" + ] + } + }, + "libcufft": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt", + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "lib", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "lib", + "lib32", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.6.2.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.6.2.json new file mode 100644 index 000000000000..c4f02188c4d4 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.6.2.json @@ -0,0 +1,1546 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "lib32" + ] + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include" + ] + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcufft": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt", + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.7.0.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.7.0.json new file mode 100644 index 000000000000..56ef5a91b038 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.7.0.json @@ -0,0 +1,1565 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include" + ] + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcufft": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt", + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.8.0.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.8.0.json new file mode 100644 index 000000000000..4a71b484e287 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.8.0.json @@ -0,0 +1,1938 @@ +{ + "cuda_cccl": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_compat": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compat" + ] + } + }, + "cuda_cudart": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_cuobjdump": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "samples" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvprune": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_profiler_api": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_sanitizer_api": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcudla": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + } + }, + "libcufft": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.0.1.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.0.1.json new file mode 100644 index 000000000000..f02ba5bfca84 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.0.1.json @@ -0,0 +1,2050 @@ +{ + "cuda_cccl": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_compat": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compat" + ] + } + }, + "cuda_cudart": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_cuobjdump": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "samples" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvprune": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_opencl": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_profiler_api": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_sanitizer_api": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcudla": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + } + }, + "libcufft": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvjitlink": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "res" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvvm_samples": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + } + }, + "nsight_compute": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.1.1.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.1.1.json new file mode 100644 index 000000000000..f02ba5bfca84 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.1.1.json @@ -0,0 +1,2050 @@ +{ + "cuda_cccl": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_compat": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compat" + ] + } + }, + "cuda_cudart": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_cuobjdump": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "samples" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvprune": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_opencl": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_profiler_api": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_sanitizer_api": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcudla": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + } + }, + "libcufft": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvjitlink": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "res" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvvm_samples": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + } + }, + "nsight_compute": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.2.0.json b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.2.0.json new file mode 100644 index 000000000000..e5201f7f81eb --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.2.0.json @@ -0,0 +1,2030 @@ +{ + "cuda_cccl": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_compat": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compat" + ] + } + }, + "cuda_cudart": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_cuobjdump": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "samples" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvprune": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_opencl": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_profiler_api": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_sanitizer_api": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcudla": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + } + }, + "libcufft": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + } + }, + "libnvjitlink": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "res" + ] + } + }, + "libnvjpeg": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix index b962b6caa1b2..a0ac0b0fcb1f 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/overrides.nix @@ -1,6 +1,8 @@ final: prev: let inherit (prev) lib pkgs; + cudaVersionOlder = lib.versionOlder final.cudaVersion; + cudaVersionAtLeast = lib.versionAtLeast final.cudaVersion; in (lib.filterAttrs (attr: _: (prev ? "${attr}")) { ### Overrides to fix the components of cudatoolkit-redist @@ -10,51 +12,83 @@ in libcufile = prev.libcufile.overrideAttrs (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ - prev.libcublas + final.libcublas.lib pkgs.numactl pkgs.rdma-core ]; # libcuda needs to be resolved during runtime - autoPatchelfIgnoreMissingDeps = true; + autoPatchelfIgnoreMissingDeps = + ["libcuda.so.1"] + # Before 12.0 libcufile depends on itself for some reason. + ++ lib.optionals (cudaVersionOlder "12.0") [ + "libcufile.so.0" + ]; }); - libcusolver = final.addBuildInputs prev.libcusolver [ - prev.libcublas - ]; + libcusolver = final.addBuildInputs prev.libcusolver ( + # Always depends on this + [final.libcublas.lib] + # Dependency from 12.0 and on + ++ lib.optionals (cudaVersionAtLeast "12.0") [ + final.libnvjitlink.lib + ] + # Dependency from 12.1 and on + ++ lib.optionals (cudaVersionAtLeast "12.1") [ + final.libcusparse.lib + ] + ); - cuda_nvcc = prev.cuda_nvcc.overrideAttrs (oldAttrs: - let - inherit (prev.backendStdenv) cc; - in - { - # Required by cmake's enable_language(CUDA) to build a test program - # When implementing cross-compilation support: this is - # final.pkgs.targetPackages.cudaPackages.cuda_cudart - env.cudartRoot = "${prev.lib.getDev final.cuda_cudart}"; + libcusparse = final.addBuildInputs prev.libcusparse ( + lib.optionals (cudaVersionAtLeast "12.0") [ + final.libnvjitlink.lib + ] + ); - # Point NVCC at a compatible compiler + cuda_gdb = final.addBuildInputs prev.cuda_gdb ( + # x86_64 only needs gmp from 12.0 and on + lib.optionals (cudaVersionAtLeast "12.0") [ + pkgs.gmp + ] + ); - # Desiredata: whenever a package (e.g. magma) adds cuda_nvcc to - # nativeBuildInputs (offsets `(-1, 0)`), magma should also source the - # setupCudaHook, i.e. we want it the hook to be propagated into the - # same nativeBuildInputs. - # - # Logically, cuda_nvcc should include the hook in depsHostHostPropagated, - # so that the final offsets for the propagated hook would be `(-1, 0) + - # (0, 0) = (-1, 0)`. - # - # In practice, TargetTarget appears to work: - # https://gist.github.com/fd80ff142cd25e64603618a3700e7f82 - depsTargetTargetPropagated = [ - final.setupCudaHook - ]; - }); + cuda_nvcc = prev.cuda_nvcc.overrideAttrs (_: { + # Required by cmake's enable_language(CUDA) to build a test program + # When implementing cross-compilation support: this is + # final.pkgs.targetPackages.cudaPackages.cuda_cudart + env = { + # Given the multiple-outputs each CUDA redist has, we can specify the exact components we + # need from the package. CMake requires: + # - the cuda_runtime.h header, which is in the dev output + # - the dynamic library, which is in the lib output + # - the static library, which is in the static output + cudartInclude = "${final.cuda_cudart.dev}"; + cudartLib = "${final.cuda_cudart.lib}"; + cudartStatic = "${final.cuda_cudart.static}"; + }; + + # Point NVCC at a compatible compiler + + # Desiredata: whenever a package (e.g. magma) adds cuda_nvcc to + # nativeBuildInputs (offsets `(-1, 0)`), magma should also source the + # setupCudaHook, i.e. we want it the hook to be propagated into the + # same nativeBuildInputs. + # + # Logically, cuda_nvcc should include the hook in depsHostHostPropagated, + # so that the final offsets for the propagated hook would be `(-1, 0) + + # (0, 0) = (-1, 0)`. + # + # In practice, TargetTarget appears to work: + # https://gist.github.com/fd80ff142cd25e64603618a3700e7f82 + depsTargetTargetPropagated = [ + final.setupCudaHook + ]; + }); cuda_nvprof = prev.cuda_nvprof.overrideAttrs (oldAttrs: { nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.addOpenGLRunpath ]; - buildInputs = oldAttrs.buildInputs ++ [ prev.cuda_cupti ]; + buildInputs = oldAttrs.buildInputs ++ [ final.cuda_cupti.lib ]; # libcuda needs to be resolved during runtime - autoPatchelfIgnoreMissingDeps = true; + autoPatchelfIgnoreMissingDeps = ["libcuda.so.1"]; }); cuda_demo_suite = final.addBuildInputs prev.cuda_demo_suite [ @@ -62,8 +96,8 @@ in pkgs.libGLU pkgs.libglvnd pkgs.mesa - prev.libcufft - prev.libcurand + final.libcufft.lib + final.libcurand.lib ]; nsight_compute = prev.nsight_compute.overrideAttrs (oldAttrs: { @@ -100,7 +134,7 @@ in nvidia_driver = prev.nvidia_driver.overrideAttrs (oldAttrs: { # libcuda needs to be resolved during runtime - autoPatchelfIgnoreMissingDeps = true; + autoPatchelfIgnoreMissingDeps = ["libcuda.so.1"]; # No need to support this package as we have drivers already # in linuxPackages. meta.broken = true; diff --git a/nixpkgs/pkgs/development/compilers/emscripten/default.nix b/nixpkgs/pkgs/development/compilers/emscripten/default.nix index be7461582303..37ccb5f1a02b 100644 --- a/nixpkgs/pkgs/development/compilers/emscripten/default.nix +++ b/nixpkgs/pkgs/development/compilers/emscripten/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.42"; + version = "3.1.45"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "emscripten-node-modules-${version}"; inherit pname version src; - npmDepsHash = "sha256-QlKm6UvPUa7+VJ9ZvXdxYZzK+U96Ju/oAHPhZ/hyv/I="; + npmDepsHash = "sha256-kcWAio1fKuwqFCFlupX9KevjWPbv9W/Z/5EPrihQ6ms="; dontBuild = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - hash = "sha256-elp/LPd9SAuVZy42Wkgb6pCbPi2GnETTfyRJqU92S0E="; + hash = "sha256-yf0Yb/UjaBQpIEPZzzjaUmR+JzKPSJHMkrYLHxDXwOg="; rev = version; }; diff --git a/nixpkgs/pkgs/development/compilers/erg/default.nix b/nixpkgs/pkgs/development/compilers/erg/default.nix index a3ed2397c8eb..860461e28b64 100644 --- a/nixpkgs/pkgs/development/compilers/erg/default.nix +++ b/nixpkgs/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.18"; + version = "0.6.19"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-bpKzC7xHP4vfl2WcyMEsFK1aAbkP3dtlpyNvXUWHWKg="; + hash = "sha256-oA0AXTMEdfItvIZi1ITQ3ZR6JPSg9/1V6oeK2wcRERw="; }; - cargoHash = "sha256-wIp+zQpHLmZNwgbSXQKV45YwO5qpZqdcUE6gnF/Wzhk="; + cargoHash = "sha256-dLMU48/umKHPV6iahazxOYA/eDvFWhzV9xveT2xQ+EE="; nativeBuildInputs = [ makeWrapper diff --git a/nixpkgs/pkgs/development/compilers/flix/default.nix b/nixpkgs/pkgs/development/compilers/flix/default.nix index 667dbaf109b9..47a84a6e5f2d 100644 --- a/nixpkgs/pkgs/development/compilers/flix/default.nix +++ b/nixpkgs/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.39.0"; + version = "0.40.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-kIH5vv/7pKgfAL1BaWYH6PSyEaKVONcccUczsudyfO4="; + sha256 = "sha256-NVQY2TgIR9ROy4x8PWxCjuaOkNx0bcUA4oZHjpQbHc4="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/compilers/flutter/default.nix b/nixpkgs/pkgs/development/compilers/flutter/default.nix index 95758fb56ab0..0a748647a1f5 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/default.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/default.nix @@ -74,39 +74,20 @@ in { inherit wrapFlutter; stable = mkFlutter { - version = "3.10.5"; - engineVersion = "45f6e009110df4f34ec2cf99f63cf73b71b7a420"; - dartVersion = "3.0.5"; + version = "3.13.0"; + engineVersion = "1ac611c64eadbd93c5f5aba5494b8fc3b35ee952"; + dartVersion = "3.1.0"; dartHash = { - x86_64-linux = "sha256-UVVwPFk0qsKNR4JZMOGSGh1T482MN/8Xp4MZ3SA3C28="; - aarch64-linux = "sha256-phzaFfrv7qbZOOhPq92q39R6mr5vFeBqEmYDU7e7lZQ="; - x86_64-darwin = "sha256-4gJ659bNzs2lfI1LRwFACgu/ttkj+3xIrqLijju+CaI="; - aarch64-darwin = "sha256-RJt+muq5IrcAhVLYEgdbVygcY1oB7tnVCN+iqktC+6c="; + x86_64-linux = "sha256-sGpRyuUTkZ0cpG/O21NCHaOsQRjNklsl9G6Ia1tZxAw="; + aarch64-linux = "sha256-wcDtL/Lh0NFC01QlnKwx8ovTHZ5ww+rb1sELn92R1uU="; + x86_64-darwin = "sha256-h+e7ABlLWCxc6wrbjiy5lgp6O/DnNKdXFNJtgnXBZNA="; + aarch64-darwin = "sha256-sAWnd09mbcRLP0WjSjjWF7+WQ7LP3tWsq5Kqw8e4APg="; }; flutterHash = rec { - x86_64-linux = "sha256-lLppUQzu+fl81TMYSPD+HA83BqeIg7bXpURyo49NPwI="; + x86_64-linux = "sha256-gXNQ9RuHVC/3puHNygWPRdezx8iiKmiOnxQmoX6XUFo="; aarch64-linux = x86_64-linux; - x86_64-darwin = "sha256-1ZC5aCoGVBCeTSsu/ZEl1v53lLnzulx8Ya6YXvo4yIY="; - aarch64-darwin = "sha256-TCMempLjO47IbP5MAZVHlXXvNaURGo+EbaL0K8e27wU="; - }; - patches = flutter3Patches; - }; - - v37 = mkFlutter { - version = "3.7.12"; - engineVersion = "1a65d409c7a1438a34d21b60bf30a6fd5db59314"; - dartVersion = "2.19.6"; - dartHash = { - x86_64-linux = "sha256-4ezRuwhQHVCxZg5WbzU/tBUDvZVpfCo6coDE4K0UzXo="; - aarch64-linux = "sha256-pYmClIqOo0sRPOkrcF4xQbo0mHlrr1TkhT1fnNyYNck="; - x86_64-darwin = "sha256-tuIQhIOX2ub0u99CW/l7nCya9YVNokCZNgbVFqO4ils="; - aarch64-darwin = "sha256-Oe8/0ygDN3xf5/2I3N/OBzF0bps7Mg0K2zJKj+E9Nak="; - }; - flutterHash = rec { - x86_64-linux = "sha256-5ExDBQXIpoZ5NwS66seY3m9/V8xDiyq/RdzldAyHdEE="; - aarch64-linux = x86_64-linux; - x86_64-darwin = "sha256-cJF8KB9fNb3hTZShDAPsMmr1neRdIMLvIl/m2tpzwQs="; - aarch64-darwin = "sha256-yetEE65UP2Wh9ocx7nClQjYLHO6lIbZPay1+I2tDSM4="; + x86_64-darwin = "sha256-vI8TsXIfTg4PYf5dzxDaJt+PIdmVFBmd2slKK7c1By0="; + aarch64-darwin = "sha256-VhGJlp+HG8QLZx8u0xK+cgbneoDM7zhNvm3Oco4nBms="; }; patches = flutter3Patches; }; diff --git a/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/default.nix index 603b1456018d..30c293c8d75d 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/default.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/default.nix @@ -191,7 +191,7 @@ let hash = (if artifactDirectory == null then hashes else hashes.${artifactDirectory}).${archive}; }); - setSourceRoot = if overrideUnpackCmd then "sourceRoot=`pwd`" else null; + sourceRoot = if overrideUnpackCmd then "." else null; unpackCmd = if overrideUnpackCmd then "unzip -o $src -d $out" else null; installPhase = diff --git a/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix index 1c8a5dc4059f..e3dc78646620 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix @@ -1,232 +1,118 @@ { - "1a65d409c7a1438a34d21b60bf30a6fd5db59314" = { - skyNotice = "sha256-+EitMZAAvJ1mIlfm5ZTfY+pk8tfyu33XM7P8qOdj+J8="; + "1ac611c64eadbd93c5f5aba5494b8fc3b35ee952" = { + skyNotice = "sha256-bJMktK26wC9fVzdhLNcTHqOg5sHRZ535LB5u5dgwjlY="; flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA="; android-arm = { - "artifacts.zip" = "sha256-KDMiI6SQoZHfFV5LJJZ7VOGyEKC4UxzRc777j4BbXgM="; + "artifacts.zip" = "sha256-rAWcm/vjJ7P9q69z0bZNhBv/NO+sGhFJe+r/BHPR1To="; }; android-arm-profile = { - "artifacts.zip" = "sha256-MErLoGJWXg4yJ6b6c5bqP8Nat6O7eYSfM71mMNAAQf4="; - "linux-x64.zip" = "sha256-0TZQ05HR7NRqHzeoHZ/sOrjKiSvCpMUH85YXXzV4URg="; - "darwin-x64.zip" = "sha256-gOmxGurYyuuGxPnzK+2O1s7d7x514R9MfincibxVTCI="; + "artifacts.zip" = "sha256-08+LDA7qNcMFH4xk+WfAXYqIDueCSHNmD/i/XaDeTrA="; + "linux-x64.zip" = "sha256-LWdrWdSGDAfX0gGtqQ2mSschBW3EAgaBldL/Cw99ft8="; + "darwin-x64.zip" = "sha256-FeBLBp3U2BPun/iPpTmHvaj3ZO8l7DQhwArqKN+D1m0="; }; android-arm-release = { - "artifacts.zip" = "sha256-hU4S4FOqUGokByZ47nzOqQ4A9QFshruqrpJvJUBHUho="; - "linux-x64.zip" = "sha256-AqNlqjOht+c2sdW5ReoF66ZJWJl1W4vGKbQ3YyderRY="; - "darwin-x64.zip" = "sha256-UiJNbIvjYvIX2oFNCz+TurUdhHS8vcl9X6WEkEs5hvU="; + "artifacts.zip" = "sha256-VCWSWfL74PJ6F6N18mOHjOkN8oTkL8coDfemV0Pc/Fw="; + "linux-x64.zip" = "sha256-xtQJ9merALKe20LZai+5ApJNOXR3uweIYQFWSyjmBEE="; + "darwin-x64.zip" = "sha256-YuEY7ZQAqpo0wbvI/iK3YYUSguZGi/wSl/DLPzmlNj8="; }; android-arm64 = { - "artifacts.zip" = "sha256-ApNg3Uu9gyGNsx7sdpTCz1yADVAI5ZuNHgvgiuH9IpQ="; + "artifacts.zip" = "sha256-z4gvkNofQaFv8tFAXcLepsge9CV1T7cBe3EZRdBT7Ms="; }; android-arm64-profile = { - "artifacts.zip" = "sha256-D/8+WKPIkOaV3PwkCHiJROFlokm4lWWmtPQb93Yqwr0="; - "linux-x64.zip" = "sha256-S0RHLov6/C22VvGdvZV87Ybaxun8YBrw1gTgNklRcM0="; - "darwin-x64.zip" = "sha256-AWivGn0TCVEW+N8g9bpEP1JuKWhrccb+ANQgyLjBjfw="; + "artifacts.zip" = "sha256-7DHKcgwdaG6+MH7uVqSk2UGxLM4VsHVk5vUtYMn11kQ="; + "linux-x64.zip" = "sha256-3ZahRPzDVBff2pGUjjoIABH1lmwyrx05GnaJNyF4OiY="; + "darwin-x64.zip" = "sha256-Pmil9S314EoWJhfo0nrtBh1VLUeiavKvp/LIPZJoy6U="; }; android-arm64-release = { - "artifacts.zip" = "sha256-OoYqHtwmT+VWJ+G+sMXM5+ux3h1Fnyo9Vj2za9cm5eE="; - "linux-x64.zip" = "sha256-NuXclg1a+Ofw5AWJ1tajpn2jYEZw6DluWxrFVL8rPfg="; - "darwin-x64.zip" = "sha256-/j5sVfyllkhsc9mpdbOqlT7VT1H6nD3Y+mYnWXDh0yI="; + "artifacts.zip" = "sha256-GI+ADau8sbD9+ctXrciraeXNPGMto2+bBDyJcKt9YTE="; + "linux-x64.zip" = "sha256-riHs2bbOFNH7VqD3snEu5RuKrMqbsuFnDBZ9Apxq/+g="; + "darwin-x64.zip" = "sha256-DwTskXkcNqNsU3I+t9UMvKjxG4O2mN4cUGLB4dSWBHM="; }; android-x64 = { - "artifacts.zip" = "sha256-hrBvnzCj/24h5kat96avlgXi6WhMsos5aPlkgxOYo8Q="; + "artifacts.zip" = "sha256-0dkDhr/TJi4ROcN1BV1OsUwWSnZuEHzgM0DKSeUIrnA="; }; android-x64-profile = { - "artifacts.zip" = "sha256-xzSj/2ah9aQoosaNGkSWFP3bMNJqRSFc0+78XEBHwzM="; - "linux-x64.zip" = "sha256-HfBiz1JWlBQ8KEfmf8uDlVzFlDt3+VF2VeY82tsMjHs="; - "darwin-x64.zip" = "sha256-J5JJH9GAQaQKahimb09fLC59VchPP15iMHY9bDMfdf8="; + "artifacts.zip" = "sha256-2g+GaZHO17/rLa6Y1DHfDEq0Q05NRxQ5ese2Eo5rvNA="; + "linux-x64.zip" = "sha256-O3bHS/UHz8ymXq8ZEutLIj7K8wVTdt7vTo3OLGAkkh8="; + "darwin-x64.zip" = "sha256-vEzg6vxm1CbvVBSAoWwZhAS/bsuDlesmo30zWwK2a7g="; }; android-x64-release = { - "artifacts.zip" = "sha256-TcfMeA+8Uf9yRrYdEIsjip0cKmSUm2Ow1tkoE9803XY="; - "linux-x64.zip" = "sha256-D6efb6pj9+xjPnJu3O+ZCmwfatBzasuFZEFRntAiU9U="; - "darwin-x64.zip" = "sha256-hDftGgKqW6tzH/+jFOYfzxssbS01XtiWEeycJr3QSoc="; + "artifacts.zip" = "sha256-nlYI2ffULiDrehOSFEZkZoav/RJ0VykwREQkUwNX2/I="; + "linux-x64.zip" = "sha256-iUy8tjpkFd3V/RIVRPbNNEsa/GAXhtLsNAkEOvdKhks="; + "darwin-x64.zip" = "sha256-xZf2f4L/hSJEN63hQqtP0rbXkB2iw/Co4vLXYe/oeI4="; }; android-x86 = { - "artifacts.zip" = "sha256-nN66nIrcbJHq2S4oIT5e2NCv7mS5Kw+HBv3ReHs+d3Y="; + "artifacts.zip" = "sha256-OIB7VnhCasOflVtGFOe1DgCLP4Os82R6H7ucp0Wrez0="; }; android-x86-jit-release = { - "artifacts.zip" = "sha256-A8F6K78Ykp1rMsUmjD7B9nFFPAubZnqAqgWSzbNCRwk="; + "artifacts.zip" = "sha256-dyjGkQJu73sOaxKvmIlbS5j0zO78RXHZrJQVi7qpBAU="; }; darwin-arm64 = { - "artifacts.zip" = "sha256-lfkEToKFBBOee7KgOl1z/ZeMQwEBWkmAYb2Hbfk8dfg="; - "font-subset.zip" = "sha256-W7GnLvCobED7uyhpURF4T4SL4yZIQmE2JFQVQIxl0NI="; + "artifacts.zip" = "sha256-Ro+N5e5RhXgfqVDSEvqCKPdXRK1QnYCvIqmtlEW4s8c="; + "font-subset.zip" = "sha256-yCboANBEarWZDtoTwDFbtnlsPW2kPwZ5Jp31V2hbga4="; }; darwin-arm64-profile = { - "artifacts.zip" = "sha256-DfYS+FEqjtq02jFRBqVR3SVWe4LAoPa5MMKWCbvF7mI="; + "artifacts.zip" = "sha256-Lf3LLkRhtGNA9cWZwv4Q9MncXzOoVCgmp+6osWRUCE0="; }; darwin-arm64-release = { - "artifacts.zip" = "sha256-gG/OcCJE3XPO6T8bltMtPxdlYX5HQ/4qYsdHe0OdDaE="; + "artifacts.zip" = "sha256-6BSQ2zodrQmZKkHeaGVVT4D7jNekhwNOul5C6qwLbO8="; }; darwin-x64 = { - "FlutterEmbedder.framework.zip" = "sha256-G84GGK6gtR+CYu9S/GhdNTL4KWqgFBp8QdvWOq+IZlk="; - "FlutterMacOS.framework.zip" = "sha256-1/txBoXDIs7Gn5zsZ4jYQXK73+iaZV4sRdYKqEBUTxU="; - "artifacts.zip" = "sha256-H7Moy6E1eRrOXYYAIgiJHOmstyy3YaCnu8O3IPr9BK8="; - "font-subset.zip" = "sha256-VSkG3zZw/4DDInwxPaMXT2B1LXIb0Ejkb2xf5SVrwW4="; - "gen_snapshot.zip" = "sha256-Pknv1fUcXGbWzt6So0DgWnvL4b43k51KMWiX1YXd2As="; + "FlutterEmbedder.framework.zip" = "sha256-4jYk+aYjOS/CZajS1oVBexg2+C9fy0OmfaI6i3rrhXo="; + "FlutterMacOS.framework.zip" = "sha256-Im7DTFf1zXrG6n1OtM4Jixd992mS2r47GRnAa7/urNc="; + "artifacts.zip" = "sha256-SdnPPnx4NOfOlJU1234977/cVRCa/5KTI/1kqCtTxG0="; + "font-subset.zip" = "sha256-F7qt7X0FNXODb3rvTkXacK3wG/aEVn+ny8DHFL3gEkI="; + "gen_snapshot.zip" = "sha256-czdCi1cPdD/nu0LJIsgUj42O6D5x5xTKfM8l/UiKZqw="; }; darwin-x64-profile = { - "FlutterMacOS.framework.zip" = "sha256-3umN1HNX4UA00EFsBnWS0X04QRKlcCnChDYd9L6x1L4="; - "artifacts.zip" = "sha256-8Aj2+nTKKeVLEYN+swVlVqRB/3fVSwrb3i1g1JUDsNY="; - "gen_snapshot.zip" = "sha256-bi3RqSdOQODpPmY+eBUQPiNeZ/bECoOUx/pOADpTZiA="; + "FlutterMacOS.framework.zip" = "sha256-gdfoq6jdHFDb2JXCf45qJ2ekTildUptLb/k0XuHYuh8="; + "artifacts.zip" = "sha256-aEoenQh0Q8xuLU6OeFND3GBbOvhMNsovbbFQwQfudm0="; + "gen_snapshot.zip" = "sha256-tY3qmpdF7MP4iEfqgouzLehr901H3QTLxeV28RoLPDY="; }; darwin-x64-release = { - "FlutterMacOS.dSYM.zip" = "sha256-LfDQuCcBXEV3Jao/sbfIvjn1d2ZfZrWgzNzFE1zE3Rw="; - "FlutterMacOS.framework.zip" = "sha256-2xuPPJifdu/kvvtR0viMvbTOXfv8ndtNAhTmef8863o="; - "artifacts.zip" = "sha256-3p41zRjvWYCl/Kk/7/0MjV2FS10XEtyX1hYmxTHT8lU="; - "gen_snapshot.zip" = "sha256-ExXwj1QO1XQznZ49rW08tibA5BaURShE6pUYDokZfpE="; - }; - "flutter_patched_sdk.zip" = "sha256-Pvsjttm5OwpJ/pW4UQXvvEiJYCM5CoZZfVXz5jef37k="; - "flutter_patched_sdk_product.zip" = "sha256-fhj2uUOrLwrzHrM6RNVpPNize5Qu6mLQDcSzLT2TbRA="; - ios = { - "artifacts.zip" = "sha256-yqJ4+lNsedRFbe11dBK4KGMX5+Nilj1V0i2E94n7q+0="; - }; - ios-profile = { - "artifacts.zip" = "sha256-ZguLM1QoYyg5dXPw3Fl1zSLdbirShV3xZuxl1CfEf50="; - }; - ios-release = { - "Flutter.dSYM.zip" = "sha256-Y57wt1y4NIdbRMM1r/d1Dv8bekwO9/9gpLkTEcw7Hfs="; - "artifacts.zip" = "sha256-Sm4Pkm1mWu3k5S+aws+kRpth+o3yTBYITg23LhnSViE="; - }; - linux-arm64 = { - "artifacts.zip" = "sha256-xyKVaEFb5gVkVrPzDrOql5BmXGO0FnCSeXOoQ10ZFrw="; - "font-subset.zip" = "sha256-Ulwb6q2SzB4suMJhAM3zAwWOzlEImlu9Ha+w5u4QqIU="; - }; - linux-arm64-debug = { - "linux-arm64-flutter-gtk.zip" = "sha256-SiYOH++py4zeoD3BkNayqy/C9Zz9OiYQ5+u+pDLIpWg="; - }; - linux-arm64-profile = { - "linux-arm64-flutter-gtk.zip" = "sha256-xB0eqrBYD7vhOwYUgJwNaBftNZJgdwxA9AUpEfX0iFs="; - }; - linux-arm64-release = { - "linux-arm64-flutter-gtk.zip" = "sha256-aHLKV129WIRsLUG6xTMwCKB4eXD3jonqinjI8KSsOus="; - }; - linux-x64 = { - "artifacts.zip" = "sha256-+zIABFXUpiqn3OMoLcU4NDLxZ1y9z0r46iCTNRHAkz8="; - "font-subset.zip" = "sha256-W4SRPvA4rraVqN1ehbY6MFL7ZIWDHVJhjlLtxyUJJKY="; - }; - linux-x64-debug = { - "linux-x64-flutter-gtk.zip" = "sha256-boICnuJF4zqGb7kaN5haO/df9hC9KeJidt3uIK06S7M="; - }; - linux-x64-profile = { - "linux-x64-flutter-gtk.zip" = "sha256-AnkLMPW3mwiXdiDz3Zo802QZRi+8EMCy4Mx2ODSbMOU="; - }; - linux-x64-release = { - "linux-x64-flutter-gtk.zip" = "sha256-RAsgupVF18IxLaP8tJ7XRQ8y/um46nlpA8fDITPwLqY="; - }; - }; - "45f6e009110df4f34ec2cf99f63cf73b71b7a420" = { - skyNotice = "sha256-n9B26rLlfUqdR6s+2+PNK4H/fN95UE0T7/Vic19W6yo="; - flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA="; - android-arm = { - "artifacts.zip" = "sha256-NOpUM+iFSPVzr99Dz0DBdDUQnMC0ad1eZnVhtqu9HnU="; - }; - android-arm-profile = { - "artifacts.zip" = "sha256-MZK1zaSv9yuZaVDR1dReCM7WRDxKql0yxsPa8WFc1yw="; - "linux-x64.zip" = "sha256-9OlBv2C6Msj73g624TixbstudCTbdIJ6PzPMsbQENy4="; - "darwin-x64.zip" = "sha256-lVJ31F7UMaXQym3touJQ2cN8svKBaWJurDTVZPeMzCo="; - }; - android-arm-release = { - "artifacts.zip" = "sha256-tjHckwoxQkkKoyTl6+wBKK40mFDmSDvCPNhBHVA+xxw="; - "linux-x64.zip" = "sha256-zE9oYkv4WBcbgEdYfYIcdDXX3tnYfCg+3KA3oA03nYA="; - "darwin-x64.zip" = "sha256-mCr29gIn808NF4k8kdC7oLTSU6AXq7I/bJF3BBdJlAo="; - }; - android-arm64 = { - "artifacts.zip" = "sha256-8W/JrOGhAzHWpM2Jh9vjdkaB6ODmCItqcmF47GqbNQk="; - }; - android-arm64-profile = { - "artifacts.zip" = "sha256-9SGBWp05lxLQTpLuzq8FYSQQOpjo8UL93Pv4YYFD4QE="; - "linux-x64.zip" = "sha256-5nH2AAxupRIhn8gNH+1V+vSP+qqfx5MS97EC4s3QHe8="; - "darwin-x64.zip" = "sha256-kkutEwKcj1wKJREbxbx8+DW53WVbizg6zKIFFVujgAM="; - }; - android-arm64-release = { - "artifacts.zip" = "sha256-7O7RBfEo6enZtVNsnt4HH0bex8Xpz9mqCvb2LNLbg3Q="; - "linux-x64.zip" = "sha256-loucmX4+0R11L1nzewiMTeRZoB6wLK0WasW5W3rIvYU="; - "darwin-x64.zip" = "sha256-0bpNQDfIzQqwQpzThLfOXEEEpH/uCJCRF331d0/pzfs="; - }; - android-x64 = { - "artifacts.zip" = "sha256-j7AezbyzH07yOR0/W1ttfCjMHMdOlXLQjAsu/ExqmqA="; - }; - android-x64-profile = { - "artifacts.zip" = "sha256-J8cqdcHoj1hpo6zY5R6S9lvkVXp7wvzQlurM7TEUe+k="; - "linux-x64.zip" = "sha256-YuRHctkDjLZVGQr+m5uM+AxYNLkfqycV4UNcAp7JavE="; - "darwin-x64.zip" = "sha256-Mw8C279cVbQHTdIsHhIT5HWe52X8XXbkIDpVcEz1tWc="; - }; - android-x64-release = { - "artifacts.zip" = "sha256-uhq3fXcxXjF4/YHSkf6V4wToL9jOUKBm3978j/7xI/s="; - "linux-x64.zip" = "sha256-iJfatLW7jVcrfNdVx/QOPiyON5ce0tSNGOBx0TILrKE="; - "darwin-x64.zip" = "sha256-3P3QZ+jW3Jl6PJvRY9pBHQdhj8UcsHFAjln8q6UlL+A="; - }; - android-x86 = { - "artifacts.zip" = "sha256-/xLacCi65hg1gEahty0btrc+NR/jfebSAIt31qwIlZY="; - }; - android-x86-jit-release = { - "artifacts.zip" = "sha256-Ntq0i+sFruDhlyp9VBxBnsNqqGoQeXMeIwfi+BNlr0Q="; - }; - darwin-arm64 = { - "artifacts.zip" = "sha256-A21Tnn4jC5IzdL3c7n6/q9H6uJ/ofvJ+K9W8PPpAoYM="; - "font-subset.zip" = "sha256-NhnUOK1Gn4ekKOf5rDoy4HodzhlS8ylf/MN/6l4Dk18="; - }; - darwin-arm64-profile = { - "artifacts.zip" = "sha256-aDWrz3bebC6kZRe2LgunsmFhbxJhmP1bsZv5A/SGF2Y="; - }; - darwin-arm64-release = { - "artifacts.zip" = "sha256-F44e39KSX8juojFBV/CSvFES+RQW+gHKDWtfnydqiNo="; - }; - darwin-x64 = { - "FlutterEmbedder.framework.zip" = "sha256-+S2unNH8cpfqUiPLTwGUUW00DdNYFDN8KM/O1pMdxQs="; - "FlutterMacOS.framework.zip" = "sha256-iCGXzxBhJGR6rWcECRg0W5Qv4I6ePo7UrWIqjQK1bWI="; - "artifacts.zip" = "sha256-2Ng0rxVDeMCH3kFHS7rhVd6R8oiJqvfsNDp+rzgtA50="; - "font-subset.zip" = "sha256-5IyNNLUT27WUCr61LjnMjmAZEv63ZaF+rl/p2XHFlVU="; - "gen_snapshot.zip" = "sha256-zPJaXPdvbQGx79c41XdRrBW/+3aV/INaPtO47+hHdxM="; - }; - darwin-x64-profile = { - "FlutterMacOS.framework.zip" = "sha256-PV4sTACDGeLLPz+AchxngWrQypmmUVQ48bQlAfH323w="; - "artifacts.zip" = "sha256-LBosuXu9mPh5WT0Mmgu9rX5Nuy+iIGN8Xvi7uVAyFhc="; - "gen_snapshot.zip" = "sha256-douXVnavzSGBuld3WhwHagBNK6FEU679puM8/fNGz2I="; - }; - darwin-x64-release = { - "FlutterMacOS.dSYM.zip" = "sha256-A8kyc1fmsGemgUVhI46yTC6XNkrXdoPYvwXomHoW6kM="; - "FlutterMacOS.framework.zip" = "sha256-dZ/MO9J+zanoGfvPaAinnANte92bQOlh697fd/LvGqA="; - "artifacts.zip" = "sha256-T/wxPd1LmstfGHr2Fx6cfhRifaGm6CUlig6cBMcOO5g="; - "gen_snapshot.zip" = "sha256-qeZxVp6btr/fUQRf7nOhlnSC03+QTcRaggiVOmPxVuo="; - }; - "flutter_patched_sdk.zip" = "sha256-kRRFCqQGBDimqwMiSn4yRMNRfZHt03YJqsKW47IBIvQ="; - "flutter_patched_sdk_product.zip" = "sha256-BowamIQHPZgfcZbWG7OFrB5GeEwdcA7AdUrF2Y+KIds="; + "FlutterMacOS.dSYM.zip" = "sha256-dNlx9PsXeJeV6FMPOliRyuc5p58DeEmXus2zP1dOqPs="; + "FlutterMacOS.framework.zip" = "sha256-ibmcuVjd3kswmUvXzZi8vl5uNEbnWvMAwzWYxs8i1zw="; + "artifacts.zip" = "sha256-KCXwR/ZZK1jyLQaIAsb+wAz4awVU1QozydIQt10M30A="; + "gen_snapshot.zip" = "sha256-hZT+IMHbvSTjk2WcNvfPl+vdXZ2vbB/MjiYP1Q+cKD8="; + }; + "flutter_patched_sdk.zip" = "sha256-vm9Zt+obBuYHQchQlqlinGYg9mwmoo41HwqYzy8QXP0="; + "flutter_patched_sdk_product.zip" = "sha256-JjMQ2zEGXKIcyYqYfCxDYlRbwglVMQ8H1zs5h6To1es=" + ; ios = { - "artifacts.zip" = "sha256-VoofDPEBUW2jBrXg3Z556uC2UdrD9JCpioZNhX1p/P0="; + "artifacts.zip" = "sha256-9/GWCsOvwEXVWYMYn48sZTe44GhB2JBJtPDRFUqgTek="; }; ios-profile = { - "artifacts.zip" = "sha256-5jDIqk7tWuRxXsAzrjBq9xzQrt/eREmmoEF3zc2xQ5M="; + "artifacts.zip" = "sha256-XZ4AFdG60gUx2xv3qZdk8Hh/0ZuIeJXeBxBoWlmhP4I="; }; ios-release = { - "Flutter.dSYM.zip" = "sha256-TuDld2LcHshl1mXcuIwfZgWLm1My4RpXUwI2B/QbLRk="; - "artifacts.zip" = "sha256-bGuUCKVqNNWWGVccVVKIBmCxTqgu4Q2Kj/Znnl9ZR2Q="; + "Flutter.dSYM.zip" = "sha256-QWCVU518mUHDXDdUm58XfS1TWYNkXI8LnfOIZ0PYLjs="; + "artifacts.zip" = "sha256-tFmIpEogaqCcx4ftVRah3Bw3CeB0dTku0xUMvUVfR00="; }; linux-arm64 = { - "artifacts.zip" = "sha256-jME3ivE+M+ceAt3aGPSeVwPaW8UhwGQOoL5lmRUqrOU="; - "font-subset.zip" = "sha256-MqavBMXOlx5JX94Oe/8GGuuDNh7A2UkjiOrEhCDW5cc="; + "artifacts.zip" = "sha256-MFsYOUIYLRINLNOjsDLFX4WPwcW3FTQ7P55/i8xQqcI="; + "font-subset.zip" = "sha256-nIWE1Mep1R1EMS3vS31qdTybhFOCyr7/agPEjlAodOQ="; }; linux-arm64-debug = { - "linux-arm64-flutter-gtk.zip" = "sha256-+ojrvr3bpCAwBc5ZJxSSvfxpW9M8h+YeQqdKno9TJgI="; + "linux-arm64-flutter-gtk.zip" = "sha256-2zYHns8gycYy7VNjXfJdf/yl71VJSDFSIMb6lQ0JuKI="; }; linux-arm64-profile = { - "linux-arm64-flutter-gtk.zip" = "sha256-5Smyc7JvudBG16l4Twq8QrZgfYXXeUGXb9NRNCBE+D4="; + "linux-arm64-flutter-gtk.zip" = "sha256-doGUIbTinn5kfw20NZRyph96ZkSa77Vm+y1Z/jBUi/E="; }; linux-arm64-release = { - "linux-arm64-flutter-gtk.zip" = "sha256-WWHhfgD83eMkAYC1jlZdkqO2J8lxf0VlIBGB8qfXQp0="; + "linux-arm64-flutter-gtk.zip" = "sha256-3zeRvhTZ3nFhOuiacJLTTlPBkyP1u3lh00j3e4jJpXU="; }; linux-x64 = { - "artifacts.zip" = "sha256-LpCjbAjQQmDL3r5iKHkB1072qKbIkvVusPvMYCj1ZI4="; - "font-subset.zip" = "sha256-2TWRwNIMSomFb+ZDKN6ZF9egehq0SBkcyD+0g+GvmEM="; + "artifacts.zip" = "sha256-L8DrlHTLYneYo5yMdgXVZw3YikF0qBKijGVLJZJLTEA="; + "font-subset.zip" = "sha256-KC733fwlRIK6DhjAJopnKdzjaC1JhvJ8nK74x+5DtIE="; }; linux-x64-debug = { - "linux-x64-flutter-gtk.zip" = "sha256-BV+Sp1EUTndrlu93eQB5txa/lsUPEEk42TbImFGzmk8="; + "linux-x64-flutter-gtk.zip" = "sha256-5hu5uRB4gOnZyH4zWBj/b2Flz6+5DUK2ytTHWGVfp4A="; }; linux-x64-profile = { - "linux-x64-flutter-gtk.zip" = "sha256-HhT2wm2dqc2ZoPprzm2TTP6pG/glh4ugmmowUYNtBRo="; + "linux-x64-flutter-gtk.zip" = "sha256-gYGBrExyYlIl+nYnCvlGBq13bP0E5bzzM089THEqHBM="; }; linux-x64-release = { - "linux-x64-flutter-gtk.zip" = "sha256-eluXkoISuzObXt2aiBmZGW6x8MsPTiD9bbVM4xcpe2w="; + "linux-x64-flutter-gtk.zip" = "sha256-Hw/hAMohLko1AMu3sr4Dq5OwvmrBP2PPJcJRVMgy6B4="; }; }; } diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch index 874619046134..ceaf59b5f535 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch +++ b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch @@ -1,8 +1,8 @@ diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index ab746724e9..1087983c87 100644 +index 3532c23114..25dfcae4c7 100644 --- a/bin/internal/shared.sh +++ b/bin/internal/shared.sh -@@ -215,8 +215,6 @@ function shared::execute() { +@@ -229,8 +229,6 @@ function shared::execute() { exit 1 fi @@ -11,39 +11,39 @@ index ab746724e9..1087983c87 100644 BIN_NAME="$(basename "$PROG_NAME")" case "$BIN_NAME" in flutter*) +diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart +index 13efbde879..467b3a7cbf 100644 +--- a/packages/flutter_tools/lib/src/cache.dart ++++ b/packages/flutter_tools/lib/src/cache.dart +@@ -664,6 +664,7 @@ class Cache { + + /// Update the cache to contain all `requiredArtifacts`. + Future<void> updateAll(Set<DevelopmentArtifact> requiredArtifacts, {bool offline = false}) async { ++ return; + if (!_lockEnabled) { + return; + } diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 738fef987d..03a152e64f 100644 +index 5d6d78639f..90a4dfa555 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -241,7 +241,6 @@ class FlutterCommandRunner extends CommandRunner<void> { +@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> { globals.flutterUsage.suppressAnalytics = true; } - globals.flutterVersion.ensureVersionFile(); - final bool machineFlag = topLevelResults['machine'] as bool? ?? false; + final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; final bool ci = await globals.botDetector.isRunningOnBot; final bool redirectedCompletion = !globals.stdio.hasTerminal && -@@ -250,10 +249,6 @@ class FlutterCommandRunner extends CommandRunner<void> { - final bool versionCheckFlag = topLevelResults['version-check'] as bool? ?? false; - final bool explicitVersionCheckPassed = topLevelResults.wasParsed('version-check') && versionCheckFlag; +@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> { + final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false; + final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag; - if (topLevelResults.command?.name != 'upgrade' && - (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) { - await globals.flutterVersion.checkFlutterVersionFreshness(); - } - +- // See if the user specified a specific device. - globals.deviceManager?.specifiedDeviceId = topLevelResults['device-id'] as String?; - -diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index dd80b1e46e..8e54517765 100644 ---- a/packages/flutter_tools/lib/src/cache.dart -+++ b/packages/flutter_tools/lib/src/cache.dart -@@ -668,6 +668,7 @@ - - /// Update the cache to contain all `requiredArtifacts`. - Future<void> updateAll(Set<DevelopmentArtifact> requiredArtifacts, {bool offline = false}) async { -+ return; - if (!_lockEnabled) { - return; - } + final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; + if (specifiedDeviceId != null) { diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/flutter-pub-dart-override.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/flutter-pub-dart-override.patch new file mode 100644 index 000000000000..9d1de65c320d --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/flutter-pub-dart-override.patch @@ -0,0 +1,34 @@ +From ddb81649092776ecac635af7040685588798b5a5 Mon Sep 17 00:00:00 2001 +From: hacker1024 <hacker1024@users.sourceforge.net> +Date: Sun, 27 Aug 2023 22:47:24 +1000 +Subject: [PATCH] Allow replacing the Dart binary used for Pub commands with + NIX_FLUTTER_PUB_DART + +--- + packages/flutter_tools/lib/src/dart/pub.dart | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/packages/flutter_tools/lib/src/dart/pub.dart b/packages/flutter_tools/lib/src/dart/pub.dart +index 40e60f9005..22fd3cebc7 100644 +--- a/packages/flutter_tools/lib/src/dart/pub.dart ++++ b/packages/flutter_tools/lib/src/dart/pub.dart +@@ -3,6 +3,7 @@ + // found in the LICENSE file. + + import 'dart:async'; ++import 'dart:io' as io; + + import 'package:meta/meta.dart'; + import 'package:package_config/package_config.dart'; +@@ -544,7 +545,7 @@ class _DefaultPub implements Pub { + + List<String> _computePubCommand() { + // TODO(zanderso): refactor to use artifacts. +- final String sdkPath = _fileSystem.path.joinAll(<String>[ ++ final String sdkPath = io.Platform.environment['NIX_FLUTTER_PUB_DART'] ?? _fileSystem.path.joinAll(<String>[ + Cache.flutterRoot!, + 'bin', + 'cache', +-- +2.41.0 + diff --git a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch index 42ad756f8ea4..6e6ae4e6fb98 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch +++ b/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/git-dir.patch @@ -1,8 +1,8 @@ diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart -index 8e4cb81340..2c20940423 100644 +index 9f33a22cc3..c46255742c 100644 --- a/dev/bots/prepare_package.dart +++ b/dev/bots/prepare_package.dart -@@ -526,7 +526,7 @@ class ArchiveCreator { +@@ -602,7 +602,7 @@ class ArchiveCreator { Future<String> _runGit(List<String> args, {Directory? workingDirectory}) { return _processRunner.runProcess( @@ -12,10 +12,10 @@ index 8e4cb81340..2c20940423 100644 ); } diff --git a/packages/flutter_tools/lib/src/commands/downgrade.dart b/packages/flutter_tools/lib/src/commands/downgrade.dart -index 666c190067..b6c3761f6f 100644 +index a58b75c009..02da0daeb7 100644 --- a/packages/flutter_tools/lib/src/commands/downgrade.dart +++ b/packages/flutter_tools/lib/src/commands/downgrade.dart -@@ -118,7 +118,7 @@ class DowngradeCommand extends FlutterCommand { +@@ -120,7 +120,7 @@ class DowngradeCommand extends FlutterCommand { // Detect unknown versions. final ProcessUtils processUtils = _processUtils!; final RunResult parseResult = await processUtils.run(<String>[ @@ -24,7 +24,7 @@ index 666c190067..b6c3761f6f 100644 ], workingDirectory: workingDirectory); if (parseResult.exitCode != 0) { throwToolExit('Failed to parse version for downgrade:\n${parseResult.stderr}'); -@@ -191,7 +191,7 @@ class DowngradeCommand extends FlutterCommand { +@@ -192,7 +192,7 @@ class DowngradeCommand extends FlutterCommand { continue; } final RunResult parseResult = await _processUtils!.run(<String>[ @@ -34,55 +34,37 @@ index 666c190067..b6c3761f6f 100644 if (parseResult.exitCode == 0) { buffer.writeln('Channel "${getNameForChannel(channel)}" was previously on: ${parseResult.stdout}.'); diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart -index dc47f17057..8068e2d1f5 100644 +index 0702b35e7e..36b2a95b65 100644 --- a/packages/flutter_tools/lib/src/version.dart +++ b/packages/flutter_tools/lib/src/version.dart -@@ -111,7 +111,7 @@ class FlutterVersion { - String? channel = _channel; - if (channel == null) { +@@ -407,7 +407,7 @@ abstract class FlutterVersion { + /// wrapper that does that. + @visibleForTesting + static List<String> gitLog(List<String> args) { +- return <String>['git', '-c', 'log.showSignature=false', 'log'] + args; ++ return <String>['git', '--git-dir','.git', '-c', 'log.showSignature=false', 'log'] + args; + } + } + +@@ -559,7 +559,7 @@ class _FlutterVersionGit extends FlutterVersion { + String? get repositoryUrl { + if (_repositoryUrl == null) { final String gitChannel = _runGit( - 'git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream', + 'git --git-dir .git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream', globals.processUtils, - _workingDirectory, + flutterRoot, ); -@@ -119,7 +119,7 @@ class FlutterVersion { +@@ -567,7 +567,7 @@ class _FlutterVersionGit extends FlutterVersion { if (slash != -1) { final String remote = gitChannel.substring(0, slash); _repositoryUrl = _runGit( - 'git ls-remote --get-url $remote', + 'git --git-dir .git ls-remote --get-url $remote', globals.processUtils, - _workingDirectory, + flutterRoot, ); -@@ -298,7 +298,7 @@ class FlutterVersion { - /// the branch name will be returned as `'[user-branch]'`. - String getBranchName({ bool redactUnknownBranches = false }) { - _branch ??= () { -- final String branch = _runGit('git rev-parse --abbrev-ref HEAD', globals.processUtils); -+ final String branch = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', globals.processUtils); - return branch == 'HEAD' ? channel : branch; - }(); - if (redactUnknownBranches || _branch!.isEmpty) { -@@ -331,7 +331,7 @@ class FlutterVersion { - /// wrapper that does that. - @visibleForTesting - static List<String> gitLog(List<String> args) { -- return <String>['git', '-c', 'log.showSignature=false', 'log'] + args; -+ return <String>['git', '-c', 'log.showSignature=false', '--git-dir', '.git', 'log'] + args; - } - - /// Gets the release date of the latest available Flutter version. -@@ -708,7 +708,7 @@ class GitTagVersion { - String gitRef = 'HEAD' - }) { - if (fetchTags) { -- final String channel = _runGit('git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory); -+ final String channel = _runGit('git --git-dir .git rev-parse --abbrev-ref HEAD', processUtils, workingDirectory); - if (channel == 'dev' || channel == 'beta' || channel == 'stable') { - globals.printTrace('Skipping request to fetchTags - on well known channel $channel.'); - } else { -@@ -718,7 +718,7 @@ class GitTagVersion { +@@ -952,7 +952,7 @@ class GitTagVersion { } // find all tags attached to the given [gitRef] final List<String> tags = _runGit( @@ -91,7 +73,7 @@ index dc47f17057..8068e2d1f5 100644 // Check first for a stable tag final RegExp stableTagPattern = RegExp(r'^\d+\.\d+\.\d+$'); -@@ -739,7 +739,7 @@ class GitTagVersion { +@@ -973,7 +973,7 @@ class GitTagVersion { // recent tag and number of commits past. return parse( _runGit( diff --git a/nixpkgs/pkgs/development/compilers/glslang/default.nix b/nixpkgs/pkgs/development/compilers/glslang/default.nix index a53e78103ad5..9753a1077a63 100644 --- a/nixpkgs/pkgs/development/compilers/glslang/default.nix +++ b/nixpkgs/pkgs/development/compilers/glslang/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , bison , cmake , jq @@ -10,24 +9,15 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "12.2.0"; + version = "12.3.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-2i6DZA42b0s1ul6VDhjPi9lpSYvsRD8r9yiRoRfVoW0="; + hash = "sha256-NP5ph598YSPbpzJJUR2r+EkqFmuItxgvOSDgDaN+Swg="; }; - patches = [ - # Fix build on Darwin - # FIXME: remove for next release - (fetchpatch { - url = "https://github.com/KhronosGroup/glslang/commit/6a7ec4be7b8a22ab16cea0f294b5973dbcdd637a.diff"; - hash = "sha256-O1N62X6LZNRNHHz90TLJDbt6pDr28EI6IKMbMXcKBj8="; - }) - ]; - # These get set at all-packages, keep onto them for child drvs passthru = { spirv-tools = spirv-tools; @@ -48,8 +38,11 @@ stdenv.mkDerivation rec { # Fix the paths in .pc, even though it's unclear if these .pc are really useful. postFixup = '' - substituteInPlace "$out"/lib/pkgconfig/SPIRV-Tools{,-shared}.pc \ + substituteInPlace $out/lib/pkgconfig/*.pc \ --replace '=''${prefix}//' '=/' + + # add a symlink for backwards compatibility + ln -s $out/bin/glslang $out/bin/glslangValidator ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/compilers/go/1.21.nix b/nixpkgs/pkgs/development/compilers/go/1.21.nix index c95211c6d9e3..d85bcbfa5a3d 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.21.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.21.nix @@ -17,8 +17,8 @@ }: let - useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV; - goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap117.nix { }; + useGccGoBootstrap = stdenv.buildPlatform.isMusl; + goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap121.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo121Module; }; diff --git a/nixpkgs/pkgs/development/compilers/go/binary.nix b/nixpkgs/pkgs/development/compilers/go/binary.nix index 352e0e395206..3b4e8010d27e 100644 --- a/nixpkgs/pkgs/development/compilers/go/binary.nix +++ b/nixpkgs/pkgs/development/compilers/go/binary.nix @@ -11,6 +11,7 @@ let "armv6l" = "armv6l"; "armv7l" = "armv6l"; "powerpc64le" = "ppc64le"; + "riscv64" = "riscv64"; }.${platform.parsed.cpu.name} or (throw "Unsupported CPU ${platform.parsed.cpu.name}"); toGoPlatform = platform: "${toGoKernel platform}-${toGoCPU platform}"; diff --git a/nixpkgs/pkgs/development/compilers/go/bootstrap121.nix b/nixpkgs/pkgs/development/compilers/go/bootstrap121.nix new file mode 100644 index 000000000000..f243ca30abf3 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/go/bootstrap121.nix @@ -0,0 +1,22 @@ +{ callPackage }: +callPackage ./binary.nix { + version = "1.21.0"; + hashes = { + # Use `print-hashes.sh ${version}` to generate the list below + darwin-amd64 = "b314de9f704ab122c077d2ec8e67e3670affe8865479d1f01991e7ac55d65e70"; + darwin-arm64 = "3aca44de55c5e098de2f406e98aba328898b05d509a2e2a356416faacf2c4566"; + linux-386 = "0e6f378d9b072fab0a3d9ff4d5e990d98487d47252dba8160015a61e6bd0bcba"; + linux-amd64 = "d0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742"; + linux-arm64 = "f3d4548edf9b22f26bbd49720350bbfe59d75b7090a1a2bff1afad8214febaf3"; + linux-armv6l = "e377a0004957c8c560a3ff99601bce612330a3d95ba3b0a2ae144165fc87deb1"; + linux-loong64 = "e484cdc55221f7e7853666ed4f0ef462eef46b52253f84df60a7b908416060cb"; + linux-mips = "6311d8ccd6ff9ce3cc8ecc72017d651d23e7325943fa72f4b65cd750be8aacd8"; + linux-mips64 = "6d9cb425dc61f60bff41e2dec873abbcc5b8dbd1d32997f994d707b662f3c363"; + linux-mips64le = "92f7933d997c589b4f506c6b3cc5b27ff43b294c3a2d40bf4d7eeaf375f92afb"; + linux-mipsle = "9bb9f938457411042074a57284d40a086e63f7778f86e1632e018bbc38948c92"; + linux-ppc64 = "e34dcc1df804bf8bac035ace3304f23696a9138a79a398dce981d89072d3ae23"; + linux-ppc64le = "e938ffc81d8ebe5efc179240960ba22da6a841ff05d5cab7ce2547112b14a47f"; + linux-riscv64 = "87b21c06573617842ca9e00b954bc9f534066736a0778eae594ac54b45a9e8b7"; + linux-s390x = "be7338df8e5d5472dfa307b0df2b446d85d001b0a2a3cdb1a14048d751b70481"; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/ispc/default.nix b/nixpkgs/pkgs/development/compilers/ispc/default.nix index f124cb4d4e68..606d77c1737f 100644 --- a/nixpkgs/pkgs/development/compilers/ispc/default.nix +++ b/nixpkgs/pkgs/development/compilers/ispc/default.nix @@ -1,22 +1,22 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode - +, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb # the default test target is sse4, but that is not supported by all Hydra agents , testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] }: stdenv.mkDerivation rec { pname = "ispc"; - version = "1.19.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256:0yhcgyzjlrgs920lm0l6kygj2skanfb6qkxbdgm69r8c2xkzkaa3"; + sha256 = "sha256:029rlkh7vh8hxg8ygpspxb9hvw5q97m460zbxwb7xnx1jnq8msh4"; }; - nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; + nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; + buildInputs = with llvmPackages; [ libllvm libclang openmp ncurses ]; @@ -52,7 +52,10 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ + "-DFILE_CHECK_EXECUTABLE=${llvmPackages.llvm}/bin/FileCheck" + "-DLLVM_AS_EXECUTABLE=${llvmPackages.llvm}/bin/llvm-as" "-DLLVM_CONFIG_EXECUTABLE=${llvmPackages.llvm.dev}/bin/llvm-config" + "-DLLVM_DIS_EXECUTABLE=${llvmPackages.llvm}/bin/llvm-dis" "-DCLANG_EXECUTABLE=${llvmPackages.clang}/bin/clang" "-DCLANGPP_EXECUTABLE=${llvmPackages.clang}/bin/clang++" "-DISPC_INCLUDE_EXAMPLES=OFF" @@ -68,6 +71,6 @@ stdenv.mkDerivation rec { description = "Intel 'Single Program, Multiple Data' Compiler, a vectorised language"; license = licenses.bsd3; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; # TODO: buildable on more platforms? - maintainers = with maintainers; [ aristid thoughtpolice athas ]; + maintainers = with maintainers; [ aristid thoughtpolice athas alexfmpe ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/julia/1.9-bin.nix b/nixpkgs/pkgs/development/compilers/julia/1.9-bin.nix index 9bae485b34d1..85c0d7043efd 100644 --- a/nixpkgs/pkgs/development/compilers/julia/1.9-bin.nix +++ b/nixpkgs/pkgs/development/compilers/julia/1.9-bin.nix @@ -24,24 +24,24 @@ let in stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.9.2"; + version = "1.9.3"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "4c2d799f442d7fe718827b19da2bacb72ea041b9ce55f24eee7b1313f57c4383"; + sha256 = "d76670cc9ba3e0fd4c1545dd3d00269c0694976a1176312795ebce1692d323d1"; }; aarch64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz"; - sha256 = "682397f8895149f0e283f0b27bffc6694033bdfb19f9366c80f6efdf3685f27c"; + sha256 = "55437879f6b98470d96c4048b922501b643dfffb8865abeb90c7333a83df7524"; }; x86_64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/x64/${lib.versions.majorMinor version}/julia-${version}-mac64.tar.gz"; - sha256 = "a2e8eb31a89b26e4a99349303aeff8e8ee780144bbdb1f7eda6f41024d42cadb"; + sha256 = "6eea87748424488226090d1e7d553e72ab106a873d63c732fc710a3d080abb97"; }; aarch64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/aarch64/${lib.versions.majorMinor version}/julia-${version}-macaarch64.tar.gz"; - sha256 = "77c71ff8cb1fcdb84097e86a9fb579a8b34d8e7fd8e24d43107042e0fb988b76"; + sha256 = "f518e38d7bd5b37766fb051916bd295993aa4b52a47018f4c98b5fde721ced87"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/nixpkgs/pkgs/development/compilers/julia/1.9.nix b/nixpkgs/pkgs/development/compilers/julia/1.9.nix index 810a03152527..002cca08aac5 100644 --- a/nixpkgs/pkgs/development/compilers/julia/1.9.nix +++ b/nixpkgs/pkgs/development/compilers/julia/1.9.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "julia"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - hash = "sha256-hwY9TC6kHHNqoujLvHwvGgYuIjlVFX+EBFU87XZJE80="; + hash = "sha256-j8DJ3FRDoo01m9ed2jlA+pS6K3lmuJhlvrINqBEjwxY="; }; patches = [ diff --git a/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/nixpkgs/pkgs/development/compilers/kotlin/default.nix index 89474f27614f..6fd5b8801927 100644 --- a/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/nixpkgs/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.9.0"; + version = "1.9.10"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1s5y9180r97qmfysw3rm39y5c646rj4z149ywhnyj2cqby00vi8z"; + sha256 = "0hh3qa4nical29wkm3byqvmd00xhx9gp7hslx8l0z3ngxqyqcx3x"; }; propagatedBuildInputs = [ jre ] ; diff --git a/nixpkgs/pkgs/development/compilers/kotlin/native.nix b/nixpkgs/pkgs/development/compilers/kotlin/native.nix index 9236809b5761..4f6dddb3fa13 100644 --- a/nixpkgs/pkgs/development/compilers/kotlin/native.nix +++ b/nixpkgs/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.9.0"; + version = "1.9.10"; src = let getArch = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; getHash = arch: { - "macos-aarch64" = "0728zm72ywyl6yhrfkad3whg2xly9bx7whp8alfi980qf468b1jh"; - "macos-x86_64" = "09j2i06qypw7ag2wrfkci9gnvprj96n3362p5vynr65jrzm5b8ww"; - "linux-x86_64" = "1v58n8ap5kifhawz30lk6rb2sp0qyiiy8gihw2ngbbhvakkigg8q"; + "macos-aarch64" = "1pn371hy6hkyji4vkfiw3zw30wy0yyfhkxnkkyr8m0609945mkyj"; + "macos-x86_64" = "13c28czvja93zaff0kzqf8crzh998l90gznq0cl6k2j3c0jhyrgm"; + "linux-x86_64" = "0nxaiwn4akfpkibq42y8kfn5hdd7vzkm296qx4a9ai7l36cngcqx"; }.${arch}; in fetchurl { diff --git a/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/default.nix b/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/default.nix index 692a0256e901..77ba2d2d008a 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/default.nix @@ -68,8 +68,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || - (stdenv.hostPlatform.isDarwin && enableShared)) [ # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, # but that does not appear to be the case for example when building # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc). diff --git a/nixpkgs/pkgs/development/compilers/llvm/16/libcxxabi/default.nix b/nixpkgs/pkgs/development/compilers/llvm/16/libcxxabi/default.nix index 692a0256e901..77ba2d2d008a 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/16/libcxxabi/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/16/libcxxabi/default.nix @@ -68,8 +68,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || - (stdenv.hostPlatform.isDarwin && enableShared)) [ # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, # but that does not appear to be the case for example when building # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc). diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 51020fcdb0ca..362de957886d 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -68,8 +68,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || - (stdenv.hostPlatform.isDarwin && enableShared)) [ # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, # but that does not appear to be the case for example when building # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc). diff --git a/nixpkgs/pkgs/development/compilers/lobster/default.nix b/nixpkgs/pkgs/development/compilers/lobster/default.nix index 712dcf12215d..357401aaf43b 100644 --- a/nixpkgs/pkgs/development/compilers/lobster/default.nix +++ b/nixpkgs/pkgs/development/compilers/lobster/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lobster"; - version = "2023.9"; + version = "2023.11"; src = fetchFromGitHub { owner = "aardappel"; repo = "lobster"; rev = "v${version}"; - sha256 = "sha256-30OOdl/BzWJeLhSWuzLAhwELRPcOJIi7FqwL/ztUOUo="; + sha256 = "sha256-c0EElDvoFzIZvYZpjWd9az+KUxDXTETOp89I/tRCrQ0="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/compilers/lunarml/default.nix b/nixpkgs/pkgs/development/compilers/lunarml/default.nix index ff3122ce2198..5d0b952aa36d 100644 --- a/nixpkgs/pkgs/development/compilers/lunarml/default.nix +++ b/nixpkgs/pkgs/development/compilers/lunarml/default.nix @@ -5,19 +5,16 @@ , lua5_3 }: -let - pname = "lunarml"; -in stdenvNoCC.mkDerivation { - inherit pname; + pname = "lunarml"; - version = "unstable-2023-06-25"; + version = "unstable-2023-08-25"; src = fetchFromGitHub { owner = "minoki"; repo = "LunarML"; - rev = "f58f90cf7a2f26340403245907ed183f6a12ab52"; - sha256 = "djHJfUAPplsejFW9L3fbwTeeWgvR+gKkI8TmwIh8n7E="; + rev = "69d09b47601f4041ca7e8a513c75f3e4835af9dd"; + sha256 = "sha256-GXUcWI4/akOKIvCHrsOfceZEdyNZdIdalTc6wX+svS4="; }; outputs = [ "out" "doc" ]; @@ -37,18 +34,21 @@ stdenvNoCC.mkDerivation { doCheck = true; installPhase = '' - mkdir -p $doc/${pname} $out/{bin,lib} + runHook preInstall + + mkdir -p $doc/lunarml $out/{bin,lib} cp -r bin $out cp -r lib $out - cp -r doc/* README.* LICENSE* $doc/${pname} - cp -r example $doc/${pname} + cp -r example $doc/lunarml + + runHook postInstall ''; meta = { description = "Standard ML compiler that produces Lua/JavaScript"; homepage = "https://github.com/minoki/LunarML"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ toastal ]; + maintainers = with lib.maintainers; [ toastal ratsclub ]; platforms = mlton.meta.platforms; }; } diff --git a/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix b/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix index 8fcb1c7c043a..cfd6166d0456 100644 --- a/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix +++ b/nixpkgs/pkgs/development/compilers/sbcl/2.x.nix @@ -19,16 +19,12 @@ let sha256 = "189gjqzdz10xh3ybiy4ch1r98bsmkcb4hpnrmggd4y2g5kqnyx4y"; }; - # The loosely held nixpkgs convention for SBCL is to keep the last two - # versions. - # https://github.com/NixOS/nixpkgs/pull/200994#issuecomment-1315042841 - "2.3.6" = { - sha256 = "sha256-tEFMpNmnR06NiE19YyN+LynvRZ39WoSEJKnD+lUdGbk="; - }; - "2.3.7" = { sha256 = "sha256-aYFE+4BaMZGaYQ3pmauYOR1S62mK2qjKGbKPxu0Nmfc="; }; + "2.3.8" = { + sha256 = "sha256-QhVxsqyRbli+jrzqXvSr+NeQKGPbah0KXvqVAK3KDSk="; + }; }; in with versionMap.${version}; diff --git a/nixpkgs/pkgs/development/compilers/typescript/default.nix b/nixpkgs/pkgs/development/compilers/typescript/default.nix index d63fe8651a1b..af60548c32e0 100644 --- a/nixpkgs/pkgs/development/compilers/typescript/default.nix +++ b/nixpkgs/pkgs/development/compilers/typescript/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "typescript"; - version = "5.1.6"; + version = "5.2.2"; src = fetchFromGitHub { owner = "microsoft"; repo = "TypeScript"; rev = "v${version}"; - hash = "sha256-YBAAiO7MBJ41VK6A9zeExB7ZSbbrQ23sVTHAqo+/H/w="; + hash = "sha256-wjoqDmCudN5+9C3GrP1viiXBvsWgU0UIYWaFeK/TJEY="; }; - npmDepsHash = "sha256-RHiUhhkzkr2Ra3wc1d13gE2WIZL49w7IEFEAZuBDTDI="; + npmDepsHash = "sha256-7Wm6nlpqZRNqBU0mYFZRVWQkO4uqvrKrp2h2aEmZtow="; meta = with lib; { description = "A superset of JavaScript that compiles to clean JavaScript output"; diff --git a/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix index 8b932499ca44..9f958e8d1c44 100644 --- a/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix @@ -7,8 +7,8 @@ with builtins; with lib; let { case = "8.13"; out = { version = "1.13.7"; };} { case = "8.14"; out = { version = "1.13.7"; };} { case = "8.15"; out = { version = "1.15.0"; };} - { case = "8.16"; out = { version = "1.16.5"; };} - { case = "8.17"; out = { version = "1.16.5"; };} + { case = "8.16"; out = { version = "1.17.0"; };} + { case = "8.17"; out = { version = "1.17.0"; };} ] {} ); in mkCoqDerivation { pname = "elpi"; @@ -16,7 +16,7 @@ in mkCoqDerivation { owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ - { case = "8.17"; out = "1.17.0"; } + { case = "8.17"; out = "1.18.0"; } { case = "8.16"; out = "1.15.6"; } { case = "8.15"; out = "1.14.0"; } { case = "8.14"; out = "1.11.2"; } @@ -24,6 +24,7 @@ in mkCoqDerivation { { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."1.18.0".sha256 = "sha256-2fCOlhqi4YkiL5n8SYHuc3pLH+DArf9zuMH7IhpBc2Y="; release."1.17.0".sha256 = "sha256-J8GatRKFU0ekNCG3V5dBI+FXypeHcLgC5QJYGYzFiEM="; release."1.15.6".sha256 = "sha256-qc0q01tW8NVm83801HHOBHe/7H1/F2WGDbKO6nCXfno="; release."1.15.1".sha256 = "sha256-NT2RlcIsFB9AvBhMxil4ZZIgx+KusMqDflj2HgQxsZg="; diff --git a/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix b/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix index 464ef4fc301d..725f7654de9b 100644 --- a/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -5,11 +5,13 @@ let hb = mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.15" "8.18"; out = "1.5.0"; } { case = range "8.15" "8.17"; out = "1.4.0"; } { case = range "8.13" "8.14"; out = "1.2.0"; } { case = range "8.12" "8.13"; out = "1.1.0"; } { case = isEq "8.11"; out = "0.10.0"; } ] null; + release."1.5.0".sha256 = "sha256-Lia3o156Pbe8rDHOA1IniGYsG5/qzZkzDKdHecfmS+c="; release."1.4.0".sha256 = "sha256-tOed9UU3kMw6KWHJ5LVLUFEmzHx1ImutXQvZ0ldW9rw="; release."1.3.0".sha256 = "17k7rlxdx43qda6i1yafpgc64na8br285cb0mbxy5wryafcdrkrc"; release."1.2.1".sha256 = "sha256-pQYZJ34YzvdlRSGLwsrYgPdz3p/l5f+KhJjkYT08Mj0="; diff --git a/nixpkgs/pkgs/development/coq-modules/serapi/default.nix b/nixpkgs/pkgs/development/coq-modules/serapi/default.nix index ac09d26935af..b33c89aa63c1 100644 --- a/nixpkgs/pkgs/development/coq-modules/serapi/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/serapi/default.nix @@ -87,6 +87,10 @@ in then [ ./janestreet-0.15.patch ] + else if version == "8.17.0+0.17.0" + then [ + ./janestreet-0.16.patch + ] else [ ]; diff --git a/nixpkgs/pkgs/development/coq-modules/serapi/janestreet-0.16.patch b/nixpkgs/pkgs/development/coq-modules/serapi/janestreet-0.16.patch new file mode 100644 index 000000000000..01aac57639ad --- /dev/null +++ b/nixpkgs/pkgs/development/coq-modules/serapi/janestreet-0.16.patch @@ -0,0 +1,17 @@ +diff --git a/serlib/ser_stdlib.ml b/serlib/ser_stdlib.ml +index 894d300..11c9217 100644 +--- a/serlib/ser_stdlib.ml ++++ b/serlib/ser_stdlib.ml +@@ -28,6 +28,7 @@ let ref_to_yojson f x = f !x + let ref_of_yojson f x = Result.map (fun x -> ref x) (f x) + let hash_fold_ref = hash_fold_ref_frozen + let compare_ref = compare_ref ++let (==) x y = (==) x y + + module Lazy = struct + type 'a t = 'a lazy_t +@@ -35,3 +36,4 @@ module Lazy = struct + end + + module Option = Stdlib.Option ++module List = Stdlib.List diff --git a/nixpkgs/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/nixpkgs/pkgs/development/embedded/arduino/arduino-language-server/default.nix index da3d1e7e7c60..1a0c3665ea27 100644 --- a/nixpkgs/pkgs/development/embedded/arduino/arduino-language-server/default.nix +++ b/nixpkgs/pkgs/development/embedded/arduino/arduino-language-server/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "arduino-language-server"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "arduino"; repo = "arduino-language-server"; rev = "refs/tags/${version}"; - hash = "sha256-A5JcHdcSrRC1BxoJsPtLKBq1fu58SvwHm9hbgu8Uy5k="; + hash = "sha256-RBoDT/KnbQHeuE5WpoL4QWu3gojiNdsi+/NEY2e/sHs="; }; subPackages = [ "." ]; - vendorHash = "sha256-SKqorfgesYE0kXR/Fm6gI7Me0CxtDeNsTRGYuGJW+vo="; + vendorHash = "sha256-tS6OmH757VDdViPHJAJAftQu+Y1YozE7gXkt5anDlT0="; doCheck = false; diff --git a/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix index af496df582c1..a9384d9b2b8b 100644 --- a/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/nixpkgs/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -1,23 +1,27 @@ -{ lib, stdenv, makeDesktopItem, icoutils, fdupes, imagemagick, jdk11, fetchzip }: -# TODO: JDK16 causes STM32CubeMX to crash right now, so we fixed the version to JDK11 -# This may be fixed in a future version of STM32CubeMX. This issue has been reported to ST: -# https://community.st.com/s/question/0D53W00000jnOzPSAU/stm32cubemx-crashes-on-launch-with-openjdk16 -# If you're updating this derivation, check the link above to see if it's been fixed upstream -# and try replacing all occurrences of jdk11 with jre and test whether it works. +{ fdupes +, fetchzip +, icoutils +, imagemagick +, jdk17 +, lib +, makeDesktopItem +, stdenv +}: + let iconame = "STM32CubeMX"; in stdenv.mkDerivation rec { pname = "stm32cubemx"; - version = "6.8.1"; + version = "6.9.1"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "sha256-0WzdyRP09rRZzVZhwMOxA/SwHrQOYGBnv8UwvjMT22Q="; + sha256 = "sha256-KTbIRj7DkWoC2h/TLKjVduvsKVSue28kGOL34JqBVx4="; stripRoot = false; }; - nativeBuildInputs = [ icoutils fdupes imagemagick ]; + nativeBuildInputs = [ fdupes icoutils imagemagick ]; desktopItem = makeDesktopItem { name = "STM32CubeMX"; exec = "stm32cubemx"; @@ -41,7 +45,7 @@ stdenv.mkDerivation rec { cat << EOF > $out/bin/${pname} #!${stdenv.shell} - ${jdk11}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX + ${jdk17}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX EOF chmod +x $out/bin/${pname} @@ -74,7 +78,7 @@ stdenv.mkDerivation rec { homepage = "https://www.st.com/en/development-tools/stm32cubemx.html"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - maintainers = with maintainers; [ wucke13 ]; + maintainers = with maintainers; [ angaz wucke13 ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/nixpkgs/pkgs/development/interpreters/clojure/default.nix index 2aaefaed7a43..0008b181fec2 100644 --- a/nixpkgs/pkgs/development/interpreters/clojure/default.nix +++ b/nixpkgs/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.11.1.1386"; + version = "1.11.1.1413"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-e5RLnsydCZKRv6P/yC8FxK5AgK0Gj6YJw7E41neGYsM="; + hash = "sha256-k8Olo63KUcWFgGNBmr9myD2/JOoV4f2S95v35mI4H+A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/interpreters/cyber/default.nix b/nixpkgs/pkgs/development/interpreters/cyber/default.nix index 9c1d94b0c7f8..4d756b152d44 100644 --- a/nixpkgs/pkgs/development/interpreters/cyber/default.nix +++ b/nixpkgs/pkgs/development/interpreters/cyber/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cyber"; - version = "unstable-2023-08-11"; + version = "unstable-2023-08-24"; src = fetchFromGitHub { owner = "fubark"; repo = "cyber"; - rev = "242ba2573cbac2acecc8c06878a8d754dd7a8716"; - hash = "sha256-jArkFdvWnHNouNGsTn8O2lbU7eZdLbPD0xEfkrFH5Aw="; + rev = "be76bc13590285cffa502c3c97470a80ff1f27bd"; + hash = "sha256-DhGp+vHz+FfF9ZGopQshF2t0Q4/yeN7CEpIlPliPBgQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/interpreters/expr/default.nix b/nixpkgs/pkgs/development/interpreters/expr/default.nix index d2f4816e0ae5..bc9145bf3403 100644 --- a/nixpkgs/pkgs/development/interpreters/expr/default.nix +++ b/nixpkgs/pkgs/development/interpreters/expr/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "expr"; - version = "1.14.3"; + version = "1.15.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = "expr"; rev = "v${version}"; - hash = "sha256-4BYFFuoKI5EdxBrgMi33PgjXL6TI7jOQ8H7jLlNKfks="; + hash = "sha256-UZUy2qZQh5vGWVw08ZSJTTy6Obh2dIHkk7p1G+B0du0="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-vQmQdPmfZtudnFqqNeMRdbRVytpbcCt/wH1xSTO+cMQ="; + vendorHash = "sha256-RnrM7L1QppUPBi3sJ4xM/UChFHADEpAA36JaURP7Vo4="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/development/interpreters/joker/default.nix b/nixpkgs/pkgs/development/interpreters/joker/default.nix index 511cf691e28a..30b7aabbcdcd 100644 --- a/nixpkgs/pkgs/development/interpreters/joker/default.nix +++ b/nixpkgs/pkgs/development/interpreters/joker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "joker"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-hNwDX2yg7J8rcR9QRSGgqFTeqH+ydyDtPbIGC2nK5RI="; + sha256 = "sha256-D9maTCNNJ9ivj76SEjddFSYNu+RLEZG+3SgOWEAD7aU="; }; - vendorHash = "sha256-DrVtT2OBNquWVp/8Je45dBPDXafEc2Q+jffwY2S8J80="; + vendorHash = "sha256-ioC7R5Pm2nmHXI+/ko1UoNJCvEFzvhZcAcVtaFECz2c="; doCheck = false; diff --git a/nixpkgs/pkgs/development/interpreters/luau/default.nix b/nixpkgs/pkgs/development/interpreters/luau/default.nix index 4bacb15a79d9..2ae58455f42e 100644 --- a/nixpkgs/pkgs/development/interpreters/luau/default.nix +++ b/nixpkgs/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.591"; + version = "0.592"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-eCYB+B5bglUcF+xAAHBWwwgDrvY9NatmcwL/GUnIhOk="; + hash = "sha256-S0Sr28jPnFBurLlCCj3BzTLh7yvzEPlR0MAUz7cDf1k="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/interpreters/php/8.3.nix b/nixpkgs/pkgs/development/interpreters/php/8.3.nix index 0e7d7111f245..2c529a3ec965 100644 --- a/nixpkgs/pkgs/development/interpreters/php/8.3.nix +++ b/nixpkgs/pkgs/development/interpreters/php/8.3.nix @@ -2,12 +2,12 @@ let base = (callPackage ./generic.nix (_args // { - version = "8.3.0beta3"; + version = "8.3.0RC1"; hash = null; })).overrideAttrs (oldAttrs: { src = fetchurl { - url = "https://downloads.php.net/~eric/php-8.3.0beta3.tar.xz"; - hash = "sha256-XW3t9BOsBFvThYXF66faVl8VyMLFB+Oi7h45vWUmE6Y="; + url = "https://downloads.php.net/~jakub/php-8.3.0RC1.tar.xz"; + hash = "sha256-pWnkxSIhzKU8Cp+AiGzqhqRtWoJu+zBfCM45n2ugH7c="; }; }); in diff --git a/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix b/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix index 46b01999f96c..74aff43f7cae 100644 --- a/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix @@ -1,7 +1,8 @@ self: dontUse: with self; let - pythonInterpreter = python.pythonForBuild.interpreter; + inherit (python) pythonForBuild; + pythonInterpreter = pythonForBuild.interpreter; pythonSitePackages = python.sitePackages; pythonCheckInterpreter = python.interpreter; setuppy = ../run_setup.py; @@ -66,11 +67,9 @@ in { makePythonHook { name = "pypa-build-hook.sh"; propagatedBuildInputs = [ build wheel ]; - substitutions = { - inherit pythonInterpreter; - }; - } ./pypa-build-hook.sh) {}; - + } ./pypa-build-hook.sh) { + inherit (pythonForBuild.pkgs) build; + }; pipInstallHook = callPackage ({ makePythonHook, pip }: makePythonHook { @@ -81,6 +80,17 @@ in { }; } ./pip-install-hook.sh) {}; + pypaInstallHook = callPackage ({ makePythonHook, installer }: + makePythonHook { + name = "pypa-install-hook"; + propagatedBuildInputs = [ installer ]; + substitutions = { + inherit pythonInterpreter pythonSitePackages; + }; + } ./pypa-install-hook.sh) { + inherit (pythonForBuild.pkgs) installer; + }; + pytestCheckHook = callPackage ({ makePythonHook, pytest }: makePythonHook { name = "pytest-check-hook"; @@ -134,9 +144,8 @@ in { pythonRelaxDepsHook = callPackage ({ makePythonHook, wheel }: makePythonHook { name = "python-relax-deps-hook"; - propagatedBuildInputs = [ wheel ]; substitutions = { - inherit pythonInterpreter; + inherit pythonInterpreter pythonSitePackages wheel; }; } ./python-relax-deps-hook.sh) {}; diff --git a/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh index 3b7130049769..5d77613bf565 100644 --- a/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh +++ b/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh @@ -6,7 +6,7 @@ pypaBuildPhase() { runHook preBuild echo "Creating a wheel..." - @pythonInterpreter@ -m build --no-isolation --outdir dist/ --wheel $pypaBuildFlags + pyproject-build --no-isolation --outdir dist/ --wheel $pypaBuildFlags echo "Finished creating a wheel..." runHook postBuild diff --git a/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh new file mode 100644 index 000000000000..2d925742daa7 --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh @@ -0,0 +1,26 @@ +# Setup hook for PyPA installer. +echo "Sourcing pypa-install-hook" + +pypaInstallPhase() { + echo "Executing pypaInstallPhase" + runHook preInstall + + pushd dist > /dev/null + + for wheel in *.whl; do + @pythonInterpreter@ -m installer --prefix "$out" "$wheel" + echo "Successfully installed $wheel" + done + + popd > /dev/null + + export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" + + runHook postInstall + echo "Finished executing pypaInstallPhase" +} + +if [ -z "${dontUsePypaInstall-}" ] && [ -z "${installPhase-}" ]; then + echo "Using pypaInstallPhase" + installPhase=pypaInstallPhase +fi diff --git a/nixpkgs/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh index 31bdec914f69..1ac91fb40e4e 100644 --- a/nixpkgs/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh +++ b/nixpkgs/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh @@ -78,24 +78,27 @@ pythonRelaxDepsHook() { pushd dist # See https://peps.python.org/pep-0491/#escaping-and-unicode - local -r pkg_name="${pname//[^[:alnum:].]/_}-$version" + local -r pkg_name="${pname//[^[:alnum:].]/_}" local -r unpack_dir="unpacked" - local -r metadata_file="$unpack_dir/$pkg_name/$pkg_name.dist-info/METADATA" + local -r metadata_file="$unpack_dir/$pkg_name*/$pkg_name*.dist-info/METADATA" # We generally shouldn't have multiple wheel files, but let's be safer here for wheel in "$pkg_name"*".whl"; do - @pythonInterpreter@ -m wheel unpack --dest "$unpack_dir" "$wheel" + PYTHONPATH="@wheel@/@pythonSitePackages@:$PYTHONPATH" \ + @pythonInterpreter@ -m wheel unpack --dest "$unpack_dir" "$wheel" rm -rf "$wheel" - _pythonRelaxDeps "$metadata_file" - _pythonRemoveDeps "$metadata_file" + # Using no quotes on purpose since we need to expand the glob from `$metadata_file` + _pythonRelaxDeps $metadata_file + _pythonRemoveDeps $metadata_file if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "pythonRelaxDepsHook: resulting METADATA for '$wheel':" - cat "$unpack_dir/$pkg_name/$pkg_name.dist-info/METADATA" + cat $metadata_file fi - @pythonInterpreter@ -m wheel pack "$unpack_dir/$pkg_name" + PYTHONPATH="@wheel@/@pythonSitePackages@:$PYTHONPATH" \ + @pythonInterpreter@ -m wheel pack "$unpack_dir/$pkg_name"* done # Remove the folder since it will otherwise be in the dist output. diff --git a/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix index 79e45b8dc395..8a75dbf43a74 100644 --- a/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -12,8 +12,8 @@ , update-python-libraries , setuptools , flitBuildHook -, pipBuildHook -, pipInstallHook +, pypaBuildHook +, pypaInstallHook , pythonCatchConflictsHook , pythonImportsCheckHook , pythonNamespacesHook @@ -161,6 +161,20 @@ let in inputs: builtins.map (checkDrv) inputs; + isBootstrapInstallPackage = builtins.elem (attrs.pname or null) [ + "flit-core" "installer" + ]; + + isBootstrapPackage = isBootstrapInstallPackage || builtins.elem (attrs.pname or null) ([ + "build" "packaging" "pyproject-hooks" "wheel" + ] ++ lib.optionals (python.pythonOlder "3.11") [ + "tomli" + ]); + + isSetuptoolsDependency = builtins.elem (attrs.pname or null) [ + "setuptools" "wheel" + ]; + # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" @@ -174,7 +188,15 @@ let wrapPython ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? pythonRemoveTestsDirHook - ] ++ lib.optionals catchConflicts [ + ] ++ lib.optionals (catchConflicts && !isBootstrapPackage && !isSetuptoolsDependency) [ + # + # 1. When building a package that is also part of the bootstrap chain, we + # must ignore conflicts after installation, because there will be one with + # the package in the bootstrap. + # + # 2. When a package is a dependency of setuptools, we must ignore conflicts + # because the hook that checks for conflicts uses setuptools. + # pythonCatchConflictsHook ] ++ lib.optionals removeBinBytecode [ pythonRemoveBinBytecodeHook @@ -184,15 +206,26 @@ let setuptoolsBuildHook ] ++ lib.optionals (format == "flit") [ flitBuildHook - ] ++ lib.optionals (format == "pyproject") [ - pipBuildHook - ] ++ lib.optionals (format == "wheel") [ + ] ++ lib.optionals (format == "pyproject") [( + if isBootstrapPackage then + pypaBuildHook.override { + inherit (python.pythonForBuild.pkgs.bootstrap) build; + wheel = null; + } + else + pypaBuildHook + )] ++ lib.optionals (format == "wheel") [ wheelUnpackHook ] ++ lib.optionals (format == "egg") [ eggUnpackHook eggBuildHook eggInstallHook - ] ++ lib.optionals (!(format == "other") || dontUsePipInstall) [ - pipInstallHook - ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ + ] ++ lib.optionals (format != "other") [( + if isBootstrapInstallPackage then + pypaInstallHook.override { + inherit (python.pythonForBuild.pkgs.bootstrap) installer; + } + else + pypaInstallHook + )] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ # This is a test, however, it should be ran independent of the checkPhase and checkInputs pythonImportsCheckHook ] ++ lib.optionals (python.pythonAtLeast "3.3") [ diff --git a/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix b/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix index 6a723413c850..91ca84b34b83 100644 --- a/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix +++ b/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix @@ -32,12 +32,17 @@ let } else result; - buildPythonPackage = makeOverridablePythonPackage (lib.makeOverridable (callPackage ./mk-python-derivation.nix { + mkPythonDerivation = if python.isPy3k then + ./mk-python-derivation.nix + else + ./python2/mk-python-derivation.nix; + + buildPythonPackage = makeOverridablePythonPackage (lib.makeOverridable (callPackage mkPythonDerivation { inherit namePrefix; # We want Python libraries to be named like e.g. "python3.6-${name}" inherit toPythonModule; # Libraries provide modules })); - buildPythonApplication = makeOverridablePythonPackage (lib.makeOverridable (callPackage ./mk-python-derivation.nix { + buildPythonApplication = makeOverridablePythonPackage (lib.makeOverridable (callPackage mkPythonDerivation { namePrefix = ""; # Python applications should not have any prefix toPythonModule = x: x; # Application does not provide modules. })); diff --git a/nixpkgs/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/nixpkgs/pkgs/development/interpreters/python/python2/mk-python-derivation.nix new file mode 100644 index 000000000000..e5f9c00b2fb2 --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -0,0 +1,252 @@ +# Generic builder only used for EOL and deprecated Python 2. + +{ lib +, config +, python +, wrapPython +, unzip +, ensureNewerSourcesForZipFilesHook +# Whether the derivation provides a Python module or not. +, toPythonModule +, namePrefix +, update-python-libraries +, setuptools +, pipBuildHook +, pipInstallHook +, pythonCatchConflictsHook +, pythonImportsCheckHook +, pythonOutputDistHook +, pythonRemoveBinBytecodeHook +, pythonRemoveTestsDirHook +, setuptoolsBuildHook +, setuptoolsCheckHook +, wheelUnpackHook +, eggUnpackHook +, eggBuildHook +, eggInstallHook +}: + +{ name ? "${attrs.pname}-${attrs.version}" + +# Build-time dependencies for the package +, nativeBuildInputs ? [] + +# Run-time dependencies for the package +, buildInputs ? [] + +# Dependencies needed for running the checkPhase. +# These are added to buildInputs when doCheck = true. +, checkInputs ? [] +, nativeCheckInputs ? [] + +# propagate build dependencies so in case we have A -> B -> C, +# C can import package A propagated by B +, propagatedBuildInputs ? [] + +# DEPRECATED: use propagatedBuildInputs +, pythonPath ? [] + +# Enabled to detect some (native)BuildInputs mistakes +, strictDeps ? true + +, outputs ? [ "out" ] + +# used to disable derivation, useful for specific python versions +, disabled ? false + +# Raise an error if two packages are installed with the same name +# TODO: For cross we probably need a different PYTHONPATH, or not +# add the runtime deps until after buildPhase. +, catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform) + +# Additional arguments to pass to the makeWrapper function, which wraps +# generated binaries. +, makeWrapperArgs ? [] + +# Skip wrapping of python programs altogether +, dontWrapPythonPrograms ? false + +# Don't use Pip to install a wheel +# Note this is actually a variable for the pipInstallPhase in pip's setupHook. +# It's included here to prevent an infinite recursion. +, dontUsePipInstall ? false + +# Skip setting the PYTHONNOUSERSITE environment variable in wrapped programs +, permitUserSite ? false + +# Remove bytecode from bin folder. +# When a Python script has the extension `.py`, bytecode is generated +# Typically, executables in bin have no extension, so no bytecode is generated. +# However, some packages do provide executables with extensions, and thus bytecode is generated. +, removeBinBytecode ? true + +# Several package formats are supported. +# "setuptools" : Install a common setuptools/distutils based package. This builds a wheel. +# "wheel" : Install from a pre-compiled wheel. +# "pyproject": Install a package using a ``pyproject.toml`` file (PEP517). This builds a wheel. +# "egg": Install a package from an egg. +# "other" : Provide your own buildPhase and installPhase. +, format ? "setuptools" + +, meta ? {} + +, passthru ? {} + +, doCheck ? config.doCheckByDefault or false + +, disabledTestPaths ? [] + +, ... } @ attrs: + +assert lib.assertMsg (format != "flit") "flit is not a supported Python 2 format"; + +let + inherit (python) stdenv; + + withDistOutput = lib.elem format ["pyproject" "setuptools" "flit" "wheel"]; + + name_ = name; + + validatePythonMatches = attrName: let + isPythonModule = drv: + # all pythonModules have the pythonModule attribute + (drv ? "pythonModule") + # Some pythonModules are turned in to a pythonApplication by setting the field to false + && (!builtins.isBool drv.pythonModule); + isMismatchedPython = drv: drv.pythonModule != python; + + optionalLocation = let + pos = builtins.unsafeGetAttrPos (if attrs ? "pname" then "pname" else "name") attrs; + in lib.optionalString (pos != null) " at ${pos.file}:${toString pos.line}:${toString pos.column}"; + + leftPadName = name: against: let + len = lib.max (lib.stringLength name) (lib.stringLength against); + in lib.strings.fixedWidthString len " " name; + + throwMismatch = drv: let + myName = "'${namePrefix}${name}'"; + theirName = "'${drv.name}'"; + in throw '' + Python version mismatch in ${myName}: + + The Python derivation ${myName} depends on a Python derivation + named ${theirName}, but the two derivations use different versions + of Python: + + ${leftPadName myName theirName} uses ${python} + ${leftPadName theirName myName} uses ${toString drv.pythonModule} + + Possible solutions: + + * If ${theirName} is a Python library, change the reference to ${theirName} + in the ${attrName} of ${myName} to use a ${theirName} built from the same + version of Python + + * If ${theirName} is used as a tool during the build, move the reference to + ${theirName} in ${myName} from ${attrName} to nativeBuildInputs + + * If ${theirName} provides executables that are called at run time, pass its + bin path to makeWrapperArgs: + + makeWrapperArgs = [ "--prefix PATH : ''${lib.makeBinPath [ ${lib.getName drv } ] }" ]; + + ${optionalLocation} + ''; + + checkDrv = drv: + if (isPythonModule drv) && (isMismatchedPython drv) + then throwMismatch drv + else drv; + + in inputs: builtins.map (checkDrv) inputs; + + # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. + self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ + "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" + "disabledTestPaths" "outputs" + ]) // { + + name = namePrefix + name_; + + nativeBuildInputs = [ + python + wrapPython + ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? + pythonRemoveTestsDirHook + ] ++ lib.optionals catchConflicts [ + pythonCatchConflictsHook + ] ++ lib.optionals removeBinBytecode [ + pythonRemoveBinBytecodeHook + ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [ + unzip + ] ++ lib.optionals (format == "setuptools") [ + setuptoolsBuildHook + ] ++ lib.optionals (format == "pyproject") [( + pipBuildHook + )] ++ lib.optionals (format == "wheel") [ + wheelUnpackHook + ] ++ lib.optionals (format == "egg") [ + eggUnpackHook eggBuildHook eggInstallHook + ] ++ lib.optionals (format != "other") [( + pipInstallHook + )] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ + # This is a test, however, it should be ran independent of the checkPhase and checkInputs + pythonImportsCheckHook + ] ++ lib.optionals withDistOutput [ + pythonOutputDistHook + ] ++ nativeBuildInputs; + + buildInputs = validatePythonMatches "buildInputs" (buildInputs ++ pythonPath); + + propagatedBuildInputs = validatePythonMatches "propagatedBuildInputs" (propagatedBuildInputs ++ [ + # we propagate python even for packages transformed with 'toPythonApplication' + # this pollutes the PATH but avoids rebuilds + # see https://github.com/NixOS/nixpkgs/issues/170887 for more context + python + ]); + + inherit strictDeps; + + LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8"; + + # Python packages don't have a checkPhase, only an installCheckPhase + doCheck = false; + doInstallCheck = attrs.doCheck or true; + nativeInstallCheckInputs = [ + ] ++ lib.optionals (format == "setuptools") [ + # Longer-term we should get rid of this and require + # users of this function to set the `installCheckPhase` or + # pass in a hook that sets it. + setuptoolsCheckHook + ] ++ nativeCheckInputs; + installCheckInputs = checkInputs; + + postFixup = lib.optionalString (!dontWrapPythonPrograms) '' + wrapPythonPrograms + '' + 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 ]; + + outputs = outputs ++ lib.optional withDistOutput "dist"; + + meta = { + # default to python's platforms + platforms = python.meta.platforms; + isBuildPythonPackage = python.meta.platforms; + } // meta; + } // lib.optionalAttrs (attrs?checkPhase) { + # If given use the specified checkPhase, otherwise use the setup hook. + # Longer-term we should get rid of `checkPhase` and use `installCheckPhase`. + installCheckPhase = attrs.checkPhase; + } // lib.optionalAttrs (disabledTestPaths != []) { + disabledTestPaths = lib.escapeShellArgs disabledTestPaths; + })); + + passthru.updateScript = let + filename = builtins.head (lib.splitString ":" self.meta.position); + in attrs.passthru.updateScript or [ update-python-libraries filename ]; +in lib.extendDerivation + (disabled -> throw "${name} not supported for interpreter ${python.executable}") + passthru + self diff --git a/nixpkgs/pkgs/development/interpreters/risor/default.nix b/nixpkgs/pkgs/development/interpreters/risor/default.nix index 61753ba2b99e..149d386fff39 100644 --- a/nixpkgs/pkgs/development/interpreters/risor/default.nix +++ b/nixpkgs/pkgs/development/interpreters/risor/default.nix @@ -7,19 +7,20 @@ buildGoModule rec { pname = "risor"; - version = "0.14.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "risor-io"; repo = "risor"; rev = "v${version}"; - hash = "sha256-QhXIwFrApSkWY2YYYGlojKsByNA2xpyVTm0SpYWB/Ds="; + hash = "sha256-/7jUz2180m+YVyE9z4UKOhVv0DSqrCWdkyAftluMHeo="; }; - vendorHash = "sha256-diAbQwnlhMm43ZlLKq3llMl9mO3sIkc80aCI5UDn7F4="; + proxyVendor = true; + vendorHash = "sha256-OUQY5yzsbMS81gRb1mIvkRHal4mvOE2Na2HAsqkeWG4="; subPackages = [ - "cmd/..." + "cmd/risor" ]; ldflags = [ @@ -43,3 +44,4 @@ buildGoModule rec { maintainers = with maintainers; [ figsoda ]; }; } + diff --git a/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix index 11119b768825..71f3f8be9b01 100644 --- a/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.4.18"; + version = "3.4.19"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-+yHTJWedZNCkkRMIRT103QMTFJODlbJ2PwVbTghEo0M="; + hash = "sha256-+ZYpS9UOB16qCjhrKwFGBn43t3KNOv/QIrLKIPAywWs="; }; patches = [ diff --git a/nixpkgs/pkgs/development/interpreters/tcl/generic.nix b/nixpkgs/pkgs/development/interpreters/tcl/generic.nix index 6ce6e35189bf..8d4903add899 100644 --- a/nixpkgs/pkgs/development/interpreters/tcl/generic.nix +++ b/nixpkgs/pkgs/development/interpreters/tcl/generic.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, callPackage, makeSetupHook +{ lib, stdenv, callPackage, makeSetupHook, runCommand +, tzdata # Version specific stuff , release, version, src @@ -7,7 +8,7 @@ let baseInterp = - stdenv.mkDerivation { + stdenv.mkDerivation rec { pname = "tcl"; inherit version src; @@ -15,6 +16,14 @@ let setOutputFlags = false; + postPatch = '' + substituteInPlace library/clock.tcl \ + --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \ + --replace "/usr/share/lib/zoneinfo" "" \ + --replace "/usr/lib/zoneinfo" "" \ + --replace "/usr/local/etc/zoneinfo" "" + ''; + preConfigure = '' cd unix ''; @@ -55,6 +64,12 @@ let name = "tcl-package-hook"; propagatedBuildInputs = [ buildPackages.makeWrapper ]; } ./tcl-package-hook.sh) {}; + # verify that Tcl's clock library can access tzdata + tests.tzdata = runCommand "${pname}-test-tzdata" {} '' + ${baseInterp}/bin/tclsh <(echo "set t [clock scan {2004-10-30 05:00:00} \ + -format {%Y-%m-%d %H:%M:%S} \ + -timezone :America/New_York]") > $out + ''; }; }; diff --git a/nixpkgs/pkgs/development/interpreters/trealla/default.nix b/nixpkgs/pkgs/development/interpreters/trealla/default.nix index 4c04940470e0..34b722d9dcf9 100644 --- a/nixpkgs/pkgs/development/interpreters/trealla/default.nix +++ b/nixpkgs/pkgs/development/interpreters/trealla/default.nix @@ -17,13 +17,13 @@ assert lib.elem lineEditingLibrary [ "isocline" "readline" ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.24.21"; + version = "2.25.2"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-zpHdZiDtNcQko+gn92fiGWSvYT4aQ4t6nYFwf6zu0cA="; + hash = "sha256-3NBrJFSTcjftvTYn26SMeU2HtR81J2qlDAwAZRdis4M="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 414bccfb8523..936caafaffa7 100644 --- a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "12.0.0"; + version = "12.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-6bbz8FH87MahD3R7G3cmsJD0461L4OoCbFejyXsuER0="; + hash = "sha256-4h+c5ke4MZuIMiCaLBt6RsRe9PWAn6VqW2Z6Wnh7X30="; fetchSubmodules = true; }; - cargoHash = "sha256-QbKYnKdJK9zImZDl057l8/Za4A+N82WrqQCzrOsc6fE="; + cargoHash = "sha256-SG/SFskr6ywCtJu2WVWTJC9GUKJJB0fUb+hZUaxag0M="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; diff --git a/nixpkgs/pkgs/development/interpreters/wazero/default.nix b/nixpkgs/pkgs/development/interpreters/wazero/default.nix index 880dbf321f82..18fa05ccc238 100644 --- a/nixpkgs/pkgs/development/interpreters/wazero/default.nix +++ b/nixpkgs/pkgs/development/interpreters/wazero/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "wazero"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "tetratelabs"; repo = "wazero"; rev = "v${version}"; - hash = "sha256-Yn5mg/K+RT6CoW1vMrpvRFOao83IAZE1mP+DGp4SmKk="; + hash = "sha256-iUPAVOmZNX4qs7bHu9dXtQP/G8FwyblJvZ3pauA9ev0="; }; vendorHash = null; @@ -46,5 +46,6 @@ buildGoModule rec { changelog = "https://github.com/tetratelabs/wazero/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ figsoda ]; + mainProgram = "wazero"; }; } diff --git a/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/nixpkgs/pkgs/development/libraries/SDL2/default.nix index aa1cd1d809f0..4c8c7ed8f435 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.28.1"; + version = "2.28.2"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-SXfOulwAVNvmwvEUZBrO1DzjvytB6mS2o3LWuhKcsV0="; + hash = "sha256-ZLEQL6Igk1FbAu8z3Yc53uG6V+nbumoJKUK4u+0aHF4="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/avahi/default.nix b/nixpkgs/pkgs/development/libraries/avahi/default.nix index ac97871d9ca1..772650bd3a8a 100644 --- a/nixpkgs/pkgs/development/libraries/avahi/default.nix +++ b/nixpkgs/pkgs/development/libraries/avahi/default.nix @@ -36,14 +36,21 @@ stdenv.mkDerivation rec { patches = [ # CVE-2021-36217 / CVE-2021-3502 (fetchpatch { + name = "CVE-2021-3502.patch"; url = "https://github.com/lathiat/avahi/commit/9d31939e55280a733d930b15ac9e4dda4497680c.patch"; sha256 = "sha256-BXWmrLWUvDxKPoIPRFBpMS3T4gijRw0J+rndp6iDybU="; }) # CVE-2021-3468 (fetchpatch { + name = "CVE-2021-3468.patch"; url = "https://github.com/lathiat/avahi/commit/447affe29991ee99c6b9732fc5f2c1048a611d3b.patch"; sha256 = "sha256-qWaCU1ZkCg2PmijNto7t8E3pYRN/36/9FrG8okd6Gu8="; }) + (fetchpatch { + name = "CVE-2023-1981.patch"; + url = "https://github.com/lathiat/avahi/commit/a2696da2f2c50ac43b6c4903f72290d5c3fa9f6f.patch"; + sha256 = "sha256-BEYFGCnQngp+OpiKIY/oaKygX7isAnxJpUPCUvg+efc="; + }) ]; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix b/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix index c618a2ee3b5b..85c785be3cb3 100644 --- a/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix +++ b/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "sha256-jpNsH8c5ObnO+/AqsribvyFZhm7mmCFGNx9p4QHZKQE="; + sha256 = "sha256-uecUyqSL02SRdlLbWIy0luHACTFoyMXQ6rOIYuisZsw="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/azmq/default.nix b/nixpkgs/pkgs/development/libraries/azmq/default.nix new file mode 100644 index 000000000000..7317c51aabde --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/azmq/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, boost +, cmake +, ninja +, zeromq +, catch2 +}: + +stdenv.mkDerivation { + pname = "azmq"; + version = "unstable-2023-03-23"; + + src = fetchFromGitHub { + owner = "zeromq"; + repo = "azmq"; + rev = "2c1adac46bced4eb74ed9be7c74563bb113eaacf"; + hash = "sha256-4o1CHlg9kociIL6QN/kU2cojPvFRhtjFmKIAz0dapUM="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + boost + catch2 + zeromq + ]; + + # Broken for some reason on this platform. + doCheck = !(stdenv.isAarch64 && stdenv.isLinux); + + meta = with lib; { + homepage = "https://github.com/zeromq/azmq"; + license = licenses.boost; + description = "C++ language binding library integrating ZeroMQ with Boost Asio"; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/belcard/default.nix b/nixpkgs/pkgs/development/libraries/belcard/default.nix index eb0ea3c94b28..0b6cd66cae38 100644 --- a/nixpkgs/pkgs/development/libraries/belcard/default.nix +++ b/nixpkgs/pkgs/development/libraries/belcard/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "5.2.12"; + version = "5.2.98"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-Q5FJ1Nh61woyXN7BVTZGNGXOVhcZXakLWcxaavPpgeY="; + sha256 = "sha256-pRNJ1bDS2v0Cn+6cxMeFa0JQ27UZR6kCI9P6gQ5W2GA="; }; buildInputs = [ bctoolbox belr ]; diff --git a/nixpkgs/pkgs/development/libraries/c-ares/default.nix b/nixpkgs/pkgs/development/libraries/c-ares/default.nix index a48b6f4fa7f5..b8201f8ce5c6 100644 --- a/nixpkgs/pkgs/development/libraries/c-ares/default.nix +++ b/nixpkgs/pkgs/development/libraries/c-ares/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.tests = { - inherit curl grpc; + inherit grpc; + curl = (curl.override { c-aresSupport = true; }).tests.withCheck; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/dab_lib/default.nix b/nixpkgs/pkgs/development/libraries/dab_lib/default.nix index 0d236c36aa3c..82d591abc139 100644 --- a/nixpkgs/pkgs/development/libraries/dab_lib/default.nix +++ b/nixpkgs/pkgs/development/libraries/dab_lib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-KSkOg0a5iq+13kClQqj+TaEP/PsLUrm8bMmiJEAZ+C4="; }; - sourceRoot = "${finalAttrs.src.name}/library/"; + sourceRoot = "${finalAttrs.src.name}/library"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ faad2 fftwFloat zlib ]; diff --git a/nixpkgs/pkgs/development/libraries/elpa/default.nix b/nixpkgs/pkgs/development/libraries/elpa/default.nix index ec108adc61eb..003de885c791 100644 --- a/nixpkgs/pkgs/development/libraries/elpa/default.nix +++ b/nixpkgs/pkgs/development/libraries/elpa/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gfortran, perl -, mpi, blas, lapack, scalapack, openssh +{ lib, stdenv, fetchurl, autoreconfHook, mpiCheckPhaseHook +, gfortran, perl, mpi, blas, lapack, scalapack, openssh # CPU optimizations , avxSupport ? stdenv.hostPlatform.avxSupport , avx2Support ? stdenv.hostPlatform.avx2Support @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.am --replace '#!/bin/bash' '#!${stdenv.shell}' ''; - nativeBuildInputs = [ autoreconfHook perl openssh ]; + nativeBuildInputs = [ autoreconfHook perl ]; buildInputs = [ mpi blas lapack scalapack ] ++ lib.optional enableCuda cudatoolkit; @@ -76,15 +76,10 @@ stdenv.mkDerivation rec { doCheck = true; + nativeCheckInputs = [ mpiCheckPhaseHook openssh ]; preCheck = '' #patchShebangs ./ - # make sure the test starts even if we have less than 4 cores - export OMPI_MCA_rmaps_base_oversubscribe=1 - - # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo - # Run dual threaded export OMP_NUM_THREADS=2 diff --git a/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix b/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix index 84513d20a57a..71077d6e315e 100644 --- a/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix +++ b/nixpkgs/pkgs/development/libraries/fdk-aac/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + enableParallelBuilding = true; + configureFlags = lib.optional exampleSupport "--enable-example"; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/freetds/default.nix b/nixpkgs/pkgs/development/libraries/freetds/default.nix index cd9e99b352eb..b42fdbd60ccb 100644 --- a/nixpkgs/pkgs/development/libraries/freetds/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.3.18"; + version = "1.3.20"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-HYVh1XxxmRoo9GgTQ3hcI6aj61TVvNI4l9B+OCX/LVY="; + sha256 = "sha256-IK4R87gG5PvA+gtZMftHO7V0i+6dSH9qoSiFCDV4pe0="; }; buildInputs = [ @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; homepage = "https://www.freetds.org"; + changelog = "https://github.com/FreeTDS/freetds/releases/tag/v${version}"; license = licenses.lgpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/futuresql/default.nix b/nixpkgs/pkgs/development/libraries/futuresql/default.nix new file mode 100644 index 000000000000..2adc148701a7 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/futuresql/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, cmake, extra-cmake-modules, qtbase }: +stdenv.mkDerivation rec { + pname = "futuresql"; + version = "0.1.1"; + + src = fetchurl { + url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-5E7Y1alhizynuimD7ZxfdXLm4KWxmflIaINLccy+vUM="; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ qtbase ]; + + # a library, nothing to wrap + dontWrapQtApps = true; +} diff --git a/nixpkgs/pkgs/development/libraries/gettext/0001-msginit-Do-not-use-POT-Creation-Date.patch b/nixpkgs/pkgs/development/libraries/gettext/0001-msginit-Do-not-use-POT-Creation-Date.patch new file mode 100644 index 000000000000..eea9dc6e0378 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gettext/0001-msginit-Do-not-use-POT-Creation-Date.patch @@ -0,0 +1,32 @@ +From 1e000ca711886055176a2f90197a383d09de0e67 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= + <rosen644835@gmail.com> +Date: Fri, 18 Dec 2020 14:19:36 +0100 +Subject: [PATCH] msginit: Do not use POT-Creation-Date. + +* gettext-tools/src/msginit.c (po_revision_date): Do not use +POT-Creation-Date when the file is automatically generated. +--- + gettext-tools/src/msginit.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c +index 8ca9a3b77..06e0e7195 100644 +--- a/gettext-tools/src/msginit.c ++++ b/gettext-tools/src/msginit.c +@@ -1075,9 +1075,9 @@ static const char * + po_revision_date (const char *header) + { + if (no_translator) +- /* Because the PO file is automatically generated, we use the +- POT-Creation-Date, not the current time. */ +- return get_field (header, "POT-Creation-Date"); ++ /* Because the PO file is automatically generated, we don't ++ generate PO-Revision-Date field. */ ++ return NULL; + else + { + /* Assume the translator will modify the PO file now. */ +-- +2.29.2 + diff --git a/nixpkgs/pkgs/development/libraries/gettext/default.nix b/nixpkgs/pkgs/development/libraries/gettext/default.nix index 9230c27a3c1f..dc4af0813918 100644 --- a/nixpkgs/pkgs/development/libraries/gettext/default.nix +++ b/nixpkgs/pkgs/development/libraries/gettext/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { }; patches = [ ./absolute-paths.diff + # fix reproducibile output, in particular in the grub2 build + # https://savannah.gnu.org/bugs/index.php?59658 + ./0001-msginit-Do-not-use-POT-Creation-Date.patch ] ++ lib.optional stdenv.hostPlatform.isWindows (fetchpatch { url = "https://aur.archlinux.org/cgit/aur.git/plain/gettext_formatstring-ruby.patch?h=mingw-w64-gettext&id=e8b577ee3d399518d005e33613f23363a7df07ee"; name = "gettext_formatstring-ruby.patch"; diff --git a/nixpkgs/pkgs/development/libraries/glog/default.nix b/nixpkgs/pkgs/development/libraries/glog/default.nix index a64bb0967aa7..53377022ad69 100644 --- a/nixpkgs/pkgs/development/libraries/glog/default.nix +++ b/nixpkgs/pkgs/development/libraries/glog/default.nix @@ -19,24 +19,50 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" + # glog's custom FindUnwind.cmake module detects LLVM's unwind in case + # stdenv.cc is clang. But the module doesn't get installed, causing + # consumers of the CMake config file to fail at the configuration step. + # Explicitly disabling unwind support sidesteps the issue. + "-DWITH_UNWIND=OFF" ]; - # TODO: Re-enable Darwin tests once we're on a release that has https://github.com/google/glog/issues/709#issuecomment-960381653 fixed - doCheck = !stdenv.isDarwin; + doCheck = true; + # There are some non-thread safe tests that can fail enableParallelChecking = false; nativeCheckInputs = [ perl ]; - GTEST_FILTER = + env.GTEST_FILTER = let filteredTests = lib.optionals stdenv.hostPlatform.isMusl [ "Symbolize.SymbolizeStackConsumption" "Symbolize.SymbolizeWithDemanglingStackConsumption" ] ++ lib.optionals stdenv.hostPlatform.isStatic [ "LogBacktraceAt.DoesBacktraceAtRightLineWhenEnabled" + ] ++ lib.optionals stdenv.cc.isClang [ + # Clang optimizes an expected allocation away. + # See https://github.com/google/glog/issues/937 + "DeathNoAllocNewHook.logging" + ] ++ lib.optionals stdenv.isDarwin [ + "LogBacktraceAt.DoesBacktraceAtRightLineWhenEnabled" + ]; + in + "-${builtins.concatStringsSep ":" filteredTests}"; + + checkPhase = + let + excludedTests = lib.optionals stdenv.isDarwin [ + "mock-log" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + "logging" # works around segfaults on aarch64-darwin for now ]; + excludedTestsRegex = lib.optionalString (excludedTests != [ ]) "(${lib.concatStringsSep "|" excludedTests})"; in - lib.optionalString doCheck "-${builtins.concatStringsSep ":" filteredTests}"; + '' + runHook preCheck + ctest -E "${excludedTestsRegex}" --output-on-failure + runHook postCheck + ''; meta = with lib; { homepage = "https://github.com/google/glog"; diff --git a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix index 75a20bbbc355..2b088eb459ad 100644 --- a/nixpkgs/pkgs/development/libraries/gnu-config/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnu-config/default.nix @@ -23,9 +23,29 @@ in stdenv.mkDerivation { pname = "gnu-config"; version = "2023-07-31"; - buildCommand = '' - install -Dm755 ${configGuess} $out/config.guess - install -Dm755 ${configSub} $out/config.sub + unpackPhase = '' + runHook preUnpack + cp ${configGuess} ./config.guess + cp ${configSub} ./config.sub + chmod +w ./config.sub ./config.guess + runHook postUnpack + ''; + + # If this isn't set, `pkgs.gnu-config.overrideAttrs( _: { patches + # = ...; })` will behave very counterintuitively: the (unpatched) + # gnu-config from the updateAutotoolsGnuConfigScriptsHook stdenv's + # defaultNativeBuildInputs will "update" the patched gnu-config by + # reverting the patch! + dontUpdateAutotoolsGnuConfigScripts = true; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm755 ./config.guess $out/config.guess + install -Dm755 ./config.sub $out/config.sub + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix index b04d5966a5a9..2bfde78f7dbc 100644 --- a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix +++ b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix @@ -41,6 +41,15 @@ stdenv.mkDerivation (finalAttrs: { --replace "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@" ''; + doCheck = true; + checkPhase = '' + runHook preCheck + + bin/unit-hyperscan + + runHook postCheck + ''; + meta = with lib; { description = "High-performance multiple regex matching library"; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/igraph/default.nix b/nixpkgs/pkgs/development/libraries/igraph/default.nix index c0e20ba7f594..69f25fd79c83 100644 --- a/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -24,19 +24,19 @@ assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !blas.isILP64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "igraph"; version = "0.10.6"; src = fetchFromGitHub { owner = "igraph"; - repo = pname; - rev = version; + repo = finalAttrs.pname; + rev = finalAttrs.version; hash = "sha256-HNc+xU7Gcv9BSpb2OgyG9tCbk/dfWw5Ix1c2gvFZklE="; }; postPatch = '' - echo "${version}" > IGRAPH_VERSION + echo "${finalAttrs.version}" > IGRAPH_VERSION ''; outputs = [ "out" "dev" "doc" ]; @@ -95,9 +95,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C library for complex network analysis and graph theory"; homepage = "https://igraph.org/"; - changelog = "https://github.com/igraph/igraph/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/igraph/igraph/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ MostAwesomeDude dotlambda ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/imgui/default.nix b/nixpkgs/pkgs/development/libraries/imgui/default.nix index ba9a0610bde0..4ed5cc06cf0a 100644 --- a/nixpkgs/pkgs/development/libraries/imgui/default.nix +++ b/nixpkgs/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.89.7"; + version = "1.89.8"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-kio1zy1DVL/Uh4eOqmHNCTE+Tb0GAIvsT4XDPkgHqYs="; + sha256 = "sha256-pkEm7+ZBYAYgAbMvXhmJyxm6DfyQWkECTXcTHTgfvuo="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix b/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix index 022f68a9d351..113c377240b4 100644 --- a/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # Work around the "unpacker appears to have produced no directories" - setSourceRoot = "sourceRoot=`pwd`"; + sourceRoot = "."; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 73bbe1782b7f..d9064ee85d17 100644 --- a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -9,13 +9,13 @@ nv-codec-headers-11 = nv-codec-headers-12; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "6.0-4"; + version = "6.0-5"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-o0D/GWbSoy5onbYG29wTbpZ8z4sZ2s1WclGCXRMSekA="; + sha256 = "sha256-pKmR+IVJAaY91KiboCBkwZleMmMFToez1fW+eXyrZjs="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; diff --git a/nixpkgs/pkgs/development/libraries/kcp/default.nix b/nixpkgs/pkgs/development/libraries/kcp/default.nix new file mode 100644 index 000000000000..69a2b91553e4 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/kcp/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "kcp"; + version = "1.7"; + + src = fetchFromGitHub { + owner = "skywind3000"; + repo = "kcp"; + rev = version; + hash = "sha256-yW40x4T++4rB7hoabGN8qiSN7octyoUYEfE9oDlLxjU="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "A Fast and Reliable ARQ Protocol"; + homepage = "https://github.com/skywind3000/kcp"; + license = licenses.mit; + maintainers = with maintainers; [ rs0vere ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/kdb/default.nix b/nixpkgs/pkgs/development/libraries/kdb/default.nix index 5ab33fcf46fd..f9aa5dc369c6 100644 --- a/nixpkgs/pkgs/development/libraries/kdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/kdb/default.nix @@ -4,12 +4,12 @@ , fetchpatch , extra-cmake-modules , qtbase -, qttranslations , kcoreaddons , python3 , sqlite , postgresql , libmysqlclient +, qttools }: mkDerivation rec { @@ -34,9 +34,9 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ qttranslations kcoreaddons python3 sqlite postgresql libmysqlclient ]; + buildInputs = [ kcoreaddons python3 sqlite postgresql libmysqlclient ]; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix index 281a490bf90a..a47182fda5e5 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kirigami2.nix @@ -1,8 +1,8 @@ -{ mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qttranslations, qtgraphicaleffects }: +{ mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qtgraphicaleffects, qttools }: mkDerivation { pname = "kirigami2"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase qtquickcontrols2 qttranslations qtgraphicaleffects ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; + buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; outputs = [ "out" "dev" ]; } diff --git a/nixpkgs/pkgs/development/libraries/lcrq/default.nix b/nixpkgs/pkgs/development/libraries/lcrq/default.nix index 91a8e2e30f5b..865ec4697326 100644 --- a/nixpkgs/pkgs/development/libraries/lcrq/default.nix +++ b/nixpkgs/pkgs/development/libraries/lcrq/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation (finalAttrs: { name = "lcrq"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "librecast"; repo = "lcrq"; rev = "v${finalAttrs.version}"; - hash = "sha256-GvfmHST53qwVrztnmCzUVbVkgNGtAl5adqdNWOHItiU="; + hash = "sha256-r4UiZ9oNDxF3rHMqg+1NLLjm6LPZtzgtZOs7pRe5SdQ="; }; installFlags = [ "PREFIX=$(out)" ]; @@ -23,6 +23,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://librecast.net/lcrq.html"; license = [ lib.licenses.gpl2 lib.licenses.gpl3 ]; maintainers = with lib.maintainers; [ albertchae aynish DMills27 jasonodoom jleightcap ]; - platforms = lib.platforms.gnu; + platforms = lib.platforms.unix; }; }) diff --git a/nixpkgs/pkgs/development/libraries/libarchive/default.nix b/nixpkgs/pkgs/development/libraries/libarchive/default.nix index c8f050c300ce..de305474a3ab 100644 --- a/nixpkgs/pkgs/development/libraries/libarchive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libarchive/default.nix @@ -30,7 +30,7 @@ let autoreconfHook = buildPackages.autoreconfHook269; in assert xarSupport -> libxml2 != null; -(stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; version = "3.6.2"; @@ -43,6 +43,16 @@ assert xarSupport -> libxml2 != null; outputs = [ "out" "lib" "dev" ]; + patches = [ + # fixes static linking; upstream in releases after 3.6.2 + # https://github.com/libarchive/libarchive/pull/1825 merged upstream + (assert finalAttrs.version == "3.6.2"; fetchpatch { + name = "001-only-add-iconv-to-pc-file-if-needed.patch"; + url = "https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch"; + hash = "sha256-lb+zwWSH6/MLUIROvu9I/hUjSbb2jOWO755WC/r+lbY="; + }) + ]; + postPatch = let skipTestPaths = [ # test won't work in nix sandbox @@ -119,16 +129,4 @@ assert xarSupport -> libxml2 != null; passthru.tests = { inherit cmake nix samba; }; -})).overrideAttrs(previousAttrs: - assert previousAttrs.version == "3.6.2"; - lib.optionalAttrs stdenv.hostPlatform.isStatic { - patches = [ - # fixes static linking; upstream in releases after 3.6.2 - # https://github.com/libarchive/libarchive/pull/1825 merged upstream - (fetchpatch { - name = "001-only-add-iconv-to-pc-file-if-needed.patch"; - url = "https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch"; - hash = "sha256-lb+zwWSH6/MLUIROvu9I/hUjSbb2jOWO755WC/r+lbY="; - }) - ]; - }) +}) diff --git a/nixpkgs/pkgs/development/libraries/libburn/default.nix b/nixpkgs/pkgs/development/libraries/libburn/default.nix index ba24182ade80..fe1b789fc42f 100644 --- a/nixpkgs/pkgs/development/libraries/libburn/default.nix +++ b/nixpkgs/pkgs/development/libraries/libburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libburn"; - version = "1.5.4"; + version = "1.5.6"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-UlBZ0QdZxcuBSO68hju1EOMRxmNgPae9LSHEa3z2O1Q="; + sha256 = "sha256-cpVJG0vl7qxeej+yBn4jbilV/9xrvUX1RkZu3uMhZEs="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libcef/default.nix b/nixpkgs/pkgs/development/libraries/libcef/default.nix index 38a62255b15e..b9d31c6fd874 100644 --- a/nixpkgs/pkgs/development/libraries/libcef/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcef/default.nix @@ -66,16 +66,16 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "0iqih0fbafzlcfq3kljjr3pkywamwvahgm6b7b0z0xdbzq0idxdx"; - platforms."x86_64-linux".sha256 = "1cc7lmp984653b9909pnk4brs96bmgq7hd6p9i6xgxy2y4n3887m"; + platforms."aarch64-linux".sha256 = "0ij7y0whlq8g1sskbhirbw3ngbp95k1in2pi9kjhb9flydjwxq8g"; + platforms."x86_64-linux".sha256 = "0dyv1ddsakxi51a7iwmy006mx27gvjq49i45difkmjv6mw9s2fw9"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "116.0.14"; - gitRevision = "376a780"; - chromiumVersion = "116.0.5845.97"; + version = "116.0.15"; + gitRevision = "0b8c265"; + chromiumVersion = "116.0.5845.111"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; diff --git a/nixpkgs/pkgs/development/libraries/libcint/default.nix b/nixpkgs/pkgs/development/libraries/libcint/default.nix index 7163c312ea92..e90078b0c840 100644 --- a/nixpkgs/pkgs/development/libraries/libcint/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "5.2.1"; + version = "5.4.0"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - hash = "sha256-sFdigOlS5fAi2dV4dhcPg3roqFdvpnh580WDqTA6DGg="; + hash = "sha256-U+ZlD/I7RHtdYNbFhAmeU4qREe45dYJDIAC3Bup2tr0="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix b/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix index faf9029b8fc7..95d1474c1fbe 100644 --- a/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "3.3.7"; + version = "3.3.8"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-EPVz9+qEuJe4VGXNuUnbH61EDxdyohZhxoxleO5j/Uk="; + sha256 = "sha256-4484PH2+4uvCSSPw9vecoCeGda8ELxoOW6mtIfuUC+U="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; diff --git a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index 9cf19fa3d312..49c3713bbe0e 100644 --- a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.15.0"; + version = "3.16.0"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - hash = "sha256-CNHBPeodU2EzvmQBa9KI+1vGuuD25gSwdU9dVhVG04Q="; + hash = "sha256-XgObeVQJ2X7hNIelGK55RTtkKvU6D+RkLMc24/PZCzY="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; diff --git a/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix index e3f9d82d1a81..7b7721197f82 100644 --- a/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdrm/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, pkg-config, meson, ninja, docutils , libpthreadstubs, libpciaccess -, withValgrind ? valgrind-light.meta.available, valgrind-light +, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light, valgrind-light }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/libraries/libgourou/default.nix b/nixpkgs/pkgs/development/libraries/libgourou/default.nix index 2d1b90675590..78b5654873bd 100644 --- a/nixpkgs/pkgs/development/libraries/libgourou/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgourou/default.nix @@ -1,13 +1,21 @@ -{ lib, stdenv, fetchzip, pugixml, updfparser, curl, openssl, libzip -, installShellFiles }: +{ lib +, stdenv +, fetchzip +, pugixml +, updfparser +, curl +, openssl +, libzip +, installShellFiles +}: stdenv.mkDerivation rec { name = "libgourou"; - version = "0.8.1"; + version = "0.8.2"; src = fetchzip { url = "https://indefero.soutade.fr/p/${name}/source/download/v${version}/"; - sha256 = "sha256-X56K4z1+k62Q9pxnN8kx35oc7+uJJN/o/tpnKx1FjwE="; + sha256 = "sha256-adkrvBCgN07Ir+J3JFCy+X9p9609lj1w8nElrlHXTxc"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/libraries/libisoburn/default.nix b/nixpkgs/pkgs/development/libraries/libisoburn/default.nix index 44367aad1f93..c3fb4a053864 100644 --- a/nixpkgs/pkgs/development/libraries/libisoburn/default.nix +++ b/nixpkgs/pkgs/development/libraries/libisoburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libisoburn"; - version = "1.5.4"; + version = "1.5.6"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-LYmEbUOIDxf6WRxTs76kL/uANijk5jDGgPwskYT3kTI="; + sha256 = "sha256-K4Cm9z3WM6XSQ/rL6XoV5cmgdkSl4aJCwhm5N1pF9xs="; }; buildInputs = [ attr zlib libburn libisofs ]; diff --git a/nixpkgs/pkgs/development/libraries/liblc3/default.nix b/nixpkgs/pkgs/development/libraries/liblc3/default.nix index 3e27e4064c59..f2ec852d3bf0 100644 --- a/nixpkgs/pkgs/development/libraries/liblc3/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblc3/default.nix @@ -7,7 +7,7 @@ let name = "liblc3"; - version = "1.0.3"; + version = "1.0.4"; in stdenv.mkDerivation { pname = name; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "google"; repo = "liblc3"; rev = "v${version}"; - sha256 = "sha256-PEnK12FWAtxOMR3WyuxOQTgF+lD9S5YX+oKuWRbFfXM="; + sha256 = "sha256-nQJgF/cWoCx5TkX4xOaLB9SzvhVXPY29bLh7UwPMWEE="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index a74c4e7140fa..edbaf20690ff 100644 --- a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "23.06"; + version = "23.07"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "sha256-xrGuiyu89AM0BRizyU8q51yOsAaCv7vRiyJELkLcz80="; + hash = "sha256-YEVsiyq4dppggdlv176G20/jJSDkoCI5fLIsrPR86CA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libngspice/default.nix b/nixpkgs/pkgs/development/libraries/libngspice/default.nix index c6e787eda618..4807c1c55142 100644 --- a/nixpkgs/pkgs/development/libraries/libngspice/default.nix +++ b/nixpkgs/pkgs/development/libraries/libngspice/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "${lib.optionalString withNgshared "lib"}ngspice"; - version = "40"; + version = "41"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - hash = "sha256-4wPKe8D1lOLWqoT2h4VCPmvwyNrQCbsgvk1XQliOiQ0="; + hash = "sha256-HOIZOV0vUMM+siOhQD+DGLFo8ebRAVp9udv0OUCN6MQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libpcap/default.nix b/nixpkgs/pkgs/development/libraries/libpcap/default.nix index 37043e3e4bde..d1ea44b6ac2f 100644 --- a/nixpkgs/pkgs/development/libraries/libpcap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpcap/default.nix @@ -9,6 +9,16 @@ , pkg-config , withBluez ? false , withRemote ? false + +# for passthru.tests +, ettercap +, nmap +, ostinato +, tcpreplay +, vde2 +, wireshark +, python3 +, haskellPackages }: stdenv.mkDerivation rec { @@ -44,6 +54,12 @@ stdenv.mkDerivation rec { fi ''; + passthru.tests = { + inherit ettercap nmap ostinato tcpreplay vde2 wireshark; + inherit (python3.pkgs) pcapy-ng scapy; + haskell-pcap = haskellPackages.pcap; + }; + meta = with lib; { homepage = "https://www.tcpdump.org"; description = "Packet Capture Library"; diff --git a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index b84562850efe..a8826e4381eb 100644 --- a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-Wgy1vsr0FXRJz9BCfw2PyFkesIJ/eg2dYDY/I2TESnU="; + sha256 = "sha256-wONqqd8Ds10SvkUrj7Ps6BfqUNPE6hCnQrKDTEglVEQ="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libraw/default.nix b/nixpkgs/pkgs/development/libraries/libraw/default.nix index 26d7616ba8f0..b03be435aac5 100644 --- a/nixpkgs/pkgs/development/libraries/libraw/default.nix +++ b/nixpkgs/pkgs/development/libraries/libraw/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, lcms2 +, pkg-config + +# for passthru.tests +, deepin +, freeimage +, hdrmerge +, imagemagick +, python3 +}: stdenv.mkDerivation rec { pname = "libraw"; @@ -11,6 +25,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-K9mULf6V/TCl5Vu4iuIdSGF9HzQlgNQLRFHIpNbmAlY"; }; + patches = [ + (fetchpatch { + name = "CVE-2023-1729.patch"; + url = "https://github.com/LibRaw/LibRaw/commit/9ab70f6dca19229cb5caad7cc31af4e7501bac93.patch"; + hash = "sha256-OAyqphxvtSM15NI77HwtGTmTmP9YNu3xhZ6D1CceJ7I="; + }) + ]; + outputs = [ "out" "lib" "dev" "doc" ]; propagatedBuildInputs = [ lcms2 ]; @@ -19,6 +41,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit imagemagick hdrmerge freeimage; + inherit (deepin) deepin-image-viewer; + inherit (python3.pkgs) rawkit; + }; + meta = with lib; { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; homepage = "https://www.libraw.org/"; diff --git a/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/nixpkgs/pkgs/development/libraries/librsvg/default.nix index d81a31ce05c4..d5738153f0ab 100644 --- a/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -29,6 +29,16 @@ , common-updater-scripts , jq , nix + +# for passthru.tests +, enlightenment +, ffmpeg +, gegl +, gimp +, imagemagick +, imlib2 +, vips +, xfce }: stdenv.mkDerivation (finalAttrs: { @@ -193,6 +203,17 @@ stdenv.mkDerivation (finalAttrs: { updateSource updateLockfile ]; + tests = { + inherit + gegl + gimp + imagemagick + imlib2 + vips; + inherit (enlightenment) efl; + inherit (xfce) xfwm4; + ffmpeg = ffmpeg.override { withSvg = true; }; + }; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libsndfile/default.nix b/nixpkgs/pkgs/development/libraries/libsndfile/default.nix index 0dc795a96d84..7c6613873f3a 100644 --- a/nixpkgs/pkgs/development/libraries/libsndfile/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsndfile/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libsndfile"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-zd0HDUzVYLyFjhIudBJQaKJUtYMjZeQRLALSkyD9tXU="; + hash = "sha256-MOOX/O0UaoeMaQPW9PvvE0izVp+6IoE5VbtTx0RvMkI="; }; nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/libubox/default.nix b/nixpkgs/pkgs/development/libraries/libubox/default.nix index 0a1e1e7f0a21..a1fe567af8b1 100644 --- a/nixpkgs/pkgs/development/libraries/libubox/default.nix +++ b/nixpkgs/pkgs/development/libraries/libubox/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "libubox"; - version = "unstable-2023-01-03${lib.optionalString with_ustream_ssl "-${ustream-ssl.ssl_implementation.pname}"}"; + version = "unstable-2023-05-23"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "eac92a4d5d82eb31e712157e7eb425af728b2c43"; - sha256 = "0w6mmwmd3ljhkqfk0qswq28dp63k30s3brlgf8lyi7vj7mrhvn3c"; + rev = "75a3b870cace1171faf57bd55e5a9a2f1564f757"; + hash = "sha256-QhJ09i7IWP6rbxrYuhisVsCr82Ou/JAZMEdkaLhZp1o="; }; cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" (if with_lua then "-DLUAPATH=${placeholder "out"}/lib/lua" else "-DBUILD_LUA=OFF") ]; diff --git a/nixpkgs/pkgs/development/libraries/liburing/default.nix b/nixpkgs/pkgs/development/libraries/liburing/default.nix index 0f1757f4e618..5779389dda1b 100644 --- a/nixpkgs/pkgs/development/libraries/liburing/default.nix +++ b/nixpkgs/pkgs/development/libraries/liburing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchgit, fetchpatch }: stdenv.mkDerivation rec { pname = "liburing"; @@ -10,6 +10,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-vbe9uh9AqXyPkzwD6zHoHH3JMeAJEl2FSGzny1T7diM="; }; + patches = [ + # Pull upstream fix for parallel build failures: + # https://github.com/axboe/liburing/pull/891 + (fetchpatch { + name = "parallel.patch"; + url = "https://github.com/axboe/liburing/commit/c34dca74854cb6e7f2b09affa2a4ab0145e62371.patch"; + hash = "sha256-RZSgHdQy5d7mXtMvkMyr+/kMhp1w+S5v9cqk5NSii5o="; + }) + ]; + separateDebugInfo = true; enableParallelBuilding = true; # Upstream's configure script is not autoconf generated, but a hand written one. diff --git a/nixpkgs/pkgs/development/libraries/libyang/default.nix b/nixpkgs/pkgs/development/libraries/libyang/default.nix index 9a78bc4422c7..9102286746b6 100644 --- a/nixpkgs/pkgs/development/libraries/libyang/default.nix +++ b/nixpkgs/pkgs/development/libraries/libyang/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libyang"; - version = "2.1.80"; + version = "2.1.111"; src = fetchFromGitHub { owner = "CESNET"; repo = "libyang"; rev = "v${version}"; - sha256 = "sha256-3Lf8JUnzD20Xq6UswCbcWpgEBs0z4OEo7CGt0vWiPhI="; + sha256 = "sha256-CJAIlEPbrjc2juYiPOQuQ0y7ggOxb/fHb7Yoo6/dYQc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libzen/default.nix b/nixpkgs/pkgs/development/libraries/libzen/default.nix index 12ac860320c7..ecc3736d1fbb 100644 --- a/nixpkgs/pkgs/development/libraries/libzen/default.nix +++ b/nixpkgs/pkgs/development/libraries/libzen/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--enable-shared" ]; - sourceRoot = "./ZenLib/Project/GNU/Library/"; + sourceRoot = "ZenLib/Project/GNU/Library"; preConfigure = "sh autogen.sh"; diff --git a/nixpkgs/pkgs/development/libraries/lief/default.nix b/nixpkgs/pkgs/development/libraries/lief/default.nix index e7e8d2032ed5..44f82f15852a 100644 --- a/nixpkgs/pkgs/development/libraries/lief/default.nix +++ b/nixpkgs/pkgs/development/libraries/lief/default.nix @@ -3,26 +3,28 @@ , fetchFromGitHub , python , cmake +, ninja }: let - pyEnv = python.withPackages (ps: [ ps.setuptools ]); + pyEnv = python.withPackages (ps: [ ps.setuptools ps.tomli ps.pip ps.setuptools ]); in stdenv.mkDerivation rec { pname = "lief"; - version = "0.12.3"; + version = "0.13.2"; src = fetchFromGitHub { owner = "lief-project"; repo = "LIEF"; rev = version; - sha256 = "sha256-wZgv4AFc7DrMCyxMLKQxO1mUTDAU4klK8aZAySqGJoY="; + sha256 = "sha256-lH4SqwPB2Jp/wUI2Cll67PQbHbwMqpNuLy/ei8roiHg="; }; outputs = [ "out" "py" ]; nativeBuildInputs = [ cmake + ninja ]; # Not a propagatedBuildInput because only the $py output needs it; $out is @@ -31,33 +33,16 @@ stdenv.mkDerivation rec { python ]; - dontUseCmakeConfigure = true; - - buildPhase = '' - runHook preBuild - - substituteInPlace setup.py \ - --replace 'cmake_args = []' "cmake_args = [ \"-DCMAKE_INSTALL_PREFIX=$prefix\" ]" - ${pyEnv.interpreter} setup.py --sdk build --parallel=$NIX_BUILD_CORES - - runHook postBuild + postBuild = '' + pushd /build/source/api/python + ${pyEnv.interpreter} setup.py build --parallel=$NIX_BUILD_CORES + popd ''; - # I was unable to find a way to build the library itself and have it install - # to $out, while also installing the Python bindings to $py without building - # the project twice (using cmake), so this is the best we've got. It uses - # something called CPack to create the tarball, but it's not obvious to me - # *how* that happens, or how to intercept it to just get the structured - # library output. - installPhase = '' - runHook preInstall - - mkdir -p $out $py/nix-support - echo "${python}" >> $py/nix-support/propagated-build-inputs - tar xf build/*.tar.gz --directory $out --strip-components 1 + postInstall = '' + pushd /build/source/api/python ${pyEnv.interpreter} setup.py install --skip-build --root=/ --prefix=$py - - runHook postInstall + popd ''; meta = with lib; { @@ -65,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://lief.quarkslab.com/"; license = [ licenses.asl20 ]; platforms = with platforms; linux ++ darwin; - maintainers = [ maintainers.lassulus ]; + maintainers = with maintainers; [ lassulus genericnerdyusername ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/liquidfun/default.nix b/nixpkgs/pkgs/development/libraries/liquidfun/default.nix index d3e3187bf757..6ab138016d19 100644 --- a/nixpkgs/pkgs/development/libraries/liquidfun/default.nix +++ b/nixpkgs/pkgs/development/libraries/liquidfun/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU libGL libX11 libXi ]; - sourceRoot = "liquidfun/Box2D/"; + sourceRoot = "liquidfun/Box2D"; preConfigurePhases = "preConfigure"; diff --git a/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix index 1c08812db45c..b583eb93153a 100644 --- a/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; + enableParallelBuilding = true; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { diff --git a/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix b/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix index f19672e566d1..05341188be6c 100644 --- a/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.13.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - sha256 = "sha256-bkTbnf7vyTxA623JVGUgrwAuXK7d8kzijOK1F4Sh4yY="; + hash = "sha256-FkiqQZ6xmwU2vkJxmr7k+Va5jIByWayAfUea+2DCFhk="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/nss/generic.nix b/nixpkgs/pkgs/development/libraries/nss/generic.nix index b4330796e52c..8badbf9e8760 100644 --- a/nixpkgs/pkgs/development/libraries/nss/generic.nix +++ b/nixpkgs/pkgs/development/libraries/nss/generic.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs nss - for f in nss/coreconf/config.gypi nss/build.sh nss/coreconf/config.gypi; do + for f in nss/coreconf/config.gypi nss/build.sh; do substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env" done diff --git a/nixpkgs/pkgs/development/libraries/oneDNN/2.nix b/nixpkgs/pkgs/development/libraries/oneDNN/2.nix index fd47a05a1bc9..8851b09214f1 100644 --- a/nixpkgs/pkgs/development/libraries/oneDNN/2.nix +++ b/nixpkgs/pkgs/development/libraries/oneDNN/2.nix @@ -1,17 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ cmake +, fetchFromGitHub +, lib +, stdenv +}: # This was originally called mkl-dnn, then it was renamed to dnnl, and it has # just recently been renamed again to oneDNN. See here for details: # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "2.7.1"; + version = "2.7.5"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; - rev = "v${version}"; - sha256 = "sha256-HBCuSZkApd/6UkAxz/KDFb/gyX2SI1S2GwgXAXSTU/c="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-oMPBORAdL2rk2ewyUrInYVHYBRvuvNX4p4rwykO3Rhs="; }; outputs = [ "out" "dev" "doc" ]; @@ -30,12 +34,12 @@ stdenv.mkDerivation rec { --replace "\''${_IMPORT_PREFIX}/" "" ''; - meta = with lib; { + meta = { + changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${finalAttrs.version}"; description = "oneAPI Deep Neural Network Library (oneDNN)"; homepage = "https://01.org/oneDNN"; - changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ alexarice bhipple ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ alexarice bhipple ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index f7495d3e9c8c..7448a99439d0 100644 --- a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix @@ -1,17 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ cmake +, fetchFromGitHub +, lib +, stdenv +}: # This was originally called mkl-dnn, then it was renamed to dnnl, and it has # just recently been renamed again to oneDNN. See here for details: # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; version = "3.2.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; - rev = "v${version}"; - sha256 = "sha256-/LbT2nHPpZHjY3xbJ9bDabR7aIMvetNP4mB+rxuTfy8="; + rev = "v${finalAttrs.version}"; + hash = "sha256-/LbT2nHPpZHjY3xbJ9bDabR7aIMvetNP4mB+rxuTfy8="; }; outputs = [ "out" "dev" "doc" ]; @@ -30,12 +34,12 @@ stdenv.mkDerivation rec { --replace "\''${_IMPORT_PREFIX}/" "" ''; - meta = with lib; { + meta = { + changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${finalAttrs.version}"; description = "oneAPI Deep Neural Network Library (oneDNN)"; homepage = "https://01.org/oneDNN"; - changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ bhipple ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bhipple ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix index 99e45c1013d1..1b955b57de42 100644 --- a/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix +++ b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix @@ -132,6 +132,7 @@ stdenv.mkDerivation rec { cmakeDir = "../cmake"; cmakeFlags = [ + "-DABSL_ENABLE_INSTALL=ON" "-DCMAKE_BUILD_TYPE=RELEASE" "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" "-DFETCHCONTENT_QUIET=OFF" @@ -143,6 +144,7 @@ stdenv.mkDerivation rec { "-DFETCHCONTENT_SOURCE_DIR_MP11=${mp11}" "-DFETCHCONTENT_SOURCE_DIR_ONNX=${python3Packages.onnx.src}" "-DFETCHCONTENT_SOURCE_DIR_PYTORCH_CPUINFO=${pytorch_cpuinfo}" + "-DFETCHCONTENT_SOURCE_DIR_RE2=${re2.src}" "-DFETCHCONTENT_SOURCE_DIR_SAFEINT=${safeint}" "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" "-Donnxruntime_BUILD_SHARED_LIB=ON" diff --git a/nixpkgs/pkgs/development/libraries/openturns/default.nix b/nixpkgs/pkgs/development/libraries/openturns/default.nix index 4c80c4b9ac81..d6735e77d460 100644 --- a/nixpkgs/pkgs/development/libraries/openturns/default.nix +++ b/nixpkgs/pkgs/development/libraries/openturns/default.nix @@ -26,24 +26,15 @@ stdenv.mkDerivation rec { pname = "openturns"; - version = "1.20"; + version = "1.21"; src = fetchFromGitHub { owner = "openturns"; repo = "openturns"; rev = "v${version}"; - sha256 = "sha256-QeapH937yGnK6oD+rgIERePxz6ooxGpOx6x9LyFDt2A="; + sha256 = "sha256-zWCwuxJEiyhnllVCsfm3zNz2Xorvuj2Vl2fufS3qixY="; }; - patches = [ - # Fix build with primesieve 11, https://github.com/openturns/openturns/pull/2187 - # Remove with next version update. - (fetchpatch { - url = "https://github.com/openturns/openturns/commit/a85061f89a5763061467beac516c1355fe81b9be.patch"; - hash = "sha256-z28ipBuX3b5UFEnKuDfp+kMI5cUcwXVz/8WZHlICnvE="; - }) - ]; - nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx; buildInputs = [ swig @@ -84,6 +75,7 @@ stdenv.mkDerivation rec { description = "Multivariate probabilistic modeling and uncertainty treatment library"; license = with licenses; [ lgpl3 gpl3 ]; homepage = "https://openturns.github.io/www/"; + changelog = "https://github.com/openturns/openturns/raw/v${version}/ChangeLog"; maintainers = with maintainers; [ gdinh ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 08b92288e544..941d4da56894 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -75,7 +75,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.77"; + version = "0.3.78"; outputs = [ "out" @@ -93,7 +93,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-dRAo/GzWvXKVCGLM12YyTQmgXHEYn3QbOyaZKmlqTYY="; + sha256 = "sha256-tiVuab8kugp9ZOKL/m8uZQps/pcrVihwB3rRf6SGuzc="; }; patches = [ @@ -221,7 +221,7 @@ let moveToOutput "bin/pw-jack" "$jack" ''; - passthru.tests = nixosTests.installed-tests.pipewire; + passthru.tests.installed-tests = nixosTests.installed-tests.pipewire; meta = with lib; { description = "Server and user space API to deal with multimedia pipelines"; diff --git a/nixpkgs/pkgs/development/libraries/plog/default.nix b/nixpkgs/pkgs/development/libraries/plog/default.nix index 789502283b7f..45b0fa49a1ab 100644 --- a/nixpkgs/pkgs/development/libraries/plog/default.nix +++ b/nixpkgs/pkgs/development/libraries/plog/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "plog"; - version = "1.1.9"; + version = "1.1.10"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "SergiusTheBest"; repo = pname; rev = version; - hash = "sha256-CARTr1EEqXNJtp6XwHhr7aiRBiYR0cClzexpNCMaQJc="; + hash = "sha256-NZphrg9OB1FTY2ifu76AXeCyGwW2a2BkxMGjZPf4uM8="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index 04fdf5298257..e6e6b24360a4 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -46,6 +46,7 @@ let ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch ./qtbase.patch.d/0010-qtbase-assert.patch ./qtbase.patch.d/0011-fix-header_module.patch + ./qtbase.patch.d/9999-backport-dbus-crash.patch ]; qtdeclarative = [ ./qtdeclarative.patch @@ -333,7 +334,17 @@ let } ../hooks/wrap-qt-apps-hook.sh; }; -in makeScopeWithSplicing' { - otherSplices = generateSplicesForMkScope "qt5"; - f = addPackages; -} + baseScope = makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "qt5"; + f = addPackages; + }; + + bootstrapScope = baseScope.overrideScope(final: prev: { + qtbase = prev.qtbase.override { qttranslations = null; }; + qtdeclarative = null; + }); + + finalScope = baseScope.overrideScope(final: prev: { + qttranslations = bootstrapScope.qttranslations; + }); +in finalScope diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch new file mode 100644 index 000000000000..e1aa0119aa2f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch @@ -0,0 +1,79 @@ +commit eb0c6846a5d05d686f0686f0f1ddddcad762ad26 (HEAD -> kde/5.15) +Author: K900 <me@0upti.me> +Date: Mon Aug 14 22:44:02 2023 +0300 + + QLibraryPrivate: Actually merge load hints + + Or old and new load hints in mergeLoadHints() instead of just storing + new ones. Andjust QLibraryPrivate::setLoadHints() to handle objects + with no file name differently and just set load hints directly. + + Mention that load hints are merged once the file name is set + in the documentation for QLibrary::setLoadHints(). + + Add a regression test into tst_qfactoryloader. + + Update and extend tst_QPluginLoader::loadHints() to take into account + load hints merging. + + Fixes: QTBUG-114480 + Change-Id: I3b9afaec7acde1f5ff992d913f8d7217392c7e00 + Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> + Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> + +diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp +index 5d2f024267..45b5a3fe27 100644 +--- a/src/corelib/plugin/qlibrary.cpp ++++ b/src/corelib/plugin/qlibrary.cpp +@@ -526,7 +526,7 @@ void QLibraryPrivate::mergeLoadHints(QLibrary::LoadHints lh) + if (pHnd.loadRelaxed()) + return; + +- loadHintsInt.storeRelaxed(lh); ++ loadHintsInt.fetchAndOrRelaxed(lh); + } + + QFunctionPointer QLibraryPrivate::resolve(const char *symbol) +@@ -538,6 +538,13 @@ QFunctionPointer QLibraryPrivate::resolve(const char *symbol) + + void QLibraryPrivate::setLoadHints(QLibrary::LoadHints lh) + { ++ // Set the load hints directly for a dummy if this object is not associated ++ // with a file. Such object is not shared between multiple instances. ++ if (fileName.isEmpty()) { ++ loadHintsInt.storeRelaxed(lh); ++ return; ++ } ++ + // this locks a global mutex + QMutexLocker lock(&qt_library_mutex); + mergeLoadHints(lh); +@@ -1166,6 +1173,10 @@ QString QLibrary::errorString() const + lazy symbol resolution, and will not export external symbols for resolution + in other dynamically-loaded libraries. + ++ \note Hints can only be cleared when this object is not associated with a ++ file. Hints can only be added once the file name is set (\a hints will ++ be or'ed with the old hints). ++ + \note Setting this property after the library has been loaded has no effect + and loadHints() will not reflect those changes. + +diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp +index 0a63b93762..ceee5d6385 100644 +--- a/src/corelib/plugin/qpluginloader.cpp ++++ b/src/corelib/plugin/qpluginloader.cpp +@@ -414,10 +414,11 @@ QString QPluginLoader::errorString() const + void QPluginLoader::setLoadHints(QLibrary::LoadHints loadHints) + { + if (!d) { +- d = QLibraryPrivate::findOrCreate(QString()); // ugly, but we need a d-ptr ++ d = QLibraryPrivate::findOrCreate({}, {}, loadHints); // ugly, but we need a d-ptr + d->errorString.clear(); ++ } else { ++ d->setLoadHints(loadHints); + } +- d->setLoadHints(loadHints); + } + + QLibrary::LoadHints QPluginLoader::loadHints() const diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index de73bcbe2772..9f0feaf94e58 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -15,6 +15,7 @@ # optional dependencies , cups ? null, postgresql ? null , withGtk3 ? false, dconf, gtk3 +, qttranslations ? null # options , libGLSupported ? !stdenv.isDarwin @@ -310,6 +311,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (mysqlSupport) [ "-L" "${libmysqlclient}/lib" "-I" "${libmysqlclient}/include" + ] ++ lib.optional (qttranslations != null) [ + "-translationdir" "${qttranslations}/translations" ] ); diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix index be96236d7285..bac70d146bf9 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -36,7 +36,7 @@ qtModule { "bin/macdeployqt" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && qtdeclarative != null) ''-DNIXPKGS_QMLIMPORTSCANNER="${qtdeclarative.dev}/bin/qmlimportscanner"''; setupHook = ../hooks/qttools-setup-hook.sh; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qttranslations.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttranslations.nix index f49a4eb9a85d..bcd52cdc4a8f 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qttranslations.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttranslations.nix @@ -2,5 +2,6 @@ qtModule { pname = "qttranslations"; - qtInputs = [ qttools ]; + nativeBuildInputs = [ qttools ]; + outputs = [ "out" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix b/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix index 9abd9fabc957..bddbf254c5f7 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix @@ -17,7 +17,7 @@ mkDerivation (args // { patches = (args.patches or []) ++ (patches.${pname} or []); nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; - propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); + propagatedBuildInputs = (args.qtInputs or []) ++ (args.propagatedBuildInputs or []); outputs = args.outputs or [ "out" "dev" ]; setOutputFlags = args.setOutputFlags or false; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/default.nix b/nixpkgs/pkgs/development/libraries/qt-6/default.nix index d90834e0b3e2..0a4fbe713ec0 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/default.nix @@ -48,6 +48,7 @@ let ./patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch ./patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch ./patches/0007-qtbase-find-qt-tools-in-QTTOOLSPATH.patch + ./patches/0008-qtbase-allow-translations-outside-prefix.patch ./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch ./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch ./patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch @@ -171,6 +172,14 @@ let # TODO(@Artturin): convert to makeScopeWithSplicing' # simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01 - self = lib.makeScope newScope addPackages; -in -self + baseScope = lib.makeScope newScope addPackages; + + bootstrapScope = baseScope.overrideScope'(final: prev: { + qtbase = prev.qtbase.override { qttranslations = null; }; + qtdeclarative = null; + }); + + finalScope = baseScope.overrideScope'(final: prev: { + qttranslations = bootstrapScope.qttranslations; + }); +in finalScope diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix index 4a4ebb320757..c0a20503e64c 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -93,6 +93,7 @@ , libGL , debug ? false , developerBuild ? false +, qttranslations ? null }: let @@ -233,7 +234,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ # error: 'path' is unavailable: introduced in macOS 10.15 "-DQT_FEATURE_cxx17_filesystem=OFF" - ]; + ] ++ lib.optional (qttranslations != null) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations"; NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ # Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc" diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qttranslations.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qttranslations.nix index 4795cd9e1bfe..61c642de1085 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qttranslations.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qttranslations.nix @@ -4,5 +4,6 @@ qtModule { pname = "qttranslations"; - qtInputs = [ qttools ]; + nativeBuildInputs = [ qttools ]; + outputs = [ "out" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 0c243d4ba7a9..5d9aa71e8537 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -14,8 +14,6 @@ , python3 , which , nodejs -, qtbase -, perl , xorg , libXcursor , libXScrnSaver @@ -51,8 +49,6 @@ , systemd , pipewire , gn -, runCommand -, writeScriptBin , ffmpeg_4 , lib , stdenv @@ -60,10 +56,8 @@ , libxml2 , libxslt , lcms2 -, re2 , libkrb5 , mesa -, xkeyboard_config , enableProprietaryCodecs ? true # darwin , llvmPackages_14 @@ -135,7 +129,11 @@ qtModule { # environment variable, since NixOS relies on it working. # See https://github.com/NixOS/nixpkgs/issues/226484 for more context. ../patches/qtwebengine-xkb-includes.patch + ../patches/qtwebengine-link-pulseaudio.patch + + # Override locales install path so they go to QtWebEngine's $out + ../patches/qtwebengine-locales-path.patch ]; postPatch = '' @@ -225,7 +223,6 @@ qtModule { libxml2 libxslt lcms2 - re2 libevent ffmpeg_4 diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch new file mode 100644 index 000000000000..e96cbdbef11d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake +index b45ec1d208..05f69c131b 100644 +--- a/cmake/QtBuild.cmake ++++ b/cmake/QtBuild.cmake +@@ -30,7 +30,7 @@ function(qt_configure_process_path name default docstring) + set(rel_path ".") + elseif(rel_path MATCHES "^\.\./") + # INSTALL_SYSCONFDIR is allowed to be outside the prefix. +- if(NOT name STREQUAL "INSTALL_SYSCONFDIR") ++ if(NOT (name STREQUAL "INSTALL_SYSCONFDIR" OR name STREQUAL "INSTALL_TRANSLATIONSDIR")) + message(FATAL_ERROR + "Path component '${name}' is outside computed install prefix: ${rel_path} ") + return() diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch new file mode 100644 index 000000000000..58f2d96f8097 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch @@ -0,0 +1,28 @@ +diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt +index f860e0ba7..30e1a767a 100644 +--- a/src/core/api/CMakeLists.txt ++++ b/src/core/api/CMakeLists.txt +@@ -193,7 +193,8 @@ if(QT_FEATURE_framework) + + else() + install(FILES ${localeFiles} +- DESTINATION ${INSTALL_TRANSLATIONSDIR}/qtwebengine_locales ++ # Nixpkgs: INSTALL_TRANSLATIONSDIR points to Qt base translations store path ++ DESTINATION ${INSTALL_DATADIR}/qtwebengine_locales + CONFIGURATIONS ${config} + ) + install(FILES ${resourceFiles} +diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp +index c03c9a3b2..430fdfab2 100644 +--- a/src/core/web_engine_library_info.cpp ++++ b/src/core/web_engine_library_info.cpp +@@ -203,7 +203,8 @@ QString localesPath() + candidatePaths << getResourcesPath(frameworkBundle()) % QDir::separator() + % QLatin1String("qtwebengine_locales"); + #endif +- candidatePaths << QLibraryInfo::path(QLibraryInfo::TranslationsPath) % QDir::separator() ++ // Nixpkgs: match the changes made in CMakeLists.txt ++ candidatePaths << QLibraryInfo::path(QLibraryInfo::DataPath) % QDir::separator() + % QLatin1String("qtwebengine_locales"); + candidatePaths << fallbackDir(); + } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix b/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix index 98606d24a968..ce917a274159 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (args // { buildInputs = args.buildInputs or [ ]; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ] ++ lib.optionals stdenv.isDarwin [ moveBuildTree ]; - propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or [ ]); + propagatedBuildInputs = (args.qtInputs or [ ]) ++ (args.propagatedBuildInputs or [ ]); moveToDev = false; diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 0d9d1d42c0fb..64f3b81edde9 100644 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -13,10 +13,14 @@ , qttools , wrapQtAppsHook , gitUpdater -}: +, qt5Kvantum ? null +}: +let + isQt6 = lib.versionAtLeast qtbase.version "6"; +in stdenv.mkDerivation rec { - pname = "qtstyleplugin-kvantum"; + pname = "qtstyleplugin-kvantum${lib.optionalString isQt6 "6"}"; version = "1.0.10"; src = fetchFromGitHub { @@ -37,8 +41,8 @@ stdenv.mkDerivation rec { qtsvg libX11 libXext - ] ++ lib.optionals (lib.versionOlder qtbase.version "6") [ qtx11extras kwindowsystem ] - ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; + ] ++ lib.optionals (!isQt6) [ qtx11extras kwindowsystem ] + ++ lib.optional isQt6 qtwayland; sourceRoot = "${src.name}/Kvantum"; @@ -57,6 +61,12 @@ stdenv.mkDerivation rec { --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" ''; + postInstall = lib.optionalString isQt6 '' + # make default Kvantum themes available for Qt 6 apps + mkdir -p "$out/share" + ln -s "${qt5Kvantum}/share/Kvantum" "$out/share/Kvantum" + ''; + passthru.updateScript = gitUpdater { rev-prefix = "V"; }; diff --git a/nixpkgs/pkgs/development/libraries/re2/default.nix b/nixpkgs/pkgs/development/libraries/re2/default.nix index 202035232399..adaef49976a7 100644 --- a/nixpkgs/pkgs/development/libraries/re2/default.nix +++ b/nixpkgs/pkgs/development/libraries/re2/default.nix @@ -8,23 +8,26 @@ , haskellPackages , mercurial , python3Packages +, abseil-cpp }: stdenv.mkDerivation rec { pname = "re2"; - version = "2023-03-01"; + version = "2023-08-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - hash = "sha256-T+P7qT8x5dXkLZAL8VjvqPD345sa6ALX1f5rflE0dwc="; + hash = "sha256-RexwqNR/Izf2Rzu1cvMw+le6C4EmL4CeWCOc+vXUBZQ="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ninja ]; + propagatedBuildInputs = [ abseil-cpp ]; + postPatch = '' substituteInPlace re2Config.cmake.in \ --replace "\''${PACKAGE_PREFIX_DIR}/" "" @@ -65,7 +68,7 @@ stdenv.mkDerivation rec { ''; license = licenses.bsd3; homepage = "https://github.com/google/re2"; - maintainers = with maintainers; [ azahi ]; + maintainers = with maintainers; [ azahi networkexception ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/rtlcss/default.nix b/nixpkgs/pkgs/development/libraries/rtlcss/default.nix new file mode 100644 index 000000000000..a553e8d33ddf --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/rtlcss/default.nix @@ -0,0 +1,24 @@ +{ buildNpmPackage, fetchFromGitHub, lib, ... }: + +buildNpmPackage rec { + pname = "rtlcss"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "MohammadYounes"; + repo = "rtlcss"; + rev = "v${version}"; + hash = "sha256-KdAf7jzt8o/YEzT/bLCXj546HX0oC90kr44u3p3qv/k="; + }; + + npmDepsHash = "sha256-ghVgvw55w7T9WxokYtlFSgCfGvcOxFzm2wQIFi+6uBY="; + + dontNpmBuild = true; + + meta = with lib; { + description = "Framework for converting Left-To-Right (LTR) Cascading Style Sheets(CSS) to Right-To-Left (RTL)"; + homepage = "https://rtlcss.com"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index dd68fef04e6b..678aac37e898 100644 --- a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.47"; + version = "1.3.48"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wFn7vJA6FCfgFCjjDdyOtBv209yeJNFlG1fKMQ84Bj0="; + sha256 = "sha256-7C1syZAhMv0N+AuE/SuXqhatKhlzDOix4ZDxLRyuWOs="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix index e0a6ffd9d547..db85bfdd9c0b 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -1,6 +1,7 @@ { stdenv, backendStdenv, lib, + lndir, zlib, useCudatoolkitRunfile ? false, cudaVersion, @@ -10,14 +11,6 @@ autoPatchelfHook, autoAddOpenGLRunpathHook, fetchurl, - # The distributed version of CUDNN includes both dynamically liked .so files, - # as well as statically linked .a files. However, CUDNN is quite large - # (multiple gigabytes), so you can save some space in your nix store by - # removing the statically linked libraries if you are not using them. - # - # Setting this to true removes the statically linked .a files. - # Setting this to false keeps these statically linked .a files. - removeStatic ? false, }: { version, url, @@ -48,11 +41,16 @@ in backendStdenv.mkDerivation { pname = "cudatoolkit-${cudaMajorVersion}-cudnn"; version = versionTriple; + strictDeps = true; + outputs = ["out" "lib" "static" "dev"]; src = fetchurl { inherit url hash; }; + # We do need some other phases, like configurePhase, so the multiple-output setup hook works. + dontBuild = true; + # Check and normalize Runpath against DT_NEEDED using autoPatchelf. # Prepend /run/opengl-driver/lib using addOpenGLRunpath for dlopen("libcudacuda.so") nativeBuildInputs = [ @@ -74,27 +72,49 @@ in # # Note also that version <=8.3.0 contained a subdirectory "lib64/" but in # version 8.3.2 it seems to have been renamed to simply "lib/". + # + # doc and dev have special output handling. Other outputs need to be moved to their own + # output. + # Note that moveToOutput operates on all outputs: + # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L105-L107 installPhase = '' runHook preInstall - mkdir -p $out - cp -a include $out/include - [ -d "lib/" ] && cp -a lib $out/lib - [ -d "lib64/" ] && cp -a lib64 $out/lib64 - '' - + strings.optionalString removeStatic '' - rm -f $out/lib/*.a - rm -f $out/lib64/*.a - '' - + '' + mkdir -p "$out" + mv * "$out" + moveToOutput "lib64" "$lib" + moveToOutput "lib" "$lib" + moveToOutput "**/*.a" "$static" + runHook postInstall ''; # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5. postFixup = strings.optionalString (strings.versionAtLeast versionTriple "8.0.5") '' - patchelf $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so - patchelf $out/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so + patchelf $lib/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so + patchelf $lib/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so + ''; + + # The out output leverages the same functionality which backs the `symlinkJoin` function in + # Nixpkgs: + # https://github.com/NixOS/nixpkgs/blob/d8b2a92df48f9b08d68b0132ce7adfbdbc1fbfac/pkgs/build-support/trivial-builders/default.nix#L510 + # + # That should allow us to emulate "fat" default outputs without having to actually create them. + # + # It is important that this run after the autoPatchelfHook, otherwise the symlinks in out will reference libraries in lib, creating a circular dependency. + postPhases = ["postPatchelf"]; + # For each output, create a symlink to it in the out output. + # NOTE: We must recreate the out output here, because the setup hook will have deleted it + # if it was empty. + # NOTE: Do not use optionalString based on whether `outputs` contains only `out` -- phases + # which are empty strings are skipped/unset and result in errors of the form "command not + # found: <customPhaseName>". + postPatchelf = '' + mkdir -p "$out" + ${lib.meta.getExe lndir} "$lib" "$out" + ${lib.meta.getExe lndir} "$static" "$out" + ${lib.meta.getExe lndir} "$dev" "$out" ''; passthru = { @@ -111,6 +131,19 @@ in majorVersion = versions.major versionTriple; }; + # Setting propagatedBuildInputs to false will prevent outputs known to the multiple-outputs + # from depending on `out` by default. + # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L196 + # Indeed, we want to do the opposite -- fat "out" outputs that contain all the other outputs. + propagatedBuildOutputs = false; + + # By default, if the dev output exists it just uses that. + # However, because we disabled propagatedBuildOutputs, dev doesn't contain libraries or + # anything of the sort. To remedy this, we set outputSpecified to true, and use + # outputsToInstall, which tells Nix which outputs to use when the package name is used + # unqualified (that is, without an explicit output). + outputSpecified = true; + meta = with lib; { # Check that the cudatoolkit version satisfies our min/max constraints (both # inclusive). We mark the package as broken if it fails to satisfies the @@ -127,5 +160,8 @@ in license = licenses.unfree; platforms = ["x86_64-linux"]; maintainers = with maintainers; [mdaiter samuela]; + # 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/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix b/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix index 5a9d3c5066cc..2c576a190026 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/dbcsr/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , cmake +, mpiCheckPhaseHook , pkg-config , fypp , gfortran @@ -64,13 +65,12 @@ stdenv.mkDerivation rec { "-DUSE_MPI=ON" ]; - checkInputs = [ openssh ]; + checkInputs = [ + openssh + mpiCheckPhaseHook + ]; doCheck = true; - preCheck = '' - export HYDRA_IFACE=lo # Fix to make mpich run in a sandbox - export OMPI_MCA_rmaps_base_oversubscribe=1 - ''; meta = with lib; { description = "Distributed Block Compressed Sparse Row matrix library"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix index 04f263568ce6..b3753a63339a 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix @@ -113,13 +113,17 @@ stdenv.mkDerivation { lapack blas ] ++ lists.optionals cudaSupport (with cudaPackages; [ - cuda_cudart - libcublas # cublas_v2.h - libcusparse # cusparse.h + cuda_cudart.dev # cuda_runtime.h + cuda_cudart.lib # cudart + cuda_cudart.static # cudart_static + libcublas.dev # cublas_v2.h + libcublas.lib # cublas + libcusparse.dev # cusparse.h + libcusparse.lib # cusparse ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ - cuda_nvprof # <cuda_profiler_api.h> + cuda_nvprof.dev # <cuda_profiler_api.h> ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ - cuda_profiler_api # <cuda_profiler_api.h> + cuda_profiler_api.dev # <cuda_profiler_api.h> ]) ++ lists.optionals rocmSupport [ hip hipblas diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/releases.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/releases.nix index 029f418edce3..59f495d67109 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/magma/releases.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/magma/releases.nix @@ -36,8 +36,8 @@ ]; } { - version = "2.7.1"; - hash = "sha256-2chxHAR6OMrhbv3nS+4uszMyF/0nEeHpuGBsu7SuGlA="; + version = "2.7.2"; + hash = "sha256-cpvBpw5RinQi/no6VFN6R0EDWne+M0n2bqxcNiV21WA="; supportedGpuTargets = [ "700" "701" diff --git a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix index 2eb391dda46b..c5c7b7e6427d 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/nccl/default.nix @@ -8,20 +8,22 @@ , cuda_nvcc , cudaFlags , cudaVersion +# passthru.updateScript +, gitUpdater }: let # Output looks like "-gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_86,code=compute_86" gencode = lib.concatStringsSep " " cudaFlags.gencode; in backendStdenv.mkDerivation (finalAttrs: { - name = "nccl-${finalAttrs.version}-cuda-${cudaVersion}"; - version = "2.16.5-1"; + pname = "nccl"; + version = "2.18.5-1"; src = fetchFromGitHub { owner = "NVIDIA"; - repo = "nccl"; + repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-JyhhYKSVIqUKIbC1rCJozPT1IrIyRLGrTjdPjJqsYaU="; + hash = "sha256-vp2WitKateEt1AzSeeEvY/wM4NnUmV7XgL/gfPRUObY="; }; outputs = [ "out" "dev" ]; @@ -63,6 +65,12 @@ backendStdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString [ "-Wno-unused-function" ]; + # Run the update script with: `nix-shell maintainers/scripts/update.nix --argstr package cudaPackages.nccl` + passthru.updateScript = gitUpdater { + inherit (finalAttrs) pname version; + rev-prefix = "v"; + }; + enableParallelBuilding = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix index 92588307ca57..55438c63a5e0 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ abseil-cpp protobuf - python.pkgs.protobuf + (python.pkgs.protobuf.override { protobuf = protobuf; }) python.pkgs.numpy ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix index fbd9db6a419f..bb5d212061f2 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, mpiCheckPhaseHook , autoreconfHook, pkg-config , p4est-sc-debugEnable ? true, p4est-sc-mpiSupport ? true , mpi, openssh, zlib @@ -47,10 +47,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; makeFlags = [ "V=0" ]; - preCheck = '' - export OMPI_MCA_rmaps_base_oversubscribe=1 - export HYDRA_IFACE=lo - ''; + nativeCheckInputs = lib.optionals mpiSupport [ + mpiCheckPhaseHook + openssh + ]; # disallow Darwin checks due to prototype incompatibility of qsort_r # to be fixed in a future version of the source code diff --git a/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix b/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix index a55c5fe573bf..1218c695590e 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { ++ lib.optional withMetis "--with-metis" ; - inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding preCheck doCheck; + inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding doCheck; meta = { branch = "prev3-develop"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix index 0d553376288f..e2a5e76c5586 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, openssh -, mpi, blas, lapack +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake +, openssh, mpiCheckPhaseHook, mpi, blas, lapack } : assert blas.isILP64 == lapack.isILP64; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ openssh ]; + nativeCheckInputs = [ openssh mpiCheckPhaseHook ]; buildInputs = [ blas lapack ]; propagatedBuildInputs = [ mpi ]; hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; @@ -61,17 +61,6 @@ stdenv.mkDerivation rec { # sometimes fail due to this checkFlagsArray = [ "ARGS=--timeout 10000" ]; - preCheck = '' - # make sure the test starts even if we have less than 4 cores - export OMPI_MCA_rmaps_base_oversubscribe=1 - - # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo - - # Run single threaded - export OMP_NUM_THREADS=1 - ''; - meta = with lib; { homepage = "http://www.netlib.org/scalapack/"; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; diff --git a/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/nixpkgs/pkgs/development/libraries/simdjson/default.nix index 1dc1a0214627..0e73ed979eba 100644 --- a/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-+BCXkOaWYZSFWGZmeZ2ZJwVxFwmHgRbb7GSj/lRxmfw="; + sha256 = "sha256-h15IyPYvIUPDOJ03KgEDyRhXe0Oi8XCR5LnzSpPc4PI="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/snappy/default.nix b/nixpkgs/pkgs/development/libraries/snappy/default.nix index a45d0a419e62..004dd388385f 100644 --- a/nixpkgs/pkgs/development/libraries/snappy/default.nix +++ b/nixpkgs/pkgs/development/libraries/snappy/default.nix @@ -23,16 +23,17 @@ stdenv.mkDerivation rec { url = "https://build.opensuse.org/public/source/openSUSE:Factory/snappy/reenable-rtti.patch?rev=a759aa6fba405cd40025e3f0ab89941d"; sha256 = "sha256-RMuM5yd6zP1eekN/+vfS54EyY4cFbGDVor1E1vj3134="; }) + # Fix -Wsign-compare warning on clang. + (fetchpatch { + url = "https://github.com/google/snappy/commit/27f34a580be4a3becf5f8c0cba13433f53c21337.patch"; + sha256 = "sha256-eq6ueeMAkd2bYmPJcKAZZzd5QlXyeWOrsxFIwR8KOpQ="; + }) ]; outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; - # See https://github.com/NixOS/nixpkgs/pull/219778#issuecomment-1464884412 - # and https://github.com/NixOS/nixpkgs/pull/221215#issuecomment-1482564003. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-sign-compare"; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" "-DSNAPPY_BUILD_TESTS=OFF" diff --git a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix index dc85ac20bf6a..44ad21d6a141 100644 --- a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.250.0"; + version = "1.3.261.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "sdk-${version}"; - hash = "sha256-5mVcbOAuzux/Yuo0NMwZRTsdQr46UxjrtMhT5mPHyCQ="; + hash = "sha256-P/ZD53Xa4Fk9+N/bW5HhsfA+LjUnCbBsQDHvXesKu5M="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix index 623a8dad04a9..05576b0dab14 100644 --- a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.5.4"; + version = "4.5.5"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - hash = "sha256-n9KPtTj/mHXrnFJnbWPO3H+Vol3Z2mg7XLl55ynyLwY="; + hash = "sha256-amWYkVQr+Rmcj+32lFDRq43Q+Ojj8V8B6KoURqdwGt0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/tdb/default.nix b/nixpkgs/pkgs/development/libraries/tdb/default.nix index c166d36d5a60..13f55a2dc52b 100644 --- a/nixpkgs/pkgs/development/libraries/tdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tdb/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "tdb"; - version = "1.4.8"; + version = "1.4.9"; src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - hash = "sha256-hDTJyFfRPOP6hGb3VgHyXDaTZ2s2kZ8VngrWEhuvXOg="; + hash = "sha256-CsImBz46LbhkjaevdEy5X1B2alL+6wAdVYsrMht0p2U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/tdlib/default.nix b/nixpkgs/pkgs/development/libraries/tdlib/default.nix index 575d8f4c4e0c..b3802c3a4514 100644 --- a/nixpkgs/pkgs/development/libraries/tdlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/tdlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.8.10"; + version = "1.8.16"; src = fetchFromGitHub { owner = "tdlib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "93c42f6d7c1209937431469f80427d48907f1b8d"; - hash = "sha256-vdaVnC26txUBp8rlqx1CdLHlNlack3XXYdfFal1VLh4="; + rev = "cde095db6c75827fe4bd237039574aad373ad96b"; + hash = "sha256-m/RN6g0GxPiSvDZbiOaJFcT2j0K7sIaVGaxKWMVn6v8="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/nixpkgs/pkgs/development/libraries/tiledb/default.nix index 163e35971a77..21c63f71221e 100644 --- a/nixpkgs/pkgs/development/libraries/tiledb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tiledb/default.nix @@ -17,6 +17,7 @@ , gtest , doxygen , fixDarwinDylibNames +, useAVX2 ? stdenv.hostPlatform.avx2Support }: stdenv.mkDerivation rec { @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { # unaccelerated routines. cmakeFlags = [ "-DTILEDB_WERROR=0" - ]; + ] ++ lib.optional (!useAVX2) "-DCOMPILER_SUPPORTS_AVX2=FALSE"; nativeBuildInputs = [ clang-tools diff --git a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index 9d7cb73cc539..f637df891354 100644 --- a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -31,16 +31,16 @@ stdenv.mkDerivation rec { shadow ]; - # cmocka is checked / used(?) in the configure script + buildInputs = [ + openssl json_c curl libgcrypt uthash libuuid + ] + # cmocka is checked in the configure script # when unit and/or integration testing is enabled - buildInputs = [ openssl json_c curl libgcrypt uthash libuuid ] - # cmocka doesn't build with pkgsStatic, and we don't need it anyway - # when tests are not run - ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ - cmocka - ]; + # cmocka doesn't build with pkgsStatic, and we don't need it anyway + # when tests are not run + ++ lib.optional doInstallCheck cmocka; - nativeCheckInputs = [ + nativeInstallCheckInputs = [ cmocka which openssl procps_pkg iproute2 ibm-sw-tpm2 ]; @@ -70,27 +70,24 @@ stdenv.mkDerivation rec { --replace 'git describe --tags --always --dirty' 'echo "${version}"' ''; - configureFlags = lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ + configureFlags = lib.optionals doInstallCheck [ "--enable-unit" "--enable-integration" ]; - doCheck = true; - preCheck = '' - # Since we rewrote the load path in the dynamic loader for the TCTI - # The various tcti implementation should be placed in their target directory - # before we could run tests - installPhase - # install already done, dont need another one - dontInstall=1 - ''; - postInstall = '' # Do not install the upstream udev rules, they rely on specific # users/groups which aren't guaranteed to exist on the system. rm -R $out/lib/udev ''; + doCheck = false; + doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform; + # Since we rewrote the load path in the dynamic loader for the TCTI + # The various tcti implementation should be placed in their target directory + # before we could run tests, so we make turn checkPhase into installCheckPhase + installCheckTarget = "check"; + meta = with lib; { description = "OSS implementation of the TCG TPM2 Software Stack (TSS2)"; homepage = "https://github.com/tpm2-software/tpm2-tss"; diff --git a/nixpkgs/pkgs/development/libraries/ubus/default.nix b/nixpkgs/pkgs/development/libraries/ubus/default.nix index 49aebdd7dca2..37c8a1fa450b 100644 --- a/nixpkgs/pkgs/development/libraries/ubus/default.nix +++ b/nixpkgs/pkgs/development/libraries/ubus/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "ubus"; - version = "unstable-2021-02-15"; + version = "unstable-2023-06-05"; src = fetchgit { url = "https://git.openwrt.org/project/ubus.git"; - rev = "2537be01858710e714c329153760c64fe3f8a73e"; - sha256 = "03ljxsn4w87bfrilccxhrkzqmd30hy6ihkvsinw0i3l7rpp5m4a7"; + rev = "f787c97b34894a38b15599886cacbca01271684f"; + hash = "sha256-PGPFtNaRXS6ryC+MA/w2CtPQfJa+vG5OXf/NPFMoIzQ="; }; cmakeFlags = [ "-DBUILD_LUA=OFF" ]; diff --git a/nixpkgs/pkgs/development/libraries/uci/default.nix b/nixpkgs/pkgs/development/libraries/uci/default.nix index c3e61e8d22a0..bbc4fcebdfc3 100644 --- a/nixpkgs/pkgs/development/libraries/uci/default.nix +++ b/nixpkgs/pkgs/development/libraries/uci/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "uci"; - version = "unstable-2021-04-14"; + version = "unstable-2023-08-10"; src = fetchgit { url = "https://git.openwrt.org/project/uci.git"; - rev = "4b3db1179747b6a6779029407984bacef851325c"; - sha256 = "1zflxazazzkrycpflzfg420kzp7kgy4dlz85cms279vk07dc1d52"; + rev = "5781664d5087ccc4b5ab58505883231212dbedbc"; + hash = "sha256-8MyFaZdAMh5oMPO/5QyNT+Or57eBL3mamJLblGGoF9g="; }; hardeningDisable = [ "all" ]; diff --git a/nixpkgs/pkgs/development/libraries/uclient/default.nix b/nixpkgs/pkgs/development/libraries/uclient/default.nix index 458d726f2ca6..63a31c2bfbe9 100644 --- a/nixpkgs/pkgs/development/libraries/uclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/uclient/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "uclient"; - version = "unstable-2022-02-24"; + version = "unstable-2023-04-13"; src = fetchgit { url = "https://git.openwrt.org/project/uclient.git"; - rev = "644d3c7e13c6a64bf5cb628137ee5bd4dada4b74"; - sha256 = "0vy4whs64699whp92d1zl7a8kh16yrfywqq0yp2y809l9z19sw22"; + rev = "007d945467499f43656b141171d31f5643b83a6c"; + hash = "sha256-A47dyVc2MtOL6aImZ0b3SMWH2vzjfAXzRAOF4nfH6S0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix b/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix index 007ebc9c4573..76689da526d8 100644 --- a/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "ustream-ssl"; - version = "unstable-2022-12-08-${ssl_implementation.pname}"; + version = "unstable-2023-02-25"; src = fetchgit { url = "https://git.openwrt.org/project/ustream-ssl.git"; - rev = "9217ab46536353c7c792951b57163063f5ec7a3b"; - sha256 = "1ldyyb3is213iljyccx98f56rb69rfpgdcb1kjxw9a176hvpipdd"; + rev = "498f6e268d4d2b0ad33b430f4ba1abe397d31496"; + hash = "sha256-qwF3pzJ/nUTaJ8NZtgLyXnSozekY3dovxK3ZWHPGORM="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix b/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix index 147248ee3461..c32c6e1e52f5 100644 --- a/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "utf8cpp"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "nemtrif"; repo = "utfcpp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-PnHbbjsryRwMMu517ta18qNgwOM6hRnVmXmR3fzS1+4="; + sha256 = "sha256-cpy1lg/9pWgI5uyOO9lfSt8llfGEjnu/O4P9688XVEA="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/vkd3d/default.nix b/nixpkgs/pkgs/development/libraries/vkd3d/default.nix index 928cf2e78a23..77a275b20df5 100644 --- a/nixpkgs/pkgs/development/libraries/vkd3d/default.nix +++ b/nixpkgs/pkgs/development/libraries/vkd3d/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "vkd3d"; - version = "1.7.1"; + version = "1.8"; nativeBuildInputs = [ autoreconfHook pkg-config wine flex bison ]; buildInputs = [ vulkan-loader vulkan-headers spirv-headers ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "wine"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-4WUD6bRG/XwrOb5tl0ZyaaR0uy85eYXcb16eDeumOAQ="; + sha256 = "sha256-v2UhJvfB5Clupmgoykei3AoWYBOp5l9pQFkUEQVlajs="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix index 7206fc1bc530..48e036ad030d 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.254"; + version = "1.3.261"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "v${version}"; - hash = "sha256-4erHZKx4jksAtyG8ZHtlVoEY3EqE4p2pEtcGHqv7G7A="; + hash = "sha256-zKHew7SGUq1C3XGp/HrCle6KyqB4cziPcTYVqAr814s="; }; passthru.updateScript = ./update.sh; diff --git a/nixpkgs/pkgs/development/libraries/vulkan-headers/update.sh b/nixpkgs/pkgs/development/libraries/vulkan-headers/update.sh index b61be25ca2e7..7f6292ed23b7 100755 --- a/nixpkgs/pkgs/development/libraries/vulkan-headers/update.sh +++ b/nixpkgs/pkgs/development/libraries/vulkan-headers/update.sh @@ -6,16 +6,17 @@ set -euf -o pipefail V_PACKAGES=( "vulkan-headers" "vulkan-loader" - "spirv-tools" "vulkan-validation-layers" "vulkan-tools" "vulkan-tools-lunarg" "vulkan-extension-layer" + "vulkan-utility-libraries" ) SDK_PACKAGES=( "spirv-headers" "spirv-cross" + "spirv-tools" ) nix-update glslang --version-regex '(\d+\.\d+\.\d+)' --commit diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix index a4cb0ae82330..6e994eaa78c6 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.254"; + version = "1.3.261"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "v${version}"; - hash = "sha256-bxmDhKDM+OOTsSJEoGXlWPZciBcwevv0e4gHweH46JU="; + hash = "sha256-5QCVHfvjE98EnL2Dr7g9fdrJAg+np1Q6hgqcuZCWReQ="; }; patches = [ ./fix-pkgconfig.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix new file mode 100644 index 000000000000..54e7afb3e58c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, cmake, python3, vulkan-headers }: + +stdenv.mkDerivation (finalAttrs: { + pname = "vulkan-utility-libraries"; + version = "1.3.261"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Utility-Libraries"; + rev = "v${finalAttrs.version}"; + hash = "sha256-szkBKNcxTHMYhhHFWr5WjD91Vf/AyZaGymvlDU9ff7s="; + }; + + nativeBuildInputs = [ cmake python3 ]; + buildInputs = [ vulkan-headers ]; + + meta = with lib; { + description = "A set of utility libraries for Vulkan"; + homepage = "https://github.com/KhronosGroup/Vulkan-Utility-Libraries"; + platforms = platforms.all; + license = licenses.asl20; + maintainers = []; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix index 726640293e34..789625f2f9f3 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -124,5 +124,5 @@ rec { ''; }; - wlroots = wlroots_0_15; + wlroots = wlroots_0_16; } diff --git a/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix index c88c7d42b128..845a8fcfdc49 100644 --- a/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -1,32 +1,32 @@ -{ stdenv -, lib +{ dbus +, docbook-xsl-nons +, docbook_xml_dtd_43 , fetchurl +, glib +, lib +, libxslt , meson , ninja , pkg-config -, libxslt -, docbook-xsl-nons -, docbook_xml_dtd_43 -, dbus -, glib +, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-dbus-proxy"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-HsDqtT0eSZZtciNSvP1RrEAtzlGQuu3HSahUHnYWcKs="; + url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${finalAttrs.version}/xdg-dbus-proxy-${finalAttrs.version}.tar.xz"; + hash = "sha256-Bh3Pr4oGUOX9nVQy3+iL2nSeoNB53BNjBL/s+84GYfs="; }; nativeBuildInputs = [ + docbook-xsl-nons + docbook_xml_dtd_43 + libxslt meson ninja pkg-config - libxslt - docbook-xsl-nons - docbook_xml_dtd_43 ]; buildInputs = [ @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { # dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory doCheck = false; - meta = with lib; { + meta = { description = "DBus proxy for Flatpak and others"; homepage = "https://github.com/flatpak/xdg-dbus-proxy"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.linux; + license = lib.licenses.lgpl21Plus; mainProgram = "xdg-dbus-proxy"; + maintainers = with lib.maintainers; [ jtojnar ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/nixpkgs/pkgs/development/lua-modules/overrides.nix b/nixpkgs/pkgs/development/lua-modules/overrides.nix index 50dbcdecc693..a389388ff65d 100644 --- a/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -524,9 +524,7 @@ with prev; tar xf *.tar.gz ''; # Without this, source root is wrongly set to ./readline-2.6/doc - setSourceRoot = '' - sourceRoot=./readline-${lib.versions.majorMinor oa.version} - ''; + sourceRoot = "readline-${lib.versions.majorMinor oa.version}"; }); sqlite = prev.sqlite.overrideAttrs (drv: { diff --git a/nixpkgs/pkgs/development/misc/brev-cli/default.nix b/nixpkgs/pkgs/development/misc/brev-cli/default.nix index b51df0073977..04e3760f4b7e 100644 --- a/nixpkgs/pkgs/development/misc/brev-cli/default.nix +++ b/nixpkgs/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.252"; + version = "0.6.259"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CwoSLAY6KNGaEKt+/ojlO/v1fRZSRsRpd67vXellLSQ="; + sha256 = "sha256-ALfWvfyQyMHSkj+6zE/+zpsdRFUr40XQHNOcAXhJFd8="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; diff --git a/nixpkgs/pkgs/development/misc/gokrazy/default.nix b/nixpkgs/pkgs/development/misc/gokrazy/default.nix new file mode 100644 index 000000000000..dfc29a0af08e --- /dev/null +++ b/nixpkgs/pkgs/development/misc/gokrazy/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gokrazy"; + version = "unstable-2023-08-12"; + + src = fetchFromGitHub { + owner = "gokrazy"; + repo = "tools"; + rev = "23cde3b0d858497a63c21e93ad30859bf197995f"; + hash = "sha256-oqtkC04TaOkcXkGAZzATCBA0XnFsx7bSGP9ODyhgAxQ="; + }; + + vendorHash = "sha256-rIIMqYMgLNCMYEH+44v79i8yGbHDmUY21X3h1E2jP9Q="; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + subPackages = [ "cmd/gok" ]; + + meta = with lib; { + description = "Turn your Go program(s) into an appliance running on the Raspberry Pi 3, Pi 4, Pi Zero 2 W, or amd64 PCs!"; + homepage = "https://github.com/gokrazy/gokrazy"; + license = licenses.bsd3; + maintainers = with maintainers; [ shayne ]; + mainProgram = "gok"; + }; +} diff --git a/nixpkgs/pkgs/development/mobile/genymotion/default.nix b/nixpkgs/pkgs/development/mobile/genymotion/default.nix index 01caa76f67b7..53c1dc13cdc9 100644 --- a/nixpkgs/pkgs/development/mobile/genymotion/default.nix +++ b/nixpkgs/pkgs/development/mobile/genymotion/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "genymotion"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { url = "https://dl.genymotion.com/releases/genymotion-${version}/genymotion-${version}-linux_x64.bin"; name = "genymotion-${version}-linux_x64.bin"; - sha256 = "sha256-2pYnjjskmIxQXLXwQpSz/HxoCqvK0TuRDBoh/KrVTpM="; + sha256 = "sha256-rZyTdVn0mnNLrGPehah62/AvTgUpNEtzn+Di1O3G3Sg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/node-packages/aliases.nix b/nixpkgs/pkgs/development/node-packages/aliases.nix index e3ff0d15396a..03bcbc595d1d 100644 --- a/nixpkgs/pkgs/development/node-packages/aliases.nix +++ b/nixpkgs/pkgs/development/node-packages/aliases.nix @@ -47,6 +47,7 @@ mapAliases { "@medable/mdctl-cli" = throw "@medable/mdctl-cli was removed because it was broken"; # added 2023-08-21 "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 antennas = pkgs.antennas; # added 2023-07-30 + inherit (pkgs) asar; # added 2023-08-26 balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31 bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30 bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 @@ -65,8 +66,10 @@ mapAliases { inherit (pkgs) firebase-tools; # added 2023-08-18 flood = pkgs.flood; # Added 2023-07-25 git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21 + glob = pkgs.node-glob; # added 2023-08-18 inherit (pkgs) graphqurl; # added 2023-08-19 gtop = pkgs.gtop; # added 2023-07-31 + inherit (pkgs) html-minifier; # added 2023-08-19 inherit (pkgs) htmlhint; # added 2023-08-19 hueadm = pkgs.hueadm; # added 2023-07-31 inherit (pkgs) hyperpotamus; # added 2023-08-19 @@ -80,8 +83,10 @@ mapAliases { inherit (pkgs) markdownlint-cli2; # added 2023-08-22 mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21 node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) npm-check-updates; # added 2023-08-22 readability-cli = pkgs.readability-cli; # Added 2023-06-12 reveal-md = pkgs.reveal-md; # added 2023-07-31 + inherit (pkgs) rtlcss; # added 2023-08-29 s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18 ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21 stf = throw "stf was removed because it was broken"; # added 2023-08-21 diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.json b/nixpkgs/pkgs/development/node-packages/node-packages.json index c715380e4f2a..af55cfddee18 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -26,7 +26,6 @@ , {"@webassemblyjs/wast-refmt": "1.11.1"} , "alex" , "alloy" -, "asar" , "audiosprite" , "autoprefixer" , "auto-changelog" @@ -134,7 +133,6 @@ , "git-standup" , "@gitbeaker/cli" , "gitmoji-cli" -, "glob" , "gramma" , "grammarly-languageserver" , "graphql" @@ -147,7 +145,6 @@ , "gulp" , "gulp-cli" , "he" -, "html-minifier" , "http-server" , "hsd" , "hs-airdrop" @@ -204,7 +201,6 @@ , "nodemon" , "np" , "npm" -, "npm-check-updates" , "npm-merge-driver" , "nrm" , "ocaml-language-server" @@ -245,7 +241,6 @@ , "rimraf" , "rollup" , {"rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"} -, "rtlcss" , "sass" , "semver" , "serve" diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.nix b/nixpkgs/pkgs/development/node-packages/node-packages.nix index 845812fdad5e..35bbb65656a1 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -75588,42 +75588,6 @@ in bypassCache = true; reconstructLock = true; }; - asar = nodeEnv.buildNodePackage { - name = "asar"; - packageName = "asar"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-3.2.0.tgz"; - sha512 = "COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg=="; - }; - dependencies = [ - sources."@types/glob-7.2.0" - sources."@types/minimatch-5.1.2" - sources."@types/node-20.5.3" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."chromium-pickle-js-0.2.0" - sources."commander-5.1.0" - sources."concat-map-0.0.1" - sources."fs.realpath-1.0.0" - sources."glob-7.2.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."minimatch-3.1.2" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Creating Electron app packages"; - homepage = "https://github.com/electron/asar"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; audiosprite = nodeEnv.buildNodePackage { name = "audiosprite"; packageName = "audiosprite"; @@ -88724,71 +88688,6 @@ in bypassCache = true; reconstructLock = true; }; - glob = nodeEnv.buildNodePackage { - name = "glob"; - packageName = "glob"; - version = "10.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz"; - sha512 = "92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw=="; - }; - dependencies = [ - sources."@isaacs/cliui-8.0.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."balanced-match-1.0.2" - sources."brace-expansion-2.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."cross-spawn-7.0.3" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - sources."foreground-child-3.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."isexe-2.0.0" - sources."jackspeak-2.3.0" - sources."lru-cache-10.0.1" - sources."minimatch-9.0.3" - sources."minipass-7.0.3" - sources."path-key-3.1.1" - sources."path-scurry-1.10.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."string-width-5.1.2" - (sources."string-width-cjs-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - }) - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - ]; - }) - sources."strip-ansi-cjs-6.0.1" - sources."which-2.0.2" - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "the most correct and second fastest glob implementation in JavaScript"; - homepage = "https://github.com/isaacs/node-glob#readme"; - license = "ISC"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; gramma = nodeEnv.buildNodePackage { name = "gramma"; packageName = "gramma"; @@ -90971,37 +90870,6 @@ in bypassCache = true; reconstructLock = true; }; - html-minifier = nodeEnv.buildNodePackage { - name = "html-minifier"; - packageName = "html-minifier"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz"; - sha512 = "aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig=="; - }; - dependencies = [ - sources."camel-case-3.0.0" - sources."clean-css-4.2.4" - sources."commander-2.20.3" - sources."he-1.2.0" - sources."lower-case-1.1.4" - sources."no-case-2.3.2" - sources."param-case-2.1.1" - sources."relateurl-0.2.7" - sources."source-map-0.6.1" - sources."uglify-js-3.17.4" - sources."upper-case-1.1.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Highly configurable, well-tested, JavaScript-based HTML minifier."; - homepage = "https://kangax.github.io/html-minifier/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; http-server = nodeEnv.buildNodePackage { name = "http-server"; packageName = "http-server"; @@ -101470,438 +101338,6 @@ in bypassCache = true; reconstructLock = true; }; - npm-check-updates = nodeEnv.buildNodePackage { - name = "npm-check-updates"; - packageName = "npm-check-updates"; - version = "16.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.13.0.tgz"; - sha512 = "zTJCqov2+KpCLM7lOOxXLFiqKg8RLt10dempIbE9EfKCzoN1yqSrDcBCpU6uOmlSRy3IIGm1rK+piCrn+uulJw=="; - }; - dependencies = [ - sources."@colors/colors-1.5.0" - (sources."@isaacs/cliui-8.0.2" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/fs-3.1.0" - (sources."@npmcli/git-4.1.0" // { - dependencies = [ - sources."which-3.0.1" - ]; - }) - sources."@npmcli/installed-package-contents-2.0.2" - sources."@npmcli/node-gyp-3.0.0" - (sources."@npmcli/promise-spawn-6.0.2" // { - dependencies = [ - sources."which-3.0.1" - ]; - }) - (sources."@npmcli/run-script-6.0.2" // { - dependencies = [ - sources."which-3.0.1" - ]; - }) - sources."@pnpm/config.env-replace-1.1.0" - (sources."@pnpm/network.ca-file-1.0.2" // { - dependencies = [ - sources."graceful-fs-4.2.10" - ]; - }) - sources."@pnpm/npm-conf-2.2.2" - sources."@sigstore/bundle-1.1.0" - sources."@sigstore/protobuf-specs-0.2.1" - sources."@sigstore/sign-1.0.0" - sources."@sigstore/tuf-1.0.3" - sources."@sindresorhus/is-5.6.0" - sources."@szmarczak/http-timer-5.0.1" - sources."@tootallnate/once-2.0.0" - sources."@tufjs/canonical-json-1.0.0" - sources."@tufjs/models-1.0.4" - sources."@types/http-cache-semantics-4.0.1" - sources."abbrev-1.1.1" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.5.0" - sources."aggregate-error-3.1.0" - sources."ansi-align-3.0.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.1" - sources."argparse-2.0.1" - sources."array-union-2.1.0" - sources."balanced-match-1.0.2" - (sources."boxen-7.1.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."brace-expansion-2.0.1" - sources."braces-3.0.2" - sources."buffer-from-1.1.2" - sources."builtins-5.0.1" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."cacheable-lookup-7.0.0" - sources."cacheable-request-10.2.13" - sources."camelcase-7.0.1" - sources."chalk-5.3.0" - sources."chownr-2.0.0" - sources."ci-info-3.8.0" - sources."clean-stack-2.2.0" - sources."cli-boxes-3.0.0" - sources."cli-table3-0.6.3" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."commander-10.0.1" - sources."concat-map-0.0.1" - (sources."config-chain-1.1.13" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."configstore-6.0.0" - sources."console-control-strings-1.1.0" - sources."cross-spawn-7.0.3" - (sources."crypto-random-string-4.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - (sources."debug-4.3.4" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."deep-extend-0.6.0" - sources."defer-to-connect-2.0.1" - sources."delegates-1.0.0" - sources."dir-glob-3.0.1" - sources."dot-prop-6.0.1" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-8.0.0" - sources."env-paths-2.2.1" - sources."err-code-2.0.3" - sources."escape-goat-4.0.0" - sources."exponential-backoff-3.1.1" - sources."fast-glob-3.3.1" - sources."fast-memoize-2.5.2" - sources."fastq-1.15.0" - sources."fill-range-7.0.1" - sources."find-up-5.0.0" - sources."foreground-child-3.1.1" - sources."form-data-encoder-2.1.4" - sources."fp-and-or-0.1.3" - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - (sources."gauge-4.0.4" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) - sources."get-stdin-8.0.0" - sources."get-stream-6.0.1" - sources."glob-10.3.3" - sources."glob-parent-5.1.2" - (sources."global-dirs-3.0.1" // { - dependencies = [ - sources."ini-2.0.0" - ]; - }) - sources."globby-11.1.0" - sources."got-12.6.1" - sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-unicode-2.0.1" - sources."has-yarn-3.0.0" - sources."hosted-git-info-5.2.1" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-5.0.0" - sources."http2-wrapper-2.2.0" - sources."https-proxy-agent-5.0.1" - sources."humanize-ms-1.2.1" - sources."ignore-5.2.4" - sources."ignore-walk-6.0.3" - sources."import-lazy-4.0.0" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-4.1.1" - sources."ip-2.0.0" - sources."is-ci-3.0.1" - sources."is-core-module-2.13.0" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-installed-globally-0.4.0" - sources."is-lambda-1.0.1" - sources."is-npm-6.0.0" - sources."is-number-7.0.0" - sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" - sources."is-typedarray-1.0.0" - sources."is-yarn-global-0.4.1" - sources."isexe-2.0.0" - sources."jackspeak-2.3.0" - sources."jju-1.4.0" - sources."js-yaml-4.1.0" - sources."json-buffer-3.0.1" - sources."json-parse-even-better-errors-3.0.0" - sources."json-parse-helpfulerror-1.0.3" - sources."json5-2.2.3" - sources."jsonlines-0.1.1" - sources."jsonparse-1.3.1" - sources."keyv-4.5.3" - sources."kleur-4.1.5" - sources."latest-version-7.0.0" - sources."locate-path-6.0.0" - sources."lodash-4.17.21" - sources."lowercase-keys-3.0.0" - sources."lru-cache-7.18.3" - sources."make-fetch-happen-11.1.1" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."mimic-response-4.0.0" - sources."minimatch-9.0.3" - sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-json-stream-1.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."ms-2.1.3" - sources."negotiator-0.6.3" - (sources."node-gyp-9.4.0" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."glob-7.2.3" - sources."minimatch-3.1.2" - sources."rimraf-3.0.2" - ]; - }) - sources."nopt-6.0.0" - (sources."normalize-package-data-5.0.0" // { - dependencies = [ - sources."hosted-git-info-6.1.1" - ]; - }) - sources."normalize-url-8.0.0" - sources."npm-bundled-3.0.0" - sources."npm-install-checks-6.2.0" - sources."npm-normalize-package-bin-3.0.1" - (sources."npm-package-arg-10.1.0" // { - dependencies = [ - sources."hosted-git-info-6.1.1" - ]; - }) - sources."npm-packlist-7.0.4" - sources."npm-pick-manifest-8.0.2" - sources."npm-registry-fetch-14.0.5" - sources."npmlog-6.0.2" - sources."once-1.4.0" - sources."p-cancelable-3.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."p-map-4.0.0" - sources."package-json-8.1.1" - sources."pacote-15.2.0" - sources."parse-github-url-1.0.2" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.0.1" - ]; - }) - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."proc-log-3.0.0" - sources."progress-2.0.3" - sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" - sources."prompts-ncu-3.0.0" - sources."proto-list-1.2.4" - sources."pupa-3.1.0" - sources."queue-microtask-1.2.3" - sources."quick-lru-5.1.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - sources."strip-json-comments-2.0.1" - ]; - }) - sources."rc-config-loader-4.1.3" - sources."read-package-json-6.0.4" - sources."read-package-json-fast-3.0.2" - sources."readable-stream-3.6.2" - sources."registry-auth-token-5.0.2" - sources."registry-url-6.0.1" - sources."remote-git-tags-3.0.0" - sources."require-from-string-2.0.2" - sources."resolve-alpn-1.2.1" - sources."responselike-3.0.0" - sources."retry-0.12.0" - sources."reusify-1.0.4" - sources."rimraf-5.0.1" - sources."run-parallel-1.2.0" - sources."safe-buffer-5.2.1" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."semver-diff-4.0.0" - sources."semver-utils-1.1.4" - sources."set-blocking-2.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."sigstore-1.9.0" - sources."sisteransi-1.0.5" - sources."slash-3.0.0" - sources."smart-buffer-4.2.0" - sources."socks-2.7.1" - sources."socks-proxy-agent-7.0.0" - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" - sources."spawn-please-2.0.2" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.13" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."string-width-4.2.3" - sources."string-width-cjs-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-ansi-cjs-6.0.1" - sources."strip-json-comments-5.0.1" - (sources."tar-6.1.15" // { - dependencies = [ - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - ]; - }) - sources."to-regex-range-5.0.1" - sources."tuf-js-1.1.7" - sources."type-fest-2.19.0" - sources."typedarray-to-buffer-3.1.5" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - sources."unique-string-3.0.0" - sources."untildify-4.0.0" - sources."update-notifier-6.0.2" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-5.0.0" - sources."which-2.0.2" - sources."wide-align-1.1.5" - (sources."widest-line-4.0.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - (sources."wrap-ansi-8.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - ]; - }) - sources."wrappy-1.0.2" - (sources."write-file-atomic-3.0.3" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) - sources."xdg-basedir-5.1.0" - sources."yallist-4.0.0" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Find newer versions of dependencies than what your package.json allows"; - homepage = "https://github.com/raineorshine/npm-check-updates"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; npm-merge-driver = nodeEnv.buildNodePackage { name = "npm-merge-driver"; packageName = "npm-merge-driver"; @@ -109754,32 +109190,6 @@ in bypassCache = true; reconstructLock = true; }; - rtlcss = nodeEnv.buildNodePackage { - name = "rtlcss"; - packageName = "rtlcss"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rtlcss/-/rtlcss-4.1.0.tgz"; - sha512 = "W+N4hh0nVqVrrn3mRkHakxpB+c9cQ4CRT67O39kgA+1DjyhrdsqyCqIuHXyvWaXn4/835n+oX3fYJCi4+G/06A=="; - }; - dependencies = [ - sources."escalade-3.1.1" - sources."nanoid-3.3.6" - sources."picocolors-1.0.0" - sources."postcss-8.4.28" - sources."source-map-js-1.0.2" - sources."strip-json-comments-3.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Framework for transforming cascading style sheets (CSS) from left-to-right (LTR) to right-to-left (RTL)"; - homepage = "https://rtlcss.com/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix index 7184ef49bc1e..c2109b49af1b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix @@ -9,7 +9,6 @@ , logs , lwt , macaddr -, mirage-profile , mirage-time , alcotest , mirage-clock-unix @@ -23,15 +22,14 @@ buildDunePackage rec { pname = "arp"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "1x3l8v96ywc3wrcwbf0j04b8agap4fif0fz6ki2ndzx57yqcjszn"; + url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + hash = "sha256-g/aEhpufQcyS/vCtKk0Z1sYaYNRmQFaZ9rTp9F4nq54="; }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; nativeBuildInputs = [ bisect_ppx @@ -45,7 +43,6 @@ buildDunePackage rec { logs lwt macaddr - mirage-profile mirage-time ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix index 8f84a973bf0f..fd409b51091d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix @@ -29,6 +29,8 @@ buildDunePackage rec { sha256 = "0g11324j1s2631zzf7zxc8s0nqd4fwvcni0kbvfpfxg96gy2wwfm"; }; + patches = [ ./janestreet-0.16.patch ]; + propagatedBuildInputs = [ base64 bos diff --git a/nixpkgs/pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch b/nixpkgs/pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch new file mode 100644 index 000000000000..bf3b41eb4ac8 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch @@ -0,0 +1,205 @@ +diff --git a/lib/engine/scheduler.ml b/lib/engine/scheduler.ml +index e32bd0f..93b566b 100644 +--- a/lib/engine/scheduler.ml ++++ b/lib/engine/scheduler.ml +@@ -601,7 +601,7 @@ module Make(Backend : Backend) = struct + ) + ) + | Trywith tw -> ( +- match Table.find sched.traces (Workflow.id tw.w) with ++ match Hashtbl.find sched.traces (Workflow.id tw.w) with + | Some eventual_trace -> ( + eventual_trace >>= function + | Ok (Run r) -> +@@ -667,10 +667,10 @@ module Make(Backend : Backend) = struct + let register_build sched ~id ~build_trace = + let open Eval_thread.Infix in + ( +- match Table.find sched.traces id with ++ match Hashtbl.find sched.traces id with + | None -> + let trace = build_trace () in +- Table.set sched.traces ~key:id ~data:trace ; ++ Hashtbl.set sched.traces ~key:id ~data:trace ; + trace + | Some trace -> trace + ) >>= fun trace -> +@@ -854,7 +854,7 @@ module Make(Backend : Backend) = struct + Eval_thread.join l.elts ~f:(build ?target sched) + | Trywith tw -> ( + build sched ?target tw.w >> fun w_result -> +- match Table.find sched.traces (Workflow.id tw.w) with ++ match Hashtbl.find sched.traces (Workflow.id tw.w) with + | Some eventual_trace -> ( + eventual_trace >> function + | Ok (Run r) when run_trywith_recovery r.details -> +diff --git a/lib/multinode/bistro_multinode.ml b/lib/multinode/bistro_multinode.ml +index 01dc5ac..3fc6b0e 100644 +--- a/lib/multinode/bistro_multinode.ml ++++ b/lib/multinode/bistro_multinode.ml +@@ -130,7 +130,7 @@ module Server = struct + let search (type s) (table : s String.Table.t) ~f = + let module M = struct exception Found of string * s end in + try +- String.Table.fold table ~init:() ~f:(fun ~key ~data () -> if f ~key ~data then raise (M.Found (key, data))) ; ++ Hashtbl.fold table ~init:() ~f:(fun ~key ~data () -> if f ~key ~data then raise (M.Found (key, data))) ; + None + with M.Found (k, v) -> Some (k, v) + +@@ -145,7 +145,7 @@ module Server = struct + match allocation_attempt with + | None -> Some elt + | Some (worker_id, (Resource curr)) -> +- String.Table.set pool.available ~key:worker_id ~data:(Resource { np = curr.np - np ; mem = curr.mem - mem }) ; ++ Hashtbl.set pool.available ~key:worker_id ~data:(Resource { np = curr.np - np ; mem = curr.mem - mem }) ; + Lwt.wakeup u (worker_id, Resource { np ; mem }) ; + None + ) +@@ -163,12 +163,12 @@ module Server = struct + t + + let add_worker pool (Worker { id ; np ; mem ; _ }) = +- match String.Table.add pool.available ~key:id ~data:(Allocator.Resource { np ; mem }) with ++ match Hashtbl.add pool.available ~key:id ~data:(Allocator.Resource { np ; mem }) with + | `Ok -> allocation_pass pool + | `Duplicate -> failwith "A worker has been added twice" + + let release pool worker_id (Allocator.Resource { np ; mem }) = +- String.Table.update pool.available worker_id ~f:(function ++ Hashtbl.update pool.available worker_id ~f:(function + | None -> failwith "Tried to release resources of inexistent worker" + | Some (Resource r) -> Resource { np = r.np + np ; mem = r.mem + mem } + ) +@@ -235,13 +235,13 @@ module Server = struct + | Subscript { np ; mem } -> + let id = new_id () in + let w = create_worker ~np ~mem id in +- String.Table.set state.workers ~key:id ~data:w ; ++ Hashtbl.set state.workers ~key:id ~data:w ; + Worker_allocator.add_worker state.alloc w ; + log (Logger.Debug (sprintf "new worker %s" id)) ; + Lwt.return (Client_id id) + + | Get_job { client_id } -> ( +- match String.Table.find state.workers client_id with ++ match Hashtbl.find state.workers client_id with + | None -> Lwt.return None + | Some (Worker worker) -> + Lwt.choose [ +@@ -250,22 +250,22 @@ module Server = struct + ] >>= function + | `Job wp -> + let workflow_id = workflow_id_of_job_waiter wp in +- String.Table.set worker.running_jobs ~key:workflow_id ~data:wp ; ++ Hashtbl.set worker.running_jobs ~key:workflow_id ~data:wp ; + Lwt.return (Some (job_of_job_waiter wp)) + | `Stop -> Lwt.return None + ) + + | Plugin_result r -> +- let Worker worker = String.Table.find_exn state.workers r.client_id in ++ let Worker worker = Hashtbl.find_exn state.workers r.client_id in + Lwt.return ( +- match String.Table.find_exn worker.running_jobs r.workflow_id with ++ match Hashtbl.find_exn worker.running_jobs r.workflow_id with + | Waiting_plugin wp -> Lwt.wakeup wp.waiter r.result + | Waiting_shell_command _ -> assert false (* should never happen *) + ) + | Shell_command_result r -> +- let Worker worker = String.Table.find_exn state.workers r.client_id in ++ let Worker worker = Hashtbl.find_exn state.workers r.client_id in + Lwt.return ( +- match String.Table.find_exn worker.running_jobs r.workflow_id with ++ match Hashtbl.find_exn worker.running_jobs r.workflow_id with + | Waiting_plugin _ -> assert false (* should never happen *) + | Waiting_shell_command wp -> Lwt.wakeup wp.waiter r.result + ) +@@ -307,7 +307,7 @@ module Server = struct + + let request_resource backend req = + Worker_allocator.request backend.state.alloc req >|= fun (worker_id, resource) -> +- String.Table.find_exn backend.state.workers worker_id, resource ++ Hashtbl.find_exn backend.state.workers worker_id, resource + + let release_resource backend worker_id res = + Worker_allocator.release backend.state.alloc worker_id res +@@ -334,7 +334,7 @@ module Server = struct + * loop () *) + + let eval backend { worker_id ; workflow_id } f x = +- let Worker worker = String.Table.find_exn backend.state.workers worker_id in ++ let Worker worker = Hashtbl.find_exn backend.state.workers worker_id in + let f () = f x in + let t, u = Lwt.wait () in + let job_waiter = Waiting_plugin { waiter = u ; f ; workflow_id } in +@@ -342,7 +342,7 @@ module Server = struct + t + + let run_shell_command backend { worker_id ; workflow_id } cmd = +- let Worker worker = String.Table.find_exn backend.state.workers worker_id in ++ let Worker worker = Hashtbl.find_exn backend.state.workers worker_id in + let t, u = Lwt.wait () in + let job = Waiting_shell_command { waiter = u ; cmd ; workflow_id } in + Lwt_queue.push worker.pending_jobs job ; +diff --git a/lib/utils/dot_output.ml b/lib/utils/dot_output.ml +index 90c299f..d13fceb 100644 +--- a/lib/utils/dot_output.ml ++++ b/lib/utils/dot_output.ml +@@ -24,7 +24,7 @@ module G = struct + (* let successors g u = fold_succ (fun h t -> h :: t) g u [] *) + + let rec of_workflow_aux seen acc u = +- if S.mem seen u then (seen, acc) ++ if Set.mem seen u then (seen, acc) + else ( + let deps = W.Any.deps u in + let seen, acc = +@@ -34,7 +34,7 @@ module G = struct + in + let acc = add_vertex acc u in + let acc = List.fold deps ~init:acc ~f:(fun acc v -> add_edge acc u v) in +- let seen = S.add seen u in ++ let seen = Set.add seen u in + seen, acc + ) + +@@ -109,7 +109,7 @@ let dot_output ?db oc g ~needed = + ] + in + let vertex_attributes u = +- let needed = (match db with None -> true | Some _ -> false) || S.mem needed u in ++ let needed = (match db with None -> true | Some _ -> false) || Set.mem needed u in + let color = if needed then black else light_gray in + let shape = `Shape (shape u) in + let W.Any w = u in +@@ -141,7 +141,7 @@ let dot_output ?db oc g ~needed = + | _ -> [] + in + let color = +- if (match db with None -> true | Some _ -> false) || (S.mem needed u && not (already_done u)) ++ if (match db with None -> true | Some _ -> false) || (Set.mem needed u && not (already_done u)) + then black else light_gray in + style @ [ `Color color ] + in +diff --git a/lib/utils/repo.ml b/lib/utils/repo.ml +index 06abcd5..206a99e 100644 +--- a/lib/utils/repo.ml ++++ b/lib/utils/repo.ml +@@ -160,7 +160,7 @@ let protected_set repo = + | Select s -> fold_path_workflow acc (W.Any s.dir) + | Input _ -> acc + | Shell _ +- | Plugin _ -> String.Set.add acc (W.id w) ++ | Plugin _ -> Set.add acc (W.id w) + | Trywith tw -> + fold_path_workflow (fold_path_workflow acc (W.Any tw.w)) (W.Any tw.failsafe) + | Ifelse ie -> +@@ -187,7 +187,7 @@ let cache_clip_fold ~bistro_dir repo ~f ~init = + let protected = protected_set repo in + let db = Db.init_exn bistro_dir in + Db.fold_cache db ~init ~f:(fun acc id -> +- f db acc (if String.Set.mem protected id then `Protected id else `Unprotected id) ++ f db acc (if Set.mem protected id then `Protected id else `Unprotected id) + ) + + let cache_clip_dry_run ~bistro_dir repo = diff --git a/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix index bff1de9bc865..8f3d4fd54175 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "bwd"; - version = "2.1.0"; + version = "2.2.0"; minimalOCamlVersion = "4.12"; duneVersion = "3"; @@ -11,7 +11,7 @@ buildDunePackage rec { owner = "RedPRL"; repo = "ocaml-bwd"; rev = version; - hash = "sha256-ucXOBjD1behL2h8CZv64xtRjCPkajZic7G1oxxDmEXY="; + hash = "sha256-4DttkEPI9yJtMsqzTNSnoDajcvMQPIiJAHk0kJl540Y="; }; doCheck = true; @@ -19,7 +19,8 @@ buildDunePackage rec { meta = { description = "Backward Lists"; - inherit (src.meta) homepage; + homepage = "https://github.com/RedPRL/ocaml-bwd"; + changelog = "https://github.com/RedPRL/ocaml-bwd/blob/${version}/CHANGELOG.markdown"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.vbgl ]; }; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix index 22e78c1aeeb2..af721b63a8f9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { hash = "sha256-iSg0QsTcU0MT/Cletl+hW6bKyH0jkp7Jixqu8H59UmQ="; }; - patches = [ ./git_commit.patch ]; + patches = [ ./git_commit.patch ./janestreet-0.16.patch ]; strictDeps = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cfstream/janestreet-0.16.patch b/nixpkgs/pkgs/development/ocaml-modules/cfstream/janestreet-0.16.patch new file mode 100644 index 000000000000..afc665f30426 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/cfstream/janestreet-0.16.patch @@ -0,0 +1,36 @@ +diff --git a/lib/CFStream_stream.ml b/lib/CFStream_stream.ml +index 25c0e5a..94da2e3 100644 +--- a/lib/CFStream_stream.ml ++++ b/lib/CFStream_stream.ml +@@ -287,7 +287,7 @@ let group_aux xs map eq = + ;; + + let group xs ~f = group_aux xs f Poly.( = ) +-let group_by xs ~eq = group_aux xs ident eq ++let group_by xs ~eq = group_aux xs Fn.id eq + + let chunk2 xs = + from (fun _ -> +@@ -615,11 +615,11 @@ let to_hashtbl xs = + let of_map t = of_list (Map.to_alist t) + + let to_map xs = +- fold xs ~init:Map.Poly.empty ~f:(fun accu (key, data) -> Map.Poly.set accu ~key ~data) ++ fold xs ~init:Map.Poly.empty ~f:(fun accu (key, data) -> Map.set accu ~key ~data) + ;; + + let of_set t = of_list (Set.to_list t) +-let to_set xs = fold xs ~init:Set.Poly.empty ~f:(fun accu e -> Set.Poly.add accu e) ++let to_set xs = fold xs ~init:Set.Poly.empty ~f:(fun accu e -> Set.add accu e) + + module Infix = struct + let ( -- ) x y = range x ~until:y +@@ -660,7 +660,7 @@ module Result = struct + | M.E e -> Result.Error e + ;; + +- let all xs ~f = all_gen ident xs ~f ++ let all xs ~f = all_gen Fn.id xs ~f + let all' xs ~f = all_gen (fun x -> Ok x) xs ~f + let to_exn = result_to_exn + diff --git a/nixpkgs/pkgs/development/ocaml-modules/domain_shims/default.nix b/nixpkgs/pkgs/development/ocaml-modules/domain_shims/default.nix new file mode 100644 index 000000000000..5846d068ae54 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/domain_shims/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitLab, buildDunePackage }: + +buildDunePackage rec { + pname = "domain_shims"; + version = "0.1.0"; + + src = fetchFromGitLab { + owner = "gasche"; + repo = "domain-shims"; + rev = version; + hash = "sha256-/5Cw+M0A1rnT7gFqzryd4Z0tylN0kZgSBXtn9jr8u1c="; + }; + + minimalOCamlVersion = "4.12"; + + meta = { + homepage = "https://gitlab.com/gasche/domain-shims/"; + description = "A non-parallel implementation of Domains compatible with OCaml 4"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/domainslib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/domainslib/default.nix index 8a36285fe697..096ba5434996 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/domainslib/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/domainslib/default.nix @@ -1,26 +1,28 @@ { lib , fetchurl , buildDunePackage -, lockfree +, saturn +, domain-local-await +, kcas , mirage-clock-unix +, qcheck-stm }: buildDunePackage rec { pname = "domainslib"; - version = "0.5.0"; + version = "0.5.1"; - duneVersion = "3"; minimalOCamlVersion = "5.0"; src = fetchurl { - url = "https://github.com/ocaml-multicore/domainslib/releases/download/v${version}/domainslib-${version}.tbz"; - hash = "sha256-rty+9DUhTUEcN7BPl8G6Q/G/MJ6z/UAn0RPkG8hACwA="; + url = "https://github.com/ocaml-multicore/domainslib/releases/download/${version}/domainslib-${version}.tbz"; + hash = "sha256-KMJd+6XZmUSXNsXW/KXgvnFtgY9vODeW3vhL77mDXQE="; }; - propagatedBuildInputs = [ lockfree ]; + propagatedBuildInputs = [ domain-local-await saturn ]; doCheck = true; - checkInputs = [ mirage-clock-unix ]; + checkInputs = [ kcas mirage-clock-unix qcheck-stm ]; meta = { homepage = "https://github.com/ocaml-multicore/domainslib"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix b/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix index 209bf30d2a61..9803a20368c3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix @@ -1,30 +1,38 @@ { lib, fetchFromGitHub, ocaml, buildDunePackage , cmdliner, dap, fmt, iter, logs, lru, lwt_ppx, lwt_react, menhir, menhirLib, path_glob, ppx_deriving_yojson +, ppx_optcomp , gitUpdater }: -if lib.versionAtLeast ocaml.version "4.13" -then throw "earlybird is not available for OCaml ${ocaml.version}" -else - buildDunePackage rec { pname = "earlybird"; - version = "1.1.0"; - - duneVersion = "3"; + version = "1.2.1"; - minimalOCamlVersion = "4.11"; + minimalOCamlVersion = "4.12"; src = fetchFromGitHub { owner = "hackwaly"; repo = "ocamlearlybird"; rev = version; - hash = "sha256-8JHZWsgpz2pzpDxST3bkMSmPHtj7MDzD5G3ujqMW+MU="; + hash = "sha256-p29uTdx8+mZKXUL+ng/FzpKuhnykEe8Sy968Wa/KUn4="; }; nativeBuildInputs = [ menhir ]; - buildInputs = [ cmdliner dap fmt iter logs lru lwt_ppx lwt_react menhirLib path_glob ppx_deriving_yojson ]; + buildInputs = [ + cmdliner + dap + fmt + iter + logs + lru + lwt_ppx + lwt_react + menhirLib + path_glob + ppx_deriving_yojson + ppx_optcomp + ]; passthru.updateScript = gitUpdater { }; diff --git a/nixpkgs/pkgs/development/ocaml-modules/eio/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eio/default.nix index d474d365a113..1f9e18e887e0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/eio/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/eio/default.nix @@ -18,14 +18,14 @@ buildDunePackage rec { pname = "eio"; - version = "0.11"; + version = "0.12"; minimalOCamlVersion = "5.0"; duneVersion = "3"; src = fetchurl { url = "https://github.com/ocaml-multicore/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "DDN0IHRWJjFneIb0/koC+Wcs7JQpf/hcLthU21uqcao="; + sha256 = "2EhHzoX/t4ZBSWrSS+PGq1zCxohc7a1q4lfsrFnZJqA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix b/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix index 4467ce3de8cd..0e0adcb0be87 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix @@ -8,11 +8,15 @@ , ppxlib, ppx_deriving , ppxlib_0_15, ppx_deriving_0_15 , coqPackages -, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.16.5" +, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.17.0" else if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1" }: +let p5 = camlp5; in +let camlp5 = p5.override { legacy = true; }; in + let fetched = coqPackages.metaFetch ({ + release."1.17.0".sha256 = "sha256-DTxE8CvYl0et20pxueydI+WzraI6UPHMNvxyp2gU/+w="; release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A="; release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s="; release."1.15.0".sha256 = "sha256:1ngdc41sgyzyz3i3lkzjhnj66gza5h912virkh077dyv17ysb6ar"; @@ -31,7 +35,7 @@ buildDunePackage rec { pname = "elpi"; inherit (fetched) version src; - patches = lib.optional (lib.versionAtLeast version "1.16" || version == "dev") + patches = lib.optional (version == "1.16.5") ./atd_2_10.patch; minimalOCamlVersion = "4.04"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ethernet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ethernet/default.nix index a27a91d9d8e9..c16534744d06 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ethernet/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ethernet/default.nix @@ -6,32 +6,23 @@ , lwt , macaddr , mirage-net -, mirage-profile -, ppx_cstruct }: buildDunePackage rec { pname = "ethernet"; - version = "3.0.0"; + version = "3.2.0"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; - src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - hash = "sha256:0a898vp9dw42majsvzzvs8pc6x4ns01wlwhwbacixliv6vv78ng9"; + url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + hash = "sha256-TB2nAhQiHZ1Dk6n/3i49s9HKNH92yNUl3xl94hByrAk="; }; - buildInputs = [ - ppx_cstruct - ]; - propagatedBuildInputs = [ cstruct mirage-net macaddr - mirage-profile lwt logs ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.16.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.16.nix new file mode 100644 index 000000000000..2df4c08e7d58 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.16.nix @@ -0,0 +1,1245 @@ +{ self +, bash +, fetchpatch +, fzf +, lib +, openssl +, zstd +, krb5 +}: + +with self; + +{ + + abstract_algebra = janePackage { + pname = "abstract_algebra"; + hash = "sha256-hAZzc2ypbGE/8mxxk4GZqr17JlIYv71gZJMQ4plsK38="; + meta.description = "A small library describing abstract algebra concepts"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + accessor = janePackage { + pname = "accessor"; + hash = "sha256-yClfUXqwVoipF4WqbqC6VBVYc6t8MZYVoHGjchH7XQA="; + meta.description = "A library that makes it nicer to work with nested functional data structures"; + propagatedBuildInputs = [ higher_kinded ]; + }; + + accessor_async = janePackage { + pname = "accessor_async"; + hash = "sha256-kGT7aFNOgU8/2ez9L/lefb2LN7I87+WthZHnb+dY9PE="; + meta.description = "Accessors for Async types, for use with the Accessor library"; + propagatedBuildInputs = [ accessor_core async_kernel ]; + }; + + accessor_base = janePackage { + pname = "accessor_base"; + hash = "sha256-idnSNP6kfoV3I8QAMJ2YoUrewBpyte+0/C371aMTIxo="; + meta.description = "Accessors for Base types, for use with the Accessor library"; + propagatedBuildInputs = [ ppx_accessor ]; + }; + + accessor_core = janePackage { + pname = "accessor_core"; + hash = "sha256-f4s/I+xDi/aca1WgaE+P3CD4e80jenS0WHg4T1Stcbg="; + meta.description = "Accessors for Core types, for use with the Accessor library"; + propagatedBuildInputs = [ accessor_base core_kernel ]; + }; + + async = janePackage { + pname = "async"; + hash = "sha256-TpsC9sn8noiNI0aYbMalUUv3xlC2LMERsv6Gr928Vzc="; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_rpc_kernel async_unix textutils ]; + doCheck = false; # we don't have netkit_sockets + }; + + async_durable = janePackage { + pname = "async_durable"; + hash = "sha256-PImYpM9xNFUWeWRld4jFwWBRowUP1iXzdxkK/fP/rHE="; + meta.description = "Durable connections for use with async"; + propagatedBuildInputs = [ async_kernel async_rpc_kernel core core_kernel ppx_jane ]; + }; + + async_extra = janePackage { + pname = "async_extra"; + hash = "sha256-Y+gTlJuKmwvEEPuMPu7v0iYeNQtlzP8QiS0PSgoYrrI="; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_kernel ]; + }; + + async_find = janePackage { + pname = "async_find"; + hash = "sha256-PG6BJx9tfP+zcDaG+7WdHiv4jUqsUH2TvHV6UXdzPAg="; + meta.description = "Directory traversal with Async"; + propagatedBuildInputs = [ async ]; + }; + + async_inotify = janePackage { + pname = "async_inotify"; + hash = "sha256-seFbs06w3T+B49sw3nOjpXpoJbJ+IJ3qN5LnufrsE48="; + meta.description = "Async wrapper for inotify"; + propagatedBuildInputs = [ async_find inotify ]; + }; + + async_interactive = janePackage { + pname = "async_interactive"; + hash = "sha256-xZKVT8L2rOLBeg7wK0tD6twhkDfwQp5ZKy4DPp1UWq8="; + meta.description = "Utilities for building simple command-line based user interfaces"; + propagatedBuildInputs = [ async ]; + }; + + async_js = janePackage { + pname = "async_js"; + hash = "sha256-JyF1busOv9JWxp55oaxBozIQyCKlmAY3csBA4/98qy0="; + meta.description = "A small library that provide Async support for JavaScript platforms"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ async_rpc_kernel js_of_ocaml uri-sexp ]; + }; + + async_kernel = janePackage { + pname = "async_kernel"; + hash = "sha256-EDgdZc6GRyiiFtnElNE9jGPEjPIUniP9uB/JoySkZz8="; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ core_kernel ]; + }; + + async_rpc_kernel = janePackage { + pname = "async_rpc_kernel"; + hash = "sha256-OccFMfhTRSQwx1LJcN8OkDpA62KabsyWn2hox84jqow="; + meta.description = "Platform-independent core of Async RPC library"; + propagatedBuildInputs = [ async_kernel protocol_version_header ]; + }; + + async_rpc_websocket = janePackage { + pname = "async_rpc_websocket"; + hash = "sha256-S3xIw/mew9YhtenWfp8ZD82WtOQSzJHtreT1+kRivus="; + meta.description = "Library to serve and dispatch Async RPCs over websockets"; + propagatedBuildInputs = [ async_rpc_kernel async_websocket cohttp_async_websocket ]; + }; + + async_sendfile = janePackage { + pname = "async_sendfile"; + hash = "sha256-ykl87/De56gz6JRQfTIeWrU823PT2fnFJr08GxuDYic="; + meta.description = "Thin wrapper around [Linux_ext.sendfile] to send full files"; + propagatedBuildInputs = [ async_unix ]; + }; + + async_shell = janePackage { + pname = "async_shell"; + hash = "sha256-DjIbadCjPymnkDsnonmxKumCWf5P9XO3ZaAwOaYRnbk="; + meta.description = "Shell helpers for Async"; + propagatedBuildInputs = [ async shell ]; + }; + + async_smtp = janePackage { + pname = "async_smtp"; + hash = "sha256-X0eegZMMU9EnC9Oi+6DjtwNmyzQYr3EKi1duNzEAfkk="; + meta.description = "SMTP client and server"; + propagatedBuildInputs = [ async_extra async_inotify async_sendfile async_shell async_ssl email_message resource_cache re2_stable sexp_macro ]; + }; + + async_ssl = janePackage { + pname = "async_ssl"; + hash = "sha256-83YKxvVb/JwBnQG4R/R1Ztik9T/hO4cbiNTfFnErpG4="; + meta.description = "Async wrappers for SSL"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ async ctypes openssl ]; + }; + + async_unix = janePackage { + pname = "async_unix"; + hash = "sha256-dT+yJC73sxS4NPR/GC/FyVLbWtYpM9DqKykVk8PEEWU="; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_kernel core_unix ]; + }; + + async_websocket = janePackage { + pname = "async_websocket"; + hash = "sha256-Qy+A8ee6u5Vr05FNeaH/6Sdp9bcq3cnaDYO9OU06VW0="; + meta.description = "A library that implements the websocket protocol on top of Async"; + propagatedBuildInputs = [ async cryptokit ]; + }; + + babel = janePackage { + pname = "babel"; + hash = "sha256-nnMliU0d6vtHTYEy9uMi8nMaHvAsEXKN6uNByqZ28+c="; + meta.description = "A library for defining Rpcs that can evolve over time without breaking backward compatibility"; + propagatedBuildInputs = [ async_rpc_kernel core ppx_jane streamable tilde_f ]; + }; + + base = janePackage { + pname = "base"; + version = "0.16.2"; + hash = "sha256-8OvZe+aiWipJ6busBufx3OqERmqxBva55UOLjL8KoPc="; + meta.description = "Full standard library replacement for OCaml"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ sexplib0 ]; + checkInputs = [ alcotest ]; + }; + + base_bigstring = janePackage { + pname = "base_bigstring"; + hash = "sha256-gQbzdr05DEowzd0k9JBTF0gGMwlaVwTVJuoKZ0u9voU="; + meta.description = "String type based on [Bigarray], for use in I/O and C-bindings"; + propagatedBuildInputs = [ int_repr ppx_jane ]; + }; + + base_trie = janePackage { + pname = "base_trie"; + hash = "sha256-KV/k3B0h/4rE+MY6f4qDnlaObMmewUS+NAN2M7sb+yw="; + meta.description = "Trie data structure library"; + propagatedBuildInputs = [ base core expect_test_helpers_core ppx_jane ]; + }; + + base_quickcheck = janePackage { + pname = "base_quickcheck"; + hash = "sha256-9Flg8vAoT6f+3lw9wETQhsaA1fSsQiqKeEhzo0qtDu4="; + meta.description = "Randomized testing framework, designed for compatibility with Base"; + propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let ppx_sexp_value splittable_random ]; + }; + + bidirectional_map = janePackage { + pname = "bidirectional_map"; + hash = "sha256-YEzOdzanBJaskI2/xN9E3ozWnBXDyxJvY3g/qEE73yI="; + meta.description = "A library for bidirectional maps and multimaps"; + }; + + bignum = janePackage { + pname = "bignum"; + hash = "sha256-PmvqGImF1Nrr6swx5q3+9mCfSbieC3RvWuz8oCTkSgg="; + propagatedBuildInputs = [ core_kernel zarith zarith_stubs_js ]; + meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals"; + }; + + bin_prot = janePackage { + pname = "bin_prot"; + hash = "sha256-qFkM6TrTLnnFKmzQHktBb68HpBTMYhiURvnRKEoAevk="; + meta.description = "A binary protocol generator"; + propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_optcomp ppx_stable_witness ppx_variants_conv ]; + }; + + bonsai = janePackage { + pname = "bonsai"; + hash = "sha256-YJ+qkVG5PLBmioa1gP7y6jwn82smyyYDIwHwhDqNeWM="; + meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; + buildInputs = [ ppx_pattern_bind ]; + nativeBuildInputs = [ ppx_css js_of_ocaml-compiler ocaml-embed-file ]; + propagatedBuildInputs = [ + async + async_durable + async_extra + async_rpc_websocket + babel + cohttp-async + core_bench + fuzzy_match + incr_dom + indentation_buffer + js_of_ocaml-ppx + ordinal_abbreviation + patdiff + polling_state_rpc + ppx_css + ppx_typed_fields + profunctor + sexp_grammar + textutils + ]; + }; + + cinaps = janePackage { + pname = "cinaps"; + version = "0.15.1"; + hash = "sha256-LycruanldSP251uYJjQqIfI76W0UQ6o5i5u8XjszBT0="; + meta.description = "Trivial metaprogramming tool"; + minimalOCamlVersion = "4.04"; + propagatedBuildInputs = [ re ]; + doCheck = false; # fails because ppx_base doesn't include ppx_js_style + }; + + cohttp_async_websocket = janePackage { + pname = "cohttp_async_websocket"; + hash = "sha256-OBtyKMyvfz0KNG4SWmvoTMVPnVTpO12N38q+kEbegJE="; + meta.description = "Websocket library for use with cohttp and async"; + propagatedBuildInputs = [ async_websocket cohttp-async ppx_jane uri-sexp ]; + }; + + cohttp_static_handler = janePackage { + pname = "cohttp_static_handler"; + hash = "sha256-7NCnJVArudBEvWARQUGlJuEq3kSCjpn5YtsLsL04bf4="; + meta.description = "A library for easily creating a cohttp handler for static files"; + propagatedBuildInputs = [ cohttp-async ]; + }; + + content_security_policy = janePackage { + pname = "content_security_policy"; + hash = "sha256-q/J+ZzeC6txyuRQzR8Hmu7cYJCQbxaMlVEmK8fj0hus="; + meta.description = "A library for building content-security policies"; + propagatedBuildInputs = [ core ppx_jane ]; + }; + + core = janePackage { + pname = "core"; + version = "0.16.1"; + hash = "sha256-cKJi67VLIsbLEgIZyFiVz00z/QEvJhNBb8+M+bR4iHU="; + meta.description = "Industrial strength alternative to OCaml's standard library"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ base base_bigstring base_quickcheck ppx_jane time_now ]; + doCheck = false; # circular dependency with core_kernel + }; + + core_bench = janePackage { + pname = "core_bench"; + hash = "sha256-ASdu3ZUk+nkdNX9UbBQxKRdXBa073mWMDRW+Ceu3/t4="; + meta.description = "Benchmarking library"; + propagatedBuildInputs = [ textutils ]; + }; + + core_extended = janePackage { + pname = "core_extended"; + hash = "sha256-hcjmFDdVKCHK8u6D4Qn2a/HYTEZOvkXHcB6BTpbjF/s="; + meta.description = "Extra components that are not as closely vetted or as stable as Core"; + propagatedBuildInputs = [ core_unix record_builder ]; + }; + + core_kernel = janePackage { + pname = "core_kernel"; + hash = "sha256-YB3WMNLePrOKu+mmVedNo0pWN9x5fIaBxJsby56TFJU="; + meta.description = "System-independent part of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ base_bigstring core int_repr sexplib ]; + doCheck = false; # we don't have quickcheck_deprecated + }; + + core_unix = janePackage { + pname = "core_unix"; + hash = "sha256-mePpxjbUumMemHDKhRgACilchgS6QHZEV1ghYtT3flg="; + meta.description = "Unix-specific portions of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ core_kernel expect_test_helpers_core ocaml_intrinsics ppx_jane timezone spawn ]; + postPatch = '' + patchShebangs unix_pseudo_terminal/src/discover.sh + ''; + }; + + csvfields = janePackage { + pname = "csvfields"; + hash = "sha256-FEkjRmLeqNvauBlrY2xtLZfxVfnFWU8w8noEArPUieo="; + propagatedBuildInputs = [ core num ]; + meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv"; + }; + + dedent = janePackage { + pname = "dedent"; + hash = "sha256-fzytLr3tVr2vPmykUBzNFMxnyMcIeeo8S9BydsTKnQw="; + propagatedBuildInputs = [ base ppx_jane stdio ]; + meta.description = "A library for improving redability of multi-line string constants in code"; + }; + + delimited_parsing = janePackage { + pname = "delimited_parsing"; + hash = "sha256-XyO3hzPz48i1cnMTJvZfarM6HC7qdHqdftp9SnCjPEU="; + propagatedBuildInputs = [ async core_extended ]; + meta.description = "Parsing of character (e.g., comma) separated and fixed-width values"; + }; + + diffable = janePackage { + pname = "diffable"; + hash = "sha256-ascQUbxzvRR8XrroaupyFZ2YNQMvlXn4PemumYTwRF4="; + propagatedBuildInputs = [ core ppx_jane stored_reversed streamable ]; + meta.description = "An interface for diffs"; + }; + + ecaml = janePackage { + pname = "ecaml"; + hash = "sha256-VS7eTTD85ci3mJIXd2pG1Y/ygT9dCIvfzU2HtOufW6U="; + meta.description = "Library for writing Emacs plugin in OCaml"; + propagatedBuildInputs = [ async expect_test_helpers_core ]; + }; + + email_message = janePackage { + pname = "email_message"; + hash = "sha256-eso68owbAspjaVgj/wGFQ7VQYlAwyYV3oNitLQWiRPA="; + meta.description = "E-mail message parser"; + propagatedBuildInputs = [ angstrom async base64 cryptokit magic-mime re2 ]; + }; + + env_config = janePackage { + pname = "env_config"; + hash = "sha256-CvvpKI7F40DVC7iByrzCqW1ilPiIhdDPYaJrDoUZVSs="; + meta.description = "Helper library for retrieving configuration from an environment variable"; + propagatedBuildInputs = [ async core core_unix ppx_jane ]; + }; + + expect_test_helpers_async = janePackage { + pname = "expect_test_helpers_async"; + hash = "sha256-dEvOMb1aCEt05XtkKIC9jWoIQ/2zM0Gj+K/ZN3bFjeI="; + meta.description = "Async helpers for writing expectation tests"; + propagatedBuildInputs = [ async expect_test_helpers_core ]; + }; + + expect_test_helpers_core = janePackage { + pname = "expect_test_helpers_core"; + hash = "sha256-8DsMwk9WhQQ7iMNYSFBglfbcgvE5dySt4J4qjzJ3dJk="; + meta.description = "Helpers for writing expectation tests"; + propagatedBuildInputs = [ core_kernel sexp_pretty ]; + }; + + fieldslib = janePackage { + pname = "fieldslib"; + hash = "sha256-dwkO65sBsPfTF0F2FKrnttEjhAY2OMbJetSgOfUXk3A="; + meta.description = "Syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; + propagatedBuildInputs = [ base ]; + }; + + file_path = janePackage { + pname = "file_path"; + hash = "sha256-EEpDZNgUgyeqivRhZgQWWlerl+7OOcvAbjjQ3e1NYOQ="; + meta.description = + "A library for typed manipulation of UNIX-style file paths"; + propagatedBuildInputs = [ + async + core + core_kernel + core_unix + expect_test_helpers_async + expect_test_helpers_core + ppx_jane + ]; + }; + + fuzzy_match = janePackage { + pname = "fuzzy_match"; + hash = "sha256-M3yOqP0/OZFbqZZpgDdhJ/FZU3MhKwIXbWjwuMlxe2Q="; + meta.description = "A library for fuzzy string matching"; + propagatedBuildInputs = [ core ppx_jane ]; + }; + + fzf = janePackage { + pname = "fzf"; + hash = "sha256-IQ2wze34LlOutecDOrPhj3U7MFVJTSjQW+If3QyHoes="; + meta.description = "A library for running the fzf command line tool"; + propagatedBuildInputs = [ async core_kernel ppx_jane ]; + postPatch = '' + substituteInPlace src/fzf.ml --replace /usr/bin/fzf ${fzf}/bin/fzf + ''; + }; + + hex_encode = janePackage { + pname = "hex_encode"; + hash = "sha256-jnsf5T1D1++AUdrato/NO3gTVXu14klXozHFIG9HH/o="; + meta.description = "Hexadecimal encoding library"; + propagatedBuildInputs = [ core ppx_jane ounit ]; + }; + + higher_kinded = janePackage { + pname = "higher_kinded"; + hash = "sha256-aCpYc7f4mrPsGp038YabEyw72cA6GbCKsok+5Hej5P0="; + meta.description = "A library with an encoding of higher kinded types in OCaml"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + incr_dom = janePackage { + pname = "incr_dom"; + hash = "sha256-fnD/YnaGK6MIy/fL6bDwcoGDJhHo2+1l8dCXxwN28kg="; + meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ async_js incr_map incr_select virtual_dom ]; + }; + + incr_map = janePackage { + pname = "incr_map"; + hash = "sha256-D3ZD0C4YfZOfXw+3CtqL8DKcz+b06UL8AF7Rf9x+hps="; + meta.description = "Helpers for incremental operations on map like data structures"; + buildInputs = [ ppx_pattern_bind ]; + propagatedBuildInputs = [ abstract_algebra bignum diffable incremental streamable ]; + }; + + incr_select = janePackage { + pname = "incr_select"; + hash = "sha256-gRUF0QsDaZfHU7Mexl5nR8xCN+65v28/r/ciueR5NdE="; + meta.description = "Handling of large set of incremental outputs from a single input"; + propagatedBuildInputs = [ incremental ]; + }; + + incremental = janePackage { + pname = "incremental"; + hash = "sha256-PXGY0M2xeVWDLeS3SrqXy1dqsyeKgndGT6NpuiyNQQQ="; + meta.description = "Library for incremental computations"; + propagatedBuildInputs = [ core_kernel lru_cache ]; + }; + + indentation_buffer = janePackage { + pname = "indentation_buffer"; + hash = "sha256-5ayWs7yUnuxh5S3Dp0GbYTkGXttDMomfZak4MHePFbk="; + meta.description = "A library for building strings with indentation"; + propagatedBuildInputs = [ core ppx_jane ]; + }; + + int_repr = janePackage { + pname = "int_repr"; + hash = "sha256-lghu2U1JwZaR4dkd9PcJEW3pZSPoaFhUluIDwFAYFK0="; + meta.description = "Integers of various widths"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + janestreet_cpuid = janePackage { + pname = "janestreet_cpuid"; + hash = "sha256-lN8+8uhcVn3AoApWzqeCe/It1G6f0VgZzFcwFEckejk="; + meta.description = "A library for parsing CPU capabilities out of the `cpuid` instruction"; + propagatedBuildInputs = [ core core_kernel ppx_jane ]; + }; + + janestreet_csv = janePackage { + pname = "janestreet_csv"; + hash = "sha256-XLyHxVlgBvMIBrG2wzOudbKqy+N12Boheb3K+6o9y1o="; + propagatedBuildInputs = [ async bignum core_kernel core_unix csvfields delimited_parsing fieldslib numeric_string ppx_jane re2 textutils tyxml ocaml_pcre ]; + meta.description = "Tools for working with CSVs on the command line"; + }; + + jane_rope = janePackage { + pname = "jane_rope"; + hash = "sha256-MpjbwV+VS3qRuW8kxhjGzsITEdrPeWyr0V+LiKR6U8U="; + meta.description = "String representation with cheap concatenation"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + jane-street-headers = janePackage { + pname = "jane-street-headers"; + hash = "sha256-vS6tPg8LJolte/zI5KHFYCtNuZjn//cmd94Wls3bLCU="; + meta.description = "Jane Street C header files"; + }; + + js_of_ocaml_patches = janePackage { + pname = "js_of_ocaml_patches"; + hash = "sha256-Uj+X/0XUP5Za8NKfHGo9OZnqzKCiuurYJyluD6b0wOQ="; + meta.description = "Additions to js_of_ocaml's standard library that are required by Jane Street libraries"; + propagatedBuildInputs = [ js_of_ocaml js_of_ocaml-ppx ]; + }; + + jsonaf = janePackage { + pname = "jsonaf"; + hash = "sha256-Gn54NUg4YOyrXY5kXCZhHFz24CfUT9c55cJ2sOsNVw8="; + meta.description = "A library for parsing, manipulating, and serializing data structured as JSON"; + propagatedBuildInputs = [ base ppx_jane angstrom faraday ]; + }; + + jst-config = janePackage { + pname = "jst-config"; + hash = "sha256-GviY+zYza7UNYOlAnfAz0aH4LH2B5xA+7iELLuZLgQQ="; + meta.description = "Compile-time configuration for Jane Street libraries"; + buildInputs = [ dune-configurator ppx_assert stdio ]; + }; + + krb = janePackage { + pname = "krb"; + hash = "sha256-+XwYKwpl668fZ23YEbL1wW9PlaIIjbP/hHwNanf3dAY="; + meta.description = "A library for using Kerberos for both Rpc and Tcp communication"; + propagatedBuildInputs = [ async base core env_config hex_encode ppx_jane protocol_version_header username_kernel dune-configurator krb5 ]; + }; + + lru_cache = janePackage { + pname = "lru_cache"; + hash = "sha256-FqOBC4kBL9IuFIL4JrVU7iF1AUu+1R/CchR52eyEsa8="; + meta.description = "An LRU Cache implementation"; + propagatedBuildInputs = [ core_kernel ppx_jane ]; + }; + + man_in_the_middle_debugger = janePackage { + pname = "man_in_the_middle_debugger"; + hash = "sha256-b2A/ITf9gx3thSdEY2n7jxKrMOVDpzx4JkSMB3aTyE4="; + meta.description = "Man-in-the-middle debugging library"; + propagatedBuildInputs = [ async core ppx_jane angstrom angstrom-async ]; + }; + + n_ary = janePackage { + pname = "n_ary"; + hash = "sha256-ofstQs5R25NTP4EtBIzDE/Mzg9ZzAJKfAF838uu0zuE="; + meta.description = "A library for N-ary datatypes and operations"; + propagatedBuildInputs = [ base expect_test_helpers_core ppx_compare ppx_enumerate ppx_hash ppx_jane ppx_sexp_conv ppx_sexp_message ]; + }; + + numeric_string = janePackage { + pname = "numeric_string"; + hash = "sha256-MzRPXMR4Pi07mfJQgOV6R1Z22y2tvQTCq22+00aY1ik="; + meta.description = "A comparison function for strings that sorts numeric fragments of strings according to their numeric value"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + ocaml-compiler-libs = janePackage { + pname = "ocaml-compiler-libs"; + version = "0.12.4"; + hash = "00if2f7j9d8igdkj4rck3p74y17j6b233l91mq02drzrxj199qjv"; + minimalOCamlVersion = "4.04.1"; + meta.description = "OCaml compiler libraries repackaged"; + }; + + ocaml-embed-file = janePackage { + pname = "ocaml-embed-file"; + hash = "sha256-rs+68VATumUgZQ9QrG+By5yNc8cy7avL0BDeqwix0co="; + propagatedBuildInputs = [ async ppx_jane ]; + meta.description = "Files contents as module constants"; + }; + + ocaml_intrinsics = janePackage { + pname = "ocaml_intrinsics"; + hash = "sha256-fbFXTakzxQEeCONSXRXh8FX3HD6h49LZHVsH62Zu3PA="; + meta.description = "Intrinsics"; + buildInputs = [ dune-configurator ]; + doCheck = false; # test rules broken + }; + + of_json = janePackage { + pname = "of_json"; + hash = "sha256-qh9mX03Fk9Jb8yox7mZ/CGbWecszK15oaygKbJVDqa0="; + meta.description = "A friendly applicative interface for Jsonaf"; + buildInputs = [ core core_extended jsonaf ppx_jane ]; + }; + + ordinal_abbreviation = janePackage { + pname = "ordinal_abbreviation"; + hash = "sha256-bGlzFcM6Yw8fcuovrv11WNtAB4mVYv4BjuMlkhsHomQ="; + meta.description = "A minimal library for generating ordinal names of integers"; + buildInputs = [ base ppx_jane ]; + }; + + parsexp = janePackage { + pname = "parsexp"; + hash = "sha256-oc2ASDtUyRBB68tjAoblryAcXF+u3XP1mkQPO5hNbKo="; + meta.description = "S-expression parsing library"; + propagatedBuildInputs = [ base sexplib0 ]; + }; + + patdiff = janePackage { + pname = "patdiff"; + hash = "sha256-iVRYKgVBBJws3ZlUwnZt52bIydMtzV7a2R5mjksQAps="; + + # Used by patdiff-git-wrapper. Providing it here also causes the shebang + # line to be automatically patched. + buildInputs = [ bash ]; + propagatedBuildInputs = [ core_unix patience_diff ocaml_pcre ]; + meta = { + description = "File Diff using the Patience Diff algorithm"; + }; + }; + + patience_diff = janePackage { + pname = "patience_diff"; + hash = "sha256-JZd99bwLUNhFHng55d77yXSw9u50ahugepesXVdUl04="; + meta.description = "Diff library using Bram Cohen's patience diff algorithm"; + propagatedBuildInputs = [ core_kernel ]; + }; + + polling_state_rpc = janePackage { + pname = "polling_state_rpc"; + hash = "sha256-l7SMFI+U2rde2OSUNOXPb9NBsvjPrBcxStNooxMgVB8="; + meta.description = "An RPC which tracks state on the client and server so it only needs to send diffs across the wire"; + propagatedBuildInputs = [ async_kernel async_rpc_kernel core core_kernel diffable ppx_jane ]; + }; + + posixat = janePackage { + pname = "posixat"; + hash = "sha256-Nhp5jiK/TTwQXY5Bm4TTeH+xDTdXtvkSq5CS/Sr1UgA="; + propagatedBuildInputs = [ ppx_optcomp ppx_sexp_conv ]; + meta.description = "Binding to the posix *at functions"; + }; + + ppx_accessor = janePackage { + pname = "ppx_accessor"; + hash = "sha256-o70q8eSbPeuGkIcCnKoK0BpaqPhy/NS7x2YYR6wfki8="; + meta.description = "[@@deriving] plugin to generate accessors for use with the Accessor libraries"; + propagatedBuildInputs = [ accessor ]; + }; + + ppx_assert = janePackage { + pname = "ppx_assert"; + hash = "sha256-LrpKE0BlFC3QseSXf5WhI71blshUzhH8yo2nXjAtiB8="; + meta.description = "Assert-like extension nodes that raise useful errors on failure"; + propagatedBuildInputs = [ ppx_cold ppx_compare ppx_here ppx_sexp_conv ]; + }; + + ppx_base = janePackage { + pname = "ppx_base"; + hash = "sha256-Ak+7+33qEGYwZWbES032SdkFOsae0+tWtR/DV+xrB10="; + meta.description = "Base set of ppx rewriters"; + propagatedBuildInputs = [ ppx_cold ppx_enumerate ppx_globalize ppx_hash ]; + }; + + ppx_bench = janePackage { + pname = "ppx_bench"; + hash = "sha256-NZlzEMruf89NsI4jfQJLSPhjk/PN47hLbJzGEN8GPl8="; + meta.description = "Syntax extension for writing in-line benchmarks in ocaml code"; + propagatedBuildInputs = [ ppx_inline_test ]; + }; + + ppx_bin_prot = janePackage { + pname = "ppx_bin_prot"; + hash = "sha256-ktfa4umCnLd9oY2WWX/5R7vPB/g7DJX8x3nF9fYLNCQ="; + meta.description = "Generation of bin_prot readers and writers from types"; + propagatedBuildInputs = [ bin_prot ppx_here ]; + doCheck = false; # circular dependency with ppx_jane + }; + + ppx_cold = janePackage { + pname = "ppx_cold"; + hash = "sha256-boP07qHPbzf4ntLdV18oyID09ZUOfkIn9ZdQ0DvtrUA="; + meta.description = "Expands [@cold] into [@inline never][@specialise never][@local never]"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_compare = janePackage { + pname = "ppx_compare"; + hash = "sha256-4bZdhyfnzTjH4E303O6GO2jW968ftuXwoE4/x854JOo="; + meta.description = "Generation of comparison functions from types"; + propagatedBuildInputs = [ ppxlib base ]; + }; + + ppx_custom_printf = janePackage { + pname = "ppx_custom_printf"; + hash = "sha256-V30ijRgcma/rwysPxNAFnuJIb7XFrfi7mfjJxN+rSak="; + meta.description = "Printf-style format-strings for user-defined string conversion"; + propagatedBuildInputs = [ ppx_sexp_conv ]; + }; + + ppx_css = janePackage { + pname = "ppx_css"; + hash = "sha256-spT/dJW8YJtG4pOku9r6VVlBAMwGakTrr1euiABeqsU="; + meta.description = "A ppx that takes in css strings and produces a module for accessing the unique names defined within"; + propagatedBuildInputs = [ async async_unix core_kernel core_unix ppxlib js_of_ocaml js_of_ocaml-ppx sedlex virtual_dom ]; + }; + + ppx_demo = janePackage { + pname = "ppx_demo"; + hash = "sha256-t/jz94YpwmorhWlcuflIZe0l85cESE62L9I7NMASVWM="; + meta.description = "PPX that exposes the source code string of an expression/module structure"; + propagatedBuildInputs = [ core dedent ppx_jane ppxlib ]; + }; + + ppx_derive_at_runtime = janePackage { + pname = "ppx_derive_at_runtime"; + hash = "sha256-UESWOkyWTHJlsE6KZkty9P+iHI3oY1rLve3raRAqMbk="; + meta.description = "Define a new ppx deriver by naming a runtime module"; + propagatedBuildInputs = [ base expect_test_helpers_core ppx_jane ppxlib ]; + }; + + ppx_disable_unused_warnings = janePackage { + pname = "ppx_disable_unused_warnings"; + hash = "sha256-jVNXmAy/Ti7MZmbdBjFuDwbmIILJB57flmmB6MoyCtY="; + meta.description = "Expands [@disable_unused_warnings] into [@warning \"-20-26-32-33-34-35-36-37-38-39-60-66-67\"]"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_enumerate = janePackage { + pname = "ppx_enumerate"; + hash = "sha256-v5JPu+qEXoZ1+mu/yTZW2sfCzU0K60/sInG/Ox1D35s="; + meta.description = "Generate a list containing all values of a finite type"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_expect = janePackage { + pname = "ppx_expect"; + hash = "sha256-H5ybRHufycdyCxKu370+QZAMUPQsHVD+6nD93tzvLn8="; + meta.description = "Cram like framework for OCaml"; + propagatedBuildInputs = [ ppx_here ppx_inline_test re ]; + doCheck = false; # test build rules broken + }; + + ppx_fields_conv = janePackage { + pname = "ppx_fields_conv"; + hash = "sha256-kl0JZocMWo2KNciCWkT4nIbJZbh56ijZmlZWbxV8Qj0="; + meta.description = "Generation of accessor and iteration functions for ocaml records"; + propagatedBuildInputs = [ fieldslib ppxlib ]; + }; + + ppx_fixed_literal = janePackage { + pname = "ppx_fixed_literal"; + hash = "sha256-vS2KcCO0fVCmiIBkUBgK6qnqdjREj57QCujHERcJTyo="; + meta.description = "Simpler notation for fixed point literals"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_globalize = janePackage { + pname = "ppx_globalize"; + hash = "sha256-SG7710YPwWmhRVl7wN3ZQz3ZMTw3cpoywVSeVQAI3Zc="; + meta.description = "A ppx rewriter that generates functions to copy local values to the global heap"; + propagatedBuildInputs = [ base ppxlib ]; + }; + + ppx_hash = janePackage { + pname = "ppx_hash"; + hash = "sha256-ZmdW+q7fak8iG42jRQgZ6chmjHHwrDSy9wg7pq/6zwk="; + meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions"; + propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ]; + }; + + ppx_here = janePackage { + pname = "ppx_here"; + hash = "sha256-ULEom0pTusxf2k2hduv+5NVp7pW5doA/e3QGQNJfGoM="; + meta.description = "Expands [%here] into its location"; + propagatedBuildInputs = [ ppxlib ]; + doCheck = false; # test build rules broken + }; + + ppx_ignore_instrumentation = janePackage { + pname = "ppx_ignore_instrumentation"; + hash = "sha256-rAdxCgAKz0jNR8ppRJO4oAEvgXbcU4J4mpreAyeGe6k="; + meta.description = "Ignore Jane Street specific instrumentation extensions"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_inline_test = janePackage { + pname = "ppx_inline_test"; + hash = "sha256-Ql0/80KitKvW3xffeCapYREmZvlg+QWCb2JM2T4Rjlc="; + meta.description = "Syntax extension for writing in-line tests in ocaml code"; + propagatedBuildInputs = [ ppxlib time_now ]; + doCheck = false; # test build rules broken + }; + + ppx_jane = janePackage { + pname = "ppx_jane"; + hash = "sha256-v+/wdEGaXdMWDBa0eJO0uR18G/pDwHjsjaskoEuLusA="; + meta.description = "Standard Jane Street ppx rewriters"; + propagatedBuildInputs = [ base_quickcheck ppx_bin_prot ppx_disable_unused_warnings ppx_expect ppx_fixed_literal ppx_ignore_instrumentation ppx_log ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_stable ppx_string ppx_tydi ppx_typerep_conv ppx_variants_conv ]; + }; + + ppx_jsonaf_conv = janePackage { + pname = "ppx_jsonaf_conv"; + hash = "sha256-GWDhSLtr2+VG3XFIbHgWUcLJFniC7/z90ndiE919CBo="; + meta.description = + "[@@deriving] plugin to generate Jsonaf conversion functions"; + propagatedBuildInputs = [ base jsonaf ppx_jane ppxlib ]; + }; + + ppx_js_style = janePackage { + pname = "ppx_js_style"; + hash = "sha256-q5CLyeu+5qjegLrJkQVMnId3HMvZ8j3c0PqEa2vTBtU="; + meta.description = "Code style checker for Jane Street Packages"; + propagatedBuildInputs = [ octavius ppxlib ]; + }; + + ppx_let = janePackage { + pname = "ppx_let"; + hash = "sha256-/kEkYXFZ5OyTM4i/WWViaxKvigpoKKoiWtUWuEMkgBE="; + meta.description = "Monadic let-bindings"; + propagatedBuildInputs = [ ppxlib ppx_here ]; + }; + + ppx_log = janePackage { + pname = "ppx_log"; + hash = "sha256-/HwoxBWKuVqTDYe4u0cYNGqg2Lj0h49U2VrFa4cpE2g="; + meta.description = "Ppx_sexp_message-like extension nodes for lazily rendering log messages"; + propagatedBuildInputs = [ base ppx_here ppx_sexp_conv ppx_sexp_message sexplib ]; + }; + + ppx_module_timer = janePackage { + pname = "ppx_module_timer"; + hash = "sha256-AfG+ZnacrR6p7MOvtktVKVLrMBpNMkX9b2+eqNZNRF4="; + meta.description = "Ppx rewriter that records top-level module startup times"; + propagatedBuildInputs = [ time_now ]; + }; + + ppx_optcomp = janePackage { + pname = "ppx_optcomp"; + hash = "sha256-TONxBQq/b0kc89f3+jItHd9SnerNx8xa2AjO7HOW+xQ="; + meta.description = "Optional compilation for OCaml"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_optional = janePackage { + pname = "ppx_optional"; + hash = "sha256-1GpKEEH1Ul+W0k4/8Mra/qYlyFpeMfZ3xrmB3X7uve0="; + meta.description = "Pattern matching on flat options"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_pattern_bind = janePackage { + pname = "ppx_pattern_bind"; + hash = "sha256-ShR8N71a7sz5XaKDyybsy+K0Uu7sYMgvpMADVxmrI/g="; + meta.description = "A ppx for writing fast incremental bind nodes in a pattern match"; + propagatedBuildInputs = [ ppx_let ]; + }; + + ppx_pipebang = janePackage { + pname = "ppx_pipebang"; + hash = "sha256-gSS+vfsYw3FFOFZ8/iRnP3rxokKAU7EPa1wXq7SbJBk="; + meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_python = janePackage { + pname = "ppx_python"; + hash = "sha256-lpc6F+Scc5ECdOXPWowKSWRnFSzKbmE8oHs7zCjq3j8="; + meta.description = "A [@@deriving] plugin to generate Python conversion functions "; + propagatedBuildInputs = [ ppx_base ppxlib pyml ]; + }; + + ppx_sexp_conv = janePackage { + pname = "ppx_sexp_conv"; + hash = "sha256-eCQfYAxZZmfNTbPrFW0sqrj63kIdIQ1MAlImCaMop68="; + meta.description = "[@@deriving] plugin to generate S-expression conversion functions"; + propagatedBuildInputs = [ ppxlib sexplib0 base ]; + }; + + ppx_sexp_message = janePackage { + pname = "ppx_sexp_message"; + hash = "sha256-4g3Fjrjqhw+XNkCyxrXkgZDEa3e+ytPsEtQA2xSv+jA="; + meta.description = "A ppx rewriter for easy construction of s-expressions"; + propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; + }; + + ppx_sexp_value = janePackage { + pname = "ppx_sexp_value"; + hash = "sha256-LsP+deeFYxB38xXw7LLB3gOMGZiUOFRYklGVY7DMmvE="; + meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values"; + propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; + }; + + ppx_stable = janePackage { + pname = "ppx_stable"; + hash = "sha256-DFCBJY+Q8LjXSF9vHwPpUJLNyMoAXdDwQZrvhl+9g0U="; + meta.description = "Stable types conversions generator"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_stable_witness = janePackage { + pname = "ppx_stable_witness"; + hash = "sha256-W1CN4xspM8NJiXfi7OsngfzWnLEUmBs+IRLwHfxX9d4="; + meta.description = "Ppx extension for deriving a witness that a type is intended to be stable"; + propagatedBuildInputs = [ base ppxlib ]; + }; + + ppx_string = janePackage { + pname = "ppx_string"; + hash = "sha256-GQlgiaES8wc6Y7rTgmPrf9UfMfu125VoNGEbdc7kFsk="; + meta.description = "Ppx extension for string interpolation"; + propagatedBuildInputs = [ ppx_base ppxlib stdio ]; + }; + + ppx_tydi = janePackage { + pname = "ppx_tydi"; + hash = "sha256-neu2Z7TgQdBzf8UtYDRhnGp3Iggfd90Fr+gQuwVTMOo="; + meta.description = "Let expressions, inferring pattern type from expression"; + propagatedBuildInputs = [ base ppxlib ]; + }; + + ppx_typed_fields = janePackage { + pname = "ppx_typed_fields"; + hash = "sha256-l4lCQ4n5FLPS82sb3FgW+HF2OEY/kY10sNfr+aQF8x8="; + meta.description = "GADT-based field accessors and utilities"; + propagatedBuildInputs = [ core ppx_jane ppxlib ]; + }; + + ppx_typerep_conv = janePackage { + pname = "ppx_typerep_conv"; + hash = "sha256-DxjgwZee0jOea7qyPfEhRrdcKWQb2jtjrowiJszS+Fs="; + meta.description = "Generation of runtime types from type declarations"; + propagatedBuildInputs = [ ppxlib typerep ]; + }; + + ppx_variants_conv = janePackage { + pname = "ppx_variants_conv"; + hash = "sha256-Q/CCcMrD+XN5YRMzKvXuiQHfcwXwI773s8x150/eMzs="; + meta.description = "Generation of accessor and iteration functions for ocaml variant types"; + propagatedBuildInputs = [ variantslib ppxlib ]; + }; + + pythonlib = janePackage { + pname = "pythonlib"; + version = "0.16"; + hash = "sha256-HrsdtwPSDSaMB9CDIR9P5iaAmLihUrReuNAPIYa+s3Y="; + meta.description = "A library to help writing wrappers around ocaml code for python"; + propagatedBuildInputs = [ base core expect_test_helpers_core ppx_compare ppx_expect ppx_here ppx_let ppx_python ppx_string stdio typerep pyml ]; + meta.broken = lib.versionAtLeast ocaml.version "4.14"; + }; + + profunctor = janePackage { + pname = "profunctor"; + hash = "sha256-CFHMtCuBnrlr+B2cdJm2Tamt0A/e+f3SnjEavvE31xQ="; + meta.description = "A library providing a signature for simple profunctors and traversal of a record"; + propagatedBuildInputs = [ base ppx_jane record_builder ]; + }; + + protocol_version_header = janePackage { + pname = "protocol_version_header"; + hash = "sha256-GVjnwne6ksjY9ptLOpbsgG0La6eiCJf1w4teYEtgJrA="; + meta.description = "Protocol versioning"; + propagatedBuildInputs = [ core_kernel ]; + }; + + re2 = janePackage { + pname = "re2"; + hash = "sha256-ZRJ7ooXtatEEh0sPL8M9OZ+6s7xNdTuw0Ot6txiG16I="; + meta.description = "OCaml bindings for RE2, Google's regular expression library"; + propagatedBuildInputs = [ core_kernel jane_rope regex_parser_intf ]; + prePatch = '' + substituteInPlace src/re2_c/dune --replace 'CXX=g++' 'CXX=c++' + substituteInPlace src/dune --replace '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2))' '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2) (-x c++))' + ''; + }; + + re2_stable = janePackage { + pname = "re2_stable"; + version = "0.14.0"; + hash = "sha256-gyet2Pzn7ZIqQ+UP2J51pRmwaESY2LSGTqCMZZwDTE4="; + meta.description = "Re2_stable adds an incomplete but stable serialization of Re2"; + propagatedBuildInputs = [ core re2 ]; + }; + + record_builder = janePackage { + pname = "record_builder"; + hash = "sha256-46zGgN9RlDjoSbi8RimuQVrMhy65Gpic0YPZpHOeoo0="; + meta.description = "A library which provides traversal of records with an applicative"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + redis-async = janePackage { + pname = "redis-async"; + hash = "sha256-5msIS2m8nkaprR8NEBfKFWZBWaDJiUtjHbfPelg9/os="; + meta.description = "Redis client for Async applications"; + propagatedBuildInputs = [ async bignum core core_kernel ppx_jane ]; + }; + + regex_parser_intf = janePackage { + pname = "regex_parser_intf"; + hash = "sha256-huzHtUIIVRd5pE7VU1oUjN20S55L6+WCvoLlQ0FCD7A="; + meta.description = "Interface shared by Re_parser and Re2.Parser"; + propagatedBuildInputs = [ base ]; + }; + + resource_cache = janePackage { + pname = "resource_cache"; + hash = "sha256-dN4skSHswgRYLZqN/tqhFFTfgoN8H/LgTgoe+5ZI5zE="; + meta.description = "General resource cache"; + propagatedBuildInputs = [ async_rpc_kernel ]; + }; + + semantic_version = janePackage { + pname = "semantic_version"; + hash = "sha256-KJanaDUW56ndvnTlnPeQgh0C7zsRqXJ328gcEiVDrmc="; + meta.description = "Semantic versioning"; + propagatedBuildInputs = [ core ppx_jane re ]; + }; + + sexp = janePackage { + pname = "sexp"; + hash = "sha256-JWRYi5lX9UOKg+RGvW6FO61t2HlnJKXhzctOHXe0bCM="; + propagatedBuildInputs = [ + async + core + csvfields + jsonaf + re2 + sexp_diff + sexp_macro + sexp_pretty + sexp_select + shell + ]; + meta.description = "S-expression swiss knife"; + }; + + sexp_grammar = janePackage { + pname = "sexp_grammar"; + hash = "sha256-Y/abRingL4+3qvaKgW9jH46E9uq7jYE2+kgr8ERKqfI="; + propagatedBuildInputs = [ core ppx_bin_prot ppx_compare ppx_hash ppx_let ppx_sexp_conv ppx_sexp_message zarith ]; + meta.description = "Helpers for manipulating [Sexplib.Sexp_grammar] values"; + }; + + sexp_diff = janePackage { + pname = "sexp_diff"; + hash = "sha256-2dMBKf7eUbKZtvV7Ol2mPMzYJOCDHuOm9xFZ8vkmp/0="; + propagatedBuildInputs = [ core_kernel ]; + meta.description = "Code for computing the diff of two sexps"; + }; + + sexp_macro = janePackage { + pname = "sexp_macro"; + hash = "sha256-x9WsFFrV7wUqgPUw8KkfyzOxLrS5h5++OSK8QljeQqg="; + propagatedBuildInputs = [ async sexplib ]; + meta.description = "Sexp macros"; + }; + + sexp_pretty = janePackage { + pname = "sexp_pretty"; + hash = "sha256-tcWdYZ717LkGowRSRoEcUNY7VCMX64uhCaY3bXhWxKM="; + meta.description = "S-expression pretty-printer"; + propagatedBuildInputs = [ ppx_base re sexplib ]; + }; + + sexp_select = janePackage { + pname = "sexp_select"; + hash = "sha256-HEzZowojeK9yDOoTY/l01fYLUdolzQGlMO9u3phV8so="; + propagatedBuildInputs = [ base ppx_jane ]; + meta.description = "A library to use CSS-style selectors to traverse sexp trees"; + }; + + sexplib0 = janePackage { + pname = "sexplib0"; + hash = "sha256-wRr1M243Bqu/XLSsr5IVPH5RTVWeVgZjxkKOrm+PW5E="; + minimalOCamlVersion = "4.08.0"; + meta.description = "Library containing the definition of S-expressions and some base converters"; + }; + + sexplib = janePackage { + pname = "sexplib"; + hash = "sha256-6MwggpjHo4FmKF88fP56LN9OHi2uIJc13TvKx4T7gEI="; + meta.description = "Library for serializing OCaml values to and from S-expressions"; + propagatedBuildInputs = [ num parsexp ]; + }; + + shell = janePackage { + pname = "shell"; + hash = "sha256-pK434+ToeYURQHRV+gK57rC7BFvznWEvIu5NAib2ZTU="; + meta.description = "Yet another implementation of fork&exec and related functionality"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ textutils ]; + checkInputs = [ ounit ]; + }; + + shexp = janePackage { + pname = "shexp"; + hash = "sha256-npIcrxMOcIgsecdUEx5XHYp0KVrXiMzMLi8jskAp4vo="; + propagatedBuildInputs = [ posixat spawn ]; + meta.description = "Process library and s-expression based shell"; + }; + + spawn = janePackage { + pname = "spawn"; + minimalOCamlVersion = "4.02.3"; + version = "0.15.0"; + hash = "1fjr91psas5zmk1hxvxh0dchhn0pkyzlr4gg232f5g9vdgissi0p"; + meta.description = "Spawning sub-processes"; + buildInputs = [ ppx_expect ]; + }; + + splay_tree = janePackage { + pname = "splay_tree"; + hash = "sha256-Ag6yqTofEZ3v0qF+Z7xpXQOh7+HWtvRLlY+iAYqcReg="; + meta.description = "A splay tree implementation"; + propagatedBuildInputs = [ core_kernel ]; + }; + + splittable_random = janePackage { + pname = "splittable_random"; + hash = "sha256-wMmLuzhKmnS2iTYVTPUx5Rv2LhL/ygmWmb9t2pUjz+E="; + meta.description = "PRNG that can be split into independent streams"; + propagatedBuildInputs = [ base ppx_assert ppx_bench ppx_sexp_message ]; + }; + + stdio = janePackage { + pname = "stdio"; + hash = "sha256-+QgxqSMqO4VGoMWWJ3QoXdtJKcVpxlSQ/OI7dmcNqjw="; + meta.description = "Standard IO library for OCaml"; + propagatedBuildInputs = [ base ]; + }; + + stored_reversed = janePackage { + pname = "stored_reversed"; + hash = "sha256-ef11f0qifEvxKChM49Hnfk6J6hL+b0tMlm0iDLd5Y0Q="; + meta.description = "A library for representing a list temporarily stored in reverse order"; + propagatedBuildInputs = [ core ppx_jane ]; + }; + + streamable = janePackage { + pname = "streamable"; + hash = "sha256-3djrUW2tPKaEmoOIpdjN6ok7U9i07yreqbi1kP+6pnY="; + meta.description = "A collection of types suitable for incremental serialization"; + propagatedBuildInputs = [ async_kernel async_rpc_kernel base core core_kernel ppx_jane ppxlib ]; + }; + + textutils = janePackage { + pname = "textutils"; + hash = "sha256-2qy99MUMpkuNCvCYlk36k4kN6cPjrEILbwEUv4DyNYw="; + meta.description = "Text output utilities"; + propagatedBuildInputs = [ core_unix textutils_kernel ]; + }; + + textutils_kernel = janePackage { + pname = "textutils_kernel"; + hash = "sha256-DiXemANj5ONmvMzp+tly3AJud5u9i7HdaHmn8aVQS48="; + meta.description = "Text output utilities"; + propagatedBuildInputs = [ core ppx_jane uutf ]; + }; + + tilde_f = janePackage { + pname = "tilde_f"; + hash = "sha256-qLjM9liJfMIh2fqRPBdnmtUf4xhzk2MY8dFNdON3Aew="; + meta.description = "Provides a let-syntax for continuation-passing style"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + time_now = janePackage { + pname = "time_now"; + hash = "sha256-DjSrx/HgwCYS0Xzm2gFvWUVLD7a1KuFVIyVrJjBi8Tc="; + meta.description = "Reports the current time"; + buildInputs = [ jst-config ppx_optcomp ]; + propagatedBuildInputs = [ jane-street-headers base ppx_base ]; + }; + + timezone = janePackage { + pname = "timezone"; + hash = "sha256-pmXUMvLfgAwP6TV/aP9wMlOs0KfwEWtaJfdjUFLbOu0="; + meta.description = "Time-zone handling"; + propagatedBuildInputs = [ core_kernel ]; + }; + + topological_sort = janePackage { + pname = "topological_sort"; + hash = "sha256-um5++60mR++iHAruKqoQfd4EbQ1kb3L+cPOWhs9sIHI="; + meta.description = "Topological sort algorithm"; + propagatedBuildInputs = [ ppx_jane stdio ]; + }; + + typerep = janePackage { + pname = "typerep"; + hash = "sha256-iJnIjWZYCTaH29x7nFviCrbnTmHRChZkkj6E5sgi4mU="; + meta.description = "Typerep is a library for runtime types"; + propagatedBuildInputs = [ base ]; + }; + + username_kernel = janePackage { + pname = "username_kernel"; + hash = "sha256-UvFL/M9OsD+SOs9MYMKiKzZilLJHzriop6SPA4bOhZQ="; + meta.description = "An identifier for a user"; + propagatedBuildInputs = [ core ppx_jane ]; + }; + + variantslib = janePackage { + pname = "variantslib"; + hash = "sha256-8NoNkyIP7iEEiei+Q1zrPoJjnWwhCsLsY1vgua22gnw="; + meta.description = "Part of Jane Street's Core library"; + propagatedBuildInputs = [ base ]; + }; + + vcaml = janePackage { + pname = "vcaml"; + hash = "sha256-pmEKi24+22T76SzI3RpBmQF7ZrQwlngrpFYLoBdLwe0="; + meta.description = "OCaml bindings for the Neovim API"; + propagatedBuildInputs = [ angstrom-async async_extra expect_test_helpers_async faraday jsonaf man_in_the_middle_debugger semantic_version ]; + }; + + virtual_dom = janePackage { + pname = "virtual_dom"; + hash = "sha256-nXW9cDHQVugriR0+GkayuV4S3HKothQAoNJef02iALM="; + meta.description = "OCaml bindings for the virtual-dom library"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ base64 core_kernel gen_js_api js_of_ocaml js_of_ocaml_patches lambdasoup tyxml uri ]; + }; + + zarith_stubs_js = janePackage { + pname = "zarith_stubs_js"; + hash = "sha256-oKD+JE08Mgvk5l8XFHSZ7xqiWPaOvKC87+zHLaQ/7q0="; + meta.description = "Javascripts stubs for the Zarith library"; + }; + + zstandard = janePackage { + pname = "zstandard"; + hash = "sha256-QcYqlOpCAr0owmO6sLDJhki8lUnNvtkaxldKb5I5AF0="; + meta.description = "OCaml bindings to Zstandard"; + buildInputs = [ ppx_jane ]; + propagatedBuildInputs = [ core_kernel ctypes zstd ]; + }; + +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix new file mode 100644 index 000000000000..061fed447466 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.16" }: + +{ pname +, version ? defaultVersion +, hash +, minimalOCamlVersion ? "4.14" +, doCheck ? true +, buildInputs ? [] +, ...}@args: + +buildDunePackage (args // { + duneVersion = "3"; + inherit version buildInputs; + + inherit minimalOCamlVersion; + + src = fetchFromGitHub { + owner = "janestreet"; + repo = pname; + rev = "v${version}"; + sha256 = hash; + }; + + inherit doCheck; + + meta = { + license = lib.licenses.mit; + homepage = "https://github.com/janestreet/${pname}"; + } // args.meta; +}) diff --git a/nixpkgs/pkgs/development/ocaml-modules/lame/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lame/default.nix index 5d65bb95101c..2e23a3715dac 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lame/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lame/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "lame"; - version = "0.3.6"; + version = "0.3.7"; minimalOCamlVersion = "4.06"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "savonet"; repo = "ocaml-lame"; rev = "v${version}"; - sha256 = "sha256-oRxP1OM0pGdz8CB+ou7kbbrNaB1x9z9KTfciLsivFnI="; + sha256 = "sha256-/ZzoGFQQrBf17TaBPSFDQ1yHaQnva56YLmscOacrKBI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/lockfree/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lockfree/default.nix deleted file mode 100644 index c3400d4583e0..000000000000 --- a/nixpkgs/pkgs/development/ocaml-modules/lockfree/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchurl, buildDunePackage -, dscheck -, qcheck, qcheck-alcotest -}: - -buildDunePackage rec { - pname = "lockfree"; - version = "0.3.0"; - - minimalOCamlVersion = "5.0"; - duneVersion = "3"; - - src = fetchurl { - url = "https://github.com/ocaml-multicore/lockfree/releases/download/${version}/lockfree-${version}.tbz"; - hash = "sha256-XdJR5ojFsA7bJ4aZ5rh10NjopE0NjfqQ9KitOLMh3Jo="; - }; - - propagatedBuildInputs = [ dscheck ]; - - doCheck = true; - checkInputs = [ qcheck qcheck-alcotest ]; - - meta = { - description = "Lock-free data structures for multicore OCaml"; - homepage = "https://github.com/ocaml-multicore/lockfree"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - }; -} diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix index fea1e712abd2..f0a89f37f418 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix @@ -6,15 +6,13 @@ buildDunePackage rec { pname = "mirage-nat"; - version = "3.0.1"; + version = "3.0.2"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; - src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - hash = "sha256-wReySOMulGkrPD60XxpgMrUoHzY9hQ7TZzYQyJ3eiik="; + hash = "sha256-Z1g3qb26x/S6asYv6roTW77r41SHy7OGN7MoZJ/E8Is="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix deleted file mode 100644 index 94a65548531f..000000000000 --- a/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildDunePackage, fetchurl, tcpip }: - -buildDunePackage rec { - pname = "mirage-stack"; - version = "4.0.0"; - duneVersion = "3"; - - src = fetchurl { - url = "https://github.com/mirage/mirage-stack/releases/download/v${version}/mirage-stack-v${version}.tbz"; - hash = "sha256-q70zGQvT5KTqvL37bZjSD8Su0P72KCUesyfWJcI8zPw="; - }; - - propagatedBuildInputs = [ tcpip ]; - - meta = { - description = "MirageOS signatures for network stacks"; - homepage = "https://github.com/mirage/mirage-stack"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - }; -} - diff --git a/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix index 3fddb162d465..e95d3b182a52 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix @@ -1,7 +1,6 @@ { buildDunePackage , lib , fetchurl -, mirage-stack , mirage-time , h2 , tls-mirage @@ -32,10 +31,8 @@ buildDunePackage rec { }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; propagatedBuildInputs = [ - mirage-stack mirage-time h2 tls-mirage diff --git a/nixpkgs/pkgs/development/ocaml-modules/saturn/default.nix b/nixpkgs/pkgs/development/ocaml-modules/saturn/default.nix new file mode 100644 index 000000000000..855935aff672 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/saturn/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchurl, buildDunePackage, ocaml +, saturn_lockfree +, dscheck +, qcheck, qcheck-alcotest, qcheck-stm +}: + +buildDunePackage rec { + pname = "saturn"; + + inherit (saturn_lockfree) src version; + + propagatedBuildInputs = [ saturn_lockfree ]; + + doCheck = lib.versionAtLeast ocaml.version "5.0"; + checkInputs = [ dscheck qcheck qcheck-alcotest qcheck-stm ]; + + meta = saturn_lockfree.meta // { + description = "Parallelism-safe data structures for multicore OCaml"; + }; + +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/saturn/lockfree.nix b/nixpkgs/pkgs/development/ocaml-modules/saturn/lockfree.nix new file mode 100644 index 000000000000..42858626e58d --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/saturn/lockfree.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, buildDunePackage +, domain_shims +}: + +buildDunePackage rec { + pname = "saturn_lockfree"; + version = "0.4.0"; + + minimalOCamlVersion = "4.12"; + + src = fetchurl { + url = "https://github.com/ocaml-multicore/saturn/releases/download/${version}/saturn-${version}.tbz"; + hash = "sha256-fHvslaJwVbQaqDVA/MHGqHybetYbxRGlMrhgXqM3iPs="; + }; + + propagatedBuildInputs = [ domain_shims ]; + + meta = { + description = "Lock-free data structures for multicore OCaml"; + homepage = "https://github.com/ocaml-multicore/lockfree"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix b/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix index 30710bfae265..1f86d7ef5bfb 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix @@ -1,8 +1,8 @@ { lib, buildDunePackage, fetchurl -, ppx_cstruct, pkg-config +, pkg-config , cstruct, cstruct-lwt, mirage-net, mirage-clock , mirage-random, mirage-time -, ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt +, macaddr, macaddr-cstruct, fmt , lwt, lwt-dllist, logs, duration, randomconv, ethernet , alcotest, mirage-flow, mirage-vnetif, pcap-format , mirage-clock-unix, arp, ipaddr-cstruct, mirage-random-test @@ -13,13 +13,11 @@ buildDunePackage rec { pname = "tcpip"; - version = "7.1.2"; - - duneVersion = "3"; + version = "8.0.0"; src = fetchurl { url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - hash = "sha256-lraur6NfFD9yddG+y21jlHKt82gLgYBBbedltlgcRm0="; + hash = "sha256-NrTBVr4WcCukxteBotqLoUYrIjcNFVcOERYFbL8CUjM="; }; nativeBuildInputs = [ @@ -27,17 +25,15 @@ buildDunePackage rec { ]; propagatedBuildInputs = [ - ppx_cstruct cstruct cstruct-lwt mirage-net mirage-clock mirage-random mirage-time - ipaddr + ipaddr-cstruct macaddr macaddr-cstruct - mirage-profile fmt lwt lwt-dllist @@ -61,7 +57,6 @@ buildDunePackage rec { mirage-vnetif pcap-format mirage-clock-unix - ipaddr-cstruct ]; __darwinAllowLocalNetworking = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix b/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix index 002af344db9c..5e861592cd7b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix @@ -5,8 +5,12 @@ buildDunePackage rec { inherit (tls) src meta version; - minimalOCamlVersion = "4.11"; - duneVersion = "3"; + minimalOCamlVersion = "4.13"; + + patches = [ + # Remove when TLS gets updated to v0.17.1. + ./janestreet-0.16.patch + ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch b/nixpkgs/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch new file mode 100644 index 000000000000..7d36ad227fa0 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch @@ -0,0 +1,23 @@ +diff --git a/async/tls_async.mli b/async/tls_async.mli +index b4894b8..101f27f 100644 +--- a/async/tls_async.mli ++++ b/async/tls_async.mli +@@ -55,4 +55,4 @@ val connect + -> 'addr Tcp.Where_to_connect.t + -> host:[ `host ] Domain_name.t option + -> (Session.t * Reader.t * Writer.t) Deferred.Or_error.t) +- Tcp.with_connect_options ++ Tcp.Aliases.with_connect_options +diff --git a/async/x509_async.ml b/async/x509_async.ml +index d4fad8c..4ee466a 100644 +--- a/async/x509_async.ml ++++ b/async/x509_async.ml +@@ -9,7 +9,7 @@ let file_contents file = + let load_all_in_directory ~directory ~f = + let open Deferred.Or_error.Let_syntax in + let%bind files = Deferred.Or_error.try_with (fun () -> Sys.ls_dir directory) in +- Deferred.Or_error.List.map files ~f:(fun file -> ++ Deferred.Or_error.List.map ~how:`Sequential files ~f:(fun file -> + let%bind contents = file_contents (directory ^/ file) in + f ~contents) + ;; diff --git a/nixpkgs/pkgs/development/ocaml-modules/trace/default.nix b/nixpkgs/pkgs/development/ocaml-modules/trace/default.nix index 208a879b1d1c..a27a61d4baf1 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/trace/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/trace/default.nix @@ -2,19 +2,19 @@ buildDunePackage rec { pname = "trace"; - version = "0.2"; + version = "0.3"; - minimalOCamlVersion = "4.05"; + minimalOCamlVersion = "4.07"; src = fetchurl { - url = "https://github.com/c-cube/trace/releases/download/v${version}/trace-${version}.tbz"; - hash = "sha256-iScnZxjgzDqZFxbDDXB0K4TkdDJDcrMC03sK/ltbqJQ="; + url = "https://github.com/c-cube/ocaml-trace/releases/download/${version}/trace-${version}.tbz"; + hash = "sha256-Krq6qYO7tKJktTRjFrdmONPHfjrd81Ighsb9nmG9ZQU="; }; meta = { description = "Common interface for tracing/instrumentation libraries in OCaml"; license = lib.licenses.mit; - homepage = "https://c-cube.github.io/trace/"; + homepage = "https://c-cube.github.io/ocaml-trace/"; maintainers = [ lib.maintainers.vbgl ]; }; diff --git a/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix b/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix index 2922a57244b9..882dfb23996e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/zed/default.nix @@ -5,8 +5,8 @@ let if lib.versionAtLeast ocaml.version "4.08" then { - version = "3.2.0"; - sha256 = "sha256-6yKHE30nVFXo8hGdCx+GO4VYYGbi802aMdN2XuYMJ7w="; + version = "3.2.3"; + sha256 = "sha256-lbhqjZxeUqHdd+yahRO+B6L2mc+h+4T2+qKVgWC2HY8="; propagatedBuildInputs = [ react result uchar uutf uucp uuseg ]; } else @@ -40,7 +40,8 @@ buildDunePackage rec { To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities. ''; - inherit (src.meta) homepage; + homepage = "https://github.com/ocaml-community/zed"; + changelog = "https://github.com/ocaml-community/zed/blob/${version}/CHANGES.md"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.gal_bolle diff --git a/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix b/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix new file mode 100644 index 000000000000..dda00a883d33 --- /dev/null +++ b/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPecl, fetchFromGitHub }: + +let + version = "1.0.0beta6"; +in buildPecl { + inherit version; + pname = "opentelemetry"; + + src = fetchFromGitHub { + owner = "open-telemetry"; + repo = "opentelemetry-php-instrumentation"; + rev = version; + hash = "sha256-dbyFb+Wh4thbnwASgPuQ4ceeke6NDMFLvNXjp66hLCM="; + }; + + doCheck = true; + + meta = with lib; { + changelog = "https://github.com/open-telemetry/opentelemetry-php-instrumentation/releases/tag/${version}"; + description = "OpenTelemetry PHP auto-instrumentation extension"; + homepage = "https://opentelemetry.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ gaelreyrol ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/adax/default.nix b/nixpkgs/pkgs/development/python-modules/adax/default.nix index e4240028638b..fd2cb0f29f59 100644 --- a/nixpkgs/pkgs/development/python-modules/adax/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adax/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "adax"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyadax"; - rev = version; - hash = "sha256-EMSX2acklwWOYiEeLHYG5mwdiGnWAUo5dGMiHCmZrko="; + rev = "refs/tags/${version}"; + hash = "sha256-y4c1RBy/UxmKP7+mHXi86XJ2/RXGrqkj94I2Q699EJU="; }; propagatedBuildInputs = [ @@ -28,11 +28,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "adax" ]; + pythonImportsCheck = [ + "adax" + ]; meta = with lib; { description = "Python module to communicate with Adax"; homepage = "https://github.com/Danielhiversen/pyAdax"; + changelog = "https://github.com/Danielhiversen/pyAdax/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix b/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix index b0af50573ad9..785c011c6d66 100644 --- a/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "add-trailing-comma"; - version = "3.0.1"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-wCqCKomnkYgvxDWtjBwyqKb09sTPqPgWbYohgosUaHA="; + hash = "sha256-B+wjBy42RwabVz/6qEMGpB0JmwJ9hqSskwcNj4x/B/k="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/afdko/default.nix b/nixpkgs/pkgs/development/python-modules/afdko/default.nix index dc14fdf51ac6..214a85f8c915 100644 --- a/nixpkgs/pkgs/development/python-modules/afdko/default.nix +++ b/nixpkgs/pkgs/development/python-modules/afdko/default.nix @@ -23,6 +23,7 @@ , setuptools-scm , scikit-build , cmake +, ninja , antlr4_9 , libxml2 , pytestCheckHook @@ -47,6 +48,7 @@ buildPythonPackage rec { setuptools-scm scikit-build cmake + ninja ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/nixpkgs/pkgs/development/python-modules/ailment/default.nix index 837842477d28..2cde5dda3ae9 100644 --- a/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.65"; + version = "9.2.66"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Bli+zrxMbRY2dzAx25ap3DhROIFTlk+TGpAfrHiMxPc="; + hash = "sha256-5F6mSdYkeDS/n4Quu6UrBK3alfieop6Go3muGlmr/84="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioambient/default.nix b/nixpkgs/pkgs/development/python-modules/aioambient/default.nix index 15d3d7ae5617..812417a38a76 100644 --- a/nixpkgs/pkgs/development/python-modules/aioambient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioambient/default.nix @@ -3,6 +3,7 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytest-aiohttp , pytest-asyncio @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "aioambient"; - version = "2023.04.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,9 +25,23 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ar2UGSlVukMD5EZsEn7TFfIOovaI+B3Ym+UeGo95oks="; + hash = "sha256-Y8I4iPvxcK98Olb3JURNK37MKggdhcweKvNBa0ZtG6I="; }; + patches = [ + # This patch removes references to setuptools and wheel that are no longer + # necessary and changes poetry to poetry-core, so that we don't need to add + # unnecessary nativeBuildInputs. + # + # https://github.com/bachya/aioambient/pull/295 + # + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/bachya/aioambient/commit/fa21a2e82678a231a73c8a1153032980926f4c35.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace 'websockets = ">=11.0.1"' 'websockets = "*"' @@ -43,6 +58,8 @@ buildPythonPackage rec { websockets ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-aiohttp diff --git a/nixpkgs/pkgs/development/python-modules/aioapns/default.nix b/nixpkgs/pkgs/development/python-modules/aioapns/default.nix index 9cebf5f1eb13..2b48f96ae2b5 100644 --- a/nixpkgs/pkgs/development/python-modules/aioapns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioapns/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aioapns"; - version = "2.2"; + version = "3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-3FMNIhIZrstPKTfHVmN+K28UR2G26HZ5S/JtXmaFk1c="; + hash = "sha256-MiFjd9HYaTugjP66O24Tgk92bC91GQHggvy1sdQIu+0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix b/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix index d6d69c6ee466..beea7e05a750 100644 --- a/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix @@ -4,11 +4,12 @@ , fetchFromGitHub , pythonOlder , setuptools +, pyjwt }: buildPythonPackage rec { pname = "aioaseko"; - version = "0.0.2"; + version = "0.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "milanmeu"; repo = pname; - rev = "v${version}"; - hash = "sha256-nJRVNBYfBcLYnBsTpQZYMHYWh0+hQObVKJ7sOXFwDjc="; + rev = "refs/tags/v${version}"; + hash = "sha256-bjPl0yrRaTIEEuPV8NbWu2hx/es5bcu2tDBZV+95fUc="; }; nativeBuildInputs = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + pyjwt ]; # Module has no tests @@ -38,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with the Aseko Pool Live API"; homepage = "https://github.com/milanmeu/aioaseko"; + changelog = "https://github.com/milanmeu/aioaseko/releases/tag/v${version}"; license = with licenses; [ lgpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aiobafi6/default.nix b/nixpkgs/pkgs/development/python-modules/aiobafi6/default.nix index e92fa59d920a..9bdd4f9eb420 100644 --- a/nixpkgs/pkgs/development/python-modules/aiobafi6/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiobafi6/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiobafi6"; - version = "0.8.2"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jfroy"; repo = "aiobafi6"; rev = "refs/tags/${version}"; - hash = "sha256-ng+WpLhAfsouFA9biomc0V+L9XQHDthJeJLv8ttnYBc="; + hash = "sha256-QxjrspvNrcMcGChjj1B4QF/SnWCsGmPxnI2bWAL6BiI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix b/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix index b64c7e103a7e..757c9c1915d5 100644 --- a/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiobiketrax"; - version = "1.1.0"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "basilfx"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qt2/Wf9qolNF83tf2G5xGFJiLTbOWLPbtCnDfIrKvoI="; + hash = "sha256-YvPWvdA4BslkOLt3IkzSgUgex8h1CjCOVZC6oxNf3ZA="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index f6b87c401cee..cc34f91fde9d 100644 --- a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "16.0.1"; + version = "16.0.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DxEfkM//WvGqS/iWb6RIvE2raIYb/I0bcwrLqLBjCmw="; + hash = "sha256-x4kH8riHZbVibgwR2DmWB4tsswpub4m2LwnypVVUgqM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiogram/default.nix b/nixpkgs/pkgs/development/python-modules/aiogram/default.nix index ab5499f7ae96..ceb3f9603ede 100644 --- a/nixpkgs/pkgs/development/python-modules/aiogram/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiogram/default.nix @@ -53,6 +53,12 @@ buildPythonPackage rec { redis ]; + # requires network + disabledTests = [ + "test_download_file_404" + "test_download_404" + ]; + pythonImportsCheck = [ "aiogram" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix b/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix index e4dcbda3a02e..aa0dbd64be80 100644 --- a/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioguardian"; - version = "2022.10.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo="; + hash = "sha256-/UNSAfAkOXPJQDWBZIe/AYIhx83kPCjGzZjn4oh+gfY="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index 5bc3597a6752..ed3823af9bef 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.6.16"; + version = "3.0.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2QnM5WJ0UyuRyL6NiXz22SLUMvyNfbdNIutJSNjS+G8="; + hash = "sha256-TyVmvricfaS+i96DGwh0IKhMm56U1DyebAmRb+OFCh4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix b/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix index 461590b0cc49..618c0e0d9023 100644 --- a/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.4.5"; + version = "0.4.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-df3FQdOa3C8eQfgFi+sh7+/GBpE+4B5gOI+3XDQLHEs="; + hash = "sha256-jbL6f6gDH6AxsfuD7mFtvCGKLqy/NKoo5bUmXN9hBrM="; }; prePatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/aioqsw/default.nix b/nixpkgs/pkgs/development/python-modules/aioqsw/default.nix index 26745f8d5561..d08eeaec6c0e 100644 --- a/nixpkgs/pkgs/development/python-modules/aioqsw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioqsw/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aioqsw"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2fu78mp9ztm229N+zhvY7FuWl3xZlqSYVk/Okp2RNJI="; + hash = "sha256-YGVQsw7UhRWXtfn2MQa3GHNlgXR4LJlFnaeLCGjmWfQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioquic/default.nix b/nixpkgs/pkgs/development/python-modules/aioquic/default.nix index 753ce73fb2dc..9aeb06a1382d 100644 --- a/nixpkgs/pkgs/development/python-modules/aioquic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioquic/default.nix @@ -1,52 +1,43 @@ { lib -, fetchPypi -, fetchpatch , buildPythonPackage +, certifi +, fetchPypi , openssl , pylsqpack -, certifi -, pytestCheckHook , pyopenssl +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "aioquic"; - version = "0.9.20"; + version = "0.9.21"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7ENqqs6Ze4RrAeUgDtv34+VrkYJqFE77l0j9jd0zK74="; + hash = "sha256-ecfsBjGOeFYnZlyk6HI63zR7ciW30AbjMtJXWh9RbvU="; }; - patches = [ - # This patch is here because it's required by the next patch. - (fetchpatch { - url = "https://github.com/aiortc/aioquic/commit/3930580b50831a034d21ee4689362188b21a4d6a.patch"; - hash = "sha256-XjhyajDawN/G1nPtkMbNe66iJCo76UpdA7PqwtxO5ag="; - }) - # https://github.com/aiortc/aioquic/pull/349, fixes test failure due pyopenssl==22 - (fetchpatch { - url = "https://github.com/aiortc/aioquic/commit/c3b72be85868d67ee32d49ab9bd98a4357cbcde9.patch"; - hash = "sha256-AjW+U9DpNXgA5yqKkWnx0OYpY2sZR9KIdQ3pSzxU+uY="; - }) - # AssertionError: 'self-signed certificate' != 'self signed certificate' - (fetchpatch { - url = "https://github.com/aiortc/aioquic/commit/cfcd3ce12fb27f5b26deb011a82f66b5d68d521a.patch"; - hash = "sha256-bCW817Z7jCxYySfUukNR4cibURH3qZWEQjeeyvRIqZY="; - }) - ]; - propagatedBuildInputs = [ certifi pylsqpack pyopenssl ]; - buildInputs = [ openssl ]; + buildInputs = [ + openssl + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "aioquic" ]; + pythonImportsCheck = [ + "aioquic" + ]; __darwinAllowLocalNetworking = true; diff --git a/nixpkgs/pkgs/development/python-modules/aioredis/default.nix b/nixpkgs/pkgs/development/python-modules/aioredis/default.nix index 5ea482278944..2c944600ef91 100644 --- a/nixpkgs/pkgs/development/python-modules/aioredis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioredis/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , async-timeout , typing-extensions @@ -11,14 +12,25 @@ buildPythonPackage rec { pname = "aioredis"; version = "2.0.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "eaa51aaf993f2d71f54b70527c440437ba65340588afeb786cd87c55c89cd98e"; + hash = "sha256-6qUar5k/LXH1S3BSfEQEN7plNAWIr+t4bNh8Vcic2Y4="; }; + patches = [ + # https://github.com/aio-libs-abandoned/aioredis-py/pull/1490 + (fetchpatch { + name = "python-3.11-compatibility.patch"; + url = "https://github.com/aio-libs-abandoned/aioredis-py/commit/1b951502dc8f149fa66beafeea40c782f1c5c1d3.patch"; + hash = "sha256-EqkiYktxISg0Rv4ShXOksGvuUyljPxjJsfNOVaaax2o="; + includes = [ "aioredis/exceptions.py" ]; + }) + ]; + propagatedBuildInputs = [ async-timeout typing-extensions @@ -29,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asyncio (PEP 3156) Redis client library"; - homepage = "https://github.com/aio-libs/aioredis"; + homepage = "https://github.com/aio-libs-abandoned/aioredis-py"; license = licenses.mit; maintainers = with maintainers; [ mmai ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix b/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix index 1ef9300eaf35..150486cf4aea 100644 --- a/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aioridwell"; - version = "2023.07.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8EPELXxSq+B9o9eMFeM5ZPVYTa1+kT/S6cO7hKtD18s="; + hash = "sha256-AreQC5LOthnOEj0HnEww4zLob394XwCvqZBwjsT2Lcg="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix b/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix index 72fdd22f6696..e993813081a8 100644 --- a/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiosomecomfort"; - version = "0.0.16"; + version = "0.0.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mkmer"; repo = "AIOSomecomfort"; rev = "refs/tags/${version}"; - hash = "sha256-GwnlaPy+pIJOL3szOebH0a0ytVMOeUI4dM8D629RuEU="; + hash = "sha256-HJbLsl1NHZxfH17mIi0T6h5ZSfKaw4VYbNgN6vmN7l4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix index b2b6a866992e..09b177a61bf7 100644 --- a/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "52"; + version = "55"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mghAUZrRBKHM+mIeUGnbJqWD+NhZyikdGsIhf1uohiM="; + hash = "sha256-JvuP1Rhq01Y9KbfAJpawUQNWfxvlf9LY82RvXok4tgw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix b/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix index dde165c5bf87..fd5da5c330d5 100644 --- a/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiowatttime"; - version = "2022.10.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rqmsUvVwXC/XkR/v2d9d3t7u6Poms4ORiOci41ajXIo="; + hash = "sha256-/ulDImbLOTcoA4iH8e65A01aqqnCLn+01DWuM/4H4p4="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix b/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix index c3bf5066385d..eec4830837f0 100644 --- a/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "airthings-ble"; - version = "0.5.6-2"; + version = "0.5.6-4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vincegio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xxKZI6yb8h1eqtfTpa8SqL/hnIWhFtuBP7RXQvI/Z/4="; + hash = "sha256-Ft5A2ZGVH9VHoRDAqDcc0rBfnQRxoXMylCAwUSwmViE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/angr/default.nix b/nixpkgs/pkgs/development/python-modules/angr/default.nix index 55fe186c90e1..815d283a58ee 100644 --- a/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.65"; + version = "9.2.66"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-atVmXsgMIRpmOXgNoatWkk9ID14f9rMJMT6+CWmvbY4="; + hash = "sha256-l/O+7M9f2HtIcXNd49+zr2Z0Cx/3mbXgZvqOyPlvJbk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix index c18343d46f1c..479ff401a425 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "4.1.5"; + version = "4.1.8"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WXyDahhMETH+62sOI82iNsQf7N7mRCc3Unj7aSD9LnQ="; + hash = "sha256-9YE19dEj4I/bfhGEm4KUXhkA+MiZughZ1LQbJcdsqVU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ansible-pylibssh/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-pylibssh/default.nix index 5eb60419fcf7..cfe8d7e1e1fa 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible-pylibssh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible-pylibssh/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { hash = "sha256-spaGux6dYvtUtpOdU6oN7SEn8IgBof2NpQSPvr+Zplg="; }; + # remove after https://github.com/ansible/pylibssh/pull/502 is merged + postPatch = '' + sed -i "/setuptools_scm_git_archive/d" pyproject.toml + ''; + nativeBuildInputs = [ cython wheel diff --git a/nixpkgs/pkgs/development/python-modules/ansible/default.nix b/nixpkgs/pkgs/development/python-modules/ansible/default.nix index 9da23d3fc09b..f7c41aa12ba2 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible/default.nix @@ -21,7 +21,7 @@ let pname = "ansible"; - version = "8.2.0"; + version = "8.3.0"; in buildPythonPackage { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-k1ppIf+wNKoY5lB7SeQBZ2zRUkPW+qXgXiIQCL9yXJc="; + hash = "sha256-XlgAHX1twz5dFWyjQ4g7YT7JiPaTZLCkP3Ek/ktb4vI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/anthropic/default.nix b/nixpkgs/pkgs/development/python-modules/anthropic/default.nix index a7bbb6fb2bd6..911361f82b8a 100644 --- a/nixpkgs/pkgs/development/python-modules/anthropic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anthropic/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , anyio , distro @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.3.8"; + version = "0.3.10"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,17 +25,9 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-rNLKIZKX9AI0IKGicozllh+XGU4Ll91EfRaAfJYJtJE="; + hash = "sha256-OmT8a588eprCTUnnhLF5+XSOtetiUMouaWz1hrTl1ao="; }; - patches = [ - (fetchpatch { - name = "support-pytest-asyncio-0.21.0.patch"; - url = "https://github.com/anthropics/anthropic-sdk-python/commit/1e199aa9b38970c5b5b4492907494ac653a7f756.patch"; - hash = "sha256-f9KldnvXuRKVgT7Xb/xdhInKOeXvi4g5OxVRD0PMhgQ="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; @@ -70,6 +61,5 @@ buildPythonPackage rec { changelog = "https://github.com/anthropics/anthropic-sdk-python/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; - broken = lib.versionAtLeast pydantic.version "2"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/anytree/default.nix b/nixpkgs/pkgs/development/python-modules/anytree/default.nix index d49b22349639..a83d8748d477 100644 --- a/nixpkgs/pkgs/development/python-modules/anytree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anytree/default.nix @@ -1,24 +1,28 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, fontconfig +, graphviz +, poetry-core +, pytestCheckHook , pythonOlder -, substituteAll , six +, substituteAll , withGraphviz ? true -, graphviz -, fontconfig -# Tests -, pytestCheckHook -, nose }: buildPythonPackage rec { pname = "anytree"; - version = "2.8.0"; + version = "2.9.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"; + src = fetchFromGitHub { + owner = "c0fec0de"; + repo = "anytree"; + rev = "refs/tags/${version}"; + hash = "sha256-e7mmOOvrZuMCcyUg74YLLXGzkb5nCtuYmhNzAbY65gg="; }; patches = lib.optionals withGraphviz [ @@ -28,30 +32,35 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ six ]; - # tests print “Fontconfig error: Cannot load default config file” + nativeCheckInputs = [ + pytestCheckHook + ]; + + # Tests print “Fontconfig error: Cannot load default config file” preCheck = lib.optionalString withGraphviz '' export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf ''; - # circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree + # Circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree doCheck = withGraphviz; - nativeCheckInputs = [ pytestCheckHook nose ]; - - pytestFlagsArray = lib.optionals (pythonOlder "3.4") [ - # Use enums, which aren't available pre-python3.4 - "--ignore=tests/test_resolver.py" - "--ignore=tests/test_search.py" + pythonImportsCheck = [ + "anytree" ]; meta = with lib; { description = "Powerful and Lightweight Python Tree Data Structure"; homepage = "https://github.com/c0fec0de/anytree"; + changelog = "https://github.com/c0fec0de/anytree/releases/tag/${version}"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maitnainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/anywidget/default.nix b/nixpkgs/pkgs/development/python-modules/anywidget/default.nix index d993af0654f8..f96ef47e7332 100644 --- a/nixpkgs/pkgs/development/python-modules/anywidget/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anywidget/default.nix @@ -7,7 +7,6 @@ , hatchling , importlib-metadata , ipywidgets -, jupyterlab , psygnal , typing-extensions , watchfiles @@ -25,10 +24,17 @@ buildPythonPackage rec { hash = "sha256-OUKxmYceEKURJeQTVI7oLT4SdZM90V7BoZf0UykkEV4="; }; + # We do not need the jupyterlab build dependency, because we do not need to + # build any JS components; these are present already in the PyPI artifact. + # + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"jupyterlab==3.*"' "" + ''; + nativeBuildInputs = [ hatch-jupyter-builder hatchling - jupyterlab ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/apischema/default.nix b/nixpkgs/pkgs/development/python-modules/apischema/default.nix new file mode 100644 index 000000000000..a60b97d1d951 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/apischema/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, graphql-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "apischema"; + version = "0.18.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "wyfo"; + repo = "apischema"; + rev = "refs/tags/v${version}"; + hash = "sha256-DBFFCLi8cpASyGPNqZvYe3OTLSbNZ8QzaxjQkOiHxFc="; + }; + + passthru.optional-dependencies = { + graphql = [ + graphql-core + ]; + }; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "apischema" + ]; + + meta = with lib; { + description = "JSON (de)serialization, GraphQL and JSON schema generation using typing"; + homepage = "https://github.com/wyfo/apischema"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/apkit/default.nix b/nixpkgs/pkgs/development/python-modules/apkit/default.nix new file mode 100644 index 000000000000..7e2c45ca8bc7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/apkit/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +}: + +buildPythonPackage { + pname = "apkit"; + version = "unstable-2022-08-23"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "hwp"; + repo = "apkit"; + rev = "40561738c3f585c590c3f0584bf2e3354eefbd48"; + hash = "sha256-/pwoEKB6BD+wWy7QwPwwzSxGn+TAOaMzduOXyuoXC8g="; + }; + + propagatedBuildInputs = [ + numpy + scipy + ]; + + pythonImportsCheck = [ "apkit" ]; + + # This package has no tests + doCheck = false; + + meta = with lib; { + description = "Audio processing toolkit"; + homepage = "https://github.com/hwp/apkit"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/app-model/default.nix b/nixpkgs/pkgs/development/python-modules/app-model/default.nix index c906b316d46e..29f19979ff53 100644 --- a/nixpkgs/pkgs/development/python-modules/app-model/default.nix +++ b/nixpkgs/pkgs/development/python-modules/app-model/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "app-model"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4I0lDL6B+8f/lj09zT14lvbGATuHIfjKwwABXi6OIvE="; + hash = "sha256-1LldqihVCCgFdnsod751zWAAqkaaIH2qMpfsPYjWzgs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/nixpkgs/pkgs/development/python-modules/apprise/default.nix index 3cdc55f63499..0e0944dd32e6 100644 --- a/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apprise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.4.5"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-t8ZlE8VFZpCimO2IfJAW3tQvFeNl0WFC5yi3T3z/7oI="; + hash = "sha256-PFgRQQd6EBeQ7eDKsW+ig60DKpsvl9xtNWX7LZGBP9c="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix b/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix index f55ca7e29670..03e0d9527522 100644 --- a/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix @@ -1,36 +1,33 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder - -# propagates , allpairspy , approval-utilities , beautifulsoup4 +, buildPythonPackage , empty-files +, fetchFromGitHub +, mock , mrjob +, numpy , pyperclip , pytest -, typing-extensions - -# tests -, numpy , pytestCheckHook +, pythonOlder +, testfixtures +, typing-extensions }: buildPythonPackage rec { - version = "8.3.1"; pname = "approvaltests"; + version = "9.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; - # no tests included in PyPI tarball src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-FyYT+w4CX+CdUg0uGwyjw98H8Z+HMVecgMBW/ytrtFU="; + hash = "sha256-tyUPXeMdFuzlBY/HrGHLDEwYngzBELayaVVfEh92lbE="; }; propagatedBuildInputs = [ @@ -41,16 +38,18 @@ buildPythonPackage rec { mrjob pyperclip pytest + testfixtures typing-extensions ]; nativeCheckInputs = [ + mock numpy pytestCheckHook ]; disabledTests = [ - # tests expects paths below ApprovalTests.Python directory + # Tests expects paths below ApprovalTests.Python directory "test_received_filename" "test_pytest_namer" ]; @@ -63,7 +62,8 @@ buildPythonPackage rec { meta = with lib; { description = "Assertion/verification library to aid testing"; homepage = "https://github.com/approvals/ApprovalTests.Python"; + changelog = "https://github.com/approvals/ApprovalTests.Python/releases/tag/v${version}"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 0a2dd009f6a4..92c58450cee4 100644 --- a/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.2.0"; + version = "5.2.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-OtaoyqYRsZVoWezrTAy3zROyNeRLbZmCT+z7YCwf9Ow="; + hash = "sha256-h1xpP3fFr8+twa5jXQrZfKFjNAlCvXv7sFvhgJZ88H0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/apptools/default.nix b/nixpkgs/pkgs/development/python-modules/apptools/default.nix index 0905100a2bae..faaf6bec0796 100644 --- a/nixpkgs/pkgs/development/python-modules/apptools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apptools/default.nix @@ -1,12 +1,10 @@ { lib , buildPythonPackage , configobj -, fetchpatch , fetchPypi , importlib-resources , pandas , pytestCheckHook -, pythonAtLeast , pythonOlder , tables , traits @@ -15,34 +13,16 @@ buildPythonPackage rec { pname = "apptools"; - version = "5.1.0"; + version = "5.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "12x5lcs1cllpybz7f0i1lcwvmqsaa5n818wb2165lj049wqxx4yh"; + hash = "sha256-xiaPXfzzCIvK92oAA+ULd3TQG1JY1xmbQQtIUv8iRuM="; }; - patches = [ - # python310: Fix tests - # https://github.com/enthought/apptools/issues/303 - (fetchpatch { - url = "https://github.com/enthought/apptools/commit/10fb73916124f7ae7edf6c6688a05ad95678488f.patch"; - hash = "sha256-izAcP5RWobLvnk2PQx31SX/TUGkw+prbYbjamYVmtjY="; - name = "fix_python310_tests.patch"; - }) - - # python39: importlib_resources -> importlib.resources. This patch will be included - # in the next release after 5.1.0. - (fetchpatch { - url = "https://github.com/enthought/apptools/commit/0ae4f52f19a8c0ca9d7926e17c7de949097f24b4.patch"; - sha256 = "165aiwjisr5c3lasg7xblcha7y1y5bq23vi3g9gc80c24bzwcbsw"; - name = "fix_importlib-resources_naming.patch"; - }) - ]; - propagatedBuildInputs = [ configobj traits @@ -68,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Set of packages that Enthought has found useful in creating a number of applications"; homepage = "https://github.com/enthought/apptools"; + changelog = "https://github.com/enthought/apptools/releases/tag/${version}"; license = licenses.bsdOriginal; maintainers = with maintainers; [ knedlsepp ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index e34c8a31a9d0..73e371ed0aab 100644 --- a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.65"; + version = "9.2.66"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g+inF8eswHNLV6bBVRpyLf6H8PjmPduv7I2svAVEG5U="; + hash = "sha256-l9AakU68ACb02NGKWbkmUp14/lC21PJeGuzexYPTaNg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/argilla/default.nix b/nixpkgs/pkgs/development/python-modules/argilla/default.nix index 24b9668d12b0..4ef9c171d2b2 100644 --- a/nixpkgs/pkgs/development/python-modules/argilla/default.nix +++ b/nixpkgs/pkgs/development/python-modules/argilla/default.nix @@ -65,7 +65,7 @@ }: let pname = "argilla"; - version = "1.13.2"; + version = "1.15.0"; optional-dependencies = { server = [ fastapi @@ -126,7 +126,7 @@ buildPythonPackage { owner = "argilla-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FCPlEbgViWZEyXpdtaa6pJxpgbSXmcfJX/1RUFF7Zs4="; + hash = "sha256-CEB2Q+8JJmYWeqKS1QuOysedCSuPWXcljlmaclwZzmY="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/astroid/default.nix b/nixpkgs/pkgs/development/python-modules/astroid/default.nix index 5e5f9e22fb40..5fd0a5281b2c 100644 --- a/nixpkgs/pkgs/development/python-modules/astroid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/astroid/default.nix @@ -5,8 +5,10 @@ , isPyPy , lazy-object-proxy , setuptools +, wheel , typing-extensions , typed-ast +, pip , pylint , pytestCheckHook , wrapt @@ -28,6 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ @@ -40,6 +43,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pip pytestCheckHook typing-extensions ]; diff --git a/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix index a3ca61f98620..7f6130414488 100644 --- a/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.34.1"; + version = "0.35.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-Ktl6YVYd8QpC6eaz3Xe6YyJZhB92ZLL9/XG4WSc2qS8="; + hash = "sha256-U1PkOu257ppSsoPQr4oYdNKkUrm1WKAPuuMy1pjLx8A="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix b/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix index 71e20a6d5f79..9e43c0494d14 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyncpg"; - version = "0.27.0"; + version = "0.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cgmG2aRwXdikD98XIDb1rnhyJQNqfrRucExFqo9iwFQ="; + hash = "sha256-clLNw6yy9S/qo2ZCgNO814pGvWwQv9aBrP/++hEg4ng="; }; # sandboxing issues on aarch64-darwin, see https://github.com/NixOS/nixpkgs/issues/198495 diff --git a/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix b/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix index fcfa15fcb1de..5ffe2e769cc9 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncsleepiq/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asyncsleepiq"; - version = "1.3.5"; + version = "1.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CLBKFDvhErnWNEs7xWLha2QgUvKRDmj0y1CYYKri3ag="; + hash = "sha256-nKXZXOpwVN8Xe1vwwPGPucvyffiIQ8I4D+0A3qGco5w="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/asyncua/default.nix b/nixpkgs/pkgs/development/python-modules/asyncua/default.nix index 507a6101a168..c17bae7c80f1 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncua/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncua/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , cryptography , fetchFromGitHub +, pyopenssl , pytest-asyncio , pytest-mock , pytestCheckHook @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "asyncua"; - version = "1.0.3"; + version = "1.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "FreeOpcUa"; repo = "opcua-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-fSXhW/Ik96HVecwOFWM+VftSzWGX6O4PzPT7JuaYXy0="; + hash = "sha256-gAyvo+VJPdS/UpXN/h8LqbIRyx84fifSUsW2GUzLgfo="; fetchSubmodules = true; }; @@ -42,12 +43,13 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - aiosqlite aiofiles - pytz + aiosqlite + cryptography + pyopenssl python-dateutil + pytz sortedcontainers - cryptography typing-extensions ]; diff --git a/nixpkgs/pkgs/development/python-modules/attrs/default.nix b/nixpkgs/pkgs/development/python-modules/attrs/default.nix index 855b4bf86982..a298dc36f507 100644 --- a/nixpkgs/pkgs/development/python-modules/attrs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/attrs/default.nix @@ -3,22 +3,31 @@ , buildPythonPackage , fetchPypi , pythonOlder -, setuptools +, hatchling }: buildPythonPackage rec { pname = "attrs"; - version = "22.2.0"; - disabled = pythonOlder "3.6"; + version = "23.1.0"; + disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-ySJ7/C8BmTwD9o2zfR0VyWkBiDI8BnxkHxo1ylgYX5k="; + hash = "sha256-YnmDbVgVE6JvG/I1+azTM7yRFWg/FPfo+uRsmPxQ4BU="; }; + patches = [ + # hatch-vcs and hatch-fancy-pypi-readme depend on pytest, which depends on attrs + ./remove-hatch-plugins.patch + ]; + + postPatch = '' + substituteAllInPlace pyproject.toml + ''; + nativeBuildInputs = [ - setuptools + hatchling ]; outputs = [ @@ -47,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python attributes without boilerplate"; homepage = "https://github.com/python-attrs/attrs"; + changelog = "https://github.com/python-attrs/attrs/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch b/nixpkgs/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch new file mode 100644 index 000000000000..7d7b83a366e0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch @@ -0,0 +1,74 @@ +diff --git a/pyproject.toml b/pyproject.toml +index fb8fae3..998211f 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: MIT + + [build-system] +-requires = ["hatchling", "hatch-vcs", "hatch-fancy-pypi-readme"] ++requires = ["hatchling"] + build-backend = "hatchling.build" + + +@@ -26,7 +26,8 @@ classifiers = [ + "Typing :: Typed", + ] + dependencies = ["importlib_metadata;python_version<'3.8'"] +-dynamic = ["version", "readme"] ++dynamic = ["readme"] ++version = "@version@" + + [project.optional-dependencies] + tests-no-zope = [ +@@ -67,50 +68,9 @@ Changelog = "https://www.attrs.org/en/stable/changelog.html" + Funding = "https://github.com/sponsors/hynek" + Tidelift = "https://tidelift.com/subscription/pkg/pypi-attrs?utm_source=pypi-attrs&utm_medium=pypi" + +- +-[tool.hatch.version] +-source = "vcs" +-raw-options = { local_scheme = "no-local-version" } +- + [tool.hatch.build.targets.wheel] + packages = ["src/attr", "src/attrs"] + +-[tool.hatch.metadata.hooks.fancy-pypi-readme] +-content-type = "text/markdown" +- +-# PyPI doesn't support the <picture> tag. +-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] +-text = """<p align="center"> +- <a href="https://www.attrs.org/"> +- <img src="https://raw.githubusercontent.com/python-attrs/attrs/main/docs/_static/attrs_logo.svg" width="35%" alt="attrs" /> +- </a> +-</p> +-""" +- +-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] +-path = "README.md" +-start-after = "<!-- teaser-begin -->" +- +-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] +-text = """ +- +-## Release Information +- +-""" +- +-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] +-path = "CHANGELOG.md" +-pattern = "\n(###.+?\n)## " +- +-[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] +-text = """ +- +---- +- +-[Full changelog](https://www.attrs.org/en/stable/changelog.html) +-""" +- +- + # Make coverage play nicely with pytest-xdist. + [tool.hatch.build.targets.wheel.hooks.autorun] + dependencies = ["hatch-autorun"] diff --git a/nixpkgs/pkgs/development/python-modules/autarco/default.nix b/nixpkgs/pkgs/development/python-modules/autarco/default.nix index 37625fdb1bd2..b5a8715f6ced 100644 --- a/nixpkgs/pkgs/development/python-modules/autarco/default.nix +++ b/nixpkgs/pkgs/development/python-modules/autarco/default.nix @@ -3,6 +3,7 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytest-asyncio , pytestCheckHook @@ -24,6 +25,22 @@ buildPythonPackage rec { hash = "sha256-3f6N4b6WZPAUUQTuGeb20q0f7ZqDR+O24QRze5RpRlw="; }; + patches = [ + # https://github.com/klaasnicolaas/python-autarco/pull/265 + (fetchpatch { + name = "remove-setuptools-dependency.patch"; + url = "https://github.com/klaasnicolaas/python-autarco/commit/bf40e8a4f64cd9c9cf72930260895537ea5b2adc.patch"; + hash = "sha256-Fgijy7sd67LUIqh3qjQjyothnjdW7Zcil/bQSuVsBR8="; + }) + ]; + + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -33,19 +50,14 @@ buildPythonPackage rec { yarl ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook ]; - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" - ''; - pythonImportsCheck = [ "autarco" ]; diff --git a/nixpkgs/pkgs/development/python-modules/awacs/default.nix b/nixpkgs/pkgs/development/python-modules/awacs/default.nix index 54e7b32825fe..f59eaccd1b9a 100644 --- a/nixpkgs/pkgs/development/python-modules/awacs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awacs/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "awacs"; - version = "2.3.0"; + version = "2.4.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0tizZWcHe1qbLxpXS/IngExaFFUHZyXXlksWcNL/vEw="; + hash = "sha256-iflg6tjqFl1gWOzlJhQwGHhAQ/pKm9n8GVvUz6fSboM="; }; propagatedBuildInputs = lib.lists.optionals (pythonOlder "3.8") [ diff --git a/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix b/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix index a32ff89555ce..a8107fac2b84 100644 --- a/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awkward-cpp/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pythonOlder , cmake +, ninja , numpy , pybind11 , scikit-build-core @@ -11,18 +12,19 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "21"; + version = "22"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-sobmPegDBI/4EvdpxrY28TsNO8vyLhuRsV9s+5WThR4="; + hash = "sha256-IWeWNvshz+NxX4ijIyaleRmThNstpKYplcMQUC1/6F8="; }; nativeBuildInputs = [ cmake + ninja pybind11 scikit-build-core ] ++ scikit-build-core.optional-dependencies.pyproject; diff --git a/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix index 536a67b48372..c716a56dfb24 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.34.0"; + version = "1.36.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,9 +21,14 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-MjX0im9GX0mdWkumUoJUIBjPZl/Ok5+sR6Dgq6vVGKM="; + hash = "sha256-cHpeNY0WY4yai/yWw2Oy1QLLjlj8PFNdB3BMbkP31Ds="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "version=read_version()," 'version="${version}",' + ''; + propagatedBuildInputs = [ six ]; diff --git a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix index 227c0f608df8..2a2915afcd75 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { version = "1.73.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aws"; @@ -28,6 +28,11 @@ buildPythonPackage rec { hash = "sha256-rj+q/06gIvPYTJP/EH9ZrP0Sp4J3K1aCRyNkgpphWP4="; }; + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" "" + ''; + propagatedBuildInputs = [ boto3 jsonschema @@ -35,12 +40,6 @@ buildPythonPackage rec { typing-extensions ]; - preCheck = '' - sed -i '2ienv =\n\tAWS_DEFAULT_REGION=us-east-1' pytest.ini - substituteInPlace pytest.ini \ - --replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" "" - ''; - nativeCheckInputs = [ parameterized pytest-env @@ -54,6 +53,10 @@ buildPythonPackage rec { "samtranslator" ]; + preCheck = '' + sed -i '2ienv =\n\tAWS_DEFAULT_REGION=us-east-1' pytest.ini + ''; + meta = with lib; { description = "Python library to transform SAM templates into AWS CloudFormation templates"; homepage = "https://github.com/aws/serverless-application-model"; diff --git a/nixpkgs/pkgs/development/python-modules/awscrt/default.nix b/nixpkgs/pkgs/development/python-modules/awscrt/default.nix index 2c85cbfcf79c..dc9ddfeceb70 100644 --- a/nixpkgs/pkgs/development/python-modules/awscrt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.16.10"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MQFJm0ebgvBAP2Fb9SDB+LlQaBjSdePiit4lzGvNuSs="; + hash = "sha256-Q5DA+lraOebUYgjFDj11XUPZY1X8qD/1dwgeMoL2SZ0="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix b/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix index 82390e389bd9..a2cdf1f929c3 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.13.0"; + version = "1.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-yTHCcwH/qGsHtNz1dOKdpz4966mrXR/k9EW7ajEX4mA="; + hash = "sha256-ckQXmfjFyJv+IQJpZeJmZyp8XQUMLGURnviZ3VNi4rE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix index b9e3a2e4a053..624c9735b6ac 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix @@ -4,32 +4,36 @@ , pythonOlder , azure-common , azure-mgmt-core -, msrest -, msrestazure +, isodate +, typing-extensions }: buildPythonPackage rec { - version = "2.0.0"; pname = "azure-mgmt-appcontainers"; + version = "3.0.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ccdIdvdgTYPWEZCWqkLc8lEuMuAEERvl5B1huJyBkvU="; - extension = "zip"; + hash = "sha256-oqKPEOnZaIU7IMzDqT552IBJr9RtWt3vFO3SlG8igs0="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest - msrestazure + isodate + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; # no tests included doCheck = false; - pythonImportsCheck = [ "azure.mgmt.appcontainers" ]; + pythonImportsCheck = [ + "azure.mgmt.appcontainers" + ]; meta = with lib; { description = "Microsoft Azure Appcontainers Management Client Library for Python"; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index e3ec3ee71b95..4707f8bc2ae9 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -1,32 +1,32 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest -, msrestazure , azure-common , azure-mgmt-core , azure-mgmt-nspkg +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "25.0.0"; + version = "26.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-je7O92bklsbIlfsTUF2TXUqztAZxn8ep4ezCUHeLuhE="; + hash = "sha256-BpvnSqee5wodtMXPxo/pHCBk8Yy4yPnEdK164d9ILuM="; }; propagatedBuildInputs = [ - msrest - msrestazure azure-common azure-mgmt-core + isodate + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; # has no tests diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index 91fb01f95473..e4d0ae9b288f 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -1,31 +1,31 @@ { lib +, azure-common +, azure-mgmt-core , buildPythonPackage , fetchPypi +, isodate , pythonOlder -, msrest -, msrestazure -, azure-common -, azure-mgmt-core +, typing-extensions }: buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "6.0.1"; + version = "6.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-j+LrnLsfvRNlolKYf72ZUXxg5lb33R7PfxveBSyxHDI="; + hash = "sha256-X/v1AOSZq3kSsbptJs7yZIDZrkEVMgGbt41yViGW4Hs="; }; propagatedBuildInputs = [ - msrest - msrestazure + isodate azure-common azure-mgmt-core + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; pythonNamespaces = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix index b0bdd1c086bb..6d8e08964807 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -1,31 +1,31 @@ { lib -, buildPythonPackage -, fetchPypi , azure-common , azure-mgmt-core -, msrest -, msrestazure +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder +, typing-extensions }: buildPythonPackage rec { - version = "24.0.0"; pname = "azure-mgmt-network"; + version = "25.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-LtahQ2PnJC2jlD3pHp+IBLaUaNXTamZqdFdE/iJ4840="; + hash = "sha256-rZPbkUQJFIeNSSPWHTK79INWeRX5+GJ7o7mEMLhyJ9E="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest - msrestazure + isodate + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; # Module has no tests diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix index 37d74abc72ee..385d55248ecd 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix @@ -1,37 +1,41 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest -, msrestazure , azure-common , azure-mgmt-core -, isPy27 +, buildPythonPackage +, fetchPypi +, isodate +, pythonOlder +, typing-extensions }: buildPythonPackage rec { - version = "1.2.0"; pname = "azure-mgmt-redhatopenshift"; - disabled = isPy27; # don't feel like fixing namespace issues on python2 + version = "1.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-ZU4mKTzny9tsKDrFSU+lll5v6oDivYJlXDriWJLAYec="; + hash = "sha256-LOJldUyWdVShpN8lD8zGdFeYFiKSmODk3WNOP1fJfcs="; }; propagatedBuildInputs = [ - msrest - msrestazure + isodate azure-common azure-mgmt-core + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; pythonNamespaces = "azure.mgmt"; - # no included + # Module has no tests doCheck = false; - pythonImportsCheck = [ "azure.mgmt.redhatopenshift" ]; + pythonImportsCheck = [ + "azure.mgmt.redhatopenshift" + ]; meta = with lib; { description = "Microsoft Azure Red Hat Openshift Management Client Library for Python"; diff --git a/nixpkgs/pkgs/development/python-modules/bentoml/default.nix b/nixpkgs/pkgs/development/python-modules/bentoml/default.nix index ff3a52809946..b09a029f307c 100644 --- a/nixpkgs/pkgs/development/python-modules/bentoml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bentoml/default.nix @@ -68,7 +68,7 @@ }: let - version = "1.1.3"; + version = "1.1.4"; aws = [ fs-s3fs ]; grpc = [ grpcio @@ -104,7 +104,7 @@ buildPythonPackage { owner = "bentoml"; repo = "BentoML"; rev = "v${version}"; - hash = "sha256-RJDFjFxTO7UhGZQB8flXug0xCpFdJqLlCZUu0O5W1YE="; + hash = "sha256-aGSw40haVGo4UpUItStsFxfgjAnY4Rhiat4qDUIINWU="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix b/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix index a40b51498eb2..baa4ddacfec5 100644 --- a/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.13.10"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-IylA73N3bZOs5HjQGbT6xqokb73iO3bdg5M2KCTX3p4="; + hash = "sha256-cx22otbBCSFRTfr+wY1+k5kyX6h9mTQfRBfPw3rplzY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix b/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix index 0bd3562e6025..f93ef838751f 100644 --- a/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "blebox-uniapi"; - version = "2.1.4"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "blebox"; repo = "blebox_uniapi"; rev = "refs/tags/v${version}"; - hash = "sha256-hr3HD8UiI+bKiHcXGnyomJMzP+/GVXLgSUxeH2U6l/4="; + hash = "sha256-cLSI6wa3gHE0QkSVVWMNpb5fyQy0TLDNSqOuGlDJGJc="; }; postPatch = '' @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/blebox/blebox_uniapi/blob/${version}/HISTORY.rst"; + changelog = "https://github.com/blebox/blebox_uniapi/blob/v${version}/HISTORY.rst"; description = "Python API for accessing BleBox smart home devices"; homepage = "https://github.com/blebox/blebox_uniapi"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/python-modules/blockfrost-python/default.nix b/nixpkgs/pkgs/development/python-modules/blockfrost-python/default.nix new file mode 100644 index 000000000000..043384e80bf0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/blockfrost-python/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +# Python deps +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "blockfrost-python"; + version = "0.5.3"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "blockfrost"; + repo = "blockfrost-python"; + rev = "${version}"; + hash = "sha256-mQ8avjyLARJONYn18neCyuHEuv3ySyCNMe+P4+Dlxck="; + }; + + propagatedBuildInputs = [ + requests + setuptools + ]; + + pythonImportsCheck = [ "blockfrost" ]; + + meta = with lib; { + description = "Python SDK for the Blockfrost.io API"; + homepage = "https://github.com/blockfrost/blockfrost-python"; + license = licenses.asl20; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix index a68f8c8da430..3a4f1f567e90 100644 --- a/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "1.7.0"; + version = "1.9.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EmZPiZKm/80nJpPnJWhI9i4I6MhgQMifLOEUBFLqbSw="; + hash = "sha256-DLB2mBjHPVT2Fg2Kr0WUDuu5nqBCbdu525wAD3ERKV8="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/nixpkgs/pkgs/development/python-modules/bootstrap/build/default.nix b/nixpkgs/pkgs/development/python-modules/bootstrap/build/default.nix new file mode 100644 index 000000000000..639d2e3292cb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bootstrap/build/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, python +, build +, flit-core +, installer +, packaging +, pyproject-hooks +, tomli +}: +let + buildBootstrapPythonModule = basePackage: attrs: stdenv.mkDerivation ({ + pname = "${python.libPrefix}-bootstrap-${basePackage.pname}"; + inherit (basePackage) version src meta; + + buildPhase = '' + runHook preBuild + + PYTHONPATH="${flit-core}/${python.sitePackages}" \ + ${python.interpreter} -m flit_core.wheel + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + PYTHONPATH="${installer}/${python.sitePackages}" \ + ${python.interpreter} -m installer \ + --destdir "$out" --prefix "" dist/*.whl + + runHook postInstall + ''; + } // attrs); + + bootstrap-packaging = buildBootstrapPythonModule packaging {}; + + bootstrap-pyproject-hooks = buildBootstrapPythonModule pyproject-hooks {}; + + bootstrap-tomli = buildBootstrapPythonModule tomli {}; +in +buildBootstrapPythonModule build { + propagatedBuildInputs = [ + bootstrap-packaging + bootstrap-pyproject-hooks + ] ++ lib.optionals (python.pythonOlder "3.11") [ + bootstrap-tomli + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/bootstrap/flit-core/default.nix b/nixpkgs/pkgs/development/python-modules/bootstrap/flit-core/default.nix new file mode 100644 index 000000000000..ab9e52538d34 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bootstrap/flit-core/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, python +, flit-core +}: + +stdenv.mkDerivation { + pname = "${python.libPrefix}-bootstrap-${flit-core.pname}"; + inherit (flit-core) version src patches meta; + + sourceRoot = "source/flit_core"; + + buildPhase = '' + runHook preBuild + + ${python.interpreter} -m flit_core.wheel + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + ${python.interpreter} bootstrap_install.py dist/flit_core-*.whl \ + --install-root "$out" --installdir "/${python.sitePackages}" + + runHook postInstall + ''; +} diff --git a/nixpkgs/pkgs/development/python-modules/bootstrap/installer/default.nix b/nixpkgs/pkgs/development/python-modules/bootstrap/installer/default.nix new file mode 100644 index 000000000000..b569e7fa6dc8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bootstrap/installer/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, python +, flit-core +, installer +}: + +stdenv.mkDerivation { + pname = "${python.libPrefix}-bootstrap-${installer.pname}"; + inherit (installer) version src meta; + + buildPhase = '' + runHook preBuild + + PYTHONPATH="${flit-core}/${python.sitePackages}" \ + ${python.interpreter} -m flit_core.wheel + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + PYTHONPATH=src ${python.interpreter} -m installer \ + --destdir "$out" --prefix "" dist/installer-*.whl + + runHook postInstall + ''; +} diff --git a/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix new file mode 100644 index 000000000000..be8514f08acd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, pythonOlder +, types-awscrt +, typing-extensions +}: + +buildPythonPackage rec { + pname = "botocore-stubs"; + version = "1.31.39"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "botocore_stubs"; + inherit version; + hash = "sha256-pqpGnPXZT5lDnTpXBfsJk0/tBtUovgazAWZf/TZJfNg="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + types-awscrt + typing-extensions + ]; + + pythonImportsCheck = [ + "botocore-stubs" + ]; + + meta = with lib; { + description = "Type annotations and code completion for botocore"; + homepage = "https://pypi.org/project/botocore-stubs/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/boxx/default.nix b/nixpkgs/pkgs/development/python-modules/boxx/default.nix index 925aa2b2568b..a2a71ad0c986 100644 --- a/nixpkgs/pkgs/development/python-modules/boxx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boxx/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "boxx"; - version = "0.10.9"; + version = "0.10.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fWOGKDk7eJVlE9LMau3DZF8nFLUrmHpunAXdqLxHFHk="; + hash = "sha256-7A5qFpISrjVrqQfKk6BPb7RhDWd9f90eF3bku+LsCcc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bpycv/default.nix b/nixpkgs/pkgs/development/python-modules/bpycv/default.nix index 09c3b4f8283d..a6d385e97781 100644 --- a/nixpkgs/pkgs/development/python-modules/bpycv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bpycv/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "bpycv"; - version = "0.3.6"; + version = "0.4.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-4N4rCVhbfJx7H7jS88QR3EcRupISIhnLuZ+cgfwIzg4="; + hash = "sha256-qqNGemDB0aagCXjrECuh6kLksf+KujPejpnXVqFG8GY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bqplot/default.nix b/nixpkgs/pkgs/development/python-modules/bqplot/default.nix index 074c75fffb7a..5695be669bbc 100644 --- a/nixpkgs/pkgs/development/python-modules/bqplot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bqplot/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchPypi , jupyter-packaging +, jupyterlab , bqscales , ipywidgets , numpy @@ -23,8 +24,17 @@ buildPythonPackage rec { hash = "sha256-FNjeb5pNGUW76mwTIOpNHJMlb3JoN3T24AINzFefPdI="; }; + # upstream seems in flux for 0.13 release. they seem to want to migrate from + # jupyter_packaging to hatch, so let's patch instead of fixing upstream + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "jupyter_packaging~=" "jupyter_packaging>=" \ + --replace "jupyterlab~=" "jupyterlab>=" + ''; + nativeBuildInputs = [ jupyter-packaging + jupyterlab ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bqscales/default.nix b/nixpkgs/pkgs/development/python-modules/bqscales/default.nix index 3bd015a58f67..8b0ebb610ad9 100644 --- a/nixpkgs/pkgs/development/python-modules/bqscales/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bqscales/default.nix @@ -13,7 +13,6 @@ buildPythonPackage rec { pname = "bqscales"; version = "0.3.1"; - format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,6 +21,19 @@ buildPythonPackage rec { hash = "sha256-C+/GLpqYpePngbn5W0MwvpdmVgFZF7aGHyKMgO5XM90="; }; + # We relax dependencies here instead of pulling in a patch because upstream + # has released a new version using hatch-jupyter-builder, but it is not yet + # trivial to upgrade to that. + # + # Per https://github.com/bqplot/bqscales/issues/76, jupyterlab is not needed + # as a build dependency right now. + # + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"jupyterlab==3.*",' "" \ + --replace 'jupyter_packaging~=' 'jupyter_packaging>=' + ''; + nativeBuildInputs = [ hatchling jupyter-packaging diff --git a/nixpkgs/pkgs/development/python-modules/build/default.nix b/nixpkgs/pkgs/development/python-modules/build/default.nix index 0eaad47c44f0..f86f47e2bd85 100644 --- a/nixpkgs/pkgs/development/python-modules/build/default.nix +++ b/nixpkgs/pkgs/development/python-modules/build/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, build , buildPythonPackage , fetchFromGitHub , flit-core @@ -41,36 +42,52 @@ buildPythonPackage rec { tomli ]; - nativeCheckInputs = [ - filelock - pytest-mock - pytest-rerunfailures - pytest-xdist - pytestCheckHook - setuptools - toml - ]; + # We need to disable tests because this package is part of the bootstrap chain + # and its test dependencies cannot be built yet when this is being built. + doCheck = false; - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" - ]; + passthru.tests = { + pytest = buildPythonPackage { + pname = "${pname}-pytest"; + inherit version; + format = "other"; - __darwinAllowLocalNetworking = true; + dontBuild = true; + dontInstall = true; - disabledTests = [ - # Tests often fail with StopIteration - "test_isolat" - "test_default_pip_is_never_too_old" - "test_build" - "test_with_get_requires" - "test_init" - "test_output" - "test_wheel_metadata" - ] ++ lib.optionals stdenv.isDarwin [ - # Expects Apple's Python and its quirks - "test_can_get_venv_paths_with_conflicting_default_scheme" - ]; + nativeCheckInputs = [ + build + filelock + pytest-mock + pytest-rerunfailures + pytest-xdist + pytestCheckHook + setuptools + toml + ]; + + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + + __darwinAllowLocalNetworking = true; + + disabledTests = [ + # Tests often fail with StopIteration + "test_isolat" + "test_default_pip_is_never_too_old" + "test_build" + "test_with_get_requires" + "test_init" + "test_output" + "test_wheel_metadata" + ] ++ lib.optionals stdenv.isDarwin [ + # Expects Apple's Python and its quirks + "test_can_get_venv_paths_with_conflicting_default_scheme" + ]; + }; + }; pythonImportsCheck = [ "build" diff --git a/nixpkgs/pkgs/development/python-modules/cairo-lang/default.nix b/nixpkgs/pkgs/development/python-modules/cairo-lang/default.nix deleted file mode 100644 index d183b607b31a..000000000000 --- a/nixpkgs/pkgs/development/python-modules/cairo-lang/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ lib -, aiohttp -, buildPythonPackage -, cachetools -, ecdsa -, eth-hash -, fastecdsa -, fetchzip -, frozendict -, gmp -, lark -, marshmallow -, marshmallow-dataclass -, marshmallow-enum -, marshmallow-oneofschema -, mpmath -, numpy -, pipdeptree -, prometheus-client -, pytest -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pyyaml -, setuptools -, sympy -, typeguard -, web3 -}: - -buildPythonPackage rec { - pname = "cairo-lang"; - version = "0.10.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchzip { - url = "https://github.com/starkware-libs/cairo-lang/releases/download/v${version}/cairo-lang-${version}.zip"; - hash = "sha256-MNbzDqqNhij9JizozLp9hhQjbRGzWxECOErS3TOPlAA="; - }; - - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - - buildInputs = [ - gmp - ]; - - propagatedBuildInputs = [ - aiohttp - cachetools - setuptools - ecdsa - fastecdsa - sympy - mpmath - numpy - typeguard - frozendict - prometheus-client - marshmallow - marshmallow-enum - marshmallow-dataclass - marshmallow-oneofschema - pipdeptree - lark - web3 - eth-hash - pyyaml - ] ++ eth-hash.optional-dependencies.pycryptodome; - - nativeCheckInputs = [ - pytest-asyncio - pytestCheckHook - ]; - - pythonRelaxDeps = [ - "frozendict" - ]; - - pythonRemoveDeps = [ - # TODO: pytest and pytest-asyncio must be removed as they are check inputs - "pytest" - "pytest-asyncio" - ]; - - postFixup = '' - chmod +x $out/bin/* - ''; - - # There seems to be no test included in the ZIP release… - # Cloning from GitHub is harder because they use a custom CMake setup - # TODO(raitobezarius): upstream was pinged out of band about it. - doCheck = false; - - meta = with lib; { - description = "Tooling for Cairo language"; - homepage = "https://github.com/starkware/cairo-lang"; - license = licenses.mit; - maintainers = with maintainers; [ raitobezarius ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix b/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix index ff79eacf99b8..fb0a81e202d9 100644 --- a/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix @@ -11,25 +11,24 @@ , pytestCheckHook , cairo , cffi +, flit-core , numpy , withXcffib ? false , xcffib , glib , gdk-pixbuf -, setuptools }: buildPythonPackage rec { pname = "cairocffi"; - version = "1.5.1"; + version = "1.6.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; - format = "pyproject"; - src = fetchPypi { inherit pname version; - hash = "sha256-Bxq3ty41MzALC/1VpSBWtP/cHtbmVneeKs7Ztwm4opU="; + hash = "sha256-eOa75HNXZAxFPQvpKfpJzQXM4uEobz0qHKnL2n79uLc="; }; patches = [ @@ -45,11 +44,9 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - setuptools + flit-core ]; - propagatedNativeBuildInputs = [ cffi ]; - propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; @@ -59,6 +56,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ + "cairocffi" + ]; + meta = with lib; { changelog = "https://github.com/Kozea/cairocffi/blob/v${version}/NEWS.rst"; homepage = "https://github.com/SimonSapin/cairocffi"; diff --git a/nixpkgs/pkgs/development/python-modules/canals/default.nix b/nixpkgs/pkgs/development/python-modules/canals/default.nix index 6832a3626132..ae4d8615c757 100644 --- a/nixpkgs/pkgs/development/python-modules/canals/default.nix +++ b/nixpkgs/pkgs/development/python-modules/canals/default.nix @@ -1,44 +1,31 @@ { lib , buildPythonPackage -, pythonOlder -, pythonAtLeast , fetchFromGitHub -# native build inputs , hatchling -# build input -, networkx -# check inputs -, pytestCheckHook -# optional dependencies -, pygraphviz -, requests , mkdocs-material , mkdocs-mermaid2-plugin , mkdocstrings +, networkx +, pygraphviz +, pytestCheckHook +, pythonOlder +, requests }: -let + +buildPythonPackage rec { pname = "canals"; - version = "0.2.2"; - optional-dependencies = { - graphviz = [ pygraphviz ]; - mermaid = [ requests ]; - docs = [ mkdocs-material mkdocs-mermaid2-plugin mkdocstrings ]; - }; -in -buildPythonPackage { - inherit version pname; + version = "0.6.0"; format = "pyproject"; - # Pypi source package doesn't contain tests + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "deepset-ai"; repo = pname; - rev = "v${version}"; - hash = "sha256-dF0bkY4DFJIovaseNiOLgF8lmha+njTTTzr2/4LzZEc="; + rev = "refs/tags/v${version}"; + hash = "sha256-s4nKPywfRn2hNhn/coWGqShv7D+MCEHblVzfweQJlnM="; }; - disabled = pythonOlder "3.8"; - nativeBuildInputs = [ hatchling ]; @@ -47,18 +34,37 @@ buildPythonPackage { networkx ]; - passthru = { inherit optional-dependencies; }; + passthru.optional-dependencies = { + graphviz = [ + pygraphviz + ]; + mermaid = [ + requests + ]; + docs = [ + mkdocs-material + mkdocs-mermaid2-plugin + mkdocstrings + ]; + }; nativeCheckInputs = [ pytestCheckHook - ] ++ optional-dependencies.mermaid; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTestPaths = [ - # requires internet connection to mermaid.ink + # Test requires internet connection to mermaid.ink "test/pipelines/integration" ]; - pythonImportsCheck = [ "canals" ]; + disabledTests = [ + # Path issue + "test_draw_pygraphviz" + ]; + + pythonImportsCheck = [ + "canals" + ]; meta = with lib; { description = "A component orchestration engine"; diff --git a/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/nixpkgs/pkgs/development/python-modules/casbin/default.nix index ce337cb8de3c..9507cad79502 100644 --- a/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.23.1"; + version = "1.26.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-jL02G4Z2Lhy/02Lb7aSUDEKg2h34UXJbwMFaDSPgc+U="; + hash = "sha256-wM27HW5w8fDjHoGV+OGDTaO5SKJrq8fGKh1EPQt+wlo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/celery-types/default.nix b/nixpkgs/pkgs/development/python-modules/celery-types/default.nix index 753d7fcc677b..6379d041f160 100644 --- a/nixpkgs/pkgs/development/python-modules/celery-types/default.nix +++ b/nixpkgs/pkgs/development/python-modules/celery-types/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , poetry-core , pythonOlder @@ -18,10 +19,15 @@ buildPythonPackage rec { hash = "sha256-1OLUJxsuxG/sCKDxKiU4i7o5HyaJdIW8rPo8UofMI28="; }; - patchPhase = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" - ''; + patches = [ + # remove extraneous build dependencies: + # https://github.com/sbdchd/celery-types/pull/138 + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/sbdchd/celery-types/commit/ff83f06a0302084e1a690e2a5a8b25f2c0dfc6e7.patch"; + hash = "sha256-c68SMugg6Qk88FC842/czoxLpk0uVAVSlWsvo4NI9uo="; + }) + ]; propagatedBuildInputs = [ typing-extensions diff --git a/nixpkgs/pkgs/development/python-modules/celery/default.nix b/nixpkgs/pkgs/development/python-modules/celery/default.nix index 1864b58d92d3..9a198ab21fc6 100644 --- a/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "celery"; - version = "5.3.1"; + version = "5.3.3"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+E0cIaFSDBFsK30mWTkmWBGRQ1oDqnS3fJQbk8ocYhA="; + hash = "sha256-uskO+ZtwubW11M/Ov28atRaLhsYSC8fFgUzYI039k4E="; }; propagatedBuildInputs = [ @@ -95,6 +95,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed task queue"; homepage = "https://github.com/celery/celery/"; + changelog = "https://github.com/celery/celery/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/cemm/default.nix b/nixpkgs/pkgs/development/python-modules/cemm/default.nix index 3036393344c9..9f9ae3b16be5 100644 --- a/nixpkgs/pkgs/development/python-modules/cemm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cemm/default.nix @@ -3,6 +3,7 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytest-asyncio , pytestCheckHook @@ -24,6 +25,15 @@ buildPythonPackage rec { hash = "sha256-BorgGHxoEeIGyJKqe9mFRDpcGHhi6/8IV7ubEI8yQE4="; }; + patches = [ + # https://github.com/klaasnicolaas/python-cemm/pull/360 + (fetchpatch { + name = "remove-setuptools-dependency.patch"; + url = "https://github.com/klaasnicolaas/python-cemm/commit/1e373dac078f18563264e6733baf6a93962cac4b.patch"; + hash = "sha256-DVNn4BZwi8yNpKFmzt7YSYhzzB4vaAyrd/My8TtYzj0="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace '"0.0.0"' '"${version}"' \ @@ -39,6 +49,8 @@ buildPythonPackage rec { yarl ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-asyncio diff --git a/nixpkgs/pkgs/development/python-modules/censys/default.nix b/nixpkgs/pkgs/development/python-modules/censys/default.nix index 70601478b1bd..150a8e36747a 100644 --- a/nixpkgs/pkgs/development/python-modules/censys/default.nix +++ b/nixpkgs/pkgs/development/python-modules/censys/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.2.4"; + version = "2.2.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "refs/tags/v${version}"; - hash = "sha256-gCq01lfAoKoS74C8gjj84mZpXDMtdNVaRLwhlEXwiPI="; + hash = "sha256-D25deUPMWc6KRlwytSfZqoPeJGmTV304slUP9gCyrUw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 02998caec37c..8b5ff73d1faa 100644 --- a/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -17,7 +17,7 @@ let pname = "chacha20poly1305-reuseable"; - version = "0.4.1"; + version = "0.4.2"; in buildPythonPackage { @@ -30,7 +30,7 @@ buildPythonPackage { owner = "bdraco"; repo = pname; rev = "v${version}"; - hash = "sha256-JDkTSJi7QltKAdgkM+aJ33DP2emOAviyCqI/jeapUB8="; + hash = "sha256-RBXEumw5A/XzB/LazUcvq8JM/Ahvcy9lCTYKpGcY7go="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/clarifai/default.nix b/nixpkgs/pkgs/development/python-modules/clarifai/default.nix index ffc02aa60480..8f6fdc18509f 100644 --- a/nixpkgs/pkgs/development/python-modules/clarifai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clarifai/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "9.5.2"; + version = "9.7.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-utils"; rev = "refs/tags/${version}"; - hash = "sha256-29by0YAQ7qc0gL/3lAFOk4FLDB5Qv4X9QDyK49gfyAo="; + hash = "sha256-/zgHgD2kf3ZG7Mu9AEBfOwqpcD0Ye0LVrFxLeuGurCM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/nixpkgs/pkgs/development/python-modules/claripy/default.nix index 8ebadc186df2..d71fc9266d2d 100644 --- a/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.65"; + version = "9.2.66"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/Ou2Kl7Fw5QpzoibNOKJPnAwRsR3EDtYypCrOQc7yjI="; + hash = "sha256-CDFZ6CN3pqNpwigYVHyKxwpa9iPfl4m/XDAo1YSRir8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cle/default.nix b/nixpkgs/pkgs/development/python-modules/cle/default.nix index cfca0e49e379..a8aa9cbfbc60 100644 --- a/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.65"; + version = "9.2.66"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-reJRy2KNk4YrkPkVH7eitMVS7V9MPTZNjo9+Wmgx5vQ="; + hash = "sha256-/LDVpw1Ej2YuzwA2qUoZv/ajQZPL9dDvvawj9r5bGbo="; }; nativeBuildInputs = [ @@ -74,6 +74,8 @@ buildPythonPackage rec { "test_plt_full_relro" # Test fails "test_tls_pe_incorrect_tls_data_start" + "test_x86" + "test_x86_64" # The required parts is not present on Nix "test_remote_file_map" ]; diff --git a/nixpkgs/pkgs/development/python-modules/click-odoo-contrib/default.nix b/nixpkgs/pkgs/development/python-modules/click-odoo-contrib/default.nix new file mode 100644 index 000000000000..b0ddaef004b9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/click-odoo-contrib/default.nix @@ -0,0 +1,43 @@ +{ buildPythonPackage +, click-odoo +, fetchPypi +, importlib-resources +, lib +, manifestoo-core +, nix-update-script +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "click-odoo-contrib"; + version = "1.16.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-VFoS/lOw/jbJNj9xfgZHKzR6JDTwnlCAItq4mZ3RA6I="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + click-odoo + manifestoo-core + ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + passthru.updateScript = nix-update-script { }; + + pythonImportsCheck = [ "click_odoo_contrib" ]; + + meta = with lib; { + description = "Collection of community-maintained scripts for Odoo maintenance"; + homepage = "https://github.com/acsone/click-odoo-contrib"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ yajo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/click-odoo/default.nix b/nixpkgs/pkgs/development/python-modules/click-odoo/default.nix new file mode 100644 index 000000000000..a618359735f1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/click-odoo/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage +, click +, fetchPypi +, lib +, nix-update-script +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "click-odoo"; + version = "1.6.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-zyfgsHzIoz4lnqANe63b2oqgD/oxBbTbJYEedfSHWQ8="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + click + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Odoo scripting helper library"; + homepage = "https://github.com/acsone/click-odoo"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ yajo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/clintermission/default.nix b/nixpkgs/pkgs/development/python-modules/clintermission/default.nix index c84fd16f823c..9b439fa16084 100644 --- a/nixpkgs/pkgs/development/python-modules/clintermission/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clintermission/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "clintermission"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "sebageek"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HPeO9K91a0MacSUN0SR0lPEWRTQgP/cF1FZaNvZLxAg="; + hash = "sha256-e7C9IDr+mhVSfU8lMywjX1BYwFo/qegPNzabak7UPcY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix b/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix index 042091634481..f11a1cff485e 100644 --- a/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.6.0"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1p0Lrx4uirgyhE8cdhrSOJLBSN11f6X5WqdWtVutDzQ="; + hash = "sha256-Bw1RhYFTz1bw+4APZKTyWP/G+LWB3R9WI/QEduEgWTQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cloup/default.nix b/nixpkgs/pkgs/development/python-modules/cloup/default.nix index d5502d9a9fa2..d23b27833bfc 100644 --- a/nixpkgs/pkgs/development/python-modules/cloup/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloup/default.nix @@ -5,18 +5,19 @@ , click , setuptools-scm , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "cloup"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ur1L3P0nT4Z3nW0845ueoPbMWrPU7+NbpoQebW0DeJM="; + hash = "sha256-4ItMwje7mlvY/4G6btSUmOIgDaw5InsWSOlXiCAo6ZM="; }; nativeBuildInputs = [ @@ -25,6 +26,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ click + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/clr-loader/default.nix b/nixpkgs/pkgs/development/python-modules/clr-loader/default.nix index 213a57ff0621..c0122a0d3d9d 100644 --- a/nixpkgs/pkgs/development/python-modules/clr-loader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clr-loader/default.nix @@ -12,11 +12,11 @@ let pname = "clr-loader"; - version = "0.2.5"; + version = "0.2.6"; src = fetchPypi { pname = "clr_loader"; inherit version; - hash = "sha256-gu1ftlRynRT9iCludLtrhOss+5dv9LfUnU5En9eKIms="; + hash = "sha256-AZNIrmtqg8ekBtFFN8J3zs96OlOyY+w0LIHe1YRaZ+4="; }; # This buildDotnetModule is used only to get nuget sources, the actual diff --git a/nixpkgs/pkgs/development/python-modules/cmake/default.nix b/nixpkgs/pkgs/development/python-modules/cmake/default.nix new file mode 100644 index 000000000000..c9ee7d11c8fb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cmake/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, flit-core +, cmake +}: + +buildPythonPackage rec { + pname = "cmake"; + inherit (cmake) version; + format = "pyproject"; + + src = ./stub; + + postUnpack = '' + substituteInPlace "$sourceRoot/pyproject.toml" \ + --subst-var version + + substituteInPlace "$sourceRoot/cmake/__init__.py" \ + --subst-var version \ + --subst-var-by CMAKE_BIN_DIR "${cmake}/bin" + ''; + + inherit (cmake) setupHooks; + + nativeBuildInputs = [ + flit-core + ]; + + pythonImportsCheck = [ + "cmake" + ]; + + meta = with lib; { + description = "CMake is an open-source, cross-platform family of tools designed to build, test and package software"; + longDescription = '' + This is a stub of the cmake package on PyPI that uses the cmake program + provided by nixpkgs instead of downloading cmake from the web. + ''; + homepage = "https://github.com/scikit-build/cmake-python-distributions"; + license = licenses.asl20; + maintainers = with maintainers; [ tjni ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cmake/stub/cmake/__init__.py b/nixpkgs/pkgs/development/python-modules/cmake/stub/cmake/__init__.py new file mode 100644 index 000000000000..512a13f3d94a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cmake/stub/cmake/__init__.py @@ -0,0 +1,19 @@ +import os +import subprocess +import sys + +__version__ = '@version@' + +CMAKE_BIN_DIR = '@CMAKE_BIN_DIR@' + +def _program(name, args): + return subprocess.call([os.path.join(CMAKE_BIN_DIR, name)] + args, close_fds=False) + +def cmake(): + raise SystemExit(_program('cmake', sys.argv[1:])) + +def cpack(): + raise SystemExit(_program('cpack', sys.argv[1:])) + +def ctest(): + raise SystemExit(_program('ctest', sys.argv[1:])) diff --git a/nixpkgs/pkgs/development/python-modules/cmake/stub/pyproject.toml b/nixpkgs/pkgs/development/python-modules/cmake/stub/pyproject.toml new file mode 100644 index 000000000000..f5c0502a3b7f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cmake/stub/pyproject.toml @@ -0,0 +1,13 @@ +[build-system] +requires = ["flit_core"] +build-backend = "flit_core.buildapi" + +[project] +name = "cmake" +version = "@version@" +description = "CMake is an open-source, cross-platform family oftools designed to build, test and package software" + +[project.scripts] +cmake = "cmake:cmake" +cpack = "cmake:cpack" +ctest = "cmake:ctest" diff --git a/nixpkgs/pkgs/development/python-modules/cobs/default.nix b/nixpkgs/pkgs/development/python-modules/cobs/default.nix new file mode 100644 index 000000000000..4ea171d94291 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cobs/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "cobs"; + version = "1.2.0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-2TsQtTcNyIaJYK77cK2x9zpOYQexaRgwekru79PtuPY="; + }; + + checkPhase = '' + runHook preCheck + + python -m cobs.cobs.test + python -m cobs.cobsr.test + + runHook postCheck + ''; + + pythonImportsCheck = [ + "cobs" + "cobs.cobs" + "cobs.cobsr" + ]; + + meta = with lib; { + description = "Python functions for encoding and decoding COBS"; + longDescription = '' + COBS is a method of encoding a packet of bytes into a form that contains no bytes with value zero (0x00). The input packet of bytes can contain bytes in the full range of 0x00 to 0xFF. The COBS encoded packet is guaranteed to generate packets with bytes only in the range 0x01 to 0xFF. Thus, in a communication protocol, packet boundaries can be reliably delimited with 0x00 bytes. + ''; + homepage = "https://github.com/cmcqueen/cobs-python/"; + license = licenses.mit; + maintainers = [ teams.ororatech ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/coconut/default.nix b/nixpkgs/pkgs/development/python-modules/coconut/default.nix index 06fe43806354..07e070d0493e 100644 --- a/nixpkgs/pkgs/development/python-modules/coconut/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coconut/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "coconut"; - version = "2.2.0"; + version = "3.0.3"; src = fetchFromGitHub { owner = "evhub"; repo = "coconut"; rev = "refs/tags/v${version}"; - hash = "sha256-+OrVNtre7kAfU5L7/6DadZxFNWVt5raF6HLGXHHpOvE="; + hash = "sha256-u1tcIu0U1VZrUx2hVdtRDv1N4jVf176kQSw47/7lOXY="; }; propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ]; diff --git a/nixpkgs/pkgs/development/python-modules/cohere/default.nix b/nixpkgs/pkgs/development/python-modules/cohere/default.nix index 34df37e4db9f..29ec01f23823 100644 --- a/nixpkgs/pkgs/development/python-modules/cohere/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cohere/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , poetry-core , pythonOlder @@ -22,6 +23,15 @@ buildPythonPackage rec { hash = "sha256-9hFDj0Cd/F1aChU6WFNJ9agLFpxxArWZTZmZ7PhECGY="; }; + patches = [ + # https://github.com/cohere-ai/cohere-python/pull/289 + (fetchpatch { + name = "replace-poetry-with-poetry-core.patch"; + url = "https://github.com/cohere-ai/cohere-python/commit/e86480336331c0cf6f67e26b0825467dfca5b277.patch"; + hash = "sha256-P1Ioq5ypzT3tx6cxrI3ep34Fi4cUx88YkfJ5ErN3VHk="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix index ca1dd48a9df5..b426de499aa0 100644 --- a/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.8.10.19"; + version = "2023.8.24.13"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-sXWcnl6E2Aw78Y4JPpTQlRmhRP6egl6eo81N2PIhi34="; + hash = "sha256-Ju8QczI/vyX4//WMy92H66DafTGJefsOqIjifCfQXGU="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/commoncode/default.nix b/nixpkgs/pkgs/development/python-modules/commoncode/default.nix index b5400b185f31..98c6492194c2 100644 --- a/nixpkgs/pkgs/development/python-modules/commoncode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/commoncode/default.nix @@ -5,7 +5,6 @@ , buildPythonPackage , click , fetchPypi -, intbitset , pytest-xdist , pytestCheckHook , pythonAtLeast @@ -14,26 +13,20 @@ , saneyaml , setuptools-scm , text-unidecode -, typing }: buildPythonPackage rec { pname = "commoncode"; - version = "31.0.2"; + version = "31.0.3"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UWd8fTHVEC5ywETfMIWjfXm4xiNaMrVpwkQ/woeXc0k="; + hash = "sha256-ura55/m/iesqN6kSYmdHB1sbthSHXaFWiQ76wVmyl0E="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "intbitset >= 2.3.0, < 3.0" "intbitset >= 2.3.0" - ''; - dontConfigure = true; nativeBuildInputs = [ @@ -44,12 +37,9 @@ buildPythonPackage rec { attrs beautifulsoup4 click - intbitset requests saneyaml text-unidecode - ] ++ lib.optionals (pythonOlder "3.7") [ - typing ]; nativeCheckInputs = [ @@ -83,7 +73,8 @@ buildPythonPackage rec { meta = with lib; { description = "A set of common utilities, originally split from ScanCode"; homepage = "https://github.com/nexB/commoncode"; + changelog = "https://github.com/nexB/commoncode/blob/v${version}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cookies/default.nix b/nixpkgs/pkgs/development/python-modules/cookies/default.nix index a4e35dac346a..3f0d64c0c22d 100644 --- a/nixpkgs/pkgs/development/python-modules/cookies/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cookies/default.nix @@ -1,15 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "cookies"; version = "2.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "13pfndz8vbk4p2a44cfbjsypjarkrall71pgc97glk5fiiw9idnn"; + hash = "sha256-1raYeIyuTPpOYu+GQ6nKMyt5vZbLMUKUuGSujX6z7o4="; }; - doCheck = false; + patches = [ + (fetchpatch { + name = "fix-deprecations.patch"; + url = "https://gitlab.com/sashahart/cookies/-/commit/22543d970568d577effe120c5a34636a38aa397b.patch"; + hash = "sha256-8e3haOnbSXlL/ZY4uv6P4+ABBKrsCjbEpsLHaulbIUk="; + }) + ]; + + nativeBuildInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # https://gitlab.com/sashahart/cookies/-/issues/6 + "test_encoding_assumptions" + ]; meta = with lib; { description = "Friendlier RFC 6265-compliant cookie parser/renderer"; diff --git a/nixpkgs/pkgs/development/python-modules/coredis/default.nix b/nixpkgs/pkgs/development/python-modules/coredis/default.nix index 13fbe5ab123d..9185fe48bb9d 100644 --- a/nixpkgs/pkgs/development/python-modules/coredis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coredis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "coredis"; - version = "4.15.1"; + version = "4.16.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9nojHufUt53Ovoos4gaR7qh1xN8D1+gJOEyFsOndXJU="; + hash = "sha256-7qpoNc5/z8/EKtGWULrPPwfH9swYe9TqqUL+zxrFQSk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/cose/default.nix b/nixpkgs/pkgs/development/python-modules/cose/default.nix new file mode 100644 index 000000000000..c591677b5316 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cose/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +# Python deps +, attrs +, cbor2 +, certvalidator +, cryptography +, ecdsa +, setuptools +}: + +buildPythonPackage rec { + pname = "cose"; + version = "1.0.1"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "TimothyClaeys"; + repo = "pycose"; + rev = "v${version}"; + hash = "sha256-8d6HebWlSKgx7dmOnT7ZZ5mrMfg6mNWhz1hHPv75XF4="; + }; + + propagatedBuildInputs = [ + attrs + cbor2 + certvalidator + cryptography + ecdsa + setuptools + ]; + + pythonImportsCheck = [ "pycose" ]; + + meta = with lib; { + description = "A Python implementation of the COSE specification"; + homepage = "https://github.com/TimothyClaeys/pycose"; + license = licenses.bsd3; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/curtsies/default.nix b/nixpkgs/pkgs/development/python-modules/curtsies/default.nix index ac36041deb2b..4a17769e18e8 100644 --- a/nixpkgs/pkgs/development/python-modules/curtsies/default.nix +++ b/nixpkgs/pkgs/development/python-modules/curtsies/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "curtsies"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YtEPNJxVOEUwZVan8mY86WsJjYxbvEDa7Hpu7d4WIrA="; + hash = "sha256-br4zIVvXyShRpQYEnHIMykz1wZLBZlwdepigTEcCdg4="; }; propagatedBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Curses-like terminal wrapper, with colored strings!"; homepage = "https://github.com/bpython/curtsies"; + changelog = "https://github.com/bpython/curtsies/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; broken = stdenv.isDarwin; diff --git a/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index b6bbf7b2dfc6..d13bef9f0bd1 100644 --- a/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "4.0.1"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GCY7M0XnVsGyuADSq/EzOy9fged5frj+hRDLhs2Uq8I="; + hash = "sha256-pRYjpmHhsw03b87YjS8YMmkQNwfcihp/bk56LFn55AU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix index bc8a5df2ed17..70cd89afdcad 100644 --- a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix @@ -37,11 +37,12 @@ buildPythonPackage rec { export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" # install "." instead of "*.whl" - ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install . --no-index --no-warn-script-location --prefix="$out" --no-cache + pip install . --no-index --no-warn-script-location --prefix="$out" --no-cache ''; nativeBuildInputs = [ pari + python.pythonForBuild.pkgs.pip ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix b/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix index d9b16bcc069a..8b8ca7a7208b 100644 --- a/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.14"; + version = "0.5.15"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lidatong"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pCvVKHh2elHaukEJNTw8MgJmoTlYjO9aVWFCQXXD13c="; + hash = "sha256-ADWNB2Eu4TwlAvchyzBwGiw9YT9McPr9lsNfo1lR1WI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/datadiff/default.nix b/nixpkgs/pkgs/development/python-modules/datadiff/default.nix index 446fdaf07b31..a971509ca823 100644 --- a/nixpkgs/pkgs/development/python-modules/datadiff/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datadiff/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "datadiff"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-I9QpQyW3sHyUgCYZYfJecTJDNHLaQtqnXG4WeA4p5VE="; + hash = "sha256-fOcN/uqMM/HYjbRrDv/ukFzDa023Ofa7BwqC3omB0ws="; }; # Tests are not part of the PyPI releases diff --git a/nixpkgs/pkgs/development/python-modules/dataproperty/default.nix b/nixpkgs/pkgs/development/python-modules/dataproperty/default.nix index af221199c910..539c3324204e 100644 --- a/nixpkgs/pkgs/development/python-modules/dataproperty/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dataproperty/default.nix @@ -1,39 +1,55 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib +, loguru , mbstrdecoder -, typepy , pytestCheckHook +, pythonOlder +, tcolorpy , termcolor +, typepy }: buildPythonPackage rec { pname = "dataproperty"; - version = "0.55.0"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; - rev = "v${version}"; - hash = "sha256-ODSrKZ8M/ni9r2gkVIKWaKkdr+3AVi4INkEKJ+cmb44="; + rev = "refs/tags/v${version}"; + hash = "sha256-adUxUU9eASkC9n5ppZYNN0MP19u4xcL8XziBWSCp2L8="; }; - propagatedBuildInputs = [ mbstrdecoder typepy ]; + propagatedBuildInputs = [ + mbstrdecoder + typepy + tcolorpy + ] ++ typepy.optional-dependencies.datetime; + + passthru.optional-dependencies = { + logging = [ + loguru + ]; + }; - nativeCheckInputs = [ pytestCheckHook ]; - checkInputs = [ termcolor ]; + nativeCheckInputs = [ + pytestCheckHook + termcolor + ]; - # Tests fail, even on non-nixos - pytestFlagsArray = [ - "--deselect test/test_dataproperty.py::Test_DataPeroperty_len::test_normal_ascii_escape_sequence" - "--deselect test/test_dataproperty.py::Test_DataPeroperty_is_include_ansi_escape::test_normal" - "--deselect test/test_dataproperty.py::Test_DataPeroperty_repr::test_normal" + pythonImportsCheck = [ + "dataproperty" ]; meta = with lib; { + description = "Library for extracting properties from data"; homepage = "https://github.com/thombashi/dataproperty"; - description = "A library for extracting properties from data"; - maintainers = with maintainers; [ genericnerdyusername ]; + changelog = "https://github.com/thombashi/DataProperty/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ genericnerdyusername ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/datasets/default.nix b/nixpkgs/pkgs/development/python-modules/datasets/default.nix index 6e02e4abe3a1..eae7b663dd99 100644 --- a/nixpkgs/pkgs/development/python-modules/datasets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datasets/default.nix @@ -21,23 +21,18 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.12.0"; + version = "2.14.4"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-o/LUzRmpM4tjiCh31KoQXzU1Z/p/91uamh7G4SGnxQM="; + hash = "sha256-2XC5k546JvqUV4xeL1SRQOHDzItL1CE3bJQMjva3IkY="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "responses<0.19" "responses" - ''; - propagatedBuildInputs = [ aiohttp dill @@ -56,10 +51,10 @@ buildPythonPackage rec { importlib-metadata ]; - # Tests require pervasive internet access. + # Tests require pervasive internet access doCheck = false; - # Module import will attempt to create a cache directory. + # Module import will attempt to create a cache directory postFixup = "export HF_MODULES_CACHE=$TMPDIR"; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix b/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix index 73d41944702b..e927665bdc85 100644 --- a/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { "click" "mashumaro" "networkx" + "logbook" ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix b/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix index c65d1b032f44..28c4df0a62a2 100644 --- a/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.93.0"; + version = "1.94.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-+L9V9Uk5VRucp3r9zrywXzJOfY/9aeWMep6MTiwngVI="; + hash = "sha256-Ttz6AX/NH6/NNLgU2cMSb5e1jV/cq0LGW3ENARRP7H4="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/nixpkgs/pkgs/development/python-modules/debianbts/default.nix b/nixpkgs/pkgs/development/python-modules/debianbts/default.nix new file mode 100644 index 000000000000..b2c2b271d61d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/debianbts/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pysimplesoap +, pytest , pytest-xdist +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "python-debianbts"; + version = "4.0.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "b0817d593ccdfb58a5f37b8cb3873bd0b2268b434f2798dc75b206d7550fdf04"; + }; + + buildInputs = [ setuptools ]; + propagatedBuildInputs = [ pysimplesoap ]; + checkInputs = [ + pytest + pytest-xdist + ]; + + meta = with lib; { + description = "Python interface to Debian's Bug Tracking System"; + homepage = "https://github.com/venthur/python-debianbts"; + downloadPage = "https://pypi.org/project/python-debianbts/"; + changelog = "https://github.com/venthur/python-debianbts/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = [ maintainers.nicoo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/nixpkgs/pkgs/development/python-modules/debugpy/default.nix index eff66b360715..2a937c9f41a2 100644 --- a/nixpkgs/pkgs/development/python-modules/debugpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/debugpy/default.nix @@ -5,6 +5,7 @@ , pythonAtLeast , fetchFromGitHub , substituteAll +, fetchpatch , gdb , django , flask @@ -49,6 +50,13 @@ buildPythonPackage rec { # To avoid this issue, debugpy should be installed using python.withPackages: # python.withPackages (ps: with ps; [ debugpy ]) ./fix-test-pythonpath.patch + + # Support disabling process timeouts when set to 0 + # See https://github.com/microsoft/debugpy/pull/1286 + (fetchpatch { + url = "https://github.com/microsoft/debugpy/commit/1569cc8319350afcc5ba8630660f599d514ac3bb.patch"; + hash = "sha256-v4GKLb2M20F1egAGtix9cTkSzBnvSgSSphSQST5p63w="; + }) ] ++ lib.optionals stdenv.isLinux [ # Hard code GDB path (used to attach to process) (substituteAll { @@ -91,11 +99,8 @@ buildPythonPackage rec { ]; preCheck = '' - # Scale default timeouts by a factor of 4 to avoid flaky builds - # https://github.com/microsoft/debugpy/pull/1286 if merged would - # allow us to disable the timeouts altogether - export DEBUGPY_PROCESS_SPAWN_TIMEOUT=60 - export DEBUGPY_PROCESS_EXIT_TIMEOUT=20 + export DEBUGPY_PROCESS_SPAWN_TIMEOUT=0 + export DEBUGPY_PROCESS_EXIT_TIMEOUT=0 '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 export no_proxy='*'; diff --git a/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/nixpkgs/pkgs/development/python-modules/distributed/default.nix index 6fea3e2c28d2..fc52b3b9fc5b 100644 --- a/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2023.8.0"; + version = "2023.8.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -34,11 +34,12 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FvNh7gfxUR1iIUY3kMolhzcbWupQL39E9JXWip8bdrQ="; + hash = "sha256-HJyqDi5MqxEjAWWv8ZqNGAzeFn5rZGPwiDz5KaCm6Xk="; }; postPatch = '' substituteInPlace pyproject.toml \ + --replace "versioneer[toml]==" "versioneer[toml]>=" \ --replace 'dynamic = ["version"]' 'version = "${version}"' ''; @@ -46,7 +47,7 @@ buildPythonPackage rec { setuptools setuptools-scm versioneer - ]; + ] ++ versioneer.optional-dependencies.toml; propagatedBuildInputs = [ click diff --git a/nixpkgs/pkgs/development/python-modules/dj-database-url/default.nix b/nixpkgs/pkgs/development/python-modules/dj-database-url/default.nix index 2c0b399e3c52..6ac924227f1a 100644 --- a/nixpkgs/pkgs/development/python-modules/dj-database-url/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dj-database-url/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "dj-database-url"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-o1qfD0N3XKb5DYGdxFYjPve8x2tHN31dkIt1x+syBiQ="; + hash = "sha256-8gQs7+EIblOcnaOfrVrX9hFzv3lmXmm/fk3lX6iLE18="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-admin-datta/default.nix b/nixpkgs/pkgs/development/python-modules/django-admin-datta/default.nix index e8561e69df52..795a86d34bf2 100644 --- a/nixpkgs/pkgs/development/python-modules/django-admin-datta/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-admin-datta/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-admin-datta"; - version = "1.0.7"; + version = "1.0.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Onk9T+QKsl8y68eJ2ikrUEeMc9ljzzvSw7cjjP4D3sE="; + hash = "sha256-VV7mb3501aZVuXUqzVqQYUttvkYa4pAECYWn7HksOmI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-scim2/default.nix b/nixpkgs/pkgs/development/python-modules/django-scim2/default.nix index 536d851a4099..d4eab102d719 100644 --- a/nixpkgs/pkgs/development/python-modules/django-scim2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-scim2/default.nix @@ -27,8 +27,10 @@ buildPythonPackage rec { hash = "sha256-larDh4f9/xVr11/n/WfkJ2Tx45DMQqyK3ZzkWAvzeig="; }; + # remove this when upstream releases a new version > 0.19.0 postPatch = '' substituteInPlace pyproject.toml \ + --replace "poetry>=0.12" "poetry-core>=1.5.2" \ --replace "poetry.masonry.api" "poetry.core.masonry.api" ''; diff --git a/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix b/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix index 5fd29de16107..b77af5e47491 100644 --- a/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-widget-tweaks/default.nix @@ -1,26 +1,24 @@ { lib , buildPythonPackage , fetchFromGitHub - -# native , setuptools-scm - -# propagated , django - -# tests , python +, pythonOlder }: buildPythonPackage rec { pname = "django-widget-tweaks"; - version = "1.4.12"; + version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; - src = fetchFromGitHub { # package from Pypi missing runtests.py + src = fetchFromGitHub { owner = "jazzband"; repo = pname; - rev = version; - sha256 = "1rhn2skx287k6nnkxlwvl9snbia6w6z4c2rqg22hwzbz5w05b24h"; + rev = "refs/tags/${version}"; + hash = "sha256-/3UIsg75X3R9YGv9cEcoPw3IN2vkhUb+HCy68813d2E="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -38,11 +36,10 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Tweak the form field rendering in templates, not in python-level form definitions."; + description = "Tweak the form field rendering in templates, not in python-level form definitions"; homepage = "https://github.com/jazzband/django-widget-tweaks"; + changelog = "https://github.com/jazzband/django-widget-tweaks/blob/${version}/CHANGES.rst"; license = licenses.mit; - maintainers = with maintainers; [ - maxxk - ]; + maintainers = with maintainers; [ maxxk ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix index 04ea80c1a83c..b1b088c44c07 100644 --- a/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "djangorestframework-dataclasses"; - version = "1.2.0"; + version = "1.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "oxan"; repo = "djangorestframework-dataclasses"; rev = "refs/tags/v${version}"; - hash = "sha256-PTX5huYdusPV6xCBW+8sFwusuPtZBH1vVApvcQU7Dlc="; + hash = "sha256-aUz+f8Q7RwQsoRpjq1AAmNtDzTA6KKxyc+MtBJEfyL8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index 8e26e9c6e4ef..cb5c3478d910 100644 --- a/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, cryptography , django , djangorestframework , fetchPypi @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "djangorestframework-simplejwt"; - version = "5.2.2"; + version = "5.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "djangorestframework_simplejwt"; inherit version; - hash = "sha256-0n1LysLGOU9njeqLTQ1RHG4Yp/Lriq7rin3mAa63fEI="; + hash = "sha256-jkxd/KjRHAuKZt/YpOP8HGqn6hiNEJB/+RyUL0tS7WY="; }; nativeBuildInputs = [ @@ -30,9 +31,17 @@ buildPythonPackage rec { django djangorestframework pyjwt - python-jose ]; + passthru.optional-dependencies = { + python-jose = [ + python-jose + ]; + crypto = [ + cryptography + ]; + }; + # Test raises django.core.exceptions.ImproperlyConfigured doCheck = false; @@ -43,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "JSON Web Token authentication plugin for Django REST Framework"; homepage = "https://github.com/davesque/django-rest-framework-simplejwt"; + changelog = "https://github.com/jazzband/djangorestframework-simplejwt/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ arnoldfarkas ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix b/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix index 2a12ca816f45..8c6692d7c8f4 100644 --- a/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "drf-yasg"; - version = "1.21.5"; + version = "1.21.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zu8MO13EOJeBr9eG5tw2l68qL+DYck7h9jfCPXW7xbI="; + hash = "sha256-TDuTBos9/KaWmrERFV5N1vey1oC5h3jej9Rgt4N72w0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/drms/default.nix b/nixpkgs/pkgs/development/python-modules/drms/default.nix index 739cf1bf505b..913e069f4fbe 100644 --- a/nixpkgs/pkgs/development/python-modules/drms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/drms/default.nix @@ -5,10 +5,12 @@ , pandas , six , astropy +, oldest-supported-numpy , pytestCheckHook , pytest-doctestplus , pythonOlder , setuptools-scm +, wheel }: buildPythonPackage rec { @@ -23,7 +25,10 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + numpy + oldest-supported-numpy setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/duckduckgo-search/default.nix b/nixpkgs/pkgs/development/python-modules/duckduckgo-search/default.nix index 6f38f7264e68..6a4afe7a577a 100644 --- a/nixpkgs/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/nixpkgs/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -2,19 +2,24 @@ , fetchFromGitHub , lib , setuptools -, requests +, aiofiles , click +, h2 +, httpx +, lxml +, requests +, socksio }: buildPythonPackage rec { pname = "duckduckgo-search"; - version = "2.8.5"; + version = "3.8.5"; src = fetchFromGitHub { owner = "deedy5"; repo = "duckduckgo_search"; rev = "v${version}"; - hash = "sha256-UXh3+kBfkylt5CIXbYTa/vniEETUvh4steUrUg5MqYU="; + hash = "sha256-FOGMqvr5+O3+UTdM0m1nJBAcemP6hpAOXv0elvnCUHU="; }; format = "pyproject"; @@ -22,9 +27,16 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ - requests + aiofiles click - ]; + h2 + httpx + lxml + requests + socksio + ] ++ httpx.optional-dependencies.brotli + ++ httpx.optional-dependencies.http2 + ++ httpx.optional-dependencies.socks; pythonImportsCheck = [ "duckduckgo_search" ]; diff --git a/nixpkgs/pkgs/development/python-modules/dvc/default.nix b/nixpkgs/pkgs/development/python-modules/dvc/default.nix index 2c6687f9bbc0..60f7c588eaa3 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc/default.nix @@ -55,14 +55,14 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.16.0"; + version = "3.17.0"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LbSmyNgRFejDGHurzDJvJxuhjPuRPDJ1t6T6p3f6UQk="; + hash = "sha256-MFwmER2BmSKqisgLvnLY3aFoRuzeObE7lr5JOesJdXE="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/dvclive/default.nix b/nixpkgs/pkgs/development/python-modules/dvclive/default.nix index a732f24fabbe..7f07a851fe38 100644 --- a/nixpkgs/pkgs/development/python-modules/dvclive/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvclive/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "2.15.2"; + version = "2.16.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Z1e6CrpVjQoR/OIqqxbbC75SZtOqi4Rrbld2doenOMA="; + hash = "sha256-VxZXZhbKtym1ow/dU3G4yu4X1GwCsXzcau/YocertzY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/esphome-dashboard-api/default.nix b/nixpkgs/pkgs/development/python-modules/esphome-dashboard-api/default.nix index 24abd9d47a95..0cb49cd6486e 100644 --- a/nixpkgs/pkgs/development/python-modules/esphome-dashboard-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/esphome-dashboard-api/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , setuptools +, wheel , aiohttp }: @@ -17,8 +18,15 @@ buildPythonPackage rec { hash = "sha256-RFfS0xzRXoM6ETXmviiMPxffPzspjTqpkvHOlTJXN9g="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools~=65.6" "setuptools" \ + --replace "wheel~=0.37.1" "wheel" + ''; + nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/events/default.nix b/nixpkgs/pkgs/development/python-modules/events/default.nix index 6fe355d9c4d8..f4e9dcd250f0 100644 --- a/nixpkgs/pkgs/development/python-modules/events/default.nix +++ b/nixpkgs/pkgs/development/python-modules/events/default.nix @@ -1,17 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - pname = "Events"; - version = "0.4"; + pname = "events"; + version = "0.5"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "01d9dd2a061f908d74a89fa5c8f07baa694f02a2a5974983663faaf7a97180f5"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pyeve"; + repo = "events"; + rev = "refs/tags/v${version}"; + hash = "sha256-GGhIKHbJ31IN0Uoe689X9V/MZvtseE47qx2CmM4MYUs="; }; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "events" + ]; + + pytestFlagsArray = [ + "events/tests/tests.py" + ]; + meta = with lib; { - homepage = "https://events.readthedocs.org"; description = "Bringing the elegance of C# EventHanlder to Python"; + homepage = "https://events.readthedocs.org"; + changelog = "https://github.com/pyeve/events/blob/v0.5/CHANGES"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix b/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix index 470d17deeba1..b7d4cda7df7c 100644 --- a/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "5.0.3"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oQ09/CvHIA4PAVqK6DeY3slHvQ1aPRqCC6ZuhubTN94="; + hash = "sha256-WKQgfmEbil55WO3tWVq4n9wiJNw0Op/jbI7xt5vtKpA="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix b/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix index b3ecf7a3fce2..dea302fb8f3a 100644 --- a/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix +++ b/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix @@ -6,25 +6,37 @@ , igraph , pygments , pytestCheckHook +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "explorerscript"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-REQYyxB2sb/gG54+OkMw+M4Agg9SWfAyqAhiSNnd3tE="; + sha256 = "sha256-0U5n7e/utmgOTBuTypkBMeHZR7lji6lFimSjbC7hVRM="; }; nativeBuildInputs = [ antlr4 + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + # antlr output is rebuilt in postPatch step. + "antlr4-python3-runtime" + # igraph > 0.10.4 was marked as incompatible by upstream + # due to regression introduced in 0.10.5, which was fixed + # in igraph 0.10.6. + # + # https://github.com/igraph/python-igraph/issues/693 + "igraph" ]; postPatch = '' - sed -i "s/antlr4-python3-runtime.*/antlr4-python3-runtime',/" setup.py antlr -Dlanguage=Python3 -visitor explorerscript/antlr/{ExplorerScript,SsbScript}.g4 ''; diff --git a/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix b/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix index 71c700bdfe0a..bdee002b5aad 100644 --- a/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.12.1"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-sDHqBGRJQuAj2zB7hcIy3u5iNCxBHO1ub0eHxfgd7kI="; + hash = "sha256-t1C9fS0LU46J7y+rp2pTCVma09aFqzuBtslrlU+MS1E="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/fastapi/default.nix b/nixpkgs/pkgs/development/python-modules/fastapi/default.nix index 48a4c483c9c3..c0c4b36d3439 100644 --- a/nixpkgs/pkgs/development/python-modules/fastapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastapi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.95.1"; + version = "0.95.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-y6mP2w2d2oabM9bLtWRO/AdRA46LNhVrMB/0qxGxH7I="; + hash = "sha256-wD39CqUZOgwpG/NEGz/pXgQsadzUoM/elxfEXthOlHo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix b/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix index 593d677ca2f3..05cb76f1dd48 100644 --- a/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix @@ -3,8 +3,9 @@ , fetchFromGitHub , python , cython +, oldest-supported-numpy , setuptools -, substituteAll +, setuptools-scm , numpy , pandas , cramjam @@ -14,6 +15,7 @@ , pytestCheckHook , pythonOlder , packaging +, wheel }: buildPythonPackage rec { @@ -30,24 +32,23 @@ buildPythonPackage rec { hash = "sha256-pJ0zK0upEV7TyuNMIcozugkwBlYpK/Dg6BdB0kBpn9k="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ cython + oldest-supported-numpy setuptools - ]; - - patches = [ - (substituteAll { - src = ./version.patch; - inherit version; - }) + setuptools-scm + wheel ]; postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'," "" \ - --replace "oldest-supported-numpy" "numpy" + substituteInPlace pyproject.toml \ + --replace '"pytest-runner"' "" - sed -i '/"git", "status"/d' setup.py + sed -i \ + -e "/pytest-runner/d" \ + -e '/"git", "status"/d' setup.py ''; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fastparquet/version.patch b/nixpkgs/pkgs/development/python-modules/fastparquet/version.patch deleted file mode 100644 index 86d80e2a411b..000000000000 --- a/nixpkgs/pkgs/development/python-modules/fastparquet/version.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/fastparquet/_version.py b/fastparquet/_version.py -new file mode 100644 -index 0000000..eb2c9c9 ---- /dev/null -+++ b/fastparquet/_version.py -@@ -0,0 +1 @@ -+__version__ = "@version@" diff --git a/nixpkgs/pkgs/development/python-modules/fb-re2/default.nix b/nixpkgs/pkgs/development/python-modules/fb-re2/default.nix index 32a6a1d60ca1..df494068c444 100644 --- a/nixpkgs/pkgs/development/python-modules/fb-re2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fb-re2/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , re2 }: @@ -13,6 +14,16 @@ buildPythonPackage rec { sha256 = "83b2c2cd58d3874e6e3a784cf4cf2f1a57ce1969e50180f92b010eea24ef26cf"; }; + patches = [ + # Bump stdlib to c++17 to fix build with recent re2 + # https://github.com/facebook/pyre2/issues/24 + # https://github.com/facebook/pyre2/pull/25 + (fetchpatch { + url = "https://github.com/facebook/pyre2/pull/25/commits/08fb06ec3ccd412ca69483d27234684a04cb91a0.patch"; + hash = "sha256-kzxE2AxpE1tJJK0dJgoFfVka9zy2u0HEqiHoS7DQDQ0="; + }) + ]; + buildInputs = [ re2 ]; # no tests in PyPI tarball diff --git a/nixpkgs/pkgs/development/python-modules/fe25519/default.nix b/nixpkgs/pkgs/development/python-modules/fe25519/default.nix index c1bc4d5f2a42..819c7cc34df6 100644 --- a/nixpkgs/pkgs/development/python-modules/fe25519/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fe25519/default.nix @@ -7,22 +7,24 @@ , pytestCheckHook , pythonOlder , setuptools +, wheel }: buildPythonPackage rec { pname = "fe25519"; - version = "1.4.2"; + version = "1.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VwCw/sS8Pzhscoa6yCRGbB9X+CtRVn8xyBEpKfGyhhY="; + hash = "sha256-la+17tPHjceMTe7Wk8DGVaSptk8XJa+l7GTeqLIFDvs="; }; nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/filedepot/default.nix b/nixpkgs/pkgs/development/python-modules/filedepot/default.nix index a73c282c160f..b347a1a6bd19 100644 --- a/nixpkgs/pkgs/development/python-modules/filedepot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/filedepot/default.nix @@ -2,10 +2,10 @@ , anyascii , buildPythonPackage , fetchFromGitHub +, fetchpatch , flaky , google-cloud-storage , mock -, paste , pillow , pymongo , pytestCheckHook @@ -28,6 +28,15 @@ buildPythonPackage rec { hash = "sha256-vPceky5cvmy3MooWz7dRdy68VoAHN7i3a7egBs4dPE8="; }; + patches = [ + # Add support for Pillow 10, https://github.com/amol-/depot/pull/84 + (fetchpatch { + name = "support-pillow-10.patch"; + url = "https://github.com/amol-/depot/commit/bdb73d1b3898279068b421bc061ecc18c5108fa4.patch"; + hash = "sha256-7+VGrdJstkiy0bYAqA9FjF1NftZiurgyPd8Wlz6GUy8="; + }) + ]; + propagatedBuildInputs = [ anyascii google-cloud-storage @@ -36,7 +45,6 @@ buildPythonPackage rec { nativeCheckInputs = [ flaky mock - paste pillow pymongo pytestCheckHook @@ -45,6 +53,8 @@ buildPythonPackage rec { ]; disabledTestPaths = [ + # ModuleNotFoundError: No module named 'depot._pillow_compat' + "tests/test_fields_sqlalchemy.py" # The examples have tests "examples" # Missing dependencies (TurboGears2 and ming) diff --git a/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix index 18e483292885..6d079b66f149 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy3k , flask , werkzeug }: @@ -9,6 +8,7 @@ buildPythonPackage rec { pname = "flask-reverse-proxy-fix"; version = "0.2.1"; + format = "setuptools"; # master fixes flask import syntax and has no major changes # new release requested: https://github.com/sublee/flask-silk/pull/6 @@ -16,15 +16,17 @@ buildPythonPackage rec { owner = "antarctica"; repo = "flask-reverse-proxy-fix"; rev = "v${version}"; - sha256 = "1jbr67cmnryn0igv05qkvqjwrwj2rsajvvjnv3cdkm9bkgb4h5k5"; + hash = "sha256-ZRZI1psr1dnY2FbuLZXOQvLMJd4TF7BfBNZnW9kxeck="; }; - disabled = !isPy3k; - postPatch = '' sed -i 's@werkzeug.contrib.fixers@werkzeug.middleware.proxy_fix@g' flask_reverse_proxy_fix/middleware/__init__.py ''; + # This is needed so that setup.py does not add "devNone" to the version, + # after which setuptools throws an error for an invalid version. + env.CI_COMMIT_TAG = "v${version}"; + propagatedBuildInputs = [ flask werkzeug diff --git a/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix b/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix index 743cc2902b97..e18cc8579ba9 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix @@ -57,6 +57,11 @@ buildPythonPackage rec { hash = "sha256-lZzm43m30y+2qjxNddFEeg9HDlQP9afq5VtuR25zaLc="; }; + postPatch = '' + # This should be removed after updating to version 5.3.0. + sed -i '/filterwarnings =/a ignore:pkg_resources is deprecated:DeprecationWarning' pytest.ini + ''; + propagatedBuildInputs = [ blinker email-validator diff --git a/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix b/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix index 2be3f227baf7..7fe9ba92b638 100644 --- a/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fnv-hash-fast/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "fnv-hash-fast"; - version = "0.4.0"; + version = "0.4.1"; format = "pyproject"; src = fetchFromGitHub { owner = "bdraco"; repo = "fnv-hash-fast"; rev = "v${version}"; - hash = "sha256-4JhzrRnpb9+FYXd0S2XcBelaHuRksm8RC29rxZqtlpw="; + hash = "sha256-vKv3Hfla+U1teYVB+w8ONj0Ur996noanbg6aaJ6S6+I="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/formulae/default.nix b/nixpkgs/pkgs/development/python-modules/formulae/default.nix index 9755fed90238..ab13f86dc18b 100644 --- a/nixpkgs/pkgs/development/python-modules/formulae/default.nix +++ b/nixpkgs/pkgs/development/python-modules/formulae/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , pytestCheckHook , numpy , pandas @@ -10,16 +11,20 @@ buildPythonPackage rec { pname = "formulae"; - version = "0.3.4"; + version = "0.5.0"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bambinos"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-6IGTn3griooslN6+qRYLJiWaJhvsxa1xj1+1kQ57yN0="; + rev = "refs/tags/${version}"; + hash = "sha256-WDWpyrHXGBfheE0m5I9K+Dk1urXRMY6yoenN3OaZogM="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ numpy pandas @@ -37,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://bambinos.github.io/formulae"; description = "Formulas for mixed-effects models in Python"; + changelog = "https://github.com/bambinos/formulae/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/fountains/default.nix b/nixpkgs/pkgs/development/python-modules/fountains/default.nix index 2f6b7cc94156..d6efde228fbd 100644 --- a/nixpkgs/pkgs/development/python-modules/fountains/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fountains/default.nix @@ -2,24 +2,26 @@ , buildPythonPackage , fetchPypi , setuptools +, wheel , bitlist , pythonOlder }: buildPythonPackage rec { pname = "fountains"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gYVguXMVrXxra/xy+R4RXVk9yDGKiKE8u3qWUk8sjt4="; + hash = "sha256-MhOQ4pemxmjfp7Uy5hLA8i8BBI5QbvD4EjEcKMM/u3I="; }; nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/funsor/default.nix b/nixpkgs/pkgs/development/python-modules/funsor/default.nix index a5250afff471..a08e2a6e4ebc 100644 --- a/nixpkgs/pkgs/development/python-modules/funsor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/funsor/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "funsor"; - version = "0.4.5"; + version = "0.4.6"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "pyro-ppl"; repo = "funsor"; rev = "refs/tags/${version}"; - hash = "sha256-3JxnRlJN/kYstcIKt8cvDmqnp8oyoA4jkMBDVuAMa5Q="; + hash = "sha256-Prj1saT0yoPAP8rDE0ipBEpR3QMk4PS12VSJlxc22p8="; }; # Disable the tests that rely on downloading assets from the internet as well as the linting checks. diff --git a/nixpkgs/pkgs/development/python-modules/ge25519/default.nix b/nixpkgs/pkgs/development/python-modules/ge25519/default.nix index 689901ca4241..60bc2b5dbba1 100644 --- a/nixpkgs/pkgs/development/python-modules/ge25519/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ge25519/default.nix @@ -8,22 +8,24 @@ , pytestCheckHook , pythonOlder , setuptools +, wheel }: buildPythonPackage rec { pname = "ge25519"; - version = "1.4.3"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oOvrfRSpvwfCcmpV7FOxcBOW8Ex89d2+otjORrzX4o0="; + hash = "sha256-VKDPiSdufWwrNcZSRTByFU4YGoJrm48TDm1nt4VyclA="; }; nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/geopy/default.nix b/nixpkgs/pkgs/development/python-modules/geopy/default.nix index 1ca084d999cd..3a25b434c301 100644 --- a/nixpkgs/pkgs/development/python-modules/geopy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geopy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "geopy"; - version = "2.3.0"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-bHfjUfuiEH3AxRDTLmbm67bKOw6fBuMQDUQA2NLg800="; + hash = "sha256-3Sq76DcnoG0Uv/KPF/B3oep0MO96vemKiANjgR7/k/I="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/getjump/default.nix b/nixpkgs/pkgs/development/python-modules/getjump/default.nix index a3c4c4ffa6ec..b1a1b7005c09 100644 --- a/nixpkgs/pkgs/development/python-modules/getjump/default.nix +++ b/nixpkgs/pkgs/development/python-modules/getjump/default.nix @@ -4,6 +4,7 @@ , fetchPypi , pillow , poetry-core +, pythonRelaxDepsHook , requests , rich }: @@ -20,6 +21,12 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + # remove after https://github.com/eggplants/getjump/pull/123 is released + "pillow" ]; propagatedBuildInputs = [ @@ -33,6 +40,9 @@ buildPythonPackage rec { "getjump" ]; + # all the tests talk to the internet + doCheck = false; + meta = with lib; { description = "Get and save images from jump web viewer"; homepage = "https://github.com/eggplants/getjump"; diff --git a/nixpkgs/pkgs/development/python-modules/gevent/default.nix b/nixpkgs/pkgs/development/python-modules/gevent/default.nix index 690c0b73e6ea..b21e40c7a600 100644 --- a/nixpkgs/pkgs/development/python-modules/gevent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gevent/default.nix @@ -4,8 +4,11 @@ , isPyPy , python , libev +, cffi +, cython_3 , greenlet , setuptools +, wheel , zope_event , zope_interface , pythonOlder @@ -24,7 +27,11 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + cython_3 setuptools + wheel + ] ++ lib.optionals (!isPyPy) [ + cffi ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix index 110dddeb47b0..e96d6dff8e42 100644 --- a/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.26.0"; + version = "3.27.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-L3YwBFpeGDPIixjvU7OLf8kpeYkqcSmLqMzGcSjtMtE="; + hash = "sha256-ZgRYwx/vICs1ombD8LGvCr0Wf9TpQurDGBoC2mtbxRs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix b/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix index e62472f6bb2a..7a2f0de78b21 100644 --- a/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "2.2.5"; + version = "3.0.2"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-UMP4FMyS8nAZmN7oKBZhMbqTgi4bSR/JmIeyWaZRZis="; + hash = "sha256-NNHkcOCoG5Xagc0jTR50uHMA5mMgsh3BIzVJ77OEEjk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-re2/default.nix b/nixpkgs/pkgs/development/python-modules/google-re2/default.nix index e93b7251a25c..1528cb1a59e1 100644 --- a/nixpkgs/pkgs/development/python-modules/google-re2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-re2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "google-re2"; - version = "1.0"; + version = "1.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IcitwpY2DeH/QmuqOMcS6tpiLChY0ZXrSH5BXZQZTpE="; + hash = "sha256-06lGfuUrRqx3ypKPbQy+rM/ZLwPKDw9lud9qlRhPOhw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gpytorch/default.nix b/nixpkgs/pkgs/development/python-modules/gpytorch/default.nix index 74d85d801f69..1fea3699d9f5 100644 --- a/nixpkgs/pkgs/development/python-modules/gpytorch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gpytorch/default.nix @@ -3,6 +3,9 @@ , fetchFromGitHub , linear_operator , scikit-learn +, setuptools +, setuptools-scm +, wheel , torch , pytestCheckHook }: @@ -19,10 +22,13 @@ buildPythonPackage rec { hash = "sha256-cpkfjx5G/4duL1Rr4nkHTHi03TDcYbcx3bKP2Ny7Ijo="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'find_version("gpytorch", "version.py")' \"$version\" - ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; propagatedBuildInputs = [ linear_operator @@ -33,7 +39,9 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "gpytorch" ]; + disabledTests = [ # AssertionError on number of warnings emitted "test_deprecated_methods" diff --git a/nixpkgs/pkgs/development/python-modules/griffe/default.nix b/nixpkgs/pkgs/development/python-modules/griffe/default.nix index 3f4d5514f47e..361323ee17b1 100644 --- a/nixpkgs/pkgs/development/python-modules/griffe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.34.0"; + version = "0.35.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kc+RL5ulV2VfB4ojgv/ZSupPy36kyOqbLBWHPiSpqkk="; + hash = "sha256-Sskz14aAPqUXhQjetPfhjVm8gjG4yrck3sHpgD37DPU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/grpc-interceptor/default.nix b/nixpkgs/pkgs/development/python-modules/grpc-interceptor/default.nix index 1dadad2238d7..a940aa17de74 100644 --- a/nixpkgs/pkgs/development/python-modules/grpc-interceptor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/grpc-interceptor/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder , poetry-core , grpcio @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "grpc-interceptor"; - version = "0.15.2"; + version = "0.15.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,13 +21,17 @@ buildPythonPackage rec { owner = "d5h-foss"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-zulK0SVehzHcrmgIyH0D5sUOiAN53eIg88IoVyF6/DA="; + hash = "sha256-tTi1X1r7584ZXa12eLp2G/Am8G6Dnd18eE5wF/Lp/EY="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" - ''; + patches = [ + # https://github.com/d5h-foss/grpc-interceptor/pull/44 + (fetchpatch { + name = "replace-poetry-with-poetry-core.patch"; + url = "https://github.com/d5h-foss/grpc-interceptor/commit/916cb394acd8dd7abb4f5edcb4e88aee961a32d0.patch"; + hash = "sha256-W2SF2zyjusTxgvCxBDLpisD03bofzDug1eyd4FLJmKs="; + }) + ]; nativeBuildInputs = [ poetry-core @@ -37,6 +42,8 @@ buildPythonPackage rec { protobuf ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/gspread/default.nix b/nixpkgs/pkgs/development/python-modules/gspread/default.nix index 6ac240e4b61e..9d05bf5e0930 100644 --- a/nixpkgs/pkgs/development/python-modules/gspread/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gspread/default.nix @@ -1,32 +1,43 @@ { lib , buildPythonPackage -, fetchPypi -, requests +, fetchFromGitHub +, flitBuildHook , google-auth , google-auth-oauthlib +, pytest-vcr +, pytestCheckHook , pythonOlder +, requests }: buildPythonPackage rec { pname = "gspread"; - version = "5.9.0"; - format = "setuptools"; + version = "5.10.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-NLl4NLvvrM9ySXcCuuJtEvltBoXkmkGK/mqSqbvLnJw="; + src = fetchFromGitHub { + owner = "burnash"; + repo = "gspread"; + rev = "refs/tags/v${version}"; + hash = "sha256-GAlQYQVuwsnkXqZOvG66f9kig+m392CVlrgUTqrTKyA="; }; + nativeBuildInputs = [ + flitBuildHook + ]; + propagatedBuildInputs = [ - requests google-auth google-auth-oauthlib + requests ]; - # No tests included - doCheck = false; + nativeCheckInputs = [ + pytest-vcr + pytestCheckHook + ]; pythonImportsCheck = [ "gspread" diff --git a/nixpkgs/pkgs/development/python-modules/gumath/default.nix b/nixpkgs/pkgs/development/python-modules/gumath/default.nix index 41c0d2352c88..013662314b72 100644 --- a/nixpkgs/pkgs/development/python-modules/gumath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gumath/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, fetchpatch , python , numba , ndtypes @@ -13,10 +14,26 @@ buildPythonPackage { pname = "gumath"; + format = "setuptools"; disabled = isPy27; inherit (libgumath) src version meta; + patches = [ + # https://github.com/xnd-project/gumath/pull/42 + (fetchpatch { + name = "remove-np-warnings-call.patch"; + url = "https://github.com/xnd-project/gumath/commit/83ab3aa3b07d55654b4e6e75e5ec6be8190fca97.patch"; + hash = "sha256-7lUXNVH5M+Go1iEu0bud03XI8cyGbdLNdLraMZplDaM="; + }) + (fetchpatch { + name = "remove-np-1.25-bartlett-test-assertion.patch"; + url = "https://github.com/xnd-project/gumath/commit/8741e31f2967ded08c96a7f0631e1e38fe813870.patch"; + hash = "sha256-flltk3RNPHalbcIV0BrkxWuhqqJBrycos7Fyv3P3mWg="; + }) + ]; + nativeCheckInputs = [ numba ]; + propagatedBuildInputs = [ ndtypes xnd ]; postPatch = '' @@ -42,6 +59,5 @@ buildPythonPackage { python test_xndarray.py popd ''; - } diff --git a/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix b/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix index 9926b3cfe915..6e9e33913fb7 100644 --- a/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix @@ -10,34 +10,67 @@ , farama-notifications , importlib-metadata , pythonOlder +, ffmpeg +, jax +, jaxlib +, matplotlib +, moviepy +, opencv4 +, pybox2d +, pygame +, pytestCheckHook +, scipy }: buildPythonPackage rec { pname = "gymnasium"; - version = "0.29.0"; + version = "0.29.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "Farama-Foundation"; - repo = pname; + repo = "gymnasium"; rev = "refs/tags/v${version}"; - hash = "sha256-4YaEFEWSOTEdGgO1kSOleZQp7OrcOf+WAT/E0BWeoKI="; + hash = "sha256-L7fn9FaJzXwQhjDKwI9hlFpbPuQdwynU+Xjd8bbjxiw="; }; - format = "pyproject"; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ - jax-jumpy cloudpickle - numpy + farama-notifications gym-notices + jax-jumpy + numpy typing-extensions - farama-notifications ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; pythonImportsCheck = [ "gymnasium" ]; + nativeCheckInputs = [ + ffmpeg + jax + jaxlib + matplotlib + moviepy + opencv4 + pybox2d + pygame + pytestCheckHook + scipy + ]; + + disabledTestPaths = [ + # mujoco is required for those tests but the mujoco python bindings are not packaged in nixpkgs. + "tests/envs/mujoco/test_mujoco_custom_env.py" + + # Those tests need to write on the filesystem which cause them to fail. + "tests/experimental/wrappers/test_record_video.py" + "tests/utils/test_save_video.py" + "tests/wrappers/test_record_video.py" + "tests/wrappers/test_video_recorder.py" + ]; + meta = with lib; { description = "A standard API for reinforcement learning and a diverse set of reference environments (formerly Gym)"; homepage = "https://github.com/Farama-Foundation/Gymnasium"; diff --git a/nixpkgs/pkgs/development/python-modules/gyp/default.nix b/nixpkgs/pkgs/development/python-modules/gyp/default.nix index ca9a8dc5a2d7..385f28b4615a 100644 --- a/nixpkgs/pkgs/development/python-modules/gyp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gyp/default.nix @@ -27,6 +27,12 @@ buildPythonPackage { pythonImportsCheck = [ "gyp" "gyp.generator" ]; + # Make mac_tool.py executable so that patchShebangs hook processes it. This + # file is copied and run by builds using gyp on macOS + preFixup = '' + chmod +x "$out/${python.sitePackages}/gyp/mac_tool.py" + ''; + meta = with lib; { description = "A tool to generate native build files"; homepage = "https://gyp.gsrc.io"; diff --git a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index d1bd71fa1c57..9aa76821650b 100644 --- a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.8.9"; + version = "2023.8.14"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PQ9KxKyTa9xiLa6suqHRem6Rs732djbjzFKKLZDUM/g="; + hash = "sha256-msN3S7rBYZnCAh2IGBVzHjqiTapzH2kMV5CBFHmtcNE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix index 96297616d7b6..9bc33f5c7e01 100644 --- a/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.69.0"; + version = "0.70.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7FO/z5AseP80y74e4ivLXlwB9t5jJf2bCaNp6HfqZ1c="; + hash = "sha256-lELb39N5pAZFeANgzg5TBmC+gmY/wgXbE7wlvdlJe2A="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/hdfs/default.nix b/nixpkgs/pkgs/development/python-modules/hdfs/default.nix index c00bd18640b6..45bd4faf4462 100644 --- a/nixpkgs/pkgs/development/python-modules/hdfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hdfs/default.nix @@ -11,14 +11,13 @@ buildPythonPackage rec { pname = "hdfs"; - # See https://github.com/mtth/hdfs/issues/176. - version = "2.5.8"; + version = "2.7.2"; src = fetchFromGitHub { owner = "mtth"; repo = pname; - rev = version; - hash = "sha256-94Q3IUoX1Cb+uRqvsfpVZJ1koJSx5cQ3/XpYJ0gkQNU="; + rev = "refs/tags/v${version}"; + hash = "sha256-KXJDQEc4+T9r8sB41SOgcx8Gth3qAOZceoOpsLbJ+ak="; }; propagatedBuildInputs = [ docopt requests six ]; @@ -30,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API and command line interface for HDFS"; homepage = "https://github.com/mtth/hdfs"; + changelog = "https://github.com/mtth/hdfs/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ samuela ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index bae4dc5a71d9..a0833b20798e 100644 --- a/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.10.2"; + version = "1.10.3"; 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-zNhqiWYZ3tv6lwYgmi6Yue+mFcgk7Y1dDMbzWlsvVJM="; + hash = "sha256-77RrqmoCftPc48fFtuuFo0KqGX3n+6aDx2RFkwGCNzQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/homematicip/default.nix b/nixpkgs/pkgs/development/python-modules/homematicip/default.nix index 2f384ab5c078..2cdb4b76df25 100644 --- a/nixpkgs/pkgs/development/python-modules/homematicip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/homematicip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.14"; + version = "1.0.15"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "hahn-th"; repo = "homematicip-rest-api"; rev = "refs/tags/${version}"; - hash = "sha256-2tJoIknqcwEvX2mQsrSEEh45pEMpNfeefuXVKSJTwig="; + hash = "sha256-wetkcHtm5O6mxhyU3/E4yrv6UGHAdKUlae2wJdCXtJI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ical/default.nix b/nixpkgs/pkgs/development/python-modules/ical/default.nix index 2f539c87524d..da27462cc50b 100644 --- a/nixpkgs/pkgs/development/python-modules/ical/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ical/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "ical"; - version = "5.0.0"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6xDbr/y9ZNT9thWMLHPi9/EXVXrUdMCVJdQAcd3G2vo="; + hash = "sha256-6gMmY6XlFdqF0DxkrCJhZPzUYZuEpDnIHG++nBRE3hg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/idasen/default.nix b/nixpkgs/pkgs/development/python-modules/idasen/default.nix index e4792be41690..8ce6928b9057 100644 --- a/nixpkgs/pkgs/development/python-modules/idasen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/idasen/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , bleak , pyyaml , voluptuous @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "idasen"; - version = "0.9.6"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,17 +21,9 @@ buildPythonPackage rec { owner = "newAM"; repo = "idasen"; rev = "refs/tags/v${version}"; - hash = "sha256-t8w4USDzyS0k5yk0XtQF8fVffzdf+udKSkdveMlseHk="; + hash = "sha256-aCVKnKWJlrlKD+74KL9JKlNpMGOzg/iWmB+1IMn0V/E="; }; - patches = [ - (fetchpatch { - name = "replace-poetry-with-poetry-core.patch"; - url = "https://github.com/newAM/idasen/commit/b9351d5c9def0687e4ae4cb65f38d14ed9ff2df5.patch"; - hash = "sha256-Qi3psPZExJ5tBJ4IIvDC3JnWf4Gym6Z7akGCV8GZUNY="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/impacket/default.nix b/nixpkgs/pkgs/development/python-modules/impacket/default.nix index 3e5db5b39678..7c7542252601 100644 --- a/nixpkgs/pkgs/development/python-modules/impacket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/impacket/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, chardet +, charset-normalizer +, dsinternals , fetchPypi , flask , ldapdomaindump @@ -14,18 +15,19 @@ buildPythonPackage rec { pname = "impacket"; - version = "0.10.0"; + version = "0.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uOsCCiy7RxRmac/jHGS7Ln1kmdBJxJPWQYuXFvXHRYM="; + hash = "sha256-7kA5tNKu3o9fZEeLxZ+qyGA2eWviTeqNwY8An7CQXko="; }; propagatedBuildInputs = [ - chardet + charset-normalizer + dsinternals flask ldapdomaindump pyasn1 @@ -45,8 +47,10 @@ buildPythonPackage rec { meta = with lib; { description = "Network protocols Constructors and Dissectors"; homepage = "https://github.com/SecureAuthCorp/impacket"; + changelog = "https://github.com/fortra/impacket/releases/tag/impacket_" + + replaceStrings [ "." ] [ "_" ] version; # Modified Apache Software License, Version 1.1 license = licenses.free; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/installer/default.nix b/nixpkgs/pkgs/development/python-modules/installer/default.nix index 02934550273b..d4f1e33ca606 100644 --- a/nixpkgs/pkgs/development/python-modules/installer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/installer/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pytestCheckHook , flit-core +, installer , mock }: @@ -21,10 +22,26 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; - nativeCheckInputs = [ - pytestCheckHook - mock - ]; + # We need to disable tests because this package is part of the bootstrap chain + # and its test dependencies cannot be built yet when this is being built. + doCheck = false; + + passthru.tests = { + pytest = buildPythonPackage { + pname = "${pname}-pytest"; + inherit version; + format = "other"; + + dontBuild = true; + dontInstall = true; + + nativeCheckInputs = [ + installer + mock + pytestCheckHook + ]; + }; + }; meta = with lib; { description = "A low-level library for installing a Python package from a wheel distribution"; diff --git a/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix b/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix index b3c912551d48..1ac7fdd3cf75 100644 --- a/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix @@ -1,7 +1,7 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchFromGitHub +, flit-core , pythonOlder , python , py-multiaddr @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "ipfshttpclient"; version = "0.8.0a2"; - format = "flit"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -32,6 +32,10 @@ buildPythonPackage rec { hash = "sha256-OmC67pN2BbuGwM43xNDKlsLhwVeUbpvfOazyIDvoMEA="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ py-multiaddr requests @@ -85,7 +89,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "ipfshttpclient" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "A python client library for the IPFS API"; homepage = "https://github.com/ipfs-shipyard/py-ipfs-http-client"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/ipycanvas/default.nix b/nixpkgs/pkgs/development/python-modules/ipycanvas/default.nix index 05fdb6e85882..85961b450ec1 100644 --- a/nixpkgs/pkgs/development/python-modules/ipycanvas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipycanvas/default.nix @@ -20,6 +20,16 @@ buildPythonPackage rec { hash = "sha256-+cOUBoG8ODgzkPjEbqXYRF1uEcbaZITDfYnfWuHawTE="; }; + # We relax dependencies here instead of pulling in a patch because upstream + # has released a new version using hatch-jupyter-builder, but it is not yet + # trivial to upgrade to that. + # + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"jupyterlab==3.*",' "" \ + --replace 'jupyter_packaging~=' 'jupyter_packaging>=' + ''; + nativeBuildInputs = [ jupyter-packaging ]; propagatedBuildInputs = [ ipywidgets numpy pillow ]; diff --git a/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix b/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix index a126030d0cb1..2f711f92a087 100644 --- a/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipyniivue/default.nix @@ -21,7 +21,18 @@ buildPythonPackage rec { hash = "sha256-kym7949VI6C+62p3IOQ2QIzWnuSBcrmySb83oqUwhjI="; }; - nativeBuildInputs = [ hatchling hatch-jupyter-builder ]; + # We do not need the jupyterlab build dependency, because we do not need to + # build any JS components; these are present already in the PyPI artifact. + # + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"jupyterlab==3.*",' "" + ''; + + nativeBuildInputs = [ + hatchling + hatch-jupyter-builder + ]; propagatedBuildInputs = [ ipywidgets jupyter-ui-poll ]; diff --git a/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix b/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix index 272a192e3ada..509b70b7fd3a 100644 --- a/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix @@ -28,6 +28,14 @@ buildPythonPackage rec { hash = "sha256-o5ql75VgFwvw6a/typ/wReG5wYMsSTAzd+3Mkc6p+3c="; }; + # We do not need the jupyterlab build dependency, because we do not need to + # build any JS components; these are present already in the PyPI artifact. + # + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"jupyterlab>=3.0.0,==3.*",' "" + ''; + nativeBuildInputs = [ hatchling ]; diff --git a/nixpkgs/pkgs/development/python-modules/ipytablewidgets/default.nix b/nixpkgs/pkgs/development/python-modules/ipytablewidgets/default.nix index 6e05a3a36f0a..4aad3219eb52 100644 --- a/nixpkgs/pkgs/development/python-modules/ipytablewidgets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipytablewidgets/default.nix @@ -27,6 +27,15 @@ buildPythonPackage rec { hash = "sha256-14vIih+r/PHLxhgG29YtwuosSBLpewD2CluWpH2+pLc="; }; + # Opened https://github.com/progressivis/ipytablewidgets/issues/3 to ask if + # jupyterlab can be updated upstream. (From commits, it looks like it was + # set to this version on purpose.) In the meantime, the build still works. + # + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'jupyterlab>=3.0.0,<3.7' 'jupyterlab>=3.0.0' + ''; + nativeBuildInputs = [ jupyter-packaging jupyterlab diff --git a/nixpkgs/pkgs/development/python-modules/jedi/default.nix b/nixpkgs/pkgs/development/python-modules/jedi/default.nix index d12691c177f0..5f802767c83a 100644 --- a/nixpkgs/pkgs/development/python-modules/jedi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jedi/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildPythonPackage -, pythonAtLeast , pythonOlder , fetchFromGitHub , attrs @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.18.2"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +20,7 @@ buildPythonPackage rec { owner = "davidhalter"; repo = "jedi"; rev = "v${version}"; - hash = "sha256-hNRmUFpRzVKJQAtfsSNV4jeTR8vVj1+mGBIPO6tUGto="; + hash = "sha256-Hw0+KQkB9ICWbBJDQQmHyKngzJlJ8e3wlpe4aSrlkvo="; fetchSubmodules = true; }; @@ -43,16 +42,6 @@ buildPythonPackage rec { ] ++ lib.optionals (stdenv.isAarch64 && pythonOlder "3.9") [ # AssertionError: assert 'foo' in ['setup'] "test_init_extension_module" - ] ++ lib.optionals (pythonAtLeast "3.11") [ - # disabled until 3.11 is added to _SUPPORTED_PYTHONS in jedi/api/environment.py - "test_find_system_environments" - - # disabled until https://github.com/davidhalter/jedi/issues/1858 is resolved - "test_interpreter" - "test_scanning_venvs" - "test_create_environment_venv_path" - "test_create_environment_executable" - "test_venv_and_pths" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix b/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix index 65f385db922f..5afe54567cb4 100644 --- a/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix @@ -1,20 +1,40 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , isPy3k , pytest , unicodecsv +, rustPlatform +, libiconv }: buildPythonPackage rec { pname = "jellyfish"; - version = "0.9.0"; + version = "1.0.0"; disabled = !isPy3k; + format = "pyproject"; + src = fetchPypi { inherit pname version; - sha256 = "40c9a2ffd8bd3016f7611d424120442f627f56d518a106847dc93f0ead6ad79a"; + hash = "sha256-iBquNnGZm7B85QwnaW8pyn6ELz4SOswNtlJcmZmIG9Q="; + }; + + nativeBuildInputs = with rustPlatform; [ + maturinBuildHook + cargoSetupHook + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}-rust-dependencies"; + hash = "sha256-Grk+n4VCPjirafcRWWI51jHw/IFUYkBtbXY739j0MFI="; }; nativeCheckInputs = [ pytest unicodecsv ]; diff --git a/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix b/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix index 5d8e36519e8c..05f857641b66 100644 --- a/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "5.0.3"; + version = "5.0.4"; src = fetchPypi { inherit pname version; - hash = "sha256-9SrFF1QAEpbS5WWBhOA1p8/YyToSbUb69vINUMQ1cug="; + hash = "sha256-+zrsfyi4I8venFGMKXDMUq+9+f7y6IY59y1/OJDExGs="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/json-tricks/default.nix b/nixpkgs/pkgs/development/python-modules/json-tricks/default.nix index f6f0ddf77cba..b75020c0e5bf 100644 --- a/nixpkgs/pkgs/development/python-modules/json-tricks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/json-tricks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "json-tricks"; - version = "3.17.2"; + version = "3.17.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "mverleg"; repo = "pyjson_tricks"; rev = "refs/tags/v${version}"; - hash = "sha256-7AT4h+f3FDTITfVZyLTimZlDGuAxKwe0kFYBEFGv51s="; + hash = "sha256-xddMc4PvVI+mqB3eeVqECZmdeSKAURsdbOnUAXahqM0="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/json5/default.nix b/nixpkgs/pkgs/development/python-modules/json5/default.nix index d1c3ccb9ea0a..b6a54dccc73d 100644 --- a/nixpkgs/pkgs/development/python-modules/json5/default.nix +++ b/nixpkgs/pkgs/development/python-modules/json5/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "json5"; - version = "0.9.9"; + version = "0.9.14"; src = fetchFromGitHub { owner = "dpranke"; repo = "pyjson5"; rev = "v${version}"; - hash = "sha256-0ommoTv5q7YuLNF+ZPWW/Xg/8CwnPrF7rXJ+eS0joUs="; + hash = "sha256-cshP1kraLENqWuQTlm4HPAP/0ywRRLFOJI8mteWcjR4="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jsonpath/default.nix b/nixpkgs/pkgs/development/python-modules/jsonpath/default.nix index 383df6e2652e..00205eb1907a 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonpath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonpath/default.nix @@ -1,21 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "jsonpath"; - version = "0.82"; + version = "0.82.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "46d3fd2016cd5b842283d547877a02c418a0fe9aa7a6b0ae344115a2c990fef4"; + hash = "sha256-2H7yvLze1o7pa8NMGAm2lFfs7JsMTdRxZYoSvTkQAtE="; }; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "jsonpath" + ]; + + pytestFlagsArray = [ + "test/test*.py" + ]; + meta = with lib; { description = "An XPath for JSON"; homepage = "https://github.com/json-path/JsonPath"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix b/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix index b34bb4435d0c..613d4478af87 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "jsonrpc-async"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "emlove"; repo = pname; rev = version; - hash = "sha256-HhesXzxVjhWJkubiBi6sMoXi/zicqn99dqT5bilycS8="; + hash = "sha256-KOnycsOZFDEVj8CJDwGbdtbOpMPQMVdrXbHG0fzr9PI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix b/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix index a23e3a5b931c..0f3d69b18d8c 100644 --- a/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix @@ -8,6 +8,7 @@ , importlib-resources , jsonschema-specifications , pkgutil-resolve-name +, pip , pytestCheckHook , pythonOlder , referencing @@ -81,6 +82,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + pip pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix index 17ec03145137..de73ea621b47 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -10,6 +10,7 @@ , jupyter-server , jupyter-server-fileid , jupyter-ydoc +, jupyterlab , ypy-websocket , pytest-asyncio , pytest-jupyter @@ -18,16 +19,15 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "1.0.1"; + version = "1.1.0"; + format = "pyproject"; disabled = pythonOlder "3.8"; - format = "pyproject"; - src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-cf7BpF6WSoHQJQW0IXdpCAGTdkX9RNWZ4JovTHvcPho="; + hash = "sha256-3OxduJ93TmbS/fKSKmVXs5vj2IZMX5MqKPTeGklFCbM="; }; postPatch = '' @@ -38,6 +38,7 @@ buildPythonPackage rec { hatch-jupyter-builder hatch-nodejs-version hatchling + jupyterlab pythonRelaxDepsHook ]; @@ -53,14 +54,16 @@ buildPythonPackage rec { ypy-websocket ]; - pythonImportsCheck = [ "jupyter_collaboration" ]; - nativeCheckInputs = [ pytest-asyncio pytest-jupyter pytestCheckHook ]; + pythonImportsCheck = [ + "jupyter_collaboration" + ]; + pytestFlagsArray = [ "-W" "ignore::DeprecationWarning" ]; @@ -69,11 +72,11 @@ buildPythonPackage rec { export HOME=$TEMP ''; - meta = { - changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/v${version}/CHANGELOG.md"; + meta = with lib; { description = "JupyterLab Extension enabling Real-Time Collaboration"; homepage = "https://github.com/jupyterlab/jupyter_collaboration"; - license = lib.licenses.bsd3; - maintainers = lib.teams.jupyter.members; + changelog = "https://github.com/jupyterlab/jupyter_collaboration/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = teams.jupyter.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jupytext/default.nix b/nixpkgs/pkgs/development/python-modules/jupytext/default.nix index 030035f744cf..a3e0eba387f9 100644 --- a/nixpkgs/pkgs/development/python-modules/jupytext/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupytext/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.15.0"; + version = "1.15.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "mwouts"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-M4BoST18sf1C1lwhFkp4a0B3fc0VKerwuVEIfwkD7i0="; + hash = "sha256-XGjAPeMtg2Epu85JiqQPyZJVez5Z8uA+E40SFcZM7WY="; }; # Follow https://github.com/mwouts/jupytext/pull/1119 to see if the patch diff --git a/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix b/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix index ab6959389a9e..f463b18950dd 100644 --- a/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,24 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder -, isPy27 -, six - -, pytestCheckHook +, jaraco-classes , keyring +, pytestCheckHook +, pythonOlder , setuptools-scm }: buildPythonPackage rec { - pname = "keyrings.alt"; - version = "4.2.0"; + pname = "keyrings-alt"; + version = "5.0.0"; format = "pyproject"; - disabled = isPy27; + + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-K6PVZEG6Bjf1+cCWBo9nAQrART+dC2Jt4qowGTU7ZDE="; + pname = "keyrings.alt"; + inherit version; + hash = "sha256-nURstHu86pD/ouzD6AA6z0FXP8IBv0S0vxO9DhFISCg="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - six + jaraco-classes ]; nativeCheckInputs = [ @@ -39,9 +39,10 @@ buildPythonPackage rec { ]; meta = with lib; { - license = licenses.mit; description = "Alternate keyring implementations"; homepage = "https://github.com/jaraco/keyrings.alt"; + changelog = "https://github.com/jaraco/keyrings.alt/blob/v${version}/NEWS.rst"; + license = licenses.mit; maintainers = with maintainers; [ nyarly ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix index a31a5a3c957d..4a640d7b1b7c 100644 --- a/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix @@ -1,8 +1,7 @@ { lib +, argon2-cffi , buildPythonPackage , fetchPypi -, fetchpatch -, argon2-cffi , keyring , pycryptodome , pytestCheckHook @@ -10,26 +9,22 @@ }: buildPythonPackage rec { - pname = "keyrings.cryptfile"; - # NOTE: newer releases are bugged/incompatible - # https://github.com/frispete/keyrings.cryptfile/issues/15 - version = "1.3.4"; + pname = "keyrings-cryptfile"; + version = "1.3.9"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchPypi { - inherit pname version; - hash = "sha256-jW+cKMm+xef8C+fl0CGe+6SEkYBHDjFX2/kLCZ62j6c="; + pname = "keyrings.cryptfile"; + inherit version; + hash = "sha256-fCpFPKuZhUJrjCH3rVSlfkn/joGboY4INAvYgBrPAJE="; }; - patches = [ - # upstream setup.cfg has an option that is not supported - ./fix-testsuite.patch - # change of API in keyrings.testing - (fetchpatch { - url = "https://github.com/frispete/keyrings.cryptfile/commit/6fb9e45f559b8b69f7a0a519c0bece6324471d79.patch"; - hash = "sha256-1878pMO9Ed1zs1pl+7gMjwx77HbDHdE1CryN8TPfPdU="; - }) - ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "-s --cov=keyrings/cryptfile" "" + ''; propagatedBuildInputs = [ argon2-cffi @@ -46,13 +41,14 @@ buildPythonPackage rec { ]; disabledTests = [ - "test_set_properties" - "UncryptedFileKeyringTestCase" + # FileNotFoundError: [Errno 2] No such file or directory: '/build/... + "test_versions" ]; meta = with lib; { description = "Encrypted file keyring backend"; homepage = "https://github.com/frispete/keyrings.cryptfile"; + changelog = "https://github.com/frispete/keyrings.cryptfile/blob/v${version}/CHANGES.md"; license = licenses.mit; maintainers = teams.chia.members; }; diff --git a/nixpkgs/pkgs/development/python-modules/klaus/default.nix b/nixpkgs/pkgs/development/python-modules/klaus/default.nix index cede627f9110..0d393d0e8ae5 100644 --- a/nixpkgs/pkgs/development/python-modules/klaus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/klaus/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "klaus"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "jonashaag"; repo = pname; rev = version; - hash = "sha256-kQcza2beyekJhRT9RwSdMIkeyapcUDtjgkapK3rocvg="; + hash = "sha256-VAwIdmwdo/Rim2sVlR605Wo5/zkNOMiGkh40qLrENmU="; }; prePatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix b/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix index ff8b8f587ce4..47b9fa4d8357 100644 --- a/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix +++ b/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , setuptools +, wheel }: buildPythonPackage rec { @@ -16,8 +18,18 @@ buildPythonPackage rec { hash = "sha256-MeurZ6731qjeBK6HTwXYLVs6+nXF9Hf1p8/NNwxmae4="; }; + patches = [ + # https://github.com/XKNX/knx-frontend/pull/96 + (fetchpatch { + name = "relax-setuptools-dependency.patch"; + url = "https://github.com/XKNX/knx-frontend/commit/72ac6dc42eeeb488992b0709ee58ea4a79287817.patch"; + hash = "sha256-EpfgEq4pIx7ahqJZalzo30ruj8NlZYHcKHxFXCGL98w="; + }) + ]; + nativeBuildInputs = [ setuptools + wheel ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/nixpkgs/pkgs/development/python-modules/kombu/default.nix index cdccecf72b09..af8e8ed29be9 100644 --- a/nixpkgs/pkgs/development/python-modules/kombu/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kombu/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.3.1"; + version = "5.3.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+9dXLZLAv3HBEqa0UWMVPepae2pwHsFrVown0P0jcPI="; + hash = "sha256-C6IT9jCiyydycorvVqxog9w6LxNDXhAEj26X1IUG270="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/kornia/default.nix b/nixpkgs/pkgs/development/python-modules/kornia/default.nix index c36540714acf..5d98379045ed 100644 --- a/nixpkgs/pkgs/development/python-modules/kornia/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kornia/default.nix @@ -2,23 +2,22 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, pytestCheckHook , packaging , torch }: buildPythonPackage rec { pname = "kornia"; - version = "0.6.12"; + version = "0.7.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qLJos1ivEws/jFK4j0Kp1ij9J9ZwCoHFRYXnlYxwPFY="; + hash = "sha256-XcQXKn4F3DIgn+XQcN5ZcGZLehd/IPBgLuGzIkPSxZg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/laszip/default.nix b/nixpkgs/pkgs/development/python-modules/laszip/default.nix index 2c6f4196595f..85187d08f99f 100644 --- a/nixpkgs/pkgs/development/python-modules/laszip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/laszip/default.nix @@ -2,17 +2,18 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , scikit-build-core , pybind11 , cmake , LASzip +, ninja , pythonOlder }: buildPythonPackage rec { pname = "laszip-python"; version = "0.2.3"; - format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,14 +25,25 @@ buildPythonPackage rec { hash = "sha256-MiPzL9TDCf1xnCv7apwdfcpkFnBRi4PO/atTQxqL8cw="; }; + patches = [ + # Removes depending on the cmake and ninja PyPI packages, since we can pass + # in the tools directly, and scikit-build-core can use them. + # https://github.com/tmontaigu/laszip-python/pull/9 + (fetchpatch { + name = "remove-cmake-ninja-pypi-dependencies.patch"; + url = "https://github.com/tmontaigu/laszip-python/commit/17e648d04945fa2d095d6d74d58c790a4fcde84a.patch"; + hash = "sha256-k58sS1RqVzT1WPh2OVt/D4Y045ODtj6U3bUjegd44VY="; + }) + ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=c++17"; nativeBuildInputs = [ cmake + ninja pybind11 scikit-build-core - scikit-build-core.optional-dependencies.pyproject - ]; + ] ++ scikit-build-core.optional-dependencies.pyproject; dontUseCmakeConfigure = true; diff --git a/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix index ea89a9ac688f..5a39ef7ecba4 100644 --- a/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.47"; + version = "0.1.48"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xe8ude2JzrdmJqwzqLlxRO697IjcGuQgGG6c3nQ/drg="; + hash = "sha256-LVRNcsTmJOR3zTBhbKV4V0zCQk0sk/Uf6kSmfbAhgfY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix index 9382ccd36b63..ac07b77bf2b4 100644 --- a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , buildPythonPackage , poetry-core , pytest-rerunfailures @@ -13,25 +12,16 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.22.1"; + version = "0.23.0post0"; format = "pyproject"; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-tz7Pynm/xHx2X3QjXkvFlX6sVlsVKqrsS1CVmqlqfj0="; + hash = "sha256-qk9QYfLVJVtkNgAZ19UziU7metluz10gDs9HbMoqZjo="; }; - patches = [ - # https://github.com/tmux-python/libtmux/pull/493 - (fetchpatch { - name = "remove-setuptools.patch"; - url = "https://github.com/tmux-python/libtmux/commit/aa3a1e2015ade73129191ad04146ce52765d478c.patch"; - hash = "sha256-p3KMktd6eG9/lRK+DdBvDtSwhI+sV2RQfBAuElMk8tQ="; - }) - ]; - postPatch = '' sed -i '/addopts/d' setup.cfg ''; diff --git a/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix b/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix index e4c0e6f955cd..bc4dcaee1a19 100644 --- a/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix @@ -19,16 +19,16 @@ buildPythonPackage rec { pname = "liquidctl"; - version = "1.12.1"; + version = "1.13.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0QjgnTxqB50JNjSUAgBrGyhN2XC/TDYiC1tvhw1Bl1M="; + hash = "sha256-LU8rQmXrEIoOBTTFotGvMeHqksYGrtNo2YSl2l2e/UI="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/logbook/default.nix b/nixpkgs/pkgs/development/python-modules/logbook/default.nix index e6d155760d51..d8251a40099f 100644 --- a/nixpkgs/pkgs/development/python-modules/logbook/default.nix +++ b/nixpkgs/pkgs/development/python-modules/logbook/default.nix @@ -1,30 +1,87 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, brotli }: +{ lib +, brotli +, buildPythonPackage +, cython +, execnet +, fetchFromGitHub +, jinja2 +, pytestCheckHook +, pythonOlder +, pyzmq +, redis +, setuptools +, sqlalchemy +}: buildPythonPackage rec { pname = "logbook"; - version = "1.5.3"; + version = "1.6.0"; + format = "setuptools"; - src = fetchPypi { - pname = "Logbook"; - inherit version; - sha256 = "1s1gyfw621vid7qqvhddq6c3z2895ci4lq3g0r1swvpml2nm9x36"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "getlogbook"; + repo = "logbook"; + rev = "refs/tags/${version}"; + hash = "sha256-2K6fM6MFrh3l0smhSz8RFd79AIOXQZJQbNLTJM4WZUo="; }; - nativeCheckInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ]; + nativeBuildInputs = [ + cython + setuptools + ]; - propagatedBuildInputs = [ brotli ]; + passthru.optional-dependencies = { + execnet = [ + execnet + ]; + sqlalchemy = [ + sqlalchemy + ]; + redis = [ + redis + ]; + zmq = [ + pyzmq + ]; + compression = [ + brotli + ]; + jinja = [ + jinja2 + ]; + all = [ + brotli + execnet + jinja2 + pyzmq + redis + sqlalchemy + ]; + }; - checkPhase = '' - find tests -name \*.pyc -delete - py.test tests - ''; + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; - meta = { - homepage = "https://pythonhosted.org/Logbook/"; + pythonImportsCheck = [ + "logbook" + ]; + + disabledTests = [ + # Test require Redis instance + "test_redis_handler" + ]; + + meta = with lib; { description = "A logging replacement for Python"; - license = lib.licenses.bsd3; + homepage = "https://logbook.readthedocs.io/"; + changelog = "https://github.com/getlogbook/logbook/blob/${version}/CHANGES"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix b/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix index 7f0231c7d357..1a103d2a8c52 100644 --- a/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.18.0"; + version = "1.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - hash = "sha256-wl8L+ZQQgzWb7QUHWHSOT3meCn1baE7Prs1nWAOvnKo="; + hash = "sha256-Kr+L8zHcutpxzqvwQ10iebHiwBIT+sZiiT38G6O/joY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/manifest-ml/default.nix b/nixpkgs/pkgs/development/python-modules/manifest-ml/default.nix index 71d7d3e26d31..329f676ef45b 100644 --- a/nixpkgs/pkgs/development/python-modules/manifest-ml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/manifest-ml/default.nix @@ -95,6 +95,12 @@ buildPythonPackage rec { "test_get" # this test has network access "test_retry_handling" + # Test is time-senstive + "test_timing" + ]; + + pythonImportsCheck = [ + "manifest" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/manifestoo-core/default.nix b/nixpkgs/pkgs/development/python-modules/manifestoo-core/default.nix new file mode 100644 index 000000000000..3135ded66ebf --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/manifestoo-core/default.nix @@ -0,0 +1,40 @@ +{ buildPythonPackage +, typing-extensions +, fetchPypi +, lib +, nix-update-script +, hatch-vcs +, pythonOlder +, importlib-resources +}: + +buildPythonPackage rec { + pname = "manifestoo-core"; + version = "0.11.0"; + format = "pyproject"; + + src = fetchPypi { + inherit version; + pname = "manifestoo_core"; + hash = "sha256-ZZAJDOtGcYWm0yS5bMOUdM1Jf+kfurwiLsJwyTYPz/4="; + }; + + nativeBuildInputs = [ + hatch-vcs + ]; + + propagatedBuildInputs = + lib.optionals (pythonOlder "3.7") [ importlib-resources ] + ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "A library to reason about Odoo addons manifests"; + homepage = "https://github.com/acsone/manifestoo-core"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ yajo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/manifestoo/default.nix b/nixpkgs/pkgs/development/python-modules/manifestoo/default.nix new file mode 100644 index 000000000000..c9499eb11310 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/manifestoo/default.nix @@ -0,0 +1,51 @@ +{ buildPythonPackage +, fetchPypi +, hatch-vcs +, importlib-metadata +, lib +, manifestoo-core +, nix-update-script +, pytestCheckHook +, pythonOlder +, textual +, typer +, typing-extensions +}: + +buildPythonPackage rec { + pname = "manifestoo"; + version = "0.7"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gCGchc+fShBgt6fVJAx80+QnH+vxWo3jsIyePkFwhYE="; + }; + + nativeBuildInputs = [ + hatch-vcs + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + propagatedBuildInputs = [ + manifestoo-core + textual + typer + ] + ++ typer.passthru.optional-dependencies.all + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "A tool to reason about Odoo addons manifests"; + homepage = "https://github.com/acsone/manifestoo"; + license = licenses.mit; + maintainers = with maintainers; [ yajo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix b/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix index 13bee5c38958..97eeb09d7b8a 100644 --- a/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mashumaro/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mashumaro"; - version = "3.9"; + version = "3.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Fatal1ty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oH44poFVnoM831dJuA9KcHCsuW6gh5B2EHrnKwza6A4="; + hash = "sha256-VDB6313lvKuLJFOnuzEaiiRLUBOvbdjfowgl3nvG8Y0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix index 2cfd5d21db19..e5df4ea7d4ea 100644 --- a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix @@ -8,10 +8,13 @@ # https://github.com/matplotlib/matplotlib/blob/main/doc/devel/dependencies.rst # build-system +, certifi +, oldest-supported-numpy , pkg-config , pybind11 , setuptools , setuptools-scm +, wheel # native libraries , ffmpeg-headless @@ -116,11 +119,14 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + certifi + numpy + oldest-supported-numpy # TODO remove after updating to 3.8.0 pkg-config pybind11 setuptools setuptools-scm - numpy + wheel ] ++ lib.optionals enableGtk3 [ gobject-introspection ]; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix index 5df491ea8575..734045426526 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "1.0.2"; + version = "1.0.4"; format = "flit"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-H+wqgcXNrdrZ5aQvZ7XM8YpBpVZM6pFtsANC00UZ0jM="; + hash = "sha256-mGWeG8clWJ7obsvO+gYaVzfAyDOh9HNdyWW5KgOgfmM="; }; buildInputs = [ @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "mdformat plugin for MkDocs"; homepage = "https://github.com/KyleKing/mdformat-mkdocs"; +changelog = "https://github.com/KyleKing/mdformat-mkdocs/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ aldoborrero ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat/default.nix index 3ac61c1a1888..a25a632f5150 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat/default.nix @@ -47,7 +47,7 @@ let package = buildPythonPackage rec { pname = "mdformat"; - version = "0.7.16"; + version = "0.7.17"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -55,8 +55,8 @@ let src = fetchFromGitHub { owner = "executablebooks"; repo = pname; - rev = version; - hash = "sha256-6MWUkvZp5CYUWsbMGXM2gudjn5075j5FIuaNnCrgRNs="; + rev = "refs/tags/${version}"; + hash = "sha256-umtfbhN6sDR/rFr1LwmJ21Ph9bK1Qq43bmMVzGCPD5s="; }; nativeBuildInputs = [ @@ -93,6 +93,7 @@ let meta = with lib; { description = "CommonMark compliant Markdown formatter"; homepage = "https://mdformat.rtfd.io/"; + changelog = "https://github.com/executablebooks/mdformat/blob/${version}/docs/users/changelog.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab aldoborrero ]; mainProgram = "mdformat"; diff --git a/nixpkgs/pkgs/development/python-modules/meep/default.nix b/nixpkgs/pkgs/development/python-modules/meep/default.nix index 021121a44ac2..df0dd2cb1bb1 100644 --- a/nixpkgs/pkgs/development/python-modules/meep/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meep/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config +, mpiCheckPhaseHook , gfortran , mpi , blas @@ -108,15 +109,11 @@ buildPythonPackage rec { errors can be caught. */ doCheck = true; + nativeCheckInputs = [ mpiCheckPhaseHook openssh ]; checkPhase = '' - export PATH=$PATH:${openssh}/bin - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - - export OMP_NUM_THREADS=1 + runHook preCheck - # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo - export OMPI_MCA_rmaps_base_oversubscribe=1 + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" # Generate a python test script cat > test.py << EOF @@ -139,6 +136,8 @@ buildPythonPackage rec { EOF ${mpi}/bin/mpiexec -np 2 python3 test.py + + runHook postCheck ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix index 00552394c8bb..18b2ae836151 100644 --- a/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.2.1"; + version = "2.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-szeY3+84xAihGK9nLgMQf9oLRDlKlaPg6+I42TJkfVY="; + hash = "sha256-7mQq0phe920t7aJxvP0cCpVNH9s7F+x1fBdzAVUgtKE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/millheater/default.nix b/nixpkgs/pkgs/development/python-modules/millheater/default.nix index fb4f054cd212..6edd37f14dbc 100644 --- a/nixpkgs/pkgs/development/python-modules/millheater/default.nix +++ b/nixpkgs/pkgs/development/python-modules/millheater/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.11.0"; + version = "0.11.1"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pymill"; rev = "refs/tags/${version}"; - hash = "sha256-NECGUosjrhRCVGHOFV+YjY8o3heoA7qi9kKsgXpeHh0="; + hash = "sha256-RlnZUI7F1u1rjmuPc2guqVomR25Izf5jejN6LlMZYS8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mip/default.nix b/nixpkgs/pkgs/development/python-modules/mip/default.nix index e7ba8740cbbf..db2786915b56 100644 --- a/nixpkgs/pkgs/development/python-modules/mip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mip/default.nix @@ -8,6 +8,9 @@ , numpy , pytestCheckHook , pythonOlder +, setuptools +, setuptools-scm +, wheel , gurobi , gurobipy # Enable support for the commercial Gurobi solver (requires a license) @@ -20,9 +23,9 @@ buildPythonPackage rec { pname = "mip"; version = "1.15.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; - format = "pyproject"; src = fetchPypi { inherit pname version; @@ -30,7 +33,14 @@ buildPythonPackage rec { }; nativeCheckInputs = [ matplotlib networkx numpy pytestCheckHook ]; - nativeBuildInputs = [ dos2unix ]; + + nativeBuildInputs = [ + dos2unix + setuptools + setuptools-scm + wheel + ]; + propagatedBuildInputs = [ cffi ] ++ lib.optionals gurobiSupport ([ diff --git a/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix index 462768eed799..5ad4ef448454 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "mkdocs-minify"; - version = "0.6.3"; + version = "0.7.1"; src = fetchFromGitHub { owner = "byrnereese"; repo = "${pname}-plugin"; rev = "refs/tags/${version}"; - hash = "sha256-ajXkEKLBC86Y8YzDCZXd6x6QtLLrCDJkb6kDrRE536o="; + hash = "sha256-LDCAWKVbFsa6Y/tmY2Zne4nOtxe4KvNplZuWxg4e4L8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index a7b109d127eb..ff9326a8ba7d 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -1,22 +1,26 @@ { lib +, beautifulsoup4 , buildPythonPackage , drawio-headless -, fetchPypi -, pythonOlder +, fetchFromGitHub , mkdocs -, beautifulsoup4 +, pathspec +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.6.2"; + version = "0.6.4"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-H/eqrwlZntEYoKkJZKiRV+KyzkrDKRirMDDSciFNIGo="; + src = fetchFromGitHub { + owner = "Blueswen"; + repo = "mkdocs-swagger-ui-tag"; + rev = "refs/tags/v${version}"; + hash = "sha256-/Spvj3lt7p+ZUbA/7xaQMLCSmHOOsoCRliqaAN+YU3g="; }; propagatedBuildInputs = [ @@ -24,10 +28,22 @@ buildPythonPackage rec { beautifulsoup4 ]; + nativeCheckInputs = [ + pathspec + pytestCheckHook + ]; + pythonImportsCheck = [ "mkdocs_swagger_ui_tag" ]; + disabledTests = [ + # Don't actually build results + "test_material" + "test_material_dark_scheme_name" + "test_template" + ]; + meta = with lib; { description = "A MkDocs plugin supports for add Swagger UI in page"; homepage = "https://github.com/Blueswen/mkdocs-swagger-ui-tag"; diff --git a/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix index e297f47a0b5d..df8b47a3e983 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.5.0"; + version = "1.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-Z92w84JI7tzARHNdVZvOrMHFbMLUayf6uHak++C0suc="; + hash = "sha256-r9zboUvF1IH32d6jQ+nRbzXejlZADt5+YNZ/LdFyULk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix b/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix index c329196d51de..eae60372af0d 100644 --- a/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ml-dtypes/default.nix @@ -27,6 +27,14 @@ buildPythonPackage rec { fetchSubmodules = true; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "numpy~=1.21.2" "numpy" \ + --replace "numpy~=1.23.3" "numpy" \ + --replace "pybind11~=2.10.0" "pybind11" \ + --replace "setuptools~=67.6.0" "setuptools" + ''; + nativeBuildInputs = [ setuptools pybind11 diff --git a/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix b/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix index 005efb6c686d..12f47a9e80d0 100644 --- a/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/model-bakery/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "model-bakery"; - version = "1.14.0"; + version = "1.15.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "model-bakers"; repo = "model_bakery"; rev = "refs/tags/${version}"; - hash = "sha256-eiCbx15lY8H+xS2HhDCpsqwsuZGxou8aHgaktd/+65U="; + hash = "sha256-gB6lcLymkajRoeOQ70kmZVlBI7oeZgQo1VySfPGeQLQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/molecule/default.nix b/nixpkgs/pkgs/development/python-modules/molecule/default.nix index c12dc3a92f35..e62ee8fb29db 100644 --- a/nixpkgs/pkgs/development/python-modules/molecule/default.nix +++ b/nixpkgs/pkgs/development/python-modules/molecule/default.nix @@ -4,7 +4,6 @@ , ansible-compat , ansible-core , click-help-colors -, cookiecutter , enrich , jsonschema , withPlugins ? true, molecule-plugins @@ -12,36 +11,41 @@ , pluggy , rich , setuptools +, setuptools-scm , yamllint +, wcmatch +, wheel }: buildPythonPackage rec { pname = "molecule"; - version = "5.1.0"; + version = "6.0.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-+nr4n9+TF1OcPsqZyx5edSLXpX4LZ/W2mORCdvmNnYI="; + hash = "sha256-uRk1P3mXRt5gsWonV1YneD45wmj98vKqA3LwFix7VHg="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + propagatedBuildInputs = [ ansible-compat ansible-core click-help-colors - cookiecutter enrich jsonschema packaging pluggy rich yamllint + wcmatch ] ++ lib.optional withPlugins molecule-plugins; - nativeBuildInputs = [ - setuptools - ]; - pythonImportsCheck = [ "molecule" ]; # tests can't be easily run without installing things from ansible-galaxy diff --git a/nixpkgs/pkgs/development/python-modules/molecule/plugins.nix b/nixpkgs/pkgs/development/python-modules/molecule/plugins.nix index 9cb8a635c31e..af36fe3bb60c 100644 --- a/nixpkgs/pkgs/development/python-modules/molecule/plugins.nix +++ b/nixpkgs/pkgs/development/python-modules/molecule/plugins.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "molecule-plugins"; - version = "23.4.1"; + version = "23.5.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-NMR+4sEcNbowyoTqaEwe4Wac9+WNIZesnb/L9C0KG3s="; + hash = "sha256-8T6gR7hlDIkmBLgbdjgryAu0riXqULI/MOgf2dWAKv8="; }; # reverse the dependency diff --git a/nixpkgs/pkgs/development/python-modules/monai-deploy/default.nix b/nixpkgs/pkgs/development/python-modules/monai-deploy/default.nix index a74fa36629df..85c23a39c77a 100644 --- a/nixpkgs/pkgs/development/python-modules/monai-deploy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/monai-deploy/default.nix @@ -26,6 +26,12 @@ buildPythonPackage rec { hash = "sha256-oaNZ0US0YR/PSwAZ5GfRpAW+HRYVhdCZI83fC00rgok="; }; + postPatch = '' + # Asked in https://github.com/Project-MONAI/monai-deploy-app-sdk/issues/450 + # if this patch can be incorporated upstream. + substituteInPlace pyproject.toml --replace 'versioneer-518' 'versioneer' + ''; + nativeBuildInputs = [ versioneer ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix b/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix index 8584930c31f1..887c5446d53c 100644 --- a/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix @@ -1,4 +1,6 @@ -{ lib, fetchPypi, fetchpatch, python, buildPythonPackage, mpi, openssh }: +{ lib, fetchPypi, fetchpatch, python, buildPythonPackage +, mpi, mpiCheckPhaseHook, openssh +}: buildPythonPackage rec { pname = "mpi4py"; @@ -33,10 +35,6 @@ buildPythonPackage rec { # sometimes packages specify where files should be installed outside the usual # python lib prefix, we override that back so all infrastructure (setup hooks) # work as expected - - # Needed to run the tests reliably. See: - # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30 - export OMPI_MCA_rmaps_base_oversubscribe=yes ''; setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"]; @@ -45,7 +43,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ openssh ]; + nativeCheckInputs = [ openssh mpiCheckPhaseHook ]; meta = with lib; { description = "Python bindings for the Message Passing Interface standard"; diff --git a/nixpkgs/pkgs/development/python-modules/msgspec/default.nix b/nixpkgs/pkgs/development/python-modules/msgspec/default.nix index 89ccbb63ff60..f5ae1860039c 100644 --- a/nixpkgs/pkgs/development/python-modules/msgspec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.18.1"; + version = "0.18.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-cacwbl5JYqQGXhdt/F0nhX032GCw8RwFi0XBsn7dlq0="; + hash = "sha256-t5TM7CgVIxdXR6jMOXh1XhpA9vBrYHBcR2iLYP4A/Jc="; }; # Requires libasan to be accessible diff --git a/nixpkgs/pkgs/development/python-modules/msprime/default.nix b/nixpkgs/pkgs/development/python-modules/msprime/default.nix index d33adc13080a..f4b3a2eb70c6 100644 --- a/nixpkgs/pkgs/development/python-modules/msprime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msprime/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage , fetchPypi +, oldest-supported-numpy , setuptools-scm +, wheel , pythonOlder , gsl , numpy @@ -25,8 +27,10 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools-scm gsl + oldest-supported-numpy + setuptools-scm + wheel ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/multiset/default.nix b/nixpkgs/pkgs/development/python-modules/multiset/default.nix index 6d9a28e564ba..0e6e143676bc 100644 --- a/nixpkgs/pkgs/development/python-modules/multiset/default.nix +++ b/nixpkgs/pkgs/development/python-modules/multiset/default.nix @@ -1,8 +1,10 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , setuptools , setuptools-scm +, wheel , pytestCheckHook }: @@ -16,9 +18,13 @@ buildPythonPackage rec { hash = "sha256-5FZxyug4Wo5iSKmwejqDKAwtDMQxJxMFjPus3F7Jlz4="; }; - nativeBuildInputs = [ - setuptools - setuptools-scm + patches = [ + # https://github.com/wheerd/multiset/pull/115 + (fetchpatch { + name = "relax-setuptools-scm-dependency.patch"; + url = "https://github.com/wheerd/multiset/commit/296187b07691c94b783f65504afc580a355abd96.patch"; + hash = "sha256-vnZR1cyM/2/JfbLuVOxJuC9oMVVVploUHpbzagmo+AE="; + }) ]; postPatch = '' @@ -26,6 +32,12 @@ buildPythonPackage rec { sed -i '/python_requires/d' setup.cfg ''; + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + pythonImportsCheck = [ "multiset" ]; diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix index d64d9d20c5ca..2df248c3d4de 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.17.3"; + version = "7.18.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-ziJb/aIvK8zZ2NwCKtyGHNQ0LM0Sro6//oAESlku0kI="; + hash = "sha256-43kyDgolXEu5J5OVaLKqjVdyWaobfGNvevNFh4CFjss="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix index 56734b6a9d52..8b22c42f0f7b 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-ebs"; - version = "1.28.16"; + version = "1.28.36"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PJkVweQPGGR3NwCpg/O+Cs822XU6awMfUL6wWwT6e0w="; + hash = "sha256-w9OLKJAn9UBnA7x+uedhplSV8plZRYlBpviU9Gv1Ny8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 063974c955fe..61aa96fa1340 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -1,6 +1,7 @@ { lib , boto3 , buildPythonPackage +, cython_3 , fetchPypi , pythonOlder , typing-extensions @@ -8,19 +9,23 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.28.27"; + version = "1.28.36"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8QlDRPaNH/4rmYQE4uT/mqQjlDhpIYf6g617c0c5mRw="; + hash = "sha256-RNo3X9TXWxxczCbc075IKUxwYURe/W2Q6/ykP/67s+Q="; }; + nativeBuildInputs = [ + cython_3 + ]; + propagatedBuildInputs = [ boto3 - ] ++ lib.optionals (pythonOlder "3.9") [ + ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; diff --git a/nixpkgs/pkgs/development/python-modules/napalm/hp-procurve.nix b/nixpkgs/pkgs/development/python-modules/napalm/hp-procurve.nix index c0a326b0ef7f..87dad04cf781 100644 --- a/nixpkgs/pkgs/development/python-modules/napalm/hp-procurve.nix +++ b/nixpkgs/pkgs/development/python-modules/napalm/hp-procurve.nix @@ -1,30 +1,44 @@ -{ lib, buildPythonPackage, fetchFromGitHub, setuptools, napalm, netmiko -, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, napalm +, netmiko +, pip +, pytestCheckHook +}: buildPythonPackage rec { pname = "napalm-hp-procurve"; version = "0.7.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "napalm-automation-community"; repo = pname; rev = version; - sha256 = "1lspciddkd1w5lfyz35i0qwgpbn5jq9cbqkwjbsvi4kliz229vkh"; + hash = "sha256-cO4kxI90krj1knzixRKWxa77OAaxjO8dLTy02VpkV9M="; }; + nativeBuildInputs = [ + pip + ]; + # dependency installation in setup.py doesn't work patchPhase = '' echo -n > requirements.txt ''; - buildInputs = [ setuptools napalm ]; + buildInputs = [ napalm ]; + propagatedBuildInputs = [ netmiko ]; # setup.cfg seems to contain invalid pytest parameters preCheck = '' rm setup.cfg ''; + nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ # AssertionError: Some methods vary. "test_method_signatures" diff --git a/nixpkgs/pkgs/development/python-modules/napari/default.nix b/nixpkgs/pkgs/development/python-modules/napari/default.nix index 769134bcd4e5..9df87e357dd3 100644 --- a/nixpkgs/pkgs/development/python-modules/napari/default.nix +++ b/nixpkgs/pkgs/development/python-modules/napari/default.nix @@ -38,7 +38,7 @@ mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.4.17"; + version = "0.4.18"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -47,7 +47,7 @@ mkDerivationWith buildPythonPackage rec { owner = "napari"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-34FALCI7h0I295553Rv0KZxKIipuA2OMNsINGde7/oE="; + hash = "sha256-xF0DYK+226MZpB050IukNvTg2iHMQAIZW0serKRJd/0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix b/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix index 6f17d83524c2..79febaf68518 100644 --- a/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "nbclassic"; - version = "0.5.2"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QPEbvMWeiVbD1e8TLeyOWoU+iT7Pgx55HVTaDYpQ150="; + hash = "sha256-CuEesjGUVdgFWWvzIDNs2pVUtB2Zq5o8Mb+BgL/6MOM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix b/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix index 74018b75e93d..de0d972aa986 100644 --- a/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.9.2"; + version = "0.9.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VA239AZjR/I9BlDEro59hTNMaa33SeAwr2TBLplv+I4="; + hash = "sha256-7DOchpG2iPhnYQSjZ6S4zz6gH9CJ3CjSTewi1WOxFWI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/neo4j/default.nix b/nixpkgs/pkgs/development/python-modules/neo4j/default.nix index 1447ceb9bcf1..96790c04c450 100644 --- a/nixpkgs/pkgs/development/python-modules/neo4j/default.nix +++ b/nixpkgs/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.11.0"; + version = "5.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-xPMO1Db1+TwOT+JsBGJcTc7BL2B8Eb1K3kqKMGnsUmE="; + hash = "sha256-feKKBbULkWxEgUaMROvmQph2YTAgSOVDRz/OnpzG9Ac="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix b/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix index e75315400621..9f00a33fdf6b 100644 --- a/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix @@ -3,7 +3,9 @@ , fetchPypi , isPyPy , python +, oldest-supported-numpy , setuptools +, wheel , numpy , zlib , netcdf @@ -26,7 +28,12 @@ buildPythonPackage rec { hash = "sha256-A4KwL/aiiEGfb/7IXexA9FH0G4dVVHFUxXXd2fD0rlM="; }; - nativeBuildInputs = [ setuptools cython ]; + nativeBuildInputs = [ + cython + oldest-supported-numpy + setuptools + wheel + ]; propagatedBuildInputs = [ cftime diff --git a/nixpkgs/pkgs/development/python-modules/newversion/default.nix b/nixpkgs/pkgs/development/python-modules/newversion/default.nix index f1643b9f21cb..e3283a4eb9e2 100644 --- a/nixpkgs/pkgs/development/python-modules/newversion/default.nix +++ b/nixpkgs/pkgs/development/python-modules/newversion/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , packaging , poetry-core , pytestCheckHook @@ -22,6 +23,15 @@ buildPythonPackage rec { hash = "sha256-27HWMzSzyAbiOW7OUhlupRWIVJG6DrpXObXmxlCsmxU="; }; + patches = [ + # https://github.com/vemel/newversion/pull/9 + (fetchpatch { + name = "remove-setuptools-dependency.patch"; + url = "https://github.com/vemel/newversion/commit/b50562671029dd6834bc7a8ad0dd3f9e0fbdfc1d.patch"; + hash = "sha256-6dXVQ9Hk0/EfSwPbW19ZV8MAFcSx+ZRO5G94kbh23GM="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/ninja/default.nix b/nixpkgs/pkgs/development/python-modules/ninja/default.nix index 0ff678569302..808bf9fb8c0e 100644 --- a/nixpkgs/pkgs/development/python-modules/ninja/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ninja/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { --subst-var version substituteInPlace "$sourceRoot/ninja/__init__.py" \ + --subst-var version \ --subst-var-by BIN_DIR "${ninja}/bin" ''; diff --git a/nixpkgs/pkgs/development/python-modules/ninja/stub/ninja/__init__.py b/nixpkgs/pkgs/development/python-modules/ninja/stub/ninja/__init__.py index fcf70f10ba31..d6e7abe15205 100644 --- a/nixpkgs/pkgs/development/python-modules/ninja/stub/ninja/__init__.py +++ b/nixpkgs/pkgs/development/python-modules/ninja/stub/ninja/__init__.py @@ -2,6 +2,8 @@ import os import subprocess import sys +__version__ = '@version@' + BIN_DIR = '@BIN_DIR@' def _program(name, args): diff --git a/nixpkgs/pkgs/development/python-modules/nitime/default.nix b/nixpkgs/pkgs/development/python-modules/nitime/default.nix index 105cecd95b10..b0870c984911 100644 --- a/nixpkgs/pkgs/development/python-modules/nitime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nitime/default.nix @@ -5,6 +5,9 @@ , pythonOlder , pytestCheckHook , cython +, setuptools +, setuptools-scm +, wheel , numpy , scipy , matplotlib @@ -23,11 +26,32 @@ buildPythonPackage rec { hash = "sha256-NnoVrSt6MTTcNup1e+/1v5JoHCYcycuQH4rHLzXJt+Y="; }; - buildInputs = [ cython ]; - propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ]; + # Upstream wants to build against the oldest version of numpy possible, but + # we only want to build against the most recent version. + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "numpy==" "numpy>=" + ''; + + nativeBuildInputs = [ + cython + setuptools + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ + numpy + scipy + matplotlib + networkx + nibabel + ]; nativeCheckInputs = [ pytestCheckHook ]; + doCheck = !stdenv.isDarwin; # tests hang indefinitely + pythonImportsCheck = [ "nitime" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix b/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix index ce438528bc28..7252ce45b711 100644 --- a/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , paho-mqtt , poetry-core , psutil @@ -15,7 +14,7 @@ buildPythonPackage rec { pname = "notus-scanner"; - version = "22.5.0"; + version = "22.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,17 +23,9 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-h+jZWjDvTfW9XjoGhWYX08hgJ/Qp64MEaqHHwnahnC4="; + hash = "sha256-Ih6Uz7dTVMNCBsLcDsslyIzttg+IDBW3B+Ixpp7sz1Y="; }; - patches = [ - (fetchpatch { - name = "update-packaging-dependency.patch"; - url = "https://github.com/greenbone/notus-scanner/commit/bfa7d3d2e63e250ff25a66c60b782eb9da0e89e7.patch"; - hash = "sha256-hzS8TYBXDEq+cgWlp6fSOtSbyeX9EX2rURmnFMF5jN0="; - }) - ]; - pythonRelaxDeps = [ "python-gnupg" ]; diff --git a/nixpkgs/pkgs/development/python-modules/numpyro/default.nix b/nixpkgs/pkgs/development/python-modules/numpyro/default.nix index e521e19e8621..f301fdac7be9 100644 --- a/nixpkgs/pkgs/development/python-modules/numpyro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numpyro/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "numpyro"; - version = "0.12.1"; + version = "0.13.0"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit version pname; - hash = "sha256-S3ifL/KPOJQcyBEYoE1XGxPLmSfh1uT9wJG/YtABBKQ="; + hash = "sha256-n+5K6fZlatKkXGVxzKcVhmP5XNuJeeM+GcCJ1Kh/WMk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix b/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix index 855ecb8384d4..37f7a1e44c21 100644 --- a/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "16.0.6"; + version = "16.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-82I+ZmWRUUV+kxveHNDXTsbOeZcT0QJo/SJP3paxRcY="; + hash = "sha256-opF7HdTJX4M7gTgB0VyWyyG/DO7lrVTvTcxMBX3a6UE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/oci/default.nix b/nixpkgs/pkgs/development/python-modules/oci/default.nix index 9cae940ccc38..13f5819a6ef3 100644 --- a/nixpkgs/pkgs/development/python-modules/oci/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.110.1"; + version = "2.111.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-v2h/K1gat+nHGjn6a9r1BDMDAoJ/OtNctxHzV41gRkg="; + hash = "sha256-7lkxk/oFb5DPH3LcOJLJByMaf4xQB8L6FLKrXOn+HsM="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/oldest-supported-numpy/default.nix b/nixpkgs/pkgs/development/python-modules/oldest-supported-numpy/default.nix index a7b99614aef8..5d6e11c34daf 100644 --- a/nixpkgs/pkgs/development/python-modules/oldest-supported-numpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oldest-supported-numpy/default.nix @@ -25,10 +25,11 @@ buildPythonPackage rec { --replace 'numpy==' 'numpy>=' ''; - nativeBuildInputs = [ + propagatedBuildInputs = [ numpy ]; + # package has no tests doCheck = false; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/opentsne/default.nix b/nixpkgs/pkgs/development/python-modules/opentsne/default.nix index beab3b0d5e6d..9fc3c7fe8143 100644 --- a/nixpkgs/pkgs/development/python-modules/opentsne/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opentsne/default.nix @@ -3,11 +3,13 @@ , fetchFromGitHub , cython , numpy +, oldest-supported-numpy , scipy , scikit-learn , pytestCheckHook , nix-update-script , setuptools +, wheel }: let @@ -23,8 +25,14 @@ let hash = "sha256-L5Qx6dMJlXF3EaWwlFTQ3dkhGXc5PvQBXYJo+QO+Hxc="; }; + nativeBuildInputs = [ + cython + oldest-supported-numpy + setuptools + wheel + ]; + propagatedBuildInputs = [ numpy scipy scikit-learn ]; - nativeBuildInputs = [ cython setuptools ]; pythonImportsCheck = [ "openTSNE" ]; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/opower/default.nix b/nixpkgs/pkgs/development/python-modules/opower/default.nix index 381afbea510f..916a4c66b9fc 100644 --- a/nixpkgs/pkgs/development/python-modules/opower/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opower/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.31"; + version = "0.0.33"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-lJVaQnGfZBjMgWLKZG/LNao8l4Fj3z3AZhnfgJwOcxo="; + hash = "sha256-YZ9I+Pdfh7i8gtBYnVwIaJSRSG0uU+8hKSCSk391hzc="; }; pythonRemoveDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/optimum/default.nix b/nixpkgs/pkgs/development/python-modules/optimum/default.nix index 6f781c3f174d..0c8a9a738aa1 100644 --- a/nixpkgs/pkgs/development/python-modules/optimum/default.nix +++ b/nixpkgs/pkgs/development/python-modules/optimum/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.11.1"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-J0QcHmR2hVd/Ygi7QFtsObwx/Sm3DCwU+DojzXHokYU="; + hash = "sha256-/Z7Gh8pAa5z96X7rdcuq6kxtpF53EFGIYOu1ft8w+XM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/osc/default.nix b/nixpkgs/pkgs/development/python-modules/osc/default.nix index 07157162f4cd..e6e7f7bc6ce9 100644 --- a/nixpkgs/pkgs/development/python-modules/osc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/osc/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "osc"; - version = "1.0.0b1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "openSUSE"; repo = "osc"; rev = version; - sha256 = "cMltsR4Nxe0plHU5cP2Lj/qqlIqRbCXi6FXP8qx7908="; + sha256 = "sha256-gHcPqo3AuSrVprYUGLenC0kw9hKNmjabZ1m6YVMsNPs="; }; buildInputs = [ bashInteractive ]; # needed for bash-completion helper @@ -18,8 +18,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ urllib3 cryptography ]; postInstall = '' - install -D -m444 osc.fish $out/etc/fish/completions/osc.fish - install -D -m555 dist/osc.complete $out/share/bash-completion/helpers/osc-helper + install -D -m444 contrib/osc.fish $out/etc/fish/completions/osc.fish + install -D -m555 contrib/osc.complete $out/share/bash-completion/helpers/osc-helper mkdir -p $out/share/bash-completion/completions cat >>$out/share/bash-completion/completions/osc <<EOF test -z "\$BASH_VERSION" && return diff --git a/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix index 3591669291aa..1e89c69f7e2f 100644 --- a/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "oslo-serialization"; - version = "5.1.1"; + version = "5.2.0"; src = fetchPypi { pname = "oslo.serialization"; inherit version; - hash = "sha256-irvaixdjoGBx/CjF2Km+VHuihfSDDminD/iP4R8Wv0M="; + hash = "sha256-nPAw1hpszh9Hpi1AUPXoPhvRoQGKxnG7GTruB9Fb28I="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/paddleocr/default.nix b/nixpkgs/pkgs/development/python-modules/paddleocr/default.nix new file mode 100644 index 000000000000..9bd81077abfd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/paddleocr/default.nix @@ -0,0 +1,111 @@ +{ lib +, buildPythonPackage +, pythonRelaxDepsHook +, fetchFromGitHub +, attrdict +, beautifulsoup4 +, cython +, fire +, fonttools +, lmdb +, lxml +, numpy +, opencv4 +, openpyxl +, pdf2docx +, pillow +, premailer +, pyclipper +, pymupdf +, python-docx +, rapidfuzz +, scikit-image +, shapely +, tqdm +, paddlepaddle +, lanms-neo +, polygon3 +}: + +let + version = "2.7.0.1"; +in +buildPythonPackage { + pname = "paddleocr"; + inherit version; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "PaddlePaddle"; + repo = "PaddleOCR"; + rev = "254786752a2659e184822b4b2de5637a05236590"; + hash = "sha256-M/Fpk9swX9Gds7o5poM9Iv6LOhKoZNbe0Wv9JNMPOU0="; + }; + + patches = [ + # The `ppocr.data.imaug` re-exports the `IaaAugment` and `CopyPaste` + # classes. These classes depend on the `imgaug` package which is + # unmaintained and has been removed from nixpkgs. + # + # The image OCR feature of PaddleOCR doesn't use these classes though, so + # they work even after stripping the the `IaaAugment` and `CopyPaste` + # exports. It probably breaks some of the OCR model creation tooling that + # PaddleOCR provides, however. + ./remove-import-imaug.patch + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + # trying to relax only pymupdf makes the whole build fail + pythonRelaxDeps = true; + pythonRemoveDeps = [ + "imgaug" + "visualdl" + "opencv-python" + "opencv-contrib-python" + ]; + + propagatedBuildInputs = [ + attrdict + beautifulsoup4 + cython + fire + fonttools + lmdb + lxml + numpy + opencv4 + openpyxl + pdf2docx + pillow + premailer + pyclipper + pymupdf + python-docx + rapidfuzz + scikit-image + shapely + tqdm + paddlepaddle + lanms-neo + polygon3 + ]; + + # TODO: The tests depend, among possibly other things, on `cudatoolkit`. + # But Cudatoolkit fails to install. + # preCheck = "export HOME=$TMPDIR"; + # nativeCheckInputs = with pkgs; [ which cudatoolkit ]; + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/PaddlePaddle/PaddleOCR"; + license = licenses.asl20; + description = "Multilingual OCR toolkits based on PaddlePaddle"; + longDescription = '' + PaddleOCR aims to create multilingual, awesome, leading, and practical OCR + tools that help users train better models and apply them into practice. + ''; + changelog = "https://github.com/PaddlePaddle/PaddleOCR/releases/tag/v${version}"; + maintainers = with maintainers; [ happysalada ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/paddleocr/remove-import-imaug.patch b/nixpkgs/pkgs/development/python-modules/paddleocr/remove-import-imaug.patch new file mode 100644 index 000000000000..f24156fb6a12 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/paddleocr/remove-import-imaug.patch @@ -0,0 +1,20 @@ +diff --git a/ppocr/data/imaug/__init__.py b/ppocr/data/imaug/__init__.py +index 121582b4..a6987c75 100644 +--- a/ppocr/data/imaug/__init__.py ++++ b/ppocr/data/imaug/__init__.py +@@ -16,7 +16,6 @@ from __future__ import division + from __future__ import print_function + from __future__ import unicode_literals + +-from .iaa_augment import IaaAugment + from .make_border_map import MakeBorderMap + from .make_shrink_map import MakeShrinkMap + from .random_crop_data import EastRandomCropData, RandomCropImgMask +@@ -30,7 +29,6 @@ from .rec_img_aug import BaseDataAugmentation, RecAug, RecConAug, RecResizeImg, + RFLRecResizeImg, SVTRRecAug + from .ssl_img_aug import SSLRotateResize + from .randaugment import RandAugment +-from .copy_paste import CopyPaste + from .ColorJitter import ColorJitter + from .operators import * + from .label_ops import * diff --git a/nixpkgs/pkgs/development/python-modules/pallets-sphinx-themes/default.nix b/nixpkgs/pkgs/development/python-modules/pallets-sphinx-themes/default.nix index be4329a41334..460d99575b9e 100644 --- a/nixpkgs/pkgs/development/python-modules/pallets-sphinx-themes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pallets-sphinx-themes/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pallets-sphinx-themes"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "pallets"; repo = "pallets-sphinx-themes"; rev = "refs/tags/${version}"; - sha256 = "sha256-u1sHeO0fk11+M5M0yqDcWsMJKBMeAGW+GPOgu1oniok="; + sha256 = "sha256-Z03rsqkwF2rYaqRZflf5qc5EdHPIEcEcB1ftYIm5DQs="; }; propagatedBuildInputs = [ packaging sphinx ]; diff --git a/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/nixpkgs/pkgs/development/python-modules/pandas/default.nix index 0c3b28d1d215..d79b9eea4bce 100644 --- a/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -6,8 +6,10 @@ # build-system , cython +, oldest-supported-numpy , setuptools , versioneer +, wheel # propagates , numpy @@ -75,7 +77,9 @@ buildPythonPackage rec { setuptools cython numpy + oldest-supported-numpy versioneer + wheel ] ++ versioneer.optional-dependencies.toml; enableParallelBuilding = true; @@ -168,10 +172,6 @@ buildPythonPackage rec { all = lib.concatLists (lib.attrValues extras); }; - # Doesn't work with -Werror,-Wunused-command-line-argument - # https://github.com/NixOS/nixpkgs/issues/39687 - hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; - nativeCheckInputs = [ glibcLocales hypothesis diff --git a/nixpkgs/pkgs/development/python-modules/particle/default.nix b/nixpkgs/pkgs/development/python-modules/particle/default.nix index 1a9f4fef309b..69eabb7cf57f 100644 --- a/nixpkgs/pkgs/development/python-modules/particle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/particle/default.nix @@ -1,6 +1,7 @@ { lib , attrs , buildPythonPackage +, deprecated , fetchFromGitHub , fetchPypi , hatch-vcs @@ -15,14 +16,14 @@ buildPythonPackage rec { pname = "particle"; - version = "0.21.2"; + version = "0.23.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-BDTTmqtPxyvORSoR+CJzb5WTfF9BFrDoMSVOvO9s/Ns="; + hash = "sha256-2BD4/CfeuOf9ZBdAF9lgfVBSIknAlzoACOWA+T2xF1A="; }; postPatch = '' @@ -39,6 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs + deprecated hepunits ]; diff --git a/nixpkgs/pkgs/development/python-modules/paste/default.nix b/nixpkgs/pkgs/development/python-modules/paste/default.nix index ba082c9285b9..2388e2d15c6d 100644 --- a/nixpkgs/pkgs/development/python-modules/paste/default.nix +++ b/nixpkgs/pkgs/development/python-modules/paste/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "paste"; - version = "3.5.2"; + version = "3.5.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cdent"; repo = "paste"; rev = "refs/tags/${version}"; - hash = "sha256-lpQMzrRpcG5TqWm/FJn4oo9TV8Skf0ypZVeQC4y8p1U="; + hash = "sha256-W02UY9P3qjIFhR/DCpQZyvjEmJYl0MvMcGt9N4xgbaY="; }; postPatch = '' @@ -35,15 +35,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # broken test - "test_file_cache" - # requires network connection - "test_proxy_to_website" - ] ++ lib.optionals (pythonAtLeast "3.11") [ - # https://github.com/cdent/paste/issues/72 - "test_form" - ]; + preCheck = '' + # needs to be modified after Sat, 1 Jan 2005 12:00:00 GMT + touch tests/urlparser_data/secured.txt + ''; pythonNamespaces = [ "paste" diff --git a/nixpkgs/pkgs/development/python-modules/pathvalidate/default.nix b/nixpkgs/pkgs/development/python-modules/pathvalidate/default.nix index ecdc7dfe80d9..31ec1f003144 100644 --- a/nixpkgs/pkgs/development/python-modules/pathvalidate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pathvalidate/default.nix @@ -2,20 +2,25 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pathvalidate"; - version = "2.5.2"; - format = "setuptools"; + version = "3.1.0"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-X/V9D6vl7Lek8eSVe/61rYq1q0wPpx95xrvCS9m30U0="; + hash = "sha256-QmlwIm4kGZ/ZDZOZXSI8Hii9qWfN9DcHVaFM33KiqO4="; }; + nativeBuildInputs = [ + setuptools + ]; + # Requires `pytest-md-report`, causing infinite recursion. doCheck = false; @@ -24,8 +29,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A Python library to sanitize/validate a string such as filenames/file-paths/etc"; + description = "Library to sanitize/validate a string such as filenames/file-paths/etc"; homepage = "https://github.com/thombashi/pathvalidate"; + changelog = "https://github.com/thombashi/pathvalidate/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ oxalica ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/patool/default.nix b/nixpkgs/pkgs/development/python-modules/patool/default.nix index f23521ea2140..7d22c167a356 100644 --- a/nixpkgs/pkgs/development/python-modules/patool/default.nix +++ b/nixpkgs/pkgs/development/python-modules/patool/default.nix @@ -1,6 +1,21 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip, - cabextract, zip, lzip, zpaq, gnutar, gnugrep, diffutils, file, - gzip, bzip2, xz}: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pytestCheckHook +, p7zip +, cabextract +, zip +, lzip +, zpaq +, gnutar +, gnugrep +, diffutils +, file +, gzip +, bzip2 +, xz +}: # unrar is unfree, as well as 7z with unrar support, not including it (patool doesn't support unar) # it will still use unrar if present in the path @@ -24,15 +39,31 @@ in buildPythonPackage rec { pname = "patool"; version = "1.12"; + format = "setuptools"; #pypi doesn't have test data src = fetchFromGitHub { owner = "wummel"; repo = pname; rev = "upstream/${version}"; - sha256 = "0v4r77sm3yzh7y1whfwxmp01cchd82jbhvbg9zsyd2yb944imzjy"; + hash = "sha256-Xv4aCUnLi+b1T29tuKRADTIWwK2dO8iDP/D7UfU5mWw="; }; + patches = [ + # https://github.com/wummel/patool/pull/63 + (fetchpatch { + name = "apk-sometimes-has-mime-jar.patch"; + url = "https://github.com/wummel/patool/commit/a9f3ee3d639a1065be024001e89c0b153511b16b.patch"; + hash = "sha256-a4aWqHHc/cBs5T2QKZ08ky1K1tqKZEgqVmTmV11aTVE="; + }) + # https://github.com/wummel/patool/pull/130 + (fetchpatch { + name = "apk-sometimes-has-mime-android-package.patch"; + url = "https://github.com/wummel/patool/commit/e8a1eea1d273b278a1b6f5029d2e21cb18bc9ffd.patch"; + hash = "sha256-AVooVdU4FNIixUfwyrn39N2SDFHNs4CUYzS5Eey+DrU="; + }) + ]; + postPatch = '' substituteInPlace patoolib/util.py \ --replace "path = None" 'path = os.environ["PATH"] + ":${lib.makeBinPath compression-utilities}"' diff --git a/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix b/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix index fc9987d3e903..e337bf292fcf 100644 --- a/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , pythonRelaxDepsHook , imagemagick +, pip , pytestCheckHook , pymupdf , fire @@ -29,7 +30,12 @@ buildPythonPackage { hash = "sha256-NrT4GURQIJbqnHstfJrPzwLXT9c2oGBi4QJ6eGIFwu4="; }; - nativeBuildInputs = [ pythonRelaxDepsHook imagemagick ]; + nativeBuildInputs = [ + pip + pythonRelaxDepsHook + imagemagick + ]; + pythonRemoveDeps = [ "opencv-python" ]; preBuild = "echo '${version}' > version.txt"; diff --git a/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix b/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix index 200d765c81f2..e92022ecd68a 100644 --- a/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.0.3"; + version = "19.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DRTXBOrz//IdoMC+zKFkKS2KX0EsAbTqu1tOqskQRQ4="; + hash = "sha256-1j1QQo8hTUM7CzDUiRvOUWImb+rGIQgPWl69hTvlZUo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pex/default.nix b/nixpkgs/pkgs/development/python-modules/pex/default.nix index 56d36ebdda56..51f13095ed08 100644 --- a/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.143"; - format = "flit"; + version = "2.1.145"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xyYD9oGrlK1kswQ7uiO3/gAJUnelvWv7ZHyzn/g5iCg="; + hash = "sha256-1rrIxOjOdGz+Xxb6QrH6Zth/eF+zaBOGFf4I9P17nbI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix index 1e2fc644b29d..9e0815ddfc71 100644 --- a/nixpkgs/pkgs/development/python-modules/pg8000/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix @@ -7,6 +7,7 @@ , pythonOlder , scramp , setuptools +, versioningit }: buildPythonPackage rec { @@ -23,6 +24,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + versioningit ]; propagatedBuildInputs = [ @@ -33,10 +35,6 @@ buildPythonPackage rec { importlib-metadata ]; - postPatch = '' - sed '/^\[metadata\]/a version = ${version}' setup.cfg - ''; - # Tests require a running PostgreSQL instance doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/pglast/default.nix b/nixpkgs/pkgs/development/python-modules/pglast/default.nix index 0c0b611fbb06..61022edb9f22 100644 --- a/nixpkgs/pkgs/development/python-modules/pglast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "5.3"; + version = "5.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fiNd+11hqMHgzSMNT7fgne3pTeJ4nu5krA48LCgIaIQ="; + hash = "sha256-fyLvgaYHmTh9OaWXkuenKmNTHCVYFln/FbN+5u2a9+8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pgvector/default.nix b/nixpkgs/pkgs/development/python-modules/pgvector/default.nix index 89f3974d4069..a521038ef03d 100644 --- a/nixpkgs/pkgs/development/python-modules/pgvector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pgvector/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pgvector"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pgvector"; repo = "pgvector-python"; rev = "refs/tags/v${version}"; - hash = "sha256-VcV/WyDY1UN2TcuvNRQRIh5YIlewGQXf6fcTZihvftQ="; + hash = "sha256-Phe8iAdOCVp4wpLuLfO+fQMD1MOD47OEIQJ45rYQzug="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index 976fd81f6cfd..3fca04a27db4 100644 --- a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.18"; + version = "8.13.19"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-s2DHViUoBdRLRHtbym0lDPa9bGm28PQljzv+Wrgb72k="; + hash = "sha256-OBgCR2lyQMzt103sS/vbwiuxCLnF+ZHycMo+QTleb5Y="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/picosvg/default.nix b/nixpkgs/pkgs/development/python-modules/picosvg/default.nix index a04479cfb414..d344fca85e59 100644 --- a/nixpkgs/pkgs/development/python-modules/picosvg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/picosvg/default.nix @@ -11,13 +11,13 @@ }: buildPythonPackage rec { pname = "picosvg"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "googlefonts"; repo = pname; - rev = "v${version}"; - hash = "sha256-J06ijF1c3ZKPqKiQha6yqfj8EjFZoZzA6i6UCCrexi8="; + rev = "refs/tags/v${version}"; + hash = "sha256-jG1rfamegnX8GXDwqkGFBFzUeycRLDObJvGbxNk6OpM="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/nixpkgs/pkgs/development/python-modules/pillow/default.nix index f1489e1f458d..bb669f421177 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -24,6 +24,16 @@ import ./generic.nix (rec { hash = "sha256-nIK1s+BDx68NlXktDSDM9o9hof7Gs1MOcYtohCJyc5Y="; }; + patches = [ + # Pull in zlib-1.3 fix pending upstream inclusion + # https://github.com/python-pillow/Pillow/pull/7344 + (fetchpatch { + name = "zlib-1.3.patch"; + url = "https://github.com/python-pillow/Pillow/commit/9ef7cb39def45b0fe1cdf4828ca20838a1fc39d1.patch"; + hash = "sha256-N7V6Xz+SBHSm3YIgmbty7zbqkv8MzpLMhU4Xxerhx8w="; + }) + ]; + passthru.tests = { inherit imageio matplotlib pilkit pydicom reportlab; }; diff --git a/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix b/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix index a4dd78a557e6..6cc7cd22a97d 100644 --- a/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix @@ -3,6 +3,8 @@ , buildPythonPackage , fetchFromGitHub , setuptools +, setuptools-scm +, wheel , pint , pandas , pytestCheckHook @@ -20,8 +22,12 @@ buildPythonPackage rec { hash = "sha256-FuH6wksSCkkL2AyQN46hwTnfeAZFwkWRl6KEEhsxmUY="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools + setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix b/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix index f1fcf59ce2fe..1871ce74dd73 100644 --- a/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix @@ -11,19 +11,21 @@ , pythonOlder , setuptools , setuptools-scm +, tomli +, tomli-w , wheel }: buildPythonPackage rec { pname = "pip-tools"; - version = "6.13.0"; + version = "7.3.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YdRr0uuAFu1Kkk4Zbm5bCiaM07q9eeWTBIcg2yNSK7E="; + hash = "sha256-jpyZEn/gJMAltGoLLRXHvUfxjzMibPczDTVJNmP8HR0="; }; patches = [ ./fix-setup-py-bad-syntax-detection.patch ]; @@ -39,11 +41,16 @@ buildPythonPackage rec { pip setuptools wheel + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ pytest-xdist pytestCheckHook + tomli-w ]; preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' diff --git a/nixpkgs/pkgs/development/python-modules/pip/default.nix b/nixpkgs/pkgs/development/python-modules/pip/default.nix index ebac5724d66f..bc06cb39e247 100644 --- a/nixpkgs/pkgs/development/python-modules/pip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pip/default.nix @@ -1,10 +1,12 @@ { lib , buildPythonPackage -, bootstrapped-pip , fetchFromGitHub +, installShellFiles , mock , scripttest +, setuptools , virtualenv +, wheel , pretend , pytest @@ -14,33 +16,40 @@ buildPythonPackage rec { pname = "pip"; - version = "23.0.1"; - format = "other"; + version = "23.2.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BSonlwKmegrlrQTTIL0avPi61/TY2M0f7kOZpSzPRQk="; - name = "${pname}-${version}-source"; + hash = "sha256-mUlzfYmq1FE3X1/2o7sYJzMgwHRI4ib4EMhpg83VvrI="; }; - nativeBuildInputs = [ bootstrapped-pip ]; - postPatch = '' # Remove vendored Windows PE binaries # Note: These are unused but make the package unreproducible. find -type f -name '*.exe' -delete ''; - # pip detects that we already have bootstrapped_pip "installed", so we need - # to force it a little. - pipInstallFlags = [ "--ignore-installed" ]; + nativeBuildInputs = [ + installShellFiles + setuptools + wheel + ]; nativeCheckInputs = [ mock scripttest virtualenv pretend pytest ]; + # Pip wants pytest, but tests are not distributed doCheck = false; + postInstall = '' + installShellCompletion --cmd pip \ + --bash <($out/bin/pip completion --bash) \ + --fish <($out/bin/pip completion --fish) \ + --zsh <($out/bin/pip completion --zsh) + ''; + passthru.tests = { inherit pip-tools; }; meta = { @@ -48,6 +57,5 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; homepage = "https://pip.pypa.io/"; changelog = "https://pip.pypa.io/en/stable/news/#v${lib.replaceStrings [ "." ] [ "-" ] version}"; - priority = 10; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix b/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix index d248672b170a..250ad2f2399d 100644 --- a/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { hatch-vcs ]; - propagatedBuildInput = [ + propagatedBuildInputs = [ pip ]; diff --git a/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index 33831490708f..f48ffb81e586 100644 --- a/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "pipenv-poetry-migrate"; - version = "0.3.2"; + version = "0.4.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-aPG0MgChnJbivJRjYx9aQE5OPhL4WlPyt5uKCHZUpeE="; + hash = "sha256-QNp+KYOJIKV1fROmIhnWgDXFU8CymXkS2p90bOEPeoQ="; }; nativeBuildInputs = [ @@ -33,11 +33,6 @@ buildPythonPackage rec { typer ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'typer = "^0.4.0"' 'typer = ">=0.4"' - ''; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/pkg-about/default.nix b/nixpkgs/pkgs/development/python-modules/pkg-about/default.nix new file mode 100644 index 000000000000..b82712dc443f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pkg-about/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, importlib-metadata +, importlib-resources +, setuptools +, packaging +, tomli +, tox +}: + +buildPythonPackage rec { + pname = "pkg-about"; + version = "1.0.8"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "pkg_about"; + inherit version; + extension = "zip"; + hash = "sha256-mb43XbKypgilagXLW33kP8wXxioNsfLtl6AEnOI1WlA="; + }; + + nativeBuildInputs = [ + packaging + setuptools + tox + ]; + + propagatedBuildInputs = [ + importlib-metadata + importlib-resources + packaging + setuptools + tomli + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "pkg_about" + ]; + + meta = with lib; { + description = "Python metadata sharing at runtime"; + homepage = "https://github.com/karpierz/pkg_about/"; + changelog = "https://github.com/karpierz/pkg_about/blob/${version}/CHANGES.rst"; + license = licenses.zlib; + maintainers = [ teams.ororatech ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix index 99fbb98703bf..a449edd308b6 100644 --- a/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "15.4.0"; + version = "15.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-IO+IIMMJHrpVTS/L/cwwK2UYrYZDDQ0F/AxKITms9+0="; + hash = "sha256-zI3fOd1IcnXS5moM3mHl/1qzrAHnxoVrFg1GBCqiA10="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/playwright/default.nix b/nixpkgs/pkgs/development/python-modules/playwright/default.nix index 1c64471778a6..ec7a53f423a0 100644 --- a/nixpkgs/pkgs/development/python-modules/playwright/default.nix +++ b/nixpkgs/pkgs/development/python-modules/playwright/default.nix @@ -16,7 +16,7 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.36.0"; + version = "1.37.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; rev = "v${version}"; - hash = "sha256-/umpMkD+WEpBmw2cRb71PtOMd1sRNfwmURKdaRy4Qsc="; + hash = "sha256-7egK76A3+C+JPbCNFXDd4qTjepBRSZgtQmFrE/jWJN4="; }; patches = [ @@ -88,6 +88,7 @@ buildPythonPackage rec { driver = playwright-driver; browsers = playwright-driver.browsers; }; + updateScript = ./update.sh; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/playwright/update.sh b/nixpkgs/pkgs/development/python-modules/playwright/update.sh index 464f9a3cba05..23c327608865 100755 --- a/nixpkgs/pkgs/development/python-modules/playwright/update.sh +++ b/nixpkgs/pkgs/development/python-modules/playwright/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix-prefetch common-updater-scripts node2nix +#!nix-shell -i bash -p curl gnused nix-prefetch common-updater-scripts node2nix jq set -euo pipefail root="$(dirname "$(readlink -f "$0")")" diff --git a/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix b/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix index 270c78a69826..1205b860b8da 100644 --- a/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix @@ -6,53 +6,72 @@ , pythonOlder , build , git -, importlib-metadata -, pep517 , pytest-mock , pytestCheckHook , setuptools +, tomli-w , virtualenv }: buildPythonPackage rec { pname = "poetry-core"; - version = "1.5.1"; + version = "1.6.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - hash = "sha256-h3d0h+WCrrNlfPOlUx6Rj0aG6untD6MiunqvPj4yT+0="; + hash = "sha256-Gc22Y2T4uO39jiOqEUFeOfnVCbknuDjmzFPZgk2eY74="; }; # revert update of vendored dependencies to unbreak e.g. zeroconf on x86_64-darwin patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ (fetchpatch { + url = "https://github.com/python-poetry/poetry-core/commit/0bdf29e9631fda9436066a07ca8e69a4aa97a31e.patch"; + revert = true; + hash = "sha256-Uqlv17GUcmVkB6ZFePtrbUonsbkiIXay7LLuT/WcPh8="; + }) + (fetchpatch { + url = "https://github.com/python-poetry/poetry-core/commit/48447a18a60c43240bf075fc0c2501f6d68f0211.patch"; + revert = true; + hash = "sha256-23GazppqYmuAmkE/xMtuzng2PbxhYNwgtmsvb6lfvig="; + }) + (fetchpatch { + url = "https://github.com/python-poetry/poetry-core/commit/bc97ac6030049a01e5337fcb53493112a9c75a81.patch"; + revert = true; + hash = "sha256-8NAG+Xm/BNL16NONZJRNB3JiRRKvjMsZJH2FWlw+dHk="; + }) + (fetchpatch { + url = "https://github.com/python-poetry/poetry-core/commit/835bc91393fbb983de6227d67b076aea1360ea68.patch"; + revert = true; + hash = "sha256-Z5viypprDY9GGeX6luBsIoSI9D0lN9g14U9uMh4DTfA="; + }) + (fetchpatch { url = "https://github.com/python-poetry/poetry-core/commit/80d7dcdc722dee0e09e5f3303b663003d794832c.patch"; revert = true; hash = "sha256-CPjkNCmuAiowp/kyKqnEfUQNmXK95RMJOIa24nG6xi8="; }) (fetchpatch { url = "https://github.com/python-poetry/poetry-core/commit/43fd7fe62676421b3661c96844b5d7cf49b87c07.patch"; + excludes = [ + "vendors/poetry.lock" + "vendors/pyproject.toml" + ]; revert = true; - hash = "sha256-fXq8L23qjLraLeMzB1bwW1jU0eGd236/GHIoYKwOuL0="; + hash = "sha256-mbu16qFH9ymDZ0KIMiYMy7js5OmxY7z5qg6ZfgfgeLs="; }) ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - nativeCheckInputs = [ build git - pep517 pytest-mock pytestCheckHook setuptools + tomli-w virtualenv ]; diff --git a/nixpkgs/pkgs/development/python-modules/polyline/default.nix b/nixpkgs/pkgs/development/python-modules/polyline/default.nix index 26cec2331cb7..5ab360ae7e37 100644 --- a/nixpkgs/pkgs/development/python-modules/polyline/default.nix +++ b/nixpkgs/pkgs/development/python-modules/polyline/default.nix @@ -1,9 +1,11 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder , setuptools +, wheel }: buildPythonPackage rec { @@ -20,6 +22,15 @@ buildPythonPackage rec { hash = "sha256-e9ZDqcS3MaMlXi2a2JHI6NtRPqIV7rjsucGXEH6V8LA="; }; + patches = [ + # https://github.com/frederickjansen/polyline/pull/15 + (fetchpatch { + name = "relax-build-dependencies.patch"; + url = "https://github.com/frederickjansen/polyline/commit/cb9fc80606c33dbbcaa0d94de25ae952358443b6.patch"; + hash = "sha256-epg2pZAG+9QuICa1ms+/EO2DDmYEz+KEtxxnvG7rsWY="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace " --cov=polyline --cov-report term-missing" "" @@ -27,6 +38,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + wheel ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/procmon-parser/default.nix b/nixpkgs/pkgs/development/python-modules/procmon-parser/default.nix new file mode 100644 index 000000000000..b45d72f3d07d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/procmon-parser/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, construct +, fetchFromGitHub +, pytestCheckHook +, python-dateutil +, pythonOlder +, six +}: + +buildPythonPackage rec { + pname = "procmon-parser"; + version = "0.3.13"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "eronnen"; + repo = "procmon-parser"; + rev = "refs/tags/v${version}"; + hash = "sha256-XkMf3MQK4WFRLl60XHDG/j2gRHAiz7XL9MmC6SRg9RE="; + }; + + propagatedBuildInputs = [ + construct + six + ]; + + nativeCheckInputs = [ + pytestCheckHook + python-dateutil + ]; + + pythonImportsCheck = [ + "procmon_parser" + ]; + + meta = with lib; { + description = "Parser to process monitor file formats"; + homepage = "https://github.com/eronnen/procmon-parser/"; + changelog = "https://github.com/eronnen/procmon-parser/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix b/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix index 911637bf8505..7c88211f5d27 100644 --- a/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix @@ -3,6 +3,7 @@ , bash , buildPythonPackage , fetchFromGitHub +, fetchpatch , gnumake , httpx , openssl @@ -13,6 +14,7 @@ , pythonOlder , setuptools-scm , typing-extensions +, wheel }: buildPythonPackage rec { @@ -29,6 +31,22 @@ buildPythonPackage rec { hash = "sha256-dA7a9RicBFCSf6IoGX/CdvI8x/xMOFfNtyuvFn9YmHI="; }; + patches = [ + # this patch is so that the one following it applies cleanly + # https://github.com/abhinavsingh/proxy.py/pull/1209 + (fetchpatch { + name = "update-build-dependencies.patch"; + url = "https://github.com/abhinavsingh/proxy.py/commit/2e535360ce5ed9734f2c00dc6aefe5ebd281cea5.patch"; + hash = "sha256-eR3R4M7jwQMnY5ob0V6G71jXcrkV7YZvo1JOUG4gnrY="; + }) + # https://github.com/abhinavsingh/proxy.py/pull/1345 + (fetchpatch { + name = "remove-setuptools-scm-git-archive-dependency.patch"; + url = "https://github.com/abhinavsingh/proxy.py/commit/027bfa6b912745f588d272f1a1082f6ca416f815.patch"; + hash = "sha256-O2LlSrSrB3u2McAZRY+KviuU7Hv1tOuf0n+D/H4BWvI="; + }) + ]; + postPatch = '' substituteInPlace Makefile \ --replace "SHELL := /bin/bash" "SHELL := ${bash}/bin/bash" @@ -40,6 +58,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix b/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix index 1c6e042e5778..79070dcfcb08 100644 --- a/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20230814"; + version = "0.10.0.20230828"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GG6ilUUauVT2u/BuS4agzJVQdydEuGwpxJVznWDb46Q="; + hash = "sha256-eVPcj1gMY9a8Znhon2lEs9EKWgc55euyvzxnrkDH05o="; }; passthru.optional-dependencies = { diff --git a/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix b/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix index a1cedcaa5ab4..cad2f1366e18 100644 --- a/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.42.0"; + version = "6.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-UUUnbByfxBMdJzZRu7EZHa809eshrR4h4poBxJAdTiI="; + hash = "sha256-AnyKDoD7hh3iYheUK8RXFfXEi5yChkZNAyWobC2ghmQ="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/nixpkgs/pkgs/development/python-modules/py-dormakaba-dkey/default.nix b/nixpkgs/pkgs/development/python-modules/py-dormakaba-dkey/default.nix index 6c70ad8861c7..27443d166e76 100644 --- a/nixpkgs/pkgs/development/python-modules/py-dormakaba-dkey/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-dormakaba-dkey/default.nix @@ -4,8 +4,10 @@ , buildPythonPackage , cryptography , fetchFromGitHub +, fetchpatch , pythonOlder , setuptools +, wheel }: buildPythonPackage rec { @@ -22,8 +24,18 @@ buildPythonPackage rec { hash = "sha256-1jIsKQa27XNVievU02jjanRWFtJDYsHolgPBab6qpM0="; }; + patches = [ + # https://github.com/emontnemery/py-dormakaba-dkey/pull/45 + (fetchpatch { + name = "relax-setuptools-dependency.patch"; + url = "https://github.com/emontnemery/py-dormakaba-dkey/commit/cfda4be71d39f2cfd1c0d4f7fff9018050c57f1a.patch"; + hash = "sha256-JGsaLQNbUfz0uK/MeGnR2XTJDs4RnTOEg7BavfDPArg="; + }) + ]; + nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix b/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix index 481d73134178..c6c35ebd297d 100644 --- a/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "py-partiql-parser"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; src = fetchFromGitHub { owner = "getmoto"; repo = "py-partiql-parser"; rev = "refs/tags/${version}"; - hash = "sha256-wfVADL87ObJbuYQ2MYcRH0DCOGymS6+mrp7pAIKoS4Q="; + hash = "sha256-RObJSvkqD3T8i470po/CayGC/ae8J6rFQROsrQ1EAGs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 6d9ea5ddf2ed..951d5d849714 100644 --- a/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.12.0"; + version = "4.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-cW9IQy4D2iaoQ6oHQ07f27YQR7q9DBv2JkoukUtPBRQ="; + hash = "sha256-5P0DfQL8lwCY4nvp5efB7fO7YyBMTRaB4qflkc+Arso="; }; passthru.optional-dependencies = { diff --git a/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix b/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix index 75525b943445..c9563039b0a8 100644 --- a/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , certifi , fetchFromGitHub +, fetchpatch , numpy , poetry-core , pygments @@ -28,6 +29,15 @@ buildPythonPackage rec { hash = "sha256-+yqN3q+uA/v01uCguzUSoeCJK9lRmiiYn8d272+Dd2M="; }; + patches = [ + # https://github.com/bachya/pyairvisual/pull/298 + (fetchpatch { + name = "clean-up-build-dependencies.patch"; + url = "https://github.com/bachya/pyairvisual/commit/eb32beb7229a53ff81917cc417ed66b26aae47dd.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml --replace \ 'certifi = ">=2023.07.22"' \ @@ -46,6 +56,9 @@ buildPythonPackage rec { pysmb ]; + # this lets tests bind to localhost in sandbox mode on macOS + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-aiohttp diff --git a/nixpkgs/pkgs/development/python-modules/pybox2d/default.nix b/nixpkgs/pkgs/development/python-modules/pybox2d/default.nix new file mode 100644 index 000000000000..c7a8e7d83ebf --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pybox2d/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, swig +}: + +buildPythonPackage rec { + pname = "pybox2d"; + version = "2.3.10"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "pybox2d"; + repo = "pybox2d"; + rev = "refs/tags/${version}"; + hash = "sha256-yjLFvsg8GQLxjN1vtZM9zl+kAmD4+eS/vzRkpj0SCjY="; + }; + + nativeBuildInputs = [ + swig + ]; + + # We need to build the package explicitly a first time so that the library/Box2D/Box2D.py file + # gets generated. + # After that, the default behavior will succeed at installing the package. + preBuild = '' + python setup.py build + ''; + + pythonImportsCheck = [ + "Box2D" + "Box2D._Box2D" + ]; + + # Tests need to start GUI windows. + doCheck = false; + + meta = with lib; { + description = "2D Game Physics for Python"; + homepage = "https://github.com/pybox2d/pybox2d"; + license = licenses.zlib; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix b/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix index d8f9e4616f4e..b2c05f73bc63 100644 --- a/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pybtex-docutils"; - version = "1.0.2"; + version = "1.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Q6o1O21Jj9WsMPAHOpjjMtBh00/mGdPVDRdh+P1KoBY="; + hash = "sha256-On69+StZPgDowcU4qpogvKXZLYQjESRxWsyWTVHZPGs="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pycardano/default.nix b/nixpkgs/pkgs/development/python-modules/pycardano/default.nix new file mode 100644 index 000000000000..8345a3da2065 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pycardano/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +# Python deps +, blockfrost-python +, cbor2 +, cose +, ecpy +, frozendict +, frozenlist +, mnemonic +, poetry-core +, pprintpp +, pynacl +, setuptools +, typeguard +, websocket-client +}: + +let + cose_0_9_dev8 = cose.overridePythonAttrs (old: rec { + version = "0.9.dev8"; + src = (old.src.override { + rev = "v${version}"; + hash = "sha256-/jwq2C2nvHInsgPG4jZCr+XsvlUJdYewAkasrUPVaHM="; + }); + pythonImportsCheck = [ "cose" ]; + }); + +in buildPythonPackage rec { + pname = "pycardano"; + version = "0.9.0"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Python-Cardano"; + repo = "pycardano"; + rev = "v${version}"; + hash = "sha256-KRlpGhEzABBh1YWCDcrpW4hyMOhEA1Rla9nh95qdVik="; + }; + + propagatedBuildInputs = [ + blockfrost-python + cbor2 + cose_0_9_dev8 + ecpy + frozendict + frozenlist + mnemonic + poetry-core + pprintpp + pynacl + setuptools + typeguard + websocket-client + ]; + + pythonImportsCheck = [ "pycardano" ]; + + meta = with lib; { + description = "A lightweight Cardano library in Python"; + homepage = "https://github.com/Python-Cardano/pycardano"; + license = licenses.mit; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix b/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix index 89b1eef76b9f..79700a7bdc7f 100644 --- a/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pycmarkgfm"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-qvTMXpQhC3Yx8LwbQDiELhgdkGzjirKT30N1NkXF5ps="; + hash = "sha256-oPklCB54aHn33ewTiSlXgx38T0RzLure5OzGuFwsLNo="; }; propagatedNativeBuildInputs = [ cffi ]; diff --git a/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix b/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix index 8e51bf8d085f..eb1029837435 100644 --- a/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.10.5"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mustang51"; repo = pname; rev = "v${version}"; - hash = "sha256-G4mNBHk8xskQyt1gbMqz5XhoTfWWxp+qTruOSqmTvOc="; + hash = "sha256-IBrd4PH8EzVVVFQtJdJ8bTMLEzfh7MYMe79yuCrhmww="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pydeck/default.nix b/nixpkgs/pkgs/development/python-modules/pydeck/default.nix index ccdc8509b8cb..da009608b678 100644 --- a/nixpkgs/pkgs/development/python-modules/pydeck/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydeck/default.nix @@ -4,6 +4,7 @@ , ipykernel , ipywidgets , jinja2 +, jupyter , numpy , pandas , pytestCheckHook @@ -26,6 +27,8 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + jinja2 + jupyter setuptools wheel ]; diff --git a/nixpkgs/pkgs/development/python-modules/pydicom-seg/default.nix b/nixpkgs/pkgs/development/python-modules/pydicom-seg/default.nix index c18c0210c86d..52708208d4c9 100644 --- a/nixpkgs/pkgs/development/python-modules/pydicom-seg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydicom-seg/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder , pytestCheckHook , pythonRelaxDepsHook @@ -26,10 +27,14 @@ buildPythonPackage rec { fetchSubmodules = true; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" - ''; + patches = [ + # https://github.com/razorx89/pydicom-seg/pull/54 + (fetchpatch { + name = "replace-poetry-with-poetry-core.patch"; + url = "https://github.com/razorx89/pydicom-seg/commit/ac91eaefe3b0aecfe745869972c08de5350d2b61.patch"; + hash = "sha256-xBOVjWZPjyQ8gSj6JLe9B531e11TI3FUFFtL+IelZOM="; + }) + ]; pythonRelaxDeps = [ "jsonschema" diff --git a/nixpkgs/pkgs/development/python-modules/pydiscourse/default.nix b/nixpkgs/pkgs/development/python-modules/pydiscourse/default.nix new file mode 100644 index 000000000000..d17c719196e1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pydiscourse/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "pydiscourse"; + version = "1.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pydiscourse"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-peDkXRcD/ieWYWXqv8hPxTSNRXBHcb/3sj/JJSF2RYg="; + }; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ + "pydiscourse" + ]; + + meta = with lib; { + description = "A Python library for working with Discourse"; + homepage = "https://github.com/pydiscourse/pydiscourse"; + changelog = "https://github.com/pydiscourse/pydiscourse/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ Dettorer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix b/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix new file mode 100644 index 000000000000..4adda6c53ccc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix @@ -0,0 +1,65 @@ +{ lib +, aiohttp +, aioresponses +, apischema +, buildPythonPackage +, fetchFromGitHub +, freezegun +, gql +, graphql-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, requests +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pydrawise"; + version = "2023.8.0"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "dknowles2"; + repo = "pydrawise"; + rev = "refs/tags/${version}"; + hash = "sha256-cnQJ0enDgOB66rEZePmfTImFrPNMiXfggATM6hsL+ag="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + aiohttp + apischema + gql + graphql-core + requests + ]; + + nativeCheckInputs = [ + aioresponses + freezegun + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pydrawise" + ]; + + meta = with lib; { + description = "Library for interacting with Hydrawise sprinkler controllers through the GraphQL API"; + homepage = "https://github.com/dknowles2/pydrawise"; + changelog = "https://github.com/dknowles2/pydrawise/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix b/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix index a8d7dbb16c5d..6c1db830955a 100644 --- a/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyduotecno"; - version = "2023.8.3"; + version = "2023.8.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "pyDuotecno"; rev = "refs/tags/${version}"; - hash = "sha256-zqaW6iQe982BgxaxeeRFTJ/a2nySGoSW4sxKmNxbKQc="; + hash = "sha256-VDDDG/D21yumWmcTC0mwXoGItB7OTdVCcjo01W1YZXY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pygobject-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/pygobject-stubs/default.nix new file mode 100644 index 000000000000..77ec68ea2884 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pygobject-stubs/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, black +, codespell +, isort +, mypy +, pre-commit +, pygobject3 +}: + +buildPythonPackage rec { + pname = "pygobject-stubs"; + version = "2.8.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pygobject"; + repo = "pygobject-stubs"; + rev = "v${version}"; + hash = "sha256-8TB8eqXPhvoKtyQ8+hnCQnH4NwO2WC1NYAxmVj+FCvg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + # This package does not include any tests. + doCheck = false; + + meta = with lib; { + description = "PEP 561 Typing Stubs for PyGObject"; + homepage = "https://github.com/pygobject/pygobject-stubs"; + changelog = "https://github.com/pygobject/pygobject-stubs/blob/${src.rev}/CHANGELOG.md"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ hacker1024 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix index 5018f8f924a5..5e83dc793ca5 100644 --- a/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix @@ -5,7 +5,6 @@ , cryptography , fetchFromGitHub , freezegun -, openssl , oscrypto , pytest-asyncio , pytestCheckHook @@ -29,6 +28,11 @@ buildPythonPackage rec { hash = "sha256-q2YxncyMHmbRmcoLb68huK02CYiKqF2CFRl8vkUfxg4="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ', "pytest-runner",' "" + ''; + nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix b/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix new file mode 100644 index 000000000000..7e59dbf9b112 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cmake +, setuptools +, setuptools-scm +, numpy +, pybind11 +, wheel +, pytestCheckHook +, pythonOlder +, graphviz +}: + +buildPythonPackage rec { + pname = "pyhepmc"; + version = "2.12.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-po1ad02dpY69RRhaRApskH6tdOaSIsCl5PgpjsAzyKo="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + setuptools + setuptools-scm + wheel + ]; + + buildInputs = [ + pybind11 + ]; + + propagatedBuildInputs = [ + numpy + ]; + + dontUseCmakeConfigure = true; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + CMAKE_ARGS = [ "-DEXTERNAL_PYBIND11=ON" ]; + + preBuild = '' + export CMAKE_BUILD_PARALLEL_LEVEL="$NIX_BUILD_CORES" + ''; + + nativeCheckInputs = [ + graphviz + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyhepmc" ]; + + meta = with lib; { + description = "Easy-to-use Python bindings for HepMC3"; + homepage = "https://github.com/scikit-hep/pyhepmc"; + changelog = "https://github.com/scikit-hep/pyhepmc/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix b/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix index 1747fc677398..dbf6ab12b44e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix @@ -4,6 +4,7 @@ , async-generator , buildPythonPackage , fetchFromGitHub +, fetchpatch , pypubsub , pyserial , pyserial-asyncio @@ -11,24 +12,35 @@ , pythonOlder , setuptools , voluptuous +, wheel }: buildPythonPackage rec { pname = "pyinsteon"; - version = "1.4.3"; + version = "1.5.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-KKF+XYQgdmLbbicyMFyZBG4ol69xAWCF2W/r15gH2Mo="; + hash = "sha256-REm0E7+otqDypVslB5heHEaWA+q3Nh1O96gxFeCC3As="; }; + patches = [ + # https://github.com/pyinsteon/pyinsteon/pull/361 + (fetchpatch { + name = "relax-setuptools-dependency.patch"; + url = "https://github.com/pyinsteon/pyinsteon/commit/676bc5fff11b73a4c3fd189a6ac6d3de9ca21ae0.patch"; + hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; + }) + ]; + nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ @@ -57,6 +69,7 @@ buildPythonPackage rec { 2413U, 2412S, 2448A7 and Hub models 2242 and 2245. ''; homepage = "https://github.com/pyinsteon/pyinsteon"; + changelog = "https://github.com/pyinsteon/pyinsteon/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix b/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix index 48cd93608e98..392595fbc082 100644 --- a/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyiqvia"; - version = "2022.10.0"; + version = "2023.08.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4xoK/SwpcsjIpGUertWoSlRsKIpgpV1XmuIzDJcZMZg="; + hash = "sha256-vPcb0mwREQri9FuYhWXihWSYnZ2ywBVujPMaNThTbVI="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix b/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix index 69e55805993d..2b482295e422 100644 --- a/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, buildPythonPackage , lxml, pycryptodomex, construct -, argon2-cffi, python-dateutil, future +, argon2-cffi, python-dateutil , python }: buildPythonPackage rec { pname = "pykeepass"; - version = "4.0.5"; + version = "4.0.6"; format = "setuptools"; @@ -14,16 +14,12 @@ buildPythonPackage rec { owner = "libkeepass"; repo = "pykeepass"; rev = "v${version}"; - hash = "sha256-IdILcIhrxcTDddoxiK257II0V7ctVb1CTLfTPmuwjTQ="; + hash = "sha256-832cTVzI/MFdwiw6xWzRG35z3iwqb5Qpf6W6XYBIFWs="; }; - postPatch = '' - substituteInPlace setup.py --replace "==" ">=" - ''; - propagatedBuildInputs = [ lxml pycryptodomex construct - argon2-cffi python-dateutil future + argon2-cffi python-dateutil ]; propagatedNativeBuildInputs = [ argon2-cffi ]; diff --git a/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix b/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix index eb6a93bc4a7a..00d69542c897 100644 --- a/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2023.4.5"; + version = "2023.4.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-e3k4L/lY8yszqYmJCaZghtv1nrmTi+WyWuzYuHSXM08="; + hash = "sha256-74EKgHocrEi37bh4WBoYyLKF1XYrwxT7e2oo3igTWms="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix b/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix index c25d11eb1180..374f7d26c9d0 100644 --- a/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.39"; + version = "2.4.40"; src = fetchPypi { inherit pname version; - hash = "sha256-rS1EZGGAcWEi7MK565oii+KUaqACruLrWXNcB/aXPek="; + hash = "sha256-PWpVKtNEof/54MgRNhrJ2LuCAc9qrK1yJNUW+gN8yzA="; }; propagatedBuildInputs = [ future lxml ]; diff --git a/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix b/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix index 05da3476ea61..1f4bcb1cce29 100644 --- a/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -6,6 +6,12 @@ , markdown , pyyaml , pygments + +# for passthru.tests +, mkdocstrings +, mkdocs-material +, mkdocs-mermaid2-plugin +, hydrus }: let @@ -38,14 +44,14 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "9.9.2"; + version = "10.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; rev = "refs/tags/${version}"; - hash = "sha256-ld3NuBTjDJUN4ZK+eTwmmfzcB8XCtg8xaLMECo95+Cg="; + hash = "sha256-KqDEmWAWXdDpQPsP9Vrced+Ozz9IZiD8rCG57hPR7Xs="; }; nativeBuildInputs = [ hatchling ]; @@ -59,6 +65,10 @@ buildPythonPackage rec { pythonImportsCheck = map (ext: "pymdownx.${ext}") extensions; + passthru.tests = { + inherit mkdocstrings mkdocs-material mkdocs-mermaid2-plugin hydrus; + }; + meta = with lib; { description = "Extensions for Python Markdown"; homepage = "https://facelessuser.github.io/pymdown-extensions/"; diff --git a/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix b/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix index 307ee7fbfd64..a27f49c8613a 100644 --- a/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , environs , fetchFromGitHub +, gitpython , grpcio , grpcio-testing , mmh3 @@ -13,6 +14,7 @@ , scikit-learn , setuptools-scm , ujson +, wheel }: buildPythonPackage rec { @@ -29,15 +31,17 @@ buildPythonPackage rec { hash = "sha256-wwhgO2iCzPXobyZI0narHPn2WCAB9sS1+AoLrP1Ih6Q="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; pythonRelaxDeps = [ "grpcio" ]; nativeBuildInputs = [ + gitpython pythonRelaxDepsHook setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pynisher/default.nix b/nixpkgs/pkgs/development/python-modules/pynisher/default.nix index 3d1c3a842208..6c7f1c0f59a2 100644 --- a/nixpkgs/pkgs/development/python-modules/pynisher/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynisher/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pynisher"; - version = "1.0.8"; + version = "1.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BTH34zv7OAaVKc20VASfv3QaxAt/Y14Dkd/PBo/V6vo="; + hash = "sha256-hlN5uUlgmcipQqmr22rB245oEXOUe5WB9jWo7MXXViE="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module intended to limit a functions resources"; homepage = "https://github.com/automl/pynisher"; + changelog = "https://github.com/automl/pynisher/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyomo/default.nix b/nixpkgs/pkgs/development/python-modules/pyomo/default.nix index c0900b664439..9e0de7f3915d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyomo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyomo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyomo"; - version = "6.6.1"; + version = "6.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "pyomo"; owner = "pyomo"; rev = "refs/tags/${version}"; - hash = "sha256-1FSu5ejFjjNTuvaFU/UqAI/817HkrOA1Hczq8gcPQGA="; + hash = "sha256-hh2sfWOUp3ac75NEuTrw3YkvS7hXpzJp39v6cfrhNiQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix index bc0a350a31c6..f85e825f2645 100644 --- a/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -2,12 +2,16 @@ , buildPythonPackage , pythonAtLeast , fetchPypi +, cython_3 +, numpy +, setuptools +, wheel }: buildPythonPackage rec { pname = "pyopengl-accelerate"; version = "3.1.7"; - disabled = pythonAtLeast "3.10"; # fails to compile + format = "pyproject"; src = fetchPypi { pname = "PyOpenGL-accelerate"; @@ -15,6 +19,13 @@ buildPythonPackage rec { hash = "sha256-KxI2ISc6k59/0uwidUHjmfm11OgV1prgvbG2xwopNoA="; }; + nativeBuildInputs = [ + cython_3 + numpy + setuptools + wheel + ]; + meta = { description = "This set of C (Cython) extensions provides acceleration of common operations for slow points in PyOpenGL 3.x"; homepage = "https://pyopengl.sourceforge.net/"; diff --git a/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix b/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix index c0e4ea20dd26..b9335d108b2e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyoutbreaksnearme/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyoutbreaksnearme"; - version = "2022.10.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-D7oXkKDSg+yF+j1WyG/VVY12hLU6oyhEtxLrF6IkMSA="; + hash = "sha256-Qrq8/dPJsJMJNXobc+Ps6Nbg819+GFuYplovGuWK0nQ="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix b/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix index a12ae560bfc5..ac7f88d48575 100644 --- a/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pandoc , pandocfilters +, poetry-core , pythonOlder , substituteAll , texlive @@ -11,6 +12,7 @@ buildPythonPackage rec { pname = "pypandoc"; version = "1.10"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,6 +32,10 @@ buildPythonPackage rec { ./skip-tests.patch ]; + nativeBuildInputs = [ + poetry-core + ]; + nativeCheckInputs = [ texlive.combined.scheme-small pandocfilters diff --git a/nixpkgs/pkgs/development/python-modules/pypck/default.nix b/nixpkgs/pkgs/development/python-modules/pypck/default.nix index 3cdd7fa4aceb..3eef4a86ce8f 100644 --- a/nixpkgs/pkgs/development/python-modules/pypck/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypck/default.nix @@ -2,11 +2,13 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytest-asyncio , pytest-timeout , pytestCheckHook , pythonOlder , setuptools +, wheel }: buildPythonPackage rec { @@ -23,8 +25,18 @@ buildPythonPackage rec { hash = "sha256-Vlt4+fRULb9mB0ceRmc7MJ50DnF9DAJPHA8iCbNVvcE="; }; + patches = [ + # https://github.com/alengwenus/pypck/pull/109 + (fetchpatch { + name = "relax-setuptools-dependency.patch"; + url = "https://github.com/alengwenus/pypck/commit/17023ebe8082120b1eec086842ca809ec6e9df2b.patch"; + hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; + }) + ]; + nativeBuildInputs = [ setuptools + wheel ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix b/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix index 6ca6ac25a98d..6cbef5b8a77f 100644 --- a/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix @@ -6,7 +6,6 @@ # build time , hatchling , hatch-vcs -, setuptools-scm # runtime , packaging @@ -21,13 +20,14 @@ # tests , pytest-mock , pytestCheckHook +, setuptools , virtualenv , wheel }: buildPythonPackage rec { pname = "pyproject-api"; - version = "1.5.0"; + version = "1.5.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pyproject-api"; rev = "refs/tags/${version}"; - hash = "sha256-VO+huA9i7uMpCVaWHC29XlfestSu+N9vWWHteY21uqs="; + hash = "sha256-HX+5BypfEOfQ3vg3vha0QCVrEarjMu/Q8id+xgmWGfA="; }; outputs = [ @@ -44,12 +44,11 @@ buildPythonPackage rec { "doc" ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ hatchling hatch-vcs - setuptools-scm # docs sphinxHook @@ -66,6 +65,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-mock pytestCheckHook + setuptools virtualenv wheel ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyproject-hooks/default.nix b/nixpkgs/pkgs/development/python-modules/pyproject-hooks/default.nix index d751160b54d8..3624b5f02edb 100644 --- a/nixpkgs/pkgs/development/python-modules/pyproject-hooks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyproject-hooks/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , flit-core +, pyproject-hooks , pytestCheckHook , pythonOlder , setuptools @@ -30,17 +31,33 @@ buildPythonPackage rec { tomli ]; - nativeCheckInputs = [ - pytestCheckHook - setuptools - testpath - ]; + # We need to disable tests because this package is part of the bootstrap chain + # and its test dependencies cannot be built yet when this is being built. + doCheck = false; - disabledTests = [ - # fail to import setuptools - "test_setup_py" - "test_issue_104" - ]; + passthru.tests = { + pytest = buildPythonPackage { + pname = "${pname}-pytest"; + inherit version; + format = "other"; + + dontBuild = true; + dontInstall = true; + + nativeCheckInputs = [ + pyproject-hooks + pytestCheckHook + setuptools + testpath + ]; + + disabledTests = [ + # fail to import setuptools + "test_setup_py" + "test_issue_104" + ]; + }; + }; pythonImportsCheck = [ "pyproject_hooks" diff --git a/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix b/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix index 0227aa102331..345b5aa13a1e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix @@ -1,15 +1,28 @@ -{ lib, fetchPypi, buildPythonPackage, packaging, sip }: +{ lib +, buildPythonPackage +, fetchPypi +, packaging +, setuptools +, sip +, wheel +}: buildPythonPackage rec { pname = "pyqt-builder"; - version = "1.14.1"; + version = "1.15.2"; + format = "pyproject"; src = fetchPypi { pname = "PyQt-builder"; inherit version; - hash = "sha256-g7w+MAr/i0FAWAS2qcKRM4mrWcSK2fDLhYSm73O8pQI="; + hash = "sha256-dGz+g8A+v/RFjUeKHAZxR5Dvk+RY7NWii8KDe6yI63Q="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ packaging sip ]; pythonImportsCheck = [ "pyqtbuild" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix index 2252d619d030..3fdfd2bfdd6d 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma-backend-opensearch"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-opensearch"; rev = "refs/tags/v${version}"; - hash = "sha256-erqKAtTNMQQy/zUkpOd0LoQT2MY2mgz5yGuSQJ0QTjI="; + hash = "sha256-g3kGaNq07yMu3mnRDeZB3Ck8wwzK3HcOIzkl36cNOs8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index 7fcd0092a7d4..bf939afd646c 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-splunk"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-splunk"; rev = "refs/tags/v${version}"; - hash = "sha256-SWD3Jw1wehWLvWkLA7rotweExYCrabq7men22D0zN5w="; + hash = "sha256-ZDRHCzNLwBx8cugNVSkk7lZhE7MzariX0OS4pHv0f1s="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix index d438078e3cff..7b16c695e97f 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-crowdstrike"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-crowdstrike"; rev = "refs/tags/v${version}"; - hash = "sha256-KHHs39RGksE7Rww8nHHo73+WOUzZaNiD4sZMhBPqqYQ="; + hash = "sha256-koXoBb3iyODQyjOmXSeEvVhYtrxpQtVb2HVqYBFkKrs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix index ccb8e6245e33..9b02a38cb18b 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-sysmon"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-sysmon"; rev = "refs/tags/v${version}"; - hash = "sha256-W3Osv0RApm6sCVdsLXUB79H3g62yUID4dtBi5Ywk5NY="; + hash = "sha256-5CDwevzD6R1nIcID6C5PV+i6pwY2CLakRC6NUXtmPs8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix index 4a05c5067e2a..b6f47d9f4a44 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-windows"; - version = "1.1.0"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-windows"; rev = "refs/tags/v${version}"; - hash = "sha256-jXUTGt/kbw6XfxA7A+t9km5GdltV1VRBTUf4lw1AwO4="; + hash = "sha256-279+nP5IeZiIjKNhJ2adbcJSDzcu7yqIB5JNFK5CPF0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysigma/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma/default.nix index c85399eefa24..6ea53e7dadd8 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, jinja2 , packaging , poetry-core , pyparsing @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.9.11"; + version = "0.10.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,19 +24,20 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-lbpx5THSegZK09jREH15RpokmdfOng2vX4tClsc/x/A="; + hash = "sha256-pEw0CmQYwZmfpN1mAv04eeOBTVX6JfW3aKhfofZaKYo="; }; + pythonRelaxDeps = [ + "packaging" + ]; + nativeBuildInputs = [ poetry-core pythonRelaxDepsHook ]; - pythonRelaxDeps = [ - "packaging" - ]; - propagatedBuildInputs = [ + jinja2 packaging pyparsing pyyaml diff --git a/nixpkgs/pkgs/development/python-modules/pysimplesoap/default.nix b/nixpkgs/pkgs/development/python-modules/pysimplesoap/default.nix new file mode 100644 index 000000000000..eecf54425380 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysimplesoap/default.nix @@ -0,0 +1,51 @@ +{ lib +, fetchDebianPatch +, fetchPypi +, buildPythonPackage +, m2crypto +}: + +buildPythonPackage rec { + pname = "pysimplesoap"; + # Unfortunately, the latest stable release is broken on Python 3. + version = "1.16.2"; + + src = fetchPypi { + pname = "PySimpleSOAP"; + inherit version; + hash = "sha256-sbv00NCt/5tlIZfWGqG3ZzGtYYhJ4n0o/lyyUJFtZ+E="; + }; + + propagatedBuildInputs = [ + m2crypto + ]; + + patches = map (args: fetchDebianPatch ({ + inherit pname version; + debianRevision = "5"; + } // args)) [ + # Merged upstream: f5f96210e1483f81cb5c582a6619e3ec4b473027 + { patch = "Add-quotes-to-SOAPAction-header-in-SoapClient"; + hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0="; } + # Merged upstream: ad03a21cafab982eed321553c4bfcda1755182eb + { patch = "fix-httplib2-version-check"; + hash = "sha256-zUeF3v0N/eMyRVRH3tQLfuUfMKOD/B/aqEwFh/7HxH4="; } + { patch = "reorder-type-check-to-avoid-a-TypeError"; + hash = "sha256-2p5Cqvh0SPfJ8B38wb/xq7jWGYgpI9pavA6qkMUb6hA="; } + # Merged upstream: 033e5899e131a2c1bdf7db5852f816f42aac9227 + { patch = "Support-integer-values-in-maxOccurs-attribute"; + hash = "sha256-IZ0DP7io+ihcnB5547cR53FAdnpRLR6z4J5KsNrkfaI="; } + { patch = "PR204"; + hash = "sha256-JlxeTnKDFxvEMFBthZsaYRbNOoBvLJhBnXCRoiL/nVw="; } + ] ++ [ ./stringIO.patch ]; + + meta = with lib; { + description = "Python simple and lightweight SOAP Library"; + homepage = "https://github.com/pysimplesoap/pysimplesoap"; + license = licenses.lgpl3Plus; + + # I don't directly use this, only needed it as a dependency of debianbts + # so co-maintainers would be welcome. + maintainers = [ maintainers.nicoo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pysimplesoap/stringIO.patch b/nixpkgs/pkgs/development/python-modules/pysimplesoap/stringIO.patch new file mode 100644 index 000000000000..8ecad11b9a74 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysimplesoap/stringIO.patch @@ -0,0 +1,31 @@ +diff --git i/pysimplesoap/c14n.py w/pysimplesoap/c14n.py +index 5749e49..297592e 100644 +--- i/pysimplesoap/c14n.py ++++ w/pysimplesoap/c14n.py +@@ -55,11 +55,8 @@ except: + class XMLNS: + BASE = "http://www.w3.org/2000/xmlns/" + XML = "http://www.w3.org/XML/1998/namespace" +-try: +- import cStringIO +- StringIO = cStringIO +-except ImportError: +- import StringIO ++ ++from io import StringIO + + _attrs = lambda E: (E.attributes and E.attributes.values()) or [] + _children = lambda E: E.childNodes or [] +diff --git i/pysimplesoap/xmlsec.py w/pysimplesoap/xmlsec.py +index 2f96df7..053149f 100644 +--- i/pysimplesoap/xmlsec.py ++++ w/pysimplesoap/xmlsec.py +@@ -15,7 +15,7 @@ from __future__ import print_function + import base64 + import hashlib + import os +-from cStringIO import StringIO ++from io import StringIO + from M2Crypto import BIO, EVP, RSA, X509, m2 + + # if lxml is not installed, use c14n.py native implementation diff --git a/nixpkgs/pkgs/development/python-modules/pyskyqremote/default.nix b/nixpkgs/pkgs/development/python-modules/pyskyqremote/default.nix index aa9bb6732fb1..27be3381ae4f 100644 --- a/nixpkgs/pkgs/development/python-modules/pyskyqremote/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyskyqremote/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyskyqremote"; - version = "0.3.25"; + version = "0.3.26"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_remote"; rev = "refs/tags/${version}"; - hash = "sha256-yDeGY5BFj0DKqqK+CzrIxqLa7G5C6Le+GIcFHwtJK9E="; + hash = "sha256-aMgUwgKHgR+NQvRxiUV7GaXehjDIlJJJHwSmHDmzK08="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyslim/default.nix b/nixpkgs/pkgs/development/python-modules/pyslim/default.nix index fcb53da4a4f3..f21dc7b354e3 100644 --- a/nixpkgs/pkgs/development/python-modules/pyslim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyslim/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyslim"; - version = "1.0.3"; + version = "1.0.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BRfv5AcdRpnvk7zGeYYWweh+foFEOSZjz3pTjX8KOnA="; + hash = "sha256-valAhPEVZNv/IYe85a88SGE+2/9O1omvBywz/HeeRco="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pysnooz/default.nix b/nixpkgs/pkgs/development/python-modules/pysnooz/default.nix index 24868e7a6b62..dd8d6ea4fcde 100644 --- a/nixpkgs/pkgs/development/python-modules/pysnooz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysnooz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pysnooz"; - version = "0.8.5"; + version = "0.8.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,13 +25,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AustinBrunkhorst"; repo = pname; - rev = "v${version}"; - hash = "sha256-X7RjI4KytJI9raHAJHLygV3J4zHKuHk8Kq+3JfktPeg="; + rev = "refs/tags/v${version}"; + hash = "sha256-hJwIObiuFEAVhgZXYB9VCeAlewBBnk0oMkP83MUCpyU="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'transitions = "^0.8.11"' 'transitions = ">0.8.11"' \ + --replace 'transitions = "^0.8.11"' 'transitions = ">=0.8.11"' \ + --replace 'Events = "^0.4"' 'Events = ">=0.4"' \ --replace " --cov=pysnooz --cov-report=term-missing:skip-covered" "" ''; @@ -62,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to control SNOOZ white noise machines"; homepage = "https://github.com/AustinBrunkhorst/pysnooz"; + changelog = "https://github.com/AustinBrunkhorst/pysnooz/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyssim/default.nix b/nixpkgs/pkgs/development/python-modules/pyssim/default.nix index 6b32660ad02d..b69bf47c96d7 100644 --- a/nixpkgs/pkgs/development/python-modules/pyssim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyssim/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow }: +{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, pillow, fetchpatch }: buildPythonPackage rec { pname = "pyssim"; @@ -14,6 +14,18 @@ buildPythonPackage rec { sha256 = "sha256-VvxQTvDTDms6Ccyclbf9P0HEQksl5atPPzHuH8yXTmc="; }; + patches = [ + # "Replace Image.ANTIALIAS with Image.LANCZOS" + # Image.ANTIALIAS has been removed in Pillow 10.0.0, + # the version currently in nixpkgs, + # and Image.LANCZOS is a drop-in since Pillow 2.7.0. + # https://github.com/jterrace/pyssim/pull/45 + (fetchpatch { + url = "https://github.com/jterrace/pyssim/commit/db4296c12ca9c027eb9cd61b52195a78dfcc6711.patch"; + hash = "sha256-wNp47EFtjXv6jIFX25IErXg83ksmGRNFKNeMFS+tP6s="; + }) + ]; + # Tests are copied from .travis.yml checkPhase = '' $out/bin/pyssim test-images/test1-1.png test-images/test1-1.png | grep 1 diff --git a/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix b/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix index f952cb475eb9..5ea2ebb98405 100644 --- a/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.39.0"; + version = "0.39.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-CswgfEmKaQvhDXizpcu6d8JMYtJSgNQ3L4+63ee58eE="; + hash = "sha256-wrn57mluIvUYBXOxw4NTFuq0UuOQwtC/WRWhfQpyRTA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytablewriter/default.nix b/nixpkgs/pkgs/development/python-modules/pytablewriter/default.nix index 07461e06a298..86af2ae0846f 100644 --- a/nixpkgs/pkgs/development/python-modules/pytablewriter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytablewriter/default.nix @@ -1,31 +1,44 @@ -{ buildPythonPackage -, fetchFromGitHub -, lib +{ lib +, buildPythonPackage , dataproperty +, dominate +, elasticsearch +, fetchFromGitHub +, loguru , mbstrdecoder +, pandas , pathvalidate +, pytestCheckHook +, pythonOlder +, pyyaml , setuptools +, simplejson , tabledata , tcolorpy -, typepy -, pytestCheckHook -, pyyaml , toml -, elasticsearch -, dominate +, typepy +, xlsxwriter +, xlwt }: buildPythonPackage rec { pname = "pytablewriter"; - version = "0.64.2"; + version = "1.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; - rev = "v${version}"; - hash = "sha256-+IOHnmdd9g3SoHyITJJtbJ0/SAAmwWmwX5XeqsO34EM="; + rev = "refs/tags/v${version}"; + hash = "sha256-VDx7/kKRBho4oWvUXYe5K9CC4vUCDs91G05Wlpa47OE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ dataproperty mbstrdecoder @@ -35,23 +48,82 @@ buildPythonPackage rec { typepy ]; - checkInputs = [ pyyaml toml elasticsearch dominate ]; - nativeCheckInputs = [ pytestCheckHook ]; - # Circular dependency + passthru.optional-dependencies = { + all = [ + dominate + elasticsearch + loguru + pandas + # pytablereader + pyyaml + simplejson + toml + xlsxwriter + xlwt + ]; + es = [ + elasticsearch + ]; + es8 = [ + elasticsearch + ]; + excel = [ + xlwt + xlsxwriter + ]; + html = [ + dominate + ]; + logging = [ + loguru + ]; + # from = [ + # pytablereader + # ]; + pandas = [ + pandas + ]; + # sqlite = [ + # simplesqlite + # ]; + # theme = [ + # pytablewriter-altrow-theme + # ]; + toml = [ + toml + ]; + yaml = [ + pyyaml + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "pathvalidate" + ]; + disabledTests = [ + # Circular dependency "test_normal_from_file" "test_normal_from_text" "test_normal_clear_theme" + # Test compares CLI output + "test_normal" ]; + disabledTestPaths = [ "test/writer/binary/test_excel_writer.py" "test/writer/binary/test_sqlite_writer.py" ]; meta = with lib; { - homepage = "https://github.com/thombashi/pytablewriter"; description = "A library to write a table in various formats"; - maintainers = with maintainers; [ genericnerdyusername ]; + homepage = "https://github.com/thombashi/pytablewriter"; + changelog = "https://github.com/thombashi/pytablewriter/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ genericnerdyusername ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytado/default.nix b/nixpkgs/pkgs/development/python-modules/pytado/default.nix index ddd618d6d14f..8575fceadc4f 100644 --- a/nixpkgs/pkgs/development/python-modules/pytado/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytado/default.nix @@ -3,18 +3,21 @@ , fetchFromGitHub , pytestCheckHook , requests +, pythonOlder }: buildPythonPackage rec { pname = "pytado"; - version = "0.16.0"; + version = "0.17.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "wmalgadey"; repo = "PyTado"; - # Upstream hasn't tagged 0.13.0 yet rev = "refs/tags/${version}"; - sha256 = "sha256-tpWr+VlkJ9svN9XtBIDEAos4uxYCl6njvUBPIJG++Yg="; + sha256 = "sha256-w1qtSEpnZCs7+M/0Gywz9AeMxUzz2csHKm9SxBKzmz4="; }; propagatedBuildInputs = [ @@ -32,7 +35,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python binding for Tado web API"; homepage = "https://github.com/wmalgadey/PyTado"; - license = licenses.gpl3; + changelog = "https://github.com/wmalgadey/PyTado/releases/tag/${version}"; + license = licenses.gpl3Only; maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix index f2a8d4bf1dc8..53766a3134a5 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-playwright/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "pytest-playwright"; - version = "0.3.3"; + version = "0.4.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "microsoft"; repo = "playwright-pytest"; rev = "refs/tags/v${version}"; - hash = "sha256-2xdRW8Q10x6mtNs/EdAsgrOtVmvLAOdbIGXfyeB8ZAg="; + hash = "sha256-yYFzaIPYOsuvS8bGcuwQQNS/CtvGUe1XQdORmfEJQmU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-recording/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-recording/default.nix index 87c0e8d33a02..7a53cbbba882 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-recording/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-recording/default.nix @@ -5,8 +5,8 @@ # install dependencies , pytest , vcrpy -, attrs # test dependencies +, hatchling , pytestCheckHook , pytest-httpbin , pytest-mock @@ -15,22 +15,23 @@ buildPythonPackage rec { pname = "pytest-recording"; - version = "0.12.2"; + version = "0.13.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "kiwicom"; repo = "pytest-recording"; rev = "v${version}"; - hash = "sha256-nivwxaW8AIrBtPkzPJYfxlPxWn2NuYcaMry/IrBnnl0="; + hash = "sha256-SCHdzii6GYVWVY7MW/IW6CNZMuu5h/jXEj49P0jvhoE="; }; buildInputs = [ + hatchling pytest ]; propagatedBuildInputs = [ vcrpy - attrs ]; __darwinAllowLocalNetworking = true; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-testinfra/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-testinfra/default.nix index fe663c3f265b..df1ae78c8612 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-testinfra/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-testinfra/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pytest-testinfra"; - version = "8.1.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; - hash = "sha256-m0CCi1j7esK/8pzBRlk0rfQ08Q3VoQj2BTXe5SZgpj0="; + hash = "sha256-UxGzaeBUaSD85GTDv5RbVevnWhJ1aPbWFelLiJE0AUk="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; # markers don't get added when docker is not available (leads to warnings): - # https://github.com/pytest-dev/pytest-testinfra/blob/8.1.0/test/conftest.py#L228 + # https://github.com/pytest-dev/pytest-testinfra/blob/9.0.0/test/conftest.py#L223 preCheck = '' export HOME=$(mktemp -d) sed -i '54imarkers = \ diff --git a/nixpkgs/pkgs/development/python-modules/python-box/default.nix b/nixpkgs/pkgs/development/python-modules/python-box/default.nix index cc66888ad4e7..3145debc745c 100644 --- a/nixpkgs/pkgs/development/python-modules/python-box/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-box/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, cython_3 , fetchFromGitHub , msgpack , poetry-core @@ -15,19 +16,20 @@ buildPythonPackage rec { pname = "python-box"; - version = "7.0.1"; + version = "7.1.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "cdgriffith"; repo = "Box"; rev = "refs/tags/${version}"; - hash = "sha256-Ddt8/S6HzmOt1kvzRzed3+TbOacw6RG9nd2UNn+ELB4="; + hash = "sha256-oxT2y3um6BZ3bwYa+LWBoTgU+9b+V7XtQdCdECU3Gu0="; }; nativeBuildInputs = [ + cython_3 setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix b/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix index 647906511a17..10db66e4bb22 100644 --- a/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix @@ -1,6 +1,7 @@ { lib , aiohttp , aresponses +, backoff , buildPythonPackage , fetchFromGitHub , packaging @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.5.12"; + version = "0.5.15"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "liudger"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ftu79SnVa7wOMx/RiRBDPmmG7Mmw84r30G4yDzBea2k="; + hash = "sha256-PNgv3QXl3iyDX0KOn1egQrt6D64i3eCUyCPtXe94y0U="; }; postPatch = '' @@ -41,6 +42,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + backoff packaging pydantic yarl diff --git a/nixpkgs/pkgs/development/python-modules/python-creole/default.nix b/nixpkgs/pkgs/development/python-modules/python-creole/default.nix index a02a08e2b44b..52d13d452aff 100644 --- a/nixpkgs/pkgs/development/python-modules/python-creole/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-creole/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , runtimeShell # build @@ -27,14 +28,20 @@ buildPythonPackage rec { hash = "sha256-8pXOnLNjhIv0d+BqjW8wlb6BT6CmFHSsxn5wLOv3LBQ="; }; + patches = [ + # https://github.com/jedie/python-creole/pull/77 + (fetchpatch { + name = "replace-poetry-with-poetry-core.patch"; + url = "https://github.com/jedie/python-creole/commit/bfc46730ab4a189f3142246cead8d26005a28671.patch"; + hash = "sha256-WtoEQyu/154Cfj6eSnNA+t37+o7Ij328QGMKxwcLg5k="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" - substituteInPlace Makefile \ --replace "/bin/bash" "${runtimeShell}" diff --git a/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix index 4c757735ada5..9a0269c983f0 100644 --- a/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.5.1"; + version = "4.6.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "refs/tags/v${version}"; - hash = "sha256-XTr5potc3t9TxHEqMydRsAzslmLnrzsGqDaM8qdKfp8="; + hash = "sha256-za2JY5Gu9MEqi3W1zxcuwYiJ5XLc43ig6Hdx/4JwDbY="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix b/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix index bfb53c92df41..c6b5f1ec4539 100644 --- a/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -4,6 +4,7 @@ , awesomeversion , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , protobuf , pytest-asyncio @@ -25,6 +26,15 @@ buildPythonPackage rec { hash = "sha256-XTSnIL/hBL1Rsyv/tBce/WCvA3n7mZern0v3i6gTOeA="; }; + patches = [ + # https://github.com/DCSBL/python-homewizard-energy/pull/235 + (fetchpatch { + name = "remove-setuptools-dependency.patch"; + url = "https://github.com/DCSBL/python-homewizard-energy/commit/b006b0bc1f3d0b4a7569654a1afa90dd4cffaf18.patch"; + hash = "sha256-WQeepxiYnBfFcQAmrc3pavBz5j1Qo0HmUcOxsK/pr50="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; @@ -34,6 +44,8 @@ buildPythonPackage rec { aiohttp ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ aresponses pytest-asyncio diff --git a/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix b/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix index 846361aa064c..e3c1b155c90b 100644 --- a/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-hosts"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - hash = "sha256-4SAXjx5pRDhv4YVUgrUttyUa5izpYqpDKiiGJc2y8V0="; + hash = "sha256-y7d7CuGuKYEUCjFHvWb+iDI6oDeVsTzBNPSySzxu1Zk="; }; # win_inet_pton is required for windows support diff --git a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix index 67bbaf998dbb..2dca97b7f858 100644 --- a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , docstring-to-markdown , fetchFromGitHub +, fetchpatch , flake8 , flaky , jedi @@ -28,6 +29,7 @@ , ujson , websockets , whatthepatch +, wheel , yapf }: @@ -45,7 +47,14 @@ buildPythonPackage rec { hash = "sha256-plciPUROFileVULGBZpwUTkW2NZVHy4Nuf4+fSjd8nM="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + patches = [ + # https://github.com/python-lsp/python-lsp-server/pull/416 + (fetchpatch { + name = "bump-jedi-upper-pin-to-0.20.patch"; + url = "https://github.com/python-lsp/python-lsp-server/commit/f33a93afc8c3a0f16751f9e1f6601a37967fd7df.patch"; + hash = "sha256-lBpzXxjlQp2ig0z2DRJw+jQZ5eRLIOJYjGrzfgvknDA="; + }) + ]; postPatch = '' substituteInPlace pyproject.toml \ @@ -53,6 +62,8 @@ buildPythonPackage rec { --replace "--cov pylsp --cov test" "" ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + pythonRelaxDeps = [ "autopep8" "flake8" @@ -65,6 +76,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pythonRelaxDepsHook setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-magic/default.nix b/nixpkgs/pkgs/development/python-modules/python-magic/default.nix index 056b466216bf..890cfb50c2cc 100644 --- a/nixpkgs/pkgs/development/python-modules/python-magic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-magic/default.nix @@ -29,6 +29,14 @@ buildPythonPackage rec { url = "https://github.com/ahupp/python-magic/commit/4ffcd59113fa26d7c2e9d5897b1eef919fd4b457.patch"; hash = "sha256-67GpjlGiR4/os/iZ69V+ZziVLpjmid+7t+gQ2aQy9I0="; }) + + # Upstream patch to amend test suite for-5.45: + # https://github.com/ahupp/python-magic/pull/290 + (fetchpatch { + name = "file-5.45.patch"; + url = "https://github.com/ahupp/python-magic/commit/3d2405ca80cd39b2a91decd26af81dcf181390a4.patch"; + hash = "sha256-HRsnO9MGfMD9BkJdC4SrEFQ1OZEaXpwakXFLoaCPK94="; + }) ]; preCheck = '' diff --git a/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix index c04beb032f95..ccb013d14e54 100644 --- a/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix @@ -1,10 +1,12 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder # build , setuptools +, wheel # propagates , aiohttp @@ -39,8 +41,18 @@ buildPythonPackage rec { hash = "sha256-t++7jQreibGpJRjJawicxjFIye5X6R1dpFqiM6yvRf0="; }; + patches = [ + # https://github.com/home-assistant-libs/python-matter-server/pull/379 + (fetchpatch { + name = "relax-setuptools-dependency.patch"; + url = "https://github.com/home-assistant-libs/python-matter-server/commit/1bbc945634db92ea081051645b03c3d9c358fb15.patch"; + hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; + }) + ]; + nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix b/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix index f11bb76057f5..d6137cf191e2 100644 --- a/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-otbr-api/default.nix @@ -4,10 +4,13 @@ , buildPythonPackage , cryptography , fetchFromGitHub +, fetchpatch +, pytest-asyncio , pytestCheckHook , pythonOlder , setuptools , voluptuous +, wheel }: buildPythonPackage rec { @@ -24,8 +27,18 @@ buildPythonPackage rec { hash = "sha256-bPN2h60ypjlKpXs1xDS7bZcGRXvatA3EdlAX/HLxxTM="; }; + patches = [ + # https://github.com/home-assistant-libs/python-otbr-api/pull/68 + (fetchpatch { + name = "relax-setuptools-dependency.patch"; + url = "https://github.com/home-assistant-libs/python-otbr-api/commit/37eb19c12d17ac7d040ded035d8401def872fbda.patch"; + hash = "sha256-JGsaLQNbUfz0uK/MeGnR2XTJDs4RnTOEg7BavfDPArg="; + }) + ]; + nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ @@ -36,6 +49,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-asyncio pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix b/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix index c300ce9baa5b..5eb3b19afe06 100644 --- a/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.32.3"; + version = "0.32.4"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-rKE+dgq0ax/EZ0qYkGVsnHhNxyt3F74hI2tZAaOHCqI="; + hash = "sha256-tZ0nyjARqXDffDOBTsGQ1iZSzzkMToUENb+NwhJ7xY4="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix b/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix index cea69bf5b14b..605d8157051c 100644 --- a/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -14,13 +14,15 @@ , pytestCheckHook , pythonOlder , pytz +, setuptools +, wheel , tornado }: buildPythonPackage rec { pname = "python-telegram-bot"; version = "20.4"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.8"; @@ -31,6 +33,11 @@ buildPythonPackage rec { hash = "sha256-owbJJZjBkMjsgfBLRl+rnePrIvQ0sUZs7rP9ie912pw="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ aiolimiter apscheduler diff --git a/nixpkgs/pkgs/development/python-modules/python-vagrant/default.nix b/nixpkgs/pkgs/development/python-modules/python-vagrant/default.nix index a9d585c777da..61d780809db5 100644 --- a/nixpkgs/pkgs/development/python-modules/python-vagrant/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-vagrant/default.nix @@ -1,21 +1,29 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , setuptools +, setuptools-scm +, wheel }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.1.0"; pname = "python-vagrant"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-qP6TzPL/N+zJXsL0nqdKkabOc6TbShapjdJtOXz9CeU="; + src = fetchFromGitHub { + owner = "pycontribs"; + repo = "python-vagrant"; + rev = "refs/tags/v${version}"; + hash = "sha256-apvYzH0IY6ZyUP/FiOVbGN3dXejgN7gn7Mq2tlEaTww="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools + setuptools-scm + wheel ]; # The tests try to connect to qemu diff --git a/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix b/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix index f3a55cfb7f56..981f963db389 100644 --- a/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix @@ -29,6 +29,9 @@ buildPythonPackage rec { url = "https://github.com/SAML-Toolkits/python3-saml/commit/bd65578e5a21494c89320094c61c1c77250bea33.diff"; hash = "sha256-9Trew6R5JDjtc0NRGoklqMVDEI4IEqFOdK3ezyBU6gI="; }) + # skip tests with expired test data + # upstream issue: https://github.com/SAML-Toolkits/python3-saml/issues/373 + ./skip-broken-tests.patch ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python3-saml/skip-broken-tests.patch b/nixpkgs/pkgs/development/python-modules/python3-saml/skip-broken-tests.patch new file mode 100644 index 000000000000..ea845e7da3de --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python3-saml/skip-broken-tests.patch @@ -0,0 +1,28 @@ +diff --git a/tests/src/OneLogin/saml2_tests/response_test.py b/tests/src/OneLogin/saml2_tests/response_test.py +index fbe714f..bbed3c2 100644 +--- a/tests/src/OneLogin/saml2_tests/response_test.py ++++ b/tests/src/OneLogin/saml2_tests/response_test.py +@@ -562,6 +562,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase): + response_2 = OneLogin_Saml2_Response(settings, xml_2) + self.assertTrue(response_2.check_one_condition()) + ++ @unittest.skip("test data expired") + def testCheckOneAuthnStatement(self): + """ + Tests the check_one_authnstatement method of SamlResponse +@@ -970,6 +971,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase): + with self.assertRaisesRegex(Exception, 'Could not validate timestamp: expired. Check system clock.'): + response_2.is_valid(self.get_request_data(), raise_exceptions=True) + ++ @unittest.skip("test data expired") + def testIsInValidNoStatement(self): + """ + Tests the is_valid method of the OneLogin_Saml2_Response +@@ -1080,6 +1082,7 @@ class OneLogin_Saml2_Response_Test(unittest.TestCase): + with self.assertRaisesRegex(Exception, 'Found an Attribute element with duplicated Name'): + response.get_attributes() + ++ @unittest.skip("test data expired") + def testIsInValidDestination(self): + """ + Tests the is_valid method of the OneLogin_Saml2_Response class diff --git a/nixpkgs/pkgs/development/python-modules/pytibber/default.nix b/nixpkgs/pkgs/development/python-modules/pytibber/default.nix index 6f782ae2139c..2701f7e64f1d 100644 --- a/nixpkgs/pkgs/development/python-modules/pytibber/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.28.0"; + version = "0.28.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-S/arFxM+9VZECqUzPijTxclBQ6oeiOxdRXQLb+uhkfM="; + hash = "sha256-ZEdBV+X9Ib1JvE8nzey+er7GrQMAV79zqn8ssC+kKdU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytile/default.nix b/nixpkgs/pkgs/development/python-modules/pytile/default.nix index 977cf15d074b..12d61c0da5eb 100644 --- a/nixpkgs/pkgs/development/python-modules/pytile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytile/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytile"; - version = "2023.04.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - hash = "sha256-SFHWhXKC7PIqanJIQyGcpM8klwxOAJPVtzk9w0i2YYA="; + rev = "refs/tags/${version}"; + hash = "sha256-wPtGofli3ZKBcAwjwjCbeYnLaSZ5lLshlBSz1/WlAcg="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix b/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix index d4067edd338e..c76b97c2374a 100644 --- a/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.0.6"; + version = "2.0.7"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-/RfHryuIFhLn9SCg6YVn0Ley8ajcIlsDtuKNuhUFm8M="; + hash = "sha256-R1uX5kPRnLWqqpEYbzJp7aOSK6e5mfyQ14CkbBCDszw="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/pytrends/default.nix b/nixpkgs/pkgs/development/python-modules/pytrends/default.nix index 84a5aed8c7ad..d52436348ad7 100644 --- a/nixpkgs/pkgs/development/python-modules/pytrends/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytrends/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , setuptools +, setuptools-scm +, wheel , requests , lxml , pandas @@ -27,6 +29,8 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + setuptools-scm + wheel ]; propagatedBuildInputs = [ requests lxml pandas ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index a7c9ae9ecffe..292bd039f8d0 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.65"; + version = "9.2.66"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-iZygYN3874o9miKxp2+0KDgQKFHDX73/45FzMSeSAlg="; + hash = "sha256-NmOa/DH/EapcYCrpdcdn4CR9DiKuVnrDvKbnTiO3Ldc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyvisa-sim/default.nix b/nixpkgs/pkgs/development/python-modules/pyvisa-sim/default.nix index 56fef67a1f9f..55d6ff6b5db6 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvisa-sim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvisa-sim/default.nix @@ -7,6 +7,9 @@ , stringparser , typing-extensions , pytestCheckHook +, setuptools +, setuptools-scm +, wheel }: buildPythonPackage rec { @@ -19,9 +22,15 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyVISA-sim"; inherit version; - sha256 = "sha256-vWxW941/1e58pqL/Rzq+eoZJpwsvLphgIe48SuJtohY="; + hash = "sha256-vWxW941/1e58pqL/Rzq+eoZJpwsvLphgIe48SuJtohY="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + propagatedBuildInputs = [ pyvisa pyyaml diff --git a/nixpkgs/pkgs/development/python-modules/pywbem/default.nix b/nixpkgs/pkgs/development/python-modules/pywbem/default.nix index 73376122eb1d..e13aafe71485 100644 --- a/nixpkgs/pkgs/development/python-modules/pywbem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywbem/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "pywbem"; - version = "1.6.1"; + version = "1.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-q9vWzgi2xZfN1sdzDmtJqELZE/L2s8xitYXFjsPueUU="; + hash = "sha256-JugXm8F+MXa0zVdrn1p3MPhI1RvgUTdo/X8x/ZsnCpY="; }; propagatedBuildInputs = [ @@ -67,6 +67,6 @@ buildPythonPackage rec { homepage = "https://pywbem.github.io"; changelog = "https://github.com/pywbem/pywbem/blob/${version}/docs/changes.rst"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyweatherflowrest/default.nix b/nixpkgs/pkgs/development/python-modules/pyweatherflowrest/default.nix index c03a4d01b170..694f37de3974 100644 --- a/nixpkgs/pkgs/development/python-modules/pyweatherflowrest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyweatherflowrest/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyweatherflowrest"; - version = "1.0.9"; + version = "1.0.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LFA1GJCYFIWl7/YblRrYgAB4lbELpzhCJyjB8aCkJ/E="; + hash = "sha256-7eNhvpaikzdQBrzjXw67JGqoynvfmz4poruharTkuG0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pywemo/default.nix b/nixpkgs/pkgs/development/python-modules/pywemo/default.nix index a2fc6c4bd279..277de7a83170 100644 --- a/nixpkgs/pkgs/development/python-modules/pywemo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pywemo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pywemo"; - version = "1.2.1"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6aigzwHP9iAQF4GKKQfnZl9sAbwZfOAG/xPf6ay7rGs="; + hash = "sha256-+AdNT7ClT8JkYLkwk+IVNWgXGS04WNtENOtqmbjv7nQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qcodes-loop/default.nix b/nixpkgs/pkgs/development/python-modules/qcodes-loop/default.nix index ef65af007d90..2590a557b8ce 100644 --- a/nixpkgs/pkgs/development/python-modules/qcodes-loop/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qcodes-loop/default.nix @@ -1,4 +1,5 @@ { lib +, fetchpatch , fetchPypi , pythonOlder , buildPythonPackage @@ -8,7 +9,9 @@ , matplotlib , numpy , pandas +, setuptools , versioningit +, wheel , xarray , hickle , ipython @@ -24,18 +27,29 @@ buildPythonPackage rec { pname = "qcodes-loop"; version = "0.1.1"; + format = "pyproject"; disabled = pythonOlder "3.8"; - format = "pyproject"; src = fetchPypi { inherit version; pname = "qcodes_loop"; - sha256 = "sha256-pDR0Ws8cYQifftdE9dKcSzMxmouFo4tJmQvNanm6zyM="; + hash = "sha256-pDR0Ws8cYQifftdE9dKcSzMxmouFo4tJmQvNanm6zyM="; }; + patches = [ + # https://github.com/QCoDeS/Qcodes_loop/pull/39 + (fetchpatch { + name = "relax-versioningit-dependency.patch"; + url = "https://github.com/QCoDeS/Qcodes_loop/commit/58006d3fb57344ae24dd44bceca98004617b5b57.patch"; + hash = "sha256-mSlm/Ql8e5xPL73ifxSoVc9+U58AAcAmBkdW5P6zEsg="; + }) + ]; + nativeBuildInputs = [ + setuptools versioningit + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/quandl/default.nix b/nixpkgs/pkgs/development/python-modules/quandl/default.nix index b70cdf4de385..5be099d98697 100644 --- a/nixpkgs/pkgs/development/python-modules/quandl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/quandl/default.nix @@ -29,9 +29,13 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Quandl"; - sha256 = "6e0b82fbc7861610b3577c5397277c4220e065eee0fed4e46cd6b6021655b64c"; + hash = "sha256-bguC+8eGFhCzV3xTlyd8QiDgZe7g/tTkbNa2AhZVtkw="; }; + patches = [ + ./pandas2-datetime-removal.patch + ]; + propagatedBuildInputs = [ pandas numpy diff --git a/nixpkgs/pkgs/development/python-modules/quandl/pandas2-datetime-removal.patch b/nixpkgs/pkgs/development/python-modules/quandl/pandas2-datetime-removal.patch new file mode 100644 index 000000000000..6e473ad4fb3c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/quandl/pandas2-datetime-removal.patch @@ -0,0 +1,33 @@ +diff --git a/test/test_datatable_data.py b/test/test_datatable_data.py +index ee9ac61..0266a19 100644 +--- a/test/test_datatable_data.py ++++ b/test/test_datatable_data.py +@@ -1,3 +1,4 @@ ++import datetime + import re + import unittest + import httpretty +@@ -135,7 +136,7 @@ class ListDatatableDataTest(unittest.TestCase): + df = results.to_pandas() + self.assertEqual(df.index.name, 'None') + +- # if datatable has Date field then it should be convert to pandas datetime ++ # if datatable has Date field then it should be convert to datetime + @parameterized.expand(['GET', 'POST']) + def test_pandas_dataframe_date_field_is_datetime(self, request_method): + if request_method == 'POST': +@@ -143,10 +144,10 @@ class ListDatatableDataTest(unittest.TestCase): + datatable = Datatable('ZACKS/FC') + results = Data.page(datatable, params={}) + df = results.to_pandas() +- self.assertIsInstance(df['per_end_date'][0], pandas.datetime) +- self.assertIsInstance(df['per_end_date'][1], pandas.datetime) +- self.assertIsInstance(df['per_end_date'][2], pandas.datetime) +- self.assertIsInstance(df['per_end_date'][3], pandas.datetime) ++ self.assertIsInstance(df['per_end_date'][0], datetime.datetime) ++ self.assertIsInstance(df['per_end_date'][1], datetime.datetime) ++ self.assertIsInstance(df['per_end_date'][2], datetime.datetime) ++ self.assertIsInstance(df['per_end_date'][3], datetime.datetime) + + @parameterized.expand(['GET', 'POST']) + def test_to_numpy_returns_numpy_object(self, request_method): diff --git a/nixpkgs/pkgs/development/python-modules/radian/default.nix b/nixpkgs/pkgs/development/python-modules/radian/default.nix index d8ffc2bff9ef..ab33203d7011 100644 --- a/nixpkgs/pkgs/development/python-modules/radian/default.nix +++ b/nixpkgs/pkgs/development/python-modules/radian/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "radian"; - version = "0.6.6"; + version = "0.6.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,13 +27,12 @@ buildPythonPackage rec { owner = "randy3k"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zA7R9UIB0hOWev10Y4oySIKeIxTOo0V6Q3Fxe+FeHSU="; + hash = "sha256-MEstbQj1dOcrukgDvMwL330L9INEZcIupebrSYMOrZk="; }; postPatch = '' substituteInPlace setup.py \ - --replace '"pytest-runner"' "" \ - --replace '0.3.39,<0.4.0' '0.3.39' + --replace '"pytest-runner"' "" ''; nativeBuildInputs = [ @@ -59,6 +58,8 @@ buildPythonPackage rec { git ]; + makeWrapperArgs = [ "--set R_HOME ${R}/lib/R" ]; + preCheck = '' export HOME=$TMPDIR export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${R}/lib/R/lib diff --git a/nixpkgs/pkgs/development/python-modules/rasterio/default.nix b/nixpkgs/pkgs/development/python-modules/rasterio/default.nix index 7410b8029a85..02cdcbed68cd 100644 --- a/nixpkgs/pkgs/development/python-modules/rasterio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rasterio/default.nix @@ -15,6 +15,7 @@ , matplotlib , ipython , numpy +, oldest-supported-numpy , packaging , pytest-randomly , pytestCheckHook @@ -22,6 +23,7 @@ , setuptools , shapely , snuggs +, wheel }: buildPythonPackage rec { @@ -41,6 +43,10 @@ buildPythonPackage rec { nativeBuildInputs = [ cython gdal + numpy + oldest-supported-numpy + setuptools + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix b/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix index 10e5a4ff34e3..f2a9f17ab670 100644 --- a/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "recipe-scrapers"; - version = "14.36.1"; + version = "14.43.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hhursev"; repo = "recipe-scrapers"; rev = "refs/tags/${version}"; - hash = "sha256-JadtlJMxRib8FpNC4QGYXfUEJGyB1aniDbsbsBYU3no="; + hash = "sha256-ik/ADmu6yGY7xWXCAn0kcWJphANIIwM8QKWjm9xoVYQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix b/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix index c6321ebab664..8c911b282605 100644 --- a/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix @@ -17,12 +17,13 @@ buildPythonPackage rec { pname = "recordlinkage"; - version = "0.15"; + version = "0.16"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-aIrx54vnf85I/Kit/4njg/VIOu6H0SE7NdQ1GbeP8Cc="; + hash = "sha256-7NoMEN/xOLFwaBXeMysShfZwrn6MzpJZYhNQHVieaqQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/reflink/default.nix b/nixpkgs/pkgs/development/python-modules/reflink/default.nix index ccada2453a3e..44106c6ca814 100644 --- a/nixpkgs/pkgs/development/python-modules/reflink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reflink/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "reflink"; - version = "0.2.1"; + version = "0.2.2"; src = fetchPypi { inherit pname version; - hash = "sha256-ySU1gtskQTv9cDq/wbKkneePMbSQcjnyhumhkpoebjo="; + hash = "sha256-iCN17nMZJ1rl9qahKHQGNl2sHpZDuRrRDlGH0/hCU70="; }; propagatedBuildInputs = [ cffi ]; diff --git a/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix b/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix index f506b13a7795..62de4b4f88c5 100644 --- a/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2023.06.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-W5W/2gBraraZs8ai8tyg3aRWvHt6WOQCVICuiAigae0="; + hash = "sha256-2czpPLTJOUxjzG0+aOyY01jfwlcRgoHiQdB6ybQ6gWg="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/remarshal/default.nix b/nixpkgs/pkgs/development/python-modules/remarshal/default.nix index 738c2f18f661..5d2e002538c2 100644 --- a/nixpkgs/pkgs/development/python-modules/remarshal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/remarshal/default.nix @@ -18,23 +18,16 @@ buildPythonPackage rec { pname = "remarshal"; - version = "0.14.0"; + version = "0.17.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dbohdan"; repo = pname; rev = "v${version}"; - hash = "sha256:nTM3jrPf0kGE15J+ZXBIt2+NGSW2a6VlZCKj70n5kHM="; + hash = "sha256-FytVq9p7Yo0lS5rHj0crPIpHFjxolW8esSPkj2wLfaI="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" \ - --replace 'PyYAML = "^5.3"' 'PyYAML = "*"' \ - --replace 'tomlkit = "^0.7"' 'tomlkit = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; @@ -52,6 +45,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/remarshal-project/remarshal/releases/tag/v${version}"; description = "Convert between TOML, YAML and JSON"; license = licenses.mit; homepage = "https://github.com/dbohdan/remarshal"; diff --git a/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix index e98159128247..073977d1252e 100644 --- a/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix +++ b/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix @@ -1,20 +1,31 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook , zope_interface +, zope_testrunner , sphinx }: buildPythonPackage rec { pname = "repoze.sphinx.autointerface"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-SGvxQjpGlrkVPkiM750ybElv/Bbd6xSwyYh7RsYOKKE="; }; - propagatedBuildInputs = [ zope_interface sphinx ]; + propagatedBuildInputs = [ + zope_interface + sphinx + ]; + + nativeCheckInputs = [ + pytestCheckHook + zope_testrunner + ]; meta = with lib; { homepage = "https://github.com/repoze/repoze.sphinx.autointerface"; diff --git a/nixpkgs/pkgs/development/python-modules/reproject/default.nix b/nixpkgs/pkgs/development/python-modules/reproject/default.nix index 3baf811140f9..00060c08bc2e 100644 --- a/nixpkgs/pkgs/development/python-modules/reproject/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reproject/default.nix @@ -6,6 +6,7 @@ , cython , fetchPypi , numpy +, oldest-supported-numpy , pytest-astropy , pytestCheckHook , pythonOlder @@ -25,9 +26,16 @@ buildPythonPackage rec { hash = "sha256-OKxPPKcVVrEVUGR8Zaphn7ur9HOuqQKa9gnMo2RQQME="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "cython==" "cython>=" + ''; + nativeBuildInputs = [ astropy-extension-helpers cython + numpy + oldest-supported-numpy setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix b/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix index 4f1aafbdfa66..875771d8f8c6 100644 --- a/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "restrictedpython"; - version = "6.1"; + version = "6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "RestrictedPython"; inherit version; - hash = "sha256-fljqFcySoLkW4MjKKV6LLG1A/uTRLhorUGPYbvwnmpw="; + hash = "sha256-23Prfjs5ZQ8NIdEMyN2pwOKYbmIclLDF3jL7De46CK8="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rfcat/default.nix b/nixpkgs/pkgs/development/python-modules/rfcat/default.nix index edb17bc813fd..9ee83c5fa728 100644 --- a/nixpkgs/pkgs/development/python-modules/rfcat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rfcat/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rfcat"; - version = "1.9.7"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "atlas0fd00m"; repo = "rfcat"; rev = "refs/tags/v${version}"; - hash = "sha256-VOLA/ZZLazW7u0VYkAHzDh4aaHGr3u09bKVOkhYk6Fk="; + hash = "sha256-hdRsVbDXRC1EOhBoFJ9T5ZE6hwOgDWSdN5sIpxJ0x3E="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/riscof/default.nix b/nixpkgs/pkgs/development/python-modules/riscof/default.nix index d774e0ed3e8a..fc5874e39e33 100644 --- a/nixpkgs/pkgs/development/python-modules/riscof/default.nix +++ b/nixpkgs/pkgs/development/python-modules/riscof/default.nix @@ -1,15 +1,19 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib , git -, riscv-isac -, riscv-config , jinja2 +, pythonOlder +, riscv-config +, riscv-isac }: buildPythonPackage rec { pname = "riscof"; version = "1.25.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "riscv-software-src"; @@ -18,18 +22,36 @@ buildPythonPackage rec { hash = "sha256-ToI2xI0fvnDR+hJ++T4ss5X3gc4G6Cj1uJHx0m2X7GY="; }; - postPatch = "substituteInPlace riscof/requirements.txt --replace 'GitPython==3.1.17' GitPython"; - - propagatedBuildInputs = [ riscv-isac riscv-config jinja2 ]; - patches = [ - # riscof copies a template directory from the store, but breaks because it doesn't change permissions and expects it to be writeable + # riscof copies a template directory from the store, but breaks because it + # doesn't change permissions and expects it to be writeable ./make_writeable.patch ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "import pip" "" + substituteInPlace riscof/requirements.txt \ + --replace "GitPython==3.1.17" "GitPython" + ''; + + propagatedBuildInputs = [ + riscv-isac + riscv-config + jinja2 + ]; + + pythonImportsCheck = [ + "riscof" + ]; + + # No unitests available + doCheck = false; + meta = with lib; { - homepage = "https://github.com/riscv-software-src/riscof"; description = "RISC-V Architectural Test Framework"; + homepage = "https://github.com/riscv-software-src/riscof"; + changelog = "https://github.com/riscv-software-src/riscof/blob/${version}/CHANGELOG.md"; maintainers = with maintainers; [ genericnerdyusername ]; license = licenses.bsd3; }; diff --git a/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix b/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix index 75dd855af33f..409c3a0d7ed1 100644 --- a/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix +++ b/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , fetchFromGitHub +, fetchpatch , lib , cerberus , pyyaml @@ -9,6 +10,7 @@ buildPythonPackage rec { pname = "riscv-config"; version = "3.5.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "riscv-software-src"; @@ -17,6 +19,15 @@ buildPythonPackage rec { hash = "sha256-K7W6yyqy/2c4WHyOojuvw2P/v7bND5K6WFfTujkofBw="; }; + patches = [ + # Remove when updating to v3.8.0+ + (fetchpatch { + name = "remove-dangling-pip-import.patch"; + url = "https://github.com/riscv-software-src/riscv-config/commit/f75e7e13fe600b71254b0391be015ec533d3c3ef.patch"; + hash = "sha256-oVRynBIJevq3UzlMDRh2rVuBJZoEwEYhDma3Bb/QV2E="; + }) + ]; + propagatedBuildInputs = [ cerberus pyyaml ruamel-yaml ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix b/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix index 6d6a48425574..6fb44840f5b2 100644 --- a/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , setuptools +, setuptools-scm +, wheel , docutils , importlib-metadata , jinja2 @@ -19,18 +21,19 @@ buildPythonPackage rec { pname = "rst2pdf"; version = "0.101"; - format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AF8FssEIFHmeY2oVrAPNe85pbmgKWO52yD6ycNNzTSg="; + hash = "sha256-AF8FssEIFHmeY2oVrAPNe85pbmgKWO52yD6ycNNzTSg="; }; outputs = [ "out" "man" ]; nativeBuildInputs = [ setuptools + setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rustworkx/default.nix b/nixpkgs/pkgs/development/python-modules/rustworkx/default.nix index 055d5ff85728..4c929ceef965 100644 --- a/nixpkgs/pkgs/development/python-modules/rustworkx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rustworkx/default.nix @@ -15,18 +15,18 @@ buildPythonPackage rec { pname = "rustworkx"; - version = "0.12.1"; + version = "0.13.1"; src = fetchFromGitHub { owner = "Qiskit"; repo = pname; rev = version; - hash = "sha256-d/KCxhJdyzhTjwJZ+GsXJE4ww30iPaXcPngpCi4hBZw="; + hash = "sha256-WwQuvRMDGiY9VrWPfxL0OotPCUhCsvbXoVSCNhmIF/g="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-imhiPj763iumRQb+oeBOpICD1nCvzZx+3yQWu1QRRQQ="; + hash = "sha256-QuzBJyM83VtB6CJ7i9/SFE8h6JbxkX/LQ9lOFSQIidU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix index bf0d3b28c9bb..b1fb11573eb7 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix @@ -14,7 +14,9 @@ , pyproject-metadata , pytest-subprocess , pytestCheckHook +, setuptools , tomli +, wheel }: buildPythonPackage rec { @@ -62,6 +64,8 @@ buildPythonPackage rec { ninja pytest-subprocess pytestCheckHook + setuptools + wheel ] ++ passthru.optional-dependencies.pyproject; disabledTestPaths = [ @@ -74,12 +78,6 @@ buildPythonPackage rec { "tests/test_setuptools_pep518.py" ]; - # Tries to access ninja.__version__ which our stub doesn't have. - # FIXME: remove for next cycle - disabledTests = [ - "test_get_ninja_programs_cmake_module" - ]; - pythonImportsCheck = [ "scikit_build_core" ]; diff --git a/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix index dbb5d2044e21..354c27f01915 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , matplotlib , networkx , nose @@ -24,12 +25,28 @@ buildPythonPackage rec { hash = "sha256-kS48aHC719wUdc2WcJa9geoMUcLHSj7ZsoRZYAhF2a0="; }; + patches = [ + # https://github.com/scikit-fuzzy/scikit-fuzzy/pull/299 + (fetchpatch { + name = "numpy-1.25-test-compatibility-1.patch"; + url = "https://github.com/scikit-fuzzy/scikit-fuzzy/commit/d7d114cff002e2edf9361a55cb985615e91797b5.patch"; + hash = "sha256-udF/z94tVGRHq7gcOko4BSkvVnqe/A/bAARfCPrc06M="; + }) + (fetchpatch { + name = "numpy-1.25-test-compatibility-2.patch"; + url = "https://github.com/scikit-fuzzy/scikit-fuzzy/commit/f1612f6aeff34dc9329dbded7cee098fcd22ffd9.patch"; + hash = "sha256-Le1ECR4+RjWCkfqjVrd471GD7tuVaQlZ7RZd3zvFdHU="; + }) + (fetchpatch { + name = "numpy-1.25-test-compatibility-3.patch"; + url = "https://github.com/scikit-fuzzy/scikit-fuzzy/commit/459b9602cf182b7b42f93aad8bcf3bda6f20bfb5.patch"; + hash = "sha256-gKrhNpGt6XoAlMwQW70OPFZj/ZC8NhQq6dEaBpGE8yY="; + }) + ]; + propagatedBuildInputs = [ networkx numpy scipy ]; nativeCheckInputs = [ matplotlib nose pytestCheckHook ]; - # numpy API breakage: "AttributeError: module 'numpy' has no attribute 'float'" - disabledTests = [ "test_fuzzy_compare" ]; - pythonImportsCheck = [ "skfuzzy" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix index 03eaf556050f..7987f3bba1cb 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix @@ -54,6 +54,9 @@ let postPatch = '' patchShebangs skimage/_build_utils/{version,cythoner}.py + + substituteInPlace pyproject.toml \ + --replace "numpy==" "numpy>=" ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix index fa35fbd9ed93..2cb24d76b2b9 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix @@ -8,6 +8,8 @@ , pkg-config , numpy , openblas +, setuptools +, wheel }: buildPythonPackage rec { @@ -23,6 +25,9 @@ buildPythonPackage rec { postPatch = '' patchShebangs . + + substituteInPlace pyproject.toml \ + --replace 'numpy==' 'numpy>=' ''; nativeBuildInputs = [ @@ -30,7 +35,10 @@ buildPythonPackage rec { gfortran git meson-python + numpy pkg-config + setuptools + wheel ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scim2-filter-parser/default.nix b/nixpkgs/pkgs/development/python-modules/scim2-filter-parser/default.nix index 9b140ae6fed5..f3d37df7735c 100644 --- a/nixpkgs/pkgs/development/python-modules/scim2-filter-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scim2-filter-parser/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , django , sly @@ -20,6 +21,15 @@ buildPythonPackage rec { hash = "sha256-QEPTYpWlRPWO6Evyt4zoqUST4ousF67GmiOpD7WUqcI="; }; + patches = [ + # https://github.com/15five/scim2-filter-parser/pull/43 + (fetchpatch { + name = "replace-poetry-with-poetry-core.patch"; + url = "https://github.com/15five/scim2-filter-parser/commit/675d85f3a3ff338e96a408827d64d9e893fa5255.patch"; + hash = "sha256-PjJH1S5CDe/BMI0+mB34KdpNNcHfexBFYBmHolsWH4o="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/nixpkgs/pkgs/development/python-modules/scipy/default.nix index d51c049589ee..e58a165f5cca 100644 --- a/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scipy/default.nix @@ -7,8 +7,6 @@ , python , pythonOlder , buildPythonPackage -, pypaBuildHook -, pipInstallHook , cython , gfortran , meson-python @@ -33,11 +31,9 @@ let # # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # - # Even if you do update these hashes manually, don't change their base - # (base16 or base64), because the update script uses sed regexes to replace - # them with the updated hashes. - version = "1.11.1"; - srcHash = "sha256-bgnYXe3EhzL7+Gfriz1cXCl2eYQJ8zF+rcIwHyZR8bQ="; + # The update script uses sed regexes to replace them with the updated hashes. + version = "1.11.2"; + srcHash = "sha256-7FE740/yKUXtujVX60fQB/xvCZFfV69FRihvSi6+UWo="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; @@ -59,7 +55,7 @@ let ''; in buildPythonPackage { inherit pname version; - format = "other"; + format = "pyproject"; src = fetchFromGitHub { owner = "scipy"; @@ -80,12 +76,22 @@ in buildPythonPackage { }) ]; + # Relax deps a bit postPatch = '' substituteInPlace pyproject.toml \ - --replace "pybind11>=2.10.4,<2.11.0" "pybind11>=2.10.4,<2.12.0" + --replace 'numpy==' 'numpy>=' \ + --replace "pybind11>=2.10.4,<2.11.0" "pybind11>=2.10.4,<2.12.0" \ + --replace 'wheel<0.41.0' 'wheel' ''; - nativeBuildInputs = [ pypaBuildHook pipInstallHook cython gfortran meson-python pythran pkg-config wheel ]; + nativeBuildInputs = [ + cython + gfortran + meson-python + pythran + pkg-config + wheel + ]; buildInputs = [ blas @@ -99,14 +105,13 @@ in buildPythonPackage { propagatedBuildInputs = [ numpy ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ nose pytest pytest-xdist ]; doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); preConfigure = '' - # Relax deps a bit - substituteInPlace pyproject.toml \ - --replace 'numpy==' 'numpy>=' # Helps parallelization a bit export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES # We download manually the datasets and this variable tells the pooch diff --git a/nixpkgs/pkgs/development/python-modules/scipy/update.sh b/nixpkgs/pkgs/development/python-modules/scipy/update.sh index b0d6e2da4f41..c6b3dca49186 100755 --- a/nixpkgs/pkgs/development/python-modules/scipy/update.sh +++ b/nixpkgs/pkgs/development/python-modules/scipy/update.sh @@ -16,10 +16,12 @@ if grep -q 'version = "'$version $fname; then echo "Current version $version is the latest available, will update only datasets' hashes (don't take long)" else echoerr got version $version - sed -i -E 's/(version = ).*=/\1'$version'/g' $fname + sed -i -E 's/(version = ").*(";)/\1'$version'\2/g' $fname + # Verify the sed command above did not fail + grep -q $version $fname # Update srcHash - srcHash='"sha256-'$(nix-prefetch-github scipy scipy --rev v${version} --fetch-submodules | jq --raw-output .sha256)'"' - sed -i 's/srcHash = .*=";/srcHash = '$srcHash';/g' $fname + srcHash="$(nix-prefetch-github scipy scipy --rev v${version} --fetch-submodules | jq --raw-output .hash)" + sed -i -E 's#(srcHash = ").*(";)#\1'$srcHash'\2#g' $fname fi for d in $datasets; do diff --git a/nixpkgs/pkgs/development/python-modules/scramp/default.nix b/nixpkgs/pkgs/development/python-modules/scramp/default.nix index 954a95c94cd8..aa6013589cd3 100644 --- a/nixpkgs/pkgs/development/python-modules/scramp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scramp/default.nix @@ -7,6 +7,7 @@ , pytestCheckHook , pythonOlder , setuptools +, wheel }: buildPythonPackage rec { @@ -25,6 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + wheel ]; propagatedBuildInputs = [ @@ -40,6 +42,7 @@ buildPythonPackage rec { postPatch = '' # Upstream uses versioningit to set the version + sed -i "/versioningit >=/d" pyproject.toml sed -i '/^name =.*/a version = "${version}"' pyproject.toml sed -i "/dynamic =/d" pyproject.toml ''; diff --git a/nixpkgs/pkgs/development/python-modules/scrapy/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy/default.nix index 61b3ed1e1e2d..2fd3c6ceb7db 100644 --- a/nixpkgs/pkgs/development/python-modules/scrapy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scrapy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.10.0"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Scrapy"; - hash = "sha256-ThajP8jAOli99OjUvcofhnNU6sacz1c2WMf/NPoMrjk="; + hash = "sha256-kdZ4dfu1N2B7B+MTY0RXGKNTK1RObitLr4oEKyGh0Q8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index 94cb5ab003cc..b3953486902e 100644 --- a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.29.2"; + version = "1.30.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-etn7vkKgCN7a8Dxv4gDSVaG6mvCltVh6rTOLaKEyNRA="; + hash = "sha256-bs2Eg9eq39/LeuAWyW8FlnPULRUvQXils7OFrAEIg0w="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix b/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix index ef031de98347..258f958ce03f 100644 --- a/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix @@ -4,10 +4,12 @@ , git , mock , pep440 +, pip , pytestCheckHook , pythonOlder , setuptools-scm , six +, wheel }: buildPythonPackage rec { @@ -30,12 +32,14 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm + wheel ]; nativeCheckInputs = [ git mock pep440 + pip pytestCheckHook six ]; diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-odoo/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-odoo/default.nix new file mode 100644 index 000000000000..a9129334208f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/setuptools-odoo/default.nix @@ -0,0 +1,76 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, nix-update-script +, pytestCheckHook +, git +, setuptools-scm +, writeScript +}: +buildPythonPackage rec { + pname = "setuptools-odoo"; + version = "3.1.12"; + src = fetchFromGitHub { + owner = "acsone"; + repo = pname; + rev = version; + hash = "sha256-GIX21gOENE0r3yFIyzwjaoEcb0XvuCqiPU8F3GLxNt4="; + }; + + propagatedBuildInputs = [ + setuptools-scm + ]; + + # HACK https://github.com/NixOS/nixpkgs/pull/229460 + SETUPTOOLS_SCM_PRETEND_VERSION = version; + patchPhase = '' + runHook prePatch + + old_manifest="$(cat MANIFEST.in 2>/dev/null || true)" + echo 'global-include **' > MANIFEST.in + echo "$old_manifest" >> MANIFEST.in + + runHook postPatch + ''; + + pythonImportsCheck = [ + "setuptools_odoo" + ]; + + setupHook = writeScript "setupHook.sh" '' + setuptoolsOdooHook() { + # Don't look for a version suffix from git when building addons + export SETUPTOOLS_ODOO_POST_VERSION_STRATEGY_OVERRIDE=none + + # Let setuptools-odoo know which files to install, when Git is missing + # HACK https://github.com/acsone/setuptools-odoo/issues/20#issuecomment-340192355 + echo 'recursive-include odoo/addons/* **' >> MANIFEST.in + + # Make sure you can import the built addon + for manifest in $(find -L . -name __manifest__.py); do + export pythonImportsCheck="$pythonImportsCheck odoo.addons.$(basename $(dirname $manifest))" + done + } + + preBuildHooks+=(setuptoolsOdooHook) + ''; + + nativeCheckInputs = [ pytestCheckHook git ]; + disabledTests = [ + "test_addon1_uncommitted_change" + "test_addon1" + "test_addon2_uncommitted_version_change" + "test_odoo_addon1_sdist" + "test_odoo_addon1" + "test_odoo_addon5_wheel" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Setuptools plugin for Odoo addons"; + homepage = "https://github.com/acsone/setuptools-odoo"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ yajo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/setuptools/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools/default.nix index c851cef24b30..ad7638f3cb38 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools/default.nix @@ -1,73 +1,36 @@ { stdenv +, lib , buildPythonPackage , fetchFromGitHub , python -, bootstrapped-pip -, lib -, pipInstallHook -, setuptoolsBuildHook +, wheel }: -let +buildPythonPackage rec { pname = "setuptools"; - version = "67.4.0"; - - # Create an sdist of setuptools - sdist = stdenv.mkDerivation rec { - name = "${pname}-${version}-sdist.tar.gz"; - - src = fetchFromGitHub { - owner = "pypa"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-QDHycUFA2VRUE9alan8rF0efZTNV3Jt0CskjkCc+in0="; - name = "${pname}-${version}-source"; - }; - - patches = [ - ./tag-date.patch - ./setuptools-distutils-C++.patch - ]; - - buildPhase = '' - ${python.pythonForBuild.interpreter} setup.py egg_info - ${python.pythonForBuild.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 - tar -xzf dist/${pname}-${version}.post0.tar.gz -C dist/ - tar -czf dist/${name} -C dist/ --mtime="@$SOURCE_DATE_EPOCH" --sort=name ${pname}-${version}.post0 - ''; - - installPhase = '' - echo "Moving sdist..." - mv dist/${name} $out - ''; + version = "68.0.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pypa"; + repo = "setuptools"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ew/DpI5XsYMB4kBfkFeeB5wv5cjx4oYTddZCWLgBHBs="; }; -in buildPythonPackage { - inherit pname version; - # Because of bootstrapping we don't use the setuptoolsBuildHook that comes with format="setuptools" directly. - # Instead, we override it to remove setuptools to avoid a circular dependency. - # The same is done for pip and the pipInstallHook. - format = "other"; - src = sdist; + patches = [ + ./tag-date.patch + ./setuptools-distutils-C++.patch + ]; nativeBuildInputs = [ - bootstrapped-pip - (pipInstallHook.override{pip=null;}) - (setuptoolsBuildHook.override{setuptools=null; wheel=null;}) + wheel ]; preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) '' export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 ''; - pipInstallFlags = [ "--ignore-installed" ]; - - # Adds setuptools to nativeBuildInputs causing infinite recursion. - catchConflicts = false; - # Requires pytest, causing infinite recursion. doCheck = false; @@ -77,7 +40,6 @@ in buildPythonPackage { changelog = "https://setuptools.pypa.io/en/stable/history.html#v${replaceStrings [ "." ] [ "-" ] version}"; license = with licenses; [ mit ]; platforms = python.meta.platforms; - priority = 10; maintainers = teams.python.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix b/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix index d4fbc5c861b8..c3264d7366f1 100644 --- a/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2023.05.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-dcWDB9tpKrFbnWf35HLDmgy2zNTzKNeJQrdtRXbSMvs="; + hash = "sha256-DExMa9z/VYAMoqUmr/gfZzYFWfTxnC+Cz4rRTaNSLBM="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix b/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix index fb6a49ff6204..349544f1d035 100644 --- a/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "skytemple-files"; - version = "1.4.7"; + version = "1.5.4"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-SLRZ9ThrH2UWqfr5BbjJKDM/SRkCfMNK70XZT4+Ks7w="; + hash = "sha256-RB+Cp4mL0y59/l7yu0z3jefADHR9/h0rbTZLm7BvJ7k="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix b/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix index 47bbf831afda..ddf1866a1056 100644 --- a/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skytemple-rust/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "skytemple-rust"; - version = "1.4.0.post0"; + version = "1.5.3"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-aw57B15sDbMcdNPD8MW+O7AdqSSqjlOcuXNSm10GdPM="; + hash = "sha256-Txx8kQNb3ODbaJXfuHERzPx4zGUqYXzy+jbLNaMyf+w="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-SvHrMr5k4afVdU5nvg+bcoHVmzHYyoOYqv7nOSVxRCE="; + hash = "sha256-KQA8dfHnuysx9EUySJXZ/52Hfq6AbALwkBp3B1WJJuc="; }; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; diff --git a/nixpkgs/pkgs/development/python-modules/smbus2/default.nix b/nixpkgs/pkgs/development/python-modules/smbus2/default.nix index ba36c02e6962..893dd1921b51 100644 --- a/nixpkgs/pkgs/development/python-modules/smbus2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/smbus2/default.nix @@ -1,13 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub -, nose +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "smbus2"; - version = "0.4.2"; + version = "0.4.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,19 +16,13 @@ buildPythonPackage rec { owner = "kplindegaard"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6JzFbhUq8XR1nYkadPeYqItcLZDIFAwTe3BriEW2nVI="; + hash = "sha256-tjJurJzDn0ATiYY3Xo66lwUs98/7ZLG3d4+h1prVHAI="; }; nativeCheckInputs = [ - nose + pytestCheckHook ]; - checkPhase = '' - runHook preCheck - nosetests - runHook postCheck - ''; - pythonImportsCheck = [ "smbus2" ]; @@ -35,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Drop-in replacement for smbus-cffi/smbus-python"; homepage = "https://smbus2.readthedocs.io/"; + changelog = "https://github.com/kplindegaard/smbus2/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/snitun/default.nix b/nixpkgs/pkgs/development/python-modules/snitun/default.nix index 42b225aa3819..35d7a877fed1 100644 --- a/nixpkgs/pkgs/development/python-modules/snitun/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snitun/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "snitun"; - version = "0.35.0"; + version = "0.36.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "NabuCasa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sZMmou9uHThl7AIMnuBxABnWTF1CCFsDj1I7FYxgJ3Y="; + hash = "sha256-ViFAPAA6uU5MQNHCTIw0OTR8eZPgF34GqRP+py6L6RU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/socksio/default.nix b/nixpkgs/pkgs/development/python-modules/socksio/default.nix index ad0e8e2e6c07..fb767db631d8 100644 --- a/nixpkgs/pkgs/development/python-modules/socksio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/socksio/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , pythonAtLeast , flit-core @@ -19,6 +20,15 @@ buildPythonPackage { hash = "sha256-+IvrPaW1w4uYkEad5n0MsPnUlLeLEGyhhF+WwQuRxKw="; }; + patches = [ + # https://github.com/sethmlarson/socksio/pull/61 + (fetchpatch { + name = "unpin-flit-core.patch"; + url = "https://github.com/sethmlarson/socksio/commit/5c50fd76e7459bb822ff8f712172a78e21b8dd04.patch"; + hash = "sha256-VVUzFvF2KCXXkCfCU5xu9acT6OLr+PlQQPeVGONtU4A="; + }) + ]; + nativeBuildInputs = [ flit-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/soxr/default.nix b/nixpkgs/pkgs/development/python-modules/soxr/default.nix index 7c9251dfd7b6..20532f4c00fa 100644 --- a/nixpkgs/pkgs/development/python-modules/soxr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/soxr/default.nix @@ -2,9 +2,10 @@ , buildPythonPackage , fetchFromGitHub -# build-sytem +# build-system , cython_3 , numpy +, oldest-supported-numpy , setuptools , setuptools-scm , gnutar @@ -29,12 +30,13 @@ buildPythonPackage rec { hash = "sha256-q/K7XlqvDHAna+fqN6iiJ9wD8efsuwHiEfKjXS46jz8="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ cython_3 gnutar numpy + oldest-supported-numpy setuptools setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix b/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix index 956eaa30b847..913a458ae0f3 100644 --- a/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "spdx-tools"; - version = "0.8.0"; + version = "0.8.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "spdx"; repo = "tools-python"; rev = "refs/tags/v${version}"; - hash = "sha256-TMiaxapJuiLqm+x9K49MIzeWOE/CRAI+M1+9OeU0YvM="; + hash = "sha256-/iBy6i4J/IiJzfNdW6pN3VTE9PVED4ckoe4OBlw8wnI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index e5e92b8b038e..2a8085de7c23 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -5,7 +5,9 @@ , importlib-metadata , sphinx , pyenchant -, pbr +, setuptools +, setuptools-scm +, wheel }: buildPythonPackage rec { @@ -21,7 +23,9 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pbr + setuptools + setuptools-scm + wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix index edb6ab2ed29e..1a075b227913 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sqlalchemy-mixins"; - version = "2.0.4.2"; + version = "2.0.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "absent1706"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-soashrkokHveEI9YXAAPBPHydhoToJhCHx+g7bunhLE="; + hash = "sha256-iJrRlV/M0Z1IOdrwWSblefm6wjvdk4/v0am+It8VeWI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix index c3ad45ec13a6..4edb02182b11 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.34"; + version = "3.35"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RgdoPLsyz9TzxjkpBF6qAgqwIhxQNvm7QbeyW8dVzSM="; + hash = "sha256-j2/n+NEncs1c9FlHA6mNzQw3wP1oIN0gVBunS5/KNjo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/starlette/default.nix b/nixpkgs/pkgs/development/python-modules/starlette/default.nix index 20a9a0d81f78..1c08e61f6660 100644 --- a/nixpkgs/pkgs/development/python-modules/starlette/default.nix +++ b/nixpkgs/pkgs/development/python-modules/starlette/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.26.1"; + version = "0.27.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/zYqYmmCcOLU8Di9b4BzDLFtB5wYEEF1bYN6u2rb8Lg="; + hash = "sha256-qT3ZJQY5l1K88llJdKoSkwHvfcWwjH6JysMnHYGknqw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/stim/default.nix b/nixpkgs/pkgs/development/python-modules/stim/default.nix index 381676047c1a..734a3b3c9ff1 100644 --- a/nixpkgs/pkgs/development/python-modules/stim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stim/default.nix @@ -11,6 +11,8 @@ , matplotlib , networkx , scipy +, setuptools +, wheel , pandas }: @@ -28,9 +30,20 @@ buildPythonPackage rec { hash = "sha256-zXWdJjFkf74FCWxyVMF8dx0P8GmUkuHFxUo5wYNU2o0="; }; + postPatch = '' + # asked to relax this in https://github.com/quantumlib/Stim/issues/623 + substituteInPlace pyproject.toml \ + --replace "pybind11==" "pybind11>=" + ''; + + nativeBuildInputs = [ + pybind11 + setuptools + wheel + ]; + propagatedBuildInputs = [ numpy - pybind11 ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/stravalib/default.nix b/nixpkgs/pkgs/development/python-modules/stravalib/default.nix index d41dcda8aba1..b05e147dcaa9 100644 --- a/nixpkgs/pkgs/development/python-modules/stravalib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stravalib/default.nix @@ -3,6 +3,8 @@ , fetchPypi , nose , setuptools +, setuptools-scm +, wheel , arrow , requests , units @@ -22,6 +24,12 @@ buildPythonPackage rec { hash = "sha256-P00oxUz0oVQB969c/N2wpKLe09wtvQWPH4DH4EZUaxc="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + nativeCheckInputs = [ nose ]; @@ -33,7 +41,6 @@ buildPythonPackage rec { pint pydantic pytz - setuptools six ]; diff --git a/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix b/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix index 98bd27072d16..761a14fbfd03 100644 --- a/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -42,20 +42,21 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.185.1"; + version = "0.205.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-PwhTD1k2GOVf6ACNDY1atLLP1jjAF6eTDCE3eLUIpJA="; + hash = "sha256-58pBsTQM3t5rj4AywhMqmCUzUQB4BH9FAF7J3p6Qkok="; }; patches = [ (fetchpatch { + # https://github.com/strawberry-graphql/strawberry/pull/2199 name = "switch-to-poetry-core.patch"; url = "https://github.com/strawberry-graphql/strawberry/commit/710bb96f47c244e78fc54c921802bcdb48f5f421.patch"; hash = "sha256-ekUZ2hDPCqwXp9n0YjBikwSkhCmVKUzQk7LrPECcD7Y="; @@ -64,7 +65,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace " --emoji --mypy-ini-file=mypy.ini --benchmark-disable" "" \ + --replace "--emoji --mypy-ini-file=mypy.ini" "" \ ''; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/streamlit/default.nix b/nixpkgs/pkgs/development/python-modules/streamlit/default.nix index 2ab4d11e640d..95a11c70592b 100755 --- a/nixpkgs/pkgs/development/python-modules/streamlit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/streamlit/default.nix @@ -18,10 +18,12 @@ , pympler , python-dateutil , pythonOlder +, pythonRelaxDepsHook , requests , rich , tenacity , toml +, tornado , typing-extensions , tzlocal , validators @@ -30,16 +32,23 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.24.1"; + version = "1.26.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version format; - hash = "sha256-/V8LZHmOlwY2RAj7WJt3WVMUpjFdE7LXULljx66X82I="; + hash = "sha256-JUdfsVo8yfsYSUXz/JNvARmYvYOG4MiS/r4UyWJb9Ho="; }; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ + "pillow" + "pydeck" + ]; + propagatedBuildInputs = [ altair blinker @@ -60,6 +69,7 @@ buildPythonPackage rec { rich tenacity toml + tornado typing-extensions tzlocal validators diff --git a/nixpkgs/pkgs/development/python-modules/stumpy/default.nix b/nixpkgs/pkgs/development/python-modules/stumpy/default.nix index 7f13c29172e0..491af1105dae 100644 --- a/nixpkgs/pkgs/development/python-modules/stumpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stumpy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "stumpy"; - version = "1.11.1"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "TDAmeritrade"; repo = "stumpy"; rev = "refs/tags/v${version}"; - hash = "sha256-ARpXqZpWkbvIEDVkxA1SwlWoxq+3WO6tvv/e7WZ/25c="; + hash = "sha256-rVl3tIx8iWx2mnaix3V5YnfWWdPBTP8+K2JJKTfctDA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/syrupy/default.nix b/nixpkgs/pkgs/development/python-modules/syrupy/default.nix index a8047c5b16be..cd9d2addc604 100644 --- a/nixpkgs/pkgs/development/python-modules/syrupy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/syrupy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder +, python , poetry-core , pytest , colored @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "syrupy"; - version = "4.0.8"; + version = "4.2.1"; format = "pyproject"; - disabled = pythonOlder "3.8.1"; + disabled = lib.versionOlder python.version "3.8.1"; src = fetchFromGitHub { owner = "tophat"; repo = "syrupy"; rev = "refs/tags/v${version}"; - hash = "sha256-qUKOZHkpQmeS/QELRf1FoUniaHs/gYyOtsBCFOidx4g="; + hash = "sha256-MXUuLw4+J/9JtXY1DYwBjj2sgAbO2cXQi1HnVRx3BhM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-metadata/default.nix index 49c2124c7952..be299e867d32 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "tensorflow-metadata"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "tensorflow"; repo = "metadata"; rev = "refs/tags/v${version}"; - hash = "sha256-G7OEupjKDbblp96u2oHVdSueGG5NON5gvYhuvyz4f3E="; + hash = "sha256-ZfX25CaV+tZVdas+n7O6Gqv1GxOP1iwippIXxfhcOfg="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix index 5ce4c59490da..9e33acfc991e 100644 --- a/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.9.2"; + version = "3.9.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-K68UhtPtgTZoAl9NG5ZHOwzsvDl028coXS4ZpmJ0ULs="; + hash = "sha256-kA2MFYryz61Mm/sPfH1NuLKnz4whtdNb6hGPYQZgQKQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/textual/default.nix b/nixpkgs/pkgs/development/python-modules/textual/default.nix index 883c62d9049b..23d332c4cbd1 100644 --- a/nixpkgs/pkgs/development/python-modules/textual/default.nix +++ b/nixpkgs/pkgs/development/python-modules/textual/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.33.0"; + version = "0.35.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IhqUUsS1kCG/AwnbcLAhmQYLBSqf1ff0pD2xH4Tgdho="; + hash = "sha256-WOYS1bovS6OGmFnJaxvEpqM3jRSzQg1M0vQGv1yfcnw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/torch/default.nix b/nixpkgs/pkgs/development/python-modules/torch/default.nix index 1d9fd2a469f6..0dcc2fdba2d9 100644 --- a/nixpkgs/pkgs/development/python-modules/torch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/torch/default.nix @@ -196,7 +196,8 @@ in buildPythonPackage rec { export TORCH_CUDA_ARCH_LIST="${gpuTargetString}" export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ '' + lib.optionalString (cudaSupport && cudnn != null) '' - export CUDNN_INCLUDE_DIR=${cudnn}/include + export CUDNN_INCLUDE_DIR=${cudnn.dev}/include + export CUDNN_LIB_DIR=${cudnn.lib}/lib '' + lib.optionalString rocmSupport '' export ROCM_PATH=${rocmtoolkit_joined} export ROCM_SOURCE_DIR=${rocmtoolkit_joined} @@ -290,7 +291,7 @@ in buildPythonPackage rec { buildInputs = [ blas blas.provider pybind11 ] ++ lib.optionals stdenv.isLinux [ linuxHeaders_5_19 ] # TMP: avoid "flexible array member" errors for now - ++ lib.optionals cudaSupport [ cudnn nccl ] + ++ lib.optionals cudaSupport [ cudnn.dev cudnn.lib nccl ] ++ lib.optionals rocmSupport [ openmp ] ++ lib.optionals (cudaSupport || rocmSupport) [ magma ] ++ lib.optionals stdenv.isLinux [ numactl ] diff --git a/nixpkgs/pkgs/development/python-modules/torchio/default.nix b/nixpkgs/pkgs/development/python-modules/torchio/default.nix index 58ab010eb969..66071011f2fb 100644 --- a/nixpkgs/pkgs/development/python-modules/torchio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/torchio/default.nix @@ -19,15 +19,16 @@ buildPythonPackage rec { pname = "torchio"; - version = "0.18.90"; + version = "0.19.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fepegar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-h8cvNhOkjMMbQ6Nry8FKtwnK+yhRYRGjXi/xp0i5yyY="; + hash = "sha256-SNX558kSRCS9Eks00Kj2kFmo7hCUgV6saYLsnx/Kus0="; }; propagatedBuildInputs = [ @@ -57,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Medical imaging toolkit for deep learning"; - homepage = "http://www.torchio.org/"; + homepage = "https://torchio.readthedocs.io"; license = licenses.asl20; maintainers = [ maintainers.bcdarwin ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/tornado/4.nix b/nixpkgs/pkgs/development/python-modules/tornado/4.nix index e4f59c148735..7476a22792ee 100644 --- a/nixpkgs/pkgs/development/python-modules/tornado/4.nix +++ b/nixpkgs/pkgs/development/python-modules/tornado/4.nix @@ -2,6 +2,7 @@ , unittestCheckHook , buildPythonPackage , fetchPypi +, fetchpatch , isPy27 , pythonAtLeast }: @@ -16,6 +17,14 @@ buildPythonPackage rec { sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d"; }; + patches = [ + (fetchpatch { + name = "CVE-2023-28370.patch"; + url = "https://github.com/tornadoweb/tornado/commit/32ad07c54e607839273b4e1819c347f5c8976b2f.patch"; + hash = "sha256-2dpPHkNThOaZD8T2g1vb/I5WYZ/vy/t690539uprJyc="; + }) + ]; + nativeCheckInputs = [ unittestCheckHook ]; # We specify the name of the test files to prevent diff --git a/nixpkgs/pkgs/development/python-modules/tornado/5.nix b/nixpkgs/pkgs/development/python-modules/tornado/5.nix index d3961d06c405..8ba3a8c073ba 100644 --- a/nixpkgs/pkgs/development/python-modules/tornado/5.nix +++ b/nixpkgs/pkgs/development/python-modules/tornado/5.nix @@ -2,6 +2,7 @@ , unittestCheckHook , buildPythonPackage , fetchPypi +, fetchpatch , isPy27 , pythonAtLeast }: @@ -16,6 +17,14 @@ buildPythonPackage rec { sha256 = "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409"; }; + patches = [ + (fetchpatch { + name = "CVE-2023-28370.patch"; + url = "https://github.com/tornadoweb/tornado/commit/32ad07c54e607839273b4e1819c347f5c8976b2f.patch"; + hash = "sha256-2dpPHkNThOaZD8T2g1vb/I5WYZ/vy/t690539uprJyc="; + }) + ]; + nativeCheckInputs = [ unittestCheckHook ]; # We specify the name of the test files to prevent diff --git a/nixpkgs/pkgs/development/python-modules/tornado/default.nix b/nixpkgs/pkgs/development/python-modules/tornado/default.nix index e255e603b9a1..ac57f212d229 100644 --- a/nixpkgs/pkgs/development/python-modules/tornado/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tornado/default.nix @@ -3,17 +3,29 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook + +# for passthru.tests +, distributed +, jupyter-server +, jupyterlab +, matplotlib +, mitmproxy +, pytest-tornado +, pytest-tornasync +, pyzmq +, sockjs-tornado +, urllib3 }: buildPythonPackage rec { pname = "tornado"; - version = "6.2.0"; + version = "6.3.3"; src = fetchFromGitHub { owner = "tornadoweb"; repo = "tornado"; rev = "v${version}"; - hash = "sha256-IV0QN3GqoclFo9kWJVc21arypmBkvUClo86Zmt/Gv6E="; + hash = "sha256-l9Ce/c2wDSmsySr9yXu5Fl/+63QkQay46aDSUTJmetA="; }; nativeCheckInputs = [ @@ -38,6 +50,20 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; + passthru.tests = { + inherit + distributed + jupyter-server + jupyterlab + matplotlib + mitmproxy + pytest-tornado + pytest-tornasync + pyzmq + sockjs-tornado + urllib3; + }; + meta = with lib; { description = "A web framework and asynchronous networking library"; homepage = "https://www.tornadoweb.org/"; diff --git a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index 1482d0a6589f..a561bcbdfb74 100644 --- a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.23.3"; + version = "3.23.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-61nMytrqc7w7IbO7TX7H4O4DYoVL9MTBasN3UDx492w="; + hash = "sha256-vf1mnszEs/r/IyggCklAjNXsrZ8ZtgIsSttVS7s6JiE="; }; nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/troposphere/default.nix b/nixpkgs/pkgs/development/python-modules/troposphere/default.nix index 567c2dec60e2..39c71da17761 100644 --- a/nixpkgs/pkgs/development/python-modules/troposphere/default.nix +++ b/nixpkgs/pkgs/development/python-modules/troposphere/default.nix @@ -1,18 +1,16 @@ { lib +, awacs , buildPythonPackage +, cfn-flip , fetchFromGitHub , pythonOlder -, python - - # python dependencies -, awacs -, cfn-flip , typing-extensions +, unittestCheckHook }: buildPythonPackage rec { pname = "troposphere"; - version = "4.3.2"; + version = "4.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,34 +19,35 @@ buildPythonPackage rec { owner = "cloudtools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8vIpwZBUdU9gD1Ya0+L1phMDMcAABtuyRx4quDfQWGA="; + hash = "sha256-ecRpp8XsP/iv4G8m85qcGJXHXH4CPdgBO8c0IZU56wU="; }; propagatedBuildInputs = [ cfn-flip - ] ++ lib.lists.optionals (pythonOlder "3.8") [ + ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; nativeCheckInputs = [ awacs + unittestCheckHook ]; passthru.optional-dependencies = { - policy = [ awacs ]; + policy = [ + awacs + ]; }; - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; - - pythonImportsCheck = [ "troposphere" ]; + pythonImportsCheck = [ + "troposphere" + ]; meta = with lib; { description = "Library to create AWS CloudFormation descriptions"; - maintainers = with maintainers; [ jlesquembre ]; - license = licenses.bsd2; homepage = "https://github.com/cloudtools/troposphere"; changelog = "https://github.com/cloudtools/troposphere/blob/${version}/CHANGELOG.rst"; + license = licenses.bsd2; + maintainers = with maintainers; [ jlesquembre ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix b/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix index af5a65a08037..bc4808a268cb 100644 --- a/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix @@ -21,6 +21,11 @@ buildPythonPackage rec { hash = "sha256-wgrY5ajaMYxznyNvlD0ul1PFr3W8oV9I/OVsStlZEBM="; }; + postPatch = '' + sed -i '/\[project\]/a version = "${version}"' pyproject.toml + sed -i '/\[project\]/a name = "tweedledum"' pyproject.toml + ''; + nativeBuildInputs = [ cmake ninja scikit-build ]; dontUseCmakeConfigure = true; diff --git a/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/nixpkgs/pkgs/development/python-modules/twilio/default.nix index fadf2ef3818c..ef2678e88b31 100644 --- a/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "8.6.0"; + version = "8.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-ATspn/cY9DJahcsesnzwDOCEKYoUbqSoeOR3+kLou0s="; + hash = "sha256-wzsAHW0OlorLVI6nnDjv8WP1dpzyrmtE4OfwzFnZOH4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/typecode/default.nix b/nixpkgs/pkgs/development/python-modules/typecode/default.nix index 9bcb05076c4e..88e76fda670a 100644 --- a/nixpkgs/pkgs/development/python-modules/typecode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typecode/default.nix @@ -47,9 +47,17 @@ buildPythonPackage rec { disabledTests = [ "TestFileTypesDataDriven" + + # Many of the failures below are reported in: + # https://github.com/nexB/typecode/issues/36 + # AssertionError: assert 'application/x-bytecode.python'... "test_compiled_python_1" "test_package_json" + + # fails due to change in file (libmagic) 5.45 + "test_doc_postscript_eps" + "test_package_debian" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/typepy/default.nix b/nixpkgs/pkgs/development/python-modules/typepy/default.nix index a1d9e7df1534..c5c393b29c01 100644 --- a/nixpkgs/pkgs/development/python-modules/typepy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typepy/default.nix @@ -26,14 +26,23 @@ buildPythonPackage rec { propagatedBuildInputs = [ mbstrdecoder - python-dateutil - pytz - packaging ]; + passthru.optional-dependencies = { + datetime = [ + python-dateutil + pytz + packaging + ]; + }; + nativeCheckInputs = [ pytestCheckHook tcolorpy + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "typepy" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix b/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix new file mode 100644 index 000000000000..ea56034cf9c2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "types-awscrt"; + version = "0.19.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "types_awscrt"; + inherit version; + hash = "sha256-YYM6oUDnJKkJgCVhD0uM3j3PZbhCYx10RzePn1204f0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + pythonImportsCheck = [ + "awscrt-stubs" + ]; + + meta = with lib; { + description = "Type annotations and code completion for awscrt"; + homepage = "https://github.com/youtype/types-awscrt"; + changelog = "https://github.com/youtype/types-awscrt/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix new file mode 100644 index 000000000000..00ebb5123e3c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, types-html5lib +}: + +buildPythonPackage rec { + pname = "types-beautifulsoup4"; + version = "4.12.0.6"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-BFqyhdPlQBhuFhM2EvQ/Z+MfkQ5tdXiQa0OgrY+BE0c="; + }; + + propagatedBuildInputs = [ + types-html5lib + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "bs4-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for beautifulsoup4"; + homepage = "https://pypi.org/project/types-beautifulsoup4/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/types-docopt/default.nix b/nixpkgs/pkgs/development/python-modules/types-docopt/default.nix new file mode 100644 index 000000000000..7c1128efb840 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-docopt/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-docopt"; + version = "0.6.11.4"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-mRpkwVaTEMIkCuc0/SwQYnq7ikr6875axvTv+aYB8xo="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "docopt-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for docopt"; + homepage = "https://pypi.org/project/types-docopt/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/types-html5lib/default.nix b/nixpkgs/pkgs/development/python-modules/types-html5lib/default.nix new file mode 100644 index 000000000000..843b1a108c85 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-html5lib/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-html5lib"; + version = "1.1.11.15"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gOGiBi0io6/+XCjZfaML/786B205PID8bxZxIWwb1JI="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "html5lib-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for html5lib"; + homepage = "https://pypi.org/project/types-html5lib/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/types-redis/default.nix b/nixpkgs/pkgs/development/python-modules/types-redis/default.nix index 8275ed31f944..adbf50aa924b 100644 --- a/nixpkgs/pkgs/development/python-modules/types-redis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.4"; + version = "4.6.0.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-xHWp089z3WlsOIfTBkQyP8VvXgCvlhUQNbO1tSh1ybM="; + hash = "sha256-XxedEL08qZWoE0qvzd/D4S1SsghDfEUp7yfmisswHzg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix b/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix index d6ec6611b755..77c4b099687d 100644 --- a/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ulid-transform/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ulid-transform"; - version = "0.8.0"; + version = "0.8.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UOAeIVjn3Z5zC4jZP0y+XH1HjYesxjGmFYpEknu8cag="; + hash = "sha256-isngr9CZ2YYuq+5s3p4HXrTU20vPqZGZ1r8mBoVkxiI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix b/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix index 802844afb65d..966e9c459d86 100644 --- a/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/universal-pathlib/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , setuptools , setuptools-scm @@ -8,13 +9,15 @@ buildPythonPackage rec { pname = "universal-pathlib"; - version = "0.1.1"; + version = "0.1.3"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchPypi { pname = "universal_pathlib"; inherit version; - hash = "sha256-UhTIbyEP6rm+W8wALwQtZeruw8CTP9ZlpDNstw6GxZ0="; + hash = "sha256-GgUqteBRcwHfZr5lF+n+Y82fwAgT5c5xpzcBRBrCtcg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/unstructured-api-tools/default.nix b/nixpkgs/pkgs/development/python-modules/unstructured-api-tools/default.nix index 7b3b5c8983cd..b3c904ba2f24 100644 --- a/nixpkgs/pkgs/development/python-modules/unstructured-api-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unstructured-api-tools/default.nix @@ -28,7 +28,7 @@ , pytest-mock }: let - version = "0.10.10"; + version = "0.10.11"; in buildPythonPackage { pname = "unstructured-api-tools"; @@ -40,8 +40,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-api-tools"; - rev = version; - hash = "sha256-CJ5bsII24hw03JN4+8VywYRYCsnMlYHjmaIIn0zttIs="; + rev = "refs/tags/${version}"; + hash = "sha256-t1fK40ayR2bxc1iMIwvn/OHuyVlR98Gq+NpIhOmaP+4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/unstructured/default.nix b/nixpkgs/pkgs/development/python-modules/unstructured/default.nix index 02b060c790f4..951aec2cd879 100644 --- a/nixpkgs/pkgs/development/python-modules/unstructured/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unstructured/default.nix @@ -133,6 +133,8 @@ buildPythonPackage { grpcio ]; + passthru.optional-dependencies = optional-dependencies; + meta = with lib; { description = "Open source libraries and APIs to build custom preprocessing pipelines for labeling, training, or production machine learning pipelines"; homepage = "https://github.com/Unstructured-IO/unstructured"; diff --git a/nixpkgs/pkgs/development/python-modules/us/default.nix b/nixpkgs/pkgs/development/python-modules/us/default.nix index 4e7d97068f25..e489879bd502 100644 --- a/nixpkgs/pkgs/development/python-modules/us/default.nix +++ b/nixpkgs/pkgs/development/python-modules/us/default.nix @@ -2,35 +2,52 @@ , buildPythonPackage , fetchPypi , jellyfish +, pytestCheckHook +, pythonOlder +, pytz }: buildPythonPackage rec { pname = "us"; - version = "2.0.2"; + version = "3.1.1"; + format = "setuptools"; - propagatedBuildInputs = [ jellyfish ]; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "cb11ad0d43deff3a1c3690c74f0c731cff5b862c73339df2edd91133e1496fbc"; + hash = "sha256-40eWPo0kocp0N69EP6aFkXdoR7UMhlDY7w61NILnBcI="; }; - # Upstream requires jellyfish==0.5.6 but we have 0.6.1 postPatch = '' - substituteInPlace setup.py --replace "jellyfish==" "jellyfish>=" + # Upstream spins jellyfish + substituteInPlace setup.py \ + --replace "jellyfish==" "jellyfish>=" ''; - doCheck = false; # pypi version doesn't include tests + propagatedBuildInputs = [ + jellyfish + ]; - meta = { + nativeCheckInputs = [ + pytestCheckHook + pytz + ]; + + pythonImportsCheck = [ + "us" + ]; + + meta = with lib; { description = "A package for easily working with US and state metadata"; longDescription = '' - all US states and territories, postal abbreviations, Associated Press style - abbreviations, FIPS codes, capitals, years of statehood, time zones, phonetic - state name lookup, is contiguous or continental, URLs to shapefiles for state, - census, congressional districts, counties, and census tracts + All US states and territories, postal abbreviations, Associated Press style + abbreviations, FIPS codes, capitals, years of statehood, time zones, phonetic + state name lookup, is contiguous or continental, URLs to shapefiles for state, + census, congressional districts, counties, and census tracts. ''; homepage = "https://github.com/unitedstates/python-us/"; - license = lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/vega/default.nix b/nixpkgs/pkgs/development/python-modules/vega/default.nix index b071612562aa..556d06d7d393 100644 --- a/nixpkgs/pkgs/development/python-modules/vega/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vega/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , pythonOlder , pythonRelaxDepsHook @@ -26,10 +27,14 @@ buildPythonPackage rec { hash = "sha256-v1/8taHdN1n9+gy7L+g/wAJ2x9FwYCaxZiEdFqLct1Y="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" - ''; + patches = [ + # https://github.com/vega/ipyvega/pull/507 + (fetchpatch { + name = "replace-poetry-with-poetry-core.patch"; + url = "https://github.com/vega/ipyvega/commit/1a5028ee5d54e24b9650b66685f54c42b72c7899.patch"; + hash = "sha256-W8UmMit7DJGKCM9+/OSRLTuRvC0ZR42AP/b/frVEvsk="; + }) + ]; nativeBuildInputs = [ poetry-core diff --git a/nixpkgs/pkgs/development/python-modules/vsure/default.nix b/nixpkgs/pkgs/development/python-modules/vsure/default.nix index 709271d0905f..f8242d34f4c2 100644 --- a/nixpkgs/pkgs/development/python-modules/vsure/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vsure/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "vsure"; - version = "2.6.5"; + version = "2.6.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2w1D0380ljgRa5NSPAUlUPFTmGzjl79hyLwirmuHmGo="; + hash = "sha256-ecrBvKOhW3znVoXHQeKKW4o/hbA4fLhxJrWZObwtki8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix b/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix index 3f75354376dd..2d2b9aa649ca 100644 --- a/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix +++ b/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "watchfiles"; - version = "0.19.0"; + version = "0.20.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,13 +28,13 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NmmeoaIfFMNKCcjH6tPnkpflkN35bKlT76MqF9W8LBc="; + hash = "sha256-eoKF6uBHgML63DrDlC1zPfDu/mAMoaevttwqHLCKh+M="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-9ruk3PMcWNLOIGth5fo91/miyF17lgERWL3F4y4as18="; + hash = "sha256-4XqR6pZqPAftZoJqZf+iZWp0c8xv00MDJDDETiGGEDo="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix b/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix index 689c27a470e2..08b6e1800955 100644 --- a/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "wcmatch"; - version = "8.4.1"; + version = "8.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-sfBCqJnqTEWLcyHaG14zMePg7HgVg0NN4TAZRs6tuUM="; + hash = "sha256-hsF1ctD3XL87yxoY878vnnKzmpwIybSnTpkeGIKo77M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/web3/default.nix b/nixpkgs/pkgs/development/python-modules/web3/default.nix index f4afe0646158..ae709ef40886 100644 --- a/nixpkgs/pkgs/development/python-modules/web3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/web3/default.nix @@ -1,22 +1,20 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , aiohttp , eth-abi , eth-account , eth-hash , eth-typing , eth-utils -, eth-rlp , hexbytes , ipfshttpclient , jsonschema , lru-dict , protobuf , requests -, typing-extensions , websockets -, pythonOlder }: buildPythonPackage rec { @@ -33,24 +31,25 @@ buildPythonPackage rec { hash = "sha256-RNWCZQjcse415SSNkHhMWckDcBJGFZnjisckF7gbYY8="; }; + # Note: to reflect the extra_requires in main/setup.py. + passthru.optional-dependencies = { + ipfs = [ ipfshttpclient ]; + }; + propagatedBuildInputs = [ aiohttp eth-abi eth-account - eth-hash - eth-rlp + eth-hash ] ++ eth-hash.optional-dependencies.pycryptodome ++ [ eth-typing eth-utils hexbytes - ipfshttpclient jsonschema lru-dict protobuf requests websockets - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions - ] ++ eth-hash.optional-dependencies.pycryptodome; + ]; # TODO: package eth-tester required for tests doCheck = false; @@ -64,9 +63,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Web3 library for interactions"; - homepage = "https://github.com/ethereum/web3"; + description = "A python interface for interacting with the Ethereum blockchain and ecosystem"; + homepage = "https://web3py.readthedocs.io/"; license = licenses.mit; - maintainers = with maintainers; [ raitobezarius ]; + maintainers = with maintainers; [ hellwolf ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/wheel/default.nix b/nixpkgs/pkgs/development/python-modules/wheel/default.nix index 3be508a0ec59..16c6c2dc087d 100644 --- a/nixpkgs/pkgs/development/python-modules/wheel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wheel/default.nix @@ -1,21 +1,19 @@ { lib , buildPythonPackage , fetchFromGitHub -, bootstrapped-pip -, setuptools +, flit-core }: buildPythonPackage rec { pname = "wheel"; - version = "0.38.4"; - format = "other"; + version = "0.41.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - hash = "sha256-yZLU0t/nz6kfnnoLL15bybOxN4+SJUaTJsCpGffl1QU="; - name = "${pname}-${version}-source"; + hash = "sha256-/EaDJ2zI/ly2BrrGhiZGwiBYDVPYWTki+87UqtCS3bw="; postFetch = '' cd $out mv tests/testdata/unicode.dist/unicodedist/åäö_日本語.py \ @@ -25,16 +23,13 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - bootstrapped-pip - setuptools + flit-core ]; # No tests in archive doCheck = false; - pythonImportsCheck = [ "wheel" ]; - # We add this flag to ignore the copy installed by bootstrapped-pip - pipInstallFlags = [ "--ignore-installed" ]; + pythonImportsCheck = [ "wheel" ]; meta = with lib; { homepage = "https://github.com/pypa/wheel"; diff --git a/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 5985b96d6dc9..91c56472e77e 100644 --- a/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "whirlpool-sixth-sense"; - version = "0.18.4"; + version = "0.18.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "abmantis"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9dwkylr+aCTGw/VIY90nxq8IkqBASeEfdr5JGz7pZrc="; + hash = "sha256-0NJsZex054CWfKX2wyJRd6Cnxa89mNrZN59VqIV2MD8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix b/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix index 9a6d19583455..13168c3757eb 100644 --- a/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "whitenoise"; - version = "6.4.0"; + version = "6.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "evansd"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ouEoqMcNh3Vwahwaq6bGQuVUFViVN14CDJosDXC5ozI="; + hash = "sha256-g1D0tjGsAP3y1fWvODWwNvxnTSZJuTpyZ0Otk83Oq9E="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to serve static file for WSGI applications"; - homepage = "https://whitenoise.evans.io/"; + homepage = "https://whitenoise.readthedocs.io/"; changelog = "https://github.com/evansd/whitenoise/blob/${version}/docs/changelog.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix b/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix index 57d1549ee867..156fbb9d387a 100644 --- a/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , setuptools +, setuptools-scm +, wheel }: buildPythonPackage rec { @@ -16,6 +18,8 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + setuptools-scm + wheel ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix b/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix index a04ff8b72eed..33911fbd16db 100644 --- a/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix @@ -11,6 +11,7 @@ , jinja2 , lxml , markupsafe +, platformdirs , pycairo , pycountry , pyflakes @@ -26,7 +27,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.17.3"; + version = "3.18.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -35,7 +36,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-5RL4DkWcQRxzi1dhSJlGgoU0BU3aUWOfBNINFKiOwLg="; + hash = "sha256-yhzOfX2umux1ulDiInbbKXvATA+k1TLQrSa9vcR/i58="; }; postPatch = '' @@ -56,6 +57,7 @@ buildPythonPackage rec { jinja2 lxml markupsafe + platformdirs pycountry pyflakes pypdf2 diff --git a/nixpkgs/pkgs/development/python-modules/xpath-expressions/default.nix b/nixpkgs/pkgs/development/python-modules/xpath-expressions/default.nix index eebd30364e47..97e5e62b01aa 100644 --- a/nixpkgs/pkgs/development/python-modules/xpath-expressions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xpath-expressions/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , lxml , poetry-core , pythonOlder @@ -10,16 +11,25 @@ buildPythonPackage rec { pname = "xpath-expressions"; version = "1.1.0"; - disabled = pythonOlder "3.5"; format = "pyproject"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "0l289iw2zmzxyfi3g2z7b917vmsaz47h5jp871zvykpmpigc632h"; + hash = "sha256-UAzDXrz1Tr9/OOjKAg/5Std9Qlrnizei8/3XL3hMSFA="; }; + patches = [ + # https://github.com/orf/xpath-expressions/pull/4 + (fetchpatch { + name = "replace-poetry-with-poetry-core.patch"; + url = "https://github.com/orf/xpath-expressions/commit/3c5900fd6b2d08dd9468707f35ab42072cf75bd3.patch"; + hash = "sha256-IeV6ncJyt/w2s5TPpbM5a3pljNT6Bp5PIiqgTg2iTRA="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; @@ -29,12 +39,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # Was fixed upstream but not released - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" - ''; - pythonImportsCheck = [ "xpath" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix index 72d5e4035519..8334fba45ffb 100644 --- a/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , requests , setuptools @@ -9,14 +9,16 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.1.1"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-UCWNub0FErdmF3kGSIJlpIcKdPZdPzJ5y8yx9ZPBUlw="; + src = fetchFromGitHub { + owner = "sigma67"; + repo = "ytmusicapi"; + rev = "refs/tags/${version}"; + hash = "sha256-YgV3kCvCOLNXb3cWBVXRuzH4guuvPpXVojOnSnrXj20="; }; nativeBuildInputs = [ @@ -24,6 +26,8 @@ buildPythonPackage rec { setuptools-scm ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/zephyr-python-api/default.nix b/nixpkgs/pkgs/development/python-modules/zephyr-python-api/default.nix new file mode 100644 index 000000000000..07cc6a2b7a19 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/zephyr-python-api/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "zephyr-python-api"; + version = "0.0.3"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-M9Kf0RtoSeDFAAgAuks+Ek+Wg5OM8qmd3eDoaAgAa3A="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + requests + ]; + + # No tests in archive + doCheck = false; + + pythonImportsCheck = [ "zephyr" ]; + + meta = { + homepage = "https://github.com/nassauwinter/zephyr-python-api"; + description = "A set of wrappers for Zephyr Scale (TM4J) REST API"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ rapiteanu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 1fe56ea5c747..0fb2134276e4 100644 --- a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.82.1"; + version = "0.88.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-8zfhrRjW+WucwCo5M+rPOjuqfNKI6ne3bTumwDGIcbI="; + hash = "sha256-PE/KK2MFSVinaCLztdu7LS+gSemlq4UzVVwSjK+9yiM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index 29ffbdeb3709..698e93d76076 100644 --- a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.102"; + version = "0.0.103"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-TsL6JRxYf8KqmLqfN0nosxaTbzezlP4Q0Fb876WeTHI="; + hash = "sha256-H6LkCjpyj1uk05aIvO2TNJoAEXsPZlsIHo+t5rO5ikY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index c73600df5a52..77fb2ac72c42 100644 --- a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.56.4"; + version = "0.57.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-PxvTg/z7WmJaH/iwHoJu2bQDLR4G5nkMS5fSP46C3mQ="; + hash = "sha256-79TOt3PRvkhuF6wf+acYhhzFFkYX0l3yLpxv8dNRk1U="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/zimports/default.nix b/nixpkgs/pkgs/development/python-modules/zimports/default.nix index ee9d683c8642..22cd50c9189e 100644 --- a/nixpkgs/pkgs/development/python-modules/zimports/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zimports/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zimports"; - version = "0.6.0"; + version = "0.6.1"; format = "setuptools"; # upstream technically support 3.7 through 3.9, but 3.10 happens to work while 3.11 breaks with an import error @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "sqlalchemyorg"; repo = "zimports"; rev = "refs/tags/v${version}"; - hash = "sha256-qm5mA8pCSLbkupGBo+ppHSW6uy1j/FfV3idvGQGhjqU="; + hash = "sha256-+sDvl8z0O0cZyS1oZgt924hlOkYeHiStpXL9y9+JZ5I="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/r-modules/wrapper-radian.nix b/nixpkgs/pkgs/development/r-modules/wrapper-radian.nix index 898ab1999650..cdac14d3300b 100644 --- a/nixpkgs/pkgs/development/r-modules/wrapper-radian.nix +++ b/nixpkgs/pkgs/development/r-modules/wrapper-radian.nix @@ -26,8 +26,7 @@ runCommand (radian.name + "-wrapper") { }; } ('' makeWrapper "${radian}/bin/radian" "$out/bin/radian" \ - --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" \ - --set "R_HOME" "${R}/lib/R" + --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" '' + lib.optionalString wrapR '' cd ${R}/bin for exe in *; do diff --git a/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix index 2a9ad50c8044..54842ff64135 100644 --- a/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.4.18"; - source.sha256 = "sha256-tvfScSHUmHSmnJGU1PjvVWsjkMzuxBY1zPTzxYBp9w4="; + version = "2.4.19"; + source.sha256 = "sha256-M03HlkODhHMv3xm/ovYjdTt+2FFg0Izh8gAJmEzvs2I="; dontPatchShebangs = true; postFixup = '' diff --git a/nixpkgs/pkgs/development/tools/air/default.nix b/nixpkgs/pkgs/development/tools/air/default.nix index 9d374fc02288..b42fe4c16c59 100644 --- a/nixpkgs/pkgs/development/tools/air/default.nix +++ b/nixpkgs/pkgs/development/tools/air/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "air"; - version = "1.44.0"; + version = "1.45.0"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - hash = "sha256-BLha2PDn7iF0B5OPVkJT6en1Znt/6xiHxuCj14ha9tc="; + hash = "sha256-q1BnY0ztnhtsks1+GC1awR9o6nodXyb8rf1waVAs3gM="; }; - vendorHash = "sha256-n2Ei+jckSYAydAdJnMaPc7FGUcwSbC49hk6nlDyDMPE="; + vendorHash = "sha256-vyuXmQEjy5kPk9cKosHx0JZSZxstYtCNyfLIlRt2bnk="; ldflags = [ "-s" "-w" "-X=main.airVersion=${version}" ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/banana-vera/default.nix b/nixpkgs/pkgs/development/tools/analysis/banana-vera/default.nix index 0511f4ccbe70..03e26e5eaede 100644 --- a/nixpkgs/pkgs/development/tools/analysis/banana-vera/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/banana-vera/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "banana-vera"; - version = "1.3.0-python3.10"; + version = "1.3.0-fedora38"; src = fetchFromGitHub { owner = "Epitech"; repo = "banana-vera"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-1nAKhUltQS1301JNrr0PQQrrf2W9Hj5gk1nbUhN4cXw="; + sha256 = "sha256-sSN3trSySJe3KVyrb/hc5HUGRS4M3c4UX9SLlzBM43c"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix index 4fdcdf9a0f1e..2cdb64b5ae7f 100644 --- a/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.4.7"; + version = "2.4.22"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-NveRGWf0Aghu0fxVAVSukrH9zFl+QJ2rWNYm5JIHIjk="; + hash = "sha256-pbeyv7Ms/7iJUsxEl2YeHjbXJ5ZJZe2OXtDpnnH5ZD8="; }; patches = [ diff --git a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index 3825f81bcf10..9bdf3829cd9e 100644 --- a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.14.1"; + version = "2.14.2"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-6gq70bF954CNUS1t38o+1YqWZORGgxM1CWcbUnRyhOU="; + sha256 = "sha256-FITcbf1+9euy55nQutDZMmRzpHxICdLBmTVHTRCyFLQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 4516de52b3e8..448b8a1b7cc1 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.214.0"; + version = "0.215.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-N3eunmUl08RPu54k1QQWqgKa9RS0uzVVI2f0kCbmb2w="; + sha256 = "sha256-n6swStUU+mKeUhs94h71eCJk02yP6QFAkpDz67DJmXg="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix b/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix index 95838c9c27fd..473dc9d7a4bb 100644 --- a/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/kcov/default.nix @@ -17,13 +17,13 @@ let self = stdenv.mkDerivation rec { pname = "kcov"; - version = "41"; + version = "42"; src = fetchFromGitHub { owner = "SimonKagstrom"; repo = "kcov"; rev = "v${version}"; - sha256 = "sha256-Kit4Yn5Qeg3uAc6+RxwlVEhDKN6at+Uc7V38yhDPrAY="; + sha256 = "sha256-8/182RjuNuyFzSyCgyyximGaveDyhStwIQg29S5U/pI="; }; preConfigure = "patchShebangs src/bin-to-c-source.py"; diff --git a/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix b/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix index cfc24aef9799..8a99a455bbdf 100644 --- a/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix @@ -25,11 +25,11 @@ let rizin = stdenv.mkDerivation rec { pname = "rizin"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; - hash = "sha256-apJJBu/fVHrFBGJ2f1rdU5AkNuekhi0sDiTKkbd2FQg="; + hash = "sha256-dgZHyvinimOKDgQL97icPtBk+r3+rE/kT/FdYrqsbJE="; }; mesonFlags = [ diff --git a/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix b/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix index b0c94ef8c647..7b5e3522ef3b 100644 --- a/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.8.0"; + version = "0.9.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ykAuypWBbZ+53ImzNJGsztLHG8OQLIGBHC6Z3Amu+L0="; + sha256 = "sha256-bd0epx3AciECCYi4OYG2WzTVhZ+JYnf5ebDZoMrPfmo="; }; - cargoHash = "sha256-517AXkFqYaHC/FejtxolAQxJVpvcFhmf3Nptzcy9idY="; + cargoHash = "sha256-RjjYfdcdJzIxnJFZqx93KADihN5YK+bCuk1QaPhVuGQ="; cargoBuildFlags = [ "--bin" "svlint" ]; diff --git a/nixpkgs/pkgs/development/tools/argc/default.nix b/nixpkgs/pkgs/development/tools/argc/default.nix index 0dca25bc2729..84d9332ade14 100644 --- a/nixpkgs/pkgs/development/tools/argc/default.nix +++ b/nixpkgs/pkgs/development/tools/argc/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "argc"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "sigoden"; repo = pname; rev = "v${version}"; - hash = "sha256-xuSoTTtULVdG1LZFiEPYYuwJxG7FdN9vY+7K7OmfWZI="; + hash = "sha256-BM9MXokVXA5EJwr8F7Wg5LTE1xhmj9ttVXOMNJx0RRw="; }; - cargoHash = "sha256-BJaVaOBCLH5c7/DrsOq6uVN02wEfLA7k+FgxCBmOUTA="; + cargoHash = "sha256-SScCPBERXScYJ9LlPcbIhwCikRum0F1tU3gZYaQRFTo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index 32b7ba5a1784..311e44051d62 100644 --- a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -42,9 +42,11 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace requirements/base.txt \ --replace 'PyYAML>=' 'PyYAML>=5.4.1 #' \ + --replace "aws_lambda_builders==" "aws_lambda_builders>=" \ --replace 'aws-sam-translator==1.70.0' 'aws-sam-translator>=1.60.1' \ --replace 'boto3>=' 'boto3>=1.26.79 #' \ --replace 'cfn-lint~=0.77.9' 'cfn-lint~=0.73.2' \ + --replace "cookiecutter~=" "cookiecutter>=" \ --replace 'docker~=6.1.0' 'docker~=6.0.1' \ --replace 'ruamel_yaml~=0.17.32' 'ruamel_yaml~=0.17.21' \ --replace 'tomlkit==0.11.8' 'tomlkit>=0.11.8' \ @@ -56,8 +58,9 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; meta = with lib; { - homepage = "https://github.com/awslabs/aws-sam-cli"; description = "CLI tool for local development and testing of Serverless applications"; + homepage = "https://github.com/awslabs/aws-sam-cli"; + changelog = "https://github.com/aws/aws-sam-cli/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ lo1tuma ]; }; diff --git a/nixpkgs/pkgs/development/tools/azcopy/default.nix b/nixpkgs/pkgs/development/tools/azcopy/default.nix index 3ab48462dbbc..0d94e4e2f6c3 100644 --- a/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.20.0"; + version = "10.20.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-0NUOOJu3iuKBlIi4z1Jv8e00BTsgk0dpLOgfpIKSc2A="; + sha256 = "sha256-pfbSNFKZubgebx90zL5sVva36wXS+0NQvvMxPI8kV3Y="; }; subPackages = [ "." ]; @@ -23,7 +23,7 @@ buildGoModule rec { meta = with lib; { broken = stdenv.isDarwin; - maintainers = with maintainers; [ colemickens ]; + maintainers = with maintainers; [ colemickens kashw2 ]; license = licenses.mit; description = "The new Azure Storage data transfer utility - AzCopy v10"; }; diff --git a/nixpkgs/pkgs/development/tools/b4/default.nix b/nixpkgs/pkgs/development/tools/b4/default.nix index e6f656c4012e..24da485d863d 100644 --- a/nixpkgs/pkgs/development/tools/b4/default.nix +++ b/nixpkgs/pkgs/development/tools/b4/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "b4"; - version = "0.12.2"; + version = "0.12.3"; src = fetchPypi { inherit pname version; - sha256 = "tvSv14v3iigFWzifCQl5Kxx4Bfs1V/XXHvvaNoKqvm4="; + hash = "sha256-tk4VBvSnHE6VnUAa3QYCqFLQbsHTJ6Bfqwa1wKEC6mI="; }; # tests make dns requests and fails @@ -24,6 +24,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://git.kernel.org/pub/scm/utils/b4/b4.git/about"; license = licenses.gpl2Only; description = "A helper utility to work with patches made available via a public-inbox archive"; - maintainers = with maintainers; [ jb55 qyliss ]; + mainProgram = "b4"; + maintainers = with maintainers; [ jb55 qyliss mfrw ]; }; } diff --git a/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/nixpkgs/pkgs/development/tools/bazelisk/default.nix index b610a7a20442..dda16c238436 100644 --- a/nixpkgs/pkgs/development/tools/bazelisk/default.nix +++ b/nixpkgs/pkgs/development/tools/bazelisk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F3paYKK+L5mBCQvlusKlSBS1X9fVSDHFw1Ujiyo5yrc="; + sha256 = "sha256-NZDdSIXNQFSCoav+YN1VLFrHQSKZfoZDp2TWXtmQC6o="; }; - vendorHash = "sha256-V1GKZPLBjFhl0F0AvUC6MfAsrZsVToSZU3K2/hwOCVs="; + vendorHash = "sha256-oYagIEb/u/XCTbZkvynxcOtORhW75hReinrVAkdOApM="; doCheck = false; @@ -23,6 +23,7 @@ buildGoModule rec { BEWARE: This package does not work on NixOS. ''; homepage = "https://github.com/bazelbuild/bazelisk"; + changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ elasticdog ]; }; diff --git a/nixpkgs/pkgs/development/tools/benthos/default.nix b/nixpkgs/pkgs/development/tools/benthos/default.nix index 2678da07a280..8dc8b26f43dd 100644 --- a/nixpkgs/pkgs/development/tools/benthos/default.nix +++ b/nixpkgs/pkgs/development/tools/benthos/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "benthos"; - version = "4.18.0"; + version = "4.19.0"; src = fetchFromGitHub { owner = "benthosdev"; repo = "benthos"; rev = "refs/tags/v${version}"; - hash = "sha256-wap11/D1PIvDt5Jk3CCyxWJNULMg62WFmiA09gc95dY="; + hash = "sha256-C/dExBN+ZBE8o3L0RBgYe4griFhv/Yd2I10em2UK/nQ="; }; - vendorHash = "sha256-pA8SBawcl8YFbUrDfWxzcrMK715xBTx1slvHoA/a9OM="; + vendorHash = "sha256-33eY+jF12lYSO1Fqm1hRLKA1+aMNxe0c9gqNl2wf10I="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/biome/default.nix b/nixpkgs/pkgs/development/tools/biome/default.nix new file mode 100644 index 000000000000..f853669bcc38 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/biome/default.nix @@ -0,0 +1,63 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libgit2_1_6 +, zlib +, stdenv +, darwin +, git +}: + +rustPlatform.buildRustPackage rec { + pname = "biome"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "biomejs"; + repo = "biome"; + rev = "cli/v${version}"; + hash = "sha256-oX/LyC6JN0NUc/xi4G9lzKgF9yOlooAt69Gw+eLJxbE="; + }; + + cargoHash = "sha256-4P57fmp5CpGn1wYkQos7PO3YFChup8LrrLExv9S76gs="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libgit2_1_6 + zlib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + nativeCheckInputs = [ + git + ]; + + cargoBuildFlags = [ "-p=rome_cli" ]; + cargoTestFlags = cargoBuildFlags; + + env = { + BIOME_VERSION = version; + }; + + preCheck = '' + # tests assume git repository + git init + + # tests assume $BIOME_VERSION is unset + unset BIOME_VERSION + ''; + + meta = with lib; { + description = "Toolchain of the web"; + homepage = "https://biomejs.dev/"; + changelog = "https://github.com/biomejs/biome/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "biome"; + }; +} diff --git a/nixpkgs/pkgs/development/tools/build-managers/apache-maven/build-package.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/build-package.nix index fd0457789ade..2026d6829371 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/apache-maven/build-package.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/build-package.nix @@ -4,6 +4,7 @@ }: { src +, sourceRoot ? null , patches ? [ ] , pname , version @@ -19,23 +20,31 @@ let fetchedMavenDeps = stdenv.mkDerivation ({ name = "${pname}-${version}-maven-deps"; - inherit src patches; + inherit src sourceRoot patches; nativeBuildInputs = [ maven ]; buildPhase = '' + runHook preBuild + mvn package -Dmaven.repo.local=$out/.m2 ${mvnParameters} + + runHook postBuild ''; # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside installPhase = '' + runHook preInstall + find $out -type f \( \ -name \*.lastUpdated \ -o -name resolver-status.properties \ -o -name _remote.repositories \) \ -delete + + runHook postInstall ''; # don't do any fixup diff --git a/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix index c912818285aa..5ed41717f3da 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -10,11 +10,11 @@ assert jdk != null; stdenvNoCC.mkDerivation (finalAttrs: { pname = "apache-maven"; - version = "3.9.3"; + version = "3.9.4"; src = fetchurl { url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/${finalAttrs.pname}-${finalAttrs.version}-bin.tar.gz"; - hash = "sha256-4eE6wMQvO2TZAMV//GUuzvaCuCVdfTVO+7tPYlGdpPE="; + hash = "sha256-/2a3DIMKONMx1E9sJaN7WCRx3vmhYck5ArrHvqMJgxk="; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index c731a1d2e723..1692058dcac8 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,22 +5,27 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.4.1"; + version = "2.4.3"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7zAeGJyMfMdrVDCuTWU3zikXjM/ydjnGj6Ctjckd32c="; + hash = "sha256-yvdsRc5KZAwzekktSu9tR9R2vvAMi+4JVkvy+ANFkQ8="; }; - vendorHash = "sha256-SxGBfWcV10L6xC5XPIfv/HJWQy5g3AoV8z4/ae23DEc="; + vendorHash = "sha256-0rmqsUMwk5ytAZc94JzvZTuh0WAmQwBEWSE96yNALE0="; + + subPackages = [ "." ]; doCheck = false; + ldflags = [ "-s" "-w" "-X main.gitCommit=${version}" ]; + meta = with lib; { homepage = "https://github.com/buchgr/bazel-remote"; description = "A remote HTTP/1.1 cache for Bazel"; + changelog = "https://github.com/buchgr/bazel-remote/releases/tag/v${version}"; license = licenses.asl20; maintainers = lib.teams.bazel.members; platforms = platforms.darwin ++ platforms.linux; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 61b2cbb415d8..8c46b2456ee3 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "6.3.2"; + version = "6.3.3"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = "v${version}"; - hash = "sha256-K0MJQYzWkryrO7jjx16UMq7CGRasWF40WUWRtroW6ME="; + hash = "sha256-eGX1W3Nc26aw31dWm1hvcUzFh1efL4Vd86dK6Hs2BJc="; }; vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A="; diff --git a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix index ff38657334da..59ceeb8761a6 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.11.1"; + version = "0.11.2"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256-qG+Ddn0BHUZX1VX5hO84exgRz8YuUgYF/fH6MmgkrXE"; + hash = "sha256-7RYMj/vfyzBQhZUpWzEaZYN27ZhYCRyKhQUhlH8tE0U="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix index 218783fd4926..58d3a7d86f42 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix @@ -1,44 +1,72 @@ -{ lib, stdenv, fetchFromGitLab, python3, ensureNewerSourcesForZipFilesHook +{ lib +, stdenv +, fetchFromGitLab +, ensureNewerSourcesForZipFilesHook +, python3 # optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]` -, withTools ? null +, extraTools ? [] }: -let - wafToolsArg = with lib.strings; - optionalString (withTools != null) " --tools=\"${concatStringsSep "," withTools}\""; -in -stdenv.mkDerivation rec { + +stdenv.mkDerivation (finalAttrs: { pname = "waf"; - version = "2.0.25"; + version = "2.0.26"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; - rev = "${pname}-${version}"; - sha256 = "sha256-wqZEAfGRHhcd7Xm2pQ0FTjZGfuPafRrZAUdpc7ACoEA="; + rev = "waf-${finalAttrs.version}"; + hash = "sha256-AXDMWlwivJ0Xot6iwuIIlbV2Anz6ieghyOI9jA4yrko="; }; - nativeBuildInputs = [ python3 ensureNewerSourcesForZipFilesHook ]; + nativeBuildInputs = [ + ensureNewerSourcesForZipFilesHook + python3 + ]; + + buildInputs = [ + # waf executable uses `#!/usr/bin/env python` + python3 + ]; - # waf bin has #!/usr/bin/env python - buildInputs = [ python3 ]; + strictDeps = true; configurePhase = '' + runHook preConfigure + python waf-light configure + + runHook postConfigure ''; - buildPhase = '' - python waf-light build${wafToolsArg} + + buildPhase = let + extraToolsList = + lib.optionalString (extraTools != []) + "--tools=\"${lib.concatStringsSep "," extraTools}\""; + in + '' + runHook preBuild + + python waf-light build ${extraToolsList} + + runHook postBuild ''; + installPhase = '' + runHook preInstall + install -D waf $out/bin/waf - ''; - strictDeps = true; + runHook postInstall + ''; - meta = with lib; { - description = "Meta build system"; - homepage = "https://waf.io"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ vrthra ]; + meta = { + homepage = "https://waf.io"; + description = "The meta build system"; + changelog = "https://gitlab.com/ita1024/waf/blob/${finalAttrs.version}/ChangeLog"; + license = lib.licenses.bsd3; + mainProgram = "waf"; + maintainers = with lib.maintainers; [ AndersonTorres vrthra ]; + inherit (python3.meta) platforms; + sourceProvenance = [ lib.sourceTypes.fromSource ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/tools/build-managers/waf/hook.nix b/nixpkgs/pkgs/development/tools/build-managers/waf/hook.nix new file mode 100644 index 000000000000..7282ed9ebf97 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/waf/hook.nix @@ -0,0 +1,24 @@ +{ lib +, stdenv +, pkgs +, makeSetupHook +, waf +}: + +makeSetupHook { + name = "waf-setup-hook"; + + substitutions = { + # Sometimes the upstream provides its own waf file; in order to honor it, + # waf is not inserted into propagatedBuildInputs, rather it is inserted + # directly + inherit waf; + crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) + ''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"''; + }; + + meta = { + description = "A setup hook for using Waf in Nixpkgs"; + inherit (waf.meta) maintainers platforms broken; + }; +} ./setup-hook.sh diff --git a/nixpkgs/pkgs/development/tools/build-managers/wafHook/setup-hook.sh b/nixpkgs/pkgs/development/tools/build-managers/waf/setup-hook.sh index 4d95c28de1f1..2593b0a9d808 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/wafHook/setup-hook.sh +++ b/nixpkgs/pkgs/development/tools/build-managers/waf/setup-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash disable=SC2206 + wafConfigurePhase() { runHook preConfigure @@ -7,7 +9,7 @@ wafConfigurePhase() { fi if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then - wafConfigureFlags="${prefixKey:---prefix=}$prefix $wafConfigureFlags" + local prefixFlag="${prefixKey:---prefix=}$prefix" fi if [ -n "${PKG_CONFIG}" ]; then @@ -15,13 +17,15 @@ wafConfigurePhase() { fi local flagsArray=( - "${flagsArray[@]}" + $prefixFlag $wafConfigureFlags "${wafConfigureFlagsArray[@]}" ${configureTargets:-configure} ) + if [ -z "${dontAddWafCrossFlags:-}" ]; then flagsArray+=(@crossFlags@) fi + echoCmd 'configure flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" @@ -38,15 +42,11 @@ wafConfigurePhase() { runHook postConfigure } -if [ -z "${dontUseWafConfigure-}" -a -z "${configurePhase-}" ]; then - configurePhase=wafConfigurePhase -fi - wafBuildPhase () { runHook preBuild # set to empty if unset - : ${wafFlags=} + : "${wafFlags=}" local flagsArray=( ${enableParallelBuilding:+-j ${NIX_BUILD_CORES}} @@ -61,10 +61,6 @@ wafBuildPhase () { runHook postBuild } -if [ -z "${dontUseWafBuild-}" -a -z "${buildPhase-}" ]; then - buildPhase=wafBuildPhase -fi - wafInstallPhase() { runHook preInstall @@ -85,6 +81,14 @@ wafInstallPhase() { runHook postInstall } -if [ -z "${dontUseWafInstall-}" -a -z "${installPhase-}" ]; then +if [ -z "${dontUseWafConfigure-}" ] && [ -z "${configurePhase-}" ]; then + configurePhase=wafConfigurePhase +fi + +if [ -z "${dontUseWafBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=wafBuildPhase +fi + +if [ -z "${dontUseWafInstall-}" ] && [ -z "${installPhase-}" ]; then installPhase=wafInstallPhase fi diff --git a/nixpkgs/pkgs/development/tools/build-managers/wafHook/default.nix b/nixpkgs/pkgs/development/tools/build-managers/wafHook/default.nix deleted file mode 100644 index f0f3a683aab0..000000000000 --- a/nixpkgs/pkgs/development/tools/build-managers/wafHook/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ lib, stdenv, pkgs, makeSetupHook, waf }: - -makeSetupHook { - name = "waf-hook"; - substitutions = { - inherit waf; - crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) - ''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"''; - }; -} ./setup-hook.sh diff --git a/nixpkgs/pkgs/development/tools/buildah/default.nix b/nixpkgs/pkgs/development/tools/buildah/default.nix index 14141cb023f1..df44b63f9d23 100644 --- a/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.31.2"; + version = "1.31.3"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-AoE9/aIKmo5+XGz7glt5h2RHEgVGiI9K+jpgJJ0uC2g="; + hash = "sha256-Uqs4MlKwFz4EGd6HTGXqcLTSfYPJTpgKKyXmA3B3RjU="; }; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/development/tools/buildkit/default.nix b/nixpkgs/pkgs/development/tools/buildkit/default.nix index 93b8b38ec9c2..6787ca6b07dd 100644 --- a/nixpkgs/pkgs/development/tools/buildkit/default.nix +++ b/nixpkgs/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-Fee/XuxtNP9+T8kRd3yeEhFvpfaIgMkqfSaZCpaYEdM="; + hash = "sha256-u85Yrg3aMG6Tx8onivSy1p7yB4lZxsBWF4bxnwO68EE="; }; vendorHash = null; @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; homepage = "https://github.com/moby/buildkit"; + changelog = "https://github.com/moby/buildkit/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ vdemeester marsam developer-guy ]; mainProgram = "buildctl"; diff --git a/nixpkgs/pkgs/development/tools/comby/comby.patch b/nixpkgs/pkgs/development/tools/comby/comby.patch index d3d2088d602f..b780560093d4 100644 --- a/nixpkgs/pkgs/development/tools/comby/comby.patch +++ b/nixpkgs/pkgs/development/tools/comby/comby.patch @@ -1,5 +1,5 @@ diff --git a/comby-kernel.opam b/comby-kernel.opam -index 9db7cc5..a497bff 100644 +index 9db7cc5..83e6e7b 100644 --- a/comby-kernel.opam +++ b/comby-kernel.opam @@ -20,7 +20,7 @@ build: [ @@ -7,7 +7,7 @@ index 9db7cc5..a497bff 100644 "dune" {>= "2.8.0"} "ocaml" {>= "4.08.1"} - "core_kernel" -+ "core_kernel" {>= "v0.15.0"} ++ "core-kernel" {>= "v0.16.0"} "mparser" {>= "1.3"} "mparser-pcre" "ppx_deriving" @@ -25,7 +25,7 @@ index 88563f6..fbbc122 100644 "lwt" "cohttp" diff --git a/comby.opam b/comby.opam -index 9e5d96b..ecab789 100644 +index 9e5d96b..d5be316 100644 --- a/comby.opam +++ b/comby.opam @@ -31,7 +31,7 @@ depends: [ @@ -33,14 +33,23 @@ index 9e5d96b..ecab789 100644 "comby-kernel" {= "1.7.0"} "comby-semantic" {= "1.7.0"} - "core" -+ "core" {>= "v0.15.0"} ++ "core" {>= "v0.16.0"} "hack_parallel" {arch != "arm32" & arch != "arm64"} "lwt" "lwt_react" diff --git a/lib/app/configuration/command_configuration.ml b/lib/app/configuration/command_configuration.ml -index 75c3107..418276e 100644 +index 75c3107..29826a9 100644 --- a/lib/app/configuration/command_configuration.ml +++ b/lib/app/configuration/command_configuration.ml +@@ -1,7 +1,7 @@ + open Core + open Camlzip + +-open Polymorphic_compare ++open Poly + + open Comby_kernel + @@ -16,21 +16,21 @@ type 'a next = let fold_directory ?(sorted=false) root ~init ~f = @@ -356,6 +365,60 @@ index 7a6353d..b79cba2 100644 - (preprocess (pps ppx_jane))) + (preprocess + (pps ppx_jane))) +diff --git a/lib/app/vendored/patdiff/kernel/src/float_tolerance.ml b/lib/app/vendored/patdiff/kernel/src/float_tolerance.ml +index 4e064fb..dca77b2 100644 +--- a/lib/app/vendored/patdiff/kernel/src/float_tolerance.ml ++++ b/lib/app/vendored/patdiff/kernel/src/float_tolerance.ml +@@ -287,7 +287,7 @@ end = struct + ~running_step:(fun (car, pos) cadr -> + match car, cadr with + | Same car_lines, Same cadr_lines -> +- Skip (Same (Array.concat [ car_lines; cadr_lines ]), pos) ++ Skip {state = (Same (Array.concat [ car_lines; cadr_lines ]), pos)} + | Unified _, _ | _, Unified _ -> + raise_s + [%message +@@ -296,7 +296,7 @@ end = struct + (cadr : string Range.t)] + | (Prev _ | Next _ | Replace _), (Prev _ | Next _ | Replace _) + | Same _, (Prev _ | Next _ | Replace _) +- | (Prev _ | Next _ | Replace _), Same _ -> Yield ((car, pos), (cadr, Middle))) ++ | (Prev _ | Next _ | Replace _), Same _ -> Yield {value = (car, pos); state = (cadr, Middle)}) + ~inner_finished:(fun (last, pos) -> + match last, pos with + | Unified _, _ -> +@@ -308,7 +308,7 @@ end = struct + Some (last, End)) + ~finishing_step:(function + | None -> Done +- | Some result -> Yield (result, None)) ++ | Some result -> Yield {value = result; state = None}) + ;; + + include struct +@@ -448,7 +448,7 @@ end = struct + ~init:{ prev_start; next_start; ranges = [] } + ~running_step:(fun t drop_or_keep -> + match (drop_or_keep : Drop_or_keep.t) with +- | Keep range -> Skip { t with ranges = range :: t.ranges } ++ | Keep range -> Skip {state = { t with ranges = range :: t.ranges }} + | Drop n -> + let hunk = to_hunk t in + let t = +@@ -457,11 +457,11 @@ end = struct + ; ranges = [] + } + in +- if List.is_empty (Hunk.ranges hunk) then Skip t else Yield (hunk, t)) ++ if List.is_empty (Hunk.ranges hunk) then Skip {state = t} else Yield {value = hunk; state = t}) + ~inner_finished:(fun t -> if List.is_empty t.ranges then None else Some t) + ~finishing_step:(function + | None -> Done +- | Some t -> Yield (to_hunk t, None)) ++ | Some t -> Yield {value = to_hunk t; state = None}) + ;; + end + diff --git a/lib/app/vendored/patdiff/kernel/src/patdiff_core.ml b/lib/app/vendored/patdiff/kernel/src/patdiff_core.ml index 4f53a0b..88ee0e3 100644 --- a/lib/app/vendored/patdiff/kernel/src/patdiff_core.ml @@ -501,7 +564,7 @@ index 03b120a..4d48b61 100644 + ppx_deriving_yojson + ppx_deriving_yojson.runtime)) diff --git a/lib/kernel/matchers/alpha.ml b/lib/kernel/matchers/alpha.ml -index d6116f7..993aafc 100644 +index d6116f7..7d16171 100644 --- a/lib/kernel/matchers/alpha.ml +++ b/lib/kernel/matchers/alpha.ml @@ -13,20 +13,11 @@ module R = MakeRegexp(Regexp) @@ -537,6 +600,15 @@ index d6116f7..993aafc 100644 List.fold plist ~init:(return Types.Unit) ~f:(>>) let with_debug_matcher s tag = +@@ -745,7 +736,7 @@ module Make (Lang : Types.Language.S) (Meta : Types.Metasyntax.S) (Ext : Types.E + let hole_parser ?at_depth sort dimension = + let open Types.Hole in + let hole_parser = +- let open Polymorphic_compare in ++ let open Poly in + List.fold ~init:[] hole_parsers ~f:(fun acc (sort', parser) -> if sort' = sort then parser::acc else acc) + in + let skip_signal hole = skip (string "_signal_hole") |>> fun () -> Types.Hole hole in diff --git a/lib/kernel/matchers/dune b/lib/kernel/matchers/dune index 12ed326..4625458 100644 --- a/lib/kernel/matchers/dune @@ -566,7 +638,7 @@ index 12ed326..4625458 100644 + yojson + ppx_deriving_yojson)) diff --git a/lib/kernel/matchers/evaluate.ml b/lib/kernel/matchers/evaluate.ml -index 9ea71a0..288f79a 100644 +index 9ea71a0..4f63ab6 100644 --- a/lib/kernel/matchers/evaluate.ml +++ b/lib/kernel/matchers/evaluate.ml @@ -3,10 +3,7 @@ open Core_kernel @@ -581,8 +653,17 @@ index 9ea71a0..288f79a 100644 type result = bool * Match.environment option +@@ -102,7 +99,7 @@ let apply + |> Option.some + in + List.find_map cases ~f:(fun (template, case_expression) -> evaluate template case_expression) +- |> Option.value_map ~f:ident ~default:(false, Some env) ++ |> Option.value_map ~f:Fn.id ~default:(false, Some env) + + (* rewrite ... { ... } *) + | Rewrite (Template t, (match_template, rewrite_template)) -> diff --git a/lib/kernel/matchers/omega.ml b/lib/kernel/matchers/omega.ml -index 61cc69a..0bef682 100644 +index 61cc69a..3445307 100644 --- a/lib/kernel/matchers/omega.ml +++ b/lib/kernel/matchers/omega.ml @@ -32,15 +32,9 @@ let push_source_ref : string ref = ref "" @@ -593,17 +674,25 @@ index 61cc69a..0bef682 100644 - match Sys.getenv "DEBUG_COMBY" with - | exception Not_found -> false - | _ -> true -- ++let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some + -let rewrite = - match Sys.getenv "REWRITE" with - | exception Not_found -> false - | _ -> true -+let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some -+ +let rewrite = Sys.getenv "REWRITE" |> Option.is_some let actual = Buffer.create 10 +@@ -540,7 +534,7 @@ module Make (Language : Types.Language.S) (Meta : Metasyntax.S) (Ext : External. + + let hole_parser sort dimension : (production * 'a) t t = + let hole_parser = (* This must be fold, can't be find *) +- let open Polymorphic_compare in ++ let open Poly in + List.fold ~init:[] Template.Matching.hole_parsers ~f:(fun acc (sort', parser) -> + if sort' = sort then parser::acc else acc) + in diff --git a/lib/kernel/matchers/preprocess.ml b/lib/kernel/matchers/preprocess.ml index 84f3ed0..b6d10e7 100644 --- a/lib/kernel/matchers/preprocess.ml @@ -633,7 +722,7 @@ index ef0bd59..906820b 100644 module type Regexp_engine_intf = sig type t diff --git a/lib/kernel/matchers/rewrite.ml b/lib/kernel/matchers/rewrite.ml -index 32c4740..2fc28db 100644 +index 32c4740..545cba5 100644 --- a/lib/kernel/matchers/rewrite.ml +++ b/lib/kernel/matchers/rewrite.ml @@ -4,10 +4,7 @@ open Core_kernel @@ -648,6 +737,35 @@ index 32c4740..2fc28db 100644 let counter = let uuid_for_id_counter = ref 0 in +@@ -46,24 +43,24 @@ let parse_first_label ?(metasyntax = Metasyntax.default_metasyntax) template = + in + parse_string ~consume:All parser template + |> function +- | Ok label -> List.find_map label ~f:ident ++ | Ok label -> List.find_map label ~f:Fn.id + | Error _ -> None + + let substitute_fresh + ?(metasyntax = Metasyntax.default_metasyntax) + ?(fresh = counter) + template = +- let label_table = String.Table.create () in ++ let label_table = Hashtbl.create (module String) in + let template_ref = ref template in + let current_label_ref = ref (parse_first_label ~metasyntax !template_ref) in + while Option.is_some !current_label_ref do + let label = Option.value_exn !current_label_ref in + let id = +- match String.Table.find label_table label with ++ match Hashtbl.find label_table label with + | Some id -> id + | None -> + let id = fresh () in +- if String.(label <> "") then String.Table.add_exn label_table ~key:label ~data:id; ++ if String.(label <> "") then Hashtbl.add_exn label_table ~key:label ~data:id; + id + in + let left, right = replacement_sentinel metasyntax in diff --git a/lib/kernel/matchers/template.ml b/lib/kernel/matchers/template.ml index 423a07f..136236c 100644 --- a/lib/kernel/matchers/template.ml diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix index 8ebc464cb346..816702d263ed 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "dagger"; - version = "0.6.4"; + version = "0.8.4"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - hash = "sha256-ms736KXQjqWnIU7WHQ4k1r6qwCp07N6tufCx9s9biVc="; + hash = "sha256-iFuPbSat555QHPqqP6j/6uTid19x1+OtRHADmGxTYzs="; }; - vendorHash = "sha256-zssmvu1s7O2DdvjxUYkR13CKOe4EYn50RFRRIPBJ9qg="; + vendorHash = "sha256-DWmHq8BIR00QTh3ZcbEgTtbHwTmsMFAhV7kQVRSKNdQ="; proxyVendor = true; subPackages = [ "cmd/dagger" ]; - ldflags = [ "-s" "-w" "-X=github.com/dagger/dagger/internal/engine.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/dagger/dagger/engine.Version=${version}" ]; passthru.tests.version = testers.testVersion { package = dagger; diff --git a/nixpkgs/pkgs/development/tools/convco/default.nix b/nixpkgs/pkgs/development/tools/convco/default.nix index 1ac7aaaaf8ac..9b735d2af215 100644 --- a/nixpkgs/pkgs/development/tools/convco/default.nix +++ b/nixpkgs/pkgs/development/tools/convco/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HOHUyO2Ct0BlQtLqqwsQZZPmnLij8AsayX+aIhIpZpw="; + sha256 = "sha256-RNUMLc4lY18tsOr2vmpkYdQ2poVOQxsSVl5PEuhzQxw="; }; - cargoHash = "sha256-p8aDqBZ0HpQ4iWG0lAF6KIvE4F5P1myd/Dt/txaoz0k="; + cargoHash = "sha256-ChB4w9qnSzuOGTPYfpAJS2icy9wi1RjONCsfT+3vlRo="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/coursier/default.nix b/nixpkgs/pkgs/development/tools/coursier/default.nix index fd3d4276f1eb..1bebbc731100 100644 --- a/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "coursier"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "rmssIpXp6bwrrxtbH45catYxQh/7K+tkQtvfKYBToNk="; + sha256 = "HBjtR2OTzWgMdm8oBfBuJaxP4arAokOMUnRECEsTvg8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/database/atlas/default.nix b/nixpkgs/pkgs/development/tools/database/atlas/default.nix new file mode 100644 index 000000000000..f17313ec3a0c --- /dev/null +++ b/nixpkgs/pkgs/development/tools/database/atlas/default.nix @@ -0,0 +1,41 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "atlas"; + version = "0.13.3"; + + src = fetchFromGitHub { + owner = "ariga"; + repo = "atlas"; + rev = "v${version}"; + hash = "sha256-mnLrmsKFDpjTHyOgOeL/YsWcTfbKgv/M+phJSMFQReU="; + }; + + modRoot = "cmd/atlas"; + + vendorHash = "sha256-Xi0N3lU/gqmkqJcJeQqkKr0rcbad6cIclhq4t6DCTZI="; + + nativeBuildInputs = [ installShellFiles ]; + + env.GOWORK = "off"; + + ldflags = [ "-s" "-w" "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${version}" ]; + + subPackages = [ "." ]; + + postInstall = '' + installShellCompletion --cmd atlas \ + --bash <($out/bin/atlas completion bash) \ + --fish <($out/bin/atlas completion fish) \ + --zsh <($out/bin/atlas completion zsh) + ''; + + meta = with lib; { + description = "A modern tool for managing database schemas"; + homepage = "https://atlasgo.io/"; + changelog = "https://github.com/ariga/atlas/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + mainProgram = "atlas"; + }; +} diff --git a/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/nixpkgs/pkgs/development/tools/database/liquibase/default.nix index 3309dbd41862..ffc9e712381e 100644 --- a/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.23.0"; + version = "4.23.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-mIuHNNo/L5h2RvpTN0jZt6ri+Il0H9aSL4auOjIepjU="; + hash = "sha256-uWZ9l6C6QlVHqp/ma6/sz07zuCHpGucy7GhNDq8v1/U="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/database/litefs/default.nix b/nixpkgs/pkgs/development/tools/database/litefs/default.nix index 660d06c63661..c12cde6af918 100644 --- a/nixpkgs/pkgs/development/tools/database/litefs/default.nix +++ b/nixpkgs/pkgs/development/tools/database/litefs/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "litefs"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "superfly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EPOOQSjhhUgUcO+edcZIPomd6g/BI9Ee5MsmylKq1Sk="; + sha256 = "sha256-gTXIQVnNyVn2UqigozvEPaPm3XoqHd6E0RZnZS4bP3g="; }; vendorHash = "sha256-4e1tAAXM2EYuqe1AbN1wng/bq1BP7MSOV6woeKjc3x4="; diff --git a/nixpkgs/pkgs/development/tools/database/sqlc/default.nix b/nixpkgs/pkgs/development/tools/database/sqlc/default.nix index dfe0cac81f89..92a740ac0a7a 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlc/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlc/default.nix @@ -8,7 +8,7 @@ buildGoModule { inherit version; src = fetchFromGitHub { - owner = "kyleconroy"; + owner = "sqlc-dev"; repo = "sqlc"; rev = "v${version}"; sha256 = "sha256-ITW5jIlNoiW7sl6s5jCVRELglauZzSPmAj3PXVpdIGA="; diff --git a/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix b/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix index b6fac2c3127e..3ad3ef0656f4 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sqlcmd"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { repo = "go-sqlcmd"; owner = "microsoft"; rev = "v${version}"; - sha256 = "sha256-d9XxE+yY3LEsg9JYOFYs9r2ZHaH0+tnEOqNV+5tEiAs="; + sha256 = "sha256-omclEa/URexzzpn5jRw2ivBPxmx6kw+WBIOk4XZASkU="; }; - vendorHash = "sha256-+buoX9etR34p1N2G8+48ZvF6cg/y4uKb89sSIwkoeuY="; + vendorHash = "sha256-mqyKH6xLfTqKVStEZYqau19U9y/NlqoD0XLeoWHScgM="; proxyVendor = true; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index c73cdb55ea94..14bb9ba345e5 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "2.3.0"; + version = "2.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zIufjQ8JNt3/GGd7Q1wEdJULKe+qXtZpEJJzrH3KVno="; + hash = "sha256-olwvg/smXPDqKvSdpp30SEsHYWNQXU9ISbOmJH7MKLo="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/development/tools/diesel-cli/default.nix b/nixpkgs/pkgs/development/tools/diesel-cli/default.nix index 29b98eb77fa5..47b01955868f 100644 --- a/nixpkgs/pkgs/development/tools/diesel-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/diesel-cli/default.nix @@ -25,15 +25,15 @@ in rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.1.0"; + version = "2.1.1"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-FdmjfywvDD3mo1d1pUQMYvebo5AUTa99gQbQuOWmZZk="; + hash = "sha256-fpvC9C30DJy5ih+sFTTMoiykUHqG6OzDhF9jvix1Ctg="; }; - cargoHash = "sha256-onPzM9E53VUogZdIu3jAeB4dL3MC2FP3b6QWZ5Tr3j0="; + cargoHash = "sha256-nPmUCww8sOJwnG7+uIflLPgT87xPX0s7g0AcuDKhY2I="; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/earthly/default.nix b/nixpkgs/pkgs/development/tools/earthly/default.nix index 06983c3e286c..225a2981a604 100644 --- a/nixpkgs/pkgs/development/tools/earthly/default.nix +++ b/nixpkgs/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.7.15"; + version = "0.7.17"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-cCN63eHfYAsCcvRU+hAH+dZJHlmBu7MitvrjGB/qzMU="; + hash = "sha256-JkZVuOlN9lDTdJ2076+STLU+UcoAAmWdqsBDGMtUJyw="; }; - vendorHash = "sha256-8t7nWVItX9OPo6fsJuzo+w6ZyVcsqwi2e7HE2nqyYck="; + vendorHash = "sha256-R3UxfshCAca73xRnjen5Dg8/gbTrTpZsz9HB18/MxEQ="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; diff --git a/nixpkgs/pkgs/development/tools/flyway/default.nix b/nixpkgs/pkgs/development/tools/flyway/default.nix index 69d020f74d5f..4fec2ef0c065 100644 --- a/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.21.1"; + version = "9.21.2"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-pbZNqle4ExLGoICJumJ94PYnL22bxZfHdMzWbo3P4NU="; + sha256 = "sha256-7MIjXF1qgEye2Z/cyeuSFkEmXT8AxkwYfw+/UevsPFg="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/gcov2lcov/default.nix b/nixpkgs/pkgs/development/tools/gcov2lcov/default.nix new file mode 100644 index 000000000000..5ee3476eac2c --- /dev/null +++ b/nixpkgs/pkgs/development/tools/gcov2lcov/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gcov2lcov"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "jandelgado"; + repo = "gcov2lcov"; + rev = "v${version}"; + hash = "sha256-S5fAhd0bh1XEeQwaya8LvnKQ/iz4PjAbpjK4uFI6H1g="; + }; + + vendorHash = "sha256-r95PFkTywGiDIEnDfLpzt97SkuDeXo4xg2N7ikG0hs0="; + + ldflags = [ "-s" "-w" ]; + + # Some checks depend on looking up vcs root + checkPhase = false; + + meta = with lib; { + description = "Convert go coverage files to lcov format"; + homepage = "https://github.com/jandelgado/gcov2lcov"; + changelog = "https://github.com/jandelgado/gcov2lcov/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ meain ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/nixpkgs/pkgs/development/tools/ginkgo/default.nix index 3e0080332e18..0b5b542ca07f 100644 --- a/nixpkgs/pkgs/development/tools/ginkgo/default.nix +++ b/nixpkgs/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-0BnvIGqAm1N4xbZiqq/iouXkvDWfpZvBA0gKMcB+WYU="; + sha256 = "sha256-ikZ3vuoGYCbjvcpqol11WZ1PfxqSm1VNfdLDJIlNeP0="; }; - vendorHash = "sha256-jpCib0bwb5MtaHhM+d3dFxIXwyMGvxdo+Vgv6PKVp7w="; + vendorHash = "sha256-huXVFvSd2KkNqb6BWsTY2megnD9dJLy7edX2mGBv0rU="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix b/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix index 47bac190dc44..f17b9d310fee 100644 --- a/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix +++ b/nixpkgs/pkgs/development/tools/global-platform-pro/default.nix @@ -1,29 +1,50 @@ -{ lib, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }: +{ lib, stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite, proot, zlib }: let mavenJdk8 = maven.override { jdk = jdk8; }; + + defineMvnWrapper = '' + mvn() + { + # One of the deps that are downloaded and run needs zlib. + export LD_LIBRARY_PATH="${lib.makeLibraryPath [zlib]}" + # Give access to ELF interpreter under FHS path, to be able to run + # prebuilt binaries. + "${lib.getExe proot}" -b "${stdenv.cc.libc}/lib:/lib64" mvn "$@" + } + ''; in mavenJdk8.buildMavenPackage rec { pname = "global-platform-pro"; - version = "18.09.14"; - GPPRO_VERSION = "18.09.14-0-gb439b52"; # git describe --tags --always --long --dirty + version = "20.01.23"; + GPPRO_VERSION = "v20.01.23-0-g5ad373b"; # git describe --tags --always --long --dirty src = fetchFromGitHub { owner = "martinpaljak"; repo = "GlobalPlatformPro"; - rev = version; - sha256 = "1vws6cbgm3mrwc2xz9j1y262vw21x3hjc9m7rqc4hn3m7gjpwsvg"; + rev = "v${version}"; + sha256 = "sha256-z38I61JR4oiAkImkbwcvXoK5QsdoR986dDrOzhHsCeY="; }; - mvnHash = "sha256-xFcEZpJ0+ApJTDTuA63LgvUwLrxATVKoj5Mh3WZyfq8="; + mvnHash = "sha256-+297ttqBT4Q4NyNIvTYTtiDrB1dfmuu9iWmAxxBZiW8="; nativeBuildInputs = [ jdk8 makeWrapper ]; + # Fix build error due to missing .git directory: + # Failed to execute goal pl.project13.maven:git-commit-id-plugin:4.0.0:revision (retrieve-git-info) on project gppro: .git directory is not found! Please specify a valid [dotGitDirectory] in your pom.xml -> [Help 1] + mvnParameters = "-Dmaven.gitcommitid.skip=true"; + + mvnFetchExtraArgs = { + preConfigure = defineMvnWrapper; + }; + + preConfigure = defineMvnWrapper; + installPhase = '' mkdir -p "$out/lib/java" "$out/share/java" - cp target/gp.jar "$out/share/java" + cp tool/target/gp.jar "$out/share/java" makeWrapper "${jre8_headless}/bin/java" "$out/bin/gp" \ --add-flags "-jar '$out/share/java/gp.jar'" \ --prefix LD_LIBRARY_PATH : "${pcsclite.out}/lib" diff --git a/nixpkgs/pkgs/development/tools/go-jet/default.nix b/nixpkgs/pkgs/development/tools/go-jet/default.nix index 2f20c8d3ca49..aea629bebefe 100644 --- a/nixpkgs/pkgs/development/tools/go-jet/default.nix +++ b/nixpkgs/pkgs/development/tools/go-jet/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-jet"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = pname; repo = "jet"; rev = "v${version}"; - sha256 = "sha256-Dj/Bq7MEM2sIhz1ThvRpO9wYCasISvd8icP68LVXEx0="; + sha256 = "sha256-G/yKS4YFKOVkuoqT/Qh12ul43dKo4W23EIyCgmeaUoo="; }; vendorHash = "sha256-AwrtLTzKqKjFf5fV3JWYWyaqzHJjMNrYuSXhHXyV5HE="; diff --git a/nixpkgs/pkgs/development/tools/go-mockery/default.nix b/nixpkgs/pkgs/development/tools/go-mockery/default.nix index fd92a8035839..690dd71d4328 100644 --- a/nixpkgs/pkgs/development/tools/go-mockery/default.nix +++ b/nixpkgs/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.32.4"; + version = "2.33.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-8J8SEPsRj6T6kpCTaouHEojLJQD4K0894m5ldVGdy6I="; + sha256 = "sha256-HQBGKWJSjo4ox8YEeQhzM8r+GxuEMsj3SiFAO78j0bA="; }; preCheck = '' diff --git a/nixpkgs/pkgs/development/tools/goa/default.nix b/nixpkgs/pkgs/development/tools/goa/default.nix index 95a258886c1f..e3edc73465e6 100644 --- a/nixpkgs/pkgs/development/tools/goa/default.nix +++ b/nixpkgs/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.12.3"; + version = "3.12.4"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - sha256 = "sha256-OWYIfzJcR0V5GogVntzu5hOe3h3JO5FYWxSqYSxRp6A="; + sha256 = "sha256-ox4UPwotJBA8qxZpqyKmOW2bqbSWHX+yIpGvFnf2Rzo="; }; - vendorHash = "sha256-Zt8Nzga9xRYuUv8ofCJa3yL2Kq+xvnqs3c0g2BnrgTo="; + vendorHash = "sha256-AIhAMgpVLMxeYoj4Jl4O92/etOtFD++ddV18R8aYRuY="; subPackages = [ "cmd/goa" ]; diff --git a/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix b/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix index 2d36c207fdbe..9f87aa67020e 100644 --- a/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix +++ b/nixpkgs/pkgs/development/tools/goimports-reviser/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "goimports-reviser"; - version = "3.3.1"; + version = "3.4.1"; src = fetchFromGitHub { owner = "incu6us"; repo = "goimports-reviser"; rev = "v${version}"; - hash = "sha256-JIXBC7fk/Bd3tTHiK+qtB+5CdAATaB/j1nvKOJrz4n4="; + hash = "sha256-aQVjnJ//fV3i6blGKb05C2Sw1Bum9b4/o00q6krFtVI="; }; vendorHash = "sha256-lyV4HlpzzxYC6OZPGVdNVL2mvTFE9yHO37zZdB/ePBg="; diff --git a/nixpkgs/pkgs/development/tools/gojq/default.nix b/nixpkgs/pkgs/development/tools/gojq/default.nix index 09c78835e5f9..b2d80e1916dc 100644 --- a/nixpkgs/pkgs/development/tools/gojq/default.nix +++ b/nixpkgs/pkgs/development/tools/gojq/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { changelog = "https://github.com/itchyny/gojq/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "gojq"; }; } diff --git a/nixpkgs/pkgs/development/tools/gops/default.nix b/nixpkgs/pkgs/development/tools/gops/default.nix index a74d0a9d08c9..6b191d00bf3b 100644 --- a/nixpkgs/pkgs/development/tools/gops/default.nix +++ b/nixpkgs/pkgs/development/tools/gops/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gops"; - version = "0.3.27"; + version = "0.3.28"; src = fetchFromGitHub { owner = "google"; repo = "gops"; rev = "v${version}"; - sha256 = "sha256-F1/1wMO2lQ4v2+r3FPzaxCkL2lW+COgxy4fjv6+p7AY="; + sha256 = "sha256-HNM487WSfNWNF31ccDIdotsEG8Mj2C7V85UI47a9drU="; }; - vendorHash = "sha256-ea+1AV0WzaQiDHyAUsm0rd/bznehG9UtmB1ubgHrOGM="; + vendorHash = "sha256-ptC2G7cXcAjthJcAXvuBqI2ZpPuSMBqzO+gJiyaAUP0="; preCheck = "export HOME=$(mktemp -d)"; diff --git a/nixpkgs/pkgs/development/tools/hcloud/default.nix b/nixpkgs/pkgs/development/tools/hcloud/default.nix index 4ba850c624eb..39fc54b6ac40 100644 --- a/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/nixpkgs/pkgs/development/tools/hcloud/default.nix @@ -1,21 +1,26 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "hcloud"; - version = "1.36.0"; + version = "1.37.0"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; - rev = "v${version}"; - sha256 = "sha256-BmV+g0Geue41KNcB++TaoSsuGG1HA+uH5GHye7QRWOM="; + rev = "refs/tags/v${version}"; + hash = "sha256-6UQaO2ArAYd6Lr1maciC83k1GlR8FLx+acAZh6SjI3g="; }; - vendorHash = "sha256-eGeaH9nIjBSZLxNlsQtas122eEXrIbrGn/GYVB4KhvY="; + vendorHash = "sha256-mxAG3o3IY70xn8WymUzF96Q2XWwQ0efWrrw1VV4Y8HU="; ldflags = [ - "-s" "-w" - "-X github.com/hetznercloud/cli/internal/version.Version=${version}" + "-s" + "-w" + "-X=github.com/hetznercloud/cli/internal/version.Version=${version}" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/html-minifier/default.nix b/nixpkgs/pkgs/development/tools/html-minifier/default.nix new file mode 100644 index 000000000000..6fd239fa816c --- /dev/null +++ b/nixpkgs/pkgs/development/tools/html-minifier/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "html-minifier"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "kangax"; + repo = "html-minifier"; + rev = "v${version}"; + hash = "sha256-OAykAqBxgr7tbeXXfSH23DALf7Eoh3VjDKNKWGAL3+A="; + }; + + npmDepsHash = "sha256-VWXc/nBXgvSE/DoLHR4XTFQ5kuwWC1m0/cj1CndfPH8="; + + npmFlags = [ "--ignore-scripts" ]; + + dontNpmBuild = true; + + meta = { + description = "Highly configurable, well-tested, JavaScript-based HTML minifier"; + homepage = "https://github.com/kangax/html-minifier"; + license = lib.licenses.mit; + mainProgram = "html-minifier"; + maintainers = with lib.maintainers; [ chris-martin ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/jql/default.nix b/nixpkgs/pkgs/development/tools/jql/default.nix index 82363d0ca515..83f25c44ab25 100644 --- a/nixpkgs/pkgs/development/tools/jql/default.nix +++ b/nixpkgs/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.0.2"; + version = "7.0.3"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-lYm+zgZkt/iVJgehJM44VqWbcR4kqt8rUSEsnz07tbU="; + hash = "sha256-9VQtPYAw/MtYZxfosWPQOy29YjvzVGP/mhje42dAb8U="; }; - cargoHash = "sha256-Gav89ub4ccv/lCCqNYn9NvK4Q8udlu6YaZPhouHOVss="; + cargoHash = "sha256-erGqHW3LyXTcy6MZH24F7OKknissH4es2VmWdEFwe0Y="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/yamafaktory/jql/releases/tag/${src.rev}"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ akshgpt7 figsoda ]; + mainProgram = "jql"; }; } diff --git a/nixpkgs/pkgs/development/tools/kafkactl/default.nix b/nixpkgs/pkgs/development/tools/kafkactl/default.nix index 3528777f787a..870f9b52023f 100644 --- a/nixpkgs/pkgs/development/tools/kafkactl/default.nix +++ b/nixpkgs/pkgs/development/tools/kafkactl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kafkactl"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "deviceinsight"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-H6oSkPQx5bk9VBBoeGVg0Ri5LTCv96tR4Vq4guymAbQ="; + hash = "sha256-Rehf0mbdHgfjcsRKYCAqaUKsys3rRZFJxwHk2h/aICM="; }; - vendorHash = "sha256-Y3BPt3PsedrlCoKiKUObf6UQd+MuNiCGLpJUg94XSgA="; + vendorHash = "sha256-5LHL0L7xTmy3yBs7rtrC1uvUjLKBU8LpjQaHyeRyFhw="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/kdash/default.nix b/nixpkgs/pkgs/development/tools/kdash/default.nix index 9a95071bb480..0269598a3e90 100644 --- a/nixpkgs/pkgs/development/tools/kdash/default.nix +++ b/nixpkgs/pkgs/development/tools/kdash/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "kdash"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "kdash-rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U2Ne0wDgPkNZa68KbJ9Hke5l+tBAf7imu1Cj+r/uZUE="; + sha256 = "sha256-PjkRE4JWDxiDKpENN/yDnO45CegxLPov/EhxnUbmpOg="; }; nativeBuildInputs = [ perl python3 pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl xorg.xcbutil ] ++ lib.optional stdenv.isDarwin AppKit; - cargoHash = "sha256-dX5p+eLhZlU1Xg2SoqtEYb8T3/lvoJa78zgQStLPZNE="; + cargoHash = "sha256-nCFXhAaVrIkm6XOSa1cDCxukbf/CVmwPEu6gk7VybVQ="; meta = with lib; { description = "A simple and fast dashboard for Kubernetes"; diff --git a/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix b/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix index bdafbc3ed8cf..bf318108c430 100644 --- a/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/kubernetes-controller-tools/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OqBTlzHqnwu6GaNFS6cdcOoBNdSGus/piR4tXRfzpn0="; + sha256 = "sha256-strTBBpmG60H38WWLakIjZHVUgKC/ajS7ZEFDhZWnlo="; }; patches = [ ./version.patch ]; - vendorHash = "sha256-gztTF8UZ5N4mip8NIyuCfoy16kpJymtggfG0sAcZW6c="; + vendorHash = "sha256-YQfMq0p3HfLgOjAk/anZpGx/fDnvovI3HtmYdKRKq5w="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix b/nixpkgs/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix index cf458c0210dd..e681f7807083 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "jsonnet-language-server"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "grafana"; repo = "jsonnet-language-server"; rev = "refs/tags/v${version}"; - hash = "sha256-Z7ovjDt7MoV0/YRDOkidTs6O4vwKAVZyioeaNaehZLQ="; + hash = "sha256-8hy+lRh6WqyjInqGD21GHdS0QWz8g0e8MdZbQblv8II="; }; - vendorHash = "sha256-dOs+CasHQt9kcjQENG2rJfTimmkGzayJyGuyE6u8Pz4="; + vendorHash = "sha256-/mfwBHaouYN8JIxPz720/7MlMVh+5EEB+ocnYe4B020="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix b/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix index 9cf575ec5480..faf662981068 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lua-language-server"; - version = "3.6.25"; + version = "3.7.0"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-fERsqOjuZSIPpTEAQbKZ/ZYzQENxJi8Gibb6Oi073pA="; + sha256 = "sha256-kUtiMNwJJN7ZAktSC7tZriAcTDFhvcfSwBE6KFzceMg="; fetchSubmodules = true; }; @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/LuaLS/lua-language-server/blob/${version}/changelog.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda sei40kr ]; + mainProgram = "lua-language-server"; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix b/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix index 10ff9bfd4b86..df78ed497d2f 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "1.0.0"; + version = "1.0.1"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-futBxdMEJN0UdDvlk5FLUUmcG7r7P7D81IhbC2oYn5s="; + outputHash = "sha256-AamUE6mr9fwjbDndQtzO2Yscu2T6zUW/DiXMYwv35YE="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; diff --git a/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock b/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock index e9208f2e315b..de07ef3606fe 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/language-servers/millet/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", ] @@ -19,16 +19,16 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] [[package]] name = "analysis" -version = "0.12.9" +version = "0.13.0" dependencies = [ "config", "diagnostic", @@ -54,9 +54,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "autocfg" @@ -66,9 +66,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", @@ -97,15 +97,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -115,7 +118,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "str-util", @@ -124,11 +127,11 @@ dependencies = [ [[package]] name = "char-name" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "cm-syntax" -version = "0.12.9" +version = "0.13.0" dependencies = [ "lex-util", "paths", @@ -140,7 +143,7 @@ dependencies = [ [[package]] name = "code-h2-md-map" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "fast-hash", ] @@ -157,7 +160,7 @@ dependencies = [ [[package]] name = "config" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "serde", @@ -185,7 +188,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "once_cell", @@ -222,7 +225,7 @@ dependencies = [ [[package]] name = "diagnostic" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "diff" @@ -239,7 +242,7 @@ checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" [[package]] name = "elapsed" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "log", ] @@ -271,9 +274,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -293,7 +296,7 @@ dependencies = [ [[package]] name = "event-parse" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "drop_bomb", "rowan", @@ -303,16 +306,16 @@ dependencies = [ [[package]] name = "fast-hash" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "rustc-hash", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -321,7 +324,7 @@ dependencies = [ [[package]] name = "fmt-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "form_urlencoded" @@ -343,9 +346,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" @@ -380,7 +383,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "identifier-case" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "idna" @@ -395,7 +398,7 @@ dependencies = [ [[package]] name = "idx" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "nohash-hasher", ] @@ -412,7 +415,7 @@ dependencies = [ [[package]] name = "input" -version = "0.12.9" +version = "0.13.0" dependencies = [ "cm-syntax", "config", @@ -460,7 +463,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.12.9" +version = "0.13.0" dependencies = [ "analysis", "anyhow", @@ -488,7 +491,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.12.9" +version = "0.13.0" [[package]] name = "libc" @@ -508,21 +511,21 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lsp-server" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ea9ae5a5082ca3b6ae824fc7666cd206b99168a4d4c769ad8fe9cc740df6a6" +checksum = "b52dccdf3302eefab8c8a1273047f0a3c3dca4b527c8458d00c09484c8371928" dependencies = [ "crossbeam-channel", "log", @@ -532,9 +535,9 @@ dependencies = [ [[package]] name = "lsp-types" -version = "0.93.2" +version = "0.94.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be6e9c7e2d18f651974370d7aff703f9513e0df6e464fd795660edc77e6ca51" +checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" dependencies = [ "bitflags 1.3.2", "serde", @@ -560,7 +563,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.12.9" +version = "0.13.0" dependencies = [ "analysis", "codespan-reporting", @@ -578,7 +581,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.12.9" +version = "0.13.0" dependencies = [ "anyhow", "env_logger", @@ -598,7 +601,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "paths", @@ -609,7 +612,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.12.9" +version = "0.13.0" dependencies = [ "config", "diagnostic", @@ -633,7 +636,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.12.9" +version = "0.13.0" dependencies = [ "lex-util", "paths", @@ -651,9 +654,9 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[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", @@ -672,18 +675,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -696,7 +699,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "panic-hook" -version = "0.12.9" +version = "0.13.0" dependencies = [ "better-panic", ] @@ -704,7 +707,7 @@ dependencies = [ [[package]] name = "paths" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "fast-hash", "glob", @@ -716,7 +719,7 @@ dependencies = [ [[package]] name = "pattern-match" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "fast-hash", ] @@ -766,18 +769,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.31" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", @@ -787,9 +790,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -829,11 +832,11 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.4" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", @@ -848,18 +851,18 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670" dependencies = [ "proc-macro2", "quote", @@ -868,9 +871,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -879,9 +882,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", @@ -899,7 +902,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "str-util", @@ -907,14 +910,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.12.9" +version = "0.13.0" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "fmt-util", @@ -925,7 +928,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.12.9" +version = "0.13.0" dependencies = [ "config", "pretty_assertions", @@ -941,7 +944,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.12.9" +version = "0.13.0" dependencies = [ "config", "elapsed", @@ -955,7 +958,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "once_cell", @@ -964,7 +967,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.12.9" +version = "0.13.0" dependencies = [ "la-arena", "sml-lab", @@ -975,7 +978,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.12.9" +version = "0.13.0" dependencies = [ "config", "cov-mark", @@ -990,14 +993,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.12.9" +version = "0.13.0" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.12.9" +version = "0.13.0" dependencies = [ "cov-mark", "diagnostic", @@ -1008,11 +1011,11 @@ dependencies = [ [[package]] name = "sml-libs" version = "0.1.0" -source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e58af01200af5b0" +source = "git+https://github.com/azdavis/sml-libs.git#0d94e3ce13f2a489dff86151f74b26074affec2a" [[package]] name = "sml-naive-fmt" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "sml-comment", @@ -1021,11 +1024,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.12.9" +version = "0.13.0" [[package]] name = "sml-parse" -version = "0.12.9" +version = "0.13.0" dependencies = [ "diagnostic", "event-parse", @@ -1037,14 +1040,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.12.9" +version = "0.13.0" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.12.9" +version = "0.13.0" dependencies = [ "num-bigint", "num-traits", @@ -1053,7 +1056,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.12.9" +version = "0.13.0" dependencies = [ "chain-map", "config", @@ -1076,7 +1079,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.12.9" +version = "0.13.0" dependencies = [ "chain-map", "code-h2-md-map", @@ -1095,7 +1098,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.12.9" +version = "0.13.0" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1103,7 +1106,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.12.9" +version = "0.13.0" dependencies = [ "code-h2-md-map", "fast-hash", @@ -1114,7 +1117,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "sml-hir", @@ -1132,16 +1135,16 @@ dependencies = [ [[package]] name = "str-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "smol_str", ] [[package]] name = "syn" -version = "2.0.26" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -1151,7 +1154,7 @@ dependencies = [ [[package]] name = "syntax-gen" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "char-name", "fast-hash", @@ -1172,7 +1175,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.12.9" +version = "0.13.0" dependencies = [ "analysis", "cm-syntax", @@ -1198,7 +1201,7 @@ dependencies = [ [[package]] name = "text-pos" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "line-index", "text-size-util", @@ -1213,7 +1216,7 @@ checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" [[package]] name = "text-size-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "text-size", ] @@ -1236,7 +1239,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "token" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "toml" @@ -1275,7 +1278,7 @@ dependencies = [ [[package]] name = "topo-sort" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "ungrammar" @@ -1285,9 +1288,9 @@ checksum = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f" [[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", ] @@ -1322,7 +1325,7 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "uniq" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "url" @@ -1388,7 +1391,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -1408,17 +1411,17 @@ 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 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]] @@ -1429,9 +1432,9 @@ 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" @@ -1441,9 +1444,9 @@ 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" @@ -1453,9 +1456,9 @@ 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" @@ -1465,9 +1468,9 @@ 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" @@ -1477,9 +1480,9 @@ 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" @@ -1489,9 +1492,9 @@ 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" @@ -1501,22 +1504,22 @@ 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.0" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[package]] name = "xtask" -version = "0.12.9" +version = "0.13.0" dependencies = [ "anyhow", "flate2", diff --git a/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix b/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix index 8b1fc8c47745..95b7a2bc68fd 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.12.9"; + version = "0.13.0"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-PGB5sgYxiXYTj6O9SY/druDpNCf4O8HsivT8zhJM62M="; + hash = "sha256-q7p3TB7YsfROW+6MCbcGCPTIekEgqQBi0MUHkIuhtHc="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "char-name-0.1.0" = "sha256-mAzrBqaESZhLNozdgrGaRbOzwT+5j9nw9rRot9Xg1Ts="; - "sml-libs-0.1.0" = "sha256-q3n4UfDcpDaN8v9UewAz2G26NeDDsZFuczS7N6nkl5Q="; + "char-name-0.1.0" = "sha256-uWKoRLEwbjndrtu30H0zysHLIXBqWa0SnYm6Iy1hUko="; + "sml-libs-0.1.0" = "sha256-zQrhH24XlA9SeQ+sVzaVwJwrm80TRIjFq99Vay7QEN8="; }; }; diff --git a/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix index fde707ec6641..b8807f0a26f8 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-wwFek9668tC+j2F12b9YiYbYJWp5z4J4F09dlj+hlq0="; + hash = "sha256-8FQFg9EV50wGnhAoK6TNL2n7BSuvJnVw73LRNdmaegw="; }; - cargoHash = "sha256-XmacBalkevCmYxWFcez/++1ng2yyURge466VX6QZC9M="; + cargoHash = "sha256-HWu+SYwjnZCv9K9Uru3YlZukpjK9+en2HBMTbRz5oW4="; meta = with lib; { description = "A cmake lsp based on tower-lsp and treesitter"; diff --git a/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock index 45443db84b5b..0432ef322588 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/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", ] @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -54,9 +54,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arrayref" @@ -102,7 +102,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -131,9 +131,9 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[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", @@ -202,24 +202,34 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" dependencies = [ "serde", ] [[package]] name = "bpaf" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c359c5e742f51d3238e83af24b289903591fbce38990eb9fcc903c7f8d5d95f9" +checksum = "1dc3b1bd654a8d16eea03586c3eee8ffd25c7f242b9eae9730cc442834fe56d9" dependencies = [ "owo-colors", "supports-color", ] [[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" @@ -251,9 +261,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[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", ] @@ -313,7 +323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28a097f142aeb5b03af73595536cd55f5d649fca4d656379aac86b3af133cf92" dependencies = [ "comemo-macros", - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -463,9 +473,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.0" +version = "5.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" +checksum = "9b101bb8960ab42ada6ae98eb82afcea4452294294c45b681295af26610d6d28" dependencies = [ "cfg-if", "hashbrown 0.14.0", @@ -482,9 +492,9 @@ checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" [[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 = "dirs" @@ -515,14 +525,14 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "ecow" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5c5051925c54d9a42c8652313b5358a7432eed209466b443ed5220431243a14" +checksum = "1d1990d053cf6edf3f030682dba3b0eb65ef01fabb2686072765d8a17d6728e8" dependencies = [ "serde", ] @@ -544,9 +554,9 @@ 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", ] @@ -561,7 +571,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -661,9 +671,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -801,7 +811,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -859,15 +869,39 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "globmatch" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0e82f77d5e36ce0c3941a39a6d8fff8ed9553ae13586b31640d6885f7376097" +dependencies = [ + "globset", + "log", + "walkdir", +] + +[[package]] +name = "globset" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] [[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", @@ -969,9 +1003,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 = "hyper" @@ -1311,6 +1345,15 @@ dependencies = [ [[package]] name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" @@ -1436,9 +1479,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lsp-types" @@ -1542,9 +1585,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", @@ -1600,9 +1643,9 @@ checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -1645,7 +1688,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1745,7 +1788,7 @@ dependencies = [ "futures-util", "once_cell", "opentelemetry_api", - "ordered-float 3.7.0", + "ordered-float 3.9.1", "percent-encoding", "rand", "regex", @@ -1771,9 +1814,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.7.0" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" +checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" dependencies = [ "num-traits", ] @@ -1851,7 +1894,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -1877,14 +1920,14 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[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" @@ -1923,9 +1966,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2028,9 +2071,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", ] @@ -2153,9 +2196,9 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ "base64", "bytes", @@ -2245,7 +2288,7 @@ dependencies = [ "log", "roxmltree", "simplecss", - "siphasher", + "siphasher 0.3.11", "svgtypes", ] @@ -2270,7 +2313,7 @@ version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", @@ -2300,9 +2343,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.3" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ "ring", "untrusted", @@ -2401,29 +2444,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.183" +version = "1.0.187" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "30a7fe14252655bd1e578af19f5fa00fe02fd0013b100ca6b49fde31c41bae4c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.187" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "e46b2a6ca578b3f1d4501b12f78ed4692006d79d82a1a7c561c12dbc3d625eb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -2438,7 +2481,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2500,15 +2543,21 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "siphasher" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" [[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", ] @@ -2643,7 +2692,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2681,7 +2730,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" dependencies = [ "kurbo", - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -2697,9 +2746,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -2747,9 +2796,9 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[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", @@ -2760,22 +2809,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2823,9 +2872,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" +checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" dependencies = [ "deranged", "itoa", @@ -2842,9 +2891,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9" dependencies = [ "time-core", ] @@ -2903,9 +2952,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.31.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ "backtrace", "bytes", @@ -2926,7 +2975,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3074,7 +3123,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3104,7 +3153,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3186,7 +3235,7 @@ name = "typst" version = "0.7.0" source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "bytemuck", "comemo", "ecow", @@ -3206,7 +3255,7 @@ dependencies = [ "roxmltree", "rustybuzz", "serde", - "siphasher", + "siphasher 0.3.11", "stacker", "subsetter", "svg2pdf", @@ -3267,7 +3316,7 @@ dependencies = [ [[package]] name = "typst-lsp" -version = "0.9.4" +version = "0.9.5" dependencies = [ "anyhow", "async-compression", @@ -3281,7 +3330,7 @@ dependencies = [ "if_chain", "indexmap 2.0.0", "internment", - "itertools", + "itertools 0.11.0", "lazy_static", "memmap2 0.7.1", "once_cell", @@ -3294,7 +3343,7 @@ dependencies = [ "same-file", "serde", "serde_json", - "siphasher", + "siphasher 1.0.0", "strum 0.25.0", "temp-dir", "thiserror", @@ -3307,6 +3356,7 @@ dependencies = [ "tracing-subscriber", "typst", "typst-library", + "typstfmt_lib", "walkdir", ] @@ -3318,7 +3368,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3338,6 +3388,21 @@ dependencies = [ ] [[package]] +name = "typstfmt_lib" +version = "0.2.0" +source = "git+https://github.com/astrale-sharp/typstfmt?rev=45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880#45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880" +dependencies = [ + "globmatch", + "itertools 0.10.5", + "regex", + "serde", + "toml", + "tracing", + "typst-syntax", + "unicode-segmentation", +] + +[[package]] name = "unic-langid" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3590,7 +3655,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -3624,7 +3689,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3637,9 +3702,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", @@ -3659,23 +3724,10 @@ dependencies = [ ] [[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" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "weezl" @@ -3734,9 +3786,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", @@ -3749,62 +3801,63 @@ 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.6" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50be2474cf85af7994b8ddd153dcde06fbcf847ced8f14d2e401ac3c33df143c" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys", ] [[package]] diff --git a/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix b/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix index e6f20062d39f..7abe4811ba37 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -7,22 +7,30 @@ rustPlatform.buildRustPackage rec { pname = "typst-lsp"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "nvarner"; repo = "typst-lsp"; rev = "v${version}"; - hash = "sha256-qbmNZFXg+XaDkHdBA3dU0ICKovEQrl7AAcMkElMLbMA="; + hash = "sha256-rV7vzI4PPyBJX/ofVCXnXd8eH6+UkGaAL7PwhP71t0k="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "typst-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; + "typstfmt_lib-0.2.0" = "sha256-DOh7WQowJXTxI9GDXfy73hvr3J+VcDqSDaClLlUpMsM="; }; }; + patches = [ + # update typstfmt to symlink its README.md into the library crate + # without this patch, typst-lsp fails to build when dependencies are vendored + # https://github.com/astrale-sharp/typstfmt/pull/81 + ./update-typstfmt.patch + ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/update-typstfmt.patch b/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/update-typstfmt.patch new file mode 100644 index 000000000000..4c540b8257ce --- /dev/null +++ b/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/update-typstfmt.patch @@ -0,0 +1,22 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -3390,7 +3390,7 @@ dependencies = [ + [[package]] + name = "typstfmt_lib" + version = "0.2.0" +-source = "git+https://github.com/astrale-sharp/typstfmt?rev=cf0ac91#cf0ac9189a4a2d47f4bc833f2538dca032534455" ++source = "git+https://github.com/astrale-sharp/typstfmt?rev=45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880#45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880" + dependencies = [ + "globmatch", + "itertools 0.10.5", +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -70,7 +70,7 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features = + "fmt", + ] } + walkdir = "2.3" +-typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", rev = "cf0ac91" } ++typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", rev = "45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880" } + + # jaeger + opentelemetry = { version = "0.20.0", optional = true } diff --git a/nixpkgs/pkgs/development/tools/micronaut/default.nix b/nixpkgs/pkgs/development/tools/micronaut/default.nix index 43afba18773d..dea45a573d88 100644 --- a/nixpkgs/pkgs/development/tools/micronaut/default.nix +++ b/nixpkgs/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.0.3"; + version = "4.0.5"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-xwBeg6A39MrnQTfesfv+vD0QSIRq9CWvF4vwqf/N730="; + sha256 = "sha256-h2llX5g4f8jSU1pmvzLEn2yLZBte/EoEfYBW9lqfuWk="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/misc/act/default.nix b/nixpkgs/pkgs/development/tools/misc/act/default.nix index 6f9c848e0228..984e2ec346e4 100644 --- a/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.49"; + version = "0.2.50"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dJt8XrcB1rYt6os3enLQz0YuqXNIqQTh85BIJdXwi2A="; + hash = "sha256-NVzONabM1EUsA+PUyJ7hBOZmqs5RYfE0teNO6BMBu7M="; }; - vendorHash = "sha256-QPpwYec2Y0x/VOsiTWvObKrNWGGE7dj8Cl5eM2l8ibk="; + vendorHash = "sha256-+MQofGGja4JUSWCctY0CWQ2aYpVrXj4/knqd/TW0PtI="; doCheck = false; @@ -29,6 +29,6 @@ buildGoModule rec { homepage = "https://github.com/nektos/act"; changelog = "https://github.com/nektos/act/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne kashw2 ]; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/ast-grep/default.nix b/nixpkgs/pkgs/development/tools/misc/ast-grep/default.nix index 40924e195de5..0b0b7e47ba93 100644 --- a/nixpkgs/pkgs/development/tools/misc/ast-grep/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ast-grep/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-chx37D0y05nIlXmP4SsWvsO+36BV7drTYpJCgMIl5xA="; + hash = "sha256-1ThEJ8VEcXNScY4zmmXz7BVYs6irE1h9HDxkVvmVq1k="; }; - cargoHash = "sha256-VfuBee2F2FxhcTE1JwosFgQI9+stzDuOHfpLv25rcNw="; + cargoHash = "sha256-3myUFgKktvD9S0Bp7ixsZb59p3iDwmiEKUFD7wB+7IM="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix b/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix index 143c6ee74dd7..b3574aab3344 100644 --- a/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.20.0"; + version = "2.21.0"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "zsG527W8/gr6wqbHfzOuihf/a8k4QeFdU6ajlJgGncs="; + sha256 = "k2KLrU/Oz3FjBS3ZRKiSDNBweauZSg02yY5Y286JIds="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "0ov+VJSJleI0aiMiZ+KdtQJ6nYcI6NZxZiShWGhV9N0="; + sha256 = "IECKTvbDIA5yANm9n2Y9WxZorDqURac+iSCmBQ8ECHk="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "IEyAR6C2px2C/LEHLW5ZBamhmveCBwcgmm6w7KW6Cyg="; + sha256 = "7tdXb1sPYncbbKsbSASlZsgzbcOB9EWI+XZ0JV05PUc="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "fD8iNRSY860hBiZ4uFqDO1LCa49/gyC9M2rBlvm2ZWI="; + sha256 = "Ke55JS9kYkCX69hxOvnNR6FsMEufgvNf1dOaHnzlcp0="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "E6UuLldO7N59PAkzR49FXJZYJ15yGbePtHVdacwyJ20="; + sha256 = "GAbN0GoWiw1AAwfo1BfFK0boo+QywfY0VC4SlSjADKo="; }; }; diff --git a/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix b/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix index 1b9b0f940cc5..9774200e9b3d 100644 --- a/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { autoPatchelfHook ]; - setSourceRoot = "sourceRoot=`pwd`"; + sourceRoot = "."; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index 6904414601a3..6192322c2c34 100644 --- a/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.28528"; + version = "0.1.28811"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y8KpJdJLYSsDLT6/z0/Nx9qByLdtNNBeiwFUupJxxCQ="; + sha256 = "sha256-HaBFKjVw6EzhH1oxSeKFmZUDZleFGrxjOegTVCGmrzI="; }; vendorHash = "sha256-OWdJ7nFR5hrKQf2H763ezjXkEh0PvtBcjjeSNvH+ca4="; diff --git a/nixpkgs/pkgs/development/tools/misc/complgen/default.nix b/nixpkgs/pkgs/development/tools/misc/complgen/default.nix index ad83f8f2078a..c9685d53511e 100644 --- a/nixpkgs/pkgs/development/tools/misc/complgen/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/complgen/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage { pname = "complgen"; - version = "unstable-2023-08-17"; + version = "unstable-2023-08-22"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; - rev = "4f01c04184b31804009e0002ff6ba1c777439798"; - hash = "sha256-KQFMWVHTlkf65ghgv3oR2Jz4QtXkdz6CNIC3eeyBgBg="; + rev = "8c9b9c51f3465c6d858e15f442b63e94b2f5ed1b"; + hash = "sha256-oYRaH3FbAFY7QujgFpUDD8gVam4+Gm9qROxCTMYBg9I="; }; - cargoHash = "sha256-m/eFpwMZOOVGVeXjQwNZheuPeGkJd0mAF903ML/Kr90="; + cargoHash = "sha256-LHnIIkQLuY+A09qhxSiyLmUpX/dES7xBE5m1uRPI0i0="; meta = with lib; { description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; diff --git a/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix b/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix index e856e333b33a..8783ca578a23 100644 --- a/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix @@ -19,17 +19,17 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.65.1"; + version = "1.66.1"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-q6UY+A7JFDYb9hzvr2SYI9GfkY9bg49fQkUM7gHKOBU="; + hash = "sha256-2bqYoWG8xGh7HGZyCPLNz/ZWXH29Be12YfYgGTCIVx8="; }; pubspecLockFile = ./pubspec.lock; - vendorHash = "sha256-nIiffqM5HwJmORdONz+RADAPTISrz/3/HxK4aOSl5cM="; + vendorHash = "sha256-YWxVpwuo97i00/F4WOn2AWiRFYSFIWbEbmxDF77gWsE="; nativeBuildInputs = [ buf diff --git a/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix index 8a44d484ddde..5c21f8a0f415 100644 --- a/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix @@ -2,17 +2,18 @@ , stdenv , cmake , fetchFromGitHub +, gitUpdater }: stdenv.mkDerivation rec { pname = "grpc-tools"; - version = "1.11.2"; + version = "1.12.4"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc-node"; rev = "grpc-tools@${version}"; - sha256 = "00432y19pjcimwachjcqpzra21vzmlqchhhlqxnk98bfh25kxdcb"; + hash = "sha256-708lBIGW5+vvSTrZHl/kc+ck7JKNXElrghIGDrMSyx8="; fetchSubmodules = true; }; @@ -25,6 +26,11 @@ stdenv.mkDerivation rec { install -Dm755 -t $out/bin deps/protobuf/protoc ''; + passthru.updateScript = gitUpdater { + url = "https://github.com/grpc/grpc-node.git"; + rev-prefix = "grpc-tools@"; + }; + meta = with lib; { description = "Distribution of protoc and the gRPC Node protoc plugin for ease of installation with npm"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index 6dd504a3cf9e..5f6113343f73 100644 --- a/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nxpmicro-mfgtools"; - version = "1.5.11"; + version = "1.5.21"; src = fetchFromGitHub { - owner = "NXPmicro"; + owner = "nxp-imx"; repo = "mfgtools"; rev = "uuu_${version}"; - hash = "sha256-RD0haw0C89uvTlLHtvlv1VwU4Jw2U19Caiq+BSfB4hU="; + sha256 = "sha256-XVvGsHltlA3h9hd3C88G3s2wIZ1EVM6DmvdiwD82vTw="; }; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix b/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix index f92e7930c4f9..d5afea351ffe 100644 --- a/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix @@ -4,13 +4,13 @@ , removeReferencesTo }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pkgconf"; - version = "1.9.5"; + version = "2.0.2"; src = fetchurl { - url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-GsFlbeuydJdWMDb3v/woFJD4P5uEV8DWC8+2OPtrYXE="; + url = "https://distfiles.dereferenced.org/pkgconf/pkgconf-${finalAttrs.version}.tar.xz"; + hash = "sha256-6lol748lHrU3fsDiHHX7YYlEM8+9vwslWboz5MJmRAE="; }; outputs = [ "out" "lib" "dev" "man" "doc" ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { mv ${placeholder "dev"}/share ${placeholder "out"} ''; - meta = with lib; { + meta = { homepage = "https://github.com/pkgconf/pkgconf"; description = "Package compiler and linker metadata toolkit"; longDescription = '' @@ -52,8 +52,10 @@ stdenv.mkDerivation rec { functionality, to allow other tooling such as compilers and IDEs to discover and use libraries configured by pkgconf. ''; - license = licenses.isc; - maintainers = with maintainers; [ zaninime AndersonTorres ]; - platforms = platforms.all; + changelog = "https://github.com/pkgconf/pkgconf/blob/pkgconf-${finalAttrs.version}/NEWS"; + license = lib.licenses.isc; + mainProgram = "pkgconf"; + maintainers = with lib.maintainers; [ zaninime AndersonTorres ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/tools/misc/premake/5.nix b/nixpkgs/pkgs/development/tools/misc/premake/5.nix index 8fefb65e79be..a42d4c1a7b6e 100644 --- a/nixpkgs/pkgs/development/tools/misc/premake/5.nix +++ b/nixpkgs/pkgs/development/tools/misc/premake/5.nix @@ -14,12 +14,17 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ lib.optionals stdenv.isDarwin [ Foundation readline ]; patches = [ ./no-curl-ca.patch ]; - patchPhase = '' + postPatch = '' substituteInPlace contrib/curl/premake5.lua \ --replace "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'" '' + lib.optionalString stdenv.isDarwin '' substituteInPlace premake5.lua \ --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 + '' + lib.optionalString stdenv.hostPlatform.isStatic '' + substituteInPlace \ + binmodules/example/premake5.lua \ + binmodules/luasocket/premake5.lua \ + --replace SharedLib StaticLib ''; buildPhase = diff --git a/nixpkgs/pkgs/development/tools/misc/runme/default.nix b/nixpkgs/pkgs/development/tools/misc/runme/default.nix index fc61e0ae376f..dfae5be83c53 100644 --- a/nixpkgs/pkgs/development/tools/misc/runme/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/runme/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "runme"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-BoPNIaYxK4VyafNWAVDonwTfpqF1N3Ggq5GF6A7DhF0="; + hash = "sha256-3NCD9kagcxW8Ahet20imFYqo3G7nkR1iPM0C5tQX72o="; }; vendorHash = "sha256-sGk2K0I9onGFpDwboRugNHjFictisY4Q0NTNnOT3BW4="; diff --git a/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix b/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix index 58c3460bf556..028f2f8d5029 100644 --- a/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix @@ -25,14 +25,14 @@ let in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; - version = "1.1.0"; + version = "1.1.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-YVOxzxkvvW2pFDsYdDM2uiK6kIam+EP/BOF+Vs+RM2g="; + sha256 = "sha256-ENv17Az6yzUwD39HDfoD7Bmvs6LHjVp85PaYkTw6jW0="; }; - cargoHash = "sha256-Nt8t4nyfwxyX8mugQy4La3Y+nertJg9MFE1ROePISSg="; + cargoHash = "sha256-wL46QhY3Cq2KFLETPRhUWb77o1vNrRA2w1NBAtBc0yo="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] diff --git a/nixpkgs/pkgs/development/tools/misc/src-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/src-cli/default.nix index f983d82846b6..d8d3ffd4bf53 100644 --- a/nixpkgs/pkgs/development/tools/misc/src-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/src-cli/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "src-cli"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "src-cli"; rev = version; - hash = "sha256-r9ugSs9I5K7yuAtOTWCKr3dHGBtmTQVehKqZ3ago1U4="; + hash = "sha256-byfmZQDYn76/0K/ByKePXF+eWVZNCnAqu5k6UN7Iijg="; }; - vendorHash = "sha256-A533f+FfEzU2TlNwHkD8gjeQYRATz85cCCmqLdl9290="; + vendorHash = "sha256-DASjCyOY9+USRYrnIS+Li4zhBnZNoyxUgN9LqhIAMh8="; subPackages = [ "cmd/src" diff --git a/nixpkgs/pkgs/development/tools/misc/typical/default.nix b/nixpkgs/pkgs/development/tools/misc/typical/default.nix index 12016efc53de..7944f14ca4d6 100644 --- a/nixpkgs/pkgs/development/tools/misc/typical/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/typical/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "typical"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "stepchowfun"; repo = "typical"; rev = "v${version}"; - hash = "sha256-pXLOtCzdI6KspNzg1R7Zc97Dd7dX7ZzxvlvKprkLF2I="; + hash = "sha256-UoTzgYxLdlWefNLeege7+tlqWh4uzotO5EbcyqvU2Xo="; }; - cargoHash = "sha256-ckW2Hc5BRqtvzZRUAlf7Vy06cgSTY6nv2ompSDNzpi4="; + cargoHash = "sha256-GIyvwByzNKFvEdVSLo2cxuQ7JvKRFezhyKQrWjbj7Kk="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/development/tools/mongosh/package-lock.json b/nixpkgs/pkgs/development/tools/mongosh/package-lock.json index 8dc69a1d059c..f3af35f3e10f 100644 --- a/nixpkgs/pkgs/development/tools/mongosh/package-lock.json +++ b/nixpkgs/pkgs/development/tools/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "1.10.5", + "version": "1.10.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "1.10.5", + "version": "1.10.6", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "1.10.5" + "@mongosh/cli-repl": "1.10.6" }, "bin": { "mongosh": "bin/mongosh.js" @@ -122,43 +122,43 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.391.0.tgz", - "integrity": "sha512-5mlkdrLP6sTG6D+q/qFw6vPVegFGSy1XcVUdERmWo6fvR7mYlRNETGC5sNsGPcMhnN3MCviqxCJmXpwnsP7okg==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.398.0.tgz", + "integrity": "sha512-Pr/S1f8R2FsJ8DwBC6g0CSdtZNNV5dMHhlIi+t8YAmCJvP4KT+UhzFjbvQRINlBRLFuGUuP7p5vRcGVELD3+wA==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.391.0", - "@aws-sdk/credential-provider-node": "3.391.0", - "@aws-sdk/middleware-host-header": "3.391.0", - "@aws-sdk/middleware-logger": "3.391.0", - "@aws-sdk/middleware-recursion-detection": "3.391.0", - "@aws-sdk/middleware-signing": "3.391.0", - "@aws-sdk/middleware-user-agent": "3.391.0", - "@aws-sdk/types": "3.391.0", - "@aws-sdk/util-endpoints": "3.391.0", - "@aws-sdk/util-user-agent-browser": "3.391.0", - "@aws-sdk/util-user-agent-node": "3.391.0", - "@smithy/config-resolver": "^2.0.3", - "@smithy/fetch-http-handler": "^2.0.3", - "@smithy/hash-node": "^2.0.3", - "@smithy/invalid-dependency": "^2.0.3", - "@smithy/middleware-content-length": "^2.0.3", - "@smithy/middleware-endpoint": "^2.0.3", - "@smithy/middleware-retry": "^2.0.3", - "@smithy/middleware-serde": "^2.0.3", + "@aws-sdk/client-sts": "3.398.0", + "@aws-sdk/credential-provider-node": "3.398.0", + "@aws-sdk/middleware-host-header": "3.398.0", + "@aws-sdk/middleware-logger": "3.398.0", + "@aws-sdk/middleware-recursion-detection": "3.398.0", + "@aws-sdk/middleware-signing": "3.398.0", + "@aws-sdk/middleware-user-agent": "3.398.0", + "@aws-sdk/types": "3.398.0", + "@aws-sdk/util-endpoints": "3.398.0", + "@aws-sdk/util-user-agent-browser": "3.398.0", + "@aws-sdk/util-user-agent-node": "3.398.0", + "@smithy/config-resolver": "^2.0.5", + "@smithy/fetch-http-handler": "^2.0.5", + "@smithy/hash-node": "^2.0.5", + "@smithy/invalid-dependency": "^2.0.5", + "@smithy/middleware-content-length": "^2.0.5", + "@smithy/middleware-endpoint": "^2.0.5", + "@smithy/middleware-retry": "^2.0.5", + "@smithy/middleware-serde": "^2.0.5", "@smithy/middleware-stack": "^2.0.0", - "@smithy/node-config-provider": "^2.0.3", - "@smithy/node-http-handler": "^2.0.3", - "@smithy/protocol-http": "^2.0.3", - "@smithy/smithy-client": "^2.0.3", - "@smithy/types": "^2.2.0", - "@smithy/url-parser": "^2.0.3", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/node-http-handler": "^2.0.5", + "@smithy/protocol-http": "^2.0.5", + "@smithy/smithy-client": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "@smithy/util-base64": "^2.0.0", "@smithy/util-body-length-browser": "^2.0.0", - "@smithy/util-body-length-node": "^2.0.0", - "@smithy/util-defaults-mode-browser": "^2.0.3", - "@smithy/util-defaults-mode-node": "^2.0.3", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.5", + "@smithy/util-defaults-mode-node": "^2.0.5", "@smithy/util-retry": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" @@ -168,40 +168,40 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.391.0.tgz", - "integrity": "sha512-aT+O1CbWIWYlCtWK6g3ZaMvFNImOgFGurOEPscuedqzG5UQc1bRtRrGYShLyzcZgfXP+s0cKYJqgGeRNoWiwqA==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.398.0.tgz", + "integrity": "sha512-CygL0jhfibw4kmWXG/3sfZMFNjcXo66XUuPC4BqZBk8Rj5vFoxp1vZeMkDLzTIk97Nvo5J5Bh+QnXKhub6AckQ==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/middleware-host-header": "3.391.0", - "@aws-sdk/middleware-logger": "3.391.0", - "@aws-sdk/middleware-recursion-detection": "3.391.0", - "@aws-sdk/middleware-user-agent": "3.391.0", - "@aws-sdk/types": "3.391.0", - "@aws-sdk/util-endpoints": "3.391.0", - "@aws-sdk/util-user-agent-browser": "3.391.0", - "@aws-sdk/util-user-agent-node": "3.391.0", - "@smithy/config-resolver": "^2.0.3", - "@smithy/fetch-http-handler": "^2.0.3", - "@smithy/hash-node": "^2.0.3", - "@smithy/invalid-dependency": "^2.0.3", - "@smithy/middleware-content-length": "^2.0.3", - "@smithy/middleware-endpoint": "^2.0.3", - "@smithy/middleware-retry": "^2.0.3", - "@smithy/middleware-serde": "^2.0.3", + "@aws-sdk/middleware-host-header": "3.398.0", + "@aws-sdk/middleware-logger": "3.398.0", + "@aws-sdk/middleware-recursion-detection": "3.398.0", + "@aws-sdk/middleware-user-agent": "3.398.0", + "@aws-sdk/types": "3.398.0", + "@aws-sdk/util-endpoints": "3.398.0", + "@aws-sdk/util-user-agent-browser": "3.398.0", + "@aws-sdk/util-user-agent-node": "3.398.0", + "@smithy/config-resolver": "^2.0.5", + "@smithy/fetch-http-handler": "^2.0.5", + "@smithy/hash-node": "^2.0.5", + "@smithy/invalid-dependency": "^2.0.5", + "@smithy/middleware-content-length": "^2.0.5", + "@smithy/middleware-endpoint": "^2.0.5", + "@smithy/middleware-retry": "^2.0.5", + "@smithy/middleware-serde": "^2.0.5", "@smithy/middleware-stack": "^2.0.0", - "@smithy/node-config-provider": "^2.0.3", - "@smithy/node-http-handler": "^2.0.3", - "@smithy/protocol-http": "^2.0.3", - "@smithy/smithy-client": "^2.0.3", - "@smithy/types": "^2.2.0", - "@smithy/url-parser": "^2.0.3", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/node-http-handler": "^2.0.5", + "@smithy/protocol-http": "^2.0.5", + "@smithy/smithy-client": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "@smithy/util-base64": "^2.0.0", "@smithy/util-body-length-browser": "^2.0.0", - "@smithy/util-body-length-node": "^2.0.0", - "@smithy/util-defaults-mode-browser": "^2.0.3", - "@smithy/util-defaults-mode-node": "^2.0.3", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.5", + "@smithy/util-defaults-mode-node": "^2.0.5", "@smithy/util-retry": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" @@ -211,43 +211,43 @@ } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.391.0.tgz", - "integrity": "sha512-y+KmorcUx9o5O99sXVPbhGUpsLpfhzYRaYCqxArLsyzZTCO6XDXMi8vg/xtS+b703j9lWEl5GxAv2oBaEwEnhQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.398.0.tgz", + "integrity": "sha512-/3Pa9wLMvBZipKraq3AtbmTfXW6q9kyvhwOno64f1Fz7kFb8ijQFMGoATS70B2pGEZTlxkUqJFWDiisT6Q6dFg==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/credential-provider-node": "3.391.0", - "@aws-sdk/middleware-host-header": "3.391.0", - "@aws-sdk/middleware-logger": "3.391.0", - "@aws-sdk/middleware-recursion-detection": "3.391.0", - "@aws-sdk/middleware-sdk-sts": "3.391.0", - "@aws-sdk/middleware-signing": "3.391.0", - "@aws-sdk/middleware-user-agent": "3.391.0", - "@aws-sdk/types": "3.391.0", - "@aws-sdk/util-endpoints": "3.391.0", - "@aws-sdk/util-user-agent-browser": "3.391.0", - "@aws-sdk/util-user-agent-node": "3.391.0", - "@smithy/config-resolver": "^2.0.3", - "@smithy/fetch-http-handler": "^2.0.3", - "@smithy/hash-node": "^2.0.3", - "@smithy/invalid-dependency": "^2.0.3", - "@smithy/middleware-content-length": "^2.0.3", - "@smithy/middleware-endpoint": "^2.0.3", - "@smithy/middleware-retry": "^2.0.3", - "@smithy/middleware-serde": "^2.0.3", + "@aws-sdk/credential-provider-node": "3.398.0", + "@aws-sdk/middleware-host-header": "3.398.0", + "@aws-sdk/middleware-logger": "3.398.0", + "@aws-sdk/middleware-recursion-detection": "3.398.0", + "@aws-sdk/middleware-sdk-sts": "3.398.0", + "@aws-sdk/middleware-signing": "3.398.0", + "@aws-sdk/middleware-user-agent": "3.398.0", + "@aws-sdk/types": "3.398.0", + "@aws-sdk/util-endpoints": "3.398.0", + "@aws-sdk/util-user-agent-browser": "3.398.0", + "@aws-sdk/util-user-agent-node": "3.398.0", + "@smithy/config-resolver": "^2.0.5", + "@smithy/fetch-http-handler": "^2.0.5", + "@smithy/hash-node": "^2.0.5", + "@smithy/invalid-dependency": "^2.0.5", + "@smithy/middleware-content-length": "^2.0.5", + "@smithy/middleware-endpoint": "^2.0.5", + "@smithy/middleware-retry": "^2.0.5", + "@smithy/middleware-serde": "^2.0.5", "@smithy/middleware-stack": "^2.0.0", - "@smithy/node-config-provider": "^2.0.3", - "@smithy/node-http-handler": "^2.0.3", - "@smithy/protocol-http": "^2.0.3", - "@smithy/smithy-client": "^2.0.3", - "@smithy/types": "^2.2.0", - "@smithy/url-parser": "^2.0.3", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/node-http-handler": "^2.0.5", + "@smithy/protocol-http": "^2.0.5", + "@smithy/smithy-client": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "@smithy/util-base64": "^2.0.0", "@smithy/util-body-length-browser": "^2.0.0", - "@smithy/util-body-length-node": "^2.0.0", - "@smithy/util-defaults-mode-browser": "^2.0.3", - "@smithy/util-defaults-mode-node": "^2.0.3", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.5", + "@smithy/util-defaults-mode-node": "^2.0.5", "@smithy/util-retry": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "fast-xml-parser": "4.2.5", @@ -258,14 +258,14 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.391.0.tgz", - "integrity": "sha512-60B2WDGJOijluCzeTQDzPWgGuAhYKTcYnK5fNMi9xzHBqw+IhPaGYcmAx1bQGY7SuoZBqVgt1h6fiNxY8TWO5w==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.398.0.tgz", + "integrity": "sha512-MFUhy1YayHg5ypRTk4OTfDumQRP+OJBagaGv14kA8DzhKH1sNrU4HV7A7y2J4SvkN5hG/KnLJqxpakCtB2/O2g==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.391.0", - "@aws-sdk/types": "3.391.0", + "@aws-sdk/client-cognito-identity": "3.398.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -273,13 +273,13 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.391.0.tgz", - "integrity": "sha512-mAzICedcg4bfL0mM5O6QTd9mQ331NLse1DMr6XL21ZZiLB48ej19L7AGV2xq5QwVbqKU3IVv1myRyhvpDM9jMg==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.398.0.tgz", + "integrity": "sha512-Z8Yj5z7FroAsR6UVML+XUdlpoqEe9Dnle8c2h8/xWwIC2feTfIBhjLhRVxfbpbM1pLgBSNEcZ7U8fwq5l7ESVQ==", "dependencies": { - "@aws-sdk/types": "3.391.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -287,19 +287,19 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.391.0.tgz", - "integrity": "sha512-DJZmbmRMqNSfSV7UF8eBVhADz16KAMCTxnFuvgioHHfYUTZQEhCxRHI8jJqYWxhLTriS7AuTBIWr+1AIbwsCTA==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.391.0", - "@aws-sdk/credential-provider-process": "3.391.0", - "@aws-sdk/credential-provider-sso": "3.391.0", - "@aws-sdk/credential-provider-web-identity": "3.391.0", - "@aws-sdk/types": "3.391.0", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.398.0.tgz", + "integrity": "sha512-AsK1lStK3nB9Cn6S6ODb1ktGh7SRejsNVQVKX3t5d3tgOaX+aX1Iwy8FzM/ZEN8uCloeRifUGIY9uQFygg5mSw==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.398.0", + "@aws-sdk/credential-provider-process": "3.398.0", + "@aws-sdk/credential-provider-sso": "3.398.0", + "@aws-sdk/credential-provider-web-identity": "3.398.0", + "@aws-sdk/types": "3.398.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -307,20 +307,20 @@ } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.391.0.tgz", - "integrity": "sha512-LXHQwsTw4WBwRzD9swu8254Hao5MoIaGXIzbhX4EQ84dtOkKYbwiY4pDpLfcHcw3B1lFKkVclMze8WAs4EdEww==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.391.0", - "@aws-sdk/credential-provider-ini": "3.391.0", - "@aws-sdk/credential-provider-process": "3.391.0", - "@aws-sdk/credential-provider-sso": "3.391.0", - "@aws-sdk/credential-provider-web-identity": "3.391.0", - "@aws-sdk/types": "3.391.0", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.398.0.tgz", + "integrity": "sha512-odmI/DSKfuWUYeDnGTCEHBbC8/MwnF6yEq874zl6+owoVv0ZsYP8qBHfiJkYqrwg7wQ7Pi40sSAPC1rhesGwzg==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.398.0", + "@aws-sdk/credential-provider-ini": "3.398.0", + "@aws-sdk/credential-provider-process": "3.398.0", + "@aws-sdk/credential-provider-sso": "3.398.0", + "@aws-sdk/credential-provider-web-identity": "3.398.0", + "@aws-sdk/types": "3.398.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -328,14 +328,14 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.391.0.tgz", - "integrity": "sha512-KMlzPlBI+hBmXDo+EoFZdLgCVRkRa9B9iEE6x0+hQQ6g9bW6HI7cDRVdceR1ZoPasSaNAZ9QOXMTIBxTpn0sPQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.398.0.tgz", + "integrity": "sha512-WrkBL1W7TXN508PA9wRXPFtzmGpVSW98gDaHEaa8GolAPHMPa5t2QcC/z/cFpglzrcVv8SA277zu9Z8tELdZhg==", "dependencies": { - "@aws-sdk/types": "3.391.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -343,16 +343,16 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.391.0.tgz", - "integrity": "sha512-FT/WoiRHiKys+FcRwvjui0yKuzNtJdn2uGuI1hYE0gpW1wVmW02ouufLckJTmcw09THUZ4w53OoCVU5OY00p8A==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.398.0.tgz", + "integrity": "sha512-2Dl35587xbnzR/GGZqA2MnFs8+kS4wbHQO9BioU0okA+8NRueohNMdrdQmQDdSNK4BfIpFspiZmFkXFNyEAfgw==", "dependencies": { - "@aws-sdk/client-sso": "3.391.0", - "@aws-sdk/token-providers": "3.391.0", - "@aws-sdk/types": "3.391.0", + "@aws-sdk/client-sso": "3.398.0", + "@aws-sdk/token-providers": "3.398.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -360,13 +360,13 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.391.0.tgz", - "integrity": "sha512-n0vYg82B8bc4rxKltVbVqclev7hx+elyS9pEnZs3YbnbWJq0qqsznXmDfLqd1TcWpa09PGXcah0nsRDolVThsA==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.398.0.tgz", + "integrity": "sha512-iG3905Alv9pINbQ8/MIsshgqYMbWx+NDQWpxbIW3W0MkSH3iAqdVpSCteYidYX9G/jv2Um1nW3y360ib20bvNg==", "dependencies": { - "@aws-sdk/types": "3.391.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -374,24 +374,24 @@ } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.391.0.tgz", - "integrity": "sha512-J2fh74zUC3qZnbZol95T9w9PTgmx9NfyIy5JVs43rISdvgnAkD9fXd6YbBfQOxl9Xx9HiZW7Fa3hTxma7d/zlA==", - "dependencies": { - "@aws-sdk/client-cognito-identity": "3.391.0", - "@aws-sdk/client-sso": "3.391.0", - "@aws-sdk/client-sts": "3.391.0", - "@aws-sdk/credential-provider-cognito-identity": "3.391.0", - "@aws-sdk/credential-provider-env": "3.391.0", - "@aws-sdk/credential-provider-ini": "3.391.0", - "@aws-sdk/credential-provider-node": "3.391.0", - "@aws-sdk/credential-provider-process": "3.391.0", - "@aws-sdk/credential-provider-sso": "3.391.0", - "@aws-sdk/credential-provider-web-identity": "3.391.0", - "@aws-sdk/types": "3.391.0", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.398.0.tgz", + "integrity": "sha512-355vXmImn2e85mIWSYDVb101AF2lIVHKNCaH6sV1U/8i0ZOXh2cJYNdkRYrxNt1ezDB0k97lSKvuDx7RDvJyRg==", + "dependencies": { + "@aws-sdk/client-cognito-identity": "3.398.0", + "@aws-sdk/client-sso": "3.398.0", + "@aws-sdk/client-sts": "3.398.0", + "@aws-sdk/credential-provider-cognito-identity": "3.398.0", + "@aws-sdk/credential-provider-env": "3.398.0", + "@aws-sdk/credential-provider-ini": "3.398.0", + "@aws-sdk/credential-provider-node": "3.398.0", + "@aws-sdk/credential-provider-process": "3.398.0", + "@aws-sdk/credential-provider-sso": "3.398.0", + "@aws-sdk/credential-provider-web-identity": "3.398.0", + "@aws-sdk/types": "3.398.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -399,13 +399,13 @@ } }, "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.391.0.tgz", - "integrity": "sha512-+nyNr0rb2ixY7mU48nibr7L7gsw37y4oELhqgnNKhcjZDJ34imBwKIMFa64n21FdftmhcjR8IdSpzXE9xrkJ8g==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.398.0.tgz", + "integrity": "sha512-m+5laWdBaxIZK2ko0OwcCHJZJ5V1MgEIt8QVQ3k4/kOkN9ICjevOYmba751pHoTnbOYB7zQd6D2OT3EYEEsUcA==", "dependencies": { - "@aws-sdk/types": "3.391.0", - "@smithy/protocol-http": "^2.0.3", - "@smithy/types": "^2.2.0", + "@aws-sdk/types": "3.398.0", + "@smithy/protocol-http": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -413,12 +413,12 @@ } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.391.0.tgz", - "integrity": "sha512-KOwl5zo16b17JDhqILHBStccBQ2w35em7+/6vdkJdUII6OU8aVIFTlIQT9wOUvd4do6biIRBMZG3IK0Rg7mRDQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.398.0.tgz", + "integrity": "sha512-CiJjW+FL12elS6Pn7/UVjVK8HWHhXMfvHZvOwx/Qkpy340sIhkuzOO6fZEruECDTZhl2Wqn81XdJ1ZQ4pRKpCg==", "dependencies": { - "@aws-sdk/types": "3.391.0", - "@smithy/types": "^2.2.0", + "@aws-sdk/types": "3.398.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -426,13 +426,13 @@ } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.391.0.tgz", - "integrity": "sha512-hVR3z59G7pX4pjDQs9Ag1tMgbLeGXOzeAAaNP9fEtHSd3KBMAGQgN3K3b9WPjzE2W0EoloHRJMK4qxZErdde2g==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.398.0.tgz", + "integrity": "sha512-7QpOqPQAZNXDXv6vsRex4R8dLniL0E/80OPK4PPFsrCh9btEyhN9Begh4i1T+5lL28hmYkztLOkTQ2N5J3hgRQ==", "dependencies": { - "@aws-sdk/types": "3.391.0", - "@smithy/protocol-http": "^2.0.3", - "@smithy/types": "^2.2.0", + "@aws-sdk/types": "3.398.0", + "@smithy/protocol-http": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -440,13 +440,13 @@ } }, "node_modules/@aws-sdk/middleware-sdk-sts": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.391.0.tgz", - "integrity": "sha512-6ZXI3Z4QU+TnT5PwKWloGmRHG81tWeI18/zxf9wWzrO2NhYFvITzEJH0vWLLiXdWtn/BYfLULXtDvkTaepbI5A==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.398.0.tgz", + "integrity": "sha512-+JH76XHEgfVihkY+GurohOQ5Z83zVN1nYcQzwCFnCDTh4dG4KwhnZKG+WPw6XJECocY0R+H0ivofeALHvVWJtQ==", "dependencies": { - "@aws-sdk/middleware-signing": "3.391.0", - "@aws-sdk/types": "3.391.0", - "@smithy/types": "^2.2.0", + "@aws-sdk/middleware-signing": "3.398.0", + "@aws-sdk/types": "3.398.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -454,15 +454,15 @@ } }, "node_modules/@aws-sdk/middleware-signing": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.391.0.tgz", - "integrity": "sha512-2pAJJlZqaHc0d+cz2FTVrQmWi8ygKfqfczHUo/loCtOaMNtWXBHb/JsLEecs6cXdizy6gi3YsLz6VZYwY4Ssxw==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.398.0.tgz", + "integrity": "sha512-O0KqXAix1TcvZBFt1qoFkHMUNJOSgjJTYS7lFTRKSwgsD27bdW2TM2r9R8DAccWFt5Amjkdt+eOwQMIXPGTm8w==", "dependencies": { - "@aws-sdk/types": "3.391.0", + "@aws-sdk/types": "3.398.0", "@smithy/property-provider": "^2.0.0", - "@smithy/protocol-http": "^2.0.3", + "@smithy/protocol-http": "^2.0.5", "@smithy/signature-v4": "^2.0.0", - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "@smithy/util-middleware": "^2.0.0", "tslib": "^2.5.0" }, @@ -471,14 +471,14 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.391.0.tgz", - "integrity": "sha512-LdK9uMNA14zqRw3B79Mhy7GX36qld/GYo93xuu+lr+AQ98leZEdc6GUbrtNDI3fP1Z8TMQcyHUKBml4/B+wXpQ==", - "dependencies": { - "@aws-sdk/types": "3.391.0", - "@aws-sdk/util-endpoints": "3.391.0", - "@smithy/protocol-http": "^2.0.3", - "@smithy/types": "^2.2.0", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.398.0.tgz", + "integrity": "sha512-nF1jg0L+18b5HvTcYzwyFgfZQQMELJINFqI0mi4yRKaX7T5a3aGp5RVLGGju/6tAGTuFbfBoEhkhU3kkxexPYQ==", + "dependencies": { + "@aws-sdk/types": "3.398.0", + "@aws-sdk/util-endpoints": "3.398.0", + "@smithy/protocol-http": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -486,42 +486,42 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.391.0.tgz", - "integrity": "sha512-kgfArsKLDJE71qQjfXiHiM5cZqgDHlMsqEx35+A65GmTWJaS1PGDqu3ZvVVU8E5mxnCCLw7vho21fsjvH6TBpg==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.398.0.tgz", + "integrity": "sha512-nrYgjzavGCKJL/48Vt0EL+OlIc5UZLfNGpgyUW9cv3XZwl+kXV0QB+HH0rHZZLfpbBgZ2RBIJR9uD5ieu/6hpQ==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/middleware-host-header": "3.391.0", - "@aws-sdk/middleware-logger": "3.391.0", - "@aws-sdk/middleware-recursion-detection": "3.391.0", - "@aws-sdk/middleware-user-agent": "3.391.0", - "@aws-sdk/types": "3.391.0", - "@aws-sdk/util-endpoints": "3.391.0", - "@aws-sdk/util-user-agent-browser": "3.391.0", - "@aws-sdk/util-user-agent-node": "3.391.0", - "@smithy/config-resolver": "^2.0.3", - "@smithy/fetch-http-handler": "^2.0.3", - "@smithy/hash-node": "^2.0.3", - "@smithy/invalid-dependency": "^2.0.3", - "@smithy/middleware-content-length": "^2.0.3", - "@smithy/middleware-endpoint": "^2.0.3", - "@smithy/middleware-retry": "^2.0.3", - "@smithy/middleware-serde": "^2.0.3", + "@aws-sdk/middleware-host-header": "3.398.0", + "@aws-sdk/middleware-logger": "3.398.0", + "@aws-sdk/middleware-recursion-detection": "3.398.0", + "@aws-sdk/middleware-user-agent": "3.398.0", + "@aws-sdk/types": "3.398.0", + "@aws-sdk/util-endpoints": "3.398.0", + "@aws-sdk/util-user-agent-browser": "3.398.0", + "@aws-sdk/util-user-agent-node": "3.398.0", + "@smithy/config-resolver": "^2.0.5", + "@smithy/fetch-http-handler": "^2.0.5", + "@smithy/hash-node": "^2.0.5", + "@smithy/invalid-dependency": "^2.0.5", + "@smithy/middleware-content-length": "^2.0.5", + "@smithy/middleware-endpoint": "^2.0.5", + "@smithy/middleware-retry": "^2.0.5", + "@smithy/middleware-serde": "^2.0.5", "@smithy/middleware-stack": "^2.0.0", - "@smithy/node-config-provider": "^2.0.3", - "@smithy/node-http-handler": "^2.0.3", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/node-http-handler": "^2.0.5", "@smithy/property-provider": "^2.0.0", - "@smithy/protocol-http": "^2.0.3", + "@smithy/protocol-http": "^2.0.5", "@smithy/shared-ini-file-loader": "^2.0.0", - "@smithy/smithy-client": "^2.0.3", - "@smithy/types": "^2.2.0", - "@smithy/url-parser": "^2.0.3", + "@smithy/smithy-client": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "@smithy/util-base64": "^2.0.0", "@smithy/util-body-length-browser": "^2.0.0", - "@smithy/util-body-length-node": "^2.0.0", - "@smithy/util-defaults-mode-browser": "^2.0.3", - "@smithy/util-defaults-mode-node": "^2.0.3", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.5", + "@smithy/util-defaults-mode-node": "^2.0.5", "@smithy/util-retry": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" @@ -531,11 +531,11 @@ } }, "node_modules/@aws-sdk/types": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.391.0.tgz", - "integrity": "sha512-QpYVFKMOnzHz/JMj/b8wb18qxiT92U/5r5MmtRz2R3LOH6ooTO96k4ozXCrYr0qNed1PAnOj73rPrrH2wnCJKQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.398.0.tgz", + "integrity": "sha512-r44fkS+vsEgKCuEuTV+TIk0t0m5ZlXHNjSDYEUvzLStbbfUFiNus/YG4UCa0wOk9R7VuQI67badsvvPeVPCGDQ==", "dependencies": { - "@smithy/types": "^2.2.0", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -543,11 +543,11 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.391.0.tgz", - "integrity": "sha512-zv4sYDTQhNxyLoekcE02/nk3xvoo6yCHDy1kDJk0MFxOKaqUB+CvZdQBR4YBLSDlD4o4DUBmdYgKT58FfbM8sQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.398.0.tgz", + "integrity": "sha512-Fy0gLYAei/Rd6BrXG4baspCnWTUSd0NdokU1pZh4KlfEAEN1i8SPPgfiO5hLk7+2inqtCmqxVJlfqbMVe9k4bw==", "dependencies": { - "@aws-sdk/types": "3.391.0", + "@aws-sdk/types": "3.398.0", "tslib": "^2.5.0" }, "engines": { @@ -566,24 +566,24 @@ } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.391.0.tgz", - "integrity": "sha512-6ipHOB1WdCBNeAMJauN7l2qNE0WLVaTNhkD290/ElXm1FHGTL8yw6lIDIjhIFO1bmbZxDiKApwDiG7ROhaJoxQ==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.398.0.tgz", + "integrity": "sha512-A3Tzx1tkDHlBT+IgxmsMCHbV8LM7SwwCozq2ZjJRx0nqw3MCrrcxQFXldHeX/gdUMO+0Oocb7HGSnVODTq+0EA==", "dependencies": { - "@aws-sdk/types": "3.391.0", - "@smithy/types": "^2.2.0", + "@aws-sdk/types": "3.398.0", + "@smithy/types": "^2.2.2", "bowser": "^2.11.0", "tslib": "^2.5.0" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.391.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.391.0.tgz", - "integrity": "sha512-PVvAK/Lf4BdB1eJIZtyFpGSslGQwKpYt9/hKs5NlR+qxBMXU9T0DnTqH4GiXZaazvXr7OUVWitIF2b7iKBMTow==", + "version": "3.398.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.398.0.tgz", + "integrity": "sha512-RTVQofdj961ej4//fEkppFf4KXqKGMTCqJYghx3G0C/MYXbg7MGl7LjfNGtJcboRE8pfHHQ/TUWBDA7RIAPPlQ==", "dependencies": { - "@aws-sdk/types": "3.391.0", - "@smithy/node-config-provider": "^2.0.3", - "@smithy/types": "^2.2.0", + "@aws-sdk/types": "3.398.0", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -691,24 +691,24 @@ } }, "node_modules/@babel/core": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz", - "integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.11.tgz", + "integrity": "sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.22.10", "@babel/generator": "^7.22.10", "@babel/helper-compilation-targets": "^7.22.10", "@babel/helper-module-transforms": "^7.22.9", - "@babel/helpers": "^7.22.10", - "@babel/parser": "^7.22.10", + "@babel/helpers": "^7.22.11", + "@babel/parser": "^7.22.11", "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.10", - "@babel/types": "^7.22.10", + "@babel/traverse": "^7.22.11", + "@babel/types": "^7.22.11", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", + "json5": "^2.2.3", "semver": "^6.3.1" }, "engines": { @@ -879,13 +879,13 @@ } }, "node_modules/@babel/helpers": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz", - "integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.11.tgz", + "integrity": "sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==", "dependencies": { "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.10", - "@babel/types": "^7.22.10" + "@babel/traverse": "^7.22.11", + "@babel/types": "^7.22.11" }, "engines": { "node": ">=6.9.0" @@ -969,9 +969,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz", - "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.11.tgz", + "integrity": "sha512-R5zb8eJIBPJriQtbH/htEQy4k7E2dHWlD2Y2VT07JCzwYZHBxV5ZYtM0UhXSNMT74LyxuM+b1jdL7pSesXbC/g==", "bin": { "parser": "bin/babel-parser.js" }, @@ -1035,9 +1035,9 @@ } }, "node_modules/@babel/traverse": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz", - "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.11.tgz", + "integrity": "sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==", "dependencies": { "@babel/code-frame": "^7.22.10", "@babel/generator": "^7.22.10", @@ -1045,8 +1045,8 @@ "@babel/helper-function-name": "^7.22.5", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.10", - "@babel/types": "^7.22.10", + "@babel/parser": "^7.22.11", + "@babel/types": "^7.22.11", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -1055,9 +1055,9 @@ } }, "node_modules/@babel/types": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", - "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", + "version": "7.22.11", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.11.tgz", + "integrity": "sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==", "dependencies": { "@babel/helper-string-parser": "^7.22.5", "@babel/helper-validator-identifier": "^7.22.5", @@ -1162,13 +1162,22 @@ "node": ">= 14.18.0" } }, + "node_modules/@mongodb-js/saslprep": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.0.tgz", + "integrity": "sha512-Xfijy7HvfzzqiOAhAepF4SGN5e9leLkMvg/OPOF97XemjfVCYN/oWa75wnkc6mltMSTwY+XlbhWgUOJmkFspSw==", + "optional": true, + "dependencies": { + "sparse-bitfield": "^3.0.3" + } + }, "node_modules/@mongosh/arg-parser": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.10.5.tgz", - "integrity": "sha512-Bt40S0q9Lgcn3JGHmFndmXVPpbE3FiaiV1MF4H15EFNIr9jWav95h+GH7ECrIEf8LkPW6kN1FGYnF3vEgepYzg==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.10.6.tgz", + "integrity": "sha512-z6rXCrsG3mvH8TyFn+j0pZwAlYPhTOYNgiG7X/Jf3YZdtGbu31HFXdG0SQcHpt+3D9AMLQDMrABSrHLDM4PqJA==", "dependencies": { - "@mongosh/errors": "1.10.5", - "@mongosh/i18n": "1.10.5", + "@mongosh/errors": "1.10.6", + "@mongosh/i18n": "1.10.6", "mongodb-connection-string-url": "^2.6.0" }, "engines": { @@ -1176,9 +1185,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.10.5.tgz", - "integrity": "sha512-EO+YyzF2ZiCfA70cFNy0yhhxv8j4PwX+AOkL2IS07/j1xik4q2ipWXHIK5AHQKXUhaBqGxhwaa7/DSmSMMEABg==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.10.6.tgz", + "integrity": "sha512-1cd08jGwxj5TWdOSaLHnh82aT3IAzE7SpdXNdPIS6x9f1bddljnW21HT7aqVyuaG5RtU9kckf8eqE0pbD65taQ==", "dependencies": { "@babel/core": "^7.22.8", "@babel/plugin-transform-destructuring": "^7.22.5", @@ -1195,12 +1204,12 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.10.5.tgz", - "integrity": "sha512-580e/PdaEaBnHL31HHxVALuLWKH9Cck7BfHRfBzxnmRPH94JwbEe8SvZrOtqQJXmuLiJsXEmMYe7MpNnKiE1Qg==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.10.6.tgz", + "integrity": "sha512-mb1KgTMyfFb/WrBvaKLuBI3GbnlEkxC4JNqWSHW91nwvsrBY0rr13lSI/ENJX3CsrjzIC1DyxcY6J2um2UC7dw==", "dependencies": { "@mongodb-js/mongodb-constants": "^0.2.2", - "@mongosh/shell-api": "1.10.5", + "@mongosh/shell-api": "1.10.6", "semver": "^7.5.4" }, "engines": { @@ -1208,24 +1217,24 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-1.10.5.tgz", - "integrity": "sha512-3M8zo027AYGsTYDEf3qEmZKwHjl7kIheJOCeqBIl/sRbUi8lqpfIWju2DgzePVX/jkKZgLEkcJcNGF22gDPZPQ==", - "dependencies": { - "@mongosh/arg-parser": "1.10.5", - "@mongosh/autocomplete": "1.10.5", - "@mongosh/editor": "1.10.5", - "@mongosh/errors": "1.10.5", - "@mongosh/history": "1.10.5", - "@mongosh/i18n": "1.10.5", - "@mongosh/js-multiline-to-singleline": "1.10.5", - "@mongosh/logging": "1.10.5", - "@mongosh/service-provider-core": "1.10.5", - "@mongosh/service-provider-server": "1.10.5", - "@mongosh/shell-api": "1.10.5", - "@mongosh/shell-evaluator": "1.10.5", - "@mongosh/snippet-manager": "1.10.5", - "@mongosh/types": "1.10.5", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-1.10.6.tgz", + "integrity": "sha512-zb3LvlWsxxorgyPl18jatdVQreBtYd3A/+h1XGiNQtwjZ0eKkw4MSZudmz+z0SfTqRVPDMJ7Fgxk2m522e1HWA==", + "dependencies": { + "@mongosh/arg-parser": "1.10.6", + "@mongosh/autocomplete": "1.10.6", + "@mongosh/editor": "1.10.6", + "@mongosh/errors": "1.10.6", + "@mongosh/history": "1.10.6", + "@mongosh/i18n": "1.10.6", + "@mongosh/js-multiline-to-singleline": "1.10.6", + "@mongosh/logging": "1.10.6", + "@mongosh/service-provider-core": "1.10.6", + "@mongosh/service-provider-server": "1.10.6", + "@mongosh/shell-api": "1.10.6", + "@mongosh/shell-evaluator": "1.10.6", + "@mongosh/snippet-manager": "1.10.6", + "@mongosh/types": "1.10.6", "analytics-node": "^5.1.2", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^1.0.0", @@ -1255,15 +1264,15 @@ } }, "node_modules/@mongosh/editor": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-1.10.5.tgz", - "integrity": "sha512-pAN+Cu7/fIiAhqaYE2eeMtr2pN2Im3+EgdmJyz2YezjTMvBPwRg7MsS2FU1cyD5bbqMfO9aEvmtQ8AD19UPkfQ==", - "dependencies": { - "@mongosh/js-multiline-to-singleline": "1.10.5", - "@mongosh/service-provider-core": "1.10.5", - "@mongosh/shell-api": "1.10.5", - "@mongosh/shell-evaluator": "1.10.5", - "@mongosh/types": "1.10.5", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-1.10.6.tgz", + "integrity": "sha512-HcHGSuVB9Jh27fi27flMtVCj7K0hiTmA1Wauv3IRwLOm+5QsMahXRt8sDIb86kw0mYtDke/UD2lWbbg351skPQ==", + "dependencies": { + "@mongosh/js-multiline-to-singleline": "1.10.6", + "@mongosh/service-provider-core": "1.10.6", + "@mongosh/shell-api": "1.10.6", + "@mongosh/shell-evaluator": "1.10.6", + "@mongosh/types": "1.10.6", "js-beautify": "^1.14.0" }, "engines": { @@ -1271,9 +1280,9 @@ } }, "node_modules/@mongosh/errors": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-1.10.5.tgz", - "integrity": "sha512-b9g/G/n5Oo5EOiW8i3CqC6pZUTHvFmD8fp0hG/LA0CXutvdzWHTLC3j8lEqqa6vByEj/GF12l9IPdBHs171wSw==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-1.10.6.tgz", + "integrity": "sha512-QWkp+1pTbsritSk2eAgw5+6m6h+GtP9n7C+LaiVhOB7HfYSCNdI9OVvZXpBzRC9Cw0rMORUc1BwUL/OioRtaYw==", "dependencies": { "chalk": "^4.1.2", "handlebars": "^4.7.7", @@ -1284,9 +1293,9 @@ } }, "node_modules/@mongosh/history": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-1.10.5.tgz", - "integrity": "sha512-kc8QAMAT7vSYW/BvS8rftp7WD+jfvWNdNYTRKxpv8Vuo6JD8p5+L6HThyc/1IufldGYQ9J30Rvrc4x8Hxc50tg==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-1.10.6.tgz", + "integrity": "sha512-lP6HauOMmmEr1TuHWbmBxFLT4ZHsEX3QxxvNU232LmH1XKNHOyr7G9oafAz/TnA49h+QNaRusKJwLEVMeI7Eaw==", "dependencies": { "mongodb-connection-string-url": "^2.6.0", "mongodb-redact": "^0.2.2" @@ -1296,11 +1305,11 @@ } }, "node_modules/@mongosh/i18n": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.10.5.tgz", - "integrity": "sha512-X+U+z5C41cn2ByMUSkS/k7depFiTT6bkR7/vyVPHVTS0JfrYwC1HIRTIB8O4HIhhriG9wt/nOQ8KIlGcYKezjg==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.10.6.tgz", + "integrity": "sha512-xj9/3MV6+jzcg+9HnInmAAtYLQF+2B8WNjrs3i+QHY0zl2C/2Fr59g8lL/btArtEbhCG0S0KYerYQ+9whI8qvg==", "dependencies": { - "@mongosh/errors": "1.10.5", + "@mongosh/errors": "1.10.6", "mustache": "^4.0.0" }, "engines": { @@ -1308,9 +1317,9 @@ } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-1.10.5.tgz", - "integrity": "sha512-jKbDw7XmQAYtJVdAgGlh+Gepn+lzVBlBQub68UYh/nagOe0QNNDXIdwr7Av39UF7gVBRH5hoC286VutMLJRtIA==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-1.10.6.tgz", + "integrity": "sha512-4kX7y6kAMCM/wwt1J6v6t6/rLQn5bZ8Xfc8HJA4bDiWVMt7FyjlrqShtkDXEzOcBpn2NMTKFrW8nmh1Bj3WZ2w==", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" @@ -1320,14 +1329,14 @@ } }, "node_modules/@mongosh/logging": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-1.10.5.tgz", - "integrity": "sha512-qZQzDafW3sSAwsg8RDSwQeopZiN90J4eXmgstmEBj+qgFbBdZXfPaQNyOA5HVf6Kt9zOJXCqafa7FPXCDmgNhA==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-1.10.6.tgz", + "integrity": "sha512-QHvdyo2JC+1vb4y+G6civdx6UQSih5Ze+Myi63sHTNkTTEx7wf4qkRQm6qHNf++THxEjOB6Xmiq6V2J7WSfw4Q==", "dependencies": { "@mongodb-js/devtools-connect": "^2.3.1", - "@mongosh/errors": "1.10.5", - "@mongosh/history": "1.10.5", - "@mongosh/types": "1.10.5", + "@mongosh/errors": "1.10.6", + "@mongosh/history": "1.10.6", + "@mongosh/types": "1.10.6", "mongodb-log-writer": "^1.3.0", "mongodb-redact": "^0.2.2" }, @@ -1336,12 +1345,12 @@ } }, "node_modules/@mongosh/service-provider-core": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.10.5.tgz", - "integrity": "sha512-CPJ0U/R6yM99lx0X4M540tPn02QLg7S0Mqw4eVNzqAjpolNJBQSeec5Gd41TMwNU9MkWjUjDgSBtaacV103Fiw==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.10.6.tgz", + "integrity": "sha512-x91v6CnrTRr7Y61sUG5jLLqjcizggBiDHjpwxxauVvDrcziTWDXc9gEolJcgLqs2Roch3sQBc96BWfCwzJkfGw==", "dependencies": { "@aws-sdk/credential-providers": "^3.347.1", - "@mongosh/errors": "1.10.5", + "@mongosh/errors": "1.10.6", "bson": "^5.3.0", "mongodb": "^5.7.0", "mongodb-build-info": "^1.6.2" @@ -1354,14 +1363,14 @@ } }, "node_modules/@mongosh/service-provider-server": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-1.10.5.tgz", - "integrity": "sha512-7ROp+9u7PEAdlwqU5VD4zWq3Mh/mtFD7/aJ6AlNRu5qeuQx5NDOOxPCSrej4O9hjvsQGwNT7Qhj6SC90n6vW9g==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-1.10.6.tgz", + "integrity": "sha512-0L+byNyYYNORyDR64BTG5HgRBW3nle/vjJl0aSEvf2vWsUnZF9lijjTXw52JT8VQAoM8+i9xddwZodF/AMXP7Q==", "dependencies": { "@mongodb-js/devtools-connect": "^2.3.1", - "@mongosh/errors": "1.10.5", - "@mongosh/service-provider-core": "1.10.5", - "@mongosh/types": "1.10.5", + "@mongosh/errors": "1.10.6", + "@mongosh/service-provider-core": "1.10.6", + "@mongosh/types": "1.10.6", "@types/sinon-chai": "^3.2.4", "aws4": "^1.11.0", "mongodb": "^5.7.0", @@ -1377,15 +1386,15 @@ } }, "node_modules/@mongosh/shell-api": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.10.5.tgz", - "integrity": "sha512-SZypGBmMxrYciuBFwGCdhdTLmwbczZ3foULphLCG2g90BjRsxhMRe3dhLaZetfohVJz4jaGBITSIfFL3MHpmBw==", - "dependencies": { - "@mongosh/arg-parser": "1.10.5", - "@mongosh/errors": "1.10.5", - "@mongosh/history": "1.10.5", - "@mongosh/i18n": "1.10.5", - "@mongosh/service-provider-core": "1.10.5", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.10.6.tgz", + "integrity": "sha512-bqC4mObT0Vt2ynmqYFBmbWOmxqZlHl3JMGambpSAst1aQM3uUDWWbmf1s9icyfvUwAzbXe7698nUuOkxW+2/Vw==", + "dependencies": { + "@mongosh/arg-parser": "1.10.6", + "@mongosh/errors": "1.10.6", + "@mongosh/history": "1.10.6", + "@mongosh/i18n": "1.10.6", + "@mongosh/service-provider-core": "1.10.6", "mongodb-redact": "^0.2.2" }, "engines": { @@ -1393,26 +1402,26 @@ } }, "node_modules/@mongosh/shell-evaluator": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.10.5.tgz", - "integrity": "sha512-SAaY9lPPNK//kazce9+mRuRLV2ZMcPogku7luShqF4dVlpk4+OsouLEcvfcFUDGUXbC4RKByPMfoShdhjX0L/w==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.10.6.tgz", + "integrity": "sha512-djFpyX5vnyivF7Sf4ywwsPDJ0xZjOFOK+lYFTqXVrO8POvoDNYbKsaXs4Y6Ktd0mA5O1Zj/bXNbPDWHirpXy6g==", "dependencies": { - "@mongosh/async-rewriter2": "1.10.5", - "@mongosh/history": "1.10.5", - "@mongosh/shell-api": "1.10.5" + "@mongosh/async-rewriter2": "1.10.6", + "@mongosh/history": "1.10.6", + "@mongosh/shell-api": "1.10.6" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-1.10.5.tgz", - "integrity": "sha512-TunA2xBclarEzaCSiv50LzdshmK0rBgYqK53qriVrnUeGEQpd6EvgTZN2F+wSpC0FJjLIkKT871amtPsjM5sJQ==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-1.10.6.tgz", + "integrity": "sha512-QcOf5XTwAQ3FDeBL9Jniew1pKTDBehLb9eq5hOmNuNtoLrNAu10gsqBkfEPrQ4x3F+TJpaIVQo3ULAahSYSitA==", "dependencies": { - "@mongosh/errors": "1.10.5", - "@mongosh/shell-api": "1.10.5", - "@mongosh/types": "1.10.5", + "@mongosh/errors": "1.10.6", + "@mongosh/shell-api": "1.10.6", + "@mongosh/types": "1.10.6", "bson": "^5.3.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", @@ -1425,9 +1434,9 @@ } }, "node_modules/@mongosh/types": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-1.10.5.tgz", - "integrity": "sha512-HQ5GUV8b4gMVlPXsqcfGCVwEK8i2DXHvSevv4RHx5ZwC19q+zt0urPqBKQHXpztmyQKnDWyNb+wwyJkhP9UKzA==", + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-1.10.6.tgz", + "integrity": "sha512-v6gRl1ek8ioWhyo8tTs1EQwGdGKSUBmUXbPSRjqFqVITkJ8kFDu0+qRoms2m4VHvIv9ml//VqHHvBTj8Mjxx9A==", "dependencies": { "@mongodb-js/devtools-connect": "^2.3.1" }, @@ -1468,11 +1477,11 @@ "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" }, "node_modules/@smithy/abort-controller": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.4.tgz", - "integrity": "sha512-3+3/xRQ0K/NFVtKSiTGsUa3muZnVaBmHrLNgxwoBLZO9rNhwZtjjjf7pFJ6aoucoul/c/w3xobRkgi8F9MWX8Q==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.5.tgz", + "integrity": "sha512-byVZ2KWLMPYAZGKjRpniAzLcygJO4ruClZKdJTuB0eCB76ONFTdptBHlviHpAZXknRz7skYWPfcgO9v30A1SyA==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1480,11 +1489,11 @@ } }, "node_modules/@smithy/config-resolver": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.4.tgz", - "integrity": "sha512-JtKWIKoCFeOY5JGQeEl81AKdIpzeLLSjSMmO5yoKqc58Yn3cxmteylT6Elba3FgAHjK1OthARRXz5JXaKKRB7g==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.5.tgz", + "integrity": "sha512-n0c2AXz+kjALY2FQr7Zy9zhYigXzboIh1AuUUVCqFBKFtdEvTwnwPXrTDoEehLiRTUHNL+4yzZ3s+D0kKYSLSg==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-config-provider": "^2.0.0", "@smithy/util-middleware": "^2.0.0", "tslib": "^2.5.0" @@ -1494,14 +1503,14 @@ } }, "node_modules/@smithy/credential-provider-imds": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.4.tgz", - "integrity": "sha512-vW7xoDKZwjjf/2GCwVf/uvZce/QJOAYan9r8UsqlzOrnnpeS2ffhxeZjLK0/emZu8n6qU3amGgZ/BTo3oVtEyQ==", - "dependencies": { - "@smithy/node-config-provider": "^2.0.4", - "@smithy/property-provider": "^2.0.4", - "@smithy/types": "^2.2.1", - "@smithy/url-parser": "^2.0.4", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.5.tgz", + "integrity": "sha512-KFcf/e0meFkQNyteJ65f1G19sgUEY1e5zL7hyAEUPz2SEfBmC9B37WyRq87G3MEEsvmAWwCRu7nFFYUKtR3svQ==", + "dependencies": { + "@smithy/node-config-provider": "^2.0.5", + "@smithy/property-provider": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "tslib": "^2.5.0" }, "engines": { @@ -1509,34 +1518,34 @@ } }, "node_modules/@smithy/eventstream-codec": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.4.tgz", - "integrity": "sha512-DkVLcQjhOxPj/4pf2hNj2kvOeoLczirHe57g7czMNJCUBvg9cpU9hNgqS37Y5sjdEtMSa2oTyCS5oeHZtKgoIw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.5.tgz", + "integrity": "sha512-iqR6OuOV3zbQK8uVs9o+9AxhVk8kW9NAxA71nugwUB+kTY9C35pUd0A5/m4PRT0Y0oIW7W4kgnSR3fdYXQjECw==", "dependencies": { "@aws-crypto/crc32": "3.0.0", - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-hex-encoding": "^2.0.0", "tslib": "^2.5.0" } }, "node_modules/@smithy/fetch-http-handler": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.0.4.tgz", - "integrity": "sha512-1dwR8T+QMe5Gs60NpZgF7ReZp0SXz1O/aX5BdDhsOJh72fi3Bx2UZlDihCdb++9vPyBRMXFRF7I8/C4x8iIm8A==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.0.5.tgz", + "integrity": "sha512-EzFoMowdBNy1VqtvkiXgPFEdosIAt4/4bgZ8uiDiUyfhmNXq/3bV+CagPFFBsgFOR/X2XK4zFZHRsoa7PNHVVg==", "dependencies": { - "@smithy/protocol-http": "^2.0.4", - "@smithy/querystring-builder": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/protocol-http": "^2.0.5", + "@smithy/querystring-builder": "^2.0.5", + "@smithy/types": "^2.2.2", "@smithy/util-base64": "^2.0.0", "tslib": "^2.5.0" } }, "node_modules/@smithy/hash-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.4.tgz", - "integrity": "sha512-vZ6a/fvEAFJKNtxJsn0I2WM8uBdypLLhLTpP4BA6fRsBAtwIl5S4wTt0Hspy6uGNn/74LmCxGmFSTMMbSd7ZDA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.5.tgz", + "integrity": "sha512-mk551hIywBITT+kXruRNXk7f8Fy7DTzBjZJSr/V6nolYKmUHIG3w5QU6nO9qPYEQGKc/yEPtkpdS28ndeG93lA==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-buffer-from": "^2.0.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.5.0" @@ -1546,11 +1555,11 @@ } }, "node_modules/@smithy/invalid-dependency": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.4.tgz", - "integrity": "sha512-zfbPPZFiZvhIXJYKlzQwDUnxmWK/SmyDcM6iQJRZHU2jQZAzhHUXFGIu2lKH9L02VUqysOgQi3S/HY4fhrVT8w==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.5.tgz", + "integrity": "sha512-0wEi+JT0hM+UUwrJVYbqjuGFhy5agY/zXyiN7BNAJ1XoCDjU5uaNSj8ekPWsXd/d4yM6NSe8UbPd8cOc1+3oBQ==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" } }, @@ -1566,12 +1575,12 @@ } }, "node_modules/@smithy/middleware-content-length": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.4.tgz", - "integrity": "sha512-Pdd+fhRbvizqsgYJ0pLWE6hjhq42wDFWzMj/1T7mEY9tG9bP6/AcdsQK8SAOckrBLURDoeSqTAwPKalsgcZBxw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.5.tgz", + "integrity": "sha512-E7VwV5H02fgZIUGRli4GevBCAPvkyEI/fgl9SU47nPPi3DAAX3nEtUb8xfGbXjOcJ5BdSUoWWZn42tEd/blOqA==", "dependencies": { - "@smithy/protocol-http": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/protocol-http": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1579,13 +1588,13 @@ } }, "node_modules/@smithy/middleware-endpoint": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.4.tgz", - "integrity": "sha512-aLPqkqKjZQ1V718P0Ostpp53nWfwK32uD0HFKSAOT25RvL285dqzGl0PAKDXpyLsPsPmHe0Yrg0AUFkRv4CRbQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.5.tgz", + "integrity": "sha512-tyzDuoNTbsMQCq5Xkc4QOt6e2GACUllQIV8SQ5fc59FtOIV9/vbf58/GxVjZm2o8+MMbdDBANjTDZe/ijZKfyA==", "dependencies": { - "@smithy/middleware-serde": "^2.0.4", - "@smithy/types": "^2.2.1", - "@smithy/url-parser": "^2.0.4", + "@smithy/middleware-serde": "^2.0.5", + "@smithy/types": "^2.2.2", + "@smithy/url-parser": "^2.0.5", "@smithy/util-middleware": "^2.0.0", "tslib": "^2.5.0" }, @@ -1594,13 +1603,13 @@ } }, "node_modules/@smithy/middleware-retry": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.4.tgz", - "integrity": "sha512-stozO6NgH9W/OSfFMOJEtlJCsnJFSoGyV4LHzIVQeXTzZ2RHjmytQ/Ez7GngHGZ1YsB4zxE1qDTXAU0AlaKf2w==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.5.tgz", + "integrity": "sha512-ulIfbFyzQTVnJbLjUl1CTSi0etg6tej/ekwaLp0Gn8ybUkDkKYa+uB6CF/m2J5B6meRwyJlsryR+DjaOVyiicg==", "dependencies": { - "@smithy/protocol-http": "^2.0.4", + "@smithy/protocol-http": "^2.0.5", "@smithy/service-error-classification": "^2.0.0", - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-middleware": "^2.0.0", "@smithy/util-retry": "^2.0.0", "tslib": "^2.5.0", @@ -1611,11 +1620,11 @@ } }, "node_modules/@smithy/middleware-serde": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.4.tgz", - "integrity": "sha512-oDttJMMES7yXmopjQHnqTkxu8vZOdjB9VpSj94Ff4/GXdKQH7ozKLNIPq4C568nbeQbBt/gsLb6Ttbx1+j+JPQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.5.tgz", + "integrity": "sha512-in0AA5sous74dOfTGU9rMJBXJ0bDVNxwdXtEt5lh3FVd2sEyjhI+rqpLLRF1E4ixbw3RSEf80hfRpcPdjg4vvQ==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1634,13 +1643,13 @@ } }, "node_modules/@smithy/node-config-provider": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.4.tgz", - "integrity": "sha512-s9O90cEhkpzZulvdHBBaroZ6AJ5uV6qtmycgYKP1yOCSfPHGIWYwaULdbfxraUsvzCcnMosDNkfckqXYoKI6jw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.5.tgz", + "integrity": "sha512-LRtjV9WkhONe2lVy+ipB/l1GX60ybzBmFyeRUoLUXWKdnZ3o81jsnbKzMK8hKq8eFSWPk+Lmyx6ZzCQabGeLxg==", "dependencies": { - "@smithy/property-provider": "^2.0.4", - "@smithy/shared-ini-file-loader": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/property-provider": "^2.0.5", + "@smithy/shared-ini-file-loader": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1648,14 +1657,14 @@ } }, "node_modules/@smithy/node-http-handler": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.0.4.tgz", - "integrity": "sha512-svqeqkGgQz1B2m3IurHtp1O8vfuUGbqw6vynFmOrvPirRdiIPukHTZW1GN/JuBCtDpq9mNPutSVipfz2n4sZbQ==", - "dependencies": { - "@smithy/abort-controller": "^2.0.4", - "@smithy/protocol-http": "^2.0.4", - "@smithy/querystring-builder": "^2.0.4", - "@smithy/types": "^2.2.1", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.0.5.tgz", + "integrity": "sha512-lZm5DZf4b3V0saUw9WTC4/du887P6cy2fUyQgQQKRRV6OseButyD5yTzeMmXE53CaXJBMBsUvvIQ0hRVxIq56w==", + "dependencies": { + "@smithy/abort-controller": "^2.0.5", + "@smithy/protocol-http": "^2.0.5", + "@smithy/querystring-builder": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1663,11 +1672,11 @@ } }, "node_modules/@smithy/property-provider": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.4.tgz", - "integrity": "sha512-OfaUIhnyvOkuCPHWMPkJqX++dUaDKsiZWuZqCdU04Z9dNAl2TtZAh7dw2rsZGb57vq6YH3PierNrDfQJTAKYtg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.5.tgz", + "integrity": "sha512-cAFSUhX6aiHcmpWfrCLKvwBtgN1F6A0N8qY/8yeSi0LRLmhGqsY1/YTxFE185MCVzYbqBGXVr9TBv4RUcIV4rA==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1675,11 +1684,11 @@ } }, "node_modules/@smithy/protocol-http": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-2.0.4.tgz", - "integrity": "sha512-I1vCZ/m1U424gA9TXkL/pJ3HlRfujY8+Oj3GfDWcrNiWVmAeyx3CTvXw+yMHp2X01BOOu5fnyAa6JwAn1O+txA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-2.0.5.tgz", + "integrity": "sha512-d2hhHj34mA2V86doiDfrsy2fNTnUOowGaf9hKb0hIPHqvcnShU4/OSc4Uf1FwHkAdYF3cFXTrj5VGUYbEuvMdw==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1687,11 +1696,11 @@ } }, "node_modules/@smithy/querystring-builder": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.4.tgz", - "integrity": "sha512-Jc7UPx1pNeisYcABkoo2Pn4kvomy1UI7uxv7R+1W3806KMAKgYHutWmZG01aPHu2XH0zY2RF2KfGiuialsxHvA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.5.tgz", + "integrity": "sha512-4DCX9krxLzATj+HdFPC3i8pb7XTAWzzKqSw8aTZMjXjtQY+vhe4azMAqIvbb6g7JKwIkmkRAjK6EXO3YWSnJVQ==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-uri-escape": "^2.0.0", "tslib": "^2.5.0" }, @@ -1700,11 +1709,11 @@ } }, "node_modules/@smithy/querystring-parser": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.4.tgz", - "integrity": "sha512-Uh6+PhGxSo17qe2g/JlyoekvTHKn7dYWfmHqUzPAvkW+dHlc3DNVG3++PV48z33lCo5YDVBBturWQ9N/TKn+EA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.5.tgz", + "integrity": "sha512-C2stCULH0r54KBksv3AWcN8CLS3u9+WsEW8nBrvctrJ5rQTNa1waHkffpVaiKvcW2nP0aIMBPCobD/kYf/q9mA==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1720,11 +1729,11 @@ } }, "node_modules/@smithy/shared-ini-file-loader": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.4.tgz", - "integrity": "sha512-091yneupXnSqvAU+vLG7h0g4QRRO6TjulpECXYVU6yW/LiNp7QE533DBpaphmbtI6tTC4EfGrhn35gTa0w+GQg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.5.tgz", + "integrity": "sha512-Mvtk6FwMtfbKRC4YuSsIqRYp9WTxsSUJVVo2djgyhcacKGMqicHDWSAmgy3sDrKv+G/G6xTZCPwm6pJARtdxVg==", "dependencies": { - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1732,13 +1741,13 @@ } }, "node_modules/@smithy/signature-v4": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.4.tgz", - "integrity": "sha512-y2xblkS0hb44QJDn9YjPp5aRFYSiI7w0bI3tATE3ybOrII2fppqD0SE3zgvew/B/3rTunuiCW+frTD0W4UYb9Q==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.5.tgz", + "integrity": "sha512-ABIzXmUDXK4n2c9cXjQLELgH2RdtABpYKT+U131e2I6RbCypFZmxIHmIBufJzU2kdMCQ3+thBGDWorAITFW04A==", "dependencies": { - "@smithy/eventstream-codec": "^2.0.4", + "@smithy/eventstream-codec": "^2.0.5", "@smithy/is-array-buffer": "^2.0.0", - "@smithy/types": "^2.2.1", + "@smithy/types": "^2.2.2", "@smithy/util-hex-encoding": "^2.0.0", "@smithy/util-middleware": "^2.0.0", "@smithy/util-uri-escape": "^2.0.0", @@ -1750,13 +1759,13 @@ } }, "node_modules/@smithy/smithy-client": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.0.4.tgz", - "integrity": "sha512-Dg1dkqyj3jwa03RFs6E4ASmfQ7CjplbGISJIJNSt3F8NfIid2RalbeCMOIHK7VagKh9qngZNyoKxObZC9LB9Lg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.0.5.tgz", + "integrity": "sha512-kCTFr8wfOAWKDzGvfBElc6shHigWtHNhMQ1IbosjC4jOlayFyZMSs2PysKB+Ox/dhQ41KqOzgVjgiQ+PyWqHMQ==", "dependencies": { "@smithy/middleware-stack": "^2.0.0", - "@smithy/types": "^2.2.1", - "@smithy/util-stream": "^2.0.4", + "@smithy/types": "^2.2.2", + "@smithy/util-stream": "^2.0.5", "tslib": "^2.5.0" }, "engines": { @@ -1764,9 +1773,9 @@ } }, "node_modules/@smithy/types": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.2.1.tgz", - "integrity": "sha512-6nyDOf027ZeJiQVm6PXmLm7dR+hR2YJUkr4VwUniXA8xZUGAu5Mk0zfx2BPFrt+e5YauvlIqQoH0CsrM4tLkfg==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.2.2.tgz", + "integrity": "sha512-4PS0y1VxDnELGHGgBWlDksB2LJK8TG8lcvlWxIsgR+8vROI7Ms8h1P4FQUx+ftAX2QZv5g1CJCdhdRmQKyonyw==", "dependencies": { "tslib": "^2.5.0" }, @@ -1775,12 +1784,12 @@ } }, "node_modules/@smithy/url-parser": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.4.tgz", - "integrity": "sha512-puIQ6+TJpI2AAPw7IGdGG6d2DEcVP5nJqa1VjrxzUcy2Jx7LtGn+gDHY2o9Pc9vQkmoicovTEKgvv7CdqP+0gg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.5.tgz", + "integrity": "sha512-OdMBvZhpckQSkugCXNJQCvqJ71wE7Ftxce92UOQLQ9pwF6hoS5PLL7wEfpnuEXtStzBqJYkzu1C1ZfjuFGOXAA==", "dependencies": { - "@smithy/querystring-parser": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/querystring-parser": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" } }, @@ -1805,9 +1814,9 @@ } }, "node_modules/@smithy/util-body-length-node": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.0.0.tgz", - "integrity": "sha512-ZV7Z/WHTMxHJe/xL/56qZwSUcl63/5aaPAGjkfynJm4poILjdD4GmFI+V+YWabh2WJIjwTKZ5PNsuvPQKt93Mg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.1.0.tgz", + "integrity": "sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==", "dependencies": { "tslib": "^2.5.0" }, @@ -1839,12 +1848,12 @@ } }, "node_modules/@smithy/util-defaults-mode-browser": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.4.tgz", - "integrity": "sha512-wGdnPt4Ng72duUd97HrlqVkq6DKVB/yjaGkSg5n3uuQKzzHjoi3OdjXGumD/VYPHz0dYd7wpLNG2CnMm/nfDrg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.5.tgz", + "integrity": "sha512-yciP6TPttLsj731aHTvekgyuCGXQrEAJibEwEWAh3kzaDsfGAVCuZSBlyvC2Dl3TZmHKCOQwHV8mIE7KQCTPuQ==", "dependencies": { - "@smithy/property-provider": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/property-provider": "^2.0.5", + "@smithy/types": "^2.2.2", "bowser": "^2.11.0", "tslib": "^2.5.0" }, @@ -1853,15 +1862,15 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.4.tgz", - "integrity": "sha512-QMkNcV6x52BeeeIvhvow6UmOu7nP7DXQljY6DKOP/aAokrli53IWTP/kUTd9B0Mp9tbW3WC10O6zaM69xiMNYw==", - "dependencies": { - "@smithy/config-resolver": "^2.0.4", - "@smithy/credential-provider-imds": "^2.0.4", - "@smithy/node-config-provider": "^2.0.4", - "@smithy/property-provider": "^2.0.4", - "@smithy/types": "^2.2.1", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.5.tgz", + "integrity": "sha512-M07t99rWasXt+IaDZDyP3BkcoEm/mgIE1RIMASrE49LKSNxaVN7PVcgGc77+4uu2kzBAyqJKy79pgtezuknyjQ==", + "dependencies": { + "@smithy/config-resolver": "^2.0.5", + "@smithy/credential-provider-imds": "^2.0.5", + "@smithy/node-config-provider": "^2.0.5", + "@smithy/property-provider": "^2.0.5", + "@smithy/types": "^2.2.2", "tslib": "^2.5.0" }, "engines": { @@ -1903,13 +1912,13 @@ } }, "node_modules/@smithy/util-stream": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.4.tgz", - "integrity": "sha512-ZVje79afuv3DB1Ma/g5m/5v9Zda8nA0xNgvE1pOD3EnoTp/Ekch1z20AN6gfVsf7JYWK2VSMVDiqI9N8Ua4wbg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.5.tgz", + "integrity": "sha512-ylx27GwI05xLpYQ4hDIfS15vm+wYjNN0Sc2P0FxuzgRe8v0BOLHppGIQ+Bezcynk8C9nUzsUue3TmtRhjut43g==", "dependencies": { - "@smithy/fetch-http-handler": "^2.0.4", - "@smithy/node-http-handler": "^2.0.4", - "@smithy/types": "^2.2.1", + "@smithy/fetch-http-handler": "^2.0.5", + "@smithy/node-http-handler": "^2.0.5", + "@smithy/types": "^2.2.2", "@smithy/util-base64": "^2.0.0", "@smithy/util-buffer-from": "^2.0.0", "@smithy/util-hex-encoding": "^2.0.0", @@ -1986,9 +1995,9 @@ "integrity": "sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==" }, "node_modules/@types/node": { - "version": "20.5.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.0.tgz", - "integrity": "sha512-Mgq7eCtoTjT89FqNoTzzXg2XvCi5VMhRV6+I2aYanc6kQCBImeNaAYRs/DyoVqk1YEUJK5gN9VO7HRIdz4Wo3Q==" + "version": "20.5.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.6.tgz", + "integrity": "sha512-Gi5wRGPbbyOTX+4Y2iULQ27oUPrefaB0PxGQJnfyWN3kvEDGM3mIB5M/gQLmitZf7A9FmLeaqxD3L1CXpm3VKQ==" }, "node_modules/@types/sinon": { "version": "10.0.16", @@ -2459,9 +2468,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001521", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001521.tgz", - "integrity": "sha512-fnx1grfpEOvDGH+V17eccmNjucGUnCbP6KL+l5KqBIerp26WK/+RQ7CIDE37KGJjaPyqWXXlFUyKiWmvdNNKmQ==", + "version": "1.0.30001523", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001523.tgz", + "integrity": "sha512-I5q5cisATTPZ1mc588Z//pj/Ox80ERYDfR71YnvY7raS/NOk8xXlZcB0sF7JdqaV//kOaa6aus7lRfpdnt1eBA==", "funding": [ { "type": "opencollective", @@ -2751,9 +2760,9 @@ "peer": true }, "node_modules/electron-to-chromium": { - "version": "1.4.494", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.494.tgz", - "integrity": "sha512-KF7wtsFFDu4ws1ZsSOt4pdmO1yWVNWCFtijVYZPUeW4SV7/hy/AESjLn/+qIWgq7mHscNOKAwN5AIM1+YAy+Ww==" + "version": "1.4.502", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.502.tgz", + "integrity": "sha512-xqeGw3Gr6o3uyHy/yKjdnDQHY2RQvXcGC2cfHjccK1IGkH6cX1WQBN8EeC/YpwPhGkBaikDTecJ8+ssxSVRQlw==" }, "node_modules/emphasize": { "version": "4.2.0", @@ -3786,9 +3795,9 @@ "optional": true }, "node_modules/mongodb": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.7.0.tgz", - "integrity": "sha512-zm82Bq33QbqtxDf58fLWBwTjARK3NSvKYjyz997KSy6hpat0prjeX/kxjbPVyZY60XYPDNETaHkHJI2UCzSLuw==", + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.8.1.tgz", + "integrity": "sha512-wKyh4kZvm6NrCPH8AxyzXm3JBoEf4Xulo0aUWh3hCgwgYJxyQ1KLST86ZZaSWdj6/kxYUA3+YZuyADCE61CMSg==", "dependencies": { "bson": "^5.4.0", "mongodb-connection-string-url": "^2.6.0", @@ -3798,12 +3807,12 @@ "node": ">=14.20.1" }, "optionalDependencies": { - "saslprep": "^1.0.3" + "@mongodb-js/saslprep": "^1.1.0" }, "peerDependencies": { - "@aws-sdk/credential-providers": "^3.201.0", - "@mongodb-js/zstd": "^1.1.0", - "kerberos": "^2.0.1", + "@aws-sdk/credential-providers": "^3.188.0", + "@mongodb-js/zstd": "^1.0.0", + "kerberos": "^1.0.0 || ^2.0.0", "mongodb-client-encryption": ">=2.3.0 <3", "snappy": "^7.2.2" }, @@ -3954,9 +3963,9 @@ "optional": true }, "node_modules/node-fetch": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz", - "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -4895,9 +4904,9 @@ } }, "node_modules/tslib": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", - "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==" + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/tunnel-agent": { "version": "0.6.0", @@ -4925,9 +4934,9 @@ } }, "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/nixpkgs/pkgs/development/tools/mongosh/source.json b/nixpkgs/pkgs/development/tools/mongosh/source.json index 4ae0b069de68..5555d11e8028 100644 --- a/nixpkgs/pkgs/development/tools/mongosh/source.json +++ b/nixpkgs/pkgs/development/tools/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "1.10.5", - "integrity": "sha512-OAaUQv9dw/2p7Q8qIlUm8Ckv0UGFIPKHD09ApNcGU1bI3E6rGGhIMcpG8rcmdyV59mbtzoV4IeGkHbqX0KhGaw==", - "filename": "mongosh-1.10.5.tgz", - "deps": "sha256-P4JT4j2JiCIpHBODpXHcyLWd5VnOK0wXBkxtcAh2g4w=" + "version": "1.10.6", + "integrity": "sha512-rReUz89EF5eERhPZo29nYpKAux1u5iK3ug74wtsr7kE9SOJs5XGWS2gh8LKSMK9uieeDKRYX8+nFIa4bl1Ls2Q==", + "filename": "mongosh-1.10.6.tgz", + "deps": "sha256-j1l6PVPkp5Ju0uBB6dKfQP8fbwttWpPR3VPviu4a/Zg=" } diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix index a09f226b3f13..02355cb9846c 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib, perl, makeWrapper , rresult, bos, ocaml_pcre, re, camlp-streams +, legacy ? false }: if lib.versionOlder ocaml.version "4.02" @@ -7,7 +8,7 @@ then throw "camlp5 is not available for OCaml ${ocaml.version}" else let params = - if lib.versionAtLeast ocaml.version "4.12" + if lib.versionAtLeast ocaml.version "4.12" && !legacy then rec { version = "8.00.05"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix b/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix index 0a5d317cbcec..6cd8154877eb 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -15,7 +15,7 @@ }: let - merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.9" else "4.7"; + merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.10" else "4.7"; hashes = { "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; @@ -24,6 +24,8 @@ let "4.8-500" = "sha256-n5NHKuo0/lZmfe7WskqnW3xm1S0PmXKSS93BDKrpjCI="; "4.9-414" = "sha256-4j/EeBNZEmn/nSfIIJiOUgpmLIndCvfqZSshUXSZy/0="; "4.9-500" = "sha256-uQfGazoxTxclHSiTfjji+tKJv8MKqRdHMPD/xfMZlSY="; + "4.10-414" = "sha256-/a1OqASISpb06eh2gsam1rE3wovM4CT8ybPV86XwR2c="; + "4.10-500" = "sha256-m9+Qz8DT94yNSwpamTVLQKISHtRVBWnZD3t/yyujSZ0="; }; ocamlVersionShorthand = lib.substring 0 3 diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json index b212fffc1b1c..176881caeed1 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json @@ -2505,8 +2505,14 @@ "setuptools" ], "build": [ - "flit-core", - "setuptools" + { + "buildSystem": "setuptools", + "until": "0.10.0" + }, + { + "buildSystem": "flit-core", + "from": "0.10.0" + } ], "buildbot": [ "setuptools" @@ -5812,11 +5818,7 @@ "setuptools" ], "flit": [ - "flit-core", - "setuptools" - ], - "flit-core": [ - "setuptools" + "flit-core" ], "flit-scm": [ "flit-core", @@ -7540,8 +7542,7 @@ "setuptools" ], "installer": [ - "flit-core", - "setuptools" + "flit-core" ], "insteon-frontend-home-assistant": [ "setuptools" @@ -10863,8 +10864,24 @@ "setuptools" ], "packaging": [ - "flit-core", - "setuptools" + { + "buildSystem": "setuptools", + "until": "20.4" + }, + { + "buildSystem": "flit-core", + "from": "20.4", + "until": "20.8" + }, + { + "buildSystem": "setuptools", + "from": "20.8", + "until": "22.0" + }, + { + "buildSystem": "flit-core", + "from": "22.0" + } ], "packbits": [ "setuptools" @@ -18088,8 +18105,14 @@ "poetry" ], "tomli": [ - "flit-core", - "setuptools" + { + "buildSystem": "poetry-core", + "until": "1.0.2" + }, + { + "buildSystem": "flit-core", + "from": "1.0.2" + } ], "tomli-w": [ "flit-core", @@ -19331,7 +19354,14 @@ "setuptools" ], "wheel": [ - "setuptools" + { + "buildSystem": "setuptools", + "until": "0.40.0" + }, + { + "buildSystem": "flit-core", + "from": "0.40.0" + } ], "wheel-filename": [ "setuptools" diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index 14338423ec39..d96d920c7094 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -2738,15 +2738,12 @@ lib.composeManyExtensions [ } ); - wheel = (( - pkgs.python3.pkgs.override { - python = self.python; + wheel = if self.python.isPy2 then + super.wheel.override { + inherit (self) bootstrapped-pip; } - ).wheel.override { - inherit (self) buildPythonPackage bootstrapped-pip setuptools; - }).overrideAttrs (old: { - inherit (super.wheel) pname name version src; - }); + else + super.wheel; zipp = if super.zipp == null then null else super.zipp.overridePythonAttrs ( @@ -2757,20 +2754,6 @@ lib.composeManyExtensions [ } ); - packaging = - let - old = super.packaging; - in - # From 20.5 until 20.7, packaging used flit for packaging (heh) - # See https://github.com/pypa/packaging/pull/352 and https://github.com/pypa/packaging/pull/367 - if (lib.versionAtLeast old.version "20.5" && lib.versionOlder old.version "20.8") then - addBuildSystem - { - inherit self; - drv = old; - attr = "flit-core"; - } else old; - psutil = super.psutil.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ diff --git a/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix b/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix index 123573401dae..0147913cca63 100644 --- a/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ b/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.9.0"; + version = "1.11.0"; src = fetchFromGitHub { - owner = "bufbuild"; + owner = "connectrpc"; repo = "connect-go"; rev = "refs/tags/v${version}"; - hash = "sha256-2U5f+VUXZ8J9K27RccKvEY7FJs57XMasKMk+xgy0LuI="; + hash = "sha256-sKAocI2zT2jbw42Oe7lX8J1wLVBh7RfJe1hP8aXRCuM="; }; vendorHash = "sha256-3opkr4kUD3NQNbNYOdSWIDqKbArv9OQUkBMzae1ccVY="; @@ -20,11 +20,16 @@ buildGoModule rec { "cmd/protoc-gen-connect-go" ]; + preCheck = '' + # test all paths + unset subPackages + ''; + meta = with lib; { - description = "library for building browser and gRPC-compatible HTTP APIs"; - homepage = "https://github.com/bufbuild/connect-go"; - changelog = "https://github.com/bufbuild/connect-go/releases/tag/v${version}"; + description = "Simple, reliable, interoperable, better gRPC"; + homepage = "https://github.com/connectrpc/connect-go"; + changelog = "https://github.com/connectrpc/connect-go/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ kilimnik ]; + maintainers = with maintainers; [ kilimnik jk ]; }; } diff --git a/nixpkgs/pkgs/development/tools/pyenv/default.nix b/nixpkgs/pkgs/development/tools/pyenv/default.nix index 83e5a6b667b7..a60ca4eda3f3 100644 --- a/nixpkgs/pkgs/development/tools/pyenv/default.nix +++ b/nixpkgs/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.3.24"; + version = "2.3.25"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-hIScCDm15voOamgiRrgn303x2JsWXIF6Oe5PqGUGJQI="; + hash = "sha256-804bLieYrfwzUrKSvZtC6Td4+fFPw1WrhV1NE4n49Rw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/nixpkgs/pkgs/development/tools/qtcreator/default.nix index 66de800f6ed1..9c5ca6a16a32 100644 --- a/nixpkgs/pkgs/development/tools/qtcreator/default.nix +++ b/nixpkgs/pkgs/development/tools/qtcreator/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { advanced code editor, a visual debugger and a GUI designer. ''; homepage = "https://wiki.qt.io/Qt_Creator"; - license = licenses.lgpl3Plus; + license = licenses.gpl3Only; # annotated with The Qt Company GPL Exception 1.0 maintainers = [ maintainers.rewine ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/tools/ruff/Cargo.lock b/nixpkgs/pkgs/development/tools/ruff/Cargo.lock index 67c2d0db0b84..261438324222 100644 --- a/nixpkgs/pkgs/development/tools/ruff/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/ruff/Cargo.lock @@ -812,7 +812,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flake8-to-ruff" -version = "0.0.285" +version = "0.0.286" dependencies = [ "anyhow", "clap", @@ -876,8 +876,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -2064,7 +2066,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.0.285" +version = "0.0.286" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -2128,6 +2130,7 @@ dependencies = [ "typed-arena", "unicode-width", "unicode_names2", + "uuid", "wsl", ] @@ -2164,7 +2167,7 @@ dependencies = [ [[package]] name = "ruff_cli" -version = "0.0.285" +version = "0.0.286" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -2340,6 +2343,7 @@ dependencies = [ "insta", "is-macro", "itertools", + "memchr", "once_cell", "ruff_formatter", "ruff_python_ast", @@ -2399,6 +2403,7 @@ dependencies = [ "ruff_text_size", "rustc-hash", "static_assertions", + "test-case", "tiny-keccak", "unic-emoji-char", "unic-ucd-ident", @@ -3344,9 +3349,26 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "getrandom", + "rand", + "uuid-macro-internal", + "wasm-bindgen", +] + +[[package]] +name = "uuid-macro-internal" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7e1ba1f333bd65ce3c9f27de592fcbc256dafe3af2717f56d7c87761fbaccf4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.23", +] [[package]] name = "valuable" diff --git a/nixpkgs/pkgs/development/tools/ruff/default.nix b/nixpkgs/pkgs/development/tools/ruff/default.nix index e1e39f1bfbdb..fc5520be15b8 100644 --- a/nixpkgs/pkgs/development/tools/ruff/default.nix +++ b/nixpkgs/pkgs/development/tools/ruff/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.285"; + version = "0.0.286"; src = fetchFromGitHub { owner = "astral-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-n5FjzngdVSHHnBpVGFXzPlUAEMx96JqjYqgKwymTMzA="; + hash = "sha256-5bMfOju1uJV4+a4UTzaanpzU6PjCSK9HHMdhvKVaNcg="; }; cargoLock = { diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix index 1d53e3724b69..0868e2f7d55f 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-xqY1C3ZPGY9GeyuSgV0s4+eSkm4r+jOQkNgSzqE2QUI="; + hash = "sha256-uT8nSsC8QstjbyO5Ve2jSug3Bd/DuUNoGzquDPVl++o="; }; - cargoHash = "sha256-yAda80b62WGYuKo5YtCLRtx08fmNs5HLDcNWhq+FG/I="; + cargoHash = "sha256-rxQKU73ANokxLb42u3Zom+5Wbv/ayiQJaM9NsTWW8fU="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-bundle/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-bundle/default.nix index f29d9aba8294..73924d1c599a 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-bundle/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-bundle/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage { pname = "cargo-bundle"; # the latest stable release fails to build on darwin - version = "unstable-2023-03-17"; + version = "unstable-2023-08-18"; src = fetchFromGitHub { owner = "burtonageo"; repo = "cargo-bundle"; - rev = "eb9fe1b0880c7c0e929a93edaddcb0a61cd3f0d4"; - hash = "sha256-alO+Q9IK5Hz09+TqHWsbjuokxISKQfQTM6QnLlUNydw="; + rev = "c9f7a182d233f0dc4ad84e10b1ffa0d44522ea43"; + hash = "sha256-n+c83pmCvFdNRAlcadmcZvYj+IRqUYeE8CJVWWYbWDQ="; }; - cargoHash = "sha256-h+QPbwYTJk6dieta/Q+VAhYe8/YH/Nik6gslzUn0YxI="; + cargoHash = "sha256-Ea658jHomktmzXtU5wmd0bRX+i5n46hCvexYxYbjjUc="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-component/Cargo.lock b/nixpkgs/pkgs/development/tools/rust/cargo-component/Cargo.lock index bb7d4a06c01f..e7264f5d7f4c 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-component/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/rust/cargo-component/Cargo.lock @@ -568,9 +568,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 = [ "libc", ] @@ -769,9 +769,9 @@ dependencies = [ [[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" dependencies = [ "serde", ] @@ -1163,9 +1163,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", @@ -2006,12 +2006,12 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 1.9.3", + "indexmap 2.0.0", ] [[package]] @@ -2373,9 +2373,9 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "20b9b67e2ca7dd9e9f9285b759de30ff538aab981abaaf7bc9bd90b84a0126c3" dependencies = [ "base64 0.21.2", "bytes", @@ -2586,18 +2586,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.183" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" dependencies = [ "proc-macro2", "quote", @@ -2659,9 +2659,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1402f54f9a3b9e2efe71c1cea24e648acce55887983553eeb858cf3115acfd49" +checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ "base64 0.21.2", "chrono", @@ -2676,9 +2676,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9197f1ad0e3c173a0222d3c4404fb04c3afe87e962bcb327af73e8301fa203c7" +checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" dependencies = [ "darling", "proc-macro2", @@ -2848,9 +2848,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[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", @@ -3171,9 +3171,9 @@ dependencies = [ [[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", ] @@ -3533,9 +3533,9 @@ dependencies = [ [[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", @@ -3723,11 +3723,12 @@ dependencies = [ [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys", ] [[package]] @@ -3766,8 +3767,7 @@ dependencies = [ [[package]] name = "wit-bindgen" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a86fe4c862e5d3d06d65ff0e9b5da8e84217af535bca6fc3acffed9eff0f5c2" +source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" dependencies = [ "bitflags 2.4.0", "wit-bindgen-rust-macro", @@ -3776,8 +3776,7 @@ dependencies = [ [[package]] name = "wit-bindgen-core" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed17e12f4277a1de3a33ef68e4934bd10a9c295053f4de803b5c0ba856b4c08" +source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" dependencies = [ "anyhow", "wit-component", @@ -3787,8 +3786,7 @@ dependencies = [ [[package]] name = "wit-bindgen-rust" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b6a165d93a825badf9c2db8c4033d76455807a4ab5f6890ccd01936d16b20ed" +source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" dependencies = [ "anyhow", "heck", @@ -3801,8 +3799,7 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-lib" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e00b553c5b5fcdabe295cb1cdb369f76f72e8c626be1930e99bb01a4e7f4dc" +source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" dependencies = [ "heck", "wit-bindgen-core", @@ -3811,8 +3808,7 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4d49b81b63fa30c3b13a559cd89dc3a721ccd94736a0b375cae718da5995d64" +source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" dependencies = [ "anyhow", "proc-macro2", diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix index 3fa4f826618a..4942045a4934 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,19 +9,20 @@ rustPlatform.buildRustPackage { pname = "cargo-component"; - version = "unstable-2023-08-19"; + version = "unstable-2023-08-24"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; - rev = "4abbb89ed356887a5b7e822c507cc1d02cbe8935"; - hash = "sha256-MZQcyK8AN/TRplTNuPkNMFFdJIlWxHEB4W6z5PnFDxw="; + rev = "a4ee64625a5248234397a9c7c2a7513bb025b030"; + hash = "sha256-7fnzIzWb2f1tJfH3mLMesQtNCy4Zg7I/T+lGiorifY8="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "warg-api-0.1.0" = "sha256-A5FQ/nbuzV8ockV6vOMKUEoJKeaId3oyZU1QeNpd1Zc="; + "wit-bindgen-0.10.0" = "sha256-/QZIIbUzDFUb5wAGoKFg1BbgNUEmP06ZJKVzhwlPecE="; }; }; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix index 1c9e073ecdd7..47e62a2c366b 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-yuBf6WgY+sGk7Y5/gZFHeawbHhsVIxabFlpiL4AUzK8="; + hash = "sha256-uHkmwmEVV3+VPvp5WIc+PbwYvhYZHStiMun1yguPelw="; }; - cargoHash = "sha256-vfpSMa3NO95SPU4jSW1qKMUy4EGZloYNC3SyGwlTGC0="; + cargoHash = "sha256-8bgb8CCkoqECyd9CW2OkPQmhqfiIOuelsXhOcm1d9kQ="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-edit/Cargo.lock b/nixpkgs/pkgs/development/tools/rust/cargo-edit/Cargo.lock index 63d3e165df5c..86da7d6071e9 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-edit/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/rust/cargo-edit/Cargo.lock @@ -10,48 +10,53 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] [[package]] -name = "aho-corasick" -version = "1.0.1" +name = "anstream" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" dependencies = [ - "memchr", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon 1.0.2", + "colorchoice", + "is-terminal", + "utf8parse", ] [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", - "anstyle-wincon", + "anstyle-wincon 2.1.0", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -62,32 +67,42 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "assert_cmd" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ - "anstream", + "anstream 0.3.2", "anstyle", "bstr", "doc-comment", @@ -103,7 +118,7 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" dependencies = [ - "anstream", + "anstream 0.3.2", "anstyle", "doc-comment", "globwalk", @@ -138,9 +153,9 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" -version = "0.13.1" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "base64ct" @@ -155,6 +170,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] name = "block-buffer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -165,12 +186,11 @@ dependencies = [ [[package]] name = "bstr" -version = "1.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "once_cell", "regex-automata", "serde", ] @@ -189,16 +209,16 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "camino" -version = "1.1.4" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" dependencies = [ "serde", ] [[package]] name = "cargo-edit" -version = "0.12.0" +version = "0.12.1" dependencies = [ "anyhow", "assert_cmd", @@ -214,7 +234,7 @@ dependencies = [ "git2", "hex", "home", - "indexmap", + "indexmap 1.9.3", "native-tls", "pathdiff", "predicates", @@ -235,9 +255,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" dependencies = [ "serde", ] @@ -245,12 +265,12 @@ dependencies = [ [[package]] name = "cargo-test-macro" version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo#13413c64ff88dd6c2824e9eb9374fc5f10895d28" +source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" [[package]] name = "cargo-test-support" version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo#13413c64ff88dd6c2824e9eb9374fc5f10895d28" +source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" dependencies = [ "anyhow", "cargo-test-macro", @@ -271,13 +291,13 @@ dependencies = [ "time", "toml", "url", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "cargo-util" -version = "0.2.4" -source = "git+https://github.com/rust-lang/cargo#13413c64ff88dd6c2824e9eb9374fc5f10895d28" +version = "0.2.7" +source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" dependencies = [ "anyhow", "core-foundation", @@ -285,14 +305,14 @@ dependencies = [ "hex", "jobserver", "libc", - "log", "miow", "same-file", "sha2", "shell-escape", "tempfile", + "tracing", "walkdir", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -311,11 +331,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -326,9 +347,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" dependencies = [ "clap_builder", "clap_derive", @@ -337,13 +358,12 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" dependencies = [ - "anstream", + "anstream 0.5.0", "anstyle", - "bitflags", "clap_lex", "strsim", "terminal_size", @@ -351,9 +371,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck", "proc-macro2", @@ -363,9 +383,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" @@ -380,7 +400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7104119c2f80d887239879d0c50e033cd40eac9a3f3561e0684ba7d5d654f4da" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "concolor-query", ] @@ -392,9 +412,9 @@ checksum = "ad159cc964ac8f9d407cbc0aa44b02436c054b541f2b4b5f06972e1efdc54bc7" [[package]] name = "const-oid" -version = "0.9.2" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] name = "content_inspector" @@ -423,24 +443,23 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] [[package]] name = "crates-index" -version = "0.19.10" +version = "0.19.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65aa5fcd68f892b56202f15a18a53308b2d489b728958dbce48d2d1f3bbaa685" +checksum = "c3cab38e209d6ba8bd5b0d41c784ec63a5a9ea3adf866b820d377588960f1ded" dependencies = [ "git2", "hex", "home", "memchr", - "num_cpus", "rayon", "rustc-hash", "semver", @@ -453,14 +472,14 @@ dependencies = [ [[package]] name = "crates-io" -version = "0.36.1" -source = "git+https://github.com/rust-lang/cargo#13413c64ff88dd6c2824e9eb9374fc5f10895d28" +version = "0.39.0" +source = "git+https://github.com/rust-lang/cargo#2a6f7f6efe118ed9b82dfff4591fac70b4bca790" dependencies = [ - "anyhow", "curl", "percent-encoding", "serde", "serde_json", + "thiserror", "url", ] @@ -496,9 +515,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -509,18 +528,18 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] [[package]] name = "crypto-bigint" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7" +checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" dependencies = [ "generic-array", "rand_core", @@ -561,9 +580,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.61+curl-8.0.1" +version = "0.4.65+curl-8.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d05c10f541ae6f3bc5b3d923c20001f47db7d5f0b2bc6ad16490133842db79" +checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986" dependencies = [ "cc", "libc", @@ -576,9 +595,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.4" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b14af2045fa69ed2b7a48934bebb842d0f33e73e96e78766ecb14bb5347a11" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", "pem-rfc7468", @@ -586,6 +605,15 @@ dependencies = [ ] [[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +dependencies = [ + "serde", +] + +[[package]] name = "difflib" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -617,15 +645,16 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "ecdsa" -version = "0.16.6" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a48e5d537b8a30c0b023116d981b16334be1485af7ca68db3a2b7024cbc957fd" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ "der", "digest", "elliptic-curve", "rfc6979", "signature", + "spki", ] [[package]] @@ -639,15 +668,15 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" -version = "0.13.4" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c71eaa367f2e5d556414a8eea812bc62985c879748d6403edabd9cb03f16e7" +checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" dependencies = [ "base16ct", "crypto-bigint", @@ -675,14 +704,20 @@ dependencies = [ ] [[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.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -697,12 +732,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "ff" @@ -722,21 +754,21 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", + "redox_syscall", + "windows-sys", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "libz-sys", @@ -775,9 +807,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -795,9 +827,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -808,11 +840,11 @@ dependencies = [ [[package]] name = "git2" -version = "0.17.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7905cdfe33d31a88bb2e8419ddd054451f5432d1da9eaf2ac7804ee1ea12d5" +checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -829,11 +861,11 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", "bstr", "fnv", "log", @@ -846,7 +878,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "ignore", "walkdir", ] @@ -869,6 +901,12 @@ 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" @@ -885,18 +923,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -931,7 +960,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -952,9 +981,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -984,39 +1013,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", ] [[package]] -name = "instant" -version = "0.1.12" +name = "indexmap" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ - "cfg-if", + "equivalent", + "hashbrown 0.14.0", ] [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[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", - "windows-sys 0.48.0", + "hermit-abi 0.3.2", + "rustix 0.38.9", + "windows-sys", ] [[package]] @@ -1030,9 +1059,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 = "jobserver" @@ -1045,9 +1074,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1060,15 +1089,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libgit2-sys" -version = "0.15.1+1.6.4" +version = "0.15.2+1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4577bde8cdfc7d6a2a4bcb7b049598597de33ffd337276e9c7db6cd4a2cee7" +checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" dependencies = [ "cc", "libc", @@ -1094,9 +1123,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -1111,13 +1140,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] +name = "linux-raw-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" + +[[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" @@ -1127,9 +1159,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -1145,11 +1177,11 @@ dependencies = [ [[package]] name = "miow" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" +checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -1178,36 +1210,36 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.2", "libc", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.52" +version = "0.10.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -1235,18 +1267,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.25.3+1.1.1t" +version = "111.27.0+1.1.1v" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924757a6a226bf60da5f7dd0311a34d2b52283dd82ddeb103208ddc66362f80c" +checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.87" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ "cc", "libc", @@ -1257,9 +1289,9 @@ dependencies = [ [[package]] name = "orion" -version = "0.17.4" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbe74a766292f94f7e69db5a7bf010eadd944f24186c463fe578a7e637582066" +checksum = "b11468cc6afd61a126fe3f91cc4cc8a0dbe7917d0a4b5e8357ba91cc47444462" dependencies = [ "fiat-crypto", "subtle", @@ -1273,7 +1305,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1290,9 +1322,9 @@ dependencies = [ [[package]] name = "pasetors" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824bf633b85dc1dece2eb07161627ba5d90a951597cd5dbf8d85f4d82b7aea69" +checksum = "ba765699a309908d55950919a3445e9491453e89b2587b1b2abe4143a48894c0" dependencies = [ "ct-codecs", "ed25519-compact", @@ -1326,9 +1358,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pin-project-lite" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pkcs8" @@ -1369,9 +1407,9 @@ checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "predicates-tree" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfd78a1cd6926a74e7f263eb466b765c79409b176be05c3676fac27df378e96" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" dependencies = [ "predicates-core", "termtree", @@ -1379,27 +1417,27 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf8d3875361e28f7753baefef104386e7aa47642c93023356d97fdef4003bfb5" +checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" dependencies = [ "elliptic-curve", ] [[package]] name = "proc-macro2" -version = "1.0.58" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.27" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1437,44 +1475,41 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_syscall" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.8.2" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ - "aho-corasick 1.0.1", + "aho-corasick", "memchr", + "regex-automata", "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rfc6979" @@ -1509,35 +1544,68 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.19" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", - "windows-sys 0.48.0", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.5", + "windows-sys", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", "ring", + "rustls-webpki 0.101.4", "sct", - "webpki", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +dependencies = [ + "ring", + "untrusted", ] [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -1550,18 +1618,18 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -1575,9 +1643,9 @@ dependencies = [ [[package]] name = "sec1" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct", "der", @@ -1589,11 +1657,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -1602,9 +1670,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -1612,27 +1680,27 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.163" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", @@ -1641,9 +1709,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -1652,18 +1720,18 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -1709,11 +1777,11 @@ dependencies = [ [[package]] name = "snapbox" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6bccd62078347f89a914e3004d94582e13824d4e3d8a816317862884c423835" +checksum = "ad90eb3a2e3a8031d636d45bd4832751aefd58a291b553f7305a2bacae21aff3" dependencies = [ - "anstream", + "anstream 0.5.0", "anstyle", "content_inspector", "dunce", @@ -1726,16 +1794,16 @@ dependencies = [ "tempfile", "wait-timeout", "walkdir", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] name = "snapbox-macros" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaaf09df9f0eeae82be96290918520214530e738a7fe5a351b0f24cf77c0ca31" +checksum = "95f4ffd811b87da98d0e48285134b7847954bd76e843bb794a893b47ca3ee325" dependencies = [ - "anstream", + "anstream 0.5.0", ] [[package]] @@ -1767,9 +1835,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spki" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a5be806ab6f127c3da44b7378837ebf01dadca8510a0e572460216b228bd0e" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ "base64ct", "der", @@ -1793,15 +1861,15 @@ dependencies = [ [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.16" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -1810,9 +1878,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.38" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -1820,15 +1888,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "redox_syscall", + "rustix 0.38.9", + "windows-sys", ] [[package]] @@ -1846,8 +1914,8 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "rustix", - "windows-sys 0.48.0", + "rustix 0.37.23", + "windows-sys", ] [[package]] @@ -1858,18 +1926,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", @@ -1888,10 +1956,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ + "deranged", "itoa", "serde", "time-core", @@ -1906,9 +1975,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -1930,9 +1999,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -1942,20 +2011,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.9" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -1963,10 +2032,42 @@ dependencies = [ ] [[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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 = "trycmd" -version = "0.14.16" +version = "0.14.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2925e71868a12b173c1eb166018c2d2f9dfaedfcaec747bdb6ea2246785d258e" +checksum = "bc6a42f89ccf3c6ee115608a68e256c172734d525a4ac36d4a17a6d4a8108149" dependencies = [ "glob", "humantime", @@ -1992,9 +2093,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -2013,28 +2114,28 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "ureq" -version = "2.6.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d" +checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" dependencies = [ "base64", "log", "native-tls", "once_cell", "rustls", + "rustls-webpki 0.100.2", "serde", "serde_json", "socks", "url", - "webpki", "webpki-roots", ] [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -2086,9 +2187,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2096,9 +2197,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", @@ -2111,9 +2212,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2121,9 +2222,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", @@ -2134,37 +2235,27 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", ] [[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" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "webpki", + "rustls-webpki 0.100.2", ] [[package]] @@ -2200,156 +2291,75 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[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.0", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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.2" +version = "0.48.5" 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" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +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.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.2" +version = "0.48.5" 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" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +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.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix index 7185d5e7cb9d..da19ac8c9d20 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-OUo007XP2B9F8ACTauiA6uls9b3KS5iq15bJDPYCONU="; + hash = "sha256-YKWJR3JgvLd43BpGHrmG3eFj9eRhwGm2e5sfrHdF90U="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "cargo-test-macro-0.1.0" = "sha256-hzoQmgvAerIoz7qoT3iyY6kHnt3g1Pv4FaJoqQYU2zE="; + "cargo-test-macro-0.1.0" = "sha256-yE8BJMTRBT3P29t5ygMCybs0CYDcFLVlxi1L0LkBV9Q="; }; }; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index 4c1399b5ff44..4227243be4f2 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.64"; + version = "1.0.65"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-8DBkF2JRrsrZTW6gNBiUyVpwFvOpoZnm2vsR4O/6c6c="; + sha256 = "sha256-fPrke89Nlr9Yj0bkB6HTwMymQsjAQ+5+o7iVPGH7Tyc="; }; - cargoHash = "sha256-r5qRxc8Jt5OBWCiBhFs8zPoxbuercsQ7gw5FfOKH3ow="; + cargoHash = "sha256-Q7nBKdwZlL/HleuiniuvErGF6Avf58xR++cJ7PP8RME="; meta = with lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix index dda30de0d2fa..95eb36a70dc1 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.5.29"; + version = "0.6.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Z3UExZghVw7Pbgh5nHuiC8cFVefBE0yZ2k5laam8myY="; + sha256 = "sha256-kb4ftO4nhQ+MykK18O5aoexuBoN+u0xobUvIEge00jU="; }; - cargoSha256 = "sha256-5X3MX2KV87mOcN/cL/lFU9K9/j04zn5C7teIXFqj7Wk="; + cargoSha256 = "sha256-+Am9w3iU2kSAIx+1tK3kpoa+oJvLQ6Ew7LeP6njYEQw="; # some necessary files are absent in the crate version doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 13536298e112..88b2f2e24406 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; - version = "0.5.30"; + version = "0.5.31"; src = fetchCrate { inherit pname version; - sha256 = "sha256-35tpMLVBLwm1aEqznUniv7J/D77CosllpgpeYsglvcs="; + sha256 = "sha256-HjnP9H1t660PJ5eXzgAhrdDEgqdzzb+9Dbk5RGUPjaQ="; }; - cargoSha256 = "sha256-7E6Biveh+fBEtQhJW346Pakimc0tTacHcSvKSJusyFs="; + cargoSha256 = "sha256-p6zpRRNX4g+jESNSwouWMjZlFhTBFJhe7LirYtFrZ1g="; # skip tests which require llvm-tools-preview checkFlags = [ diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix index 913755b64812..af5937e328d0 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.31.3"; + version = "0.32.0"; src = fetchCrate { inherit pname version; - hash = "sha256-oSjfNbId5jEHeLiJ3FMoNqwLZg6iyr3ZqpcfKvEnpac="; + hash = "sha256-etEwMmfwyOTHRb/UfkcHvmnLVVqeSagWJ5HjuJ6gZVo="; }; - cargoHash = "sha256-VHHEQafQfRqmdscuWpN+NdcfEc1sTt+lKLg26aM9QQE="; + cargoHash = "sha256-7GyPjEit3FEjnegLnZt9TMLBI3BtzcDssrJPj60gpTo="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-run-bin/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-run-bin/default.nix new file mode 100644 index 000000000000..dca10dc1c42a --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-run-bin/default.nix @@ -0,0 +1,28 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-run-bin"; + version = "1.1.5"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-YCWjdY8feiqU4/bOn19qbY8YiKa3SvFImvH0wDKXOhI="; + }; + + cargoSha256 = "sha256-mNJZjEkuUwo/aqyotqjNj+P50dFFGaJnLQ2CyCYg/1Y="; + + # multiple impurities in tests + doCheck = false; + + meta = with lib; { + description = "Build, cache, and run binaries scoped in Cargo.toml rather than installing globally. This acts similarly to npm run and gomodrun, and allows your teams to always be running the same tooling versions"; + homepage = "https://github.com/dustinblackman/cargo-run-bin"; + changelog = "https://github.com/dustinblackman/cargo-run-bin/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ mightyiam matthiasbeyer ]; + }; +} + diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock index b8653c5cbfb0..3521b27b18f3 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock @@ -52,9 +52,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -136,9 +136,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -146,9 +146,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "anymap2" @@ -245,9 +245,9 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -292,18 +292,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -642,9 +642,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.19" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a1de45611fdb535bfde7b7de4fd54f4fd2b17b1737c0a59b69bf9b92074b8c" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", @@ -670,7 +670,7 @@ dependencies = [ "sha1", "sync_wrapper", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.20.0", "tower", "tower-layer", "tower-service", @@ -715,9 +715,9 @@ dependencies = [ [[package]] name = "axum-extra" -version = "0.7.5" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cebbcd90f811f93fc2a993024caecc1e8270d9d1eb9d3359edb3069c2096ea6f" +checksum = "a93e433be9382c737320af3924f7d5fc6f89c155cf2bf88949d8f5126fab283f" dependencies = [ "axum", "axum-core", @@ -731,7 +731,6 @@ dependencies = [ "serde", "tokio", "tower", - "tower-http 0.4.3", "tower-layer", "tower-service", ] @@ -862,9 +861,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" dependencies = [ "serde", ] @@ -981,7 +980,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "regex-automata 0.3.4", + "regex-automata 0.3.6", "serde", ] @@ -1142,7 +1141,7 @@ dependencies = [ [[package]] name = "cargo-shuttle" -version = "0.24.0" +version = "0.25.1" dependencies = [ "anyhow", "assert_cmd", @@ -1180,13 +1179,12 @@ dependencies = [ "shuttle-common-tests", "shuttle-proto", "shuttle-service", - "sqlx", "strum", "tar", "tempfile", "test-context", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.19.0", "tokiotest-httpserver", "toml 0.5.11", "toml_edit 0.16.2", @@ -1214,9 +1212,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.80" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f1226cd9da55587234753d1245dd5b132343ea240f26b6a9003d68706141ba" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", "libc", @@ -1295,7 +1293,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1364,9 +1362,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] name = "const-random" @@ -1774,9 +1772,9 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "der" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", "pem-rfc7468", @@ -1799,9 +1797,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8810e7e2cf385b1e9b50d68264908ec367ba642c96d02edfe61c39e88e2a3c01" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" dependencies = [ "serde", ] @@ -1946,7 +1944,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2088,7 +2086,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b0377f1edc77dbd1118507bc7a66e4ab64d2b90c66f90726dc801e73a8c68f9" dependencies = [ "cfg-if 1.0.0", - "rustix 0.38.6", + "rustix 0.38.8", "windows-sys 0.48.0", ] @@ -2104,13 +2102,13 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] @@ -2128,9 +2126,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -2202,15 +2200,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d167b646a876ba8fda6b50ac645cfd96242553cbaf0ca4fccaa39afcbf0801f" dependencies = [ "io-lifetimes 1.0.11", - "rustix 0.38.6", + "rustix 0.38.8", "windows-sys 0.48.0", ] [[package]] name = "fs_at" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15550ecca96ea332ec143fb450701074143b70d358e50b32b1f847ccff2e1cf7" +checksum = "13865faf9bae9729a623b591520adb9c5b1b0ecbec8a48394f47f6801a458f9f" dependencies = [ "aligned", "cfg-if 1.0.0", @@ -2293,7 +2291,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2627,9 +2625,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aca8bbd8e0707c1887a8bbb7e6b40e228f251ff5d62c8220a4a7a53c73aff006" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", "bstr", @@ -2640,9 +2638,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", @@ -2815,9 +2813,9 @@ checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" [[package]] name = "http-serde" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e272971f774ba29341db2f686255ff8a979365a26fb9e4277f6b6d9ec0cdd5e" +checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" dependencies = [ "http", "serde", @@ -2831,9 +2829,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" @@ -3108,7 +3106,7 @@ dependencies = [ "socket2 0.5.3", "widestring", "windows-sys 0.48.0", - "winreg 0.50.0", + "winreg", ] [[package]] @@ -3124,7 +3122,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.6", + "rustix 0.38.8", "windows-sys 0.48.0", ] @@ -3368,7 +3366,7 @@ checksum = "fc2fb41a9bb4257a3803154bdf7e2df7d45197d1941c9b1a90ad815231630721" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3398,9 +3396,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru-cache" @@ -3452,9 +3450,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matchit" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67827e6ea8ee8a7c4a72227ef4fc08957040acffdb5f122733b24fa12daff41b" +checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" [[package]] name = "maybe-owned" @@ -3567,9 +3565,9 @@ dependencies = [ [[package]] name = "mongodb" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcd85ec209a5b84fd9f54b9e381f6fa17462bc74160d018fc94fd8b9f61faa8" +checksum = "16928502631c0db72214720aa479c722397fe5aed6bf1c740a3830b3fe4bfcfe" dependencies = [ "async-trait", "base64 0.13.1", @@ -3834,9 +3832,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", @@ -3855,7 +3853,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3875,9 +3873,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ "cc", "libc", @@ -4050,7 +4048,7 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -4140,7 +4138,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -4156,39 +4154,39 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 1.9.3", + "indexmap 2.0.0", ] [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -4448,9 +4446,9 @@ 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", ] @@ -4603,9 +4601,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" [[package]] name = "regex-syntax" @@ -4637,9 +4635,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "20b9b67e2ca7dd9e9f9285b759de30ff538aab981abaaf7bc9bd90b84a0126c3" dependencies = [ "base64 0.21.2", "bytes", @@ -4671,15 +4669,15 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.22.6", - "winreg 0.10.1", + "webpki-roots 0.25.2", + "winreg", ] [[package]] name = "reqwest-middleware" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4531c89d50effe1fac90d095c8b133c20c5c714204feee0bfc3fd158e784209d" +checksum = "ff44108c7925d082f2861e683a88618b68235ad9cdc60d64d9d1188efc951cdb" dependencies = [ "anyhow", "async-trait", @@ -4853,7 +4851,7 @@ dependencies = [ "quote", "rust-embed-utils", "shellexpand", - "syn 2.0.28", + "syn 2.0.29", "walkdir", ] @@ -4948,11 +4946,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.6" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee020b1716f0a80e2ace9b03441a749e402e86712f15f16fe8a8f75afac732f" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", "linux-raw-sys 0.4.5", @@ -4979,7 +4977,7 @@ checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", "ring", - "rustls-webpki 0.101.2", + "rustls-webpki 0.101.3", "sct", ] @@ -5016,9 +5014,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.2" +version = "0.101.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59" +checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" dependencies = [ "ring", "untrusted", @@ -5158,9 +5156,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.180" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] @@ -5176,20 +5174,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.180" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "indexmap 2.0.0", "itoa", @@ -5215,7 +5213,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -5354,7 +5352,7 @@ dependencies = [ [[package]] name = "shuttle-admin" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "clap", @@ -5371,12 +5369,12 @@ dependencies = [ [[package]] name = "shuttle-auth" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "async-trait", "axum", - "axum-extra 0.7.5", + "axum-extra 0.7.7", "axum-sessions", "clap", "http", @@ -5400,7 +5398,7 @@ dependencies = [ [[package]] name = "shuttle-codegen" -version = "0.24.0" +version = "0.25.0" dependencies = [ "pretty_assertions", "proc-macro-error", @@ -5410,14 +5408,14 @@ dependencies = [ "serde", "serde_json", "shuttle-common-tests", - "syn 2.0.28", + "syn 2.0.29", "tokio", "trybuild", ] [[package]] name = "shuttle-common" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "async-trait", @@ -5466,7 +5464,7 @@ dependencies = [ [[package]] name = "shuttle-common-tests" -version = "0.24.0" +version = "0.25.0" dependencies = [ "cargo-shuttle", "hyper", @@ -5479,7 +5477,7 @@ dependencies = [ [[package]] name = "shuttle-deployer" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "async-trait", @@ -5530,7 +5528,7 @@ dependencies = [ [[package]] name = "shuttle-gateway" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "async-trait", @@ -5588,7 +5586,7 @@ dependencies = [ [[package]] name = "shuttle-proto" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "chrono", @@ -5606,7 +5604,7 @@ dependencies = [ [[package]] name = "shuttle-provisioner" -version = "0.24.0" +version = "0.25.0" dependencies = [ "aws-config", "aws-sdk-rds", @@ -5632,7 +5630,7 @@ dependencies = [ [[package]] name = "shuttle-resource-recorder" -version = "0.24.0" +version = "0.25.0" dependencies = [ "async-trait", "chrono", @@ -5656,7 +5654,7 @@ dependencies = [ [[package]] name = "shuttle-runtime" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "async-trait", @@ -5689,7 +5687,7 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "async-trait", @@ -5960,7 +5958,7 @@ checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" dependencies = [ "atoi", "base64 0.21.2", - "bitflags 2.3.3", + "bitflags 2.4.0", "byteorder", "bytes", "chrono", @@ -6004,7 +6002,7 @@ checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" dependencies = [ "atoi", "base64 0.21.2", - "bitflags 2.3.3", + "bitflags 2.4.0", "byteorder", "chrono", "crc", @@ -6136,9 +6134,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -6169,12 +6167,12 @@ version = "0.25.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10081a99cbecbc363d381b9503563785f0b02735fccbb0d4c1a2cb3d39f7e7fe" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "cap-fs-ext", "cap-std", "fd-lock", "io-lifetimes 2.0.2", - "rustix 0.38.6", + "rustix 0.38.8", "windows-sys 0.48.0", "winx 0.36.1", ] @@ -6193,9 +6191,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -6268,22 +6266,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -6298,9 +6296,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b79eabcd964882a646b3584543ccabeae7869e9ac32a46f6f22b7a5bd405308b" +checksum = "a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07" dependencies = [ "deranged", "itoa", @@ -6319,9 +6317,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "75c65469ed6b3a4809d987a41eb1dc918e9bc1d92211cbad7ae82931846f7451" dependencies = [ "time-core", ] @@ -6352,11 +6350,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", @@ -6365,7 +6362,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.9", + "socket2 0.5.3", "tokio-macros", "windows-sys 0.48.0", ] @@ -6388,7 +6385,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -6447,11 +6444,23 @@ dependencies = [ "rustls 0.21.6", "tokio", "tokio-rustls 0.24.1", - "tungstenite", + "tungstenite 0.19.0", "webpki-roots 0.23.1", ] [[package]] +name = "tokio-tungstenite" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.20.0", +] + +[[package]] name = "tokio-util" version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6652,7 +6661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" dependencies = [ "base64 0.21.2", - "bitflags 2.3.3", + "bitflags 2.4.0", "bytes", "futures-core", "futures-util", @@ -6711,7 +6720,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -6841,9 +6850,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "trybuild" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84e0202ea606ba5ebee8507ab2bfbe89b98551ed9b8f0be198109275cff284b" +checksum = "6df60d81823ed9c520ee897489573da4b1d79ffbe006b8134f46de1a1aa03555" dependencies = [ "basic-toml", "glob", @@ -6885,6 +6894,25 @@ dependencies = [ ] [[package]] +name = "tungstenite" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] name = "typed-builder" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6925,9 +6953,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", ] @@ -7029,9 +7057,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utoipa" -version = "3.4.3" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c624186f22e625eb8faa777cb33d34cd595aa16d1742aa1d8b6cf35d3e4dda9" +checksum = "d82b1bc5417102a73e8464c686eef947bdfb99fcdfc0a4f228e81afa9526470a" dependencies = [ "indexmap 2.0.0", "serde", @@ -7041,22 +7069,22 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "3.4.4" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ce5f21ca77e010f5283fa791c6ab892c68b3668a1bdc6b7ac6cf978f5d5b30" +checksum = "05d96dcd6fc96f3df9b3280ef480770af1b7c5d14bc55192baa9b067976d920c" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "uuid", ] [[package]] name = "utoipa-swagger-ui" -version = "3.1.4" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4602d7100d3cfd8a086f30494e68532402ab662fa366c9d201d677e33cee138d" +checksum = "84614caa239fb25b2bb373a52859ffd94605ceb256eeb1d63436325cf81e3653" dependencies = [ "axum", "mime_guess", @@ -7201,7 +7229,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -7235,7 +7263,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7535,9 +7563,9 @@ dependencies = [ [[package]] name = "wast" -version = "62.0.1" +version = "63.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ae06f09dbe377b889fbd620ff8fa21e1d49d1d9d364983c0cdbf9870cb9f1f" +checksum = "2560471f60a48b77fccefaf40796fda61c97ce1e790b59dfcec9dc3995c9f63a" dependencies = [ "leb128", "memchr", @@ -7547,11 +7575,11 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "842e15861d203fb4a96d314b0751cdeaf0f6f8b35e8d81d2953af2af5e44e637" +checksum = "3bdc306c2c4c2f2bf2ba69e083731d0d2a77437fc6a350a19db139636e7e416c" dependencies = [ - "wast 62.0.1", + "wast 63.0.0", ] [[package]] @@ -7566,9 +7594,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd222aa310eb7532e3fd427a5d7db7e44bc0b0cf1c1e21139c345325511a85b6" +checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57" dependencies = [ "core-foundation", "home", @@ -7615,10 +7643,16 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki 0.101.2", + "rustls-webpki 0.101.3", ] [[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + +[[package]] name = "which" version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7735,7 +7769,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -7753,7 +7787,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -7773,17 +7807,17 @@ 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 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]] @@ -7794,9 +7828,9 @@ 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" @@ -7806,9 +7840,9 @@ 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" @@ -7818,9 +7852,9 @@ 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" @@ -7830,9 +7864,9 @@ 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" @@ -7842,9 +7876,9 @@ 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" @@ -7854,9 +7888,9 @@ 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" @@ -7866,30 +7900,21 @@ 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.3" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46aab759304e4d7b2075a9aecba26228bb073ee8c50db796b2c72c676b5d807" +checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" 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" @@ -7915,7 +7940,7 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4857cedf8371f690bb6782a3e2b065c54d1b6661be068aaf3eac8b45e813fdf8" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "windows-sys 0.48.0", ] @@ -7975,9 +8000,9 @@ dependencies = [ [[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix index 13643d9799af..5e3f2cca245c 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-shuttle/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.24.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-21ImDhdT07fc+eKhOWU4z/SQWAO2meq4PITKsVSSG9Y="; + hash = "sha256-UB9S3Ougd7t+D3oAYE9i6AUY76bNKrr605W6GWh1vb0="; }; cargoLock = { diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix index b340dc338a27..3c83dd5437a5 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.28"; + version = "1.0.29"; src = fetchCrate { inherit pname version; - sha256 = "sha256-vPOQC/bpjmjQzHZZHVMTil2XqIbKhxb7461dWCgySQk="; + sha256 = "sha256-SCxigQ6jhT+r6ixgCGwWDtvU8WUJ+5eWYe8DIWPBWhY="; }; - cargoSha256 = "sha256-SL9fIZpMG+XfNHV0xEQyrm13MphIWv6I/cFUOVrA6bA="; + cargoSha256 = "sha256-ZX2T+wKIgYJqOK6118wmsMBKigtJvPqJ2hVtyh23zUk="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index 8ff6c841758e..55bf3bb36b68 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.41"; + version = "0.1.42"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LfPhs3hTM47ktDSSC5TVYQoJa4OzMfL7zKLWV4d6bAA="; + sha256 = "sha256-8CQnmUk7jMlcdtZh6046B5duKnZKaMVk2xG4D2svqVw="; }; - cargoHash = "sha256-NBxQ75J60kZX6ASk3/42N5JT6pDLEZpnZtUCgRDOvSY="; + cargoHash = "sha256-e3ku9c4VLZtnJIUDRMAcUVaJnOsMqckj3XmuJHSR364="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index 85a1f1272b7d..396b3f07b17e 100644 --- a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.24.6"; + version = "0.25.0"; src = fetchFromGitHub { owner = "mozilla"; repo = "cbindgen"; rev = "v${version}"; - hash = "sha256-RHh97hwWmjV6hw+fX+fOtixX/DGedTf9cx+PYPW6/wI="; + hash = "sha256-gljICr0abKEXxJfLCJN3L2OIwUvw/QoIC6T5C7pieEA="; }; - cargoSha256 = "sha256-7G/16arXYwt7Nrs1isWyrPubm8GMi8NsjLjWAD8x6aM="; + cargoSha256 = "sha256-agBzn2MibM7158/QlLXI2HBBcYIe0p50rYSF1jBDF8U="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/development/tools/rust/genemichaels/Cargo.lock b/nixpkgs/pkgs/development/tools/rust/genemichaels/Cargo.lock new file mode 100644 index 000000000000..56b9df484a6d --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/genemichaels/Cargo.lock @@ -0,0 +1,553 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cargo-manifest" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ce38d2d1efbe0e7180766a872570bc07cd5430a42e713b01006d4afa89912fe" +dependencies = [ + "serde", + "toml", +] + +[[package]] +name = "cc" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", +] + +[[package]] +name = "clap_derive" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[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", + "syn", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[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 = "genemichaels" +version = "0.1.21" +dependencies = [ + "anyhow", + "cargo-manifest", + "clap", + "derive_more", + "markdown", + "proc-macro2", + "quote", + "structre", + "syn", + "threadpool", + "walkdir", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +dependencies = [ + "hermit-abi", + "io-lifetimes", + "rustix", + "windows-sys", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "litrs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9275e0933cf8bb20f008924c0cb07a0692fe54d8064996520bf998de9eb79aa" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "markdown" +version = "1.0.0-alpha.5" +source = "git+https://github.com/wooorm/markdown-rs?rev=af202d3f0ea24e0a957b02a6f9fb23c6c3b4afe7#af202d3f0ea24e0a957b02a6f9fb23c6c3b4afe7" +dependencies = [ + "log", + "unicode-id", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.36.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "semver" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "structre" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31eab0dcebb0d631c93629c0da9fdce1448123aa15e5e4c08fcd71d4f4fd5f4" +dependencies = [ + "anyhow", + "once_cell", + "regex", + "structre_proc_macros", +] + +[[package]] +name = "structre_proc_macros" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66e7698a9d57b3a475ce1d6cc37b1be9ee8ed188ec596603c863c06c9e06cf7e" +dependencies = [ + "litrs", + "proc-macro2", + "quote", + "regex-syntax", + "syn", +] + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "toml" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +dependencies = [ + "indexmap", + "serde", +] + +[[package]] +name = "unicode-id" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a" + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[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.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/nixpkgs/pkgs/development/tools/rust/genemichaels/default.nix b/nixpkgs/pkgs/development/tools/rust/genemichaels/default.nix new file mode 100644 index 000000000000..673519aeabc4 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/genemichaels/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "genemichaels"; + version = "0.1.21"; + src = fetchFromGitHub { + owner = "andrewbaxter"; + repo = pname; + rev = "158bb8eb705b073d84562554c1a6a63eedd44c6b"; + hash = "sha256-rAJYukxptasexZzwWgtGlUbHhyyI6OJvSzVxGLBO9vM="; + }; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes."markdown-1.0.0-alpha.5" = "sha256-pjIKzXvRKoMfFVIyIXdm+29vvUzCHiJ0rrZgr4K+Ih8="; + }; + meta = { + description = "Even formats macros"; + homepage = "https://github.com/andrewbaxter/genemichaels"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.anselmschueler ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/leptosfmt/default.nix b/nixpkgs/pkgs/development/tools/rust/leptosfmt/default.nix index b4e2480d1c70..c2dbf742162a 100644 --- a/nixpkgs/pkgs/development/tools/rust/leptosfmt/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/leptosfmt/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "leptosfmt"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "bram209"; repo = "leptosfmt"; rev = version; - hash = "sha256-RR4gwmYna/mvUw5akQutWKaUCWzCjK512gynR9Pddd0="; + hash = "sha256-QitvZ0AkZcXmjv8EnewWjexQMVEHy/naUarBIrzHbBA="; }; - cargoHash = "sha256-6du44SfH0dT1gWVFluB3+AA3GUzwN7Sjh03rKhSRKCM="; + cargoHash = "sha256-Fjj4lgkdHeA/3ajNbF1vTf6/YzGvDUJsDmiXzkEpels="; meta = with lib; { description = "A formatter for the leptos view! macro"; diff --git a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix index 6542dacbe9e7..8780b8892fa1 100644 --- a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.1.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-UH+qOKKQdWXQZZMtrihbWmKaUoSy1NciGh9UTtS/W5E="; + hash = "sha256-uaDTL6dfH+zqjMbLtgLaZRe91mDuyKA0afw+3LFF+1U="; }; - cargoHash = "sha256-EGgVPRaofia+AwXSr6X4Aa8jbk5qDkXg1XvMoEp0qMQ="; + cargoHash = "sha256-DF8O3YrHr0tBStnmnUUUF4QaZcoXYCCweZoEig4etQA="; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; diff --git a/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix b/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix index e5290700c310..567dfcf8d2c3 100644 --- a/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "specr-transpile"; - version = "0.1.22"; + version = "0.1.24"; src = fetchCrate { inherit pname version; - hash = "sha256-D3UdQ3L7fSSFWlVSjqjEUqNCQebMHOtZnJqO7sBjm14="; + hash = "sha256-+7NjB87pfFh8472gOV4HoKIqSiHnTCFOEVdKYBsn1qg="; }; - cargoHash = "sha256-f0Gwxr7J56Q11Rv26mycCYbCidr5bXUwo4kmnVWMCz4="; + cargoHash = "sha256-VgEyXm1uSsNJVjUYx66A35vLNxYErTrC8qBhYVlYyH4="; meta = with lib; { description = "Converts Specr lang code to Rust"; diff --git a/nixpkgs/pkgs/development/tools/rye/Cargo.lock b/nixpkgs/pkgs/development/tools/rye/Cargo.lock index 23192dcfe6bb..058cbe8ced7c 100644 --- a/nixpkgs/pkgs/development/tools/rye/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/rye/Cargo.lock @@ -1697,7 +1697,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.11.0" +version = "0.13.0" dependencies = [ "age", "anyhow", diff --git a/nixpkgs/pkgs/development/tools/rye/default.nix b/nixpkgs/pkgs/development/tools/rye/default.nix index 63873b7a6798..714a54cfa23e 100644 --- a/nixpkgs/pkgs/development/tools/rye/default.nix +++ b/nixpkgs/pkgs/development/tools/rye/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.11.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "mitsuhiko"; - repo = pname; + repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-00Q+qvK1fq9CGb6umtCiUJZZ1M5LMxiSIM3/s7eOumM="; + hash = "sha256-B53oTAgy+y+FWk7y+unJPt7Mc7m4nwnTX+5wqL6AX+4="; }; cargoLock = { diff --git a/nixpkgs/pkgs/development/tools/skopeo/default.nix b/nixpkgs/pkgs/development/tools/skopeo/default.nix index 7abad3b3c188..d9577377e6d7 100644 --- a/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - hash = "sha256-X6DHRE3HIHNWVJYrQyXP3fZYK5Va0nNtpFCV1QzbBoE="; + hash = "sha256-FTPBeq/WbrYDEmS1fR8rzDBHBsjdyMHcm+tCxXtYUPg="; }; outputs = [ "out" "man" ]; @@ -36,7 +36,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; buildInputs = [ gpgme ] - ++ lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; + ++ lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; buildPhase = '' runHook preBuild diff --git a/nixpkgs/pkgs/development/tools/spirv-tools/default.nix b/nixpkgs/pkgs/development/tools/spirv-tools/default.nix index 63ff07b4ce54..274aff3f4e15 100644 --- a/nixpkgs/pkgs/development/tools/spirv-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/spirv-tools/default.nix @@ -2,15 +2,20 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "2023.3.rc1"; + version = "1.3.261.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "v${version}"; - hash = "sha256-HV7jNvgTRRGnhurtT5pf5f5gzUOmr3iWNcDc8TE4ICQ="; + rev = "sdk-${version}"; + hash = "sha256-K7cv0mMNrXYOlJsxAPwz3rVX5FnsnBNvaU33k9hYnQc="; }; + # The cmake options are sufficient for turning on static building, but not + # for disabling shared building, just trim the shared lib from the CMake + # description + patches = lib.optional stdenv.hostPlatform.isStatic ./no-shared-libs.patch; + nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ @@ -39,7 +44,7 @@ stdenv.mkDerivation rec { description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules"; homepage = "https://github.com/KhronosGroup/SPIRV-Tools"; license = licenses.asl20; - platforms = platforms.unix; + platforms = with platforms; unix ++ windows; maintainers = [ maintainers.ralith ]; }; } diff --git a/nixpkgs/pkgs/development/tools/spirv-tools/no-shared-libs.patch b/nixpkgs/pkgs/development/tools/spirv-tools/no-shared-libs.patch new file mode 100644 index 000000000000..45d2be6ec6ac --- /dev/null +++ b/nixpkgs/pkgs/development/tools/spirv-tools/no-shared-libs.patch @@ -0,0 +1,30 @@ +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index acfa0c12..bf3eb686 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -378,16 +378,6 @@ function(spirv_tools_default_target_options target) + add_dependencies(${target} spirv-tools-build-version core_tables enum_string_mapping extinst_tables) + endfunction() + +-# Always build ${SPIRV_TOOLS}-shared. This is expected distro packages, and +-# unlike the other SPIRV_TOOLS target, defaults to hidden symbol visibility. +-add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES}) +-spirv_tools_default_target_options(${SPIRV_TOOLS}-shared) +-set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden) +-target_compile_definitions(${SPIRV_TOOLS}-shared +- PRIVATE SPIRV_TOOLS_IMPLEMENTATION +- PUBLIC SPIRV_TOOLS_SHAREDLIB +-) +- + if(SPIRV_TOOLS_BUILD_STATIC) + add_library(${SPIRV_TOOLS}-static STATIC ${SPIRV_SOURCES}) + spirv_tools_default_target_options(${SPIRV_TOOLS}-static) +@@ -402,7 +392,7 @@ if(SPIRV_TOOLS_BUILD_STATIC) + add_library(${SPIRV_TOOLS} ALIAS ${SPIRV_TOOLS}-static) + endif() + +- set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared) ++ set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static) + else() + add_library(${SPIRV_TOOLS} ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_SOURCES}) + spirv_tools_default_target_options(${SPIRV_TOOLS}) diff --git a/nixpkgs/pkgs/development/tools/sq/default.nix b/nixpkgs/pkgs/development/tools/sq/default.nix index eb2f96e34fd5..058c84b3c910 100644 --- a/nixpkgs/pkgs/development/tools/sq/default.nix +++ b/nixpkgs/pkgs/development/tools/sq/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, sq }: +{ lib, buildGo121Module, fetchFromGitHub, installShellFiles, testers, sq }: -buildGoModule rec { +buildGo121Module rec { pname = "sq"; - version = "0.40.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TD9brvMxU2gdiOiJPs/M5PmiwFd99P9YohCG7bcjLas="; + hash = "sha256-IL3041R35WL+sYCpTjfPXUpd7GTcQoaILYBufwH1WoE="; }; - vendorHash = "sha256-/LsQfhU5+Wobts6R3cJDJaKSvPUqWNBpx9ILgNC2otc="; + vendorHash = "sha256-ez5qhGgK0q3oDT0L0Fs+JKJjMbNoJukzCoir2a9ro48="; proxyVendor = true; diff --git a/nixpkgs/pkgs/development/tools/sqldef/default.nix b/nixpkgs/pkgs/development/tools/sqldef/default.nix new file mode 100644 index 000000000000..6ce1d02e9f85 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/sqldef/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub, libpg_query, xxHash, postgresql }: + +buildGoModule rec { + pname = "sqldef"; + version = "0.16.4"; + + src = fetchFromGitHub { + owner = "k0kubun"; + repo = "sqldef"; + rev = "v${version}"; + hash = "sha256-HQ6WyeKYRd+pY/P2Bsu7W2eMjgpjUhbwEFE7bADrxDY="; + }; + + proxyVendor = true; + + vendorHash = "sha256-YdZo2XN+425s0K/3COqQx3g1Bpus4uWiwnzrYJ8qdOM="; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + + # The test requires a running database + doCheck = false; + + meta = with lib; { + description = "Idempotent SQL schema management tool"; + license = with licenses; [ mit /* for everything except parser */ asl20 /* for parser */ ]; + homepage = "https://github.com/k0kubun/sqldef"; + changelog = "https://github.com/k0kubun/sqldef/blob/v${version}/CHANGELOG.md"; + maintainers = with maintainers; [ kgtkr ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/supabase-cli/default.nix b/nixpkgs/pkgs/development/tools/supabase-cli/default.nix index 8f5f8e24add1..f54475ef6db5 100644 --- a/nixpkgs/pkgs/development/tools/supabase-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/supabase-cli/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.86.1"; + version = "1.88.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-JAs0PScCWsE82cxhUWKjl3fB1EqwR9nh/ESbPd63mc0="; + hash = "sha256-OgeKr0xSWp83Ri3WBNsY3TL6tAWsMtsEdD6KeKdPdCw="; }; vendorSha256 = "sha256-efcgpxvhHe6KtNfNYYc5fYv93fJPf63V39d+5AcCvPQ="; @@ -51,7 +51,7 @@ buildGoModule rec { description = "A CLI for interacting with supabase"; homepage = "https://github.com/supabase/cli"; license = licenses.mit; - maintainers = with maintainers; [ gerschtli ]; + maintainers = with maintainers; [ gerschtli kashw2 ]; mainProgram = "supabase"; }; } diff --git a/nixpkgs/pkgs/development/tools/symfony-cli/default.nix b/nixpkgs/pkgs/development/tools/symfony-cli/default.nix index aee1a2d150a6..acae7f04f6af 100644 --- a/nixpkgs/pkgs/development/tools/symfony-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.5.7"; - vendorHash = "sha256-OXV/hTSHJvYfe2SiFamkedC01J/DOgd8I60yIpQToos="; + version = "5.5.8"; + vendorHash = "sha256-hOYVIynWsbsindNJRbXX4NkC3FW3RErORCSLlV1bCWc="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-LC6QQIVHllBRu8B6XfV8SuTB3O+FmqYr+LQnVmLj2nU="; + hash = "sha256-K2DttdK8g5NI+XlGwIA9HTPTLlMGgGc1K625FquIhi4="; }; ldflags = [ diff --git a/nixpkgs/pkgs/development/tools/tabnine/default.nix b/nixpkgs/pkgs/development/tools/tabnine/default.nix index fcd00726ba77..4426e2bbf81f 100644 --- a/nixpkgs/pkgs/development/tools/tabnine/default.nix +++ b/nixpkgs/pkgs/development/tools/tabnine/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { # Work around the "unpacker appears to have produced no directories" # case that happens when the archive doesn't have a subdirectory. - setSourceRoot = "sourceRoot=`pwd`"; + sourceRoot = "."; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/tools/turso-cli/default.nix b/nixpkgs/pkgs/development/tools/turso-cli/default.nix index a109016cffa5..2b9d622dedd0 100644 --- a/nixpkgs/pkgs/development/tools/turso-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/turso-cli/default.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.79.0"; + version = "0.81.0"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-5ucStAFe3lZgnGMI0fRw1E4T60+9nglNbZnzrjRmRgk="; + hash = "sha256-Ck1q3II/o7f+n0pdR5PzUXG2c6GZmQFeddofHzPTLlA="; }; - vendorHash = "sha256-+F9I6+f7Sm5qhBAoXCMKjV/jFY0fyVIk0NKBQNNI+qM="; + vendorHash = "sha256-Y/pg8+w6B1YQqaZ5wj8QZxiBHAG0Tf3Zec5WlVyA4eI="; # Test_setDatabasesCache fails due to /homeless-shelter: read-only file system error. doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/twilio-cli/default.nix b/nixpkgs/pkgs/development/tools/twilio-cli/default.nix index d64da750c407..51b10de9c237 100644 --- a/nixpkgs/pkgs/development/tools/twilio-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.12.0"; + version = "5.13.0"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-K8SMUT2f8pgxCP5JGFyo/gLm60t0OeCt/1fYAw2HQX0="; + sha256 = "sha256-WfaXYNaNBMcOyQshJkMgzGSmID0tmZ0TRN6N3lR275Q="; }; buildInputs = [ nodejs ]; diff --git a/nixpkgs/pkgs/development/tools/typos/default.nix b/nixpkgs/pkgs/development/tools/typos/default.nix index 877b0c824728..efd0a856226e 100644 --- a/nixpkgs/pkgs/development/tools/typos/default.nix +++ b/nixpkgs/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.16.8"; + version = "1.16.9"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-JEXc/yR7QbqaKGHrmc/1ZwFVL0NqAAb5JDhidS0p1Ik="; + hash = "sha256-aFP4q3Cv7ESqgpBoYW70Fsl2GGEIX8bEl3/sEG6HGpM="; }; - cargoHash = "sha256-f6BvUc5YVSRZUWEtwUMBnvXwKNFiYbcGzvlplma7Mj4="; + cargoHash = "sha256-mUcvKYe2SiuEWKXGG1jiF4YtVB72HlGc7HDHhgUhLaU="; meta = with lib; { description = "Source code spell checker"; diff --git a/nixpkgs/pkgs/development/tools/vendir/default.nix b/nixpkgs/pkgs/development/tools/vendir/default.nix index af6f8e5fcbcc..0a7ff7210505 100644 --- a/nixpkgs/pkgs/development/tools/vendir/default.nix +++ b/nixpkgs/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.34.3"; + version = "0.34.4"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-oeKzbe272Mg0pp+MW6/oBw64/OAzTSmo1qSNAoRqmOE="; + sha256 = "sha256-HdKMPXZIz1n8+170E3Aj7BYquVGgnPwRKJ5CZcqN35M="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/development/tools/vsce/default.nix b/nixpkgs/pkgs/development/tools/vsce/default.nix index 6b35fb317683..7d80b364c1b6 100644 --- a/nixpkgs/pkgs/development/tools/vsce/default.nix +++ b/nixpkgs/pkgs/development/tools/vsce/default.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "vsce"; - version = "2.20.1"; + version = "2.21.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-vsce"; rev = "v${version}"; - hash = "sha256-wwSrECqCNBTfr+Hk0sO6eI64uXCiJuRdCk7HUf5oO4g="; + hash = "sha256-iBbKVfkmt8n06JJ8TSO8BDCeiird9gTkOQhlREtZ5Cw="; }; - npmDepsHash = "sha256-eTyeNvI34+x2ymyQc3qD5WTGIwL+7OjUCK3u2QZhJDQ="; + npmDepsHash = "sha256-Difk9a9TYmfwzP9SawEuaxm7iHVjdfO+FxFCE7aEMzM="; postPatch = '' substituteInPlace package.json --replace '"version": "0.0.0"' '"version": "${version}"' diff --git a/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix b/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix index 2d500eb9eba4..377f87b16453 100644 --- a/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -14,33 +14,16 @@ , libXrandr , spirv-headers , vulkan-headers +, vulkan-utility-libraries , wayland }: let robin-hood-hashing = callPackage ./robin-hood-hashing.nix {}; - - # Current VVL version requires a newer spirv-headers than the latest release tag. - # This should hopefully not be too common and the override should be removed after - # the next SPIRV headers release. - # FIXME: if this ever becomes common, figure out a way to pull revisions directly - # from upstream known-good.json - spirv-headers' = spirv-headers.overrideAttrs(_: { - version = "unstable-2023-04-27"; - - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-Headers"; - rev = "7f1d2f4158704337aff1f739c8e494afc5716e7e"; - hash = "sha256-DHOYIZQqP5uWDYdb+vePpMBaQDOCB5Pcg8wPBMF8itk="; - }; - - postPatch = ""; - }); in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.254"; + version = "1.3.261"; # If we were to use "dev" here instead of headers, the setupHook would be # placed in that output instead of "out". @@ -51,7 +34,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "v${version}"; - hash = "sha256-hh/lCXSKq8xmygVsFFOGu79DvBvBPcc1l1e5wQskK7M="; + hash = "sha256-4kE3pkyYu6hnbv19fHhON+hI2HU4vLm31tNlp5fhndM="; }; nativeBuildInputs = [ @@ -68,12 +51,13 @@ stdenv.mkDerivation rec { libffi libxcb vulkan-headers + vulkan-utility-libraries wayland ]; cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" - "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers'}" + "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}" "-DBUILD_LAYER_SUPPORT_FILES=ON" "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" diff --git a/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index 4a962a1585a0..16dfcd878ab6 100644 --- a/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -1,22 +1,35 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "vultr-cli"; - version = "2.17.0"; + version = "2.18.2"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - hash = "sha256-z5G7oXthz1oP9h6IwKZrkG0waBurBpbOALGdcAuThnc="; + hash = "sha256-RW8t5s28eUxHKEz+UHdeHlRMYprKlA9AdtiEy661des="; }; - vendorHash = "sha256-c5FzeqC+uEnVT3TxXHzI4FFIdJvKQ2tgGQAwd1DE5eM="; + vendorHash = "sha256-61hdhkFyp4an9KtqDzB4Sd2+t40QEoLgq7MvUBxEQKs="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ "-s" "-w" ]; + + postInstall = '' + installShellCompletion --cmd vultr-cli \ + --bash <($out/bin/vultr-cli completion bash) \ + --fish <($out/bin/vultr-cli completion fish) \ + --zsh <($out/bin/vultr-cli completion zsh) + ''; meta = with lib; { description = "Official command line tool for Vultr services"; homepage = "https://github.com/vultr/vultr-cli"; + changelog = "https://github.com/vultr/vultr-cli/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ Br1ght0ne ]; + mainProgram = "vultr-cli"; }; } diff --git a/nixpkgs/pkgs/development/tools/watchman/Cargo.lock b/nixpkgs/pkgs/development/tools/watchman/Cargo.lock index 9554b7be1f5b..d0ccfa032ade 100644 --- a/nixpkgs/pkgs/development/tools/watchman/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/watchman/Cargo.lock @@ -3,12 +3,30 @@ 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 = "ahash" -version = "0.3.8" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ - "const-random", + "cfg-if", + "getrandom", + "once_cell", + "version_check", ] [[package]] @@ -22,9 +40,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "atty" @@ -44,6 +62,21 @@ 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 = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -57,18 +90,21 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" dependencies = [ "serde", ] [[package]] name = "cc" -version = "1.0.78" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -92,32 +128,10 @@ dependencies = [ ] [[package]] -name = "const-random" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" -dependencies = [ - "getrandom", - "once_cell", - "proc-macro-hack", - "tiny-keccak", -] - -[[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 = "crossbeam" @@ -135,9 +149,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", @@ -145,9 +159,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", @@ -156,14 +170,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", ] @@ -179,20 +193,14 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +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 = "duct" version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -206,9 +214,9 @@ dependencies = [ [[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 = "futures" @@ -218,9 +226,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -233,9 +241,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -243,15 +251,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -260,38 +268,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures 0.1.31", "futures-channel", @@ -308,9 +316,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -318,6 +326,12 @@ dependencies = [ ] [[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] name = "heck" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -337,18 +351,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jwalk" @@ -368,15 +379,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -384,12 +395,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "maplit" @@ -414,68 +422,86 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[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.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi", "windows-sys", ] [[package]] name = "nix" -version = "0.23.2" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ + "autocfg", "bitflags", - "cc", "cfg-if", "libc", "memoffset 0.6.5", + "pin-utils", ] [[package]] name = "ntapi" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" dependencies = [ "winapi", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "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.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "os_pipe" -version = "1.1.2" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a252f1f8c11e84b3ab59d7a488e48e4478a93937e027076638c49536204639" +checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" dependencies = [ "libc", "windows-sys", @@ -493,22 +519,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.6" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-targets", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -525,7 +551,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -541,34 +567,28 @@ dependencies = [ ] [[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.50" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -576,9 +596,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -588,30 +608,36 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags", ] [[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] name = "ryu" -version = "1.0.12" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" dependencies = [ "serde_derive", ] @@ -624,25 +650,35 @@ dependencies = [ "byteorder", "bytes", "serde", + "serde_bytes", "thiserror", ] [[package]] +name = "serde_bytes" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +dependencies = [ + "serde", +] + +[[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", @@ -661,36 +697,36 @@ 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", ] [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" -version = "0.4.7" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" dependencies = [ "libc", - "winapi", + "windows-sys", ] [[package]] @@ -720,14 +756,25 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -769,43 +816,33 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", + "syn 2.0.28", ] [[package]] name = "tokio" -version = "1.24.2" +version = "1.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot", @@ -813,18 +850,19 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", + "tracing", "windows-sys", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] @@ -844,16 +882,36 @@ dependencies = [ ] [[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 = "unicode-ident" -version = "1.0.6" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[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" @@ -885,7 +943,7 @@ version = "0.8.0" dependencies = [ "anyhow", "bytes", - "futures 0.3.25", + "futures 0.3.28", "maplit", "serde", "serde_bser", @@ -901,7 +959,6 @@ version = "0.1.0" dependencies = [ "ahash", "anyhow", - "atty", "duct", "jwalk", "nix", @@ -938,9 +995,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -953,42 +1019,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/nixpkgs/pkgs/development/tools/watchman/default.nix b/nixpkgs/pkgs/development/tools/watchman/default.nix index 33db2dd144d1..6bd12510c13d 100644 --- a/nixpkgs/pkgs/development/tools/watchman/default.nix +++ b/nixpkgs/pkgs/development/tools/watchman/default.nix @@ -1,7 +1,6 @@ { boost , cargo , cmake -, config , CoreServices , cpptoml , double-conversion @@ -22,9 +21,8 @@ , libunwind , lz4 , openssl -, pcre +, pcre2 , pkg-config -, python3 , rustPlatform , rustc , stateDir ? "/tmp" @@ -36,13 +34,13 @@ stdenv.mkDerivation rec { pname = "watchman"; - version = "2023.01.30.00"; + version = "2023.08.14.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; rev = "v${version}"; - sha256 = "sha256-ZtCUlxx3YgfwKa9J8o9GkdkHquJbh+EytLiGNRlABls="; + hash = "sha256-41bBPFlLYFHySyX4/GUllT1pNywSRcH7x/pnb5iN/1o="; }; cmakeFlags = [ @@ -64,9 +62,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - pcre + pcre2 openssl - python3 gtest glog boost diff --git a/nixpkgs/pkgs/development/tools/wgo/default.nix b/nixpkgs/pkgs/development/tools/wgo/default.nix index bcd8cb7a0044..0213dfcf7795 100644 --- a/nixpkgs/pkgs/development/tools/wgo/default.nix +++ b/nixpkgs/pkgs/development/tools/wgo/default.nix @@ -5,7 +5,7 @@ let pname = "wgo"; - version = "0.5.1"; + version = "0.5.3"; in buildGoModule { inherit pname version; @@ -14,10 +14,10 @@ buildGoModule { owner = "bokwoon95"; repo = "wgo"; rev = "v${version}"; - hash = "sha256-kfa3Lm2oJomhoHbtSPLylRr+BFGV/y7xqSIv3xHHg3Q="; + hash = "sha256-Uny5FiMox0oIaJ+WE7p3kw4guSzktEF+WzuxjgFXh2I="; }; - vendorHash = "sha256-jxyO3MGrC+y/jJuwur/+tLIsbxGnT57ZXYzaf1lCv7A="; + vendorHash = "sha256-w6UJxZToHbbQmuXkyqFzyssFcE+7uVNqOuIF/XKdEsU="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/tools/misc/wasm-tools/Cargo.lock b/nixpkgs/pkgs/development/tools/worker-build/Cargo.lock index 131ab047353d..17c911f4146c 100644 --- a/nixpkgs/pkgs/tools/misc/wasm-tools/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/worker-build/Cargo.lock @@ -3,156 +3,79 @@ version = 3 [[package]] -name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli", -] - -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "cpp_demangle 0.4.2", - "fallible-iterator", - "gimli", - "memmap2", - "object 0.31.1", - "rustc-demangle", - "smallvec", -] - -[[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", -] - -[[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] [[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" +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys", -] +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" [[package]] -name = "anstyle-wincon" -version = "1.0.2" +name = "android_system_properties" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "anstyle", - "windows-sys", + "libc", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] -name = "arbitrary" -version = "1.3.0" +name = "async-trait" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ - "derive_arbitrary", + "proc-macro2", + "quote", + "syn 2.0.18", ] [[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" +name = "autocfg" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "atty" -version = "0.2.14" +name = "base64" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", + "byteorder", + "safemem", ] [[package]] -name = "autocfg" -version = "1.1.0" +name = "base64" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] -name = "bincode" -version = "1.3.3" +name = "base64" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bitflags" @@ -161,22 +84,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[package]] -name = "blake3" -version = "1.4.1" +name = "blake2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", "digest", ] @@ -202,20 +114,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] -name = "cast" -version = "0.3.0" +name = "bytes" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cc" -version = "1.0.82" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" -dependencies = [ - "jobserver", - "libc", -] +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -224,593 +132,479 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "clap" -version = "2.34.0" +name = "chrono" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ - "bitflags 1.3.2", - "textwrap", - "unicode-width", + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "winapi", ] [[package]] -name = "clap" -version = "4.3.23" +name = "chrono-tz" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03aef18ddf7d879c15ce20f04826ef8418101c7e528014c3eeea13321047dca3" +checksum = "cf9cc2b23599e6d7479755f3594285efb3f74a1bdca7a7374948bc831e23a552" dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", + "chrono", + "chrono-tz-build", + "phf", ] [[package]] -name = "clap_builder" -version = "4.3.23" +name = "chrono-tz-build" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ce6fffb678c9b80a70b6b6de0aad31df727623a70fd9a842c30cd573e2fa98" +checksum = "d9998fb9f7e9b2111641485bf8beb32f92945f97f92a3d061f744cfef335f751" dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", + "parse-zoneinfo", + "phf", + "phf_codegen", ] [[package]] -name = "clap_derive" -version = "4.3.12" +name = "console_error_panic_hook" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.29", + "cfg-if", + "wasm-bindgen", ] [[package]] -name = "clap_lex" -version = "0.5.0" +name = "core-foundation" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] [[package]] -name = "colorchoice" -version = "1.0.0" +name = "core-foundation-sys" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] -name = "constant_time_eq" -version = "0.3.0" +name = "cpufeatures" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" - -[[package]] -name = "cpp_demangle" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ - "cfg-if", + "libc", ] [[package]] -name = "cpp_demangle" -version = "0.4.2" +name = "crc32fast" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee34052ee3d93d6d8f3e6f81d85c47921f6653a19a7b70e939e3e602d893a674" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if", ] [[package]] -name = "cranelift-bforest" -version = "0.98.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1380172556902242d32f78ed08c98aac4f5952aef22d3684aed5c66a5db0a6fc" -dependencies = [ - "cranelift-entity", -] - -[[package]] -name = "cranelift-codegen" -version = "0.98.1" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037cca234e1ad0766fdfe43b527ec14e100414b4ccf4bb614977aa9754958f57" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "bumpalo", - "cranelift-bforest", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-control", - "cranelift-entity", - "cranelift-isle", - "gimli", - "hashbrown 0.13.2", - "log", - "regalloc2", - "smallvec", - "target-lexicon", + "generic-array", + "typenum", ] [[package]] -name = "cranelift-codegen-meta" -version = "0.98.1" +name = "digest" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d375e6afa8b9a304999ea8cf58424414b8e55e004571265a4f0826eba8b74f18" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "cranelift-codegen-shared", + "block-buffer", + "crypto-common", + "subtle", ] [[package]] -name = "cranelift-codegen-shared" -version = "0.98.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca590e72ccb8da963def6e36460cce4412032b1f03c31d1a601838d305abdc39" - -[[package]] -name = "cranelift-control" -version = "0.98.1" +name = "dirs-next" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2d38eea4373639f4b6236a40f69820fed16c5511093cd3783bf8491a93d9cf" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "arbitrary", + "cfg-if", + "dirs-sys-next", ] [[package]] -name = "cranelift-entity" -version = "0.98.1" +name = "dirs-sys-next" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e3173c1434af23c00e4964722cf93ca8f0e6287289bf5d52110597c3ba2ea09" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ - "serde", + "libc", + "redox_users", + "winapi", ] [[package]] -name = "cranelift-frontend" -version = "0.98.1" +name = "encoding_rs" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aec4a3a33825062eccf6eec73e852c8773220f6e4798925e19696562948beb1f" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ - "cranelift-codegen", - "log", - "smallvec", - "target-lexicon", + "cfg-if", ] [[package]] -name = "cranelift-isle" -version = "0.98.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5146b5cea4b21095a021d964b0174cf6ff5530f83e8d0a822683c7559e360b66" - -[[package]] -name = "cranelift-native" -version = "0.98.1" +name = "errno" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cec3717ce554d3936b2101aa8eae1a2a410bd6da0f4df698a4b008fe9cf1e9" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ - "cranelift-codegen", + "errno-dragonfly", "libc", - "target-lexicon", + "windows-sys 0.48.0", ] [[package]] -name = "cranelift-wasm" -version = "0.98.1" +name = "errno-dragonfly" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fd2f9f1bf29ce6639ae2f477a2fe20bad0bd09289df13efeb890e8e4b9f807" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" dependencies = [ - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", - "itertools", - "log", - "smallvec", - "wasmparser 0.107.0", - "wasmtime-types", + "cc", + "libc", ] [[package]] -name = "crc32fast" -version = "1.3.2" +name = "fallible-iterator" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] -name = "criterion" -version = "0.3.6" +name = "fastrand" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ - "atty", - "cast", - "clap 2.34.0", - "criterion-plot", - "csv", - "itertools", - "lazy_static", - "num-traits", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_cbor", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", + "instant", ] [[package]] -name = "criterion-plot" -version = "0.4.5" +name = "filetime" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ - "cast", - "itertools", + "cfg-if", + "libc", + "redox_syscall 0.2.16", + "windows-sys 0.48.0", ] [[package]] -name = "crossbeam-channel" -version = "0.5.8" +name = "flate2" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ - "cfg-if", - "crossbeam-utils", + "crc32fast", + "miniz_oxide", ] [[package]] -name = "crossbeam-deque" -version = "0.8.3" +name = "fnv" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "crossbeam-epoch" -version = "0.9.15" +name = "foreign-types" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", + "foreign-types-shared", ] [[package]] -name = "crossbeam-utils" -version = "0.8.16" +name = "foreign-types-shared" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] -name = "crypto-common" -version = "0.1.6" +name = "form_urlencoded" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ - "generic-array", - "typenum", + "percent-encoding", ] [[package]] -name = "csv" -version = "1.2.2" +name = "futures-channel" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", + "futures-core", + "futures-sink", ] [[package]] -name = "csv-core" -version = "0.1.10" +name = "futures-core" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -dependencies = [ - "memchr", -] +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] -name = "debugid" -version = "0.8.0" +name = "futures-io" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "uuid", -] +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] -name = "derive_arbitrary" -version = "1.3.1" +name = "futures-macro" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.18", ] [[package]] -name = "diff" -version = "0.1.13" +name = "futures-sink" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] -name = "digest" -version = "0.10.7" +name = "futures-task" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] -name = "egg" -version = "0.6.0" +name = "futures-util" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a6c0bbc92278f84e742f08c0ab9cb16a987376cd2bc39d228ef9c74d98d6f7" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ - "indexmap 1.9.3", - "instant", - "log", - "once_cell", - "smallvec", - "symbolic_expressions", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", ] [[package]] -name = "either" -version = "1.9.0" +name = "generic-array" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] [[package]] -name = "encoding_rs" -version = "0.8.32" +name = "getrandom" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", ] [[package]] -name = "env_logger" -version = "0.9.3" +name = "h2" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", ] [[package]] -name = "equivalent" -version = "1.0.1" +name = "hashbrown" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] -name = "errno" -version = "0.3.2" +name = "heck" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", + "unicode-segmentation", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "hermit-abi" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" dependencies = [ - "cc", "libc", ] [[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] -name = "fixedbitset" -version = "0.4.2" +name = "hermit-abi" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] -name = "flagset" +name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda653ca797810c02f7ca4b804b40b8b95ae046eb989d356bce17919a8c25499" -dependencies = [ - "serde", -] +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] -name = "flate2" -version = "1.0.27" +name = "hmac" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "crc32fast", - "miniz_oxide", + "digest", ] [[package]] -name = "form_urlencoded" -version = "1.2.0" +name = "http" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "percent-encoding", + "bytes", + "fnv", + "itoa", ] [[package]] -name = "fuzz-stats" -version = "0.1.0" +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "anyhow", - "arbitrary", - "num_cpus", - "rand", - "wasm-smith", - "wasmtime", + "bytes", + "http", + "pin-project-lite", ] [[package]] -name = "fxhash" -version = "0.2.1" +name = "httparse" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] -name = "fxprof-processed-profile" -version = "0.6.0" +name = "httpdate" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" -dependencies = [ - "bitflags 2.4.0", - "debugid", - "fxhash", - "serde", - "serde_json", -] +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] -name = "generic-array" -version = "0.14.7" +name = "hyper" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ - "typenum", - "version_check", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.9", + "tokio", + "tower-service", + "tracing", + "want", ] [[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +name = "hyper-on-workers" +version = "0.1.0" dependencies = [ - "cfg-if", - "libc", - "wasi", + "console_error_panic_hook", + "hyper", + "tokio", + "wasm-bindgen-futures", + "worker", ] [[package]] -name = "gimli" -version = "0.27.3" +name = "hyper-tls" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "fallible-iterator", - "indexmap 1.9.3", - "stable_deref_trait", + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", ] [[package]] -name = "glob" -version = "0.3.1" +name = "iana-time-zone" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ - "ahash", + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", ] [[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" +name = "iana-time-zone-haiku" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "libc", + "cc", ] [[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] name = "id-arena" version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -833,19 +627,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown 0.14.0", - "serde", + "hashbrown", ] [[package]] @@ -863,60 +645,28 @@ 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.1", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] -name = "is-terminal" -version = "0.4.9" +name = "ipnet" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.8", - "windows-sys", -] - -[[package]] -name = "is_executable" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8" -dependencies = [ - "winapi", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[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" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] @@ -935,20 +685,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.146" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "libfuzzer-sys" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" -dependencies = [ - "arbitrary", - "cc", - "once_cell", -] +checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" [[package]] name = "linux-raw-sys" @@ -957,242 +696,349 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] -name = "linux-raw-sys" -version = "0.4.5" +name = "lock_api" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] [[package]] name = "log" -version = "0.4.20" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] -name = "mach" -version = "0.3.2" +name = "matchit" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9376a4f0340565ad675d11fc1419227faf5f60cd7ac9cb2e7185a471f30af833" + +[[package]] +name = "md-5" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "libc", + "digest", ] [[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + +[[package]] name = "memchr" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] -name = "memfd" -version = "0.6.3" +name = "mime" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" dependencies = [ - "rustix 0.37.23", + "mime", + "unicase", ] [[package]] -name = "memmap2" -version = "0.5.10" +name = "miniz_oxide" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ - "libc", + "adler", ] [[package]] -name = "memoffset" -version = "0.8.0" +name = "mio" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ - "autocfg", + "libc", + "wasi", + "windows-sys 0.48.0", ] [[package]] -name = "memoffset" -version = "0.9.0" +name = "native-tls" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ - "autocfg", + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", ] [[package]] -name = "miniz_oxide" -version = "0.7.1" +name = "nu-ansi-term" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ - "adler", + "overload", + "winapi", ] [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.16.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.2.6", "libc", ] [[package]] -name = "object" -version = "0.30.4" +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "openssl" +version = "0.10.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" +checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019" dependencies = [ - "crc32fast", - "hashbrown 0.13.2", - "indexmap 1.9.3", - "memchr", + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", ] [[package]] -name = "object" -version = "0.31.1" +name = "openssl-macros" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "flate2", - "memchr", - "ruzstd", + "proc-macro2", + "quote", + "syn 2.0.18", ] [[package]] -name = "once_cell" -version = "1.18.0" +name = "openssl-probe" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] -name = "oorandom" -version = "11.1.3" +name = "openssl-sys" +version = "0.9.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] [[package]] -name = "paste" -version = "1.0.14" +name = "overload" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] -name = "percent-encoding" -version = "2.3.0" +name = "parking_lot" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] [[package]] -name = "petgraph" -version = "0.6.3" +name = "parking_lot_core" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ - "fixedbitset", - "indexmap 1.9.3", + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "smallvec", + "windows-targets", ] [[package]] -name = "plotters" -version = "0.3.5" +name = "parse-zoneinfo" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", + "regex", ] [[package]] -name = "plotters-backend" -version = "0.3.5" +name = "percent-encoding" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] -name = "plotters-svg" -version = "0.3.5" +name = "phf" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" dependencies = [ - "plotters-backend", + "phf_shared", ] [[package]] -name = "ppv-lite86" -version = "0.2.17" +name = "phf_codegen" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" +dependencies = [ + "phf_generator", + "phf_shared", +] [[package]] -name = "pretty_assertions" -version = "1.4.0" +name = "phf_generator" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" dependencies = [ - "diff", - "yansi", + "phf_shared", + "rand", ] [[package]] -name = "proc-macro2" -version = "1.0.66" +name = "phf_shared" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" dependencies = [ - "unicode-ident", + "siphasher", ] [[package]] -name = "psm" -version = "0.1.21" +name = "pin-project" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" dependencies = [ - "cc", + "pin-project-internal", ] [[package]] -name = "pulldown-cmark" -version = "0.8.0" +name = "pin-project-internal" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ - "bitflags 1.3.2", - "memchr", - "unicase", + "proc-macro2", + "quote", + "syn 2.0.18", ] [[package]] -name = "pulldown-cmark" -version = "0.9.3" +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "postgres-protocol" +version = "0.6.5" +source = "git+https://github.com/sfackler/rust-postgres?branch=master#790af54a0fdd5c487e77dc9a25d82921ee31ffe6" dependencies = [ - "bitflags 1.3.2", + "base64 0.21.2", + "byteorder", + "bytes", + "fallible-iterator", + "getrandom", + "hmac", + "md-5", "memchr", - "unicase", + "rand", + "sha2", + "stringprep", +] + +[[package]] +name = "postgres-types" +version = "0.2.5" +source = "git+https://github.com/sfackler/rust-postgres?branch=master#790af54a0fdd5c487e77dc9a25d82921ee31ffe6" +dependencies = [ + "bytes", + "fallible-iterator", + "postgres-protocol", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro2" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +dependencies = [ + "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -1228,25 +1074,12 @@ dependencies = [ ] [[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" +name = "redox_syscall" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", + "bitflags", ] [[package]] @@ -1255,163 +1088,235 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] -name = "regalloc2" -version = "0.9.2" +name = "redox_users" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b4dcbd3a2ae7fb94b5813fa0e957c6ab51bf5d0a8ee1b69e0c2d0f1e6eb8485" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "hashbrown 0.13.2", - "log", - "rustc-hash", - "slice-group-by", - "smallvec", + "getrandom", + "redox_syscall 0.2.16", + "thiserror", ] [[package]] name = "regex" -version = "1.9.3" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ "aho-corasick", "memchr", - "regex-automata", "regex-syntax", ] [[package]] -name = "regex-automata" -version = "0.3.6" +name = "regex-syntax" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" + +[[package]] +name = "reqwest" +version = "0.11.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", + "base64 0.21.2", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams 0.2.3", + "web-sys", + "winreg", ] [[package]] -name = "regex-syntax" -version = "0.7.4" +name = "retry" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "9166d72162de3575f950507683fac47e30f6f2c3836b71b7fbc61aa517c9c5f4" +dependencies = [ + "rand", +] [[package]] -name = "rustc-demangle" -version = "0.1.23" +name = "ring" +version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] [[package]] -name = "rustc-hash" -version = "1.1.0" +name = "rustc-demangle" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" dependencies = [ - "bitflags 1.3.2", + "bitflags", "errno", "io-lifetimes", "libc", - "linux-raw-sys 0.3.8", - "windows-sys", + "linux-raw-sys", + "windows-sys 0.48.0", ] [[package]] -name = "rustix" -version = "0.38.8" +name = "rustls" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys 0.4.5", - "windows-sys", + "log", + "ring", + "sct", + "webpki", ] [[package]] -name = "ruzstd" -version = "0.3.1" +name = "ryu" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a15e661f0f9dac21f3494fe5d23a6338c0ac116a2d22c2b63010acd89467ffe" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "byteorder", - "thiserror", - "twox-hash", + "windows-sys 0.42.0", ] [[package]] -name = "ryu" -version = "1.0.15" +name = "scoped-tls" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] -name = "same-file" -version = "1.0.6" +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 = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "winapi-util", + "ring", + "untrusted", ] [[package]] -name = "scopeguard" -version = "1.2.0" +name = "security-framework" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] [[package]] -name = "semver" -version = "1.0.18" +name = "security-framework-sys" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +dependencies = [ + "core-foundation-sys", + "libc", +] [[package]] name = "serde" -version = "1.0.183" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" dependencies = [ "serde_derive", ] [[package]] -name = "serde_cbor" -version = "0.11.2" +name = "serde-wasm-bindgen" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" dependencies = [ - "half", + "js-sys", "serde", + "wasm-bindgen", ] [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.18", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -1419,74 +1324,110 @@ dependencies = [ ] [[package]] -name = "serde_yaml" -version = "0.9.25" +name = "serde_urlencoded" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ - "indexmap 2.0.0", + "form_urlencoded", "itoa", "ryu", "serde", - "unsafe-libyaml", ] [[package]] -name = "slice-group-by" -version = "0.3.1" +name = "sha-1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] [[package]] -name = "smallvec" -version = "1.11.0" +name = "sha2" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] [[package]] -name = "spdx" -version = "0.10.2" +name = "sharded-slab" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b19b32ed6d899ab23174302ff105c1577e45a06b08d4fe0a9dd13ce804bbbf71" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" dependencies = [ - "smallvec", + "lazy_static", ] [[package]] -name = "sptr" -version = "0.3.2" +name = "siphasher" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] -name = "stable_deref_trait" -version = "1.2.0" +name = "slab" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] [[package]] -name = "static_assertions" -version = "1.1.0" +name = "smallvec" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] -name = "strsim" -version = "0.10.0" +name = "socket2" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] [[package]] -name = "subtle" -version = "2.5.0" +name = "socket2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] [[package]] -name = "symbolic_expressions" -version = "5.0.3" +name = "spin" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c68d531d83ec6c531150584c42a4290911964d5f0d79132b193b67252a23b71" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "stringprep" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -1501,9 +1442,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" dependencies = [ "proc-macro2", "quote", @@ -1511,70 +1452,86 @@ dependencies = [ ] [[package]] -name = "target-lexicon" -version = "0.12.11" +name = "tar" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +dependencies = [ + "filetime", + "libc", + "xattr", +] [[package]] name = "tempfile" -version = "3.7.1" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ + "autocfg", "cfg-if", "fastrand", - "redox_syscall", - "rustix 0.38.8", - "windows-sys", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.48.0", ] [[package]] -name = "termcolor" -version = "1.2.0" +name = "thiserror" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ - "winapi-util", + "thiserror-impl", ] [[package]] -name = "textwrap" -version = "0.11.0" +name = "thiserror-impl" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ - "unicode-width", + "proc-macro2", + "quote", + "syn 2.0.18", ] [[package]] -name = "thiserror" -version = "1.0.47" +name = "thread_local" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ - "thiserror-impl", + "cfg-if", + "once_cell", ] [[package]] -name = "thiserror-impl" -version = "1.0.47" +name = "time" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", + "itoa", + "js-sys", + "serde", + "time-core", + "time-macros", ] [[package]] -name = "tinytemplate" -version = "1.2.1" +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.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" dependencies = [ - "serde", - "serde_json", + "time-core", ] [[package]] @@ -1593,687 +1550,590 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] -name = "twox-hash" -version = "1.6.3" +name = "tokio" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ - "cfg-if", - "static_assertions", + "autocfg", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2 0.4.9", + "tokio-macros", + "windows-sys 0.48.0", ] [[package]] -name = "typenum" -version = "1.16.0" +name = "tokio-macros" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] [[package]] -name = "unicase" -version = "2.6.0" +name = "tokio-native-tls" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ - "version_check", + "native-tls", + "tokio", ] [[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +name = "tokio-postgres" +version = "0.7.8" +source = "git+https://github.com/sfackler/rust-postgres?branch=master#790af54a0fdd5c487e77dc9a25d82921ee31ffe6" +dependencies = [ + "async-trait", + "byteorder", + "bytes", + "fallible-iterator", + "futures-channel", + "futures-util", + "log", + "parking_lot", + "percent-encoding", + "phf", + "pin-project-lite", + "postgres-protocol", + "postgres-types", + "socket2 0.5.3", + "tokio", + "tokio-util", +] [[package]] -name = "unicode-ident" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +name = "tokio-postgres-on-workers" +version = "0.1.0" +dependencies = [ + "tokio-postgres", + "worker", +] [[package]] -name = "unicode-normalization" -version = "0.1.22" +name = "tokio-util" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ - "tinyvec", + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", ] [[package]] -name = "unicode-width" -version = "0.1.10" +name = "tower-service" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] -name = "unicode-xid" -version = "0.2.4" +name = "tracing" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] [[package]] -name = "unsafe-libyaml" -version = "0.2.9" +name = "tracing-attributes" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] [[package]] -name = "url" -version = "2.4.0" +name = "tracing-core" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", + "once_cell", + "valuable", ] [[package]] -name = "utf8parse" -version = "0.2.1" +name = "tracing-log" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] [[package]] -name = "uuid" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +name = "tracing-on-workers" +version = "0.1.0" +dependencies = [ + "time", + "tracing", + "tracing-subscriber", + "tracing-web", + "worker", +] [[package]] -name = "version_check" -version = "0.9.4" +name = "tracing-serde" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] [[package]] -name = "walkdir" -version = "2.3.3" +name = "tracing-subscriber" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ - "same-file", - "winapi-util", + "nu-ansi-term", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "time", + "tracing-core", + "tracing-log", + "tracing-serde", ] [[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +name = "tracing-web" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "0ff5efc53ed5a7c4b99b3dd24fd10f41e7aa1b284a4e64ae9167d97e31afe124" +dependencies = [ + "js-sys", + "tracing-core", + "tracing-subscriber", + "wasm-bindgen", + "web-sys", +] [[package]] -name = "wasm-bindgen" -version = "0.2.87" +name = "try-lock" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" +name = "tungstenite" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" dependencies = [ - "bumpalo", + "base64 0.13.1", + "byteorder", + "bytes", + "http", + "httparse", "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.29", - "wasm-bindgen-shared", + "rand", + "sha-1", + "thiserror", + "url", + "utf-8", ] [[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" +name = "typenum" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" +name = "unicase" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", - "wasm-bindgen-backend", - "wasm-bindgen-shared", + "version_check", ] [[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" +name = "unicode-bidi" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] -name = "wasm-compose" -version = "0.4.1" -dependencies = [ - "anyhow", - "glob", - "heck", - "indexmap 2.0.0", - "log", - "petgraph", - "pretty_assertions", - "serde", - "serde_yaml", - "smallvec", - "wasm-encoder 0.31.1", - "wasmparser 0.111.0", - "wasmprinter 0.2.63", - "wat", - "wit-component", -] +name = "unicode-ident" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] -name = "wasm-encoder" -version = "0.29.0" +name = "unicode-normalization" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ - "leb128", + "tinyvec", ] [[package]] -name = "wasm-encoder" -version = "0.31.1" -dependencies = [ - "anyhow", - "leb128", - "tempfile", - "wasmparser 0.111.0", -] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] -name = "wasm-metadata" -version = "0.10.2" -dependencies = [ - "anyhow", - "clap 4.3.23", - "indexmap 2.0.0", - "serde", - "serde_json", - "spdx", - "wasm-encoder 0.31.1", - "wasmparser 0.111.0", - "wat", -] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] -name = "wasm-mutate" -version = "0.2.31" +name = "ureq" +version = "2.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d" dependencies = [ - "anyhow", - "clap 4.3.23", - "egg", - "env_logger", + "base64 0.13.1", + "flate2", "log", - "rand", - "thiserror", - "wasm-encoder 0.31.1", - "wasmparser 0.111.0", - "wasmprinter 0.2.63", - "wat", + "once_cell", + "rustls", + "url", + "webpki", + "webpki-roots", ] [[package]] -name = "wasm-mutate-stats" -version = "0.1.0" +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ - "anyhow", - "arbitrary", - "clap 4.3.23", - "env_logger", - "itertools", - "log", - "num_cpus", - "rand", - "wasm-mutate", - "wasmparser 0.111.0", - "wasmprinter 0.2.63", - "wasmtime", + "form_urlencoded", + "idna", + "percent-encoding", ] [[package]] -name = "wasm-shrink" -version = "0.1.32" -dependencies = [ - "anyhow", - "blake3", - "clap 4.3.23", - "env_logger", - "log", - "rand", - "wasm-mutate", - "wasmparser 0.111.0", - "wasmprinter 0.2.63", - "wat", -] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] -name = "wasm-smith" -version = "0.12.14" +name = "uuid" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ - "arbitrary", - "criterion", - "flagset", - "indexmap 2.0.0", - "leb128", - "libfuzzer-sys", - "rand", + "getrandom", "serde", - "wasm-encoder 0.31.1", - "wasmparser 0.111.0", - "wasmprinter 0.2.63", - "wat", ] [[package]] -name = "wasm-tools" -version = "1.0.39" +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walrus" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8" dependencies = [ - "addr2line 0.20.0", "anyhow", - "arbitrary", - "clap 4.3.23", - "cpp_demangle 0.4.2", - "diff", - "env_logger", - "gimli", - "is_executable", + "id-arena", + "leb128", "log", - "pretty_assertions", - "rayon", - "regex", - "rustc-demangle", - "serde", - "serde_json", - "tempfile", - "termcolor", - "wasm-compose", - "wasm-encoder 0.31.1", - "wasm-metadata", - "wasm-mutate", - "wasm-shrink", - "wasm-smith", - "wasmparser 0.111.0", - "wasmprinter 0.2.63", - "wast", - "wat", - "wit-component", - "wit-parser 0.10.0", - "wit-smith", -] - -[[package]] -name = "wasm-tools-c-api" -version = "0.1.1" -dependencies = [ - "arbitrary", - "wasm-mutate", - "wasm-shrink", - "wasm-smith", - "wasmparser 0.111.0", - "wasmprinter 0.2.63", - "wast", - "wat", + "walrus-macro", + "wasmparser", ] [[package]] -name = "wasm-tools-fuzz" -version = "0.0.1" +name = "walrus-macro" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e5bd22c71e77d60140b0bd5be56155a37e5bd14e24f5f87298040d0cc40d7" dependencies = [ - "anyhow", - "arbitrary", - "env_logger", - "libfuzzer-sys", - "log", - "tempfile", - "wasm-encoder 0.31.1", - "wasm-mutate", - "wasm-smith", - "wasmparser 0.111.0", - "wasmprinter 0.2.63", - "wasmtime", - "wast", - "wat", - "wit-component", - "wit-parser 0.10.0", - "wit-smith", + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "wasmparser" -version = "0.107.0" +name = "want" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" dependencies = [ - "indexmap 1.9.3", - "semver", + "log", + "try-lock", ] [[package]] -name = "wasmparser" -version = "0.111.0" +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.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ - "anyhow", - "criterion", - "indexmap 2.0.0", - "once_cell", - "rayon", - "semver", - "wasm-encoder 0.31.1", - "wast", - "wat", + "cfg-if", + "wasm-bindgen-macro", ] [[package]] -name = "wasmparser" -version = "0.111.0" +name = "wasm-bindgen-backend" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad71036aada3f6b09251546e97e4f4f176dd6b41cf6fa55e7e0f65e86aec319a" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ - "indexmap 2.0.0", - "semver", + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.18", + "wasm-bindgen-shared", ] [[package]] -name = "wasmprinter" -version = "0.2.63" +name = "wasm-bindgen-cli-support" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8315d6503415e5d44ff64f1ba34aefd8264c561df17e0f1c8eb8c96bde79c45e" dependencies = [ "anyhow", - "diff", - "rayon", + "base64 0.9.3", + "log", + "rustc-demangle", + "serde_json", "tempfile", - "wasmparser 0.111.0", - "wast", - "wat", + "unicode-ident", + "walrus", + "wasm-bindgen-externref-xform", + "wasm-bindgen-multi-value-xform", + "wasm-bindgen-shared", + "wasm-bindgen-threads-xform", + "wasm-bindgen-wasm-conventions", + "wasm-bindgen-wasm-interpreter", ] [[package]] -name = "wasmprinter" -version = "0.2.63" +name = "wasm-bindgen-externref-xform" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8cc41d341939dce08ee902b50e36cd35add940f6044c94b144e8f73fe07a6" +checksum = "4522bf3be16c6274c87a5a2c5d2a62efa80253b025f8e813f9682d0d6a8a8fca" dependencies = [ "anyhow", - "wasmparser 0.111.0 (registry+https://github.com/rust-lang/crates.io-index)", + "walrus", ] [[package]] -name = "wasmtime" -version = "11.0.1" +name = "wasm-bindgen-futures" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b1f817f2ca5070983c71f1205fbab5848c9073df7f4e1af9fdceb4cc4a1b8e5" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" dependencies = [ - "anyhow", - "bincode", - "bumpalo", "cfg-if", - "encoding_rs", - "fxprof-processed-profile", - "indexmap 1.9.3", - "libc", - "log", - "object 0.30.4", - "once_cell", - "paste", - "psm", - "serde", - "serde_json", - "target-lexicon", - "wasmparser 0.107.0", - "wasmtime-component-macro", - "wasmtime-component-util", - "wasmtime-cranelift", - "wasmtime-environ", - "wasmtime-jit", - "wasmtime-runtime", - "wasmtime-winch", - "windows-sys", + "js-sys", + "wasm-bindgen", + "web-sys", ] [[package]] -name = "wasmtime-asm-macros" -version = "11.0.1" +name = "wasm-bindgen-macro" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f82fbfda4610e9225238c62574ecded8e9d6ad3a12f387ac45819ecad5c3f9b" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ - "cfg-if", + "quote", + "wasm-bindgen-macro-support", ] [[package]] -name = "wasmtime-component-macro" -version = "11.0.1" +name = "wasm-bindgen-macro-support" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27b96c540c78e12b60025fcbc0ba8a55bff1b32885a5e8eae2df765a6bc97ac" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ - "anyhow", "proc-macro2", "quote", - "syn 1.0.109", - "wasmtime-component-util", - "wasmtime-wit-bindgen", - "wit-parser 0.8.0", + "syn 2.0.18", + "wasm-bindgen-backend", + "wasm-bindgen-shared", ] [[package]] -name = "wasmtime-component-util" -version = "11.0.1" +name = "wasm-bindgen-multi-value-xform" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0928fe66c22bf8887e2fb524b7647308b8ce836a333af8504e4f1d80b8ea849f" - -[[package]] -name = "wasmtime-cranelift" -version = "11.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b659f6e58662d1131f250339acd03aa49377f9351474282699985b79ca4d4a7c" +checksum = "113256596776ebb4b243512d3711e73d5475eaeff373e1ae65427c66e5aa2073" dependencies = [ "anyhow", - "cranelift-codegen", - "cranelift-control", - "cranelift-entity", - "cranelift-frontend", - "cranelift-native", - "cranelift-wasm", - "gimli", - "log", - "object 0.30.4", - "target-lexicon", - "thiserror", - "wasmparser 0.107.0", - "wasmtime-cranelift-shared", - "wasmtime-environ", + "walrus", ] [[package]] -name = "wasmtime-cranelift-shared" -version = "11.0.1" +name = "wasm-bindgen-shared" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74171de083bf2ecb716c507900f825e2b858346c714fbf48f4763ea760f998a8" -dependencies = [ - "anyhow", - "cranelift-codegen", - "cranelift-control", - "cranelift-native", - "gimli", - "object 0.30.4", - "target-lexicon", - "wasmtime-environ", -] +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] -name = "wasmtime-environ" -version = "11.0.1" +name = "wasm-bindgen-test" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b124cbac1a3e04a744c76b3f77919343ef16dc4c818a2406dd7b689b16a54639" +checksum = "c9e636f3a428ff62b3742ebc3c70e254dfe12b8c2b469d688ea59cdd4abcf502" dependencies = [ - "anyhow", - "cranelift-entity", - "gimli", - "indexmap 1.9.3", - "log", - "object 0.30.4", - "serde", - "target-lexicon", - "thiserror", - "wasm-encoder 0.29.0", - "wasmparser 0.107.0", - "wasmprinter 0.2.63 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmtime-component-util", - "wasmtime-types", + "console_error_panic_hook", + "js-sys", + "scoped-tls", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test-macro", ] [[package]] -name = "wasmtime-jit" -version = "11.0.1" +name = "wasm-bindgen-test-macro" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ff15f426c2378f32ffb6d9b4370e3504231492e93f6968e8b5102c3256bbc4" +checksum = "f18c1fad2f7c4958e7bcce014fa212f59a65d5e3721d0f77e6c0b27ede936ba3" dependencies = [ - "addr2line 0.19.0", - "anyhow", - "bincode", - "cfg-if", - "cpp_demangle 0.3.5", - "gimli", - "log", - "object 0.30.4", - "rustc-demangle", - "rustix 0.37.23", - "serde", - "target-lexicon", - "wasmtime-environ", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime", - "windows-sys", + "proc-macro2", + "quote", ] [[package]] -name = "wasmtime-jit-debug" -version = "11.0.1" +name = "wasm-bindgen-threads-xform" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c549e219102426aa1f90bd18e56a3195ed1e696c318abb3f501c1f4924b530ac" +checksum = "89106aaf83a2b80464fc8f60a074a4575135b73a491e174f35bbeae6ff0d7ec6" dependencies = [ - "once_cell", + "anyhow", + "walrus", + "wasm-bindgen-wasm-conventions", ] [[package]] -name = "wasmtime-jit-icache-coherence" -version = "11.0.1" +name = "wasm-bindgen-wasm-conventions" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cf02fedda287a409cff80ad40a7c6c0f0771e99b0cd5e2b79d9cb7ecdc1b2f4" +checksum = "84e5ad27a7930400994cb40823d3d4a7ef235fac52d0c75ebd61fa40eba994a8" dependencies = [ - "cfg-if", - "libc", - "windows-sys", + "anyhow", + "walrus", ] [[package]] -name = "wasmtime-runtime" -version = "11.0.1" +name = "wasm-bindgen-wasm-interpreter" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc38c6229a5d3b8a2528eb33eb11d3e7ebf570259c7cd2f01e8668fe783ea443" +checksum = "e69500063b7b20f3e9422d78c2b381dd192c7c4ebaef34d205332877cd78e0d3" dependencies = [ "anyhow", - "cc", - "cfg-if", - "encoding_rs", - "indexmap 1.9.3", - "libc", "log", - "mach", - "memfd", - "memoffset 0.8.0", - "paste", - "rand", - "rustix 0.37.23", - "sptr", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-jit-debug", - "windows-sys", + "walrus", + "wasm-bindgen-wasm-conventions", ] [[package]] -name = "wasmtime-types" -version = "11.0.1" +name = "wasm-streams" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "768f6c5e7afc3a02eff2753196741db8e5ac5faf26a1e2204d7341b30a637c6f" +checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" dependencies = [ - "cranelift-entity", - "serde", - "thiserror", - "wasmparser 0.107.0", + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", ] [[package]] -name = "wasmtime-winch" -version = "11.0.1" +name = "wasm-streams" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2249faeb887b8b7e7b1797c460ac76160654aea3b8d5842093a771d77fc3819" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ - "anyhow", - "cranelift-codegen", - "gimli", - "object 0.30.4", - "target-lexicon", - "wasmparser 0.107.0", - "wasmtime-cranelift-shared", - "wasmtime-environ", - "winch-codegen", + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", ] [[package]] -name = "wasmtime-wit-bindgen" -version = "11.0.1" +name = "wasmparser" +version = "0.77.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a4a005a6a2d5faa7cd953d389da8ae979cb571fe40edec7769649d8c98d874" -dependencies = [ - "anyhow", - "heck", - "wit-parser 0.8.0", -] +checksum = "5fe3d5405e9ea6c1317a656d6e0820912d8b7b3607823a7596117c8f666daf6f" [[package]] -name = "wast" -version = "63.0.0" +name = "web-sys" +version = "0.3.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" dependencies = [ - "anyhow", - "leb128", - "memchr", - "rayon", - "unicode-width", - "wasm-encoder 0.31.1", - "wasmparser 0.111.0", - "wat", + "js-sys", + "wasm-bindgen", ] [[package]] -name = "wat" -version = "1.0.70" +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" dependencies = [ - "wast", + "ring", + "untrusted", ] [[package]] -name = "web-sys" -version = "0.3.64" +name = "webpki-roots" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "js-sys", - "wasm-bindgen", + "webpki", ] [[package]] @@ -2293,34 +2153,33 @@ 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 = "winch-codegen" -version = "0.9.1" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21de111a36e8f367416862fdf6f10caa411cc07a6e21b614eedbf9388c2a3dc9" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "anyhow", - "cranelift-codegen", - "gimli", - "regalloc2", - "smallvec", - "target-lexicon", - "wasmparser 0.107.0", - "wasmtime-environ", + "windows-targets", +] + +[[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]] @@ -2334,141 +2193,223 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.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.48.5" +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 = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +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.48.5" +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 = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +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 = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +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 = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] -name = "wit-component" -version = "0.13.2" +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ - "anyhow", - "bitflags 2.4.0", - "env_logger", - "glob", - "indexmap 2.0.0", - "log", - "pretty_assertions", - "wasm-encoder 0.31.1", - "wasm-metadata", - "wasmparser 0.111.0", - "wasmprinter 0.2.63", - "wasmtime", - "wat", - "wit-parser 0.10.0", + "winapi", ] [[package]] -name = "wit-parser" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6daec9f093dbaea0e94043eeb92ece327bbbe70c86b1f41aca9bbfefd7f050f0" +name = "worker" +version = "0.0.18" dependencies = [ - "anyhow", - "id-arena", - "indexmap 1.9.3", - "log", - "pulldown-cmark 0.8.0", - "semver", - "unicode-xid", + "async-trait", + "chrono", + "chrono-tz", + "futures-channel", + "futures-util", + "http", + "js-sys", + "matchit", + "pin-project", + "serde", + "serde-wasm-bindgen", + "serde_json", + "tokio", "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams 0.3.0", + "web-sys", + "worker-kv", + "worker-macros", + "worker-sys", ] [[package]] -name = "wit-parser" -version = "0.10.0" +name = "worker-build" +version = "0.0.10" dependencies = [ "anyhow", - "env_logger", - "id-arena", - "indexmap 2.0.0", - "log", - "pretty_assertions", - "pulldown-cmark 0.9.3", - "rayon", - "semver", - "unicode-xid", - "url", + "dirs-next", + "flate2", + "tar", + "ureq", + "wasm-bindgen-cli-support", ] [[package]] -name = "wit-parser-fuzz" -version = "0.0.1" +name = "worker-kv" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d4b9fe1a87b7aef252fceb4f30bf6303036a5de329c81ccad9be9c35d1fdbc7" dependencies = [ - "arbitrary", - "env_logger", - "libfuzzer-sys", - "log", - "wasmprinter 0.2.63", - "wit-parser 0.10.0", + "js-sys", + "serde", + "serde-wasm-bindgen", + "serde_json", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", ] [[package]] -name = "wit-smith" -version = "0.1.9" +name = "worker-macros" +version = "0.0.10" dependencies = [ - "arbitrary", - "clap 4.3.23", - "indexmap 2.0.0", - "log", - "semver", - "wit-component", - "wit-parser 0.10.0", + "async-trait", + "proc-macro2", + "quote", + "syn 2.0.18", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-macro-support", + "worker-sys", +] + +[[package]] +name = "worker-sandbox" +version = "0.1.0" +dependencies = [ + "blake2", + "cfg-if", + "chrono", + "console_error_panic_hook", + "futures-channel", + "futures-util", + "getrandom", + "hex", + "http", + "md5", + "rand", + "regex", + "reqwest", + "retry", + "serde", + "serde-wasm-bindgen", + "serde_json", + "tokio", + "tungstenite", + "uuid", + "wasm-bindgen-test", + "worker", ] [[package]] -name = "yansi" -version = "0.5.1" +name = "worker-sys" +version = "0.0.10" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "xattr" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] diff --git a/nixpkgs/pkgs/development/tools/worker-build/default.nix b/nixpkgs/pkgs/development/tools/worker-build/default.nix index 54f5f0191b43..620fd87142ff 100644 --- a/nixpkgs/pkgs/development/tools/worker-build/default.nix +++ b/nixpkgs/pkgs/development/tools/worker-build/default.nix @@ -2,16 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "worker-build"; - version = "0.0.17"; + version = "0.0.18"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-rs"; rev = "v${version}"; - sha256 = "sha256-siKIE+RHAnZ8Lj3kWg7jEVo5t10dqc59OMrro26ClWo="; + hash = "sha256-z6m14IbMzgycwnQpA28e4taokDSVpfZOKIRmFIwLjbg="; }; - cargoHash = "sha256-j6WG8pRM6fIvMeXDdkjzRREE9tIug0w+UwWdOmPao4U="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "postgres-protocol-0.6.5" = "sha256-xLyaappu7ebtKOoHY49dvjDEcuRg8IOv1bNH9RxSUcM="; + }; + }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; @@ -22,7 +27,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "This is a tool to be used as a custom build command for a Cloudflare Workers `workers-rs` project."; - homepage = "https://github.com/cloudflare/worker-rs"; + homepage = "https://github.com/cloudflare/workers-rs"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ happysalada ]; }; diff --git a/nixpkgs/pkgs/development/web/bun/default.nix b/nixpkgs/pkgs/development/web/bun/default.nix index 7b9ea612ab37..4520cbd22c13 100644 --- a/nixpkgs/pkgs/development/web/bun/default.nix +++ b/nixpkgs/pkgs/development/web/bun/default.nix @@ -11,7 +11,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.7.3"; + version = "0.8.1"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -35,19 +35,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-9gs5PIbYxhhUC+lw/iEIhjdMIUYVnhP7oYrRqmE3HcU="; + hash = "sha256-R0+2MevBE98WNsjGsfBrMJyvc0jadLQ9lJIvoekGiBk="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-CFio1bgsgND54BrklkCVjfDvMDFxpYe1h77nGMOJdsc="; + hash = "sha256-fdn3yEavJUEwcUiyr9vd/0yVzkuJLwTvVeIaLcZkKhs="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-j6NpHAqSBRe2Wa4ztA1Ao4JYTKTEIwlYMCMMICKqZv0="; + hash = "sha256-dGu06A/6d/OtyXcmJCVZsODkLIvP7Zd0w6vnuLWuI1I="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-05Duhv2WrYXWS6mKI3zB5QiIlitsysXwmuy+9XHBB9M="; + hash = "sha256-BZ1Ymu2WexC4Ad3cS0Zo9K6WtYL8rlqIYWprk1MyOsg="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/nixpkgs/pkgs/development/web/cypress/default.nix b/nixpkgs/pkgs/development/web/cypress/default.nix index 4532b7743045..6802f218b523 100644 --- a/nixpkgs/pkgs/development/web/cypress/default.nix +++ b/nixpkgs/pkgs/development/web/cypress/default.nix @@ -18,7 +18,7 @@ let availableBinaries = { x86_64-linux = { platform = "linux-x64"; - checksum = "sha256-khMJRCGNIITvs56SHHKxoxptoMBb7lqA3FS293qfMys="; + checksum = "sha256-9f5Ewd63pLpMbewtQ0u4WsRnZQEn1lfh6b/jZ8yDSMU="; }; aarch64-linux = { platform = "linux-arm64"; @@ -30,7 +30,7 @@ let inherit (binary) platform checksum; in stdenv.mkDerivation rec { pname = "cypress"; - version = "12.17.3"; + version = "12.17.4"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip"; diff --git a/nixpkgs/pkgs/development/web/insomnia/default.nix b/nixpkgs/pkgs/development/web/insomnia/default.nix index abf2ff4b4327..99843767d906 100644 --- a/nixpkgs/pkgs/development/web/insomnia/default.nix +++ b/nixpkgs/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2023.4.0"; + version = "2023.5.5"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-7tkd0HaJeDdCvX1t1XCHrrQ23xFrcMsy1nhJJEp6klk="; + sha256 = "sha256-/SrSpkfF3IrLl6BC4UknsTDraqN8uFKrKQSzQpBaRLY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/web/playwright-test/node-packages.json b/nixpkgs/pkgs/development/web/playwright-test/node-packages.json index 87012158d5e4..b079fb119e9e 100644 --- a/nixpkgs/pkgs/development/web/playwright-test/node-packages.json +++ b/nixpkgs/pkgs/development/web/playwright-test/node-packages.json @@ -1,3 +1,3 @@ [ - {"@playwright/test": "1.34.3"} + {"@playwright/test": "1.37.0"} ] diff --git a/nixpkgs/pkgs/development/web/playwright-test/node-packages.nix b/nixpkgs/pkgs/development/web/playwright-test/node-packages.nix index 329452c14bee..63abea2981b0 100644 --- a/nixpkgs/pkgs/development/web/playwright-test/node-packages.nix +++ b/nixpkgs/pkgs/development/web/playwright-test/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@types/node-20.2.5" = { + "@types/node-20.5.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.2.5"; + version = "20.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.2.5.tgz"; - sha512 = "JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.5.0.tgz"; + sha512 = "Mgq7eCtoTjT89FqNoTzzXg2XvCi5VMhRV6+I2aYanc6kQCBImeNaAYRs/DyoVqk1YEUJK5gN9VO7HRIdz4Wo3Q=="; }; }; "fsevents-2.3.2" = { @@ -22,30 +22,30 @@ let sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; }; }; - "playwright-core-1.34.3" = { + "playwright-core-1.37.0" = { name = "playwright-core"; packageName = "playwright-core"; - version = "1.34.3"; + version = "1.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/playwright-core/-/playwright-core-1.34.3.tgz"; - sha512 = "2pWd6G7OHKemc5x1r1rp8aQcpvDh7goMBZlJv6Co5vCNLVcQJdhxRL09SGaY6HcyHH9aT4tiynZabMofVasBYw=="; + url = "https://registry.npmjs.org/playwright-core/-/playwright-core-1.37.0.tgz"; + sha512 = "1c46jhTH/myQw6sesrcuHVtLoSNfJv8Pfy9t3rs6subY7kARv0HRw5PpyfPYPpPtQvBOmgbE6K+qgYUpj81LAA=="; }; }; }; in { - "@playwright/test-1.34.3" = nodeEnv.buildNodePackage { + "@playwright/test-1.37.0" = nodeEnv.buildNodePackage { name = "_at_playwright_slash_test"; packageName = "@playwright/test"; - version = "1.34.3"; + version = "1.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/@playwright/test/-/test-1.34.3.tgz"; - sha512 = "zPLef6w9P6T/iT6XDYG3mvGOqOyb6eHaV9XtkunYs0+OzxBtrPAAaHotc0X+PJ00WPPnLfFBTl7mf45Mn8DBmw=="; + url = "https://registry.npmjs.org/@playwright/test/-/test-1.37.0.tgz"; + sha512 = "181WBLk4SRUyH1Q96VZl7BP6HcK0b7lbdeKisn3N/vnjitk+9HbdlFz/L5fey05vxaAhldIDnzo8KUoy8S3mmQ=="; }; dependencies = [ - sources."@types/node-20.2.5" + sources."@types/node-20.5.0" sources."fsevents-2.3.2" - sources."playwright-core-1.34.3" + sources."playwright-core-1.37.0" ]; buildInputs = globalBuildInputs; meta = { diff --git a/nixpkgs/pkgs/development/web/playwright/driver.nix b/nixpkgs/pkgs/development/web/playwright/driver.nix index 3ee02fe402ec..1046647a277a 100644 --- a/nixpkgs/pkgs/development/web/playwright/driver.nix +++ b/nixpkgs/pkgs/development/web/playwright/driver.nix @@ -30,15 +30,15 @@ let { pname = "playwright-driver"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.34.3"; + version = "1.37.0"; src = fetchurl { url = "https://playwright.azureedge.net/builds/driver/${filename}"; sha256 = { - x86_64-linux = "1xh05v3yqa8gkwayhl4nffgjcnlakpyyi17hwzh0wqzrbwwn0cs8"; - aarch64-linux = "18jxbmhiqda5pzrv6b3n7xi14xg4zvlh6sn7hc3b3hckl77vl933"; - x86_64-darwin = "0fy5nxbvp1kxplavj832gxiznjqpvl0ww869hsfj0h1fibhly7cy"; - aarch64-darwin = "11msl4pnmr8cmlw32xq2qvfz3g3fy0azvq134a47c0fnpj2gd5zl"; + x86_64-linux = "1lkmanr402ar9njwb7dgyzparjyr1r9krz9ad7b8c6hi3fjvrj0y"; + aarch64-linux = "13nfva9jfmjyjxm1my0aq8ngn6ha0fdrpfv28gm351n0j9cjlvqh"; + x86_64-darwin = "0q1qmgypngxs9ipb6dlhk1xccyzw6frzr835ijifpypgp4xmz2gi"; + aarch64-darwin = "1mq1868s06wgfgi3nhdrzsdqi3cl08lrkiz5q06mg1s724b2sf0v"; }.${system} or throwSystem; }; diff --git a/nixpkgs/pkgs/games/angband/default.nix b/nixpkgs/pkgs/games/angband/default.nix index 6c34176be375..0b24988c54f2 100644 --- a/nixpkgs/pkgs/games/angband/default.nix +++ b/nixpkgs/pkgs/games/angband/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "angband"; - version = "4.2.4"; + version = "4.2.5"; src = fetchFromGitHub { owner = "angband"; repo = "angband"; rev = version; - sha256 = "sha256-Fp3BGCZYYdQCKXOLYsT4zzlibNRlbELZi26ofrbGGPQ="; + sha256 = "sha256-XH2FUTJJaH5TqV2UD1CKKAXE4CRAb6zfg1UQ79a15k0="; }; diff --git a/nixpkgs/pkgs/games/anki/Cargo.lock b/nixpkgs/pkgs/games/anki/Cargo.lock index 4ede682cc1e5..2bc1a892b2a0 100644 --- a/nixpkgs/pkgs/games/anki/Cargo.lock +++ b/nixpkgs/pkgs/games/anki/Cargo.lock @@ -55,7 +55,7 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64e6d1c7838db705c9b756557ee27c384ce695a1c51a6fe528784cb1c6840170" dependencies = [ - "html5ever 0.26.0", + "html5ever", "maplit", "once_cell", "tendril", @@ -83,7 +83,6 @@ version = "0.0.0" dependencies = [ "ammonia", "anki_i18n", - "ascii_percent_encoding", "async-compression", "async-stream", "async-trait", @@ -93,7 +92,7 @@ dependencies = [ "bytes", "chrono", "coarsetime", - "convert_case 0.6.0", + "convert_case", "criterion", "csv", "difflib", @@ -114,6 +113,7 @@ dependencies = [ "num_cpus", "num_enum", "once_cell", + "percent-encoding-iri", "pin-project", "prost", "prost-build", @@ -148,7 +148,7 @@ dependencies = [ "wiremock", "workspace-hack", "zip", - "zstd 0.12.2+zstd.1.5.2", + "zstd 0.12.3+zstd.1.5.2", ] [[package]] @@ -181,10 +181,50 @@ dependencies = [ ] [[package]] +name = "anstream" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-wincon", + "concolor-override", + "concolor-query", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" + +[[package]] +name = "anstyle-parse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-wincon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +dependencies = [ + "anstyle", + "windows-sys 0.45.0", +] + +[[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "apple-bundles" @@ -211,14 +251,14 @@ dependencies = [ "workspace-hack", "xz2", "zip", - "zstd 0.12.2+zstd.1.5.2", + "zstd 0.12.3+zstd.1.5.2", ] [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -227,10 +267,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] -name = "ascii_percent_encoding" -version = "0.0.0" - -[[package]] name = "assert-json-diff" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -267,34 +303,35 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" +checksum = "ad445822218ce64be7a341abfb0b1ea43b5c23aa83902542a4542e78309d8e5e" dependencies = [ "async-stream-impl", "futures-core", + "pin-project-lite", ] [[package]] name = "async-stream-impl" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" +checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "async-trait" -version = "0.1.61" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.12", ] [[package]] @@ -316,21 +353,21 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.2" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1304eab461cf02bd70b083ed8273388f9724c549b316ba3d1e213ce0e9e7fb7e" +checksum = "349f8ccfd9221ee7d1f3d4b33e1f8319b3a81ed8f61f2ea40b37b859794b4491" dependencies = [ "async-trait", "axum-core", "axum-macros", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "headers", "http", "http-body", "hyper", - "itoa 1.0.5", + "itoa", "matchit", "memchr", "mime", @@ -345,7 +382,6 @@ dependencies = [ "sync_wrapper", "tokio", "tower", - "tower-http", "tower-layer", "tower-service", ] @@ -362,9 +398,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f487e40dc9daee24d8a1779df88522f159a54a980f99cfbe43db0be0bd3444a8" +checksum = "b2f958c80c248b34b9a877a643811be8dbca03ca5ba827f2b63baf3a81e5fc4e" dependencies = [ "async-trait", "bytes", @@ -379,14 +415,14 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.3.1" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7d7c3e69f305217e317a28172aab29f275667f2e1c15b87451e134fe27c7b1" +checksum = "2bb524613be645939e280b7279f7b017f98cf7f5ef084ec374df373530e73277" dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.12", ] [[package]] @@ -418,9 +454,9 @@ checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[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 = "bitflags" @@ -429,6 +465,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" + +[[package]] name = "blake3" version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -438,15 +480,15 @@ dependencies = [ "arrayvec", "cc", "cfg-if", - "constant_time_eq 0.2.4", + "constant_time_eq 0.2.5", "digest", ] [[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", ] @@ -474,11 +516,13 @@ dependencies = [ [[package]] name = "bstr" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" +checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" dependencies = [ "memchr", + "once_cell", + "regex-automata", "serde", ] @@ -496,9 +540,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bzip2" @@ -523,9 +567,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.2" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" +checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" [[package]] name = "cast" @@ -539,14 +583,14 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" dependencies = [ - "cipher 0.4.3", + "cipher 0.4.4", ] [[package]] name = "cc" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ "jobserver", ] @@ -559,9 +603,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "iana-time-zone", "num-integer", @@ -607,9 +651,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", @@ -621,7 +665,7 @@ version = "3.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "clap_lex 0.2.4", "indexmap", "textwrap", @@ -629,30 +673,49 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.1" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2" +checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" dependencies = [ - "bitflags", + "clap_builder", "clap_derive", - "clap_lex 0.3.1", - "is-terminal", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +dependencies = [ + "anstream", + "anstyle", + "bitflags 1.3.2", + "clap_lex 0.4.1", "once_cell", "strsim", - "termcolor", + "terminal_size", +] + +[[package]] +name = "clap_complete" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01c22dcfb410883764b29953103d9ef7bb8fe21b3fa1158bc99986c2067294bd" +dependencies = [ + "clap 4.2.1", ] [[package]] name = "clap_derive" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.12", ] [[package]] @@ -666,18 +729,15 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "coarsetime" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454038500439e141804c655b4cd1bc6a70bcb95cd2bc9463af5661b6956f0e46" +checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354" dependencies = [ "libc", "once_cell", @@ -707,6 +767,21 @@ dependencies = [ ] [[package]] +name = "concolor-override" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" + +[[package]] +name = "concolor-query" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" +dependencies = [ + "windows-sys 0.45.0", +] + +[[package]] name = "concurrent-queue" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -731,15 +806,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "constant_time_eq" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" - -[[package]] -name = "convert_case" -version = "0.4.0" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" [[package]] name = "convert_case" @@ -768,9 +837,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" dependencies = [ "libc", ] @@ -822,9 +891,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", @@ -832,9 +901,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", @@ -843,22 +912,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.7.1", + "memoffset", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if", ] @@ -874,40 +943,13 @@ dependencies = [ ] [[package]] -name = "cssparser" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa 0.4.8", - "matches", - "phf 0.8.0", - "proc-macro2", - "quote", - "smallvec", - "syn", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" -dependencies = [ - "quote", - "syn", -] - -[[package]] name = "csv" version = "1.1.6" source = "git+https://github.com/ankitects/rust-csv.git?rev=1c9d3aab6f79a7d815c69f925a46a4590c115f90#1c9d3aab6f79a7d815c69f925a46a4590c115f90" dependencies = [ "bstr 0.2.17", "csv-core", - "itoa 1.0.5", + "itoa", "ryu", "serde", ] @@ -922,9 +964,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.86" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" dependencies = [ "cc", "cxxbridge-flags", @@ -934,9 +976,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.86" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" dependencies = [ "cc", "codespan-reporting", @@ -944,24 +986,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 2.0.12", ] [[package]] name = "cxxbridge-flags" -version = "1.0.86" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" [[package]] name = "cxxbridge-macro" -version = "1.0.86" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.12", ] [[package]] @@ -984,25 +1026,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaa37046cc0f6c3cc6090fbdbf73ef0b8ef4cfcc37f6befc0020f63e8cf121e1" [[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case 0.4.0", - "proc-macro2", - "quote", - "rustc_version", - "syn", -] - -[[package]] name = "des" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e" dependencies = [ - "cipher 0.4.3", + "cipher 0.4.4", ] [[package]] @@ -1030,7 +1059,7 @@ checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1040,21 +1069,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - -[[package]] -name = "dtoa-short" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" -dependencies = [ - "dtoa", -] - -[[package]] name = "duct" version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1074,15 +1088,27 @@ checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "elasticlunr-rs" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "41e83863a500656dfa214fee6682de9c5b9f03de6860fec531235ed2ae9f6571" +dependencies = [ + "regex", + "serde", + "serde_derive", + "serde_json", +] [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] @@ -1102,13 +1128,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.45.0", ] [[package]] @@ -1141,23 +1167,23 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[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 = "filetime" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys", + "redox_syscall 0.2.16", + "windows-sys 0.45.0", ] [[package]] @@ -1282,6 +1308,15 @@ dependencies = [ ] [[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] name = "ftl" version = "0.0.0" dependencies = [ @@ -1302,9 +1337,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -1317,9 +1352,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -1327,15 +1362,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -1344,9 +1379,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" @@ -1365,26 +1400,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.12", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-timer" @@ -1394,9 +1429,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -1411,19 +1446,10 @@ dependencies = [ ] [[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -1462,9 +1488,18 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" + +[[package]] +name = "gitignore" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78aa90e4620c1498ac434c06ba6e521b525794bbdacf085d490cc794b4a2f9a4" +dependencies = [ + "glob", +] [[package]] name = "glob" @@ -1479,7 +1514,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", - "bstr 1.1.0", + "bstr 1.4.0", "fnv", "log", "regex", @@ -1487,9 +1522,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" dependencies = [ "bytes", "fnv", @@ -1511,6 +1546,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] +name = "handlebars" +version = "4.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a" +dependencies = [ + "log", + "pest", + "pest_derive", + "serde", + "serde_json", + "thiserror", +] + +[[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1535,7 +1584,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "bytes", "headers-core", "http", @@ -1555,9 +1604,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -1578,6 +1627,12 @@ dependencies = [ ] [[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1594,30 +1649,16 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" -dependencies = [ - "log", - "mac", - "markup5ever 0.10.1", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "html5ever" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" dependencies = [ "log", "mac", - "markup5ever 0.11.0", + "markup5ever", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1628,13 +1669,13 @@ checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", - "itoa 1.0.5", + "itoa", ] [[package]] @@ -1695,9 +1736,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" dependencies = [ "bytes", "futures-channel", @@ -1708,7 +1749,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.5", + "itoa", "pin-project-lite", "socket2", "tokio", @@ -1745,16 +1786,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows", ] [[package]] @@ -1788,9 +1829,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", @@ -1798,9 +1839,9 @@ dependencies = [ [[package]] name = "indoc" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2d6f23ffea9d7e76c53eee25dfb67bcd8fde7f1198b0855350698c9f07c780" +checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "infer" @@ -1815,6 +1856,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" [[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 = "inout" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1854,30 +1915,31 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.4" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" dependencies = [ + "hermit-abi 0.3.1", "libc", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] name = "ipnet" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] name = "is-terminal" -version = "0.4.2" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.1", "io-lifetimes", "rustix", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -1891,54 +1953,56 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] [[package]] name = "junction" -version = "0.2.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be39922b087cecaba4e2d5592dedfc8bda5d4a5a1231f143337cca207950b61d" +checksum = "ca39ef0d69b18e6a2fd14c2f0a1d593200f4a4ed949b240b5917ab51fac754cb" dependencies = [ "scopeguard", "winapi", ] [[package]] -name = "kuchiki" -version = "0.8.1" +name = "kqueue" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" +checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" dependencies = [ - "cssparser", - "html5ever 0.25.2", - "matches", - "selectors", + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +dependencies = [ + "bitflags 1.3.2", + "libc", ] [[package]] @@ -1949,15 +2013,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "libsqlite3-sys" -version = "0.25.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" dependencies = [ "cc", "pkg-config", @@ -1984,18 +2048,20 @@ dependencies = [ [[package]] name = "linkcheck" -version = "0.4.1-alpha.0" -source = "git+https://github.com/ankitects/linkcheck.git?rev=2f20798ce521cc594d510d4e417e76d5eac04d4b#2f20798ce521cc594d510d4e417e76d5eac04d4b" +version = "0.4.1" +source = "git+https://github.com/ankitects/linkcheck.git?rev=184b2ca50ed39ca43da13f0b830a463861adb9ca#184b2ca50ed39ca43da13f0b830a463861adb9ca" dependencies = [ "bytes", "codespan", "dunce", "futures", + "html5ever", "http", - "kuchiki", "lazy_static", "linkify", "log", + "markup5ever_rcdom", + "mdbook", "pulldown-cmark 0.8.0", "regex", "reqwest", @@ -2022,18 +2088,18 @@ dependencies = [ [[package]] name = "linkify" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78d59d732ba6d7eeefc418aab8057dc8e3da4374bd5802ffa95bebc04b4d1dfb" +checksum = "04d828fdc1ffceb369a5a9183bd4df2dbb3678f40c8b3fbaa9231de32beb29f9" dependencies = [ "memchr", ] [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] name = "lock_api" @@ -2078,7 +2144,7 @@ dependencies = [ "anyhow", "apple-bundles", "camino", - "clap 4.1.1", + "clap 4.2.1", "glob", "lazy_static", "plist", @@ -2095,7 +2161,7 @@ version = "0.0.0" dependencies = [ "anyhow", "camino", - "clap 4.1.1", + "clap 4.2.1", "glob", "tugger-windows-codesign", "walkdir", @@ -2110,30 +2176,28 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "markup5ever" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" dependencies = [ "log", - "phf 0.8.0", - "phf_codegen 0.8.0", + "phf 0.10.1", + "phf_codegen", "string_cache", "string_cache_codegen", "tendril", ] [[package]] -name = "markup5ever" -version = "0.11.0" +name = "markup5ever_rcdom" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +checksum = "b9521dd6750f8e80ee6c53d65e2e4656d7de37064f3a7a5d2d11d05df93839c2" dependencies = [ - "log", - "phf 0.10.1", - "phf_codegen 0.10.0", - "string_cache", - "string_cache_codegen", + "html5ever", + "markup5ever", "tendril", + "xml5ever", ] [[package]] @@ -2147,9 +2211,9 @@ 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" @@ -2158,19 +2222,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" [[package]] -name = "memchr" -version = "2.5.0" +name = "mdbook" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "764dcbfc2e5f868bc1b566eb179dff1a06458fd0cff846aae2579392dd3f01a0" +dependencies = [ + "ammonia", + "anyhow", + "chrono", + "clap 4.2.1", + "clap_complete", + "elasticlunr-rs", + "env_logger", + "futures-util", + "gitignore", + "handlebars", + "log", + "memchr", + "notify", + "notify-debouncer-mini", + "once_cell", + "opener", + "pulldown-cmark 0.9.2", + "regex", + "serde", + "serde_json", + "shlex", + "tempfile", + "tokio", + "toml", + "topological-sort", + "warp", +] [[package]] -name = "memoffset" -version = "0.7.1" +name = "memchr" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" @@ -2183,9 +2272,9 @@ dependencies = [ [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" @@ -2198,6 +2287,16 @@ dependencies = [ ] [[package]] +name = "minilints" +version = "0.0.0" +dependencies = [ + "anyhow", + "camino", + "once_cell", + "walkdir", +] + +[[package]] name = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2214,14 +2313,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -2238,7 +2337,7 @@ dependencies = [ "log", "memchr", "mime", - "spin 0.9.4", + "spin 0.9.8", "version_check", ] @@ -2288,12 +2387,6 @@ dependencies = [ ] [[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2310,6 +2403,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" [[package]] +name = "notify" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9" +dependencies = [ + "bitflags 1.3.2", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "mio", + "walkdir", + "windows-sys 0.42.0", +] + +[[package]] +name = "notify-debouncer-mini" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e23e9fa24f094b143c1eb61f90ac6457de87be6987bc70746e0179f7dbc9007b" +dependencies = [ + "crossbeam-channel", + "notify", +] + +[[package]] name = "nu-ansi-term" version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2326,7 +2447,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ "arrayvec", - "itoa 1.0.5", + "itoa", ] [[package]] @@ -2360,39 +2481,39 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.7" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.7" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "object" -version = "0.30.2" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b8c786513eb403643f2a88c244c2aaa270ef2153f55094587d0c48a3cf22a83" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "oorandom" @@ -2407,12 +2528,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] +name = "opener" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "293c15678e37254c15bd2f092314abb4e51d7fdde05c2021279c12631b54f005" +dependencies = [ + "bstr 1.4.0", + "winapi", +] + +[[package]] name = "openssl" version = "0.10.48" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -2429,7 +2560,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2453,19 +2584,19 @@ dependencies = [ [[package]] name = "os_pipe" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a252f1f8c11e84b3ab59d7a488e48e4478a93937e027076638c49536204639" +checksum = "a53dbb20faf34b16087a931834cba2d7a73cc74af2b7ef345a4c8324e2409a12" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] name = "os_str_bytes" -version = "6.4.1" +version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" [[package]] name = "overload" @@ -2480,7 +2611,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4873306de53fe82e7e484df31e1e947d61514b6ea2ed6cd7b45d63006fd9224" dependencies = [ "cbc", - "cipher 0.4.3", + "cipher 0.4.4", "des", "getrandom 0.2.8", "hmac", @@ -2508,15 +2639,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -2558,24 +2689,62 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] -name = "petgraph" -version = "0.6.2" +name = "percent-encoding-iri" +version = "2.2.0" +source = "git+https://github.com/ankitects/rust-url.git?rev=bb930b8d089f4d30d7d19c12e54e66191de47b88#bb930b8d089f4d30d7d19c12e54e66191de47b88" + +[[package]] +name = "pest" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" +checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122" dependencies = [ - "fixedbitset", - "indexmap", + "thiserror", + "ucd-trie", ] [[package]] -name = "phf" -version = "0.8.0" +name = "pest_derive" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +checksum = "be99c4c1d2fc2769b1d00239431d711d08f6efedcecb8b6e30707160aee99c15" dependencies = [ - "phf_macros 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.12", +] + +[[package]] +name = "pest_meta" +version = "2.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6733073c7cff3d8459fda0e42f13a047870242aed8b509fe98000928975f359e" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "petgraph" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +dependencies = [ + "fixedbitset", + "indexmap", ] [[package]] @@ -2593,22 +2762,12 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" dependencies = [ - "phf_macros 0.11.1", + "phf_macros", "phf_shared 0.11.1", ] [[package]] name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_codegen" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" @@ -2619,16 +2778,6 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] - -[[package]] -name = "phf_generator" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" @@ -2649,20 +2798,6 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "phf_macros" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" @@ -2671,16 +2806,7 @@ dependencies = [ "phf_shared 0.11.1", "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", + "syn 1.0.109", ] [[package]] @@ -2718,7 +2844,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2741,11 +2867,11 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "plist" -version = "1.4.0" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5329b8f106a176ab0dce4aae5da86bfcb139bb74fb00882859e03745011f3635" +checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "indexmap", "line-wrap", "quick-xml", @@ -2795,47 +2921,22 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "prettyplease" -version = "0.1.23" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.109", ] [[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", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", + "toml_edit", ] [[package]] @@ -2846,18 +2947,18 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.50" +version = "1.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" dependencies = [ "unicode-ident", ] [[package]] name = "prost" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" +checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537" dependencies = [ "bytes", "prost-derive", @@ -2865,9 +2966,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e" +checksum = "2c828f93f5ca4826f97fedcbd3f9a536c16b12cff3dbbb4a007f932bbad95b12" dependencies = [ "bytes", "heck", @@ -2880,31 +2981,30 @@ dependencies = [ "prost", "prost-types", "regex", - "syn", + "syn 1.0.109", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" +checksum = "4ea9b0f8cbe5e15a8a042d030bd96668db28ecb567ec37d691971ff5731d2b1b" dependencies = [ "anyhow", "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "prost-types" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" +checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88" dependencies = [ - "bytes", "prost", ] @@ -2914,7 +3014,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "getopts", "memchr", "unicase", @@ -2926,7 +3026,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" dependencies = [ - "bitflags", + "bitflags 1.3.2", "getopts", "memchr", "unicase", @@ -2934,14 +3034,14 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd4149c8c3975099622b4e1962dac27565cf5663b76452c3e2b66e0b6824277" +checksum = "cfb848f80438f926a9ebddf0a539ed6065434fd7aae03a89312a9821f81b8501" dependencies = [ "cfg-if", "indoc", "libc", - "memoffset 0.8.0", + "memoffset", "parking_lot", "pyo3-build-config", "pyo3-ffi", @@ -2951,9 +3051,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd09fe469834db21ee60e0051030339e5d361293d8cb5ec02facf7fdcf52dbf" +checksum = "98a42e7f42e917ce6664c832d5eee481ad514c98250c49e0b03b20593e2c7ed0" dependencies = [ "once_cell", "target-lexicon", @@ -2961,9 +3061,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c427c9a96b9c5b12156dbc11f76b14f49e9aae8905ca783ea87c249044ef137" +checksum = "a0707f0ab26826fe4ccd59b69106e9df5e12d097457c7b8f9c0fd1d2743eec4d" dependencies = [ "libc", "pyo3-build-config", @@ -2971,41 +3071,41 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b822bbba9d60630a44d2109bc410489bb2f439b33e3a14ddeb8a40b378a7c4" +checksum = "978d18e61465ecd389e1f235ff5a467146dc4e3c3968b90d274fe73a5dd4a438" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "pyo3-macros-backend" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ae898104f7c99db06231160770f3e40dad6eb9021daddc0fedfa3e41dff10a" +checksum = "8e0e1128f85ce3fca66e435e08aa2089a2689c1c48ce97803e13f63124058462" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "quick-xml" -version = "0.26.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" +checksum = "e5c1a97b1bc42b1d550bfb48d4262153fe400a12bab1511821736f7eac76d7e2" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -3021,7 +3121,6 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", - "rand_pcg", ] [[package]] @@ -3083,19 +3182,10 @@ dependencies = [ ] [[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -3103,9 +3193,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -3119,7 +3209,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62c64daa8e9438b84aaae55010a93f396f8e60e3911590fcba770d04643fc1dd" dependencies = [ - "cipher 0.4.3", + "cipher 0.4.4", ] [[package]] @@ -3140,14 +3230,23 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.7.1" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -3165,17 +3264,17 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "reqwest" -version = "0.11.13" +version = "0.11.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" +checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "bytes", "encoding_rs", "futures-core", @@ -3210,6 +3309,7 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", "webpki-roots", "winreg 0.10.1", @@ -3250,7 +3350,7 @@ name = "runner" version = "0.0.0" dependencies = [ "camino", - "clap 4.1.1", + "clap 4.2.1", "junction", "termcolor", "workspace-hack", @@ -3258,11 +3358,11 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" +checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags", + "bitflags 2.0.2", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -3272,9 +3372,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" [[package]] name = "rustc-hash" @@ -3283,26 +3383,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] name = "rustix" -version = "0.36.6" +version = "0.37.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" +checksum = "0e78cc525325c06b4a7ff02db283472f3c042b7ff0c391f96c6d5ac6f4f91b75" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -3340,15 +3431,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "safemem" @@ -3371,10 +3462,16 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "windows-sys", + "windows-sys 0.42.0", ] [[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.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3382,9 +3479,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" [[package]] name = "sct" @@ -3398,11 +3495,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.7.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -3411,35 +3508,15 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", ] [[package]] -name = "selectors" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" -dependencies = [ - "bitflags", - "cssparser", - "derive_more", - "fxhash", - "log", - "matches", - "phf 0.8.0", - "phf_codegen 0.8.0", - "precomputed-hash", - "servo_arc", - "smallvec", - "thin-slice", -] - -[[package]] name = "self_cell" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3447,15 +3524,15 @@ checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" [[package]] name = "semver" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" dependencies = [ "serde_derive", ] @@ -3473,31 +3550,31 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.12", ] [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" dependencies = [ - "itoa 1.0.5", + "itoa", "ryu", "serde", ] [[package]] name = "serde_path_to_error" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b04f22b563c91331a10074bda3dd5492e3cc39d56bd557e91c0af42b6c7341" +checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" dependencies = [ "serde", ] @@ -3515,13 +3592,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e" +checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.12", ] [[package]] @@ -3542,7 +3619,7 @@ checksum = "4076151d1a2b688e25aaf236997933c66e18b870d0369f8b248b8ab2be630d7e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3552,22 +3629,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.5", + "itoa", "ryu", "serde", ] [[package]] -name = "servo_arc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" -dependencies = [ - "nodrop", - "stable_deref_trait", -] - -[[package]] name = "sha1" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3609,10 +3676,16 @@ dependencies = [ ] [[package]] +name = "shlex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[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", ] @@ -3631,9 +3704,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -3664,7 +3737,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3675,9 +3748,9 @@ checksum = "27207bb65232eda1f588cf46db2fee75c0808d557f6b3cf19a75f5d6d7c94df1" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -3691,21 +3764,15 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[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", @@ -3752,7 +3819,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.109", ] [[package]] @@ -3763,9 +3830,20 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927" dependencies = [ "proc-macro2", "quote", @@ -3774,9 +3852,9 @@ dependencies = [ [[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 = "tar" @@ -3791,21 +3869,21 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" +checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" [[package]] name = "tempfile" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", + "redox_syscall 0.3.5", "rustix", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -3829,53 +3907,58 @@ dependencies = [ ] [[package]] -name = "textwrap" -version = "0.16.0" +name = "terminal_size" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +dependencies = [ + "rustix", + "windows-sys 0.48.0", +] [[package]] -name = "thin-slice" -version = "0.1.1" +name = "textwrap" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.12", ] [[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 = "time" -version = "0.3.17" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ - "itoa 1.0.5", + "itoa", "serde", "time-core", "time-macros", @@ -3889,18 +3972,18 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" dependencies = [ "time-core", ] [[package]] name = "tinystr" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aeafdfd935e4a7fe16a91ab711fa52d54df84f9c8f7ca5837a9d1d902ef4c2" +checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef" dependencies = [ "displaydoc", ] @@ -3926,20 +4009,19 @@ 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.24.2" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot", @@ -3947,25 +4029,25 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.12", ] [[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", @@ -3995,10 +4077,33 @@ dependencies = [ ] [[package]] +name = "tokio-stream" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + +[[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", @@ -4010,14 +4115,37 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] [[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" + +[[package]] +name = "toml_edit" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "topological-sort" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d" + +[[package]] name = "tower" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4035,11 +4163,11 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.3.5" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes", "futures-core", "futures-util", @@ -4047,7 +4175,6 @@ dependencies = [ "http-body", "http-range-header", "pin-project-lite", - "tower", "tower-layer", "tower-service", "tracing", @@ -4097,7 +4224,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4198,6 +4325,25 @@ dependencies = [ ] [[package]] +name = "tungstenite" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" +dependencies = [ + "base64 0.13.1", + "byteorder", + "bytes", + "http", + "httparse", + "log", + "rand 0.8.5", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] name = "type-map" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4213,6 +4359,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] +name = "ucd-trie" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" + +[[package]] name = "unic-char-property" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4272,7 +4424,7 @@ checksum = "1f5cdec05b907f4e2f6843f4354f4ce6a5bebe1a56df320a49134944477ce4d8" dependencies = [ "proc-macro-hack", "quote", - "syn", + "syn 1.0.109", "unic-langid-impl", ] @@ -4308,15 +4460,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" @@ -4329,9 +4481,9 @@ 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" @@ -4370,6 +4522,12 @@ 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 = "utime" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4424,6 +4582,36 @@ dependencies = [ ] [[package]] +name = "warp" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27e1a710288f0f91a98dd8a74f05b76a10768db245ce183edf64dc1afdc3016c" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "headers", + "http", + "hyper", + "log", + "mime", + "mime_guess", + "percent-encoding", + "pin-project", + "rustls-pemfile", + "scoped-tls", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "tokio-util", + "tower-service", + "tracing", +] + +[[package]] name = "wasi" version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4437,9 +4625,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4447,24 +4635,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if", "js-sys", @@ -4474,9 +4662,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4484,28 +4672,41 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] +name = "wasm-streams" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -4532,9 +4733,9 @@ dependencies = [ [[package]] name = "which" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", "libc", @@ -4574,11 +4775,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.44.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets", + "windows-targets 0.48.0", ] [[package]] @@ -4587,71 +4788,155 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +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.0", ] [[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", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] 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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +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 = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[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" +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.42.1" +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 = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -4700,12 +4985,13 @@ version = "0.1.0" dependencies = [ "bytes", "cc", + "clap 4.2.1", + "clap_builder", "crossbeam-utils", "either", "flate2", "futures-channel", "futures-io", - "futures-task", "futures-util", "getrandom 0.2.8", "hashbrown", @@ -4717,7 +5003,6 @@ dependencies = [ "num-traits", "phf_shared 0.11.1", "prost", - "rand 0.7.3", "rand 0.8.5", "rand_core 0.6.4", "regex", @@ -4727,9 +5012,9 @@ dependencies = [ "serde_json", "sha2", "snafu", - "syn", + "syn 1.0.109", + "syn 2.0.12", "time", - "time-macros", "tokio", "tokio-util", "tracing", @@ -4737,9 +5022,9 @@ dependencies = [ "url", "zip", "zstd 0.11.2+zstd.1.5.2", - "zstd 0.12.2+zstd.1.5.2", + "zstd 0.12.3+zstd.1.5.2", "zstd-safe 5.0.2+zstd.1.5.2", - "zstd-safe 6.0.2+zstd.1.5.2", + "zstd-safe 6.0.4+zstd.1.5.4", "zstd-sys", ] @@ -4753,6 +5038,17 @@ dependencies = [ ] [[package]] +name = "xml5ever" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" +dependencies = [ + "log", + "mac", + "markup5ever", +] + +[[package]] name = "xz2" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4772,9 +5068,9 @@ dependencies = [ [[package]] name = "zip" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537ce7411d25e54e8ae21a7ce0b15840e7bfcff15b51d697ec3266cc76bdf080" +checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef" dependencies = [ "aes", "byteorder", @@ -4801,11 +5097,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.2+zstd.1.5.2" +version = "0.12.3+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9262a83dc741c0b0ffec209881b45dbc232c21b02a2b9cb1adb93266e41303d" +checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" dependencies = [ - "zstd-safe 6.0.2+zstd.1.5.2", + "zstd-safe 6.0.4+zstd.1.5.4", ] [[package]] @@ -4820,9 +5116,9 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "6.0.2+zstd.1.5.2" +version = "6.0.4+zstd.1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cf39f730b440bab43da8fb5faf5f254574462f73f260f85f7987f32154ff17" +checksum = "7afb4b54b8910cf5447638cb54bf4e8a65cbedd783af98b98c62ffe91f185543" dependencies = [ "libc", "zstd-sys", @@ -4830,9 +5126,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.5+zstd.1.5.2" +version = "2.0.7+zstd.1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596" +checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" dependencies = [ "cc", "libc", diff --git a/nixpkgs/pkgs/games/anki/bin.nix b/nixpkgs/pkgs/games/anki/bin.nix index 9a66de369266..133622e6eb46 100644 --- a/nixpkgs/pkgs/games/anki/bin.nix +++ b/nixpkgs/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.65"; + version = "2.1.66"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-JBqW/aCMUyR0H52WMYuVkcE3/t/joLxfvFho64IzvDg="; + sha256 = "sha256-P1PEKz0vblPxiLri34QrP0+qOsltJsvPL2JVmYj1wFg="; }; # 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-zmCI77yLdoJm/znUgy+xZ8Jd77F3CPlzq3ceBzckA4U="; + sha256 = "sha256-cFYuw+ZSQd5Rw+x7eIKEDzV9UyvuxX3iZ8drmtQNZ78="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-1owbeL28dnOYD7nR9uZt9EHvFK75GFGRe6S9oV85Eoo="; + sha256 = "sha256-0xtHT0rq7QnHqhIySpBKtO+kMAu88Q5nWmWvMSxVtBo="; }; }; diff --git a/nixpkgs/pkgs/games/anki/default.nix b/nixpkgs/pkgs/games/anki/default.nix index fd8d29ee1b39..18ffb1558f5d 100644 --- a/nixpkgs/pkgs/games/anki/default.nix +++ b/nixpkgs/pkgs/games/anki/default.nix @@ -25,14 +25,14 @@ let pname = "anki"; - version = "2.1.61"; - rev = "0c1eaf4ce66c1b90867af9a79b95d9e507262cf8"; + version = "2.1.65"; + rev = "aa9a734f695d0b0981aa3c0aaa2745ce86832f08"; src = fetchFromGitHub { owner = "ankitects"; repo = "anki"; rev = version; - hash = "sha256-prTGilOw7SfxWevnMsuGq8Zp5uLfVHzTkoAU57NzqHk="; + hash = "sha256-l+RTot8pJFJDDiapmQdKJ9WfwAuwRFiNJMbX+fBETeU="; fetchSubmodules = true; }; @@ -41,7 +41,8 @@ let lockFile = ./Cargo.lock; outputHashes = { "csv-1.1.6" = "sha256-w728ffOVkI+IfK6FbmkGhr0CjuyqgJnPB1kutMJIUYg="; - "linkcheck-0.4.1-alpha.0" = "sha256-Fiom8oHW9y7vV2RLXW0ClzHOdIlBq3Z9jLP+p6Sk4GI="; + "linkcheck-0.4.1" = "sha256-S93J1cDzMlzDjcvz/WABmv8CEC6x78E+f7nzhsN7NkE="; + "percent-encoding-iri-2.2.0" = "sha256-kCBeS1PNExyJd4jWfDfctxq6iTdAq69jtxFQgCCQ8kQ="; }; }; @@ -88,7 +89,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-jP0ltYVB52LolGtN/GGjM4I7ira16rRTXfyJlrdjTX4="; + hash = "sha256-66mYsHojQQBfLTHd12+/HEf7FKF5Y2RZRFeYRS2yZco="; }; # https://discourse.nixos.org/t/mkyarnpackage-lockfile-has-incorrect-entry/21586/3 @@ -277,5 +278,7 @@ python3.pkgs.buildPythonApplication { license = licenses.agpl3Plus; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ oxij euank ]; + # Reported to crash at launch on darwin (as of 2.1.65) + broken = stdenv.isDarwin; }; } diff --git a/nixpkgs/pkgs/games/anki/patches/0001-Skip-formatting-python-code.patch b/nixpkgs/pkgs/games/anki/patches/0001-Skip-formatting-python-code.patch index b35ddec1a267..7ba3381ebab5 100644 --- a/nixpkgs/pkgs/games/anki/patches/0001-Skip-formatting-python-code.patch +++ b/nixpkgs/pkgs/games/anki/patches/0001-Skip-formatting-python-code.patch @@ -1,7 +1,7 @@ -From ed5090b237bca768dbf7dfc3b4414b955879f15e Mon Sep 17 00:00:00 2001 +From 104572dc7ebb75061b867158ce3d4311d8cf4594 Mon Sep 17 00:00:00 2001 From: Euan Kemp <euank@euank.com> -Date: Fri, 7 Apr 2023 20:22:34 +0900 -Subject: [PATCH 3/3] Skip formatting python code +Date: Thu, 6 Jul 2023 10:05:15 +0900 +Subject: [PATCH] Skip formatting python code --- pylib/tools/hookslib.py | 4 ++-- @@ -27,5 +27,5 @@ index 6361c633e..95ecb64a2 100644 - subprocess.run([sys.executable, "-m", "black", "-q", path], check=True) + # subprocess.run([sys.executable, "-m", "black", "-q", path], check=True) -- -2.39.2 +2.40.1 diff --git a/nixpkgs/pkgs/games/blackshades/default.nix b/nixpkgs/pkgs/games/blackshades/default.nix index 80fc72341501..7f1cd29c9d54 100644 --- a/nixpkgs/pkgs/games/blackshades/default.nix +++ b/nixpkgs/pkgs/games/blackshades/default.nix @@ -6,22 +6,22 @@ , libGLU , libsndfile , openal -, zig_0_9 +, zig_0_11 }: stdenv.mkDerivation (finalAttrs: { pname = "blackshades"; - version = "2.4.9"; + version = "2.5.1"; src = fetchFromSourcehut { owner = "~cnx"; repo = "blackshades"; rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-Hg+VcWI28GzY/CPm1lUftP0RGztOnzizrKJQVTmeJ9I="; + hash = "sha256-qdpXpuXHr9w2XMfgOVveWv3JoqdJHVB8TCqZdyaw/DM="; }; - nativeBuildInputs = [ zig_0_9.hook ]; + nativeBuildInputs = [ zig_0_11.hook ]; buildInputs = [ glfw @@ -34,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://sr.ht/~cnx/blackshades"; description = "A psychic bodyguard FPS"; + changelog = "https://git.sr.ht/~cnx/blackshades/refs/${finalAttrs.version}"; + mainProgram = "blackshades"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ McSinyx viric ]; platforms = lib.platforms.linux; diff --git a/nixpkgs/pkgs/games/classicube/default.nix b/nixpkgs/pkgs/games/classicube/default.nix index ec2490196abb..96b941490b01 100644 --- a/nixpkgs/pkgs/games/classicube/default.nix +++ b/nixpkgs/pkgs/games/classicube/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ClassiCube"; - version = "1.3.5"; + version = "1.3.6"; src = fetchFromGitHub { owner = "UnknownShadow200"; repo = "ClassiCube"; rev = version; - sha256 = "sha256-anBi9hPwX1AAIc8dXsKyX4u7UbkKqC1P+7f7wdKWAig="; + sha256 = "sha256-7VPn5YXNoAR3ftYMDQuQRqeMCrbyB56ir1sQWBiPWAI="; }; nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ]; @@ -64,21 +64,17 @@ stdenv.mkDerivation rec { --replace '%NIXPKGS_FONT_PATH%' "${font_path}" # ClassiCube's Makefile hardcodes JOBS=1 for some reason, # even though it works perfectly well multi-threaded. - substituteInPlace src/Makefile \ + substituteInPlace Makefile \ --replace 'JOBS=1' "JOBS=$NIX_BUILD_CORES" ''; buildInputs = [ libX11 libXi libGL curl openal liberation_ttf ]; - preBuild = "cd src"; - - postBuild = "cd -"; - installPhase = '' runHook preInstall mkdir -p "$out/bin" - cp 'src/ClassiCube' "$out/bin" + cp 'ClassiCube' "$out/bin" # ClassiCube puts downloaded resources # next to the location of the executable by default. # This doesn't work with Nix diff --git a/nixpkgs/pkgs/games/classicube/fix-linking.patch b/nixpkgs/pkgs/games/classicube/fix-linking.patch index 197a3ab694e0..4fc0e826cb4a 100644 --- a/nixpkgs/pkgs/games/classicube/fix-linking.patch +++ b/nixpkgs/pkgs/games/classicube/fix-linking.patch @@ -1,7 +1,7 @@ -diff --git a/src/Makefile b/src/Makefile +diff --git a/Makefile b/Makefile index 83188ce..3439cdb 100644 ---- a/src/Makefile -+++ b/src/Makefile +--- a/Makefile ++++ b/Makefile @@ -40,7 +40,7 @@ LIBS=-mwindows -lws2_32 -lwininet -lwinmm -limagehlp -lcrypt32 -ld3d9 endif diff --git a/nixpkgs/pkgs/games/corsix-th/default.nix b/nixpkgs/pkgs/games/corsix-th/default.nix index 75a676a057c1..0dd8edb59820 100644 --- a/nixpkgs/pkgs/games/corsix-th/default.nix +++ b/nixpkgs/pkgs/games/corsix-th/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "corsix-th"; - version = "0.66"; + version = "0.67"; src = fetchFromGitHub { owner = "CorsixTH"; repo = "CorsixTH"; rev = "v${finalAttrs.version}"; - hash = "sha256-GsZU2FHcFRlwN3hnFTyQmUK6kJLwnarKDtvg+DDc+mk="; + hash = "sha256-WA/VJqHXzBfVUBNtxCVsGBRzSRQ0pvDvAy03ntc0KZE="; }; luaEnv = lua.withPackages(p: with p; [ luafilesystem lpeg luasec luasocket ]); diff --git a/nixpkgs/pkgs/games/fheroes2/default.nix b/nixpkgs/pkgs/games/fheroes2/default.nix index 8ede4b40bda4..4e9e5ab965b1 100644 --- a/nixpkgs/pkgs/games/fheroes2/default.nix +++ b/nixpkgs/pkgs/games/fheroes2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-FTxmcRD6PlY46HuakD/7wcBa26nEHYdWYUGmOR4R58Q="; + sha256 = "sha256-DRwCTy87mC1bXpOEaPGQc+dJaPOaKzlmJv9d/BntR7s="; }; nativeBuildInputs = [ imagemagick ]; diff --git a/nixpkgs/pkgs/games/grapejuice/default.nix b/nixpkgs/pkgs/games/grapejuice/default.nix index 629ecac05647..abc882b300b8 100644 --- a/nixpkgs/pkgs/games/grapejuice/default.nix +++ b/nixpkgs/pkgs/games/grapejuice/default.nix @@ -15,17 +15,18 @@ , wine , glxinfo , xrandr +, bash }: python3Packages.buildPythonApplication rec { pname = "grapejuice"; - version = "7.8.3"; + version = "7.14.4"; src = fetchFromGitLab { owner = "BrinkerVII"; repo = "grapejuice"; rev = "v${version}"; - sha256 = "sha256-jNh3L6JDuJryFpHQaP8UesBmepmJopoHxb/XUfOwZz4="; + hash = "sha256-CWTnofJXx9T/hGXx3rdephXHjpiVRdFEJQ1u2v6n7yo="; }; nativeBuildInputs = [ @@ -33,12 +34,14 @@ python3Packages.buildPythonApplication rec { desktop-file-utils glib wrapGAppsHook + python3Packages.pip ]; buildInputs = [ cairo gettext gtk3 + bash ]; propagatedBuildInputs = with python3Packages; [ @@ -57,7 +60,6 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; makeWrapperArgs = [ - "\${gappsWrapperArgs[@]}" "--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs wine winetricks pciutils glxinfo xrandr ]}" # make xdg-open overrideable at runtime "--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}" @@ -77,7 +79,7 @@ python3Packages.buildPythonApplication rec { --replace \$GRAPEJUICE_EXECUTABLE "$out/bin/grapejuice" \ --replace \$PLAYER_ICON "grapejuice-roblox-player" - substituteInPlace src/grapejuice_common/assets/desktop/roblox-studio.desktop \ + substituteInPlace src/grapejuice_common/assets/desktop/roblox-studio.desktop src/grapejuice_common/assets/desktop/roblox-studio-auth.desktop \ --replace \$GRAPEJUICE_EXECUTABLE "$out/bin/grapejuice" \ --replace \$STUDIO_ICON "grapejuice-roblox-studio" @@ -86,29 +88,38 @@ python3Packages.buildPythonApplication rec { substituteInPlace src/grapejuice_common/models/settings_model.py \ --replace 'default_wine_home: Optional[str] = ""' 'default_wine_home: Optional[str] = "${wine}"' + + substituteInPlace src/grapejuice_packaging/builders/linux_package_builder.py \ + --replace '"--no-dependencies",' '"--no-dependencies", "--no-build-isolation",' + + substituteInPlace src/grapejuice_packaging/packaging_resources/bin/grapejuice src/grapejuice_packaging/packaging_resources/bin/grapejuice-gui \ + --replace "/usr/bin/env python3" "${python3Packages.python.interpreter}" ''; - postInstall = '' - mkdir -p "$out/share/icons" "$out/share/applications" "$out/share/mime/packages" - cp -r src/grapejuice_common/assets/desktop/* $out/share/applications/ - cp -r src/grapejuice_common/assets/icons $out/share/ - cp src/grapejuice_common/assets/mime_xml/*.xml $out/share/mime/packages/ + installPhase = '' + runHook preInstall + + PYTHONPATH=$(pwd)/src:$PYTHONPATH python3 -m grapejuice_packaging linux_package - # compile locales (*.po -> *.mo) - # from https://gitlab.com/brinkervii/grapejuice/-/blob/master/src/grapejuice_common/util/mo_util.py - LOCALE_DIR="$out/share/locale" - PO_DIR="src/grapejuice_common/assets/po" - LINGUAS_FILE="src/grapejuice_common/assets/po/LINGUAS" + mkdir -p "$out" "$out/${python3Packages.python.sitePackages}" + tar -xvf ./dist/linux_package/grapejuice-''${version}.tar.gz --strip-components=1 -C "$out" + + mv "$out/lib/python3/dist-packages/"* "$out/${python3Packages.python.sitePackages}" + rmdir --ignore-fail-on-non-empty -p "$out/lib/python3/dist-packages" + + runHook postInstall + ''; - for lang in $(<"$LINGUAS_FILE") # extract langs from LINGUAS_FILE - do - po_file="$PO_DIR/$lang.po" - mo_file_dir="$LOCALE_DIR/$lang/LC_MESSAGES" + postFixup = '' + patchShebangs "$out/bin/grapejuice{,-gui}" - mkdir -p $mo_file_dir + buildPythonPath "$out $pythonPath" - mo_file="$mo_file_dir/grapejuice.mo" - msgfmt $po_file -o $mo_file # msgfmt from gettext + for bin in grapejuice grapejuice-gui; do + wrapProgram "$out/bin/$bin" \ + --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" \ + ''${makeWrapperArgs[@]} \ + ''${gappsWrapperArgs[@]} done ''; diff --git a/nixpkgs/pkgs/games/heroic/default.nix b/nixpkgs/pkgs/games/heroic/default.nix index 05455ae7c7d6..ca9d5799596e 100644 --- a/nixpkgs/pkgs/games/heroic/default.nix +++ b/nixpkgs/pkgs/games/heroic/default.nix @@ -93,7 +93,7 @@ in stdenv.mkDerivation rec { --inherit-argv0 \ --add-flags --disable-gpu-compositing \ --add-flags $out/share/${appName} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" substituteInPlace "$out/share/${appName}/flatpak/com.heroicgameslauncher.hgl.desktop" \ --replace "Exec=heroic-run" "Exec=heroic" diff --git a/nixpkgs/pkgs/games/heroic/fhsenv.nix b/nixpkgs/pkgs/games/heroic/fhsenv.nix index 40a8ea37efae..3979b2823926 100644 --- a/nixpkgs/pkgs/games/heroic/fhsenv.nix +++ b/nixpkgs/pkgs/games/heroic/fhsenv.nix @@ -12,6 +12,9 @@ buildFHSEnv { # Many Wine and native games need 32-bit libraries. multiArch = true; + # required by Electron + unshareIpc = false; + targetPkgs = pkgs: with pkgs; [ heroic-unwrapped gamemode diff --git a/nixpkgs/pkgs/games/openarena/Makefile.local b/nixpkgs/pkgs/games/openarena/Makefile.local new file mode 100644 index 000000000000..2055770f14b2 --- /dev/null +++ b/nixpkgs/pkgs/games/openarena/Makefile.local @@ -0,0 +1,12 @@ +BUILD_CLIENT=1 +BUILD_RENDERER_OPENGL2=1 +BUILD_SERVER=1 +USE_CURL_DLOPEN=0 +USE_FREETYPE=1 +USE_INTERNAL_SPEEX=0 +USE_INTERNAL_JPEG=0 +USE_INTERNAL_OGG=0 +USE_INTERNAL_OPUS=0 +USE_INTERNAL_ZLIB=0 +USE_OPENAL_DLOPEN=0 +USE_RENDERER_DLOPEN=0 diff --git a/nixpkgs/pkgs/games/openarena/default.nix b/nixpkgs/pkgs/games/openarena/default.nix index 30f221902f77..7ae0111cfe4b 100644 --- a/nixpkgs/pkgs/games/openarena/default.nix +++ b/nixpkgs/pkgs/games/openarena/default.nix @@ -10,6 +10,7 @@ , which , freetype , libglvnd +, libjpeg , libogg , libvorbis , libxmp @@ -25,25 +26,18 @@ let url = "https://download.tuxfamily.org/openarena/rel/088/openarena-0.8.8.zip"; hash = "sha256-Rup1n14k9sKcyVFYzFqPYV+BEBCnUNwpnFsnyGrhl20="; }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "openarena"; + version = "unstable-2023-03-02"; - openarena-source = fetchFromGitHub { + src = fetchFromGitHub { name = "openarena-source"; owner = "OpenArena"; repo = "engine"; rev = "075cb860a4d2bc43e75e5f506eba7da877708aba"; hash = "sha256-ofQKQyS3ti5TSN+zqwPFYuJiB9kvdER6zTWn8yrOpQU="; }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "openarena"; - version = "unstable-2023-03-02"; - - srcs = [ - openarena-source - openarena-maps - ]; - - sourceRoot = "openarena-source"; patches = [ # Fix Makefile `copyFiles` target @@ -65,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ freetype libglvnd + libjpeg libogg libvorbis libxmp @@ -75,13 +70,9 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - makeFlags = [ - "USE_INTERNAL_LIBS=0" - "USE_FREETYPE=1" - "USE_OPENAL_DLOPEN=0" - "USE_CURL_DLOPEN=0" - "ARCH=${stdenv.hostPlatform.linuxArch}" - ]; + preConfigure = '' + cp ${./Makefile.local} ./Makefile.local + ''; installTargets = [ "copyfiles" ]; installFlags = [ "COPYDIR=$(out)/share/openarena" ]; diff --git a/nixpkgs/pkgs/games/path-of-building/default.nix b/nixpkgs/pkgs/games/path-of-building/default.nix index f08f4de54bbf..9b5bcdd1add0 100644 --- a/nixpkgs/pkgs/games/path-of-building/default.nix +++ b/nixpkgs/pkgs/games/path-of-building/default.nix @@ -2,13 +2,13 @@ let data = stdenv.mkDerivation(finalAttrs: { pname = "path-of-building-data"; - version = "2.32.2"; + version = "2.33.5"; src = fetchFromGitHub { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${finalAttrs.version}"; - hash = "sha256-1JwnKx5ohwFGdPlgaqXwTIPcfXmH+2GJRBbQhF46mTY="; + hash = "sha256-a7/xuVfsLQaSsmHVFKqDEypCunFQtHvcVISaQD1YCEs="; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/games/prismlauncher/wrapper.nix b/nixpkgs/pkgs/games/prismlauncher/wrapper.nix index 240deec4e2fe..89b0b08c229e 100644 --- a/nixpkgs/pkgs/games/prismlauncher/wrapper.nix +++ b/nixpkgs/pkgs/games/prismlauncher/wrapper.nix @@ -16,6 +16,7 @@ , gamemode , flite , mesa-demos +, udev , msaClientID ? null , gamemodeSupport ? stdenv.isLinux @@ -58,11 +59,15 @@ symlinkJoin { libXxf86vm ]) ++ [ + # lwjgl libpulseaudio libGL glfw openal stdenv.cc.cc.lib + + # oshi + udev ] ++ lib.optional gamemodeSupport gamemode.lib ++ lib.optional textToSpeechSupport flite diff --git a/nixpkgs/pkgs/games/qgo/default.nix b/nixpkgs/pkgs/games/qgo/default.nix index cc28ebc63f3c..ec7986c6a36b 100644 --- a/nixpkgs/pkgs/games/qgo/default.nix +++ b/nixpkgs/pkgs/games/qgo/default.nix @@ -4,7 +4,7 @@ , qmake , qtbase , qtmultimedia -, qttranslations +, qttools }: mkDerivation { @@ -41,6 +41,6 @@ mkDerivation { postPatch = '' sed -i 's|@out@|'"''${out}"'|g' src/src.pro src/defines.h ''; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtmultimedia qttranslations ]; + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtbase qtmultimedia ]; } diff --git a/nixpkgs/pkgs/games/unciv/default.nix b/nixpkgs/pkgs/games/unciv/default.nix index d5a884a01381..b5400752cb81 100644 --- a/nixpkgs/pkgs/games/unciv/default.nix +++ b/nixpkgs/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.7.13"; + version = "4.7.19"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-KvRDPu2FZY+iZ2vNi/tly/7/Tpg/EN8jHTKizYV5jeY="; + hash = "sha256-ABPaI7FivP1yl9q0Ne5L4ZJoTlDwHOz0gegtNRi0u2E="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/games/warzone2100/default.nix b/nixpkgs/pkgs/games/warzone2100/default.nix index c312753763b8..22a2be308348 100644 --- a/nixpkgs/pkgs/games/warzone2100/default.nix +++ b/nixpkgs/pkgs/games/warzone2100/default.nix @@ -88,6 +88,9 @@ stdenv.mkDerivation rec { --replace '"which "' '"${which}/bin/which "' substituteInPlace lib/exceptionhandler/exceptionhandler.cpp \ --replace "which %s" "${which}/bin/which %s" + # https://github.com/Warzone2100/warzone2100/pull/3353 + substituteInPlace lib/ivis_opengl/gfx_api_vk.cpp \ + --replace vk::throwResultException vk::detail::throwResultException ''; cmakeFlags = [ diff --git a/nixpkgs/pkgs/misc/beep/default.nix b/nixpkgs/pkgs/misc/beep/default.nix index 31fbb82cc357..180b53e1e768 100644 --- a/nixpkgs/pkgs/misc/beep/default.nix +++ b/nixpkgs/pkgs/misc/beep/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/spkr-beep/beep"; license = licenses.gpl2Only; platforms = platforms.linux; + mainProgram = "beep"; }; } diff --git a/nixpkgs/pkgs/misc/brightnessctl/default.nix b/nixpkgs/pkgs/misc/brightnessctl/default.nix index 43a37ad764ee..460b8199d697 100644 --- a/nixpkgs/pkgs/misc/brightnessctl/default.nix +++ b/nixpkgs/pkgs/misc/brightnessctl/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0immxc7almmpg80n3bdn834p3nrrz7bspl2syhb04s3lawa5y2lq"; }; + postPatch = '' + substituteInPlace Makefile \ + --replace "pkg-config" "$PKG_CONFIG" + ''; + makeFlags = [ "PREFIX=" "DESTDIR=$(out)" "ENABLE_SYSTEMD=1" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/misc/jackaudio/default.nix b/nixpkgs/pkgs/misc/jackaudio/default.nix index 7d5b622eaa81..21ed258e2be7 100644 --- a/nixpkgs/pkgs/misc/jackaudio/default.nix +++ b/nixpkgs/pkgs/misc/jackaudio/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "${prefix}jack2"; - version = "1.9.19"; + version = "1.9.22"; src = fetchFromGitHub { owner = "jackaudio"; repo = "jack2"; rev = "v${finalAttrs.version}"; - sha256 = "01s8i64qczxqawgrzrw19asaqmcspf5l2h3203xzg56wnnhhzcw7"; + sha256 = "sha256-Cslfys5fcZDy0oee9/nM5Bd1+Cg4s/ayXjJJOSQCL4E="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/misc/lilypond/default.nix b/nixpkgs/pkgs/misc/lilypond/default.nix index b9f59934efea..17c271793aa5 100644 --- a/nixpkgs/pkgs/misc/lilypond/default.nix +++ b/nixpkgs/pkgs/misc/lilypond/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "lilypond"; - version = "2.24.1"; + version = "2.24.2"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-1cWQh1ZKXNbwilK6gOfWUJuRxYXkQ4XcwPo5Jl0YFQk="; + sha256 = "sha256-eUTmENe08d5Mccz+H73TIB9U+sVFYb3NBIkU+Nu2Ckg="; }; postInstall = '' diff --git a/nixpkgs/pkgs/misc/logging/beats/7.x.nix b/nixpkgs/pkgs/misc/logging/beats/7.x.nix index 77ac0bd3b59d..ad4d00a8149e 100644 --- a/nixpkgs/pkgs/misc/logging/beats/7.x.nix +++ b/nixpkgs/pkgs/misc/logging/beats/7.x.nix @@ -24,6 +24,7 @@ let beat = package: extraArgs: buildGoModule (rec { } // extraArgs); in rec { + auditbeat7 = beat "auditbeat" { meta.description = "Lightweight shipper for audit data"; }; filebeat7 = beat "filebeat" { meta.description = "Lightweight shipper for logfiles"; buildInputs = [ systemd ]; diff --git a/nixpkgs/pkgs/misc/vencord/default.nix b/nixpkgs/pkgs/misc/vencord/default.nix index 99d11b06976f..73a4b2cf5ea2 100644 --- a/nixpkgs/pkgs/misc/vencord/default.nix +++ b/nixpkgs/pkgs/misc/vencord/default.nix @@ -1,20 +1,24 @@ { buildNpmPackage , fetchFromGitHub +, fetchpatch2 , lib -, substituteAll , esbuild , buildGoModule , buildWebExtension ? false }: +let + version = "1.4.5"; + gitHash = "98a03c8"; +in buildNpmPackage rec { pname = "vencord"; - version = "1.3.4"; + inherit version; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - sha256 = "sha256-r+VgxXwsBOfMggcVlr5q1/ONfp13CpX4ssrLQtmdLe8="; + sha256 = "sha256-ZoHOCl0j+RBSl2lL9wO2rJ8VR+GNIeWJYe65c3lVoz8="; }; ESBUILD_BINARY_PATH = lib.getExe (esbuild.override { @@ -33,23 +37,36 @@ buildNpmPackage rec { # Supresses an error about esbuild's version. npmRebuildFlags = [ "|| true" ]; - npmDepsHash = "sha256-HJK88z4Gs8mqd28zKrsTtk34VcRqIyb6aURbvRZLN0I="; + npmDepsHash = "sha256-51IK95QY9YX0WerGu4GuOrYKoj8Uoo0R1b6WZpC5v4U="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; - npmBuildFlags = [ "--" "--standalone" ]; + npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; prePatch = '' cp ${./package-lock.json} ./package-lock.json ''; patches = [ - (substituteAll { - src = ./replace-git.patch; - inherit version; + (fetchpatch2 { + name = "allow-git-hash-remote-preset.patch"; + url = "https://github.com/Vendicated/Vencord/commit/d9f55664428007199348123b05818f9e08c4f64d.patch"; + hash = "sha256-l4PP8nVtyQJYUqtU9xYGT4j1Oayy08DE6TfbwPun0pY="; + }) + (fetchpatch2 { + name = "use-source-date-epoch.patch"; + url = "https://github.com/Vendicated/Vencord/commit/28247c88a949eeaac75b13a8d6653164d9659f56.patch"; + hash = "sha256-mMpsB3GkI9LUiMQ/NFOiRw4z+wVkktmWgUHNTgxUFPU="; + }) + (fetchpatch2 { + name = "allow-disabling-updater.patch"; + url = "https://github.com/Vendicated/Vencord/commit/bad1fa0c766b2d42cd2eb0e0d1ab2e0c381bab98.patch"; + hash = "sha256-yp453kFvVC02QEB3Op8PfopnLt3xGkjp4WfP6kPeIJ0="; }) - ./disable-updater-ui.patch ]; + VENCORD_HASH = gitHash; + VENCORD_REMOTE = "${src.owner}/${src.repo}"; + installPhase = if buildWebExtension then '' cp -r dist/chromium-unpacked/ $out diff --git a/nixpkgs/pkgs/misc/vencord/disable-updater-ui.patch b/nixpkgs/pkgs/misc/vencord/disable-updater-ui.patch deleted file mode 100644 index 6682d814b862..000000000000 --- a/nixpkgs/pkgs/misc/vencord/disable-updater-ui.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/components/VencordSettings/UpdaterTab.tsx b/src/components/VencordSettings/UpdaterTab.tsx -index 4d0b86c..0f1d87f 100644 ---- a/src/components/VencordSettings/UpdaterTab.tsx -+++ b/src/components/VencordSettings/UpdaterTab.tsx -@@ -249,4 +249,4 @@ function Updater() { - ); - } - --export default IS_WEB ? null : wrapTab(Updater, "Updater"); -+export default null; -diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx -index 3ea5a43..da63213 100644 ---- a/src/plugins/_core/settings.tsx -+++ b/src/plugins/_core/settings.tsx -@@ -105,7 +105,7 @@ export default definePlugin({ - label: "Themes", - element: require("@components/VencordSettings/ThemesTab").default, - }, -- !IS_WEB && { -+ false && !IS_WEB && { - section: "VencordUpdater", - label: "Updater", - element: require("@components/VencordSettings/UpdaterTab").default, -diff --git a/src/utils/updater.ts b/src/utils/updater.ts -index 2e2bfe1..5ebd06e 100644 ---- a/src/utils/updater.ts -+++ b/src/utils/updater.ts -@@ -38,6 +38,7 @@ async function Unwrap<T>(p: Promise<IpcRes<T>>) { - } - - export async function checkForUpdates() { -+ return false; - changes = await Unwrap(VencordNative.updater.getUpdates()); - if (changes.some(c => c.hash === gitHash)) { - isNewer = true; diff --git a/nixpkgs/pkgs/misc/vencord/package-lock.json b/nixpkgs/pkgs/misc/vencord/package-lock.json index c75130a7e6fa..e53695d7098c 100644 --- a/nixpkgs/pkgs/misc/vencord/package-lock.json +++ b/nixpkgs/pkgs/misc/vencord/package-lock.json @@ -1,16 +1,18 @@ { "name": "vencord", - "version": "1.3.4", + "version": "1.4.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.3.4", - "license": "GPL-3.0", + "version": "1.4.5", + "license": "GPL-3.0-or-later", "dependencies": { + "@sapphi-red/web-noise-suppressor": "0.3.3", "@vap/core": "0.0.12", "@vap/shiki": "0.10.5", + "eslint-plugin-simple-header": "^1.0.2", "fflate": "^0.7.4", "nanoid": "^4.0.2", "virtual-merge": "^1.0.1" @@ -27,9 +29,8 @@ "diff": "^5.1.0", "discord-types": "^1.3.26", "esbuild": "^0.15.18", - "eslint": "^8.28.0", + "eslint": "^8.46.0", "eslint-import-resolver-alias": "^1.1.2", - "eslint-plugin-header": "^3.1.1", "eslint-plugin-path-alias": "^1.0.0", "eslint-plugin-simple-import-sort": "^10.0.0", "eslint-plugin-unused-imports": "^2.0.0", @@ -48,6 +49,15 @@ "pnpm": ">=8" } }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/@babel/code-frame": { "version": "7.22.5", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz", @@ -695,23 +705,23 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz", - "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz", + "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz", - "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", + "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.5.2", + "espree": "^9.6.0", "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -727,9 +737,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.43.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz", - "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==", + "version": "8.47.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz", + "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -833,6 +843,11 @@ } } }, + "node_modules/@sapphi-red/web-noise-suppressor": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@sapphi-red/web-noise-suppressor/-/web-noise-suppressor-0.3.3.tgz", + "integrity": "sha512-gAC33DCXYwNTI/k1PxOVHmbbzakUSMbb/DHpoV6rn4pKZtPI1dduULSmAAm/y1ipgIlArnk2JcnQzw4n2tCZHw==" + }, "node_modules/@types/diff": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.3.tgz", @@ -1133,9 +1148,9 @@ } }, "node_modules/acorn": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz", - "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -2295,27 +2310,27 @@ } }, "node_modules/eslint": { - "version": "8.43.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz", - "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==", + "version": "8.47.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz", + "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.0.3", - "@eslint/js": "8.43.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "^8.47.0", "@humanwhocodes/config-array": "^0.11.10", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", + "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.0", - "eslint-visitor-keys": "^3.4.1", - "espree": "^9.5.2", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -2325,7 +2340,6 @@ "globals": "^13.19.0", "graphemer": "^1.4.0", "ignore": "^5.2.0", - "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", @@ -2335,9 +2349,8 @@ "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.1", + "optionator": "^0.9.3", "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" }, "bin": { @@ -2362,15 +2375,6 @@ "eslint-plugin-import": ">=1.4.0" } }, - "node_modules/eslint-plugin-header": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz", - "integrity": "sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==", - "dev": true, - "peerDependencies": { - "eslint": ">=7.7.0" - } - }, "node_modules/eslint-plugin-path-alias": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/eslint-plugin-path-alias/-/eslint-plugin-path-alias-1.0.0.tgz", @@ -2383,6 +2387,11 @@ "eslint": "^7" } }, + "node_modules/eslint-plugin-simple-header": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-simple-header/-/eslint-plugin-simple-header-1.0.2.tgz", + "integrity": "sha512-K1EJ/ueBIjPRA8qR44Ymo+GDmPYYmfoODtainGxVr7PSbX6QiaY+pTuGCrOhO+AtVsYJs8GLSVdGUTXyAxAtOA==" + }, "node_modules/eslint-plugin-simple-import-sort": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz", @@ -2436,9 +2445,9 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz", - "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -2448,9 +2457,9 @@ } }, "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", - "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", @@ -2473,12 +2482,12 @@ } }, "node_modules/espree": { - "version": "9.5.2", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz", - "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "dependencies": { - "acorn": "^8.8.0", + "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^3.4.1" }, @@ -2893,9 +2902,9 @@ } }, "node_modules/globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.21.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", + "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -3866,17 +3875,17 @@ } }, "node_modules/optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" + "type-check": "^0.4.0" }, "engines": { "node": ">= 0.8.0" @@ -5600,15 +5609,6 @@ "node": ">= 8" } }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", diff --git a/nixpkgs/pkgs/misc/vencord/replace-git.patch b/nixpkgs/pkgs/misc/vencord/replace-git.patch deleted file mode 100644 index 829321638bf2..000000000000 --- a/nixpkgs/pkgs/misc/vencord/replace-git.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs -index 7ff599a..85b3bfa 100644 ---- a/scripts/build/common.mjs -+++ b/scripts/build/common.mjs -@@ -24,7 +24,7 @@ import { promisify } from "util"; - - export const watch = process.argv.includes("--watch"); - export const isStandalone = JSON.stringify(process.argv.includes("--standalone")); --export const gitHash = execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim(); -+export const gitHash = "v@version@"; - export const banner = { - js: ` - // Vencord ${gitHash} -@@ -124,11 +124,7 @@ export const gitRemotePlugin = { - namespace: "git-remote", path: args.path - })); - build.onLoad({ filter, namespace: "git-remote" }, async () => { -- const res = await promisify(exec)("git remote get-url origin", { encoding: "utf-8" }); -- const remote = res.stdout.trim() -- .replace("https://github.com/", "") -- .replace("git@github.com:", "") -- .replace(/.git$/, ""); -+ const remote = "Vendicated/Vencord"; - - return { contents: `export default "${remote}"` }; - }); diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/cf-setup-hook.sh b/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/cf-setup-hook.sh index 3b08c51d196e..b64eb95f2ded 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/cf-setup-hook.sh +++ b/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/cf-setup-hook.sh @@ -1,6 +1,6 @@ forceLinkCoreFoundationFramework() { NIX_CFLAGS_COMPILE="-F@out@/Library/Frameworks${NIX_CFLAGS_COMPILE:+ }${NIX_CFLAGS_COMPILE-}" - NIX_LDFLAGS+=" @out@/Library/Frameworks/CoreFoundation.framework/CoreFoundation" + NIX_LDFLAGS+=" @out@/Library/Frameworks/CoreFoundation.framework/CoreFoundation.tbd" } preConfigureHooks+=(forceLinkCoreFoundationFramework) diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh index bbf9625e6557..5d0f58f48b48 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh +++ b/nixpkgs/pkgs/os-specific/darwin/apple-sdk/cf-setup-hook.sh @@ -3,7 +3,7 @@ linkSystemCoreFoundationFramework() { # gross! many symbols (such as _OBJC_CLASS_$_NSArray) are defined in system CF, but not # in the opensource release # if the package needs private headers, we assume they also want to link with system CF - NIX_LDFLAGS+=" @out@/Library/Frameworks/CoreFoundation.framework/CoreFoundation" + NIX_LDFLAGS+=" @out@/Library/Frameworks/CoreFoundation.framework/CoreFoundation.tbd" } preConfigureHooks+=(linkSystemCoreFoundationFramework) diff --git a/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix b/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix index b27390608a28..426474115deb 100644 --- a/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix @@ -1,10 +1,12 @@ { lib , stdenv , fetchFromGitHub -, Carbon -, Cocoa +, AppKit +, CoreAudio , CoreWLAN +, CoreVideo , DisplayServices +, IOKit , MediaRemote , SkyLight }: @@ -18,20 +20,22 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; - version = "2.15.2"; + version = "2.16.1"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; rev = "v${finalAttrs.version}"; - hash = "sha256-13wc+1IgplB+L0j1AbBr/MUjEo4W38ZgJwrAhbdOroE="; + hash = "sha256-H+bR5ZhUTrN2KAEdY/hnq6c3TEb1NQvPQ9uPo09gSM8="; }; buildInputs = [ - Carbon - Cocoa + AppKit + CoreAudio CoreWLAN + CoreVideo DisplayServices + IOKit MediaRemote SkyLight ]; @@ -53,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A highly customizable macOS status bar replacement"; homepage = "https://github.com/FelixKratz/SketchyBar"; license = lib.licenses.gpl3; + mainProgram = "sketchybar"; maintainers = with lib.maintainers; [ azuwis khaneliman ]; platforms = lib.platforms.darwin; }; diff --git a/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix b/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix index 2de0a8d4d510..be70e1c8bcd7 100644 --- a/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/skhd/default.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation (finalAttrs: { description = "Simple hotkey daemon for macOS"; homepage = "https://github.com/koekeishiya/skhd"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ cmacrae lnl7 periklis khaneliman]; + mainProgram = "skhd"; + maintainers = with lib.maintainers; [ cmacrae lnl7 periklis khaneliman ]; platforms = lib.platforms.darwin; }; }) diff --git a/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix b/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix index 703916db553c..66f78da85d6f 100644 --- a/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/yabai/default.nix @@ -3,7 +3,6 @@ , stdenvNoCC , fetchFromGitHub , fetchzip -, writeShellScript , installShellFiles , testers , yabai @@ -18,7 +17,7 @@ let pname = "yabai"; - version = "5.0.6"; + version = "5.0.7"; test-version = testers.testVersion { package = yabai; @@ -37,10 +36,12 @@ let changelog = "https://github.com/koekeishiya/yabai/blob/v${version}/CHANGELOG.md"; license = licenses.mit; platforms = platforms.darwin; + mainProgram = "yabai"; maintainers = with maintainers; [ cmacrae shardy ivar + khaneliman ]; }; in @@ -52,7 +53,7 @@ in src = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz"; - sha256 = "sha256-wpm9VnR4yPk6Ybo/V2DMLgRcSzDl3dWGSKDCjYfz+xQ="; + hash = "sha256-6RtA3xFOVwTYrfHE72Qa65kDSwv/3/NQ8z4bVCsm9Fc="; }; nativeBuildInputs = [ @@ -88,7 +89,7 @@ in owner = "koekeishiya"; repo = "yabai"; rev = "v${version}"; - sha256 = "sha256-1/h8f1FQNHn5eVprPVd0can8XHjNyF7j4H3LSN0K8rI="; + hash = "sha256-wFrMMiy+K+bnEeVyY3RGVZBoxiKQ69Q+Bp1xa+IcWas="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix b/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix index b85392977c46..ed1e31cc40eb 100644 --- a/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix @@ -144,7 +144,7 @@ let perl python libapparmor - libapparmor.python + (libapparmor.python or null) ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/default.nix index 3d9e5fde481e..460ac0ad17b4 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/default.nix @@ -1,24 +1,37 @@ { lib +, writeText , flutter , fetchFromGitHub }: -flutter.buildFlutterApplication { +flutter.buildFlutterApplication rec { pname = "firmware-updater"; - version = "unstable-2023-06-20"; + version = "unstable-2023-09-17"; pubspecLockFile = ./pubspec.lock; depsListFile = ./deps.json; - vendorHash = "sha256-+4Lu6yHH/Yhl58bxhsLanP5hyhXSg9LpCuG1ohAlM5g="; + vendorHash = "sha256-5xd9ppnWleKVA69DJWVdY+rZziu4dQBCu16I0ivD8kE="; src = fetchFromGitHub { owner = "canonical"; repo = "firmware-updater"; - rev = "49ebcad241ed4964f1547c8da408bef13a8b4c69"; - sha256 = "sha256-1BGcpcIJV0jqrj3nA7FJg36lMqpl281NGOgWppDUFCI="; - fetchSubmodules = true; + rev = "855999da8d3d0c9930e06f2d296d82b55aeff79e"; + hash = "sha256-tIeEuHl+sCKd756NYPmxXiV1Sg2m9W0eGUtM/Iskeu8="; }; + postPatch = '' + rm -f pubspec.lock + ln -s "${writeText "${pname}-overrides.yaml" (builtins.toJSON { + dependency_overrides = { + yaru = "^1.1.0"; + yaru_icons = "^2.2.1"; + yaru_widgets = "^3.1.0"; + mockito = "^5.4.2"; + test_api = "^0.6.1"; + }; + })}" pubspec_overrides.yaml + ''; + meta = with lib; { description = "Firmware Updater for Linux"; homepage = "https://github.com/canonical/firmware-updater"; diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/deps.json b/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/deps.json index de6a6a9d65f4..702ddfd8c093 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/deps.json +++ b/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/deps.json @@ -23,6 +23,7 @@ "ubuntu_logger", "ubuntu_service", "ubuntu_session", + "ubuntu_test", "upower", "yaru", "yaru_colors", @@ -34,30 +35,13 @@ "freezed", "integration_test", "melos", - "mockito" - ] - }, - { - "name": "mockito", - "version": "5.4.0", - "kind": "dev", - "source": "hosted", - "dependencies": [ - "analyzer", - "build", - "code_builder", - "collection", - "dart_style", - "matcher", - "meta", - "path", - "source_gen", + "mockito", "test_api" ] }, { "name": "test_api", - "version": "0.5.1", + "version": "0.6.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -69,37 +53,34 @@ "stack_trace", "stream_channel", "string_scanner", - "term_glyph", - "matcher" + "term_glyph" ] }, { - "name": "matcher", - "version": "0.12.15", + "name": "term_glyph", + "version": "1.2.1", "kind": "transitive", "source": "hosted", - "dependencies": [ - "async", - "meta", - "stack_trace", - "term_glyph", - "test_api" - ] + "dependencies": [] }, { - "name": "term_glyph", - "version": "1.2.1", + "name": "string_scanner", + "version": "1.2.0", "kind": "transitive", "source": "hosted", - "dependencies": [] + "dependencies": [ + "source_span" + ] }, { - "name": "stack_trace", - "version": "1.11.0", + "name": "source_span", + "version": "1.10.0", "kind": "transitive", "source": "hosted", "dependencies": [ - "path" + "collection", + "path", + "term_glyph" ] }, { @@ -110,13 +91,22 @@ "dependencies": [] }, { - "name": "meta", - "version": "1.9.1", + "name": "collection", + "version": "1.17.2", "kind": "direct", "source": "hosted", "dependencies": [] }, { + "name": "stream_channel", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { "name": "async", "version": "2.11.0", "kind": "transitive", @@ -127,54 +117,52 @@ ] }, { - "name": "collection", - "version": "1.17.1", + "name": "meta", + "version": "1.9.1", "kind": "direct", "source": "hosted", "dependencies": [] }, { - "name": "string_scanner", - "version": "1.2.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "source_span" - ] - }, - { - "name": "source_span", - "version": "1.9.1", + "name": "stack_trace", + "version": "1.11.0", "kind": "transitive", "source": "hosted", "dependencies": [ - "collection", - "path", - "term_glyph" + "path" ] }, { - "name": "stream_channel", + "name": "boolean_selector", "version": "2.1.1", "kind": "transitive", "source": "hosted", "dependencies": [ - "async" + "source_span", + "string_scanner" ] }, { - "name": "boolean_selector", - "version": "2.1.1", - "kind": "transitive", + "name": "mockito", + "version": "5.4.2", + "kind": "dev", "source": "hosted", "dependencies": [ - "source_span", - "string_scanner" + "analyzer", + "build", + "code_builder", + "collection", + "dart_style", + "matcher", + "meta", + "path", + "source_gen", + "test_api" ] }, { "name": "source_gen", - "version": "1.3.2", + "version": "1.4.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -224,7 +212,7 @@ }, { "name": "dart_style", - "version": "2.3.1", + "version": "2.3.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -329,7 +317,7 @@ }, { "name": "build", - "version": "2.4.0", + "version": "2.4.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -352,6 +340,19 @@ "dependencies": [] }, { + "name": "matcher", + "version": "0.12.16", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "meta", + "stack_trace", + "term_glyph", + "test_api" + ] + }, + { "name": "code_builder", "version": "4.5.0", "kind": "transitive", @@ -366,7 +367,7 @@ }, { "name": "built_value", - "version": "8.6.1", + "version": "8.6.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -392,7 +393,7 @@ }, { "name": "melos", - "version": "3.1.0", + "version": "3.1.1", "kind": "dev", "source": "hosted", "dependencies": [ @@ -465,13 +466,14 @@ }, { "name": "pub_updater", - "version": "0.2.4", + "version": "0.3.1", "kind": "transitive", "source": "hosted", "dependencies": [ "http", "json_annotation", - "process" + "process", + "pub_semver" ] }, { @@ -503,7 +505,7 @@ }, { "name": "http", - "version": "0.13.6", + "version": "1.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -630,7 +632,6 @@ "collection", "fake_async", "file", - "js", "matcher", "material_color_utilities", "meta", @@ -642,6 +643,7 @@ "term_glyph", "test_api", "vector_math", + "web", "webdriver" ] }, @@ -665,26 +667,26 @@ "dependencies": [] }, { - "name": "vector_math", - "version": "2.1.4", + "name": "web", + "version": "0.1.4-beta", "kind": "transitive", "source": "hosted", "dependencies": [] }, { - "name": "material_color_utilities", - "version": "0.2.0", + "name": "vector_math", + "version": "2.1.4", "kind": "transitive", "source": "hosted", "dependencies": [] }, { - "name": "js", - "version": "0.6.7", + "name": "material_color_utilities", + "version": "0.5.0", "kind": "transitive", "source": "hosted", "dependencies": [ - "meta" + "collection" ] }, { @@ -713,7 +715,7 @@ }, { "name": "vm_service", - "version": "11.3.0", + "version": "11.7.1", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -726,6 +728,7 @@ "dependencies": [ "flutter", "test_api", + "matcher", "path", "fake_async", "clock", @@ -735,14 +738,13 @@ "boolean_selector", "characters", "collection", - "js", - "matcher", "material_color_utilities", "meta", "source_span", "stream_channel", "string_scanner", - "term_glyph" + "term_glyph", + "web" ] }, { @@ -753,10 +755,10 @@ "dependencies": [ "characters", "collection", - "js", "material_color_utilities", "meta", "vector_math", + "web", "sky_engine" ] }, @@ -786,7 +788,6 @@ "characters", "clock", "collection", - "js", "matcher", "material_color_utilities", "platform", @@ -798,7 +799,8 @@ "sync_http", "term_glyph", "test_api", - "vector_math" + "vector_math", + "web" ] }, { @@ -817,7 +819,7 @@ }, { "name": "freezed", - "version": "2.3.5", + "version": "2.4.1", "kind": "dev", "source": "hosted", "dependencies": [ @@ -833,7 +835,7 @@ }, { "name": "freezed_annotation", - "version": "2.2.0", + "version": "2.4.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -881,7 +883,7 @@ }, { "name": "flutter_lints", - "version": "2.0.1", + "version": "2.0.2", "kind": "dev", "source": "hosted", "dependencies": [ @@ -897,7 +899,7 @@ }, { "name": "build_runner", - "version": "2.4.5", + "version": "2.4.6", "kind": "dev", "source": "hosted", "dependencies": [ @@ -997,6 +999,15 @@ "dependencies": [] }, { + "name": "js", + "version": "0.6.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { "name": "http_multi_server", "version": "3.2.1", "kind": "transitive", @@ -1043,7 +1054,7 @@ }, { "name": "build_resolvers", - "version": "2.2.0", + "version": "2.2.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1054,8 +1065,8 @@ "crypto", "graphs", "logging", - "path", "package_config", + "path", "pool", "pub_semver", "stream_transform", @@ -1083,20 +1094,19 @@ }, { "name": "yaru_widgets", - "version": "2.3.1", + "version": "3.1.0", "kind": "direct", "source": "hosted", "dependencies": [ "flutter", "yaru", - "yaru_colors", "yaru_icons", "yaru_window" ] }, { "name": "yaru_window", - "version": "0.1.2", + "version": "0.1.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1120,7 +1130,7 @@ }, { "name": "yaru_window_platform_interface", - "version": "0.1.1", + "version": "0.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1131,7 +1141,7 @@ }, { "name": "plugin_platform_interface", - "version": "2.1.4", + "version": "2.1.5", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1145,12 +1155,12 @@ "source": "sdk", "dependencies": [ "flutter", - "js", "characters", "collection", "material_color_utilities", "meta", - "vector_math" + "vector_math", + "web" ] }, { @@ -1167,7 +1177,7 @@ }, { "name": "window_manager", - "version": "0.3.4", + "version": "0.3.6", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1178,7 +1188,7 @@ }, { "name": "screen_retriever", - "version": "0.1.6", + "version": "0.1.9", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1187,7 +1197,7 @@ }, { "name": "yaru_window_linux", - "version": "0.1.2", + "version": "0.1.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1197,7 +1207,7 @@ }, { "name": "yaru_icons", - "version": "1.0.4", + "version": "2.2.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1205,57 +1215,56 @@ ] }, { - "name": "yaru_colors", - "version": "0.1.7", + "name": "yaru", + "version": "1.1.0", "kind": "direct", "source": "hosted", "dependencies": [ "collection", "flutter", - "meta", - "yaru_color_generator" + "gtk", + "platform" ] }, { - "name": "yaru_color_generator", - "version": "0.1.0", - "kind": "transitive", + "name": "gtk", + "version": "2.1.0", + "kind": "direct", "source": "hosted", "dependencies": [ - "collection", + "ffi", + "flutter", "meta" ] }, { - "name": "yaru", - "version": "0.6.2", - "kind": "direct", + "name": "ffi", + "version": "2.1.0", + "kind": "transitive", "source": "hosted", - "dependencies": [ - "collection", - "flutter", - "gtk", - "platform", - "yaru_colors" - ] + "dependencies": [] }, { - "name": "gtk", - "version": "2.1.0", + "name": "yaru_colors", + "version": "0.1.7", "kind": "direct", "source": "hosted", "dependencies": [ - "ffi", + "collection", "flutter", - "meta" + "meta", + "yaru_color_generator" ] }, { - "name": "ffi", - "version": "2.0.2", + "name": "yaru_color_generator", + "version": "0.1.0", "kind": "transitive", "source": "hosted", - "dependencies": [] + "dependencies": [ + "collection", + "meta" + ] }, { "name": "upower", @@ -1299,6 +1308,198 @@ ] }, { + "name": "ubuntu_test", + "version": "0.1.0-beta.6", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_html", + "flutter_markdown", + "flutter_svg", + "flutter_test", + "mockito", + "test_api", + "ubuntu_localizations", + "yaru_test" + ] + }, + { + "name": "yaru_test", + "version": "0.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_test", + "yaru", + "yaru_widgets", + "yaru_window_platform_interface" + ] + }, + { + "name": "ubuntu_localizations", + "version": "0.3.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "diacritic", + "flutter", + "flutter_localizations", + "intl" + ] + }, + { + "name": "intl", + "version": "0.18.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "clock", + "meta", + "path" + ] + }, + { + "name": "flutter_localizations", + "version": "0.0.0", + "kind": "direct", + "source": "sdk", + "dependencies": [ + "flutter", + "intl", + "characters", + "clock", + "collection", + "material_color_utilities", + "meta", + "path", + "vector_math", + "web" + ] + }, + { + "name": "diacritic", + "version": "0.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_svg", + "version": "2.0.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "vector_graphics", + "vector_graphics_codec", + "vector_graphics_compiler" + ] + }, + { + "name": "vector_graphics_compiler", + "version": "1.1.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "meta", + "path_parsing", + "xml", + "vector_graphics_codec" + ] + }, + { + "name": "vector_graphics_codec", + "version": "1.1.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "path_parsing", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "vector_math", + "meta" + ] + }, + { + "name": "vector_graphics", + "version": "1.1.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "vector_graphics_codec" + ] + }, + { + "name": "flutter_markdown", + "version": "0.6.17+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "markdown", + "meta", + "path" + ] + }, + { + "name": "markdown", + "version": "7.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "meta" + ] + }, + { + "name": "flutter_html", + "version": "3.0.0-beta.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "html", + "csslib", + "collection", + "list_counter", + "flutter" + ] + }, + { + "name": "list_counter", + "version": "1.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "csslib", + "version": "0.17.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "html", + "version": "0.15.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "csslib", + "source_span" + ] + }, + { "name": "ubuntu_session", "version": "0.0.4", "kind": "direct", @@ -1310,7 +1511,7 @@ }, { "name": "ubuntu_service", - "version": "0.2.3", + "version": "0.2.4", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1354,17 +1555,6 @@ ] }, { - "name": "intl", - "version": "0.18.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "clock", - "meta", - "path" - ] - }, - { "name": "dio", "version": "4.0.6", "kind": "direct", @@ -1422,62 +1612,5 @@ "dbus", "meta" ] - }, - { - "name": "flutter_localizations", - "version": "0.0.0", - "kind": "direct", - "source": "sdk", - "dependencies": [ - "flutter", - "intl", - "characters", - "clock", - "collection", - "js", - "material_color_utilities", - "meta", - "path", - "vector_math" - ] - }, - { - "name": "flutter_html", - "version": "3.0.0-beta.2", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "html", - "csslib", - "collection", - "list_counter", - "flutter" - ] - }, - { - "name": "list_counter", - "version": "1.0.2", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "csslib", - "version": "0.17.3", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "source_span" - ] - }, - { - "name": "html", - "version": "0.15.4", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "csslib", - "source_span" - ] } ] diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock b/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock index f95c0a6ab34a..99d5d74560b7 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock +++ b/nixpkgs/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock @@ -53,10 +53,10 @@ packages: dependency: transitive description: name: build - sha256: "43865b79fbb78532e4bff7c33087aa43b1d488c4fdef014eaef568af6d8016dc" + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" build_config: dependency: transitive description: @@ -77,18 +77,18 @@ packages: dependency: transitive description: name: build_resolvers - sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95 + sha256: "6c4dd11d05d056e76320b828a1db0fc01ccd376922526f8e9d6c796a5adbac20" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "5e1929ad37d48bd382b124266cb8e521de5548d406a45a5ae6656c13dab73e37" + sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b" url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "2.4.6" build_runner_core: dependency: transitive description: @@ -109,10 +109,10 @@ packages: dependency: transitive description: name: built_value - sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166" + sha256: ff627b645b28fb8bdb69e645f910c2458fd6b65f6585c3a53e0626024897dedf url: "https://pub.dev" source: hosted - version: "8.6.1" + version: "8.6.2" characters: dependency: transitive description: @@ -173,10 +173,10 @@ packages: dependency: "direct main" description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" conventional_commit: dependency: transitive description: @@ -213,10 +213,10 @@ packages: dependency: transitive description: name: dart_style - sha256: f4f1f73ab3fd2afcbcca165ee601fe980d966af6a21b5970c6c9376955c528ad + sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" dbus: dependency: "direct main" description: @@ -225,6 +225,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.8" + diacritic: + dependency: transitive + description: + name: diacritic + sha256: a84e03ec2779375fb86430dbe9d8fba62c68376f2499097a5f6e75556babe706 + url: "https://pub.dev" + source: hosted + version: "0.1.4" dio: dependency: "direct main" description: @@ -245,10 +253,10 @@ packages: dependency: transitive description: name: ffi - sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99 + sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.0" file: dependency: "direct main" description: @@ -287,15 +295,31 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2" flutter_localizations: dependency: "direct main" description: flutter source: sdk version: "0.0.0" + flutter_markdown: + dependency: transitive + description: + name: flutter_markdown + sha256: "2b206d397dd7836ea60035b2d43825c8a303a76a5098e66f42d55a753e18d431" + url: "https://pub.dev" + source: hosted + version: "0.6.17+1" + flutter_svg: + dependency: transitive + description: + name: flutter_svg + sha256: "8c5d68a82add3ca76d792f058b186a0599414f279f00ece4830b9b231b570338" + url: "https://pub.dev" + source: hosted + version: "2.0.7" flutter_test: dependency: "direct dev" description: flutter @@ -310,18 +334,18 @@ packages: dependency: "direct dev" description: name: freezed - sha256: a9520490532087cf38bf3f7de478ab6ebeb5f68bb1eb2641546d92719b224445 + sha256: "2df89855fe181baae3b6d714dc3c4317acf4fccd495a6f36e5e00f24144c6c3b" url: "https://pub.dev" source: hosted - version: "2.3.5" + version: "2.4.1" freezed_annotation: dependency: "direct main" description: name: freezed_annotation - sha256: aeac15850ef1b38ee368d4c53ba9a847e900bb2c53a4db3f6881cbb3cb684338 + sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.4.1" frontend_server_client: dependency: transitive description: @@ -396,10 +420,10 @@ packages: dependency: transitive description: name: http - sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" url: "https://pub.dev" source: hosted - version: "0.13.6" + version: "1.1.0" http_multi_server: dependency: transitive description: @@ -425,10 +449,10 @@ packages: dependency: transitive description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.18.0" + version: "0.18.1" io: dependency: transitive description: @@ -485,30 +509,38 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.2" + markdown: + dependency: transitive + description: + name: markdown + sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd + url: "https://pub.dev" + source: hosted + version: "7.1.1" matcher: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" melos: dependency: "direct dev" description: name: melos - sha256: ccbb6ecd8bb3f08ae8f9ce22920d816bff325a98940c845eda0257cd395503ac + sha256: "3f22f6cc629d72acf3acc8a7f8563384550290fa30790efa328c9cf606aa17d7" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.1" meta: dependency: "direct main" description: @@ -529,10 +561,10 @@ packages: dependency: "direct dev" description: name: mockito - sha256: dd61809f04da1838a680926de50a9e87385c1de91c6579629c3d1723946e8059 + sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616" url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "5.4.2" mustache_template: dependency: transitive description: @@ -565,6 +597,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.8.3" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + url: "https://pub.dev" + source: hosted + version: "1.0.1" petitparser: dependency: transitive description: @@ -585,10 +625,10 @@ packages: dependency: transitive description: name: plugin_platform_interface - sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" pool: dependency: transitive description: @@ -633,10 +673,10 @@ packages: dependency: transitive description: name: pub_updater - sha256: "42890302ab2672adf567dc2b20e55b4ecc29d7e19c63b6b98143ab68dd717d3a" + sha256: b06600619c8c219065a548f8f7c192b3e080beff95488ed692780f48f69c0625 url: "https://pub.dev" source: hosted - version: "0.2.4" + version: "0.3.1" pubspec: dependency: transitive description: @@ -673,10 +713,10 @@ packages: dependency: transitive description: name: screen_retriever - sha256: "4931f226ca158123ccd765325e9fbf360bfed0af9b460a10f960f9bb13d58323" + sha256: "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90" url: "https://pub.dev" source: hosted - version: "0.1.6" + version: "0.1.9" shelf: dependency: transitive description: @@ -702,18 +742,18 @@ packages: dependency: transitive description: name: source_gen - sha256: "373f96cf5a8744bc9816c1ff41cf5391bbdbe3d7a96fe98c622b6738a8a7bd33" + sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" source_span: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: @@ -763,13 +803,13 @@ packages: source: hosted version: "1.2.1" test_api: - dependency: transitive + dependency: "direct overridden" description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.1" timing: dependency: transitive description: @@ -786,6 +826,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" + ubuntu_localizations: + dependency: transitive + description: + name: ubuntu_localizations + sha256: a75e87b9f1c3dc678f69a943eb4cee8ccbd5b0db64d491750325950e311adab0 + url: "https://pub.dev" + source: hosted + version: "0.3.4" ubuntu_logger: dependency: "direct main" description: @@ -798,10 +846,10 @@ packages: dependency: "direct main" description: name: ubuntu_service - sha256: f90582494cddd4c7325637930497f38598a7ec567f4f86f88fe1ac40a53832a1 + sha256: f6ad4dfb099af41e750c59aad00d67a96e22df00f4962d2e25d56ae3db78be49 url: "https://pub.dev" source: hosted - version: "0.2.3" + version: "0.2.4" ubuntu_session: dependency: "direct main" description: @@ -810,6 +858,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.0.4" + ubuntu_test: + dependency: "direct main" + description: + name: ubuntu_test + sha256: "2361b741808a11d95c64a50666151d536133e75cade17b8feccca1e67364be88" + url: "https://pub.dev" + source: hosted + version: "0.1.0-beta.6" upower: dependency: "direct main" description: @@ -826,6 +882,30 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "670f6e07aca990b4a2bcdc08a784193c4ccdd1932620244c3a86bb72a0eac67f" + url: "https://pub.dev" + source: hosted + version: "1.1.7" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: "7451721781d967db9933b63f5733b1c4533022c0ba373a01bdd79d1a5457f69f" + url: "https://pub.dev" + source: hosted + version: "1.1.7" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "80a13c613c8bde758b1464a1755a7b3a8f2b6cec61fbf0f5a53c94c30f03ba2e" + url: "https://pub.dev" + source: hosted + version: "1.1.7" vector_math: dependency: transitive description: @@ -838,10 +918,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe + sha256: c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f url: "https://pub.dev" source: hosted - version: "11.3.0" + version: "11.7.1" watcher: dependency: transitive description: @@ -850,6 +930,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" web_socket_channel: dependency: transitive description: @@ -870,10 +958,10 @@ packages: dependency: transitive description: name: window_manager - sha256: "95096fede562cbb65f30d38b62d819a458f59ba9fe4a317f6cee669710f6676b" + sha256: "6ee795be9124f90660ea9d05e581a466de19e1c89ee74fc4bf528f60c8600edd" url: "https://pub.dev" source: hosted - version: "0.3.4" + version: "0.3.6" xml: dependency: transitive description: @@ -902,10 +990,10 @@ packages: dependency: "direct main" description: name: yaru - sha256: "1d1fb60359a92f91cc7e6a76fd3046474b9734d2fb97b7a7189bb1e2ca66929f" + sha256: "24047f0de452784840a326874192d26cb5ebd8cf5eac7864086e5bc9272a28db" url: "https://pub.dev" source: hosted - version: "0.6.2" + version: "1.1.0" yaru_color_generator: dependency: transitive description: @@ -926,34 +1014,42 @@ packages: dependency: "direct main" description: name: yaru_icons - sha256: "8ddd40522c882de898a493094f2f41687f7a0faaf3434b9c854a7605a53a2477" + sha256: cbb0b5945f407116fd8a1fbe7265e7ffa0d568249d496343a69cb5c55360bba1 url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "2.2.1" + yaru_test: + dependency: transitive + description: + name: yaru_test + sha256: "9396269fbe026bb9c398b9d4308c76982090ddeca102e4846bd4ba595333ff0a" + url: "https://pub.dev" + source: hosted + version: "0.1.4" yaru_widgets: dependency: "direct main" description: name: yaru_widgets - sha256: "2fd284afe8c8c8104ea18b963d5db68f780ec65048be7ac0624d0dbb7176c55f" + sha256: "482a71ef5566c6cb4135272f0041bf8a9c35729bf9079b0d304eedfa2fa0cc0c" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "3.1.0" yaru_window: dependency: transitive description: name: yaru_window - sha256: "2effc86bfe7aae870384655c029e3bc36bf5dd32727474e502832a1edaeff75d" + sha256: "55c8f039d13aaa1b211a8cf0b7731ae2fdcac9b1be1e0994eb14ad1d17fecaf7" url: "https://pub.dev" source: hosted - version: "0.1.2" + version: "0.1.3" yaru_window_linux: dependency: transitive description: name: yaru_window_linux - sha256: "9a813227137d1aafbc786d6455edc24c5febd17d6da04fe7ba2109c02bb60e69" + sha256: c45606cf75880ae6427bbe176dc5313356f16c876c7013a19aeee782882c40c2 url: "https://pub.dev" source: hosted - version: "0.1.2" + version: "0.1.3" yaru_window_manager: dependency: transitive description: @@ -966,10 +1062,10 @@ packages: dependency: transitive description: name: yaru_window_platform_interface - sha256: "7845d7db91e1c1acbc0f8b2f9ba6082c00a98f06cabda1732bdb7c267edc5c89" + sha256: e9f8cd34e207d7f7b771ae70dee347ed974cee06b981819c4181b3e474e52254 url: "https://pub.dev" source: hosted - version: "0.1.1" + version: "0.1.2" yaru_window_web: dependency: transitive description: @@ -979,5 +1075,5 @@ packages: source: hosted version: "0.0.3" sdks: - dart: ">=3.0.0 <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=3.10.0" diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix index 371e13de589e..25bce432bc5f 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -123,7 +123,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "1.9.3"; + version = "1.9.4"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; rev = finalAttrs.version; - hash = "sha256-IVP5RVHRxWkvPqndiuCxiguYWN5d32qJo9YzBOHoyUk"; + hash = "sha256-xjN6nHqg7sQzgojClySQEjLQBdI5291TxPhgLjKzKvk="; }; patches = [ @@ -212,9 +212,6 @@ stdenv.mkDerivation (finalAttrs: { "-Dplugin_dummy=true" # We are building the official releases. "-Dsupported_build=enabled" - # Would dlopen libsoup to preserve compatibility with clients linking against older fwupd. - # https://github.com/fwupd/fwupd/commit/173d389fa59d8db152a5b9da7cc1171586639c97 - "-Dsoup_session_compat=false" "-Dudevdir=lib/udev" "-Dsystemd_root_prefix=${placeholder "out"}" "-Dinstalled_test_prefix=${placeholder "installedTests"}" @@ -399,7 +396,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://fwupd.org/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ rvdp ]; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix index 824615a4baf2..444585189434 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ cabextract ]; - sourceRoot = "./."; + sourceRoot = "."; unpackCmd = '' cabextract -F FW_ACC_00U.bin ${src} diff --git a/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix b/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix index af8cbf0aa829..6c7afffd9cec 100644 --- a/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.372"; + version = "0.373"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - hash = "sha256-XC0U5UsOjTveRj1b0e1TBlYv/tKebSOu/YEGt/rmAHw="; + hash = "sha256-KXZodSvY4Szt/gp0iRkx+ngziCaUYvkjnkvjwPj3OwI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index f6ce1b2d61d7..f3ffbde6f1d9 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,21 +52,21 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.46-hardened1.patch", - "sha256": "1filmigpmn3bly4f08450izq4gabn57xi1fkczcnmkphwp83rk4l", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.46-hardened1/linux-hardened-6.1.46-hardened1.patch" + "name": "linux-hardened-6.1.47-hardened1.patch", + "sha256": "0wgsjb05m9f0fgv4vj0m0ll9bx22z894qlpwb45b33mq66fvbgwn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.47-hardened1/linux-hardened-6.1.47-hardened1.patch" }, - "sha256": "15m228bllks2p8gpsmvplx08yxzp7bij9fnmnafqszylrk7ppxpm", - "version": "6.1.46" + "sha256": "1azwvlzyp1s2adm17ic0jfmv3ph70wqzycb8s96z9987y1m8pmck", + "version": "6.1.47" }, "6.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.4.11-hardened1.patch", - "sha256": "15c8fs5dmkm2a9j66gq5c1hcbw95p4d03y71rvh6jhglpna7b3xc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.11-hardened1/linux-hardened-6.4.11-hardened1.patch" + "name": "linux-hardened-6.4.12-hardened1.patch", + "sha256": "0xkcvyy2ii5wfdw8h21svcsz3s3q0qk4yx7dxzbrisap10d79l51", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.12-hardened1/linux-hardened-6.4.12-hardened1.patch" }, - "sha256": "0609lhgc42j9id2vvdpv8n7djabp46p2mridf9s0sg3x16snhssl", - "version": "6.4.11" + "sha256": "0x56b4hslm730ghvggz41fjkbzlnxp6k8857dn7iy27yavlipafc", + "version": "6.4.12" } } diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index 1d9c04f46371..f4d80ce0153f 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.191"; + version = "5.10.192"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1hk2x5dgvfq9v6161v25wz5qpzgyvqbx34xbm7ww8z4ish76cm6b"; + sha256 = "1fdmn38l3hilpqwjl2sr28rjpr2k3jxd3nxs54j162p5avp123f4"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix index fcee7105c70e..2efbc4036510 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.127"; + version = "5.15.128"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "09lgj9hs1cjxg84hb7avras4rlsx18igr69mx433l9hv6issbl5d"; + sha256 = "1pl03djrfa7bqzpcvqlfgqnwx6iby6bpr1hc7gspdzc3a62clbhg"; }; } // (args.argsOverride or { })) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix index 32ce7cb0c989..6859e537de7d 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.47"; + version = "6.1.49"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1azwvlzyp1s2adm17ic0jfmv3ph70wqzycb8s96z9987y1m8pmck"; + sha256 = "03vs0ncpxx12d2pm0glxa68lqkj17j69lcx9h8w6xjm43hii9sn9"; }; } // (args.argsOverride or { })) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.5.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.5.nix new file mode 100644 index 000000000000..00b3487e4e75 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.5.nix @@ -0,0 +1,18 @@ +{ lib, fetchurl, buildLinux, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "6.5"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = versions.pad 3 version; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; + hash = "sha256-eldLvCCALqdrUsp/rwcmf3IEXoYbGJFcUnKpjCer+IQ="; + }; +} // (args.argsOverride or { })) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index ae098fb1b948..6a0f7c2325e0 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19392"; - sha256 = "09d61yw3jmq1cpzp1kpnmjrnl1gxhp8p0vqnc75j05ikmibqpa4l"; + rev = "19397"; + sha256 = "130q08my839kwbi1v8lqwvs6w8s6328ki7s243as4yz4kfrlymr3"; } , ... }: diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix index ab57c908581e..1f03029d9028 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.5-rc5"; + version = "6.5-rc7"; extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchzip { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-7QNXBuk1jMCdUFWeu5P0j1nwL5PQgBFhlFYbKzj/k6E="; + hash = "sha256-5rIcyXN54o9P+RxHZkI/BTO2Ox6uJ0Fi9NVcrN1HczQ="; }; # Should the testing kernels ever be built on Hydra? diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/perf/default.nix b/nixpkgs/pkgs/os-specific/linux/kernel/perf/default.nix index 2fc82b2e10be..ad8f2608d936 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/perf/default.nix @@ -25,6 +25,7 @@ , libbfd_2_38 , libopcodes , libopcodes_2_38 +, libpfm , libtraceevent , openssl , systemtap @@ -125,6 +126,7 @@ stdenv.mkDerivation { ++ lib.optional withGtk gtk2 ++ lib.optional withZstd zstd ++ lib.optional withLibcap libcap + ++ lib.optional (lib.versionAtLeast kernel.version "5.8") libpfm ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3.pkgs.setuptools; env.NIX_CFLAGS_COMPILE = toString [ diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 30b8f6bba893..4a97d8f6ecf8 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/nixpkgs/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.46"; - hash = "sha256-E9DEWfhl9hUAQXOvJVYJsKBFIen0xHrmiUdTUvGeKxE="; + version = "6.1.47"; + hash = "sha256-yF05EkQ/sAvmoNW2waxNJRGGB0gnL85fFdl6pc6U8Eo="; variant = "lts"; }; mainVariant = { - version = "6.4.11"; - hash = "sha256-HZTLuxdlkVRBe8C95vr6Fk9YjlCXZEpK3gfbtzLqwLQ="; + version = "6.4.12"; + hash = "sha256-rvSQJb9MIOXkGEjHOPt3x+dqp1AysvQg7n5yYsg95fk="; variant = "main"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix b/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix index 4f4c3c937254..fe5535eea8db 100644 --- a/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix +++ b/nixpkgs/pkgs/os-specific/linux/lenovo-legion/app.nix @@ -2,12 +2,12 @@ python3.pkgs.buildPythonApplication rec { pname = "lenovo-legion-app"; - version = "2023-04-02-16-53-51"; + version = "0.0.5"; src = fetchFromGitHub { owner = "johnfanv2"; repo = "LenovoLegionLinux"; - rev = "main${version}"; + rev = "v${version}-prerelease"; sha256 = "sha256-s4JFFmawokdC4qoqNvZDhuJSinhQ3YKSIfAYi79VTTA="; }; diff --git a/nixpkgs/pkgs/os-specific/linux/libcap/default.nix b/nixpkgs/pkgs/os-specific/linux/libcap/default.nix index 17fcbd128408..9b23625102ae 100644 --- a/nixpkgs/pkgs/os-specific/linux/libcap/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libcap/default.nix @@ -1,6 +1,18 @@ { stdenv, lib, buildPackages, fetchurl, attr, runtimeShell , usePam ? !isStatic, pam ? null , isStatic ? stdenv.hostPlatform.isStatic + +# passthru.tests +, bind +, chrony +, htop +, libgcrypt +, libvirt +, ntp +, qemu +, squid +, tor +, uwsgi }: assert usePam -> pam != null; @@ -57,6 +69,20 @@ stdenv.mkDerivation rec { mv "$lib"/lib/security "$pam/lib" ''; + passthru.tests = { + inherit + bind + chrony + htop + libgcrypt + libvirt + ntp + qemu + squid + tor + uwsgi; + }; + meta = { description = "Library for working with POSIX capabilities"; homepage = "https://sites.google.com/site/fullycapable"; diff --git a/nixpkgs/pkgs/os-specific/linux/libnl-tiny/default.nix b/nixpkgs/pkgs/os-specific/linux/libnl-tiny/default.nix index fc520830f6a2..2f5d1d0999a0 100644 --- a/nixpkgs/pkgs/os-specific/linux/libnl-tiny/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libnl-tiny/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "libnl-tiny"; - version = "unstable-2022-12-13"; + version = "unstable-2023-07-27"; src = fetchgit { url = "https://git.openwrt.org/project/libnl-tiny.git"; - rev = "f5d9b7e4f534a69cbd35c3f150fa6d57b9d631e4"; - sha256 = "0c5ycsdas8rr5c33gd0mnmm515dq631fmdjn5mp2j1m0j1bk7hc0"; + rev = "bc92a280186f9becc53c0f17e4e43cfbdeec7e7b"; + hash = "sha256-/d6so8hfBOyp8NbUhPZ0aRj6gXO/RLgwCQnAT7N/rF8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/os-specific/linux/libnvme/default.nix b/nixpkgs/pkgs/os-specific/linux/libnvme/default.nix index 4ed838051f6f..029deb0b48a2 100644 --- a/nixpkgs/pkgs/os-specific/linux/libnvme/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libnvme/default.nix @@ -11,13 +11,15 @@ , stdenv , swig , systemd +# ImportError: cannot import name 'mlog' from 'mesonbuild' +, withDocs ? stdenv.hostPlatform.canExecute stdenv.buildPlatform }: stdenv.mkDerivation rec { pname = "libnvme"; version = "1.4"; - outputs = [ "out" "man" ]; + outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ]; src = fetchFromGitHub { owner = "linux-nvme"; @@ -51,7 +53,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=man" - "-Ddocs-build=true" + (lib.mesonBool "docs-build" withDocs) ]; preConfigure = '' diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index 3ad2b8f0fa0b..cc7c47bb46a5 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -27,12 +27,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "535.98"; - sha256_64bit = "sha256-E1DAmVLTe+L5DWCONq47BQtE/Rb22akZMHGhK/0FTsM="; - sha256_aarch64 = "sha256-ikqj7bvSvCGlkDviaqagyoSZhpf6ZU3TiKKxNDZm3RU="; - openSha256 = "sha256-dgc5Z70NSpBARelNy6XaZ4e7Tz9vWJWeNek3TSztJus="; - settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s="; - persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM="; + version = "535.104.05"; + sha256_64bit = "sha256-L51gnR2ncL7udXY2Y1xG5+2CU63oh7h8elSC4z/L7ck="; + sha256_aarch64 = "sha256-J4uEQQ5WK50rVTI2JysBBHLpmBEWQcQ0CihgEM6xuvk="; + openSha256 = "sha256-0ng4hyiUt0rHZkNveFTo+dSaqkMFO4UPXh85/js9Zbw="; + settingsSha256 = "sha256-pS9W5LMenX0Rrwmpg1cszmpAYPt0Mx+apVQmOmLWTog="; + persistencedSha256 = "sha256-uqT++w0gZRNbzyqbvP3GBqgb4g18r6VM3O8AMEfM7GU="; }; latest = selectHighestVersion production (generic { diff --git a/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix index 7e5fca7a354b..001162608cd0 100644 --- a/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "18.3.2-53621"; + version = "19.0.0-54570"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-mPETZiCI/i6xJ3+ououDKaVwrAxK5cr6L6A16oEgIqk="; + hash = "sha256-y7UC+E5i2cxkOJ9nVI6aQAFJ5kTXv9uaZoMO4/SCS6k="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/nixpkgs/pkgs/os-specific/linux/tpacpi-bat/default.nix b/nixpkgs/pkgs/os-specific/linux/tpacpi-bat/default.nix index 2ec8badb1ce5..455a36eb7aeb 100644 --- a/nixpkgs/pkgs/os-specific/linux/tpacpi-bat/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/tpacpi-bat/default.nix @@ -3,13 +3,13 @@ # Requires the acpi_call kernel module in order to run. stdenv.mkDerivation rec { pname = "tpacpi-bat"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "teleshoes"; repo = "tpacpi-bat"; rev = "v${version}"; - sha256 = "0wbaz34z99gqx721alh5vmpxpj2yxg3x9m8jqyivfi1wfpwc2nd5"; + sha256 = "sha256-9XnvVNdgB5VeI3juZfc8N5weEyULXuqu1IDChZfQqFk="; }; buildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix b/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix index e69ec1fb324d..b9367a68728d 100644 --- a/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, zlib, shadow +{ lib, stdenv, fetchurl, pkg-config, zlib, shadow , capabilitiesSupport ? stdenv.isLinux , libcap_ng , libxcrypt @@ -19,35 +19,15 @@ stdenv.mkDerivation rec { pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal"; - version = "2.39"; + version = "2.39.1"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz"; - hash = "sha256-MrMKM2zakDGC7WH+s+m5CLdipeZv4U5D77iNNxYgdcs="; + hash = "sha256-iQro/4ECR70Z4nTfdug3HSAs2gGtJ3aBsOqI7qoAKGs="; }; patches = [ ./rtcwake-search-PATH-for-shutdown.patch - - # FIXME: backport mount fixes for older kernels, remove in next release - (fetchpatch { - url = "https://github.com/util-linux/util-linux/commit/f94a7760ed7ce81389a6059f020238981627a70d.diff"; - hash = "sha256-UorqDeECK8pBePkmpo2x90p/jP3rCMshyPCyijSX1wo="; - }) - (fetchpatch { - url = "https://github.com/util-linux/util-linux/commit/1bd85b64632280d6bf0e86b4ff29da8b19321c5f.diff"; - hash = "sha256-dgu4de5ul/si7Vzwe8lr9NvsdI1CWfDQKuqvARaY6sE="; - }) - - # FIXME: backport bcache detection fixes, remove in next release - (fetchpatch { - url = "https://github.com/util-linux/util-linux/commit/158639a2a4c6e646fd4fa0acb5f4743e65daa415.diff"; - hash = "sha256-9F1OQFxKuI383u6MVy/UM15B6B+tkZFRwuDbgoZrWME="; - }) - (fetchpatch { - url = "https://github.com/util-linux/util-linux/commit/00a19fb8cdfeeae30a6688ac6b490e80371b2257.diff"; - hash = "sha256-w1S6IKSoL6JhVew9t6EemNRc/nrJQ5oMqFekcx0kno8="; - }) ]; # We separate some of the utilities into their own outputs. This diff --git a/nixpkgs/pkgs/os-specific/linux/xone/default.nix b/nixpkgs/pkgs/os-specific/linux/xone/default.nix index da0ae54e560f..104b7952f2be 100644 --- a/nixpkgs/pkgs/os-specific/linux/xone/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/xone/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; setSourceRoot = '' - export sourceRoot=$(pwd)/source + export sourceRoot=$(pwd)/${src.name} ''; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/nixpkgs/pkgs/os-specific/linux/xpadneo/default.nix b/nixpkgs/pkgs/os-specific/linux/xpadneo/default.nix index bb47bf03f58a..e470fa66adf3 100644 --- a/nixpkgs/pkgs/os-specific/linux/xpadneo/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/xpadneo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { }; setSourceRoot = '' - export sourceRoot=$(pwd)/source/hid-xpadneo/src + export sourceRoot=$(pwd)/${finalAttrs.src.name}/hid-xpadneo/src ''; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/nixpkgs/pkgs/pkgs-lib/tests/formats.nix b/nixpkgs/pkgs/pkgs-lib/tests/formats.nix index 80df247f7b6a..b7e100dd73bc 100644 --- a/nixpkgs/pkgs/pkgs-lib/tests/formats.nix +++ b/nixpkgs/pkgs/pkgs-lib/tests/formats.nix @@ -210,7 +210,6 @@ in runBuildTests { list = [1, 2] str = "foo" true = true - [attrs] foo = "foo" diff --git a/nixpkgs/pkgs/servers/bazarr/default.nix b/nixpkgs/pkgs/servers/bazarr/default.nix index 601fc49e4d05..792d430a42eb 100644 --- a/nixpkgs/pkgs/servers/bazarr/default.nix +++ b/nixpkgs/pkgs/servers/bazarr/default.nix @@ -20,7 +20,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip makeWrapper ]; buildInputs = [ - (python3.withPackages (ps: [ ps.lxml ps.numpy ps.gevent ps.gevent-websocket ps.pillow ])) + (python3.withPackages (ps: [ + ps.lxml + ps.numpy + ps.gevent + ps.gevent-websocket + ps.pillow + ps.setuptools + ])) ] ++ runtimeProgDeps; installPhase = '' diff --git a/nixpkgs/pkgs/servers/bililiverecorder/default.nix b/nixpkgs/pkgs/servers/bililiverecorder/default.nix new file mode 100644 index 000000000000..d5094bfb1a6a --- /dev/null +++ b/nixpkgs/pkgs/servers/bililiverecorder/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchzip +, makeWrapper +, dotnetCorePackages +}: + +let + pname = "bililiverecorder"; + + dotnet = with dotnetCorePackages; combinePackages [ + runtime_6_0 + aspnetcore_6_0 + ]; + + version = "2.6.3"; + hash = "sha256-h7nsbi831HB1tmo7d9vlR8fSKeTn2Ezn8NVl02Z1oQ0="; + +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchzip { + url = "https://github.com/BililiveRecorder/BililiveRecorder/releases/download/v${version}/BililiveRecorder-CLI-any.zip"; + stripRoot = false; + inherit hash; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version}/. + + makeWrapper "${dotnet}/bin/dotnet" $out/bin/BililiveRecorder \ + --add-flags "$out/share/${pname}-${version}/BililiveRecorder.Cli.dll" + + runHook postInstall + ''; + + meta = with lib; { + description = "A convenient free open source bilibili live recording tool"; + homepage = "https://rec.danmuji.org/"; + changelog = "https://github.com/BililiveRecorder/BililiveRecorder/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ zaldnoay ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/servers/dendrite/default.nix b/nixpkgs/pkgs/servers/dendrite/default.nix index ddffa995b5cd..a9e1b47eddba 100644 --- a/nixpkgs/pkgs/servers/dendrite/default.nix +++ b/nixpkgs/pkgs/servers/dendrite/default.nix @@ -1,26 +1,18 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch, nix-update-script +{ lib, buildGoModule, fetchFromGitHub, nix-update-script , nixosTests, postgresql, postgresqlTestHook }: buildGoModule rec { pname = "matrix-dendrite"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - hash = "sha256-2DqEfTXD3W6MxfBb6aHaKH+zpxLc2tHaGuWGQuncySo="; + hash = "sha256-I8k3E/7RXJFIaEX1Zw6oFDT6UkQvZBZuyTxUZZQYr+s="; }; - patches = [ - # Fix SQLite db lockup - (fetchpatch { - url = "https://github.com/matrix-org/dendrite/commit/c08c7405dbe9d88c1364f6f1f2466db5045506cc.patch"; - hash = "sha256-gTF9jK5Ihfe1v49gPCK68BLeiUZa2Syo+7D9r62iEXQ="; - }) - ]; - - vendorHash = "sha256-dc0zpKh7J+fi2b5GD/0BQ120UXbBvJLUF74RmYMSOMw="; + vendorHash = "sha256-H2wtGjGTzqN8OXAI2ksCBgTJsmJYLQu5aFu9OP03/DA="; subPackages = [ # The server diff --git a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index 492ab6131621..dbe0840a0fad 100644 --- a/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.2.9"; + version = "3.3.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "bc1f9eb8c9f67f52805f3acfa2d0153190245fa145b007fafa9068d2da292506"; + sha256 = "cf12ab736c512eb719a221cd3f65bb94f93ff2b477803d9474d1334af73c1533"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix index 7bd5f874b143..0c714cce59c0 100644 --- a/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix +++ b/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.9.0"; + version = "4.9.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "sha256-028WKEPjZ2RqZhp4XKC+zem2hVKFW/QFMq66+hA5ZvM="; + sha256 = "sha256-Ch7cE+jyvWYfOeMWOH2UHiLeagO4p6L8Zi/fi5Quor4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/servers/geospatial/tegola/default.nix b/nixpkgs/pkgs/servers/geospatial/tegola/default.nix index 0930f3f697d9..1c7e0697dac9 100644 --- a/nixpkgs/pkgs/servers/geospatial/tegola/default.nix +++ b/nixpkgs/pkgs/servers/geospatial/tegola/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tegola"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "go-spatial"; repo = "tegola"; rev = "v${version}"; - sha256 = "sha256-FYKsAkOVqhgTaps0eTI/SLCEI1BRTKKpRtwKo2m7srQ="; + sha256 = "sha256-lrFRPD16AFavc+ghpKoxwQJsfJLe5jxTQVK/0a6SIIs="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/servers/gpsd/default.nix b/nixpkgs/pkgs/servers/gpsd/default.nix index c254c60d9fed..662c4d530170 100644 --- a/nixpkgs/pkgs/servers/gpsd/default.nix +++ b/nixpkgs/pkgs/servers/gpsd/default.nix @@ -10,7 +10,7 @@ , dbus , libusb1 , ncurses -, pps-tools +, kppsSupport ? stdenv.isLinux, pps-tools , python3Packages # optional deps for GUI packages @@ -53,8 +53,9 @@ stdenv.mkDerivation rec { dbus libusb1 ncurses - pps-tools python3Packages.python + ] ++ lib.optionals kppsSupport [ + pps-tools ] ++ lib.optionals guiSupport [ atk dbus-glib @@ -135,7 +136,7 @@ stdenv.mkDerivation rec { homepage = "https://gpsd.gitlab.io/gpsd/index.html"; changelog = "https://gitlab.com/gpsd/gpsd/-/blob/release-${version}/NEWS"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor rasendubi ]; }; } diff --git a/nixpkgs/pkgs/servers/heisenbridge/default.nix b/nixpkgs/pkgs/servers/heisenbridge/default.nix index c2e75335f1fc..afb2520a6b88 100644 --- a/nixpkgs/pkgs/servers/heisenbridge/default.nix +++ b/nixpkgs/pkgs/servers/heisenbridge/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "heisenbridge"; - version = "1.14.4"; + version = "1.14.5"; src = fetchFromGitHub { owner = "hifi"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-4poHHwJ9WcOTTwOtPfANMqusaLltaoLryxNMQE1Parc="; + sha256 = "sha256-OmAmgHM+EmJ3mUY4lPBxIv2rAq8j2QEeTUMux7ZBfRE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 80d3c1a189f7..6d4965a63fc2 100644 --- a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.8.3"; + version = "2023.8.4"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -1822,7 +1822,8 @@ pygti ]; "hydrawise" = ps: with ps; [ - ]; # missing inputs: pydrawise + pydrawise + ]; "hyperion" = ps: with ps; [ hyperion-py ]; diff --git a/nixpkgs/pkgs/servers/home-assistant/default.nix b/nixpkgs/pkgs/servers/home-assistant/default.nix index 307aa6e63755..c6f7703718ed 100644 --- a/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -49,6 +49,7 @@ let }; postPatch = '' substituteInPlace pyproject.toml \ + --replace "poetry>=1.0.0b1" "poetry-core" \ --replace "poetry.masonry" "poetry.core.masonry" ''; propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ @@ -295,7 +296,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.8.3"; + hassVersion = "2023.8.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -311,7 +312,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-fbuNDP604G7YIL61+7LALPdD0blA4n2/meG0PnKnNQU="; + hash = "sha256-Mu3DyCtF/bTrTvRKPLVEGSZfWZrF7QQy/ZvBi5IIH3s="; }; # Secondary source is git for tests @@ -319,11 +320,12 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-eDA4FWFhfwlUM2skq/Yrua6RFEbmX5x1uC/QE/PhgTQ="; + hash = "sha256-N06e2QSt34l4T0hulndZR/czjaPcmw8YXF0iAN/XmgQ="; }; nativeBuildInputs = with python.pkgs; [ setuptools + wheel ]; # copy tests early, so patches apply as they would to the git repo @@ -368,6 +370,9 @@ in python.pkgs.buildPythonApplication rec { ) relaxedConstraints)} pyproject.toml substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' + + sed -i 's/setuptools[~=]/setuptools>/' pyproject.toml + sed -i 's/wheel[~=]/wheel>/' pyproject.toml ''; propagatedBuildInputs = with python.pkgs; [ diff --git a/nixpkgs/pkgs/servers/home-assistant/intents.nix b/nixpkgs/pkgs/servers/home-assistant/intents.nix index 0255d97da6b6..0d4caaea8b39 100644 --- a/nixpkgs/pkgs/servers/home-assistant/intents.nix +++ b/nixpkgs/pkgs/servers/home-assistant/intents.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, setuptools # build , hassil @@ -11,6 +10,8 @@ , regex , voluptuous , python +, setuptools +, wheel # tests , pytest-xdist @@ -32,12 +33,17 @@ buildPythonPackage rec { fetchSubmodules = true; }; + postPatch = '' + substituteInPlace pyproject.toml --replace 'requires = ["setuptools~=62.3", "wheel~=0.37.1"]' 'requires = ["setuptools", "wheel"]' + ''; + nativeBuildInputs = [ hassil jinja2 pyyaml regex setuptools + wheel voluptuous ]; diff --git a/nixpkgs/pkgs/servers/home-assistant/stubs.nix b/nixpkgs/pkgs/servers/home-assistant/stubs.nix index b8259e573673..fa2bdee5f89f 100644 --- a/nixpkgs/pkgs/servers/home-assistant/stubs.nix +++ b/nixpkgs/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.8.3"; + version = "2023.8.4"; 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-odZ0rKydFtj2bwNrP3KsE5xxFLAssYMoaEe+sBMIeYI="; + hash = "sha256-Oxge6gZ7m0ZFuJKIy6X9YgmC7aK2/oQWJAYCFTclZ/Y="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/servers/homepage-dashboard/default.nix b/nixpkgs/pkgs/servers/homepage-dashboard/default.nix index 44af271d5dd4..280f3349e733 100644 --- a/nixpkgs/pkgs/servers/homepage-dashboard/default.nix +++ b/nixpkgs/pkgs/servers/homepage-dashboard/default.nix @@ -13,13 +13,13 @@ buildNpmPackage rec { pname = "homepage-dashboard"; - version = "0.6.28"; + version = "0.6.29"; src = fetchFromGitHub { owner = "benphelps"; repo = "homepage"; rev = "v${version}"; - hash = "sha256-ghS5RL6wKdyJg4HxS31lol7QlFiZRXDAgn6rijy9XV8="; + hash = "sha256-v2DpF96prpavvhf5Qq2//sskJVNMgGTWltRi/+85KDM="; }; npmDepsHash = "sha256-3sjMWQ40FqdTfx1QkMoIwpIGWRQKPOqOKfPVDWzjz3w="; diff --git a/nixpkgs/pkgs/servers/honk/default.nix b/nixpkgs/pkgs/servers/honk/default.nix index 8b968dc49eea..5c342fd24a02 100644 --- a/nixpkgs/pkgs/servers/honk/default.nix +++ b/nixpkgs/pkgs/servers/honk/default.nix @@ -3,6 +3,7 @@ , fetchurl , sqlite , installShellFiles +, nixosTests }: buildGoModule rec { @@ -49,6 +50,10 @@ buildGoModule rec { mv views $out/share/${pname} ''; + passthru.tests = { + inherit (nixosTests) honk; + }; + meta = { changelog = "https://humungus.tedunangst.com/r/honk/v/v${version}/f/docs/changelog.txt"; description = "An ActivityPub server with minimal setup and support costs."; diff --git a/nixpkgs/pkgs/servers/http/dufs/default.nix b/nixpkgs/pkgs/servers/http/dufs/default.nix index 65582acd9cab..77425c08b5ba 100644 --- a/nixpkgs/pkgs/servers/http/dufs/default.nix +++ b/nixpkgs/pkgs/servers/http/dufs/default.nix @@ -2,31 +2,23 @@ , rustPlatform , fetchFromGitHub , stdenv -, pkg-config -, openssl , darwin }: rustPlatform.buildRustPackage rec { pname = "dufs"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "sigoden"; - repo = pname; + repo = "dufs"; rev = "v${version}"; - sha256 = "sha256-FrLvwXEnNEKi8FvPIs6A52WpSUT+pUCc61JBi9M/PPw="; + hash = "sha256-WZ+tyrx4ayFyPmDJq6dGaTRiR6bSQq5k5iOfb+ETe/I="; }; - cargoHash = "sha256-YHFEjs8a1QJHWYVjAQxmpMIQ2aDbu6mxeuNqcvReYR0="; + cargoHash = "sha256-HZiWmqIh21b12DP+hnx1pWBWgSa5j71kp6GCRKGMHv0="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ - pkg-config - ]; - - buildInputs = lib.optionals stdenv.isLinux [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/nixpkgs/pkgs/servers/imgproxy/default.nix b/nixpkgs/pkgs/servers/imgproxy/default.nix index 10cafd2019c7..954cab9bda13 100644 --- a/nixpkgs/pkgs/servers/imgproxy/default.nix +++ b/nixpkgs/pkgs/servers/imgproxy/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.18.2"; + version = "3.19.0"; src = fetchFromGitHub { owner = pname; repo = pname; - hash = "sha256-iMzaeB086VohyzUJqYxdnGi0grosrJD1H0AgK5A75XM="; + hash = "sha256-EGnamJBotPDatsWG+XLI/QhF2464aphkB9oS631oj+c="; rev = "v${version}"; }; - vendorHash = "sha256-5o1i88v+1UGYXP2SzyM6seyidrj1Z3Q64w/gi07xf4w="; + vendorHash = "sha256-gjRUt8/LECFSU2DG4ALi7a3DxKAGFoW98eBgeE5i2+s="; nativeBuildInputs = [ pkg-config gobject-introspection ]; diff --git a/nixpkgs/pkgs/servers/invidious/versions.json b/nixpkgs/pkgs/servers/invidious/versions.json index f2bc1e7af4d8..61ee89b6e742 100644 --- a/nixpkgs/pkgs/servers/invidious/versions.json +++ b/nixpkgs/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "34508966027fce3f460d9670eeecef67b92565a0", - "sha256": "sha256-z+6YHhESb0Ws9DRaVH4AR2i/SaWgM9OhTzxdY1bkv/0=", - "version": "unstable-2023-08-07" + "rev": "1377f2ce7d0a8fed716e8e285902bfbfef1a17e0", + "sha256": "sha256-ro5XneQqKGOfR7UZrowiht5V45s7EgkpbJiyBoLcnBo=", + "version": "unstable-2023-08-25" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", diff --git a/nixpkgs/pkgs/servers/jackett/default.nix b/nixpkgs/pkgs/servers/jackett/default.nix index fa08cb20b234..8be8c602f434 100644 --- a/nixpkgs/pkgs/servers/jackett/default.nix +++ b/nixpkgs/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.674"; + version = "0.21.719"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-sLgTnj1Z/zeAML8B1I40xGuEkyrxYeXVR/Two7vMGP3xmyv/KfssikVu8yFDtA4bdQq9RsLU8GxC74VQKe3txQ=="; + hash = "sha512-j2f8qsEEhvFIm2h87eIuOHjVUMtfy14v+FhO8p4JOmIIuhoG1DZ8zL8dgTgLUgtfCoXgvTd10P+cK/VfVuMJLw=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/nixpkgs/pkgs/servers/janus-gateway/default.nix b/nixpkgs/pkgs/servers/janus-gateway/default.nix index 705037e682bf..d62be801a4ca 100644 --- a/nixpkgs/pkgs/servers/janus-gateway/default.nix +++ b/nixpkgs/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "1.1.4"; + version = "1.2.0"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kvaO2g4QF6LYZcxv39yXkwY9iZVenJio8oOlRLLH2Kk="; + sha256 = "sha256-YbY7wcd8YHcPo5w4n54gjOtepYLbboLsrLij7oYzhco="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; diff --git a/nixpkgs/pkgs/servers/keycloak/scim-for-keycloak/default.nix b/nixpkgs/pkgs/servers/keycloak/scim-for-keycloak/default.nix index e192f38fcb10..81686d2be1d9 100644 --- a/nixpkgs/pkgs/servers/keycloak/scim-for-keycloak/default.nix +++ b/nixpkgs/pkgs/servers/keycloak/scim-for-keycloak/default.nix @@ -5,20 +5,19 @@ maven.buildMavenPackage rec { pname = "scim-for-keycloak"; - version = "kc-15-b2"; # When updating also update mvnHash + version = "kc-20-b1"; # When updating also update mvnHash src = fetchFromGitHub { owner = "Captain-P-Goldfish"; repo = "scim-for-keycloak"; rev = version; - sha256 = "K34c7xISjEETI3jFkRLdZ0C8pZHTWtPtrrIzwC76Tv0="; + hash = "sha256-kHjCVkcD8C0tIaMExDlyQmcWMhypisR1nyG93laB8WU="; }; - mvnHash = "sha256-MWxm2q6tx8YcdEsleC2h+s+lp9whi11VQ1yFr8AZUyQ="; + mvnHash = "sha256-cOuJSU57OuP+U7lI+pDD7g9HPIfZAoDPYLf+eO+XuF4="; installPhase = '' - EAR=$(find -iname "*.ear") - install -D "$EAR" "$out/$(basename $EAR)" + install -D "scim-for-keycloak-server/target/scim-for-keycloak-${version}.jar" "$out/scim-for-keycloak-${version}.jar" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/servers/lidarr/default.nix b/nixpkgs/pkgs/servers/lidarr/default.nix index fdf510a774ce..24c46d32253e 100644 --- a/nixpkgs/pkgs/servers/lidarr/default.nix +++ b/nixpkgs/pkgs/servers/lidarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-fYfqkv3o9aly2bgY5iiZETs4LZfrbJGWd7XeRP4nTu0="; - arm64-linux_hash = "sha256-ENdQQnjxNFyVYnTdxZuaSO4oJ7sd4Oa9TLs8xu93p5g="; - x64-osx_hash = "sha256-LwzwMsqq8RDBiQbKtBVKJPhh4woQTpVr+T0K8ii6kG8="; + x64-linux_hash = "sha256-Dpdsg952hw3ra24/REedfm/S3cOocfSrxjR5vGO/b5E="; + arm64-linux_hash = "sha256-xMRpbg37Q9VIRiioy3kUS00M0zxCT1G439pNWdgSe6A="; + x64-osx_hash = "sha256-rfG7pGUYpEHVpHu+tS0v+/CqF0v/TI0uy7faPoXU4oo="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "lidarr"; - version = "1.2.6.3313"; + version = "1.3.5.3530"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/nixpkgs/pkgs/servers/mail/listmonk/default.nix b/nixpkgs/pkgs/servers/mail/listmonk/default.nix index 7e55fde4504e..2d660e3cdbfb 100644 --- a/nixpkgs/pkgs/servers/mail/listmonk/default.nix +++ b/nixpkgs/pkgs/servers/mail/listmonk/default.nix @@ -12,8 +12,9 @@ buildGoModule rec { }; patches = [ + # Ensure that listmonk supports Go 1.20 (fetchpatch { - url = "https://github.com/knadh/listmonk/pull/1479.patch"; + url = "https://github.com/knadh/listmonk/commit/25513b81044803b104ada63c0be57a913960484e.patch"; hash = "sha256-SYACM8r+NgeSWn9VJV4+wkm+6s/MhNGwn5zyc2tw7FU="; }) ]; diff --git a/nixpkgs/pkgs/servers/mail/mailman/package.nix b/nixpkgs/pkgs/servers/mail/mailman/package.nix index 1220daebccb8..f74e20566f68 100644 --- a/nixpkgs/pkgs/servers/mail/mailman/package.nix +++ b/nixpkgs/pkgs/servers/mail/mailman/package.nix @@ -2,7 +2,6 @@ , fetchpatch , python3 , fetchPypi -, docutils , sphinx , postfix , lynx @@ -41,7 +40,6 @@ buildPythonPackage rec { ]; checkInputs = [ - docutils sphinx ]; diff --git a/nixpkgs/pkgs/servers/mail/mailman/web.nix b/nixpkgs/pkgs/servers/mail/mailman/web.nix index b63fa8c65505..ed5c267ad0c2 100644 --- a/nixpkgs/pkgs/servers/mail/mailman/web.nix +++ b/nixpkgs/pkgs/servers/mail/mailman/web.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { ]; meta = with lib; { + homepage = "https://gitlab.com/mailman/mailman-web"; description = "Django project for Mailman 3 web interface"; license = licenses.gpl3Plus; maintainers = with maintainers; [ qyliss m1cr0man ]; diff --git a/nixpkgs/pkgs/servers/mail/mox/default.nix b/nixpkgs/pkgs/servers/mail/mox/default.nix index 2dd7712c2c88..897f6ffc7a5b 100644 --- a/nixpkgs/pkgs/servers/mail/mox/default.nix +++ b/nixpkgs/pkgs/servers/mail/mox/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "mox"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "mjl-"; repo = "mox"; rev = "v${version}"; - hash = "sha256-f5/K6cPqJJkbdiVCNGOTd9Fjx2/gvSZCxeR6nnEaeJw="; + hash = "sha256-RNzjDAvyz0RfD4GV6hT9RNJOfHSUXCLfwN4+V5acX28="; }; # set the version during buildtime diff --git a/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix index ab7d92aef18c..c91069c722bc 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -16,26 +16,31 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.90.0"; + version = "1.91.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-VUbEERQ/UFCroSiz8Y8EsjB+uhFQXLAsK52kM6HTjjY="; + hash = "sha256-rLEewCN8OdZ4wIWQRbLkxVF/VOAESTLAVQLfUu/PYsA="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-t65rvhkLryzba6eZH1thBMzV7y0y5XMbdbrTxC91blQ="; + hash = "sha256-aOoSvT6e2x7JcXoQ2sVTCDvkWupixLzpbk3cTHVQs7I="; }; postPatch = '' # Remove setuptools_rust from runtime dependencies # https://github.com/matrix-org/synapse/blob/v1.69.0/pyproject.toml#L177-L185 sed -i '/^setuptools_rust =/d' pyproject.toml + + # Remove version pin on build dependencies. Upstream does this on purpose to + # be extra defensive, but we don't want to deal with updating this + sed -i 's/"poetry-core>=\([0-9.]*\),<=[0-9.]*"/"poetry-core>=\1"/' pyproject.toml + sed -i 's/"setuptools_rust>=\([0-9.]*\),<=[0-9.]*"/"setuptools_rust>=\1"/' pyproject.toml ''; nativeBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix b/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix index e1a9f7285920..d1ab9ab538b3 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "sha256-/vnojWLpu/fktqPUhAdL1QTESxDwFrBVYAkyF79Fj9w="; }; - sourceRoot = "./${src.name}/synapse_antispam"; + sourceRoot = "${src.name}/synapse_antispam"; buildInputs = [ matrix-synapse-unwrapped ]; diff --git a/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix b/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix index 7f425b7c5e49..0d7bd004f6bd 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "synadm"; - version = "0.41.3"; + version = "0.42"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-gWEgLpSE77XdocAZqN1i/vR5dvYFsgsg5zs5Dj90V/o="; + hash = "sha256-nfKXg4q+fOH0IwenEQ7P5x+YgwaooWpjn0gWHxK6tcc="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/servers/mautrix-discord/default.nix b/nixpkgs/pkgs/servers/mautrix-discord/default.nix new file mode 100644 index 000000000000..bad985e818c6 --- /dev/null +++ b/nixpkgs/pkgs/servers/mautrix-discord/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, olm +, nix-update-script +, testers +, mautrix-discord +}: + +buildGoModule rec { + pname = "mautrix-discord"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "mautrix"; + repo = "discord"; + rev = "v${version}"; + hash = "sha256-rs7wWlQMc79Vls+cqPPo+lRzYAGye4WcKKz+9EXlEBo="; + }; + + vendorSha256 = "sha256-ZI1+Tfru2OfnqLnaaiDL08OtSmbMBiRDvkL39+jhhmI="; + + ldflags = [ "-s" "-w" ]; + + buildInputs = [ olm ]; + + doCheck = false; + + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = mautrix-discord; + }; + }; + + meta = with lib; { + description = "A Matrix-Discord puppeting bridge"; + homepage = "https://github.com/mautrix/discord"; + changelog = "https://github.com/mautrix/discord/blob/${src.rev}/CHANGELOG.md"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ MoritzBoehme ]; + }; +} diff --git a/nixpkgs/pkgs/servers/metabase/default.nix b/nixpkgs/pkgs/servers/metabase/default.nix index 84d6351379ec..29ca27b16589 100644 --- a/nixpkgs/pkgs/servers/metabase/default.nix +++ b/nixpkgs/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.46.6.1"; + version = "0.46.7"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-EtJnv1FaI4lEu2X87tHvg/WuY0UcEa1bf3rb6vYS5cY="; + hash = "sha256-LGtjzODVkoOr8yGcE+fpgMzINQG3lBchTujTsZGgARU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/minio/default.nix b/nixpkgs/pkgs/servers/minio/default.nix index 236e90b57dda..e9c9c15c35e6 100644 --- a/nixpkgs/pkgs/servers/minio/default.nix +++ b/nixpkgs/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2023-08-09T23-30-22Z"; + version = "2023-08-16T20-17-30Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-veuqbXJxz7tyj4nZ0sr/kl/m/q2GcLwQBp0AkyvMpQ4="; + sha256 = "sha256-VY07ITsR2ISM0V4NgwpayDLakU425JCIjxEJ6YKEzXY="; }; - vendorHash = "sha256-12JdaDUIfUpFSxhQuF3ib5bQV3s4qO7MRzQCO2+eQZE="; + vendorHash = "sha256-KYbfHYls77OH8IWCnO9dSevrJ+2fZmpRQPCKfKCyXME="; doCheck = false; diff --git a/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix index faa42933facd..620d3aebc4a1 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix @@ -1,27 +1,36 @@ { lib , buildGoModule , fetchFromGitHub +, fetchYarnDeps +, fixup_yarn_lock , grafana-agent , nixosTests +, nodejs , stdenv , systemd , testers +, yarn }: buildGoModule rec { pname = "grafana-agent"; - version = "0.35.4"; + version = "0.36.0"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-3pUKqmqnRm3/e/fhAV5cq16wcK/f7KWb3aoFbPXCC3o="; + hash = "sha256-YUEla8VvLi0H0Utu0vQNqSbZH8C9BeF8BGWRb2R61P8="; }; - vendorHash = "sha256-vzrp20Mg6AA0h3+5+qbKRa7nhx/hgiIHG6RNXLATpHE="; + vendorHash = "sha256-Si7qZYq23XlWFPp+C5qIJw7n0Zk/Rx+yo643m+gSRcg="; proxyVendor = true; # darwin/linux hash mismatch + frontendYarnOfflineCache = fetchYarnDeps { + yarnLock = src + "/web/ui/yarn.lock"; + hash = "sha256-sUFxuliLupGEJY1xFA2V4W2gwHxtUgst3Vrywh1owAo="; + }; + ldflags = let prefix = "github.com/grafana/agent/pkg/build"; in [ @@ -34,7 +43,10 @@ buildGoModule rec { "-X ${prefix}.BuildDate=1980-01-01T00:00:00Z" ]; + nativeBuildInputs = [ fixup_yarn_lock nodejs yarn ]; + tags = [ + "builtinassets" "nonetwork" "nodocker" "promtail_journal_enabled" @@ -43,8 +55,27 @@ buildGoModule rec { subPackages = [ "cmd/grafana-agent" "cmd/grafana-agentctl" + "web/ui" ]; + preBuild = '' + export HOME="$TMPDIR" + + pushd web/ui + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $frontendYarnOfflineCache + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules + yarn --offline run build + popd + ''; + + # do not pass preBuild to go-modules.drv, as it would otherwise fail to build. + # but even if it would work, it simply isn't needed in that scope. + overrideModAttrs = (_: { + preBuild = null; + }); + # uses go-systemd, which uses libsystemd headers # https://github.com/coreos/go-systemd/issues/351 env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isLinux [ "-I${lib.getDev systemd}/include" ]); diff --git a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 9fa03091c866..980e95f57fb3 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - hash = "sha256-lgCSJgFcrZb4ki4/YdVRgXvVBjQrmEoTPf/KficA3sM="; + hash = "sha256-QFRahjDyL7BNikK2cCsFLfu4/odDbkCxplf6f7yCezE="; }; vendorHash = "sha256-mnrGnQ7clzu2dkAHyCuxfX0sGU5EcHybut6GfpmOSoU="; diff --git a/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix b/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix index 6f7e696c5d6d..2a49eda4530f 100644 --- a/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "net-snmp"; - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { url = "mirror://sourceforge/net-snmp/${pname}-${version}.tar.gz"; - sha256 = "sha256-IJfym34b8/EwC0uuUvojCNC7jV05mNvgL5RipBOi7wo="; + sha256 = "sha256-i03gE5HnTjxwFL60OWGi1tb6A6zDQoC5WF9JMHRbBUQ="; }; patches = diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/unbound-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/unbound-exporter.nix index 3f8206b14edf..a7575e809b3a 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/unbound-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/unbound-exporter.nix @@ -1,36 +1,34 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, nixosTests, Security }: +{ lib +, buildGoModule +, fetchFromGitHub +, nixosTests +}: -rustPlatform.buildRustPackage rec { - pname = "unbound-telemetry"; - version = "unstable-2021-09-18"; +let + version = "0.4.4"; +in +buildGoModule { + pname = "unbound_exporter"; + inherit version; src = fetchFromGitHub { - owner = "svartalf"; - repo = pname; - rev = "19e53b05828a43b7062b67a9cc6c84836ca26439"; - sha256 = "sha256-wkr9T6GlJP/PSv17z3MC7vC0cXg/Z6rGlhlCUHH3Ua4="; + owner = "letsencrypt"; + repo = "unbound_exporter"; + rev = "refs/tags/v${version}"; + hash = "sha256-0eo56z5b+hzKCY5OKg/9F7rjLyoSKPJoHLoXeMjCuFU="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "native-tls-0.2.3" = "sha256-I1+ZNLDVGS1x9Iu81RD2//xnqhKhNGBmlrT0ryNFSlE="; - }; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; + vendorHash = "sha256-4aWuf9UTPQseEwDJfWIcQW4uGMffRnWlHhiu0yMz4vk="; passthru.tests = { inherit (nixosTests.prometheus-exporters) unbound; }; meta = with lib; { + changelog = "https://github.com/letsencrypt/unbound_exporter/releases/tag/v${version}"; description = "Prometheus exporter for Unbound DNS resolver"; - homepage = "https://github.com/svartalf/unbound-telemetry"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + homepage = "https://github.com/letsencrypt/unbound_exporter/tree/main"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; }; } diff --git a/nixpkgs/pkgs/servers/monitoring/unpoller/default.nix b/nixpkgs/pkgs/servers/monitoring/unpoller/default.nix index 021bed53eb87..741142cf8fd7 100644 --- a/nixpkgs/pkgs/servers/monitoring/unpoller/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/unpoller/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "unpoller"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-1LfpMjKf1pLW2loyXWIJEQclYgNnXhSchlOD4JWRCEc="; + hash = "sha256-w0DcU27wrqzWxPwoY/as2vBtJQytz1482tNIXdyvHbY="; }; - vendorHash = "sha256-mRuJ9B4u62VENQmQJTkVZHzNba224ZqewjUjGZBjdz4="; + vendorHash = "sha256-2uvQhEEtsnGPQxYnNND6kM1HeN3kFlHzUXiehM+GpMs="; ldflags = [ "-w" "-s" diff --git a/nixpkgs/pkgs/servers/monitoring/vmagent/default.nix b/nixpkgs/pkgs/servers/monitoring/vmagent/default.nix index a5a473db8a39..95736f726b9f 100644 --- a/nixpkgs/pkgs/servers/monitoring/vmagent/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/vmagent/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "vmagent"; - version = "1.91.3"; + version = "1.93.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - sha256 = "sha256-xW31Lm+WiJ1quMaIDa7tbZuKhILTMdUviIDTRJT1Cqg="; + sha256 = "sha256-NkpMGsNz4knt5QY6B9sPJ3GcXEgPNyNgAsNBs9F2GOQ="; }; ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; diff --git a/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix b/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix index 152332538ff9..48058cf0d211 100644 --- a/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix +++ b/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "mosquitto"; - version = "2.0.15"; + version = "2.0.17"; src = fetchFromGitHub { owner = "eclipse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H2oaTphx5wvwXWDDaf9lLSVfHWmb2rMlxQmyRB4k5eg="; + sha256 = "sha256-hOnZ6oHLvunZL6MrCmR5GkROQNww34QQ3m4gYDaSpb4="; }; patches = lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/servers/nextcloud/packages/25.json b/nixpkgs/pkgs/servers/nextcloud/packages/25.json index 0c4d462b8b87..952fb6d8db83 100644 --- a/nixpkgs/pkgs/servers/nextcloud/packages/25.json +++ b/nixpkgs/pkgs/servers/nextcloud/packages/25.json @@ -3,7 +3,7 @@ "sha256": "1kdpma5f3rb9g29j364lqv6bkar5qgwlvcxmhpmzllwlkmjpc9w8", "url": "https://github.com/nextcloud/bookmarks/releases/download/v12.1.0/bookmarks-12.1.0.tar.gz", "version": "12.1.0", - "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP v7.4+\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", + "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ "agpl" @@ -140,9 +140,9 @@ ] }, "news": { - "sha256": "1z08k8xnyv71zj0djlv339faq9lx23mlqgjanf2jhv6jhh8cy5c6", - "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz", - "version": "22.0.0", + "sha256": "1j9dhqz5anwsmw3f8hbhvqc2h1fp15zmxzdbpnz1p3vwqf8f5cjs", + "url": "https://github.com/nextcloud/news/releases/download/23.0.0/news.tar.gz", + "version": "23.0.0", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -170,9 +170,9 @@ ] }, "onlyoffice": { - "sha256": "10axh9a4w8y3iw95xdjn4q8wjg5459dki42xb6cax5ikimyfv07j", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.8.0/onlyoffice.tar.gz", - "version": "7.8.0", + "sha256": "12hzmngps86ha4lcfwaf62svfz41aywykq0z419r644g5i4v7raq", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.9.0/onlyoffice.tar.gz", + "version": "7.9.0", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ diff --git a/nixpkgs/pkgs/servers/nextcloud/packages/26.json b/nixpkgs/pkgs/servers/nextcloud/packages/26.json index 1a913713dd20..557b6ec045f9 100644 --- a/nixpkgs/pkgs/servers/nextcloud/packages/26.json +++ b/nixpkgs/pkgs/servers/nextcloud/packages/26.json @@ -1,9 +1,9 @@ { "bookmarks": { - "sha256": "0xx331bgly91y8ncxk36ha3ncrr2xlivblfi7rix6ffkrdx73yb9", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.0.1/bookmarks-13.0.1.tar.gz", - "version": "13.0.1", - "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP v7.4+\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", + "sha256": "16j10gj5nghgji36jhng60291wl4h9c3vndjx9j8jij9qn6hz23f", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.0/bookmarks-13.1.0.tar.gz", + "version": "13.1.0", + "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ "agpl" @@ -140,9 +140,9 @@ ] }, "news": { - "sha256": "1z08k8xnyv71zj0djlv339faq9lx23mlqgjanf2jhv6jhh8cy5c6", - "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz", - "version": "22.0.0", + "sha256": "1j9dhqz5anwsmw3f8hbhvqc2h1fp15zmxzdbpnz1p3vwqf8f5cjs", + "url": "https://github.com/nextcloud/news/releases/download/23.0.0/news.tar.gz", + "version": "23.0.0", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -170,9 +170,9 @@ ] }, "onlyoffice": { - "sha256": "10axh9a4w8y3iw95xdjn4q8wjg5459dki42xb6cax5ikimyfv07j", - "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.8.0/onlyoffice.tar.gz", - "version": "7.8.0", + "sha256": "12hzmngps86ha4lcfwaf62svfz41aywykq0z419r644g5i4v7raq", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v7.9.0/onlyoffice.tar.gz", + "version": "7.9.0", "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", "homepage": "https://www.onlyoffice.com", "licenses": [ diff --git a/nixpkgs/pkgs/servers/nextcloud/packages/27.json b/nixpkgs/pkgs/servers/nextcloud/packages/27.json index 27b3b202802c..850b46bf8379 100644 --- a/nixpkgs/pkgs/servers/nextcloud/packages/27.json +++ b/nixpkgs/pkgs/servers/nextcloud/packages/27.json @@ -1,9 +1,9 @@ { "bookmarks": { - "sha256": "0xx331bgly91y8ncxk36ha3ncrr2xlivblfi7rix6ffkrdx73yb9", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.0.1/bookmarks-13.0.1.tar.gz", - "version": "13.0.1", - "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP v7.4+\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", + "sha256": "16j10gj5nghgji36jhng60291wl4h9c3vndjx9j8jij9qn6hz23f", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.0/bookmarks-13.1.0.tar.gz", + "version": "13.1.0", + "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- 🔍 Full-text search\n- 📲 Synchronize with all your browsers and devices\n- 👪 Share bookmarks with other users and publicly\n- ☠ Find broken links\n- ⚛ Generate RSS feeds of your collections\n- 📔 Read archived versions of your links in case they are depublished\n- 💬 Create new bookmarks directly from within Nextcloud Talk\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ "agpl" @@ -140,9 +140,9 @@ ] }, "news": { - "sha256": "1z08k8xnyv71zj0djlv339faq9lx23mlqgjanf2jhv6jhh8cy5c6", - "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz", - "version": "22.0.0", + "sha256": "1j9dhqz5anwsmw3f8hbhvqc2h1fp15zmxzdbpnz1p3vwqf8f5cjs", + "url": "https://github.com/nextcloud/news/releases/download/23.0.0/news.tar.gz", + "version": "23.0.0", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ diff --git a/nixpkgs/pkgs/servers/nextcloud/packages/default.nix b/nixpkgs/pkgs/servers/nextcloud/packages/default.nix index e5874f2d94ac..9c12619968af 100644 --- a/nixpkgs/pkgs/servers/nextcloud/packages/default.nix +++ b/nixpkgs/pkgs/servers/nextcloud/packages/default.nix @@ -9,15 +9,21 @@ let packages = self: generatedJson = { inherit apps; }; + appBaseDefs = builtins.fromJSON (builtins.readFile ./nextcloud-apps.json); in { # Create a derivation from the official Nextcloud apps. # This takes the data generated from the go tool. - mkNextcloudDerivation = self.callPackage ({ }: { data }: + mkNextcloudDerivation = self.callPackage ({ }: { pname, data }: pkgs.fetchNextcloudApp { - inherit (data) url sha256; + appName = pname; + appVersion = data.version; + license = appBaseDefs.${pname}; + inherit (data) url sha256 description homepage; }) {}; - } // lib.mapAttrs (type: pkgs: lib.makeExtensible (_: lib.mapAttrs (pname: data: self.mkNextcloudDerivation { inherit data; }) pkgs)) generatedJson; + } // lib.mapAttrs (type: pkgs: + lib.makeExtensible (_: lib.mapAttrs (pname: data: self.mkNextcloudDerivation { inherit pname; inherit data; }) pkgs)) + generatedJson; in (lib.makeExtensible (_: (lib.makeScope newScope packages))).extend (selfNC: superNC: {}) diff --git a/nixpkgs/pkgs/servers/nextcloud/packages/generate.sh b/nixpkgs/pkgs/servers/nextcloud/packages/generate.sh index ff8957a6a34d..48960ab24dec 100755 --- a/nixpkgs/pkgs/servers/nextcloud/packages/generate.sh +++ b/nixpkgs/pkgs/servers/nextcloud/packages/generate.sh @@ -8,7 +8,7 @@ set -x export NEXTCLOUD_VERSIONS=$(nix-instantiate --eval -E 'import ./nc-versions.nix {}' -A e) -APPS=`cat nextcloud-apps.json | jq -r '.[]' | sed -z 's/\n/,/g;s/,$/\n/'` +APPS=`cat nextcloud-apps.json | jq -r 'keys|.[]' | sed -z 's/\n/,/g;s/,$/\n/'` nc4nix -apps $APPS rm *.log diff --git a/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json index 26b57eba0603..bbbe556f6cbe 100644 --- a/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -1,31 +1,31 @@ -[ - "bookmarks" -, "calendar" -, "contacts" -, "cospend" -, "deck" -, "files_texteditor" -, "files_markdown" -, "forms" -, "groupfolders" -, "impersonate" -, "keeweb" -, "mail" -, "maps" -, "memories" -, "news" -, "notes" -, "notify_push" -, "onlyoffice" -, "polls" -, "previewgenerator" -, "qownnotesapi" -, "registration" -, "spreed" -, "tasks" -, "twofactor_nextcloud_notification" -, "twofactor_totp" -, "twofactor_webauthn" -, "unsplash" -, "user_saml" -] +{ + "bookmarks": "agpl3Plus" +, "calendar": "agpl3Plus" +, "contacts": "agpl3Plus" +, "cospend": "agpl3Plus" +, "deck": "agpl3Plus" +, "files_texteditor": "agpl3Plus" +, "files_markdown": "agpl3Plus" +, "forms": "agpl3Plus" +, "groupfolders": "agpl3Plus" +, "impersonate": "agpl3Plus" +, "keeweb": "agpl3Plus" +, "mail": "agpl3Plus" +, "maps": "agpl3Plus" +, "memories": "agpl3Plus" +, "news": "agpl3Plus" +, "notes": "agpl3Plus" +, "notify_push": "agpl3Plus" +, "onlyoffice": "asl20" +, "polls": "agpl3Plus" +, "previewgenerator": "agpl3Plus" +, "qownnotesapi": "agpl3Plus" +, "registration": "agpl3Plus" +, "spreed": "agpl3Plus" +, "tasks": "agpl3Plus" +, "twofactor_nextcloud_notification": "agpl3Only" +, "twofactor_totp": "agpl3Plus" +, "twofactor_webauthn": "agpl3Plus" +, "unsplash": "agpl3Only" +, "user_saml": "agpl3Plus" +} diff --git a/nixpkgs/pkgs/servers/nfs-ganesha/default.nix b/nixpkgs/pkgs/servers/nfs-ganesha/default.nix index 16e649684df6..440471a86a9e 100644 --- a/nixpkgs/pkgs/servers/nfs-ganesha/default.nix +++ b/nixpkgs/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "5.5"; + version = "5.5.1"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-ebnR/ukbVTwpFNzGf189NmsaDh97ThEGWew5kp50UGg="; + sha256 = "sha256-fbulqSRHPdlpoLH391/axxtjJ7G/9lH9BdqoLKRuIuE="; }; preConfigure = "cd src"; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { "-DSYSSTATEDIR=/var" "-DENABLE_VFS_POSIX_ACL=ON" "-DUSE_ACL_MAPPING=ON" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ]; nativeBuildInputs = [ @@ -42,6 +43,10 @@ stdenv.mkDerivation rec { nfs-utils ]; + postFixup = '' + patchelf --add-rpath $out/lib $out/bin/ganesha.nfsd + ''; + meta = with lib; { description = "NFS server that runs in user space"; homepage = "https://github.com/nfs-ganesha/nfs-ganesha/wiki"; diff --git a/nixpkgs/pkgs/servers/nginx-sso/default.nix b/nixpkgs/pkgs/servers/nginx-sso/default.nix index 3b3dd52be6ef..25b58d88b3c7 100644 --- a/nixpkgs/pkgs/servers/nginx-sso/default.nix +++ b/nixpkgs/pkgs/servers/nginx-sso/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nginx-sso"; - version = "0.26.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "Luzifer"; repo = "nginx-sso"; rev = "v${version}"; - hash = "sha256-vtbomeezW8PMv2lCR6PJqYw+PCFJ3M1SAQPGaIWouXY="; + hash = "sha256-mJwUAMjFUSbJZ8o096o2ntfd7c7dNU+LbgbL/l8aDGc="; }; - vendorHash = "sha256-THTQhUgIfDDTgnR4qZxWFoGQzvqr3xrrz5ZxnV9ipBM="; + vendorHash = "sha256-nyzcFYnUm2xxAdiy16vVyeF57zRI9D+P+/58pP6evDs="; postInstall = '' mkdir -p $out/share diff --git a/nixpkgs/pkgs/servers/nosql/eventstore/default.nix b/nixpkgs/pkgs/servers/nosql/eventstore/default.nix index 8ade5ff4342d..4165a6ff4390 100644 --- a/nixpkgs/pkgs/servers/nosql/eventstore/default.nix +++ b/nixpkgs/pkgs/servers/nosql/eventstore/default.nix @@ -14,13 +14,13 @@ in buildDotnetModule rec { pname = "EventStore"; - version = "22.10.2"; + version = "23.6.0"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "sha256-CYI1VE+6bR3UFx98IquS8rgucKmQqcHh74Jf/9CGE0k="; + sha256 = "sha256-+Wxm6yusaCoqXIbsi0ZoALAviKUyNMQwbzsQtBK/PCo="; leaveDotGit = true; }; diff --git a/nixpkgs/pkgs/servers/nosql/eventstore/deps.nix b/nixpkgs/pkgs/servers/nosql/eventstore/deps.nix index b49ee16e4852..c1bdacfbf074 100644 --- a/nixpkgs/pkgs/servers/nosql/eventstore/deps.nix +++ b/nixpkgs/pkgs/servers/nosql/eventstore/deps.nix @@ -5,30 +5,34 @@ (fetchNuGet { pname = "CompareNETObjects"; version = "4.78.0"; sha256 = "0vs0bxnw7287rh7yigq55750hfdzh04xbcaahawfdl9467vp4dgm"; }) (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; }) (fetchNuGet { pname = "dotnet-retire"; version = "4.0.1"; sha256 = "0zqyivj00mjagzhhkvzckdk5d5ldxhxhv7qk985pis9krfkgzhww"; }) - (fetchNuGet { pname = "Esprima"; version = "2.1.2"; sha256 = "15gvrak3qqm7s943nx7fzpsjjcjygwvwjjjvypw42gjvj8pcywaq"; }) + (fetchNuGet { pname = "Esprima"; version = "3.0.0-rc-01"; sha256 = "068xfs4h34irqab9zbq5s45iycxhbrv2r6fdv47zsxcday9xq617"; }) (fetchNuGet { pname = "EventStore.Client"; version = "21.2.0"; sha256 = "1crnk0nbwcz4l2dv3ia96skmfn274nbyh5j1p0g9rjbzyy7kzf5j"; }) - (fetchNuGet { pname = "EventStore.Plugins"; version = "22.10.1"; sha256 = "018q2awlmvbw4wjphiqfjs0gws7ydxrcipb9v9cfmiw4g8wifan1"; }) + (fetchNuGet { pname = "EventStore.Plugins"; version = "22.10.3"; sha256 = "0irii0xk806bc1pfnyn5dgksy4x9nqj9x2m01h9ddnzkzds2n9bi"; }) (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.0.1"; sha256 = "155d1fmnxlq7p7wk4v74b8v8h36nq0i6bq1vhdjf8sbq7f95fj0f"; }) (fetchNuGet { pname = "GitInfo"; version = "2.0.26"; sha256 = "050l74vkamvbsp8f02b8aknizcknk4fr26dvwvw86mm8iw1dlvrv"; }) - (fetchNuGet { pname = "Google.Protobuf"; version = "3.21.6"; sha256 = "1mjal5h5dn3ncf3cmx0d85qilfj984d5sbr8vs1l1jb14j0r45xz"; }) + (fetchNuGet { pname = "Google.Protobuf"; version = "3.22.0"; sha256 = "1wjxxlqdrjjb0f3py8sbgsivqms8d22m7xk1zx68gfmyih671in7"; }) (fetchNuGet { pname = "gpr"; version = "0.1.122"; sha256 = "0z65n8zqdz0p2ackha572gpdjydhgnfszb46rca44773ak6mfa2b"; }) - (fetchNuGet { pname = "Grpc.AspNetCore"; version = "2.49.0"; sha256 = "04hgp08p59cjwvqhrzmk1fs82yb5pwvg1c208rlpizv7y3fgwp7r"; }) - (fetchNuGet { pname = "Grpc.AspNetCore.Server"; version = "2.49.0"; sha256 = "0j3djf49p345lh2jymmssi3d6lwf60wachx7jxb5r1hpr2z02mls"; }) - (fetchNuGet { pname = "Grpc.AspNetCore.Server.ClientFactory"; version = "2.49.0"; sha256 = "088k52ianb5aigymigaw354m3fpxkk4ayz7mh5pjk5ckmd4ph566"; }) + (fetchNuGet { pname = "Grpc.AspNetCore"; version = "2.52.0"; sha256 = "1apbsqzkns2p0rn31j0q21n3a4lbnp06b4kh2wf44kancvhaj4ch"; }) + (fetchNuGet { pname = "Grpc.AspNetCore.Server"; version = "2.52.0"; sha256 = "0bvi61phh4r48ha0xc8mp0n79n3l0pniik08kvc2cwyq2fk3iiji"; }) + (fetchNuGet { pname = "Grpc.AspNetCore.Server.ClientFactory"; version = "2.52.0"; sha256 = "192bqxg63mn0nc8d8v21xnq3qmchiz90df6liqpbnisdl3avdyhk"; }) (fetchNuGet { pname = "Grpc.Core"; version = "2.46.5"; sha256 = "0s1vyb1cx5id62kwx67qaqx25bykwpqnm2nmwsmcyqpzgyy0zwy2"; }) (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.46.5"; sha256 = "0m0vjr69rfqllvvij6rvv79mbks27rhh7b4wnfvj88v43zvvlnq0"; }) - (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.49.0"; sha256 = "0yq459zkzsxphgpr9ik6qaqv4whd854425ws3qljia94y877nz8a"; }) - (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.49.0"; sha256 = "01wbba3g9gmbvb3h1rqz560q6nkv0wnnm7sbcj76fncwdrr42m6b"; }) - (fetchNuGet { pname = "Grpc.Net.ClientFactory"; version = "2.49.0"; sha256 = "076vi0pmv3gvxjp7vqk6grrnay85zsbvfyzyi3c0h202bhp1yg7h"; }) - (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.49.0"; sha256 = "0fs2pzw0i6r9697x6m2y59dz8hf58i80nfy9pm0690lxmgpsasxc"; }) + (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.52.0"; sha256 = "1mrc8zkcgvklrc0xalky9xxy9dkq5yk92idj1wm5zgdh6pghsa11"; }) + (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.52.0"; sha256 = "0f8m8nmx30bb5wk61i7aqxnwz00rflyc7l8pl9i60mr8ybq5n671"; }) + (fetchNuGet { pname = "Grpc.Net.ClientFactory"; version = "2.52.0"; sha256 = "18zcrbzhg06f6wvm120176zfkz2sy9jal6p9wh2xsapjk52qin27"; }) + (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.52.0"; sha256 = "1dhf98h89xbcpx4v6lmr3gq51br9r8jm38zhrs9dw8l9vy73x1jy"; }) (fetchNuGet { pname = "Grpc.Tools"; version = "2.49.1"; sha256 = "1nsxm73b1bn4jjjpz5q6hvqjm77l9vhl4wi36b1pxwgdbdspy5rm"; }) + (fetchNuGet { pname = "Grpc.Tools"; version = "2.52.0"; sha256 = "1a13rrdryykazhq71q339r0xpsyi8vlj2zprrpriak2yn7zhxiqh"; }) (fetchNuGet { pname = "HdrHistogram"; version = "2.5.0"; sha256 = "1s2np7m3pp17rgambax9a3x5pd2grx74cr325q3xapjz2gd58sj1"; }) (fetchNuGet { pname = "HostStat.NET"; version = "1.0.2"; sha256 = "1khxpp1fy36njjcmikr0xnxk7zv9d3rcnm6f7x2s94agins23hg7"; }) - (fetchNuGet { pname = "Jint"; version = "3.0.0-beta-2038"; sha256 = "0gnp5pqsxd9lr7b4i73mpq5lyq16vzn0pr8rcyvnjjf3fanls8kc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.TestHost"; version = "6.0.9"; sha256 = "1c48772hhz7izsv2ndgiwxxg6b89f1hykbw6d5mhjjd3d3dfa4n2"; }) + (fetchNuGet { pname = "Jint"; version = "3.0.0-beta-2048"; sha256 = "1iyfzpj36b8ybiwrjxwxqz42jgx2wsm8l0dmkiaip8ds0lal71iw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.TestHost"; version = "6.0.16"; sha256 = "1zpiiq9yjwgcwq89j3jj7jdd2ycp15d3pklqdmhfxclv43ssn3hf"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.0"; sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.3.0"; sha256 = "0qpxygiq53v2d2wl6hccnkjf1lhlxjh4q3w5b6d23aq9pw5qj626"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.3.0"; sha256 = "0m9qqn391ayfi1ffkzvhpij790hs96q6dbhzfkj2ahvw6qx47b30"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.3.2"; sha256 = "1f05l2vm8inlwhk36lfbyszjlcnvdd2qw2832npaah0dldn6dz00"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) @@ -39,41 +43,61 @@ (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.1.1"; sha256 = "0244czr3jflvzcj6axq61j10dkl0f16ad34rw81ryg57v4cvlwx6"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.0.3"; sha256 = "0fiwv35628rzkpixpbqcj8ln4c0hnwhr3is8ha38a9pdzlrs6zx8"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.0"; sha256 = "1rszgz0rd5kvib5fscz6ss3pkxyjwqy0xpd4f2ypgzf5z5g5d398"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.0"; sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.1"; sha256 = "0b4bn0cf39c6jlc8xnpi1d8f3pz0qhf8ng440yb95y5jv5q4fdyw"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.0.3"; sha256 = "18l6ys6z7j07vf5pa3g0d018dfgk5vb9hf3393cmmh448rpjq41m"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.0"; sha256 = "1f7h52kamljglx5k08ccryilvk6d6cvr9c26lcb6b2c091znzk0q"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.1.1"; sha256 = "0n91s6cjfv8plf5swhr307s849jmq2pa3i1rbpb0cb0grxml0mqm"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.0.3"; sha256 = "0zy90kvlvxinwqz38cwj1jmp06a8gar1crdbycjk5wy8d6w5m0br"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.0"; sha256 = "13jj7jxihiswmhmql7r5jydbca4x5qj6h7zq10z17gagys6dc7pw"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "3.1.0"; sha256 = "1bkcrsmm37i7dcg4arffwqmd90vfhaxhrc6vh8mjwwp41q09ghna"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "6.0.0"; sha256 = "1c6l5szma1pdn61ncq1kaqibg0dz65hbma2xl626a8d1m6awn353"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.0.3"; sha256 = "0nd36n0zfqv5l4w4jlbs2smaw0x7lw49aw1wgk3wsyv69s74p3gj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.1.0"; sha256 = "1xc61dy07bn2q73mx1z3ylrw80xpa682qjby13gklnqq636a3gab"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.0"; sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.1"; sha256 = "0rn0925aqm1fsbaf0n8jy6ng2fm1cy97lp7yikvx31m6178k9i84"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.0.3"; sha256 = "1hyilp5gr19xz7zcyar6h8jpfksqbn5s9kz0qrfqwvqhq2p7sm5g"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.0"; sha256 = "1pvms778xkyv1a3gfwrxnh8ja769cxi416n7pcidn9wvg15ifvbh"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.0.0"; sha256 = "1cm0hycgb33mf1ja9q91wxi3gk13d1p462gdq7gndrya23hw2jm5"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.1.0"; sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Composite"; version = "6.0.0"; sha256 = "1yn0cnclbm3lv12fmf6z0mxqsyjk8s8r952fcw4fdv54mvqbfgkl"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Embedded"; version = "6.0.9"; sha256 = "0pni3y0drcjfr3cgpw8iiac589rsh6z5c2h2xnzy3yvk5lx5pl0d"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.1.0"; sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; }) (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "3.0.3"; sha256 = "0glfid82amr4mxjqpq2ar6vhq6wv88sp463yvhg4pravkcrd0611"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.1.1"; sha256 = "12pag6rf01xfa8x1h30mf4czfhlhg2kgi5q712jicy3h12c02w8y"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "3.0.3"; sha256 = "0kyh6bk9iywbdvn29zm1770fwmag58y7c8rfpx886anxs6p9rh61"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "3.1.0"; sha256 = "1d3yhqj1rav7vswm747j7w8fh8paybji4rz941hhlq4b12mfqfh4"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.1"; sha256 = "1sgpwj0sa0ac7m5fnkb482mnch8fsv8hfbvk53c6lyh47s1xhdjg"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.0.3"; sha256 = "1wj871vl1azasbn2lrzzycvzkk72rvaxywnj193xwv11420b0mjh"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.0"; sha256 = "1zyalrcksszmn9r5xjnirfh7847axncgzxkk3k5srbvlcch8fw8g"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "3.1.0"; sha256 = "00bx95j2j0lkrr1znm53qicigvrj4sbc7snh27nqwsp4vkjnpz5h"; }) (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "5.0.10"; sha256 = "07fk669pjydkcg6bxxv7aj548fzab4yb7ba8370d719lgi9y425l"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.1.1"; sha256 = "0wgpsi874gzzjj099xbdmmsifslkbdjkxd5xrzpc5xdglpkw08vl"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.0.3"; sha256 = "0lq433x3z3dhf4w10vrxnqami6xsr6mwasla3qhmfx7yfybgz7y0"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "3.1.0"; sha256 = "13bhi1q4s79k4qb19m4p94364543jr3a1f8kacjvdhigpmqa732r"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.1.0"; sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.1.1"; sha256 = "033rkqdffybq5prhc7nn6v68zij393n00s5a82yf2n86whwvdfwx"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.0.3"; sha256 = "08zlr6kl92znj9v2cs1wsjw6s98nxbkwnxk8pccbv0b4c7xhb3pf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.0"; sha256 = "1w1y22njywwysi8qjnj4m83qhbq0jr4mmjib0hfawz6cwamh7xrb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) (fetchNuGet { pname = "Microsoft.FASTER.Core"; version = "1.9.5"; sha256 = "1vp2644301bsdad0sd20pjqa8lbf1vc8yvd9rkl986h56hgwczsj"; }) (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.8"; sha256 = "1s0n68z6v5mbys4jjrd4jdxrrz81iq4dzmmbmxzmlf59769x8rj9"; }) @@ -102,7 +126,13 @@ (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) (fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.2.1"; sha256 = "0gildh4xcb6gkxcrrgh5a1j7lq0a7l670jpbs71akl5b5bgy5gc3"; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.4.0-rc.1"; sha256 = "17cbj0dx6fxk169rs0ds6cph75z9r1i90xgjdapx1zmx1kwcdn00"; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.4.0-rc.1"; sha256 = "09pc8vbhgjq5bibvjw39gjdb99x3nclsggzp509qfcxv8gizcs21"; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.4.0-rc.1"; sha256 = "129qk929f21akx87g66f8h1ckj2lj2ij5by5ma7bdm19jpk2yhdx"; }) + (fetchNuGet { pname = "OpenTelemetry.Extensions.DependencyInjection"; version = "1.4.0-rc.1"; sha256 = "19sraav8y53yi1pf8dsjd2n5cnffqd876rjxmlkkbi550qdr9l0v"; }) + (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.4.0-rc.1"; sha256 = "0h781wdirsqz1hxwmag6dzzng3kpk7nqrmfg0j04z3q23zi9rp9h"; }) (fetchNuGet { pname = "protobuf-net"; version = "2.4.0"; sha256 = "106lxm9afga7ihlknyy7mlfplyq40mrndksqrsn8ia2a47fbqqld"; }) + (fetchNuGet { pname = "Quickenshtein"; version = "1.5.1"; sha256 = "0mhnywivqxlpznr2fk7jp8g0bshsbq0yyyggcn51blkaabf18grl"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -162,6 +192,7 @@ (fetchNuGet { pname = "Serilog.Sinks.Async"; version = "1.5.0"; sha256 = "0bcb3n6lmg5wfj806mziybfmbb8gyiszrivs3swf0msy8w505gyg"; }) (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.1.0"; sha256 = "1rpkphmqfh3bv3m7v1zwz88wz4sirj4xqyff9ga0c6bqhblj6wii"; }) (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) + (fetchNuGet { pname = "Serilog.Sinks.InMemory"; version = "0.11.0"; sha256 = "0kmnj3wx1hwxvgp06avn2zw1mzsfjamrgpaav44ir40100g4hdkd"; }) (fetchNuGet { pname = "Serilog.Sinks.TextWriter"; version = "2.1.0"; sha256 = "0p13m8spj6psybwdw21gjaxw854va8n6m2rbdy0w78q135br1kcd"; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.2"; sha256 = "07rc4pj3rphi8nhzkcvilnm0fv27qcdp68jdwk4g0zjk7yfvbcay"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.2"; sha256 = "19hxv895lairrjmk4gkzd3mcb6b0na45xn4n551h4kckplqadg3d"; }) @@ -170,20 +201,23 @@ (fetchNuGet { pname = "Superpower"; version = "2.3.0"; sha256 = "0bdsc3c0d6jb0wr67siqfba0ldl0jxbwis6xr0whzqzf6m2cyahm"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "6.0.0"; sha256 = "16zfx5mivkkykp76krw8x68izmjf79ldfmn26k9x3m55lmp9i77c"; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.0"; sha256 = "1jxhvsh5mzdf0sgb4dfmbys1b12ylyr5pcfyj1map354fiq3qsgm"; }) (fetchNuGet { pname = "System.Diagnostics.PerformanceCounter"; version = "6.0.1"; sha256 = "17p5vwbgrycsrvv9a9ksxbiziy75x4s25dw71fnbw1ci5kpp8yz7"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "7.0.0"; sha256 = "1a14kgpqz4k7jhi7bs2gpgf67ym5wpj99203zxgwjypj7x47xhbq"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) @@ -200,10 +234,13 @@ (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { pname = "System.Private.ServiceModel"; version = "4.10.0"; sha256 = "0048hmv4j4wfpa9hwn8d5l3ag3hwmhp5r26iarfbsxj0q3i2d1a8"; }) @@ -218,6 +255,7 @@ (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) @@ -226,6 +264,7 @@ (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) @@ -243,11 +282,11 @@ (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; sha256 = "0wswhbvm3gh06azg9k1zfvmhicpzlh7v71qzd4x5zwizq4khv7iq"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "7.0.2"; sha256 = "0px6snb8gdb6mpwsqrhlpbkmjgd63h4yamqm2gvyf9rwibymjbm9"; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.1"; sha256 = "15d0np1njvy2ywf0qzdqyjk5sjs4zbfxg917jrvlbfwrqpqxb5dj"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "7.0.1"; sha256 = "0p6kx6ag0il7rxxcvm84w141phvr7fafjzxybf920bxwa0jkwzq8"; }) (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) @@ -256,6 +295,7 @@ (fetchNuGet { pname = "System.ServiceModel.Primitives"; version = "4.5.3"; sha256 = "1v90pci049cn44y0km885k1vrilhb34w6q2zva4y6f3ay84klrih"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) @@ -267,6 +307,7 @@ (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) diff --git a/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix b/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix index 01fa9a38be8d..7a6fa51dea75 100644 --- a/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix +++ b/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.93.0"; + version = "1.93.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-NkpMGsNz4knt5QY6B9sPJ3GcXEgPNyNgAsNBs9F2GOQ="; + hash = "sha256-52OY4sZ2UI+p6+QYkRW8Ov9SbLPKmvgvgV7rhfo0tAY="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/servers/ombi/default.nix b/nixpkgs/pkgs/servers/ombi/default.nix index 1f648f095bde..d1a74eb4d136 100644 --- a/nixpkgs/pkgs/servers/ombi/default.nix +++ b/nixpkgs/pkgs/servers/ombi/default.nix @@ -10,14 +10,14 @@ let "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-3gvR82JiWvw+jkF68Xm/UH7OsOPqmDlVwYDaNbNf7Jg="; - arm64-linux_hash = "sha256-4ckLs7vwTffB205Pa9BOkw+6PbVOb8tVp8S2D+Ic8fM="; - x64-osx_hash = "sha256-by2+rf/pODD7RuxTEeyh1pJ+kGYVmwlVSwxDPgeNzW4="; + x64-linux_hash = "sha256-4343S9fxNmoZhbfq/ZAfI2wF7ZwIw7IyyyZUsga48Zo="; + arm64-linux_hash = "sha256-XnR/uT73luKSpYr6ieZyu0mjOy23XGs5UVDke0IU9PQ="; + x64-osx_hash = "sha256-4EoMZm++T4K2zwPw8G4J44RV/HcssAdzmKjQFqBXbwY="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "ombi"; - version = "4.39.1"; + version = "4.43.5"; sourceRoot = "."; diff --git a/nixpkgs/pkgs/servers/onlyoffice-documentserver/default.nix b/nixpkgs/pkgs/servers/onlyoffice-documentserver/default.nix index cc2224ed95f8..2b5b34eb3de9 100644 --- a/nixpkgs/pkgs/servers/onlyoffice-documentserver/default.nix +++ b/nixpkgs/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.0"; + version = "7.4.1"; 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-FL09EXxQlUZuJMMHYu9tSOH8ARPgzoqAKmQYV6225PU="; + sha256 = "sha256-60S8M1Y9BxuMxXGxEaxW82Va5lSnZZPfQnPq2ivTXdU="; }; preferLocalBuild = true; diff --git a/nixpkgs/pkgs/servers/oxigraph/default.nix b/nixpkgs/pkgs/servers/oxigraph/default.nix index b21c39165bbc..0246d3f5b071 100644 --- a/nixpkgs/pkgs/servers/oxigraph/default.nix +++ b/nixpkgs/pkgs/servers/oxigraph/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "oxigraph"; - version = "0.3.18"; + version = "0.3.19"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-0sAQ/jOnYO0P1EX+DY7rDJyzOkdAaO7hGQDFTgNJyQs="; + sha256 = "sha256-lVPRg9zU3VOTrxr2pTHzfvaGjoP/h88W4JmQhOKshRc="; fetchSubmodules = true; }; - cargoHash = "sha256-bRSv77fq+3f4X+NB75qtjXRHo50H61ytoRPTEjKp6W0="; + cargoHash = "sha256-+wh6qHXW9KXXOkMIkRr+tI3ViBrHpE2G+96mhXFJDtI="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/nixpkgs/pkgs/servers/radarr/default.nix b/nixpkgs/pkgs/servers/radarr/default.nix index 17e216a74b5c..2338ef950842 100644 --- a/nixpkgs/pkgs/servers/radarr/default.nix +++ b/nixpkgs/pkgs/servers/radarr/default.nix @@ -6,17 +6,19 @@ let x86_64-linux = "x64"; aarch64-linux = "arm64"; x86_64-darwin = "x64"; + aarch64-darwin = "arm64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-EDaccNDSKAkGGT4wSgPUp373M9WXwB5U6KpJS5GO24Y="; - arm64-linux_hash = "sha256-xUhWdmQ5RMXxrYge3Qz3XEC6wa2d660hgirS39E62fk="; - x64-osx_hash = "sha256-UdJd7xrL9aoIziaN4db4orEs48udXTqqongxsCt5L1Y="; + x64-linux_hash = "sha256-Y08mLq/lpWqwcffPczL+ntS7CWLmOgz9irfbhIKbL5A="; + arm64-linux_hash = "sha256-gswwyq9ZIObwrcs6PABhcN4saF8VDQHLpP2trAnVSck="; + x64-osx_hash = "sha256-MxlUQLXiCg02AMTYsAWrM4l3IfgCRIPoU0cgwT8S98g="; + arm64-osx_hash = "sha256-mZqP5hCJqSBY7BDooa+FGi6cdEey9DqVMV8fhp9/2IM="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "4.6.4.7568"; + version = "4.7.5.7809"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; @@ -50,6 +52,6 @@ in stdenv.mkDerivation rec { changelog = "https://github.com/Radarr/Radarr/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ edwtjo purcell ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/nixpkgs/pkgs/servers/radarr/update.sh b/nixpkgs/pkgs/servers/radarr/update.sh index ce64b6df429b..6b94d66959b6 100755 --- a/nixpkgs/pkgs/servers/radarr/update.sh +++ b/nixpkgs/pkgs/servers/radarr/update.sh @@ -40,3 +40,4 @@ updateVersion $latestVersion updateHash $latestVersion x64 linux updateHash $latestVersion arm64 linux updateHash $latestVersion x64 osx +updateHash $latestVersion arm64 osx diff --git a/nixpkgs/pkgs/servers/radicale/3.x.nix b/nixpkgs/pkgs/servers/radicale/3.x.nix index 1827c30be984..3df1ae7c4d1d 100644 --- a/nixpkgs/pkgs/servers/radicale/3.x.nix +++ b/nixpkgs/pkgs/servers/radicale/3.x.nix @@ -1,4 +1,9 @@ -{ lib, python3, fetchFromGitHub, nixosTests }: +{ lib +, python3 +, fetchFromGitHub +, fetchpatch +, nixosTests +}: python3.pkgs.buildPythonApplication rec { pname = "radicale"; @@ -11,6 +16,15 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-V0nqgxGUxcTRAYFuxpKUEVB/g/Mbvw+9OIcvAexXwuM="; }; + patches = [ + # https://github.com/Kozea/Radicale/pull/1328 + (fetchpatch { + name = "fix-python3.11-tests.patch"; + url = "https://github.com/Kozea/Radicale/commit/110ec3a7885f523ce894a8c0e336c1a081dcd092.patch"; + hash = "sha256-WEiwzJ+Vzv8PXmZUi1X7Qzs+oE6qgmpvHqm/xiOMrt0="; + }) + ]; + postPatch = '' sed -i '/addopts/d' setup.cfg ''; @@ -23,6 +37,8 @@ python3.pkgs.buildPythonApplication rec { pytz # https://github.com/Kozea/Radicale/issues/816 ] ++ passlib.optional-dependencies.bcrypt; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook waitress diff --git a/nixpkgs/pkgs/servers/readarr/default.nix b/nixpkgs/pkgs/servers/readarr/default.nix index 3703618d29a4..609d0cacddf2 100644 --- a/nixpkgs/pkgs/servers/readarr/default.nix +++ b/nixpkgs/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-46BfIsJEgtZMKQdiCqSFdM2whaYRwRLycv0pmY2InDk="; - arm64-linux_hash = "sha256-zTDqbQz966RYV3FSBxmtN9JMe0j0AA21GCz4f0+NnHw="; - x64-osx_hash = "sha256-EKy8vOvCHCcC5PheIdKyr5tWZ18Q+XeKh3mCrqcG7oA="; + x64-linux_hash = "sha256-0q+MHdNRzq7gmv5jiArU1q+1UBWNZx0JRgiIy2pnIAc="; + arm64-linux_hash = "sha256-NtbzzbWfEE1thyGOuJhTYXPxhTpw9lqXcvvlfmvCMqM="; + x64-osx_hash = "sha256-oz2Sbvr8fky0mpBUXRKYki3UL0ewA/a2hEtPISBV8Ko="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.2.4.1999"; + version = "0.3.3.2171"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/nixpkgs/pkgs/servers/rustypaste/default.nix b/nixpkgs/pkgs/servers/rustypaste/default.nix index bae1b5232c7d..b1777fa0c5c1 100644 --- a/nixpkgs/pkgs/servers/rustypaste/default.nix +++ b/nixpkgs/pkgs/servers/rustypaste/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AdcoyBtPgTK94VDBsCGozPU5enqCquY7r5IuEm3oW/g="; + sha256 = "sha256-dyj5Zg49APsRLaOOCvyZ7X8qNLgzRcBZBCS5IR0dDCs="; }; - cargoHash = "sha256-VJjXwvMDSnDedcxJTjg6tVjPUxjRGTSOnx2nXgXCdzI="; + cargoHash = "sha256-yw1ldacFxTKV1/A2XxZAZ2DpC0gJFjeGz5Yduw3RZEU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/nixpkgs/pkgs/servers/samba/4.x.nix b/nixpkgs/pkgs/servers/samba/4.x.nix index 9a5ebd9f63ec..ed8744ef3c62 100644 --- a/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/nixpkgs/pkgs/servers/samba/4.x.nix @@ -51,11 +51,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.18.5"; + version = "4.18.6"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - hash = "sha256-CVJWrDMuHZ+/m3/3gj+SoyM9PtZYzn/JszkFwiQ/RH8="; + hash = "sha256-KEyKmUzpich81oCMOQ/LnQDDayGg3BqKdUdLZ8nnFec="; }; outputs = [ "out" "dev" "man" ]; diff --git a/nixpkgs/pkgs/servers/seafile-server/default.nix b/nixpkgs/pkgs/servers/seafile-server/default.nix index af3e8c4ea8c2..e1c9d0b0858e 100644 --- a/nixpkgs/pkgs/servers/seafile-server/default.nix +++ b/nixpkgs/pkgs/servers/seafile-server/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { pname = "seafile-server"; - version = "9.0.6"; + version = "9.0.10"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-server"; - rev = "881c270aa8d99ca6648e7aa1458fc283f38e6f31"; # using a fixed revision because upstream may re-tag releases :/ - sha256 = "sha256-M1jIysirtl1KKyEvScOIshLvSa5vjxTdFEARgy8bLTc="; + rev = "079a8b65a543bfbc48e7671c3dbbffe19fd02944"; # using a fixed revision because upstream may re-tag releases :/ + sha256 = "sha256-F1n4E6ajpri3CVM7B28UKoTV1oOLr5nTy6Lw0E5tCrc="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix b/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix index 8c2ff568df31..c23b5ad7a2bd 100644 --- a/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix +++ b/nixpkgs/pkgs/servers/search/elasticsearch/plugins.nix @@ -21,7 +21,7 @@ let dontUnpack = true; # Work around the "unpacker appears to have produced no directories" # case that happens when the archive doesn't have a subdirectory. - setSourceRoot = "sourceRoot=$(pwd)"; + sourceRoot = "."; nativeBuildInputs = [ unzip ]; meta = a.meta // { platforms = elasticsearch.meta.platforms; diff --git a/nixpkgs/pkgs/servers/search/typesense/sources.json b/nixpkgs/pkgs/servers/search/typesense/sources.json index a4f44552504f..0ecf202f670e 100644 --- a/nixpkgs/pkgs/servers/search/typesense/sources.json +++ b/nixpkgs/pkgs/servers/search/typesense/sources.json @@ -1,17 +1,17 @@ { - "version": "0.24.1", + "version": "0.25.0", "platforms": { "aarch64-linux": { "arch": "linux-arm64", - "hash": "sha256-TI/bjGqyEZpGDq1F9MBaDypm5XDTlsw9OGd3lIn7JCI=" + "hash": "sha256-R1ayDJah8EMZVVw5fQpHNXMUMwtOJWEPtx4qz5KbniM=" }, "x86_64-linux": { "arch": "linux-amd64", - "hash": "sha256-bmvje439QYivV96fjnEXblYJnSk8C916OwVeK2n/QR8=" + "hash": "sha256-/EDDYaGP43LuOq90Vx8z/fmp4ougyuiTP1L5DmQPZ0Q=" }, "x86_64-darwin": { "arch": "darwin-amd64", - "hash": "sha256-24odPFqHWQoGXXXDLxvMDjCRu81Y+I5QOdK/KLdeH5o=" + "hash": "sha256-M2yUAto7KlNY8zswSXqVwH120QV8OrGljobbZkjUSoQ=" } } } diff --git a/nixpkgs/pkgs/servers/search/weaviate/default.nix b/nixpkgs/pkgs/servers/search/weaviate/default.nix index 5be04938caff..d195d6511a42 100644 --- a/nixpkgs/pkgs/servers/search/weaviate/default.nix +++ b/nixpkgs/pkgs/servers/search/weaviate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.20.5"; + version = "1.21.1"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-aQY1kwMdZ8aDj3YSK3g88coHqTSIZDxDJJdZSwPhDSU="; + hash = "sha256-rWoVuWzfRJhhYDwOBcmSIJXh0WwvZFYM2GPOMvP98xM="; }; - vendorHash = "sha256-RL18glau8IODHy0HqLq28nE7OIUezWDJY7BE/OBFHBw="; + vendorHash = "sha256-HUfkwmAIwTPDZsgRLte7tu/0QKT82WriTqJ14iiKKOs="; subPackages = [ "cmd/weaviate-server" ]; diff --git a/nixpkgs/pkgs/servers/ser2net/default.nix b/nixpkgs/pkgs/servers/ser2net/default.nix index ded2662daa27..f7d1fd77b04b 100644 --- a/nixpkgs/pkgs/servers/ser2net/default.nix +++ b/nixpkgs/pkgs/servers/ser2net/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - hash = "sha256-g+im3WH8ddE4jxKKbb/klkqlmPegKRv1r10HjFIHnQw="; + hash = "sha256-AmTJfjLpnPHtPMKP9djKTZozNPkojPqRJ3eoypY53bA="; }; passthru = { diff --git a/nixpkgs/pkgs/servers/sip/freeswitch/default.nix b/nixpkgs/pkgs/servers/sip/freeswitch/default.nix index d8a6882671e6..499bef7e2375 100644 --- a/nixpkgs/pkgs/servers/sip/freeswitch/default.nix +++ b/nixpkgs/pkgs/servers/sip/freeswitch/default.nix @@ -88,12 +88,12 @@ in stdenv.mkDerivation rec { pname = "freeswitch"; - version = "1.10.9"; + version = "1.10.10"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "sha256-65DH2HxiF8wqzmzbIqaQZjSa/JPERHIS2FW6F18c6Pw="; + sha256 = "sha256-3Mm/hbMwnlwbtiOFlODtKItVyj34O3beZDlV8YoJmts="; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_1.nix b/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_1.nix index 40a00313639b..f5de11c7cc11 100644 --- a/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_1.nix +++ b/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_1.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./. (args // { - version = "3.1.13"; - sha256 = "0xb8fiissblxb319y5ifqqp86zblwis789ipb753pcb4zpnsaw82"; + version = "3.1.21"; + hash = "sha256-PovyQvomT8+vGWS39/QjLauiGkSiuqKQpTrSXdyVyow="; }) diff --git a/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_2.nix b/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_2.nix index 1e9884eb7333..d9ef5d8966fe 100644 --- a/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_2.nix +++ b/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_2.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./. (args // { - version = "3.2.5"; - sha256 = "0w0fimdiiqrrm012iflz8l4rnafryq7y0qqijzxn7nwzxhm9jsr9"; + version = "3.2.7"; + hash = "sha256-nXGWJI5ml8Ccc+Fz/psoIEX1XsnXrnQ8HrrQi56lbdo="; }) diff --git a/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_3.nix b/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_3.nix new file mode 100644 index 000000000000..ec70d9998283 --- /dev/null +++ b/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_3.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./. (args // { + version = "3.3.5"; + hash = "sha256-ynLrJvbbK++nfkj/lm9xvNPLRLM72Lu4ELZebQEcHlw="; +}) diff --git a/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix index dbf8e36e9e7d..7a175620c7cb 100644 --- a/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -1,18 +1,21 @@ { lib, stdenv, fetchurl, cmake -, curl, openssl, zlib +, curl, openssl, zlib, zstd , libiconv -, version, sha256, ... +, version, hash, ... }: with lib; -stdenv.mkDerivation { +let + isVer33 = versionAtLeast version "3.3"; + +in stdenv.mkDerivation { pname = "mariadb-connector-c"; inherit version; src = fetchurl { url = "https://downloads.mariadb.com/Connectors/c/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz"; - inherit sha256; + inherit hash; }; outputs = [ "out" "dev" ]; @@ -26,8 +29,11 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace mariadb_config/mariadb_config.c.in \ - --replace '-I%s/@INSTALL_INCLUDEDIR@' "-I$dev/include" \ - --replace '-L%s/@INSTALL_LIBDIR@' "-L$out/lib/mariadb" + --replace '#define INCLUDE "-I%s/@INSTALL_INCLUDEDIR@ -I%s/@INSTALL_INCLUDEDIR@/mysql"' "#define INCLUDE \"-I$dev/include -I$dev/include/mysql\"" \ + --replace '#define LIBS "-L%s/@INSTALL_LIBDIR@/ -lmariadb"' "#define LIBS \"-L$out/lib/mariadb -lmariadb\"" \ + --replace '#define PKG_LIBDIR "%s/@INSTALL_LIBDIR@"' "#define PKG_LIBDIR \"$out/lib/mariadb\"" \ + --replace '#define PLUGIN_DIR "%s/@INSTALL_PLUGINDIR@"' "#define PLUGIN_DIR \"$out/lib/mariadb/plugin\"" \ + --replace '#define PKG_PLUGINDIR "%s/@INSTALL_PLUGINDIR@"' "#define PKG_PLUGINDIR \"$out/lib/mariadb/plugin\"" '' + lib.optionalString stdenv.hostPlatform.isStatic '' # Disables all dynamic plugins substituteInPlace cmake/plugins.cmake \ @@ -43,7 +49,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ curl openssl zlib ]; + propagatedBuildInputs = [ curl openssl zlib ] ++ optional isVer33 zstd; buildInputs = [ libiconv ]; postInstall = '' diff --git a/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/default.nix index 63775138de2a..fae12db390f2 100644 --- a/nixpkgs/pkgs/servers/sql/mariadb/default.nix +++ b/nixpkgs/pkgs/servers/sql/mariadb/default.nix @@ -246,43 +246,43 @@ in # see https://mariadb.org/about/#maintenance-policy for EOLs mariadb_104 = self.callPackage generic { # Supported until 2024-06-18 - version = "10.4.30"; - hash = "sha256-/LvaZxxseEwDFQJiYj8NgYlMkRUz58PCdvJW8voSEAw="; + version = "10.4.31"; + hash = "sha256-Uqv1Q0xqQuCgSKY6uZo4mPt/yhWA+t16Yb0OnOm4UFQ="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_105 = self.callPackage generic { # Supported until 2025-06-24 - version = "10.5.21"; - hash = "sha256-yn63Mo4cAunZCxPfNpW3+ni9c92ZykniPjLWzImCIkI="; + version = "10.5.22"; + hash = "sha256-PiOGu17iWo3c0hz/xIx2CX5cpBpuSgmPay7kASsNY44="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_106 = self.callPackage generic { # Supported until 2026-07-06 - version = "10.6.14"; - hash = "sha256-RQQ3x0qORMdrPAs0O5NH65AyAVRYUVZdeNmmJGdqsgI="; + version = "10.6.15"; + hash = "sha256-sva9uhfq1NkcTSVPr8NKcorGsCfdHXF4vCZ1jc5pQzU="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_1010 = self.callPackage generic { # Supported until 2023-11-17. TODO: remove ahead of 23.11 branchoff - version = "10.10.5"; - hash = "sha256-kc1NQm04rwmFLr2vAOdCEXdexsyQf3TBruDUXN9dmWs="; + version = "10.10.6"; + hash = "sha256-4eUwEZedKfDsJuE6uMr2E0gb8ClSBWb7loF1RhA5ONU="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_1011 = self.callPackage generic { # Supported until 2028-02-16 - version = "10.11.4"; - hash = "sha256-zo2sElVozF9A2nTBchJ2fJLY+u2BBmWAtSakhaWREn0="; + version = "10.11.5"; + hash = "sha256-TJSEBI1NDHHdB2qzP8KpzoUQvfdiiG3g1j/lJJbz27s="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_110 = self.callPackage generic { # Supported until 2024-06-07 - version = "11.0.2"; - hash = "sha256-PHFXbK0OpBaIInDjg/lMyJaTt/vM4fpPMG/j6THkZK4="; + version = "11.0.3"; + hash = "sha256-Up8IoGTudzOhNuxHSkI56Kyb1tsTm4unC/+KfxMDg5o="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; diff --git a/nixpkgs/pkgs/servers/sql/monetdb/default.nix b/nixpkgs/pkgs/servers/sql/monetdb/default.nix index 7df1d03eef97..09c9bfaa3c44 100644 --- a/nixpkgs/pkgs/servers/sql/monetdb/default.nix +++ b/nixpkgs/pkgs/servers/sql/monetdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "monetdb"; - version = "11.47.3"; + version = "11.47.5"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2"; - hash = "sha256-0vhcPh4ZXCAKpgiSZstu6vBQv7VwOYc6qoz8dPkugNE="; + hash = "sha256-GuGGs3hAheNYsaiUG7femLhi38c4gB528bruRotOdNE="; }; nativeBuildInputs = [ bison cmake python3 ]; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix index 64a18d42ce36..d709f822fb0a 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.4.4"; + version = "0.5.0"; src = fetchFromGitHub { owner = "pgvector"; repo = "pgvector"; rev = "v${version}"; - hash = "sha256-D2jB0rks4zmWtGB7SCXG5XW0PCun8OPawp3W/VGRQn0="; + hash = "sha256-7GRqGgU15VQAY0wvZqfPU9og7s+/0NlOpTMclXPVwlQ="; }; buildInputs = [ postgresql ]; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix index 79dd4c1bdd21..61e7ee9fc965 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -8,6 +8,7 @@ , flex , curl , json_c +, libxcrypt }: stdenv.mkDerivation rec { @@ -23,7 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex ]; - buildInputs = [ postgresql openssl zlib readline curl json_c ]; + buildInputs = [ postgresql openssl zlib readline curl json_c ] + ++ lib.optionals (stdenv.isLinux && lib.versionOlder postgresql.version "13") [ libxcrypt ]; installPhase = '' mkdir -p $out/{bin,lib,share/postgresql/extension} diff --git a/nixpkgs/pkgs/servers/tautulli/default.nix b/nixpkgs/pkgs/servers/tautulli/default.nix index 10f92e38a041..3872b7783529 100644 --- a/nixpkgs/pkgs/servers/tautulli/default.nix +++ b/nixpkgs/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.12.5"; + version = "2.13.1"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ruCTmLmAsDzrNUZAeu0NjgPZRG1ZEOFUdprMvO6ZWbc="; + sha256 = "sha256-+uVBvtwMJRqPWJKQ0Tn9wLiuR02Btsbxd9+rl9tAlgg="; }; installPhase = '' diff --git a/nixpkgs/pkgs/servers/tidb/default.nix b/nixpkgs/pkgs/servers/tidb/default.nix index e27f22ce6741..f5600579a0ef 100644 --- a/nixpkgs/pkgs/servers/tidb/default.nix +++ b/nixpkgs/pkgs/servers/tidb/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tidb"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "pingcap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7iz82H3H22GCLvy8VD+t1BkEEoNQ0+6ZLBOUwWTlNfI="; + sha256 = "sha256-zpAduymFC17iL9eEssFoHxK+J4EP1QyamchfLetFN/k="; }; - vendorHash = "sha256-9vgxdX8CPUbyJZNSkwTZK02ORIXACjad/yPef8zB7FU="; + vendorHash = "sha256-GbAZK2TQKc3bziZm202Q2QLLK0TDJ/AplSGKBSLSoqQ="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/servers/tracing/tempo/default.nix b/nixpkgs/pkgs/servers/tracing/tempo/default.nix index eb35a2ccb2dd..9046fb9a96f8 100644 --- a/nixpkgs/pkgs/servers/tracing/tempo/default.nix +++ b/nixpkgs/pkgs/servers/tracing/tempo/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tempo"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-+qBfscfAtVr8SEqAkpjkJfWfGfEImvO7BQfKvpVvf/0="; + hash = "sha256-ols6cYKd1FVRG/fbq+oXst18eCQ3+V2032m03t3DvEc="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/servers/traefik/default.nix b/nixpkgs/pkgs/servers/traefik/default.nix index 176be440bb82..ff6103c94d4c 100644 --- a/nixpkgs/pkgs/servers/traefik/default.nix +++ b/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.10.3"; + version = "2.10.4"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-0Mg+jBuj12GlNdKoyUcB1YDv2oGl9OARKdTzQ+WIWfw="; + sha256 = "sha256-rpXSK/6ssUxzYbR1Nf0Cw7Sk6GnhExO4z8OZGQWITZM="; stripRoot = false; }; - vendorHash = "sha256-sCylkXFg3cGm2ksN9TYV6hxdDqwlxfhZLQtjbZq7LBQ="; + vendorHash = "sha256-CsLn8YqQozO+H66ss59Jh+fmDLVx/CzpFY09x2SoI2k="; subPackages = [ "cmd/traefik" ]; diff --git a/nixpkgs/pkgs/servers/unstructured-api/default.nix b/nixpkgs/pkgs/servers/unstructured-api/default.nix new file mode 100644 index 000000000000..521ff17e573f --- /dev/null +++ b/nixpkgs/pkgs/servers/unstructured-api/default.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + python3, + makeWrapper, + nix-update-script, + symlinkJoin, + nltk-data, +}: +let + pythonEnv = python3.withPackages (packages: with packages; [ + unstructured-api-tools + unstructured + pydantic + click + ratelimit + requests + pypdf + pycryptodome + safetensors + uvicorn + ] ++ packages.unstructured.optional-dependencies.local-inference); + version = "0.0.39"; + unstructured_api_nltk_data = symlinkJoin { + name = "unstructured_api_nltk_data"; + + paths = [ nltk-data.punkt nltk-data.averaged_perceptron_tagger ]; + }; +in stdenvNoCC.mkDerivation { + pname = "unstructured-api"; + inherit version; + + src = fetchFromGitHub { + owner = "Unstructured-IO"; + repo = "unstructured-api"; + rev = version; + hash = "sha256-fk0YkGllggi0eWdp9ytHy4/9rChkcDnQvEvVAp1+RJw="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out $out/bin $out/lib + cp -r . $out/lib + + makeWrapper ${pythonEnv}/bin/uvicorn $out/bin/unstructured-api \ + --set NLTK_DATA ${unstructured_api_nltk_data} \ + --prefix PYTHONPATH : $out/lib \ + --add-flags "prepline_general.api.app:app" + + runHook postInstall + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "open-source toolkit designed to make it easy to prepare unstructured data like PDFs, HTML and Word Documents for downstream data science tasks"; + homepage = "https://github.com/Unstructured-IO/unstructured-api"; + changelog = "https://github.com/Unstructured-IO/unstructured-api/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix b/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix index 9c94ad3bd545..4e2070d91ebd 100644 --- a/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dolibarr"; - version = "16.0.5"; + version = "17.0.3"; src = fetchFromGitHub { owner = "Dolibarr"; repo = "dolibarr"; rev = version; - sha256 = "sha256-+OAkUMwLXZGFPQocJARIG//+0V1Dv5MdZvythbp4KPw="; + sha256 = "sha256-RpmeBoFY2TyYTpHLG2Kx5FezUHzwukj1+SfZhQOqxqU="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix b/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix index cd7b11102731..d578fde8e56b 100644 --- a/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix +++ b/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix @@ -55,6 +55,13 @@ mkYarnPackage { hash = pinData.uiYarnDepsHash; }; + patchPhase = '' + substituteInPlace ./package.json \ + --replace '$(git rev-parse --short HEAD)' "${src.rev}" \ + --replace 'yarn clean' 'yarn --offline clean' \ + --replace 'yarn run rimraf dist' 'yarn --offline run rimraf dist' + ''; + yarnPreBuild = '' export npm_config_nodedir=${nodejs} ''; @@ -79,6 +86,7 @@ mkYarnPackage { passthru.updateScript = ./update.py; passthru.tests.lemmy-ui = nixosTests.lemmy; + passthru.commit_sha = src.rev; meta = with lib; { description = "Building a federated alternative to reddit in rust"; diff --git a/nixpkgs/pkgs/servers/web-apps/moodle/default.nix b/nixpkgs/pkgs/servers/web-apps/moodle/default.nix index 5eb3d997a053..0ab0d0f7db29 100644 --- a/nixpkgs/pkgs/servers/web-apps/moodle/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }: let - version = "4.1.3"; + version = "4.1.4"; versionParts = lib.take 2 (lib.splitVersion version); # 4.2 -> 402, 3.11 -> 311 @@ -14,8 +14,8 @@ in stdenv.mkDerivation rec { inherit version; src = fetchurl { - url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - hash = "sha256-JMK+nGgeBryC6I9cg1DD52gIGcPMAJ/xZxrC4a1R5Ps="; + url = "https://download.moodle.org/download.php/direct/stable${stableVersion}/${pname}-${version}.tgz"; + hash = "sha256-mfJV5KHOG401N8gHFWYygsRRVnlWyn0SojD1H5KAvPQ="; }; phpConfig = writeText "config.php" '' diff --git a/nixpkgs/pkgs/servers/web-apps/netbox/default.nix b/nixpkgs/pkgs/servers/web-apps/netbox/default.nix index e5f99033b5d4..5ba7efc83eac 100644 --- a/nixpkgs/pkgs/servers/web-apps/netbox/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/netbox/default.nix @@ -26,8 +26,8 @@ in }; netbox = callPackage generic { - version = "3.5.7"; - hash = "sha256-R5P4FOhn7rE6e9H9U3JlE3ms4Svv6ps4c3+ZjE1KwNM="; + version = "3.5.8"; + hash = "sha256-i8LwMZYItDG5wz0yVn59710R615i81/KYT58og1Ut6A="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch diff --git a/nixpkgs/pkgs/servers/web-apps/slskd/default.nix b/nixpkgs/pkgs/servers/web-apps/slskd/default.nix index a63c7eceb064..bff64dd3bb0a 100644 --- a/nixpkgs/pkgs/servers/web-apps/slskd/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/slskd/default.nix @@ -10,13 +10,13 @@ }: let pname = "slskd"; - version = "0.17.8"; + version = "0.18.2"; src = fetchFromGitHub { owner = "slskd"; repo = "slskd"; rev = version; - sha256 = "sha256-kqkJZNxg044RbgHFsRfvRMyFRBjnIubdHRqUuMjj2D0="; + sha256 = "sha256-hWK6nbXAZTjxukx9EzkJkyEFlqXUkjanmv4VfHZxW24="; }; meta = with lib; { @@ -34,9 +34,8 @@ let pname = "slskd-web"; src = "${src}/src/web"; - patches = [ ./package-lock.patch ]; npmFlags = [ "--legacy-peer-deps" ]; - npmDepsHash = "sha256-vURi36ebdJQofhBlElIH5m6T1b8tsVGAzXCiDYUcSww="; + npmDepsHash = "sha256-+2g3pCaGFbzQjKwhjmD6viuzVE5pRg+qSOXMrCtLQkI="; installPhase = '' cp -r build $out ''; diff --git a/nixpkgs/pkgs/servers/web-apps/slskd/deps.nix b/nixpkgs/pkgs/servers/web-apps/slskd/deps.nix index b911a2cd3d94..d40a61d3d2d6 100644 --- a/nixpkgs/pkgs/servers/web-apps/slskd/deps.nix +++ b/nixpkgs/pkgs/servers/web-apps/slskd/deps.nix @@ -102,6 +102,7 @@ (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { pname = "OneOf"; version = "3.0.255"; sha256 = "17m7nqiwfvpbmy0c9l1i71hh1n2vnjm7hdmb6ppgwmbq6ypnxy4a"; }) (fetchNuGet { pname = "prometheus-net"; version = "7.0.0"; sha256 = "13h42444mx4nbafhn0aw7xg8gg5dxjszv3qxfz1dflayzmcwganf"; }) (fetchNuGet { pname = "prometheus-net.AspNetCore"; version = "7.0.0"; sha256 = "0cjdh47qimcg6bmflnwl5xv77vxn4h4hmd1znv8b5a7krg1hrf5k"; }) (fetchNuGet { pname = "prometheus-net.AspNetCore.HealthChecks"; version = "7.0.0"; sha256 = "0q9gal3hkd45d78s1p0f3dv0kxr0byq69k0aq6pmmh9h6rpx56dl"; }) diff --git a/nixpkgs/pkgs/servers/web-apps/slskd/package-lock.patch b/nixpkgs/pkgs/servers/web-apps/slskd/package-lock.patch deleted file mode 100644 index 59bc95c2aea0..000000000000 --- a/nixpkgs/pkgs/servers/web-apps/slskd/package-lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/package-lock.json b/package-lock.json -index 5a84fbe7..562051c7 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -12425,7 +12425,7 @@ - "node_modules/pkg-up/node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", -- "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", -+ "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", - "dev": true, - "engines": { - "node": ">=4" diff --git a/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index edfa0e879450..66f4b11cfdcf 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix @@ -979,6 +979,9 @@ self: super: postInstall = '' rm $out/bin/xkeystone ''; + meta = attrs.meta // { + mainProgram = "xrandr"; + }; }); xset = super.xset.overrideAttrs (attrs: { diff --git a/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix b/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix index 1b5b02b204de..073ae04952ec 100644 --- a/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix @@ -5,13 +5,13 @@ let in buildFishPlugin rec { pname = "fzf.fish"; - version = "9.9"; + version = "10.0"; src = fetchFromGitHub { owner = "PatrickF1"; repo = "fzf.fish"; rev = "v${version}"; - sha256 = "sha256-Aqr6+DcOS3U1R8o9Mlbxszo5/Dy9viU4KbmRGXo95R8="; + hash = "sha256-CqRSkwNqI/vdxPKrShBykh+eHQq9QIiItD6jWdZ/DSM="; }; nativeCheckInputs = [ fzf fd unixtools.script procps ]; @@ -38,6 +38,7 @@ buildFishPlugin rec { meta = with lib; { description = "Augment your fish command line with fzf key bindings"; homepage = "https://github.com/PatrickF1/fzf.fish"; + changelog = "https://github.com/PatrickF1/fzf.fish/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ pacien natsukium ]; }; diff --git a/nixpkgs/pkgs/shells/fish/plugins/pure.nix b/nixpkgs/pkgs/shells/fish/plugins/pure.nix index dae5cf783010..04334f14fa99 100644 --- a/nixpkgs/pkgs/shells/fish/plugins/pure.nix +++ b/nixpkgs/pkgs/shells/fish/plugins/pure.nix @@ -1,29 +1,21 @@ -{ lib, buildFishPlugin, fetchFromGitHub, git, fishtape }: +{ lib, buildFishPlugin, fetchFromGitHub, git, fishtape_3 }: buildFishPlugin rec { pname = "pure"; - version = "4.1.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = "pure-fish"; repo = "pure"; rev = "v${version}"; - sha256 = "1x1h65l8582p7h7w5986sc9vfd7b88a7hsi68dbikm090gz8nlxx"; + hash = "sha256-O8rC2uCuM3xUQPRap7XqyyAvO77hP+sqNM4mEQ7pZkw="; }; - # The tests aren't passing either on the project's CI. - # The release notes of the program for v3.5.0 say: - # > Tests are going crazy at the moment, should be fixed once fishtape 3.0 - # > is released, and we do the switch. - # This is tracked in https://github.com/pure-fish/pure/issues/272 - # and https://github.com/pure-fish/pure/pull/275. - doCheck = false; - nativeCheckInputs = [ git ]; - checkPlugins = [ fishtape ]; + checkPlugins = [ fishtape_3 ]; checkPhase = '' - # https://github.com/rafaelrinaldi/pure/issues/264 - rm tests/_pure_string_width.test.fish + rm tests/pure_tools_installer.test.fish + rm tests/_pure_uninstall.test.fish fishtape tests/*.test.fish ''; diff --git a/nixpkgs/pkgs/shells/nushell/default.nix b/nixpkgs/pkgs/shells/nushell/default.nix index b76b63167e2b..d87d842be08c 100644 --- a/nixpkgs/pkgs/shells/nushell/default.nix +++ b/nixpkgs/pkgs/shells/nushell/default.nix @@ -22,7 +22,7 @@ }: let - version = "0.83.1"; + version = "0.84.0"; in rustPlatform.buildRustPackage { @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-WMMGsJFgUkascCja7v0VA3spaOb5QmMFXQ2JOT9beO4="; + hash = "sha256-vXtQUWKRPS53IBUgO9Dw8dVzfD5W2kHSPOZHs293O5Q="; }; - cargoHash = "sha256-/0+k3qOM9/rY6XmeVjqQWkjv19yZTkmfMK51z4+ppJU="; + cargoHash = "sha256-NtTCuTWbGTrGKF7ulm3Bfal/WuBtPEX7QvHoOyKY1V8="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] diff --git a/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix b/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix index 0a49f709a6b7..9170e8452460 100644 --- a/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix +++ b/nixpkgs/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "unstable-2023-07-29"; + version = "unstable-2023-08-24"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "3ee56c6ec31fcc8dbffee85e1c73eb6fe0bbba8d"; - hash = "sha256-luGIvcKOfhDorPfGfL449+eD+58MGo5jMCsNwIRJWt4="; + rev = "45c051dad0e243a63608c8274b7fddd5f0b74941"; + hash = "sha256-kpE+vgobYsQuh8sS3gK/yg68nQykquwteeuecjLtIrE="; }; installPhase = '' diff --git a/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix b/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix index bbba12bddb35..4cab90c7e05a 100644 --- a/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix +++ b/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix @@ -11,9 +11,9 @@ let in rustPlatform.buildRustPackage { inherit pname; - version = "0.83.1"; + version = "0.84.0"; src = nushell.src; - cargoHash = "sha256-qRKONc8rDRALEin8WGxi7Jma4uD+U+9Gu6zpmYWmGOc="; + cargoHash = "sha256-RcwCYfIEV0+NbZ99uWaCOLqLap3wZ4qXIsc02fqkBSQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; cargoBuildFlags = [ "--package nu_plugin_gstat" ]; diff --git a/nixpkgs/pkgs/shells/nushell/plugins/query.nix b/nixpkgs/pkgs/shells/nushell/plugins/query.nix index 00b70f279c67..0988d4f80bb7 100644 --- a/nixpkgs/pkgs/shells/nushell/plugins/query.nix +++ b/nixpkgs/pkgs/shells/nushell/plugins/query.nix @@ -9,11 +9,11 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; - version = "0.83.1"; + version = "0.84.0"; src = nushell.src; - cargoHash = "sha256-0Bcu2h1ooc4z4ezKSjl7ca5cNQwnF3je7XzdhuqP4iQ="; + cargoHash = "sha256-8uAoiurQpI++duheNqwEDw/0CIPE1dHcgL48hKWqNUg="; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; diff --git a/nixpkgs/pkgs/shells/yash/default.nix b/nixpkgs/pkgs/shells/yash/default.nix index 6af39debf565..4957c657b86d 100644 --- a/nixpkgs/pkgs/shells/yash/default.nix +++ b/nixpkgs/pkgs/shells/yash/default.nix @@ -1,16 +1,19 @@ -{ stdenv, lib, fetchurl, gettext, ncurses }: +{ stdenv, lib, fetchFromGitHub, gettext, ncurses, asciidoc }: stdenv.mkDerivation rec { pname = "yash"; - version = "2.54"; + version = "2.55"; - src = fetchurl { - url = "https://osdn.net/dl/yash/yash-${version}.tar.xz"; - hash = "sha256-RKCsHM98Os7PvqAn2MDJMPE6goBlvjGAVc4RMBU5GDk="; + src = fetchFromGitHub { + owner = "magicant"; + repo = pname; + rev = version; + hash = "sha256-raTIqklo69JEuhzdWUK3uywuLjqeQJCJ9nvnLRxlGr4="; }; strictDeps = true; - buildInputs = [ gettext ncurses ]; + nativeBuildInputs = [ asciidoc gettext ]; + buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ gettext ]; meta = with lib; { homepage = "https://yash.osdn.jp/index.html.en"; diff --git a/nixpkgs/pkgs/stdenv/generic/setup.sh b/nixpkgs/pkgs/stdenv/generic/setup.sh index 7fe5f67b14de..7c948afc4dac 100644 --- a/nixpkgs/pkgs/stdenv/generic/setup.sh +++ b/nixpkgs/pkgs/stdenv/generic/setup.sh @@ -933,7 +933,7 @@ _allFlags() { export system pname name version for varName in $(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }'); do if (( "${NIX_DEBUG:-0}" >= 1 )); then - printf "@%s@ -> %q\n" "${varName}" "${!varName}" + printf "@%s@ -> %q\n" "${varName}" "${!varName}" >&2 fi args+=("--subst-var" "$varName") done diff --git a/nixpkgs/pkgs/test/default.nix b/nixpkgs/pkgs/test/default.nix index 6bfa1c4393c4..d6fd75359fc4 100644 --- a/nixpkgs/pkgs/test/default.nix +++ b/nixpkgs/pkgs/test/default.nix @@ -35,6 +35,7 @@ with pkgs; fetchurl = callPackages ../build-support/fetchurl/tests.nix { }; fetchpatch = callPackages ../build-support/fetchpatch/tests.nix { }; fetchpatch2 = callPackages ../build-support/fetchpatch/tests.nix { fetchpatch = fetchpatch2; }; + fetchDebianPatch = callPackages ../build-support/fetchdebianpatch/tests.nix { }; fetchzip = callPackages ../build-support/fetchzip/tests.nix { }; fetchgit = callPackages ../build-support/fetchgit/tests.nix { }; fetchFirefoxAddon = callPackages ../build-support/fetchfirefoxaddon/tests.nix { }; @@ -93,4 +94,6 @@ with pkgs; }; pkgs-lib = recurseIntoAttrs (import ../pkgs-lib/tests { inherit pkgs; }); + + nixpkgs-check-by-name = callPackage ./nixpkgs-check-by-name { }; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/.envrc b/nixpkgs/pkgs/test/nixpkgs-check-by-name/.envrc new file mode 100644 index 000000000000..1d953f4bd735 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/.envrc @@ -0,0 +1 @@ +use nix diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/.gitignore b/nixpkgs/pkgs/test/nixpkgs-check-by-name/.gitignore new file mode 100644 index 000000000000..75e92a908987 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/.gitignore @@ -0,0 +1,2 @@ +target +.direnv diff --git a/nixpkgs/pkgs/applications/misc/mission-center/proxy-Cargo.lock b/nixpkgs/pkgs/test/nixpkgs-check-by-name/Cargo.lock index 7b99bafde589..3859d2b6e97c 100644 --- a/nixpkgs/pkgs/applications/misc/mission-center/proxy-Cargo.lock +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/Cargo.lock @@ -3,31 +3,39 @@ version = 3 [[package]] +name = "aho-corasick" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +dependencies = [ + "memchr", +] + +[[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -43,34 +51,46 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys", ] [[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "block-buffer" -version = "0.10.4" +name = "bitflags" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -80,9 +100,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.3.4" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80672091db20273a15cf9fdd4e47ed43b5091ec9841bf4c6145c9dfbbcae09ed" +checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" dependencies = [ "clap_builder", "clap_derive", @@ -91,22 +111,21 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.4" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636" +checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck", "proc-macro2", @@ -116,9 +135,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" @@ -127,76 +146,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] -name = "const-random" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" -dependencies = [ - "getrandom", - "once_cell", - "proc-macro-hack", - "tiny-keccak", -] - -[[package]] -name = "cpufeatures" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" -dependencies = [ - "libc", -] - -[[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 = "digest" -version = "0.10.7" +name = "colored" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" dependencies = [ - "block-buffer", - "crypto-common", + "is-terminal", + "lazy_static", + "windows-sys", ] [[package]] -name = "dlv-list" -version = "0.5.0" +name = "countme" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73" -dependencies = [ - "const-random", -] +checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -214,31 +184,16 @@ dependencies = [ ] [[package]] -name = "generic-array" -version = "0.14.7" +name = "fastrand" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "heck" @@ -248,41 +203,26 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] -name = "io-lifetimes" -version = "1.0.11" +name = "is-terminal" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "libc", + "hermit-abi", + "rustix", "windows-sys", ] [[package]] -name = "is-terminal" -version = "0.4.7" +name = "itoa" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys", -] +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "lazy_static" @@ -292,24 +232,45 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" + +[[package]] +name = "memchr" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] -name = "num_cpus" -version = "1.15.0" +name = "memoffset" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ - "hermit-abi 0.2.6", - "libc", + "autocfg", +] + +[[package]] +name = "nixpkgs-check-by-name" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "colored", + "lazy_static", + "regex", + "rnix", + "rowan", + "serde", + "serde_json", + "tempfile", ] [[package]] @@ -319,84 +280,137 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] -name = "ordered-multimap" -version = "0.6.0" +name = "proc-macro2" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ - "dlv-list", - "hashbrown", + "unicode-ident", ] [[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" +name = "quote" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] [[package]] -name = "proc-macro2" -version = "1.0.60" +name = "redox_syscall" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "unicode-ident", + "bitflags 1.3.2", ] [[package]] -name = "proxy" -version = "0.2.5" +name = "regex" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ - "clap", - "lazy_static", - "libc", - "num_cpus", - "rust-ini", - "sha2", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "quote" -version = "1.0.28" +name = "regex-automata" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ - "proc-macro2", + "aho-corasick", + "memchr", + "regex-syntax", ] [[package]] -name = "rust-ini" -version = "0.19.0" +name = "regex-syntax" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "rnix" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb35cedbeb70e0ccabef2a31bcff0aebd114f19566086300b8f42c725fc2cb5f" dependencies = [ - "cfg-if", - "ordered-multimap", + "rowan", +] + +[[package]] +name = "rowan" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64449cfef9483a475ed56ae30e2da5ee96448789fb2aa240a04beb6a055078bf" +dependencies = [ + "countme", + "hashbrown", + "memoffset", + "rustc-hash", + "text-size", ] [[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.20" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys", ] [[package]] -name = "sha2" -version = "0.10.7" +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "serde" +version = "1.0.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1" dependencies = [ - "cfg-if", - "cpufeatures", - "digest", + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.186" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.105" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +dependencies = [ + "itoa", + "ryu", + "serde", ] [[package]] @@ -407,9 +421,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "2.0.18" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -417,25 +431,29 @@ dependencies = [ ] [[package]] -name = "tiny-keccak" -version = "2.0.2" +name = "tempfile" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "crunchy", + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys", ] [[package]] -name = "typenum" -version = "1.16.0" +name = "text-size" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "utf8parse" @@ -444,18 +462,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -466,9 +472,9 @@ dependencies = [ [[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", "windows_aarch64_msvc", @@ -481,42 +487,42 @@ 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" diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/Cargo.toml b/nixpkgs/pkgs/test/nixpkgs-check-by-name/Cargo.toml new file mode 100644 index 000000000000..003aab6d5842 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/Cargo.toml @@ -0,0 +1,16 @@ +[package] +name = "nixpkgs-check-by-name" +version = "0.1.0" +edition = "2021" + +[dependencies] +rnix = "0.11.0" +rowan = "0.15.0" +regex = "1.9.3" +clap = { version = "4.3.23", features = ["derive"] } +serde_json = "1.0.105" +tempfile = "3.8.0" +serde = { version = "1.0.185", features = ["derive"] } +anyhow = "1.0" +lazy_static = "1.4.0" +colored = "2.0.4" diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/README.md b/nixpkgs/pkgs/test/nixpkgs-check-by-name/README.md new file mode 100644 index 000000000000..754d0a2090df --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/README.md @@ -0,0 +1,97 @@ +# Nixpkgs pkgs/by-name checker + +This directory implements a program to check the [validity](#validity-checks) of the `pkgs/by-name` Nixpkgs directory once introduced. +This is part of the implementation of [RFC 140](https://github.com/NixOS/rfcs/pull/140). + +## API + +This API may be changed over time if the CI making use of it is adjusted to deal with the change appropriately, see [Hydra builds](#hydra-builds). + +- Command line: `nixpkgs-check-by-name <NIXPKGS>` +- Arguments: + - `<NIXPKGS>`: The path to the Nixpkgs to check +- Exit code: + - `0`: If the [validation](#validity-checks) is successful + - `1`: If the [validation](#validity-checks) is not successful + - `2`: If an unexpected I/O error occurs +- Standard error: + - Informative messages + - Error messages if validation is not successful + +## Validity checks + +These checks are performed by this tool: + +### File structure checks +- `pkgs/by-name` must only contain subdirectories of the form `${shard}/${name}`, called _package directories_. +- The `name`'s of package directories must be unique when lowercased +- `name` is a string only consisting of the ASCII characters `a-z`, `A-Z`, `0-9`, `-` or `_`. +- `shard` is the lowercased first two letters of `name`, expressed in Nix: `shard = toLower (substring 0 2 name)`. +- Each package directory must contain a `package.nix` file and may contain arbitrary other files. + +### Nix parser checks +- Each package directory must not refer to files outside itself using symlinks or Nix path expressions. + +### Nix evaluation checks +- `pkgs.${name}` is defined as `callPackage pkgs/by-name/${shard}/${name}/package.nix args` for some `args`. +- `pkgs.lib.isDerivation pkgs.${name}` is `true`. + +## Development + +Enter the development environment in this directory either automatically with `direnv` or with +``` +nix-shell +``` + +Then use `cargo`: +``` +cargo build +cargo test +cargo fmt +cargo clippy +``` + +## Tests + +Tests are declared in [`./tests`](./tests) as subdirectories imitating Nixpkgs with these files: +- `default.nix`: + Always contains + ```nix + import ../mock-nixpkgs.nix { root = ./.; } + ``` + which makes + ``` + nix-instantiate <subdir> --eval -A <attr> --arg overlays <overlays> + ``` + work very similarly to the real Nixpkgs, just enough for the program to be able to test it. +- `pkgs/by-name`: + The `pkgs/by-name` directory to check. + +- `all-packages.nix` (optional): + Contains an overlay of the form + ```nix + self: super: { + # ... + } + ``` + allowing the simulation of package overrides to the real [`pkgs/top-level/all-packages.nix`](../../top-level/all-packages.nix`). + The default is an empty overlay. + +- `expected` (optional): + A file containing the expected standard output. + The default is expecting an empty standard output. + +## Hydra builds + +This program will always be available pre-built for `x86_64-linux` on the `nixos-unstable` channel and `nixos-XX.YY` channels. +This is ensured by including it in the `tested` jobset description in [`nixos/release-combined.nix`](../../../nixos/release-combined.nix). + +This allows CI for PRs to development branches `master` and `release-XX.YY` to fetch the pre-built program from the corresponding channel and use that to check the PR. This has the following benefits: +- It allows CI to check all PRs, even if they would break the CI tooling. +- It makes the CI check very fast, since no Nix builds need to be done, even for mass rebuilds. +- It improves security, since we don't have to build potentially untrusted code from PRs. + The tool only needs a very minimal Nix evaluation at runtime, which can work with [readonly-mode](https://nixos.org/manual/nix/stable/command-ref/opt-common.html#opt-readonly-mode) and [restrict-eval](https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-restrict-eval). +- It allows anybody to make updates to the tooling and for those updates to be automatically used by CI without needing a separate release mechanism. + +The tradeoff is that there's a delay between updates to the tool and those updates being used by CI. +This needs to be considered when updating the [API](#api). diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/default.nix new file mode 100644 index 000000000000..a997fc8612c8 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/default.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + nix, + rustfmt, + clippy, + mkShell, +}: +let + package = + rustPlatform.buildRustPackage { + name = "nixpkgs-check-by-name"; + src = lib.cleanSource ./.; + cargoLock.lockFile = ./Cargo.lock; + nativeBuildInputs = [ + nix + rustfmt + clippy + ]; + # Needed to make Nix evaluation work inside the nix build + preCheck = '' + export TEST_ROOT=$(pwd)/test-tmp + export NIX_CONF_DIR=$TEST_ROOT/etc + export NIX_LOCALSTATE_DIR=$TEST_ROOT/var + export NIX_LOG_DIR=$TEST_ROOT/var/log/nix + export NIX_STATE_DIR=$TEST_ROOT/var/nix + export NIX_STORE_DIR=$TEST_ROOT/store + ''; + postCheck = '' + cargo fmt --check + cargo clippy -- -D warnings + ''; + passthru.shell = mkShell { + inputsFrom = [ package ]; + }; + }; +in +package diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/shell.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/shell.nix new file mode 100644 index 000000000000..33bcf45b8d05 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/shell.nix @@ -0,0 +1,6 @@ +let + pkgs = import ../../.. { + config = {}; + overlays = []; + }; +in pkgs.tests.nixpkgs-check-by-name.shell diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/eval.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/eval.nix new file mode 100644 index 000000000000..7c0ae755215a --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/eval.nix @@ -0,0 +1,59 @@ +# Takes a path to nixpkgs and a path to the json-encoded list of attributes to check. +# Returns an attribute set containing information on each requested attribute. +# If the attribute is missing from Nixpkgs it's also missing from the result. +# +# The returned information is an attribute set with: +# - call_package_path: The <path> from `<attr> = callPackage <path> { ... }`, +# or null if it's not defined as with callPackage, or if the <path> is not a path +# - is_derivation: The result of `lib.isDerivation <attr>` +{ + attrsPath, + nixpkgsPath, +}: +let + attrs = builtins.fromJSON (builtins.readFile attrsPath); + + # This overlay mocks callPackage to persist the path of the first argument + callPackageOverlay = self: super: { + callPackage = fn: args: + let + result = super.callPackage fn args; + in + if builtins.isAttrs result then + # If this was the last overlay to be applied, we could just only return the `_callPackagePath`, + # but that's not the case because stdenv has another overlays on top of user-provided ones. + # So to not break the stdenv build we need to return the mostly proper result here + result // { + _callPackagePath = fn; + } + else + # It's very rare that callPackage doesn't return an attribute set, but it can occur. + { + _callPackagePath = fn; + }; + }; + + pkgs = import nixpkgsPath { + # Don't let the users home directory influence this result + config = { }; + overlays = [ callPackageOverlay ]; + }; + + attrInfo = attr: { + # These names are used by the deserializer on the Rust side + call_package_path = + if pkgs.${attr} ? _callPackagePath && builtins.isPath pkgs.${attr}._callPackagePath then + toString pkgs.${attr}._callPackagePath + else + null; + is_derivation = pkgs.lib.isDerivation pkgs.${attr}; + }; + + attrInfos = builtins.listToAttrs (map (name: { + inherit name; + value = attrInfo name; + }) attrs); + +in +# Filter out attributes not in Nixpkgs +builtins.intersectAttrs pkgs attrInfos diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/eval.rs b/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/eval.rs new file mode 100644 index 000000000000..d084642ffe7e --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/eval.rs @@ -0,0 +1,124 @@ +use crate::structure; +use crate::utils::ErrorWriter; +use std::path::Path; + +use anyhow::Context; +use serde::Deserialize; +use std::collections::HashMap; +use std::io; +use std::path::PathBuf; +use std::process; +use tempfile::NamedTempFile; + +/// Attribute set of this structure is returned by eval.nix +#[derive(Deserialize)] +struct AttributeInfo { + call_package_path: Option<PathBuf>, + is_derivation: bool, +} + +const EXPR: &str = include_str!("eval.nix"); + +/// Check that the Nixpkgs attribute values corresponding to the packages in pkgs/by-name are +/// of the form `callPackage <package_file> { ... }`. +/// See the `eval.nix` file for how this is achieved on the Nix side +pub fn check_values<W: io::Write>( + error_writer: &mut ErrorWriter<W>, + nixpkgs: &structure::Nixpkgs, + eval_accessible_paths: Vec<&Path>, +) -> anyhow::Result<()> { + // Write the list of packages we need to check into a temporary JSON file. + // This can then get read by the Nix evaluation. + let attrs_file = NamedTempFile::new().context("Failed to create a temporary file")?; + serde_json::to_writer(&attrs_file, &nixpkgs.package_names).context(format!( + "Failed to serialise the package names to the temporary path {}", + attrs_file.path().display() + ))?; + + // With restrict-eval, only paths in NIX_PATH can be accessed, so we explicitly specify the + // ones needed needed + + let mut command = process::Command::new("nix-instantiate"); + command + // Inherit stderr so that error messages always get shown + .stderr(process::Stdio::inherit()) + // Clear NIX_PATH to be sure it doesn't influence the result + .env_remove("NIX_PATH") + .args([ + "--eval", + "--json", + "--strict", + "--readonly-mode", + "--restrict-eval", + "--show-trace", + "--expr", + EXPR, + ]) + // Pass the path to the attrs_file as an argument and add it to the NIX_PATH so it can be + // accessed in restrict-eval mode + .args(["--arg", "attrsPath"]) + .arg(attrs_file.path()) + .arg("-I") + .arg(attrs_file.path()) + // Same for the nixpkgs to test + .args(["--arg", "nixpkgsPath"]) + .arg(&nixpkgs.path) + .arg("-I") + .arg(&nixpkgs.path); + + // Also add extra paths that need to be accessible + for path in eval_accessible_paths { + command.arg("-I"); + command.arg(path); + } + + let result = command + .output() + .context(format!("Failed to run command {command:?}"))?; + + if !result.status.success() { + anyhow::bail!("Failed to run command {command:?}"); + } + // Parse the resulting JSON value + let actual_files: HashMap<String, AttributeInfo> = serde_json::from_slice(&result.stdout) + .context(format!( + "Failed to deserialise {}", + String::from_utf8_lossy(&result.stdout) + ))?; + + for package_name in &nixpkgs.package_names { + let relative_package_file = structure::Nixpkgs::relative_file_for_package(package_name); + let absolute_package_file = nixpkgs.path.join(&relative_package_file); + + if let Some(attribute_info) = actual_files.get(package_name) { + let is_expected_file = + if let Some(call_package_path) = &attribute_info.call_package_path { + absolute_package_file == *call_package_path + } else { + false + }; + + if !is_expected_file { + error_writer.write(&format!( + "pkgs.{package_name}: This attribute is not defined as `pkgs.callPackage {} {{ ... }}`.", + relative_package_file.display() + ))?; + continue; + } + + if !attribute_info.is_derivation { + error_writer.write(&format!( + "pkgs.{package_name}: This attribute defined by {} is not a derivation", + relative_package_file.display() + ))?; + } + } else { + error_writer.write(&format!( + "pkgs.{package_name}: This attribute is not defined but it should be defined automatically as {}", + relative_package_file.display() + ))?; + continue; + } + } + Ok(()) +} diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/main.rs b/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/main.rs new file mode 100644 index 000000000000..db22e524553b --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/main.rs @@ -0,0 +1,171 @@ +mod eval; +mod references; +mod structure; +mod utils; + +use anyhow::Context; +use clap::Parser; +use colored::Colorize; +use std::io; +use std::path::{Path, PathBuf}; +use std::process::ExitCode; +use structure::Nixpkgs; +use utils::ErrorWriter; + +/// Program to check the validity of pkgs/by-name +#[derive(Parser, Debug)] +#[command(about)] +struct Args { + /// Path to nixpkgs + nixpkgs: PathBuf, +} + +fn main() -> ExitCode { + let args = Args::parse(); + match check_nixpkgs(&args.nixpkgs, vec![], &mut io::stderr()) { + Ok(true) => { + eprintln!("{}", "Validated successfully".green()); + ExitCode::SUCCESS + } + Ok(false) => { + eprintln!("{}", "Validation failed, see above errors".yellow()); + ExitCode::from(1) + } + Err(e) => { + eprintln!("{} {:#}", "I/O error: ".yellow(), e); + ExitCode::from(2) + } + } +} + +/// Checks whether the pkgs/by-name structure in Nixpkgs is valid. +/// +/// # Arguments +/// - `nixpkgs_path`: The path to the Nixpkgs to check +/// - `eval_accessible_paths`: +/// Extra paths that need to be accessible to evaluate Nixpkgs using `restrict-eval`. +/// This is used to allow the tests to access the mock-nixpkgs.nix file +/// - `error_writer`: An `io::Write` value to write validation errors to, if any. +/// +/// # Return value +/// - `Err(e)` if an I/O-related error `e` occurred. +/// - `Ok(false)` if the structure is invalid, all the structural errors have been written to `error_writer`. +/// - `Ok(true)` if the structure is valid, nothing will have been written to `error_writer`. +pub fn check_nixpkgs<W: io::Write>( + nixpkgs_path: &Path, + eval_accessible_paths: Vec<&Path>, + error_writer: &mut W, +) -> anyhow::Result<bool> { + let nixpkgs_path = nixpkgs_path.canonicalize().context(format!( + "Nixpkgs path {} could not be resolved", + nixpkgs_path.display() + ))?; + + // Wraps the error_writer to print everything in red, and tracks whether anything was printed + // at all. Later used to figure out if the structure was valid or not. + let mut error_writer = ErrorWriter::new(error_writer); + + if !nixpkgs_path.join(structure::BASE_SUBPATH).exists() { + eprintln!( + "Given Nixpkgs path does not contain a {} subdirectory, no check necessary.", + structure::BASE_SUBPATH + ); + } else { + let nixpkgs = Nixpkgs::new(&nixpkgs_path, &mut error_writer)?; + + if error_writer.empty { + // Only if we could successfully parse the structure, we do the semantic checks + eval::check_values(&mut error_writer, &nixpkgs, eval_accessible_paths)?; + references::check_references(&mut error_writer, &nixpkgs)?; + } + } + Ok(error_writer.empty) +} + +#[cfg(test)] +mod tests { + use crate::check_nixpkgs; + use crate::structure; + use anyhow::Context; + use std::env; + use std::fs; + use std::path::Path; + use tempfile::{tempdir, tempdir_in}; + + #[test] + fn tests_dir() -> anyhow::Result<()> { + for entry in Path::new("tests").read_dir()? { + let entry = entry?; + let path = entry.path(); + let name = entry.file_name().to_string_lossy().into_owned(); + + if !path.is_dir() { + continue; + } + + let expected_errors = + fs::read_to_string(path.join("expected")).unwrap_or(String::new()); + + test_nixpkgs(&name, &path, &expected_errors)?; + } + Ok(()) + } + + // We cannot check case-conflicting files into Nixpkgs (the channel would fail to + // build), so we generate the case-conflicting file instead. + #[test] + fn test_case_sensitive() -> anyhow::Result<()> { + let temp_nixpkgs = tempdir()?; + let path = temp_nixpkgs.path(); + + if is_case_insensitive_fs(&path)? { + eprintln!("We're on a case-insensitive filesystem, skipping case-sensitivity test"); + return Ok(()); + } + + let base = path.join(structure::BASE_SUBPATH); + + fs::create_dir_all(base.join("fo/foo"))?; + fs::write(base.join("fo/foo/package.nix"), "{ someDrv }: someDrv")?; + + fs::create_dir_all(base.join("fo/foO"))?; + fs::write(base.join("fo/foO/package.nix"), "{ someDrv }: someDrv")?; + + test_nixpkgs( + "case_sensitive", + &path, + "pkgs/by-name/fo: Duplicate case-sensitive package directories \"foO\" and \"foo\".\n", + )?; + + Ok(()) + } + + fn test_nixpkgs(name: &str, path: &Path, expected_errors: &str) -> anyhow::Result<()> { + let extra_nix_path = Path::new("tests/mock-nixpkgs.nix"); + + // We don't want coloring to mess up the tests + env::set_var("NO_COLOR", "1"); + + let mut writer = vec![]; + check_nixpkgs(&path, vec![&extra_nix_path], &mut writer) + .context(format!("Failed test case {name}"))?; + + let actual_errors = String::from_utf8_lossy(&writer); + + if actual_errors != expected_errors { + panic!( + "Failed test case {name}, expected these errors:\n\n{}\n\nbut got these:\n\n{}", + expected_errors, actual_errors + ); + } + Ok(()) + } + + /// Check whether a path is in a case-insensitive filesystem + fn is_case_insensitive_fs(path: &Path) -> anyhow::Result<bool> { + let dir = tempdir_in(path)?; + let base = dir.path(); + fs::write(base.join("aaa"), "")?; + Ok(base.join("AAA").exists()) + } +} diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/references.rs b/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/references.rs new file mode 100644 index 000000000000..16dc60729c42 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/references.rs @@ -0,0 +1,184 @@ +use crate::structure::Nixpkgs; +use crate::utils; +use crate::utils::{ErrorWriter, LineIndex}; + +use anyhow::Context; +use rnix::{Root, SyntaxKind::NODE_PATH}; +use std::ffi::OsStr; +use std::fs::read_to_string; +use std::io; +use std::path::{Path, PathBuf}; + +/// Small helper so we don't need to pass in the same arguments to all functions +struct PackageContext<'a, W: io::Write> { + error_writer: &'a mut ErrorWriter<W>, + /// The package directory relative to Nixpkgs, such as `pkgs/by-name/fo/foo` + relative_package_dir: &'a PathBuf, + /// The absolute package directory + absolute_package_dir: &'a PathBuf, +} + +/// Check that every package directory in pkgs/by-name doesn't link to outside that directory. +/// Both symlinks and Nix path expressions are checked. +pub fn check_references<W: io::Write>( + error_writer: &mut ErrorWriter<W>, + nixpkgs: &Nixpkgs, +) -> anyhow::Result<()> { + // Check the directories for each package separately + for package_name in &nixpkgs.package_names { + let relative_package_dir = Nixpkgs::relative_dir_for_package(package_name); + let mut context = PackageContext { + error_writer, + relative_package_dir: &relative_package_dir, + absolute_package_dir: &nixpkgs.path.join(&relative_package_dir), + }; + + // The empty argument here is the subpath under the package directory to check + // An empty one means the package directory itself + check_path(&mut context, Path::new("")).context(format!( + "While checking the references in package directory {}", + relative_package_dir.display() + ))?; + } + Ok(()) +} + +/// Checks for a specific path to not have references outside +fn check_path<W: io::Write>(context: &mut PackageContext<W>, subpath: &Path) -> anyhow::Result<()> { + let path = context.absolute_package_dir.join(subpath); + + if path.is_symlink() { + // Check whether the symlink resolves to outside the package directory + match path.canonicalize() { + Ok(target) => { + // No need to handle the case of it being inside the directory, since we scan through the + // entire directory recursively anyways + if let Err(_prefix_error) = target.strip_prefix(context.absolute_package_dir) { + context.error_writer.write(&format!( + "{}: Path {} is a symlink pointing to a path outside the directory of that package.", + context.relative_package_dir.display(), + subpath.display(), + ))?; + } + } + Err(e) => { + context.error_writer.write(&format!( + "{}: Path {} is a symlink which cannot be resolved: {e}.", + context.relative_package_dir.display(), + subpath.display(), + ))?; + } + } + } else if path.is_dir() { + // Recursively check each entry + for entry in utils::read_dir_sorted(&path)? { + let entry_subpath = subpath.join(entry.file_name()); + check_path(context, &entry_subpath) + .context(format!("Error while recursing into {}", subpath.display()))? + } + } else if path.is_file() { + // Only check Nix files + if let Some(ext) = path.extension() { + if ext == OsStr::new("nix") { + check_nix_file(context, subpath).context(format!( + "Error while checking Nix file {}", + subpath.display() + ))? + } + } + } else { + // This should never happen, git doesn't support other file types + anyhow::bail!("Unsupported file type for path {}", subpath.display()); + } + Ok(()) +} + +/// Check whether a nix file contains path expression references pointing outside the package +/// directory +fn check_nix_file<W: io::Write>( + context: &mut PackageContext<W>, + subpath: &Path, +) -> anyhow::Result<()> { + let path = context.absolute_package_dir.join(subpath); + let parent_dir = path.parent().context(format!( + "Could not get parent of path {}", + subpath.display() + ))?; + + let contents = + read_to_string(&path).context(format!("Could not read file {}", subpath.display()))?; + + let root = Root::parse(&contents); + if let Some(error) = root.errors().first() { + context.error_writer.write(&format!( + "{}: File {} could not be parsed by rnix: {}", + context.relative_package_dir.display(), + subpath.display(), + error, + ))?; + return Ok(()); + } + + let line_index = LineIndex::new(&contents); + + for node in root.syntax().descendants() { + // We're only interested in Path expressions + if node.kind() != NODE_PATH { + continue; + } + + let text = node.text().to_string(); + let line = line_index.line(node.text_range().start().into()); + + // Filters out ./foo/${bar}/baz + // TODO: We can just check ./foo + if node.children().count() != 0 { + context.error_writer.write(&format!( + "{}: File {} at line {line} contains the path expression \"{}\", which is not yet supported and may point outside the directory of that package.", + context.relative_package_dir.display(), + subpath.display(), + text + ))?; + continue; + } + + // Filters out search paths like <nixpkgs> + if text.starts_with('<') { + context.error_writer.write(&format!( + "{}: File {} at line {line} contains the nix search path expression \"{}\" which may point outside the directory of that package.", + context.relative_package_dir.display(), + subpath.display(), + text + ))?; + continue; + } + + // Resolves the reference of the Nix path + // turning `../baz` inside `/foo/bar/default.nix` to `/foo/baz` + match parent_dir.join(Path::new(&text)).canonicalize() { + Ok(target) => { + // Then checking if it's still in the package directory + // No need to handle the case of it being inside the directory, since we scan through the + // entire directory recursively anyways + if let Err(_prefix_error) = target.strip_prefix(context.absolute_package_dir) { + context.error_writer.write(&format!( + "{}: File {} at line {line} contains the path expression \"{}\" which may point outside the directory of that package.", + context.relative_package_dir.display(), + subpath.display(), + text, + ))?; + } + } + Err(e) => { + context.error_writer.write(&format!( + "{}: File {} at line {line} contains the path expression \"{}\" which cannot be resolved: {e}.", + context.relative_package_dir.display(), + subpath.display(), + text, + ))?; + } + }; + } + + Ok(()) +} diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/structure.rs b/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/structure.rs new file mode 100644 index 000000000000..ea80128e487a --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/structure.rs @@ -0,0 +1,152 @@ +use crate::utils; +use crate::utils::ErrorWriter; +use lazy_static::lazy_static; +use regex::Regex; +use std::collections::HashMap; +use std::io; +use std::path::{Path, PathBuf}; + +pub const BASE_SUBPATH: &str = "pkgs/by-name"; +pub const PACKAGE_NIX_FILENAME: &str = "package.nix"; + +lazy_static! { + static ref SHARD_NAME_REGEX: Regex = Regex::new(r"^[a-z0-9_-]{1,2}$").unwrap(); + static ref PACKAGE_NAME_REGEX: Regex = Regex::new(r"^[a-zA-Z0-9_-]+$").unwrap(); +} + +/// Contains information about the structure of the pkgs/by-name directory of a Nixpkgs +pub struct Nixpkgs { + /// The path to nixpkgs + pub path: PathBuf, + /// The names of all packages declared in pkgs/by-name + pub package_names: Vec<String>, +} + +impl Nixpkgs { + // Some utility functions for the basic structure + + pub fn shard_for_package(package_name: &str) -> String { + package_name.to_lowercase().chars().take(2).collect() + } + + pub fn relative_dir_for_shard(shard_name: &str) -> PathBuf { + PathBuf::from(format!("{BASE_SUBPATH}/{shard_name}")) + } + + pub fn relative_dir_for_package(package_name: &str) -> PathBuf { + Nixpkgs::relative_dir_for_shard(&Nixpkgs::shard_for_package(package_name)) + .join(package_name) + } + + pub fn relative_file_for_package(package_name: &str) -> PathBuf { + Nixpkgs::relative_dir_for_package(package_name).join(PACKAGE_NIX_FILENAME) + } +} + +impl Nixpkgs { + /// Read the structure of a Nixpkgs directory, displaying errors on the writer. + /// May return early with I/O errors. + pub fn new<W: io::Write>( + path: &Path, + error_writer: &mut ErrorWriter<W>, + ) -> anyhow::Result<Nixpkgs> { + let base_dir = path.join(BASE_SUBPATH); + + let mut package_names = Vec::new(); + + for shard_entry in utils::read_dir_sorted(&base_dir)? { + let shard_path = shard_entry.path(); + let shard_name = shard_entry.file_name().to_string_lossy().into_owned(); + let relative_shard_path = Nixpkgs::relative_dir_for_shard(&shard_name); + + if shard_name == "README.md" { + // README.md is allowed to be a file and not checked + continue; + } + + if !shard_path.is_dir() { + error_writer.write(&format!( + "{}: This is a file, but it should be a directory.", + relative_shard_path.display(), + ))?; + // we can't check for any other errors if it's a file, since there's no subdirectories to check + continue; + } + + let shard_name_valid = SHARD_NAME_REGEX.is_match(&shard_name); + if !shard_name_valid { + error_writer.write(&format!( + "{}: Invalid directory name \"{shard_name}\", must be at most 2 ASCII characters consisting of a-z, 0-9, \"-\" or \"_\".", + relative_shard_path.display() + ))?; + } + + let mut unique_package_names = HashMap::new(); + + for package_entry in utils::read_dir_sorted(&shard_path)? { + let package_path = package_entry.path(); + let package_name = package_entry.file_name().to_string_lossy().into_owned(); + let relative_package_dir = + PathBuf::from(format!("{BASE_SUBPATH}/{shard_name}/{package_name}")); + + if !package_path.is_dir() { + error_writer.write(&format!( + "{}: This path is a file, but it should be a directory.", + relative_package_dir.display(), + ))?; + continue; + } + + if let Some(duplicate_package_name) = + unique_package_names.insert(package_name.to_lowercase(), package_name.clone()) + { + error_writer.write(&format!( + "{}: Duplicate case-sensitive package directories \"{duplicate_package_name}\" and \"{package_name}\".", + relative_shard_path.display(), + ))?; + } + + let package_name_valid = PACKAGE_NAME_REGEX.is_match(&package_name); + if !package_name_valid { + error_writer.write(&format!( + "{}: Invalid package directory name \"{package_name}\", must be ASCII characters consisting of a-z, A-Z, 0-9, \"-\" or \"_\".", + relative_package_dir.display(), + ))?; + } + + let correct_relative_package_dir = Nixpkgs::relative_dir_for_package(&package_name); + if relative_package_dir != correct_relative_package_dir { + // Only show this error if we have a valid shard and package name + // Because if one of those is wrong, you should fix that first + if shard_name_valid && package_name_valid { + error_writer.write(&format!( + "{}: Incorrect directory location, should be {} instead.", + relative_package_dir.display(), + correct_relative_package_dir.display(), + ))?; + } + } + + let package_nix_path = package_path.join(PACKAGE_NIX_FILENAME); + if !package_nix_path.exists() { + error_writer.write(&format!( + "{}: Missing required \"{PACKAGE_NIX_FILENAME}\" file.", + relative_package_dir.display(), + ))?; + } else if package_nix_path.is_dir() { + error_writer.write(&format!( + "{}: \"{PACKAGE_NIX_FILENAME}\" must be a file.", + relative_package_dir.display(), + ))?; + } + + package_names.push(package_name.clone()); + } + } + + Ok(Nixpkgs { + path: path.to_owned(), + package_names, + }) + } +} diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/utils.rs b/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/utils.rs new file mode 100644 index 000000000000..325c736eca98 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/utils.rs @@ -0,0 +1,72 @@ +use anyhow::Context; +use colored::Colorize; +use std::fs; +use std::io; +use std::path::Path; + +/// Deterministic file listing so that tests are reproducible +pub fn read_dir_sorted(base_dir: &Path) -> anyhow::Result<Vec<fs::DirEntry>> { + let listing = base_dir + .read_dir() + .context(format!("Could not list directory {}", base_dir.display()))?; + let mut shard_entries = listing + .collect::<io::Result<Vec<_>>>() + .context(format!("Could not list directory {}", base_dir.display()))?; + shard_entries.sort_by_key(|entry| entry.file_name()); + Ok(shard_entries) +} + +/// A simple utility for calculating the line for a string offset. +/// This doesn't do any Unicode handling, though that probably doesn't matter +/// because newlines can't split up Unicode characters. Also this is only used +/// for error reporting +pub struct LineIndex { + /// Stores the indices of newlines + newlines: Vec<usize>, +} + +impl LineIndex { + pub fn new(s: &str) -> LineIndex { + let mut newlines = vec![]; + let mut index = 0; + // Iterates over all newline-split parts of the string, adding the index of the newline to + // the vec + for split in s.split_inclusive('\n') { + index += split.len(); + newlines.push(index); + } + LineIndex { newlines } + } + + /// Returns the line number for a string index + pub fn line(&self, index: usize) -> usize { + match self.newlines.binary_search(&index) { + // +1 because lines are 1-indexed + Ok(x) => x + 1, + Err(x) => x + 1, + } + } +} + +/// A small wrapper around a generic io::Write specifically for errors: +/// - Print everything in red to signal it's an error +/// - Keep track of whether anything was printed at all, so that +/// it can be queried whether any errors were encountered at all +pub struct ErrorWriter<W> { + pub writer: W, + pub empty: bool, +} + +impl<W: io::Write> ErrorWriter<W> { + pub fn new(writer: W) -> ErrorWriter<W> { + ErrorWriter { + writer, + empty: true, + } + } + + pub fn write(&mut self, string: &str) -> io::Result<()> { + self.empty = false; + writeln!(self.writer, "{}", string.red()) + } +} diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/default.nix new file mode 100644 index 000000000000..793dfabd6553 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/default.nix @@ -0,0 +1,4 @@ +args: +builtins.removeAttrs + (import ../mock-nixpkgs.nix { root = ./.; } args) + [ "foo" ] diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/expected new file mode 100644 index 000000000000..fff17c6c7cd5 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/expected @@ -0,0 +1 @@ +pkgs.foo: This attribute is not defined but it should be defined automatically as pkgs/by-name/fo/foo/package.nix diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/pkgs/by-name/fo/foo/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/pkgs/by-name/fo/foo/package.nix new file mode 100644 index 000000000000..a1b92efbbadb --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/pkgs/by-name/fo/foo/package.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/expected new file mode 100644 index 000000000000..3627368c0ef0 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/expected @@ -0,0 +1 @@ +pkgs/by-name/aa/FOO: Incorrect directory location, should be pkgs/by-name/fo/FOO instead. diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/pkgs/by-name/aa/FOO/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/pkgs/by-name/aa/FOO/package.nix new file mode 100644 index 000000000000..a1b92efbbadb --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/pkgs/by-name/aa/FOO/package.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/expected new file mode 100644 index 000000000000..8c8eafdcb3d1 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/expected @@ -0,0 +1 @@ +pkgs/by-name/fo/fo@: Invalid package directory name "fo@", must be ASCII characters consisting of a-z, A-Z, 0-9, "-" or "_". diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/pkgs/by-name/fo/fo@/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/pkgs/by-name/fo/fo@/package.nix new file mode 100644 index 000000000000..a1b92efbbadb --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/pkgs/by-name/fo/fo@/package.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/expected new file mode 100644 index 000000000000..248aa8877966 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/expected @@ -0,0 +1 @@ +pkgs/by-name/A: Invalid directory name "A", must be at most 2 ASCII characters consisting of a-z, 0-9, "-" or "_". diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/pkgs/by-name/A/A/.git-keep b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/pkgs/by-name/A/A/.git-keep new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/pkgs/by-name/A/A/.git-keep diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/pkgs/by-name/A/A/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/pkgs/by-name/A/A/package.nix new file mode 100644 index 000000000000..a1b92efbbadb --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/pkgs/by-name/A/A/package.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/expected new file mode 100644 index 000000000000..ce1afcbf2d34 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/expected @@ -0,0 +1 @@ +pkgs/by-name/fo/foo: Missing required "package.nix" file. diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/pkgs/by-name/fo/foo/.git-keep b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/pkgs/by-name/fo/foo/.git-keep new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/pkgs/by-name/fo/foo/.git-keep diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/mock-nixpkgs.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/mock-nixpkgs.nix new file mode 100644 index 000000000000..50ad67617542 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/mock-nixpkgs.nix @@ -0,0 +1,101 @@ +/* +This file returns a mocked version of Nixpkgs' default.nix for testing purposes. +It does not depend on Nixpkgs itself for the sake of simplicity. + +It takes one attribute as an argument: +- `root`: The root of Nixpkgs to read other files from, including: + - `./pkgs/by-name`: The `pkgs/by-name` directory to test + - `./all-packages.nix`: A file containing an overlay to mirror the real `pkgs/top-level/all-packages.nix`. + This allows adding overrides on top of the auto-called packages in `pkgs/by-name`. + +It returns a Nixpkgs-like function that can be auto-called and evaluates to an attribute set. +*/ +{ + root, +}: +# The arguments for the Nixpkgs function +{ + # Passed by the checker to modify `callPackage` + overlays ? [], + # Passed by the checker to make sure a real Nixpkgs isn't influenced by impurities + config ? {}, +}: +let + + # Simplified versions of lib functions + lib = { + fix = f: let x = f x; in x; + + extends = overlay: f: final: + let + prev = f final; + in + prev // overlay final prev; + + callPackageWith = autoArgs: fn: args: + let + f = if builtins.isFunction fn then fn else import fn; + fargs = builtins.functionArgs f; + allArgs = builtins.intersectAttrs fargs autoArgs // args; + in + f allArgs; + + isDerivation = value: value.type or null == "derivation"; + }; + + # The base fixed-point function to populate the resulting attribute set + pkgsFun = self: { + inherit lib; + callPackage = lib.callPackageWith self; + someDrv = { type = "derivation"; }; + }; + + baseDirectory = root + "/pkgs/by-name"; + + # Generates { <name> = <file>; } entries mapping package names to their `package.nix` files in `pkgs/by-name`. + # Could be more efficient, but this is only for testing. + autoCalledPackageFiles = + let + entries = builtins.readDir baseDirectory; + + namesForShard = shard: + if entries.${shard} != "directory" then + # Only README.md is allowed to be a file, but it's not this code's job to check for that + { } + else + builtins.mapAttrs + (name: _: baseDirectory + "/${shard}/${name}/package.nix") + (builtins.readDir (baseDirectory + "/${shard}")); + + in + builtins.foldl' + (acc: el: acc // el) + { } + (map namesForShard (builtins.attrNames entries)); + + # Turns autoCalledPackageFiles into an overlay that `callPackage`'s all of them + autoCalledPackages = self: super: + builtins.mapAttrs (name: file: + self.callPackage file { } + ) autoCalledPackageFiles; + + # A list optionally containing the `all-packages.nix` file from the test case as an overlay + optionalAllPackagesOverlay = + if builtins.pathExists (root + "/all-packages.nix") then + [ (import (root + "/all-packages.nix")) ] + else + [ ]; + + # All the overlays in the right order, including the user-supplied ones + allOverlays = + [ + autoCalledPackages + ] + ++ optionalAllPackagesOverlay + ++ overlays; + + # Apply all the overlays in order to the base fixed-point function pkgsFun + f = builtins.foldl' (f: overlay: lib.extends overlay f) pkgsFun allOverlays; +in +# Evaluate the fixed-point +lib.fix f diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/no-by-name/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/no-by-name/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/no-by-name/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/expected new file mode 100644 index 000000000000..e6c923790102 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/expected @@ -0,0 +1 @@ +pkgs.nonDerivation: This attribute defined by pkgs/by-name/no/nonDerivation/package.nix is not a derivation diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/pkgs/by-name/no/nonDerivation/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/pkgs/by-name/no/nonDerivation/package.nix new file mode 100644 index 000000000000..bd68dba1ded5 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/pkgs/by-name/no/nonDerivation/package.nix @@ -0,0 +1 @@ +{ }: null diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/expected new file mode 100644 index 000000000000..e6c923790102 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/expected @@ -0,0 +1 @@ +pkgs.nonDerivation: This attribute defined by pkgs/by-name/no/nonDerivation/package.nix is not a derivation diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/pkgs/by-name/no/nonDerivation/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/pkgs/by-name/no/nonDerivation/package.nix new file mode 100644 index 000000000000..b021e28c2145 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/pkgs/by-name/no/nonDerivation/package.nix @@ -0,0 +1 @@ +{ }: { } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/one-letter/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/one-letter/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/one-letter/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/one-letter/pkgs/by-name/a/a/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/one-letter/pkgs/by-name/a/a/package.nix new file mode 100644 index 000000000000..a1b92efbbadb --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/one-letter/pkgs/by-name/a/a/package.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/all-packages.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/all-packages.nix new file mode 100644 index 000000000000..8bedb90d89a7 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/all-packages.nix @@ -0,0 +1,3 @@ +self: super: { + nonDerivation = self.callPackage ./someDrv.nix { }; +} diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected new file mode 100644 index 000000000000..1c6377d8aef0 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected @@ -0,0 +1 @@ +pkgs.nonDerivation: This attribute is not defined as `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`. diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/pkgs/by-name/no/nonDerivation/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/pkgs/by-name/no/nonDerivation/package.nix new file mode 100644 index 000000000000..bd68dba1ded5 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/pkgs/by-name/no/nonDerivation/package.nix @@ -0,0 +1 @@ +{ }: null diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/someDrv.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/someDrv.nix new file mode 100644 index 000000000000..a1b92efbbadb --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/someDrv.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/all-packages.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/all-packages.nix new file mode 100644 index 000000000000..4fad280ae1c7 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/all-packages.nix @@ -0,0 +1,3 @@ +self: super: { + nonDerivation = null; +} diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected new file mode 100644 index 000000000000..1c6377d8aef0 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected @@ -0,0 +1 @@ +pkgs.nonDerivation: This attribute is not defined as `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`. diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/pkgs/by-name/no/nonDerivation/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/pkgs/by-name/no/nonDerivation/package.nix new file mode 100644 index 000000000000..bd68dba1ded5 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/pkgs/by-name/no/nonDerivation/package.nix @@ -0,0 +1 @@ +{ }: null diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/all-packages.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/all-packages.nix new file mode 100644 index 000000000000..4c521d2d4468 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/all-packages.nix @@ -0,0 +1,3 @@ +self: super: { + nonDerivation = self.callPackage ({ }: { }) { }; +} diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected new file mode 100644 index 000000000000..1c6377d8aef0 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected @@ -0,0 +1 @@ +pkgs.nonDerivation: This attribute is not defined as `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`. diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/pkgs/by-name/no/nonDerivation/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/pkgs/by-name/no/nonDerivation/package.nix new file mode 100644 index 000000000000..bd68dba1ded5 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/pkgs/by-name/no/nonDerivation/package.nix @@ -0,0 +1 @@ +{ }: null diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/expected new file mode 100644 index 000000000000..3ad4b8f820f5 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/expected @@ -0,0 +1 @@ +pkgs/by-name/fo/foo: This path is a file, but it should be a directory. diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/pkgs/by-name/fo/foo b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/pkgs/by-name/fo/foo new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/pkgs/by-name/fo/foo diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/expected new file mode 100644 index 000000000000..67a0c69fe29e --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/expected @@ -0,0 +1 @@ +pkgs/by-name/fo/foo: "package.nix" must be a file. diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/pkgs/by-name/fo/foo/package.nix/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/pkgs/by-name/fo/foo/package.nix/default.nix new file mode 100644 index 000000000000..a1b92efbbadb --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/pkgs/by-name/fo/foo/package.nix/default.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/expected new file mode 100644 index 000000000000..7d20c32aad68 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/expected @@ -0,0 +1 @@ +pkgs/by-name/aa/aa: File package.nix at line 2 contains the path expression "/foo" which cannot be resolved: No such file or directory (os error 2). diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/pkgs/by-name/aa/aa/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/pkgs/by-name/aa/aa/package.nix new file mode 100644 index 000000000000..7a51ba1ec719 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/pkgs/by-name/aa/aa/package.nix @@ -0,0 +1,3 @@ +{ someDrv }: someDrv // { + escape = /foo; +} diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/expected new file mode 100644 index 000000000000..3d7fb64e80a3 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/expected @@ -0,0 +1 @@ +pkgs/by-name/aa/aa: File package.nix at line 2 contains the path expression "../." which may point outside the directory of that package. diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/pkgs/by-name/aa/aa/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/pkgs/by-name/aa/aa/package.nix new file mode 100644 index 000000000000..5989f52eb899 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/pkgs/by-name/aa/aa/package.nix @@ -0,0 +1,3 @@ +{ someDrv }: someDrv // { + escape = ../.; +} diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/expected new file mode 100644 index 000000000000..b0cdff4a4778 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/expected @@ -0,0 +1 @@ +pkgs/by-name/aa/aa: File package.nix at line 2 contains the nix search path expression "<nixpkgs>" which may point outside the directory of that package. diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/pkgs/by-name/aa/aa/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/pkgs/by-name/aa/aa/package.nix new file mode 100644 index 000000000000..864fdce13319 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/pkgs/by-name/aa/aa/package.nix @@ -0,0 +1,3 @@ +{ someDrv }: someDrv // { + nixPath = <nixpkgs>; +} diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/expected new file mode 100644 index 000000000000..281aba009236 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/expected @@ -0,0 +1 @@ +pkgs/by-name/aa/aa: File invalid.nix could not be parsed by rnix: unexpected token at 28..29 diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/pkgs/by-name/aa/aa/invalid.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/pkgs/by-name/aa/aa/invalid.nix new file mode 100644 index 000000000000..ee6b002a529b --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/pkgs/by-name/aa/aa/invalid.nix @@ -0,0 +1 @@ +this is not a valid nix file! diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/pkgs/by-name/aa/aa/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/pkgs/by-name/aa/aa/package.nix new file mode 100644 index 000000000000..a1b92efbbadb --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/pkgs/by-name/aa/aa/package.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/expected new file mode 100644 index 000000000000..ad662af27a86 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/expected @@ -0,0 +1 @@ +pkgs/by-name/aa/aa: File package.nix at line 2 contains the path expression "./${"test"}", which is not yet supported and may point outside the directory of that package. diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/pkgs/by-name/aa/aa/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/pkgs/by-name/aa/aa/package.nix new file mode 100644 index 000000000000..a94ba7541263 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/pkgs/by-name/aa/aa/package.nix @@ -0,0 +1,3 @@ +{ someDrv }: someDrv // { + pathWithSubexpr = ./${"test"}; +} diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/dir/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/dir/default.nix new file mode 100644 index 000000000000..7e4a7548fec7 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/dir/default.nix @@ -0,0 +1,2 @@ +# Recursive +../package.nix diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/file b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/file new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/file diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/file.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/file.nix new file mode 100644 index 000000000000..bd55e601bf64 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/file.nix @@ -0,0 +1,2 @@ +# Recursive test +import ./file.nix diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/package.nix new file mode 100644 index 000000000000..474db5b0ebfc --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/package.nix @@ -0,0 +1,5 @@ +{ someDrv }: someDrv // { + nixFile = ./file.nix; + nonNixFile = ./file; + directory = ./dir; +} diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/expected new file mode 100644 index 000000000000..447b38e6b6c1 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/expected @@ -0,0 +1 @@ +pkgs/by-name/fo: This is a file, but it should be a directory. diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/pkgs/by-name/fo b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/pkgs/by-name/fo new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/pkgs/by-name/fo diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/success/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/success/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/success/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/success/pkgs/by-name/fo/foo/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/success/pkgs/by-name/fo/foo/package.nix new file mode 100644 index 000000000000..a1b92efbbadb --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/success/pkgs/by-name/fo/foo/package.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/expected new file mode 100644 index 000000000000..335c5d6b6e5d --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/expected @@ -0,0 +1 @@ +pkgs/by-name/fo/foo: Path package.nix is a symlink pointing to a path outside the directory of that package. diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/pkgs/by-name/fo/foo/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/pkgs/by-name/fo/foo/package.nix new file mode 120000 index 000000000000..f079163d158a --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/pkgs/by-name/fo/foo/package.nix @@ -0,0 +1 @@ +../../../../someDrv.nix \ No newline at end of file diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/someDrv.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/someDrv.nix new file mode 100644 index 000000000000..a1b92efbbadb --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/someDrv.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/expected b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/expected new file mode 100644 index 000000000000..f622f3e7fd6d --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/expected @@ -0,0 +1 @@ +pkgs/by-name/fo/foo: Path foo.nix is a symlink which cannot be resolved: No such file or directory (os error 2). diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/pkgs/by-name/fo/foo/foo.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/pkgs/by-name/fo/foo/foo.nix new file mode 120000 index 000000000000..49cd425a8cdb --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/pkgs/by-name/fo/foo/foo.nix @@ -0,0 +1 @@ +none.nix \ No newline at end of file diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/pkgs/by-name/fo/foo/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/pkgs/by-name/fo/foo/package.nix new file mode 100644 index 000000000000..a1b92efbbadb --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/pkgs/by-name/fo/foo/package.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/someDrv.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/someDrv.nix new file mode 100644 index 000000000000..a1b92efbbadb --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/someDrv.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/uppercase/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/uppercase/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/uppercase/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/uppercase/pkgs/by-name/fo/FOO/package.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/uppercase/pkgs/by-name/fo/FOO/package.nix new file mode 100644 index 000000000000..a1b92efbbadb --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/uppercase/pkgs/by-name/fo/FOO/package.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/with-readme/default.nix b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/with-readme/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/with-readme/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/with-readme/pkgs/by-name/README.md b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/with-readme/pkgs/by-name/README.md new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/with-readme/pkgs/by-name/README.md diff --git a/nixpkgs/pkgs/test/texlive/default.nix b/nixpkgs/pkgs/test/texlive/default.nix index 1d339c1ddd0b..e2c714100f90 100644 --- a/nixpkgs/pkgs/test/texlive/default.nix +++ b/nixpkgs/pkgs/test/texlive/default.nix @@ -1,6 +1,31 @@ { lib, stdenv, buildEnv, runCommand, fetchurl, file, texlive, writeShellScript, writeText }: -{ +rec { + + mkTeXTest = lib.makeOverridable ( + { name + , format + , text + , texLive ? texlive.combined.scheme-small + , options ? "-interaction=errorstopmode" + , preTest ? "" + , postTest ? "" + , ... + }@attrs: runCommand "texlive-test-tex-${name}" + ({ + nativeBuildInputs = [ texLive ] ++ attrs.nativeBuildInputs or [ ]; + text = builtins.toFile "${name}.tex" text; + } // builtins.removeAttrs attrs [ "nativeBuildInputs" "text" "texLive" ]) + '' + export HOME="$(mktemp -d)" + mkdir "$out" + cd "$out" + cp "$text" "$name.tex" + ${preTest} + $format $options "$name.tex" + ${postTest} + '' + ); tlpdbNix = runCommand "texlive-test-tlpdb-nix" { nixpkgsTlpdbNix = ../../tools/typesetting/tex/texlive/tlpdb.nix; @@ -11,34 +36,32 @@ diff -u "''${nixpkgsTlpdbNix}" "''${tlpdbNix}" | tee "$out/tlpdb.nix.patch" ''; - opentype-fonts = runCommand "texlive-test-opentype" { - nativeBuildInputs = [ - (with texlive; combine { inherit scheme-medium libertinus-fonts; }) - ]; - input = builtins.toFile "opentype-testfile.tex" '' - \documentclass{article} - \usepackage{fontspec} - \setmainfont{Libertinus Serif} - \begin{document} - \LaTeX{} is great - \end{document} - ''; - } - '' - export HOME="$(mktemp -d)" - # We use the same testfile to test two completely different - # font discovery mechanisms, both of which were once broken: - # - lualatex uses its own luaotfload script (#220228) - # - xelatex uses fontconfig (#228196) - # both of the following two commands need to succeed. - lualatex -halt-on-error "$input" - xelatex -halt-on-error "$input" - echo success > $out - ''; + # test two completely different font discovery mechanisms, both of which were once broken: + # - lualatex uses its own luaotfload script (#220228) + # - xelatex uses fontconfig (#228196) + opentype-fonts = lib.recurseIntoAttrs rec { + lualatex = mkTeXTest { + name = "opentype-fonts-lualatex"; + format = "lualatex"; + texLive = texlive.combine { inherit (texlive) scheme-small libertinus-fonts; }; + text = '' + \documentclass{article} + \usepackage{fontspec} + \setmainfont{Libertinus Serif} + \begin{document} + \LaTeX{} is great + \end{document} + ''; + }; + xelatex = lualatex.override { + name = "opentype-fonts-xelatex"; + format = "xelatex"; + }; + }; chktex = runCommand "texlive-test-chktex" { nativeBuildInputs = [ - (with texlive; combine { inherit scheme-infraonly chktex; }) + (texlive.combine { inherit (texlive) scheme-infraonly chktex; }) ]; input = builtins.toFile "chktex-sample.tex" '' \documentclass{article} @@ -76,7 +99,7 @@ # test dvipng's limited capability to render postscript specials via GS ghostscript = runCommand "texlive-test-ghostscript" { - nativeBuildInputs = [ file (with texlive; combine { inherit scheme-small dvipng; }) ]; + nativeBuildInputs = [ file (texlive.combine { inherit (texlive) scheme-small dvipng; }) ]; input = builtins.toFile "postscript-sample.tex" '' \documentclass{minimal} \begin{document} @@ -143,8 +166,8 @@ texdoc = runCommand "texlive-test-texdoc" { nativeBuildInputs = [ - (with texlive; combine { - inherit scheme-infraonly luatex texdoc; + (texlive.combine { + inherit (texlive) scheme-infraonly luatex texdoc; pkgFilter = pkg: lib.elem pkg.tlType [ "run" "bin" "doc" ]; }) ]; @@ -155,6 +178,115 @@ grep texdoc.pdf "$out" ''; + # check that the default language is US English + defaultLanguage = lib.recurseIntoAttrs rec { + # language.def + etex = mkTeXTest { + name = "default-language-etex"; + format = "etex"; + text = '' + \catcode`\@=11 + \ifnum\language=\lang@USenglish \message{[tests.texlive] Default language is US English.} + \else\errmessage{[tests.texlive] Error: default language is NOT US English.}\fi + \ifnum\language=0\message{[tests.texlive] Default language has id 0.} + \else\errmessage{[tests.texlive] Error: default language does NOT have id 0.}\fi + \bye + ''; + }; + # language.dat + latex = mkTeXTest { + name = "default-language-latex"; + format = "latex"; + text = '' + \makeatletter + \ifnum\language=\l@USenglish \GenericWarning{}{[tests.texlive] Default language is US English} + \else\GenericError{}{[tests.texlive] Error: default language is NOT US English}{}{}\fi + \ifnum\language=0\GenericWarning{}{[tests.texlive] Default language has id 0} + \else\GenericError{}{[tests.texlive] Error: default language does NOT have id 0}{}{}\fi + \stop + ''; + }; + # language.dat.lua + luatex = etex.override { + name = "default-language-luatex"; + format = "luatex"; + }; + }; + + # check that all languages are available, including synonyms + allLanguages = let hyphenBase = lib.head texlive.hyphen-base.pkgs; texLive = texlive.combined.scheme-full; in + lib.recurseIntoAttrs { + # language.def + etex = mkTeXTest { + name = "all-languages-etex"; + format = "etex"; + inherit hyphenBase texLive; + text = '' + \catcode`\@=11 + \input kvsetkeys.sty + \def\CheckLang#1{ + \ifcsname lang@#1\endcsname\message{[tests.texlive] Found language #1} + \else\errmessage{[tests.texlive] Error: missing language #1}\fi + } + \comma@parse{@texLanguages@}\CheckLang + \bye + ''; + preTest = '' + texLanguages="$(sed -n -E 's/^\\addlanguage\s*\{([^}]+)\}.*$/\1/p' < "$hyphenBase"/tex/generic/config/language.def)" + texLanguages="''${texLanguages//$'\n'/,}" + substituteInPlace "$name.tex" --subst-var texLanguages + ''; + }; + # language.dat + latex = mkTeXTest { + name = "all-languages-latex"; + format = "latex"; + inherit hyphenBase texLive; + text = '' + \makeatletter + \@for\Lang:=italian,@texLanguages@\do{ + \ifcsname l@\Lang\endcsname + \GenericWarning{}{[tests.texlive] Found language \Lang} + \else + \GenericError{}{[tests.texlive] Error: missing language \Lang}{}{} + \fi + } + \stop + ''; + preTest = '' + texLanguages="$(sed -n -E 's/^([^%= \t]+).*$/\1/p' < "$hyphenBase"/tex/generic/config/language.dat)" + texLanguages="''${texLanguages//$'\n'/,}" + substituteInPlace "$name.tex" --subst-var texLanguages + ''; + }; + # language.dat.lua + luatex = mkTeXTest { + name = "all-languages-luatex"; + format = "luatex"; + inherit hyphenBase texLive; + text = '' + \directlua{ + require('luatex-hyphen.lua') + langs = '@texLanguages@,' + texio.write('\string\n') + for l in langs:gmatch('([^,]+),') do + if luatexhyphen.lookupname(l) \string~= nil then + texio.write('[tests.texlive] Found language '..l..'.\string\n') + else + error('[tests.texlive] Error: missing language '..l..'.', 2) + end + end + } + \bye + ''; + preTest = '' + texLanguages="$(sed -n -E 's/^.*\[("|'\''')(.*)("|'\''')].*$/\2/p' < "$hyphenBase"/tex/generic/config/language.dat.lua)" + texLanguages="''${texLanguages//$'\n'/,}" + substituteInPlace "$name.tex" --subst-var texLanguages + ''; + }; + }; + # test that language files are generated as expected hyphen-base = runCommand "texlive-test-hyphen-base" { hyphenBase = lib.head texlive.hyphen-base.pkgs; @@ -511,4 +643,25 @@ echo "$errorText" false ''); + + # verify that all fixed hashes are present + # this is effectively an eval-time assertion, converted into a derivation for + # ease of testing + fixedHashes = with lib; let + combine = findFirst (p: (head p.pkgs).pname == "combine") { pkgs = []; } (head texlive.collection-latexextra.pkgs).tlDeps; + all = concatLists (map (p: p.pkgs or []) (attrValues (removeAttrs texlive [ "bin" "combine" "combined" "tlpdb" ]))) ++ combine.pkgs; + fods = filter (p: isDerivation p && p.tlType != "bin") all; + errorText = concatMapStrings (p: optionalString (! p ? outputHash) "${p.pname + optionalString (p.tlType != "run") ("." + p.tlType)} does not have a fixed output hash\n") fods; + in runCommand "texlive-test-fixed-hashes" { + inherit errorText; + passAsFile = [ "errorText" ]; + } '' + if [[ -s "$errorTextPath" ]] ; then + cat "$errorTextPath" + echo Failed: some TeX Live packages do not have fixed output hashes. Please read UPGRADING.md for how to generate a new fixed-hashes.nix. + exit 1 + else + touch "$out" + fi + ''; } diff --git a/nixpkgs/pkgs/tools/X11/gobble/default.nix b/nixpkgs/pkgs/tools/X11/gobble/default.nix new file mode 100644 index 000000000000..46b1b2c4b482 --- /dev/null +++ b/nixpkgs/pkgs/tools/X11/gobble/default.nix @@ -0,0 +1,37 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, xorg +, installShellFiles +, pandoc +}: + +rustPlatform.buildRustPackage rec { + pname = "gobble"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "EmperorPenguin18"; + repo = pname; + rev = version; + hash = "sha256-g4154Axvjp9jbE0lvMeNGM+v2UxkAsZqt9kPv5bhVK8="; + }; + + cargoHash = "sha256-5xsMLOYTKQc1bHHQsk9L4rHMVNBFOzIMxD+1qaMaNbQ="; + + buildInputs = [ xorg.libxcb ]; + nativeBuildInputs = [ pandoc installShellFiles ]; + + postInstall = '' + pandoc gobble.1.md -s -t man -o gobble.1 + installManPage gobble.1 + ''; + + meta = { + description = "gobbles your terminal"; + homepage = "https://github.com/EmperorPenguin18/gobble"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ vuimuich ]; + platforms = lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix b/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix index 402af6119636..d237e4f748f9 100644 --- a/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.177"; + version = "3.0.179"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-A63cRbIEXsX8mmbbXqsT7athWN8vrZLRnUyurb0HNDA="; + sha256 = "sha256-AQsmk5Kl/uGUeT3hNEuqg28q+hXtkz3E7J2Q0FOdr8U="; }; vendorHash = "sha256-81z4bflVzDCl6IiYnTwFPsLHXq87OiKv4aDmZq05Nqc="; diff --git a/nixpkgs/pkgs/tools/admin/amazon-ec2-utils/default.nix b/nixpkgs/pkgs/tools/admin/amazon-ec2-utils/default.nix index 1225005cfb79..ed472b2a930e 100644 --- a/nixpkgs/pkgs/tools/admin/amazon-ec2-utils/default.nix +++ b/nixpkgs/pkgs/tools/admin/amazon-ec2-utils/default.nix @@ -1,30 +1,33 @@ { stdenv , lib , fetchFromGitHub -, curl -, gawk +, bash , python3 , installShellFiles -, bash +, gawk +, curl }: + stdenv.mkDerivation rec { pname = "amazon-ec2-utils"; - version = "2.0"; + version = "2.1.0"; src = fetchFromGitHub { - owner = "aws"; + owner = "amazonlinux"; repo = "amazon-ec2-utils"; - rev = "v${version}"; - hash = "sha256-u1rHBV8uVcCywvQNYagtDleYB12tmhyqDbXTBzt45dk="; + rev = "refs/tags/v${version}"; + hash = "sha256-Yr6pVwyvyVGV4xrjL7VFSkRH8d1w8VLPMTVjXfneJUM="; }; outputs = [ "out" "man" ]; strictDeps = true; + buildInputs = [ - python3 bash + python3 ]; + nativeBuildInputs = [ installShellFiles ]; @@ -66,9 +69,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/aws/amazon-ec2-utils"; + changelog = "https://github.com/amazonlinux/amazon-ec2-utils/releases/tag/v${version}"; description = "Contains a set of utilities and settings for Linux deployments in EC2"; + homepage = "https://github.com/amazonlinux/amazon-ec2-utils"; license = licenses.mit; - maintainers = with maintainers; [ ketzacoatl thefloweringash ]; + maintainers = with maintainers; [ ketzacoatl thefloweringash anthonyroussel ]; }; } diff --git a/nixpkgs/pkgs/tools/admin/ansible/lint.nix b/nixpkgs/pkgs/tools/admin/ansible/lint.nix index f62b3f4b3941..c28892bc8260 100644 --- a/nixpkgs/pkgs/tools/admin/ansible/lint.nix +++ b/nixpkgs/pkgs/tools/admin/ansible/lint.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "ansible-lint"; - version = "6.17.1"; + version = "6.18.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-804zPzVVyZ/zTHePYdRw0eOh623HYJDQ3XuVsslHRcI="; + hash = "sha256-VHRO5/j9DsOAUfC23yFTUjk5o5HuS7SPCIW1/N2C+bk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix b/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix index c381d05bb4ff..18b312c6a1c0 100644 --- a/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - hash = "sha256-RshR1GA3BvvPwwkVxrM98FfgW3kNaMM0Vqr7iEuoFek="; + hash = "sha256-mINJtjSOmU6oUNIPa5Hl5fG5FqTFM8AJg9jH8WmIAHE="; }; vendorHash = "sha256-skFENAr5XjdKoAyVwXYJVZH+IviqfyZmMIdgHq+7IPs="; diff --git a/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/nixpkgs/pkgs/tools/admin/awscli2/default.nix index ef44da70227b..c2465ea95914 100644 --- a/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -3,7 +3,6 @@ , groff , less , fetchFromGitHub -, fetchpatch , nix-update-script , testers , awscli2 @@ -24,31 +23,27 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.13.7"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.13.13"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; - rev = version; - hash = "sha256-SQ9ggHSpQioptic5qjrhCB63t9pld7KGAeCNtq4OJyQ="; + rev = "refs/tags/${version}"; + hash = "sha256-0Wx/Ze6W0Fa8OzM79PFu2liSxl1UwuUqIoYT0WhTk5k="; }; - patches = [ - # https://github.com/aws/aws-cli/pull/7912 - (fetchpatch { - name = "update-flit-core.patch"; - url = "https://github.com/aws/aws-cli/commit/83412a4b2ec750bada640a34a87bfe07ce41fb50.patch"; - hash = "sha256-uhO6aOSptsARYWuXXEFhx+6rCW5/uGn2KQ15BnhzH68="; - }) - ]; - 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 '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' + + substituteInPlace requirements-base.txt \ + --replace "wheel==0.38.4" "wheel>=0.38.4" \ + --replace "flit_core==3.8.0" "flit_core>=3.8.0" - # upstream needs pip to build and install dependencies and validates this + # Upstream needs pip to build and install dependencies and validates this # with a configure script, but we don't as we provide all of the packages # through PYTHONPATH sed -i '/pip>=/d' requirements/bootstrap.txt @@ -61,18 +56,18 @@ with py.pkgs; buildPythonApplication rec { propagatedBuildInputs = [ awscrt bcdoc + botocore colorama cryptography distro docutils groff + jmespath less prompt-toolkit + python-dateutil pyyaml - rsa ruamel-yaml - python-dateutil - jmespath urllib3 ]; @@ -131,9 +126,9 @@ 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"; changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; - description = "Unified tool to manage your AWS services"; license = licenses.asl20; maintainers = with maintainers; [ bhipple davegallant bryanasdev000 devusb anthonyroussel ]; mainProgram = "aws"; diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index 625d68dabc0a..392063126229 100644 --- a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -5,7 +5,7 @@ let overrideAzureMgmtPackage = package: version: extension: hash: # check to make sure overriding is even necessary - package.overrideAttrs(oldAttrs: rec { + package.overridePythonAttrs (oldAttrs: rec { inherit version; src = fetchPypi { @@ -121,6 +121,11 @@ let azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "4.0.0" "zip" "sha256-AiTjLJ28g80xnrRFLfPUevJgeaxLpuGmvkd3+FskNiw="; + azure-mgmt-appcontainers = (overrideAzureMgmtPackage super.azure-mgmt-appcontainers "2.0.0" "zip" + "sha256-ccdIdvdgTYPWEZCWqkLc8lEuMuAEERvl5B1huJyBkvU=").overridePythonAttrs (attrs: { + propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; + }); + azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "17.0.0" "zip" "sha256-hkM4WVLuwxj4qgXsY8Ya7zu7/v37gKdP0Xbf2EqrsWo="; @@ -164,7 +169,7 @@ let "sha256-eNQ3rbKFdPRIyDjtXwH5ztN4GWCYBh3rWdn3AxcEwX4="; azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "25.0.0" "zip" - "sha256-je7O92bklsbIlfsTUF2TXUqztAZxn8ep4ezCUHeLuhE="; + "sha256-je7O92bklsbIlfsTUF2TXUqztAZxn8ep4ezCUHeLuhE="; azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "9.2.0" "zip" "sha256-PAaBkR77Ho2YI5I+lmazR/8vxEZWpbvM427yRu1ET0k="; @@ -205,8 +210,10 @@ let azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "13.0.0b4" "zip" "sha256-Jm1t7v5vyFjNNM/evVaEI9sXJKNwJk6XAXuJSRSnKHk="; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "21.0.1" "zip" - "sha256-7PduPg0JK4f/3q/b5pq58TjqVk+Iu+vxa+aJKDnScy8="; + azure-mgmt-network = (overrideAzureMgmtPackage super.azure-mgmt-network "21.0.1" "zip" + "sha256-7PduPg0JK4f/3q/b5pq58TjqVk+Iu+vxa+aJKDnScy8=").overridePythonAttrs (attrs: { + propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; + }); azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "2.0.0" "zip" "sha256-OE4X92potwCk+YhHiUXDqXIXEcBAByWv38tjz4ToXw4="; @@ -223,7 +230,7 @@ let azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "9.0.0" "zip" "sha256-TI7l8sSQ2QUgPqiE3Cu/F67Wna+KHbQS3fuIjOb95ZM="; - azure-mgmt-msi = super.azure-mgmt-msi.overridePythonAttrs(old: rec { + azure-mgmt-msi = super.azure-mgmt-msi.overridePythonAttrs (old: rec { version = "7.0.0"; src = old.src.override { inherit version; @@ -282,8 +289,10 @@ let azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "10.1.0" "zip" "sha256-VrX9YfYNvlA8+eNqHCp35BAeQZzQKakZs7ZZKwT8oYc="; - azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "5.0.0" "zip" - "sha256-eL9KJowxTF7hZJQQQCNJZ7l+rKPFM8wP5vEigt3ZFGE="; + azure-mgmt-monitor = (overrideAzureMgmtPackage super.azure-mgmt-monitor "5.0.0" "zip" + "sha256-eL9KJowxTF7hZJQQQCNJZ7l+rKPFM8wP5vEigt3ZFGE=").overridePythonAttrs (attrs: { + propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; + }); azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip" "sha256-/ECLNzFf6EeBtRkST4yxuKwQsvQkHkOdDT4l/WyhjXs="; @@ -312,7 +321,7 @@ let azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "1.2.0" "tar.gz" "sha256-CQuoWHeh0EMitTRsvifotrTwpWd/Q9LWWD7jZ2w9r8I="; - azure-appconfiguration = super.azure-appconfiguration.overrideAttrs(oldAttrs: rec { + azure-appconfiguration = super.azure-appconfiguration.overrideAttrs (oldAttrs: rec { version = "1.1.1"; src = fetchPypi { @@ -323,7 +332,7 @@ let }; }); - azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { + azure-graphrbac = super.azure-graphrbac.overrideAttrs (oldAttrs: rec { version = "0.60.0"; src = fetchPypi { @@ -334,7 +343,7 @@ let }; }); - azure-storage-blob = super.azure-storage-blob.overrideAttrs(oldAttrs: rec { + azure-storage-blob = super.azure-storage-blob.overrideAttrs (oldAttrs: rec { version = "1.5.0"; src = fetchPypi { inherit (oldAttrs) pname; @@ -343,7 +352,7 @@ let }; }); - azure-storage-common = super.azure-storage-common.overrideAttrs(oldAttrs: rec { + azure-storage-common = super.azure-storage-common.overrideAttrs (oldAttrs: rec { version = "1.4.2"; src = fetchPypi { inherit (oldAttrs) pname; @@ -352,7 +361,7 @@ let }; }); - azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs(oldAttrs: rec { + azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs (oldAttrs: rec { version = "0.15.0"; src = fetchPypi { inherit (oldAttrs) pname; @@ -365,7 +374,7 @@ let ]; }); - azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs(oldAttrs: rec { + azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs (oldAttrs: rec { version = "0.5.0"; src = fetchPypi { inherit (oldAttrs) pname; @@ -375,7 +384,7 @@ let }; }); - azure-synapse-managedprivateendpoints = super.azure-synapse-managedprivateendpoints.overrideAttrs(oldAttrs: rec { + azure-synapse-managedprivateendpoints = super.azure-synapse-managedprivateendpoints.overrideAttrs (oldAttrs: rec { version = "0.4.0"; src = fetchPypi { inherit (oldAttrs) pname; @@ -385,7 +394,7 @@ let }; }); - azure-synapse-spark = super.azure-synapse-spark.overrideAttrs(oldAttrs: rec { + azure-synapse-spark = super.azure-synapse-spark.overrideAttrs (oldAttrs: rec { version = "0.2.0"; src = fetchPypi { inherit (oldAttrs) pname; @@ -395,7 +404,7 @@ let }; }); - azure-keyvault = super.azure-keyvault.overrideAttrs(oldAttrs: rec { + azure-keyvault = super.azure-keyvault.overrideAttrs (oldAttrs: rec { version = "1.1.0"; src = fetchPypi { inherit (oldAttrs) pname; @@ -415,7 +424,7 @@ let pythonImportsCheck = [ ]; }); - azure-keyvault-administration = super.azure-keyvault-administration.overridePythonAttrs(oldAttrs: rec { + azure-keyvault-administration = super.azure-keyvault-administration.overridePythonAttrs (oldAttrs: rec { version = "4.3.0"; src = fetchPypi { inherit (oldAttrs) pname; @@ -425,7 +434,7 @@ let }; }); - azure-keyvault-keys = super.azure-keyvault-keys.overridePythonAttrs(oldAttrs: rec { + azure-keyvault-keys = super.azure-keyvault-keys.overridePythonAttrs (oldAttrs: rec { version = "4.8.0b2"; src = fetchPypi { inherit (oldAttrs) pname; @@ -437,7 +446,7 @@ let # part of azure.mgmt.datalake namespace - azure-mgmt-datalake-analytics = super.azure-mgmt-datalake-analytics.overrideAttrs(oldAttrs: rec { + azure-mgmt-datalake-analytics = super.azure-mgmt-datalake-analytics.overrideAttrs (oldAttrs: rec { version = "0.2.1"; src = fetchPypi { @@ -454,7 +463,7 @@ let ''; }); - azure-mgmt-datalake-store = super.azure-mgmt-datalake-store.overrideAttrs(oldAttrs: rec { + azure-mgmt-datalake-store = super.azure-mgmt-datalake-store.overrideAttrs (oldAttrs: rec { version = "0.5.0"; src = fetchPypi { @@ -471,7 +480,7 @@ let ''; }); - adal = super.adal.overridePythonAttrs(oldAttrs: rec { + adal = super.adal.overridePythonAttrs (oldAttrs: rec { version = "1.2.7"; src = fetchPypi { @@ -484,7 +493,7 @@ let doCheck = false; }); - msal = super.msal.overridePythonAttrs(oldAttrs: rec { + msal = super.msal.overridePythonAttrs (oldAttrs: rec { version = "1.24.0b1"; src = fetchPypi { @@ -494,7 +503,7 @@ let }; }); - semver = super.semver.overridePythonAttrs(oldAttrs: rec { + semver = super.semver.overridePythonAttrs (oldAttrs: rec { version = "2.13.0"; src = fetchPypi { @@ -504,7 +513,7 @@ let }; }); - jsondiff = super.jsondiff.overridePythonAttrs(oldAttrs: rec { + jsondiff = super.jsondiff.overridePythonAttrs (oldAttrs: rec { version = "2.0.0"; src = oldAttrs.src.override { @@ -513,7 +522,7 @@ let }; }); - knack = super.knack.overridePythonAttrs(oldAttrs: rec { + knack = super.knack.overridePythonAttrs (oldAttrs: rec { version = "0.11.0"; src = fetchPypi { @@ -523,7 +532,7 @@ let }; }); - argcomplete = super.argcomplete.overridePythonAttrs(oldAttrs: rec { + argcomplete = super.argcomplete.overridePythonAttrs (oldAttrs: rec { version = "3.1.1"; src = fetchPypi { @@ -533,7 +542,7 @@ let }; }); - sshtunnel = super.sshtunnel.overridePythonAttrs(oldAttrs: rec { + sshtunnel = super.sshtunnel.overridePythonAttrs (oldAttrs: rec { name = "sshtunnel-${version}"; version = "0.1.5"; @@ -544,7 +553,7 @@ let }; }); - websocket-client = super.websocket-client.overridePythonAttrs(oldAttrs: rec { + websocket-client = super.websocket-client.overridePythonAttrs (oldAttrs: rec { version = "1.3.1"; src = oldAttrs.src.override { @@ -553,7 +562,7 @@ let }; }); - azure-mgmt-resource = super.azure-mgmt-resource.overridePythonAttrs(oldAttrs: rec { + azure-mgmt-resource = super.azure-mgmt-resource.overridePythonAttrs (oldAttrs: rec { version = "23.1.0b2"; src = oldAttrs.src.override { @@ -564,4 +573,4 @@ let }; }; in - py +py diff --git a/nixpkgs/pkgs/tools/admin/balena-cli/default.nix b/nixpkgs/pkgs/tools/admin/balena-cli/default.nix index 827d4e162b51..bb674a83f322 100644 --- a/nixpkgs/pkgs/tools/admin/balena-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/balena-cli/default.nix @@ -1,47 +1,49 @@ { lib , stdenv -, fetchzip +, buildNpmPackage +, fetchFromGitHub , testers +, balena-cli +, nodePackages +, python3 +, udev +, darwin }: -let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - plat = { - x86_64-linux = "linux-x64"; - x86_64-darwin = "macOS-x64"; - # Balena only packages for x86 so we rely on Rosetta for Apple Silicon - aarch64-darwin = "macOS-x64"; - }.${system} or throwSystem; - - sha256 = { - x86_64-linux = "sha256-USljQ/cnbSabzsZWXlZ0eeZSqkTr3wVP0ktXqZ7Fw4U="; - x86_64-darwin = "sha256-NWzJPB+HzlsB6yTcEMwTg8pioonGWPOU96jyIpiZiTY="; - aarch64-darwin = "sha256-NWzJPB+HzlsB6yTcEMwTg8pioonGWPOU96jyIpiZiTY="; - }.${system} or throwSystem; - - version = "16.7.6"; - src = fetchzip { - url = "https://github.com/balena-io/balena-cli/releases/download/v${version}/balena-cli-v${version}-${plat}-standalone.zip"; - inherit sha256; - }; -in -stdenv.mkDerivation (finalAttrs: { +buildNpmPackage rec { pname = "balena-cli"; - inherit version src; + version = "17.0.0"; - installPhase = '' - runHook preInstall + src = fetchFromGitHub { + owner = "balena-io"; + repo = "balena-cli"; + rev = "v${version}"; + hash = "sha256-sNpxjSumiP+4fX6b3j+HEl/lr4pvudrhfTzr2TYastE="; + }; - mkdir -p $out/bin - cp -r ./* $out/ - ln -s $out/balena $out/bin/balena + npmDepsHash = "sha256-q2Yc6e5dEiP2Q4tFIeqj4mswM1/pX1pdGeoagyiupvs="; - runHook postInstall + postPatch = '' + ln -s npm-shrinkwrap.json package-lock.json ''; + makeCacheWritable = true; + + nativeBuildInputs = [ + nodePackages.node-gyp + python3 + ] ++ lib.optionals stdenv.isDarwin [ + darwin.cctools + ]; + + buildInputs = lib.optionals stdenv.isLinux [ + udev + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.Cocoa + ]; passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; + package = balena-cli; command = '' # Override default cache directory so Balena CLI's unavoidable update check does not fail due to write permissions BALENARC_DATA_DIRECTORY=./ balena --version @@ -49,46 +51,6 @@ stdenv.mkDerivation (finalAttrs: { inherit version; }; - # https://github.com/NixOS/nixpkgs/pull/48193/files#diff-b65952dbe5271c002fbc941b01c3586bf5050ad0e6aa6b2fcc74357680e103ea - preFixup = - if stdenv.isLinux then - let - libPath = lib.makeLibraryPath [ stdenv.cc.cc ]; - in - '' - orig_size=$(stat --printf=%s $out/balena) - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/balena - patchelf --set-rpath ${libPath} $out/balena - chmod +x $out/balena - new_size=$(stat --printf=%s $out/balena) - ###### zeit-pkg fixing starts here. - # we're replacing plaintext js code that looks like - # PAYLOAD_POSITION = '1234 ' | 0 - # [...] - # PRELUDE_POSITION = '1234 ' | 0 - # ^-----20-chars-----^^------22-chars------^ - # ^-- grep points here - # - # var_* are as described above - # shift_by seems to be safe so long as all patchelf adjustments occur - # before any locations pointed to by hardcoded offsets - var_skip=20 - var_select=22 - shift_by=$(expr $new_size - $orig_size) - function fix_offset { - # $1 = name of variable to adjust - location=$(grep -obUam1 "$1" $out/bin/balena | cut -d: -f1) - location=$(expr $location + $var_skip) - value=$(dd if=$out/balena iflag=count_bytes,skip_bytes skip=$location \ - bs=1 count=$var_select status=none) - value=$(expr $shift_by + $value) - echo -n $value | dd of=$out/balena bs=1 seek=$location conv=notrunc - } - fix_offset PAYLOAD_POSITION - fix_offset PRELUDE_POSITION - '' else ''''; - dontStrip = true; - meta = with lib; { description = "A command line interface for balenaCloud or openBalena"; longDescription = '' @@ -100,9 +62,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/balena-io/balena-cli"; changelog = "https://github.com/balena-io/balena-cli/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = [ maintainers.kalebpace ]; - platforms = platforms.linux ++ platforms.darwin; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + maintainers = [ maintainers.kalebpace maintainers.doronbehar ]; mainProgram = "balena"; }; -}) +} diff --git a/nixpkgs/pkgs/tools/admin/coldsnap/default.nix b/nixpkgs/pkgs/tools/admin/coldsnap/default.nix index 93f9baa3de85..417bbd14c139 100644 --- a/nixpkgs/pkgs/tools/admin/coldsnap/default.nix +++ b/nixpkgs/pkgs/tools/admin/coldsnap/default.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage rec { pname = "coldsnap"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-WqNGajtezhBDYmgUayKjdNAZSyKirIYeYOnozMCIya4="; + hash = "sha256-zXLt16ffqbExU23uRI7U99nUwpSKTIf039dDq+k2KAA="; }; - cargoHash = "sha256-av9hsvY8xsB+HlIRLYNFDJc9eyBfOyBZ347vWoVsDmM="; + cargoHash = "sha256-RRyAzD9eiscZ9kB5tFh5vUnGk6XYYKy0/TAjcaygmG4="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix b/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix index a9cd2230ed8d..b7176656363a 100644 --- a/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.29.1"; + version = "1.30.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Mfh3Bym9aVvCaRHcSyg68KqA1Zx0tt7x52IOzvC+61M="; + hash = "sha256-Q495MJlvElm5yrX4QWrwvB62Tdzq0W5pTYsTXyw9Idw="; }; - vendorHash = "sha256-0QPUvKGuR4fhXUoak6PqkBXsg+WkAOlSluci6/+ULB8="; + vendorHash = "sha256-/2uUiFL2wL+gAzqY2S3sqytPLKB5+QkYXCBNLqSJSWU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 9153e4c4ecfc..d3472f4dae51 100644 --- a/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.151.0"; + version = "0.154.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-XZo4g66r/pvIHT5XqvQYcwPzrYUGoQKNE2h5skhPzU4="; + hash = "sha256-GPJym+U6wBEJSvDYoXAwgCFqzTvXSVK2i/AN+X1S6Oo="; }; - vendorHash = "sha256-p+zCwVKUP6igQLR5GycsmF2oNyDfP/EEgg89kBDS1VU="; + vendorHash = "sha256-/aL1mweWPJRjjqzGBcGc7UHcH0ymVANdu2LkpoCTkh0="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix b/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix index 8d35085eb454..e33587b94670 100644 --- a/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix +++ b/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix @@ -42,14 +42,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "gimme-aws-creds"; - version = "2.7.1"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.7.2"; # N.B: if you change this, check if overrides are still up-to-date format = "setuptools"; src = fetchFromGitHub { owner = "Nike-Inc"; repo = "gimme-aws-creds"; rev = "v${version}"; - hash = "sha256-vn3DzDqu19g6Z/RcWsktJxmeg6oK9NIEyjpH9g1tXNs="; + hash = "sha256-ydzGaUQ43vvQqU9xvhPJqHG/2PUtBbASIVpZCDnsR60="; }; nativeBuildInputs = with python.pkgs; [ @@ -71,6 +71,11 @@ python.pkgs.buildPythonApplication rec { pyjwt ]; + preCheck = '' + # Disable using platform's keyring unavailable in sandbox + export PYTHON_KEYRING_BACKEND="keyring.backends.fail.Keyring" + ''; + checkInputs = with python.pkgs; [ pytestCheckHook responses diff --git a/nixpkgs/pkgs/tools/admin/granted/default.nix b/nixpkgs/pkgs/tools/admin/granted/default.nix index cfea2994df6b..907d440174ff 100644 --- a/nixpkgs/pkgs/tools/admin/granted/default.nix +++ b/nixpkgs/pkgs/tools/admin/granted/default.nix @@ -1,7 +1,10 @@ { bash , buildGoModule , fetchFromGitHub + +, withFish ? false , fish + , lib , makeWrapper , xdg-utils @@ -36,6 +39,8 @@ buildGoModule rec { ]; postInstall = '' + ln -s $out/bin/granted $out/bin/assumego + # Install shell script install -Dm755 $src/scripts/assume $out/bin/assume substituteInPlace $out/bin/assume \ @@ -44,6 +49,7 @@ buildGoModule rec { wrapProgram $out/bin/assume \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + '' + lib.optionalString withFish '' # Install fish script install -Dm755 $src/scripts/assume.fish $out/share/assume.fish substituteInPlace $out/share/assume.fish \ @@ -56,5 +62,10 @@ buildGoModule rec { changelog = "https://github.com/common-fate/granted/releases/tag/${version}"; license = licenses.mit; maintainers = [ maintainers.ivankovnatsky ]; + # Could not figure out how to use this application without any hustle. Weird + # linking of binary, aliases for god knows what. + # https://docs.commonfate.io/granted/usage/assuming-roles. + # Will mark as broken until maybe someone fixes it. Switched to aws-sso. + broken = true; }; } diff --git a/nixpkgs/pkgs/tools/admin/hop-cli/default.nix b/nixpkgs/pkgs/tools/admin/hop-cli/default.nix index eea6a9e73661..794b5be90ef4 100644 --- a/nixpkgs/pkgs/tools/admin/hop-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/hop-cli/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "hop-cli"; - version = "0.2.52"; + version = "0.2.53"; src = fetchFromGitHub { owner = "hopinc"; repo = "cli"; rev = "v${version}"; - hash = "sha256-xuOkW5jetl+8obeFJnbkVZa+wYWfTNiTOmcrzC8+wGE="; + hash = "sha256-DyM8OEgO2OtD/PD/I6Ys2Yg0gQMB21OnjFdDkWKw+Io="; }; - cargoHash = "sha256-ePUlw4UzsQ2lNuJ5g5OAYh6nKTIoHdDMb34Jzuqtas8="; + cargoHash = "sha256-R6Dbje6OEndJxyWJ8cR/QcfdIBw88Vfbve+EYGozWNc="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/tools/admin/lxd/default.nix b/nixpkgs/pkgs/tools/admin/lxd/default.nix index 427d60f3edf6..5e123ff6685b 100644 --- a/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -18,11 +18,11 @@ buildGoModule rec { pname = "lxd-unwrapped"; - version = "5.16"; + version = "5.17"; src = fetchurl { url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"; - hash = "sha256-evtNPZvnx8rzr/tJkEp0E7BhUBWHBSJdMtZJQk3VZI8="; + hash = "sha256-21pw8Q8UYjuxdaKzNXoTanxxyTNRXXbuerIZPIQK4yg="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix b/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix index 971e47d3ad61..9c88c2d39b89 100644 --- a/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.65.1"; + version = "0.67.1"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0Wg6E89+k7YKx+DpIcO76NJ+VzGPQc07PoR0FvmYeKg="; + hash = "sha256-mVn+Q4XZ+jJjHR+V5Rl/rPUZN/Tv7vVX7u6IDuJNdO0="; }; vendorHash = "sha256-Fcm/f54zGgA742yhIVJxjv7Y2T8DblC71+hw5HTmOf0="; diff --git a/nixpkgs/pkgs/tools/admin/simplotask/default.nix b/nixpkgs/pkgs/tools/admin/simplotask/default.nix index ac5ccbaa89e2..127fd46f7814 100644 --- a/nixpkgs/pkgs/tools/admin/simplotask/default.nix +++ b/nixpkgs/pkgs/tools/admin/simplotask/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "simplotask"; - version = "1.11.3"; + version = "1.11.4"; src = fetchFromGitHub { owner = "umputun"; repo = "spot"; rev = "v${version}"; - hash = "sha256-sNYC8QQmVdBjHU3/pDD4TGLDxKsMLyMmZa7wBVlWnGM="; + hash = "sha256-G/T7LF8ujlCSbK1Lv2h43OZVx52yrLDr+6e/WxhaHOo="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix index 5d31ab07fdad..727f6f605cbe 100644 --- a/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - hash = "sha256-F+mnFarlrlQ+bq7q6CoyDPPQ7uv5y9pBRT072JRlS/4="; + hash = "sha256-5j2DHbBLHQWtkQP8qTTxD949alo5mh88Vgv5cus8C/w="; }; vendorHash = "sha256-DYA6cu2KzEBZ4wsT7wjcdY1endQQOZlj2aOwu6iGLew="; @@ -29,7 +29,7 @@ buildGoModule rec { rm pkg/cmd/resources_test.go rm pkg/cmd/root_test.go - # TODO: no clue why it's broken (1.17.0), remove for now. + # TODO: no clue why it's broken (1.17.1), remove for now. rm pkg/login/client_login_test.go rm pkg/git/editor_test.go rm pkg/rpcservice/sample_create_test.go diff --git a/nixpkgs/pkgs/tools/admin/syft/default.nix b/nixpkgs/pkgs/tools/admin/syft/default.nix index c8f91dc0fe65..0f823492d32c 100644 --- a/nixpkgs/pkgs/tools/admin/syft/default.nix +++ b/nixpkgs/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.87.0"; + version = "0.88.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-qDeUo/xAGCy/Ih5B8AyiJ7q9aCd5iWNkW7T+0OqAfTY="; + hash = "sha256-A9EYbZigG6TmyYhMjqhpZRaYnR7KzCJpaOBEEaSXWQ4="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-7lrim4N3hT2qkpTIVF1A/GUu5BfJ3Z8A6H1nd8yHwaw="; + vendorHash = "sha256-7KL/Z95Gg2Cy6oUIVS8KLS3DvQYcLCZaxgKbtzR1M1U="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/archivers/unar/default.nix b/nixpkgs/pkgs/tools/archivers/unar/default.nix index 2fdaf2def590..ee1693ee18e2 100644 --- a/nixpkgs/pkgs/tools/archivers/unar/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unar/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { dontConfigure = true; - sourceRoot = "./${src.name}/XADMaster"; + sourceRoot = "${src.name}/XADMaster"; installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/tools/audio/bark/default.nix b/nixpkgs/pkgs/tools/audio/bark/default.nix new file mode 100644 index 000000000000..f943b555b010 --- /dev/null +++ b/nixpkgs/pkgs/tools/audio/bark/default.nix @@ -0,0 +1,29 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, alsa-lib +, speexdsp +}: +rustPlatform.buildRustPackage { + pname = "bark"; + version = "unstable-2023-08-22"; + src = fetchFromGitHub { + owner = "haileys"; + repo = "bark"; + rev = "2586b9fb58b496f8ef06f516c9cd3aace77521f7"; + hash = "sha256-sGroae6uJhB9UIpFmvt520Zs9k0ir7H8pGkhKJmVWek="; + }; + cargoHash = "sha256-OjlVn4fvKPm3UfqhKkv7cDuvK4mcLcQXPNPK+WScrMc="; + buildInputs = [ alsa-lib speexdsp ]; + nativeBuildInputs = [ pkg-config ]; + + meta = { + description = "Live sync audio streaming for local networks"; + homepage = "https://github.com/haileys/bark"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ samw ]; + platforms = lib.platforms.linux; + }; +} + diff --git a/nixpkgs/pkgs/tools/audio/headsetcontrol/default.nix b/nixpkgs/pkgs/tools/audio/headsetcontrol/default.nix index 294b2cc7b931..99434f9ca738 100644 --- a/nixpkgs/pkgs/tools/audio/headsetcontrol/default.nix +++ b/nixpkgs/pkgs/tools/audio/headsetcontrol/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "headsetcontrol"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "Sapd"; repo = "HeadsetControl"; rev = version; - sha256 = "sha256-SVOcRzR52RYZsk/OWAr1/s+Nm6x48OxG0TF7yQ+Kb94="; + sha256 = "sha256-tAndkfLEgj81JWzXtDBNspRxzKAL6XaRw0aDI1XbC1E="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; /* - Test depends on having the apropiate headsets connected. + Tests depend on having the appropriate headsets connected. */ doCheck = false; diff --git a/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix b/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix index 39dbcb952329..f530ffc5d664 100644 --- a/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix +++ b/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix @@ -1,27 +1,37 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +}: buildGoModule rec { pname = "mpd-mpris"; - version = "0.4.0-2"; + version = "0.4.1"; src = fetchFromGitHub { owner = "natsukagami"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RGuscED0RvA1+5Aj+Kcnk1h/whU4npJ6hPq8GHWwxPU="; + sha256 = "sha256-QxPkGWpCWiyEbChH9SHeD+SiV8k0c/G7MG/azksP3xU="; }; - vendorHash = "sha256-GmdD/4VYp3KeblNGgltFWHdOnK5qsBa2ygIYOBrH+b0="; + patches = [ + # Makes Exec= path not absolute, see https://github.com/natsukagami/mpd-mpris/pull/42 + (fetchpatch { + url = "https://github.com/natsukagami/mpd-mpris/commit/8a5b53b1aa3174c3ccb1db24fb4e39f90012b98f.patch"; + hash = "sha256-LArPq+RRPJOs0je1olqg+pK7nvU7UIlrpGtHv2PhIY4="; + }) + ]; + + vendorHash = "sha256-HCDJrp9WFB1z+FnYpOI5e/AojtdnpN2ZNtgGVaH/v/Q="; doCheck = false; subPackages = [ "cmd/${pname}" ]; postInstall = '' - substituteInPlace mpd-mpris.service \ - --replace /usr/bin $out/bin - mkdir -p $out/lib/systemd/user - cp mpd-mpris.service $out/lib/systemd/user + install -Dm644 mpd-mpris.service $out/lib/systemd/user/mpd-mpris.service + install -Dm644 mpd-mpris.desktop $out/etc/xdg/autostart/mpd-mpris.desktop ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/audio/stt/default.nix b/nixpkgs/pkgs/tools/audio/stt/default.nix index 8697cb62f5b7..9f3fcf05b5fa 100644 --- a/nixpkgs/pkgs/tools/audio/stt/default.nix +++ b/nixpkgs/pkgs/tools/audio/stt/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { url = "https://github.com/coqui-ai/STT/releases/download/v${version}/native_client.tflite.Linux.tar.xz"; hash = "sha256-RVYc64pLYumQoVUEFZdxfUUaBMozaqgD0h/yiMaWN90="; }; - setSourceRoot = "sourceRoot=`pwd`"; + + sourceRoot = "."; nativeBuildInputs = [ autoPatchelfHook diff --git a/nixpkgs/pkgs/tools/audio/vgmtools/default.nix b/nixpkgs/pkgs/tools/audio/vgmtools/default.nix index dc3e4e2df65d..ae6184a850f2 100644 --- a/nixpkgs/pkgs/tools/audio/vgmtools/default.nix +++ b/nixpkgs/pkgs/tools/audio/vgmtools/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vgmtools"; - version = "unstable-2023-07-14"; + version = "unstable-2023-08-27"; src = fetchFromGitHub { owner = "vgmrips"; repo = "vgmtools"; - rev = "1b880040e0f730f180ecd019cb06c3db717420d2"; - hash = "sha256-6JNBQGVAs49l80ITKDabPFeN3XQtIH/RGhR7vIlMNxs="; + rev = "7b7f2041e346f0d4fff8c834a763edc4f4d88896"; + hash = "sha256-L52h94uohLMnj29lZj+i9hM8n9hIYo20nRS8RCW8npY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/backup/awsbck/default.nix b/nixpkgs/pkgs/tools/backup/awsbck/default.nix index 9e1286312120..f0ef8367e0ee 100644 --- a/nixpkgs/pkgs/tools/backup/awsbck/default.nix +++ b/nixpkgs/pkgs/tools/backup/awsbck/default.nix @@ -8,20 +8,20 @@ rustPlatform.buildRustPackage rec { pname = "awsbck"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "beeb"; repo = "awsbck"; rev = "v${version}"; - hash = "sha256-L5hQ6vwuC9HuAGD9mvS8BGkPV3Ry5jJgRUF4Qf7fqaM="; + hash = "sha256-MDlFCbBAvGovhCO5uxXRQhIN4Fw9wav0afIBNzz3Mow="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-VKm27IzCUv3e1Mapb46SBJqvEwifgGxaRX2uM9MTNnQ="; + cargoSha256 = "sha256-p7t/QtihdP6dyJ7tKpNkqcyYJvFJG8+fPqSGH7DNAtg="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/backup/gphotos-sync/default.nix b/nixpkgs/pkgs/tools/backup/gphotos-sync/default.nix index 707828fae713..27caf6df4db0 100644 --- a/nixpkgs/pkgs/tools/backup/gphotos-sync/default.nix +++ b/nixpkgs/pkgs/tools/backup/gphotos-sync/default.nix @@ -21,7 +21,19 @@ python3.pkgs.buildPythonApplication rec { ./skip-network-tests.patch ]; - nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; + # Consider fixing this upstream by following up on: + # https://github.com/gilesknap/gphotos-sync/issues/441 + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools<57" "setuptools" \ + --replace "wheel==0.33.1" "wheel" + ''; + + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + setuptools + wheel + ]; pythonRelaxDeps = [ "psutil" diff --git a/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix b/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix index 3cf9ebecfff0..5adf07df325d 100644 --- a/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix +++ b/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "pgbackrest"; - version = "2.46"; + version = "2.47"; src = fetchFromGitHub { owner = "pgbackrest"; repo = "pgbackrest"; rev = "release/${version}"; - sha256 = "sha256-Jd49ZpG/QhX+ayk9Ld0FB8abemfxQV6KZZuSXmybZw4="; + sha256 = "sha256-HKmJA/WlMR6Epu5WuD8pABDh5gaN+T98lc4ejgoD8LM="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix b/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix index 5892ddbe0106..654306f873b9 100644 --- a/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix +++ b/nixpkgs/pkgs/tools/backup/rdiff-backup/default.nix @@ -6,22 +6,18 @@ let in pypkgs.buildPythonApplication rec { pname = "rdiff-backup"; - version = "2.0.5"; + version = "2.2.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VNFgOOYgFO2RbHHIMDsH0vphpqaAOMoYn8LTFTSw84s="; + sha256 = "sha256-huKCa3hOw+pO8YfZNu5fFSd0IsQHfvoBVu9n4xOeoI4="; }; - # pkg_resources fails to find the version and then falls back to "DEV" - postPatch = '' - substituteInPlace src/rdiff_backup/Globals.py \ - --replace 'version = "DEV"' 'version = "${version}"' - ''; + nativeBuildInputs = with pypkgs; [ setuptools-scm ]; buildInputs = [ librsync ]; - nativeBuildInputs = with pypkgs; [ setuptools-scm ]; + propagatedBuildInputs = with pypkgs; [ pyyaml ]; # no tests from pypi doCheck = false; diff --git a/nixpkgs/pkgs/tools/compression/asar/default.nix b/nixpkgs/pkgs/tools/compression/asar/default.nix new file mode 100644 index 000000000000..3d6c017674a8 --- /dev/null +++ b/nixpkgs/pkgs/tools/compression/asar/default.nix @@ -0,0 +1,48 @@ +{ lib +, mkYarnPackage +, fetchFromGitHub +, fetchYarnDeps +}: + +mkYarnPackage rec { + pname = "asar"; + version = "3.2.4"; + + src = fetchFromGitHub { + owner = "electron"; + repo = "asar"; + rev = "v${version}"; + hash = "sha256-12FP8VRDo1PQ+tiN4zhzkcfAx9zFs/0MU03t/vFo074="; + }; + + packageJSON = ./package.json; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-/fV3hd98pl46+fgmiMH9sDQrrZgdLY1oF9c3TaIxRSg="; + }; + + doDist = false; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/lib/node_modules" + mv deps/@electron "$out/lib/node_modules" + rm "$out/lib/node_modules/@electron/asar/node_modules" + mv node_modules "$out/lib/node_modules/@electron/asar" + + mkdir "$out/bin" + ln -s "$out/lib/node_modules/@electron/asar/bin/asar.js" "$out/bin/asar" + + runHook postInstall + ''; + + meta = { + description = "Simple extensive tar-like archive format with indexing"; + homepage = "https://github.com/electron/asar"; + license = lib.licenses.mit; + mainProgram = "asar"; + maintainers = with lib.maintainers; [ xvapx ]; + }; +} diff --git a/nixpkgs/pkgs/tools/compression/asar/package.json b/nixpkgs/pkgs/tools/compression/asar/package.json new file mode 100644 index 000000000000..51ed0e24ffeb --- /dev/null +++ b/nixpkgs/pkgs/tools/compression/asar/package.json @@ -0,0 +1,62 @@ +{ + "name": "@electron/asar", + "description": "Creating Electron app packages", + "version": "0.0.0-development", + "main": "./lib/asar.js", + "types": "./lib/index.d.ts", + "bin": { + "asar": "./bin/asar.js" + }, + "files": [ + "bin", + "lib", + "lib/index.d.ts" + ], + "engines": { + "node": ">=10.12.0" + }, + "license": "MIT", + "homepage": "https://github.com/electron/asar", + "repository": { + "type": "git", + "url": "https://github.com/electron/asar.git" + }, + "bugs": { + "url": "https://github.com/electron/asar/issues" + }, + "scripts": { + "mocha": "xvfb-maybe electron-mocha --reporter spec && mocha --reporter spec", + "test": "npm run lint && npm run mocha", + "lint": "tsd && standard", + "standard": "standard", + "tsd": "tsd" + }, + "standard": { + "env": { + "mocha": true + }, + "globals": [ + "BigInt" + ] + }, + "tsd": { + "directory": "test" + }, + "dependencies": { + "chromium-pickle-js": "^0.2.0", + "commander": "^5.0.0", + "glob": "^7.1.6", + "minimatch": "^3.0.4" + }, + "devDependencies": { + "@continuous-auth/semantic-release-npm": "^3.0.0", + "electron": "^22.0.0", + "electron-mocha": "^11.0.2", + "lodash": "^4.17.15", + "mocha": "^10.1.0", + "rimraf": "^3.0.2", + "standard": "^14.3.3", + "tsd": "^0.25.0", + "xvfb-maybe": "^0.2.1" + } +} diff --git a/nixpkgs/pkgs/tools/filesystems/catcli/default.nix b/nixpkgs/pkgs/tools/filesystems/catcli/default.nix index eedbdcc22285..a2f5402dca25 100644 --- a/nixpkgs/pkgs/tools/filesystems/catcli/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/catcli/default.nix @@ -1,28 +1,38 @@ { lib , fetchFromGitHub -, buildPythonApplication -, docopt, anytree +, python3 }: -buildPythonApplication rec { - +python3.pkgs.buildPythonApplication rec { pname = "catcli"; - version = "0.8.7"; + version = "0.9.6"; + format = "setuptools"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-hVunxgc/aUapQYe6k3hKdkC+2Jw0x1HjI/kl/fJdWUo="; + hash = "sha256-+/kd7oPT6msojPj25bzG9HwVqPj47gIUg9LngbDc3y8="; }; - propagatedBuildInputs = [ docopt anytree ]; - postPatch = "patchShebangs . "; + propagatedBuildInputs = with python3.pkgs; [ + anytree + docopt + fusepy + pyfzf + types-docopt + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + meta = with lib; { description = "The command line catalog tool for your offline data"; homepage = "https://github.com/deadc0de6/catcli"; + changelog = "https://github.com/deadc0de6/catcli/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ petersjt014 ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index 1b0c9c98633a..5f3c8b22b888 100644 --- a/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -85,7 +85,7 @@ assert cryptopp != null || (nss != null && nspr != null); let - shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; optYasm = shouldUsePkg yasm; optExpat = shouldUsePkg expat; diff --git a/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix index a35ad566e506..b417c9654292 100644 --- a/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-k9ws3m0stPqzmi3WOAWH3RfQywlOa6l5SFvloanf5e0="; + hash = "sha256-ngpC1KtUsIJOfpJ9dSqZn9XhKkJSpp2/6RBz/RlZ+A0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/filesystems/garage/default.nix b/nixpkgs/pkgs/tools/filesystems/garage/default.nix index ef4a46868cad..0ac025f37a32 100644 --- a/nixpkgs/pkgs/tools/filesystems/garage/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/garage/default.nix @@ -57,7 +57,7 @@ let "sqlite" ]); - passthru = nixosTests.garage; + passthru.tests = nixosTests.garage; meta = { description = "S3-compatible object store for small self-hosted geo-distributed deployments"; @@ -83,13 +83,13 @@ in garage_0_7 = garage_0_7_3; - garage_0_8_2 = generic { - version = "0.8.2"; - sha256 = "sha256-IlDWbNWI1yXvPPF3HIqQvo79M2FQCtoX1wRLJrDbd9k="; - cargoSha256 = "sha256-6l4tDBMcOvckTkEO05rman4hHlmVbBt1nCeX5/dETKk="; + garage_0_8_3 = generic { + version = "0.8.3"; + sha256 = "sha256-NxkFj76L+LpCWzOWbnN3zdhw9Q16uzPibDs+C+voM/0="; + cargoSha256 = "sha256-hbBuUjdlw//s6d24dPBu3R/BTJvmOW1B7tSIXNxLXlU="; }; - garage_0_8 = garage_0_8_2; + garage_0_8 = garage_0_8_3; garage = garage_0_8; } diff --git a/nixpkgs/pkgs/tools/filesystems/mount-zip/default.nix b/nixpkgs/pkgs/tools/filesystems/mount-zip/default.nix index 678abe4892cd..a6577e900733 100644 --- a/nixpkgs/pkgs/tools/filesystems/mount-zip/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/mount-zip/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mount-zip"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "google"; repo = "mount-zip"; rev = "v${finalAttrs.version}"; - hash = "sha256-+slN5eedSddYKgiNLq4KZ5BXwvGQw9859sVfkcIBYeo="; + hash = "sha256-dc1Cpyh4ctPPYo4cxH81mqNlomtzjiHHfkh52NPzq80="; }; nativeBuildInputs = [ boost gcc icu pandoc pkg-config ]; diff --git a/nixpkgs/pkgs/tools/filesystems/stratisd/Cargo.lock b/nixpkgs/pkgs/tools/filesystems/stratisd/Cargo.lock index 3cd26958eda6..97a211387195 100644 --- a/nixpkgs/pkgs/tools/filesystems/stratisd/Cargo.lock +++ b/nixpkgs/pkgs/tools/filesystems/stratisd/Cargo.lock @@ -119,7 +119,7 @@ checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -357,8 +357,6 @@ version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" dependencies = [ - "futures-channel", - "futures-util", "libc", "libdbus-sys", "winapi", @@ -551,7 +549,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -1238,13 +1236,13 @@ checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" [[package]] name = "serde_derive" -version = "1.0.175" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -1311,7 +1309,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stratisd" -version = "3.5.8" +version = "3.5.9" dependencies = [ "assert_cmd", "assert_matches", @@ -1359,7 +1357,7 @@ dependencies = [ [[package]] name = "stratisd_proc_macros" -version = "0.2.0" +version = "0.2.1" dependencies = [ "proc-macro2", "quote", @@ -1385,9 +1383,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -1448,7 +1446,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -1533,7 +1531,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -1555,7 +1553,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix b/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix index 892591576dc4..a9e5e4ca3680 100644 --- a/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.5.8"; + version = "3.5.9"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/stratisd-v${version}"; - hash = "sha256-/Yqruz8gUyfL6zXYwlNvXa9feLBOOT4q4Gl/jxt1cMs="; + hash = "sha256-E4bBrbkqEh2twolPIHpHxphMG3bnDj0tjEBUWhrwL+M="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/nixpkgs/pkgs/tools/games/ps3iso-utils/default.nix b/nixpkgs/pkgs/tools/games/ps3iso-utils/default.nix new file mode 100644 index 000000000000..63093b59b2cc --- /dev/null +++ b/nixpkgs/pkgs/tools/games/ps3iso-utils/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, unstableGitUpdater +, lib +}: +stdenv.mkDerivation { + pname = "ps3iso-utils"; + version = "277db7de"; + + src = fetchFromGitHub { + owner = "bucanero"; + repo = "ps3iso-utils"; + rev = "878090980a9042c61901920fed1b034af215e8c7"; + hash = "sha256-HUx5BqHBvVMUHReuJL0RcyxXOnufSt1Zi/ieAlI2eoc="; + }; + + buildPhase = '' + mkdir -p bin/ + find . -type f -name "*.c" -exec \ + sh -c 'OFILE=`basename "{}" ".c"` && $CC "{}" -o bin/"$OFILE"' \; + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/* $out/bin + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "Estwald's PS3ISO utilities"; + homepage = "https://github.com/bucanero/ps3iso-utils"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ soupglasses ]; + platforms = platforms.all; + }; +} + diff --git a/nixpkgs/pkgs/tools/graphics/pikchr/default.nix b/nixpkgs/pkgs/tools/graphics/pikchr/default.nix index d750d243fc36..5e390ce12cd3 100644 --- a/nixpkgs/pkgs/tools/graphics/pikchr/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pikchr/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation { license = licenses.bsd0; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + mainProgram = "pikchr"; }; } diff --git a/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix b/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix index 265c6365d6fb..1bf20910cf54 100644 --- a/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix +++ b/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,17 +2,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.3.250.0"; + version = "1.3.261.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "sdk-${finalAttrs.version}"; - hash = "sha256-H4UkR/EiBWpdhdPHNBrdRkl4eN8kD9gEOzpnwfFSdpI="; + hash = "sha256-abVqLovvcKBJhGhSCbyD5mc1DSfvh4TWssGxi52ukQ8="; }; nativeBuildInputs = [ cmake python3 ]; + postFixup = '' + substituteInPlace $out/lib/pkgconfig/*.pc \ + --replace '=''${prefix}//' '=/' + ''; + meta = with lib; { description = "A tool designed for parsing and converting SPIR-V to other shader languages"; homepage = "https://github.com/KhronosGroup/SPIRV-Cross"; diff --git a/nixpkgs/pkgs/tools/graphics/svgbob/default.nix b/nixpkgs/pkgs/tools/graphics/svgbob/default.nix index 0ee757f5c812..e5974d04e1ae 100644 --- a/nixpkgs/pkgs/tools/graphics/svgbob/default.nix +++ b/nixpkgs/pkgs/tools/graphics/svgbob/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "svgbob"; - version = "0.7.0"; + version = "0.7.2"; src = fetchCrate { inherit version; crateName = "svgbob_cli"; - sha256 = "sha256-iWcd+23/Ou7K2YUDf/MJx84LsVMXXqAkGNPs6B0RDqA="; + sha256 = "sha256-QWDi6cpADm5zOzz8hXuqOBtVrqb0DteWmiDXC6PsLS4="; }; - cargoHash = "sha256-YbbVv2ln01nJfCaopKCwvVN7cgrcuaRHNXGHf9j9XUY="; + cargoHash = "sha256-Fj1qjG4SKlchUWW4q0tBC+9fHFFuY6MHngJCFz6J5JY="; postInstall = '' mv $out/bin/svgbob_cli $out/bin/svgbob diff --git a/nixpkgs/pkgs/tools/graphics/termimage/default.nix b/nixpkgs/pkgs/tools/graphics/termimage/default.nix new file mode 100644 index 000000000000..3703d5a993e5 --- /dev/null +++ b/nixpkgs/pkgs/tools/graphics/termimage/default.nix @@ -0,0 +1,37 @@ +{ lib +, rustPlatform +, fetchCrate +, installShellFiles +, ronn +}: + +rustPlatform.buildRustPackage rec { + pname = "termimage"; + version = "1.2.1"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-1FOPe466GqQfiIpsQT9DJn+FupI2vy9b4+7p31ceY6M="; + }; + + cargoHash = "sha256-Up6wvkZJ4yLrXp/2sEAv5RqGbhLOQPNHO2vEy2Vhy+E="; + + nativeBuildInputs = [ + installShellFiles + ronn + ]; + + postInstall = '' + ronn --roff --organization="termimage developers" termimage.md + installManPage termimage.1 + ''; + + meta = with lib; { + description = "Display images in your terminal"; + homepage = "https://github.com/nabijaczleweli/termimage"; + changelog = "https://github.com/nabijaczleweli/termimage/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "termimage"; + }; +} diff --git a/nixpkgs/pkgs/tools/graphics/textplots/default.nix b/nixpkgs/pkgs/tools/graphics/textplots/default.nix index a0c5e72ac23c..689758de2031 100644 --- a/nixpkgs/pkgs/tools/graphics/textplots/default.nix +++ b/nixpkgs/pkgs/tools/graphics/textplots/default.nix @@ -1,15 +1,15 @@ -{ fetchCrate, lib, rustPlatform }: +{ lib, rustPlatform, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "textplots"; - version = "0.8.0"; + version = "0.8.2"; src = fetchCrate { inherit pname version; - sha256 = "07lxnvg8g24r1j6h07w91j5lp0azngmb76lagk55y28br0y70qr4"; + hash = "sha256-NBUp5kFiODqoJrg/JBPhtaVsOikppqt2jbd3C3RQ7qg="; }; - cargoSha256 = "19xb1ann3bqx26nhjjvcwqdsvzg7lflg9fdrnlx05ndd2ip44flz"; + cargoHash = "sha256-hHj3Da399gbRbgHgHcBE53HJusWoPbRA184tcCSJ4fc="; meta = with lib; { description = "Terminal plotting written in Rust"; diff --git a/nixpkgs/pkgs/tools/graphics/ueberzugpp/default.nix b/nixpkgs/pkgs/tools/graphics/ueberzugpp/default.nix index 83332d47ae3d..dc6803e23488 100644 --- a/nixpkgs/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/nixpkgs/pkgs/tools/graphics/ueberzugpp/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "ueberzugpp"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "jstkdng"; repo = "ueberzugpp"; rev = "v${version}"; - hash = "sha256-n1cSHHPCx6igJmBxAbny7gntZQk4cMb358zx7f2lMi8="; + hash = "sha256-zI+ctJHxjDbAKjCFDpNgpQ6m6pPffd7TV5gmfPP/yv4="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/tools/graphics/vips/default.nix b/nixpkgs/pkgs/tools/graphics/vips/default.nix index 1adfa8e7c1e1..8fd66f284cfa 100644 --- a/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.14.3"; + version = "8.14.4"; outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - hash = "sha256-2BE/cDQU/FP0Lo9/gZiG1IAskTbnhBtzbcL2dRziHmU="; + hash = "sha256-y2Tyi8rxal3s3jLURRGPuCAUuHITRPl1+zJZDp557+I="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' diff --git a/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix index a80e216137db..96edbcad83f6 100644 --- a/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, cmake, writeText, vulkan-headers, jq }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, writeText, vulkan-headers, jq, libX11, libXrandr, libxcb, wayland }: stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.254"; + version = "1.3.261"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "v${version}"; - hash = "sha256-YWJk0sAvhmfVbJ6Nv24kzFL4SltQnggNjZ+NjaUO1Io="; + hash = "sha256-MeW7mmbjgqEvXEnAYzTNu4omC4fqq1fplIVjDpV2LcA="; }; - nativeBuildInputs = [ cmake jq ]; + nativeBuildInputs = [ cmake pkg-config jq ]; - buildInputs = [ vulkan-headers ]; + buildInputs = [ vulkan-headers libX11 libXrandr libxcb wayland ]; # Help vulkan-loader find the validation layers setupHook = writeText "setup-hook" '' diff --git a/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/add-missing-macro-definition.patch b/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/add-missing-macro-definition.patch deleted file mode 100644 index 4d5717363303..000000000000 --- a/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/add-missing-macro-definition.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/layersvt/api_dump.h b/layersvt/api_dump.h -index 6e13b6de3..33bee96e7 100644 ---- a/layersvt/api_dump.h -+++ b/layersvt/api_dump.h -@@ -60,6 +60,8 @@ - #include <unordered_set> - #include <utility> - -+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) -+ - #ifdef ANDROID - - #include <android/log.h> -diff --git a/layersvt/screenshot.cpp b/layersvt/screenshot.cpp -index b9743371c..6ee65c576 100755 ---- a/layersvt/screenshot.cpp -+++ b/layersvt/screenshot.cpp -@@ -44,6 +44,8 @@ using namespace std; - - #include "screenshot_parsing.h" - -+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) -+ - #ifdef ANDROID - - #include <android/log.h> diff --git a/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 8dec2e5130e7..072876e46dec 100644 --- a/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -5,6 +5,7 @@ , python3 , jq , expat +, jsoncpp , libX11 , libXdmcp , libXrandr @@ -24,13 +25,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.3.250"; + version = "1.3.261"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "v${version}"; - hash = "sha256-oI2ITvciuE/f8ojFpIwcH+HnYCasz43nKkER3wJxX+c="; + hash = "sha256-Kem3nWVaMeDEsidKYMsWr9Bu0yBgjjennDB0sKBDogA="; fetchSubmodules = true; }; @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat + jsoncpp libX11 libXdmcp libXrandr @@ -70,6 +72,8 @@ stdenv.mkDerivation rec { patchShebangs scripts/* sed -i '/^git /d' $update ./$update + + substituteInPlace via/CMakeLists.txt --replace "jsoncpp_static" "jsoncpp" ''; # Include absolute paths to layer libraries in their associated @@ -82,14 +86,6 @@ stdenv.mkDerivation rec { ''; patches = [ - # Redefine an internal macro removed in vulkan-validation-layers - # FIXME: remove when fixed upstream - ./add-missing-macro-definition.patch - - # Skip QNX-specific extension causing build failures - # FIXME: remove when fixed upstream - ./skip-qnx-extension.patch - ./gtest.patch ]; diff --git a/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/skip-qnx-extension.patch b/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/skip-qnx-extension.patch deleted file mode 100644 index 777b32f43af4..000000000000 --- a/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/skip-qnx-extension.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 209f3ec39..c711af38b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -190,7 +190,7 @@ endif() - # Define macro used for building vk.xml generated files - function(run_vulkantools_vk_xml_generate dependency output) - add_custom_command(OUTPUT ${output} -- COMMAND ${PYTHON_CMD} -B ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py -registry ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml -scripts ${VULKAN_HEADERS_REGISTRY_DIRECTORY} ${output} -+ COMMAND ${PYTHON_CMD} -B ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py -registry ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml -scripts ${VULKAN_HEADERS_REGISTRY_DIRECTORY} ${output} -removeExtensions VK_QNX_external_memory_screen_buffer - DEPENDS ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/generator.py ${VULKANTOOLS_SCRIPTS_DIR}/${dependency} ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/reg.py - ) - endfunction() diff --git a/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix b/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix index 3f36e8abf7f9..9327bd9c9d6e 100644 --- a/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.254"; + version = "1.3.261"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "v${version}"; - hash = "sha256-MyYngyoIGpGu1jFN1GDm9BcFye1JRz1cN6SaZue1ZGQ="; + hash = "sha256-C5FVkI9F/dgIS8qp7VaOn9J2zoNLb1PnmgAemsVO6zM="; }; nativeBuildInputs = [ @@ -86,6 +86,7 @@ stdenv.mkDerivation rec { # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH "-DCMAKE_INSTALL_RPATH=${libraryPath}" "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" + "-DGLSLANG_INSTALL_DIR=${glslang}" # Hide dev warnings that are useless for packaging "-Wno-dev" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 3703c2edea46..19d5b1b96933 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.19"; + version = "1.4.22"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-e/nw6UGaxWpDCKwI5r8MuSZjrE6u/S5njZYilFa4zJI="; + sha256 = "sha256-wjWDqhhLqj77IxVpelChOEdUtneaGmL+IK2Sp3eObkA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index 89e4d3d15cd1..c997c20c8d26 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ibus-table-others"; - version = "1.3.16"; + version = "1.3.17"; src = fetchurl { url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-TybqFQ2EgYo4zCYXwDJ0dke7HSzkZXs0lG2zR2XmlG4="; + hash = "sha256-7//axHjQ1LgLpeWR4MTI8efLURm4Umj4JV3G33Y0m0g="; }; nativeBuildInputs = [ pkg-config python3 ]; diff --git a/nixpkgs/pkgs/tools/misc/birdfont/default.nix b/nixpkgs/pkgs/tools/misc/birdfont/default.nix index 096d8c785e91..69b5c53bd28e 100644 --- a/nixpkgs/pkgs/tools/misc/birdfont/default.nix +++ b/nixpkgs/pkgs/tools/misc/birdfont/default.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchurl, pkg-config, python3, xmlbird, cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala, -gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: +gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook, autoPatchelfHook }: stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.32.3"; + version = "2.33.1"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-ZsYwDS7pgs635P3wPX/PCTuHLX3/Iu97HgVe+qFyjZw="; + sha256 = "sha256-vFXpZNvsXpz7saRp6ruhvsP50rmJ2Prr2M78+8oxQ9M="; }; - nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook autoPatchelfHook ]; buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ]; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/cfonts/default.nix b/nixpkgs/pkgs/tools/misc/cfonts/default.nix index a4faf4866585..cbee66e68f4a 100644 --- a/nixpkgs/pkgs/tools/misc/cfonts/default.nix +++ b/nixpkgs/pkgs/tools/misc/cfonts/default.nix @@ -1,17 +1,14 @@ -{ lib -, rustPlatform -, fetchCrate -}: +{ lib, rustPlatform, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "cfonts"; - version = "1.1.0"; + version = "1.1.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-STeLEHgggshhyLCfqiJmDcmwxqQ1AOGHj2ATliEY+DA="; + hash = "sha256-bnjrbcQ2MMZsM0rWWk+xkA58rSREHWfSvlGDAHKIPAw="; }; - cargoHash = "sha256-GGi4OduO9FPIWllxlx4tK3lix36zF0FNDyptzftV0GY="; + cargoHash = "sha256-8NgEsFglt+JyP5D61mT4Z8SIbPATJskiEpn8tWy+yjk="; meta = with lib; { homepage = "https://github.com/dominikwilkowski/cfonts"; diff --git a/nixpkgs/pkgs/tools/misc/charasay/default.nix b/nixpkgs/pkgs/tools/misc/charasay/default.nix index 84247a147c3d..c66605cc826c 100644 --- a/nixpkgs/pkgs/tools/misc/charasay/default.nix +++ b/nixpkgs/pkgs/tools/misc/charasay/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "charasay"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "latipun7"; repo = pname; rev = "v${version}"; - hash = "sha256-Cq7pHW4CYGHdVAhscyiOHSdi5Lefk5ve32EOqS2oSRk="; + hash = "sha256-ijr6AvhoiYWHYTPUxSdBds9jBW1HEy1n7h6zH1VGP1c="; }; - cargoHash = "sha256-/9ex5rIYtJVsuwpOpCZLgFSHEdntbnkOX1oRaZ02AOg="; + cargoHash = "sha256-HCHdiCeb4dqxQMWfYZV2k8Yq963vWfmL05BRpVYmIcg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/citron/default.nix b/nixpkgs/pkgs/tools/misc/citron/default.nix new file mode 100644 index 000000000000..17fa3c5e5a21 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/citron/default.nix @@ -0,0 +1,35 @@ +{ lib +, rustPlatform +, fetchCrate +, dbus +, installShellFiles +, pkg-config +}: + +rustPlatform.buildRustPackage rec { + pname = "citron"; + version = "0.15.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-6wJ4UfiwpV9zFuBR8SYj6eBiRqQitFs7wRe5R51Z3SA="; + }; + + cargoHash = "sha256-xTmhgE4iHydhZBMrHWqQUcS9KDlZAzW2CmPGpJr40Fw="; + + buildInputs = [ dbus ]; + + nativeBuildInputs = [ installShellFiles pkg-config ]; + + postInstall = '' + installManPage doc/citron.1 + ''; + + meta = { + homepage = "https://git.sr.ht/~grtcdr/citron"; + description = "System data via on-demand notifications"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vuimuich ]; + platforms = lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/ckb-next/default.nix b/nixpkgs/pkgs/tools/misc/ckb-next/default.nix index efd581a06cbc..f9309ecf81dd 100644 --- a/nixpkgs/pkgs/tools/misc/ckb-next/default.nix +++ b/nixpkgs/pkgs/tools/misc/ckb-next/default.nix @@ -50,6 +50,7 @@ mkDerivation rec { homepage = "https://github.com/ckb-next/ckb-next"; license = licenses.gpl2; platforms = platforms.linux; + mainProgram = "ckb-next"; maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/clac/default.nix b/nixpkgs/pkgs/tools/misc/clac/default.nix index acf9b6b867de..0c4676323003 100644 --- a/nixpkgs/pkgs/tools/misc/clac/default.nix +++ b/nixpkgs/pkgs/tools/misc/clac/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clac"; - version = "0.3.3"; + version = "0.3.3-unstable-2021-09-06"; src = fetchFromGitHub { owner = "soveran"; repo = "clac"; - rev = version; - sha256 = "rsag8MWl/udwXC0Gj864fAuQ6ts1gzrN2N/zelazqjE="; + rev = "beae8c4bc89912f4cd66bb875585fa471692cd54"; + sha256 = "XaULDkFF9OZW7Hbh60wbGgvCJ6L+3gZNGQ9uQv3G0zU="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/nixpkgs/pkgs/tools/misc/crudini/default.nix b/nixpkgs/pkgs/tools/misc/crudini/default.nix index 6527a01e43b7..1e25413b151f 100644 --- a/nixpkgs/pkgs/tools/misc/crudini/default.nix +++ b/nixpkgs/pkgs/tools/misc/crudini/default.nix @@ -1,32 +1,52 @@ -{ lib, fetchFromGitHub, python3Packages, help2man, installShellFiles }: +{ lib +, fetchFromGitHub +, fetchpatch +, python3Packages +, help2man +, installShellFiles +}: python3Packages.buildPythonApplication rec { pname = "crudini"; - version = "0.9.3"; + version = "0.9.4"; + format = "pyproject"; src = fetchFromGitHub { owner = "pixelb"; repo = "crudini"; rev = version; - sha256 = "0298hvg0fpk0m0bjpwryj3icksbckwqqsr9w1ain55wf5s0v24k3"; + hash = "sha256-jbTOaCF/ZqRpM0scDBBAcV5bSYg/QhBPbM9R5cONZ2o="; }; - nativeBuildInputs = [ help2man installShellFiles ]; - - propagatedBuildInputs = with python3Packages; [ iniparse ]; + patches = [ + (fetchpatch { + name = "add-missing-install-file.patch"; + url = "https://github.com/pixelb/crudini/commit/d433e4d9c4106ae26985e3f4b2efa593bdd5c274.patch"; + hash = "sha256-aDGzoG4i2tvYeL8m1WoqwNFNHe4xR1dGk+XDt3f3i5E="; + }) + ]; postPatch = '' - substituteInPlace crudini-help \ - --replace ./crudini $out/bin/crudini - substituteInPlace tests/test.sh \ - --replace ..: $out/bin: + patchShebangs crudini.py crudini-help tests/test.sh ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + help2man + installShellFiles + python3Packages.setuptools + python3Packages.setuptools-scm + python3Packages.wheel + ]; + + propagatedBuildInputs = with python3Packages; [ iniparse ]; + postInstall = '' # this just creates the man page make all - install -Dm444 -t $out/share/doc/${pname} README EXAMPLES + install -Dm444 -t $out/share/doc/${pname} README.md EXAMPLES installManPage *.1 ''; @@ -34,7 +54,7 @@ python3Packages.buildPythonApplication rec { runHook preCheck pushd tests >/dev/null - bash ./test.sh + ./test.sh popd >/dev/null runHook postCheck @@ -45,5 +65,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://www.pixelbeat.org/programs/crudini/"; license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; + mainProgram = "crudini"; }; } diff --git a/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix b/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix index 0f45361e3db6..f920e3afc696 100644 --- a/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix +++ b/nixpkgs/pkgs/tools/misc/ddccontrol/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; rev = version; - sha256 = "sha256-En2e0FDKLpMjuxa2aXuvI6h7d+D1D5x1dDg96924/qM="; + sha256 = "sha256-Me7E5dUo3tnuXInWF19AmrcyKMtBlugVmvQHULMMMoA="; }; nativeBuildInputs = [ @@ -46,10 +46,6 @@ stdenv.mkDerivation rec { substituteInPlace src/ddcpci/Makefile.am \ --replace "chmod 4711" "chmod 0711" - '' + lib.optionalString (lib.versionAtLeast "0.6.1" version) '' - # Upstream PR: https://github.com/ddccontrol/ddccontrol/pull/115 - substituteInPlace src/lib/Makefile.am \ - --replace "/etc/" "\$""{sysconfdir}/" ''; preConfigure = '' diff --git a/nixpkgs/pkgs/tools/misc/debootstrap/default.nix b/nixpkgs/pkgs/tools/misc/debootstrap/default.nix index 2f34fb1e5645..04c19d93af99 100644 --- a/nixpkgs/pkgs/tools/misc/debootstrap/default.nix +++ b/nixpkgs/pkgs/tools/misc/debootstrap/default.nix @@ -1,5 +1,26 @@ -{ lib, stdenv, fetchFromGitLab, dpkg, gawk, perl, wget, binutils, bzip2, coreutils, util-linux -, gnugrep, gnupg1, gnutar, gnused, gzip, xz, makeWrapper }: +{ lib +, stdenv +, fetchFromGitLab +, dpkg +, gawk +, perl +, wget +, binutils +, bzip2 +, coreutils +, util-linux +, gnugrep +, gnupg1 +, gnutar +, gnused +, gzip +, xz +, makeWrapper +, nix-update-script +, testers +, debootstrap +}: + # USAGE like this: debootstrap sid /tmp/target-chroot-directory # There is also cdebootstrap now. Is that easier to maintain? let binPath = lib.makeBinPath [ @@ -19,14 +40,14 @@ let binPath = lib.makeBinPath [ ]; in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.128"; + version = "1.0.131"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = pname; - rev = version; - sha256 = "sha256-WybWWyRPreokjUAdWfZ2MUjgZhF1GTncpbLajQ3rh0E="; + rev = "refs/tags/${version}"; + hash = "sha256-rwNcrS2GzVs0JYxeHcpLMG9FDwSpthNmZIemn95hC6g="; }; nativeBuildInputs = [ makeWrapper ]; @@ -62,7 +83,15 @@ in stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = debootstrap; + }; + }; + meta = with lib; { + changelog = "https://salsa.debian.org/installer-team/debootstrap/-/blob/${version}/debian/changelog"; description = "Tool to create a Debian system in a chroot"; homepage = "https://wiki.debian.org/Debootstrap"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/misc/diffoci/default.nix b/nixpkgs/pkgs/tools/misc/diffoci/default.nix new file mode 100644 index 000000000000..5d1678a017d3 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/diffoci/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "diffoci"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "reproducible-containers"; + repo = "diffoci"; + rev = "v${version}"; + hash = "sha256-xmsfqlp/bosCjT83MXkA7uNlPgGYlKXOdnxVhm648zo="; + }; + + vendorHash = "sha256-w3/Je8iIT6CEusfIfGv9TAWkePY5TtOQS0rQYH92sAs="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Diff for Docker and OCI container images"; + homepage = "https://github.com/reproducible-containers/diffoci/"; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 284570617032..85e148049fa9 100644 --- a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -78,11 +78,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "247"; + version = "248"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-sbLny1eK/eyCQKeSUyQc3DTvlHeCp8rAgrx681KjvNQ="; + hash = "sha256-Lub+SIr0EyY4YmPsoLXWavXJhcpmK5VRb6eEnozZ0XQ="; }; outputs = [ diff --git a/nixpkgs/pkgs/tools/misc/ent/default.nix b/nixpkgs/pkgs/tools/misc/ent/default.nix index 6904d4667721..bd9dfeafea6b 100644 --- a/nixpkgs/pkgs/tools/misc/ent/default.nix +++ b/nixpkgs/pkgs/tools/misc/ent/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { # Work around the "unpacker appears to have produced no directories" # case that happens when the archive doesn't have a subdirectory. - setSourceRoot = "sourceRoot=`pwd`"; + sourceRoot = "."; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/tools/misc/esptool/default.nix b/nixpkgs/pkgs/tools/misc/esptool/default.nix index d7bf8a9b9031..a06074b688d6 100644 --- a/nixpkgs/pkgs/tools/misc/esptool/default.nix +++ b/nixpkgs/pkgs/tools/misc/esptool/default.nix @@ -1,38 +1,56 @@ { lib , fetchFromGitHub , python3 +, softhsm }: python3.pkgs.buildPythonApplication rec { pname = "esptool"; - version = "4.5.1"; + version = "4.6.2"; + + format = "setuptools"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - hash = "sha256-FKFw7czXzC8F3OXjlLoJEFaqsSgqWz0ZEqd7KjCy5Ik="; + hash = "sha256-3uvTyJrGCpulu/MR/VfCgnIxibxJj2ehBIBSveq7EfI="; }; + postPatch = '' + patchShebangs ci + + substituteInPlace test/test_espsecure_hsm.py \ + --replace "/usr/lib/softhsm" "${lib.getLib softhsm}/lib/softhsm" + ''; + propagatedBuildInputs = with python3.pkgs; [ bitstring cryptography ecdsa pyserial reedsolo + pyyaml + python-pkcs11 ]; nativeCheckInputs = with python3.pkgs; [ pyelftools pytestCheckHook + softhsm ]; # tests mentioned in `.github/workflows/test_esptool.yml` checkPhase = '' runHook preCheck + export SOFTHSM2_CONF=$(mktemp) + echo "directories.tokendir = $(mktemp -d)" > "$SOFTHSM2_CONF" + ./ci/setup_softhsm2.sh + pytest test/test_imagegen.py pytest test/test_espsecure.py + pytest test/test_espsecure_hsm.py pytest test/test_merge_bin.py pytest test/test_image_info.py pytest test/test_modules.py diff --git a/nixpkgs/pkgs/tools/misc/eza/default.nix b/nixpkgs/pkgs/tools/misc/eza/default.nix index 8ee47ac4cd70..dc03e7fa0584 100644 --- a/nixpkgs/pkgs/tools/misc/eza/default.nix +++ b/nixpkgs/pkgs/tools/misc/eza/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.10.8"; + version = "0.10.9"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-3g4eauJqnbIqWtDmRvKsDiZh1eAz171FP9idF2nBXLQ="; + hash = "sha256-ssP4jPO7Yt98ZCKOpQi7RwKfUBOHQ1dK5rzWxAJD9Jc="; }; - cargoHash = "sha256-HS/nmLxr5zvyneiSJk9tPUhszF5vFwSo5HMsRql9I38="; + cargoHash = "sha256-XxqAAs44iZuqcAsixIqEgUHWytwS9umuM/KIPosrfRo="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] @@ -57,6 +57,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/eza-community/eza"; license = licenses.mit; + mainProgram = "eza"; maintainers = with maintainers; [ cafkafk ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/faketty/default.nix b/nixpkgs/pkgs/tools/misc/faketty/default.nix index 2c25dc6b6a2b..6ec144d5d693 100644 --- a/nixpkgs/pkgs/tools/misc/faketty/default.nix +++ b/nixpkgs/pkgs/tools/misc/faketty/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "faketty"; - version = "1.0.12"; + version = "1.0.13"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1q1TOwKC2Tse/Ct/6Nw7YiOviJyBZAsOBEp3sT4N0ss="; + hash = "sha256-jV5b6mB81Nz0Q+Toj5DTQq2QcM+EoQ7jRYV/OXgtemA="; }; - cargoSha256 = "sha256-x8+7sZJnA+kEwKAu8DBF8z7JhWjJ6ZFiLaQP8kFOt08="; + cargoHash = "sha256-9t1Km/ZXzxyO72CaWM81fWGcFkri7F+wMAVom0GV/YM="; postPatch = '' patchShebangs tests/test.sh @@ -18,6 +18,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A wrapper to execute a command in a pty, even if redirecting the output"; homepage = "https://github.com/dtolnay/faketty"; + changelog = "https://github.com/dtolnay/faketty/releases/tag/${version}"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ figsoda ]; }; diff --git a/nixpkgs/pkgs/tools/misc/fastfetch/default.nix b/nixpkgs/pkgs/tools/misc/fastfetch/default.nix index 731cd459d41c..2a222f155662 100644 --- a/nixpkgs/pkgs/tools/misc/fastfetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/fastfetch/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.0.3"; + version = "2.0.5"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-Zh77m1jezjKJPC8Ua3Uv3w7MIeuLJ6U9WBFzT0uuLSo="; + hash = "sha256-KYicfYpJiO7ZfQ2vlGDKuiNprIwXnxz6Razf3GrjRq8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/file/32-bit-time_t.patch b/nixpkgs/pkgs/tools/misc/file/32-bit-time_t.patch new file mode 100644 index 000000000000..19c595215d65 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/file/32-bit-time_t.patch @@ -0,0 +1,38 @@ +https://github.com/file/file/commit/218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1.patch + +From 218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas <christos@zoulas.com> +Date: Fri, 28 Jul 2023 14:38:25 +0000 +Subject: [PATCH] deal with 32 bit time_t + +--- + src/file.h | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/file.h b/src/file.h +index 2e0494d2f..78f574ea1 100644 +--- a/src/file.h ++++ b/src/file.h +@@ -27,7 +27,7 @@ + */ + /* + * file.h - definitions for file(1) program +- * @(#)$File: file.h,v 1.247 2023/07/27 19:40:22 christos Exp $ ++ * @(#)$File: file.h,v 1.248 2023/07/28 14:38:25 christos Exp $ + */ + + #ifndef __file_h__ +@@ -159,9 +159,11 @@ + /* + * Dec 31, 23:59:59 9999 + * we need to make sure that we don't exceed 9999 because some libc +- * implementations like muslc crash otherwise ++ * implementations like muslc crash otherwise. If you are unlucky ++ * to be running on a system with a 32 bit time_t, then it is even less. + */ +-#define MAX_CTIME CAST(time_t, 0x3afff487cfULL) ++#define MAX_CTIME \ ++ CAST(time_t, sizeof(time_t) > 4 ? 0x3afff487cfULL : 0x7fffffffULL) + + #define FILE_BADSIZE CAST(size_t, ~0ul) + #define MAXDESC 64 /* max len of text description/MIME type */ diff --git a/nixpkgs/pkgs/tools/misc/file/default.nix b/nixpkgs/pkgs/tools/misc/file/default.nix index 7fad2c381c3f..6026f3c7adaa 100644 --- a/nixpkgs/pkgs/tools/misc/file/default.nix +++ b/nixpkgs/pkgs/tools/misc/file/default.nix @@ -7,29 +7,22 @@ stdenv.mkDerivation rec { pname = "file"; - version = "5.44"; + version = "5.45"; src = fetchurl { urls = [ "https://astron.com/pub/file/${pname}-${version}.tar.gz" "https://distfiles.macports.org/file/${pname}-${version}.tar.gz" ]; - sha256 = "sha256-N1HH+6jbyDHLjXzIr/IQNUWbjOUVXviwiAon0ChHXzs="; + hash = "sha256-/Jf1ECm7DiyfTjv/79r2ePDgOe6HK53lwAKm0Jx4TYI="; }; outputs = [ "out" "dev" "man" ]; patches = [ - # Backport fix to identification for pyzip files. - # Needed for strip-nondeterminism. - # https://salsa.debian.org/reproducible-builds/strip-nondeterminism/-/issues/20 - ./pyzip.patch - - # Backport fix for --uncompress always detecting contents as "empty" - (fetchurl { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/file/files/file-5.44-decompress-empty.patch?h=dfc57da515a2aaf085bea68267cc727f1bfaa691"; - hash = "sha256-fUzRQAlLWczBmR5iA1Gk66mHjP40MJcMdgCtm2+u1SQ="; - }) + # Upstream patch to fix 32-bit tests. + # Will be included in 5.46+ releases. + ./32-bit-time_t.patch ]; strictDeps = true; diff --git a/nixpkgs/pkgs/tools/misc/file/pyzip.patch b/nixpkgs/pkgs/tools/misc/file/pyzip.patch deleted file mode 100644 index 57f9e7ef8b64..000000000000 --- a/nixpkgs/pkgs/tools/misc/file/pyzip.patch +++ /dev/null @@ -1,36 +0,0 @@ -From dc71304b3b1fd2ed5f7098d59fb7f6ef10cfdc85 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas <christos@zoulas.com> -Date: Sat, 31 Dec 2022 20:24:08 +0000 -Subject: [PATCH] pyzip improvements (FC Stegerman) - ---- - magic/Magdir/archive | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/magic/Magdir/archive b/magic/Magdir/archive -index a706556d5..d58201e69 100644 ---- a/magic/Magdir/archive -+++ b/magic/Magdir/archive -@@ -1,5 +1,5 @@ - #------------------------------------------------------------------------------ --# $File: archive,v 1.179 2022/12/21 15:50:59 christos Exp $ -+# $File: archive,v 1.180 2022/12/31 20:24:08 christos Exp $ - # archive: file(1) magic for archive formats (see also "msdos" for self- - # extracting compressed archives) - # -@@ -1876,9 +1876,14 @@ - # https://en.wikipedia.org/wiki/ZIP_(file_format)#End_of_central_directory_record_(EOCD) - # by Michal Gorny <mgorny@gentoo.org> - -2 uleshort 0 -->&-22 string PK\005\006 Zip archive, with extra data prepended -+>&-22 string PK\005\006 -+# without #! -+>>0 string !#! Zip archive, with extra data prepended - !:mime application/zip - !:ext zip/cbz -+# with #! -+>>0 string/w #!\ a -+>>>&-1 string/T x %s script executable (Zip archive) - - # ACE archive (from http://www.wotsit.org/download.asp?f=ace) - # by Stefan `Sec` Zehl <sec@42.org> diff --git a/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix b/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix index 45f28b8ee442..6fb4c5df775d 100644 --- a/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix +++ b/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,4 +1,4 @@ -{ lib, appimageTools, fetchurl, nodePackages }: let +{ lib, appimageTools, fetchurl, asar }: let pname = "flexoptix-app"; version = "5.13.4"; @@ -18,9 +18,9 @@ ${oA.buildCommand} # Get rid of the autoupdater - ${nodePackages.asar}/bin/asar extract $out/resources/app.asar app + ${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 - ${nodePackages.asar}/bin/asar pack app $out/resources/app.asar + ${asar}/bin/asar pack app $out/resources/app.asar ''; }); diff --git a/nixpkgs/pkgs/tools/misc/fsearch/default.nix b/nixpkgs/pkgs/tools/misc/fsearch/default.nix index 6af61b122337..a9e3b6caa352 100644 --- a/nixpkgs/pkgs/tools/misc/fsearch/default.nix +++ b/nixpkgs/pkgs/tools/misc/fsearch/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "fsearch"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "cboxdoerfer"; repo = pname; rev = version; - hash = "sha256-1nu6J5eHVpPHGXcFKHSnUhAJccxABBht5H2bpBx42og="; + hash = "sha256-VBcoDxh4ip2zLBcXVHDe9s1lVRQF4bZJKsGUt6sPcos="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/fuc/add_missing_feature.patch b/nixpkgs/pkgs/tools/misc/fuc/add_missing_feature.patch deleted file mode 100644 index c765dde01428..000000000000 --- a/nixpkgs/pkgs/tools/misc/fuc/add_missing_feature.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/cpz/src/main.rs b/cpz/src/main.rs -index 4e7ce8d..0d0922d 100644 ---- a/cpz/src/main.rs -+++ b/cpz/src/main.rs -@@ -1,5 +1,6 @@ - #![feature(once_cell)] - #![feature(let_chains)] -+#![feature(main_separator_str)] - - use std::{ - borrow::Cow, diff --git a/nixpkgs/pkgs/tools/misc/fuc/default.nix b/nixpkgs/pkgs/tools/misc/fuc/default.nix index 00d95add4f39..33e34e2b6323 100644 --- a/nixpkgs/pkgs/tools/misc/fuc/default.nix +++ b/nixpkgs/pkgs/tools/misc/fuc/default.nix @@ -7,18 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "fuc"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "SUPERCILEX"; repo = "fuc"; rev = version; - hash = "sha256-kbEIZljIWs/GYOQ/XCBgWsBcEwm05bf7bZmAwq+eWXo="; + hash = "sha256-Ii0X2QGvUE+wDD7pKN3Mws4VqnwGJFdpjjv3oJRn/pY="; }; - patches = [ ./add_missing_feature.patch ]; - - cargoHash = "sha256-AD3LdBMmyf6xM7sWUDxYZs3NltnAkEfAdxYLAbnRM4M="; + cargoHash = "sha256-08MQCKfkusnE9fuuJOlKeDESwmf8ajU7qMjujN2o5bU="; RUSTC_BOOTSTRAP = 1; diff --git a/nixpkgs/pkgs/tools/misc/getoptions/default.nix b/nixpkgs/pkgs/tools/misc/getoptions/default.nix index 46a671707259..9860430515e4 100644 --- a/nixpkgs/pkgs/tools/misc/getoptions/default.nix +++ b/nixpkgs/pkgs/tools/misc/getoptions/default.nix @@ -18,8 +18,11 @@ stdenvNoCC.mkDerivation rec { nativeCheckInputs = [ shellspec ksh mksh yash zsh ] ++ lib.lists.optional (!stdenvNoCC.isDarwin) busybox-sandbox-shell; + # Disable checks against yash, since shellspec seems to be broken for yash>=2.54 + # (see: https://github.com/NixOS/nixpkgs/pull/218264#pullrequestreview-1434402054) preCheck = '' sed -i '/shellspec -s posh/d' Makefile + sed -i '/shellspec -s yash/d' Makefile '' + lib.strings.optionalString stdenvNoCC.isDarwin '' sed -i "/shellspec -s 'busybox ash'/d" Makefile ''; diff --git a/nixpkgs/pkgs/tools/misc/gh-dash/default.nix b/nixpkgs/pkgs/tools/misc/gh-dash/default.nix index 6f0d3d77ce5b..1fc865feef82 100644 --- a/nixpkgs/pkgs/tools/misc/gh-dash/default.nix +++ b/nixpkgs/pkgs/tools/misc/gh-dash/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gh-dash"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-ypYM/FXp+BObR2fjVCV8nDJhRuuu2Y7213haAJnzRIE="; + hash = "sha256-XvNc68pVwqBLthkr3jb578Avpnr1NKT1XWUD4aazBHw="; }; - vendorHash = "sha256-lOIONv+7cUUC0mGCwYkOkDn3zHreYpFeqmTbp2Ob3yM="; + vendorHash = "sha256-COPEgRqogRkGuJm56n9Cqljr7H8QT0RSKAdnXbHm+nw="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index c1b90a26575a..714876c0cc68 100644 --- a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "goreleaser"; - version = "1.19.2"; + version = "1.20.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T8mLbEJ0fGm+rxwFVHziQyq+JcXC0OrThwyDPxcPHB0="; + sha256 = "iZqX/03+0koxLTbeUOxpQoEita6S/eszB8kMe/NtDcc="; }; - vendorHash = "sha256-2m81ELHWbF9WKEMXmr5E8QReClWdVhPRJ+ZstrM6qY0="; + vendorHash = "sha256-YYFCoLwgx8OBfI4VcWO6AUqNZU2JdgGAJm26koJAzWA="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; diff --git a/nixpkgs/pkgs/tools/misc/gradescope-submit/default.nix b/nixpkgs/pkgs/tools/misc/gradescope-submit/default.nix new file mode 100644 index 000000000000..89e7dc89438c --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/gradescope-submit/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, ocamlPackages +}: + +ocamlPackages.buildDunePackage rec { + pname = "gradescope_submit"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "nmittu"; + repo = "gradescope-submit"; + rev = version; + hash = "sha256-BVNXipgw0wz3PRGYvur8jrXZw/6i0fZ+MOZHzXzlFOk="; + }; + + buildInputs = with ocamlPackages; [ + core + core_unix + cohttp + cohttp-lwt-unix + lambdasoup + toml + yojson + lwt_ssl + ]; + + meta = with lib; { + description = "A small script to submit to Gradescope via GitHub"; + homepage = "https://github.com/nmittu/gradescope-submit"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "submit"; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/grex/default.nix b/nixpkgs/pkgs/tools/misc/grex/default.nix index d7a0fc1a747b..2a6ca6031e3b 100644 --- a/nixpkgs/pkgs/tools/misc/grex/default.nix +++ b/nixpkgs/pkgs/tools/misc/grex/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "grex"; - version = "1.4.2"; + version = "1.4.4"; src = fetchFromGitHub { owner = "pemistahl"; - repo = pname; + repo = "grex"; rev = "v${version}"; - sha256 = "sha256-kbrBnpoVeXSgmIqElpfAnoSutYwsnFaxFJpRsJPUE8k="; + hash = "sha256-ef1eUxeCznIgXLoywwJmnLkTGdW1AmGwCin9DLU9kAs="; }; - cargoSha256 = "sha256-WO8h5JUEiCpfsROQoRZj7I6em6REcJ2PfmoGN1zKRPg="; + cargoHash = "sha256-XLH+fS3fwRcWmVOzTjUacV010N37Oofs9Tbixdka1qY="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; @@ -27,7 +27,9 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A command-line tool for generating regular expressions from user-provided test cases"; homepage = "https://github.com/pemistahl/grex"; + changelog = "https://github.com/pemistahl/grex/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + mainProgram = "grex"; + maintainers = with maintainers; [ SuperSandro2000 mfrw ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/h/default.nix b/nixpkgs/pkgs/tools/misc/h/default.nix index 8f44ed1b210b..6e4ae6381e75 100644 --- a/nixpkgs/pkgs/tools/misc/h/default.nix +++ b/nixpkgs/pkgs/tools/misc/h/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "h"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "zimbatm"; repo = "h"; rev = "v${version}"; - hash = "sha256-RyQZ9F+rZ0a/90hljSyNCzYK8eA3rYJlJkV7B5NPRzY="; + hash = "sha256-eitUKOo2c1c+SyctkUW/SUb2RCKUoU6nJplfJVdwBSs="; }; buildInputs = [ ruby ]; diff --git a/nixpkgs/pkgs/tools/misc/hdf5/default.nix b/nixpkgs/pkgs/tools/misc/hdf5/default.nix index 1dc0eda83f67..3c9c6169192d 100644 --- a/nixpkgs/pkgs/tools/misc/hdf5/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf5/default.nix @@ -26,7 +26,7 @@ assert !cppSupport || !mpiSupport; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.14.1-2"; + version = "1.14.2"; pname = "hdf5" + lib.optionalString cppSupport "-cpp" + lib.optionalString fortranSupport "-fortran" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { majorMinor = lib.versions.majorMinor version; majorMinorPatch = with lib.versions; "${major version}.${minor version}.${patch version}"; in "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${majorMinor}/hdf5-${majorMinorPatch}/src/hdf5-${version}.tar.bz2"; - sha256 = "sha256-BsoUHRo8MStdfMSCahJzcpOuExAxdIhhaJ9qLsghnb0="; + sha256 = "sha256-6jxeJX7zIq9ed/weUurTrWvzu0rAZIDdF+45ANeiTPs="; }; passthru = { @@ -94,18 +94,6 @@ stdenv.mkDerivation rec { moveToOutput 'bin/h5pcc' "''${!outputDev}" ''; - # Remove reference to /build, which get introduced - # into AM_CPPFLAGS since hdf5-1.14.0. Cmake of various - # packages using HDF5 gets confused trying access the non-existent path. - postFixup = '' - for i in h5cc h5pcc h5c++; do - if [ -f $dev/bin/$i ]; then - substituteInPlace $dev/bin/$i --replace \ - '-I/build/hdf5-${version}/src/H5FDsubfiling' "" - fi - done - ''; - enableParallelBuilding = true; passthru.tests = { diff --git a/nixpkgs/pkgs/tools/misc/hoard/default.nix b/nixpkgs/pkgs/tools/misc/hoard/default.nix index f44787924d94..4bdf7b7127b8 100644 --- a/nixpkgs/pkgs/tools/misc/hoard/default.nix +++ b/nixpkgs/pkgs/tools/misc/hoard/default.nix @@ -1,27 +1,39 @@ -{ lib, rustPlatform, fetchFromGitHub, ncurses, openssl, pkg-config, stdenv, Security }: +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "hoard"; - version = "1.3.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Hyde46"; - repo = pname; + repo = "hoard"; rev = "v${version}"; - sha256 = "sha256-Gm3X6/g5JQJEl7wRvWcO4j5XpROhtfRJ72LNaUeZRGc="; + hash = "sha256-c9iSbxkHwLOeATkO7kzTyLD0VAwZUzCvw5c4FyuR5/E="; }; - buildInputs = [ ncurses openssl ] - ++ lib.optional stdenv.isDarwin Security; + cargoHash = "sha256-4EeeD1ySR4M1i2aaKJP/BNSn+t1l8ingiv2ZImFFn1A="; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-ZNhUqnsme1rczl3FdFBGGs+vBDFcFEELkPp0/udTfR4="; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; meta = with lib; { description = "CLI command organizer written in rust"; homepage = "https://github.com/hyde46/hoard"; + changelog = "https://github.com/Hyde46/hoard/blob/${src.rev}/CHANGES.md"; license = licenses.mit; - maintainers = with maintainers; [ builditluc ]; + maintainers = with maintainers; [ builditluc figsoda ]; + mainProgram = "hoard"; }; } diff --git a/nixpkgs/pkgs/tools/misc/hyfetch/default.nix b/nixpkgs/pkgs/tools/misc/hyfetch/default.nix index 037a6e123196..3621ad675b24 100644 --- a/nixpkgs/pkgs/tools/misc/hyfetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/hyfetch/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "hyfetch"; - version = "1.4.9"; + version = "1.4.10"; format = "setuptools"; src = fetchFromGitHub { owner = "hykilpikonna"; repo = "hyfetch"; rev = "refs/tags/${version}"; - hash = "sha256-n+Aa6HrGB7aKrHLQijKNcUVGMYxuqYVrAAnHFPDYH40="; + hash = "sha256-B8FAMXot+QV7Q2bJuTsRsrxHSr/2f+WNTKrZqFXewdE="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/tools/misc/ksnip/default.nix b/nixpkgs/pkgs/tools/misc/ksnip/default.nix index 853db8ab45a5..bae675b49599 100644 --- a/nixpkgs/pkgs/tools/misc/ksnip/default.nix +++ b/nixpkgs/pkgs/tools/misc/ksnip/default.nix @@ -7,7 +7,7 @@ , kimageannotator , wrapQtAppsHook , qtsvg -, qttranslations +, qttools , qtx11extras }: @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { cmake extra-cmake-modules wrapQtAppsHook + qttools ]; buildInputs = [ kcolorpicker kimageannotator qtsvg - qttranslations qtx11extras ]; diff --git a/nixpkgs/pkgs/tools/misc/lighthouse-steamvr/Cargo.lock b/nixpkgs/pkgs/tools/misc/lighthouse-steamvr/Cargo.lock index 0ac80e453262..daaa1802698f 100644 --- a/nixpkgs/pkgs/tools/misc/lighthouse-steamvr/Cargo.lock +++ b/nixpkgs/pkgs/tools/misc/lighthouse-steamvr/Cargo.lock @@ -3,31 +3,77 @@ version = 3 [[package]] -name = "anyhow" -version = "1.0.66" +name = "addr2line" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] [[package]] -name = "async-trait" -version = "0.1.58" +name = "adler" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "anstream" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ - "proc-macro2", - "quote", - "syn", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", ] [[package]] -name = "atty" -version = "0.2.14" +name = "anstyle" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "async-trait" +version = "0.1.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -37,12 +83,33 @@ 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 = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -50,12 +117,12 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "bluez-async" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e81db626818b179ab5fc3393b7ac77462335f716b302ef1ff1866473ab6ddb25" +checksum = "5ce7d4413c940e8e3cb6afc122d3f4a07096aca259d286781128683fc9f39d9b" dependencies = [ "async-trait", - "bitflags", + "bitflags 2.4.0", "bluez-generated", "dbus", "dbus-tokio", @@ -71,21 +138,21 @@ dependencies = [ [[package]] name = "bluez-generated" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ad8f302dd79411881cd0181f3bd9fc91a959b71c3a13159bd8a07d2c40dc7f" +checksum = "4d1c659dbc82f0b8ca75606c91a371e763589b7f6acf36858eeed0c705afe367" dependencies = [ "dbus", ] [[package]] name = "btleplug" -version = "0.10.3" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade1454166eca7ef6ac97f447e462a32615942c703683b6cdf690227e6170078" +checksum = "a1ad24f1a9171b691da81fd0a0ae6859ef471979a4d68372515bafc2f4586df1" dependencies = [ "async-trait", - "bitflags", + "bitflags 1.3.2", "bluez-async", "cocoa", "dashmap", @@ -109,15 +176,18 @@ dependencies = [ [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cc" -version = "1.0.77" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cesu8" @@ -133,37 +203,43 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.0.27" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0acbd8d28a0a60d7108d7ae850af6ba34cf2d1257fc646980e5f97ce14275966" +checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" dependencies = [ - "bitflags", + "clap_builder", "clap_derive", - "clap_lex", - "is-terminal", "once_cell", - "strsim", - "termcolor", ] [[package]] name = "clap-verbosity-flag" -version = "2.0.0" -source = "git+https://github.com/ShayBoxs-Forks/clap-verbosity-flag.git#9567257d3fc7f394d6edc95111027d38f5722de4" +version = "2.1.1" +source = "git+https://github.com/ShayBoxs-Forks/clap-verbosity-flag.git#5807fd33f935a71ade25e2e6d5aa1b8727c8e63f" dependencies = [ "clap", - "log", "tracing", ] [[package]] +name = "clap_builder" +version = "4.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] name = "clap_derive" -version = "4.0.21" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", "syn", @@ -171,45 +247,48 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" -dependencies = [ - "os_str_bytes", -] +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "cocoa" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "cocoa-foundation", "core-foundation", "core-graphics", - "foreign-types", + "foreign-types 0.5.0", "libc", "objc", ] [[package]] name = "cocoa-foundation" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", "libc", "objc", ] [[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] name = "combine" version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -231,40 +310,39 @@ 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 = "core-graphics" -version = "0.22.3" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.5.0", "libc", ] [[package]] name = "core-graphics-types" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", - "foreign-types", "libc", ] [[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", "hashbrown", @@ -275,9 +353,9 @@ dependencies = [ [[package]] name = "dbus" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8bcdd56d2e5c4ed26a529c5a9029f5db8290d433497506f958eae3be148eb6" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" dependencies = [ "futures-channel", "futures-util", @@ -288,9 +366,9 @@ dependencies = [ [[package]] name = "dbus-tokio" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12a1a74a0c53b22d7d994256cf3ecbeefa5eedce3cf9d362945ac523c4132180" +checksum = "007688d459bc677131c063a3a77fb899526e17b7980f390b69644bdbc41fad13" dependencies = [ "dbus", "libc", @@ -299,62 +377,57 @@ dependencies = [ [[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 = "errno" -version = "0.2.8" +name = "foreign-types" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "errno-dragonfly", - "libc", - "winapi", + "foreign-types-shared 0.1.1", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "foreign-types" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ - "cc", - "libc", + "foreign-types-macros", + "foreign-types-shared 0.3.1", ] [[package]] -name = "error-stack" -version = "0.2.4" +name = "foreign-types-macros" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d224e04b2d93d974c08e375dac9b8d1a513846e44c6666450a57b1ed963f9" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ - "anyhow", - "owo-colors", - "rustc_version", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "foreign-types" -version = "0.3.2" +name = "foreign-types-shared" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "foreign-types-shared" -version = "0.1.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -367,9 +440,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -377,15 +450,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -394,15 +467,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", @@ -411,21 +484,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -440,62 +513,28 @@ dependencies = [ ] [[package]] -name = "hashbrown" -version = "0.12.3" +name = "gimli" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] -name = "heck" -version = "0.4.0" +name = "hashbrown" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] -name = "hermit-abi" -version = "0.1.19" +name = "heck" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e394faa0efb47f9f227f1cd89978f854542b318a6f64fa695489c9c993056656" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "is-terminal" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae5bc6e2eb41c9def29a3e0f1306382807764b9b53112030eff57435667352d" -dependencies = [ - "hermit-abi 0.2.6", - "io-lifetimes", - "rustix", - "windows-sys", -] - -[[package]] -name = "is_ci" -version = "1.1.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "itertools" @@ -528,9 +567,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jni-utils" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d3a00638470bedd9bcbea85292bef2207e6db984079db0bd70148a449cdb457" +checksum = "259e9f2c3ead61de911f147000660511f07ab00adeed1d84f5ac4d0386e7a6c4" dependencies = [ "dashmap", "futures", @@ -549,45 +588,39 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.137" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libdbus-sys" -version = "0.2.2" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" dependencies = [ "pkg-config", ] [[package]] name = "lighthouse" -version = "1.0.0" +version = "1.1.1" dependencies = [ "btleplug", "clap", "clap-verbosity-flag", - "error-stack", - "log", "serde", + "thiserror", "tokio", + "tracing", "tracing-subscriber", "uuid", ] [[package]] -name = "linux-raw-sys" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" - -[[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -595,12 +628,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "malloc_buf" @@ -613,18 +643,26 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] [[package]] name = "mio" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi", "windows-sys", ] @@ -641,11 +679,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", "libc", ] @@ -659,16 +697,19 @@ dependencies = [ ] [[package]] -name = "once_cell" -version = "1.16.0" +name = "object" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +dependencies = [ + "memchr", +] [[package]] -name = "os_str_bytes" -version = "6.4.1" +name = "once_cell" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "overload" @@ -677,15 +718,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" -dependencies = [ - "supports-color", -] - -[[package]] name = "parking_lot" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -697,22 +729,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.4" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-targets", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -722,83 +754,42 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.21" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "semver", + "bitflags 1.3.2", ] [[package]] -name = "rustix" -version = "0.36.3" +name = "rustc-demangle" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b1fbb4dfc4eb1d390c02df47760bb19a84bb80b301ecc947ab5406394d8223e" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys", -] +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "same-file" @@ -811,30 +802,24 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "semver" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde-xml-rs" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65162e9059be2f6a3421ebbb4fef3e74b7d9e7c60c50a0e292c6239f19f1edfa" +checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" dependencies = [ "log", "serde", @@ -844,18 +829,18 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.7" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", @@ -873,36 +858,36 @@ 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", ] [[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", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" -version = "0.4.7" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" dependencies = [ "libc", - "winapi", + "windows-sys", ] [[package]] @@ -918,20 +903,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "supports-color" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba6faf2ca7ee42fdd458f4347ae0a9bd6bcc445ad7cb57ad82b383f18870d6f" -dependencies = [ - "atty", - "is_ci", -] - -[[package]] name = "syn" -version = "1.0.103" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -939,28 +914,19 @@ dependencies = [ ] [[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", @@ -969,23 +935,23 @@ dependencies = [ [[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 = "tokio" -version = "1.22.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot", @@ -993,14 +959,14 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "winapi", + "windows-sys", ] [[package]] name = "tokio-macros" -version = "1.8.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", @@ -1009,9 +975,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite", @@ -1021,9 +987,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -1046,9 +1012,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", @@ -1057,9 +1023,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -1078,9 +1044,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "nu-ansi-term", "sharded-slab", @@ -1092,15 +1058,21 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + +[[package]] +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.2.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "serde", ] @@ -1112,19 +1084,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -1167,120 +1132,81 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.41.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3ed69de2c1f8d0524a8a3417a80a85dd316a071745fbfdf5eb028b310058ab" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows_aarch64_gnullvm 0.41.0", - "windows_aarch64_msvc 0.41.0", - "windows_i686_gnu 0.41.0", - "windows_i686_msvc 0.41.0", - "windows_x86_64_gnu 0.41.0", - "windows_x86_64_gnullvm 0.41.0", - "windows_x86_64_msvc 0.41.0", + "windows-targets", ] [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows_aarch64_gnullvm 0.42.0", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm 0.42.0", - "windows_x86_64_msvc 0.42.0", + "windows-targets", ] [[package]] -name = "windows_aarch64_gnullvm" -version = "0.41.0" +name = "windows-targets" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "163d2761774f2278ecb4e6719e80b2b5e92e5a2be73a7bcd3ef624dd5e3091fd" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.41.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef005ff2bceb00d3b84166a359cc19084f9459754fd3fe5a504dee3dddcd0a0c" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" - -[[package]] -name = "windows_i686_gnu" -version = "0.41.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4df2d51e32f03f8b4b228e487828c03bcb36d97b216fc5463bcea5bb1440b" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" - -[[package]] -name = "windows_i686_msvc" -version = "0.41.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a966834571f2f3267f07dd72b4d8507381f25e53d056808483b2637385ef7" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.41.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc395dac1adf444e276d096d933ae7961361c8cda3245cffef7a9b3a70a8f994" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.41.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e8ec22b715d5b436e1d59c8adad6c744dc20cd984710121d5836b4e8dbb5e0" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.41.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9761f0216b669019df1512f6e25e5ee779bf61c5cdc43c7293858e7efd7926" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "xml-rs" -version = "0.8.4" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" \ No newline at end of file +checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" diff --git a/nixpkgs/pkgs/tools/misc/lighthouse-steamvr/default.nix b/nixpkgs/pkgs/tools/misc/lighthouse-steamvr/default.nix index 1fa29273a831..5328c14cdbfe 100644 --- a/nixpkgs/pkgs/tools/misc/lighthouse-steamvr/default.nix +++ b/nixpkgs/pkgs/tools/misc/lighthouse-steamvr/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "Lighthouse"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "ShayBox"; repo = pname; rev = version; - sha256 = "0628v6fq9dcv1w4spgnypgyxf1qw5x03yhasink5s9nqpcip0w4h"; + sha256 = "0g0cs54j1vmcig5nc8sqgx30nfn2zjs40pvv30j5g9cyyszbzwkw"; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "clap-verbosity-flag-2.0.0" = "125b8ki3dqj2kilimmvpi9wslwky8xacydi75c2bdrxpi926nya6"; + "clap-verbosity-flag-2.1.1" = "1213bsb0bpvv6621j9zicjsqy05sv21gh6inrvszqwcmj6fxxc7j"; }; }; diff --git a/nixpkgs/pkgs/tools/misc/lsd/default.nix b/nixpkgs/pkgs/tools/misc/lsd/default.nix index 89f51c0ea5c6..83d7580a7eed 100644 --- a/nixpkgs/pkgs/tools/misc/lsd/default.nix +++ b/nixpkgs/pkgs/tools/misc/lsd/default.nix @@ -1,7 +1,9 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform , installShellFiles +, darwin , pandoc , testers , lsd @@ -9,23 +11,29 @@ rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "0.23.1"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "Peltoche"; - repo = pname; - rev = version; - sha256 = "sha256-FY1odcKBl7zJ+MxfohkmC1e45fPQK3MKB3orQdCRpA4="; + owner = "lsd-rs"; + repo = "lsd"; + rev = "v${version}"; + hash = "sha256-syT+1LNdigUWkfJ/wkbY/kny2uW6qfpl7KmW1FjZKR8="; }; - cargoSha256 = "sha256-t7J7hIbLlRq99Yd2/3Zn+PbHhJtaJRdDluDXN0Hp/Jc="; + cargoHash = "sha256-viLr76Bq9OkPMp+BoprQusMDgx59nbevVi4uxjZ+eZg="; nativeBuildInputs = [ installShellFiles pandoc ]; + + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + postInstall = '' pandoc --standalone --to man doc/lsd.md -o lsd.1 installManPage lsd.1 - installShellCompletion $releaseDir/build/lsd-*/out/{_lsd,lsd.{bash,fish}} + installShellCompletion --cmd lsd \ + --bash $releaseDir/build/lsd-*/out/lsd.bash \ + --fish $releaseDir/build/lsd-*/out/lsd.fish \ + --zsh $releaseDir/build/lsd-*/out/_lsd ''; # Found argument '--test-threads' which wasn't expected, or isn't valid in this context @@ -36,9 +44,9 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { - homepage = "https://github.com/Peltoche/lsd"; + homepage = "https://github.com/lsd-rs/lsd"; description = "The next gen ls command"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne marsam zowoq SuperSandro2000 ]; + maintainers = with maintainers; [ marsam zowoq SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/moar/default.nix b/nixpkgs/pkgs/tools/misc/moar/default.nix index cc25dde87587..7c163859dfdb 100644 --- a/nixpkgs/pkgs/tools/misc/moar/default.nix +++ b/nixpkgs/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.15.3"; + version = "1.16.0"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-ppaBO+qgjHPCQysTiB3nCXa8zUuEyLOK5iR2VwSyXRM="; + hash = "sha256-m3IG5xZITh+iAE233NFMI+25VRt6GvK694oVd1wU5jA="; }; vendorHash = "sha256-aFCv6VxHD1bOLhCHXhy4ubik8Z9uvU6AeqcMqIZI2Oo="; diff --git a/nixpkgs/pkgs/tools/misc/ncdu/1.nix b/nixpkgs/pkgs/tools/misc/ncdu/1.nix index 742ef587138a..09289ea745da 100644 --- a/nixpkgs/pkgs/tools/misc/ncdu/1.nix +++ b/nixpkgs/pkgs/tools/misc/ncdu/1.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ncdu"; - version = "1.17"; + version = "1.18.1"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-gQdFqO0as3iMh9OupMwaFO327iJvdkvMOD4CS6Vq2/E="; + sha256 = "sha256-fA+h6ynYWq7UuhdBZL27jwEbXDkNAXxX1mj8cjEzJAU="; }; buildInputs = [ ncurses ]; @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ pSub ]; + mainProgram = "ncdu"; }; } diff --git a/nixpkgs/pkgs/tools/misc/node-glob/default.nix b/nixpkgs/pkgs/tools/misc/node-glob/default.nix new file mode 100644 index 000000000000..aba4690bbba4 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/node-glob/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "glob"; + version = "10.3.3"; + + src = fetchFromGitHub { + owner = "isaacs"; + repo = "node-glob"; + rev = "v${version}"; + hash = "sha256-oLlNhQOnu/hlKjNWa5vjqslz1EarZJOpUEXUB+vGQvc="; + }; + + npmDepsHash = "sha256-78oODw+CBCk5JRJbDqLqVmzTVImP7Z7o6jRIimDxZDQ="; + + dontNpmBuild = true; + + meta = { + changelog = "https://github.com/isaacs/node-glob/blob/${src.rev}/changelog.md"; + description = "A little globber for Node.js"; + homepage = "https://github.com/isaacs/node-glob"; + license = lib.licenses.isc; + mainProgram = "glob"; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/nomino/default.nix b/nixpkgs/pkgs/tools/misc/nomino/default.nix index ce9be1fd5878..1eb472ee8fa1 100644 --- a/nixpkgs/pkgs/tools/misc/nomino/default.nix +++ b/nixpkgs/pkgs/tools/misc/nomino/default.nix @@ -1,21 +1,22 @@ -{ fetchFromGitHub, lib, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "nomino"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "yaa110"; repo = pname; rev = version; - sha256 = "sha256-XUxoHmZePn/VVlu2KctC+TbmCwp+tYEYg5EYXI8ZB7o="; + hash = "sha256-pzAL7e72sO94qLEwsH/5RuiuzvnsSelIq47jdU8INDw="; }; - cargoSha256 = "sha256-RyEqDC2gRacd27uvNf3XOATZdeVg70vBEdPURNuf38w="; + cargoHash = "sha256-gDOZ3nD7pTIRNXG3S+qTkl+HInBcAErvwPqa0NZWxY4="; meta = with lib; { description = "Batch rename utility for developers"; homepage = "https://github.com/yaa110/nomino"; + changelog = "https://github.com/yaa110/nomino/releases/tag/${src.rev}"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; }; diff --git a/nixpkgs/pkgs/tools/misc/ollama/default.nix b/nixpkgs/pkgs/tools/misc/ollama/default.nix index 8de315533746..be1864024888 100644 --- a/nixpkgs/pkgs/tools/misc/ollama/default.nix +++ b/nixpkgs/pkgs/tools/misc/ollama/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ollama"; - version = "0.0.15"; + version = "0.0.17"; src = fetchFromGitHub { owner = "jmorganca"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-p2YLgLyjmf2MPvFue45+wW7kqKpUli9rX3aWNH08cDk="; + hash = "sha256-idsFcjsRD1zPmG742gnYQJcgSWDA2DLMHksCFNe2GiY="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ diff --git a/nixpkgs/pkgs/tools/misc/pgbadger/default.nix b/nixpkgs/pkgs/tools/misc/pgbadger/default.nix index b0c4c1ad6551..ed1646c04f82 100644 --- a/nixpkgs/pkgs/tools/misc/pgbadger/default.nix +++ b/nixpkgs/pkgs/tools/misc/pgbadger/default.nix @@ -1,13 +1,13 @@ { buildPerlPackage, stdenv, lib, fetchFromGitHub, which, bzip2, PodMarkdown, JSONXS -, TextCSV }: +, TextCSV_XS }: buildPerlPackage rec { pname = "pgbadger"; - version = "11.5"; + version = "12.2"; src = fetchFromGitHub { owner = "darold"; repo = "pgbadger"; - rev = "98b38161ba99faae77c81d5fa47bd769c1dd750b"; - sha256 = "0r01mx1922g1m56x4958cihk491zjlaijvap0i32grjmnv4s5v88"; + rev = "v${version}"; + hash = "sha256-IzfpDqzS5VcehkPsFxyn3kJsvXs8nLgJ3WT8ZCmIDxI="; }; postPatch = '' @@ -18,13 +18,14 @@ buildPerlPackage rec { PERL_MM_OPT = "INSTALL_BASE=${placeholder "out"}"; - buildInputs = [ PodMarkdown JSONXS TextCSV ]; + buildInputs = [ PodMarkdown JSONXS TextCSV_XS ]; nativeCheckInputs = [ which bzip2 ]; meta = { homepage = "https://github.com/darold/pgbadger"; description = "A fast PostgreSQL Log Analyzer"; + changelog = "https://github.com/darold/pgbadger/raw/v${version}/ChangeLog"; license = lib.licenses.postgresql; maintainers = lib.teams.determinatesystems.members; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/pgbadger.x86_64-darwin diff --git a/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix b/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix index e6d4b3bed213..1b6312db12df 100644 --- a/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix +++ b/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6JqlAJHFJAvJjLqOwXLmW7sRwQCmYFfLGrSw5lTY8Sc="; + sha256 = "sha256-WzyTLOJo/wTZA9glxO0ovcaADlHV+AKLChWSLJ+uvaQ="; }; vendorHash = "sha256-KIMnvGMIipuIFPTSeERtCfvlPuvHvEHdjBJ1TbT2d1s="; diff --git a/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix b/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix index a4eba4aaf0a4..3de9148c98ab 100644 --- a/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.8.4"; + version = "2.11.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-tYpn93PSvO9g31soDOW0+gOBaypMUlx9Xfo0H3ftJQk="; + sha256 = "sha256-8LhXsrO0sXMu7cXNoLafwNgCO99zGcQBYcCmqJfM2KY="; }; - vendorHash = "sha256-SooYBVXcll8QciK8J68wUAsAH6kN+lWlmPS8h0Hw4e0="; + vendorHash = "sha256-lbJetTERQKnDKmM1VqRWU0OjZPm+bfeQ9ZThs/TzxIU="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/ripdrag/default.nix b/nixpkgs/pkgs/tools/misc/ripdrag/default.nix index cf1f41dfdc6e..67151cd060e5 100644 --- a/nixpkgs/pkgs/tools/misc/ripdrag/default.nix +++ b/nixpkgs/pkgs/tools/misc/ripdrag/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ripdrag"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "nik012003"; repo = "ripdrag"; rev = "v${version}"; - hash = "sha256-YTr4vxPsZAQmzE1aE7PAgUEqEyr6pywAQO4VCZ4SZoM="; + hash = "sha256-SvGJb/XosR8T/bg7nhjXR15Ba1MLaerJvoetYDtgHiM="; }; - cargoHash = "sha256-sUT05qY1eI0kw/kDvKcD93Zg2ZcKlHu+DSQIhFChf0I="; + cargoHash = "sha256-O/Xp+dZ+Pv1/yNS/KYbF2wQguq/udtJlRPeP4v3U0Vs="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; diff --git a/nixpkgs/pkgs/tools/misc/routino/default.nix b/nixpkgs/pkgs/tools/misc/routino/default.nix index 5f2a8852e319..ea882749a534 100644 --- a/nixpkgs/pkgs/tools/misc/routino/default.nix +++ b/nixpkgs/pkgs/tools/misc/routino/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "routino"; - version = "3.3.3"; + version = "3.4.1"; src = fetchurl { url = "https://routino.org/download/${pname}-${version}.tgz"; - sha256 = "1xa7l2bjn832nk6bc7b481nv8hd2gj41jwhg0d2qy10lqdvjpn5b"; + hash = "sha256-C6qNKljRdV0ProbgSxfrZLgZH+Pl8kcpKmTb83GLhSs="; }; patchFlags = [ "-p0" ]; @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.routino.org/"; + changelog = "http://routino.org/software/NEWS.txt"; description = "OpenStreetMap Routing Software"; license = licenses.agpl3Plus; maintainers = with maintainers; [ dotlambda ]; diff --git a/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix b/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix index e875d5a59550..61ca001563f5 100644 --- a/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix +++ b/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix @@ -1,31 +1,43 @@ -{ mkDerivation, - stdenv, - lib, - fetchFromGitHub, - cmake, - curl, - libarchive, - util-linux, - qtbase, - qtdeclarative, - qtsvg, - qttools, - qtquickcontrols2, - qtgraphicaleffects +{ lib +, stdenv +, fetchFromGitHub +, wrapQtAppsHook +, cmake +, util-linux +, curl +, libarchive +, qtbase +, qtdeclarative +, qtsvg +, qttools +, qtquickcontrols2 +, qtgraphicaleffects +, nix-update-script +, enableTelemetry ? false }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "rpi-imager"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ahETmUhlPZ3jpxmzDK5pS6yLc6UxCJFOtWolAtSrDVQ="; + sha256 = "sha256-yB+H1zWL40KzxOrBuvg7nBC3zmWilsOgOW7ndiDWuDA="; }; - nativeBuildInputs = [ cmake util-linux ]; + nativeBuildInputs = [ + cmake + util-linux + wrapQtAppsHook + ]; + + # Disable telemetry and update check. + cmakeFlags = lib.optionals (!enableTelemetry) [ + "-DENABLE_CHECK_VERSION=OFF" + "-DENABLE_TELEMETRY=OFF" + ]; buildInputs = [ curl @@ -45,12 +57,29 @@ mkDerivation rec { This patch removes the check. */ patches = [ ./lsblkCheckFix.patch ]; + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + # Without this, the tests fail because they cannot create the QT Window + export QT_QPA_PLATFORM=offscreen + $out/bin/rpi-imager --version + + runHook postInstallCheck + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Raspberry Pi Imaging Utility"; - homepage = "https://www.raspberrypi.org/software/"; + homepage = "https://www.raspberrypi.com/software/"; + changelog = "https://github.com/raspberrypi/rpi-imager/releases/tag/v${version}"; downloadPage = "https://github.com/raspberrypi/rpi-imager/"; license = licenses.asl20; - maintainers = with maintainers; [ ymarkus ]; + maintainers = with maintainers; [ ymarkus anthonyroussel ]; platforms = platforms.all; # does not build on darwin broken = stdenv.isDarwin; diff --git a/nixpkgs/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch b/nixpkgs/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch index 98fd2a659dc8..aa4fdeecfdb0 100644 --- a/nixpkgs/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch +++ b/nixpkgs/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch @@ -1,16 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3d7fc79..8ce72b9 100644 +index 170ce7a..063a137 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -229,11 +229,6 @@ else() +@@ -332,11 +332,6 @@ else() if (NOT LSBLK) message(FATAL_ERROR "Unable to locate lsblk (used for disk enumeration)") endif() - -- execute_process(COMMAND "${LSBLK}" "--json" RESULT_VARIABLE ret) +- execute_process(COMMAND "${LSBLK}" "--json" OUTPUT_QUIET RESULT_VARIABLE ret) - if (ret EQUAL "1") - message(FATAL_ERROR "util-linux package too old. lsblk does not support --json (used for disk enumeration)") - endif() endif() - + configure_file( diff --git a/nixpkgs/pkgs/tools/misc/shopware-cli/default.nix b/nixpkgs/pkgs/tools/misc/shopware-cli/default.nix index 7d1c29c956f2..b553ab269d7c 100644 --- a/nixpkgs/pkgs/tools/misc/shopware-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/shopware-cli/default.nix @@ -4,21 +4,23 @@ , installShellFiles , makeWrapper , dart-sass +, git }: buildGoModule rec { pname = "shopware-cli"; - version = "0.2.1"; + version = "0.2.6"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; rev = version; - hash = "sha256-3upZmqsKCg98j/HTwFp0L7MMspCw7Dj6dRoyEPW287k="; + hash = "sha256-Ut/SKdnaJM4B6jXXcRS6UJ1qCEgnZy977qlZbH8S6qU="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; + nativeCheckInputs = [ git ]; - vendorHash = "sha256-KEWACwZka4WMQS4/O6WkIdeeUnxtcpEwQmMlNBLUjbI="; + vendorHash = "sha256-luA+tSePY8V+BQBTykv236mq4z3wQjLrjeYH2KQ0Mrc="; postInstall = '' export HOME="$(mktemp -d)" diff --git a/nixpkgs/pkgs/tools/misc/slingshot/default.nix b/nixpkgs/pkgs/tools/misc/slingshot/default.nix new file mode 100644 index 000000000000..48ea7f24c040 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/slingshot/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "slingshot"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "caio-ishikawa"; + repo = "slingshot"; + rev = "v${version}"; + hash = "sha256-PbcpvSBYoRs8TMkbbQjG284BWr+PSaTStPOg4a1GIrw="; + }; + + cargoHash = "sha256-Y0H88paBe2yyUyTdwxXO58YFDdH04kK+nHvi1qyYVF0="; + + meta = with lib; { + description = "Lightweight command line tool to quickly navigate across folders"; + homepage = "https://github.com/caio-ishikawa/slingshot"; + changelog = "https://github.com/caio-ishikawa/slingshot/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "slingshot"; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/smenu/default.nix b/nixpkgs/pkgs/tools/misc/smenu/default.nix index ed45be67d200..9768b33c5ce9 100644 --- a/nixpkgs/pkgs/tools/misc/smenu/default.nix +++ b/nixpkgs/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.2.0"; + version = "1.3.0"; pname = "smenu"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "sha256-DfND2lIHQc+7+8lM86MMOdFKhbUAOnSlkpLwxo10EI4="; + sha256 = "sha256-r2N+MmZI2KCuYarrFL2Xn5hu4FO3n5MqADRuTXMOtk0="; }; buildInputs = [ ncurses ]; diff --git a/nixpkgs/pkgs/tools/misc/spacer/default.nix b/nixpkgs/pkgs/tools/misc/spacer/default.nix index f6c6db98998e..4452b72ba836 100644 --- a/nixpkgs/pkgs/tools/misc/spacer/default.nix +++ b/nixpkgs/pkgs/tools/misc/spacer/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "spacer"; - version = "0.1.8"; + version = "0.2"; src = fetchFromGitHub { owner = "samwho"; repo = "spacer"; rev = "v${version}"; - hash = "sha256-F2PrBlS9uL6BQtjNNabCpl3ofavsUGlBy/Hotm42Oec="; + hash = "sha256-6RGwOyp/TzO7Z2xpcNFtAb+UaiMmgiuac9nqZs4fC10="; }; - cargoHash = "sha256-aeXvqgSKRvm9W6sc5XCkwhMYUncj8pEPyQpYQr+fj7Y="; + cargoHash = "sha256-XWXrivx0TJZmu5jJYJAzKm6dzqOwiWwU8mRuehZkQbA="; meta = with lib; { description = "CLI tool to insert spacers when command output stops"; diff --git a/nixpkgs/pkgs/tools/misc/tgpt/default.nix b/nixpkgs/pkgs/tools/misc/tgpt/default.nix index 543aa24aa9ec..96b4ccce6bd8 100644 --- a/nixpkgs/pkgs/tools/misc/tgpt/default.nix +++ b/nixpkgs/pkgs/tools/misc/tgpt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tgpt"; - version = "1.7.2"; + version = "1.7.4"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "tgpt"; rev = "refs/tags/v${version}"; - hash = "sha256-e1OPDhZuRbm6DqvmB1ZiXVRSnjaZEFi2gSIMnfIIHKE="; + hash = "sha256-JOCoyGSIdHWa7/4fwSoaTFLqk5EE9Ni4UFCD7BvFeoQ="; }; vendorHash = "sha256-2I5JJWxM6aZx0eZu7taUTL11Y/5HIrXYC5aezrTbbsM="; diff --git a/nixpkgs/pkgs/tools/misc/tlp/default.nix b/nixpkgs/pkgs/tools/misc/tlp/default.nix index 4d1ff026f21e..023028879245 100644 --- a/nixpkgs/pkgs/tools/misc/tlp/default.nix +++ b/nixpkgs/pkgs/tools/misc/tlp/default.nix @@ -24,13 +24,13 @@ , networkmanager }: stdenv.mkDerivation rec { pname = "tlp"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = version; - sha256 = "sha256-hHel3BVMzTYfE59kxxADnm8tqtUFntqS3RzmJSZlWjM="; + hash = "sha256-XAyko2MxFyo5RyioaexhoFAR3E+I3t/8vD2K3WYNmsI="; }; # XXX: See patch files for relevant explanations. @@ -127,6 +127,7 @@ description = "Advanced Power Management for Linux"; homepage = "https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html"; + changelog = "https://github.com/linrunner/TLP/releases/tag/${version}"; platforms = platforms.linux; maintainers = with maintainers; [ abbradar lovesegfault ]; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch b/nixpkgs/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch index be8afc0667fa..278cd0b1dde8 100644 --- a/nixpkgs/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch +++ b/nixpkgs/pkgs/tools/misc/tlp/patches/0001-makefile-correctly-sed-paths.patch @@ -15,14 +15,14 @@ The reason DESTDIR is used at all, as opposed to the more appropriate PREFIX, is covered in the nix formula, and is (also) due to the Makefile being a bit "different." --- - Makefile | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) + Makefile | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile -index e9bbab4..ab05720 100644 +index 8042517..1c436ad 100644 --- a/Makefile +++ b/Makefile -@@ -51,19 +51,19 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) +@@ -57,20 +57,20 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT) SED = sed \ -e "s|@TLPVER@|$(TLPVER)|g" \ @@ -40,9 +40,11 @@ index e9bbab4..ab05720 100644 -e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \ - -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \ - -e "s|@TLP_CONFREN@|$(TLP_CONFREN)|g" \ +- -e "s|@TLP_CONFDPR@|$(TLP_CONFDPR)|g" \ - -e "s|@TLP_CONF@|$(TLP_CONF)|g" \ + -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \ + -e "s|@TLP_CONFREN@|$(_CONFREN)|g" \ ++ -e "s|@TLP_CONFDPR@|$(_CONFDPR)|g" \ + -e "s|@TLP_CONF@|$(_CONF)|g" \ -e "s|@TLP_RUN@|$(TLP_RUN)|g" \ -e "s|@TLP_VAR@|$(TLP_VAR)|g" \ @@ -52,5 +54,5 @@ index e9bbab4..ab05720 100644 INFILES = \ tlp \ -- -2.33.0 +2.41.0 diff --git a/nixpkgs/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch b/nixpkgs/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch index 08bbafc4b9da..dfea1c61636d 100644 --- a/nixpkgs/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch +++ b/nixpkgs/pkgs/tools/misc/tlp/patches/0002-reintroduce-tlp-sleep-service.patch @@ -13,17 +13,15 @@ systemd itself to not use the hook scripts. As per the manual: > they should rather use the Inhibitor interface[1]. --- Makefile | 6 +++--- - tlp-sleep | 11 ----------- tlp-sleep.service.in | 19 +++++++++++++++++++ - 3 files changed, 22 insertions(+), 14 deletions(-) - delete mode 100644 tlp-sleep + 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 tlp-sleep.service.in diff --git a/Makefile b/Makefile -index ab05720..075b42f 100644 +index 1c436ad..fd5211b 100644 --- a/Makefile +++ b/Makefile -@@ -76,6 +76,7 @@ INFILES = \ +@@ -84,6 +84,7 @@ INFILES = \ tlp.rules \ tlp-readconfs \ tlp-run-on \ @@ -31,15 +29,15 @@ index ab05720..075b42f 100644 tlp.service \ tlp-stat \ tlp.upstart \ -@@ -106,7 +107,6 @@ SHFILES = \ +@@ -115,7 +116,6 @@ SHFILES = \ tlp-rdw-udev.in \ tlp-rf.in \ tlp-run-on.in \ - tlp-sleep \ tlp-sleep.elogind \ tlp-stat.in \ - tlp-usb-udev.in -@@ -159,7 +159,7 @@ ifneq ($(TLP_NO_INIT),1) + tlp-usb-udev.in \ +@@ -172,7 +172,7 @@ ifneq ($(TLP_NO_INIT),1) endif ifneq ($(TLP_WITH_SYSTEMD),0) install -D -m 644 tlp.service $(_SYSD)/tlp.service @@ -48,7 +46,7 @@ index ab05720..075b42f 100644 endif ifneq ($(TLP_WITH_ELOGIND),0) install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep -@@ -216,7 +216,7 @@ uninstall-tlp: +@@ -240,7 +240,7 @@ uninstall-tlp: rm $(_ULIB)/rules.d/85-tlp.rules rm -f $(_SYSV)/tlp rm -f $(_SYSD)/tlp.service @@ -83,5 +81,5 @@ index 0000000..79c202c +[Install] +WantedBy=sleep.target -- -2.33.0 +2.41.0 diff --git a/nixpkgs/pkgs/tools/misc/tmuxp/default.nix b/nixpkgs/pkgs/tools/misc/tmuxp/default.nix index 2b153d230f28..cd80aa3495cb 100644 --- a/nixpkgs/pkgs/tools/misc/tmuxp/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmuxp/default.nix @@ -2,18 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "tmuxp"; - version = "1.28.1"; + version = "1.29.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sNLqUyas6QY11eW/FhkqB6+u4MTqiY1ixvD3BN69Fic="; + hash = "sha256-MiXG4MVzomyc4LjovPsvhmPngtJv85s6Ypo/Cm2Whho="; }; - # No tests in archive - doCheck = false; - - format = "pyproject"; - nativeBuildInputs = [ python3Packages.poetry-core python3Packages.shtab @@ -27,6 +23,9 @@ python3Packages.buildPythonApplication rec { libtmux ]; + # No tests in archive + doCheck = false; + postInstall = '' installShellCompletion --cmd tmuxp \ --bash <(shtab --shell=bash -u tmuxp.cli.create_parser) \ diff --git a/nixpkgs/pkgs/tools/misc/url-parser/default.nix b/nixpkgs/pkgs/tools/misc/url-parser/default.nix index d5655324a0a5..27df534d8756 100644 --- a/nixpkgs/pkgs/tools/misc/url-parser/default.nix +++ b/nixpkgs/pkgs/tools/misc/url-parser/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "url-parser"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "thegeeklab"; repo = "url-parser"; - rev = "v${version}"; - hash = "sha256-rOL6merwQ6CQkdsYGOpFttkJIy2EXCKMGIbAqqmYdvM="; + rev = "refs/tags/v${version}"; + hash = "sha256-A+uoxwPdWdy12Avl2Ci+zd9TFmQFA22pMbsxtWpNPpc="; }; - vendorHash = "sha256-ZaZlIGk44eX0ER2sdLdSvN2qdKVyEPsXjfCuJzJGspE="; + vendorHash = "sha256-8doDVHyhQKsBeN1H73KV/rxhpumDLIzjahdjtW79Bek="; ldflags = [ "-s" @@ -26,6 +26,7 @@ buildGoModule rec { meta = with lib; { description = "Simple command-line URL parser"; homepage = "https://github.com/thegeeklab/url-parser"; + changelog = "https://github.com/thegeeklab/url-parser/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; }; diff --git a/nixpkgs/pkgs/tools/misc/usbimager/default.nix b/nixpkgs/pkgs/tools/misc/usbimager/default.nix index 533f61a9c7d1..a3660d71da4c 100644 --- a/nixpkgs/pkgs/tools/misc/usbimager/default.nix +++ b/nixpkgs/pkgs/tools/misc/usbimager/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-CEGUXJXqXmD8uT93T9dg49Lf5vTpAzQjdnhYmbR5zTI="; }; - sourceRoot = "${src.name}/src/"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = lib.optionals withUdisks [ udisks glib ] diff --git a/nixpkgs/pkgs/tools/misc/vial/default.nix b/nixpkgs/pkgs/tools/misc/vial/default.nix index 6834a53bb6ec..40d3a7c3322d 100644 --- a/nixpkgs/pkgs/tools/misc/vial/default.nix +++ b/nixpkgs/pkgs/tools/misc/vial/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, appimageTools }: let name = "vial-${version}"; - version = "0.6"; + version = "0.7"; pname = "Vial"; src = fetchurl { url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - sha256 = "sha256-2EapikmY79KQdoHnz1A7gErVXBN8D80r1GJMKQ5gIM0="; + hash = "sha256-IvOjwboxc3KRKUMXW3dWoHMy8Oh7NGsu0GIJcLZ6WR8="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; @@ -23,11 +23,13 @@ appimageTools.wrapType2 { echo 'KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0666", TAG+="uaccess", TAG+="udev-acl"' > $out/etc/udev/rules.d/92-viia.rules ''; - meta = with lib; { - description = "An Open-source QMK GUI fork for configuring your keyboard in real time"; + meta = { + description = "An Open-source GUI and QMK fork for configuring your keyboard in real time"; homepage = "https://get.vial.today"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ kranzes ]; + license = lib.licenses.gpl2Plus; + mainProgram = "vial"; + maintainers = with lib.maintainers; [ kranzes ]; platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/viddy/default.nix b/nixpkgs/pkgs/tools/misc/viddy/default.nix index 0b48f4c6986f..385663f40c85 100644 --- a/nixpkgs/pkgs/tools/misc/viddy/default.nix +++ b/nixpkgs/pkgs/tools/misc/viddy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "viddy"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "sachaos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AcRfKu6P7b/HsuC6DTezbYLI9rQZwjklH/bs7mKITUk="; + hash = "sha256-82q73L0641d5qNmB+WLkUmDP5OHMoj2SNFc+FhknhwU="; }; - vendorSha256 = "sha256-QxYM4N3E/BqmeNaofLR1crwFLVaF3IigDXKlKA2Bkuw="; + vendorHash = "sha256-FMSgLI1W5keRnSYVyY0XuarMzLWvm9D1ufUYmZttfxk="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/misc/vrc-get/default.nix b/nixpkgs/pkgs/tools/misc/vrc-get/default.nix index f33290e662c6..c0099d822e40 100644 --- a/nixpkgs/pkgs/tools/misc/vrc-get/default.nix +++ b/nixpkgs/pkgs/tools/misc/vrc-get/default.nix @@ -2,13 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "vrc-get"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "anatawa12"; repo = pname; rev = "v${version}"; - sha256 = "03p3y6q6md2m6fj9v01419cy1wa13dhasd2izs7j9gl9jh69w9xm"; + hash = "sha256-CJBwW2QsLNLyNubawBPD+Cy74JrrdSUHe7JBSdbMnjY="; + fetchSubmodules = true; }; nativeBuildInputs = [ pkg-config ]; @@ -18,7 +19,7 @@ rustPlatform.buildRustPackage rec { # Make openssl-sys use pkg-config. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "03lv72gw39q7hibg2rzibvc1y0az30691jdf2fwn1m5ng0r7lqvp"; + cargoHash = "sha256-PnNo+MmBo/Ke7pL6KwRKXz3gycJmbYefTRMWOvlCQaQ="; meta = with lib; { description = "Command line client of VRChat Package Manager, the main feature of VRChat Creator Companion (VCC)"; diff --git a/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix b/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix index 81e4f70065a6..057413c54ce9 100644 --- a/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix @@ -5,23 +5,18 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.0.39"; + version = "1.0.40"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-NohA/2yzsEtMECvnntPyWvhEdVL63elmw0B+4Med6OE="; + hash = "sha256-ZDQPIEDroi+YgEtQ9IsVvFSErfeyDf4KFuybEbGu91E="; fetchSubmodules = true; }; - cargoLock.lockFile = ./Cargo.lock; - postPatch = '' - ln -sf ${./Cargo.lock} Cargo.lock - ''; - + cargoHash = "sha256-Nynn7pxQyqfMAMGmp3eZFg7y5nj7UPyK6FLbVbN07AA="; cargoBuildFlags = [ "--package" "wasm-tools" ]; - cargoTestFlags = [ "--all" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/xcp/default.nix b/nixpkgs/pkgs/tools/misc/xcp/default.nix index b8e93c3f7b67..9b06c11890dc 100644 --- a/nixpkgs/pkgs/tools/misc/xcp/default.nix +++ b/nixpkgs/pkgs/tools/misc/xcp/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "xcp"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "tarka"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DrB7eVo7nFsp2jGVygbBvj7zOztJ8jDkLODRFfxXhjY="; + sha256 = "sha256-QCoH8N6HDpXQXWchccGIG/pbDx9qZ8YKM6VP6lxoYzU="; }; # no such file or directory errors doCheck = false; - cargoHash = "sha256-O16aY+s27LBMcbefz4ug5+EuGAAiNsD7D0nv5KPg+Us="; + cargoHash = "sha256-F51BHBUaQx1xg0Y2eVnXGRCMykbzk3q5IyJ528JyA5o="; meta = with lib; { description = "An extended cp(1)"; diff --git a/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix b/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix index 0f1769fc8023..73e648cf83c5 100644 --- a/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix +++ b/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "xdaliclock"; - version = "2.47"; + version = "2.48"; src = fetchurl { url = "https://www.jwz.org/xdaliclock/${pname}-${version}.tar.gz"; - hash = "sha256-1Jkv9iulvyY+b5KryDr8s+v8LU95hcVi7PJQsL1rUL4="; + hash = "sha256-BZiqjTSSAgvT/56OJDcKh4pDP9uqVhR5cCx89H+5FLQ="; }; # Note: don't change this to set sourceRoot, or updateAutotoolsGnuConfigScriptsHook diff --git a/nixpkgs/pkgs/tools/misc/zellij/default.nix b/nixpkgs/pkgs/tools/misc/zellij/default.nix index 6456dfb804de..cc69b4550ad0 100644 --- a/nixpkgs/pkgs/tools/misc/zellij/default.nix +++ b/nixpkgs/pkgs/tools/misc/zellij/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.37.2"; + version = "0.38.1"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-YceH3qW0B+h7UvI84PIlfwJXWi4jyxSXIYDsZFrpc1c="; + hash = "sha256-3khMo5qMG0qonMnPvuErVYFohUrZLAkaxKZzkMHou8E="; }; - cargoSha256 = "sha256-uD8z8oQ/z2zk5/MSohgcg5N5984hJhKyPz8dQQUnWL8="; + cargoHash = "sha256-d4UNkbp/ryN/VbK8VO8oYvZ1j6qHKeLRSDqgdT+zIeU="; nativeBuildInputs = [ mandown diff --git a/nixpkgs/pkgs/tools/networking/bully/default.nix b/nixpkgs/pkgs/tools/networking/bully/default.nix index c82971d8217a..55ff196154e3 100644 --- a/nixpkgs/pkgs/tools/networking/bully/default.nix +++ b/nixpkgs/pkgs/tools/networking/bully/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - sourceRoot = "./${src.name}/src"; + sourceRoot = "${src.name}/src"; installPhase = '' install -Dm555 -t $out/bin bully diff --git a/nixpkgs/pkgs/tools/networking/clash-meta/default.nix b/nixpkgs/pkgs/tools/networking/clash-meta/default.nix index c7275db6c0a6..5c3f4c976b41 100644 --- a/nixpkgs/pkgs/tools/networking/clash-meta/default.nix +++ b/nixpkgs/pkgs/tools/networking/clash-meta/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "clash-meta"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "Clash.Meta"; rev = "v${version}"; - hash = "sha256-QXNMplVy4cDRbUUDwidto7jxgjStX5PmCLdAIW7Edn8="; + hash = "sha256-gOUG+XtLfkgnbTj1yUun50pevOh+aPXfIlof5/U2ud8="; }; - vendorHash = "sha256-lMeJ3z/iTHIbJI5kTzkQjNPMv5tGMJK/+PM36BUlpjE="; + vendorHash = "sha256-My/fwa8BgaJcSGKcyyzUExVE0M2fk7rMZtOBW7V5edQ="; # Do not build testing suit excludedPackages = [ "./test" ]; diff --git a/nixpkgs/pkgs/tools/networking/containerlab/default.nix b/nixpkgs/pkgs/tools/networking/containerlab/default.nix index 51879351fd81..ca9b54c5135a 100644 --- a/nixpkgs/pkgs/tools/networking/containerlab/default.nix +++ b/nixpkgs/pkgs/tools/networking/containerlab/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "containerlab"; - version = "0.44.2"; + version = "0.44.3"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-W05FPyBAKnndrELXytrXzpfTcEtq3Q2RDvOQkKMpvwI="; + hash = "sha256-USQULAT1T40eyQHpU3YIdwl2PDG1IHm9ferXKsNVyLg="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix index 1fa275ab2b53..1968d866c91f 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,7 +1,7 @@ { lib , stdenv , cmake -, buildGo118Module +, buildGoModule , makeWrapper , fetchFromGitHub , pythonPackages @@ -35,7 +35,7 @@ let cmakeFlags = ["-DBUILD_DEMO=OFF" "-DDISABLE_PYTHON2=ON"]; }; -in buildGo118Module rec { +in buildGoModule rec { pname = "datadog-agent"; inherit src version; diff --git a/nixpkgs/pkgs/tools/networking/dnsperf/default.nix b/nixpkgs/pkgs/tools/networking/dnsperf/default.nix index 2a89c46f0ab1..7c8913a7f430 100644 --- a/nixpkgs/pkgs/tools/networking/dnsperf/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnsperf/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "dnsperf"; - version = "2.13.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; rev = "v${version}"; - sha256 = "sha256-ijbJ3ttSLO3UL8TBdayJeYcsBMisv4vICQW3+ZhVsuM="; + hash = "sha256-iNTuLcN9bsBPyXZ8SL96moFaI2pTcEhFey8+4xo9iyk="; }; nativeBuildInputs = [ @@ -37,8 +37,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools for DNS benchmaring"; homepage = "https://www.dns-oarc.net/tools/dnsperf"; + changelog = "https://github.com/DNS-OARC/dnsperf/releases/tag/v${version}"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ vcunat ]; + mainProgram = "dnsperf"; + maintainers = with maintainers; [ vcunat mfrw ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/easyrsa/default.nix b/nixpkgs/pkgs/tools/networking/easyrsa/default.nix index 8900681443be..8790d5ada935 100644 --- a/nixpkgs/pkgs/tools/networking/easyrsa/default.nix +++ b/nixpkgs/pkgs/tools/networking/easyrsa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "easyrsa"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "easy-rsa"; rev = "v${version}"; - sha256 = "sha256-GOgwGCsutg4WsBjs1f9jiTS2fvmVMyWCoTw+J/7iZG0="; + sha256 = "sha256-VbL2QXc4IaTe6u17nhByIk+SEsKLhl6sk85E5moGfjs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/networking/frp/default.nix b/nixpkgs/pkgs/tools/networking/frp/default.nix index 078d80af10eb..519aedad558e 100644 --- a/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.51.2"; + version = "0.51.3"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uiF27qGHwAg05o9thCxIf6Z2xhMnKzhDgMKTuS6IJ8A="; + sha256 = "sha256-ijcYSuB91I9lD4qx6ohVFDQgTE0+FTQ5Hr1heNwKyUo="; }; - vendorHash = "sha256-sqlBgEfIWuDnGsepSZtrgxmG/DoP+Hc4c3nOpo8S/Ks="; + vendorHash = "sha256-DFQ59E24LR5/qodtge0EsqajvrjPN0otpxGB8JQ0ERw="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/getmail6/default.nix b/nixpkgs/pkgs/tools/networking/getmail6/default.nix index 2c52f055575a..cf3d5402898e 100644 --- a/nixpkgs/pkgs/tools/networking/getmail6/default.nix +++ b/nixpkgs/pkgs/tools/networking/getmail6/default.nix @@ -5,13 +5,15 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.18.12"; + version = "6.18.13"; + + format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-b+zDoiOD80BTP5VDpW/swur8zJOqYEWe05e/ZupZjyk="; + hash = "sha256-cyX+3LsXqBpAvaOPVpT4EuPzqJm9kki1uNTG+7k3Q28="; }; # needs a Docker setup diff --git a/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix b/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix index 1d22b6cd17bb..9cd4d34876cb 100644 --- a/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.56.2"; + version = "1.57.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-yjEaVfyfOlH/GPZz06lKvdds88VZUygPe1OxueMDnJA="; + hash = "sha256-ZPhPi4ODAAohCySVKeypaDID4ZUXvnfidOGK5EMXvh4="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; diff --git a/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/nixpkgs/pkgs/tools/networking/haproxy/default.nix index b7c39d83d896..6ac8dfb04ef6 100644 --- a/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -18,11 +18,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "2.8.1"; + version = "2.8.2"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-SFVS/NnV1fQarQRvEx/Ap+hJvvJaNJoEB1CvDG/FaAc="; + hash = "sha256-aY1pBtFwlGqGl2mWTleBa6PaOt9h/3XomXKxN/RljbA="; }; buildInputs = [ openssl zlib libxcrypt ] @@ -76,5 +76,6 @@ stdenv.mkDerivation (finalAttrs: { ''; maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; linux ++ darwin; + mainProgram = "haproxy"; }; }) diff --git a/nixpkgs/pkgs/tools/networking/httplz/default.nix b/nixpkgs/pkgs/tools/networking/httplz/default.nix index bc2733bfb982..2a0f665f863a 100644 --- a/nixpkgs/pkgs/tools/networking/httplz/default.nix +++ b/nixpkgs/pkgs/tools/networking/httplz/default.nix @@ -12,15 +12,15 @@ rustPlatform.buildRustPackage rec { pname = "httplz"; - version = "1.13.0"; + version = "1.13.2"; src = fetchCrate { inherit version; pname = "https"; - hash = "sha256-sTkj2UkUENpezPFAzyDUz6rC4F0G864uLLYOU9fyXjo="; + hash = "sha256-uxEMgSrcxMZD/3GQuH9S/oYtMUPzgMR61ZzLcb65zXU="; }; - cargoHash = "sha256-omjm+NSny1NLUj9MCeGU6XgrVRAxMJzTbvIyfmWgoCU="; + cargoHash = "sha256-8cH8QrnkfPF0Di7+Ns/P/8cFe0jej/v7m4fkkfTFdvs="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/tools/networking/ipinfo/default.nix b/nixpkgs/pkgs/tools/networking/ipinfo/default.nix index a05372a1577a..5c32868d43cf 100644 --- a/nixpkgs/pkgs/tools/networking/ipinfo/default.nix +++ b/nixpkgs/pkgs/tools/networking/ipinfo/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ipinfo"; - version = "2.10.1"; + version = "3.0.1"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = "refs/tags/${pname}-${version}"; - hash = "sha256-/CW+CmtKc96tVEh5cB6x+/Hb4WnbVi+3AZ0CEao0NE4="; + hash = "sha256-b6Rh5TJHqcdexZ4AHY+4jQsCMdn69J3MTbmgKXEaACw="; }; - vendorSha256 = null; + vendorHash = null; # Tests require network access doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/juicity/default.nix b/nixpkgs/pkgs/tools/networking/juicity/default.nix index 53e12094fa7a..c28060d403ee 100644 --- a/nixpkgs/pkgs/tools/networking/juicity/default.nix +++ b/nixpkgs/pkgs/tools/networking/juicity/default.nix @@ -1,19 +1,19 @@ { lib , fetchFromGitHub -, buildGoModule +, buildGo121Module }: -buildGoModule rec { +buildGo121Module rec { pname = "juicity"; - version = "0.1.3"; + version = "0.2.1"; src = fetchFromGitHub { owner = "juicity"; repo = pname; rev = "v${version}"; - hash = "sha256-aTg2Xo2+3uxLTJ3MRC46FR/4qBs28IpT6K3KMb8i16s="; + hash = "sha256-+P7MFNhWI4aqCtcJhAw3/RtfOkh+b3v2v69pIOznc/8="; }; - vendorHash = "sha256-xTpT3Qjg2kAJynLaQLLMmoL/SzpguK2YrlWsq/NYrX4="; + vendorHash = "sha256-KrkEqvgHyAoNAX93SE9yDuik60CvPeP+w0Xehi7lgi0="; proxyVendor = true; diff --git a/nixpkgs/pkgs/tools/networking/lxi-tools/default.nix b/nixpkgs/pkgs/tools/networking/lxi-tools/default.nix index ddf2147cea9f..6f94988c2c58 100644 --- a/nixpkgs/pkgs/tools/networking/lxi-tools/default.nix +++ b/nixpkgs/pkgs/tools/networking/lxi-tools/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "lxi-tools"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "lxi-tools"; repo = "lxi-tools"; rev = "v${version}"; - sha256 = "sha256-THtMSiGlBes9OujFEZL88Twx+etYiQRJSk9DFYeGFhY="; + sha256 = "sha256-69B3wW4lg6GxSpEKhuFYKTuAyd+QYb4WNbNVdZnRUt8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/networking/mockoon/default.nix b/nixpkgs/pkgs/tools/networking/mockoon/default.nix index df151764501b..e98b4ac7df44 100644 --- a/nixpkgs/pkgs/tools/networking/mockoon/default.nix +++ b/nixpkgs/pkgs/tools/networking/mockoon/default.nix @@ -5,11 +5,11 @@ let pname = "mockoon"; - version = "3.0.0"; + version = "4.1.0"; src = fetchurl { url = "https://github.com/mockoon/mockoon/releases/download/v${version}/mockoon-${version}.AppImage"; - hash = "sha256-YGcD/8h21fUoBEAcBVI5jo0UMCKdVRdC1zxDIrHjU+8="; + hash = "sha256-7wf7RFyYQN0pGcfKRzYOxs0qNi27JuX/nXUzT/zMSY4="; }; appimageContents = appimageTools.extractType2 { diff --git a/nixpkgs/pkgs/tools/networking/mu/default.nix b/nixpkgs/pkgs/tools/networking/mu/default.nix index 4ed161ba355f..06083f8e0fae 100644 --- a/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.10.6"; + version = "1.10.7"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = "v${version}"; - hash = "sha256-AGHPczGh4z0bla034FGSTmaRgMIfBNYFBUPevJ9LHqI="; + hash = "sha256-x1TsyTOK5U6/Y3QInm+XQ7T32X49iwa+4UnaHdiyqCI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/networking/netbird/default.nix b/nixpkgs/pkgs/tools/networking/netbird/default.nix index e7b1727c1603..97a53e882c70 100644 --- a/nixpkgs/pkgs/tools/networking/netbird/default.nix +++ b/nixpkgs/pkgs/tools/networking/netbird/default.nix @@ -30,13 +30,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.22.6"; + version = "0.22.7"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/7iJbl9MFe5D9g+4a8nFavZG3jXIiEgKU3toGpx0hyM="; + sha256 = "sha256-2Xvpalizazhkp8aYPYY5Er9I6dkL8AKnrjpIU44o2WM="; }; vendorHash = "sha256-CwozOBAPFSsa1XzDOHBgmFSwGiNekWT8t7KGR2KOOX4="; diff --git a/nixpkgs/pkgs/tools/networking/networkmanager/dmenu/default.nix b/nixpkgs/pkgs/tools/networking/networkmanager/dmenu/default.nix index 2d4656e69b70..8bf9af1ffbf9 100644 --- a/nixpkgs/pkgs/tools/networking/networkmanager/dmenu/default.nix +++ b/nixpkgs/pkgs/tools/networking/networkmanager/dmenu/default.nix @@ -4,13 +4,13 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "networkmanager_dmenu"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "firecat53"; repo = "networkmanager-dmenu"; rev = "v${version}"; - sha256 = "sha256-cJeDYk2BQv2ZWGC96I7lXFFYgseWj68ZfvE7ATW46U0="; + sha256 = "sha256-RbJE6JCElctBY5HDJa6SIJhm8g9BugncLF5kmambPPc="; }; nativeBuildInputs = [ gobject-introspection ]; diff --git a/nixpkgs/pkgs/tools/networking/ntpd-rs/default.nix b/nixpkgs/pkgs/tools/networking/ntpd-rs/default.nix new file mode 100644 index 000000000000..0fa44cb418c7 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/ntpd-rs/default.nix @@ -0,0 +1,45 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "ntpd-rs"; + version = "0.3.7"; + + src = fetchFromGitHub { + owner = "pendulum-project"; + repo = "ntpd-rs"; + rev = "v${version}"; + hash = "sha256-AUCzsveG9U+KxYO/4LGmyCPkR+w9pGDA/vTzMAGiVuI="; + }; + + cargoHash = "sha256-6FUVkr3uock43ZBHuMEVIZ5F8Oh8wMifh2EokMWv4hU="; + + checkFlags = [ + # doesn't find the testca + "--skip=keyexchange::tests::key_exchange_roundtrip" + # seems flaky + "--skip=algorithm::kalman::peer::tests::test_offset_steering_and_measurements" + # needs networking + "--skip=hwtimestamp::tests::get_hwtimestamp" + ]; + + postInstall = '' + install -vDt $out/lib/systemd/system pkg/common/ntpd-rs.service + + for testprog in demobilize-server rate-limit-server nts-ke nts-ke-server peer-state simple-daemon; do + moveToOutput bin/$testprog "$tests" + done + ''; + + outputs = [ "out" "tests" ]; + + meta = with lib; { + description = "A full-featured implementation of the Network Time Protocol"; + homepage = "https://tweedegolf.nl/en/pendulum"; + changelog = "https://github.com/pendulum-project/ntpd-rs/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/ocserv/default.nix b/nixpkgs/pkgs/tools/networking/ocserv/default.nix index ec1d3acea005..eb1795e73546 100644 --- a/nixpkgs/pkgs/tools/networking/ocserv/default.nix +++ b/nixpkgs/pkgs/tools/networking/ocserv/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ocserv"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitLab { owner = "openconnect"; repo = "ocserv"; rev = version; - sha256 = "sha256-EwjP4HKJEPMnn2tnJG7tPgHc49iQQm+V1mKx8CLOSkw="; + sha256 = "sha256-mYf0cdWIxRSDGvszlFDex2SU6TtvodD1sXcUZOOcYd0="; }; nativeBuildInputs = [ autoreconfHook gperf pkg-config ronn ]; diff --git a/nixpkgs/pkgs/tools/networking/oneshot/default.nix b/nixpkgs/pkgs/tools/networking/oneshot/default.nix index 006fd3b259a8..3ecca675e18c 100644 --- a/nixpkgs/pkgs/tools/networking/oneshot/default.nix +++ b/nixpkgs/pkgs/tools/networking/oneshot/default.nix @@ -1,26 +1,50 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, testers, oneshot }: buildGoModule rec { pname = "oneshot"; - version = "1.5.1"; + version = "2.0.1"; src = fetchFromGitHub { - owner = "raphaelreyna"; + owner = "forestnode-io"; repo = "oneshot"; rev = "v${version}"; - sha256 = "sha256-5NCGKgmioTOHGJEWMIEsZlA+072XXL9L8KbEH6+caHc="; + hash = "sha256-QReh8wdFeiCAv+XMz4cADNn9QcxlvewFJJuJ+OH7Lgc="; }; - vendorSha256 = "sha256-rL/NWIIggvngTrdTDm1g1uH3vC55JF3cWllPc6Yb5jc="; + vendorHash = "sha256-z6eOPugSwWEK02lgRu5Oo8LzjXnJlAtQvkzdevjBTVs="; - doCheck = false; + subPackages = [ "cmd" ]; - subPackages = [ "." ]; + GOWORK = "off"; + + modRoot = "v2"; + + ldflags = [ + "-s" + "-w" + "-extldflags=-static" + "-X github.com/forestnode-io/oneshot/v2/pkg/version.Version=${version}" + "-X github.com/forestnode-io/oneshot/v2/pkg/version.APIVersion=v1.0.0" + ]; + + installPhase = '' + runHook preInstall + + install -D -m 555 -T $GOPATH/bin/cmd $out/bin/oneshot + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { + package = oneshot; + command = "oneshot version"; + }; meta = with lib; { - description = "A first-come-first-serve single-fire HTTP server"; - homepage = "https://github.com/raphaelreyna/oneshot"; + description = "A first-come first-served single-fire HTTP server"; + homepage = "https://www.oneshot.uno/"; license = licenses.mit; maintainers = with maintainers; [ milibopp ]; + mainProgram = "oneshot"; }; } diff --git a/nixpkgs/pkgs/tools/networking/ookla-speedtest/default.nix b/nixpkgs/pkgs/tools/networking/ookla-speedtest/default.nix index d889414bc118..b08769b6ca1d 100644 --- a/nixpkgs/pkgs/tools/networking/ookla-speedtest/default.nix +++ b/nixpkgs/pkgs/tools/networking/ookla-speedtest/default.nix @@ -34,9 +34,7 @@ stdenv.mkDerivation rec { src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - setSourceRoot = '' - sourceRoot=$PWD - ''; + sourceRoot = "."; dontBuild = true; dontConfigure = true; diff --git a/nixpkgs/pkgs/tools/networking/openssh/common.nix b/nixpkgs/pkgs/tools/networking/openssh/common.nix index d29f45e8af2f..2b6ea743fec1 100644 --- a/nixpkgs/pkgs/tools/networking/openssh/common.nix +++ b/nixpkgs/pkgs/tools/networking/openssh/common.nix @@ -28,6 +28,7 @@ , hostname , nixosTests , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl +, withPAM ? stdenv.hostPlatform.isLinux , linkOpenssl ? true }: @@ -71,7 +72,7 @@ stdenv.mkDerivation { buildInputs = [ zlib openssl libedit ] ++ lib.optional withFIDO libfido2 ++ lib.optional withKerberos libkrb5 - ++ lib.optional stdenv.isLinux pam; + ++ lib.optional withPAM pam; preConfigure = '' # Setting LD causes `configure' and `make' to disagree about which linker @@ -88,7 +89,7 @@ stdenv.mkDerivation { "--with-mantype=man" "--with-libedit=yes" "--disable-strip" - (if stdenv.isLinux then "--with-pam" else "--without-pam") + (lib.withFeature withPAM "pam") ] ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}" ++ lib.optional withFIDO "--with-security-key-builtin=yes" ++ lib.optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}") diff --git a/nixpkgs/pkgs/tools/networking/s5cmd/default.nix b/nixpkgs/pkgs/tools/networking/s5cmd/default.nix index 71d1cf51fae9..cdfa2cee6033 100644 --- a/nixpkgs/pkgs/tools/networking/s5cmd/default.nix +++ b/nixpkgs/pkgs/tools/networking/s5cmd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "s5cmd"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "peak"; repo = "s5cmd"; rev = "v${version}"; - hash = "sha256-uH6KE3sTPc2FfqOxr6cB3A8DOq+VjGsJ3KoK8riOKXk="; + hash = "sha256-4Jx9hgjj+rthiyB7eKXNcbBv9oJWfwHanPO7bZ4J/K0="; }; - vendorSha256 = null; + vendorHash = null; # Skip e2e tests requiring network access excludedPackages = [ "./e2e" ]; diff --git a/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix index cf22d4f002fe..cef81e1cbb57 100644 --- a/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.15.4"; + version = "1.16.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - hash = "sha256-Tdh6lGk93hGuR+L2cytVoKYfRHrmuNo9OtKqQaeCMx0="; + hash = "sha256-kJqJpYjgN49qV/JLfUfmd/f9UjhiM1HOwSONELl2bOk="; }; - cargoHash = "sha256-dtHr+zsjpQe+iNwlj0sRxZRsgl1nxflXhhV1fTMCiFY="; + cargoHash = "sha256-HzvNcESNalZp7+k9WH+ohARq0na8Q4NUctqrCOu6gwI="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; @@ -35,13 +35,18 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=http_proxy" "--skip=tcp_tunnel" + "--skip=tcprelay" "--skip=udp_tunnel" "--skip=udp_relay" "--skip=socks4_relay_connect" "--skip=socks5_relay_aead" "--skip=socks5_relay_stream" + "--skip=trust_dns_resolver" ]; + # timeouts in sandbox + doCheck = false; + meta = with lib; { description = "A Rust port of Shadowsocks"; homepage = "https://github.com/shadowsocks/shadowsocks-rust"; diff --git a/nixpkgs/pkgs/tools/networking/sing-box/default.nix b/nixpkgs/pkgs/tools/networking/sing-box/default.nix index 3acc4acc64ef..db1541eac1cd 100644 --- a/nixpkgs/pkgs/tools/networking/sing-box/default.nix +++ b/nixpkgs/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.3.6"; + version = "1.4.0"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-iVoouUEZ3dMv3sD7eljltsWrdhAn9L+YtG1bbB5YuPM="; + hash = "sha256-i6Cpb4NQNsyIrMOihWYdR37BkSouSCWi3nxMnbODnZU="; }; - vendorHash = "sha256-4Rr/ILnDLJ4x0uSDOzTX2cjT3kaIApLOCo2NEOzGoyA="; + vendorHash = "sha256-6Mx8kdZL7EguQoh1upuu6wGZckczDoGmRjOFCpv756s="; tags = [ "with_quic" diff --git a/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix b/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix index 62c4e8c76a66..828e3e1ad0c5 100644 --- a/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix +++ b/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "sha256-wVisE4YAK52yfeM2itnBqCmhRKlrKRs0NEppQzZPok8="; + sha256 = "sha256-Lq3MMIPPEo1yJZ/xE3m9Y/V+cJl17IRkTBVjnr/avHw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/smartdns/default.nix b/nixpkgs/pkgs/tools/networking/smartdns/default.nix index a0d5e21e50e4..79b089e8e16a 100644 --- a/nixpkgs/pkgs/tools/networking/smartdns/default.nix +++ b/nixpkgs/pkgs/tools/networking/smartdns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = "42"; + version = "43"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - hash = "sha256-FVHOjW5SEShxTPPd4IuEfPV6vvqr0RepV976eJmxqwM="; + hash = "sha256-gwbyP2duUvZafMclPwP4uZh7A7OzAvSyqjl6Eg1N6Gg="; }; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/tools/networking/speedtest-go/default.nix b/nixpkgs/pkgs/tools/networking/speedtest-go/default.nix index 680f81dadacc..ead27348c5c6 100644 --- a/nixpkgs/pkgs/tools/networking/speedtest-go/default.nix +++ b/nixpkgs/pkgs/tools/networking/speedtest-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "speedtest-go"; - version = "1.6.3"; + version = "1.6.5"; src = fetchFromGitHub { owner = "showwin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xZq7wiD0H6W7BeOQoTkWVmFM1dV24clJUibNaW0lLwk="; + hash = "sha256-nuZKYGumxSzhdbrMQzady1ja3aozzTyOx9cfRTin08w="; }; vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E="; diff --git a/nixpkgs/pkgs/tools/networking/ssl-proxy/default.nix b/nixpkgs/pkgs/tools/networking/ssl-proxy/default.nix new file mode 100644 index 000000000000..1aac650885b6 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/ssl-proxy/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGo118Module, fetchFromGitHub }: + +buildGo118Module rec { + pname = "ssl-proxy"; + version = "0.2.7"; + + src = fetchFromGitHub { + owner = "suyashkumar"; + repo = "ssl-proxy"; + rev = "v${version}"; + hash = "sha256-c9BLdDlkrg1z1QrO+vEAVyPtrV/nQcYlGXFmwfAOSpQ="; + }; + + vendorHash = "sha256-310K9ZSxy/OQ4HYFCcHQaj4NQwzATrOZ2YkhiSkhY5I="; + + checkTarget = "test"; + + meta = with lib; { + homepage = "https://github.com/suyashkumar/ssl-proxy"; + description = "Simple single-command SSL reverse proxy with autogenerated certificates (LetsEncrypt, self-signed)"; + longDescription = '' + A handy and simple way to add SSL to your thing running on a VM--be it your personal jupyter + notebook or your team jenkins instance. ssl-proxy autogenerates SSL certs and proxies + HTTPS traffic to an existing HTTP server in a single command. + ''; + license = licenses.mit; + mainProgram = "ssl-proxy"; + maintainers = [ maintainers.konst-aa ]; + platforms = platforms.linux ++ platforms.darwin ++ platforms.windows ; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/subnetcalc/default.nix b/nixpkgs/pkgs/tools/networking/subnetcalc/default.nix index ba8b46d486b6..b5aa064f7390 100644 --- a/nixpkgs/pkgs/tools/networking/subnetcalc/default.nix +++ b/nixpkgs/pkgs/tools/networking/subnetcalc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "subnetcalc"; - version = "2.4.21"; + version = "2.4.22"; src = fetchFromGitHub { owner = "dreibh"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-cFlNx59PaI5GvbEKUplNEq5HVCNt40ZJUvMj2UIbe2A="; + sha256 = "sha256-5sDEMS4RgHdGQZAT2MVF/Ls0KXwdKzX+05uQpHhCZn8="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/nixpkgs/pkgs/tools/networking/traceroute/default.nix b/nixpkgs/pkgs/tools/networking/traceroute/default.nix index 9d092aac560c..c0171ea5880d 100644 --- a/nixpkgs/pkgs/tools/networking/traceroute/default.nix +++ b/nixpkgs/pkgs/tools/networking/traceroute/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "traceroute"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "mirror://sourceforge/traceroute/${pname}-${version}.tar.gz"; - sha256 = "sha256-UHwmjyl3tOIYznPn6+1Fug2XCoykmV3Zy7H/6OmbWx8="; + sha256 = "sha256-BevHq6KKkQD5u65Uzuy/dcgsz0a9/Oi11kgGRZp+BBI="; }; makeFlags = [ diff --git a/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix b/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix index 95d77f7402c7..af439b741305 100644 --- a/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix +++ b/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wormhole-william"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "psanford"; repo = "wormhole-william"; rev = "v${version}"; - sha256 = "sha256-L/0zgQkwADElpIzOJAROa3CN/YNl76Af2pAhX8y2Wxs="; + sha256 = "sha256-KLj9ZeLcIOWA4VeuxfoOr99kUCDb7OARX/h9DSG1WHw="; }; - vendorSha256 = "sha256-J6iht3cagcwFekydShgaYJtkNLfEvSDqonkC7+frldM="; + vendorHash = "sha256-oJz7HgtjuP4ooXdpofIKaDndGg4WqVZgbT8Yb1AyaMs="; preCheck = '' # wormhole_test.go:692: failed to establish connection diff --git a/nixpkgs/pkgs/tools/networking/zerotierone/Cargo.lock b/nixpkgs/pkgs/tools/networking/zerotierone/Cargo.lock index e6373783c50e..b01e68e2d084 100644 --- a/nixpkgs/pkgs/tools/networking/zerotierone/Cargo.lock +++ b/nixpkgs/pkgs/tools/networking/zerotierone/Cargo.lock @@ -3,6 +3,27 @@ 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 = "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" @@ -38,6 +59,21 @@ 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 = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -45,9 +81,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bitflags" @@ -56,19 +92,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[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 = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytes" @@ -90,16 +132,19 @@ dependencies = [ "quote", "serde", "serde_json", - "syn", + "syn 1.0.109", "tempfile", "toml", ] [[package]] name = "cc" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -109,12 +154,12 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", - "num-integer", "num-traits", "serde", "winapi", @@ -128,7 +173,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap", "unicode-width", @@ -136,16 +181,6 @@ dependencies = [ ] [[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] name = "core-foundation" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -157,15 +192,15 @@ 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 = "cpufeatures" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -181,50 +216,6 @@ dependencies = [ ] [[package]] -name = "cxx" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] name = "darling" version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -245,7 +236,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn", + "syn 1.0.109", ] [[package]] @@ -256,14 +247,20 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] +name = "deranged" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" + +[[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -272,9 +269,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encoding_rs" @@ -287,13 +284,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys", ] [[package]] @@ -308,12 +305,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "fnv" @@ -338,51 +332,51 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] [[package]] name = "futures-channel" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-io" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-sink" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-core", "futures-io", @@ -395,9 +389,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -405,9 +399,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -417,10 +411,16 @@ dependencies = [ ] [[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] name = "h2" -version = "0.3.16" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -461,12 +461,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hmac" @@ -507,15 +504,15 @@ 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 = "hyper" -version = "0.14.24" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -528,7 +525,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -550,26 +547,25 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows", ] [[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]] @@ -580,9 +576,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -590,38 +586,19 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", ] [[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" -dependencies = [ - "libc", - "windows-sys 0.45.0", -] - -[[package]] name = "ipnet" -version = "2.7.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "itertools" @@ -634,15 +611,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -669,33 +646,21 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" @@ -705,20 +670,28 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "mime" -version = "0.3.16" +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 = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] @@ -762,28 +735,28 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.2", "libc", ] [[package]] name = "oauth2" -version = "4.3.0" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaf26a72311c087f8c5ba617c96fac67a5c04f430e716ac8d8ab2de62e23368" +checksum = "09a6e2a2b13a56ebeabba9142f911745be6456163fd6c3d361274ebcd891a80c" dependencies = [ "base64 0.13.1", "chrono", @@ -800,16 +773,25 @@ dependencies = [ ] [[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.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openidconnect" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a0f47b0f1499d08c4a8480c963d49c5ec77f4249c2b6869780979415f45809" +checksum = "98dd5b7049bac4fdd2233b8c9767d42c05da8006fdb79cc903258556d2b18009" dependencies = [ "base64 0.13.1", "chrono", @@ -834,11 +816,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.45" +version = "0.10.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -849,13 +831,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", "quote", - "syn", + "syn 2.0.29", ] [[package]] @@ -866,11 +848,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.80" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -888,15 +869,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -906,9 +887,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[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 = "ppv-lite86" @@ -918,18 +899,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.51" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -966,20 +947,20 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "reqwest" -version = "0.11.14" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -1026,47 +1007,46 @@ dependencies = [ ] [[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] name = "rustix" -version = "0.36.8" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] [[package]] -name = "scratch" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" - -[[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -1075,9 +1055,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -1085,9 +1065,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.152" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" dependencies = [ "serde_derive", ] @@ -1104,20 +1084,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.93" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -1126,10 +1106,11 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.9" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b04f22b563c91331a10074bda3dd5492e3cc39d56bd557e91c0af42b6c7341" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" dependencies = [ + "itoa", "serde", ] @@ -1173,14 +1154,14 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -1198,15 +1179,25 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", ] [[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1226,9 +1217,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -1242,25 +1233,27 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.4.0" +name = "syn" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.42.0", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] -name = "termcolor" -version = "1.2.0" +name = "tempfile" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" dependencies = [ - "winapi-util", + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys", ] [[package]] @@ -1274,30 +1267,31 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", ] [[package]] name = "time" -version = "0.3.20" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" dependencies = [ + "deranged", "itoa", "serde", "time-core", @@ -1306,15 +1300,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" dependencies = [ "time-core", ] @@ -1336,19 +1330,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.26.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", "mio", "num_cpus", "pin-project-lite", - "socket2", - "windows-sys 0.45.0", + "socket2 0.5.3", + "windows-sys", ] [[package]] @@ -1363,9 +1356,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -1403,9 +1396,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", ] @@ -1424,15 +1417,15 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-bidi" -version = "0.3.10" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -1463,9 +1456,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -1493,11 +1486,10 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[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", ] @@ -1509,9 +1501,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1519,24 +1511,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.29", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -1546,9 +1538,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1556,28 +1548,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -1600,49 +1592,34 @@ 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.42.0" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows-targets", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -1655,45 +1632,45 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winreg" @@ -1708,7 +1685,7 @@ dependencies = [ name = "zeroidc" version = "0.1.0" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "bytes", "cbindgen", "jwt", diff --git a/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix index c761d887e35d..de0ffe86ec4f 100644 --- a/nixpkgs/pkgs/tools/networking/zerotierone/default.nix +++ b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix @@ -2,10 +2,8 @@ , stdenv , rustPlatform , fetchFromGitHub - , buildPackages , cargo -, iproute2 , lzo , openssl , pkg-config @@ -16,13 +14,13 @@ let pname = "zerotierone"; - version = "1.10.6"; + version = "1.12.1"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-mapFKeF+8jMGkxSuHaw5oUdTdSQgAdxEwF/S6iyVLbY="; + sha256 = "sha256-430wdPrSNohM3sXewusjsW3tbE7EFGISGxABZF21yRc="; }; in stdenv.mkDerivation { @@ -62,8 +60,6 @@ in stdenv.mkDerivation { lzo openssl zlib - ] ++ lib.optional stdenv.isLinux [ - iproute2 ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/networking/zrok/default.nix b/nixpkgs/pkgs/tools/networking/zrok/default.nix index bbd5c2dc260b..fa59d9f7ddf2 100644 --- a/nixpkgs/pkgs/tools/networking/zrok/default.nix +++ b/nixpkgs/pkgs/tools/networking/zrok/default.nix @@ -11,14 +11,14 @@ let }.${system} or throwSystem; sha256 = { - x86_64-linux = "sha256-sHQD8uN8Pm/LnayW1XdWXJ90gN4cCE4sGd+Or4TlhP8="; - aarch64-linux = "sha256-VJaVC+sfqdT0BnV1v8MjzftemP4Iuln1wy3BaCTbeYA="; - armv7l-linux = "sha256-7v9u7OtUbtnzvlTBvO5zuIuTgNqualxYsrv97TZGa9U="; + x86_64-linux = "sha256-lI9FmAvUTzfukxyhjbB4mULURSQNhLcLbZ0NzIDem0g="; + aarch64-linux = "sha256-A77yPDC3MVDhc4Le+1XmHl/HRc0keYDfnS3kM1hQYL4="; + armv7l-linux = "sha256-khl0g8IDHtB53Sg4IdRzQs7A+FmUZyT/1dpKVTGnMs8="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "zrok"; - version = "0.4.2"; + version = "0.4.5"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${version}/zrok_${version}_${plat}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/package-management/apt/default.nix b/nixpkgs/pkgs/tools/package-management/apt/default.nix index 405c269b2239..74676827fb95 100644 --- a/nixpkgs/pkgs/tools/package-management/apt/default.nix +++ b/nixpkgs/pkgs/tools/package-management/apt/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "apt"; - version = "2.7.2"; + version = "2.7.3"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz"; - hash = "sha256-CVySyC/O/0zALdrcJHeFm4JjyI0wFdZ5mqcuMwE1my8="; + hash = "sha256-mtLrLE8lzjU12aXYBW4f6TLW27WMJkfNX8jfjJ+N71M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/package-management/dpkg/default.nix b/nixpkgs/pkgs/tools/package-management/dpkg/default.nix index 9e9d76b6a495..79bf6f8c5083 100644 --- a/nixpkgs/pkgs/tools/package-management/dpkg/default.nix +++ b/nixpkgs/pkgs/tools/package-management/dpkg/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { pname = "dpkg"; - version = "1.21.22"; + version = "1.22.0"; src = fetchgit { url = "https://git.launchpad.net/ubuntu/+source/dpkg"; rev = "applied/${version}"; - hash = "sha256-tP2PNUrq90CXVDJZM7TG42dSEUVW2iQjaOVRjF7leSc="; + hash = "sha256-q+kP0PuQyGKuKahA1/TwtJG380a/sNR433xZhxvGO9M="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix b/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix index f3983b0cd760..2166184eb6da 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "nix-doc"; - version = "0.5.10"; + version = "0.6.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "lf-"; repo = "nix-doc"; - sha256 = "sha256-+T4Bz26roTFiXTM8P8FnJLSdFY2hP26X4nChWWUACN8="; + sha256 = "sha256-1y4BSdKgsV4WLcaNICVh5rac1ZAtZxFM3BlhL2g/AcI="; }; doCheck = true; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { RUSTFLAGS = "-Z relro-level=partial"; }; - cargoSha256 = "sha256-GylSWo4LIsjKnJE9H6iJHZ99UI6UPhAOnAGXk+v8bko="; + cargoSha256 = "sha256-nP03WnXBcwazAi6nVe17CpDSeUxmG84BFFMA5ueey3M="; meta = with lib; { description = "An interactive Nix documentation tool"; diff --git a/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix b/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix index 6cbf981cedd9..8e02281540cd 100644 --- a/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -16,14 +16,14 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.10.0"; + version = "2.10.1"; format = "pyproject"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - hash = "sha256-uMcTwRmELk/vFI7vU4+UUvBDhlF+gVgohIXE0Sm1/d8="; + hash = "sha256-zZM0Ozl6uoYfzvHhQRluS4/5NNRuumQgc4MV993LNyY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/package-management/npm-check-updates/default.nix b/nixpkgs/pkgs/tools/package-management/npm-check-updates/default.nix new file mode 100644 index 000000000000..93585593a494 --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/npm-check-updates/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "npm-check-updates"; + version = "16.13.0"; + + src = fetchFromGitHub { + owner = "raineorshine"; + repo = "npm-check-updates"; + rev = "v${version}"; + hash = "sha256-RrNO1TAPNFB/6JWY8xZjNCZ+FDgM0MCn7vaDXoCSIfI="; + }; + + npmDepsHash = "sha256-aghW4d3/8cJmwpmI5PcHioCnc91Yu4N5EfwuoaB5Xqw="; + + meta = { + changelog = "https://github.com/raineorshine/npm-check-updates/blob/${src.rev}/CHANGELOG.md"; + description = "Find newer versions of package dependencies than what your package.json allows"; + homepage = "https://github.com/raineorshine/npm-check-updates"; + license = lib.licenses.asl20; + mainProgram = "ncu"; + maintainers = with lib.maintainers; [ flosse ]; + }; +} diff --git a/nixpkgs/pkgs/tools/package-management/pkg/default.nix b/nixpkgs/pkgs/tools/package-management/pkg/default.nix index 25c3fd134324..800400ba93c4 100644 --- a/nixpkgs/pkgs/tools/package-management/pkg/default.nix +++ b/nixpkgs/pkgs/tools/package-management/pkg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkg"; - version = "1.20.4"; + version = "1.20.5"; src = fetchFromGitHub { owner = "freebsd"; repo = "pkg"; rev = finalAttrs.version; - sha256 = "sha256-GW29jbFt68ITJfmuxkwl8c39mA+ObYiV6NeT/OXPlyM="; + sha256 = "sha256-svAxEBRnqwWhmu3aRfeGeEjXfADbb1zWPj+REK9fsDM="; }; setOutputFlags = false; diff --git a/nixpkgs/pkgs/tools/package-management/poetry/default.nix b/nixpkgs/pkgs/tools/package-management/poetry/default.nix index 62c4ac599697..d1dd48c0aad8 100644 --- a/nixpkgs/pkgs/tools/package-management/poetry/default.nix +++ b/nixpkgs/pkgs/tools/package-management/poetry/default.nix @@ -39,10 +39,6 @@ let rev = version; hash = "sha256-Gc22Y2T4uO39jiOqEUFeOfnVCbknuDjmzFPZgk2eY74="; }; - patches = [ ]; - nativeCheckInputs = old.nativeCheckInputs ++ [ - self.tomli-w - ]; }); } // (plugins self); }; diff --git a/nixpkgs/pkgs/tools/security/apachetomcatscanner/default.nix b/nixpkgs/pkgs/tools/security/apachetomcatscanner/default.nix index 13a11808b7dd..41c68aa79792 100644 --- a/nixpkgs/pkgs/tools/security/apachetomcatscanner/default.nix +++ b/nixpkgs/pkgs/tools/security/apachetomcatscanner/default.nix @@ -15,6 +15,12 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-ChVVXUjm6y71iRs64Kv63oiOG1GSqmx6J0YiGtEI0ao="; }; + # Posted a PR for discussion upstream that can be followed: + # https://github.com/p0dalirius/ApacheTomcatScanner/pull/32 + postPatch = '' + sed -i '/apachetomcatscanner=apachetomcatscanner\.__main__:main/d' setup.py + ''; + propagatedBuildInputs = with python3.pkgs; [ requests sectools diff --git a/nixpkgs/pkgs/tools/security/bitwarden/cli.nix b/nixpkgs/pkgs/tools/security/bitwarden/cli.nix index 446dc89bd8b7..22cfca249718 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden/cli.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden/cli.nix @@ -12,16 +12,16 @@ let buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; }; in buildNpmPackage' rec { pname = "bitwarden-cli"; - version = "2023.7.0"; + version = "2023.8.2"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-Xnfjp+qRJWvxvgSODbajLxYsP2DtOYK9CXBMfIn+qwA="; + hash = "sha256-v9ql01dwWf9kBxw75n9svQousrnbUi8NY1wkJx06teg="; }; - npmDepsHash = "sha256-vz7erDhh3BpHNadPwIXkD2PRCnbxM7e7lE0rvBEXGyc="; + npmDepsHash = "sha256-RvkauNvt6MZxWMssEtaCjXP1z/3NsReywUgCefV/jjM="; nativeBuildInputs = [ python3 diff --git a/nixpkgs/pkgs/tools/security/chopchop/default.nix b/nixpkgs/pkgs/tools/security/chopchop/default.nix index 10ac9e7f4a77..fc7bd0326fd4 100644 --- a/nixpkgs/pkgs/tools/security/chopchop/default.nix +++ b/nixpkgs/pkgs/tools/security/chopchop/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "michelin"; repo = "ChopChop"; rev = "v${version}"; - sha256 = "qSBQdcS6d0tctSHRbkY4T7s6Zj7xI2abaPUvNKh1M2E="; + hash = "sha256-qSBQdcS6d0tctSHRbkY4T7s6Zj7xI2abaPUvNKh1M2E="; }; - vendorSha256 = "UxWARWOFp8AYKEdiJwRZNwFrphgMTJSZjnvktTNOsgU="; + vendorHash = "sha256-UxWARWOFp8AYKEdiJwRZNwFrphgMTJSZjnvktTNOsgU="; meta = with lib; { description = "CLI to search for sensitive services/files/folders"; diff --git a/nixpkgs/pkgs/tools/security/clairvoyance/default.nix b/nixpkgs/pkgs/tools/security/clairvoyance/default.nix index 2ffc101eb983..ba88338347fc 100644 --- a/nixpkgs/pkgs/tools/security/clairvoyance/default.nix +++ b/nixpkgs/pkgs/tools/security/clairvoyance/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "clairvoyance"; - version = "2.0.6"; + version = "2.5.3"; format = "pyproject"; src = fetchFromGitHub { owner = "nikitastupin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Jsb/UjqAppAUz9AGgON6AyVgUdOY6aswjQ9EL939Kro="; + hash = "sha256-CVXa2HvX7M0cwqnTeZVETg07j324ATQuMNreEgAC2QA="; }; nativeBuildInputs = with python3.pkgs; [ @@ -21,6 +21,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ aiohttp + rich ]; nativeCheckInputs = with python3.pkgs; [ @@ -45,6 +46,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool to obtain GraphQL API schemas"; homepage = "https://github.com/nikitastupin/clairvoyance"; + changelog = "https://github.com/nikitastupin/clairvoyance/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/tools/security/cosign/default.nix b/nixpkgs/pkgs/tools/security/cosign/default.nix index f3e58b1e2a33..c08a8cf1dd17 100644 --- a/nixpkgs/pkgs/tools/security/cosign/default.nix +++ b/nixpkgs/pkgs/tools/security/cosign/default.nix @@ -13,13 +13,13 @@ }: buildGoModule rec { pname = "cosign"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-5dRrq+mV2fDGTi2WZHlCP8+GH3cBJIE8AHGuch7hv/I="; + hash = "sha256-VE/rm85KZs3JWMsidIlUGJ9JrtZ4VBI+Go1yujq7z1s="; }; buildInputs = @@ -28,7 +28,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorHash = "sha256-y9bUwyQMYw4m7JZ6RpTlcYZOiCoxaQRiWYKNmgzEXJA="; + vendorHash = "sha256-mpT4/BS/NofMueBbwhh4v6pNEONEpWM9RDKuYZ+9BtA="; subPackages = [ "cmd/cosign" diff --git a/nixpkgs/pkgs/tools/security/earlybird/default.nix b/nixpkgs/pkgs/tools/security/earlybird/default.nix index eb13b38c158f..c7c16ab47d38 100644 --- a/nixpkgs/pkgs/tools/security/earlybird/default.nix +++ b/nixpkgs/pkgs/tools/security/earlybird/default.nix @@ -2,24 +2,30 @@ , buildGoModule , fetchFromGitHub }: -buildGoModule { + +buildGoModule rec { pname = "earlybird"; - version = "1.25.0"; + version = "3.16.0"; src = fetchFromGitHub { owner = "americanexpress"; repo = "earlybird"; - # According to the GitHub repo, the latest version *is* 1.25.0, but they - # tagged it as "refs/heads/main-2" - rev = "4f365f1c02972dc0a68a196a262912d9c4325b21"; - sha256 = "UZXHYBwBmb9J1HrE/htPZcKvZ+7mc+oXnUtzgBmBgN4="; + rev = "v${version}"; + hash = "sha256-qSW8O13UW5L2eVsqIuqOguhCyZBPqevZ9fJ7qkraa7M="; }; - vendorSha256 = "oSHBR1EvK/1+cXqGNCE9tWn6Kd/BwNY3m5XrKCAijhA="; + patches = [ + ./fix-go.mod-dependency.patch + ]; + + vendorHash = "sha256-ktsQvWc0CTnqOer+9cc0BddrQp0F3Xk7YJP3jxfuw1w="; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A sensitive data detection tool capable of scanning source code repositories for passwords, key files, and more"; homepage = "https://github.com/americanexpress/earlybird"; + changelog = "https://github.com/americanexpress/earlybird/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/nixpkgs/pkgs/tools/security/earlybird/fix-go.mod-dependency.patch b/nixpkgs/pkgs/tools/security/earlybird/fix-go.mod-dependency.patch new file mode 100644 index 000000000000..fb1cf4afdabc --- /dev/null +++ b/nixpkgs/pkgs/tools/security/earlybird/fix-go.mod-dependency.patch @@ -0,0 +1,13 @@ +--- a/go.mod ++++ b/go.mod +@@ -42,8 +42,9 @@ require ( + github.com/src-d/gcfg v1.4.0 // indirect + github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect + github.com/xanzy/ssh-agent v0.2.1 // indirect +- golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect ++ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect + golang.org/x/sys v0.0.0-20220906165534-d0df966e6959 // indirect ++ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect + google.golang.org/protobuf v1.23.0 // indirect + gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect diff --git a/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/nixpkgs/pkgs/tools/security/exploitdb/default.nix index 1ab7fba07084..7b60deeb699c 100644 --- a/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-08-24"; + version = "2023-08-30"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-iL0RfcTOKQ3c3UErfAE0efi4HXJYHUP6RFcgDzeGJqU="; + hash = "sha256-EWxZvr0VbSN8aysDQmqA/d/V5bxy4z1wx2PtC5RVAuI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/flare-floss/default.nix b/nixpkgs/pkgs/tools/security/flare-floss/default.nix index 283c761680b1..b049ea166108 100644 --- a/nixpkgs/pkgs/tools/security/flare-floss/default.nix +++ b/nixpkgs/pkgs/tools/security/flare-floss/default.nix @@ -2,32 +2,10 @@ , python3 , fetchFromGitHub }: -let - py = python3.override { - packageOverrides = final: prev: { - # required for networkx 2.5.1 - decorator = prev.decorator.overridePythonAttrs (o: o // rec { - version = "4.4.2"; - src = o.src.override { - inherit version; - hash = "sha256-46YvBSAXJEDKDcyCN0kxk4Ljd/N/FAoLme9F/suEv+c="; - }; - }); - # flare-floss requires this exact version (newer versions are incompatible) - networkx = prev.networkx.overridePythonAttrs (o: o // rec { - version = "2.5.1"; - src = o.src.override { - inherit version; - hash = "sha256-EJzVhcrEEpf3EQPDxCrG73N58peI61TLdRvlpmO7I1o="; - }; - }); - }; - }; -in -py.pkgs.buildPythonPackage rec { +python3.pkgs.buildPythonPackage rec { pname = "flare-floss"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; src = fetchFromGitHub { @@ -35,7 +13,7 @@ py.pkgs.buildPythonPackage rec { repo = "flare-floss"; rev = "refs/tags/v${version}"; fetchSubmodules = true; # for tests - hash = "sha256-Oa0DMl7RKNfA00shcc4y1sNd2OiKCf0sA0EUC5gByBI="; + hash = "sha256-tOLnve5XBc3TtSgucPIddBHD0YJhsRpRduXsKrtJ/eQ="; }; postPatch = '' @@ -46,17 +24,19 @@ py.pkgs.buildPythonPackage rec { --replace 'sigs_path = os.path.join(get_default_root(), "sigs")' 'sigs_path = "'"$out"'/share/flare-floss/sigs"' ''; - propagatedBuildInputs = with py.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ halo networkx + pefile pydantic + rich tabulate tqdm viv-utils vivisect ] ++ viv-utils.optional-dependencies.flirt; - nativeCheckInputs = with py.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-sugar pytestCheckHook pyyaml diff --git a/nixpkgs/pkgs/tools/security/grype/default.nix b/nixpkgs/pkgs/tools/security/grype/default.nix index b1668c1274aa..1654a903add2 100644 --- a/nixpkgs/pkgs/tools/security/grype/default.nix +++ b/nixpkgs/pkgs/tools/security/grype/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "grype"; - version = "0.65.2"; + version = "0.66.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ST+fJfkViQubCWVMY2BbOgE7tOpXjCX1ATLBmLmvMiY="; + hash = "sha256-oZSXUwWucSyd2JYx0TkYfxgP6NZjjA2bhTrlOJSNh8c="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-HaqJ1Pc0A29D0HielGhP6uxkVccB8JyUrm0Q5nW8teU="; + vendorHash = "sha256-Ur68es1eXsIldXqZjBbtMoK2fjvTIZ+ae2cWaiNzfBg="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/tools/security/imdshift/default.nix b/nixpkgs/pkgs/tools/security/imdshift/default.nix new file mode 100644 index 000000000000..c33e0878cd4d --- /dev/null +++ b/nixpkgs/pkgs/tools/security/imdshift/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "imdshift"; + version = "1.0.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "ayushpriya10"; + repo = "IMDShift"; + rev = "refs/tags/v${version}"; + hash = "sha256-Uoa0uNOhCkT622Yy8GEg8jz9k5zmtXwGmvdb3MVTLX8="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + boto3 + click + prettytable + tqdm + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "IMDShift" + ]; + + meta = with lib; { + description = "Tool to migrate workloads to IMDSv2"; + homepage = "https://github.com/ayushpriya10/IMDShift"; + changelog = "https://github.com/ayushpriya10/IMDShift/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/ipscan/default.nix b/nixpkgs/pkgs/tools/security/ipscan/default.nix index 7611680c64af..72a44a4ab8a1 100644 --- a/nixpkgs/pkgs/tools/security/ipscan/default.nix +++ b/nixpkgs/pkgs/tools/security/ipscan/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ipscan"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { - url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_all.deb"; - sha256 = "sha256-HpsEp5XSz118cbV2wT81hzQT4cgDEBnpUbpl45ZVvlg="; + url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_amd64.deb"; + hash = "sha256-UPkUwZV3NIeVfL3yYvqOhm4X5xW+40GOlZGy8WGhYmk="; }; sourceRoot = "."; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share - cp usr/lib/ipscan/ipscan-any-${version}.jar $out/share/${pname}-${version}.jar + cp usr/lib/ipscan/ipscan-linux64-${version}.jar $out/share/${pname}-${version}.jar makeWrapper ${jre}/bin/java $out/bin/ipscan \ --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt xorg.libXtst ]}" \ @@ -42,12 +42,13 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Fast and friendly network scanner"; + description = "Angry IP Scanner - fast and friendly network scanner"; homepage = "https://angryip.org"; + downloadPage = "https://github.com/angryip/ipscan/releases/tag/${version}"; changelog = "https://github.com/angryip/ipscan/blob/${version}/CHANGELOG"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ kylesferrazza ]; + maintainers = with maintainers; [ kylesferrazza totoroot ]; }; } diff --git a/nixpkgs/pkgs/tools/security/jwx/default.nix b/nixpkgs/pkgs/tools/security/jwx/default.nix index fb5c2c59f11e..2ccf3d7bfd47 100644 --- a/nixpkgs/pkgs/tools/security/jwx/default.nix +++ b/nixpkgs/pkgs/tools/security/jwx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jwx"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = pname; rev = "v${version}"; - hash = "sha256-8ZzDVCJERf9T9Tlth+9imVJPZIAwffR03S/8UflKjZc="; + hash = "sha256-2Lx9pu5KQut9eXIQYDjFW/pMDzR0eSKMFtSGOPQAkN4="; }; - vendorHash = "sha256-RyAQh1uXw3bEZ6vuh8+mEf8T4l3ZIFAaFJ6dGMoANys="; + vendorHash = "sha256-o3EHPIXGLz/io0d8jhl9cxzctP3CeOjEDMQl1SY9lXg="; sourceRoot = "${src.name}/cmd/jwx"; diff --git a/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix b/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix index 18f00ed756bb..a5640e87fb8c 100644 --- a/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix +++ b/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubernetes-polaris"; - version = "8.4.0"; + version = "8.5.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "polaris"; rev = version; - sha256 = "sha256-r1SUYz71IXgqWTYtZlk+OjlYHSfJ8nOK2/YFOoIESMw="; + sha256 = "sha256-Xn3NZxZ2aMEgI8XnrPNjNkt8aTQ95brYcdJO2ba3L14="; }; - vendorHash = "sha256-K9QvA4WNF61iToPze26OwP78HKseuajnsHzmWdoo7Y4="; + vendorHash = "sha256-ZWetW+Xar4BXXlR0iG+O/NRqYk41x+PPVCGis2W2Nkk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/nixpkgs/pkgs/tools/security/metasploit/Gemfile index d52b52b62217..f62588de9e48 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/nixpkgs/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.30" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.31" diff --git a/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index fe3c7d2c8838..f608b1b2fd48 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: e15c05b0bd8774e33c33c100965ec7e301e4f295 - ref: refs/tags/6.3.30 + revision: a97e8a0e2a3b15f3b3710f04def1178139ae0fa2 + ref: refs/tags/6.3.31 specs: - metasploit-framework (6.3.30) + metasploit-framework (6.3.31) actionpack (~> 7.0) activerecord (~> 7.0) activesupport (~> 7.0) @@ -41,6 +41,7 @@ GIT mqtt msgpack (~> 1.6.0) nessus_rest + net-imap net-ldap net-smtp net-ssh @@ -104,25 +105,25 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (7.0.7) - actionview (= 7.0.7) - activesupport (= 7.0.7) + actionpack (7.0.7.2) + actionview (= 7.0.7.2) + activesupport (= 7.0.7.2) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.7) - activesupport (= 7.0.7) + actionview (7.0.7.2) + activesupport (= 7.0.7.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.7) - activesupport (= 7.0.7) - activerecord (7.0.7) - activemodel (= 7.0.7) - activesupport (= 7.0.7) - activesupport (7.0.7) + activemodel (7.0.7.2) + activesupport (= 7.0.7.2) + activerecord (7.0.7.2) + activemodel (= 7.0.7.2) + activesupport (= 7.0.7.2) + activesupport (7.0.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -133,13 +134,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.806.0) - aws-sdk-core (3.180.3) + aws-partitions (1.811.0) + aws-sdk-core (3.181.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.399.0) + aws-sdk-ec2 (1.402.0) aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) aws-sdk-ec2instanceconnect (1.32.0) @@ -151,8 +152,8 @@ GEM aws-sdk-kms (1.71.0) aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.132.1) - aws-sdk-core (~> 3, >= 3.179.0) + aws-sdk-s3 (1.134.0) + aws-sdk-core (~> 3, >= 3.181.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) aws-sdk-ssm (1.156.0) @@ -172,6 +173,7 @@ GEM cookiejar (0.3.3) crass (1.0.6) daemons (1.4.1) + date (3.3.3) dnsruby (1.70.0) simpleidn (~> 0.2.1) domain_name (0.5.20190701) @@ -271,6 +273,9 @@ GEM mustermann (3.0.0) ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) + net-imap (0.3.7) + date + net-protocol net-ldap (0.18.0) net-protocol (0.2.1) timeout @@ -317,9 +322,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.7) - actionpack (= 7.0.7) - activesupport (= 7.0.7) + railties (7.0.7.2) + actionpack (= 7.0.7.2) + activesupport (= 7.0.7.2) method_source rake (>= 12.2) thor (~> 1.0) @@ -331,7 +336,7 @@ GEM recog (3.1.2) nokogiri redcarpet (3.6.0) - reline (0.3.7) + reline (0.3.8) io-console (~> 0.5) rex-arch (0.1.14) rex-text @@ -407,7 +412,7 @@ GEM tilt (~> 2.0) sqlite3 (1.6.3) mini_portile2 (~> 2.8.0) - sshkey (2.0.0) + sshkey (3.0.0) strptime (0.2.5) swagger-blocks (3.0.0) thin (1.8.2) diff --git a/nixpkgs/pkgs/tools/security/metasploit/default.nix b/nixpkgs/pkgs/tools/security/metasploit/default.nix index e98c4a25c121..9cfc107eceef 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.30"; + version = "6.3.31"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-j2tgBXn5PP4WegSk4NU5aVfrWVKYcYUS8fHFF5kuCJc="; + sha256 = "sha256-X0QJ4edzqLh01qAhmpcdiuk8xdAkccoJAZmxeTh3q48="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index 1f4f9687e1a4..d713e28fc444 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "150sjsk12vzj9aswjy3cz124l8n8sn52bhd0wwly73rwc1a750sg"; + sha256 = "0qamc5ly521wk9i1658h9jv7avmyyp92kffa1da2fn5zk0wgyhf4"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nn21k5psxdv2fkwxs679lr0b8n1nzli2ks343cx4azn6snp8b8a"; + sha256 = "151zxb61bb6q7g0sn34qz79k8bg02vmb8mmnsn0fr15lxw92dfhm"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rspbw4yxx9fh2wyl2wvgwadwapfyx7j9zlirpd4pmk31wkhl4hf"; + sha256 = "1crjq1dznlbsrwd5yijxraz1591xmg4vdcwwnmrw4nh6hrwq5fj5"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ygg145wxlgm12b1x5r0rsk2aa6i2wjz7bgb21j8vmyqyfl272cy"; + sha256 = "03vrssdqaqm41w27s21r37skdfxa41midvjy37i2zh3rnbnq8ps2"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wzbnv3hns0yiwbgh1m3q5j0d7b0k52nlpwirhxyv3l0ycmljfr9"; + sha256 = "1vlzcnyqlbchaq85phmdv73ydlc18xpvxy1cbsk191cwd29i7q32"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; addressable = { groups = ["default"]; @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "072z18xbl8n793w4irrsmgh788csvmfkvw1iixsrmdzlzrjjagqx"; + sha256 = "0082fsywglghvam55i4jz7cj2vyd8hb8b7658cr9yqlwna9j1sp3"; type = "gem"; }; - version = "1.806.0"; + version = "1.811.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lc3j74v49b2akyimfnsx3vsgi1i3068cpchn358l0dv27aib6c2"; + sha256 = "0xjw9cf6ldbw50xi5ric8d63r8kybpsvaqxh2v6n7374hfady73i"; type = "gem"; }; - version = "3.180.3"; + version = "3.181.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l2gdlqgq9y5r83svl4g7jpijpw3a6p7xsfdvhklb36mgmf61a0n"; + sha256 = "1kl5b8m0ad2dxj2r0f5wkphfwhnpq820jbzrdmxyh20kivckv33c"; type = "gem"; }; - version = "1.399.0"; + version = "1.402.0"; }; aws-sdk-ec2instanceconnect = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iciakii0vcm16x0fivs5hwwhy3n8j1f9d7pimxr05yplnxizh6a"; + sha256 = "1fbz259as60xnf563z9byp8blq5fsc81h92h3wicai4bmz45w4r5"; type = "gem"; }; - version = "1.132.1"; + version = "1.134.0"; }; aws-sdk-ssm = { groups = ["default"]; @@ -299,6 +299,16 @@ }; version = "1.4.1"; }; + date = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + type = "gem"; + }; + version = "3.3.3"; + }; dnsruby = { groups = ["default"]; platforms = []; @@ -644,12 +654,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "e15c05b0bd8774e33c33c100965ec7e301e4f295"; - sha256 = "15q85scigigiy498awcqa9cynmv977ay1904g8bgwg7rg42n0swg"; + rev = "a97e8a0e2a3b15f3b3710f04def1178139ae0fa2"; + sha256 = "13xbfww7kccr044wlw94s32krsca3nbrl8d0srsbia3kwzhhji2z"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.30"; + version = "6.3.31"; }; metasploit-model = { groups = ["default"]; @@ -771,6 +781,16 @@ }; version = "0.1.6"; }; + net-imap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; + type = "gem"; + }; + version = "0.3.7"; + }; net-ldap = { groups = ["default"]; platforms = []; @@ -1037,10 +1057,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0in2b84qqmfnigx0li9bgi6l4knmgbj3a29fzm1zzb5jnv4r1gbr"; + sha256 = "01pdn9sn7kawwrvrbr3vz44j287xbka8mm7nrv9cl510y8gzxi2x"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; rake = { groups = ["default"]; @@ -1097,10 +1117,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6b6a1b18fscw9ff0fw5jk1l7kzw542r8444mm7d27zyx5v18sj"; + sha256 = "0lv1nv7z63n4qmsm3h5h273m7daxngkcq8ynkk9j8lmn7jji98lb"; type = "gem"; }; - version = "0.3.7"; + version = "0.3.8"; }; rex-arch = { groups = ["default"]; @@ -1418,10 +1438,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; + sha256 = "1k8i5pzjhcnyf0bhcyn5iixpfp4pz0556rcxwpglh6p0sr8s6nv5"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.0"; }; strptime = { groups = ["default"]; diff --git a/nixpkgs/pkgs/tools/security/mpw/default.nix b/nixpkgs/pkgs/tools/security/mpw/default.nix index 0fe45039b9be..8d6f7f4f3b1d 100644 --- a/nixpkgs/pkgs/tools/security/mpw/default.nix +++ b/nixpkgs/pkgs/tools/security/mpw/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { inherit rev; }; - sourceRoot = "./${src.name}/platform-independent/c/cli"; + sourceRoot = "${src.name}/platform-independent/c/cli"; postPatch = '' rm build diff --git a/nixpkgs/pkgs/tools/security/nbtscanner/Cargo.lock.patch b/nixpkgs/pkgs/tools/security/nbtscanner/Cargo.lock.patch new file mode 100644 index 000000000000..7ca50b7b4a11 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/nbtscanner/Cargo.lock.patch @@ -0,0 +1,176 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 9b32d00..9767c48 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,39 +1,44 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "ansi_term" +-version = "0.10.2" ++version = "0.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6b3568b48b7cefa6b8ce125f9bb4989e52fbcc29ebea88df04cc7c5f12f70455" ++checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" ++dependencies = [ ++ "winapi", ++] + + [[package]] + name = "assert_matches" +-version = "1.1.0" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9e772942dccdf11b368c31e044e4fca9189f80a773d2f0808379de65894cbf57" ++checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" + + [[package]] + name = "atty" +-version = "0.2.6" ++version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8352656fd42c30a0c3c89d26dea01e3b77c0ab2af18230835c15e2e13cd51859" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" + dependencies = [ ++ "hermit-abi", + "libc", +- "termion", + "winapi", + ] + + [[package]] + name = "bitflags" +-version = "1.0.1" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] + name = "clap" +-version = "2.29.1" ++version = "2.34.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f4a2b3bb7ef3c672d7c13d15613211d5a6976b6892c598b0fcb5d40765f19c2" ++checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" + dependencies = [ + "ansi_term", + "atty", +@@ -45,77 +50,60 @@ dependencies = [ + ] + + [[package]] +-name = "libc" +-version = "0.2.36" ++name = "hermit-abi" ++version = "0.1.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1e5d97d6708edaa407429faa671b942dc0f2727222fb6b6539bf1db936e4b121" +- +-[[package]] +-name = "nbtscanner" +-version = "0.0.1" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" + dependencies = [ +- "assert_matches", +- "clap", ++ "libc", + ] + + [[package]] +-name = "redox_syscall" +-version = "0.1.37" ++name = "libc" ++version = "0.2.147" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd" ++checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + + [[package]] +-name = "redox_termios" +-version = "0.1.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" ++name = "nbtscanner" ++version = "0.0.2" + dependencies = [ +- "redox_syscall", ++ "assert_matches", ++ "clap", + ] + + [[package]] + name = "strsim" +-version = "0.6.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694" +- +-[[package]] +-name = "termion" +-version = "1.5.1" ++version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" +-dependencies = [ +- "libc", +- "redox_syscall", +- "redox_termios", +-] ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + + [[package]] + name = "textwrap" +-version = "0.9.0" ++version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c0b59b6b4b44d867f1370ef1bd91bfb262bf07bf0ae65c202ea2fbc16153b693" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" + dependencies = [ + "unicode-width", + ] + + [[package]] + name = "unicode-width" +-version = "0.1.4" ++version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f" ++checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + + [[package]] + name = "vec_map" +-version = "0.8.0" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + + [[package]] + name = "winapi" +-version = "0.3.3" ++version = "0.3.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b09fb3b6f248ea4cd42c9a65113a847d612e17505d6ebd1f7357ad68a8bf8693" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" + dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +@@ -123,12 +111,12 @@ dependencies = [ + + [[package]] + name = "winapi-i686-pc-windows-gnu" +-version = "0.3.2" ++version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ec6667f60c23eca65c561e63a13d81b44234c2e38a6b6c959025ee907ec614cc" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + + [[package]] + name = "winapi-x86_64-pc-windows-gnu" +-version = "0.3.2" ++version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "98f12c52b2630cd05d2c3ffd8e008f7f48252c042b4871c72aed9dc733b96668" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/nixpkgs/pkgs/tools/security/nbtscanner/default.nix b/nixpkgs/pkgs/tools/security/nbtscanner/default.nix index 6ad9fdd47708..51e9f085164b 100644 --- a/nixpkgs/pkgs/tools/security/nbtscanner/default.nix +++ b/nixpkgs/pkgs/tools/security/nbtscanner/default.nix @@ -7,16 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "nbtscanner"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "jonkgrimes"; repo = pname; rev = version; - sha256 = "06507a8y41v42cmvjpzimyrzdp972w15fjpc6c6750n1wa2wdl6c"; + hash = "sha256-lnTTutOc829COwfNhBkSK8UpiNnGsm7Da53b+eSBt1Q="; }; - cargoSha256 = "0cis54zmr2x0f4z664lmhk9dzx00hvds6jh3x417308sz7ak11gd"; + cargoHash = "sha256-NffNQXKJ+b1w7Ar2M6UDev/AxruDEf8IGQ+mNdvU6e4="; + + cargoPatches = [ + ./Cargo.lock.patch + ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix b/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix index 8f8991801f7c..d48047a7b1c6 100644 --- a/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix +++ b/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix @@ -3,10 +3,10 @@ , cmake , fetchFromGitHub , pkg-config -, qttranslations , wrapQtAppsHook , libnitrokey , cppcodec +, qttools }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmake pkg-config wrapQtAppsHook - qttranslations + qttools ]; cmakeFlags = [ diff --git a/nixpkgs/pkgs/tools/security/notation/default.nix b/nixpkgs/pkgs/tools/security/notation/default.nix index 4c579f3f016d..845f3fbc4b8d 100644 --- a/nixpkgs/pkgs/tools/security/notation/default.nix +++ b/nixpkgs/pkgs/tools/security/notation/default.nix @@ -1,22 +1,32 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, notation }: buildGoModule rec { pname = "notation"; - version = "1.0.0-rc.7"; + version = "1.0.0"; src = fetchFromGitHub { owner = "notaryproject"; repo = pname; rev = "v${version}"; - hash = "sha256-EM2QunSL88Am3zgKwgI94jET3xaVfvsa4MCtMZ3ejjU="; + hash = "sha256-mj+LCO6Q4kKfYewPl0R9axZB9O4Yy+GkLlUIDe6yhlI="; }; - vendorHash = "sha256-88PCnIm7nQB8jLzrfVOyDLXWX7RZeT31n1cwvb4Qza0="; + vendorHash = "sha256-wQTRgOSOq0LeiSwF5eowaW4R2xCx+kEb0WQ+upsxdAA="; # This is a Go sub-module and cannot be built directly (e2e tests). excludedPackages = [ "./test" ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/notaryproject/notation/internal/version.Version=${version}" + "-X github.com/notaryproject/notation/internal/version.BuildMetadata=" + ]; + + passthru.tests.version = testers.testVersion { + package = notation; + command = "notation version"; + }; meta = with lib; { description = "CLI tool to sign and verify OCI artifacts and container images"; diff --git a/nixpkgs/pkgs/tools/security/nuclei/default.nix b/nixpkgs/pkgs/tools/security/nuclei/default.nix index f4d4a66e04ab..344ba03a361e 100644 --- a/nixpkgs/pkgs/tools/security/nuclei/default.nix +++ b/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "nuclei"; - version = "2.9.12"; + version = "2.9.13"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XLSNBFblgDkGGimwx0KqgHfDOekj7GH81EaKQ106v5U="; + hash = "sha256-mjb7U7F4OZ9nRjtLjZk1s7T+n/VqV/RPMbnGodxRVUE="; }; vendorHash = "sha256-/1F2aY3cRLRz06s1KXQ6bt7UgaZgiXEjS/5stGi7xIw="; diff --git a/nixpkgs/pkgs/tools/security/ospd-openvas/default.nix b/nixpkgs/pkgs/tools/security/ospd-openvas/default.nix index c4a277f217b7..778d3d786625 100644 --- a/nixpkgs/pkgs/tools/security/ospd-openvas/default.nix +++ b/nixpkgs/pkgs/tools/security/ospd-openvas/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ospd-openvas"; - version = "22.5.4"; + version = "22.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "greenbone"; repo = "ospd-openvas"; rev = "refs/tags/v${version}"; - hash = "sha256-T/MKx8yjRZ+r0ypnWzASGIQPKOAvzznWvaP7gwP+24M="; + hash = "sha256-1538XMNnerhfV3xQ8/TyoztCfWnkRvy0p6QtKMQb2p4="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/tools/security/pass/default.nix b/nixpkgs/pkgs/tools/security/pass/default.nix index 3437b19e3a30..735d025e2ea6 100644 --- a/nixpkgs/pkgs/tools/security/pass/default.nix +++ b/nixpkgs/pkgs/tools/security/pass/default.nix @@ -72,12 +72,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ]; - postInstall = '' - # Install Emacs Mode. NOTE: We can't install the necessary - # dependencies (s.el) here. The user has to do this themselves. - mkdir -p "$out/share/emacs/site-lisp" - cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" - '' + lib.optionalString dmenuSupport '' + postInstall = lib.optionalString dmenuSupport '' cp "contrib/dmenu/passmenu" "$out/bin/" ''; diff --git a/nixpkgs/pkgs/tools/security/qdigidoc/default.nix b/nixpkgs/pkgs/tools/security/qdigidoc/default.nix index 19ce14f915aa..8a8fa4496c38 100644 --- a/nixpkgs/pkgs/tools/security/qdigidoc/default.nix +++ b/nixpkgs/pkgs/tools/security/qdigidoc/default.nix @@ -10,8 +10,8 @@ , openssl , pcsclite , qtbase -, qttranslations , qtsvg +, qttools }: mkDerivation rec { @@ -29,7 +29,7 @@ mkDerivation rec { sha256 = "1cikz36w9phgczcqnwk4k3mx3kk919wy2327jksmfa4cjfjq4a8d"; }; - nativeBuildInputs = [ cmake gettext pkg-config ]; + nativeBuildInputs = [ cmake gettext pkg-config qttools ]; postPatch = '' substituteInPlace client/CMakeLists.txt \ @@ -44,7 +44,6 @@ mkDerivation rec { pcsclite qtbase qtsvg - qttranslations ]; # qdigidoc4's `QPKCS11::reload()` dlopen()s "opensc-pkcs11.so" in QLibrary, diff --git a/nixpkgs/pkgs/tools/security/semgrep/common.nix b/nixpkgs/pkgs/tools/security/semgrep/common.nix index c144d7634cf7..da646461a20f 100644 --- a/nixpkgs/pkgs/tools/security/semgrep/common.nix +++ b/nixpkgs/pkgs/tools/security/semgrep/common.nix @@ -1,9 +1,9 @@ { lib }: rec { - version = "1.35.0"; + version = "1.37.0"; - srcHash = "sha256-SUKswvY49Hxis5CwguXC5QSshG0sGKb23mz2IT1vNJI="; + srcHash = "sha256-oFJ43dq3DAhux0UEFDKFZnxruoRdOfCndKY6XgG3d5I="; # submodule dependencies # these are fetched so we: @@ -13,8 +13,8 @@ rec { "cli/src/semgrep/semgrep_interfaces" = { owner = "returntocorp"; repo = "semgrep-interfaces"; - rev = "f7fed064dadb859f0b802b11fb60f7f77008c4d7"; - hash = "sha256-EXYRc6p94QxkOBMPOdr608JqLY6kN1AanlRfOFXxPm8="; + rev = "331603197022625f50a64dd5e3029a96a5f03ada"; + hash = "sha256-UAcWbTSCIdBGvgGSbdQ+miFOEuBvQ6m42MkU3VeErKY="; }; }; @@ -25,15 +25,15 @@ rec { core = { x86_64-linux = { platform = "any"; - hash = "sha256-ZqSbiuVKGjH+2fB0ReSw07CzTDSK35a8Adstzrvh8zA="; + hash = "sha256-Sj/6tzZMyRQAJL09X/3zgvdGTIhNibqO8usKsus9Xss="; }; x86_64-darwin = { platform = "macosx_10_14_x86_64"; - hash = "sha256-MusoteFarPJm8eQO7T/LrXDWUV0Wx4nw80ZvjG7HHhM="; + hash = "sha256-hC04VknZG6aYYNX7lqvkcOoVslewNqlYax+o1nV2TcM="; }; aarch64-darwin = { platform = "macosx_11_0_arm64"; - hash = "sha256-xN87fp5jqes/smMrtLbZowMIuTevpDJNFNeWdo0Seu4="; + hash = "sha256-0F+ndM4+0dnxf9acwWvGdIy9iYWSqixS9IzOxa95/yM="; }; }; diff --git a/nixpkgs/pkgs/tools/security/sigma-cli/default.nix b/nixpkgs/pkgs/tools/security/sigma-cli/default.nix index 3ff04a8a630f..bbed9910f251 100644 --- a/nixpkgs/pkgs/tools/security/sigma-cli/default.nix +++ b/nixpkgs/pkgs/tools/security/sigma-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sigma-cli"; - version = "0.7.2"; + version = "0.7.7"; format = "pyproject"; src = fetchFromGitHub { owner = "SigmaHQ"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yzo/BotNzTBjdkaXI1lHntpI5AyW5AbpFu3XtkWpHU4="; + hash = "sha256-Qqe9nJZfCb7xh93ERrV3XpqdtfeRECt7RDca9eQU3eQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/security/spire/default.nix b/nixpkgs/pkgs/tools/security/spire/default.nix index 6c64e19043a2..13e42efa7888 100644 --- a/nixpkgs/pkgs/tools/security/spire/default.nix +++ b/nixpkgs/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.7.1"; + version = "1.7.2"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-42UEFil9b2z8vfnA5oJvkqcPuSApi61m//RZ4pKZZ5w="; + sha256 = "sha256-3D7TlL4SulLAqpVIMJ4Yl2OWnNsMYMLVJqgGhOYMiio="; }; - vendorHash = "sha256-H4INblBEWc/AuOn59lXmj5XX6mKrhmRTRVWtVhusW9k="; + vendorHash = "sha256-Vct++sjkkosBOY0Uho58MHSQoL5121kYbQTf1j+HFUk="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; diff --git a/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix b/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix index e348b081bd12..52997fc24259 100644 --- a/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix +++ b/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssh-to-age"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "Mic92"; repo = "ssh-to-age"; rev = version; - sha256 = "sha256-guBwwIXKAr9rtkiitFPs+usdzCQacnXcn5bTtQY77AY="; + sha256 = "sha256-vER4PG2LFi/NM9TmCffqsF3aR4ZycwWVeKls2fNupo0="; }; - vendorHash = "sha256-NEHZ2ZakkO6Yw2pZdKIfCp9NzjgIRIVxARpcQOBGse4="; + vendorHash = "sha256-g8qVV2cd7nxBN/BGNz28gJbtNkCUDJDdSdupXxhFw9Q="; checkPhase = '' runHook preCheck diff --git a/nixpkgs/pkgs/tools/security/swtpm/default.nix b/nixpkgs/pkgs/tools/security/swtpm/default.nix index e71b88c8c3b9..d132e27a8059 100644 --- a/nixpkgs/pkgs/tools/security/swtpm/default.nix +++ b/nixpkgs/pkgs/tools/security/swtpm/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "swtpm"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "stefanberger"; repo = "swtpm"; rev = "v${version}"; - sha256 = "sha256-O+sHkmQ47FbqsgWpaqAc/j2AJ5xzsvpBj/p0Zea1nSI="; + sha256 = "sha256-QKR5S7FlMFDw4+VpyRdqixMWyzLpQkf3QCUceQvsliU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/tlsx/default.nix b/nixpkgs/pkgs/tools/security/tlsx/default.nix index 42c5a84cd3c3..91f21c99710b 100644 --- a/nixpkgs/pkgs/tools/security/tlsx/default.nix +++ b/nixpkgs/pkgs/tools/security/tlsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tlsx"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-dCtMfrkN43zJqztCobT3RSkn4crGigqzI6NSP8wrCf0="; + hash = "sha256-EMTNd5NOvaFbVxv31j3pBU//mWQQpThswCT8bMNx5Qw="; }; - vendorHash = "sha256-33eVwWV9PnrP2MSPXTAcYe9ruJc5lauASc4uubBd9S4="; + vendorHash = "sha256-5fS10G1YxtyhMZcpaqYy9P6eX/xQABYVZj1HX6WxQxo="; # Tests require network access doCheck = false; diff --git a/nixpkgs/pkgs/tools/security/trufflehog/default.nix b/nixpkgs/pkgs/tools/security/trufflehog/default.nix index dce1996abb48..d5eea9398073 100644 --- a/nixpkgs/pkgs/tools/security/trufflehog/default.nix +++ b/nixpkgs/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.53.0"; + version = "3.54.1"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-O1MCl9chqiOGxOUYxaQNs0gXHgVkT8ZgSSTQXj63f90="; + hash = "sha256-wHgteAxFCnGY31Yda1qIxy4TLM51Lk+yy2BIHgfIzik="; }; - vendorHash = "sha256-RHNt9GxqWb4EDKg5of5s88iUmJPI2w7i5hPoCFMmnew="; + vendorHash = "sha256-zYvKhhwN5TtJQxkkcY5U9LtTdMb97ucfksxpTMKH/Zc="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/security/uncover/default.nix b/nixpkgs/pkgs/tools/security/uncover/default.nix index 456c629c774b..1ea2f4144780 100644 --- a/nixpkgs/pkgs/tools/security/uncover/default.nix +++ b/nixpkgs/pkgs/tools/security/uncover/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "uncover"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; - rev = "v${version}"; - hash = "sha256-TkNqy5436EH7P7F/kKaFrAuG6D+WwkIJzV5+a/H3aYM="; + rev = "refs/tags/v${version}"; + hash = "sha256-FJtd73z6Cc56+nBderYncjrac3xRydDeoiJqn8xW29U="; }; - vendorHash = "sha256-P2XlFvFkrmH8ATWP1QXtNsUwCT22j0LmzlMuob6LlmY="; + vendorHash = "sha256-mpojOzGedkTthD+fHl9Uhul7tOCN1EGIin+7USoaNmE="; meta = with lib; { description = "API wrapper to search for exposed hosts"; diff --git a/nixpkgs/pkgs/tools/security/vals/default.nix b/nixpkgs/pkgs/tools/security/vals/default.nix index 489d0e6d93f3..c835de3444cb 100644 --- a/nixpkgs/pkgs/tools/security/vals/default.nix +++ b/nixpkgs/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.26.2"; + version = "0.27.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "variantdev"; repo = pname; - sha256 = "sha256-WTUdb2LF/50KT3BqwbvKu4TFocbYBdEAoD3IQiPD2bs="; + sha256 = "sha256-EYp+c3MbkdMIyo/2kHsKg9hjByqm6VdNxLcsl4dJrcg="; }; - vendorHash = "sha256-6DJiqDEgEHQbyIt4iShoBnagBvspd3W3vD56/FGjESs="; + vendorHash = "sha256-iNwQUwcF6iKYdqvy4t5xgOvNdhR+Vx+J5UHZzkNOed4="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/security/web-eid-app/default.nix b/nixpkgs/pkgs/tools/security/web-eid-app/default.nix index f392fb0147bd..fd9c4cc319e7 100644 --- a/nixpkgs/pkgs/tools/security/web-eid-app/default.nix +++ b/nixpkgs/pkgs/tools/security/web-eid-app/default.nix @@ -5,30 +5,30 @@ , gtest , pcsclite , pkg-config -, qttranslations +, qttools }: mkDerivation rec { pname = "web-eid-app"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "web-eid"; repo = "web-eid-app"; rev = "v${version}"; - sha256 = "sha256-X6/vfCDEGXFn05DUSyy7koGVxUAPJ0lv8dnTaoansKk="; + sha256 = "sha256-xWwguxs/121BFF1zhb/HxS9b1vTwQRemhPKOfHEXVZQ="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config + qttools ]; buildInputs = [ gtest # required during build of lib/libelectronic-id/lib/libpcsc-cpp pcsclite - qttranslations ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/system/bottom/default.nix b/nixpkgs/pkgs/tools/system/bottom/default.nix index 7fa64aae7d25..223d4b0f2c96 100644 --- a/nixpkgs/pkgs/tools/system/bottom/default.nix +++ b/nixpkgs/pkgs/tools/system/bottom/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.9.4"; + version = "0.9.6"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - hash = "sha256-9WQdudO2tIvxDHfJ87zvJeMfpuFSr4D5zGteL7Od2fQ="; + hash = "sha256-czOYEZevZD7GfExmqwB7vhLXl6+etag1PjZFA2G9aGA="; }; - cargoHash = "sha256-aRN6V6r+JYi6yUcXei2f7l7oZ+8IkUmw1sgOwZJOtIE="; + cargoHash = "sha256-RDOGf1jujZikcRXRtL71BUGgmZyt7vQOTk1LkKpXDuo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/system/daemon/default.nix b/nixpkgs/pkgs/tools/system/daemon/default.nix index 3c8689416c2f..7d63b12850ea 100644 --- a/nixpkgs/pkgs/tools/system/daemon/default.nix +++ b/nixpkgs/pkgs/tools/system/daemon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "daemon"; - version = "0.8.2"; + version = "0.8.4"; src = fetchurl { url = "http://libslack.org/daemon/download/daemon-${version}.tar.gz"; - sha256 = "sha256-s0s3VDu6Q70Ibln0t1TIECOArlwXKLmHyJDV2ktM88o="; + sha256 = "sha256-+iiFmtNBywoLASwRwnGBT4cEggE7SfcQYAMh03mIfNE="; }; makeFlags = [ diff --git a/nixpkgs/pkgs/tools/system/htop/default.nix b/nixpkgs/pkgs/tools/system/htop/default.nix index c00f25780839..50c6ea461f36 100644 --- a/nixpkgs/pkgs/tools/system/htop/default.nix +++ b/nixpkgs/pkgs/tools/system/htop/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { "--enable-capabilities" "--enable-delayacct" ] - ++ lib.optional sensorsSupport "--with-sensors" + ++ lib.optional sensorsSupport "--enable-sensors" ; postFixup = diff --git a/nixpkgs/pkgs/tools/system/lr/default.nix b/nixpkgs/pkgs/tools/system/lr/default.nix index 2bb49bf9803d..806b329196a2 100644 --- a/nixpkgs/pkgs/tools/system/lr/default.nix +++ b/nixpkgs/pkgs/tools/system/lr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lr"; - version = "1.5.1"; + version = "1.6"; src = fetchFromGitHub { owner = "chneukirchen"; repo = "lr"; rev = "v${version}"; - sha256 = "1wv2acm4r5y5gg6f64v2hiwpg1f3lnr4fy1a9zssw77fmdc7ys3j"; + sha256 = "sha256-TcP0jLFemdmWzGa4/RX7N6xUUTgKsI7IEOD7GfuuPWI="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/nixpkgs/pkgs/tools/system/netdata/default.nix b/nixpkgs/pkgs/tools/system/netdata/default.nix index 420cb2880af6..e61f3673bc87 100644 --- a/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { # Don't forget to update go.d.plugin.nix as well - version = "1.42.0"; + version = "1.42.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - hash = "sha256-Gd+lZVi0bU/7dXCZaPyRwWKkFOm+QNbuwgxcXS2YO7E="; + hash = "sha256-uVr897LF5F+ZGz2rzrTBLhoOOFE+BrE69xztQM8Lq8Q="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/tools/system/nvitop/default.nix b/nixpkgs/pkgs/tools/system/nvitop/default.nix index dc1adc7ccdd1..21fa53dc7034 100644 --- a/nixpkgs/pkgs/tools/system/nvitop/default.nix +++ b/nixpkgs/pkgs/tools/system/nvitop/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "nvitop"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "XuehaiPan"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Za2NJ4gx+aE/cfl2wzbwLxIFNL1UzgKVbb6VqopkNxs="; + hash = "sha256-nHJ2m5Q0IWl0nx13iGBkHsHj2YdPS+33kLUBsjbpyuM="; }; pythonRelaxDeps = [ "nvidia-ml-py" ]; diff --git a/nixpkgs/pkgs/tools/system/nvtop/default.nix b/nixpkgs/pkgs/tools/system/nvtop/default.nix index 44ecbd39d471..1ab520cefac4 100644 --- a/nixpkgs/pkgs/tools/system/nvtop/default.nix +++ b/nixpkgs/pkgs/tools/system/nvtop/default.nix @@ -11,14 +11,15 @@ , udev , addOpenGLRunpath , amd ? true +, intel ? true +, msm ? true , nvidia ? true }: let - pname-suffix = if amd && nvidia then "" else if amd then "-amd" else "-nvidia"; nvidia-postFixup = "addOpenGLRunpath $out/bin/nvtop"; libPath = lib.makeLibraryPath [ libdrm ncurses udev ]; - amd-postFixup = '' + drm-postFixup = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ @@ -26,14 +27,14 @@ let ''; in stdenv.mkDerivation rec { - pname = "nvtop" + pname-suffix; - version = "3.0.1"; + pname = "nvtop"; + version = "3.0.2"; src = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; rev = version; - hash = "sha256-vLvt2sankpQWAVZBPo3OePs4LDy7YfVnMkZLfN6ERAc="; + hash = "sha256-SHKdjzbc3ZZfOW2p8RLFRKKBfLnO+Z8/bKVxcdLLqxw="; }; cmakeFlags = with lib; [ @@ -43,17 +44,19 @@ stdenv.mkDerivation rec { ] ++ optional nvidia "-DNVML_INCLUDE_DIRS=${cudatoolkit}/include" ++ optional nvidia "-DNVML_LIBRARIES=${cudatoolkit}/targets/x86_64-linux/lib/stubs/libnvidia-ml.so" ++ optional (!amd) "-DAMDGPU_SUPPORT=OFF" + ++ optional (!intel) "-DINTEL_SUPPORT=OFF" + ++ optional (!msm) "-DMSM_SUPPORT=OFF" ++ optional (!nvidia) "-DNVIDIA_SUPPORT=OFF" - ++ optional amd "-DLibdrm_INCLUDE_DIRS=${libdrm}/lib/stubs/libdrm.so.2" + ++ optional (amd || msm) "-DLibdrm_INCLUDE_DIRS=${libdrm}/lib/stubs/libdrm.so.2" ; nativeBuildInputs = [ cmake gtest ] ++ lib.optional nvidia addOpenGLRunpath; buildInputs = with lib; [ ncurses udev ] ++ optional nvidia cudatoolkit - ++ optional amd libdrm + ++ optional (amd || msm) libdrm ; # ordering of fixups is important - postFixup = (lib.optionalString amd amd-postFixup) + (lib.optionalString nvidia nvidia-postFixup); + postFixup = (lib.optionalString (amd || msm) drm-postFixup) + (lib.optionalString nvidia nvidia-postFixup); doCheck = true; @@ -66,9 +69,10 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A (h)top like task monitor for AMD, Intel and NVIDIA GPUs"; + description = "A (h)top like task monitor for AMD, Adreno, Intel and NVIDIA GPUs"; longDescription = '' - Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD, Intel and NVIDIA GPUs. It can handle multiple GPUs and print information about them in a htop familiar way. + Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD, Adreno, Intel and NVIDIA GPUs. + It can handle multiple GPUs and print information about them in a htop familiar way. ''; homepage = "https://github.com/Syllo/nvtop"; changelog = "https://github.com/Syllo/nvtop/releases/tag/${version}"; diff --git a/nixpkgs/pkgs/tools/system/rex/default.nix b/nixpkgs/pkgs/tools/system/rex/default.nix index 0befdbd2a1e0..980874322bb8 100644 --- a/nixpkgs/pkgs/tools/system/rex/default.nix +++ b/nixpkgs/pkgs/tools/system/rex/default.nix @@ -73,6 +73,10 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; + postPatch = '' + patchShebangs bin + ''; + fixupPhase = '' for sh in bash zsh; do substituteInPlace ./share/rex-tab-completion.$sh \ diff --git a/nixpkgs/pkgs/tools/system/rsyslog/default.nix b/nixpkgs/pkgs/tools/system/rsyslog/default.nix index ceb83ff202fc..b406c5b4a312 100644 --- a/nixpkgs/pkgs/tools/system/rsyslog/default.nix +++ b/nixpkgs/pkgs/tools/system/rsyslog/default.nix @@ -61,11 +61,11 @@ stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2306.0"; + version = "8.2308.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - hash = "sha256-9ig++q3GCVQKVua+yIo2LJZud/Kf5I5rc0vWwRI+C+U="; + hash = "sha256-AghrkSHocs6mnl0PbI4tjr/zMjSzytVQNmU3jTry48k="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/system/sg3_utils/default.nix b/nixpkgs/pkgs/tools/system/sg3_utils/default.nix index 5aca34e344ba..3975a5927f47 100644 --- a/nixpkgs/pkgs/tools/system/sg3_utils/default.nix +++ b/nixpkgs/pkgs/tools/system/sg3_utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sg3_utils"; - version = "1.47"; + version = "1.48"; src = fetchurl { url = "https://sg.danny.cz/sg/p/sg3_utils-${version}.tgz"; - sha256 = "sha256-hnPH+sqEm2s0dkMy0qqR9y2wW/9zgruDbQaIeVGZw+E="; + sha256 = "sha256-1itsPPIDkPpzVwRDkAhBZtJfHZMqETXEULaf5cKD13M="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/nixpkgs/pkgs/tools/system/stress-ng/default.nix index 889b061ac137..f93716ff4332 100644 --- a/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.15.10"; + version = "0.16.04"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-JRdqbZAWcPBNspziM/qo2ioIaJOrMgLmx10w7NNaps0="; + hash = "sha256-Qr1t+xyl0aS2tSB+DyS7oXOkbcJRaSabS6g/qc8hdWc="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/system/thermald/default.nix b/nixpkgs/pkgs/tools/system/thermald/default.nix index b4696d704224..9f667bb4203e 100644 --- a/nixpkgs/pkgs/tools/system/thermald/default.nix +++ b/nixpkgs/pkgs/tools/system/thermald/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "thermald"; - version = "2.5.3"; + version = "2.5.4"; outputs = [ "out" "devdoc" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "sha256-rYhf+mbELNmm6gVS7eH1EEY73Dsw1vZLFUbaTOU980I="; + sha256 = "sha256-5UILKdv+HhilY+NsbMwqqvYjbM3mAeec/lX+CGY0CPE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock b/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock index 1d0974afe898..549f575426c4 100644 --- a/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock +++ b/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock @@ -84,9 +84,12 @@ checksum = "72feb31ffc86498dacdbd0fcebb56138e7177a8cc5cea4516031d15ae85a742e" [[package]] name = "cc" -version = "1.0.78" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -234,7 +237,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "difftastic" -version = "0.50.0" +version = "0.51.1" dependencies = [ "assert_cmd", "bumpalo", @@ -245,7 +248,7 @@ dependencies = [ "glob", "hashbrown 0.12.3", "humansize", - "itertools", + "itertools 0.11.0", "lazy_static", "libc", "libmimalloc-sys", @@ -259,6 +262,8 @@ dependencies = [ "rayon", "regex", "rustc-hash", + "serde", + "serde_json", "strsim", "strum", "tree-sitter", @@ -401,6 +406,21 @@ 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 = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -591,7 +611,7 @@ checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c" dependencies = [ "difflib", "float-cmp", - "itertools", + "itertools 0.10.3", "normalize-line-endings", "predicates-core", "regex", @@ -732,6 +752,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[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" @@ -747,6 +773,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] +name = "serde" +version = "1.0.176" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.176" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "serde_json" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] name = "signal-hook" version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -891,9 +948,9 @@ dependencies = [ [[package]] name = "typed-arena" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "unicode-ident" diff --git a/nixpkgs/pkgs/tools/text/difftastic/default.nix b/nixpkgs/pkgs/tools/text/difftastic/default.nix index 520afe5a3024..77fa6334f16e 100644 --- a/nixpkgs/pkgs/tools/text/difftastic/default.nix +++ b/nixpkgs/pkgs/tools/text/difftastic/default.nix @@ -16,13 +16,13 @@ in rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.50.0"; + version = "0.51.1"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - hash = "sha256-CC06Bryn5VNEsW4Wwbo+ubifizCWgpWUE1FsAozZcdg="; + hash = "sha256-u03UL5QB0mdMTgRtxVe4pgLlCeLx1cG7czo7uBKQI84="; }; cargoLock = { diff --git a/nixpkgs/pkgs/tools/text/dos2unix/default.nix b/nixpkgs/pkgs/tools/text/dos2unix/default.nix index a76432d76c05..5505893b4ec6 100644 --- a/nixpkgs/pkgs/tools/text/dos2unix/default.nix +++ b/nixpkgs/pkgs/tools/text/dos2unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dos2unix"; - version = "7.5.0"; + version = "7.5.1"; src = fetchurl { url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz"; - sha256 = "sha256-ejsB0B4hTWLCs+BMOpLg3ccoo4VWbkwDVu+mb9brla8="; + sha256 = "sha256-2gd4i7LgKbDWP2Rx0Wb2hSis2Nos8UgjoYjoqdXB/BU="; }; nativeBuildInputs = [ perl gettext ]; diff --git a/nixpkgs/pkgs/tools/text/gtree/default.nix b/nixpkgs/pkgs/tools/text/gtree/default.nix index db51febfdc4d..17e04df84453 100644 --- a/nixpkgs/pkgs/tools/text/gtree/default.nix +++ b/nixpkgs/pkgs/tools/text/gtree/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gtree"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-qbAus0RgocbkC9eOmoiAOoyZw58LPDZlJgoRA/SzhQI="; + hash = "sha256-eU5mMUDUh5eMzd4oLc0XOHapt1hhODWXQJ+OJAy3tWc="; }; vendorHash = "sha256-QxcDa499XV43p8fstENOtfe3iZ176R5/Ub5iovXlYIM="; diff --git a/nixpkgs/pkgs/tools/text/languagetool-rust/default.nix b/nixpkgs/pkgs/tools/text/languagetool-rust/default.nix index 013a24686824..eda1060320c8 100644 --- a/nixpkgs/pkgs/tools/text/languagetool-rust/default.nix +++ b/nixpkgs/pkgs/tools/text/languagetool-rust/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "languagetool-rust"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "jeertmans"; repo = pname; rev = "v${version}"; - hash = "sha256-iiJSdr7TF1f8/Ve+OKbTDHYWdFkd2IEOzp7Lhlpwb50="; + hash = "sha256-YsVK72q+A9T00u9bXIUfGDhwQl5kiLMec6onbp9YKkg="; }; - cargoHash = "sha256-oCRlWYCTmJWTi6LCDEKimsLmqm3JTaQEsKJXrvQP/p8="; + cargoHash = "sha256-Yit6zWWEcH5LXpcvy9EXUvRNz+JsyW10fauSNBf1BoU="; buildFeatures = [ "full" ]; diff --git a/nixpkgs/pkgs/tools/text/mdbook-i18n-helpers/default.nix b/nixpkgs/pkgs/tools/text/mdbook-i18n-helpers/default.nix index 4231f1ee65a3..6e4ef6d01ad1 100644 --- a/nixpkgs/pkgs/tools/text/mdbook-i18n-helpers/default.nix +++ b/nixpkgs/pkgs/tools/text/mdbook-i18n-helpers/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-i18n-helpers"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "google"; repo = "mdbook-i18n-helpers"; rev = "refs/tags/${version}"; - hash = "sha256-j5nbAgbCuz8urvdYPTTtGDnWwY/FxKNnwbeSTcuyIKw="; + hash = "sha256-ea/z5+QAvQVacP2Yxz9hGh8REjsNbp/rfkDV0f9KyPg="; }; - cargoHash = "sha256-lDHq4KRYIeCddhFGQDWOx9olcOASjOke/h22Qm4wv6Q="; + cargoHash = "sha256-4Bf6R8sVwJCFiF+j+WePxWy43KuArIuMCzXKc58+TAw="; meta = with lib; { description = "Helpers for a mdbook i18n workflow based on Gettext"; diff --git a/nixpkgs/pkgs/tools/text/mmdoc/default.nix b/nixpkgs/pkgs/tools/text/mmdoc/default.nix index a570d0b9558e..312a4f94b22f 100644 --- a/nixpkgs/pkgs/tools/text/mmdoc/default.nix +++ b/nixpkgs/pkgs/tools/text/mmdoc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mmdoc"; - version = "0.15.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "ryantm"; repo = "mmdoc"; rev = version; - hash = "sha256-xOi91BSQh+AN13V6YyAzOe7kUsyPAvUKWTJ+PUPlPJQ="; + hash = "sha256-W48ndjWrdJphvGDDUtcLZLBzsTfeLCi3k6UrHVroBcA="; }; nativeBuildInputs = [ ninja meson pkg-config xxd ]; diff --git a/nixpkgs/pkgs/tools/text/riffdiff/default.nix b/nixpkgs/pkgs/tools/text/riffdiff/default.nix index f78ddaf9c829..c26966a15817 100644 --- a/nixpkgs/pkgs/tools/text/riffdiff/default.nix +++ b/nixpkgs/pkgs/tools/text/riffdiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "2.25.0"; + version = "2.25.2"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; rev = version; - hash = "sha256-/V9xp5ew+oL3AIBsgDaAa6LE5Ko/ae7VW47QATtqG1I="; + hash = "sha256-JZWgI4yAsk+jtTyS3QZBxdAOPYmUxb7pn1SbcUeCh6Y="; }; - cargoHash = "sha256-pWMsmQ4JqlHgdP5TUgwZ6fwdEjKrilI5Rla6XLjaBF8="; + cargoHash = "sha256-Z33CGF02rPf24LaYh+wEmmGgPPw+oxMNCgMzCrUEKqk="; meta = with lib; { description = "A diff filter highlighting which line parts have changed"; diff --git a/nixpkgs/pkgs/tools/text/tesh/default.nix b/nixpkgs/pkgs/tools/text/tesh/default.nix index 7961b120d213..0b702ae0052a 100644 --- a/nixpkgs/pkgs/tools/text/tesh/default.nix +++ b/nixpkgs/pkgs/tools/text/tesh/default.nix @@ -1,4 +1,4 @@ -{ python3Packages, fetchFromGitHub }: +{ python3Packages, fetchFromGitHub, fetchpatch }: let version = "0.3.0"; @@ -12,13 +12,23 @@ in python3Packages.buildPythonPackage rec { owner = "OceanSprint"; repo = "tesh"; rev = version; - sha256 = "sha256-/CSYz2YXbjKZszb1HMOCS+srVJ+TcFSeLeuz9VvtlI4="; + hash = "sha256-/CSYz2YXbjKZszb1HMOCS+srVJ+TcFSeLeuz9VvtlI4="; }; - prePatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry" "poetry.core.masonry" - ''; + patches = [ + # https://github.com/OceanSprint/tesh/pull/49 + (fetchpatch { + name = "replace-poetry-with-poetry-core-1.patch"; + url = "https://github.com/OceanSprint/tesh/commit/49b90f5a3c9cf111931393248943b1da966dc3ec.patch"; + hash = "sha256-s+eGO4NXTGbyXcLP37kCg4GDrjAsYIlOwNDR1Q7+1Uc="; + }) + # https://github.com/OceanSprint/tesh/pull/50 + (fetchpatch { + name = "replace-poetry-with-poetry-core-2.patch"; + url = "https://github.com/OceanSprint/tesh/commit/66798b54f28dc0b72159ee3a2144895cf945eaf0.patch"; + hash = "sha256-f3uL7TZlkrTOWYihwWNfhrY5/xlBrclAMnbxRNXCGJw="; + }) + ]; checkInputs = [ python3Packages.pytest ]; nativeBuildInputs = [ python3Packages.poetry-core ]; diff --git a/nixpkgs/pkgs/tools/text/ugrep/default.nix b/nixpkgs/pkgs/tools/text/ugrep/default.nix index afc986e9c597..159c8ca594ac 100644 --- a/nixpkgs/pkgs/tools/text/ugrep/default.nix +++ b/nixpkgs/pkgs/tools/text/ugrep/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "4.0.2"; + version = "4.0.5"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-g+COkAdXc1Z3yrObbeBU1wtu9Tr3mEhxrf6Qmy3JywY="; + hash = "sha256-7cE8kbj8ChvHOPb1F7Fj9talg82nXpXRPt4oBSGSWZw="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/text/xml/xml2/default.nix b/nixpkgs/pkgs/tools/text/xml/xml2/default.nix index 265ab10e5ac8..d469078c91dc 100644 --- a/nixpkgs/pkgs/tools/text/xml/xml2/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/xml2/default.nix @@ -12,6 +12,25 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 ]; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + echo -n 'checking csv2 and 2csv...' + $out/bin/csv2 -f <<< $'a,b\n1,2' \ + | $out/bin/2csv record a b \ + | grep -qF '1,2' + echo ' ok' + + echo -n 'checking xml2 and 2xml...' + $out/bin/xml2 <<< $'<a>abc</a>' \ + | $out/bin/2xml \ + | grep -qF '<a>abc</a>' + echo ' ok' + + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://web.archive.org/web/20160515005047/http://dan.egnor.name:80/xml2"; description = "Tools for command line processing of XML, HTML, and CSV"; diff --git a/nixpkgs/pkgs/tools/text/yx/default.nix b/nixpkgs/pkgs/tools/text/yx/default.nix new file mode 100644 index 000000000000..bff2b955fb42 --- /dev/null +++ b/nixpkgs/pkgs/tools/text/yx/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitLab, libyaml }: +stdenv.mkDerivation rec { + pname = "yx"; + version = "1.0.0"; + + src = fetchFromGitLab { + owner = "tomalok"; + repo = pname; + rev = version; + sha256 = "sha256-oY61V9xP0DwRooabzi0XtaFsQa2GwYbuvxfERXQtYcA="; + }; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + strictDeps = true; + + buildInputs = [ libyaml ]; + + doCheck = true; + + meta = with lib; { + description = "YAML Data Extraction Tool"; + homepage = "https://gitlab.com/tomalok/yx"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ twz123 ]; + mainProgram = pname; + }; +} diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix index 1415d2d39f9f..2e9572f168a5 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix @@ -29,6 +29,7 @@ , hasManpages ? false , hasRunfiles ? false , hasTlpkg ? false +, extraNativeBuildInputs ? [ ] , ... }@args: @@ -119,6 +120,7 @@ let inherit meta; # shebang interpreters buildInputs = (args.extraBuildInputs or [ ]) ++ [ bash perl ] ++ (lib.attrVals (args.scriptExts or [ ]) extToInput); + nativeBuildInputs = extraNativeBuildInputs; # absolute scripts folder scriptsFolder = lib.optionalString (run ? outPath) (run.outPath + "/scripts/" + args.scriptsFolder or pname); # binaries info diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix index 1821d1c090de..8a3265727168 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -1,4 +1,6 @@ -params: with params; +{ lib, buildEnv, runCommand, writeText, makeWrapper, libfaketime, makeFontsConf +, perl, bash, coreutils, gnused, gnugrep, gawk, ghostscript +, bin, tl }: # combine = args@{ pkgFilter ? (pkg: pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "core" @@ -8,6 +10,22 @@ args@{ , ... }: let + # combine a set of TL packages into a single TL meta-package + combinePkgs = pkgList: lib.catAttrs "pkg" ( + let + # a TeX package is an attribute set { pkgs = [ ... ]; ... } where pkgs is a list of derivations + # the derivations make up the TeX package and optionally (for backward compatibility) its dependencies + tlPkgToSets = { pkgs, ... }: map ({ tlType, version ? "", outputName ? "", ... }@pkg: { + # outputName required to distinguish among bin.core-big outputs + key = "${pkg.pname or pkg.name}.${tlType}-${version}-${outputName}"; + inherit pkg; + }) pkgs; + pkgListToSets = lib.concatMap tlPkgToSets; in + builtins.genericClosure { + startSet = pkgListToSets pkgList; + operator = { pkg, ... }: pkgListToSets (pkg.tlDeps or []); + }); + pkgSet = removeAttrs args [ "pkgFilter" "extraName" "extraVersion" ]; pkgList = rec { combined = combinePkgs (lib.attrValues pkgSet); diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix index 9839d764adf4..96bc6f61e4f0 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix @@ -4,7 +4,7 @@ */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscript_headless, harfbuzz -, makeWrapper +, makeWrapper, installShellFiles , python3, ruby, perl, tk, jdk, bash, snobol4 , coreutils, findutils, gawk, getopt, gnugrep, gnumake, gnupg, gnused, gzip, ncurses, zip , libfaketime, asymptote, biber-ms, makeFontsConf @@ -23,8 +23,8 @@ let # function for creating a working environment from a set of TL packages combine = import ./combine.nix { - inherit bin combinePkgs buildEnv lib makeWrapper writeText runCommand - stdenv perl libfaketime makeFontsConf bash tl coreutils gawk gnugrep gnused; + inherit bin buildEnv lib makeWrapper writeText runCommand + perl libfaketime makeFontsConf bash tl coreutils gawk gnugrep gnused; ghostscript = ghostscript_headless; }; @@ -34,392 +34,14 @@ let # the set of TeX Live packages, collections, and schemes; using upstream naming overriddenTlpdb = let - # most format -> engine links are generated by texlinks according to fmtutil.cnf at combine time - # so we remove them from binfiles, and add back the ones texlinks purposefully ignore (e.g. mptopdf) - removeFormatLinks = lib.mapAttrs (_: attrs: - if (attrs ? formats && attrs ? binfiles) - then let formatLinks = lib.catAttrs "name" (lib.filter (f: f.name != f.engine) attrs.formats); - binNotFormats = lib.subtractLists formatLinks attrs.binfiles; - in if binNotFormats != [] then attrs // { binfiles = binNotFormats; } else removeAttrs attrs [ "binfiles" ] - else attrs); - - orig = removeFormatLinks (removeAttrs tlpdb [ "00texlive.config" ]); in - - lib.recursiveUpdate orig rec { - #### overrides of texlive.tlpdb - - #### nonstandard script folders - context.scriptsFolder = "context/stubs/unix"; - cyrillic-bin.scriptsFolder = "texlive-extra"; - fontinst.scriptsFolder = "texlive-extra"; - mptopdf.scriptsFolder = "context/perl"; - pdftex.scriptsFolder = "simpdftex"; - texlive-scripts.scriptsFolder = "texlive"; - texlive-scripts-extra.scriptsFolder = "texlive-extra"; - xetex.scriptsFolder = "texlive-extra"; - - #### interpreters not detected by looking at the script extensions - ctanbib.extraBuildInputs = [ bin.luatex ]; - de-macro.extraBuildInputs = [ python3 ]; - match_parens.extraBuildInputs = [ ruby ]; - optexcount.extraBuildInputs = [ python3 ]; - pdfbook2.extraBuildInputs = [ python3 ]; - texlogsieve.extraBuildInputs = [ bin.luatex ]; - - #### perl packages - crossrefware.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ LWP URI ])) ]; - ctan-o-mat.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ LWP LWPProtocolHttps ])) ]; - ctanify.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ FileCopyRecursive ])) ]; - ctanupload.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ HTMLFormatter WWWMechanize ])) ]; - exceltex.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ SpreadsheetParseExcel ])) ]; - latex-git-log.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ IPCSystemSimple ])) ]; - latexindent.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ FileHomeDir LogDispatch LogLog4perl UnicodeLineBreak YAMLTiny ])) ]; - pax.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ FileWhich ])) ]; - ptex-fontmaps.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ Tk ])) ]; - purifyeps.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ FileWhich ])) ]; - svn-multi.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ TimeDate ])) ]; - texdoctk.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ Tk ])) ]; - ulqda.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ DigestSHA1 ])) ]; - - #### python packages - pythontex.extraBuildInputs = [ (python3.withPackages (ps: with ps; [ pygments ])) ]; - - #### other runtime PATH dependencies - a2ping.extraBuildInputs = [ ghostscript_headless ]; - bibexport.extraBuildInputs = [ gnugrep ]; - checklistings.extraBuildInputs = [ coreutils ]; - cjk-gs-integrate.extraBuildInputs = [ ghostscript_headless ]; - context.extraBuildInputs = [ coreutils ruby ]; - cyrillic-bin.extraBuildInputs = [ coreutils gnused ]; - dtxgen.extraBuildInputs = [ coreutils getopt gnumake zip ]; - dviljk.extraBuildInputs = [ coreutils ]; - epspdf.extraBuildInputs = [ ghostscript_headless ]; - epstopdf.extraBuildInputs = [ ghostscript_headless ]; - fragmaster.extraBuildInputs = [ ghostscript_headless ]; - installfont.extraBuildInputs = [ coreutils getopt gnused ]; - latexfileversion.extraBuildInputs = [ coreutils gnugrep gnused ]; - listings-ext.extraBuildInputs = [ coreutils getopt ]; - ltxfileinfo.extraBuildInputs = [ coreutils getopt gnused ]; - ltximg.extraBuildInputs = [ ghostscript_headless ]; - luaotfload.extraBuildInputs = [ ncurses ]; - makeindex.extraBuildInputs = [ coreutils gnused ]; - pagelayout.extraBuildInputs = [ gnused ncurses ]; - pdfcrop.extraBuildInputs = [ ghostscript_headless ]; - pdftex.extraBuildInputs = [ coreutils ghostscript_headless gnused ]; - pdftex-quiet.extraBuildInputs = [ coreutils ]; - pdfxup.extraBuildInputs = [ coreutils ghostscript_headless ]; - pkfix-helper.extraBuildInputs = [ ghostscript_headless ]; - ps2eps.extraBuildInputs = [ ghostscript_headless ]; - pst2pdf.extraBuildInputs = [ ghostscript_headless ]; - tex4ht.extraBuildInputs = [ ruby ]; - texlive-scripts.extraBuildInputs = [ gnused ]; - texlive-scripts-extra.extraBuildInputs = [ coreutils findutils ghostscript_headless gnused ]; - thumbpdf.extraBuildInputs = [ ghostscript_headless ]; - tpic2pdftex.extraBuildInputs = [ gawk ]; - wordcount.extraBuildInputs = [ coreutils gnugrep ]; - xdvi.extraBuildInputs = [ coreutils gnugrep ]; - xindy.extraBuildInputs = [ gzip ]; - - #### adjustments to binaries - # TODO patch the scripts from bin.* directly in bin.* instead of here - - # mptopdf is a format link, but not generated by texlinks - # so we add it back to binfiles to generate it from mkPkgBin - mptopdf.binfiles = (orig.mptopdf.binfiles or []) ++ [ "mptopdf" ]; - - # remove man - texlive-scripts.binfiles = lib.remove "man" orig.texlive-scripts.binfiles; - - # upmendex is "TODO" in bin.nix - uptex.binfiles = lib.remove "upmendex" orig.uptex.binfiles; - - # xindy is broken on some platforms unfortunately - xindy.binfiles = if bin ? xindy - then lib.subtractLists [ "xindy.mem" "xindy.run" ] orig.xindy.binfiles - else []; - - #### additional symlinks - cluttex.binlinks = { - cllualatex = "cluttex"; - clxelatex = "cluttex"; - }; - - epstopdf.binlinks.repstopdf = "epstopdf"; - pdfcrop.binlinks.rpdfcrop = "pdfcrop"; - - ptex.binlinks = { - pdvitomp = bin.metapost + "/bin/pdvitomp"; - pmpost = bin.metapost + "/bin/pmpost"; - r-pmpost = bin.metapost + "/bin/r-pmpost"; - }; - - texdef.binlinks = { - latexdef = "texdef"; - }; - - texlive-scripts.binlinks = { - mktexfmt = "fmtutil"; - texhash = (lib.last tl."texlive.infra".pkgs) + "/bin/mktexlsr"; - }; - - texlive-scripts-extra.binlinks = { - allec = "allcm"; - kpsepath = "kpsetool"; - kpsexpand = "kpsetool"; - }; - - # metapost binaries are in bin.metapost instead of bin.core - uptex.binlinks = { - r-upmpost = bin.metapost + "/bin/r-upmpost"; - updvitomp = bin.metapost + "/bin/updvitomp"; - upmpost = bin.metapost + "/bin/upmpost"; - }; - - #### add PATH dependencies without wrappers - # TODO deduplicate this code - a2ping.postFixup = '' - sed -i '6i$ENV{PATH}='"'"'${lib.makeBinPath a2ping.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/a2ping - ''; - - bibexport.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath bibexport.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/bibexport - ''; - - checklistings.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath checklistings.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/checklistings - ''; - - cjk-gs-integrate.postFixup = '' - sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath cjk-gs-integrate.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/cjk-gs-integrate - ''; - - context.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath [ coreutils ]}''${PATH:+:$PATH}"' "$out"/bin/{contextjit,mtxrunjit} - sed -i '2iPATH="${lib.makeBinPath [ ruby ]}''${PATH:+:$PATH}"' "$out"/bin/texexec - ''; - - cyrillic-bin.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath cyrillic-bin.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/rumakeindex - ''; - - dtxgen.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath dtxgen.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/dtxgen - ''; - - dviljk.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath dviljk.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/dvihp - ''; - - epstopdf.postFixup = '' - sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath epstopdf.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/epstopdf - ''; - - fragmaster.postFixup = '' - sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath fragmaster.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/fragmaster - ''; - - installfont.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath installfont.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/installfont-tl - ''; - - latexfileversion.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath latexfileversion.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/latexfileversion - ''; - - listings-ext.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath listings-ext.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/listings-ext.sh - ''; - - ltxfileinfo.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath ltxfileinfo.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/ltxfileinfo - ''; - - ltximg.postFixup = '' - sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath ltximg.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/ltximg - ''; - - luaotfload.postFixup = '' - sed -i '2ios.setenv("PATH","${lib.makeBinPath luaotfload.extraBuildInputs}" .. (os.getenv("PATH") and ":" .. os.getenv("PATH") or ""))' "$out"/bin/luaotfload-tool - ''; - - makeindex.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath makeindex.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/mkindex - ''; - - pagelayout.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath [ gnused ]}''${PATH:+:$PATH}"' "$out"/bin/pagelayoutapi - sed -i '2iPATH="${lib.makeBinPath [ ncurses ]}''${PATH:+:$PATH}"' "$out"/bin/textestvis - ''; - - pdfcrop.postFixup = '' - sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath pdfcrop.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/pdfcrop - ''; - - pdftex.postFixup = '' - sed -i -e '2iPATH="${lib.makeBinPath [ coreutils gnused ]}''${PATH:+:$PATH}"' \ - -e 's!^distillerpath="/usr/local/bin"$!distillerpath="${lib.makeBinPath [ ghostscript_headless ]}"!' \ - "$out"/bin/simpdftex - ''; - - pdftex-quiet.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath pdftex-quiet.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/pdftex-quiet - ''; - - pdfxup.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath pdfxup.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/pdfxup - ''; - - pkfix-helper.postFixup = '' - sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath pkfix-helper.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/pkfix-helper - ''; - - ps2eps.postFixup = '' - sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath ps2eps.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/ps2eps - ''; - - pst2pdf.postFixup = '' - sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath pst2pdf.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/pst2pdf - ''; - - tex4ht.postFixup = '' - sed -i -e '2iPATH="${lib.makeBinPath tex4ht.extraBuildInputs}''${PATH:+:$PATH}"' -e 's/\\rubyCall//g;' "$out"/bin/htcontext - ''; - - texlive-scripts.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath texlive-scripts.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/{fmtutil-user,mktexmf,mktexpk,mktextfm,updmap-user} - ''; - - thumbpdf.postFixup = '' - sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath thumbpdf.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/thumbpdf - ''; - - tpic2pdftex.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath tpic2pdftex.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/tpic2pdftex - ''; - - wordcount.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath wordcount.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/wordcount - ''; - - # TODO patch in bin.xdvi - xdvi.postFixup = '' - sed -i '2iPATH="${lib.makeBinPath xdvi.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/xdvi - ''; - - xindy.postFixup = '' - sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath xindy.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/{texindy,xindy} - ''; - - #### other script fixes - # misc tab and python3 fixes - ebong.postFixup = '' - sed -Ei 's/import sre/import re/; s/file\(/open(/g; s/\t/ /g; s/print +(.*)$/print(\1)/g' "$out"/bin/ebong - ''; - - # find files in script directory, not binary directory - # add runtime dependencies to PATH - epspdf.postFixup = '' - sed -i '2ios.setenv("PATH","${lib.makeBinPath epspdf.extraBuildInputs}" .. (os.getenv("PATH") and ":" .. os.getenv("PATH") or ""))' "$out"/bin/epspdf - substituteInPlace "$out"/bin/epspdftk --replace '[info script]' "\"$scriptsFolder/epspdftk.tcl\"" - ''; - - # find files in script directory, not in binary directory - latexindent.postFixup = '' - substituteInPlace "$out"/bin/latexindent --replace 'use FindBin;' "BEGIN { \$0 = '$scriptsFolder' . '/latexindent.pl'; }; use FindBin;" - ''; - - # Patch texlinks.sh back to 2015 version; - # otherwise some bin/ links break, e.g. xe(la)tex. - # add runtime dependencies to PATH - texlive-scripts-extra.postFixup = '' - patch -R "$out"/bin/texlinks < '${./texlinks.diff}' - sed -i '2iPATH="${lib.makeBinPath [ coreutils ]}''${PATH:+:$PATH}"' "$out"/bin/{allcm,dvired,mkocp,ps2frag} - sed -i '2iPATH="${lib.makeBinPath [ coreutils findutils ]}''${PATH:+:$PATH}"' "$out"/bin/allneeded - sed -i '2iPATH="${lib.makeBinPath [ coreutils ghostscript_headless ]}''${PATH:+:$PATH}"' "$out"/bin/dvi2fax - sed -i '2iPATH="${lib.makeBinPath [ gnused ]}''${PATH:+:$PATH}"' "$out"/bin/{kpsetool,texconfig,texconfig-sys} - sed -i '2iPATH="${lib.makeBinPath [ coreutils gnused ]}''${PATH:+:$PATH}"' "$out"/bin/texconfig-dialog - ''; - - # patch interpreter - texosquery.postFixup = '' - substituteInPlace "$out"/bin/* --replace java "$interpJava" - ''; - - # hardcode revision numbers (since texlive.infra, tlshell are not in either system or user texlive.tlpdb) - tlshell.postFixup = '' - substituteInPlace "$out"/bin/tlshell \ - --replace '[dict get $::pkgs texlive.infra localrev]' '${toString orig."texlive.infra".revision}' \ - --replace '[dict get $::pkgs tlshell localrev]' '${toString orig.tlshell.revision}' - ''; - #### dependency changes - - # it seems to need it to transform fonts - xdvi.deps = (orig.xdvi.deps or []) ++ [ "metafont" ]; - - # remove dependency-heavy packages from the basic collections - collection-basic.deps = lib.subtractLists [ "metafont" "xdvi" ] orig.collection-basic.deps; - - # add them elsewhere so that collections cover all packages - collection-metapost.deps = orig.collection-metapost.deps ++ [ "metafont" ]; - collection-plaingeneric.deps = orig.collection-plaingeneric.deps ++ [ "xdvi" ]; - - #### misc - - # tlpdb lists license as "unknown", but the README says lppl13: http://mirrors.ctan.org/language/arabic/arabi-add/README - arabi-add.license = [ "lppl13c" ]; - - # TODO: remove this when updating to texlive-2023, npp-for-context is no longer in texlive - # tlpdb lists license as "noinfo", but it's gpl3: https://github.com/luigiScarso/context-npp - npp-for-context.license = [ "gpl3Only" ]; - - texdoc = { - extraRevision = "-tlpdb${toString tlpdbVersion.revision}"; - extraVersion = "-tlpdb-${toString tlpdbVersion.revision}"; - - # build Data.tlpdb.lua (part of the 'tlType == "run"' package) - postUnpack = '' - if [[ -f "$out"/scripts/texdoc/texdoc.tlu ]]; then - unxz --stdout "${tlpdbxz}" > texlive.tlpdb - - # create dummy doc file to ensure that texdoc does not return an error - mkdir -p support/texdoc - touch support/texdoc/NEWS - - TEXMFCNF="${bin.core}"/share/texmf-dist/web2c TEXMF="$out" TEXDOCS=. TEXMFVAR=. \ - "${bin.luatex}"/bin/texlua "$out"/scripts/texdoc/texdoc.tlu \ - -c texlive_tlpdb=texlive.tlpdb -lM texdoc - - cp texdoc/cache-tlpdb.lua "$out"/scripts/texdoc/Data.tlpdb.lua - fi - ''; - }; - - "texlive.infra" = { - extraRevision = ".tlpdb${toString tlpdbVersion.revision}"; - extraVersion = "-tlpdb-${toString tlpdbVersion.revision}"; - - # add license of tlmgr and TeXLive::* perl packages and of bin.core - license = [ "gpl2Plus" ] ++ lib.toList bin.core.meta.license.shortName ++ orig."texlive.infra".license or [ ]; - - scriptsFolder = "texlive"; - extraBuildInputs = [ coreutils gnused gnupg (lib.last tl.kpathsea.pkgs) (perl.withPackages (ps: with ps; [ Tk ])) ]; - - # make tlmgr believe it can use kpsewhich to evaluate TEXMFROOT - postFixup = '' - substituteInPlace "$out"/bin/tlmgr \ - --replace 'if (-r "$bindir/$kpsewhichname")' 'if (1)' - sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath [ gnupg ]}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/tlmgr - sed -i '2iPATH="${lib.makeBinPath [ coreutils gnused (lib.last tl.kpathsea.pkgs) ]}''${PATH:+:$PATH}"' "$out"/bin/mktexlsr - ''; - - # add minimal texlive.tlpdb - postUnpack = '' - if [[ "$tlType" == "tlpkg" ]] ; then - xzcat "${tlpdbxz}" | sed -n -e '/^name \(00texlive.config\|00texlive.installation\)$/,/^$/p' > "$out"/texlive.tlpdb - fi - ''; - }; - }; # overrides + overrides = import ./tlpdb-overrides.nix { + inherit + lib bin tlpdb tlpdbxz tl + installShellFiles + coreutils findutils gawk getopt ghostscript_headless gnugrep + gnumake gnupg gnused gzip ncurses perl python3 ruby zip; + }; + in overrides tlpdb; version = { # day of the snapshot being taken @@ -478,29 +100,9 @@ let // lib.optionalAttrs (args ? deps) { deps = map (n: tl.${n}) (args.deps or [ ]); }) ) overriddenTlpdb; - # combine a set of TL packages into a single TL meta-package - combinePkgs = pkgList: lib.catAttrs "pkg" ( - let - # a TeX package is an attribute set { pkgs = [ ... ]; ... } where pkgs is a list of derivations - # the derivations make up the TeX package and optionally (for backward compatibility) its dependencies - tlPkgToSets = { pkgs, ... }: map ({ tlType, version ? "", outputName ? "", ... }@pkg: { - # outputName required to distinguish among bin.core-big outputs - key = "${pkg.pname or pkg.name}.${tlType}-${version}-${outputName}"; - inherit pkg; - }) pkgs; - pkgListToSets = lib.concatMap tlPkgToSets; in - builtins.genericClosure { - startSet = pkgListToSets pkgList; - operator = { pkg, ... }: pkgListToSets (pkg.tlDeps or []); - }); - assertions = with lib; assertMsg (tlpdbVersion.year == version.texliveYear) "TeX Live year in texlive does not match tlpdb.nix, refusing to evaluate" && - assertMsg (tlpdbVersion.frozen == version.final) "TeX Live final status in texlive does not match tlpdb.nix, refusing to evaluate" && - (!useFixedHashes || - (let all = concatLists (catAttrs "pkgs" (attrValues tl)); - fods = filter (p: isDerivation p && p.tlType != "bin") all; - in builtins.all (p: assertMsg (p ? outputHash) "The TeX Live package '${p.pname + lib.optionalString (p.tlType != "run") ("." + p.tlType)}' does not have a fixed output hash. Please read UPGRADING.md on how to build a new 'fixed-hashes.nix'.") fods)); + assertMsg (tlpdbVersion.frozen == version.final) "TeX Live final status in texlive does not match tlpdb.nix, refusing to evaluate"; in tl // { diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix new file mode 100644 index 000000000000..4d2ce46ed475 --- /dev/null +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix @@ -0,0 +1,411 @@ +{ lib, tlpdb, bin, tlpdbxz, tl +, installShellFiles +, coreutils, findutils, gawk, getopt, ghostscript_headless, gnugrep +, gnumake, gnupg, gnused, gzip, ncurses, perl, python3, ruby, zip +}: + +oldTlpdb: + +let + tlpdbVersion = tlpdb."00texlive.config"; + + # most format -> engine links are generated by texlinks according to fmtutil.cnf at combine time + # so we remove them from binfiles, and add back the ones texlinks purposefully ignore (e.g. mptopdf) + removeFormatLinks = lib.mapAttrs (_: attrs: + if (attrs ? formats && attrs ? binfiles) + then let formatLinks = lib.catAttrs "name" (lib.filter (f: f.name != f.engine) attrs.formats); + binNotFormats = lib.subtractLists formatLinks attrs.binfiles; + in if binNotFormats != [] then attrs // { binfiles = binNotFormats; } else removeAttrs attrs [ "binfiles" ] + else attrs); + + orig = removeFormatLinks (removeAttrs oldTlpdb [ "00texlive.config" ]); + +in lib.recursiveUpdate orig rec { + #### overrides of texlive.tlpdb + + #### nonstandard script folders + context.scriptsFolder = "context/stubs/unix"; + cyrillic-bin.scriptsFolder = "texlive-extra"; + fontinst.scriptsFolder = "texlive-extra"; + mptopdf.scriptsFolder = "context/perl"; + pdftex.scriptsFolder = "simpdftex"; + texlive-scripts.scriptsFolder = "texlive"; + texlive-scripts-extra.scriptsFolder = "texlive-extra"; + xetex.scriptsFolder = "texlive-extra"; + + #### interpreters not detected by looking at the script extensions + ctanbib.extraBuildInputs = [ bin.luatex ]; + de-macro.extraBuildInputs = [ python3 ]; + match_parens.extraBuildInputs = [ ruby ]; + optexcount.extraBuildInputs = [ python3 ]; + pdfbook2.extraBuildInputs = [ python3 ]; + texlogsieve.extraBuildInputs = [ bin.luatex ]; + + #### perl packages + crossrefware.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ LWP URI ])) ]; + ctan-o-mat.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ LWP LWPProtocolHttps ])) ]; + ctanify.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ FileCopyRecursive ])) ]; + ctanupload.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ HTMLFormatter WWWMechanize ])) ]; + exceltex.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ SpreadsheetParseExcel ])) ]; + latex-git-log.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ IPCSystemSimple ])) ]; + latexindent.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ FileHomeDir LogDispatch LogLog4perl UnicodeLineBreak YAMLTiny ])) ]; + pax.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ FileWhich ])) ]; + ptex-fontmaps.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ Tk ])) ]; + purifyeps.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ FileWhich ])) ]; + svn-multi.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ TimeDate ])) ]; + texdoctk.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ Tk ])) ]; + ulqda.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ DigestSHA1 ])) ]; + + #### python packages + pythontex.extraBuildInputs = [ (python3.withPackages (ps: with ps; [ pygments ])) ]; + + #### other runtime PATH dependencies + a2ping.extraBuildInputs = [ ghostscript_headless ]; + bibexport.extraBuildInputs = [ gnugrep ]; + checklistings.extraBuildInputs = [ coreutils ]; + cjk-gs-integrate.extraBuildInputs = [ ghostscript_headless ]; + context.extraBuildInputs = [ coreutils ruby ]; + cyrillic-bin.extraBuildInputs = [ coreutils gnused ]; + dtxgen.extraBuildInputs = [ coreutils getopt gnumake zip ]; + dviljk.extraBuildInputs = [ coreutils ]; + epspdf.extraBuildInputs = [ ghostscript_headless ]; + epstopdf.extraBuildInputs = [ ghostscript_headless ]; + fragmaster.extraBuildInputs = [ ghostscript_headless ]; + installfont.extraBuildInputs = [ coreutils getopt gnused ]; + latexfileversion.extraBuildInputs = [ coreutils gnugrep gnused ]; + listings-ext.extraBuildInputs = [ coreutils getopt ]; + ltxfileinfo.extraBuildInputs = [ coreutils getopt gnused ]; + ltximg.extraBuildInputs = [ ghostscript_headless ]; + luaotfload.extraBuildInputs = [ ncurses ]; + makeindex.extraBuildInputs = [ coreutils gnused ]; + pagelayout.extraBuildInputs = [ gnused ncurses ]; + pdfcrop.extraBuildInputs = [ ghostscript_headless ]; + pdftex.extraBuildInputs = [ coreutils ghostscript_headless gnused ]; + pdftex-quiet.extraBuildInputs = [ coreutils ]; + pdfxup.extraBuildInputs = [ coreutils ghostscript_headless ]; + pkfix-helper.extraBuildInputs = [ ghostscript_headless ]; + ps2eps.extraBuildInputs = [ ghostscript_headless ]; + pst2pdf.extraBuildInputs = [ ghostscript_headless ]; + tex4ht.extraBuildInputs = [ ruby ]; + texlive-scripts.extraBuildInputs = [ gnused ]; + texlive-scripts-extra.extraBuildInputs = [ coreutils findutils ghostscript_headless gnused ]; + thumbpdf.extraBuildInputs = [ ghostscript_headless ]; + tpic2pdftex.extraBuildInputs = [ gawk ]; + wordcount.extraBuildInputs = [ coreutils gnugrep ]; + xdvi.extraBuildInputs = [ coreutils gnugrep ]; + xindy.extraBuildInputs = [ gzip ]; + + #### adjustments to binaries + # TODO patch the scripts from bin.* directly in bin.* instead of here + + # mptopdf is a format link, but not generated by texlinks + # so we add it back to binfiles to generate it from mkPkgBin + mptopdf.binfiles = (orig.mptopdf.binfiles or []) ++ [ "mptopdf" ]; + + # remove man + texlive-scripts.binfiles = lib.remove "man" orig.texlive-scripts.binfiles; + + # upmendex is "TODO" in bin.nix + uptex.binfiles = lib.remove "upmendex" orig.uptex.binfiles; + + # xindy is broken on some platforms unfortunately + xindy.binfiles = if bin ? xindy + then lib.subtractLists [ "xindy.mem" "xindy.run" ] orig.xindy.binfiles + else []; + + #### additional symlinks + cluttex.binlinks = { + cllualatex = "cluttex"; + clxelatex = "cluttex"; + }; + + epstopdf.binlinks.repstopdf = "epstopdf"; + pdfcrop.binlinks.rpdfcrop = "pdfcrop"; + + ptex.binlinks = { + pdvitomp = bin.metapost + "/bin/pdvitomp"; + pmpost = bin.metapost + "/bin/pmpost"; + r-pmpost = bin.metapost + "/bin/r-pmpost"; + }; + + texdef.binlinks = { + latexdef = "texdef"; + }; + + texlive-scripts.binlinks = { + mktexfmt = "fmtutil"; + texhash = (lib.last tl."texlive.infra".pkgs) + "/bin/mktexlsr"; + }; + + texlive-scripts-extra.binlinks = { + allec = "allcm"; + kpsepath = "kpsetool"; + kpsexpand = "kpsetool"; + }; + + # metapost binaries are in bin.metapost instead of bin.core + uptex.binlinks = { + r-upmpost = bin.metapost + "/bin/r-upmpost"; + updvitomp = bin.metapost + "/bin/updvitomp"; + upmpost = bin.metapost + "/bin/upmpost"; + }; + + #### add PATH dependencies without wrappers + # TODO deduplicate this code + a2ping.postFixup = '' + sed -i '6i$ENV{PATH}='"'"'${lib.makeBinPath a2ping.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/a2ping + ''; + + bibexport.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath bibexport.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/bibexport + ''; + + checklistings.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath checklistings.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/checklistings + ''; + + cjk-gs-integrate.postFixup = '' + sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath cjk-gs-integrate.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/cjk-gs-integrate + ''; + + context.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath [ coreutils ]}''${PATH:+:$PATH}"' "$out"/bin/{contextjit,mtxrunjit} + sed -i '2iPATH="${lib.makeBinPath [ ruby ]}''${PATH:+:$PATH}"' "$out"/bin/texexec + ''; + + cyrillic-bin.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath cyrillic-bin.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/rumakeindex + ''; + + dtxgen.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath dtxgen.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/dtxgen + ''; + + dviljk.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath dviljk.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/dvihp + ''; + + epstopdf.postFixup = '' + sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath epstopdf.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/epstopdf + ''; + + fragmaster.postFixup = '' + sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath fragmaster.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/fragmaster + ''; + + installfont.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath installfont.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/installfont-tl + ''; + + latexfileversion.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath latexfileversion.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/latexfileversion + ''; + + listings-ext.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath listings-ext.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/listings-ext.sh + ''; + + ltxfileinfo.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath ltxfileinfo.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/ltxfileinfo + ''; + + ltximg.postFixup = '' + sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath ltximg.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/ltximg + ''; + + luaotfload.postFixup = '' + sed -i '2ios.setenv("PATH","${lib.makeBinPath luaotfload.extraBuildInputs}" .. (os.getenv("PATH") and ":" .. os.getenv("PATH") or ""))' "$out"/bin/luaotfload-tool + ''; + + makeindex.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath makeindex.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/mkindex + ''; + + pagelayout.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath [ gnused ]}''${PATH:+:$PATH}"' "$out"/bin/pagelayoutapi + sed -i '2iPATH="${lib.makeBinPath [ ncurses ]}''${PATH:+:$PATH}"' "$out"/bin/textestvis + ''; + + pdfcrop.postFixup = '' + sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath pdfcrop.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/pdfcrop + ''; + + pdftex.postFixup = '' + sed -i -e '2iPATH="${lib.makeBinPath [ coreutils gnused ]}''${PATH:+:$PATH}"' \ + -e 's!^distillerpath="/usr/local/bin"$!distillerpath="${lib.makeBinPath [ ghostscript_headless ]}"!' \ + "$out"/bin/simpdftex + ''; + + pdftex-quiet.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath pdftex-quiet.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/pdftex-quiet + ''; + + pdfxup.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath pdfxup.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/pdfxup + ''; + + pkfix-helper.postFixup = '' + sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath pkfix-helper.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/pkfix-helper + ''; + + ps2eps.postFixup = '' + sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath ps2eps.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/ps2eps + ''; + + pst2pdf.postFixup = '' + sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath pst2pdf.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/pst2pdf + ''; + + tex4ht.postFixup = '' + sed -i -e '2iPATH="${lib.makeBinPath tex4ht.extraBuildInputs}''${PATH:+:$PATH}"' -e 's/\\rubyCall//g;' "$out"/bin/htcontext + ''; + + texlive-scripts.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath texlive-scripts.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/{fmtutil-user,mktexmf,mktexpk,mktextfm,updmap-user} + ''; + + thumbpdf.postFixup = '' + sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath thumbpdf.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/thumbpdf + ''; + + tpic2pdftex.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath tpic2pdftex.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/tpic2pdftex + ''; + + wordcount.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath wordcount.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/wordcount + ''; + + # TODO patch in bin.xdvi + xdvi.postFixup = '' + sed -i '2iPATH="${lib.makeBinPath xdvi.extraBuildInputs}''${PATH:+:$PATH}"' "$out"/bin/xdvi + ''; + + xindy.postFixup = '' + sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath xindy.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/{texindy,xindy} + ''; + + #### other script fixes + # misc tab and python3 fixes + ebong.postFixup = '' + sed -Ei 's/import sre/import re/; s/file\(/open(/g; s/\t/ /g; s/print +(.*)$/print(\1)/g' "$out"/bin/ebong + ''; + + # find files in script directory, not binary directory + # add runtime dependencies to PATH + epspdf.postFixup = '' + sed -i '2ios.setenv("PATH","${lib.makeBinPath epspdf.extraBuildInputs}" .. (os.getenv("PATH") and ":" .. os.getenv("PATH") or ""))' "$out"/bin/epspdf + substituteInPlace "$out"/bin/epspdftk --replace '[info script]' "\"$scriptsFolder/epspdftk.tcl\"" + ''; + + # find files in script directory, not in binary directory + latexindent.postFixup = '' + substituteInPlace "$out"/bin/latexindent --replace 'use FindBin;' "BEGIN { \$0 = '$scriptsFolder' . '/latexindent.pl'; }; use FindBin;" + ''; + + # Patch texlinks.sh back to 2015 version; + # otherwise some bin/ links break, e.g. xe(la)tex. + # add runtime dependencies to PATH + texlive-scripts-extra.postFixup = '' + patch -R "$out"/bin/texlinks < '${./texlinks.diff}' + sed -i '2iPATH="${lib.makeBinPath [ coreutils ]}''${PATH:+:$PATH}"' "$out"/bin/{allcm,dvired,mkocp,ps2frag} + sed -i '2iPATH="${lib.makeBinPath [ coreutils findutils ]}''${PATH:+:$PATH}"' "$out"/bin/allneeded + sed -i '2iPATH="${lib.makeBinPath [ coreutils ghostscript_headless ]}''${PATH:+:$PATH}"' "$out"/bin/dvi2fax + sed -i '2iPATH="${lib.makeBinPath [ gnused ]}''${PATH:+:$PATH}"' "$out"/bin/{kpsetool,texconfig,texconfig-sys} + sed -i '2iPATH="${lib.makeBinPath [ coreutils gnused ]}''${PATH:+:$PATH}"' "$out"/bin/texconfig-dialog + ''; + + # patch interpreter + texosquery.postFixup = '' + substituteInPlace "$out"/bin/* --replace java "$interpJava" + ''; + + # hardcode revision numbers (since texlive.infra, tlshell are not in either system or user texlive.tlpdb) + tlshell.postFixup = '' + substituteInPlace "$out"/bin/tlshell \ + --replace '[dict get $::pkgs texlive.infra localrev]' '${toString orig."texlive.infra".revision}' \ + --replace '[dict get $::pkgs tlshell localrev]' '${toString orig.tlshell.revision}' + ''; + #### dependency changes + + # it seems to need it to transform fonts + xdvi.deps = (orig.xdvi.deps or []) ++ [ "metafont" ]; + + # remove dependency-heavy packages from the basic collections + collection-basic.deps = lib.subtractLists [ "metafont" "xdvi" ] orig.collection-basic.deps; + + # add them elsewhere so that collections cover all packages + collection-metapost.deps = orig.collection-metapost.deps ++ [ "metafont" ]; + collection-plaingeneric.deps = orig.collection-plaingeneric.deps ++ [ "xdvi" ]; + + #### misc + + # tlpdb lists license as "unknown", but the README says lppl13: http://mirrors.ctan.org/language/arabic/arabi-add/README + arabi-add.license = [ "lppl13c" ]; + + # TODO: remove this when updating to texlive-2023, npp-for-context is no longer in texlive + # tlpdb lists license as "noinfo", but it's gpl3: https://github.com/luigiScarso/context-npp + npp-for-context.license = [ "gpl3Only" ]; + + texdoc = { + extraRevision = "-tlpdb${toString tlpdbVersion.revision}"; + extraVersion = "-tlpdb-${toString tlpdbVersion.revision}"; + + extraNativeBuildInputs = [ installShellFiles ]; + + # build Data.tlpdb.lua (part of the 'tlType == "run"' package) + postUnpack = '' + if [[ -f "$out"/scripts/texdoc/texdoc.tlu ]]; then + unxz --stdout "${tlpdbxz}" > texlive.tlpdb + + # create dummy doc file to ensure that texdoc does not return an error + mkdir -p support/texdoc + touch support/texdoc/NEWS + + TEXMFCNF="${bin.core}"/share/texmf-dist/web2c TEXMF="$out" TEXDOCS=. TEXMFVAR=. \ + "${bin.luatex}"/bin/texlua "$out"/scripts/texdoc/texdoc.tlu \ + -c texlive_tlpdb=texlive.tlpdb -lM texdoc + + cp texdoc/cache-tlpdb.lua "$out"/scripts/texdoc/Data.tlpdb.lua + fi + ''; + + # install zsh completion + postFixup = '' + TEXMFCNF="${bin.core}"/share/texmf-dist/web2c TEXMF="$scriptsFolder/../.." \ + texlua "$out"/bin/texdoc --print-completion zsh > "$TMPDIR"/_texdoc + substituteInPlace "$TMPDIR"/_texdoc \ + --replace 'compdef __texdoc texdoc' '#compdef texdoc' \ + --replace '$(kpsewhich -var-value TEXMFROOT)/tlpkg/texlive.tlpdb' '$(kpsewhich Data.tlpdb.lua)' \ + --replace '/^name[^.]*$/ {print $2}' '/^ \["[^"]*"\] = {$/ { print substr($1,3,length($1)-4) }' + echo '__texdoc' >> "$TMPDIR"/_texdoc + installShellCompletion --zsh "$TMPDIR"/_texdoc + ''; + }; + + "texlive.infra" = { + extraRevision = ".tlpdb${toString tlpdbVersion.revision}"; + extraVersion = "-tlpdb-${toString tlpdbVersion.revision}"; + + # add license of tlmgr and TeXLive::* perl packages and of bin.core + license = [ "gpl2Plus" ] ++ lib.toList bin.core.meta.license.shortName ++ orig."texlive.infra".license or [ ]; + + scriptsFolder = "texlive"; + extraBuildInputs = [ coreutils gnused gnupg (lib.last tl.kpathsea.pkgs) (perl.withPackages (ps: with ps; [ Tk ])) ]; + + # make tlmgr believe it can use kpsewhich to evaluate TEXMFROOT + postFixup = '' + substituteInPlace "$out"/bin/tlmgr \ + --replace 'if (-r "$bindir/$kpsewhichname")' 'if (1)' + sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath [ gnupg ]}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/tlmgr + sed -i '2iPATH="${lib.makeBinPath [ coreutils gnused (lib.last tl.kpathsea.pkgs) ]}''${PATH:+:$PATH}"' "$out"/bin/mktexlsr + ''; + + # add minimal texlive.tlpdb + postUnpack = '' + if [[ "$tlType" == "tlpkg" ]] ; then + xzcat "${tlpdbxz}" | sed -n -e '/^name \(00texlive.config\|00texlive.installation\)$/,/^$/p' > "$out"/texlive.tlpdb + fi + ''; + }; +} diff --git a/nixpkgs/pkgs/tools/typesetting/typst/default.nix b/nixpkgs/pkgs/tools/typesetting/typst/default.nix index adcbee4bb28e..66b0160c3632 100644 --- a/nixpkgs/pkgs/tools/typesetting/typst/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/typst/default.nix @@ -49,5 +49,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/typst/typst/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ drupol figsoda kanashimia ]; + mainProgram = "typst"; }; } diff --git a/nixpkgs/pkgs/tools/typesetting/typstfmt/Cargo.lock b/nixpkgs/pkgs/tools/typesetting/typstfmt/Cargo.lock index e760716d05ea..5cc5d755f21b 100644 --- a/nixpkgs/pkgs/tools/typesetting/typstfmt/Cargo.lock +++ b/nixpkgs/pkgs/tools/typesetting/typstfmt/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -24,9 +24,9 @@ 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", "serde", @@ -73,18 +73,18 @@ dependencies = [ [[package]] name = "ecow" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5c5051925c54d9a42c8652313b5358a7432eed209466b443ed5220431243a14" +checksum = "1d1990d053cf6edf3f030682dba3b0eb65ef01fabb2686072765d8a17d6728e8" dependencies = [ "serde", ] [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -106,9 +106,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "globmatch" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e82f77d5e36ce0c3941a39a6d8fff8ed9553ae13586b31640d6885f7376097" +checksum = "3755076379cc2b2bbf53855fe718e1eed3093cfb769ebf5d290f617fa9cc09a0" dependencies = [ "globset", "log", @@ -117,12 +117,12 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", - "bstr 1.6.0", + "bstr 1.6.2", "fnv", "log", "regex", @@ -192,15 +192,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "nu-ansi-term" @@ -226,9 +226,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "proc-macro2" @@ -241,22 +241,22 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.31" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "regex" -version = "1.9.1" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.3", + "regex-automata 0.3.7", "regex-syntax", ] @@ -268,9 +268,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", @@ -279,9 +279,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 = "same-file" @@ -294,22 +294,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.171" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -342,9 +342,9 @@ dependencies = [ [[package]] name = "similar-asserts" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf644ad016b75129f01a34a355dcb8d66a5bc803e417c7a77cc5d5ee9fa0f18" +checksum = "e041bb827d1bfca18f213411d51b665309f1afb37a04a5d1464530e13779fc0f" dependencies = [ "console", "similar", @@ -352,9 +352,9 @@ 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 = "smallvec" @@ -375,9 +375,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.26" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -448,7 +448,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -504,7 +504,7 @@ dependencies = [ [[package]] name = "typstfmt" -version = "0.1.0" +version = "0.2.1" dependencies = [ "lexopt", "typstfmt_lib", @@ -512,7 +512,7 @@ dependencies = [ [[package]] name = "typstfmt_lib" -version = "0.1.0" +version = "0.2.1" dependencies = [ "globmatch", "insta", @@ -666,9 +666,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "winnow" -version = "0.5.0" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] diff --git a/nixpkgs/pkgs/tools/typesetting/typstfmt/default.nix b/nixpkgs/pkgs/tools/typesetting/typstfmt/default.nix index 5e83892f528a..2a2fb16d8478 100644 --- a/nixpkgs/pkgs/tools/typesetting/typstfmt/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/typstfmt/default.nix @@ -1,14 +1,14 @@ { lib, rustPlatform, fetchFromGitHub }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "typstfmt"; - version = "unstable-2023-08-15"; + version = "0.2.1"; src = fetchFromGitHub { owner = "astrale-sharp"; repo = "typstfmt"; - rev = "0e5cf2769ef46ca8f6627c688cb8f848ee279a88"; - hash = "sha256-xdmEixbINjVjXlGwdBqDPcd4YHcT/WeswlRNEwpnfx4="; + rev = version; + hash = "sha256-cxiT8QVioZ7cGdkxsa8ampwNBWcdpAu4fO1ijfviHhI="; }; cargoLock = { @@ -21,6 +21,7 @@ rustPlatform.buildRustPackage { meta = with lib; { description = "A formatter for the Typst language"; homepage = "https://github.com/astrale-sharp/typstfmt"; + changelog = "https://github.com/astrale-sharp/typstfmt/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda geri1701 ]; }; diff --git a/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix b/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix index 69c48120b061..dd8adab9ee8a 100644 --- a/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/xmlroff/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { popt ]; - sourceRoot = "${src.name}/xmlroff/"; + sourceRoot = "${src.name}/xmlroff"; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix b/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix index 01b05b5481f5..64d5022c2de8 100644 --- a/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix @@ -23,16 +23,21 @@ let in with localPython.pkgs; buildPythonApplication rec { pname = "awsebcli"; - version = "3.20.7"; + version = "3.20.9"; format = "setuptools"; src = fetchFromGitHub { owner = "aws"; repo = "aws-elastic-beanstalk-cli"; rev = "refs/tags/${version}"; - hash = "sha256-DxjoEkFnY4aSfxVKPpnJLmnjLtZnlM74XXd0K8mcdoY="; + hash = "sha256-tnBDEeR+SCHb9UT3pTO7ISm4TVICvVfrV5cfz/60YQY="; }; + postPatch = '' + # https://github.com/aws/aws-elastic-beanstalk-cli/pull/469 + substituteInPlace setup.py --replace "scripts=['bin/eb']," "" + ''; + nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix index 32ca1ed00355..bb4374b1ec6b 100644 --- a/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "google-guest-oslogin"; - version = "20230808.00"; + version = "20230821.01"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "guest-oslogin"; rev = version; - sha256 = "sha256-6CHMnoPrfXFAgTyIoGPsMos9CaW6W0zcbpIG1j7DRqk="; + sha256 = "sha256-1/iXn4jN44eZCLRYCDSsEz7WDnTsAwxxB62jvIRjvoU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/virtualization/mkosi/default.nix b/nixpkgs/pkgs/tools/virtualization/mkosi/default.nix index 345e65d04881..8fc5376e4c2c 100644 --- a/nixpkgs/pkgs/tools/virtualization/mkosi/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/mkosi/default.nix @@ -1,6 +1,8 @@ { lib , fetchFromGitHub , setuptools +, setuptools-scm +, wheel , buildPythonApplication , pytestCheckHook , bubblewrap @@ -41,9 +43,10 @@ buildPythonApplication rec { nativeBuildInputs = [ setuptools + setuptools-scm + wheel ]; - propagatedBuildInputs = [ systemdForMkosi bubblewrap diff --git a/nixpkgs/pkgs/tools/virtualization/reg/default.nix b/nixpkgs/pkgs/tools/virtualization/reg/default.nix index eaa937f6f326..84aecc3ff671 100644 --- a/nixpkgs/pkgs/tools/virtualization/reg/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/reg/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { owner = "genuinetools"; repo = "reg"; rev = "v${version}"; - sha256 = "1jlza1czfssssi3y9zi6kr8k9msfa7vp215ibhwbz4h97av5xw5m"; + hash = "sha256-tfBetjoJkr84XLEEcfdRTtc0UZ4m/uRH1Fpr91lQn8o="; }; patches = [ @@ -29,7 +29,7 @@ buildGoModule rec { }) ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/wayland/shotman/default.nix b/nixpkgs/pkgs/tools/wayland/shotman/default.nix index 1835fc12c66f..08de35f14d3f 100644 --- a/nixpkgs/pkgs/tools/wayland/shotman/default.nix +++ b/nixpkgs/pkgs/tools/wayland/shotman/default.nix @@ -9,21 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "shotman"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = pname; rev = "v${version}"; - hash = "sha256-c2fgP6XB/fqKfsjqRRQpOFzHZyF/a9tLAKIGdKFAcSQ="; + hash = "sha256-SctWNhYCFTAOOnDEcsFZH61+QQAcmup11GVVXA1U5Dw="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "smithay-client-toolkit-0.16.0" = "sha256-n+s+qH39tna0yN44D6GGlQGZHjsr9FBpp+NZItyqwaE="; - }; - }; + cargoHash = "sha256-q5scdgfB5NgtjAgnIy/+c+y/mymF0b9ZZSz2LmM0pfw="; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -39,6 +34,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://git.sr.ht/~whynothugo/shotman"; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ zendo ]; + maintainers = with maintainers; [ zendo fpletz ]; }; } diff --git a/nixpkgs/pkgs/tools/wayland/stacktile/default.nix b/nixpkgs/pkgs/tools/wayland/stacktile/default.nix new file mode 100644 index 000000000000..073794e42b98 --- /dev/null +++ b/nixpkgs/pkgs/tools/wayland/stacktile/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromSourcehut +, wayland +, wayland-scanner +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "stacktile"; + version = "1.0.0"; + + src = fetchFromSourcehut { + owner = "~leon_plickat"; + repo = "stacktile"; + rev = "v${finalAttrs.version}"; + hash = "sha256-IOFxgYMjh92jx2CPfBRZDL/1ucgfHtUyAL5rS2EG+Gc="; + }; + + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ + wayland-scanner + ]; + + buildInputs = [ + wayland + ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "MANDIR=${placeholder "man"}/share/man" + ]; + + strictDeps = true; + + meta = { + homepage = "https://sr.ht/~leon_plickat/stacktile/"; + description = "Layout generator for the river Wayland compositor"; + license = with lib.licenses; [ gpl3Plus ]; + mainProgram = "stacktile"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/nixpkgs/pkgs/tools/wayland/wl-clipboard/default.nix b/nixpkgs/pkgs/tools/wayland/wl-clipboard/default.nix index 141e2e11d025..8d812ac1685b 100644 --- a/nixpkgs/pkgs/tools/wayland/wl-clipboard/default.nix +++ b/nixpkgs/pkgs/tools/wayland/wl-clipboard/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "wl-clipboard"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "bugaevc"; repo = "wl-clipboard"; rev = "v${version}"; - hash = "sha256-L4k2jOZ2YtkFpDs2+LAUElYl5aNSC42QxkbMNJ2ZhWQ="; + hash = "sha256-BYRXqVpGt9FrEBYQpi2kHPSZyeMk9o1SXkxjjcduhiY="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/tools/wayland/wl-screenrec/default.nix b/nixpkgs/pkgs/tools/wayland/wl-screenrec/default.nix index 8f09b806f6af..c7f42cba6430 100644 --- a/nixpkgs/pkgs/tools/wayland/wl-screenrec/default.nix +++ b/nixpkgs/pkgs/tools/wayland/wl-screenrec/default.nix @@ -34,6 +34,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/russelltg/wl-screenrec"; license = licenses.asl20; platforms = platforms.linux; + mainProgram = "wl-screenrec"; maintainers = with maintainers; [ colemickens ]; }; } diff --git a/nixpkgs/pkgs/tools/wayland/wlr-which-key/default.nix b/nixpkgs/pkgs/tools/wayland/wlr-which-key/default.nix index 470242871c78..d333f1525402 100644 --- a/nixpkgs/pkgs/tools/wayland/wlr-which-key/default.nix +++ b/nixpkgs/pkgs/tools/wayland/wlr-which-key/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "wlr-which-key"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "wlr-which-key"; rev = "v${version}"; - hash = "sha256-GLTbUa5EfpJV7OACTlewAgGjd5Ub0fYHoW8f+EVrT14="; + hash = "sha256-FVpPS5EQ6+xZIBtdS18SdVx0TK9/ikryU9mtm5JvDgk="; }; - cargoHash = "sha256-TtA4Ley5bwymF8Yiqso5fGAwGsT0GRlfAlGS5j4s0Qw="; + cargoHash = "sha256-JELvmG2CiknBP3QbaXSl1uj6wEgLaDFVFBuS1l5SUk4="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix index 4038c003f20b..baac0085f68d 100644 --- a/nixpkgs/pkgs/top-level/aliases.nix +++ b/nixpkgs/pkgs/top-level/aliases.nix @@ -81,6 +81,7 @@ mapAliases ({ amuleGui = throw "amuleGui was renamed to amule-gui"; # Added 2022-02-11 amsn = throw "amsn has been removed due to being unmaintained"; # Added 2020-12-09 angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06 + angryipscanner = ipscan; # Added 2023-08-30 ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 ansible_2_11 = throw "Ansible 2.11 goes end of life in 2022/11 and can't be supported throughout the 22.05 release cycle"; # Added 2022-03-30 ansible_2_10 = throw "Ansible 2.10 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30 @@ -96,6 +97,7 @@ mapAliases ({ arduino_core = throw "'arduino_core' has been renamed to/replaced by 'arduino-core'"; # Converted to throw 2022-02-22 arora = throw "arora has been removed"; # Added 2020-09-09 asciidocFull = throw "'asciidocFull' has been renamed to/replaced by 'asciidoc-full'"; # Converted to throw 2022-02-22 + aseprite-unfree = aseprite; # Added 2023-08-26 asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16 asterisk_13 = throw "asterisk_13: Asterisk 13 is end of life and has been removed"; # Added 2022-04-06 asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed"; # Added 2020-10-07 @@ -532,6 +534,7 @@ mapAliases ({ flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions"; # Added 2020-01-15 flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions"; # Added 2020-01-15 flutter2 = throw "flutter2 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 + flutter37 = throw "flutter37 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 flvtool2 = throw "flvtool2 has been removed"; # Added 2020-11-03 fme = throw "fme was removed, because it is old and uses Glade, a discontinued library"; # Added 2022-01-26 foldingathome = fahclient; # Added 2020-09-03 @@ -855,6 +858,7 @@ mapAliases ({ kubei = kubeclarity; # Added 2023-05-20 kubeless = throw "kubeless is deprecated and archived by upstream"; # Added 2022-04-05 kubicorn = throw "kubicorn has been dropped due to the lack of maintenance from upstream since 2019"; # Added 2022-05-30 + kuma-prometheus-sd = throw "kuma-prometheus-sd has been deprecated upstream"; # Added 2023-07-02 kvm = throw "'kvm' has been renamed to/replaced by 'qemu_kvm'"; # Converted to throw 2022-02-22 ### L ### @@ -971,6 +975,7 @@ mapAliases ({ linuxPackages_6_2 = linuxKernel.packages.linux_6_2; linuxPackages_6_3 = linuxKernel.packages.linux_6_3; linuxPackages_6_4 = linuxKernel.packages.linux_6_4; + linuxPackages_6_5 = linuxKernel.packages.linux_6_5; linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; @@ -995,6 +1000,7 @@ mapAliases ({ linux_6_2 = linuxKernel.kernels.linux_6_2; linux_6_3 = linuxKernel.kernels.linux_6_3; linux_6_4 = linuxKernel.kernels.linux_6_4; + linux_6_5 = linuxKernel.kernels.linux_6_5; linuxPackages_mptcp = throw "'linuxPackages_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 linux_mptcp_95 = throw "'linux_mptcp_95' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 @@ -2020,20 +2026,20 @@ mapAliases ({ https://github.com/NixOS/nixpkgs/pull/101369 */ inherit (plasma5Packages) - akonadi akregator ark bluedevil bomber bovo breeze-grub breeze-gtk + akonadi akregator arianna ark bluedevil bomber bovo breeze-grub breeze-gtk breeze-icons breeze-plymouth breeze-qt5 colord-kde discover dolphin dragon elisa falkon ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook - kalendar kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce + kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config kdenlive kdeplasma-addons kdevelop-pg-qt kdevelop-unwrapped kdev-php - kdev-python kdevelop kdf kdialog kdiamond keditbookmarks kfind kfloppy + kdev-python kdevelop kdf kdialog kdiamond keditbookmarks kfind kgamma5 kget kgpg khelpcenter kig kigo killbots kinfocenter kitinerary kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact konversation korganizer kpkpass krdc kreversi krfb kscreen kscreenlocker kshisen ksquares ksshaskpass ksystemlog kteatime ktimer ktorrent ktouch kturtle kwallet-pam kwalletmanager kwave kwayland-integration kwin kwrited - marble milou minuet okular oxygen oxygen-icons5 picmi + marble merkuro milou minuet okular oxygen oxygen-icons5 picmi plasma-browser-integration plasma-desktop plasma-integration plasma-nano plasma-nm plasma-pa plasma-mobile plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent @@ -2041,6 +2047,9 @@ mapAliases ({ systemsettings xdg-desktop-portal-kde yakuake zanshin ; + kalendar = merkuro; # Renamed in 23.08 + kfloppy = throw "kfloppy has been removed upstream in KDE Gear 23.08"; + inherit (plasma5Packages.thirdParty) krohnkite krunner-ssh diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index cd7d758815e8..3c6091cc9665 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -336,7 +336,9 @@ with pkgs; banana-accounting = callPackage ../applications/office/banana-accounting { }; - beebeep = libsForQt5.callPackage ../applications/office/beebeep {}; + beebeep = libsForQt5.callPackage ../applications/office/beebeep { }; + + beeper = qt5.callPackage ../applications/networking/instant-messengers/beeper { }; bakelite = callPackage ../tools/backup/bakelite { }; @@ -348,6 +350,8 @@ with pkgs; bibtex-tidy = callPackage ../tools/typesetting/bibtex-tidy { }; + bililiverecorder = callPackage ../servers/bililiverecorder { }; + binbloom = callPackage ../tools/security/binbloom { }; bingo = callPackage ../development/tools/bingo { }; @@ -378,6 +382,8 @@ with pkgs; circumflex = callPackage ../applications/networking/circumflex { }; + citron = callPackage ../tools/misc/citron { }; + cxx-rs = callPackage ../development/libraries/cxx-rs { }; elfcat = callPackage ../tools/misc/elfcat { }; @@ -674,14 +680,20 @@ with pkgs; glade = callPackage ../development/tools/glade { }; + gobble = callPackage ../tools/X11/gobble { }; + goda = callPackage ../development/tools/goda { }; + gokrazy = callPackage ../development/misc/gokrazy { }; + gojq = callPackage ../development/tools/gojq { }; govulncheck = callPackage ../tools/security/govulncheck { }; gpick = callPackage ../tools/misc/gpick { }; + gradescope-submit = callPackage ../tools/misc/gradescope-submit { }; + gridlock = callPackage ../tools/nix/gridlock { }; inherit (gridlock) nyarr; @@ -1167,6 +1179,11 @@ with pkgs; tests = pkgs.tests.fetchzip; }; + fetchDebianPatch = callPackage ../build-support/fetchdebianpatch { } + // { + tests = pkgs.tests.fetchDebianPatch; + }; + fetchCrate = callPackage ../build-support/rust/fetchcrate.nix { }; fetchFromGitea = callPackage ../build-support/fetchgitea { }; @@ -1302,6 +1319,8 @@ with pkgs; singularity-tools = callPackage ../build-support/singularity-tools { }; + stacktile = callPackage ../tools/wayland/stacktile { }; + sirula = callPackage ../tools/wayland/sirula { }; sitelen-seli-kiwen = callPackage ../data/fonts/sitelen-seli-kiwen { }; @@ -1648,6 +1667,8 @@ with pkgs; amidst = callPackage ../tools/games/minecraft/amidst { }; + asar = callPackage ../tools/compression/asar { }; + askalono = callPackage ../tools/misc/askalono { }; asleap = callPackage ../tools/networking/asleap { }; @@ -1882,8 +1903,14 @@ with pkgs; systemd = pkgs.systemd; }; + node-glob = callPackage ../tools/misc/node-glob { }; + nominatim = callPackage ../servers/nominatim { }; + npm-check-updates = callPackage ../tools/package-management/npm-check-updates { }; + + ntpd-rs = callPackage ../tools/networking/ntpd-rs { }; + ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { }; @@ -3330,6 +3357,8 @@ with pkgs; azure-storage-azcopy = callPackage ../development/tools/azcopy { }; + bark = callPackage ../tools/audio/bark { }; + bashblog = callPackage ../tools/text/bashblog { }; berglas = callPackage ../tools/admin/berglas { }; @@ -3853,6 +3882,8 @@ with pkgs; hakrawler = callPackage ../tools/security/hakrawler { }; + harsh = callPackage ../applications/misc/harsh { }; + harvid = callPackage ../tools/video/harvid { }; headset = callPackage ../applications/audio/headset { }; @@ -4138,6 +4169,8 @@ with pkgs; atftp = callPackage ../tools/networking/atftp { }; + atlas = callPackage ../development/tools/database/atlas { }; + authoscope = callPackage ../tools/security/authoscope { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -4241,11 +4274,13 @@ with pkgs; bchunk = callPackage ../tools/cd-dvd/bchunk { }; inherit (callPackages ../misc/logging/beats/7.x.nix { }) + auditbeat7 filebeat7 heartbeat7 metricbeat7 packetbeat7; + auditbeat = auditbeat7; filebeat = filebeat7; heartbeat = heartbeat7; metricbeat = metricbeat7; @@ -4771,7 +4806,9 @@ with pkgs; wlsunset = callPackage ../tools/wayland/wlsunset { }; - wl-gammactl = callPackage ../tools/wayland/wl-gammactl { }; + wl-gammactl = callPackage ../tools/wayland/wl-gammactl { + wlroots = wlroots_0_15; + }; wluma = callPackage ../tools/wayland/wluma { }; @@ -5391,7 +5428,9 @@ with pkgs; flashfocus = callPackage ../misc/flashfocus { }; - qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { }; + qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { + wlroots = wlroots_0_15; + }; fwup = callPackage ../tools/misc/fwup { inherit (darwin.apple_sdk.frameworks) DiskArbitration; @@ -5625,9 +5664,13 @@ with pkgs; hyprland-share-picker = libsForQt5.callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix { }; + hyprnome = callPackage ../applications/misc/hyprnome { }; + hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; - hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { }; + hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { + wlroots = wlroots_0_15; + }; hysteria = callPackage ../tools/networking/hysteria { }; @@ -5675,8 +5718,6 @@ with pkgs; jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player { inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; - # Disable pipewire to avoid segfault, see https://github.com/jellyfin/jellyfin-media-player/issues/341 - mpv = wrapMpv (mpv-unwrapped.override { pipewireSupport = false; }) { }; }; jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; @@ -6064,7 +6105,9 @@ with pkgs; onboard = callPackage ../applications/misc/onboard { }; - oneshot = callPackage ../tools/networking/oneshot { }; + oneshot = callPackage ../tools/networking/oneshot { + buildGoModule = buildGo121Module; + }; orjail = callPackage ../tools/security/orjail { }; @@ -6091,6 +6134,7 @@ with pkgs; }; odoo = callPackage ../applications/finance/odoo { }; + odoo15 = callPackage ../applications/finance/odoo/odoo15.nix { }; odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter { }; @@ -6454,6 +6498,8 @@ with pkgs; util-linux = util-linuxMinimal; }; + sqldef = callPackage ../development/tools/sqldef { }; + sqlint = callPackage ../development/tools/sqlint { }; squawk = callPackage ../development/tools/squawk { }; @@ -6999,6 +7045,8 @@ with pkgs; biodiff = callPackage ../development/tools/biodiff { }; + biome = callPackage ../development/tools/biome { }; + biosdevname = callPackage ../tools/networking/biosdevname { }; bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { }; @@ -7205,7 +7253,6 @@ with pkgs; idnSupport = true; zstdSupport = true; } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) { - gssSupport = true; brotliSupport = true; }); @@ -7374,6 +7421,10 @@ with pkgs; diction = callPackage ../tools/text/diction { }; + diffoci = callPackage ../tools/misc/diffoci { + buildGoModule = buildGo121Module; + }; + diffoscope = callPackage ../tools/misc/diffoscope { jdk = jdk8; }; @@ -8351,7 +8402,7 @@ with pkgs; }) garage garage_0_7 garage_0_8 - garage_0_7_3 garage_0_8_2; + garage_0_7_3 garage_0_8_3; garmin-plugin = callPackage ../applications/misc/garmin-plugin { }; @@ -9588,6 +9639,14 @@ with pkgs; jupyter = callPackage ../applications/editors/jupyter { }; + jupyter-all = jupyter.override { + definitions = { + clojure = clojupyter.definition; + octave = octave-kernel.definition; + # wolfram = wolfram-for-jupyter-kernel.definition; # unfree + }; + }; + jupyter-kernel = callPackage ../applications/editors/jupyter/kernel.nix { }; justify = callPackage ../tools/text/justify { }; @@ -9775,6 +9834,7 @@ with pkgs; ligo = callPackage ../development/compilers/ligo { coq = coq_8_14; + ocamlPackages = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; }; lego = callPackage ../tools/admin/lego { }; @@ -9938,6 +9998,8 @@ with pkgs; matrix-hookshot = callPackage ../servers/matrix-synapse/matrix-hookshot { }; + mautrix-discord = callPackage ../servers/mautrix-discord { }; + mautrix-facebook = callPackage ../servers/mautrix-facebook { }; mautrix-googlechat = callPackage ../servers/mautrix-googlechat { }; @@ -11790,9 +11852,7 @@ with pkgs; patchage = callPackage ../applications/audio/patchage { }; - patchance = python3Packages.callPackage ../applications/audio/patchance { - inherit (qt5) qttools; - }; + patchance = python3Packages.callPackage ../applications/audio/patchance { }; patatt = callPackage ../development/tools/patatt { }; @@ -11893,7 +11953,9 @@ with pkgs; pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { }; - phoc = callPackage ../applications/misc/phoc { }; + phoc = callPackage ../applications/misc/phoc { + wlroots = wlroots_0_15; + }; phockup = callPackage ../applications/misc/phockup { }; @@ -12096,9 +12158,7 @@ with pkgs; porsmo = callPackage ../applications/misc/porsmo { }; - pantum-driver = callPackage ../misc/drivers/pantum-driver { - libjpeg8 = libjpeg.override { enableJpeg8 = true; }; - }; + pantum-driver = callPackage ../misc/drivers/pantum-driver { }; posteid-seed-extractor = callPackage ../tools/security/posteid-seed-extractor { }; @@ -12189,6 +12249,8 @@ with pkgs; ps3-disc-dumper = callPackage ../tools/games/ps3-disc-dumper { }; + ps3iso-utils = callPackage ../tools/games/ps3iso-utils { }; + ps3netsrv = callPackage ../servers/ps3netsrv { }; pscircle = callPackage ../os-specific/linux/pscircle { }; @@ -12267,9 +12329,7 @@ with pkgs; pystring = callPackage ../development/libraries/pystring { }; - raysession = python3Packages.callPackage ../applications/audio/raysession { - inherit (qt5) qttools; - }; + raysession = python3Packages.callPackage ../applications/audio/raysession {}; revolt-desktop = callPackage ../applications/networking/instant-messengers/revolt-desktop { }; @@ -12317,6 +12377,7 @@ with pkgs; outils = callPackage ../tools/misc/outils { }; mpi = openmpi; # this attribute should used to build MPI applications + mpiCheckPhaseHook = callPackage ../build-support/setup-hooks/mpi-check-hook { }; ucc = callPackage ../development/libraries/ucc { }; @@ -13102,7 +13163,7 @@ with pkgs; sixpair = callPackage ../tools/misc/sixpair { }; sketchybar = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/sketchybar { - inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa CoreWLAN DisplayServices MediaRemote SkyLight; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreWLAN CoreVideo DisplayServices IOKit MediaRemote SkyLight; }; sketchybar-app-font = callPackage ../data/fonts/sketchybar-app-font { }; @@ -13206,7 +13267,9 @@ with pkgs; }; soapui = callPackage ../applications/networking/soapui { - jdk = jdk11; + jdk = if stdenv.isDarwin + then (jdk11.override { enableJavaFX = true; }) + else jdk11; }; sockdump = callPackage ../tools/networking/sockdump { }; @@ -13640,6 +13703,8 @@ with pkgs; teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; + teehee = callPackage ../applications/editors/teehee { }; + teip = callPackage ../tools/text/teip { }; telegraf = callPackage ../servers/monitoring/telegraf { }; @@ -14758,7 +14823,7 @@ with pkgs; volumeicon = callPackage ../tools/audio/volumeicon { }; waf = callPackage ../development/tools/build-managers/waf { }; - wafHook = callPackage ../development/tools/build-managers/wafHook { }; + wafHook = callPackage ../development/tools/build-managers/waf/hook.nix { }; waf-tester = callPackage ../tools/security/waf-tester { }; @@ -14834,7 +14899,6 @@ with pkgs; wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { }; wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin { - libjpeg8 = libjpeg.override { enableJpeg8 = true; }; openssl = openssl_1_1; }; @@ -15037,6 +15101,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + yx = callPackage ../tools/text/yx { }; + zarchive = callPackage ../tools/archivers/zarchive { }; zprint = callPackage ../development/tools/zprint { }; @@ -15462,8 +15528,8 @@ with pkgs; colmap = libsForQt5.callPackage ../applications/science/misc/colmap { inherit (config) cudaSupport; }; colmapWithCuda = colmap.override { cudaSupport = true; }; - chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; - chickenPackages_5 = callPackage ../development/compilers/chicken/5 { }; + chickenPackages_4 = recurseIntoAttrs (callPackage ../development/compilers/chicken/4 { }); + chickenPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/chicken/5 { }); chickenPackages = dontRecurseIntoAttrs chickenPackages_5; inherit (chickenPackages_5) @@ -15687,9 +15753,7 @@ with pkgs; flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); flutter-unwrapped = flutterPackages.stable; - flutter37-unwrapped = flutterPackages.v37; flutter = flutterPackages.wrapFlutter flutter-unwrapped; - flutter37 = flutterPackages.wrapFlutter flutter37-unwrapped; fnm = callPackage ../development/tools/fnm { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security; @@ -17221,6 +17285,7 @@ with pkgs; }; cargo-readme = callPackage ../development/tools/rust/cargo-readme { }; cargo-risczero = callPackage ../development/tools/rust/cargo-risczero { }; + cargo-run-bin = callPackage ../development/tools/rust/cargo-run-bin {}; cargo-semver-checks = callPackage ../development/tools/rust/cargo-semver-checks { }; cargo-show-asm = callPackage ../development/tools/rust/cargo-show-asm { }; @@ -17402,7 +17467,9 @@ with pkgs; stalin = callPackage ../development/compilers/stalin { }; - stanc = callPackage ../development/compilers/stanc { }; + stanc = callPackage ../development/compilers/stanc { + ocamlPackages = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; + }; metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { }; @@ -17724,6 +17791,8 @@ with pkgs; expr = callPackage ../development/interpreters/expr { }; + genemichaels = callPackage ../development/tools/rust/genemichaels { }; + gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage { inherit (llvmPackages) openmp; inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -19139,7 +19208,15 @@ with pkgs; doclifter = callPackage ../development/tools/misc/doclifter { }; - docutils = with python3Packages; toPythonApplication docutils; + docutils = with python3Packages; toPythonApplication ( + docutils.overridePythonAttrs (attrs: rec { + version = "0.20.1"; + src = attrs.src.override { + inherit version; + hash = "sha256-8IpOJ2w6FYOobc4+NKuj/gTQK7ot1R7RYQYkToqSPjs="; + }; + }) + ); doctl = callPackage ../development/tools/doctl { }; @@ -19299,6 +19376,8 @@ with pkgs; funzzy = callPackage ../development/tools/misc/funzzy { }; + futuresql = libsForQt5.callPackage ../development/libraries/futuresql { }; + fzf-make = callPackage ../development/tools/misc/fzf-make { }; gede = libsForQt5.callPackage ../development/tools/misc/gede { }; @@ -19455,6 +19534,8 @@ with pkgs; confluent-cli = callPackage ../development/tools/confluent-cli { }; + html-minifier = callPackage ../development/tools/html-minifier { }; + htmlhint = callPackage ../development/tools/htmlhint { }; htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { }; @@ -20666,6 +20747,8 @@ with pkgs; ayatana-webmail = callPackage ../applications/networking/mailreaders/ayatana-webmail { }; + azmq = callPackage ../development/libraries/azmq { }; + babl = callPackage ../development/libraries/babl { }; backward-cpp = callPackage ../development/libraries/backward-cpp { }; @@ -22244,7 +22327,7 @@ with pkgs; ispc = callPackage ../development/compilers/ispc { xcode = darwin.xcode_14; - llvmPackages = llvmPackages_14; + llvmPackages = llvmPackages_15; }; isso = callPackage ../servers/isso { @@ -22319,6 +22402,8 @@ with pkgs; judy = callPackage ../development/libraries/judy { }; + kcp = callPackage ../development/libraries/kcp { }; + kddockwidgets = libsForQt5.callPackage ../development/libraries/kddockwidgets { }; keybinder = callPackage ../development/libraries/keybinder { @@ -23216,6 +23301,7 @@ with pkgs; # also known as libturbojpeg libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; libjpeg = libjpeg_turbo; + libjpeg8 = libjpeg_turbo.override { enableJpeg8 = true; }; libjreen = callPackage ../development/libraries/libjreen { }; @@ -24262,8 +24348,30 @@ with pkgs; nvitop = callPackage ../tools/system/nvitop { }; nvtop = callPackage ../tools/system/nvtop { }; - nvtop-nvidia = callPackage ../tools/system/nvtop { amd = false; }; - nvtop-amd = callPackage ../tools/system/nvtop { nvidia = false; }; + nvtop-amd = (callPackage ../tools/system/nvtop { + amd = true; + intel = false; + msm = false; + nvidia = false; + }).overrideAttrs { pname = "nvtop-amd"; }; + nvtop-intel = (callPackage ../tools/system/nvtop { + amd = false; + intel = true; + msm = false; + nvidia = false; + }).overrideAttrs { pname = "nvtop-intel"; }; + nvtop-msm = (callPackage ../tools/system/nvtop { + amd = false; + intel = false; + msm = true; + nvidia = false; + }).overrideAttrs { pname = "nvtop-msm"; }; + nvtop-nvidia = (callPackage ../tools/system/nvtop { + amd = false; + intel = false; + msm = false; + nvidia = true; + }).overrideAttrs { pname = "nvtop-nvidia"; }; ocl-icd = callPackage ../development/libraries/ocl-icd { }; @@ -24876,6 +24984,8 @@ with pkgs; rshell = python3.pkgs.callPackage ../development/embedded/rshell { }; + rtlcss = callPackage ../development/libraries/rtlcss { }; + rttr = callPackage ../development/libraries/rttr { }; rubberband = callPackage ../development/libraries/rubberband { }; @@ -25566,6 +25676,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; + vulkan-utility-libraries = callPackage ../development/libraries/vulkan-utility-libraries { }; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; vxl = callPackage ../development/libraries/vxl { }; @@ -25623,6 +25734,8 @@ with pkgs; whereami = callPackage ../development/libraries/whereami { }; + where-is-my-sddm-theme = libsForQt5.callPackage ../data/themes/where-is-my-sddm-theme { }; + wildmidi = callPackage ../development/libraries/wildmidi { inherit (darwin.apple_sdk.frameworks) OpenAL; }; @@ -26096,17 +26209,17 @@ with pkgs; pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {}; faslExt = "fasl"; }; - sbcl_2_3_6 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.6"; }; + sbcl_2_3_7 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.7"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_3_7 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.7"; }; + sbcl_2_3_8 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.8"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_3_7; + sbcl = sbcl_2_3_8; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -26311,7 +26424,11 @@ with pkgs; bind = callPackage ../servers/dns/bind { }; dnsutils = bind.dnsutils; - dig = bind.dnsutils; + dig = bind.dnsutils // { + meta = bind.dnsutils.meta // { + mainProgram = "dig"; + }; + }; bird = callPackage ../servers/bird { }; @@ -26543,7 +26660,7 @@ with pkgs; hiraeth = callPackage ../servers/hiraeth { }; - hoard = callPackage ../tools/misc/hoard { inherit (darwin) Security; }; + hoard = callPackage ../tools/misc/hoard { }; home-assistant = callPackage ../servers/home-assistant { }; @@ -26955,12 +27072,14 @@ with pkgs; rpcsvc-proto = callPackage ../tools/misc/rpcsvc-proto { }; - libmysqlclient = libmysqlclient_3_2; + libmysqlclient = libmysqlclient_3_3; libmysqlclient_3_1 = mariadb-connector-c_3_1; libmysqlclient_3_2 = mariadb-connector-c_3_2; - mariadb-connector-c = mariadb-connector-c_3_2; + libmysqlclient_3_3 = mariadb-connector-c_3_3; + mariadb-connector-c = mariadb-connector-c_3_3; mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; mariadb-connector-c_3_2 = callPackage ../servers/sql/mariadb/connector-c/3_2.nix { }; + mariadb-connector-c_3_3 = callPackage ../servers/sql/mariadb/connector-c/3_3.nix { }; mariadb-galera = callPackage ../servers/sql/mariadb/galera { }; @@ -27235,9 +27354,7 @@ with pkgs; prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { }; prometheus-systemd-exporter = callPackage ../servers/monitoring/prometheus/systemd-exporter.nix { }; prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; - prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { }; prometheus-v2ray-exporter = callPackage ../servers/monitoring/prometheus/v2ray-exporter.nix { }; prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { @@ -27488,6 +27605,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa WebKit; }; + unstructured-api = callPackage ../servers/unstructured-api { }; + urserver = callPackage ../servers/urserver { }; uxplay = callPackage ../servers/uxplay { }; @@ -28431,6 +28550,8 @@ with pkgs; gci = callPackage ../development/tools/gci { }; + gcov2lcov = callPackage ../development/tools/gcov2lcov { }; + ginkgo = callPackage ../development/tools/ginkgo { }; gdlv = darwin.apple_sdk_11_0.callPackage ../development/tools/gdlv { @@ -30240,6 +30361,8 @@ with pkgs; whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { }; + whitesur-kde = callPackage ../data/themes/whitesur-kde { }; + wireless-regdb = callPackage ../data/misc/wireless-regdb { }; work-sans = callPackage ../data/fonts/work-sans { }; @@ -30487,8 +30610,6 @@ with pkgs; argo-rollouts = callPackage ../applications/networking/cluster/argo-rollouts { }; - arianna = libsForQt5.callPackage ../applications/misc/arianna { }; - ario = callPackage ../applications/audio/ario { }; arion = callPackage ../applications/virtualization/arion { }; @@ -30518,7 +30639,6 @@ with pkgs; asap = callPackage ../tools/audio/asap { }; aseprite = callPackage ../applications/editors/aseprite { }; - aseprite-unfree = aseprite.override { unfree = true; }; assign-lb-ip = callPackage ../applications/networking/cluster/assign-lb-ip { }; @@ -30720,10 +30840,10 @@ with pkgs; }; bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { }; bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix { - libjpeg = libjpeg.override { enableJpeg8 = true; }; + libjpeg = libjpeg8; }; bitwig-studio5 = callPackage ../applications/audio/bitwig-studio/bitwig-studio5.nix { - libjpeg = libjpeg.override { enableJpeg8 = true; }; + libjpeg = libjpeg8; }; bitwig-studio = bitwig-studio5; @@ -31302,7 +31422,9 @@ with pkgs; dyff = callPackage ../development/tools/dyff { }; - dwl = callPackage ../applications/window-managers/dwl { }; + dwl = callPackage ../applications/window-managers/dwl { + wlroots = wlroots_0_16; + }; dwm = callPackage ../applications/window-managers/dwm { # dwm is configured entirely through source modification. Allow users to @@ -31377,7 +31499,7 @@ with pkgs; em = callPackage ../applications/editors/em { }; - inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { })) + inherit (recurseIntoAttrs (darwin.apple_sdk_11_0.callPackage ../applications/editors/emacs { })) emacs28 emacs28-gtk2 emacs28-gtk3 @@ -31689,6 +31811,8 @@ with pkgs; geoipupdate = callPackage ../applications/misc/geoipupdate { }; + glicol-cli = callPackage ../applications/audio/glicol-cli { }; + globe-cli = callPackage ../applications/misc/globe-cli { }; gnmic = callPackage ../applications/networking/gnmic { }; @@ -32725,7 +32849,9 @@ with pkgs; rootbar = callPackage ../applications/misc/rootbar { }; - waybar = callPackage ../applications/misc/waybar { }; + waybar = callPackage ../applications/misc/waybar { + wlroots = wlroots_0_15; + }; waycorner = callPackage ../applications/misc/waycorner { }; @@ -32737,7 +32863,9 @@ with pkgs; wbg = callPackage ../applications/misc/wbg { }; - hikari = callPackage ../applications/window-managers/hikari { }; + hikari = callPackage ../applications/window-managers/hikari { + wlroots = wlroots_0_15; + }; i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; @@ -32803,7 +32931,9 @@ with pkgs; kitti3 = python3.pkgs.callPackage ../applications/window-managers/i3/kitti3.nix { }; - waybox = callPackage ../applications/window-managers/waybox { }; + waybox = callPackage ../applications/window-managers/waybox { + wlroots = wlroots_0_15; + }; workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; @@ -32925,6 +33055,8 @@ with pkgs; inherit (nodePackages) imapnotify; + imdshift = callPackage ../tools/security/imdshift { }; + img2pdf = with python3Packages; toPythonApplication img2pdf; imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber { }; @@ -33307,10 +33439,6 @@ with pkgs; components = ["kuma-dp"]; pname = "kuma-dp"; }; - kuma-prometheus-sd = callPackage ../applications/networking/cluster/kuma { - components = ["kuma-prometheus-sd"]; - pname = "kuma-prometheus-sd"; - }; kile-wl = callPackage ../applications/misc/kile-wl { }; @@ -33352,7 +33480,9 @@ with pkgs; lame = callPackage ../development/libraries/lame { }; - labwc = callPackage ../applications/window-managers/labwc { }; + labwc = callPackage ../applications/window-managers/labwc { + wlroots = wlroots_0_16; + }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -34014,7 +34144,9 @@ with pkgs; wrapMpv = callPackage ../applications/video/mpv/wrapper.nix { }; mpv = wrapMpv mpv-unwrapped { }; - mpvpaper = callPackage ../tools/wayland/mpvpaper { }; + mpvpaper = callPackage ../tools/wayland/mpvpaper { + wlroots = wlroots_0_15; + }; mpvScripts = import ../applications/video/mpv/scripts { inherit lib callPackage config; }; @@ -34077,6 +34209,8 @@ with pkgs; neomutt = callPackage ../applications/networking/mailreaders/neomutt { }; + neosay = callPackage ../applications/networking/instant-messengers/neosay { }; + natron = libsForQt5.callPackage ../applications/video/natron { }; natural-docs = callPackage ../applications/misc/natural-docs { }; @@ -34254,6 +34388,8 @@ with pkgs; qemacs = callPackage ../applications/editors/qemacs { }; + ragnarwm = callPackage ../applications/window-managers/ragnarwm {}; + rime-cli = callPackage ../applications/office/rime-cli { }; roxctl = callPackage ../applications/networking/cluster/roxctl { @@ -34565,7 +34701,7 @@ with pkgs; orca-c = callPackage ../applications/audio/orca-c { }; - organicmaps = libsForQt5.callPackage ../applications/misc/organicmaps { }; + organicmaps = qt6Packages.callPackage ../applications/misc/organicmaps { }; osm2xmap = callPackage ../applications/misc/osm2xmap { }; @@ -35228,6 +35364,8 @@ with pkgs; runc = callPackage ../applications/virtualization/runc { }; + rust-traverse = callPackage ../applications/misc/rust-traverse { }; + rusty-psn = callPackage ../applications/misc/rusty-psn { }; rusty-psn-gui = rusty-psn.override { withGui = true; }; @@ -35332,13 +35470,15 @@ with pkgs; sish = callPackage ../tools/networking/sish { }; sky = libsForQt5.callPackage ../applications/networking/instant-messengers/sky { - libjpeg_turbo = libjpeg_turbo.override { enableJpeg8 = true; }; + libjpeg_turbo = libjpeg8; }; skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { }; + slingshot = callPackage ../tools/misc/slingshot { }; + slop = callPackage ../tools/misc/slop { }; slowhttptest = callPackage ../tools/security/slowhttptest { }; @@ -35797,6 +35937,8 @@ with pkgs; termdown = python3Packages.callPackage ../applications/misc/termdown { }; + termimage = callPackage ../tools/graphics/termimage { }; + terminal-notifier = callPackage ../applications/misc/terminal-notifier { }; textpieces = callPackage ../tools/text/textpieces { }; @@ -39278,7 +39420,7 @@ with pkgs; inherit (callPackage ../development/libraries/science/math/magma { inherit (llvmPackages_rocm) openmp; - }) magma magma_2_7_1 magma_2_6_2; + }) magma magma_2_7_2 magma_2_6_2; magma-cuda = magma.override { cudaSupport = true; @@ -39323,6 +39465,7 @@ with pkgs; or-tools = callPackage ../development/libraries/science/math/or-tools { python = python3; + protobuf = protobuf3_21; # or-tools builds with -std=c++20, so abseil-cpp must # also be built that way abseil-cpp = abseil-cpp_202206.override { @@ -39994,7 +40137,15 @@ with pkgs; gravit = callPackage ../applications/science/astronomy/gravit { }; golly = callPackage ../applications/science/misc/golly { - wxGTK = wxGTK32; + wxGTK = wxGTK32.overrideAttrs (x: { + configureFlags = x.configureFlags ++ [ + "--enable-webrequest" + ]; + buildInputs = x.buildInputs ++ [ + curl + ]; + }); + perl = perl536; }; megam = callPackage ../applications/science/misc/megam { }; @@ -41284,7 +41435,9 @@ with pkgs; usb-reset = callPackage ../applications/misc/usb-reset { }; - usql = callPackage ../applications/misc/usql { }; + usql = callPackage ../applications/misc/usql { + buildGoModule = buildGo121Module; + }; utf8cpp = callPackage ../development/libraries/utf8cpp { }; @@ -42110,4 +42263,6 @@ with pkgs; wpm = callPackage ../applications/misc/wpm { }; yazi = callPackage ../applications/file-managers/yazi { inherit (darwin.apple_sdk.frameworks) Foundation; }; + + ssl-proxy = callPackage ../tools/networking/ssl-proxy { }; } diff --git a/nixpkgs/pkgs/top-level/emacs-packages.nix b/nixpkgs/pkgs/top-level/emacs-packages.nix index 3f61bc2229d0..2b06fd2e2425 100644 --- a/nixpkgs/pkgs/top-level/emacs-packages.nix +++ b/nixpkgs/pkgs/top-level/emacs-packages.nix @@ -5,20 +5,13 @@ # Recommended: simply use `emacsWithPackages` with the packages you want. # # Alternative: use `emacs`, install everything to a system or user profile -# and then add this at the start your `init.el`: +# and then add this at the start your `early-init.el`: /* - (require 'package) - - ;; optional. makes unpure packages archives unavailable - (setq package-archives nil) - ;; optional. use this if you install emacs packages to the system profile (add-to-list 'package-directory-list "/run/current-system/sw/share/emacs/site-lisp/elpa") ;; optional. use this if you install emacs packages to user profiles (with nix-env) (add-to-list 'package-directory-list "~/.nix-profile/share/emacs/site-lisp/elpa") - - (package-initialize) */ { pkgs' diff --git a/nixpkgs/pkgs/top-level/linux-kernels.nix b/nixpkgs/pkgs/top-level/linux-kernels.nix index bf2114130e74..6a276557d027 100644 --- a/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -182,6 +182,13 @@ in { ]; }; + linux_6_5 = callPackage ../os-specific/linux/kernel/linux-6.5.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ @@ -575,6 +582,7 @@ in { linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_4 = recurseIntoAttrs (packagesFor kernels.linux_6_4); + linux_6_5 = recurseIntoAttrs (packagesFor kernels.linux_6_5); } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 @@ -636,7 +644,7 @@ in { packageAliases = { linux_default = packages.linux_6_1; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_4; + linux_latest = packages.linux_6_5; linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_6_1; diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index b50358e4f2ec..64e3e12d7dba 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -60,9 +60,7 @@ let ### B ### - bap = callPackage ../development/ocaml-modules/bap { - inherit (pkgs.llvmPackages) llvm; - }; + bap = janeStreet_0_15.bap; base64 = callPackage ../development/ocaml-modules/base64 { }; @@ -86,7 +84,7 @@ let biniou = callPackage ../development/ocaml-modules/biniou { }; - biocaml = callPackage ../development/ocaml-modules/biocaml { }; + biocaml = janeStreet_0_15.biocaml; bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { }; @@ -347,6 +345,8 @@ let domain-name = callPackage ../development/ocaml-modules/domain-name { }; + domain_shims = callPackage ../development/ocaml-modules/domain_shims { }; + domainslib = callPackage ../development/ocaml-modules/domainslib { }; dose3 = callPackage ../development/ocaml-modules/dose3 { }; @@ -716,7 +716,9 @@ let # Jane Street janePackage = - if lib.versionOlder "4.10.2" ocaml.version + if lib.versionOlder "4.13.1" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/janePackage_0_16.nix {} + else if lib.versionOlder "4.10.2" ocaml.version then callPackage ../development/ocaml-modules/janestreet/janePackage_0_15.nix {} else if lib.versionOlder "4.08" ocaml.version then callPackage ../development/ocaml-modules/janestreet/janePackage_0_14.nix {} @@ -725,7 +727,12 @@ let else callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; janeStreet = - if lib.versionOlder "4.10.2" ocaml.version + if lib.versionOlder "4.13.1" ocaml.version + then import ../development/ocaml-modules/janestreet/0.16.nix { + inherit self; + inherit (pkgs) bash fetchpatch fzf lib openssl zstd krb5; + } + else if lib.versionOlder "4.10.2" ocaml.version then import ../development/ocaml-modules/janestreet/0.15.nix { inherit self; inherit (pkgs) bash fetchpatch fzf lib openssl zstd; @@ -749,6 +756,75 @@ let inherit (pkgs) openssl; }; + janeStreet_0_15 = (lib.makeScope self.newScope (self': with self'; { + + # ocamlPackages that janestreet v0.15 packages depend on. + jsDeps = let + uri-sexp = self.uri-sexp.override { inherit (self') ppx_sexp_conv sexplib0; }; + cohttp = self.cohttp.override { + inherit (self') ppx_sexp_conv; + inherit uri-sexp; + }; + ipaddr-sexp = self.ipaddr-sexp.override { inherit (self') ppx_sexp_conv; }; + conduit = self.conduit.override { + inherit (self') ppx_sexp_conv sexplib; + inherit ipaddr-sexp; + }; + conduit-async = self.conduit-async.override { + inherit (self') async ppx_sexp_conv ppx_here core sexplib async_ssl; + inherit conduit ipaddr-sexp; + }; + in { + inherit (self) dune-configurator alcotest re num octavius uutf ounit ctypes; + ppxlib = self.ppxlib.override { inherit (self') stdio; }; + cohttp-async = self.cohttp-async.override { + inherit (self') ppx_sexp_conv base async async_kernel async_unix core_unix sexplib0 core; + inherit uri-sexp cohttp conduit-async; + }; + janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage_0_15.nix { }; + }; + + janeStreet = import ../development/ocaml-modules/janestreet/0.15.nix { + self = self' // jsDeps; + inherit (pkgs) bash fetchpatch fzf lib openssl zstd; + }; + + # Packages that are not part of janestreet libraries, but still depend + # on v0.15 are kept in this scope, too. + + bap = let + ppxlib = jsDeps.ppxlib; + lwt_ppx = self.lwt_ppx.override { inherit ppxlib; }; + sedlex = self.sedlex.override { inherit ppxlib ppx_expect; }; + in callPackage ../development/ocaml-modules/bap { + inherit (pkgs.llvmPackages) llvm; + ezjsonm = self.ezjsonm.override { inherit sexplib0; }; + ppx_bitstring = self.ppx_bitstring.override { inherit ppxlib; }; + ocurl = self.ocurl.override { inherit lwt_ppx; }; + piqi = self.piqi.override { inherit sedlex; }; + piqi-ocaml = self.piqi-ocaml.override { inherit piqi; }; + }; + + biocaml = let + angstrom = self.angstrom.override { inherit ppx_let; }; + in callPackage ../development/ocaml-modules/biocaml { + uri = self.uri.override { inherit angstrom; }; + cfstream = self.cfstream.override { inherit core_kernel; }; + }; + + magic-trace = callPackage ../development/ocaml-modules/magic-trace { }; + + phylogenetics = let + angstrom = self.angstrom.override { inherit ppx_let; }; + in callPackage ../development/ocaml-modules/phylogenetics { + inherit biocaml; + ppx_deriving = self.ppx_deriving.override { inherit (jsDeps) ppxlib; }; + angstrom-unix = self.angstrom-unix.override { inherit angstrom; }; + }; + + ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; + })).overrideScope' liftJaneStreet; + janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { self = self.janeStreet_0_9_0; super = self // { @@ -874,8 +950,6 @@ let lo = callPackage ../development/ocaml-modules/lo { }; - lockfree = callPackage ../development/ocaml-modules/lockfree { }; - logs = callPackage ../development/ocaml-modules/logs { }; lru = callPackage ../development/ocaml-modules/lru { }; @@ -930,7 +1004,7 @@ let magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; - magic-trace = callPackage ../development/ocaml-modules/magic-trace { }; + magic-trace = janeStreet_0_15.magic-trace; mariadb = callPackage ../development/ocaml-modules/mariadb { inherit (pkgs) mariadb; @@ -1056,8 +1130,6 @@ let mirage-runtime = callPackage ../development/ocaml-modules/mirage/runtime.nix { }; - mirage-stack = callPackage ../development/ocaml-modules/mirage-stack { }; - mirage-time = callPackage ../development/ocaml-modules/mirage-time { }; mirage-time-unix = callPackage ../development/ocaml-modules/mirage-time/unix.nix { }; @@ -1334,7 +1406,7 @@ let pgsolver = callPackage ../development/ocaml-modules/pgsolver { }; - phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { }; + phylogenetics = janeStreet_0_15.phylogenetics; piaf = callPackage ../development/ocaml-modules/piaf { }; @@ -1368,7 +1440,7 @@ let pprint = callPackage ../development/ocaml-modules/pprint { }; - ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; + ppx_bap = janeStreet_0_15.ppx_bap; ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { }; @@ -1537,6 +1609,10 @@ let samplerate = callPackage ../development/ocaml-modules/samplerate { }; + saturn = callPackage ../development/ocaml-modules/saturn { }; + + saturn_lockfree = callPackage ../development/ocaml-modules/saturn/lockfree.nix { }; + sawja = callPackage ../development/ocaml-modules/sawja { }; secp256k1 = callPackage ../development/ocaml-modules/secp256k1 { @@ -1855,6 +1931,13 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages = ocamlPackages_4_14; + # This is a nasty way to replace toplevel janestreet attributes in the scope, + # so that modules outside of ocamlPackages that depend on JS OCaml libraries + # *and* non-JS OCaml libraries can pull in the same version of JS transitive + # dependencies. Remove this once ligo and stanc can be compiled against + # janestreet 0.16 libraries. + ocamlPackages_4_14_janeStreet_0_15 = ocamlPackages_4_14.overrideScope' (self: super: super // super.janeStreet_0_15); + # We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0. # Below are aliases for porting them to the latest versions of the OCaml 4 series. ocamlPackages_4_14_unsafe_string = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.14.nix { diff --git a/nixpkgs/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix index abd3c5b206e9..da9f1687a440 100644 --- a/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/nixpkgs/pkgs/top-level/perl-packages.nix @@ -4273,19 +4273,23 @@ with self; { }; }; - Connector = buildPerlPackage { + Connector = buildPerlModule { pname = "Connector"; - version = "1.35"; + version = "1.47"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.35.tar.gz"; - hash = "sha256-Qdl2bubNdaGcFsdeuQ3GT9/dXbp22NIJdo37FeVm3Eo="; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.47.tar.gz"; + hash = "sha256-I2R4pAq53cIVgu4na6krnjgbP8XtljkKLe2o4nSGeoM="; }; - buildInputs = [ ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI IOSocketSSL JSON LWP LWPProtocolHttps ProcSafeExec TemplateToolkit YAML ]; + buildInputs = [ ModuleBuildTiny ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI IOSocketSSL JSON LWP LWPProtocolHttps ProcSafeExec TemplateToolkit YAML ]; propagatedBuildInputs = [ LogLog4perl Moose ]; prePatch = '' # Attempts to use network. rm t/01-proxy-http.t rm t/01-proxy-proc-safeexec.t + + # crypt() tests that use DES + rm t/01-builtin-password.t + rm t/01-builtin-password-scheme.t ''; meta = { description = "A generic connection to a hierarchical-structured data set"; @@ -12704,11 +12708,11 @@ with self; { ImageExifTool = buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.62"; + version = "12.65"; src = fetchurl { url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - hash = "sha256-SZCkbGm2VoiNfVcyuvQDnalkaI7d33ocLutRQEmZ7B0="; + hash = "sha256-YWynZES+4/MkYueeN8Y3IC7vKGb0wkANUfIKgScDJDI="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; diff --git a/nixpkgs/pkgs/top-level/php-packages.nix b/nixpkgs/pkgs/top-level/php-packages.nix index 42df62fb1fa5..df8acbf2900f 100644 --- a/nixpkgs/pkgs/top-level/php-packages.nix +++ b/nixpkgs/pkgs/top-level/php-packages.nix @@ -254,6 +254,8 @@ lib.makeScope pkgs.newScope (self: with self; { oci8 = callPackage ../development/php-packages/oci8 { }; + opentelemetry = callPackage ../development/php-packages/opentelemetry { }; + openswoole = callPackage ../development/php-packages/openswoole { }; pdlib = callPackage ../development/php-packages/pdlib { }; diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index 36c7f74c6614..f096bc9503d8 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -8,6 +8,16 @@ self: super: with self; { + bootstrap = lib.recurseIntoAttrs { + flit-core = toPythonModule (callPackage ../development/python-modules/bootstrap/flit-core { }); + installer = toPythonModule (callPackage ../development/python-modules/bootstrap/installer { + inherit (bootstrap) flit-core; + }); + build = toPythonModule (callPackage ../development/python-modules/bootstrap/build { + inherit (bootstrap) flit-core installer; + }); + }; + bootstrapped-pip = toPythonModule (callPackage ../development/python-modules/bootstrapped-pip { }); setuptools = callPackage ../development/python-modules/setuptools { }; @@ -570,10 +580,14 @@ self: super: with self; { apipkg = callPackage ../development/python-modules/apipkg { }; + apischema = callPackage ../development/python-modules/apischema { }; + apispec = callPackage ../development/python-modules/apispec { }; apispec-webframeworks = callPackage ../development/python-modules/apispec-webframeworks { }; + apkit = callPackage ../development/python-modules/apkit { }; + aplpy = callPackage ../development/python-modules/aplpy { }; app-model = callPackage ../development/python-modules/app-model { }; @@ -913,7 +927,9 @@ self: super: with self; { awkward = callPackage ../development/python-modules/awkward { }; - awkward-cpp = callPackage ../development/python-modules/awkward-cpp { }; + awkward-cpp = callPackage ../development/python-modules/awkward-cpp { + inherit (pkgs) cmake ninja; + }; aws-adfs = callPackage ../development/python-modules/aws-adfs { }; @@ -1199,6 +1215,8 @@ self: super: with self; { paddle2onnx = callPackage ../development/python-modules/paddle2onnx { }; + paddleocr = callPackage ../development/python-modules/paddleocr { }; + paddlepaddle = callPackage ../development/python-modules/paddlepaddle { }; pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; }; @@ -1452,6 +1470,8 @@ self: super: with self; { block-io = callPackage ../development/python-modules/block-io { }; + blockfrost-python = callPackage ../development/python-modules/blockfrost-python { }; + blocksat-cli = callPackage ../development/python-modules/blocksat-cli { }; blosc2 = callPackage ../development/python-modules/blosc2 { }; @@ -1525,6 +1545,8 @@ self: super: with self; { botocore = callPackage ../development/python-modules/botocore { }; + botocore-stubs = callPackage ../development/python-modules/botocore-stubs { }; + botorch = callPackage ../development/python-modules/botorch { }; bottle = callPackage ../development/python-modules/bottle { }; @@ -1675,8 +1697,6 @@ self: super: with self; { caio = callPackage ../development/python-modules/caio { }; - cairo-lang = callPackage ../development/python-modules/cairo-lang { }; - cairocffi = callPackage ../development/python-modules/cairocffi { }; cairosvg = callPackage ../development/python-modules/cairosvg { }; @@ -1965,6 +1985,8 @@ self: super: with self; { cock = callPackage ../development/python-modules/cock { }; + cobs = callPackage ../development/python-modules/cobs { }; + class-doc = callPackage ../development/python-modules/class-doc { }; cliche = callPackage ../development/python-modules/cliche { }; @@ -1991,6 +2013,10 @@ self: super: with self; { click-log = callPackage ../development/python-modules/click-log { }; + click-odoo = callPackage ../development/python-modules/click-odoo { }; + + click-odoo-contrib = callPackage ../development/python-modules/click-odoo-contrib { }; + click-option-group = callPackage ../development/python-modules/click-option-group { }; click-plugins = callPackage ../development/python-modules/click-plugins { }; @@ -2057,6 +2083,8 @@ self: super: with self; { cmaes = callPackage ../development/python-modules/cmaes { }; + cmake = callPackage ../development/python-modules/cmake { inherit (pkgs) cmake; }; + cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; cmd2 = callPackage ../development/python-modules/cmd2 { }; @@ -2215,6 +2243,8 @@ self: super: with self; { corsair-scan = callPackage ../development/python-modules/corsair-scan { }; + cose = callPackage ../development/python-modules/cose { }; + cot = callPackage ../development/python-modules/cot { }; covCore = callPackage ../development/python-modules/cov-core { }; @@ -2543,6 +2573,8 @@ self: super: with self; { debian = callPackage ../development/python-modules/debian { }; + debianbts = callPackage ../development/python-modules/debianbts { }; + debian-inspector = callPackage ../development/python-modules/debian-inspector { }; debtcollector = callPackage ../development/python-modules/debtcollector { }; @@ -5802,7 +5834,9 @@ self: super: with self; { laspy = callPackage ../development/python-modules/laspy { }; - laszip = callPackage ../development/python-modules/laszip { }; + laszip = callPackage ../development/python-modules/laszip { + inherit (pkgs) cmake ninja; + }; latex2mathml = callPackage ../development/python-modules/latex2mathml { }; @@ -6311,6 +6345,10 @@ self: super: with self; { manifest-ml = callPackage ../development/python-modules/manifest-ml { }; + manifestoo = callPackage ../development/python-modules/manifestoo { }; + + manifestoo-core = callPackage ../development/python-modules/manifestoo-core { }; + manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix { }; manuel = callPackage ../development/python-modules/manuel { }; @@ -7946,6 +7984,8 @@ self: super: with self; { pkgutil-resolve-name = callPackage ../development/python-modules/pkgutil-resolve-name { }; + pkg-about = callPackage ../development/python-modules/pkg-about { }; + micloud = callPackage ../development/python-modules/micloud { }; mqtt2influxdb = callPackage ../development/python-modules/mqtt2influxdb { }; @@ -8154,6 +8194,8 @@ self: super: with self; { pyheos = callPackage ../development/python-modules/pyheos { }; + pyhepmc = callPackage ../development/python-modules/pyhepmc { }; + pyhiveapi = callPackage ../development/python-modules/pyhiveapi { }; pyhumps = callPackage ../development/python-modules/pyhumps { }; @@ -8216,6 +8258,8 @@ self: super: with self; { pysiaalarm = callPackage ../development/python-modules/pysiaalarm { }; + pysimplesoap = callPackage ../development/python-modules/pysimplesoap { }; + pyskyqhub = callPackage ../development/python-modules/pyskyqhub { }; pyskyqremote = callPackage ../development/python-modules/pyskyqremote { }; @@ -8503,6 +8547,8 @@ self: super: with self; { process-tests = callPackage ../development/python-modules/process-tests { }; + procmon-parser = callPackage ../development/python-modules/procmon-parser { }; + proglog = callPackage ../development/python-modules/proglog { }; progressbar2 = callPackage ../development/python-modules/progressbar2 { }; @@ -8762,6 +8808,8 @@ self: super: with self; { pybotvac = callPackage ../development/python-modules/pybotvac { }; + pybox2d = callPackage ../development/python-modules/pybox2d { }; + pybravia = callPackage ../development/python-modules/pybravia { }; pybrowserid = callPackage ../development/python-modules/pybrowserid { }; @@ -8852,6 +8900,8 @@ self: super: with self; { py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { }; + pycardano = callPackage ../development/python-modules/pycardano { }; + pycrc = callPackage ../development/python-modules/pycrc { }; pycritty = callPackage ../development/python-modules/pycritty { }; @@ -8930,6 +8980,8 @@ self: super: with self; { pydigiham = callPackage ../development/python-modules/pydigiham { }; + pydiscourse = callPackage ../development/python-modules/pydiscourse { }; + pydispatcher = callPackage ../development/python-modules/pydispatcher { }; pydmd = callPackage ../development/python-modules/pydmd { }; @@ -8946,6 +8998,8 @@ self: super: with self; { inherit (pkgs) graphviz; }; + pydrawise = callPackage ../development/python-modules/pydrawise { }; + pydrive2 = callPackage ../development/python-modules/pydrive2 { }; pydroid-ipcam = callPackage ../development/python-modules/pydroid-ipcam { }; @@ -9120,6 +9174,8 @@ self: super: with self; { inherit (pkgs.buildPackages) meson; }; + pygobject-stubs = callPackage ../development/python-modules/pygobject-stubs { }; + pygogo = callPackage ../development/python-modules/pygogo { }; pygpgme = callPackage ../development/python-modules/pygpgme { }; @@ -10738,7 +10794,9 @@ self: super: with self; { pywizlight = callPackage ../development/python-modules/pywizlight { }; - pywlroots = callPackage ../development/python-modules/pywlroots { }; + pywlroots = callPackage ../development/python-modules/pywlroots { + wlroots = pkgs.wlroots_0_15; + }; pyws66i = callPackage ../development/python-modules/pyws66i { }; @@ -10852,7 +10910,9 @@ self: super: with self; { qtconsole = callPackage ../development/python-modules/qtconsole { }; - qtile = callPackage ../development/python-modules/qtile { }; + qtile = callPackage ../development/python-modules/qtile { + wlroots = pkgs.wlroots_0_15; + }; qtile-extras = callPackage ../development/python-modules/qtile-extras { }; qtpy = callPackage ../development/python-modules/qtpy { }; @@ -11624,6 +11684,8 @@ self: super: with self; { setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; + setuptools-odoo = callPackage ../development/python-modules/setuptools-odoo { }; + setuptools-rust = callPackage ../development/python-modules/setuptools-rust { }; setuptools-scm = callPackage ../development/python-modules/setuptools-scm { }; @@ -13118,6 +13180,10 @@ self: super: with self; { types-appdirs = callPackage ../development/python-modules/types-appdirs { }; + types-awscrt = callPackage ../development/python-modules/types-awscrt { }; + + types-beautifulsoup4 = callPackage ../development/python-modules/types-beautifulsoup4 { }; + types-colorama = callPackage ../development/python-modules/types-colorama { }; types-dateutil = callPackage ../development/python-modules/types-dateutil { }; @@ -13126,6 +13192,8 @@ self: super: with self; { types-deprecated = callPackage ../development/python-modules/types-deprecated { }; + types-docopt = callPackage ../development/python-modules/types-docopt { }; + types-docutils = callPackage ../development/python-modules/types-docutils { }; types-enum34 = callPackage ../development/python-modules/types-enum34 { }; @@ -13134,6 +13202,8 @@ self: super: with self; { types-futures = callPackage ../development/python-modules/types-futures { }; + types-html5lib = callPackage ../development/python-modules/types-html5lib { }; + types-ipaddress = callPackage ../development/python-modules/types-ipaddress { }; types-mock = callPackage ../development/python-modules/types-mock { }; @@ -14038,6 +14108,8 @@ self: super: with self; { python3 = python; })).py; + zephyr-python-api = callPackage ../development/python-modules/zephyr-python-api { }; + zeroc-ice = callPackage ../development/python-modules/zeroc-ice { }; zeroconf = callPackage ../development/python-modules/zeroconf { }; diff --git a/nixpkgs/pkgs/top-level/python2-packages.nix b/nixpkgs/pkgs/top-level/python2-packages.nix index 7b36e82f99fb..073ffa0be2c4 100644 --- a/nixpkgs/pkgs/top-level/python2-packages.nix +++ b/nixpkgs/pkgs/top-level/python2-packages.nix @@ -37,6 +37,10 @@ with self; with super; { more-itertools = callPackage ../development/python2-modules/more-itertools { }; + # ninja python stub was created to help simplify python builds using PyPA's + # build tool in Python 3, but it does not yet support Python 2 + ninja = pkgs.buildPackages.ninja; + packaging = callPackage ../development/python2-modules/packaging { }; pip = callPackage ../development/python2-modules/pip { }; diff --git a/nixpkgs/pkgs/top-level/qt6-packages.nix b/nixpkgs/pkgs/top-level/qt6-packages.nix index 792be6b3efda..bc10fe2b99d6 100644 --- a/nixpkgs/pkgs/top-level/qt6-packages.nix +++ b/nixpkgs/pkgs/top-level/qt6-packages.nix @@ -30,7 +30,9 @@ in qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { }; - qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { }; + qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { + qt5Kvantum = pkgs.libsForQt5.qtstyleplugin-kvantum; + }; quazip = callPackage ../development/libraries/quazip { }; |