diff options
330 files changed, 5510 insertions, 7102 deletions
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 131a52b0560b..d174203238c8 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -20,7 +20,7 @@ jobs: if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index 272447ecee87..9eb5efabc373 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -18,8 +18,8 @@ jobs: runs-on: ubuntu-latest # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v23 - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/check-by-name.yml index 9622634fcffd..7a3598dbe2a4 100644 --- a/.github/workflows/check-by-name.yml +++ b/.github/workflows/check-by-name.yml @@ -3,8 +3,10 @@ name: Check pkgs/by-name # The pre-built tool is fetched from a channel, -# making it work predictable on all PRs -on: pull_request +# making it work predictable on all PRs. +on: + # Using pull_request_target instead of pull_request avoids having to approve first time contributors + pull_request_target # The tool doesn't need any permissions, it only outputs success or not based on the checkout permissions: {} @@ -15,8 +17,11 @@ jobs: # as specified in nixos/release-combined.nix runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 + - uses: actions/checkout@v4 + with: + # pull_request_target checks out the base branch by default + ref: refs/pull/${{ github.event.pull_request.number }}/merge + - uses: cachix/install-nix-action@v23 - name: Determining channel to use for dependencies run: | echo "Determining which channel to use for PR base branch $GITHUB_BASE_REF" diff --git a/.github/workflows/check-maintainers-sorted.yaml b/.github/workflows/check-maintainers-sorted.yaml index 652ddd07496a..d399951f65df 100644 --- a/.github/workflows/check-maintainers-sorted.yaml +++ b/.github/workflows/check-maintainers-sorted.yaml @@ -12,11 +12,11 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index e72f706deff1..b5c3c7fd95cd 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -24,11 +24,11 @@ jobs: - name: print list of changed files run: | cat "$HOME/changed_files" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index 9862d8d72434..6be47caf278d 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -14,11 +14,11 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 812907ab84e2..f148aee076d5 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -15,11 +15,11 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index abfb51244fd6..32c32397dc08 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -40,7 +40,7 @@ jobs: into: staging-23.05 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@1.4.0 diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml index 300c418054d7..687c1b99adb2 100644 --- a/.github/workflows/periodic-merge-6h.yml +++ b/.github/workflows/periodic-merge-6h.yml @@ -38,7 +38,7 @@ jobs: into: staging name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@1.4.0 diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index e843b1404df5..5aa1693bc9b3 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -16,8 +16,8 @@ jobs: if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v23 with: nix_path: nixpkgs=channel:nixpkgs-unstable - name: setup diff --git a/doc/builders/packages/ibus.section.md b/doc/builders/packages/ibus.section.md index 4eb74c0b6912..817e55d56f1f 100644 --- a/doc/builders/packages/ibus.section.md +++ b/doc/builders/packages/ibus.section.md @@ -29,12 +29,12 @@ _Note: each language passed to `langs` must be an attribute name in `pkgs.hunspe ## Built-in emoji picker {#sec-ibus-typing-booster-emoji-picker} -The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-emoji` is needed: +The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-color-emoji` is needed: On NixOS, it can be installed using the following expression: ```nix { pkgs, ... }: { - fonts.packages = with pkgs; [ noto-fonts-emoji ]; + fonts.packages = with pkgs; [ noto-fonts-color-emoji ]; } ``` diff --git a/doc/hooks/waf.section.md b/doc/hooks/waf.section.md index 8dc78121cd9d..fa027d87a94d 100644 --- a/doc/hooks/waf.section.md +++ b/doc/hooks/waf.section.md @@ -1,50 +1,58 @@ -# waf.hook {#wafhook} +# wafHook {#waf-hook} [Waf](https://waf.io) is a Python-based software building system. -In Nixpkgs, `waf.hook` overrides the default configure, build, and install phases. +In Nixpkgs, `wafHook` overrides the default configure, build, and install phases. -## Variables controlling waf.hook {#variablesControllingWafHook} +## Variables controlling wafHook {#waf-hook-variables-controlling} -### `wafPath` {#wafPath} +### `wafHook` Exclusive Variables {#waf-hook-exclusive-variables} -Location of the `waf` tool. It defaults to `./waf`, to honor software projects that include it directly inside their source trees. +The variables below are exclusive of `wafHook`. -If `wafPath` doesn't exist, then `waf.hook` will copy the `waf` provided from Nixpkgs to it. +#### `wafPath` {#waf-path} -### `wafConfigureFlags` {#wafConfigureFlags} +Location of the `waf` tool. It defaults to `./waf`, to honor software projects that include it directly inside their source trees. -Controls the flags passed to waf tool during configure phase. +If `wafPath` doesn't exist, then `wafHook` will copy the `waf` provided from Nixpkgs to it. -### `wafFlags` {#wafFlags} +#### `wafFlags` {#waf-flags} -Controls the flags passed to waf tool during build and install phases. +Controls the flags passed to waf tool during build and install phases. For settings specific to build or install phases, use `wafBuildFlags` or `wafInstallFlags` respectively. -### `dontAddWafCrossFlags` {#dontAddWafCrossFlags} +#### `dontAddWafCrossFlags` {#dont-add-waf-cross-flags} When set to `true`, don't add cross compilation flags during configure phase. -### `dontUseWafConfigure` {#dontUseWafConfigure} +#### `dontUseWafConfigure` {#dont-use-waf-configure} When set to true, don't use the predefined `wafConfigurePhase`. -### `dontUseWafBuild` {#dontUseWafBuild} +#### `dontUseWafBuild` {#dont-use-waf-build} When set to true, don't use the predefined `wafBuildPhase`. -### `dontUseWafInstall` {#dontUseWafInstall} +#### `dontUseWafInstall` {#dont-use-waf-install} When set to true, don't use the predefined `wafInstallPhase`. -### Variables honored by waf.hook {#variablesHonoredByWafHook} +### Similar variables {#waf-hook-similar-variables} + +The following variables are similar to their `stdenv.mkDerivation` counterparts. + +| `wafHook` Variable | `stdenv.mkDerivation` Counterpart | +|-----------------------|-----------------------------------| +| `wafConfigureFlags` | `configureFlags` | +| `wafConfigureTargets` | `configureTargets` | +| `wafBuildFlags` | `buildFlags` | +| `wafBuildTargets` | `buildTargets` | +| `wafInstallFlags` | `installFlags` | +| `wafInstallTargets` | `installTargets` | + +### Honored variables {#waf-hook-honored-variables} -The following variables commonly used by `stdenv.mkDerivation` are also honored by `waf.hook`. +The following variables commonly used by `stdenv.mkDerivation` are honored by `wafHook`. - `prefixKey` -- `configureTargets` - `enableParallelBuilding` - `enableParallelInstalling` -- `buildFlags` -- `buildTargets` -- `installFlags` -- `installTargets` diff --git a/doc/hooks/zig.section.md b/doc/hooks/zig.section.md index 8178866f44c9..1a09491649d7 100644 --- a/doc/hooks/zig.section.md +++ b/doc/hooks/zig.section.md @@ -4,7 +4,7 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases. -## Example code snippet {#example-code-snippet} +## Example code snippet {#zig-hook-example-code-snippet} ```nix { lib @@ -27,25 +27,25 @@ stdenv.mkDerivation { } ``` -## Variables controlling zig.hook {#variables-controlling-zig-hook} +## Variables controlling zig.hook {#zig-hook-variables-controlling} -### `zig.hook` Exclusive Variables {#zigHookExclusiveVariables} +### `zig.hook` Exclusive Variables {#zig-hook-exclusive-variables} The variables below are exclusive to `zig.hook`. -#### `dontUseZigBuild` {#dontUseZigBuild} +#### `dontUseZigBuild` {#dont-use-zig-build} Disables using `zigBuildPhase`. -#### `dontUseZigCheck` {#dontUseZigCheck} +#### `dontUseZigCheck` {#dont-use-zig-check} Disables using `zigCheckPhase`. -#### `dontUseZigInstall` {#dontUseZigInstall} +#### `dontUseZigInstall` {#dont-use-zig-install} Disables using `zigInstallPhase`. -### Similar variables {#similarVariables} +### Similar variables {#zig-hook-similar-variables} The following variables are similar to their `stdenv.mkDerivation` counterparts. @@ -55,7 +55,7 @@ The following variables are similar to their `stdenv.mkDerivation` counterparts. | `zigCheckFlags` | `checkFlags` | | `zigInstallFlags` | `installFlags` | -### Variables honored by zig.hook {#variables-honored-by-zig-hook} +### Variables honored by zig.hook {#zig-hook-variables-honored} The following variables commonly used by `stdenv.mkDerivation` are honored by `zig.hook`. diff --git a/lib/generators.nix b/lib/generators.nix index 0368577d5a51..8e93ed04916e 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -189,10 +189,10 @@ rec { * } * *> [url "ssh://git@github.com/"] - *> insteadOf = https://github.com/ + *> insteadOf = "https://github.com" *> *> [user] - *> name = edolstra + *> name = "edolstra" */ toGitINI = attrs: with builtins; @@ -209,9 +209,17 @@ rec { else ''${section} "${subsection}"''; + mkValueString = v: + let + escapedV = '' + "${ + replaceStrings [ "\n" " " ''"'' "\\" ] [ "\\n" "\\t" ''\"'' "\\\\" ] v + }"''; + in mkValueStringDefault { } (if isString v then escapedV else v); + # generation for multiple ini values mkKeyValue = k: v: - let mkKeyValue = mkKeyValueDefault { } " = " k; + let mkKeyValue = mkKeyValueDefault { inherit mkValueString; } " = " k; in concatStringsSep "\n" (map (kv: "\t" + mkKeyValue kv) (lib.toList v)); # converts { a.b.c = 5; } to { "a.b".c = 5; } for toINI diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 6d55ae684771..80223dccb261 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -948,6 +948,51 @@ runTests { ''; }; + testToGitINI = { + expr = generators.toGitINI { + user = { + email = "user@example.org"; + name = "John Doe"; + signingKey = "00112233445566778899AABBCCDDEEFF"; + }; + gpg.program = "path-to-gpg"; + tag.gpgSign = true; + include.path = "~/path/to/config.inc"; + includeIf."gitdif:~/src/dir".path = "~/path/to/conditional.inc"; + extra = { + boolean = true; + integer = 38; + name = "value"; + subsection.value = "test"; + };}; + expected = '' + [extra] + ${"\t"}boolean = true + ${"\t"}integer = 38 + ${"\t"}name = "value" + + [extra "subsection"] + ${"\t"}value = "test" + + [gpg] + ${"\t"}program = "path-to-gpg" + + [include] + ${"\t"}path = "~/path/to/config.inc" + + [includeIf "gitdif:~/src/dir"] + ${"\t"}path = "~/path/to/conditional.inc" + + [tag] + ${"\t"}gpgSign = true + + [user] + ${"\t"}email = "user@example.org" + ${"\t"}name = "John Doe" + ${"\t"}signingKey = "00112233445566778899AABBCCDDEEFF" + ''; + }; + /* right now only invocation check */ testToJSONSimple = let val = { diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 33043a777594..d3e1dbf64287 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -876,6 +876,12 @@ githubId = 153175; name = "Andrew Marshall"; }; + amaxine = { + email = "max@ine.dev"; + github = "amaxine"; + githubId = 35892750; + name = "Maxine Aubrey"; + }; ambroisie = { email = "bruno.nixpkgs@belanyi.fr"; github = "ambroisie"; @@ -1516,6 +1522,11 @@ githubId = 11037075; name = "Ashley Hooper"; }; + ashvith-shetty = { + github = "Ashvith10"; + githubId = 113123021; + name = "Ashvith Shetty"; + }; aske = { email = "aske@fmap.me"; github = "aske"; @@ -9245,6 +9256,12 @@ github = "KnairdA"; githubId = 498373; }; + knarkzel = { + email = "knarkzel@gmail.com"; + name = "Knarkzel"; + github = "Knarkzel"; + githubId = 85593302; + }; knedlsepp = { email = "josef.kemetmueller@gmail.com"; github = "knedlsepp"; @@ -10317,6 +10334,12 @@ githubId = 782440; name = "Luna Nova"; }; + luochen1990 = { + email = "luochen1990@gmail.com"; + github = "luochen1990"; + githubId = 2309868; + name = "Luo Chen"; + }; lurkki = { email = "jussi.kuokkanen@protonmail.com"; github = "Lurkki14"; @@ -10868,12 +10891,6 @@ githubId = 502805; name = "Max Zerzouri"; }; - maxeaubrey = { - email = "maxeaubrey@gmail.com"; - github = "maxeaubrey"; - githubId = 35892750; - name = "Maxine Aubrey"; - }; maxhbr = { email = "nixos@maxhbr.dev"; github = "maxhbr"; @@ -12742,6 +12759,12 @@ githubId = 16027994; name = "Nathan Viets"; }; + nyanbinary = { + email = "vextium@skiff.com"; + github = "nyabinary"; + githubId = 97130632; + name = "Niko"; + }; nyanloutre = { email = "paul@nyanlout.re"; github = "nyanloutre"; @@ -18479,6 +18502,12 @@ githubId = 20464732; name = "Willi Butz"; }; + willswats = { + email = "williamstuwatson@gmail.com"; + github = "willswats"; + githubId = 86304139; + name = "William Watson"; + }; wilsonehusin = { name = "Wilson E. Husin"; email = "wilsonehusin@gmail.com"; diff --git a/maintainers/scripts/remove-old-aliases.py b/maintainers/scripts/remove-old-aliases.py index 8f04a9be4f17..3c5f8edc50ad 100755 --- a/maintainers/scripts/remove-old-aliases.py +++ b/maintainers/scripts/remove-old-aliases.py @@ -102,12 +102,13 @@ def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]: alias = before_equal alias_unquoted = before_equal.strip('"') - after_equal_list = [x.strip(";:") for x in after_equal.split()] + replacement = next(x.strip(";:") for x in after_equal.split()) + replacement = replacement.removeprefix("pkgs.") converted = ( - f"{indent}{alias} = throw \"'{alias_unquoted}' has been renamed to/replaced by" - f" '{after_equal_list.pop(0)}'\";" - f' # Converted to throw {datetime.today().strftime("%Y-%m-%d")}' + f"{indent}{alias} = throw \"'{alias_unquoted}' has been" + f" renamed to/replaced by '{replacement}'\";" + f" # Converted to throw {datetime.today().strftime('%Y-%m-%d')}" ) converted_list.append((line, converted)) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 8e92004148ba..cba6f0d43642 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -365,7 +365,7 @@ with lib.maintainers; { hedning jtojnar dasj19 - maxeaubrey + amaxine ]; githubTeams = [ "gnome" @@ -918,6 +918,18 @@ with lib.maintainers; { shortName = "Vim/Neovim"; }; + wdz = { + members = [ + n0emis + netali + vidister + johannwagner + yuka + ]; + scope = "Group registration for WDZ GmbH team members who collectively maintain packages."; + shortName = "WDZ GmbH"; + }; + xfce = { members = [ bobby285271 diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index b9f1c814cd5a..a2041db2a874 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -91,6 +91,8 @@ - `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). +- The `users.users.<name>.passwordFile` has been renamed to `users.users.<name>.hashedPasswordFile` to avoid possible confusions. The option is in fact the file-based version of `hashedPassword`, not `password`, and expects a file containing the {manpage}`crypt(3)` hash of the user password. + - The `services.ananicy.extraRules` option now has the type of `listOf attrs` instead of `string`. - JACK tools (`jack_*` except `jack_control`) have moved from the `jack2` package to `jack-example-tools` @@ -191,6 +193,10 @@ - The `hail` NixOS module was removed, as `hail` was unmaintained since 2017. +- Package `noto-fonts-emoji` was renamed to `noto-fonts-color-emoji`; + see [#221181](https://github.com/NixOS/nixpkgs/issues/221181). + + ## Other Notable Changes {#sec-release-23.11-notable-changes} - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration. @@ -263,8 +269,12 @@ The module update takes care of the new config syntax and the data itself (user - The `cawbird` package is dropped from nixpkgs, as it got broken by the Twitter API closing down and has been abandoned upstream. +- `hardware.nvidia` gained `datacenter` options for enabling NVIDIA Data Center drivers and configuration of NVLink/NVSwitch topologies through `nv-fabricmanager`. + - Certificate generation via the `security.acme` now limits the concurrent number of running certificate renewals and generation jobs, to avoid spiking resource usage when processing many certificates at once. The limit defaults to *5* and can be adjusted via `maxConcurrentRenewals`. Setting it to *0* disables the limits altogether. +- New `boot.bcache.enable` (default enabled) allows completely removing `bcache` mount support. + ## 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/nixos/modules/config/fonts/packages.nix b/nixos/modules/config/fonts/packages.nix index 46907d5411ca..37b705ecb345 100644 --- a/nixos/modules/config/fonts/packages.nix +++ b/nixos/modules/config/fonts/packages.nix @@ -37,7 +37,7 @@ in gyre-fonts # TrueType substitutes for standard PostScript fonts liberation_ttf unifont - noto-fonts-emoji + noto-fonts-color-emoji ]); }; } diff --git a/nixos/modules/config/terminfo.nix b/nixos/modules/config/terminfo.nix index 82f9ae48372a..1ae8e82c471e 100644 --- a/nixos/modules/config/terminfo.nix +++ b/nixos/modules/config/terminfo.nix @@ -16,16 +16,24 @@ with lib; config = { - # can be generated with: filter (drv: (builtins.tryEval (drv ? terminfo)).value) (attrValues pkgs) + # can be generated with: + # attrNames (filterAttrs + # (_: drv: (builtins.tryEval (isDerivation drv && drv ? terminfo)).value) + # pkgs) environment.systemPackages = mkIf config.environment.enableAllTerminfo (map (x: x.terminfo) (with pkgs; [ alacritty + contour foot kitty mtm + rio rxvt-unicode-unwrapped rxvt-unicode-unwrapped-emoji + st termite + tmux wezterm + yaft ])); environment.pathsToLink = [ diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 684b4bc8fbcc..4893d28924eb 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -18,11 +18,11 @@ let passwordDescription = '' The options {option}`hashedPassword`, - {option}`password` and {option}`passwordFile` + {option}`password` and {option}`hashedPasswordFile` controls what password is set for the user. {option}`hashedPassword` overrides both - {option}`password` and {option}`passwordFile`. - {option}`password` overrides {option}`passwordFile`. + {option}`password` and {option}`hashedPasswordFile`. + {option}`password` overrides {option}`hashedPasswordFile`. If none of these three options are set, no password is assigned to the user, and the user will not be able to do password logins. If the option {option}`users.mutableUsers` is true, the @@ -250,18 +250,26 @@ let ''; }; - passwordFile = mkOption { + hashedPasswordFile = mkOption { type = with types; nullOr str; - default = null; + default = cfg.users.${name}.passwordFile; + defaultText = literalExpression "null"; description = lib.mdDoc '' - The full path to a file that contains the user's password. The password - file is read on each system activation. The file should contain - exactly one line, which should be the password in an encrypted form - that is suitable for the `chpasswd -e` command. + The full path to a file that contains the hash of the user's + password. The password file is read on each system activation. The + file should contain exactly one line, which should be the password in + an encrypted form that is suitable for the `chpasswd -e` command. ${passwordDescription} ''; }; + passwordFile = mkOption { + type = with types; nullOr (passwdEntry str); + default = null; + visible = false; + description = lib.mdDoc "Deprecated alias of hashedPasswordFile"; + }; + initialHashedPassword = mkOption { type = with types; nullOr (passwdEntry str); default = null; @@ -447,7 +455,7 @@ let users = mapAttrsToList (_: u: { inherit (u) name uid group description home homeMode createHome isSystemUser - password passwordFile hashedPassword + password hashedPasswordFile hashedPassword autoSubUidGidRange subUidRanges subGidRanges initialPassword initialHashedPassword expires; shell = utils.toShellPath u.shell; @@ -756,7 +764,7 @@ in { && (allowsLogin cfg.hashedPassword || cfg.password != null - || cfg.passwordFile != null + || cfg.hashedPasswordFile != null || cfg.openssh.authorizedKeys.keys != [] || cfg.openssh.authorizedKeys.keyFiles != []) ) cfg.users ++ [ @@ -845,9 +853,13 @@ in { The password hash of user "${user.name}" may be invalid. You must set a valid hash or the user will be locked out of their account. Please check the value of option `users.users."${user.name}".hashedPassword`.'' - else null - )); - + else null) + ++ flip mapAttrsToList cfg.users (name: user: + if user.passwordFile != null then + ''The option `users.users."${name}".passwordFile' has been renamed '' + + ''to `users.users."${name}".hashedPasswordFile'.'' + else null) + ); }; } diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 67c3afcf320a..0b1238dd888a 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -4,8 +4,10 @@ pkgs, ... }: let + x11Enabled = config.services.xserver.enable + && (lib.elem "nvidia" config.services.xserver.videoDrivers); nvidia_x11 = - if (lib.elem "nvidia" config.services.xserver.videoDrivers) + if x11Enabled || cfg.datacenter.enable then cfg.package else null; @@ -18,9 +20,64 @@ primeEnabled = syncCfg.enable || reverseSyncCfg.enable || offloadCfg.enable; busIDType = lib.types.strMatching "([[:print:]]+[\:\@][0-9]{1,3}\:[0-9]{1,2}\:[0-9])?"; ibtSupport = cfg.open || (nvidia_x11.ibtSupport or false); + settingsFormat = pkgs.formats.keyValue {}; in { options = { hardware.nvidia = { + datacenter.enable = lib.mkEnableOption (lib.mdDoc '' + Data Center drivers for NVIDIA cards on a NVLink topology. + ''); + datacenter.settings = lib.mkOption { + type = settingsFormat.type; + default = { + LOG_LEVEL=4; + LOG_FILE_NAME="/var/log/fabricmanager.log"; + LOG_APPEND_TO_LOG=1; + LOG_FILE_MAX_SIZE=1024; + LOG_USE_SYSLOG=0; + DAEMONIZE=1; + BIND_INTERFACE_IP="127.0.0.1"; + STARTING_TCP_PORT=16000; + FABRIC_MODE=0; + FABRIC_MODE_RESTART=0; + STATE_FILE_NAME="/var/tmp/fabricmanager.state"; + FM_CMD_BIND_INTERFACE="127.0.0.1"; + FM_CMD_PORT_NUMBER=6666; + FM_STAY_RESIDENT_ON_FAILURES=0; + ACCESS_LINK_FAILURE_MODE=0; + TRUNK_LINK_FAILURE_MODE=0; + NVSWITCH_FAILURE_MODE=0; + ABORT_CUDA_JOBS_ON_FM_EXIT=1; + TOPOLOGY_FILE_PATH=nvidia_x11.fabricmanager + "/share/nvidia-fabricmanager/nvidia/nvswitch"; + }; + defaultText = lib.literalExpression '' + { + LOG_LEVEL=4; + LOG_FILE_NAME="/var/log/fabricmanager.log"; + LOG_APPEND_TO_LOG=1; + LOG_FILE_MAX_SIZE=1024; + LOG_USE_SYSLOG=0; + DAEMONIZE=1; + BIND_INTERFACE_IP="127.0.0.1"; + STARTING_TCP_PORT=16000; + FABRIC_MODE=0; + FABRIC_MODE_RESTART=0; + STATE_FILE_NAME="/var/tmp/fabricmanager.state"; + FM_CMD_BIND_INTERFACE="127.0.0.1"; + FM_CMD_PORT_NUMBER=6666; + FM_STAY_RESIDENT_ON_FAILURES=0; + ACCESS_LINK_FAILURE_MODE=0; + TRUNK_LINK_FAILURE_MODE=0; + NVSWITCH_FAILURE_MODE=0; + ABORT_CUDA_JOBS_ON_FM_EXIT=1; + TOPOLOGY_FILE_PATH=nvidia_x11.fabricmanager + "/share/nvidia-fabricmanager/nvidia/nvswitch"; + } + ''; + description = lib.mdDoc '' + Additional configuration options for fabricmanager. + ''; + }; + powerManagement.enable = lib.mkEnableOption (lib.mdDoc '' experimental power management through systemd. For more information, see the NVIDIA docs, on Chapter 21. Configuring Power Management Support. @@ -167,9 +224,15 @@ in { It also drastically increases the time the driver needs to clock down after load. ''); - package = lib.mkPackageOptionMD config.boot.kernelPackages.nvidiaPackages "nvidia_x11" { - default = "stable"; + package = lib.mkOption { + default = config.boot.kernelPackages.nvidiaPackages."${if cfg.datacenter.enable then "dc" else "stable"}"; + defaultText = lib.literalExpression '' + config.boot.kernelPackages.nvidiaPackages."\$\{if cfg.datacenter.enable then "dc" else "stable"}" + ''; example = lib.mdDoc "config.boot.kernelPackages.nvidiaPackages.legacy_470"; + description = lib.mdDoc '' + The NVIDIA driver package to use. + ''; }; open = lib.mkEnableOption (lib.mdDoc '' @@ -188,8 +251,46 @@ in { then pCfg.intelBusId else pCfg.amdgpuBusId; in - lib.mkIf (nvidia_x11 != null) { - assertions = [ + lib.mkIf (nvidia_x11 != null) (lib.mkMerge [ + # Common + ({ + assertions = [ + { + assertion = !(x11Enabled && cfg.datacenter.enable); + message = "You cannot configure both X11 and Data Center drivers at the same time."; + } + ]; + boot = { + blacklistedKernelModules = ["nouveau" "nvidiafb"]; + kernelModules = [ "nvidia-uvm" ]; + }; + systemd.tmpfiles.rules = + lib.optional config.virtualisation.docker.enableNvidia + "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin"; + services.udev.extraRules = + '' + # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. + KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'" + KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do mknod -m 666 /dev/nvidia$${i} c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) $${i}; done'" + KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'" + KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" + KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'" + ''; + hardware.opengl = { + extraPackages = [ + nvidia_x11.out + ]; + extraPackages32 = [ + nvidia_x11.lib32 + ]; + }; + environment.systemPackages = [ + nvidia_x11.bin + ]; + }) + # X11 + (lib.mkIf x11Enabled { + assertions = [ { assertion = primeEnabled -> pCfg.intelBusId == "" || pCfg.amdgpuBusId == ""; message = "You cannot configure both an Intel iGPU and an AMD APU. Pick the one corresponding to your processor."; @@ -248,227 +349,207 @@ in { { assertion = cfg.dynamicBoost.enable -> lib.versionAtLeast nvidia_x11.version "510.39.01"; message = "NVIDIA's Dynamic Boost feature only exists on versions >= 510.39.01"; - } - ]; - - # If Optimus/PRIME is enabled, we: - # - Specify the configured NVIDIA GPU bus ID in the Device section for the - # "nvidia" driver. - # - Add the AllowEmptyInitialConfiguration option to the Screen section for the - # "nvidia" driver, in order to allow the X server to start without any outputs. - # - Add a separate Device section for the Intel GPU, using the "modesetting" - # driver and with the configured BusID. - # - OR add a separate Device section for the AMD APU, using the "amdgpu" - # driver and with the configures BusID. - # - Reference that Device section from the ServerLayout section as an inactive - # device. - # - Configure the display manager to run specific `xrandr` commands which will - # configure/enable displays connected to the Intel iGPU / AMD APU. - - # reverse sync implies offloading - hardware.nvidia.prime.offload.enable = lib.mkDefault reverseSyncCfg.enable; - - services.xserver.drivers = - lib.optional primeEnabled { - name = igpuDriver; - display = offloadCfg.enable; - modules = lib.optional (igpuDriver == "amdgpu") pkgs.xorg.xf86videoamdgpu; - deviceSection = - '' - BusID "${igpuBusId}" - '' - + lib.optionalString (syncCfg.enable && igpuDriver != "amdgpu") '' - Option "AccelMethod" "none" - ''; - } - ++ lib.singleton { - name = "nvidia"; - modules = [nvidia_x11.bin]; - display = !offloadCfg.enable; - deviceSection = - lib.optionalString primeEnabled - '' - BusID "${pCfg.nvidiaBusId}" - '' - + lib.optionalString pCfg.allowExternalGpu '' - Option "AllowExternalGpus" - ''; - screenSection = - '' - Option "RandRRotation" "on" - '' - + lib.optionalString syncCfg.enable '' - Option "AllowEmptyInitialConfiguration" - '' - + lib.optionalString cfg.forceFullCompositionPipeline '' - Option "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}" - Option "AllowIndirectGLXProtocol" "off" - Option "TripleBuffer" "on" - ''; - }; - - services.xserver.serverLayoutSection = - lib.optionalString syncCfg.enable '' - Inactive "Device-${igpuDriver}[0]" - '' - + lib.optionalString reverseSyncCfg.enable '' - Inactive "Device-nvidia[0]" - '' - + lib.optionalString offloadCfg.enable '' - Option "AllowNVIDIAGPUScreens" - ''; - - services.xserver.displayManager.setupCommands = let - gpuProviderName = - if igpuDriver == "amdgpu" - then - # find the name of the provider if amdgpu - "`${lib.getExe pkgs.xorg.xrandr} --listproviders | ${lib.getExe pkgs.gnugrep} -i AMD | ${lib.getExe pkgs.gnused} -n 's/^.*name://p'`" - else igpuDriver; - providerCmdParams = - if syncCfg.enable - then "\"${gpuProviderName}\" NVIDIA-0" - else "NVIDIA-G0 \"${gpuProviderName}\""; - in - lib.optionalString (syncCfg.enable || reverseSyncCfg.enable) '' - # Added by nvidia configuration module for Optimus/PRIME. - ${lib.getExe pkgs.xorg.xrandr} --setprovideroutputsource ${providerCmdParams} - ${lib.getExe pkgs.xorg.xrandr} --auto - ''; - - environment.etc = { - "nvidia/nvidia-application-profiles-rc" = lib.mkIf nvidia_x11.useProfiles {source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc";}; + }]; + + # If Optimus/PRIME is enabled, we: + # - Specify the configured NVIDIA GPU bus ID in the Device section for the + # "nvidia" driver. + # - Add the AllowEmptyInitialConfiguration option to the Screen section for the + # "nvidia" driver, in order to allow the X server to start without any outputs. + # - Add a separate Device section for the Intel GPU, using the "modesetting" + # driver and with the configured BusID. + # - OR add a separate Device section for the AMD APU, using the "amdgpu" + # driver and with the configures BusID. + # - Reference that Device section from the ServerLayout section as an inactive + # device. + # - Configure the display manager to run specific `xrandr` commands which will + # configure/enable displays connected to the Intel iGPU / AMD APU. + + # reverse sync implies offloading + hardware.nvidia.prime.offload.enable = lib.mkDefault reverseSyncCfg.enable; + + services.xserver.drivers = + lib.optional primeEnabled { + name = igpuDriver; + display = offloadCfg.enable; + modules = lib.optional (igpuDriver == "amdgpu") pkgs.xorg.xf86videoamdgpu; + deviceSection = + '' + BusID "${igpuBusId}" + '' + + lib.optionalString (syncCfg.enable && igpuDriver != "amdgpu") '' + Option "AccelMethod" "none" + ''; + } + ++ lib.singleton { + name = "nvidia"; + modules = [nvidia_x11.bin]; + display = !offloadCfg.enable; + deviceSection = + lib.optionalString primeEnabled + '' + BusID "${pCfg.nvidiaBusId}" + '' + + lib.optionalString pCfg.allowExternalGpu '' + Option "AllowExternalGpus" + ''; + screenSection = + '' + Option "RandRRotation" "on" + '' + + lib.optionalString syncCfg.enable '' + Option "AllowEmptyInitialConfiguration" + '' + + lib.optionalString cfg.forceFullCompositionPipeline '' + Option "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}" + Option "AllowIndirectGLXProtocol" "off" + Option "TripleBuffer" "on" + ''; + }; - # 'nvidia_x11' installs it's files to /run/opengl-driver/... - "egl/egl_external_platform.d".source = "/run/opengl-driver/share/egl/egl_external_platform.d/"; - }; + services.xserver.serverLayoutSection = + lib.optionalString syncCfg.enable '' + Inactive "Device-${igpuDriver}[0]" + '' + + lib.optionalString reverseSyncCfg.enable '' + Inactive "Device-nvidia[0]" + '' + + lib.optionalString offloadCfg.enable '' + Option "AllowNVIDIAGPUScreens" + ''; + + services.xserver.displayManager.setupCommands = let + gpuProviderName = + if igpuDriver == "amdgpu" + then + # find the name of the provider if amdgpu + "`${lib.getExe pkgs.xorg.xrandr} --listproviders | ${lib.getExe pkgs.gnugrep} -i AMD | ${lib.getExe pkgs.gnused} -n 's/^.*name://p'`" + else igpuDriver; + providerCmdParams = + if syncCfg.enable + then "\"${gpuProviderName}\" NVIDIA-0" + else "NVIDIA-G0 \"${gpuProviderName}\""; + in + lib.optionalString (syncCfg.enable || reverseSyncCfg.enable) '' + # Added by nvidia configuration module for Optimus/PRIME. + ${lib.getExe pkgs.xorg.xrandr} --setprovideroutputsource ${providerCmdParams} + ${lib.getExe pkgs.xorg.xrandr} --auto + ''; + + environment.etc = { + "nvidia/nvidia-application-profiles-rc" = lib.mkIf nvidia_x11.useProfiles {source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc";}; + + # 'nvidia_x11' installs it's files to /run/opengl-driver/... + "egl/egl_external_platform.d".source = "/run/opengl-driver/share/egl/egl_external_platform.d/"; + }; - hardware.opengl = { - extraPackages = [ - nvidia_x11.out - pkgs.nvidia-vaapi-driver - ]; - extraPackages32 = [ - nvidia_x11.lib32 - pkgs.pkgsi686Linux.nvidia-vaapi-driver - ]; - }; - environment.systemPackages = - [nvidia_x11.bin] - ++ lib.optional cfg.nvidiaSettings nvidia_x11.settings - ++ lib.optional cfg.nvidiaPersistenced nvidia_x11.persistenced - ++ lib.optional offloadCfg.enableOffloadCmd - (pkgs.writeShellScriptBin "nvidia-offload" '' - export __NV_PRIME_RENDER_OFFLOAD=1 - export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 - export __GLX_VENDOR_LIBRARY_NAME=nvidia - export __VK_LAYER_NV_optimus=NVIDIA_only - exec "$@" - ''); - - systemd.packages = lib.optional cfg.powerManagement.enable nvidia_x11.out; - - systemd.services = let - nvidiaService = state: { - description = "NVIDIA system ${state} actions"; - path = [pkgs.kbd]; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${nvidia_x11.out}/bin/nvidia-sleep.sh '${state}'"; - }; - before = ["systemd-${state}.service"]; - requiredBy = ["systemd-${state}.service"]; + hardware.opengl = { + extraPackages = [ + pkgs.nvidia-vaapi-driver + ]; + extraPackages32 = [ + pkgs.pkgsi686Linux.nvidia-vaapi-driver + ]; }; - in - lib.mkMerge [ - (lib.mkIf cfg.powerManagement.enable { - nvidia-suspend = nvidiaService "suspend"; - nvidia-hibernate = nvidiaService "hibernate"; - nvidia-resume = - (nvidiaService "resume") - // { - before = []; - after = ["systemd-suspend.service" "systemd-hibernate.service"]; - requiredBy = ["systemd-suspend.service" "systemd-hibernate.service"]; - }; - }) - (lib.mkIf cfg.nvidiaPersistenced { - "nvidia-persistenced" = { - description = "NVIDIA Persistence Daemon"; - wantedBy = ["multi-user.target"]; - serviceConfig = { - Type = "forking"; - Restart = "always"; - PIDFile = "/var/run/nvidia-persistenced/nvidia-persistenced.pid"; - ExecStart = "${lib.getExe nvidia_x11.persistenced} --verbose"; - ExecStopPost = "${pkgs.coreutils}/bin/rm -rf /var/run/nvidia-persistenced"; - }; + environment.systemPackages = + lib.optional cfg.nvidiaSettings nvidia_x11.settings + ++ lib.optional cfg.nvidiaPersistenced nvidia_x11.persistenced + ++ lib.optional offloadCfg.enableOffloadCmd + (pkgs.writeShellScriptBin "nvidia-offload" '' + export __NV_PRIME_RENDER_OFFLOAD=1 + export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 + export __GLX_VENDOR_LIBRARY_NAME=nvidia + export __VK_LAYER_NV_optimus=NVIDIA_only + exec "$@" + ''); + + systemd.packages = lib.optional cfg.powerManagement.enable nvidia_x11.out; + + systemd.services = let + nvidiaService = state: { + description = "NVIDIA system ${state} actions"; + path = [pkgs.kbd]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${nvidia_x11.out}/bin/nvidia-sleep.sh '${state}'"; }; - }) - (lib.mkIf cfg.dynamicBoost.enable { - "nvidia-powerd" = { - description = "nvidia-powerd service"; - path = [ - pkgs.util-linux # nvidia-powerd wants lscpu - ]; - wantedBy = ["multi-user.target"]; - serviceConfig = { - Type = "dbus"; - BusName = "nvidia.powerd.server"; - ExecStart = "${nvidia_x11.bin}/bin/nvidia-powerd"; + before = ["systemd-${state}.service"]; + requiredBy = ["systemd-${state}.service"]; + }; + in + lib.mkMerge [ + (lib.mkIf cfg.powerManagement.enable { + nvidia-suspend = nvidiaService "suspend"; + nvidia-hibernate = nvidiaService "hibernate"; + nvidia-resume = + (nvidiaService "resume") + // { + before = []; + after = ["systemd-suspend.service" "systemd-hibernate.service"]; + requiredBy = ["systemd-suspend.service" "systemd-hibernate.service"]; + }; + }) + (lib.mkIf cfg.nvidiaPersistenced { + "nvidia-persistenced" = { + description = "NVIDIA Persistence Daemon"; + wantedBy = ["multi-user.target"]; + serviceConfig = { + Type = "forking"; + Restart = "always"; + PIDFile = "/var/run/nvidia-persistenced/nvidia-persistenced.pid"; + ExecStart = "${lib.getExe nvidia_x11.persistenced} --verbose"; + ExecStopPost = "${pkgs.coreutils}/bin/rm -rf /var/run/nvidia-persistenced"; + }; }; - }; - }) - ]; - - services.acpid.enable = true; - - services.dbus.packages = lib.optional cfg.dynamicBoost.enable nvidia_x11.bin; - - hardware.firmware = lib.optional cfg.open nvidia_x11.firmware; - - systemd.tmpfiles.rules = - lib.optional config.virtualisation.docker.enableNvidia - "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin" - ++ lib.optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia) - "L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced"; - - boot = { - blacklistedKernelModules = ["nouveau" "nvidiafb"]; - - extraModulePackages = - if cfg.open - then [nvidia_x11.open] - else [nvidia_x11.bin]; - - # nvidia-uvm is required by CUDA applications. - kernelModules = - ["nvidia-uvm"] - ++ lib.optionals config.services.xserver.enable ["nvidia" "nvidia_modeset" "nvidia_drm"]; - - # If requested enable modesetting via kernel parameter. - kernelParams = - lib.optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1" - ++ lib.optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1" - ++ lib.optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1" - ++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && !ibtSupport) "ibt=off"; - - # enable finegrained power management - extraModprobeConfig = lib.optionalString cfg.powerManagement.finegrained '' - options nvidia "NVreg_DynamicPowerManagement=0x02" - ''; - }; - - services.udev.extraRules = - '' - # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. - KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'" - KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do mknod -m 666 /dev/nvidia$${i} c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) $${i}; done'" - KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'" - KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" - KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'" - '' - + lib.optionalString cfg.powerManagement.finegrained ( + }) + (lib.mkIf cfg.dynamicBoost.enable { + "nvidia-powerd" = { + description = "nvidia-powerd service"; + path = [ + pkgs.util-linux # nvidia-powerd wants lscpu + ]; + wantedBy = ["multi-user.target"]; + serviceConfig = { + Type = "dbus"; + BusName = "nvidia.powerd.server"; + ExecStart = "${nvidia_x11.bin}/bin/nvidia-powerd"; + }; + }; + }) + ]; + services.acpid.enable = true; + + services.dbus.packages = lib.optional cfg.dynamicBoost.enable nvidia_x11.bin; + + hardware.firmware = lib.optional cfg.open nvidia_x11.firmware; + + systemd.tmpfiles.rules = + lib.optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia) + "L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced"; + + boot = { + extraModulePackages = + if cfg.open + then [nvidia_x11.open] + else [nvidia_x11.bin]; + # nvidia-uvm is required by CUDA applications. + kernelModules = + lib.optionals config.services.xserver.enable ["nvidia" "nvidia_modeset" "nvidia_drm"]; + + # If requested enable modesetting via kernel parameter. + kernelParams = + lib.optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1" + ++ lib.optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1" + ++ lib.optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1" + ++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && !ibtSupport) "ibt=off"; + + # enable finegrained power management + extraModprobeConfig = lib.optionalString cfg.powerManagement.finegrained '' + options nvidia "NVreg_DynamicPowerManagement=0x02" + ''; + }; + services.udev.extraRules = + lib.optionalString cfg.powerManagement.finegrained ( lib.optionalString (lib.versionOlder config.boot.kernelPackages.kernel.version "5.5") '' # Remove NVIDIA USB xHCI Host Controller devices, if present ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{remove}="1" @@ -489,5 +570,30 @@ in { ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="on" '' ); - }; + }) + # Data Center + (lib.mkIf (cfg.datacenter.enable) { + boot.extraModulePackages = [ + nvidia_x11.bin + ]; + systemd.services.nvidia-fabricmanager = { + enable = true; + description = "Start NVIDIA NVLink Management"; + wantedBy = [ "multi-user.target" ]; + unitConfig.After = [ "network-online.target" ]; + unitConfig.Requires = [ "network-online.target" ]; + serviceConfig = { + Type = "forking"; + TimeoutStartSec = 240; + ExecStart = let + nv-fab-conf = settingsFormat.generate "fabricmanager.conf" cfg.datacenter.settings; + in + nvidia_x11.fabricmanager + "/bin/nv-fabricmanager -c " + nv-fab-conf; + LimitCORE="infinity"; + }; + }; + environment.systemPackages = + lib.optional cfg.datacenter.enable nvidia_x11.fabricmanager; + }) + ]); } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 018b9b6b44c5..05cf792e3fcb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1250,6 +1250,7 @@ ./services/web-apps/matomo.nix ./services/web-apps/mattermost.nix ./services/web-apps/mediawiki.nix + ./services/web-apps/meme-bingo-web.nix ./services/web-apps/miniflux.nix ./services/web-apps/monica.nix ./services/web-apps/moodle.nix diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 286faeadc489..7d3322ea5e50 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -81,7 +81,7 @@ in if [ "$TERM" != "dumb" ] || [ -n "$INSIDE_EMACS" ]; then PROMPT_COLOR="1;31m" ((UID)) && PROMPT_COLOR="1;32m" - if [ -n "$INSIDE_EMACS" ] || [ "$TERM" = "eterm" ] || [ "$TERM" = "eterm-color" ]; then + if [ -n "$INSIDE_EMACS" ]; then # Emacs term mode doesn't support xterm title escape sequence (\e]0;) PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] " else diff --git a/nixos/modules/security/acme/default.md b/nixos/modules/security/acme/default.md index 8ff97b55f685..31548ad181a7 100644 --- a/nixos/modules/security/acme/default.md +++ b/nixos/modules/security/acme/default.md @@ -189,7 +189,7 @@ security.acme.defaults.email = "admin+acme@example.com"; security.acme.certs."example.com" = { domain = "*.example.com"; dnsProvider = "rfc2136"; - credentialsFile = "/var/lib/secrets/certs.secret"; + environmentFile = "/var/lib/secrets/certs.secret"; # We don't need to wait for propagation since this is a local DNS server dnsPropagationCheck = false; }; @@ -256,7 +256,7 @@ security.acme.acceptTerms = true; security.acme.defaults.email = "admin+acme@example.com"; security.acme.defaults = { dnsProvider = "rfc2136"; - credentialsFile = "/var/lib/secrets/certs.secret"; + environmentFile = "/var/lib/secrets/certs.secret"; # We don't need to wait for propagation since this is a local DNS server dnsPropagationCheck = false; }; diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 222a25cf11dc..92bed172f452 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -362,8 +362,14 @@ let "/var/lib/acme/.lego/${cert}/${certDir}:/tmp/certificates" ]; - # Only try loading the credentialsFile if the dns challenge is enabled - EnvironmentFile = mkIf useDns data.credentialsFile; + # Only try loading the environmentFile if the dns challenge is enabled + EnvironmentFile = mkIf useDns data.environmentFile; + + Environment = mkIf useDns + (mapAttrsToList (k: v: ''"${k}=%d/${k}"'') data.credentialFiles); + + LoadCredential = mkIf useDns + (mapAttrsToList (k: v: "${k}:${v}") data.credentialFiles); # Run as root (Prefixed with +) ExecStartPost = "+" + (pkgs.writeShellScript "acme-postrun" '' @@ -496,6 +502,10 @@ let defaultText = if isDefaults then default else literalExpression "config.security.acme.defaults.${name}"; }; in { + imports = [ + (mkRenamedOptionModule [ "credentialsFile" ] [ "environmentFile" ]) + ]; + options = { validMinDays = mkOption { type = types.int; @@ -607,9 +617,9 @@ let ''; }; - credentialsFile = mkOption { + environmentFile = mkOption { type = types.nullOr types.path; - inherit (defaultAndText "credentialsFile" null) default defaultText; + inherit (defaultAndText "environmentFile" null) default defaultText; description = lib.mdDoc '' Path to an EnvironmentFile for the cert's service containing any required and optional environment variables for your selected dnsProvider. @@ -619,6 +629,24 @@ let example = "/var/src/secrets/example.org-route53-api-token"; }; + credentialFiles = mkOption { + type = types.attrsOf (types.path); + inherit (defaultAndText "credentialFiles" {}) default defaultText; + description = lib.mdDoc '' + Environment variables suffixed by "_FILE" to set for the cert's service + for your selected dnsProvider. + To find out what values you need to set, consult the documentation at + <https://go-acme.github.io/lego/dns/> for the corresponding dnsProvider. + This allows to securely pass credential files to lego by leveraging systemd + credentials. + ''; + example = literalExpression '' + { + "RFC2136_TSIG_SECRET_FILE" = "/run/secrets/tsig-secret-example.org"; + } + ''; + }; + dnsPropagationCheck = mkOption { type = types.bool; inherit (defaultAndText "dnsPropagationCheck" true) default defaultText; @@ -929,6 +957,13 @@ in { `security.acme.certs.${cert}.listenHTTP` must be provided. ''; } + { + assertion = all (hasSuffix "_FILE") (attrNames data.credentialFiles); + message = '' + Option `security.acme.certs.${cert}.credentialFiles` can only be + used for variables suffixed by "_FILE". + ''; + } ]) cfg.certs)); users.users.acme = { diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index a431817fe1bb..d83259ccbebc 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -1303,7 +1303,7 @@ in security.pam.enableEcryptfs = mkEnableOption (lib.mdDoc "eCryptfs PAM module (mounting ecryptfs home directory on login)"); security.pam.enableFscrypt = mkEnableOption (lib.mdDoc '' - Enables fscrypt to automatically unlock directories with the user's login password. + fscrypt to automatically unlock directories with the user's login password. This also enables a service at security.pam.services.fscrypt which is used by fscrypt to verify the user's password when setting up a new protector. If you diff --git a/nixos/modules/services/audio/tts.nix b/nixos/modules/services/audio/tts.nix index 1a355c8ee39f..0d93224ec030 100644 --- a/nixos/modules/services/audio/tts.nix +++ b/nixos/modules/services/audio/tts.nix @@ -134,6 +134,7 @@ in ProtectProc = "invisible"; ProcSubset = "pid"; RestrictAddressFamilies = [ + "AF_UNIX" "AF_INET" "AF_INET6" ]; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index e75239e059d3..702423ef09cd 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -33,8 +33,7 @@ let ${cfg.extraConfig} EOL - ssh-keygen -q -f mock-hostkey -N "" - sshd -t -f $out -h mock-hostkey + sshd -G -f $out ''; cfg = config.services.openssh; diff --git a/nixos/modules/services/networking/websockify.nix b/nixos/modules/services/networking/websockify.nix index 45a3487bd337..27ad8953d3fa 100644 --- a/nixos/modules/services/networking/websockify.nix +++ b/nixos/modules/services/networking/websockify.nix @@ -38,7 +38,7 @@ let cfg = config.services.networking.websockify; in { description = "Service to forward websocket connections to TCP connections (from port:to port %I)"; script = '' IFS=':' read -a array <<< "$1" - ${pkgs.pythonPackages.websockify}/bin/websockify --ssl-only \ + ${pkgs.python3Packages.websockify}/bin/websockify --ssl-only \ --cert=${cfg.sslCert} --key=${cfg.sslKey} 0.0.0.0:''${array[0]} 0.0.0.0:''${array[1]} ''; scriptArgs = "%i"; diff --git a/nixos/modules/services/web-apps/healthchecks.nix b/nixos/modules/services/web-apps/healthchecks.nix index b3fdb681e2f3..b92525075541 100644 --- a/nixos/modules/services/web-apps/healthchecks.nix +++ b/nixos/modules/services/web-apps/healthchecks.nix @@ -1,16 +1,16 @@ -{ config, lib, pkgs, buildEnv, ... }: +{ config, lib, options, pkgs, buildEnv, ... }: with lib; let defaultUser = "healthchecks"; cfg = config.services.healthchecks; + opt = options.services.healthchecks; pkg = cfg.package; boolToPython = b: if b then "True" else "False"; environment = { PYTHONPATH = pkg.pythonPath; STATIC_ROOT = cfg.dataDir + "/static"; - DB_NAME = "${cfg.dataDir}/healthchecks.sqlite"; } // cfg.settings; environmentFile = pkgs.writeText "healthchecks-environment" (lib.generators.toKeyValue { } environment); @@ -98,17 +98,24 @@ in description = lib.mdDoc '' Environment variables which are read by healthchecks `(local)_settings.py`. - Settings which are explicitly covered in options bewlow, are type-checked and/or transformed + Settings which are explicitly covered in options below, are type-checked and/or transformed before added to the environment, everything else is passed as a string. See <https://healthchecks.io/docs/self_hosted_configuration/> for a full documentation of settings. - We add two variables to this list inside the packages `local_settings.py.` - - STATIC_ROOT to set a state directory for dynamically generated static files. - - SECRET_KEY_FILE to read SECRET_KEY from a file at runtime and keep it out of /nix/store. + We add additional variables to this list inside the packages `local_settings.py.` + - `STATIC_ROOT` to set a state directory for dynamically generated static files. + - `SECRET_KEY_FILE` to read `SECRET_KEY` from a file at runtime and keep it out of + /nix/store. + - `_FILE` variants for several values that hold sensitive information in + [Healthchecks configuration](https://healthchecks.io/docs/self_hosted_configuration/) so + that they also can be read from a file and kept out of /nix/store. To see which values + have support for a `_FILE` variant, run: + - `nix-instantiate --eval --expr '(import <nixpkgs> {}).healthchecks.secrets'` + - or `nix eval 'nixpkgs#healthchecks.secrets'` if the flake support has been enabled. ''; - type = types.submodule { + type = types.submodule (settings: { freeformType = types.attrsOf types.str; options = { ALLOWED_HOSTS = lib.mkOption { @@ -143,8 +150,28 @@ in ''; apply = boolToPython; }; + + DB = mkOption { + type = types.enum [ "sqlite" "postgres" "mysql" ]; + default = "sqlite"; + description = lib.mdDoc "Database engine to use."; + }; + + DB_NAME = mkOption { + type = types.str; + default = + if settings.config.DB == "sqlite" + then "${cfg.dataDir}/healthchecks.sqlite" + else "hc"; + defaultText = lib.literalExpression '' + if config.${settings.options.DB} == "sqlite" + then "''${config.${opt.dataDir}}/healthchecks.sqlite" + else "hc" + ''; + description = lib.mdDoc "Database name."; + }; }; - }; + }); }; }; @@ -168,7 +195,7 @@ in StateDirectoryMode = mkIf (cfg.dataDir == "/var/lib/healthchecks") "0750"; }; in - { + { healthchecks-migration = { description = "Healthchecks migrations"; wantedBy = [ "healthchecks.target" ]; diff --git a/nixos/modules/services/web-apps/meme-bingo-web.nix b/nixos/modules/services/web-apps/meme-bingo-web.nix new file mode 100644 index 000000000000..cb864321ef27 --- /dev/null +++ b/nixos/modules/services/web-apps/meme-bingo-web.nix @@ -0,0 +1,93 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkEnableOption mkIf mkOption mdDoc types literalExpression; + + cfg = config.services.meme-bingo-web; +in { + options = { + services.meme-bingo-web = { + enable = mkEnableOption (mdDoc '' + A web app for the meme bingo, rendered entirely on the web server and made interactive with forms. + + Note: The application's author suppose to run meme-bingo-web behind a reverse proxy for SSL and HTTP/3. + ''); + + package = mkOption { + type = types.package; + default = pkgs.meme-bingo-web; + defaultText = literalExpression "pkgs.meme-bingo-web"; + description = mdDoc "meme-bingo-web package to use."; + }; + + baseUrl = mkOption { + description = mdDoc '' + URL to be used for the HTML <base> element on all HTML routes. + ''; + type = types.str; + default = "http://localhost:41678/"; + example = "https://bingo.example.com/"; + }; + port = mkOption { + description = mdDoc '' + Port to be used for the web server. + ''; + type = types.port; + default = 41678; + example = 21035; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.meme-bingo-web = { + description = "A web app for playing meme bingos."; + wantedBy = [ "multi-user.target" ]; + + environment = { + MEME_BINGO_BASE = cfg.baseUrl; + MEME_BINGO_PORT = toString cfg.port; + }; + path = [ cfg.package ]; + + serviceConfig = { + User = "meme-bingo-web"; + Group = "meme-bingo-web"; + + DynamicUser = true; + + ExecStart = "${cfg.package}/bin/meme-bingo-web"; + + Restart = "always"; + RestartSec = 1; + + # Hardening + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "/dev/random" ]; + LockPersonality = true; + PrivateDevices = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectSystem = "strict"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + UMask = "0077"; + RestrictSUIDSGID = true; + RemoveIPC = true; + NoNewPrivileges = true; + MemoryDenyWriteExecute = true; + }; + }; + }; +} diff --git a/nixos/modules/services/x11/window-managers/oroborus.nix b/nixos/modules/services/x11/window-managers/oroborus.nix deleted file mode 100644 index 654b8708e48f..000000000000 --- a/nixos/modules/services/x11/window-managers/oroborus.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.xserver.windowManager.oroborus; -in -{ - ###### interface - options = { - services.xserver.windowManager.oroborus.enable = mkEnableOption (lib.mdDoc "oroborus"); - }; - - ###### implementation - config = mkIf cfg.enable { - services.xserver.windowManager.session = singleton { - name = "oroborus"; - start = '' - ${pkgs.oroborus}/bin/oroborus & - waitPID=$! - ''; - }; - environment.systemPackages = [ pkgs.oroborus ]; - }; -} diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 1770f0759434..d9a1535ffc7d 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -147,7 +147,7 @@ in { default = false; type = types.bool; description = lib.mdDoc '' - Make MemTest86+ available from the systemd-boot menu. MemTest86+ is a + Make Memtest86+ available from the systemd-boot menu. Memtest86+ is a program for testing memory. ''; }; @@ -191,7 +191,7 @@ in { default = {}; example = literalExpression '' { "memtest86.conf" = ''' - title MemTest86+ + title Memtest86+ efi /efi/memtest86/memtest.efi '''; } ''; @@ -285,7 +285,7 @@ in { boot.loader.systemd-boot.extraEntries = mkMerge [ (mkIf cfg.memtest86.enable { "${cfg.memtest86.entryFilename}" = '' - title MemTest86 + title Memtest86+ efi /efi/memtest86/memtest.efi ''; }) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 87afc5023253..238c6670ea0f 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -902,6 +902,9 @@ let "RelayTarget" "RelayAgentCircuitId" "RelayAgentRemoteId" + "BootServerAddress" + "BootServerName" + "BootFilename" ]) (assertInt "PoolOffset") (assertMinimum "PoolOffset" 0) diff --git a/nixos/modules/tasks/bcache.nix b/nixos/modules/tasks/bcache.nix index 35b922dc8a1d..68531a4d2fed 100644 --- a/nixos/modules/tasks/bcache.nix +++ b/nixos/modules/tasks/bcache.nix @@ -1,6 +1,10 @@ -{ config, lib, pkgs, ... }: - -{ +{ config, lib, pkgs, ... }: let + cfg = config.boot.bcache; +in { + options.boot.bcache.enable = lib.mkEnableOption (lib.mdDoc "bcache mount support") // { + default = true; + example = false; + }; options.boot.initrd.services.bcache.enable = lib.mkEnableOption (lib.mdDoc "bcache support in the initrd") // { description = lib.mdDoc '' *This will only be used when systemd is used in stage 1.* @@ -9,7 +13,7 @@ ''; }; - config = { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.bcache-tools ]; diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix index 8985660d80a7..1174187062d7 100644 --- a/nixos/modules/tasks/swraid.nix +++ b/nixos/modules/tasks/swraid.nix @@ -67,7 +67,7 @@ in { $out/bin/mdadm --version ''; - extraFiles."/etc/mdadm.conf" = mdadm_conf; + extraFiles."/etc/mdadm.conf".source = pkgs.writeText "mdadm.conf" mdadm_conf.text; systemd = { contents."/etc/mdadm.conf".text = mdadm_conf.text; diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index f255c655bffc..e5f2d4c7934a 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -18,7 +18,7 @@ dnsConfig = nodes: { dnsProvider = "exec"; dnsPropagationCheck = false; - credentialsFile = pkgs.writeText "wildcard.env" '' + environmentFile = pkgs.writeText "wildcard.env" '' EXEC_PATH=${dnsScript nodes} EXEC_POLLING_INTERVAL=1 EXEC_PROPAGATION_TIMEOUT=1 diff --git a/nixos/tests/fontconfig-default-fonts.nix b/nixos/tests/fontconfig-default-fonts.nix index d8c6ea0f721b..293dc43f91f3 100644 --- a/nixos/tests/fontconfig-default-fonts.nix +++ b/nixos/tests/fontconfig-default-fonts.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ lib, ... }: nodes.machine = { config, pkgs, ... }: { fonts.enableDefaultPackages = true; # Background fonts fonts.packages = with pkgs; [ - noto-fonts-emoji + noto-fonts-color-emoji cantarell-fonts twitter-color-emoji source-code-pro diff --git a/nixos/tests/noto-fonts.nix b/nixos/tests/noto-fonts.nix index edbb0db4cb7a..b871f5f51729 100644 --- a/nixos/tests/noto-fonts.nix +++ b/nixos/tests/noto-fonts.nix @@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif - noto-fonts-emoji + noto-fonts-color-emoji ]; fontconfig.defaultFonts = { serif = [ "Noto Serif" "Noto Serif CJK SC" ]; diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index 9d81ebaad85f..d0685abc510c 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { { pkgs, ... }: { - services.postgresql = let mypg = pkgs.postgresql_11; in { + services.postgresql = let mypg = pkgs.postgresql; in { enable = true; package = mypg; extraPlugins = with mypg.pkgs; [ diff --git a/nixos/tests/systemd-initrd-swraid.nix b/nixos/tests/systemd-initrd-swraid.nix index cb5b1cb4f535..d00e67b5705a 100644 --- a/nixos/tests/systemd-initrd-swraid.nix +++ b/nixos/tests/systemd-initrd-swraid.nix @@ -32,6 +32,9 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { }; specialisation.boot-swraid.configuration.virtualisation.rootDevice = "/dev/disk/by-label/testraid"; + # This protects against a regression. We do not have to switch to it. + # It's sufficient to trigger its evaluation. + specialisation.build-old-initrd.configuration.boot.initrd.systemd.enable = lib.mkForce false; }; testScript = '' diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index d2a62142144e..225970b8018e 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -28,12 +28,11 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "23.02"; + version = "23.07"; src = fetchurl { - url = - "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}+deps.tar.xz"; - sha256 = "sha256-5vEWTkEXIMG/re7Ex+YKh+ETLDuc2nihTPpYSg5LdRo="; + url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; + hash = "sha256-Ng2E6ML9lffmdGgn9piIF3ko4uvV/uLDb3d7ytrfcLU="; }; prePatch = '' @@ -51,6 +50,7 @@ stdenv.mkDerivation rec { makeWrapper python3 ]; + buildInputs = [ dbus fftwFloat @@ -76,6 +76,9 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/Cardinal \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]} + wrapProgram $out/bin/CardinalMini \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]} + # this doesn't work and is mainly just a test tool for the developers anyway. rm -f $out/bin/CardinalNative ''; diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index cd2d050c9a96..4bf9380e3568 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals withSixel [ libsixel ] ++ lib.optionals (withAudioBackend == "alsa") [ alsa-lib ] ++ lib.optionals (withAudioBackend == "pulseaudio") [ libpulseaudio ] - ++ lib.optionals (withAudioBackend == "rodio") [ alsa-lib ] + ++ lib.optionals (withAudioBackend == "rodio" && stdenv.isLinux) [ alsa-lib ] ++ lib.optionals (withAudioBackend == "portaudio") [ portaudio ] ++ lib.optionals (withAudioBackend == "jackaudio") [ libjack2 ] ++ lib.optionals (withAudioBackend == "rodiojack") [ alsa-lib libjack2 ] diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index 2c3b4283a6a1..557d43603786 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tidal-hifi"; - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-fA6zXmLfcZJt5/umdY4gdqGdbH3afsaanmK/i+Js5HQ="; + sha256 = "sha256-7wBQgoglLS67aiQsF9iUeFoJDDqq0fJgu5BSyH+HI7M="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index b322e19098cc..d3aabb739ec8 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -65,7 +65,7 @@ , withNativeCompilation ? if nativeComp != null then lib.warn "nativeComp option is deprecated and will be removed; use withNativeCompilation instead" nativeComp - else true + else stdenv.buildPlatform.canExecute stdenv.hostPlatform , noGui ? false , srcRepo ? true , withAcl ? false @@ -405,6 +405,6 @@ mkDerivation (finalAttrs: { }; meta = meta // { - broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); + broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); }; }) diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index 4e61777424c1..c844e703e385 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -68,7 +68,9 @@ least specific (the system profile)" ;; TODO: We should also add the other `NIX_PROFILES' to this path. ;; However, these are user-specific, so we would need to discover ;; them dynamically after connecting via `tramp' - '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) + '(progn + (add-to-list 'tramp-remote-path "/run/current-system/sw/bin") + (add-to-list 'tramp-remote-path "/run/wrappers/bin"))) ;;; C source directory ;;; diff --git a/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile b/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile index c3f096edcad1..5a1f1d091a6b 100644 --- a/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile +++ b/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile @@ -1,6 +1,2 @@ source 'https://rubygems.org' -gem 'sensu' -gem 'iruby' -gem 'cztop' -gem 'ffi-rzmq' -gem 'rbczmq' +gem 'iruby', "0.7.4" diff --git a/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile.lock b/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile.lock index 89f60a6dbdce..5d59b8e03df0 100644 --- a/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile.lock +++ b/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile.lock @@ -1,119 +1,35 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) - amq-protocol (2.0.1) - amqp (1.6.0) - amq-protocol (>= 2.0.1) - eventmachine - bond (0.5.1) - childprocess (0.5.8) - ffi (~> 1.0, >= 1.0.11) - cookiejar (0.3.3) - czmq-ffi-gen (0.15.0) - ffi (~> 1.9.10) - cztop (0.13.1) - czmq-ffi-gen (~> 0.15.0) data_uri (0.1.0) - em-http-request (1.1.5) - addressable (>= 2.3.4) - cookiejar (!= 0.3.1) - em-socksify (>= 0.3) - eventmachine (>= 1.0.3) - http_parser.rb (>= 0.6.0) - em-http-server (0.1.8) - eventmachine - em-socksify (0.3.2) - eventmachine (>= 1.0.0.beta.4) - em-worker (0.0.2) - eventmachine - eventmachine (1.2.7) - ffi (1.9.21) + ffi (1.15.5) ffi-rzmq (2.0.7) ffi-rzmq-core (>= 1.0.7) ffi-rzmq-core (1.0.7) ffi - http_parser.rb (0.6.0) - iruby (0.3) - bond (~> 0.5) + io-console (0.6.0) + irb (1.7.4) + reline (>= 0.3.6) + iruby (0.7.4) data_uri (~> 0.1) - mimemagic (~> 0.3) + ffi-rzmq + irb + mime-types (>= 3.3.1) multi_json (~> 1.11) - mimemagic (0.3.3) - multi_json (1.13.1) - oj (2.18.1) - parse-cron (0.1.4) - public_suffix (3.0.3) - rbczmq (1.7.9) - sensu (1.6.2) - em-http-request (= 1.1.5) - em-http-server (= 0.1.8) - eventmachine (= 1.2.7) - parse-cron (= 0.1.4) - sensu-extension (= 1.5.2) - sensu-extensions (= 1.10.0) - sensu-json (= 2.1.1) - sensu-logger (= 1.2.2) - sensu-redis (= 2.4.0) - sensu-settings (= 10.14.0) - sensu-spawn (= 2.5.0) - sensu-transport (= 8.2.0) - sensu-extension (1.5.2) - eventmachine - sensu-extensions (1.10.0) - sensu-extension - sensu-extensions-check-dependencies (= 1.1.0) - sensu-extensions-debug (= 1.0.0) - sensu-extensions-json (= 1.0.0) - sensu-extensions-occurrences (= 1.2.0) - sensu-extensions-only-check-output (= 1.0.0) - sensu-extensions-ruby-hash (= 1.0.0) - sensu-json (>= 1.1.0) - sensu-logger - sensu-settings - sensu-extensions-check-dependencies (1.1.0) - sensu-extension - sensu-extensions-debug (1.0.0) - sensu-extension - sensu-extensions-json (1.0.0) - sensu-extension - sensu-extensions-occurrences (1.2.0) - sensu-extension - sensu-extensions-only-check-output (1.0.0) - sensu-extension - sensu-extensions-ruby-hash (1.0.0) - sensu-extension - sensu-json (2.1.1) - oj (= 2.18.1) - sensu-logger (1.2.2) - eventmachine - sensu-json - sensu-redis (2.4.0) - eventmachine - sensu-settings (10.14.0) - parse-cron - sensu-json (>= 1.1.0) - sensu-spawn (2.5.0) - childprocess (= 0.5.8) - em-worker (= 0.0.2) - eventmachine - ffi (= 1.9.21) - sensu-transport (8.2.0) - amq-protocol (= 2.0.1) - amqp (= 1.6.0) - eventmachine - sensu-redis (>= 1.0.0) + native-package-installer + mime-types (3.5.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2023.0808) + multi_json (1.15.0) + native-package-installer (1.1.8) + reline (0.3.8) + io-console (~> 0.5) PLATFORMS ruby DEPENDENCIES - cztop - ffi-rzmq - iruby - rbczmq - sensu + iruby (= 0.7.4) BUNDLED WITH - 1.17.2 + 2.4.19 diff --git a/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix b/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix index 59630f0a53d0..314b78be4bd1 100644 --- a/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix +++ b/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix @@ -1,89 +1,4 @@ { - addressable = { - dependencies = ["public_suffix"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; - type = "gem"; - }; - version = "2.6.0"; - }; - amq-protocol = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rpn9vgh7y037aqhhp04smihzr73vp5i5g6xlqlha10wy3q0wp7x"; - type = "gem"; - }; - version = "2.0.1"; - }; - amqp = { - dependencies = ["amq-protocol" "eventmachine"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kbrqnpjgj9v0722p3n5rw589l4g26ry8mcghwc5yr20ggkpdaz9"; - type = "gem"; - }; - version = "1.6.0"; - }; - bond = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r19ifc4skyl2gxnifrxa5jvbbay9fb2in79ppgv02b6n4bhsw90"; - type = "gem"; - }; - version = "0.5.1"; - }; - childprocess = { - dependencies = ["ffi"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lv7axi1fhascm9njxh3lx1rbrnsm8wgvib0g7j26v4h1fcphqg0"; - type = "gem"; - }; - version = "0.5.8"; - }; - cookiejar = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0q0kmbks9l3hl0wdq744hzy97ssq9dvlzywyqv9k9y1p3qc9va2a"; - type = "gem"; - }; - version = "0.3.3"; - }; - czmq-ffi-gen = { - dependencies = ["ffi"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ngsd1yxiayd50v402vwhmq7ma9ang6pcba5kqiwq7smpdvfmbmp"; - type = "gem"; - }; - version = "0.15.0"; - }; - cztop = { - dependencies = ["czmq-ffi-gen"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12xcz7g42dbp2ryhcwdm2ykj7bmwfhjhla296hy18g7a09zlfnz7"; - type = "gem"; - }; - version = "0.13.1"; - }; data_uri = { groups = ["default"]; platforms = []; @@ -94,69 +9,15 @@ }; version = "0.1.0"; }; - em-http-request = { - dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13rxmbi0fv91n4sg300v3i9iiwd0jxv0i6xd0sp81dx3jlx7kasx"; - type = "gem"; - }; - version = "1.1.5"; - }; - em-http-server = { - dependencies = ["eventmachine"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0y8l4gymy9dzjjchjav90ck6has2i2zdjihlhcyrg3jgq6kjzyq5"; - type = "gem"; - }; - version = "0.1.8"; - }; - em-socksify = { - dependencies = ["eventmachine"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rk43ywaanfrd8180d98287xv2pxyl7llj291cwy87g1s735d5nk"; - type = "gem"; - }; - version = "0.3.2"; - }; - em-worker = { - dependencies = ["eventmachine"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk"; - type = "gem"; - }; - version = "0.0.2"; - }; - eventmachine = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; - type = "gem"; - }; - version = "1.2.7"; - }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2dl10pi6a30kcvx2s6p2v1wb4kbm48iv38kmz2ff600nirhpb8"; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; type = "gem"; }; - version = "1.9.21"; + version = "1.15.5"; }; ffi-rzmq = { dependencies = ["ffi-rzmq-core"]; @@ -180,250 +41,88 @@ }; version = "1.0.7"; }; - "http_parser.rb" = { + io-console = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + sha256 = "0dikardh14c72gd9ypwh8dim41wvqmzfzf35mincaj5yals9m7ff"; type = "gem"; }; version = "0.6.0"; }; - iruby = { - dependencies = ["bond" "data_uri" "mimemagic" "multi_json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wdf2c0x8y6cya0n3y0p3p7b1sxkb2fdavdn2k58rf4rs37s7rzn"; - type = "gem"; - }; - version = "0.3"; - }; - mimemagic = { + irb = { + dependencies = ["reline"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04cp5sfbh1qx82yqxn0q75c7hlcx8y1dr5g3kyzwm4mx6wi2gifw"; + sha256 = "158ca10kj3qqnql5g8f1g2arsnhgdl79mg74manpf8ldkwjjn3n8"; type = "gem"; }; - version = "0.3.3"; + version = "1.7.4"; }; - multi_json = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; - type = "gem"; - }; - version = "1.13.1"; - }; - oj = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "147whmq8h2n04chskl3v4a132xhz5i6kk6vhnz83jwng4vihin5f"; - type = "gem"; - }; - version = "2.18.1"; - }; - parse-cron = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02fj9i21brm88nb91ikxwxbwv9y7mb7jsz6yydh82rifwq7357hg"; - type = "gem"; - }; - version = "0.1.4"; - }; - public_suffix = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; - type = "gem"; - }; - version = "3.0.3"; - }; - rbczmq = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1bqr44m2nb61smza6y5cahp09hk16lsn0z3wpq9g5zpr9nhp50fx"; - type = "gem"; - }; - version = "1.7.9"; - }; - sensu = { - dependencies = ["em-http-request" "em-http-server" "eventmachine" "parse-cron" "sensu-extension" "sensu-extensions" "sensu-json" "sensu-logger" "sensu-redis" "sensu-settings" "sensu-spawn" "sensu-transport"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rxv6yj63nkxlzmmqk6qpfpcvrbar9s4sd4kgfb5zsv9bw7236cr"; - type = "gem"; - }; - version = "1.6.2"; - }; - sensu-extension = { - dependencies = ["eventmachine"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bpizp4n01rv72cryjjlrbfxxj3csish3mkxjzdy4inpi5j5h1dw"; - type = "gem"; - }; - version = "1.5.2"; - }; - sensu-extensions = { - dependencies = ["sensu-extension" "sensu-extensions-check-dependencies" "sensu-extensions-debug" "sensu-extensions-json" "sensu-extensions-occurrences" "sensu-extensions-only-check-output" "sensu-extensions-ruby-hash" "sensu-json" "sensu-logger" "sensu-settings"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04v221qjv8qy3jci40i66p63ig5vrrh0dpgmf1l8229x5m7bxrsg"; - type = "gem"; - }; - version = "1.10.0"; - }; - sensu-extensions-check-dependencies = { - dependencies = ["sensu-extension"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hc4kz7k983f6fk27ikg5drvxm4a85qf1k07hqssfyk3k75jyj1r"; - type = "gem"; - }; - version = "1.1.0"; - }; - sensu-extensions-debug = { - dependencies = ["sensu-extension"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11abdgn2kkkbvxq4692yg6a27qnxz4349gfiq7d35biy7vrw34lp"; - type = "gem"; - }; - version = "1.0.0"; - }; - sensu-extensions-json = { - dependencies = ["sensu-extension"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wnbn9sycdqdh9m0fhszaqkv0jijs3fkdbvcv8kdspx6irbv3m6g"; - type = "gem"; - }; - version = "1.0.0"; - }; - sensu-extensions-occurrences = { - dependencies = ["sensu-extension"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lx5wsbblfs0rvkxfg09bsz0g2mwmckrhga7idnarsnm8m565v1v"; - type = "gem"; - }; - version = "1.2.0"; - }; - sensu-extensions-only-check-output = { - dependencies = ["sensu-extension"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ds2i8wd4ji9ifig2zzr4jpxinvk5dm7j10pvaqy4snykxa3rqh3"; - type = "gem"; - }; - version = "1.0.0"; - }; - sensu-extensions-ruby-hash = { - dependencies = ["sensu-extension"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xyrj3gbmslbivcd5qcmyclgapn7qf7f5jwfvfpw53bxzib0h7s3"; - type = "gem"; - }; - version = "1.0.0"; - }; - sensu-json = { - dependencies = ["oj"]; + iruby = { + dependencies = ["data_uri" "ffi-rzmq" "irb" "mime-types" "multi_json" "native-package-installer"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08zlxg5j3bhs72cc7wcllp026jbif0xiw6ib1cgawndlpsfl9fgx"; + sha256 = "0856ncjk7akm55gxcnhfmv426xsl4ryywdxrqbwgphwpqwm9w8fc"; type = "gem"; }; - version = "2.1.1"; + version = "0.7.4"; }; - sensu-logger = { - dependencies = ["eventmachine" "sensu-json"]; + mime-types = { + dependencies = ["mime-types-data"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jpw4kz36ilaknrzb3rbkhpbgv93w2d668z2cv395dq30d4d3iwm"; + sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; type = "gem"; }; - version = "1.2.2"; + version = "3.5.1"; }; - sensu-redis = { - dependencies = ["eventmachine"]; + mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0widfmmj1h9ca2kk14wy1sqmlkq40linp89a73s3ghngnzri0xyk"; + sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a"; type = "gem"; }; - version = "2.4.0"; + version = "3.2023.0808"; }; - sensu-settings = { - dependencies = ["parse-cron" "sensu-json"]; + multi_json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "152n4hazv2l4vbzrgd316rpj135jmz042fyh6k2yv2kw0x29pi0f"; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; - version = "10.14.0"; + version = "1.15.0"; }; - sensu-spawn = { - dependencies = ["childprocess" "em-worker" "eventmachine" "ffi"]; + native-package-installer = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17yc8ivjpjbvig9r7yl6991d6ma0kcq75fbpz6i856ljvcr3lmd5"; + sha256 = "004wx9xhcam92g1d4ybvrl1yqablm2svalyck9sq4igy9nwkz9nb"; type = "gem"; }; - version = "2.5.0"; + version = "1.1.8"; }; - sensu-transport = { - dependencies = ["amq-protocol" "amqp" "eventmachine" "sensu-redis"]; + reline = { + dependencies = ["io-console"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x6vyfmg1jm1srf7xa5aka73by7qwcmry2rx8kq8phwa4g0v4mzr"; + sha256 = "0lv1nv7z63n4qmsm3h5h273m7daxngkcq8ynkk9j8lmn7jji98lb"; type = "gem"; }; - version = "8.2.0"; + version = "0.3.8"; }; } diff --git a/pkgs/applications/editors/jupyter-kernels/iruby/update.sh b/pkgs/applications/editors/jupyter-kernels/iruby/update.sh new file mode 100755 index 000000000000..11ae225a79b5 --- /dev/null +++ b/pkgs/applications/editors/jupyter-kernels/iruby/update.sh @@ -0,0 +1,18 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq bundler bundix ruby + +set -eu -o pipefail + +cd "$(dirname "$0")" + +# Update Gemfile with the latest iruby version +echo "source 'https://rubygems.org'" > Gemfile +echo -n "gem 'iruby', " >> Gemfile +curl https://rubygems.org/api/v1/gems/iruby.json | jq .version >> Gemfile + +# Regenerate Gemfile.lock +export BUNDLE_FORCE_RUBY_PLATFORM=1 +bundle lock + +# Regenerate gemset.nix +bundix -l diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 3b948d798760..8e23c361d47f 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -11,6 +11,8 @@ , substituteAll # Language dependencies +, fetchYarnDeps +, mkYarnModules , python3 , rustPlatform @@ -730,8 +732,14 @@ self: super: { markdown-preview-nvim = let # We only need its dependencies `node-modules`. - nodeDep = nodePackages."markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim".overrideAttrs { - dontNpmInstall = true; + nodeDep = mkYarnModules rec { + inherit (super.markdown-preview-nvim) pname version; + packageJSON = ./markdown-preview-nvim/package.json; + yarnLock = "${super.markdown-preview-nvim.src}/yarn.lock"; + offlineCache = fetchYarnDeps { + inherit yarnLock; + hash = "sha256-kzc9jm6d9PJ07yiWfIOwqxOTAAydTpaLXVK6sEWM8gg="; + }; }; in super.markdown-preview-nvim.overrideAttrs { patches = [ @@ -741,7 +749,7 @@ self: super: { }) ]; postInstall = '' - ln -s ${nodeDep}/lib/node_modules/markdown-preview/node_modules $out/app + ln -s ${nodeDep}/node_modules $out/app ''; nativeBuildInputs = [ nodejs ]; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 092cddd6276a..1d4f7b0c8eb5 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1224,8 +1224,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.15.2"; - sha256 = "sha256-Zu/AcV0KY3QV0hyZsGrQdbc/Qc0pKNHVkHZVJ3PL0ps="; + version = "0.16.0"; + sha256 = "sha256-PZUyOZ/U6OkGid+PYY2G/pAe5R5eumUibKNel9HBI+s="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index b1f0451cc174..5d311de422f9 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -97,7 +97,7 @@ in homepage = "https://code.visualstudio.com/"; downloadPage = "https://code.visualstudio.com/Updates"; license = licenses.unfree; - maintainers = with maintainers; [ eadwu synthetica maxeaubrey bobby285271 Enzime ]; + maintainers = with maintainers; [ eadwu synthetica amaxine bobby285271 Enzime ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index a07d899ee749..7611a8860b91 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -842,6 +842,16 @@ in }; }; + same_cdi = mkLibretroCore { + core = "same_cdi"; + extraNativeBuildInputs = [ python3 ]; + extraBuildInputs = [ alsa-lib libGLU libGL portaudio xorg.libX11 ]; + meta = { + description = "SAME_CDI is a libretro core to play CD-i games"; + license = with lib.licenses; [ bsd3 gpl2Plus ]; + }; + }; + scummvm = mkLibretroCore rec { core = "scummvm"; version = "unstable-2022-04-06"; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 410e782d0a93..9e38d15cac89 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -412,6 +412,12 @@ "rev": "75d501a87ec2074e8d2f7256fb0359513c263c29", "hash": "sha256-yAHVTgOt8SGyPXihp4YNKKAvxl9VBBAvHyzLW86zSCw=" }, + "same_cdi": { + "owner": "libretro", + "repo": "same_cdi", + "rev": "54cf493c2dee4c46666059c452f8aaaa0bd7c8e0", + "hash": "sha256-/+4coMzj/o82Q04Z65DQiPaykK6N56W6PRQLtyJOd8E=" + }, "sameboy": { "owner": "libretro", "repo": "sameboy", diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py index a091958c38b0..76147ccf20f4 100755 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ b/pkgs/applications/emulators/retroarch/update_cores.py @@ -81,6 +81,7 @@ CORES = { "puae": {"repo": "libretro-uae"}, "quicknes": {"repo": "QuickNES_Core"}, "sameboy": {"repo": "sameboy"}, + "same_cdi": {"repo": "same_cdi"}, "scummvm": {"repo": "scummvm"}, "smsplus-gx": {"repo": "smsplus-gx"}, "snes9x": {"repo": "snes9x", "owner": "snes9xgit"}, diff --git a/pkgs/applications/graphics/lutgen/default.nix b/pkgs/applications/graphics/lutgen/default.nix new file mode 100644 index 000000000000..5b5af34cdc9a --- /dev/null +++ b/pkgs/applications/graphics/lutgen/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "lutgen"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "ozwaldorf"; + repo = "lutgen-rs"; + rev = "v${version}"; + hash = "sha256-9olBUPOi6ZQorgPxQX2lqZSlYjEPMwfhUF/Ze34v0nc="; + }; + + cargoHash = "sha256-hMbrzjfLSawrm+GmtLx7sQ7atr1aV2RU9rJXgun6HR8="; + + meta = with lib; { + description = "A blazingly fast interpolated LUT generator and applicator for arbitrary and popular color palettes"; + homepage = "https://github.com/ozwaldorf/lutgen-rs"; + maintainers = with maintainers; [ zzzsy ]; + mainProgram = "lutgen"; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index 24732eee9e3a..d197fdadc369 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation rec { pname = "megapixels"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitLab { owner = "postmarketOS"; repo = "megapixels"; rev = version; - hash = "sha256-ZkTDHDL5nhpR8PKqia12pbrEZLnRXEm8DwBYdYrP5Qo="; + hash = "sha256-ejTCYZMDkqz8P3vroq8XAl+pUGgcS56cm3tzOTE3rfc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index cf2ac98bc090..1539c1693e64 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -59,7 +59,7 @@ let homepage = "https://1password.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; + maintainers = with maintainers; [ timstott savannidgerinel amaxine sebtm ]; platforms = builtins.attrNames sources.${channel}; mainProgram = "1password"; }; diff --git a/pkgs/applications/misc/OSCAR/default.nix b/pkgs/applications/misc/OSCAR/default.nix index 3d8ea9119544..fee0c79cd5d9 100644 --- a/pkgs/applications/misc/OSCAR/default.nix +++ b/pkgs/applications/misc/OSCAR/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }: mkDerivation rec { pname = "OSCAR"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitLab { owner = "pholy"; repo = "OSCAR-code"; rev = "v${version}"; - sha256 = "sha256-bgETkpyL0yhCD1FfTVN0s9RNOPkDp88W/1Gdxvu+Ons="; + sha256 = "sha256-eaj2/ioh9dXxWv7X/IZv7m/oVcU6t7r+mK5YrrViF2w="; }; buildInputs = [ qtbase qttools qtserialport libGLU ]; diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix index 199e89dc0ba5..95a439b67539 100644 --- a/pkgs/applications/misc/authy/default.nix +++ b/pkgs/applications/misc/authy/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "authy"; # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version' - version = "2.3.0"; - rev = "19"; + version = "2.4.1"; + rev = "21"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap"; - hash = "sha256-WN/vcY3kfF/HQZ7opyIdDevU5oDYDGjshS7XVU7yrj8="; + hash = "sha256-a5z6Lwdgody88f7has/f2AMg9m9fGWsJSexZM6KUGOY="; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ]; diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/applications/misc/camunda-modeler/default.nix index e42f022df7f2..aa588dee6cbd 100644 --- a/pkgs/applications/misc/camunda-modeler/default.nix +++ b/pkgs/applications/misc/camunda-modeler/default.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.13.0"; + version = "5.14.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-/9Af/1ZP2Hkc0PP9yXObNDNmxe6riBNWSv+JaM7O5Vs="; + hash = "sha256-zGxuvS4T1olMH+QOqrPcsFjfO3PDERmFQOa+ISN9u0c="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 4b5ee339b1ab..5c6614b98263 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -38,6 +38,7 @@ buildPythonApplication rec { homepage = "https://github.com/mikf/gallery-dl"; changelog = "https://github.com/mikf/gallery-dl/blob/v${version}/CHANGELOG.md"; license = licenses.gpl2Only; + mainProgram = "gallery-dl"; maintainers = with maintainers; [ dawidsowa marsam ]; }; } diff --git a/pkgs/applications/misc/markmind/default.nix b/pkgs/applications/misc/markmind/default.nix deleted file mode 100644 index e44b7fe54ad5..000000000000 --- a/pkgs/applications/misc/markmind/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }: - -stdenv.mkDerivation rec { - pname = "markmind"; - version = "1.3.1"; - - src = fetchurl { - url = "https://github.com/MarkMindCkm/Mark-Mind/releases/download/v${version}/Mark.Mind-${version}.AppImage"; - sha256 = "sha256-iOJ0IOIzleA69rv94Qd35rMbHc+XSi8OPatf2V6sYrI="; - }; - - appimageContents = appimageTools.extractType2 { - name = "markmind-${version}"; - inherit src; - }; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/markmind $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/markmind - cp -a ${appimageContents}/mind.desktop $out/share/applications/markmind.desktop - cp -a ${appimageContents}/usr/share/icons $out/share - substituteInPlace $out/share/applications/markmind.desktop \ - --replace 'Exec=AppRun' 'Exec=markmind' - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/markmind \ - --add-flags $out/share/markmind/resources/app.asar - ''; - - meta = with lib; { - description = "Mind map and outliner editor"; - homepage = "https://github.com/MarkMindCkm/Mark-Mind"; - license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 74ab67739d02..ed08ee5c09ea 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "mob"; - version = "4.4.5"; + version = "4.4.6"; src = fetchFromGitHub { owner = "remotemobprogramming"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/Kr5K0QkjARWKR8YhDsOQ2CoUzUu5LWUq6smhB0yDCM="; + sha256 = "sha256-UunFfP0Rn4t8lSJiubbqZ0bImK9OhIdC0gSGbkg6Ohw="; }; vendorHash = null; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 38736866b242..cb9b1a7f6aa8 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,20 +12,20 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.4.5"; + version = "1.4.11"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; license = licenses.obsidian; - maintainers = with maintainers; [ atila conradmearns zaninime qbit ]; + maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 ]; }; filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-1xGlXjQrJ8gNtKYlCBiIfNnTZU591JZdU6NJqMA5gug=" else "sha256-Y/RlT+3xBbF9tjCbRQnQ+j8ogzLMfsQPnOdiCVj+NK0="; + sha256 = if stdenv.isDarwin then "sha256-bJLWXdeVzbVrb8jmIRpyQG6a5H1jMydhO9ioHOGk3Ms=" else "sha256-Z4DojO90PAlGGsItcZugPsi+48UPnOjvCn2BIzrDQpc="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/pomotroid/default.nix b/pkgs/applications/misc/pomotroid/default.nix deleted file mode 100644 index dfe76aa92f4c..000000000000 --- a/pkgs/applications/misc/pomotroid/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv, lib, fetchurl, makeWrapper, makeDesktopItem, copyDesktopItems, electron }: - -let - version = "0.13.0"; - appIcon = fetchurl { - url = "https://raw.githubusercontent.com/Splode/pomotroid/v${version}/static/icon.png"; - sha256 = "sha256-BEPoOBErw5ZCeK4rtdxdwZZLimbpglu1Cu++4xzuVUs="; - }; - -in stdenv.mkDerivation rec { - pname = "pomotroid"; - inherit version; - - src = fetchurl { - url = "https://github.com/Splode/pomotroid/releases/download/v${version}/${pname}-${version}-linux.tar.gz"; - sha256 = "sha256-AwpVnvwWQd/cgmZvtr5NprnLyeXz6ym4Fywc808tcSc="; - }; - - nativeBuildInputs = [ - makeWrapper - copyDesktopItems - ]; - - desktopItems = [ - (makeDesktopItem { - name = pname; - exec = "pomotroid"; - icon = "pomotroid"; - comment = meta.description; - desktopName = "Pomotroid"; - genericName = "Pomodoro Application"; - }) - ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/opt/pomotroid $out/share/pomotroid $out/share/pixmaps - - cp -r ./ $out/opt/pomotroid - mv $out/opt/pomotroid/{locales,resources} $out/share/pomotroid - cp ${appIcon} $out/share/pixmaps/pomotroid.png - - makeWrapper ${electron}/bin/electron $out/bin/pomotroid \ - --add-flags $out/share/pomotroid/resources/app.asar - - runHook postInstall - ''; - - meta = with lib; { - description = "Simple and visually-pleasing Pomodoro timer"; - homepage = "https://splode.github.io/pomotroid"; - license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/misc/retool/default.nix b/pkgs/applications/misc/retool/default.nix index a88e719c6ddd..8d7811120979 100644 --- a/pkgs/applications/misc/retool/default.nix +++ b/pkgs/applications/misc/retool/default.nix @@ -19,17 +19,18 @@ python3.pkgs.buildPythonApplication { hash = "sha256-6y/7RR7O2xYKXdxaFtkRfnSlwygp/LRDUozUJo6ue7s="; }; - patches = [ - # pythonRelaxDepsHook will not work in this package until - # https://github.com/NixOS/nixpkgs/pull/248516 hits master - ./relax_deps.patch - ]; - nativeBuildInputs = with python3.pkgs; [ poetry-core + pythonRelaxDepsHook qt6.wrapQtAppsHook ]; + pythonRelaxDeps = true; + + # ERROR: Could not find a version that satisfies the requirement PySide6 (from retool) (from versions: none) + # ERROR: No matching distribution found for PySide6 + pythonRemoveDeps = [ "PySide6" ]; + buildInputs = [ qt6.qtbase ] ++ diff --git a/pkgs/applications/misc/retool/relax_deps.patch b/pkgs/applications/misc/retool/relax_deps.patch deleted file mode 100644 index 528d2b47d970..000000000000 --- a/pkgs/applications/misc/retool/relax_deps.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index 6e62347..34600a0 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -13,12 +13,14 @@ packages = [ - - [tool.poetry.dependencies] - python = ">=3.10,<3.12" --strictyaml = "^1.6.2" --lxml = "^4.9.2" --PySide6 = "^6.4.2" --validators = "^0.20.0" --alive-progress = "^3.0.1" --psutil = "^5.9.4" -+strictyaml = "*" -+lxml = "*" -+# ERROR: Could not find a version that satisfies the requirement PySide6 (from retool) (from versions: none) -+# ERROR: No matching distribution found for PySide6 -+# PySide6 = "*" -+validators = "*" -+alive-progress = "*" -+psutil = "*" - - [tool.poetry.scripts] - retool = "retool:main" diff --git a/pkgs/applications/misc/waypaper/default.nix b/pkgs/applications/misc/waypaper/default.nix index 86c23400f1ba..cfb7ec3abf69 100644 --- a/pkgs/applications/misc/waypaper/default.nix +++ b/pkgs/applications/misc/waypaper/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "waypaper"; - version = "1.5"; + version = "1.9"; src = fetchFromGitHub { owner = "anufrievroman"; repo = "waypaper"; rev = "refs/tags/${version}"; - hash = "sha256-lK4TygR9cwEHcnrC0E5vE7Jor6afEiM9TmEgGXj+hNA="; + hash = "sha256-6hv+f2fbrbLodJIRHl5MYTkiZ51iZOAK42Vg73zSw/E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 384bbc54bf81..37cdef064d6c 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -41,9 +41,9 @@ version = "2023-06-09"; }; }; - sha256 = "09b0i48sr5ynlhpya4lwnhgp081q4lqd23cc5l59dsxzh5ivbycb"; - sha256bin64 = "1d49qcjh5mhfzqzjn4ilj23dpzd6nyl1pij5iv43dwxl8z2r3l3m"; - version = "116.0.5845.179"; + sha256 = "152lyrw8k36gbmf4fmfny4ajqh0523y5d48yrshbgwn5klmbhaji"; + sha256bin64 = "118sk39939d52srws2vgs1mfizpikswxh5ihd9x053vzn0aj8cfa"; + version = "116.0.5845.187"; }; ungoogled-chromium = { deps = { diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index 6ed870aa9321..ecc75cd5cd30 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -3,7 +3,7 @@ , glib, gdk-pixbuf, cairo , mailcap, pango, gtk3 , glib-networking, gsettings-desktop-schemas -, xclip, notify-osd, enchant +, xclip, wl-clipboard, notify-osd, enchant }: stdenv.mkDerivation rec { @@ -41,9 +41,8 @@ stdenv.mkDerivation rec { cp -f $src/assets/nyxt_''${i}x''${i}.png "$out/share/icons/hicolor/''${i}x''${i}/apps/nyxt.png" done - # Need to suffix PATH with xclip to be able to copy/paste in Nyxt even if xclip/xsel/wl-clipboard are not in the user's PATH mkdir -p $out/bin && makeWrapper $src/bin/nyxt $out/bin/nyxt \ - --suffix PATH : ${lib.makeBinPath [ xclip ]} \ + --prefix PATH : ${lib.makeBinPath [ xclip wl-clipboard ]} \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "${GST_PLUGIN_SYSTEM_PATH_1_0}" \ --argv0 nyxt "''${gappsWrapperArgs[@]}" ''; diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index 617d52788d73..4426eabe60e5 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -2,12 +2,12 @@ let pname = "polypane"; - version = "14.0.1"; + version = "14.1.0"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-UBWd8ApSb5YN5TUqSxv/352+jAwwRjiv/pM1rocqukk="; + sha256 = "sha256-UJ4Ccz9PjpmZqJGbJjw3lyqR3VCl9xf3F6WUoBaUEVg="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 6c1918aa7bd8..b754edb111cc 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.8.0"; + version = "2.8.3"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-/BMagPR74pANVYcmvdJZmV4tB48cEyAy0FKtBlpoLDE="; + hash = "sha256-sVaUItort09n2aShrE0MqOKQps44qNQv0Nox4P21xqg="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-xiCgQqP2XF+b2JQTBFqJ3h2klc6GjqyXoNUwatO0Ul8="; + vendorHash = "sha256-WeDIvw9KHDL5h/MQ9H1rOZkAlUOzROGw/gwpZB2jvOg="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix index f663c562f4d8..b3b480015156 100644 --- a/pkgs/applications/networking/cluster/karmor/default.nix +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "karmor"; - version = "0.13.15"; + version = "0.13.16"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-irpfZFswZjowKDnHmoutTo6960jl5C3Dq+NurjOk3p8="; + hash = "sha256-MEP7OlmsPe5qpdFBEOzCsJqLdZ5t7bMwPE/JhP9bGTY="; }; - vendorHash = "sha256-raMR27DqgT/Hjp3yAMAKLbfOjIZs0K0XsncgmIP6vxk="; + vendorHash = "sha256-5r5UqWRmqrLcpTeYpezGxIMj9JnPaohhd1i7VvaBVGM="; nativeBuildInputs = [ installShellFiles ]; @@ -51,6 +51,6 @@ buildGoModule rec { homepage = "https://kubearmor.io"; changelog = "https://github.com/kubearmor/kubearmor-client/releases/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ urandom ]; + maintainers = with maintainers; [ urandom kashw2 ]; }; } diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 6f4e466677a1..73c71b292853 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -40,7 +40,7 @@ let homepage = "https://www.nomadproject.io/"; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey techknowlogick ]; + maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes amaxine techknowlogick ]; }; } // attrs'); in diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index ecf231aabbc9..de8eaa0e0185 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pluto"; - version = "5.18.3"; + version = "5.18.4"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-D85+cT4bRVQwyrXs+NZJetRIHP3I7nbJKqOTjatoxwc="; + hash = "sha256-/8ZJXy5FErLnnXpED0UL+xqOo4QZtmR1hpcSpVsE8mw="; }; vendorHash = "sha256-ysMRE/OwMf4rBnlkpkW9K8ZHEEbHpQ02RXNwLLSr0nY="; @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://github.com/FairwindsOps/pluto"; description = "Find deprecated Kubernetes apiVersions"; license = licenses.asl20; - maintainers = with maintainers; [ peterromfeldhk ]; + maintainers = with maintainers; [ peterromfeldhk kashw2 ]; }; } diff --git a/pkgs/applications/networking/cluster/rke2/default.nix b/pkgs/applications/networking/cluster/rke2/default.nix index 7aa0efe45f8f..04271e7798e9 100644 --- a/pkgs/applications/networking/cluster/rke2/default.nix +++ b/pkgs/applications/networking/cluster/rke2/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "rke2"; - version = "1.27.3+rke2r1"; + version = "1.27.5+rke2r1"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-M/3F97iNeXdMMhs0eoPODeBC6Jp+yo/PwlPiG28SfYU="; + hash = "sha256-LKVz/oKt3WDf84KEEj4dRyjkRWZIWbOnEgG03EHvfGQ="; }; - vendorHash = "sha256-7Za8PQr22kvZBvoYRVbI4bXUvGWkfILQC+kAmw9ZCro="; + vendorHash = "sha256-Ck3/sMvCLoXKtOIhn0uE8hHdTlPFjIT04l3zoZQNKPs="; postPatch = '' # Patch the build scripts so they work in the Nix build environment. @@ -36,5 +36,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ zimbatm zygot ]; mainProgram = "rke2"; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index ce75218385ba..a13dbfb54363 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -58,8 +58,7 @@ let Chili-Man babariviere kalbasit - marsam - maxeaubrey + amaxine timstott zimbatm zowoq diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index d6f0dae7038b..5af78b5327eb 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -8,7 +8,7 @@ , libdeltachat , makeDesktopItem , makeWrapper -, noto-fonts-emoji +, noto-fonts-color-emoji , pkg-config , python3 , roboto @@ -85,7 +85,7 @@ buildNpmPackage rec { install -D build/icon.png \ $out/share/icons/hicolor/scalable/apps/deltachat.png - ln -sf ${noto-fonts-emoji}/share/fonts/noto/NotoColorEmoji.ttf \ + ln -sf ${noto-fonts-color-emoji}/share/fonts/noto/NotoColorEmoji.ttf \ $out/lib/node_modules/deltachat-desktop/html-dist/fonts/noto/emoji for font in $out/lib/node_modules/deltachat-desktop/html-dist/fonts/Roboto-*.ttf; do ln -sf ${roboto}/share/fonts/truetype/$(basename $font) \ diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index d9ee5d71c49e..8980eb8a13cc 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ let stable = "0.0.29"; ptb = "0.0.45"; canary = "0.0.166"; - development = "0.0.217"; + development = "0.0.232"; } else { stable = "0.0.273"; ptb = "0.0.59"; @@ -28,7 +28,7 @@ let }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - sha256 = "sha256-fzNFKrYo5qckrWZAkkiK337czCt6nOM1O8FeG18Q8Y0="; + sha256 = "sha256-AsHdQvDLzflhuYO8V4R+2zjQYpRo+aPa8HYXc3taayY="; }; }; x86_64-darwin = { diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 0b4093735022..b52b9f479bd3 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -45,14 +45,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.33.84"; - x86_64-darwin-sha256 = "1qkcj0w5rqfdj8l7p7gv2ck0rgkm5sc8490f8mnbflgvjj9y0gsb"; + x86_64-darwin-version = "4.34.115"; + x86_64-darwin-sha256 = "1l2swrjxm47xyb8skwzy7clmr3qdckx9xs1x204jbrz1xk7yd7l5"; - x86_64-linux-version = "4.33.84"; - x86_64-linux-sha256 = "0cjl3m9gprxkm57889l1avkl21pyc7bzhcgm4j5yf938dp699zhd"; + x86_64-linux-version = "4.34.115"; + x86_64-linux-sha256 = "0gyyjyvrvn13i5308fg34z6b3yzr7vmmh1148a9xh79ngq2pqv47"; - aarch64-darwin-version = "4.33.84"; - aarch64-darwin-sha256 = "0aw4wn4xx304dyzz7v9lmdgwg1345lhizil8yq9cjqy5kas3zj34"; + aarch64-darwin-version = "4.34.115"; + aarch64-darwin-sha256 = "09qcz57yxjfw8sdqbvmkd25hs4c7frmpf6v94hr4d1szy1rfv11k"; version = { x86_64-darwin = x86_64-darwin-version; @@ -81,9 +81,10 @@ let meta = with lib; { description = "Desktop client for Slack"; homepage = "https://slack.com"; + changelog = "https://slack.com/release-notes"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ mmahut maxeaubrey ]; + maintainers = with maintainers; [ mmahut amaxine ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; mainProgram = "slack"; }; diff --git a/pkgs/applications/networking/instant-messengers/webcord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/default.nix index 6018a6f7e533..f4ae642c79e5 100644 --- a/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -6,7 +6,7 @@ , pipewire , libpulseaudio , xdg-utils -, electron_26 +, electron_25 , makeDesktopItem , nix-update-script }: @@ -56,7 +56,7 @@ buildNpmPackage rec { install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png # Add xdg-utils to path via suffix, per PR #181171 - makeWrapper '${electron_26}/bin/electron' $out/bin/webcord \ + makeWrapper '${electron_25}/bin/electron' $out/bin/webcord \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \ --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \ diff --git a/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix index 0f4a9b4f31e7..47e067345547 100644 --- a/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix +++ b/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix @@ -5,6 +5,8 @@ }: webcord.overrideAttrs (old: { + pname = "webcord-vencord"; + patches = (old.patches or [ ]) ++ [ (substituteAll { src = ./add-extension.patch; diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 2047cc761759..326acae85e87 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -85,184 +85,184 @@ let sha512 = "2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w=="; }; }; - "@aws-sdk/client-cognito-identity-3.395.0" = { + "@aws-sdk/client-cognito-identity-3.409.0" = { name = "_at_aws-sdk_slash_client-cognito-identity"; packageName = "@aws-sdk/client-cognito-identity"; - version = "3.395.0"; + version = "3.409.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.395.0.tgz"; - sha512 = "97cOjOzEHWaP8cmf7Q+8QwQiao3Dq+9FmeRpjoNDo0+0cT3TP6gYRqPiHYt3fcfQsk+Nmk88oFUWhz2ibW27gA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.409.0.tgz"; + sha512 = "vUThhqsTL39s4Gbtldher8EuaahWkVh9M5BrfIlIoDnO2dTA/NXbAA3tP7Zj+mw1PAjLZdEqtNmIeZFVGs+0nw=="; }; }; - "@aws-sdk/client-sso-3.395.0" = { + "@aws-sdk/client-sso-3.409.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.395.0"; + version = "3.409.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.395.0.tgz"; - sha512 = "IEmqpZnflzFk6NTlkRpEXIcU2uBrTYl+pA5z4ZerbKclYWuxJ7MoLtLDNWgIn3mkNxvdroWgaPY1B2dkQlTe4g=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.409.0.tgz"; + sha512 = "vlXcIzcmUhObuEJ6q3lsp1ZHeDeD9bUrG3dmdSTeII4U6A9imgvaXONWI9GFEUsgzCrrCxtCqBX2RqMfZDhylw=="; }; }; - "@aws-sdk/client-sts-3.395.0" = { + "@aws-sdk/client-sts-3.409.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.395.0"; + version = "3.409.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.395.0.tgz"; - sha512 = "zWxZ+pjeP88uRN4k0Zzid6t/8Yhzg1Cv2LnrYX6kZzbS6AOTDho7fVGZgUl+cme33QZhtE8pXUvwGeJAptbhqg=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.409.0.tgz"; + sha512 = "yNL9zYWDVIOWZhIlsy2tiHetSYvio5ZVJ3nvR4xWPTwqOQveZx/K0PTK+nh6T6w5R3w5IOSKvd+vPCpY4bGx8Q=="; }; }; - "@aws-sdk/credential-provider-cognito-identity-3.395.0" = { + "@aws-sdk/credential-provider-cognito-identity-3.409.0" = { name = "_at_aws-sdk_slash_credential-provider-cognito-identity"; packageName = "@aws-sdk/credential-provider-cognito-identity"; - version = "3.395.0"; + version = "3.409.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.395.0.tgz"; - sha512 = "aRsDf4HO9ek6REmadAcY8MuwprNDHyYASFuc4YtbbmkH90jVhyz70e7PGCmDpcJZN2lLTV8tcZeWmKXcvMwq/A=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.409.0.tgz"; + sha512 = "8MLPJ8YjX+iAhsyeUah6388EHm0aeLPyn+bz5M/PwyDkX8UuuaM3VzH0dHoMdqX+iOCIynh/WRm+qYizrAscCA=="; }; }; - "@aws-sdk/credential-provider-env-3.391.0" = { + "@aws-sdk/credential-provider-env-3.408.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.391.0"; + version = "3.408.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.391.0.tgz"; - sha512 = "mAzICedcg4bfL0mM5O6QTd9mQ331NLse1DMr6XL21ZZiLB48ej19L7AGV2xq5QwVbqKU3IVv1myRyhvpDM9jMg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.408.0.tgz"; + sha512 = "GCpgHEHxRTzKaMkwDC2gLb3xlD+ZxhKPUJ1DVcO7I9E3eCGJsYVedIi0/2XE+NP+HVoy8LyW2qH8QQWh64JKow=="; }; }; - "@aws-sdk/credential-provider-ini-3.395.0" = { + "@aws-sdk/credential-provider-ini-3.409.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.395.0"; + version = "3.409.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.395.0.tgz"; - sha512 = "t7cWs+syJsSkj9NGdKyZ1t/+nYQyOec2nPjTtPWwKs8D7rvH3IMIgJwkvAGNzYaiIoIpXXx0wgCqys84TSEIYQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.409.0.tgz"; + sha512 = "Z7hb0Kj0FuqD5HimDrtt0LRjKBHA5pvLcTYYdVorJovaBxEvfDpISSDVRIUmvhMGAlv7XezbvqESOU5cn0Gpzw=="; }; }; - "@aws-sdk/credential-provider-node-3.395.0" = { + "@aws-sdk/credential-provider-node-3.409.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.395.0"; + version = "3.409.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.395.0.tgz"; - sha512 = "qJawWTYf5L7Z1Is0sSJEYc4e96Qd0HWGqluO2h9qoUNrRREZ9RSxsDq+LGxVVAYLupYFcIFtiCnA/MoBBIWhzg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.409.0.tgz"; + sha512 = "kXmfBVYnHoEAACo6zskEryDSgMSo1QYiv6P8n6Go/RsJHe4Ec+YtrOMLg3hTOptiIGHOTWZ1ANaU/IfIxmqumA=="; }; }; - "@aws-sdk/credential-provider-process-3.391.0" = { + "@aws-sdk/credential-provider-process-3.408.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.391.0"; + version = "3.408.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.391.0.tgz"; - sha512 = "KMlzPlBI+hBmXDo+EoFZdLgCVRkRa9B9iEE6x0+hQQ6g9bW6HI7cDRVdceR1ZoPasSaNAZ9QOXMTIBxTpn0sPQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.408.0.tgz"; + sha512 = "qCTf9tr6+I2s3+v5zP4YRQQrGlYw/jyZ7u/k6bGshhlvgwGPfjNuHrM8uK/W1kv4ng1myxaL1/tAY6RVVdXz4Q=="; }; }; - "@aws-sdk/credential-provider-sso-3.395.0" = { + "@aws-sdk/credential-provider-sso-3.409.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.395.0"; + version = "3.409.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.395.0.tgz"; - sha512 = "wAoHG9XqO0L8TvJv4cjwN/2XkYskp0cbnupKKTJm+D29MYcctKEtL0aYOHxaNN2ECAYxIFIQDdlo62GKb3nJ5Q=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.409.0.tgz"; + sha512 = "Bh0ykbDpnUK4W8sQMEpRA/TlZxwpPLl4aU8eBLlbEcTL2M8or2nr0dQzOOvabZo8hbaPM6yfOl+vLTvWGs75zg=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.391.0" = { + "@aws-sdk/credential-provider-web-identity-3.408.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.391.0"; + version = "3.408.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.391.0.tgz"; - sha512 = "n0vYg82B8bc4rxKltVbVqclev7hx+elyS9pEnZs3YbnbWJq0qqsznXmDfLqd1TcWpa09PGXcah0nsRDolVThsA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.408.0.tgz"; + sha512 = "5FbDPF/zY/1t6k1zRI/HnrxcH2v7SwsEYu2SThI2qbzaP/K7MTnTanV5vNFcdQOpuQ7x3PrzTlH3AWZueCr3Vw=="; }; }; - "@aws-sdk/credential-providers-3.395.0" = { + "@aws-sdk/credential-providers-3.409.0" = { name = "_at_aws-sdk_slash_credential-providers"; packageName = "@aws-sdk/credential-providers"; - version = "3.395.0"; + version = "3.409.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.395.0.tgz"; - sha512 = "V4oYeXdjjgdQGGYqIXbA1XbnHvAJWni5caEq0zWJdIm9f0JCOQUZBCq5Gkv0ptiUc+GP8U+nzAmweTmYYOMVmg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.409.0.tgz"; + sha512 = "eaQChfbLnVs1ctC04dIdQPh5FtJD9v8R3xbVttKowdhUUV18rTHM5sVJuL5DGbHTXxmZSiURsoVCujrc/kaEiA=="; }; }; - "@aws-sdk/middleware-host-header-3.391.0" = { + "@aws-sdk/middleware-host-header-3.408.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.391.0"; + version = "3.408.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.391.0.tgz"; - sha512 = "+nyNr0rb2ixY7mU48nibr7L7gsw37y4oELhqgnNKhcjZDJ34imBwKIMFa64n21FdftmhcjR8IdSpzXE9xrkJ8g=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.408.0.tgz"; + sha512 = "eofCXuSZ+ntbLzeCRdHzraXzgWqAplXU7W2qFFVC4O9lZBhADwNPI8n8x98TH0mftnmvZxh5Bo5U8WvEolIDkw=="; }; }; - "@aws-sdk/middleware-logger-3.391.0" = { + "@aws-sdk/middleware-logger-3.408.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.391.0"; + version = "3.408.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.391.0.tgz"; - sha512 = "KOwl5zo16b17JDhqILHBStccBQ2w35em7+/6vdkJdUII6OU8aVIFTlIQT9wOUvd4do6biIRBMZG3IK0Rg7mRDQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.408.0.tgz"; + sha512 = "otwXPCubsGRFv8Hb6nKw6Vvnu4dC8CcPk05buStj42nF8QdjWrKGb2rDCvLph5lr576LF5HN+Y2moyOi7z/I7g=="; }; }; - "@aws-sdk/middleware-recursion-detection-3.391.0" = { + "@aws-sdk/middleware-recursion-detection-3.408.0" = { name = "_at_aws-sdk_slash_middleware-recursion-detection"; packageName = "@aws-sdk/middleware-recursion-detection"; - version = "3.391.0"; + version = "3.408.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.391.0.tgz"; - sha512 = "hVR3z59G7pX4pjDQs9Ag1tMgbLeGXOzeAAaNP9fEtHSd3KBMAGQgN3K3b9WPjzE2W0EoloHRJMK4qxZErdde2g=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.408.0.tgz"; + sha512 = "QfZwmX5z0IRC2c8pBi9VozSqbJw19V5oxyykSTqdjGe3CG3yNujXObV6xQesK67CWSnPb9wDgVGKUoYuIXwOxw=="; }; }; - "@aws-sdk/middleware-sdk-sts-3.391.0" = { + "@aws-sdk/middleware-sdk-sts-3.408.0" = { name = "_at_aws-sdk_slash_middleware-sdk-sts"; packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.391.0"; + version = "3.408.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.391.0.tgz"; - sha512 = "6ZXI3Z4QU+TnT5PwKWloGmRHG81tWeI18/zxf9wWzrO2NhYFvITzEJH0vWLLiXdWtn/BYfLULXtDvkTaepbI5A=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.408.0.tgz"; + sha512 = "dIO9BTX049P2PwaeAK2lxJeA2rZi9/bWzMP1GIE60VrMDHmN5Ljvh1lLActECLAqNQIqN5Ub0bKV2tC/jMn+CA=="; }; }; - "@aws-sdk/middleware-signing-3.391.0" = { + "@aws-sdk/middleware-signing-3.408.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.391.0"; + version = "3.408.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.391.0.tgz"; - sha512 = "2pAJJlZqaHc0d+cz2FTVrQmWi8ygKfqfczHUo/loCtOaMNtWXBHb/JsLEecs6cXdizy6gi3YsLz6VZYwY4Ssxw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.408.0.tgz"; + sha512 = "flLiLKATJ4NLcLb7lPojyQ6NvLSyQ3axqIClqwMRnhSRxvREB7OgBKwmPecSl0I5JxsNEqo+mjARdMjUHadgWQ=="; }; }; - "@aws-sdk/middleware-user-agent-3.391.0" = { + "@aws-sdk/middleware-user-agent-3.408.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.391.0"; + version = "3.408.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.391.0.tgz"; - sha512 = "LdK9uMNA14zqRw3B79Mhy7GX36qld/GYo93xuu+lr+AQ98leZEdc6GUbrtNDI3fP1Z8TMQcyHUKBml4/B+wXpQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.408.0.tgz"; + sha512 = "UvlKri8/Mgf5W+tFU6ZJ65fC6HljcysIqfRFts/8Wurl322IS1I4j+pyjV2P6eK1054bzynfi3Trv+tRYHtVcA=="; }; }; - "@aws-sdk/token-providers-3.391.0" = { + "@aws-sdk/token-providers-3.408.0" = { name = "_at_aws-sdk_slash_token-providers"; packageName = "@aws-sdk/token-providers"; - version = "3.391.0"; + version = "3.408.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.391.0.tgz"; - sha512 = "kgfArsKLDJE71qQjfXiHiM5cZqgDHlMsqEx35+A65GmTWJaS1PGDqu3ZvVVU8E5mxnCCLw7vho21fsjvH6TBpg=="; + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.408.0.tgz"; + sha512 = "D//BjUrVtDzDdCz1mRdZZSAc822fh75Ssq46smeS6S6NKq3vJeHhfrQJMyVU1GclXu1tn9AwykaQW5Jwb5im+g=="; }; }; - "@aws-sdk/types-3.391.0" = { + "@aws-sdk/types-3.408.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.391.0"; + version = "3.408.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.391.0.tgz"; - sha512 = "QpYVFKMOnzHz/JMj/b8wb18qxiT92U/5r5MmtRz2R3LOH6ooTO96k4ozXCrYr0qNed1PAnOj73rPrrH2wnCJKQ=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.408.0.tgz"; + sha512 = "sIsR5224xWQTW7O6h4V0S7DMWs4bK4DCunwOo7Avpq7ZVmH2YyLTs0n4NGL186j8xTosycF1ACQgpM48SLIvaA=="; }; }; - "@aws-sdk/util-endpoints-3.391.0" = { + "@aws-sdk/util-endpoints-3.408.0" = { name = "_at_aws-sdk_slash_util-endpoints"; packageName = "@aws-sdk/util-endpoints"; - version = "3.391.0"; + version = "3.408.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.391.0.tgz"; - sha512 = "zv4sYDTQhNxyLoekcE02/nk3xvoo6yCHDy1kDJk0MFxOKaqUB+CvZdQBR4YBLSDlD4o4DUBmdYgKT58FfbM8sQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.408.0.tgz"; + sha512 = "N1D5cKEkCqf5Q7IF/pI9kfcNrT+/5ctZ6cQo4Ex6xaOcnUzdOZcXdPqaMRZVZRn8enjK2SpoLlRpXGISOugPaw=="; }; }; "@aws-sdk/util-locate-window-3.310.0" = { @@ -274,22 +274,22 @@ let sha512 = "qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w=="; }; }; - "@aws-sdk/util-user-agent-browser-3.391.0" = { + "@aws-sdk/util-user-agent-browser-3.408.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.391.0"; + version = "3.408.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.391.0.tgz"; - sha512 = "6ipHOB1WdCBNeAMJauN7l2qNE0WLVaTNhkD290/ElXm1FHGTL8yw6lIDIjhIFO1bmbZxDiKApwDiG7ROhaJoxQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.408.0.tgz"; + sha512 = "wOVjDprG5h6kM8aJZk/tRX/RgxNxr73d6kIsUePlAgil13q62M9lcFMcIXduqtDsa1B6FfVB2wx/pyUuOZri5g=="; }; }; - "@aws-sdk/util-user-agent-node-3.391.0" = { + "@aws-sdk/util-user-agent-node-3.408.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.391.0"; + version = "3.408.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.391.0.tgz"; - sha512 = "PVvAK/Lf4BdB1eJIZtyFpGSslGQwKpYt9/hKs5NlR+qxBMXU9T0DnTqH4GiXZaazvXr7OUVWitIF2b7iKBMTow=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.408.0.tgz"; + sha512 = "BzMFV+cIXrtfcfJk3GpXnkANFkzZisvAtD306TMgIscn5FF26K1jD5DU+h5Q5WMq7gx+oXh9kJ3Lu3hi7hahKQ=="; }; }; "@aws-sdk/util-utf8-browser-3.259.0" = { @@ -328,13 +328,13 @@ let sha512 = "kleJ1iUTxcO32Y06dH9Pfi9K4U+Tlb111WXEnbt7R/ne+NLRwppZiTGJuTD5VVoxTMK5NTbEtm5t2vcdNCFe2g=="; }; }; - "@azure/core-http-3.0.2" = { + "@azure/core-http-3.0.3" = { name = "_at_azure_slash_core-http"; packageName = "@azure/core-http"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.2.tgz"; - sha512 = "o1wR9JrmoM0xEAa0Ue7Sp8j+uJvmqYaGoHOCT5qaVYmvgmnZDC0OvQimPA/JR3u77Sz6D1y3Xmk1y69cDU9q9A=="; + url = "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.3.tgz"; + sha512 = "QMib3wXotJMFhHgmJBPUF9YsyErw34H0XDFQd9CauH7TPB+RGcyl9Ayy7iURtJB04ngXhE6YwrQsWDXlSLrilg=="; }; }; "@azure/core-http-compat-1.3.0" = { @@ -364,13 +364,13 @@ let sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw=="; }; }; - "@azure/core-rest-pipeline-1.12.0" = { + "@azure/core-rest-pipeline-1.12.1" = { name = "_at_azure_slash_core-rest-pipeline"; packageName = "@azure/core-rest-pipeline"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.12.0.tgz"; - sha512 = "+MnSB0vGZjszSzr5AW8z93/9fkDu2RLtWmAN8gskURq7EW2sSwqy8jZa0V26rjuBVkwhdA3Hw8z3VWoeBUOw+A=="; + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.12.1.tgz"; + sha512 = "SsyWQ+T5MFQRX+M8H/66AlaI6HyCbQStGfFngx2fuiW+vKI2DkhtOvbYodPyf9fOe/ARLWWc3ohX54lQ5Kmaog=="; }; }; "@azure/core-tracing-1.0.0-preview.13" = { @@ -427,22 +427,22 @@ let sha512 = "ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg=="; }; }; - "@azure/msal-browser-2.38.1" = { + "@azure/msal-browser-2.38.2" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.38.1"; + version = "2.38.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.38.1.tgz"; - sha512 = "NROo7mLpw7aWtj8tWy9ZPz3WWiudwVAOIDZ1K3PPrjDAA4kFYayWlbZiJl1T1sD5Oqwa6FOtwzFSvuUj1CWp6Q=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.38.2.tgz"; + sha512 = "71BeIn2we6LIgMplwCSaMq5zAwmalyJR3jFcVOZxNVfQ1saBRwOD+P77nLs5vrRCedVKTq8RMFhIOdpMLNno0A=="; }; }; - "@azure/msal-common-13.2.1" = { + "@azure/msal-common-13.3.0" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "13.2.1"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-13.2.1.tgz"; - sha512 = "9CtyVdDtAOw+raemKg8gdBuE7gleObgSb7p4bzMIlUt8eM69/Gaow7uqr1gK3jLYINSrss32OZW8mBbdgVLiHg=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-13.3.0.tgz"; + sha512 = "/VFWTicjcJbrGp3yQP7A24xU95NiDMe23vxIU1U6qdRPFsprMDNUohMudclnd+WSHE4/McqkZs/nUU3sAKkVjg=="; }; }; "@azure/msal-common-7.6.0" = { @@ -454,13 +454,13 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-node-1.18.1" = { + "@azure/msal-node-1.18.3" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.18.1"; + version = "1.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.1.tgz"; - sha512 = "B4kUOWJoN4vD8b3pGJ9Q9mIZhaDb8EnQM1aN0x1otlQgTfzDvEk6rWc6fy8uGdtXqcNddBtiXdc4oRiItroVkA=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.3.tgz"; + sha512 = "lI1OsxNbS/gxRD4548Wyj22Dk8kS7eGMwD9GlBZvQmFV8FJUXoXySL1BiNzDsHUE96/DS/DHmA+F73p1Dkcktg=="; }; }; "@azure/storage-blob-12.15.0" = { @@ -472,22 +472,22 @@ let sha512 = "e7JBKLOFi0QVJqqLzrjx1eL3je3/Ug2IQj24cTM9b85CsnnFjLGeGjJVIjbGGZaytewiCEG7r3lRwQX7fKj0/w=="; }; }; - "@babel/parser-7.22.10" = { + "@babel/parser-7.22.16" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.22.10"; + version = "7.22.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz"; - sha512 = "lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz"; + sha512 = "+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA=="; }; }; - "@babel/runtime-7.22.10" = { + "@babel/runtime-7.22.15" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.22.10"; + version = "7.22.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz"; - sha512 = "21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.15.tgz"; + sha512 = "T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA=="; }; }; "@codemirror/autocomplete-6.9.0" = { @@ -499,13 +499,13 @@ let sha512 = "Fbwm0V/Wn3BkEJZRhr0hi5BhCo5a7eBL6LYaliPjOSwCyfOpnjXY59HruSxOUNV+1OYer0Tgx1zRNQttjXyDog=="; }; }; - "@codemirror/commands-6.2.4" = { + "@codemirror/commands-6.2.5" = { name = "_at_codemirror_slash_commands"; packageName = "@codemirror/commands"; - version = "6.2.4"; + version = "6.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.4.tgz"; - sha512 = "42lmDqVH0ttfilLShReLXsDfASKLXzfyC36bzwcqzox9PlHulMcsUOfHXNo2X2aFMVNUoQ7j+d4q5bnfseYoOA=="; + url = "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.5.tgz"; + sha512 = "dSi7ow2P2YgPBZflR9AJoaTHvqmeGIgkhignYMd5zK5y6DANTvxKxp6eMEpIDUJkRAaOY/TFZ4jP1ADIO/GLVA=="; }; }; "@codemirror/lang-css-6.2.1" = { @@ -517,13 +517,13 @@ let sha512 = "/UNWDNV5Viwi/1lpr/dIXJNWiwDxpw13I4pTUAsNxZdg6E0mI2kTQb0P2iHczg1Tu+H4EBgJR+hYhKiHKko7qg=="; }; }; - "@codemirror/lang-javascript-6.1.9" = { + "@codemirror/lang-javascript-6.2.1" = { name = "_at_codemirror_slash_lang-javascript"; packageName = "@codemirror/lang-javascript"; - version = "6.1.9"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.9.tgz"; - sha512 = "z3jdkcqOEBT2txn2a87A0jSy6Te3679wg/U8QzMeftFt+4KA6QooMwfdFzJiuC3L6fXKfTXZcDocoaxMYfGz0w=="; + url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.1.tgz"; + sha512 = "jlFOXTejVyiQCW3EQwvKH0m99bUYIw40oPmFjSX2VS78yzfe0HELZ+NEo9Yfo1MkGRpGlj3Gnu4rdxV1EnAs5A=="; }; }; "@codemirror/lang-json-6.0.1" = { @@ -553,13 +553,13 @@ let sha512 = "nFu311/0ne/qGuGCL3oKuktBgzVOaxCHZPZv1tLSZkNjPYxxvkjSbzno3MlErG2tgw1Yw1yF8BxMCegeMXqpiw=="; }; }; - "@codemirror/lint-6.4.0" = { + "@codemirror/lint-6.4.1" = { name = "_at_codemirror_slash_lint"; packageName = "@codemirror/lint"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lint/-/lint-6.4.0.tgz"; - sha512 = "6VZ44Ysh/Zn07xrGkdtNfmHCbGSHZzFBdzWi0pbd7chAQ/iUcpLGX99NYRZTa7Ugqg4kEHCqiHhcZnH0gLIgSg=="; + url = "https://registry.npmjs.org/@codemirror/lint/-/lint-6.4.1.tgz"; + sha512 = "2Hx945qKX7FBan5/gUdTM8fsMYrNG9clIgEcPXestbLVFAUyQYFAuju/5BMNf/PwgpVaX5pvRm4+ovjbp9D9gQ=="; }; }; "@codemirror/state-6.2.1" = { @@ -571,13 +571,13 @@ let sha512 = "RupHSZ8+OjNT38zU9fKH2sv+Dnlr8Eb8sl4NOnnqz95mCFTZUaiRP8Xv5MeeaG0px2b8Bnfe7YGwCV3nsBhbuw=="; }; }; - "@codemirror/view-6.16.0" = { + "@codemirror/view-6.18.1" = { name = "_at_codemirror_slash_view"; packageName = "@codemirror/view"; - version = "6.16.0"; + version = "6.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/view/-/view-6.16.0.tgz"; - sha512 = "1Z2HkvkC3KR/oEZVuW9Ivmp8TWLzGEd8T8TA04TTwPvqogfkHBdYSlflytDOqmkUxM2d1ywTg7X2dU5mC+SXvg=="; + url = "https://registry.npmjs.org/@codemirror/view/-/view-6.18.1.tgz"; + sha512 = "xcsXcMkIMd7l3WZEWoc4ljteAiqzxb5gVerRxk5132p5cLix6rTydWTQjsj2oxORepfsrwy1fC4r20iMa9plrg=="; }; }; "@colors/colors-1.5.0" = { @@ -598,13 +598,13 @@ let sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="; }; }; - "@ctrl/tinycolor-3.6.0" = { + "@ctrl/tinycolor-3.6.1" = { name = "_at_ctrl_slash_tinycolor"; packageName = "@ctrl/tinycolor"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.0.tgz"; - sha512 = "/Z3l6pXthq0JvMYdUFyX9j0MaCltlIn6mfh9jLyQwg5aPKxkyNa0PTHtU1AlFXLNk55ZuAeJRcpvq+tmLfKmaQ=="; + url = "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz"; + sha512 = "SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA=="; }; }; "@curlconverter/yargs-0.0.2" = { @@ -661,22 +661,22 @@ let sha512 = "jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ=="; }; }; - "@floating-ui/dom-1.5.1" = { + "@floating-ui/dom-1.5.2" = { name = "_at_floating-ui_slash_dom"; packageName = "@floating-ui/dom"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.1.tgz"; - sha512 = "KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw=="; + url = "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.2.tgz"; + sha512 = "6ArmenS6qJEWmwzczWyhvrXRdI/rI78poBcW0h/456+onlabit+2G+QxHx5xTOX60NBJQXjsCLFbW2CmsXpUog=="; }; }; - "@floating-ui/utils-0.1.1" = { + "@floating-ui/utils-0.1.2" = { name = "_at_floating-ui_slash_utils"; packageName = "@floating-ui/utils"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.1.tgz"; - sha512 = "m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw=="; + url = "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.2.tgz"; + sha512 = "ou3elfqG/hZsbmF4bxeJhPHIf3G2pm0ujc39hYEZrfVqt7Vk/Zji6CXc3W0pmYM8BW1g40U+akTl9DKZhFhInQ=="; }; }; "@fontsource/open-sans-4.5.14" = { @@ -868,13 +868,13 @@ let sha512 = "FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g=="; }; }; - "@grpc/proto-loader-0.7.8" = { + "@grpc/proto-loader-0.7.9" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; - version = "0.7.8"; + version = "0.7.9"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.8.tgz"; - sha512 = "GU12e2c8dmdXb7XUlOgYWZ2o2i+z9/VeACkxTA/zzAe2IjclC5PnVL0lpgjhrqfpDYHzM8B1TF6pqWegMYAzlA=="; + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.9.tgz"; + sha512 = "YJsOehVXzgurc+lLAxYnlSMc1p/Gu6VAvnfx0ATi2nzvr0YZcjhmZDeY8SeAKv1M7zE3aEJH0Xo9mK1iZ8GYoQ=="; }; }; "@httptoolkit/websocket-stream-6.0.1" = { @@ -895,49 +895,31 @@ let sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg=="; }; }; - "@intlify/core-base-9.2.2" = { + "@intlify/core-base-9.4.0" = { name = "_at_intlify_slash_core-base"; packageName = "@intlify/core-base"; - version = "9.2.2"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.2.2.tgz"; - sha512 = "JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA=="; + url = "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.4.0.tgz"; + sha512 = "bIvtuEjLES35l39R0OccYbmr/fatSr4VSRThhouvFc05mnoAZyJGgj3st1iLaHGlFTmvd507uww1427o56r36Q=="; }; }; - "@intlify/devtools-if-9.2.2" = { - name = "_at_intlify_slash_devtools-if"; - packageName = "@intlify/devtools-if"; - version = "9.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.2.2.tgz"; - sha512 = "4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg=="; - }; - }; - "@intlify/message-compiler-9.2.2" = { + "@intlify/message-compiler-9.4.0" = { name = "_at_intlify_slash_message-compiler"; packageName = "@intlify/message-compiler"; - version = "9.2.2"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.2.tgz"; - sha512 = "IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA=="; + url = "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.4.0.tgz"; + sha512 = "EdjqOH3bQqEjZcUOwo90wuW4ZuFr41FDxVni6WNKS0V0myKgwz9EuvLDcnEbjJMIX8vKAWPjWfnSTt5fMwKHLA=="; }; }; - "@intlify/shared-9.2.2" = { + "@intlify/shared-9.4.0" = { name = "_at_intlify_slash_shared"; packageName = "@intlify/shared"; - version = "9.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.2.tgz"; - sha512 = "wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q=="; - }; - }; - "@intlify/vue-devtools-9.2.2" = { - name = "_at_intlify_slash_vue-devtools"; - packageName = "@intlify/vue-devtools"; - version = "9.2.2"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz"; - sha512 = "+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg=="; + url = "https://registry.npmjs.org/@intlify/shared/-/shared-9.4.0.tgz"; + sha512 = "AFqymip2kToqA0B6KZPg5jSrdcVHoli9t/VhGKE2iiMq9utFuMoGdDC/JOCIZgwxo6aXAk86QyU2XtzEoMuZ6A=="; }; }; "@ioredis/commands-1.2.0" = { @@ -1147,13 +1129,13 @@ let sha512 = "Kk9HJARZTc0bAnMQUqbtuhFVsB4AnteR2BFUWfZV7L/x1H0aAKz6YabrfJ2gk/BEgjh9L3hg5O4y2IDZRBdzuQ=="; }; }; - "@lezer/javascript-1.4.5" = { + "@lezer/javascript-1.4.7" = { name = "_at_lezer_slash_javascript"; packageName = "@lezer/javascript"; - version = "1.4.5"; + version = "1.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.5.tgz"; - sha512 = "FmBUHz8K1V22DgjTd6SrIG9owbzOYZ1t3rY6vGEmw+e2RVBd7sqjM8uXEVRFmfxKFn1Mx2ABJehHjrN3G2ZpmA=="; + url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.7.tgz"; + sha512 = "OVWlK0YEi7HM+9JRWtRkir8qvcg0/kVYg2TAMHlVtl6DU1C9yK1waEOLBMztZsV/axRJxsqfJKhzYz+bxZme5g=="; }; }; "@lezer/json-1.0.1" = { @@ -1192,22 +1174,22 @@ let sha512 = "Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ=="; }; }; - "@mongodb-js/zstd-1.1.0" = { + "@mongodb-js/zstd-1.2.0" = { name = "_at_mongodb-js_slash_zstd"; packageName = "@mongodb-js/zstd"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongodb-js/zstd/-/zstd-1.1.0.tgz"; - sha512 = "+dRj3tSgenHhdqZ1d9ii7PKrXerXOZgDKJE9E2IFxC2lOecgOnSnInAD1o6hCFmyJ5NDQrcsrJKxkOlptwA1mw=="; + url = "https://registry.npmjs.org/@mongodb-js/zstd/-/zstd-1.2.0.tgz"; + sha512 = "sKHsJU2MXsp822IFXOHw/4mpFulScNHpZzVy1Zi5k5wBsdiAPx1QramyOXZkpacla+2QPEC/s7TxPlEhG/HuNQ=="; }; }; - "@n8n/client-oauth2-0.6.0" = { + "@n8n/client-oauth2-0.7.0" = { name = "_at_n8n_slash_client-oauth2"; packageName = "@n8n/client-oauth2"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@n8n/client-oauth2/-/client-oauth2-0.6.0.tgz"; - sha512 = "t5K1N0O4llf+FMfmnox3DcAjaP09hkM3nJU+iBYHF0AbbSDXEvBCZk0TW26ujAKe/4QOM8JXAoQUuw7HRUVAug=="; + url = "https://registry.npmjs.org/@n8n/client-oauth2/-/client-oauth2-0.7.0.tgz"; + sha512 = "E/ir1Ay8Pmia+b5tvV4KhZ0J0xexz3jJc1w93xx39Iaq5XuZRWC3TNJhJdVp0f2fPti0rVDHnAMHsovBucHBIw=="; }; }; "@n8n/codemirror-lang-sql-1.0.2" = { @@ -1219,6 +1201,15 @@ let sha512 = "sOf/KyewSu3Ikij0CkRtzJJDhRDZcwNCEYl8UdH4U/riL0/XZGcBD7MYofCCcKszanJZiEWRZ2KU1sRp234iMg=="; }; }; + "@n8n/vm2-3.9.20" = { + name = "_at_n8n_slash_vm2"; + packageName = "@n8n/vm2"; + version = "3.9.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@n8n/vm2/-/vm2-3.9.20.tgz"; + sha512 = "qk2oJYkuFRVSTxoro4obX/sv/wT1pViZjHh/isjOvFB93D52QIg3TCjMPsHOfHTmkxCKJffjLrUvjIwvWzSMCQ=="; + }; + }; "@n8n_io/license-sdk-2.4.0" = { name = "_at_n8n_io_slash_license-sdk"; packageName = "@n8n_io/license-sdk"; @@ -1363,13 +1354,13 @@ let sha512 = "nEv7dFPxCrWrvK6dQ8zya0/Kb54EXVcwIKV9capjSa89ZDoOo+qH0YSo4/eQVECXgW3eUvgKLDIcIt62YBk0HA=="; }; }; - "@opentelemetry/api-1.4.1" = { + "@opentelemetry/api-1.5.0" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.1.tgz"; - sha512 = "O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.5.0.tgz"; + sha512 = "636km3y3pVyJldKGp9qM+lPvxuOvhThUED9cHNPsERkp+APbdtCtj0sALW+mZsbQqnqQkNRHqoGw/Uc82UP6fQ=="; }; }; "@popperjs/core-2.11.7" = { @@ -1480,13 +1471,13 @@ let sha512 = "HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg=="; }; }; - "@redis/client-1.5.8" = { + "@redis/client-1.5.9" = { name = "_at_redis_slash_client"; packageName = "@redis/client"; - version = "1.5.8"; + version = "1.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/client/-/client-1.5.8.tgz"; - sha512 = "xzElwHIO6rBAqzPeVnCzgvrnBEcFL1P0w8P65VNLRkdVW8rOE58f52hdj0BDgmsdOm4f1EoXPZtH4Fh7M/qUpw=="; + url = "https://registry.npmjs.org/@redis/client/-/client-1.5.9.tgz"; + sha512 = "SffgN+P1zdWJWSXBvJeynvEnmnZrYmtKSRW00xl8pOPFOMJjxRR9u0frSxJpPR6Y4V+k54blJjGW7FgxbTI7bQ=="; }; }; "@redis/graph-1.1.0" = { @@ -1516,13 +1507,13 @@ let sha512 = "4Dg1JjvCevdiCBTZqjhKkGoC5/BcB7k9j99kdMnaXFXg8x4eyOIVg9487CMv7/BUVkFLZCaIh8ead9mU15DNng=="; }; }; - "@redis/time-series-1.0.4" = { + "@redis/time-series-1.0.5" = { name = "_at_redis_slash_time-series"; packageName = "@redis/time-series"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.4.tgz"; - sha512 = "ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng=="; + url = "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.5.tgz"; + sha512 = "IFjIgTusQym2B5IZJG3XKr5llka7ey84fw/NOYqESP5WUfQs9zz1ww/9+qoz4ka/S6KcGBodzlCeZ5UImKbscg=="; }; }; "@rudderstack/rudder-sdk-node-1.0.6" = { @@ -1534,13 +1525,13 @@ let sha512 = "kJYCXv6fRFbQrAp3hMsgRCnAa7RUBdbiGLBT9PcpQURi0VwHmD7mk3Ja7U4HDnL0EHXYJpPyx3oSonkklmPJ9Q=="; }; }; - "@sap/hana-client-2.17.22" = { + "@sap/hana-client-2.18.22" = { name = "_at_sap_slash_hana-client"; packageName = "@sap/hana-client"; - version = "2.17.22"; + version = "2.18.22"; src = fetchurl { - url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.17.22.tgz"; - sha512 = "EwhiBZcuRJcc9wtipzcebi3A7JMRnVcxUy3k2S49zFiZqbVJaqFx84zNVvwjbTjzAjKq7NQZ4rTxHKOZx72o+Q=="; + url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.18.22.tgz"; + sha512 = "iihhrDk70vg9SYHCDWnFiYSBjS3y5TMojPqEPkcPpkNg7YuYlabcdY7xy4iepLpDP6jqa1EijPxPi33zYAnXzw=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -1561,121 +1552,121 @@ let sha512 = "P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ=="; }; }; - "@sentry-internal/tracing-7.64.0" = { + "@sentry-internal/tracing-7.68.0" = { name = "_at_sentry-internal_slash_tracing"; packageName = "@sentry-internal/tracing"; - version = "7.64.0"; + version = "7.68.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.64.0.tgz"; - sha512 = "1XE8W6ki7hHyBvX9hfirnGkKDBKNq3bDJyXS86E0bYVDl94nvbRM9BD9DHsCFetqYkVm1yDGEK+6aUVs4CztoQ=="; + url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.68.0.tgz"; + sha512 = "nNKS/q21+Iqzxs2K7T/l3dZi8Z9s/uxsAazpk2AYhFzx9mFnPj1Xfe3dgbFoygNifE+IrpUuldr6D5HQamTDPQ=="; }; }; - "@sentry/core-7.64.0" = { + "@sentry/core-7.68.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.64.0"; + version = "7.68.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.64.0.tgz"; - sha512 = "IzmEyl5sNG7NyEFiyFHEHC+sizsZp9MEw1+RJRLX6U5RITvcsEgcajSkHQFafaBPzRrcxZMdm47Cwhl212LXcw=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.68.0.tgz"; + sha512 = "mT3ObBWgvAky/QF3dZy4KBoXbRXbNsD6evn+mYi9UEeIZQ5NpnQYDEp78mapiEjI/TAHZIhTIuaBhj1Jk0qUUA=="; }; }; - "@sentry/integrations-7.64.0" = { + "@sentry/integrations-7.68.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.64.0"; + version = "7.68.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.64.0.tgz"; - sha512 = "6gbSGiruOifAmLtXw//Za19GWiL5qugDMEFxSvc5WrBWb+A8UK+foPn3K495OcivLS68AmqAQCUGb+6nlVowwA=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.68.0.tgz"; + sha512 = "kCY+rD2QD9YAatx9rFT7ndxCTigP10lWTX1qZHNKZBZqr38SvsaD3tyVpbXVPjaFR1tnpuH0osWAjY/gyjFhlw=="; }; }; - "@sentry/node-7.64.0" = { + "@sentry/node-7.68.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.64.0"; + version = "7.68.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.64.0.tgz"; - sha512 = "wRi0uTnp1WSa83X2yLD49tV9QPzGh5e42IKdIDBiQ7lV9JhLILlyb34BZY1pq6p4dp35yDasDrP3C7ubn7wo6A=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.68.0.tgz"; + sha512 = "gtcHoi6Xu6Iu8MpPgKJA4E0nozqLvYF0fKtt+27T0QBzWioO6lkxSQkKGWMyJGL0AmpLCex0E28fck/rlbt0LA=="; }; }; - "@sentry/types-7.64.0" = { + "@sentry/types-7.68.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.64.0"; + version = "7.68.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.64.0.tgz"; - sha512 = "LqjQprWXjUFRmzIlUjyA+KL+38elgIYmAeoDrdyNVh8MK5IC1W2Lh1Q87b4yOiZeMiIhIVNBd7Ecoh2rodGrGA=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.68.0.tgz"; + sha512 = "5J2pH1Pjx/029zTm3CNY9MaE8Aui81nG7JCtlMp7uEfQ//9Ja4d4Sliz/kV4ARbkIKUZerSgaRAm3xCy5XOXLg=="; }; }; - "@sentry/utils-7.64.0" = { + "@sentry/utils-7.68.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.64.0"; + version = "7.68.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.64.0.tgz"; - sha512 = "HRlM1INzK66Gt+F4vCItiwGKAng4gqzCR4C5marsL3qv6SrKH98dQnCGYgXluSWaaa56h97FRQu7TxCk6jkSvQ=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.68.0.tgz"; + sha512 = "NecnQegvKARyeFmBx7mYmbI17mTvjARWs1nfzY5jhPyNc3Zk4M3bQsgIdnJ1t+jo93UYudlNND7hxhDzjcBAVg=="; }; }; - "@smithy/abort-controller-2.0.4" = { + "@smithy/abort-controller-2.0.6" = { name = "_at_smithy_slash_abort-controller"; packageName = "@smithy/abort-controller"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.4.tgz"; - sha512 = "3+3/xRQ0K/NFVtKSiTGsUa3muZnVaBmHrLNgxwoBLZO9rNhwZtjjjf7pFJ6aoucoul/c/w3xobRkgi8F9MWX8Q=="; + url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.6.tgz"; + sha512 = "4I7g0lyGUlW2onf8mD76IzU37oRWSHsQ5zlW5MjDzgg4I4J9bOK4500Gx6qOuoN7+GulAnGLe1YwyrIluzhakg=="; }; }; - "@smithy/config-resolver-2.0.4" = { + "@smithy/config-resolver-2.0.7" = { name = "_at_smithy_slash_config-resolver"; packageName = "@smithy/config-resolver"; - version = "2.0.4"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.4.tgz"; - sha512 = "JtKWIKoCFeOY5JGQeEl81AKdIpzeLLSjSMmO5yoKqc58Yn3cxmteylT6Elba3FgAHjK1OthARRXz5JXaKKRB7g=="; + url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.7.tgz"; + sha512 = "J4J1AWiqaApC+3I9U++SuxAQ3BOoM5VoYnpFzCZcb63aLF80Zpc/nq2pFR1OsEIYyg2UYNdcBKKfHABmwo4WgQ=="; }; }; - "@smithy/credential-provider-imds-2.0.4" = { + "@smithy/credential-provider-imds-2.0.9" = { name = "_at_smithy_slash_credential-provider-imds"; packageName = "@smithy/credential-provider-imds"; - version = "2.0.4"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.4.tgz"; - sha512 = "vW7xoDKZwjjf/2GCwVf/uvZce/QJOAYan9r8UsqlzOrnnpeS2ffhxeZjLK0/emZu8n6qU3amGgZ/BTo3oVtEyQ=="; + url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.9.tgz"; + sha512 = "K7WZRkHS5HZofRgK+O8W4YXXyaVexU1K6hp9vlUL/8CsnrFbZS9quyH/6hTROrYh2PuJr24yii1kc83NJdxMGQ=="; }; }; - "@smithy/eventstream-codec-2.0.4" = { + "@smithy/eventstream-codec-2.0.6" = { name = "_at_smithy_slash_eventstream-codec"; packageName = "@smithy/eventstream-codec"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.4.tgz"; - sha512 = "DkVLcQjhOxPj/4pf2hNj2kvOeoLczirHe57g7czMNJCUBvg9cpU9hNgqS37Y5sjdEtMSa2oTyCS5oeHZtKgoIw=="; + url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.6.tgz"; + sha512 = "J9xL82mlYRUMXFnB9VaThXkD7z2JLr52FIVZMoQQ1dxZG5ub+NOGmzaTTZC/cMmKXI/nwCoFuwDWCTjwQhYhQA=="; }; }; - "@smithy/fetch-http-handler-2.0.4" = { + "@smithy/fetch-http-handler-2.1.2" = { name = "_at_smithy_slash_fetch-http-handler"; packageName = "@smithy/fetch-http-handler"; - version = "2.0.4"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.0.4.tgz"; - sha512 = "1dwR8T+QMe5Gs60NpZgF7ReZp0SXz1O/aX5BdDhsOJh72fi3Bx2UZlDihCdb++9vPyBRMXFRF7I8/C4x8iIm8A=="; + url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.1.2.tgz"; + sha512 = "3Gm3pQm4viUPU+e7KkRScS9t5phBxSNRS8rQSZ+HeCwK/busrX0/2HJZiwLvGblqPqi1laJB0lD18AdiOioJww=="; }; }; - "@smithy/hash-node-2.0.4" = { + "@smithy/hash-node-2.0.6" = { name = "_at_smithy_slash_hash-node"; packageName = "@smithy/hash-node"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.4.tgz"; - sha512 = "vZ6a/fvEAFJKNtxJsn0I2WM8uBdypLLhLTpP4BA6fRsBAtwIl5S4wTt0Hspy6uGNn/74LmCxGmFSTMMbSd7ZDA=="; + url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.6.tgz"; + sha512 = "xz7fzFxSzxohKGGyKPbLReRrY01JOZgRDHIXSks3PxQxG9c8PJMa5nUw0stH8UOySUgkofmMy0n7vTUsF5Mdqg=="; }; }; - "@smithy/invalid-dependency-2.0.4" = { + "@smithy/invalid-dependency-2.0.6" = { name = "_at_smithy_slash_invalid-dependency"; packageName = "@smithy/invalid-dependency"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.4.tgz"; - sha512 = "zfbPPZFiZvhIXJYKlzQwDUnxmWK/SmyDcM6iQJRZHU2jQZAzhHUXFGIu2lKH9L02VUqysOgQi3S/HY4fhrVT8w=="; + url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.6.tgz"; + sha512 = "L5MUyl9mzawIvBxr0Hg3J/Q5qZFXKcBgMk0PacfK3Mthp4WAR6h7iMxdSQ23Q7X/kxOrpZuoYEdh1BWLKbDc8Q=="; }; }; "@smithy/is-array-buffer-2.0.0" = { @@ -1687,40 +1678,40 @@ let sha512 = "z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug=="; }; }; - "@smithy/middleware-content-length-2.0.4" = { + "@smithy/middleware-content-length-2.0.8" = { name = "_at_smithy_slash_middleware-content-length"; packageName = "@smithy/middleware-content-length"; - version = "2.0.4"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.4.tgz"; - sha512 = "Pdd+fhRbvizqsgYJ0pLWE6hjhq42wDFWzMj/1T7mEY9tG9bP6/AcdsQK8SAOckrBLURDoeSqTAwPKalsgcZBxw=="; + url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.8.tgz"; + sha512 = "fHJFsscHXrYhUSWMFJNXfsZW8KsyhWQfBgU3b0nvDfpm+NAeQLqKYNhywGrDwZQc1k+lt7Fw9faAquhNPxTZRA=="; }; }; - "@smithy/middleware-endpoint-2.0.4" = { + "@smithy/middleware-endpoint-2.0.6" = { name = "_at_smithy_slash_middleware-endpoint"; packageName = "@smithy/middleware-endpoint"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.4.tgz"; - sha512 = "aLPqkqKjZQ1V718P0Ostpp53nWfwK32uD0HFKSAOT25RvL285dqzGl0PAKDXpyLsPsPmHe0Yrg0AUFkRv4CRbQ=="; + url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.6.tgz"; + sha512 = "MuSPPtEHFal/M77tR3ffLsdOfX29IZpA990nGuoPj5zQnAYrA4PYBGoqqrASQKm8Xb3C0NwuYzOATT7WX4f5Pg=="; }; }; - "@smithy/middleware-retry-2.0.4" = { + "@smithy/middleware-retry-2.0.9" = { name = "_at_smithy_slash_middleware-retry"; packageName = "@smithy/middleware-retry"; - version = "2.0.4"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.4.tgz"; - sha512 = "stozO6NgH9W/OSfFMOJEtlJCsnJFSoGyV4LHzIVQeXTzZ2RHjmytQ/Ez7GngHGZ1YsB4zxE1qDTXAU0AlaKf2w=="; + url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.9.tgz"; + sha512 = "gneEqWj4l/ZjHdZPk0BFMXoTalRArdQ8i579/KqJgBAc6Ux5vnR/SSppkMCkj2kOQYwdypvzSPeqEW3ZrvIg6g=="; }; }; - "@smithy/middleware-serde-2.0.4" = { + "@smithy/middleware-serde-2.0.6" = { name = "_at_smithy_slash_middleware-serde"; packageName = "@smithy/middleware-serde"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.4.tgz"; - sha512 = "oDttJMMES7yXmopjQHnqTkxu8vZOdjB9VpSj94Ff4/GXdKQH7ozKLNIPq4C568nbeQbBt/gsLb6Ttbx1+j+JPQ=="; + url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.6.tgz"; + sha512 = "8/GODBngYbrS28CMZtaHIL4R9rLNSQ/zgb+N1OAZ02NwBUawlnLDcatve9YRzhJC/IWz0/pt+WimJZaO1sGcig=="; }; }; "@smithy/middleware-stack-2.0.0" = { @@ -1732,58 +1723,67 @@ let sha512 = "31XC1xNF65nlbc16yuh3wwTudmqs6qy4EseQUGF8A/p2m/5wdd/cnXJqpniy/XvXVwkHPz/GwV36HqzHtIKATQ=="; }; }; - "@smithy/node-config-provider-2.0.4" = { + "@smithy/node-config-provider-2.0.9" = { name = "_at_smithy_slash_node-config-provider"; packageName = "@smithy/node-config-provider"; - version = "2.0.4"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.4.tgz"; - sha512 = "s9O90cEhkpzZulvdHBBaroZ6AJ5uV6qtmycgYKP1yOCSfPHGIWYwaULdbfxraUsvzCcnMosDNkfckqXYoKI6jw=="; + url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.9.tgz"; + sha512 = "TlSPbCwtT/jgNnmPQqKuCR5CFN8UIrCCHRrgUfs3NqRMuaLLeP8TPe1fSKq2J8h1M/jd4BF853gneles0gWevg=="; }; }; - "@smithy/node-http-handler-2.0.4" = { + "@smithy/node-http-handler-2.1.2" = { name = "_at_smithy_slash_node-http-handler"; packageName = "@smithy/node-http-handler"; - version = "2.0.4"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.0.4.tgz"; - sha512 = "svqeqkGgQz1B2m3IurHtp1O8vfuUGbqw6vynFmOrvPirRdiIPukHTZW1GN/JuBCtDpq9mNPutSVipfz2n4sZbQ=="; + url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.2.tgz"; + sha512 = "PdEEDCShuM8zxGoaRxmGB/1ikB8oeqz+ZAF9VIA8FCP3E59j8zDTF+wCELoWd1Y6gtxr+RcTAg5sA8nvn5qH/w=="; }; }; - "@smithy/property-provider-2.0.4" = { + "@smithy/property-provider-2.0.7" = { name = "_at_smithy_slash_property-provider"; packageName = "@smithy/property-provider"; - version = "2.0.4"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.4.tgz"; - sha512 = "OfaUIhnyvOkuCPHWMPkJqX++dUaDKsiZWuZqCdU04Z9dNAl2TtZAh7dw2rsZGb57vq6YH3PierNrDfQJTAKYtg=="; + url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.7.tgz"; + sha512 = "XT8Tl7YNxM8tCtGqy7v7DSf6PxyXaPE9cdA/Yj4dEw2b05V3RrPqsP+t5XJiZu0yIsQ7pdeYZWv2sSEWVjNeAg=="; }; }; - "@smithy/protocol-http-2.0.4" = { + "@smithy/protocol-http-2.0.5" = { name = "_at_smithy_slash_protocol-http"; packageName = "@smithy/protocol-http"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-2.0.4.tgz"; - sha512 = "I1vCZ/m1U424gA9TXkL/pJ3HlRfujY8+Oj3GfDWcrNiWVmAeyx3CTvXw+yMHp2X01BOOu5fnyAa6JwAn1O+txA=="; + url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-2.0.5.tgz"; + sha512 = "d2hhHj34mA2V86doiDfrsy2fNTnUOowGaf9hKb0hIPHqvcnShU4/OSc4Uf1FwHkAdYF3cFXTrj5VGUYbEuvMdw=="; }; }; - "@smithy/querystring-builder-2.0.4" = { + "@smithy/protocol-http-3.0.2" = { + name = "_at_smithy_slash_protocol-http"; + packageName = "@smithy/protocol-http"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.2.tgz"; + sha512 = "LUOWCPRihvJBkdSs+ivK9m1f/rMfF3n9Zpzg8qdry2eIG4HQqqLBMWQyF9bgk7JhsrrOa3//jJKhXzvL7wL5Xw=="; + }; + }; + "@smithy/querystring-builder-2.0.6" = { name = "_at_smithy_slash_querystring-builder"; packageName = "@smithy/querystring-builder"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.4.tgz"; - sha512 = "Jc7UPx1pNeisYcABkoo2Pn4kvomy1UI7uxv7R+1W3806KMAKgYHutWmZG01aPHu2XH0zY2RF2KfGiuialsxHvA=="; + url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.6.tgz"; + sha512 = "HnU00shCGoV8vKJZTiNBkNvR9NogU3NIUaVMAGJPSqNGJj3psWo+TUrC0BVCDcwiCljXwXCFGJqIcsWtClrktQ=="; }; }; - "@smithy/querystring-parser-2.0.4" = { + "@smithy/querystring-parser-2.0.6" = { name = "_at_smithy_slash_querystring-parser"; packageName = "@smithy/querystring-parser"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.4.tgz"; - sha512 = "Uh6+PhGxSo17qe2g/JlyoekvTHKn7dYWfmHqUzPAvkW+dHlc3DNVG3++PV48z33lCo5YDVBBturWQ9N/TKn+EA=="; + url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.6.tgz"; + sha512 = "i4LKoXHP7pTFAPjLIJyQXYOhWokbcFha3WWsX74sAKmuluv0XM2cxONZoFxwEzmWhsNyM6buSwJSZXyPiec0AQ=="; }; }; "@smithy/service-error-classification-2.0.0" = { @@ -1795,49 +1795,49 @@ let sha512 = "2z5Nafy1O0cTf69wKyNjGW/sNVMiqDnb4jgwfMG8ye8KnFJ5qmJpDccwIbJNhXIfbsxTg9SEec2oe1cexhMJvw=="; }; }; - "@smithy/shared-ini-file-loader-2.0.4" = { + "@smithy/shared-ini-file-loader-2.0.8" = { name = "_at_smithy_slash_shared-ini-file-loader"; packageName = "@smithy/shared-ini-file-loader"; - version = "2.0.4"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.4.tgz"; - sha512 = "091yneupXnSqvAU+vLG7h0g4QRRO6TjulpECXYVU6yW/LiNp7QE533DBpaphmbtI6tTC4EfGrhn35gTa0w+GQg=="; + url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.8.tgz"; + sha512 = "4u+V+Dv7JGpJ0tppB5rxCem7WhdFux950z4cGPhV0kHTPkKe8DDgINzOlVa2RBu5dI33D02OBJcxFjhW4FPORg=="; }; }; - "@smithy/signature-v4-2.0.4" = { + "@smithy/signature-v4-2.0.6" = { name = "_at_smithy_slash_signature-v4"; packageName = "@smithy/signature-v4"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.4.tgz"; - sha512 = "y2xblkS0hb44QJDn9YjPp5aRFYSiI7w0bI3tATE3ybOrII2fppqD0SE3zgvew/B/3rTunuiCW+frTD0W4UYb9Q=="; + url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.6.tgz"; + sha512 = "4zNTi8w4sky07YKq7oYucZt4ogY00IEaS1NFDXxmCN5V/ywE0WiK+WMim+8wtYQmB0qy3oExZR4LoCAml6j/rA=="; }; }; - "@smithy/smithy-client-2.0.4" = { + "@smithy/smithy-client-2.1.3" = { name = "_at_smithy_slash_smithy-client"; packageName = "@smithy/smithy-client"; - version = "2.0.4"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.0.4.tgz"; - sha512 = "Dg1dkqyj3jwa03RFs6E4ASmfQ7CjplbGISJIJNSt3F8NfIid2RalbeCMOIHK7VagKh9qngZNyoKxObZC9LB9Lg=="; + url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.3.tgz"; + sha512 = "nSMMp2AKqcG/ruzCY01ogrMdbq/WS1cvGStTsw7yd6bTpp/bGtlOgXvy3h7e0zP7w2DH1AtvIwzYBD6ejZePsQ=="; }; }; - "@smithy/types-2.2.1" = { + "@smithy/types-2.3.0" = { name = "_at_smithy_slash_types"; packageName = "@smithy/types"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/types/-/types-2.2.1.tgz"; - sha512 = "6nyDOf027ZeJiQVm6PXmLm7dR+hR2YJUkr4VwUniXA8xZUGAu5Mk0zfx2BPFrt+e5YauvlIqQoH0CsrM4tLkfg=="; + url = "https://registry.npmjs.org/@smithy/types/-/types-2.3.0.tgz"; + sha512 = "pJce3rd39MElkV57UTPAoSYAApjQLELUxjU5adHNLYk9gnPvyIGbJNJTZVVFu00BrgZH3W/cQe8QuFcknDyodQ=="; }; }; - "@smithy/url-parser-2.0.4" = { + "@smithy/url-parser-2.0.6" = { name = "_at_smithy_slash_url-parser"; packageName = "@smithy/url-parser"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.4.tgz"; - sha512 = "puIQ6+TJpI2AAPw7IGdGG6d2DEcVP5nJqa1VjrxzUcy2Jx7LtGn+gDHY2o9Pc9vQkmoicovTEKgvv7CdqP+0gg=="; + url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.6.tgz"; + sha512 = "9i6j5QW6bapHZ4rtkXOAm0hOUG1+5IVdVJXNSUTcNskwJchZH5IQuDNPCbgUi/u2P8EZazKt4wXT51QxOXCz1A=="; }; }; "@smithy/util-base64-2.0.0" = { @@ -1858,13 +1858,13 @@ let sha512 = "JdDuS4ircJt+FDnaQj88TzZY3+njZ6O+D3uakS32f2VNnDo3vyEuNdBOh/oFd8Df1zSZOuH1HEChk2AOYDezZg=="; }; }; - "@smithy/util-body-length-node-2.0.0" = { + "@smithy/util-body-length-node-2.1.0" = { name = "_at_smithy_slash_util-body-length-node"; packageName = "@smithy/util-body-length-node"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.0.0.tgz"; - sha512 = "ZV7Z/WHTMxHJe/xL/56qZwSUcl63/5aaPAGjkfynJm4poILjdD4GmFI+V+YWabh2WJIjwTKZ5PNsuvPQKt93Mg=="; + url = "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.1.0.tgz"; + sha512 = "/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw=="; }; }; "@smithy/util-buffer-from-2.0.0" = { @@ -1885,22 +1885,22 @@ let sha512 = "xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg=="; }; }; - "@smithy/util-defaults-mode-browser-2.0.4" = { + "@smithy/util-defaults-mode-browser-2.0.7" = { name = "_at_smithy_slash_util-defaults-mode-browser"; packageName = "@smithy/util-defaults-mode-browser"; - version = "2.0.4"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.4.tgz"; - sha512 = "wGdnPt4Ng72duUd97HrlqVkq6DKVB/yjaGkSg5n3uuQKzzHjoi3OdjXGumD/VYPHz0dYd7wpLNG2CnMm/nfDrg=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.7.tgz"; + sha512 = "s1caKxC7Y87Q72Goll//clZs2WNBfG9WtFDWVRS+Qgk147YPCOUYtkpuD0XZAh/vbayObFz5tQ1fiX4G19HSCA=="; }; }; - "@smithy/util-defaults-mode-node-2.0.4" = { + "@smithy/util-defaults-mode-node-2.0.9" = { name = "_at_smithy_slash_util-defaults-mode-node"; packageName = "@smithy/util-defaults-mode-node"; - version = "2.0.4"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.4.tgz"; - sha512 = "QMkNcV6x52BeeeIvhvow6UmOu7nP7DXQljY6DKOP/aAokrli53IWTP/kUTd9B0Mp9tbW3WC10O6zaM69xiMNYw=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.9.tgz"; + sha512 = "HlV4iNL3/PgPpmDGs0+XrAKtwFQ8rOs5P2y5Dye8dUYaJauadlzHRrNKk7wH2aBYswvT2HM+PIgXamvrE7xbcw=="; }; }; "@smithy/util-hex-encoding-2.0.0" = { @@ -1930,13 +1930,13 @@ let sha512 = "/dvJ8afrElasuiiIttRJeoS2sy8YXpksQwiM/TcepqdRVp7u4ejd9C4IQURHNjlfPUT7Y6lCDSa2zQJbdHhVTg=="; }; }; - "@smithy/util-stream-2.0.4" = { + "@smithy/util-stream-2.0.9" = { name = "_at_smithy_slash_util-stream"; packageName = "@smithy/util-stream"; - version = "2.0.4"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.4.tgz"; - sha512 = "ZVje79afuv3DB1Ma/g5m/5v9Zda8nA0xNgvE1pOD3EnoTp/Ekch1z20AN6gfVsf7JYWK2VSMVDiqI9N8Ua4wbg=="; + url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.9.tgz"; + sha512 = "Fn2/3IMwqu0l2hOC7K3bbtSqFEJ6nOzMLoPVIhuH84yw/95itNkFBwVbIIiAfDaout0ZfZ26+5ch86E2q3avww=="; }; }; "@smithy/util-uri-escape-2.0.0" = { @@ -1966,31 +1966,40 @@ let sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw=="; }; }; - "@swc/core-1.3.78" = { + "@swc/core-1.3.84" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.78"; + version = "1.3.84"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.78.tgz"; - sha512 = "y6DQP571v7fbUUY7nz5G4lNIRGofuO48K5pGhD9VnuOCTuptfooCdi8wnigIrIhM/M4zQ53m/YCMDCbOtDgEww=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.84.tgz"; + sha512 = "UPKUiDwG7HOdPfOb1VFeEJ76JDgU2w80JLewzx6tb0fk9TIjhr9yxKBzPbzc/QpjGHDu5iaEuNeZcu27u4j63g=="; }; }; - "@swc/helpers-0.5.1" = { + "@swc/helpers-0.5.2" = { name = "_at_swc_slash_helpers"; packageName = "@swc/helpers"; - version = "0.5.1"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz"; + sha512 = "E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw=="; + }; + }; + "@swc/types-0.1.4" = { + name = "_at_swc_slash_types"; + packageName = "@swc/types"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.1.tgz"; - sha512 = "sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg=="; + url = "https://registry.npmjs.org/@swc/types/-/types-0.1.4.tgz"; + sha512 = "z/G02d+59gyyUb7KYhKi9jOhicek6QD2oMaotUyG+lUkybpXoV49dY9bj7Ah5Q+y7knK2jU67UTX9FyfGzaxQg=="; }; }; - "@swc/wasm-1.3.78" = { + "@swc/wasm-1.3.84" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.78"; + version = "1.3.84"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.78.tgz"; - sha512 = "MaJEpjm69eLX+XDT3jmkPtAEjN2MVHmTFSYUwtqKdO2lTAVYZcv2u/2oyAtsgOqTseklJrlgxQHWFJjaN44F1g=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.84.tgz"; + sha512 = "lFF3vflQLl9pDVnlZAmH0y8cTdXDU5LhUlj6HxyZA83Ft4CkLhZSCE3CU9ksBeonGdj8YsIh0RPDQ3dqj70IZQ=="; }; }; "@techteamer/ocsp-1.0.0" = { @@ -2011,13 +2020,13 @@ let sha512 = "d/keJiNKfpHo+GmSB8QcsAwBx8h+V1UbdozA5TD+eSLXprNY53JAYub47J9evsSKWDdNG5uVj0FiMozLKuzowQ=="; }; }; - "@tediousjs/connection-string-0.4.4" = { + "@tediousjs/connection-string-0.5.0" = { name = "_at_tediousjs_slash_connection-string"; packageName = "@tediousjs/connection-string"; - version = "0.4.4"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@tediousjs/connection-string/-/connection-string-0.4.4.tgz"; - sha512 = "Qssn7gmOILmqD0zkfA09YyFd52UajWYkLTTSi4Dx/XZaUuVcx4W4guv2rAVc5mm8wYRdonmG/HfFH3PS6izXAg=="; + url = "https://registry.npmjs.org/@tediousjs/connection-string/-/connection-string-0.5.0.tgz"; + sha512 = "7qSgZbincDDDFyRweCIEvZULFAw5iz/DeunhvuxpL31nfntX3P4Yd4HkHBRg9H8CdqY1e5WFN1PZIz/REL9MVQ=="; }; }; "@tokenizer/token-0.3.0" = { @@ -2110,13 +2119,13 @@ let sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; }; }; - "@types/connect-3.4.35" = { + "@types/connect-3.4.36" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; - version = "3.4.35"; + version = "3.4.36"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz"; - sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.36.tgz"; + sha512 = "P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w=="; }; }; "@types/duplexify-3.6.1" = { @@ -2173,13 +2182,13 @@ let sha512 = "Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q=="; }; }; - "@types/express-serve-static-core-4.17.35" = { + "@types/express-serve-static-core-4.17.36" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.35"; + version = "4.17.36"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz"; - sha512 = "wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.36.tgz"; + sha512 = "zbivROJ0ZqLAtMzgzIUC4oNqDG9iF0lSsAqpOD9kbs5xcIM3dTiyuHvBc7R8MtWBp3AAWGaovJa+wzWPjLYW7Q=="; }; }; "@types/http-errors-2.0.1" = { @@ -2209,22 +2218,22 @@ let sha512 = "drE6uz7QBKq1fYqqoFKTDRdFCPHd5TCub75BM+D+cMx7NU9hUz7SESLfC2fSCXVFMO5Yj8sOWHuGqPgjc+fz0Q=="; }; }; - "@types/lodash-4.14.197" = { + "@types/lodash-4.14.198" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.197"; + version = "4.14.198"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.197.tgz"; - sha512 = "BMVOiWs0uNxHVlHBgzTIqJYmj+PgCo4euloGF+5m4okL3rEYzM2EEv78mw8zWSMM57dM7kVIgJ2QDvwHSoCI5g=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.198.tgz"; + sha512 = "trNJ/vtMZYMLhfN45uLq4ShQSw0/S7xCTLLVM+WM1rmFpba/VS42jVUgaO3w/NOLiWR/09lnYk0yMaA/atdIsg=="; }; }; - "@types/lodash-es-4.17.8" = { + "@types/lodash-es-4.17.9" = { name = "_at_types_slash_lodash-es"; packageName = "@types/lodash-es"; - version = "4.17.8"; + version = "4.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.8.tgz"; - sha512 = "euY3XQcZmIzSy7YH5+Unb3b2X12Wtk54YWINBvvGQ5SmMvwb11JQskGsfkH/5HXK77Kr8GF0wkVDIxzAisWtog=="; + url = "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.9.tgz"; + sha512 = "ZTcmhiI3NNU7dEvWLZJkzG6ao49zOIjEgIE0RgV7wbPxU0f2xT3VSAHw2gmst8swH6V0YkLRGp4qPlX/6I90MQ=="; }; }; "@types/long-4.0.2" = { @@ -2254,13 +2263,13 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-20.5.1" = { + "@types/node-20.6.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.5.1"; + version = "20.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.5.1.tgz"; - sha512 = "4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.6.0.tgz"; + sha512 = "najjVq5KN2vsH2U/xyh2opaSEz6cZMR2SetLIlxlj08nOcmPOemJmUK2o4kUzfLqfrWE0PIrNeE16XhYDd3nqg=="; }; }; "@types/node-fetch-2.6.4" = { @@ -2281,13 +2290,13 @@ let sha512 = "l7u/Dnh1OG9T7VH6TvulR0g8oE8hgIW5409mSUKi8Vxw2+JV18aTa06Sv5bvNjrD0zbsB/cuZ/iTFQgFNfzIuw=="; }; }; - "@types/qs-6.9.7" = { + "@types/qs-6.9.8" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.7"; + version = "6.9.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz"; - sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.8.tgz"; + sha512 = "u95svzDlTysU5xecFNTgfFG5RUWu1A9P0VzgpcIiGZA9iraHOdSzcxMxQ55DyeRaGCSxQi7LxXDI4rzq/MYfdg=="; }; }; "@types/range-parser-1.2.4" = { @@ -2299,6 +2308,15 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; + "@types/readable-stream-4.0.2" = { + name = "_at_types_slash_readable-stream"; + packageName = "@types/readable-stream"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.2.tgz"; + sha512 = "hhzOsMEISZ+mX1l+01F0duYt9wHEbCGmjARed0PcQoVS5zAdu7u5YbWYuNGhw09M1MgGr3kfsto+ut/MnAdKqA=="; + }; + }; "@types/send-0.17.1" = { name = "_at_types_slash_send"; packageName = "@types/send"; @@ -2353,13 +2371,13 @@ let sha512 = "c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw=="; }; }; - "@types/uuid-9.0.2" = { + "@types/uuid-9.0.3" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; - version = "9.0.2"; + version = "9.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.2.tgz"; - sha512 = "kNnC1GFBLuhImSnV7w4njQkUiJi0ZXUycu1rUaouPqiKlXkh77JKgdRnTAp1x5eBwcIwbtI+3otwzuIDEuDoxQ=="; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.3.tgz"; + sha512 = "taHQQH/3ZyI3zP8M/puluDEIEvtQHVYcC6y3N8ijFtAd28+Ey/G4sg1u2gB01S8MwybLOKAp9/yCMu/uR5l3Ug=="; }; }; "@types/validator-13.11.1" = { @@ -2533,22 +2551,22 @@ let sha512 = "7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="; }; }; - "@vueuse/components-10.3.0" = { + "@vueuse/components-10.4.1" = { name = "_at_vueuse_slash_components"; packageName = "@vueuse/components"; - version = "10.3.0"; + version = "10.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/components/-/components-10.3.0.tgz"; - sha512 = "EeZz3kjmJI7bH7JSxxMlLyk21LGl6GQjXfpl2n/GiI9QSJi+BVzIra5kEty5eM8McwAanx3e/HnK4drYTgFOWw=="; + url = "https://registry.npmjs.org/@vueuse/components/-/components-10.4.1.tgz"; + sha512 = "hEWeumCfH394fkEYc/hng6T5VcjVkdqx7b75Sd6z4Uw3anjeo93Zp9qqtzFOv5bAmHls3Zy04Kowo1glrxDFRQ=="; }; }; - "@vueuse/core-10.3.0" = { + "@vueuse/core-10.4.1" = { name = "_at_vueuse_slash_core"; packageName = "@vueuse/core"; - version = "10.3.0"; + version = "10.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/core/-/core-10.3.0.tgz"; - sha512 = "BEM5yxcFKb5btFjTSAFjTu5jmwoW66fyV9uJIP4wUXXU8aR5Hl44gndaaXp7dC5HSObmgbnR2RN+Un1p68Mf5Q=="; + url = "https://registry.npmjs.org/@vueuse/core/-/core-10.4.1.tgz"; + sha512 = "DkHIfMIoSIBjMgRRvdIvxsyboRZQmImofLyOHADqiVbQVilP8VVHDhBX2ZqoItOgu7dWa8oXiNnScOdPLhdEXg=="; }; }; "@vueuse/core-9.13.0" = { @@ -2560,13 +2578,13 @@ let sha512 = "pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw=="; }; }; - "@vueuse/metadata-10.3.0" = { + "@vueuse/metadata-10.4.1" = { name = "_at_vueuse_slash_metadata"; packageName = "@vueuse/metadata"; - version = "10.3.0"; + version = "10.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.3.0.tgz"; - sha512 = "Ema3YhNOa4swDsV0V7CEY5JXvK19JI/o1szFO1iWxdFg3vhdFtCtSTP26PCvbUpnUtNHBY2wx5y3WDXND5Pvnw=="; + url = "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.4.1.tgz"; + sha512 = "2Sc8X+iVzeuMGHr6O2j4gv/zxvQGGOYETYXEc41h0iZXIRnRbJZGmY/QP8dvzqUelf8vg0p/yEA5VpCEu+WpZg=="; }; }; "@vueuse/metadata-9.13.0" = { @@ -2578,13 +2596,13 @@ let sha512 = "gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ=="; }; }; - "@vueuse/shared-10.3.0" = { + "@vueuse/shared-10.4.1" = { name = "_at_vueuse_slash_shared"; packageName = "@vueuse/shared"; - version = "10.3.0"; + version = "10.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/shared/-/shared-10.3.0.tgz"; - sha512 = "kGqCTEuFPMK4+fNWy6dUOiYmxGcUbtznMwBZLC1PubidF4VZY05B+Oht7Jh7/6x4VOWGpvu3R37WHi81cKpiqg=="; + url = "https://registry.npmjs.org/@vueuse/shared/-/shared-10.4.1.tgz"; + sha512 = "vz5hbAM4qA0lDKmcr2y3pPdU+2EVw/yzfRsBdu+6+USGa4PxqSQRYIUC9/NcT06y+ZgaTsyURw2I9qOFaaXHAg=="; }; }; "@vueuse/shared-9.13.0" = { @@ -3064,22 +3082,22 @@ let sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; - "array.prototype.reduce-1.0.5" = { + "array.prototype.reduce-1.0.6" = { name = "array.prototype.reduce"; packageName = "array.prototype.reduce"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz"; - sha512 = "kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q=="; + url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz"; + sha512 = "UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg=="; }; }; - "arraybuffer.prototype.slice-1.0.1" = { + "arraybuffer.prototype.slice-1.0.2" = { name = "arraybuffer.prototype.slice"; packageName = "arraybuffer.prototype.slice"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz"; - sha512 = "09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw=="; + url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz"; + sha512 = "yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw=="; }; }; "arrify-2.0.1" = { @@ -3262,13 +3280,13 @@ let sha512 = "H5Vrb/GMzq72+Of2zrW69i/BTQ4gQd3MQvdZ3X3okfppzHdEjSPkdJN6ia8V2/1J1FmFvEtoxaY4nwraHUGQvg=="; }; }; - "aws-sdk-2.1440.0" = { + "aws-sdk-2.1454.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1440.0"; + version = "2.1454.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1440.0.tgz"; - sha512 = "ijHaRFZIKLYUDqOGTNrwncXF5vzJPU6VJpbRr7eNBAvo+nFtEHY4BZkldWYuhELCbWz0U5/+qMtF2T/JgPjfWQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1454.0.tgz"; + sha512 = "k+wBy+ev2HWawdfYlZqGMD4WI8zyS+r6t1hc8pwSxm3s8wjP69s8df4LjUaMxMwK8xu7UscVVsXJBpMMsXFhew=="; }; }; "aws4-1.12.0" = { @@ -3307,13 +3325,22 @@ let sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; - "axios-retry-3.6.0" = { + "axios-1.5.0" = { + name = "axios"; + packageName = "axios"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz"; + sha512 = "D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ=="; + }; + }; + "axios-retry-3.7.0" = { name = "axios-retry"; packageName = "axios-retry"; - version = "3.6.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.6.0.tgz"; - sha512 = "jtH4qWTKZ2a17dH6tjq52Y1ssNV0lKge6/Z9Lw67s9Wt01nGTg4hg7/LJBGYfDci44NTANJQlCPHPOT/TSFm9w=="; + url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.7.0.tgz"; + sha512 = "ZTnCkJbRtfScvwiRnoVskFAfvU0UG3xNcsjwTR0mawSbIJoothxn67gKsMaNAFHRXJ1RmuLhmZBzvyXi3+9WyQ=="; }; }; "balanced-match-1.0.2" = { @@ -3370,13 +3397,13 @@ let sha512 = "V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="; }; }; - "better-sqlite3-8.5.1" = { + "better-sqlite3-8.6.0" = { name = "better-sqlite3"; packageName = "better-sqlite3"; - version = "8.5.1"; + version = "8.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.5.1.tgz"; - sha512 = "aDfC67xfll6bugnOqRJhdUWioQZnkhLkrwZ+oo6yZbNMtyktbwkDO4SfBcCVWbm4BlsCjCNTJchlHaBt+vB4Iw=="; + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.6.0.tgz"; + sha512 = "jwAudeiTMTSyby+/SfbHDebShbmC2MCH8mU2+DXi0WJfv13ypEJm47cd3kljmy/H130CazEvkf2Li//ewcMJ1g=="; }; }; "big-integer-1.6.51" = { @@ -3415,13 +3442,13 @@ let sha512 = "uw4ra6Cv483Op/ebM0GBKKfxZlSmn6NgFRby5L3yGTlunLj53KQgndDlqy2WVFOwgvurocApYkSud0aO+mvrpQ=="; }; }; - "bignumber.js-9.1.1" = { + "bignumber.js-9.1.2" = { name = "bignumber.js"; packageName = "bignumber.js"; - version = "9.1.1"; + version = "9.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz"; - sha512 = "pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="; + url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz"; + sha512 = "2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug=="; }; }; "binary-extensions-2.2.0" = { @@ -3784,13 +3811,13 @@ let sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; }; - "caniuse-lite-1.0.30001522" = { + "caniuse-lite-1.0.30001532" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001522"; + version = "1.0.30001532"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001522.tgz"; - sha512 = "TKiyTVZxJGhsTszLuzb+6vUZSjVOAhClszBr2Ta2k9IwtNBT/4dzmL6aywt0HCgEZlmwJzXJd8yNiob6HgwTRg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001532.tgz"; + sha512 = "FbDFnNat3nMnrROzqrsg314zhqN5LGQ1kyyMk2opcrwGbVGpHRhgCWtAgD5YJUqNAiQ+dklreil/c3Qf1dfCTw=="; }; }; "capital-case-1.0.4" = { @@ -4351,13 +4378,13 @@ let sha512 = "2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA=="; }; }; - "core-js-3.32.1" = { + "core-js-3.32.2" = { name = "core-js"; packageName = "core-js"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz"; - sha512 = "lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.32.2.tgz"; + sha512 = "pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ=="; }; }; "core-util-is-1.0.3" = { @@ -4990,22 +5017,22 @@ let sha512 = "rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ=="; }; }; - "electron-to-chromium-1.4.496" = { + "electron-to-chromium-1.4.513" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.496"; + version = "1.4.513"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.496.tgz"; - sha512 = "qeXC3Zbykq44RCrBa4kr8v/dWzYJA8rAwpyh9Qd+NKWoJfjG5vvJqy9XOJ9H4P/lqulZBCgUWAYi+FeK5AuJ8g=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.513.tgz"; + sha512 = "cOB0xcInjm+E5qIssHeXJ29BaUyWpMyFKT5RB3bsLENDheCja0wMkHJyiPl0NBE/VzDI7JDuNEQWhe6RitEUcw=="; }; }; - "element-plus-2.3.9" = { + "element-plus-2.3.12" = { name = "element-plus"; packageName = "element-plus"; - version = "2.3.9"; + version = "2.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/element-plus/-/element-plus-2.3.9.tgz"; - sha512 = "TIOLnPl4cnoCPXqK3QYh+jpkthUBQnAM21O7o3Lhbse8v9pfrRXRTaBJtoEKnYNa8GZ4lZptUfH0PeZgDCNLUg=="; + url = "https://registry.npmjs.org/element-plus/-/element-plus-2.3.12.tgz"; + sha512 = "fAWpbKCyt+l1dsqSNPOs/F/dBN4Wp5CGAyxbiS5zqDwI4q3QPM+LxLU2h3GUHMIBtMGCvmsG98j5HPMkTKkvcA=="; }; }; "emoji-regex-8.0.0" = { @@ -5143,13 +5170,13 @@ let sha512 = "ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw=="; }; }; - "es-aggregate-error-1.0.9" = { + "es-aggregate-error-1.0.10" = { name = "es-aggregate-error"; packageName = "es-aggregate-error"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/es-aggregate-error/-/es-aggregate-error-1.0.9.tgz"; - sha512 = "fvnX40sb538wdU6r4s35cq4EY6Lr09Upj40BEVem4LEsuW8XgQep9yD5Q1U2KftokNp1rWODFJ2qwZSsAjFpbg=="; + url = "https://registry.npmjs.org/es-aggregate-error/-/es-aggregate-error-1.0.10.tgz"; + sha512 = "qX3K9eP7HcgeFckzRy1T5Mtb7wYwZt9ahFteBDigG5Te0vGOmOH3dHDncBiuNkZBX9i+C8LgSbpqSEl97gN11Q=="; }; }; "es-array-method-boxes-properly-1.0.0" = { @@ -5170,13 +5197,13 @@ let sha512 = "sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw=="; }; }; - "es-module-lexer-1.3.0" = { + "es-module-lexer-1.3.1" = { name = "es-module-lexer"; packageName = "es-module-lexer"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz"; - sha512 = "vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA=="; + url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz"; + sha512 = "JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q=="; }; }; "es-set-tostringtag-2.0.1" = { @@ -5719,13 +5746,13 @@ let sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; }; }; - "formidable-3.5.0" = { + "formidable-3.5.1" = { name = "formidable"; packageName = "formidable"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-3.5.0.tgz"; - sha512 = "WwsMWvPmY+Kv37C3+KP3A+2Ym1aZoac4nz4ZEe5z0UPBoCg0O/wHay3eeYkZr4KJIbCzpSUeno+STMhde+KCfw=="; + url = "https://registry.npmjs.org/formidable/-/formidable-3.5.1.tgz"; + sha512 = "WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og=="; }; }; "formstream-1.3.1" = { @@ -5818,13 +5845,13 @@ let sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; - "function.prototype.name-1.1.5" = { + "function.prototype.name-1.1.6" = { name = "function.prototype.name"; packageName = "function.prototype.name"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; - sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; + url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz"; + sha512 = "Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg=="; }; }; "functions-have-names-1.2.3" = { @@ -5989,13 +6016,13 @@ let sha512 = "SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="; }; }; - "glob-10.3.3" = { + "glob-10.3.4" = { name = "glob"; packageName = "glob"; - version = "10.3.3"; + version = "10.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz"; - sha512 = "92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw=="; + url = "https://registry.npmjs.org/glob/-/glob-10.3.4.tgz"; + sha512 = "6LFElP3A+i/Q8XQKEvZjkEWEOTgAIALR9AO2rwT8bgPhDd1anmqDJDZ6lLddI4ehxxxR1S5RIqKe1uapMQfYaQ=="; }; }; "glob-7.2.3" = { @@ -6547,6 +6574,15 @@ let sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; }; }; + "infisical-node-1.4.3" = { + name = "infisical-node"; + packageName = "infisical-node"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/infisical-node/-/infisical-node-1.4.3.tgz"; + sha512 = "z/gYkctAB6yQoH/9um9znvljsF6WVhsrMw9urZ80O5E1M+/RwZW40mc6LHs2nQpZD90at6SbuzVWQoEwSdEmTw=="; + }; + }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -7060,13 +7096,13 @@ let sha512 = "BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w=="; }; }; - "jackspeak-2.3.0" = { + "jackspeak-2.3.3" = { name = "jackspeak"; packageName = "jackspeak"; - version = "2.3.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.0.tgz"; - sha512 = "uKmsITSsF4rUWQHzqaRUuyAir3fZfW3f202Ee34lz/gZCi970CPZwyQXLGNgWJvvZbvFyzeyGq0+4fcG/mBKZg=="; + url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.3.tgz"; + sha512 = "R2bUw+kVZFS/h1AZqBKrSgDmdmjApzgY0AlCPumopFiAlbUxE2gf+SCuBzQ0cP5hHmUmFYF5yw55T97Th5Kstg=="; }; }; "jake-10.8.7" = { @@ -7105,13 +7141,13 @@ let sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; }; }; - "jose-4.14.4" = { + "jose-4.14.6" = { name = "jose"; packageName = "jose"; - version = "4.14.4"; + version = "4.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/jose/-/jose-4.14.4.tgz"; - sha512 = "j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g=="; + url = "https://registry.npmjs.org/jose/-/jose-4.14.6.tgz"; + sha512 = "EqJPEUlZD0/CSUMubKtMaYUOtWe91tZXTWMJZoKSbLk+KtdhNdcvppH8lA9XwVu2V4Ailvsj0GBZJ2ZwDjfesQ=="; }; }; "js-base64-3.7.5" = { @@ -7285,13 +7321,13 @@ let sha512 = "S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ=="; }; }; - "jsonwebtoken-9.0.1" = { + "jsonwebtoken-9.0.2" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz"; - sha512 = "K8wx7eJ5TPvEjuiVSkv167EVboBDv9PZdDoF7BgeQnBLVvZWW9clr2PsQHVJDTKaEIH5JBIwHujGcHp7GgI2eg=="; + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz"; + sha512 = "PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ=="; }; }; "jssha-3.3.1" = { @@ -7357,13 +7393,13 @@ let sha512 = "+Rcfu2hyQ/jv5skqRY8xA7Ra+mmRkDAzCaLDYbkGtgsNKpzxPWiLbk8ub0dgr4EbWrN1Zb4BCXHUkD6+zYfdWg=="; }; }; - "kerberos-2.0.1" = { + "kerberos-2.0.2" = { name = "kerberos"; packageName = "kerberos"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/kerberos/-/kerberos-2.0.1.tgz"; - sha512 = "O/jIgbdGK566eUhFwIcgalbqirYU/r76MW7/UFw06Fd9x5bSwgyZWL/Vm26aAmezQww/G9KYkmmJBkEkPk5HLw=="; + url = "https://registry.npmjs.org/kerberos/-/kerberos-2.0.2.tgz"; + sha512 = "pP1aZ+T9/58joIdvhqTKTAnwLVLe3cnh+fE7UazuuHNCf4BxHUwF+oh5g2KK3yhouTfb3RQMi+mjw3/6vshdOg=="; }; }; "kuler-2.0.0" = { @@ -7438,13 +7474,13 @@ let sha512 = "A0z9O4+5q+ZTj7QwNe/Juy1KARNb4WaviO4mYeFC4b8dBT2EEqK2pkM+GC8MVnkOjqhl5nYQxRgnPYRRTNmuSQ=="; }; }; - "libphonenumber-js-1.10.41" = { + "libphonenumber-js-1.10.44" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.41"; + version = "1.10.44"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.41.tgz"; - sha512 = "4rmmF4u4vD3eGNuuCGjCPwRwO+fIuu1WWcS7VwbPTiMFkJd8F02v8o5pY5tlYuMR+xOvJ88mtOHpkm0Tnu2LcQ=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.44.tgz"; + sha512 = "svlRdNBI5WgBjRC20GrCfbFiclbF0Cx+sCcQob/C1r57nsoq0xg8r65QbTyVyweQIlB33P+Uahyho6EMYgcOyQ=="; }; }; "libpq-1.8.12" = { @@ -7609,6 +7645,15 @@ let sha512 = "z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="; }; }; + "lodash.includes-4.3.0" = { + name = "lodash.includes"; + packageName = "lodash.includes"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz"; + sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="; + }; + }; "lodash.isarguments-3.1.0" = { name = "lodash.isarguments"; packageName = "lodash.isarguments"; @@ -7618,6 +7663,42 @@ let sha512 = "chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg=="; }; }; + "lodash.isboolean-3.0.3" = { + name = "lodash.isboolean"; + packageName = "lodash.isboolean"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; + sha512 = "Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="; + }; + }; + "lodash.isinteger-4.0.4" = { + name = "lodash.isinteger"; + packageName = "lodash.isinteger"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz"; + sha512 = "DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="; + }; + }; + "lodash.isnumber-3.0.3" = { + name = "lodash.isnumber"; + packageName = "lodash.isnumber"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz"; + sha512 = "QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="; + }; + }; + "lodash.isplainobject-4.0.6" = { + name = "lodash.isplainobject"; + packageName = "lodash.isplainobject"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; + sha512 = "oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="; + }; + }; "lodash.isstring-4.0.1" = { name = "lodash.isstring"; packageName = "lodash.isstring"; @@ -7627,6 +7708,15 @@ let sha512 = "0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="; }; }; + "lodash.once-4.1.1" = { + name = "lodash.once"; + packageName = "lodash.once"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; + sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="; + }; + }; "lodash.orderby-4.6.0" = { name = "lodash.orderby"; packageName = "lodash.orderby"; @@ -7798,13 +7888,13 @@ let sha512 = "Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ=="; }; }; - "luxon-3.4.0" = { + "luxon-3.4.3" = { name = "luxon"; packageName = "luxon"; - version = "3.4.0"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-3.4.0.tgz"; - sha512 = "7eDo4Pt7aGhoCheGFIuq4Xa2fJm4ZpmldpGhjTYBNUYNCN6TIEP6v7chwwwt3KRp7YR+rghbfvjyo3V5y9hgBw=="; + url = "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz"; + sha512 = "tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg=="; }; }; "magic-string-0.30.3" = { @@ -7861,13 +7951,13 @@ let sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="; }; }; - "mappersmith-2.41.0" = { + "mappersmith-2.42.0" = { name = "mappersmith"; packageName = "mappersmith"; - version = "2.41.0"; + version = "2.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.41.0.tgz"; - sha512 = "kg2PXCFiM0WBMKZSgkvVBhF6SV7vdDEUsql5+DGdEHYZx9cwK+2QCSnsZ2EI4oyIWHMdIN/l+4yiyXJTsH7PcQ=="; + url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.42.0.tgz"; + sha512 = "1QCZ1FKu+3GqgPkCotTkhnDEyFCU+ZPJnIx7X20L9d2JL6OfBDL9VVc5kyGGlroxZZ6IwYZrmSke+14HpSVC1g=="; }; }; "markdown-it-12.3.2" = { @@ -8257,22 +8347,22 @@ let sha512 = "72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ=="; }; }; - "mongodb-4.17.0" = { + "mongodb-4.17.1" = { name = "mongodb"; packageName = "mongodb"; - version = "4.17.0"; + version = "4.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.17.0.tgz"; - sha512 = "LZGMIPjPfWEfhPJATk1s9IvVTD18tyfKdT/0blCMih5vGagk2SwA9wFAUPMdtJpTrhXmyfGgwAaMkvneX2bn2A=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.17.1.tgz"; + sha512 = "MBuyYiPUPRTqfH2dV0ya4dcr2E5N52ocBuZ8Sgg/M030nGF78v855B3Z27mZJnp8PxjnUquEnAtjOsphgMZOlQ=="; }; }; - "mongodb-5.7.0" = { + "mongodb-5.8.1" = { name = "mongodb"; packageName = "mongodb"; - version = "5.7.0"; + version = "5.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-5.7.0.tgz"; - sha512 = "zm82Bq33QbqtxDf58fLWBwTjARK3NSvKYjyz997KSy6hpat0prjeX/kxjbPVyZY60XYPDNETaHkHJI2UCzSLuw=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-5.8.1.tgz"; + sha512 = "wKyh4kZvm6NrCPH8AxyzXm3JBoEf4Xulo0aUWh3hCgwgYJxyQ1KLST86ZZaSWdj6/kxYUA3+YZuyADCE61CMSg=="; }; }; "mongodb-client-encryption-2.9.0" = { @@ -8302,13 +8392,13 @@ let sha512 = "ew3qwG/TJRorTz47eW46vZ5oBw5MEYbQZVaEji44j5lAUSQSqIEoul7Kua/BatBW0H0kKQcC9kwUHa1qzaWHSw=="; }; }; - "mqtt-5.0.3" = { + "mqtt-5.0.5" = { name = "mqtt"; packageName = "mqtt"; - version = "5.0.3"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-5.0.3.tgz"; - sha512 = "XyCzdCNFm4XXBUV7HQPd1qXYdu7GC/H+wXr+RfaztwZ72/c3sD8yRivOBdh8iKWHc+EGawSeDIvXCnvEykcJVA=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-5.0.5.tgz"; + sha512 = "Ahbzk7nddvYg0aOezbYl/d9o8wcEbZw1NjiH+CmGObxiHsG4HgL7+IaRkph5yxwH679GVMAwtfsyUY2dFBSVSw=="; }; }; "mqtt-packet-6.10.0" = { @@ -8356,13 +8446,13 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "msgpackr-1.9.7" = { + "msgpackr-1.9.9" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.9.7"; + version = "1.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.9.7.tgz"; - sha512 = "baUNaLvKQvVhzfWTNO07njwbZK1Lxjtb0P1JL6/EhXdLTHzR57/mZqqJC39TtQKvOmkJA4pcejS4dbk7BDgLLA=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.9.9.tgz"; + sha512 = "sbn6mioS2w0lq1O6PpGtsv6Gy8roWM+o3o4Sqjd6DudrL/nOugY+KyJUimoWzHnf9OkO0T6broHFnYE/R05t9A=="; }; }; "mssql-8.1.4" = { @@ -8374,13 +8464,13 @@ let sha512 = "nqkYYehETWVvFLB9zAGJV2kegOsdtLjUnkHA52aFhlE0ZIoOXC3BL8pLERwFicFypM4i3DX1hYeuM726EEIxjQ=="; }; }; - "mssql-9.1.3" = { + "mssql-9.3.2" = { name = "mssql"; packageName = "mssql"; - version = "9.1.3"; + version = "9.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-9.1.3.tgz"; - sha512 = "oXs2lJ1vKUe2s0twCdcdKnqATTVaIswzpSiGnUjMIhV6Sip9vEDuYt3dCoVWXXNuPJ5iFIqLxvagw4Hrz6xR4A=="; + url = "https://registry.npmjs.org/mssql/-/mssql-9.3.2.tgz"; + sha512 = "XI5GOGCCSSNL8K2SSXg9HMyugJoCjLmrhiZfcZrJrJ2r3NfTcnz3Cegeg4m+xPkNVd0o3owsSL/NsDCFYfjOlw=="; }; }; "multer-1.4.5-lts.1" = { @@ -8419,49 +8509,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-1.3.1" = { + "n8n-core-1.5.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "1.3.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-1.3.1.tgz"; - sha512 = "qAh0cZfwrhY1gy0xH+nzvtK6uNPYdxgQQpHupn8vro8wPVsGYLAhZ8sLh5f7d2HLccL9QrPbvVne4SKLhrfWKQ=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-1.5.0.tgz"; + sha512 = "1OLb/C0QOuaHgXYAn2SO+t9pkRSbYdeAdB7ienu8foz8ptHygAieACoaAVrI4VLeGBTWbVKcVA9kISEsVk6/3g=="; }; }; - "n8n-design-system-1.3.1" = { + "n8n-design-system-1.5.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "1.3.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-1.3.1.tgz"; - sha512 = "1BLdJ4zAy7MnSVJc0MQKUzjQ7tJi/fOQDYSEjSVsn1If4eEPPmfZE8ed/gvrAH2deHXCNoTh9LLYmtB5jOg0yg=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-1.5.0.tgz"; + sha512 = "Hx4uDVkpBSo+bpNNS/WiGb6o2D9lUcWGPddJLbbUEBFwf2gJPYz7HYf2X7oycJBwxdlGClf6EQNdI6Wlo2rT5w=="; }; }; - "n8n-editor-ui-1.3.1" = { + "n8n-editor-ui-1.5.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "1.3.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-1.3.1.tgz"; - sha512 = "n7Y9p8G0qtxORLyFOzOMCFeS0SeSmOnlPfpy56Bfh3oyAG16OqQR6TgkWWqfU/YrCQW8qs1QbmL6P4Cxij9OhQ=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-1.5.0.tgz"; + sha512 = "/qEKz0/ZY/cDFmIubhJxVE/UMuSfJSWxapbLtjA8ODNtQgVR1KQ3PM9noFoBDodoXT0RfFq/uVY5V9tRpxkNaA=="; }; }; - "n8n-nodes-base-1.3.1" = { + "n8n-nodes-base-1.5.1" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "1.3.1"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-1.3.1.tgz"; - sha512 = "L9YBF4qzYNHb+k6o52w/Eo6RpjQZq3IFMbwHs5RyB9MQVj6+50tjQcjJ3DDCN2ewM7xroLLTlxQRa1nm7CEgTA=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-1.5.1.tgz"; + sha512 = "eCN9p4i5KWDO2fNOQ00QE093z92GDwAtSfgmRe9JkMf5L9VkeEr7TVOrRV+jqd/tBeG8fLsaauTkcRiB3kGnEA=="; }; }; - "n8n-workflow-1.3.0" = { + "n8n-workflow-1.5.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "1.3.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-1.3.0.tgz"; - sha512 = "CozT9PjzBRYWXJ3MeBT96GUfM0FBmftlndThb7b9ZW54S36FsyfY7O3RYCVEiBYdwBUYP5/eeh61HKX3+QUfyw=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-1.5.0.tgz"; + sha512 = "bUf3dPpo+tGKl5TaxIOtr6IrW2TW7gNJSBO5cZ55SqJnbK3r15u5JyDlCHMDmL3iZS6znOVfggHfzAg29IB3Ww=="; }; }; "named-placeholders-1.1.3" = { @@ -8590,13 +8680,22 @@ let sha512 = "73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ=="; }; }; - "node-fetch-2.6.13" = { + "node-addon-api-6.1.0" = { + name = "node-addon-api"; + packageName = "node-addon-api"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz"; + sha512 = "+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="; + }; + }; + "node-fetch-2.7.0" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.6.13"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.13.tgz"; - sha512 = "StxNAxh15zr77QvvkmveSQ8uCQ4+v5FkvNTj0OESmiHu+VRi/gXArXtkWMElOsOUNLtUEvI4yS+rdtOHZTwlQA=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz"; + sha512 = "c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="; }; }; "node-forge-1.3.1" = { @@ -8617,13 +8716,13 @@ let sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; }; }; - "node-gyp-build-4.6.0" = { + "node-gyp-build-4.6.1" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.6.0"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; - sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz"; + sha512 = "24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ=="; }; }; "node-html-markdown-1.3.0" = { @@ -8635,13 +8734,13 @@ let sha512 = "OeFi3QwC/cPjvVKZ114tzzu+YoR+v9UXW5RwSXGUqGb0qCl0DvP406tzdL7SFn8pZrMyzXoisfG2zcuF9+zw4g=="; }; }; - "node-html-parser-6.1.6" = { + "node-html-parser-6.1.9" = { name = "node-html-parser"; packageName = "node-html-parser"; - version = "6.1.6"; + version = "6.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.6.tgz"; - sha512 = "C/MGDQ2NjdjzUq41bW9kW00MPZecAe/oo89vZEFLDfWoQVDk/DdML1yuxVVKLDMFIFax2VTq6Vpfzyn7z5yYgQ=="; + url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.9.tgz"; + sha512 = "nQ+MRf0PmRTLcMalVqMsWvceSaBydBCBlnQSL78HVk/E8e0Aazyao4SI9aB67XAAgOgHMsw7q5dJBUPPt9XE3g=="; }; }; "node-machine-id-1.1.12" = { @@ -8698,13 +8797,13 @@ let sha512 = "fy9v3NgTzBngrMFkDsKEj0r02U7jm6XfC3b52eoNV+GCrGj+s8pt5OqhiJdWKuw51zCTdiNR/IUD1z33LIIGpg=="; }; }; - "nodemailer-6.9.4" = { + "nodemailer-6.9.5" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.9.4"; + version = "6.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.4.tgz"; - sha512 = "CXjQvrQZV4+6X5wP6ZIgdehJamI63MFoYFGGPtHudWym9qaEHDNdPzaj5bfMCvxG1vhAileSWW90q7nL0N36mA=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.5.tgz"; + sha512 = "/dmdWo62XjumuLc5+AYQZeiRj+PRR8y8qKtFCOyuOl1k/hckZd8durUUHs/ucKx6/8kN+wFxqKJlQ/LK/qR5FA=="; }; }; "nopt-5.0.0" = { @@ -8869,13 +8968,13 @@ let sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; }; }; - "object.getownpropertydescriptors-2.1.6" = { + "object.getownpropertydescriptors-2.1.7" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz"; - sha512 = "lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz"; + sha512 = "PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g=="; }; }; "on-finished-2.4.1" = { @@ -9544,13 +9643,13 @@ let sha512 = "bQ/0XPZZ7eX+cdAkd61uYWpfMhakH3NeteUF1R8GNa+LMqX8QFAkbCLqq+AYAns1/ueACBu/BMWhrlKGrdvGZg=="; }; }; - "postcss-8.4.28" = { + "postcss-8.4.29" = { name = "postcss"; packageName = "postcss"; - version = "8.4.28"; + version = "8.4.29"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz"; - sha512 = "Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz"; + sha512 = "cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw=="; }; }; "postgres-array-1.0.3" = { @@ -9625,13 +9724,13 @@ let sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; }; }; - "prettier-2.8.8" = { + "prettier-3.0.3" = { name = "prettier"; packageName = "prettier"; - version = "2.8.8"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz"; - sha512 = "tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q=="; + url = "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz"; + sha512 = "L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg=="; }; }; "pretty-bytes-5.6.0" = { @@ -9715,13 +9814,13 @@ let sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; }; }; - "promise.prototype.finally-3.1.4" = { + "promise.prototype.finally-3.1.5" = { name = "promise.prototype.finally"; packageName = "promise.prototype.finally"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.4.tgz"; - sha512 = "nNc3YbgMfLzqtqvO/q5DP6RR0SiHI9pUPGzyDf1q+usTwCN2kjvAnJkBb7bHe3o+fFSBPpsGMoYtaSi+LTNqng=="; + url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.5.tgz"; + sha512 = "4TQ3Dk8yyUZGyU+UXInKdkQ2b6xtiBXAIScGAtGnXVmJtG1uOrxRgbF1ggIu72uzoWFzUfT3nUKa1SuMm9NBdg=="; }; }; "property-expr-2.0.5" = { @@ -9760,13 +9859,13 @@ let sha512 = "5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw=="; }; }; - "protobufjs-7.2.4" = { + "protobufjs-7.2.5" = { name = "protobufjs"; packageName = "protobufjs"; - version = "7.2.4"; + version = "7.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz"; - sha512 = "AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ=="; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz"; + sha512 = "gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A=="; }; }; "proxy-addr-2.0.7" = { @@ -9877,6 +9976,15 @@ let sha512 = "UsI/mNvk25jRpGKYI38Nfbv84z48oiIWwG67DLVvjRhy8B/0aIK+5Ju5WOHgw/o9rnEmbAS00v4rgKFQeC332Q=="; }; }; + "qrcode.vue-3.4.1" = { + name = "qrcode.vue"; + packageName = "qrcode.vue"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qrcode.vue/-/qrcode.vue-3.4.1.tgz"; + sha512 = "wq/zHsifH4FJ1GXQi8/wNxD1KfQkckIpjK1KPTc/qwYU5/Bkd4me0w4xZSg6EXk6xLBkVDE0zxVagewv5EMAVA=="; + }; + }; "qs-6.11.0" = { name = "qs"; packageName = "qs"; @@ -10084,13 +10192,13 @@ let sha512 = "grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw=="; }; }; - "redis-4.6.7" = { + "redis-4.6.8" = { name = "redis"; packageName = "redis"; - version = "4.6.7"; + version = "4.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-4.6.7.tgz"; - sha512 = "KrkuNJNpCwRm5vFJh0tteMxW8SaUzkm5fBH7eL5hd/D0fAkzvapxbfGPP/r+4JAXdQuX7nebsBkBqA2RHB7Usw=="; + url = "https://registry.npmjs.org/redis/-/redis-4.6.8.tgz"; + sha512 = "S7qNkPUYrsofQ0ztWlTHSaK0Qqfl1y+WMIxrzeAGNG+9iUZB4HGeBgkHxE6uJJ6iXrkvLd1RVJ2nvu6H1sAzfQ=="; }; }; "redis-commands-1.7.0" = { @@ -10345,13 +10453,13 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "safe-array-concat-1.0.0" = { + "safe-array-concat-1.0.1" = { name = "safe-array-concat"; packageName = "safe-array-concat"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz"; - sha512 = "9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ=="; + url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz"; + sha512 = "6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q=="; }; }; "safe-buffer-5.1.2" = { @@ -10741,13 +10849,13 @@ let sha512 = "iADMq1kY0v3vJmGTuKcFWSXt15qYUz7wFkArOrsSg0IFfI3nJqIJvK2/ZbEIndg7erIJLtAVX2nSOqPz7DcwbA=="; }; }; - "snowflake-sdk-1.7.0" = { + "snowflake-sdk-1.8.0" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.7.0.tgz"; - sha512 = "dSCq4NGBV67Ws9VPEO1md8AZw2mx8czoosBdq8CKdVSwUf9e9wUMpH+VEeIJUKy573M/B4vLU4CUYrhGlSkUHQ=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.8.0.tgz"; + sha512 = "zdU1c+ytIZclF4K6D4XPPHa5II6l6cOQdsLdvKP95IwSdTYJz324ESA7fPcg/rwYV7vUKnIZJ9OCjB1mE7D2IQ=="; }; }; "socks-2.7.1" = { @@ -10867,13 +10975,13 @@ let sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; }; - "sprintf-js-1.1.2" = { + "sprintf-js-1.1.3" = { name = "sprintf-js"; packageName = "sprintf-js"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz"; - sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz"; + sha512 = "Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="; }; }; "sql.js-1.8.0" = { @@ -11110,31 +11218,31 @@ let sha512 = "VHhsDkuf8gsw4JNRK9cIZjYe6r7PsVUutVohaBhqYAoPaRADoQH+mMgUg7Cs/TgQeDGEvI+PzPEMOdvdsCMvpg=="; }; }; - "string.prototype.trim-1.2.7" = { + "string.prototype.trim-1.2.8" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz"; - sha512 = "p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg=="; + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz"; + sha512 = "lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ=="; }; }; - "string.prototype.trimend-1.0.6" = { + "string.prototype.trimend-1.0.7" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz"; - sha512 = "JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz"; + sha512 = "Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA=="; }; }; - "string.prototype.trimstart-1.0.6" = { + "string.prototype.trimstart-1.0.7" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"; - sha512 = "omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz"; + sha512 = "NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg=="; }; }; "string_decoder-0.10.31" = { @@ -11227,13 +11335,13 @@ let sha512 = "PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw=="; }; }; - "style-mod-4.0.3" = { + "style-mod-4.1.0" = { name = "style-mod"; packageName = "style-mod"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/style-mod/-/style-mod-4.0.3.tgz"; - sha512 = "78Jv8kYJdjbvRwwijtCevYADfsI0lGzYJe4mMFdceO8l75DFFDoqBhR1jVDicDRRaX4//g1u9wKeo+ztc2h1Rw=="; + url = "https://registry.npmjs.org/style-mod/-/style-mod-4.1.0.tgz"; + sha512 = "Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA=="; }; }; "supports-color-7.2.0" = { @@ -11272,13 +11380,13 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "swagger-ui-dist-5.4.2" = { + "swagger-ui-dist-5.6.2" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "5.4.2"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.4.2.tgz"; - sha512 = "vT5QxP/NOr9m4gLZl+SpavWI3M9Fdh30+Sdw9rEtZbkqNmNNEPhjXas2xTD9rsJYYdLzAiMfwXvtooWH3xbLJA=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.6.2.tgz"; + sha512 = "2LKVuU2m6RHkemJloKiKJOTpN2RPmbsiad0OfSdtmFHOXJKAgYRZMwJcpT96RX6E9HUB5RkVOFC6vWqVjRgSOg=="; }; }; "swagger-ui-express-4.6.3" = { @@ -11308,13 +11416,13 @@ let sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; }; }; - "tar-6.1.15" = { + "tar-6.2.0" = { name = "tar"; packageName = "tar"; - version = "6.1.15"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz"; - sha512 = "/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A=="; + url = "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz"; + sha512 = "/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ=="; }; }; "tar-fs-2.1.1" = { @@ -11389,13 +11497,13 @@ let sha512 = "jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww=="; }; }; - "terser-5.19.2" = { + "terser-5.19.4" = { name = "terser"; packageName = "terser"; - version = "5.19.2"; + version = "5.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz"; - sha512 = "qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA=="; + url = "https://registry.npmjs.org/terser/-/terser-5.19.4.tgz"; + sha512 = "6p1DjHeuluwxDXcuT9VR8p64klWJKo1ILiy19s6C9+0Bh2+NWTX6nD9EPppiER4ICkHDVB1RkVpin/YW2nQn/g=="; }; }; "terser-webpack-plugin-5.3.9" = { @@ -11659,6 +11767,24 @@ let sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; }; }; + "tweetnacl-1.0.3" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz"; + sha512 = "6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="; + }; + }; + "tweetnacl-util-0.15.1" = { + name = "tweetnacl-util"; + packageName = "tweetnacl-util"; + version = "0.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz"; + sha512 = "RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw=="; + }; + }; "type-check-0.3.2" = { name = "type-check"; packageName = "type-check"; @@ -11758,13 +11884,13 @@ let sha512 = "EqrdoXr0FbUrAMmkNQQuPwlhUGM7SJnpwUlWTWNlK2mOhOUyM+33fhm1f1hz3nnJJV8fTxzS3kTDq6pkVASLAw=="; }; }; - "typescript-5.1.6" = { + "typescript-5.2.2" = { name = "typescript"; packageName = "typescript"; - version = "5.1.6"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz"; - sha512 = "zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz"; + sha512 = "mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w=="; }; }; "uc.micro-1.0.6" = { @@ -11803,13 +11929,13 @@ let sha512 = "hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="; }; }; - "undici-5.23.0" = { + "undici-5.24.0" = { name = "undici"; packageName = "undici"; - version = "5.23.0"; + version = "5.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.23.0.tgz"; - sha512 = "1D7w+fvRsqlQ9GscLBwcAJinqcZGHUKjbOmXdlE/v8BvEGXjeWAax+341q44EuTcHXXnfyKNbKRq4Lg7OzhMmg=="; + url = "https://registry.npmjs.org/undici/-/undici-5.24.0.tgz"; + sha512 = "OKlckxBjFl0oXxcj9FU6oB8fDAaiRUq+D8jrFWGmOfI/gIyjk/IeS75LMzgYKUaeHzLUcYvf9bbJGSrUwTfwwQ=="; }; }; "unescape-1.0.1" = { @@ -12145,22 +12271,22 @@ let sha512 = "X0Ur6+aYE8jXjKyY/LaWKrZ+FeJmc4xsirdz/lLuvm68wiokJc26Y9WpYPDuS1L2GwbvRDqLrnd9F2eL46buzA=="; }; }; - "vue-demi-0.14.5" = { + "vue-demi-0.14.6" = { name = "vue-demi"; packageName = "vue-demi"; - version = "0.14.5"; + version = "0.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.5.tgz"; - sha512 = "o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA=="; + url = "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz"; + sha512 = "8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w=="; }; }; - "vue-i18n-9.2.2" = { + "vue-i18n-9.4.0" = { name = "vue-i18n"; packageName = "vue-i18n"; - version = "9.2.2"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.2.2.tgz"; - sha512 = "yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ=="; + url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.4.0.tgz"; + sha512 = "701V7wv6m/Fesbu58rRJv9Rd3en/9F7Nxyn/NiwcR7bJkEfwflMJg5wVezkeHy1tIqjXME1e1zbHhK1dNaR8mg=="; }; }; "vue-json-pretty-2.2.4" = { @@ -12442,13 +12568,13 @@ let sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; - "ws-8.13.0" = { + "ws-8.14.1" = { name = "ws"; packageName = "ws"; - version = "8.13.0"; + version = "8.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz"; - sha512 = "x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="; + url = "https://registry.npmjs.org/ws/-/ws-8.14.1.tgz"; + sha512 = "4OOseMUq8AzRBI/7SLMUwO+FEDnguetSk7KMb1sHwvF2w2Wv5Hoj0nlifx8vtGsftE/jWHojPy8sMMzYLJ2G/A=="; }; }; "xlsx-https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz" = { @@ -12665,10 +12791,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "1.3.1"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-1.3.1.tgz"; - sha512 = "BYNeFcyYt68EGnMPUEeFsVt3ZtbotvGZ2zjRDgVZkJ1wc7F+Z+flQZqF0b9+tgeZRTvjY4LECCWBaECidHtcUw=="; + url = "https://registry.npmjs.org/n8n/-/n8n-1.5.1.tgz"; + sha512 = "KrrT4HhyIJfROBLUwMm1bdvk2M/YPBd+rUCdkXMfVud8mHKcMfykT80+OtRwD76OJJR70/ImF2M+NNk2HWl9tQ=="; }; dependencies = [ (sources."@acuminous/bitsyntax-0.1.2" // { @@ -12713,34 +12839,34 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/client-cognito-identity-3.395.0" - sources."@aws-sdk/client-sso-3.395.0" - sources."@aws-sdk/client-sts-3.395.0" - sources."@aws-sdk/credential-provider-cognito-identity-3.395.0" - sources."@aws-sdk/credential-provider-env-3.391.0" - sources."@aws-sdk/credential-provider-ini-3.395.0" - sources."@aws-sdk/credential-provider-node-3.395.0" - sources."@aws-sdk/credential-provider-process-3.391.0" - sources."@aws-sdk/credential-provider-sso-3.395.0" - sources."@aws-sdk/credential-provider-web-identity-3.391.0" - sources."@aws-sdk/credential-providers-3.395.0" - sources."@aws-sdk/middleware-host-header-3.391.0" - sources."@aws-sdk/middleware-logger-3.391.0" - sources."@aws-sdk/middleware-recursion-detection-3.391.0" - sources."@aws-sdk/middleware-sdk-sts-3.391.0" - sources."@aws-sdk/middleware-signing-3.391.0" - sources."@aws-sdk/middleware-user-agent-3.391.0" - sources."@aws-sdk/token-providers-3.391.0" - sources."@aws-sdk/types-3.391.0" - sources."@aws-sdk/util-endpoints-3.391.0" + sources."@aws-sdk/client-cognito-identity-3.409.0" + sources."@aws-sdk/client-sso-3.409.0" + sources."@aws-sdk/client-sts-3.409.0" + sources."@aws-sdk/credential-provider-cognito-identity-3.409.0" + sources."@aws-sdk/credential-provider-env-3.408.0" + sources."@aws-sdk/credential-provider-ini-3.409.0" + sources."@aws-sdk/credential-provider-node-3.409.0" + sources."@aws-sdk/credential-provider-process-3.408.0" + sources."@aws-sdk/credential-provider-sso-3.409.0" + sources."@aws-sdk/credential-provider-web-identity-3.408.0" + sources."@aws-sdk/credential-providers-3.409.0" + sources."@aws-sdk/middleware-host-header-3.408.0" + sources."@aws-sdk/middleware-logger-3.408.0" + sources."@aws-sdk/middleware-recursion-detection-3.408.0" + sources."@aws-sdk/middleware-sdk-sts-3.408.0" + sources."@aws-sdk/middleware-signing-3.408.0" + sources."@aws-sdk/middleware-user-agent-3.408.0" + sources."@aws-sdk/token-providers-3.408.0" + sources."@aws-sdk/types-3.408.0" + sources."@aws-sdk/util-endpoints-3.408.0" sources."@aws-sdk/util-locate-window-3.310.0" - sources."@aws-sdk/util-user-agent-browser-3.391.0" - sources."@aws-sdk/util-user-agent-node-3.391.0" + sources."@aws-sdk/util-user-agent-browser-3.408.0" + sources."@aws-sdk/util-user-agent-node-3.408.0" sources."@aws-sdk/util-utf8-browser-3.259.0" sources."@azure/abort-controller-1.1.0" sources."@azure/core-auth-1.5.0" sources."@azure/core-client-1.7.3" - (sources."@azure/core-http-3.0.2" // { + (sources."@azure/core-http-3.0.3" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" ]; @@ -12748,7 +12874,7 @@ in sources."@azure/core-http-compat-1.3.0" sources."@azure/core-lro-2.5.4" sources."@azure/core-paging-1.5.0" - (sources."@azure/core-rest-pipeline-1.12.0" // { + (sources."@azure/core-rest-pipeline-1.12.1" // { dependencies = [ sources."@tootallnate/once-2.0.0" sources."http-proxy-agent-5.0.0" @@ -12765,15 +12891,15 @@ in }) sources."@azure/keyvault-keys-4.7.2" sources."@azure/logger-1.0.4" - (sources."@azure/msal-browser-2.38.1" // { + (sources."@azure/msal-browser-2.38.2" // { dependencies = [ - sources."@azure/msal-common-13.2.1" + sources."@azure/msal-common-13.3.0" ]; }) sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.18.1" // { + (sources."@azure/msal-node-1.18.3" // { dependencies = [ - sources."@azure/msal-common-13.2.1" + sources."@azure/msal-common-13.3.0" ]; }) (sources."@azure/storage-blob-12.15.0" // { @@ -12781,33 +12907,33 @@ in sources."@azure/core-tracing-1.0.0-preview.13" ]; }) - sources."@babel/parser-7.22.10" - (sources."@babel/runtime-7.22.10" // { + sources."@babel/parser-7.22.16" + (sources."@babel/runtime-7.22.15" // { dependencies = [ sources."regenerator-runtime-0.14.0" ]; }) sources."@codemirror/autocomplete-6.9.0" - sources."@codemirror/commands-6.2.4" + sources."@codemirror/commands-6.2.5" sources."@codemirror/lang-css-6.2.1" - sources."@codemirror/lang-javascript-6.1.9" + sources."@codemirror/lang-javascript-6.2.1" sources."@codemirror/lang-json-6.0.1" sources."@codemirror/lang-python-6.1.3" sources."@codemirror/language-6.9.0" - sources."@codemirror/lint-6.4.0" + sources."@codemirror/lint-6.4.1" sources."@codemirror/state-6.2.1" - sources."@codemirror/view-6.16.0" + sources."@codemirror/view-6.18.1" sources."@colors/colors-1.5.0" sources."@cspotcode/source-map-support-0.8.1" - sources."@ctrl/tinycolor-3.6.0" + sources."@ctrl/tinycolor-3.6.1" sources."@curlconverter/yargs-0.0.2" sources."@curlconverter/yargs-parser-0.0.1" sources."@dabh/diagnostics-2.0.3" sources."@element-plus/icons-vue-2.1.0" sources."@ewoudenberg/difflib-0.1.0" sources."@floating-ui/core-1.4.1" - sources."@floating-ui/dom-1.5.1" - sources."@floating-ui/utils-0.1.1" + sources."@floating-ui/dom-1.5.2" + sources."@floating-ui/utils-0.1.2" sources."@fontsource/open-sans-4.5.14" sources."@fortawesome/fontawesome-common-types-0.3.0" sources."@fortawesome/fontawesome-svg-core-1.3.0" @@ -12855,10 +12981,10 @@ in }) (sources."@grpc/grpc-js-1.6.12" // { dependencies = [ - sources."@grpc/proto-loader-0.7.8" + sources."@grpc/proto-loader-0.7.9" sources."cliui-8.0.1" sources."long-5.2.3" - sources."protobufjs-7.2.4" + sources."protobufjs-7.2.5" sources."wrap-ansi-7.0.0" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" @@ -12881,11 +13007,9 @@ in sources."string_decoder-0.10.31" ]; }) - sources."@intlify/core-base-9.2.2" - sources."@intlify/devtools-if-9.2.2" - sources."@intlify/message-compiler-9.2.2" - sources."@intlify/shared-9.2.2" - sources."@intlify/vue-devtools-9.2.2" + sources."@intlify/core-base-9.4.0" + sources."@intlify/message-compiler-9.4.0" + sources."@intlify/shared-9.4.0" sources."@ioredis/commands-1.2.0" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ @@ -12917,14 +13041,15 @@ in sources."@lezer/css-1.1.3" sources."@lezer/highlight-1.1.6" sources."@lezer/html-1.3.6" - sources."@lezer/javascript-1.4.5" + sources."@lezer/javascript-1.4.7" sources."@lezer/json-1.0.1" sources."@lezer/lr-1.3.10" sources."@lezer/python-1.1.8" sources."@mapbox/node-pre-gyp-1.0.11" - sources."@mongodb-js/zstd-1.1.0" - sources."@n8n/client-oauth2-0.6.0" + sources."@mongodb-js/zstd-1.2.0" + sources."@n8n/client-oauth2-0.7.0" sources."@n8n/codemirror-lang-sql-1.0.2" + sources."@n8n/vm2-3.9.20" sources."@n8n_io/license-sdk-2.4.0" sources."@n8n_io/riot-tmpl-4.0.1" sources."@nodelib/fs.scandir-2.1.5" @@ -12960,7 +13085,7 @@ in sources."@oclif/linewrap-1.0.0" sources."@oclif/parser-3.8.17" sources."@oclif/screen-3.0.6" - sources."@opentelemetry/api-1.4.1" + sources."@opentelemetry/api-1.5.0" sources."@popperjs/core-2.11.7" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" @@ -12973,7 +13098,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@redis/bloom-1.2.0" - (sources."@redis/client-1.5.8" // { + (sources."@redis/client-1.5.9" // { dependencies = [ sources."yallist-4.0.0" ]; @@ -12981,14 +13106,14 @@ in sources."@redis/graph-1.1.0" sources."@redis/json-1.0.4" sources."@redis/search-1.1.3" - sources."@redis/time-series-1.0.4" + sources."@redis/time-series-1.0.5" (sources."@rudderstack/rudder-sdk-node-1.0.6" // { dependencies = [ sources."bull-3.29.3" sources."ioredis-4.28.5" ]; }) - (sources."@sap/hana-client-2.17.22" // { + (sources."@sap/hana-client-2.18.22" // { dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" @@ -12996,56 +13121,73 @@ in }) sources."@segment/loosely-validate-event-2.0.0" sources."@selderee/plugin-htmlparser2-0.11.0" - sources."@sentry-internal/tracing-7.64.0" - sources."@sentry/core-7.64.0" - sources."@sentry/integrations-7.64.0" - sources."@sentry/node-7.64.0" - sources."@sentry/types-7.64.0" - sources."@sentry/utils-7.64.0" - sources."@smithy/abort-controller-2.0.4" - sources."@smithy/config-resolver-2.0.4" - sources."@smithy/credential-provider-imds-2.0.4" - sources."@smithy/eventstream-codec-2.0.4" - sources."@smithy/fetch-http-handler-2.0.4" - sources."@smithy/hash-node-2.0.4" - sources."@smithy/invalid-dependency-2.0.4" + sources."@sentry-internal/tracing-7.68.0" + sources."@sentry/core-7.68.0" + sources."@sentry/integrations-7.68.0" + sources."@sentry/node-7.68.0" + sources."@sentry/types-7.68.0" + sources."@sentry/utils-7.68.0" + sources."@smithy/abort-controller-2.0.6" + sources."@smithy/config-resolver-2.0.7" + sources."@smithy/credential-provider-imds-2.0.9" + sources."@smithy/eventstream-codec-2.0.6" + (sources."@smithy/fetch-http-handler-2.1.2" // { + dependencies = [ + sources."@smithy/protocol-http-3.0.2" + ]; + }) + sources."@smithy/hash-node-2.0.6" + sources."@smithy/invalid-dependency-2.0.6" sources."@smithy/is-array-buffer-2.0.0" - sources."@smithy/middleware-content-length-2.0.4" - sources."@smithy/middleware-endpoint-2.0.4" - sources."@smithy/middleware-retry-2.0.4" - sources."@smithy/middleware-serde-2.0.4" + (sources."@smithy/middleware-content-length-2.0.8" // { + dependencies = [ + sources."@smithy/protocol-http-3.0.2" + ]; + }) + sources."@smithy/middleware-endpoint-2.0.6" + (sources."@smithy/middleware-retry-2.0.9" // { + dependencies = [ + sources."@smithy/protocol-http-3.0.2" + ]; + }) + sources."@smithy/middleware-serde-2.0.6" sources."@smithy/middleware-stack-2.0.0" - sources."@smithy/node-config-provider-2.0.4" - sources."@smithy/node-http-handler-2.0.4" - sources."@smithy/property-provider-2.0.4" - sources."@smithy/protocol-http-2.0.4" - sources."@smithy/querystring-builder-2.0.4" - sources."@smithy/querystring-parser-2.0.4" + sources."@smithy/node-config-provider-2.0.9" + (sources."@smithy/node-http-handler-2.1.2" // { + dependencies = [ + sources."@smithy/protocol-http-3.0.2" + ]; + }) + sources."@smithy/property-provider-2.0.7" + sources."@smithy/protocol-http-2.0.5" + sources."@smithy/querystring-builder-2.0.6" + sources."@smithy/querystring-parser-2.0.6" sources."@smithy/service-error-classification-2.0.0" - sources."@smithy/shared-ini-file-loader-2.0.4" - sources."@smithy/signature-v4-2.0.4" - sources."@smithy/smithy-client-2.0.4" - sources."@smithy/types-2.2.1" - sources."@smithy/url-parser-2.0.4" + sources."@smithy/shared-ini-file-loader-2.0.8" + sources."@smithy/signature-v4-2.0.6" + sources."@smithy/smithy-client-2.1.3" + sources."@smithy/types-2.3.0" + sources."@smithy/url-parser-2.0.6" sources."@smithy/util-base64-2.0.0" sources."@smithy/util-body-length-browser-2.0.0" - sources."@smithy/util-body-length-node-2.0.0" + sources."@smithy/util-body-length-node-2.1.0" sources."@smithy/util-buffer-from-2.0.0" sources."@smithy/util-config-provider-2.0.0" - sources."@smithy/util-defaults-mode-browser-2.0.4" - sources."@smithy/util-defaults-mode-node-2.0.4" + sources."@smithy/util-defaults-mode-browser-2.0.7" + sources."@smithy/util-defaults-mode-node-2.0.9" sources."@smithy/util-hex-encoding-2.0.0" sources."@smithy/util-middleware-2.0.0" sources."@smithy/util-retry-2.0.0" - sources."@smithy/util-stream-2.0.4" + sources."@smithy/util-stream-2.0.9" sources."@smithy/util-uri-escape-2.0.0" sources."@smithy/util-utf8-2.0.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.78" - sources."@swc/helpers-0.5.1" - sources."@swc/wasm-1.3.78" + sources."@swc/core-1.3.84" + sources."@swc/helpers-0.5.2" + sources."@swc/types-0.1.4" + sources."@swc/wasm-1.3.84" sources."@techteamer/ocsp-1.0.0" - sources."@tediousjs/connection-string-0.4.4" + sources."@tediousjs/connection-string-0.5.0" sources."@tokenizer/token-0.3.0" sources."@tootallnate/once-1.1.2" sources."@tsconfig/node10-1.0.9" @@ -13055,37 +13197,42 @@ in sources."@types/asn1-0.2.1" sources."@types/big.js-6.2.0" sources."@types/body-parser-1.19.2" - sources."@types/connect-3.4.35" + sources."@types/connect-3.4.36" sources."@types/duplexify-3.6.1" sources."@types/es-aggregate-error-1.0.2" sources."@types/eslint-8.44.2" sources."@types/eslint-scope-3.7.4" sources."@types/estree-1.0.1" sources."@types/express-4.17.17" - sources."@types/express-serve-static-core-4.17.35" + sources."@types/express-serve-static-core-4.17.36" sources."@types/http-errors-2.0.1" sources."@types/json-schema-7.0.12" sources."@types/jsonwebtoken-9.0.2" - sources."@types/lodash-4.14.197" - sources."@types/lodash-es-4.17.8" + sources."@types/lodash-4.14.198" + sources."@types/lodash-es-4.17.9" sources."@types/long-4.0.2" sources."@types/mime-1.3.2" sources."@types/multer-1.4.7" - sources."@types/node-20.5.1" + sources."@types/node-20.6.0" (sources."@types/node-fetch-2.6.4" // { dependencies = [ sources."form-data-3.0.1" ]; }) sources."@types/pumpify-1.4.1" - sources."@types/qs-6.9.7" + sources."@types/qs-6.9.8" sources."@types/range-parser-1.2.4" + (sources."@types/readable-stream-4.0.2" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."@types/send-0.17.1" sources."@types/serve-static-1.15.2" sources."@types/stack-trace-0.0.29" sources."@types/triple-beam-1.3.2" sources."@types/tunnel-0.0.3" - sources."@types/uuid-9.0.2" + sources."@types/uuid-9.0.3" sources."@types/validator-13.11.1" sources."@types/web-bluetooth-0.0.17" sources."@types/webidl-conversions-7.0.0" @@ -13107,10 +13254,10 @@ in sources."@vue/runtime-dom-3.3.4" sources."@vue/server-renderer-3.3.4" sources."@vue/shared-3.3.4" - sources."@vueuse/components-10.3.0" - sources."@vueuse/core-10.3.0" - sources."@vueuse/metadata-10.3.0" - sources."@vueuse/shared-10.3.0" + sources."@vueuse/components-10.4.1" + sources."@vueuse/core-10.4.1" + sources."@vueuse/metadata-10.4.1" + sources."@vueuse/shared-10.4.1" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -13173,8 +13320,8 @@ in sources."array-parallel-0.1.3" sources."array-series-0.1.5" sources."array-union-2.1.0" - sources."array.prototype.reduce-1.0.5" - sources."arraybuffer.prototype.slice-1.0.1" + sources."array.prototype.reduce-1.0.6" + sources."arraybuffer.prototype.slice-1.0.2" sources."arrify-2.0.1" sources."asap-2.0.6" sources."asn1-0.2.6" @@ -13209,7 +13356,7 @@ in sources."axios-0.24.0" ]; }) - (sources."aws-sdk-2.1440.0" // { + (sources."aws-sdk-2.1454.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -13221,7 +13368,7 @@ in }) sources."aws4-1.12.0" sources."axios-0.21.4" - sources."axios-retry-3.6.0" + sources."axios-retry-3.7.0" sources."balanced-match-1.0.2" sources."base-64-1.0.0" sources."base64-js-1.5.1" @@ -13230,12 +13377,16 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."bcrypt-pbkdf-1.0.2" + (sources."bcrypt-pbkdf-1.0.2" // { + dependencies = [ + sources."tweetnacl-0.14.5" + ]; + }) sources."bcryptjs-2.4.3" - sources."better-sqlite3-8.5.1" + sources."better-sqlite3-8.6.0" sources."big-integer-1.6.51" sources."big.js-6.2.1" - sources."bignumber.js-9.1.1" + sources."bignumber.js-9.1.2" sources."binary-extensions-2.2.0" sources."binascii-0.0.2" sources."bindings-1.5.0" @@ -13294,7 +13445,7 @@ in sources."callsites-3.1.0" sources."camel-case-4.1.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001522" + sources."caniuse-lite-1.0.30001532" sources."capital-case-1.0.4" sources."cardinal-2.1.1" sources."chalk-4.1.2" @@ -13387,7 +13538,7 @@ in sources."cookie-signature-1.0.6" sources."copy-to-2.0.1" sources."copy-to-clipboard-3.3.3" - sources."core-js-3.32.1" + sources."core-js-3.32.2" sources."core-util-is-1.0.3" sources."create-require-1.1.1" sources."crelt-1.0.6" @@ -13459,8 +13610,8 @@ in sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" sources."ejs-3.1.9" - sources."electron-to-chromium-1.4.496" - (sources."element-plus-2.3.9" // { + sources."electron-to-chromium-1.4.513" + (sources."element-plus-2.3.12" // { dependencies = [ sources."@types/web-bluetooth-0.0.16" sources."@vueuse/core-9.13.0" @@ -13481,10 +13632,10 @@ in sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."es-abstract-1.22.1" - sources."es-aggregate-error-1.0.9" + sources."es-aggregate-error-1.0.10" sources."es-array-method-boxes-properly-1.0.0" sources."es-get-iterator-1.1.3" - sources."es-module-lexer-1.3.0" + sources."es-module-lexer-1.3.1" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" @@ -13575,7 +13726,7 @@ in sources."for-each-0.3.3" sources."foreground-child-3.1.1" sources."form-data-4.0.0" - sources."formidable-3.5.0" + sources."formidable-3.5.1" (sources."formstream-1.3.1" // { dependencies = [ sources."mime-2.6.0" @@ -13600,7 +13751,7 @@ in ]; }) sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" + sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" (sources."gauge-3.0.2" // { dependencies = [ @@ -13627,7 +13778,7 @@ in }) sources."getpass-0.1.7" sources."github-from-package-0.0.0" - (sources."glob-10.3.3" // { + (sources."glob-10.3.4" // { dependencies = [ sources."minimatch-9.0.3" ]; @@ -13723,6 +13874,12 @@ in sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."infer-owner-1.0.4" + (sources."infisical-node-1.4.3" // { + dependencies = [ + sources."axios-1.5.0" + sources."dotenv-16.3.1" + ]; + }) sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -13780,7 +13937,7 @@ in sources."isexe-2.0.0" sources."iso-639-1-2.1.15" sources."isomorphic-ws-4.0.1" - sources."jackspeak-2.3.0" + sources."jackspeak-2.3.3" sources."jake-10.8.7" (sources."jest-worker-27.5.1" // { dependencies = [ @@ -13789,7 +13946,7 @@ in }) sources."jmespath-0.16.0" sources."join-component-1.1.0" - sources."jose-4.14.4" + sources."jose-4.14.6" sources."js-base64-3.7.5" sources."js-md4-0.3.2" sources."js-nacl-1.4.0" @@ -13811,13 +13968,17 @@ in ]; }) sources."jsonschema-1.4.1" - sources."jsonwebtoken-9.0.1" + sources."jsonwebtoken-9.0.2" sources."jssha-3.3.1" sources."jwa-1.4.1" sources."jwks-rsa-3.0.1" sources."jws-3.2.2" sources."kafkajs-1.16.0" - sources."kerberos-2.0.1" + (sources."kerberos-2.0.2" // { + dependencies = [ + sources."node-addon-api-6.1.0" + ]; + }) sources."kuler-2.0.0" (sources."ldapts-4.2.6" // { dependencies = [ @@ -13829,7 +13990,7 @@ in sources."levn-0.3.0" sources."libbase64-1.2.1" sources."libmime-5.2.1" - sources."libphonenumber-js-1.10.41" + sources."libphonenumber-js-1.10.44" sources."libpq-1.8.12" sources."libqp-2.0.1" sources."lie-3.1.1" @@ -13855,8 +14016,14 @@ in sources."lodash.defaults-4.2.0" sources."lodash.flatten-4.4.0" sources."lodash.get-4.4.2" + sources."lodash.includes-4.3.0" sources."lodash.isarguments-3.1.0" + sources."lodash.isboolean-3.0.3" + sources."lodash.isinteger-4.0.4" + sources."lodash.isnumber-3.0.3" + sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" + sources."lodash.once-4.1.1" sources."lodash.orderby-4.6.0" sources."lodash.snakecase-4.1.1" sources."lodash.throttle-4.1.1" @@ -13874,7 +14041,7 @@ in ]; }) sources."lru_map-0.3.3" - sources."luxon-3.4.0" + sources."luxon-3.4.3" sources."magic-string-0.30.3" (sources."mailparser-3.6.5" // { dependencies = [ @@ -13900,7 +14067,7 @@ in sources."yallist-4.0.0" ]; }) - sources."mappersmith-2.41.0" + sources."mappersmith-2.42.0" sources."markdown-it-13.0.1" sources."markdown-it-emoji-2.0.2" sources."markdown-it-link-attributes-4.0.1" @@ -13972,7 +14139,7 @@ in sources."mkdirp-classic-0.5.3" sources."moment-2.29.4" sources."moment-timezone-0.5.43" - sources."mongodb-5.7.0" + sources."mongodb-5.8.1" (sources."mongodb-client-encryption-2.9.0" // { dependencies = [ sources."gaxios-5.1.3" @@ -13999,8 +14166,8 @@ in }) sources."mqtt-packet-6.10.0" sources."ms-2.1.2" - sources."msgpackr-1.9.7" - (sources."mssql-9.1.3" // { + sources."msgpackr-1.9.9" + (sources."mssql-9.3.2" // { dependencies = [ sources."commander-11.0.0" ]; @@ -14015,13 +14182,13 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-1.3.1" // { + (sources."n8n-core-1.5.0" // { dependencies = [ sources."concat-stream-2.0.0" sources."readable-stream-3.6.2" ]; }) - (sources."n8n-design-system-1.3.1" // { + (sources."n8n-design-system-1.5.0" // { dependencies = [ sources."@fortawesome/vue-fontawesome-2.0.10" sources."@vue/compiler-sfc-2.7.14" @@ -14030,8 +14197,8 @@ in sources."vue-2.7.14" ]; }) - sources."n8n-editor-ui-1.3.1" - (sources."n8n-nodes-base-1.3.1" // { + sources."n8n-editor-ui-1.5.0" + (sources."n8n-nodes-base-1.5.1" // { dependencies = [ sources."@tediousjs/connection-string-0.3.0" (sources."bl-5.1.0" // { @@ -14058,8 +14225,8 @@ in }) sources."lru-cache-7.18.3" sources."minimatch-5.1.6" - sources."mongodb-4.17.0" - sources."mqtt-5.0.3" + sources."mongodb-4.17.1" + sources."mqtt-5.0.5" sources."mqtt-packet-8.2.0" sources."mssql-8.1.4" (sources."readable-stream-4.4.2" // { @@ -14068,12 +14235,12 @@ in ]; }) sources."redis-3.1.2" - sources."sprintf-js-1.1.2" + sources."sprintf-js-1.1.3" sources."string_decoder-1.3.0" sources."tedious-14.7.0" ]; }) - (sources."n8n-workflow-1.3.0" // { + (sources."n8n-workflow-1.5.0" // { dependencies = [ sources."ast-types-0.15.2" ]; @@ -14096,7 +14263,7 @@ in sources."node-abi-3.47.0" sources."node-abort-controller-3.1.1" sources."node-addon-api-4.3.0" - sources."node-fetch-2.6.13" + sources."node-fetch-2.7.0" sources."node-forge-1.3.1" (sources."node-gyp-8.4.1" // { dependencies = [ @@ -14108,9 +14275,9 @@ in sources."signal-exit-3.0.7" ]; }) - sources."node-gyp-build-4.6.0" + sources."node-gyp-build-4.6.1" sources."node-html-markdown-1.3.0" - (sources."node-html-parser-6.1.6" // { + (sources."node-html-parser-6.1.9" // { dependencies = [ sources."css-select-5.1.0" ]; @@ -14120,7 +14287,7 @@ in sources."node-rsa-1.1.1" sources."node-ssh-12.0.5" sources."nodeify-1.0.1" - sources."nodemailer-6.9.4" + sources."nodemailer-6.9.5" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-wheel-1.0.1" @@ -14138,7 +14305,7 @@ in sources."object-keys-1.1.1" sources."object-treeify-1.1.33" sources."object.assign-4.1.4" - sources."object.getownpropertydescriptors-2.1.6" + sources."object.getownpropertydescriptors-2.1.7" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -14231,7 +14398,7 @@ in sources."picomatch-2.3.1" sources."pinia-2.1.6" sources."pkce-challenge-3.1.0" - sources."postcss-8.4.28" + sources."postcss-8.4.29" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" @@ -14247,7 +14414,7 @@ in ]; }) sources."prelude-ls-1.1.2" - sources."prettier-2.8.8" + sources."prettier-3.0.3" sources."pretty-bytes-5.6.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -14257,7 +14424,7 @@ in sources."promise-ftp-common-1.1.5" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."promise.prototype.finally-3.1.4" + sources."promise.prototype.finally-3.1.5" sources."property-expr-2.0.5" sources."proto3-json-serializer-0.1.9" sources."protobufjs-6.11.4" @@ -14281,6 +14448,7 @@ in sources."punycode-2.3.0" sources."pyodide-0.23.4" sources."python-struct-1.1.3" + sources."qrcode.vue-3.4.1" sources."qs-6.11.0" sources."query-string-7.1.3" sources."querystring-0.2.0" @@ -14316,7 +14484,7 @@ in }) sources."rechoir-0.6.2" sources."redeyed-2.1.1" - sources."redis-4.6.7" + sources."redis-4.6.8" sources."redis-commands-1.7.0" sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" @@ -14366,7 +14534,7 @@ in sources."tslib-1.14.1" ]; }) - sources."safe-array-concat-1.0.0" + sources."safe-array-concat-1.0.1" sources."safe-buffer-5.2.1" sources."safe-regex-test-1.0.0" sources."safe-stable-stringify-2.4.3" @@ -14425,7 +14593,7 @@ in sources."smart-buffer-4.2.0" sources."snake-case-3.0.4" sources."snappy-7.2.2" - (sources."snowflake-sdk-1.7.0" // { + (sources."snowflake-sdk-1.8.0" // { dependencies = [ sources."axios-0.27.2" sources."bignumber.js-2.4.0" @@ -14457,7 +14625,11 @@ in sources."readable-stream-3.6.2" ]; }) - sources."sshpk-1.17.0" + (sources."sshpk-1.17.0" // { + dependencies = [ + sources."tweetnacl-0.14.5" + ]; + }) (sources."ssri-8.0.1" // { dependencies = [ sources."minipass-3.3.6" @@ -14484,9 +14656,9 @@ in sources."string-width-4.2.3" sources."string-width-cjs-4.2.3" sources."string.prototype.startswith-1.0.0" - sources."string.prototype.trim-1.2.7" - sources."string.prototype.trimend-1.0.6" - sources."string.prototype.trimstart-1.0.6" + sources."string.prototype.trim-1.2.8" + sources."string.prototype.trimend-1.0.7" + sources."string.prototype.trimstart-1.0.7" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -14498,15 +14670,15 @@ in sources."strnum-1.0.5" sources."strtok3-6.3.0" sources."stubs-3.0.0" - sources."style-mod-4.0.3" + sources."style-mod-4.1.0" sources."supports-color-7.2.0" sources."supports-hyperlinks-2.3.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."swagger-ui-dist-5.4.2" + sources."swagger-ui-dist-5.6.2" sources."swagger-ui-express-4.6.3" sources."syslog-client-1.1.1" sources."tapable-2.2.1" - (sources."tar-6.1.15" // { + (sources."tar-6.2.0" // { dependencies = [ sources."minipass-5.0.0" sources."mkdirp-1.0.4" @@ -14530,7 +14702,7 @@ in dependencies = [ sources."bl-5.1.0" sources."readable-stream-3.6.2" - sources."sprintf-js-1.1.2" + sources."sprintf-js-1.1.3" ]; }) (sources."teeny-request-7.2.0" // { @@ -14539,7 +14711,7 @@ in sources."http-proxy-agent-5.0.0" ]; }) - (sources."terser-5.19.2" // { + (sources."terser-5.19.4" // { dependencies = [ sources."commander-2.20.3" ]; @@ -14588,7 +14760,8 @@ in sources."tsscmp-1.0.6" sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" + sources."tweetnacl-1.0.3" + sources."tweetnacl-util-0.15.1" sources."type-check-0.3.2" sources."type-fest-0.21.3" sources."type-is-1.6.18" @@ -14612,12 +14785,12 @@ in ]; }) sources."typeorm-aurora-data-api-driver-2.4.4" - sources."typescript-5.1.6" + sources."typescript-5.2.2" sources."uc.micro-1.0.6" sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" sources."underscore-1.12.1" - sources."undici-5.23.0" + sources."undici-5.24.0" sources."unescape-1.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -14666,8 +14839,8 @@ in sources."vue-3.3.4" sources."vue-agile-2.0.0" sources."vue-boring-avatars-1.3.0" - sources."vue-demi-0.14.5" - sources."vue-i18n-9.2.2" + sources."vue-demi-0.14.6" + sources."vue-i18n-9.4.0" sources."vue-json-pretty-2.2.4" sources."vue-router-4.2.4" sources."vue3-touch-events-4.1.3" @@ -14705,7 +14878,7 @@ in sources."wrap-ansi-6.2.0" sources."wrap-ansi-cjs-7.0.0" sources."wrappy-1.0.2" - sources."ws-8.13.0" + sources."ws-8.14.1" sources."xlsx-https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz" sources."xml-1.0.1" sources."xml-crypto-3.2.0" diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index 0af5824eb0ed..1e89c1b2cb46 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, mkYarnPackage, nixosTests, writeText, python3 }: +{ lib, stdenv, fetchFromGitHub, fetchYarnDeps, mkYarnPackage, nixosTests, writeText, python3 }: let version = "0.4.1"; @@ -22,7 +22,12 @@ let assets = mkYarnPackage { inherit src version; packageJSON = ./package.json; - yarnNix = ./yarndeps.nix; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-3ebT19LrbYuypdJaoB3tClVVP0Fi8tHx3Xi6ge/DpA4="; + }; + # Copied from package.json, see also # https://github.com/NixOS/nixpkgs/pull/214952 packageResolutions = { diff --git a/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh b/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh deleted file mode 100755 index 86dcb8cbf659..000000000000 --- a/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../.. -i bash -p wget yarn2nix-moretea.yarn2nix jq - -# This script is based upon: -# pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh - -set -euo pipefail - -if [[ $# -ne 1 || $1 == -* ]]; then - echo "Regenerates the Yarn dependency lock files for the powerdns-admin package." - echo "Usage: $0 <git release version>" - exit 1 -fi - -WEB_SRC="https://raw.githubusercontent.com/ngoduykhanh/PowerDNS-Admin/v$1" - -wget "$WEB_SRC/package.json" -O - | jq ".name = \"powerdns-admin-assets\" | .version = \"$1\"" > package.json -wget "$WEB_SRC/yarn.lock" -O yarn.lock -yarn2nix --lockfile=yarn.lock > yarndeps.nix -rm yarn.lock diff --git a/pkgs/applications/networking/powerdns-admin/yarndeps.nix b/pkgs/applications/networking/powerdns-admin/yarndeps.nix deleted file mode 100644 index 4e49c310895b..000000000000 --- a/pkgs/applications/networking/powerdns-admin/yarndeps.nix +++ /dev/null @@ -1,1701 +0,0 @@ -{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { - offline_cache = linkFarm "offline" packages; - packages = [ - { - name = "_foliojs_fork_fontkit___fontkit_1.9.1.tgz"; - path = fetchurl { - name = "_foliojs_fork_fontkit___fontkit_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/@foliojs-fork/fontkit/-/fontkit-1.9.1.tgz"; - sha512 = "U589voc2/ROnvx1CyH9aNzOQWJp127JGU1QAylXGQ7LoEAF6hMmahZLQ4eqAcgHUw+uyW4PjtCItq9qudPkK3A=="; - }; - } - { - name = "_foliojs_fork_linebreak___linebreak_1.1.1.tgz"; - path = fetchurl { - name = "_foliojs_fork_linebreak___linebreak_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@foliojs-fork/linebreak/-/linebreak-1.1.1.tgz"; - sha512 = "pgY/+53GqGQI+mvDiyprvPWgkTlVBS8cxqee03ejm6gKAQNsR1tCYCIvN9FHy7otZajzMqCgPOgC4cHdt4JPig=="; - }; - } - { - name = "_foliojs_fork_pdfkit___pdfkit_0.13.0.tgz"; - path = fetchurl { - name = "_foliojs_fork_pdfkit___pdfkit_0.13.0.tgz"; - url = "https://registry.yarnpkg.com/@foliojs-fork/pdfkit/-/pdfkit-0.13.0.tgz"; - sha512 = "YXeG1fml9k97YNC9K8e292Pj2JzGt9uOIiBFuQFxHsdQ45BlxW+JU3RQK6JAvXU7kjhjP8rCcYvpk36JLD33sQ=="; - }; - } - { - name = "_foliojs_fork_restructure___restructure_2.0.2.tgz"; - path = fetchurl { - name = "_foliojs_fork_restructure___restructure_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@foliojs-fork/restructure/-/restructure-2.0.2.tgz"; - sha512 = "59SgoZ3EXbkfSX7b63tsou/SDGzwUEK6MuB5sKqgVK1/XE0fxmpsOb9DQI8LXW3KfGnAjImCGhhEb7uPPAUVNA=="; - }; - } - { - name = "_fortawesome_fontawesome_free___fontawesome_free_6.3.0.tgz"; - path = fetchurl { - name = "_fortawesome_fontawesome_free___fontawesome_free_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.3.0.tgz"; - sha512 = "qVtd5i1Cc7cdrqnTWqTObKQHjPWAiRwjUPaXObaeNPcy7+WKxJumGBx66rfSFgK6LNpIasVKkEgW8oyf0tmPLA=="; - }; - } - { - name = "_lgaitan_pace_progress___pace_progress_1.0.7.tgz"; - path = fetchurl { - name = "_lgaitan_pace_progress___pace_progress_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/@lgaitan/pace-progress/-/pace-progress-1.0.7.tgz"; - sha512 = "GMoTcF6WBpno7a7Iyx7M79os26d5bCDbh7YTZmXZM8YuLR3DDtwo0/CBYddStGD6QIBTieFDz4IAQiO0dAdRGw=="; - }; - } - { - name = "_sweetalert2_theme_bootstrap_4___theme_bootstrap_4_5.0.15.tgz"; - path = fetchurl { - name = "_sweetalert2_theme_bootstrap_4___theme_bootstrap_4_5.0.15.tgz"; - url = "https://registry.yarnpkg.com/@sweetalert2/theme-bootstrap-4/-/theme-bootstrap-4-5.0.15.tgz"; - sha512 = "WsGXk67Yz3Txe3lJA4FNqQCKbQQ6yJLpVUknyGcoESVvwHm+UBBlIMHAcKuLvF+WXK9Rbq8gXhpDIU8ISoiPlQ=="; - }; - } - { - name = "_ttskch_select2_bootstrap4_theme___select2_bootstrap4_theme_1.5.2.tgz"; - path = fetchurl { - name = "_ttskch_select2_bootstrap4_theme___select2_bootstrap4_theme_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/@ttskch/select2-bootstrap4-theme/-/select2-bootstrap4-theme-1.5.2.tgz"; - sha512 = "gAj8qNy/VYwQDBkACm0USM66kxFai8flX83ayRXPNhzZckEgSqIBB9sM74SCM3ssgeX+ZVy4BifTnLis+KpIyg=="; - }; - } - { - name = "acorn_node___acorn_node_1.8.2.tgz"; - path = fetchurl { - name = "acorn_node___acorn_node_1.8.2.tgz"; - url = "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz"; - sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A=="; - }; - } - { - name = "acorn_walk___acorn_walk_7.2.0.tgz"; - path = fetchurl { - name = "acorn_walk___acorn_walk_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz"; - sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; - }; - } - { - name = "acorn___acorn_7.4.1.tgz"; - path = fetchurl { - name = "acorn___acorn_7.4.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; - sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; - }; - } - { - name = "admin_lte___admin_lte_3.2.0.tgz"; - path = fetchurl { - name = "admin_lte___admin_lte_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/admin-lte/-/admin-lte-3.2.0.tgz"; - sha512 = "IDUfoU8jo9DVlB59lDEASAJXTesAEXDZ68DOHI3qg93r5ehVTkMl2x0ixgIyff8NiHeNYXpcOZh3tr6oGbvu9g=="; - }; - } - { - name = "amdefine___amdefine_1.0.1.tgz"; - path = fetchurl { - name = "amdefine___amdefine_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz"; - sha512 = "S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg=="; - }; - } - { - name = "array_from___array_from_2.1.1.tgz"; - path = fetchurl { - name = "array_from___array_from_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz"; - sha512 = "GQTc6Uupx1FCavi5mPzBvVT7nEOeWMmUA9P95wpfpW1XwMSKs+KaymD5C2Up7KAUKg/mYwbsUYzdZWcoajlNZg=="; - }; - } - { - name = "ast_transform___ast_transform_0.0.0.tgz"; - path = fetchurl { - name = "ast_transform___ast_transform_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/ast-transform/-/ast-transform-0.0.0.tgz"; - sha512 = "e/JfLiSoakfmL4wmTGPjv0HpTICVmxwXgYOB8x+mzozHL8v+dSfCbrJ8J8hJ0YBP0XcYu1aLZ6b/3TnxNK3P2A=="; - }; - } - { - name = "ast_types___ast_types_0.7.8.tgz"; - path = fetchurl { - name = "ast_types___ast_types_0.7.8.tgz"; - url = "https://registry.yarnpkg.com/ast-types/-/ast-types-0.7.8.tgz"; - sha512 = "RIOpVnVlltB6PcBJ5BMLx+H+6JJ/zjDGU0t7f0L6c2M1dqcK92VQopLBlPQ9R80AVXelfqYgjcPLtHtDbNFg0Q=="; - }; - } - { - name = "base64_js___base64_js_1.3.1.tgz"; - path = fetchurl { - name = "base64_js___base64_js_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz"; - sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; - }; - } - { - name = "base64_js___base64_js_1.5.1.tgz"; - path = fetchurl { - name = "base64_js___base64_js_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; - sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; - }; - } - { - name = "bootstrap_colorpicker___bootstrap_colorpicker_3.4.0.tgz"; - path = fetchurl { - name = "bootstrap_colorpicker___bootstrap_colorpicker_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/bootstrap-colorpicker/-/bootstrap-colorpicker-3.4.0.tgz"; - sha512 = "7vA0hvLrat3ptobEKlT9+6amzBUJcDAoh6hJRQY/AD+5dVZYXXf1ivRfrTwmuwiVLJo9rZwM8YB4lYzp6agzqg=="; - }; - } - { - name = "bootstrap_datepicker___bootstrap_datepicker_1.9.0.tgz"; - path = fetchurl { - name = "bootstrap_datepicker___bootstrap_datepicker_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.9.0.tgz"; - sha512 = "9rYYbaVOheGYxjOr/+bJCmRPihfy+LkLSg4fIFMT9Od8WwWB/MB50w0JO1eBgKUMbb7PFHQD5uAfI3ArAxZRXA=="; - }; - } - { - name = "bootstrap_slider___bootstrap_slider_11.0.2.tgz"; - path = fetchurl { - name = "bootstrap_slider___bootstrap_slider_11.0.2.tgz"; - url = "https://registry.yarnpkg.com/bootstrap-slider/-/bootstrap-slider-11.0.2.tgz"; - sha512 = "CdwS+Z6X79OkLes9RfDgPB9UIY/+81wTkm6ktdSB6hdyiRbjJLFQIjZdnEr55tDyXZfgC7U6yeSXkNN9ZdGqjA=="; - }; - } - { - name = "bootstrap_switch___bootstrap_switch_3.3.4.tgz"; - path = fetchurl { - name = "bootstrap_switch___bootstrap_switch_3.3.4.tgz"; - url = "https://registry.yarnpkg.com/bootstrap-switch/-/bootstrap-switch-3.3.4.tgz"; - sha512 = "7YQo+Ir6gCUqC36FFp1Zvec5dRF/+obq+1drMtdIMi9Xc84Kx63Evi0kdcp4HfiGsZpiz6IskyYDNlSKcxsL7w=="; - }; - } - { - name = "bootstrap_validator___bootstrap_validator_0.11.9.tgz"; - path = fetchurl { - name = "bootstrap_validator___bootstrap_validator_0.11.9.tgz"; - url = "https://registry.yarnpkg.com/bootstrap-validator/-/bootstrap-validator-0.11.9.tgz"; - sha512 = "BJlnaTeFNr5+SNtZ71DNaiFx7qY0X2c7m/KvZE1GiVXbyD8PihJlALvS6TeRGUs8mY8qga/LrhG80N9dw8UWqA=="; - }; - } - { - name = "bootstrap4_duallistbox___bootstrap4_duallistbox_4.0.2.tgz"; - path = fetchurl { - name = "bootstrap4_duallistbox___bootstrap4_duallistbox_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/bootstrap4-duallistbox/-/bootstrap4-duallistbox-4.0.2.tgz"; - sha512 = "vQdANVE2NN0HMaZO9qWJy0C7u04uTpAmtUGO3KLq3xAZKCboJweQ437hDTszI6pbYV2olJCGZMbdhvIkBNGeGQ=="; - }; - } - { - name = "bootstrap___bootstrap_4.6.2.tgz"; - path = fetchurl { - name = "bootstrap___bootstrap_4.6.2.tgz"; - url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz"; - sha512 = "51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ=="; - }; - } - { - name = "bootstrap___bootstrap_5.2.3.tgz"; - path = fetchurl { - name = "bootstrap___bootstrap_5.2.3.tgz"; - url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz"; - sha512 = "cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ=="; - }; - } - { - name = "brfs___brfs_2.0.2.tgz"; - path = fetchurl { - name = "brfs___brfs_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/brfs/-/brfs-2.0.2.tgz"; - sha512 = "IrFjVtwu4eTJZyu8w/V2gxU7iLTtcHih67sgEdzrhjLBMHp2uYefUBfdM4k2UvcuWMgV7PQDZHSLeNWnLFKWVQ=="; - }; - } - { - name = "brotli___brotli_1.3.3.tgz"; - path = fetchurl { - name = "brotli___brotli_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/brotli/-/brotli-1.3.3.tgz"; - sha512 = "oTKjJdShmDuGW94SyyaoQvAjf30dZaHnjJ8uAF+u2/vGJkJbJPJAT1gDiOJP5v1Zb6f9KEyW/1HpuaWIXtGHPg=="; - }; - } - { - name = "browser_resolve___browser_resolve_1.11.3.tgz"; - path = fetchurl { - name = "browser_resolve___browser_resolve_1.11.3.tgz"; - url = "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz"; - sha512 = "exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ=="; - }; - } - { - name = "browserify_optional___browserify_optional_1.0.1.tgz"; - path = fetchurl { - name = "browserify_optional___browserify_optional_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/browserify-optional/-/browserify-optional-1.0.1.tgz"; - sha512 = "VrhjbZ+Ba5mDiSYEuPelekQMfTbhcA2DhLk2VQWqdcCROWeFqlTcXZ7yfRkXCIl8E+g4gINJYJiRB7WEtfomAQ=="; - }; - } - { - name = "bs_custom_file_input___bs_custom_file_input_1.3.4.tgz"; - path = fetchurl { - name = "bs_custom_file_input___bs_custom_file_input_1.3.4.tgz"; - url = "https://registry.yarnpkg.com/bs-custom-file-input/-/bs-custom-file-input-1.3.4.tgz"; - sha512 = "NBsQzTnef3OW1MvdKBbMHAYHssCd613MSeJV7z2McXznWtVMnJCy7Ckyc+PwxV6Pk16cu6YBcYWh/ZE0XWNKCA=="; - }; - } - { - name = "bs_stepper___bs_stepper_1.7.0.tgz"; - path = fetchurl { - name = "bs_stepper___bs_stepper_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/bs-stepper/-/bs-stepper-1.7.0.tgz"; - sha512 = "+DX7UKKgw2GI6ucsSCRd19VHYrxf/8znRCLs1lQVVLxz+h7EqgIOxoHcJ0/QTaaNoR9Cwg78ydo6hXIasyd3LA=="; - }; - } - { - name = "buffer_equal___buffer_equal_0.0.1.tgz"; - path = fetchurl { - name = "buffer_equal___buffer_equal_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz"; - sha512 = "RgSV6InVQ9ODPdLWJ5UAqBqJBOg370Nz6ZQtRzpt6nUjc8v0St97uJ4PYC6NztqIScrAXafKM3mZPMygSe1ggA=="; - }; - } - { - name = "buffer_from___buffer_from_1.1.2.tgz"; - path = fetchurl { - name = "buffer_from___buffer_from_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; - sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; - }; - } - { - name = "call_bind___call_bind_1.0.2.tgz"; - path = fetchurl { - name = "call_bind___call_bind_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; - sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; - }; - } - { - name = "chart.js___chart.js_2.9.4.tgz"; - path = fetchurl { - name = "chart.js___chart.js_2.9.4.tgz"; - url = "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz"; - sha512 = "B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A=="; - }; - } - { - name = "chartjs_color_string___chartjs_color_string_0.6.0.tgz"; - path = fetchurl { - name = "chartjs_color_string___chartjs_color_string_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz"; - sha512 = "TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A=="; - }; - } - { - name = "chartjs_color___chartjs_color_2.4.1.tgz"; - path = fetchurl { - name = "chartjs_color___chartjs_color_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz"; - sha512 = "haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w=="; - }; - } - { - name = "clone___clone_1.0.4.tgz"; - path = fetchurl { - name = "clone___clone_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz"; - sha512 = "JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="; - }; - } - { - name = "codemirror___codemirror_5.65.11.tgz"; - path = fetchurl { - name = "codemirror___codemirror_5.65.11.tgz"; - url = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.11.tgz"; - sha512 = "Gp62g2eKSCHYt10axmGhKq3WoJSvVpvhXmowNq7pZdRVowwtvBR/hi2LSP5srtctKkRT33T6/n8Kv1UGp7JW4A=="; - }; - } - { - name = "color_convert___color_convert_1.9.3.tgz"; - path = fetchurl { - name = "color_convert___color_convert_1.9.3.tgz"; - url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; - }; - } - { - name = "color_name___color_name_1.1.3.tgz"; - path = fetchurl { - name = "color_name___color_name_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; - }; - } - { - name = "color_name___color_name_1.1.4.tgz"; - path = fetchurl { - name = "color_name___color_name_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; - sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; - }; - } - { - name = "concat_stream___concat_stream_1.6.2.tgz"; - path = fetchurl { - name = "concat_stream___concat_stream_1.6.2.tgz"; - url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; - sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; - }; - } - { - name = "convert_source_map___convert_source_map_1.9.0.tgz"; - path = fetchurl { - name = "convert_source_map___convert_source_map_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz"; - sha512 = "ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="; - }; - } - { - name = "core_util_is___core_util_is_1.0.3.tgz"; - path = fetchurl { - name = "core_util_is___core_util_is_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; - sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; - }; - } - { - name = "crypto_js___crypto_js_4.1.1.tgz"; - path = fetchurl { - name = "crypto_js___crypto_js_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz"; - sha512 = "o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="; - }; - } - { - name = "d___d_1.0.1.tgz"; - path = fetchurl { - name = "d___d_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz"; - sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; - }; - } - { - name = "dash_ast___dash_ast_2.0.1.tgz"; - path = fetchurl { - name = "dash_ast___dash_ast_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/dash-ast/-/dash-ast-2.0.1.tgz"; - sha512 = "5TXltWJGc+RdnabUGzhRae1TRq6m4gr+3K2wQX0is5/F2yS6MJXJvLyI3ErAnsAXuJoGqvfVD5icRgim07DrxQ=="; - }; - } - { - name = "datatables.net_autofill_bs4___datatables.net_autofill_bs4_2.5.2.tgz"; - path = fetchurl { - name = "datatables.net_autofill_bs4___datatables.net_autofill_bs4_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-autofill-bs4/-/datatables.net-autofill-bs4-2.5.2.tgz"; - sha512 = "k8SU+S0fa8iX2vJLdzfykpawIRNXRygX6pZJZ52zcEMh6pO7wYKFblH4A6N9ToPrkF22lW5kYHqshEb+GMZLiA=="; - }; - } - { - name = "datatables.net_autofill___datatables.net_autofill_2.5.2.tgz"; - path = fetchurl { - name = "datatables.net_autofill___datatables.net_autofill_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-autofill/-/datatables.net-autofill-2.5.2.tgz"; - sha512 = "sMkHTVv3I8shEt4Qvf3y9Hfp3XLTe8wMi1tMclJw5OV9NOL5UkuHmBkQeJUegZWOBZ6sivYjOvOX7H8AI6OHMg=="; - }; - } - { - name = "datatables.net_bs4___datatables.net_bs4_1.13.2.tgz"; - path = fetchurl { - name = "datatables.net_bs4___datatables.net_bs4_1.13.2.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-1.13.2.tgz"; - sha512 = "sr5D4pV+VqIfPGPh3oKQDu+denk/bZ3ObyAYp/EbQLoLw2U6dvVJifHeccCC5M+ZhYtucHVID/qpbswx90QQHA=="; - }; - } - { - name = "datatables.net_buttons_bs4___datatables.net_buttons_bs4_2.3.4.tgz"; - path = fetchurl { - name = "datatables.net_buttons_bs4___datatables.net_buttons_bs4_2.3.4.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-buttons-bs4/-/datatables.net-buttons-bs4-2.3.4.tgz"; - sha512 = "rg1OpsPxbXeYStcsHHeh1NnvCIMKnnyKk0cnrNyGck5DJFFunKNySqJk2t1MkQrpEN1NibeuqyMCjfsAx5TQHg=="; - }; - } - { - name = "datatables.net_buttons___datatables.net_buttons_2.3.4.tgz"; - path = fetchurl { - name = "datatables.net_buttons___datatables.net_buttons_2.3.4.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-buttons/-/datatables.net-buttons-2.3.4.tgz"; - sha512 = "1fe/aiKBdKbwJ5j0OobP2dzhbg/alGOphnTfLFGaqlP5yVxDCfcZ9EsuglYeHRJ/KnU7DZ8BgsPFiTE0tOFx8Q=="; - }; - } - { - name = "datatables.net_colreorder_bs4___datatables.net_colreorder_bs4_1.6.1.tgz"; - path = fetchurl { - name = "datatables.net_colreorder_bs4___datatables.net_colreorder_bs4_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-colreorder-bs4/-/datatables.net-colreorder-bs4-1.6.1.tgz"; - sha512 = "vdr0Padd26pDNdUhasFUGWK6WrYyoBSwoJ5Sq4294hgj1SqblP8pz1vIGUmFiFtlHlOsHaVor3rffeqyYH8Waw=="; - }; - } - { - name = "datatables.net_colreorder___datatables.net_colreorder_1.6.1.tgz"; - path = fetchurl { - name = "datatables.net_colreorder___datatables.net_colreorder_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-colreorder/-/datatables.net-colreorder-1.6.1.tgz"; - sha512 = "ae0gdkG0OmrEGUrXYm0XgWDzDkuEhEuNrfvQsmtCTl0j+1nxtXPsecIiWBCqv/dM0X4x8PT0dJY8furqPCzXXw=="; - }; - } - { - name = "datatables.net_fixedcolumns_bs4___datatables.net_fixedcolumns_bs4_4.2.1.tgz"; - path = fetchurl { - name = "datatables.net_fixedcolumns_bs4___datatables.net_fixedcolumns_bs4_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-fixedcolumns-bs4/-/datatables.net-fixedcolumns-bs4-4.2.1.tgz"; - sha512 = "RXI0weSNs9MlwKZujIKtih2wAdycjYgE7xunFYNTLJrjMzmRrisHs1FQ8AwZAQZu2CkvUbrUjdiAuaJXwKPyuA=="; - }; - } - { - name = "datatables.net_fixedcolumns___datatables.net_fixedcolumns_4.2.1.tgz"; - path = fetchurl { - name = "datatables.net_fixedcolumns___datatables.net_fixedcolumns_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-fixedcolumns/-/datatables.net-fixedcolumns-4.2.1.tgz"; - sha512 = "XCNM2UyWwLl8Qtaw23/wgMlUhQjIWEKXJSLqB67RTibeyfVUF7zsnNQECPtlPr6kqUN229Ep8UZG15Zc71MytQ=="; - }; - } - { - name = "datatables.net_fixedheader_bs4___datatables.net_fixedheader_bs4_3.3.1.tgz"; - path = fetchurl { - name = "datatables.net_fixedheader_bs4___datatables.net_fixedheader_bs4_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-fixedheader-bs4/-/datatables.net-fixedheader-bs4-3.3.1.tgz"; - sha512 = "cTSh9VygiEoMwnkuR5xhex/NDCJ5CsgXCLG0VDdOqptUwjYIqlrrVf4hBCj2XnJCxHi/liV1sSW3qu7q1QnpwQ=="; - }; - } - { - name = "datatables.net_fixedheader___datatables.net_fixedheader_3.3.1.tgz"; - path = fetchurl { - name = "datatables.net_fixedheader___datatables.net_fixedheader_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-fixedheader/-/datatables.net-fixedheader-3.3.1.tgz"; - sha512 = "m1ip5dOOsdjaFw2e5G77o+XLjqy5wWKnBnp+BwbnFCq4J5hFbMqcIV1r5z9X+NeAiKlADqZqteeLoO2xYRXBVA=="; - }; - } - { - name = "datatables.net_keytable_bs4___datatables.net_keytable_bs4_2.8.1.tgz"; - path = fetchurl { - name = "datatables.net_keytable_bs4___datatables.net_keytable_bs4_2.8.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-keytable-bs4/-/datatables.net-keytable-bs4-2.8.1.tgz"; - sha512 = "1RAE6oC8z7EnWXFfi1sbilYpeUyrK3j0MDCH5Bm6DfIsT7fnchjUEzgBy3Nr9+uE5edFUb7FNW0VQjTZKjFd2g=="; - }; - } - { - name = "datatables.net_keytable___datatables.net_keytable_2.8.1.tgz"; - path = fetchurl { - name = "datatables.net_keytable___datatables.net_keytable_2.8.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-keytable/-/datatables.net-keytable-2.8.1.tgz"; - sha512 = "ch9O35OSUgwTCb9cJXV6ABRQ8l296cg/UEtPmLjto9CHVL/XF7o0ZwzvKWevnabXmTVbudfB647mrUtkFd/8og=="; - }; - } - { - name = "datatables.net_plugins___datatables.net_plugins_1.13.1.tgz"; - path = fetchurl { - name = "datatables.net_plugins___datatables.net_plugins_1.13.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-plugins/-/datatables.net-plugins-1.13.1.tgz"; - sha512 = "4UpaRl7ZiTmStjV1QTB3x9V0EKmgdMvF7Ms+HzZ6gSzv33kPrL9Cw76/Uxxl02Z+ajergobvfMN64ndlZ9AXzA=="; - }; - } - { - name = "datatables.net_responsive_bs4___datatables.net_responsive_bs4_2.4.0.tgz"; - path = fetchurl { - name = "datatables.net_responsive_bs4___datatables.net_responsive_bs4_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-responsive-bs4/-/datatables.net-responsive-bs4-2.4.0.tgz"; - sha512 = "zCAxwcuaLneJd3Yy1eKZU3wksIj4IFvcaQEXrFeVBgsl6iH3H+uqW9apwdadDL8agsBHdsln08qYjkz8bYY7Bg=="; - }; - } - { - name = "datatables.net_responsive___datatables.net_responsive_2.4.0.tgz"; - path = fetchurl { - name = "datatables.net_responsive___datatables.net_responsive_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-responsive/-/datatables.net-responsive-2.4.0.tgz"; - sha512 = "Acws4aEPJZX/+CQsXpuDBHfrwgl3XxWEc/zlsnJCXE/GGbqjVAtQt7SM6EBcdReMv1FbyWUlF/Uw+de11NT46A=="; - }; - } - { - name = "datatables.net_rowgroup_bs4___datatables.net_rowgroup_bs4_1.3.0.tgz"; - path = fetchurl { - name = "datatables.net_rowgroup_bs4___datatables.net_rowgroup_bs4_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-rowgroup-bs4/-/datatables.net-rowgroup-bs4-1.3.0.tgz"; - sha512 = "qw4PwsFgVNKazimL/ixYP9NGzsEgZtt1VQfFK/r+JF1uoV7/vVvG7qK/B+wFRAdTAXL+9v6uKlJ/8RI7bPAbvg=="; - }; - } - { - name = "datatables.net_rowgroup___datatables.net_rowgroup_1.3.0.tgz"; - path = fetchurl { - name = "datatables.net_rowgroup___datatables.net_rowgroup_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-rowgroup/-/datatables.net-rowgroup-1.3.0.tgz"; - sha512 = "kLzYxvMmy8wmISksXvHBbZrv0wD7hlmp8NaiZQ6rFMwbTIoMt9YzOA+tpKDZiw3MOnku44QAOBXdPtXwxjE0JA=="; - }; - } - { - name = "datatables.net_rowreorder_bs4___datatables.net_rowreorder_bs4_1.3.2.tgz"; - path = fetchurl { - name = "datatables.net_rowreorder_bs4___datatables.net_rowreorder_bs4_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-rowreorder-bs4/-/datatables.net-rowreorder-bs4-1.3.2.tgz"; - sha512 = "tzPefl59gbw4qytRtwfPGTA49O6Gf2J7jL1xvhR2px2fcKHP2RqNJaHtnBk9nhqTJNWc9YPPy2wtbkIFIkswqQ=="; - }; - } - { - name = "datatables.net_rowreorder___datatables.net_rowreorder_1.3.2.tgz"; - path = fetchurl { - name = "datatables.net_rowreorder___datatables.net_rowreorder_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-rowreorder/-/datatables.net-rowreorder-1.3.2.tgz"; - sha512 = "zF2nsYEdteqIPojl+8ADDF1uMR9v7WttQlMiYkz/5qaNMaMj6GUbrql4eXPFBFH87CKTqnN9fL0HH0CRvewKBg=="; - }; - } - { - name = "datatables.net_scroller_bs4___datatables.net_scroller_bs4_2.1.0.tgz"; - path = fetchurl { - name = "datatables.net_scroller_bs4___datatables.net_scroller_bs4_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-scroller-bs4/-/datatables.net-scroller-bs4-2.1.0.tgz"; - sha512 = "xZa2rhZjKbk1ebPQBrY6pqQRdc8/JTuAzzqhQjU7hDKwQqRyQ6WJuVjdJxJ6MHkB2fFVdj7v9H3VCvUJOuXTEQ=="; - }; - } - { - name = "datatables.net_scroller___datatables.net_scroller_2.1.0.tgz"; - path = fetchurl { - name = "datatables.net_scroller___datatables.net_scroller_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-scroller/-/datatables.net-scroller-2.1.0.tgz"; - sha512 = "B/MxP8YPcFtoa1cexvlcK0PXQdzy6tz+HhQlyjNpRCoRc/8ZM5VcZg+ecYfP/pRBBXZORgkOJjWYkIdoChhE0w=="; - }; - } - { - name = "datatables.net_searchbuilder_bs4___datatables.net_searchbuilder_bs4_1.4.0.tgz"; - path = fetchurl { - name = "datatables.net_searchbuilder_bs4___datatables.net_searchbuilder_bs4_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-searchbuilder-bs4/-/datatables.net-searchbuilder-bs4-1.4.0.tgz"; - sha512 = "iEjhIkKLKoVD7wGWEVNSfpQaqBx+SXbiDTmH3t39h5hNWpYqoLtwEy/PhtaSdaF+hIhlrhcB4y8qHr/mW7KlSw=="; - }; - } - { - name = "datatables.net_searchbuilder___datatables.net_searchbuilder_1.4.0.tgz"; - path = fetchurl { - name = "datatables.net_searchbuilder___datatables.net_searchbuilder_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-searchbuilder/-/datatables.net-searchbuilder-1.4.0.tgz"; - sha512 = "I6+a5EebX6uYFlWmc7TAk1oQvlfoGZqyLgdN4H9Rm6fL5VZv6SvWQ7y2+W9ebshMD0smKdtp8pedYc8PIh80kg=="; - }; - } - { - name = "datatables.net_searchpanes_bs4___datatables.net_searchpanes_bs4_1.4.0.tgz"; - path = fetchurl { - name = "datatables.net_searchpanes_bs4___datatables.net_searchpanes_bs4_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-searchpanes-bs4/-/datatables.net-searchpanes-bs4-1.4.0.tgz"; - sha512 = "Floxzmw2cQkUQdI7Vv4IWtLqLmwPrmY6MPncbEWq4YvkSeaZW7OHzSmZLLUjMn2P6Huvz59WUVcwL0lSDui6GQ=="; - }; - } - { - name = "datatables.net_searchpanes___datatables.net_searchpanes_2.1.1.tgz"; - path = fetchurl { - name = "datatables.net_searchpanes___datatables.net_searchpanes_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-searchpanes/-/datatables.net-searchpanes-2.1.1.tgz"; - sha512 = "WsgnK8C/jCco9oRcpsVaImgTCiD7hk28dLHBmlpbvbIHMHCAhLPn0zVnCB3yInoNC/7kOGKpkeItpIpFHDMnhA=="; - }; - } - { - name = "datatables.net_select_bs4___datatables.net_select_bs4_1.6.0.tgz"; - path = fetchurl { - name = "datatables.net_select_bs4___datatables.net_select_bs4_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-select-bs4/-/datatables.net-select-bs4-1.6.0.tgz"; - sha512 = "oHClu+R1IMpttFse0cAdUhl4uLHGgoHrFEU/QxpASOQLd1h4CtkiVnmDr0fFRvm6XZMRTNt5xgYgwr262YuXyQ=="; - }; - } - { - name = "datatables.net_select___datatables.net_select_1.6.0.tgz"; - path = fetchurl { - name = "datatables.net_select___datatables.net_select_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-select/-/datatables.net-select-1.6.0.tgz"; - sha512 = "1kj32GOXs/dSpjBL5iDV3pwRwHU0hhJLPnTW/NOUH8Vhv1rGR3/X3PMSCc/T+Fy7J1jCJFbk8hQDsruXQKfSzw=="; - }; - } - { - name = "datatables.net___datatables.net_1.13.2.tgz"; - path = fetchurl { - name = "datatables.net___datatables.net_1.13.2.tgz"; - url = "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.13.2.tgz"; - sha512 = "u5nOU+C9SBp1SyPmd6G+niozZtrBwo1E8xzdOk3JJaAkFYgX/KxF3Gd79R8YLbUfmIs2OLnLe5gaz/qs5U8UDA=="; - }; - } - { - name = "daterangepicker___daterangepicker_3.1.0.tgz"; - path = fetchurl { - name = "daterangepicker___daterangepicker_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/daterangepicker/-/daterangepicker-3.1.0.tgz"; - sha512 = "DxWXvvPq4srWLCqFugqSV+6CBt/CvQ0dnpXhQ3gl0autcIDAruG1PuGG3gC7yPRNytAD1oU1AcUOzaYhOawhTw=="; - }; - } - { - name = "deep_equal___deep_equal_1.1.1.tgz"; - path = fetchurl { - name = "deep_equal___deep_equal_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; - sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; - }; - } - { - name = "deep_is___deep_is_0.1.4.tgz"; - path = fetchurl { - name = "deep_is___deep_is_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz"; - sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; - }; - } - { - name = "define_properties___define_properties_1.2.0.tgz"; - path = fetchurl { - name = "define_properties___define_properties_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz"; - sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA=="; - }; - } - { - name = "dfa___dfa_1.2.0.tgz"; - path = fetchurl { - name = "dfa___dfa_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/dfa/-/dfa-1.2.0.tgz"; - sha512 = "ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q=="; - }; - } - { - name = "dropzone___dropzone_5.9.3.tgz"; - path = fetchurl { - name = "dropzone___dropzone_5.9.3.tgz"; - url = "https://registry.yarnpkg.com/dropzone/-/dropzone-5.9.3.tgz"; - sha512 = "Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA=="; - }; - } - { - name = "duplexer2___duplexer2_0.1.4.tgz"; - path = fetchurl { - name = "duplexer2___duplexer2_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz"; - sha512 = "asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA=="; - }; - } - { - name = "ekko_lightbox___ekko_lightbox_5.3.0.tgz"; - path = fetchurl { - name = "ekko_lightbox___ekko_lightbox_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/ekko-lightbox/-/ekko-lightbox-5.3.0.tgz"; - sha512 = "mbacwySuVD3Ad6F2hTkjSTvJt59bcVv2l/TmBerp4xZnLak8tPtA4AScUn4DL42c1ksTiAO6sGhJZ52P/1Qgew=="; - }; - } - { - name = "es5_ext___es5_ext_0.10.62.tgz"; - path = fetchurl { - name = "es5_ext___es5_ext_0.10.62.tgz"; - url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.62.tgz"; - sha512 = "BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA=="; - }; - } - { - name = "es6_iterator___es6_iterator_2.0.3.tgz"; - path = fetchurl { - name = "es6_iterator___es6_iterator_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz"; - sha512 = "zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g=="; - }; - } - { - name = "es6_map___es6_map_0.1.5.tgz"; - path = fetchurl { - name = "es6_map___es6_map_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz"; - sha512 = "mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A=="; - }; - } - { - name = "es6_set___es6_set_0.1.6.tgz"; - path = fetchurl { - name = "es6_set___es6_set_0.1.6.tgz"; - url = "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.6.tgz"; - sha512 = "TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw=="; - }; - } - { - name = "es6_symbol___es6_symbol_3.1.3.tgz"; - path = fetchurl { - name = "es6_symbol___es6_symbol_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz"; - sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; - }; - } - { - name = "escodegen___escodegen_1.14.3.tgz"; - path = fetchurl { - name = "escodegen___escodegen_1.14.3.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; - sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; - }; - } - { - name = "escodegen___escodegen_1.2.0.tgz"; - path = fetchurl { - name = "escodegen___escodegen_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.2.0.tgz"; - sha512 = "yLy3Cc+zAC0WSmoT2fig3J87TpQ8UaZGx8ahCAs9FL8qNbyV7CVyPKS74DG4bsHiL5ew9sxdYx131OkBQMFnvA=="; - }; - } - { - name = "esprima___esprima_4.0.1.tgz"; - path = fetchurl { - name = "esprima___esprima_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; - sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; - }; - } - { - name = "esprima___esprima_1.0.4.tgz"; - path = fetchurl { - name = "esprima___esprima_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz"; - sha512 = "rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA=="; - }; - } - { - name = "estraverse___estraverse_4.3.0.tgz"; - path = fetchurl { - name = "estraverse___estraverse_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; - sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; - }; - } - { - name = "estraverse___estraverse_1.5.1.tgz"; - path = fetchurl { - name = "estraverse___estraverse_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-1.5.1.tgz"; - sha512 = "FpCjJDfmo3vsc/1zKSeqR5k42tcIhxFIlvq+h9j0fO2q/h2uLKyweq7rYJ+0CoVvrGQOxIS5wyBrW/+vF58BUQ=="; - }; - } - { - name = "estree_is_function___estree_is_function_1.0.0.tgz"; - path = fetchurl { - name = "estree_is_function___estree_is_function_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/estree-is-function/-/estree-is-function-1.0.0.tgz"; - sha512 = "nSCWn1jkSq2QAtkaVLJZY2ezwcFO161HVc174zL1KPW3RJ+O6C3eJb8Nx7OXzvhoEv+nLgSR1g71oWUHUDTrJA=="; - }; - } - { - name = "esutils___esutils_2.0.3.tgz"; - path = fetchurl { - name = "esutils___esutils_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - } - { - name = "esutils___esutils_1.0.0.tgz"; - path = fetchurl { - name = "esutils___esutils_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/esutils/-/esutils-1.0.0.tgz"; - sha512 = "x/iYH53X3quDwfHRz4y8rn4XcEwwCJeWsul9pF1zldMbGtgOtMNBEOuYWwB1EQlK2LRa1fev3YAgym/RElp5Cg=="; - }; - } - { - name = "ev_emitter___ev_emitter_1.1.1.tgz"; - path = fetchurl { - name = "ev_emitter___ev_emitter_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/ev-emitter/-/ev-emitter-1.1.1.tgz"; - sha512 = "ipiDYhdQSCZ4hSbX4rMW+XzNKMD1prg/sTvoVmSLkuQ1MVlwjJQQA+sW8tMYR3BLUr9KjodFV4pvzunvRhd33Q=="; - }; - } - { - name = "eve_raphael___eve_raphael_0.5.0.tgz"; - path = fetchurl { - name = "eve_raphael___eve_raphael_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz"; - sha512 = "jrxnPsCGqng1UZuEp9DecX/AuSyAszATSjf4oEcRxvfxa1Oux4KkIPKBAAWWnpdwfARtr+Q0o9aPYWjsROD7ug=="; - }; - } - { - name = "event_emitter___event_emitter_0.3.5.tgz"; - path = fetchurl { - name = "event_emitter___event_emitter_0.3.5.tgz"; - url = "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz"; - sha512 = "D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA=="; - }; - } - { - name = "ext___ext_1.7.0.tgz"; - path = fetchurl { - name = "ext___ext_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz"; - sha512 = "6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw=="; - }; - } - { - name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; - path = fetchurl { - name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; - }; - } - { - name = "fast_memoize___fast_memoize_2.5.2.tgz"; - path = fetchurl { - name = "fast_memoize___fast_memoize_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz"; - sha512 = "Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw=="; - }; - } - { - name = "fastclick___fastclick_1.0.6.tgz"; - path = fetchurl { - name = "fastclick___fastclick_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/fastclick/-/fastclick-1.0.6.tgz"; - sha512 = "cXyDBT4g0uWl/Xe75QspBDAgAWQ0lkPi/zgp6YFEUHj6WV6VIZl7R6TiDZhdOVU3W4ehp/8tG61Jev1jit+ztQ=="; - }; - } - { - name = "filterizr___filterizr_2.2.4.tgz"; - path = fetchurl { - name = "filterizr___filterizr_2.2.4.tgz"; - url = "https://registry.yarnpkg.com/filterizr/-/filterizr-2.2.4.tgz"; - sha512 = "hqyEdg7RrvJMVFOeF0yysS75HP6jLu0wBSUtSPAc3BysAtHpwcXaPnR1kYp2uZtd3YXyhH6JRfF9+H4SRvrqXg=="; - }; - } - { - name = "flag_icon_css___flag_icon_css_4.1.7.tgz"; - path = fetchurl { - name = "flag_icon_css___flag_icon_css_4.1.7.tgz"; - url = "https://registry.yarnpkg.com/flag-icon-css/-/flag-icon-css-4.1.7.tgz"; - sha512 = "AFjSU+fv98XbU0vnTQ32vcLj89UEr1MhwDFcooQv14qWJCjg9fGZzfh9BVyDhAhIOZW/pGmJmq38RqpgPaeybQ=="; - }; - } - { - name = "flot___flot_4.2.3.tgz"; - path = fetchurl { - name = "flot___flot_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/flot/-/flot-4.2.3.tgz"; - sha512 = "r1t2gfhILE6dt7cnYDHX/D2VHERyD0YoV0UdFJg5dWbjkcu05MugfhNY7VspfBFTa+hjVNYVZw6/t9ZyYNen+w=="; - }; - } - { - name = "fs_extra___fs_extra_10.1.0.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz"; - sha512 = "oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="; - }; - } - { - name = "fullcalendar___fullcalendar_5.11.4.tgz"; - path = fetchurl { - name = "fullcalendar___fullcalendar_5.11.4.tgz"; - url = "https://registry.yarnpkg.com/fullcalendar/-/fullcalendar-5.11.4.tgz"; - sha512 = "1TH40KkWFVlZBpqJ/eB69E7nPABleA0skoc7pTIXJNNNYyUuKPjiJg+TSMunjJ9faPLzvbvfCdgttGZnynPA3Q=="; - }; - } - { - name = "function_bind___function_bind_1.1.1.tgz"; - path = fetchurl { - name = "function_bind___function_bind_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; - }; - } - { - name = "functions_have_names___functions_have_names_1.2.3.tgz"; - path = fetchurl { - name = "functions_have_names___functions_have_names_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz"; - sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; - }; - } - { - name = "get_assigned_identifiers___get_assigned_identifiers_1.2.0.tgz"; - path = fetchurl { - name = "get_assigned_identifiers___get_assigned_identifiers_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz"; - sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="; - }; - } - { - name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; - path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; - sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; - }; - } - { - name = "graceful_fs___graceful_fs_4.2.10.tgz"; - path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.10.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz"; - sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; - }; - } - { - name = "has_property_descriptors___has_property_descriptors_1.0.0.tgz"; - path = fetchurl { - name = "has_property_descriptors___has_property_descriptors_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; - sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; - }; - } - { - name = "has_symbols___has_symbols_1.0.3.tgz"; - path = fetchurl { - name = "has_symbols___has_symbols_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz"; - sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; - }; - } - { - name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; - path = fetchurl { - name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; - }; - } - { - name = "has___has_1.0.3.tgz"; - path = fetchurl { - name = "has___has_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; - sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; - }; - } - { - name = "icheck_bootstrap___icheck_bootstrap_3.0.1.tgz"; - path = fetchurl { - name = "icheck_bootstrap___icheck_bootstrap_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/icheck-bootstrap/-/icheck-bootstrap-3.0.1.tgz"; - sha512 = "Rj3SybdcMcayhsP4IJ+hmCNgCKclaFcs/5zwCuLXH1WMo468NegjhZVxbSNKhEjJjnwc4gKETogUmPYSQ9lEZQ=="; - }; - } - { - name = "icheck___icheck_1.0.2.tgz"; - path = fetchurl { - name = "icheck___icheck_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/icheck/-/icheck-1.0.2.tgz"; - sha512 = "1oDqj9ikiH4csFWKZnfbD1S9IY/MqzEt4cir6PIfkT84D/8QYaAZFrplXoyz5eaATmaoawY3KMTkMAO+fP4wGg=="; - }; - } - { - name = "iconv_lite___iconv_lite_0.6.3.tgz"; - path = fetchurl { - name = "iconv_lite___iconv_lite_0.6.3.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; - }; - } - { - name = "imagesloaded___imagesloaded_4.1.4.tgz"; - path = fetchurl { - name = "imagesloaded___imagesloaded_4.1.4.tgz"; - url = "https://registry.yarnpkg.com/imagesloaded/-/imagesloaded-4.1.4.tgz"; - sha512 = "ltiBVcYpc/TYTF5nolkMNsnREHW+ICvfQ3Yla2Sgr71YFwQ86bDwV9hgpFhFtrGPuwEx5+LqOHIrdXBdoWwwsA=="; - }; - } - { - name = "immediate___immediate_3.0.6.tgz"; - path = fetchurl { - name = "immediate___immediate_3.0.6.tgz"; - url = "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz"; - sha512 = "XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="; - }; - } - { - name = "inherits___inherits_2.0.4.tgz"; - path = fetchurl { - name = "inherits___inherits_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - } - { - name = "inputmask___inputmask_5.0.7.tgz"; - path = fetchurl { - name = "inputmask___inputmask_5.0.7.tgz"; - url = "https://registry.yarnpkg.com/inputmask/-/inputmask-5.0.7.tgz"; - sha512 = "rUxbRDS25KEib+c/Ow+K01oprU/+EK9t9SOPC8ov94/ftULGDqj1zOgRU/Hko6uzoKRMdwCfuhAafJ/Wk2wffQ=="; - }; - } - { - name = "ion_rangeslider___ion_rangeslider_2.3.1.tgz"; - path = fetchurl { - name = "ion_rangeslider___ion_rangeslider_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/ion-rangeslider/-/ion-rangeslider-2.3.1.tgz"; - sha512 = "6V+24FD13/feliI485gnRHZYD9Ev64M5NAFTxnVib516ATHa9PlXQrC+nOiPngouRYTCLPJyokAJEi3e1Umi5g=="; - }; - } - { - name = "is_arguments___is_arguments_1.1.1.tgz"; - path = fetchurl { - name = "is_arguments___is_arguments_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz"; - sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; - }; - } - { - name = "is_core_module___is_core_module_2.11.0.tgz"; - path = fetchurl { - name = "is_core_module___is_core_module_2.11.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz"; - sha512 = "RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw=="; - }; - } - { - name = "is_date_object___is_date_object_1.0.5.tgz"; - path = fetchurl { - name = "is_date_object___is_date_object_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz"; - sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; - }; - } - { - name = "is_regex___is_regex_1.1.4.tgz"; - path = fetchurl { - name = "is_regex___is_regex_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz"; - sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; - }; - } - { - name = "isarray___isarray_1.0.0.tgz"; - path = fetchurl { - name = "isarray___isarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; - }; - } - { - name = "jquery_knob_chif___jquery_knob_chif_1.2.13.tgz"; - path = fetchurl { - name = "jquery_knob_chif___jquery_knob_chif_1.2.13.tgz"; - url = "https://registry.yarnpkg.com/jquery-knob-chif/-/jquery-knob-chif-1.2.13.tgz"; - sha512 = "dveq9MZCr68bRrsziuRusKS+/ciT1yOOHdENOSTcXVRM9MsEyCK/DjqR9nc7V3on41269PFdDE2Fuib8Cw4jAA=="; - }; - } - { - name = "jquery_mapael___jquery_mapael_2.2.0.tgz"; - path = fetchurl { - name = "jquery_mapael___jquery_mapael_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/jquery-mapael/-/jquery-mapael-2.2.0.tgz"; - sha512 = "B5cVcCkfs7Ezia1Zs8bEfVacYD/GvaASyqQeidApR/NJ1C4igcExk9VULVsgLcTPkxohcZrrz5uCaPXvuKeZWw=="; - }; - } - { - name = "jquery_mousewheel___jquery_mousewheel_3.1.13.tgz"; - path = fetchurl { - name = "jquery_mousewheel___jquery_mousewheel_3.1.13.tgz"; - url = "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz"; - sha512 = "GXhSjfOPyDemM005YCEHvzrEALhKDIswtxSHSR2e4K/suHVJKJxxRCGz3skPjNxjJjQa9AVSGGlYjv1M3VLIPg=="; - }; - } - { - name = "jquery_slimscroll___jquery_slimscroll_1.3.8.tgz"; - path = fetchurl { - name = "jquery_slimscroll___jquery_slimscroll_1.3.8.tgz"; - url = "https://registry.yarnpkg.com/jquery-slimscroll/-/jquery-slimscroll-1.3.8.tgz"; - sha512 = "3cNGNCq6i3b+rZQOx1tSBlSFewk4X35eUuQmoRVSA4MSytw3rGPvCw6cEB2oEHf+u15RVzgfh4hN+/3dDNzwiQ=="; - }; - } - { - name = "jquery_sparkline___jquery_sparkline_2.4.0.tgz"; - path = fetchurl { - name = "jquery_sparkline___jquery_sparkline_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/jquery-sparkline/-/jquery-sparkline-2.4.0.tgz"; - sha512 = "SzjpMkOwlnqZpH4Ni2UbdRU5GxDl/BljgN8Smlun7CXUDqRhjPf2eolJ37KKcaG0/ufsMKY+XDERfPTV1hIcjg=="; - }; - } - { - name = "jquery_ui_dist___jquery_ui_dist_1.13.2.tgz"; - path = fetchurl { - name = "jquery_ui_dist___jquery_ui_dist_1.13.2.tgz"; - url = "https://registry.yarnpkg.com/jquery-ui-dist/-/jquery-ui-dist-1.13.2.tgz"; - sha512 = "oVDRd1NLtTbBwpRKAYdIRgpWVDzeBhfy7Gu0RmY6JEaZtmBq6kDn1pm5SgDiAotrnDS+RoTRXO6xvcNTxA9tOA=="; - }; - } - { - name = "jquery_validation___jquery_validation_1.19.5.tgz"; - path = fetchurl { - name = "jquery_validation___jquery_validation_1.19.5.tgz"; - url = "https://registry.yarnpkg.com/jquery-validation/-/jquery-validation-1.19.5.tgz"; - sha512 = "X2SmnPq1mRiDecVYL8edWx+yTBZDyC8ohWXFhXdtqFHgU9Wd4KHkvcbCoIZ0JaSaumzS8s2gXSkP8F7ivg/8ZQ=="; - }; - } - { - name = "jquery.quicksearch___jquery.quicksearch_2.4.0.tgz"; - path = fetchurl { - name = "jquery.quicksearch___jquery.quicksearch_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/jquery.quicksearch/-/jquery.quicksearch-2.4.0.tgz"; - sha512 = "20FJSCW3kTawO6Jvy/6MtUCURvgUZFqRUOAGTxH/VaPlwLG4kba82sKaM3ghTi1DsmSZrM2BvrwLUwNWmwDXiw=="; - }; - } - { - name = "jquery___jquery_3.6.3.tgz"; - path = fetchurl { - name = "jquery___jquery_3.6.3.tgz"; - url = "https://registry.yarnpkg.com/jquery/-/jquery-3.6.3.tgz"; - sha512 = "bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="; - }; - } - { - name = "jqvmap_novulnerability___jqvmap_novulnerability_1.5.1.tgz"; - path = fetchurl { - name = "jqvmap_novulnerability___jqvmap_novulnerability_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/jqvmap-novulnerability/-/jqvmap-novulnerability-1.5.1.tgz"; - sha512 = "O6Jr7AGiut9iNJMelPdy8pH83tNXadOqmhJm5FZy9gtaZ5uuhZK3VNu+YLFuTpXeZI8YXUvlFUYbJJi5XHA+tw=="; - }; - } - { - name = "jsgrid___jsgrid_1.5.3.tgz"; - path = fetchurl { - name = "jsgrid___jsgrid_1.5.3.tgz"; - url = "https://registry.yarnpkg.com/jsgrid/-/jsgrid-1.5.3.tgz"; - sha512 = "/BJgQp7gZe8o/VgNelwXc21jHc9HN+l7WPOkBhC9b9jPXFtOrU9ftNLPVBmKYCNlIulAbGTW8SDJI0mpw7uWxQ=="; - }; - } - { - name = "jsonfile___jsonfile_6.1.0.tgz"; - path = fetchurl { - name = "jsonfile___jsonfile_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; - sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; - }; - } - { - name = "jszip___jszip_3.10.1.tgz"; - path = fetchurl { - name = "jszip___jszip_3.10.1.tgz"; - url = "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz"; - sha512 = "xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g=="; - }; - } - { - name = "jtimeout___jtimeout_3.2.0.tgz"; - path = fetchurl { - name = "jtimeout___jtimeout_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/jtimeout/-/jtimeout-3.2.0.tgz"; - sha512 = "P/cEhmgr8P2Vd3V79uUk6pHAHpMSe+Px7B+mGEir4aZW3/J6C09uH97aAEXVpjqb9i9vHnUyIp7k0UoA+Hy0eg=="; - }; - } - { - name = "knockout___knockout_3.5.1.tgz"; - path = fetchurl { - name = "knockout___knockout_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/knockout/-/knockout-3.5.1.tgz"; - sha512 = "wRJ9I4az0QcsH7A4v4l0enUpkS++MBx0BnL/68KaLzJg7x1qmbjSlwEoCNol7KTYZ+pmtI7Eh2J0Nu6/2Z5J/Q=="; - }; - } - { - name = "levn___levn_0.3.0.tgz"; - path = fetchurl { - name = "levn___levn_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; - sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; - }; - } - { - name = "lie___lie_3.3.0.tgz"; - path = fetchurl { - name = "lie___lie_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz"; - sha512 = "UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ=="; - }; - } - { - name = "magic_string___magic_string_0.25.1.tgz"; - path = fetchurl { - name = "magic_string___magic_string_0.25.1.tgz"; - url = "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.1.tgz"; - sha512 = "sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg=="; - }; - } - { - name = "merge_source_map___merge_source_map_1.0.4.tgz"; - path = fetchurl { - name = "merge_source_map___merge_source_map_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz"; - sha512 = "PGSmS0kfnTnMJCzJ16BLLCEe6oeYCamKFFdQKshi4BmM6FUwipjVOcBFGxqtQtirtAG4iZvHlqST9CpZKqlRjA=="; - }; - } - { - name = "minimist___minimist_1.2.8.tgz"; - path = fetchurl { - name = "minimist___minimist_1.2.8.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz"; - sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; - }; - } - { - name = "moment_timezone___moment_timezone_0.5.40.tgz"; - path = fetchurl { - name = "moment_timezone___moment_timezone_0.5.40.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.40.tgz"; - sha512 = "tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg=="; - }; - } - { - name = "moment___moment_2.29.4.tgz"; - path = fetchurl { - name = "moment___moment_2.29.4.tgz"; - url = "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz"; - sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; - }; - } - { - name = "multiselect___multiselect_0.9.12.tgz"; - path = fetchurl { - name = "multiselect___multiselect_0.9.12.tgz"; - url = "https://registry.yarnpkg.com/multiselect/-/multiselect-0.9.12.tgz"; - sha512 = "JCuFC288lp9m5xNlxsgX10dhZZv+5lIQQt4kM4H8uLysbiMJTYQBi0LuYguRunCvlXlGjFvH8O/YpL8x2lu9EA=="; - }; - } - { - name = "next_tick___next_tick_1.1.0.tgz"; - path = fetchurl { - name = "next_tick___next_tick_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz"; - sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="; - }; - } - { - name = "object_inspect___object_inspect_1.12.3.tgz"; - path = fetchurl { - name = "object_inspect___object_inspect_1.12.3.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz"; - sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="; - }; - } - { - name = "object_is___object_is_1.1.5.tgz"; - path = fetchurl { - name = "object_is___object_is_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz"; - sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; - }; - } - { - name = "object_keys___object_keys_1.1.1.tgz"; - path = fetchurl { - name = "object_keys___object_keys_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; - }; - } - { - name = "optionator___optionator_0.8.3.tgz"; - path = fetchurl { - name = "optionator___optionator_0.8.3.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; - sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; - }; - } - { - name = "overlayscrollbars___overlayscrollbars_1.13.3.tgz"; - path = fetchurl { - name = "overlayscrollbars___overlayscrollbars_1.13.3.tgz"; - url = "https://registry.yarnpkg.com/overlayscrollbars/-/overlayscrollbars-1.13.3.tgz"; - sha512 = "1nB/B5kaakJuHXaLXLRK0bUIilWhUGT6q5g+l2s5vqYdLle/sd0kscBHkQC1kuuDg9p9WR4MTdySDOPbeL/86g=="; - }; - } - { - name = "pako___pako_0.2.9.tgz"; - path = fetchurl { - name = "pako___pako_0.2.9.tgz"; - url = "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz"; - sha512 = "NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA=="; - }; - } - { - name = "pako___pako_1.0.11.tgz"; - path = fetchurl { - name = "pako___pako_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz"; - sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; - }; - } - { - name = "path_parse___path_parse_1.0.7.tgz"; - path = fetchurl { - name = "path_parse___path_parse_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; - sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; - }; - } - { - name = "pdfmake___pdfmake_0.2.7.tgz"; - path = fetchurl { - name = "pdfmake___pdfmake_0.2.7.tgz"; - url = "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.2.7.tgz"; - sha512 = "ClLpgx30H5G3EDvRW1MrA1Xih6YxEaSgIVFrOyBMgAAt62V+hxsyWAi6JNP7u1Fc5JKYAbpb4RRVw8Rhvmz5cQ=="; - }; - } - { - name = "png_js___png_js_1.0.0.tgz"; - path = fetchurl { - name = "png_js___png_js_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/png-js/-/png-js-1.0.0.tgz"; - sha512 = "k+YsbhpA9e+EFfKjTCH3VW6aoKlyNYI6NYdTfDL4CIvFnvsuO84ttonmZE7rc+v23SLTH8XX+5w/Ak9v0xGY4g=="; - }; - } - { - name = "popper.js___popper.js_1.16.1.tgz"; - path = fetchurl { - name = "popper.js___popper.js_1.16.1.tgz"; - url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz"; - sha512 = "Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="; - }; - } - { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - path = fetchurl { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; - }; - } - { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; - path = fetchurl { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; - }; - } - { - name = "quote_stream___quote_stream_1.0.2.tgz"; - path = fetchurl { - name = "quote_stream___quote_stream_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz"; - sha512 = "kKr2uQ2AokadPjvTyKJQad9xELbZwYzWlNfI3Uz2j/ib5u6H9lDP7fUUR//rMycd0gv4Z5P1qXMfXR8YpIxrjQ=="; - }; - } - { - name = "raphael___raphael_2.3.0.tgz"; - path = fetchurl { - name = "raphael___raphael_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/raphael/-/raphael-2.3.0.tgz"; - sha512 = "w2yIenZAQnp257XUWGni4bLMVxpUpcIl7qgxEgDIXtmSypYtlNxfXWpOBxs7LBTps5sDwhRnrToJrMUrivqNTQ=="; - }; - } - { - name = "readable_stream___readable_stream_2.3.7.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_2.3.7.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; - }; - } - { - name = "regexp.prototype.flags___regexp.prototype.flags_1.4.3.tgz"; - path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; - sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; - }; - } - { - name = "resolve___resolve_1.1.7.tgz"; - path = fetchurl { - name = "resolve___resolve_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz"; - sha512 = "9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg=="; - }; - } - { - name = "resolve___resolve_1.22.1.tgz"; - path = fetchurl { - name = "resolve___resolve_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz"; - sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; - }; - } - { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; - }; - } - { - name = "safer_buffer___safer_buffer_2.1.2.tgz"; - path = fetchurl { - name = "safer_buffer___safer_buffer_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - } - { - name = "sax___sax_1.2.4.tgz"; - path = fetchurl { - name = "sax___sax_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; - }; - } - { - name = "scope_analyzer___scope_analyzer_2.1.2.tgz"; - path = fetchurl { - name = "scope_analyzer___scope_analyzer_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/scope-analyzer/-/scope-analyzer-2.1.2.tgz"; - sha512 = "5cfCmsTYV/wPaRIItNxatw02ua/MThdIUNnUOCYp+3LSEJvnG804ANw2VLaavNILIfWXF1D1G2KNANkBBvInwQ=="; - }; - } - { - name = "select2___select2_4.0.13.tgz"; - path = fetchurl { - name = "select2___select2_4.0.13.tgz"; - url = "https://registry.yarnpkg.com/select2/-/select2-4.0.13.tgz"; - sha512 = "1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw=="; - }; - } - { - name = "setimmediate___setimmediate_1.0.5.tgz"; - path = fetchurl { - name = "setimmediate___setimmediate_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz"; - sha512 = "MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="; - }; - } - { - name = "shallow_copy___shallow_copy_0.0.1.tgz"; - path = fetchurl { - name = "shallow_copy___shallow_copy_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz"; - sha512 = "b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw=="; - }; - } - { - name = "source_map___source_map_0.5.7.tgz"; - path = fetchurl { - name = "source_map___source_map_0.5.7.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; - sha512 = "LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="; - }; - } - { - name = "source_map___source_map_0.1.43.tgz"; - path = fetchurl { - name = "source_map___source_map_0.1.43.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz"; - sha512 = "VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ=="; - }; - } - { - name = "source_map___source_map_0.6.1.tgz"; - path = fetchurl { - name = "source_map___source_map_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; - }; - } - { - name = "sourcemap_codec___sourcemap_codec_1.4.8.tgz"; - path = fetchurl { - name = "sourcemap_codec___sourcemap_codec_1.4.8.tgz"; - url = "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"; - sha512 = "9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="; - }; - } - { - name = "sparklines___sparklines_1.3.0.tgz"; - path = fetchurl { - name = "sparklines___sparklines_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/sparklines/-/sparklines-1.3.0.tgz"; - sha512 = "CkFtpDE3hmOeu1IJyIQIOH0AQtHnPj1c61ALxJZQ9cPEFKDgWC1fcNAHuwPi1i1klTDYvlKKseoYHSwe7JmdLA=="; - }; - } - { - name = "static_eval___static_eval_2.1.0.tgz"; - path = fetchurl { - name = "static_eval___static_eval_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/static-eval/-/static-eval-2.1.0.tgz"; - sha512 = "agtxZ/kWSsCkI5E4QifRwsaPs0P0JmZV6dkLz6ILYfFYQGn+5plctanRN+IC8dJRiFkyXHrwEE3W9Wmx67uDbw=="; - }; - } - { - name = "static_module___static_module_3.0.4.tgz"; - path = fetchurl { - name = "static_module___static_module_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/static-module/-/static-module-3.0.4.tgz"; - sha512 = "gb0v0rrgpBkifXCa3yZXxqVmXDVE+ETXj6YlC/jt5VzOnGXR2C15+++eXuMDUYsePnbhf+lwW0pE1UXyOLtGCw=="; - }; - } - { - name = "string_decoder___string_decoder_1.1.1.tgz"; - path = fetchurl { - name = "string_decoder___string_decoder_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; - }; - } - { - name = "summernote___summernote_0.8.20.tgz"; - path = fetchurl { - name = "summernote___summernote_0.8.20.tgz"; - url = "https://registry.yarnpkg.com/summernote/-/summernote-0.8.20.tgz"; - sha512 = "W9RhjQjsn+b1s9xiJQgJbCiYGJaDAc9CdEqXo+D13WuStG8lCdtKaO5AiNiSSMJsQJN2EfGSwbBQt+SFE2B8Kw=="; - }; - } - { - name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; - path = fetchurl { - name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; - sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; - }; - } - { - name = "sweetalert2___sweetalert2_11.7.2.tgz"; - path = fetchurl { - name = "sweetalert2___sweetalert2_11.7.2.tgz"; - url = "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-11.7.2.tgz"; - sha512 = "atPjDa3fv/4xwZpiAt7FZUgAhR5VAASiLP2hu7HUeVDXx+v4/9nD1W0u8xal1e9f2/qGh0DwTxPXPV9XoZIBvg=="; - }; - } - { - name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.39.2.tgz"; - path = fetchurl { - name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.39.2.tgz"; - url = "https://registry.yarnpkg.com/tempusdominus-bootstrap-4/-/tempusdominus-bootstrap-4-5.39.2.tgz"; - sha512 = "8Au4miSAsMGdsElPg87EUmsN7aGJFaRA5Y8Ale7dDTfhhnQL1Za53LclIJkq+t/7NO5+Ufr1jY7tmEPvWGHaVg=="; - }; - } - { - name = "through2___through2_2.0.5.tgz"; - path = fetchurl { - name = "through2___through2_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz"; - sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; - }; - } - { - name = "through___through_2.3.8.tgz"; - path = fetchurl { - name = "through___through_2.3.8.tgz"; - url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; - }; - } - { - name = "tiny_inflate___tiny_inflate_1.0.3.tgz"; - path = fetchurl { - name = "tiny_inflate___tiny_inflate_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz"; - sha512 = "pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw=="; - }; - } - { - name = "toastr___toastr_2.1.4.tgz"; - path = fetchurl { - name = "toastr___toastr_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/toastr/-/toastr-2.1.4.tgz"; - sha512 = "LIy77F5n+sz4tefMmFOntcJ6HL0Fv3k1TDnNmFZ0bU/GcvIIfy6eG2v7zQmMiYgaalAiUv75ttFrPn5s0gyqlA=="; - }; - } - { - name = "type_check___type_check_0.3.2.tgz"; - path = fetchurl { - name = "type_check___type_check_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; - sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; - }; - } - { - name = "type___type_1.2.0.tgz"; - path = fetchurl { - name = "type___type_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz"; - sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; - }; - } - { - name = "type___type_2.7.2.tgz"; - path = fetchurl { - name = "type___type_2.7.2.tgz"; - url = "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz"; - sha512 = "dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="; - }; - } - { - name = "typedarray___typedarray_0.0.6.tgz"; - path = fetchurl { - name = "typedarray___typedarray_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; - }; - } - { - name = "unicode_properties___unicode_properties_1.4.1.tgz"; - path = fetchurl { - name = "unicode_properties___unicode_properties_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/unicode-properties/-/unicode-properties-1.4.1.tgz"; - sha512 = "CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg=="; - }; - } - { - name = "unicode_trie___unicode_trie_2.0.0.tgz"; - path = fetchurl { - name = "unicode_trie___unicode_trie_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-trie/-/unicode-trie-2.0.0.tgz"; - sha512 = "x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ=="; - }; - } - { - name = "universalify___universalify_2.0.0.tgz"; - path = fetchurl { - name = "universalify___universalify_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; - }; - } - { - name = "uplot___uplot_1.6.24.tgz"; - path = fetchurl { - name = "uplot___uplot_1.6.24.tgz"; - url = "https://registry.yarnpkg.com/uplot/-/uplot-1.6.24.tgz"; - sha512 = "WpH2BsrFrqxkMu+4XBvc0eCDsRBhzoq9crttYeSI0bfxpzR5YoSVzZXOKFVWcVC7sp/aDXrdDPbDZGCtck2PVg=="; - }; - } - { - name = "util_deprecate___util_deprecate_1.0.2.tgz"; - path = fetchurl { - name = "util_deprecate___util_deprecate_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; - }; - } - { - name = "word_wrap___word_wrap_1.2.3.tgz"; - path = fetchurl { - name = "word_wrap___word_wrap_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; - sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; - }; - } - { - name = "xmldoc___xmldoc_1.2.0.tgz"; - path = fetchurl { - name = "xmldoc___xmldoc_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/xmldoc/-/xmldoc-1.2.0.tgz"; - sha512 = "2eN8QhjBsMW2uVj7JHLHkMytpvGHLHxKXBy4J3fAT/HujsEtM6yU84iGjpESYGHg6XwK0Vu4l+KgqQ2dv2cCqg=="; - }; - } - { - name = "xtend___xtend_4.0.2.tgz"; - path = fetchurl { - name = "xtend___xtend_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; - sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; - }; - } - ]; -} diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index f138523016ea..d82981f2f086 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.63.1"; + version = "1.64.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-H//Y7BFBr3VXAoKZZgjSgU4aA+Af7tvFozhpoj14ba0="; + hash = "sha256-miXYBKUTmsqAvVLmxcVCpjgEO3HeKQpUZKSvzaxhqdU="; }; - vendorHash = "sha256-AXgyyI6ZbTepC/TGkHQvHiwpQOjzwG5ung71nKE5d1Y="; + vendorHash = "sha256-rpF44yd8ElOkXTT1lSW0l3ZwTqeNdGS1OxrvNY8atzA="; subPackages = [ "." ]; diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 46d514187d52..11d291238727 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.3.0"; + version = "0.3.1"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz"; - sha256 = "sha256-05RQtvf6I4/sjGtMDfc5U4esxfFFeTwIuxFAkbr6p4A"; + hash = "sha256-jIekGA+MG9tvjEyHAI3dcD7lI1JL/qPqRpVO9gRhcTw="; stripRoot = false; }; diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/7_2.nix index ba4a75ddfbaa..8abf0909e6b3 100644 --- a/pkgs/applications/office/onlyoffice-bin/default.nix +++ b/pkgs/applications/office/onlyoffice-bin/7_2.nix @@ -177,6 +177,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents"; + longDescription = '' + The latest versions of OnlyOffice are currently broken on wlroots environments (e.g. Hyprland, Sway). + If you are using a different environment, you can get the latest version using `onlyoffice-bin_latest`. + ''; homepage = "https://www.onlyoffice.com/"; downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases"; changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; diff --git a/pkgs/applications/office/onlyoffice-bin/7_4.nix b/pkgs/applications/office/onlyoffice-bin/7_4.nix new file mode 100644 index 000000000000..bf587a4c9bc2 --- /dev/null +++ b/pkgs/applications/office/onlyoffice-bin/7_4.nix @@ -0,0 +1,215 @@ +{ stdenv +, lib +, fetchurl +, buildFHSEnv + # Alphabetic ordering below +, alsa-lib +, at-spi2-atk +, atk +, autoPatchelfHook +, cairo +, curl +, dbus +, dconf +, dpkg +, fontconfig +, gcc-unwrapped +, gdk-pixbuf +, glib +, glibc +, gsettings-desktop-schemas +, gst_all_1 +, gtk2 +, gtk3 +, libpulseaudio +, libudev0-shim +, libdrm +, makeWrapper +, mesa +, nspr +, nss +, pulseaudio +, qt5 +, wrapGAppsHook +, xkeyboard_config +, xorg +}: +let + + # Note on fonts: + # + # OnlyOffice does not distribute unfree fonts, but makes it easy to pick up + # any fonts you install. See: + # + # * https://helpcenter.onlyoffice.com/en/installation/docs-community-install-fonts-linux.aspx + # * https://www.onlyoffice.com/blog/2020/04/how-to-add-new-fonts-to-onlyoffice-desktop-editors/ + # + # As recommended there, you should download + # + # arial.ttf, calibri.ttf, cour.ttf, symbol.ttf, times.ttf, wingding.ttf + # + # into `~/.local/share/fonts/`, otherwise the default template fonts, and + # things like bullet points, will not look as expected. + + # TODO: Find out which of these fonts we'd be allowed to distribute along + # with this package, or how to make this easier for users otherwise. + + # Not using the `noto-fonts-cjk` package from nixpkgs, because it was + # reported that its `.ttc` file is not picked up by OnlyOffice, see: + # https://github.com/NixOS/nixpkgs/pull/116343#discussion_r593979816 + noto-fonts-cjk = fetchurl { + url = + let + version = "v20201206-cjk"; + in + "https://github.com/googlefonts/noto-cjk/raw/${version}/NotoSansCJKsc-Regular.otf"; + sha256 = "sha256-aJXSVNJ+p6wMAislXUn4JQilLhimNSedbc9nAuPVxo4="; + }; + + runtimeLibs = lib.makeLibraryPath [ + curl + glibc + gcc-unwrapped.lib + libudev0-shim + pulseaudio + ]; + + derivation = stdenv.mkDerivation rec { + pname = "onlyoffice-desktopeditors"; + version = "7.4.1"; + minor = null; + src = fetchurl { + url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; + sha256 = "sha256-vaBF3GJyLBldWdEruOeVpRvwGNwaRl7IKPguDLRoe8M="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + wrapGAppsHook + ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + atk + cairo + dbus + dconf + fontconfig + gdk-pixbuf + glib + gsettings-desktop-schemas + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + gtk2 + gtk3 + libpulseaudio + libdrm + nspr + nss + mesa # libgbm + qt5.qtbase + qt5.qtdeclarative + qt5.qtsvg + qt5.qtwayland + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libXtst + ]; + + dontWrapQtApps = true; + + unpackPhase = '' + dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner + ''; + + preConfigure = '' + cp --no-preserve=mode,ownership ${noto-fonts-cjk} opt/onlyoffice/desktopeditors/fonts/ + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib,share} + + mv usr/bin/* $out/bin + mv usr/share/* $out/share/ + mv opt/onlyoffice/desktopeditors $out/share + + for f in $out/share/desktopeditors/asc-de-*.png; do + size=$(basename "$f" ".png" | cut -d"-" -f3) + res="''${size}x''${size}" + mkdir -pv "$out/share/icons/hicolor/$res/apps" + ln -s "$f" "$out/share/icons/hicolor/$res/apps/onlyoffice-desktopeditors.png" + done; + + substituteInPlace $out/bin/onlyoffice-desktopeditors \ + --replace "/opt/onlyoffice/" "$out/share/" + + ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors + + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ + --set QT_QPA_PLATFORM "xcb" + # the bundled version of qt does not support wayland + ) + ''; + + passthru.updateScript = ./update.sh; + }; + +in + +# In order to download plugins, OnlyOffice uses /usr/bin/curl so we have to wrap it. +# Curl still needs to be in runtimeLibs because the library is used directly in other parts of the code. +buildFHSEnv { + name = derivation.name; + + targetPkgs = pkgs': [ + curl + derivation + ]; + + runScript = "/bin/onlyoffice-desktopeditors"; + + extraInstallCommands = '' + mv $out/bin/$name $out/bin/onlyoffice-desktopeditors + mkdir -p $out/share + ln -s ${derivation}/share/icons $out/share + cp -r ${derivation}/share/applications $out/share + substituteInPlace $out/share/applications/onlyoffice-desktopeditors.desktop \ + --replace "/usr/bin/onlyoffice-desktopeditors" "$out/bin/onlyoffice-desktopeditors" + ''; + + meta = with lib; { + description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents"; + longDescription = '' + This version is broken on wlroots environments (e.g. Hyprland, Sway). + If you are using one of these environments, please use `onlyoffice-bin` instead. + ''; + homepage = "https://www.onlyoffice.com/"; + downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases"; + changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ nh2 gtrunsec ]; + }; +} diff --git a/pkgs/applications/science/biology/veryfasttree/default.nix b/pkgs/applications/science/biology/veryfasttree/default.nix index e29b2da0fc41..63597a75d494 100644 --- a/pkgs/applications/science/biology/veryfasttree/default.nix +++ b/pkgs/applications/science/biology/veryfasttree/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "veryfasttree"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "citiususc"; repo = "veryfasttree"; rev = "v${finalAttrs.version}"; - hash = "sha256-JMBhSxfGO3qz7Yl4s5r6zWHFefXGzu0ktEJdRUh/Uqg="; + hash = "sha256-Sp331VJRaYv/BTwFj3HwUcUsWjYf6YEXWjYdOzDhBBA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index d08a342a28f1..b0df275085e6 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-gnE0uISKfUqUdmrHI6F7nLOFcsQALjRy584nMRrC68w="; + sha256 = "sha256-VrCEwAoWKhb1qfJUv3OreTzuKEVQADwZpEQIVEhjwHA="; }; - cargoHash = "sha256-rjxJ4bGep5OJUWME+EV5CqEsFY1SuoU07ANL0cbD+DU="; + cargoHash = "sha256-SMKFSu5C5mc3U266hEa6RB3GH5te3jIrUZAzj3YNa2E="; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -61,7 +61,9 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Small tool to manage your installations of the Lean theorem prover"; homepage = "https://github.com/leanprover/elan"; + changelog = "https://github.com/leanprover/elan/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gebner ]; + mainProgram = "elan"; }; } diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix new file mode 100644 index 000000000000..7509ca63c804 --- /dev/null +++ b/pkgs/applications/science/logic/lean4/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, cmake +, fetchFromGitHub +, git +, gmp +, perl +}: + +stdenv.mkDerivation rec { + pname = "lean4"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "leanprover"; + repo = "lean4"; + rev = "v${version}"; + hash = "sha256-3Ni+NiD0iSsOruUyRpBd+aC0TZNYfOLhwqCpPHPruPg="; + }; + + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace 'set(GIT_SHA1 "")' 'set(GIT_SHA1 "${src.rev}")' + + # Remove tests that fails in sandbox. + # It expects `sourceRoot` to be a git repository. + rm -rf src/lake/examples/git/ + ''; + + preConfigure = '' + patchShebangs stage0/src/bin/ src/bin/ + ''; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + gmp + ]; + + nativeCheckInputs = [ + git + perl + ]; + + cmakeFlags = [ + "-DUSE_GITHASH=OFF" + ]; + + meta = with lib; { + description = "Automatic and interactive theorem prover"; + homepage = "https://leanprover.github.io/"; + changelog = "https://github.com/leanprover/lean4/blob/${src.rev}/RELEASES.md"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ marsam ]; + mainProgram = "lean"; + }; +} diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index e9e309f421a0..f4c6e724270d 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: +{ lib, stdenv, fetchurl, xorg, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: let pname = "geogebra"; version = "5-0-785-0"; @@ -55,7 +55,11 @@ let installPhase = '' install -D geogebra/* -t "$out/libexec/geogebra/" + # The bundled jogl (required for 3D graphics) links to libXxf86vm + # OpenGL versions newer than 3.0 cause "javax.media.opengl.GLException: Not a GL2 implementation" makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libXxf86vm ]}" \ + --set MESA_GL_VERSION_OVERRIDE 3.0 \ --set JAVACMD "${jre}/bin/java" \ --set GG_PATH "$out/libexec/geogebra" \ --add-flags "--language=${language}" diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index c1eba0e3fe45..9c44946f3826 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -47,6 +47,8 @@ mkDerivation rec { sha256 = "sha256-TpxVC0GFZD3jGISnDWHKEetgVVpznm5k/Vc2dwVfSG4="; }; + outputs = [ "out" "terminfo" ]; + nativeBuildInputs = [ cmake pkg-config @@ -86,6 +88,12 @@ mkDerivation rec { sed -i '/fixup_bundle/d' src/contour/CMakeLists.txt ''; + postInstall = '' + mkdir -p $out/nix-support $terminfo/share + mv $out/share/terminfo $terminfo/share/ + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; + passthru.tests.test = nixosTests.terminal-emulators.contour; meta = with lib; { diff --git a/pkgs/applications/terminal-emulators/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix deleted file mode 100644 index a0bccbfcb1ed..000000000000 --- a/pkgs/applications/terminal-emulators/eterm/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, imlib2 -, libX11 -, libXaw -, libXext -, libast -, pkg-config -, nixosTests -}: - -stdenv.mkDerivation rec { - pname = "eterm"; - version = "0.9.6+date=2020-03-03"; - - src = fetchFromGitHub { - owner = "mej"; - repo = pname; - rev = "e8fb85b56da21113aaf0f5f7987ae647c4413b6c"; - sha256 = "sha256-pfXYrd6BamBTcnarvXj+C6D1WyGtj87GrW+Dl6AeiDE="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - buildInputs = [ - imlib2 - libX11 - libXaw - libXext - libast - ]; - - passthru.tests.test = nixosTests.terminal-emulators.eterm; - - meta = with lib; { - homepage = "https://github.com/mej/Eterm"; # http://www.eterm.org is gone - description = "Terminal emulator"; - license = licenses.bsd2; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - knownVulnerabilities = [ - ''Usage of ANSI escape sequences causes unexpected newline-termination, - leading to unexpected command execution. More info at: - - https://www.cve.org/CVERecord?id=CVE-2021-33477 - - https://www.openwall.com/lists/oss-security/2021/05/17/1'' - ]; - }; -} diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index da48550877c7..9856d1428f97 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-82NZeZc06ueFvss3QGPwvoM88i+ItPFpzSUbmTJOCOc="; }; + outputs = [ "out" "terminfo" ]; + inherit patches; configFile = lib.optionalString (conf != null) @@ -51,7 +53,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ extraLibs; preInstall = '' - export TERMINFO=$out/share/terminfo + export TERMINFO=$terminfo/share/terminfo + mkdir -p $TERMINFO $out/nix-support + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages ''; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/terminal-emulators/yaft/default.nix b/pkgs/applications/terminal-emulators/yaft/default.nix index 5471ee45e0a3..c38d90bd4043 100644 --- a/pkgs/applications/terminal-emulators/yaft/default.nix +++ b/pkgs/applications/terminal-emulators/yaft/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { version = "0.2.9"; pname = "yaft"; + outputs = [ "out" "terminfo" ]; + src = fetchFromGitHub { owner = "uobikiemukot"; repo = "yaft"; @@ -15,6 +17,12 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "MANPREFIX=$(out)/share/man" ]; + postInstall = '' + mkdir -p $out/nix-support $terminfo/share + mv $out/share/terminfo $terminfo/share/ + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; + meta = { homepage = "https://github.com/uobikiemukot/yaft"; description = "Yet another framebuffer terminal"; diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index 1db75b0d2d4e..9c38e05320a9 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , git , python3 +, stdenv +, installShellFiles , testers }: @@ -25,6 +27,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core pythonRelaxDepsHook + installShellFiles ]; propagatedBuildInputs = with python3.pkgs; [ @@ -77,6 +80,18 @@ python3.pkgs.buildPythonApplication rec { "test_commitizen_debug_excepthook" ]; + postInstall = + let + argcomplete = lib.getExe' python3.pkgs.argcomplete "register-python-argcomplete"; + in + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) + '' + installShellCompletion --cmd cz \ + --bash <(${argcomplete} --shell bash $out/bin/cz) \ + --zsh <(${argcomplete} --shell zsh $out/bin/cz) \ + --fish <(${argcomplete} --shell fish $out/bin/cz) + ''; + passthru = { tests.version = testers.testVersion { package = commitizen; diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index f4722b894aaa..5860d679db62 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-EmpWJWvYxyg6m08Q77kRehtcVSQOm16ZdcmZWncLch4="; + hash = "sha256-HD/g9zXE7w9x8o0ERBym5OZvODQ6n4a/bkzf457QPxM="; }; - cargoHash = "sha256-ECTvfS09CglAavj8LJbfpxnaWQtsp4DZb7GMJHIeEAA="; + cargoHash = "sha256-tTH5FMlOHv+T9rd0C7O2WaPkp2nUTQ3Ulsi16WiwbdE="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/version-management/gitnr/default.nix b/pkgs/applications/version-management/gitnr/default.nix index b0fd434d448c..6472ed9f6aa8 100644 --- a/pkgs/applications/version-management/gitnr/default.nix +++ b/pkgs/applications/version-management/gitnr/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "gitnr"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "reemus-dev"; repo = "gitnr"; rev = "v${version}"; - hash = "sha256-5HZT/e53e2dUMFnT+4a5GJk3JqJu5+62yxrsnNfSqD8="; + hash = "sha256-0LuQqDNyMd98cHCG3JDyRx/2hhjNlcGQ7n61Z264WzA="; }; - cargoHash = "sha256-rO8qHa+GI76s5CN52aMa58W8ERuTWQtQ96jpLbXKzOs="; + cargoHash = "sha256-H9aLOHdd2UP2YH/dptTwE0bzfFAJk7jwp3ecd0w8bjY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index afc0733458d9..057b9874162a 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -225,9 +225,6 @@ in stdenv'.mkDerivation (finalAttrs: { # See the explanation in addOpenGLRunpath. postFixup = lib.optionalString stdenv.isLinux '' addOpenGLRunpath $out/bin/mpv - '' + lib.optionalString (stdenv.isDarwin && javascriptSupport) '' - ${stdenv.cc.targetPrefix}install_name_tool -change "build/release/libmujs.dylib" \ - "${mujs}/lib/libmujs.dylib" $out/bin/mpv ''; passthru = { diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index e15b0969e35d..d37fc66cb036 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -16,6 +16,7 @@ , meson , ninja , gsettings-desktop-schemas +, hicolor-icon-theme }: python3.pkgs.buildPythonApplication rec { @@ -74,6 +75,13 @@ python3.pkgs.buildPythonApplication rec { librosa ]; + preFixup = '' + gappsWrapperArgs+=( + # The icon theme is hardcoded. + --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" + ) + ''; + postPatch = '' patchShebangs ./getenvvar.py ''; @@ -94,7 +102,7 @@ python3.pkgs.buildPythonApplication rec { that can appeal to newbies and professionals alike. ''; license = licenses.lgpl21Plus; - maintainers = with maintainers; []; + maintainers = with maintainers; [ akechishiro ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 4b8fc566bff0..392bb4dacc50 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -7,12 +7,13 @@ rec { , mobyRev, mobyHash , runcRev, runcHash , containerdRev, containerdHash - , tiniRev, tiniHash, buildxSupport ? true, composeSupport ? true + , tiniRev, tiniHash + , buildxSupport ? true, composeSupport ? true, sbomSupport ? false # package dependencies , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd, runc, docker-proxy, tini, libtool - , sqlite, iproute2, docker-buildx, docker-compose + , sqlite, iproute2, docker-buildx, docker-compose, docker-sbom , iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, rootlesskit, slirp4netns, fuse-overlayfs, nixosTests , clientOnly ? !stdenv.isLinux, symlinkJoin @@ -159,7 +160,8 @@ rec { }); plugins = lib.optional buildxSupport docker-buildx - ++ lib.optional composeSupport docker-compose; + ++ lib.optional composeSupport docker-compose + ++ lib.optional sbomSupport docker-sbom; pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; }; in buildGoPackage (lib.optionalAttrs (!clientOnly) { @@ -273,7 +275,7 @@ rec { To enable the docker daemon on NixOS, set the `virtualisation.docker.enable` option to `true`. ''; license = licenses.asl20; - maintainers = with maintainers; [ offline vdemeester periklis maxeaubrey ]; + maintainers = with maintainers; [ offline vdemeester periklis amaxine ]; mainProgram = "docker"; }; }); diff --git a/pkgs/applications/virtualization/docker/sbom-disable-tests.patch b/pkgs/applications/virtualization/docker/sbom-disable-tests.patch new file mode 100644 index 000000000000..2bf3116da814 --- /dev/null +++ b/pkgs/applications/virtualization/docker/sbom-disable-tests.patch @@ -0,0 +1,28 @@ +diff --git a/test/cli/all_formats_expressible_test.go b/test/cli/all_formats_expressible_test.go +index 3f40a46..5ba04e8 100644 +--- a/test/cli/all_formats_expressible_test.go ++++ b/test/cli/all_formats_expressible_test.go +@@ -8,7 +8,8 @@ import ( + "github.com/anchore/syft/syft" + ) + +-func TestAllFormatsExpressible(t *testing.T) { ++// Disabled because it needs a running docker daemon ++func disabledTestAllFormatsExpressible(t *testing.T) { + commonAssertions := []traitAssertion{ + func(tb testing.TB, stdout, _ string, _ int) { + tb.Helper() +diff --git a/test/cli/sbom_cmd_test.go b/test/cli/sbom_cmd_test.go +index 0a0771c..a086c3b 100644 +--- a/test/cli/sbom_cmd_test.go ++++ b/test/cli/sbom_cmd_test.go +@@ -8,7 +8,8 @@ import ( + "github.com/docker/sbom-cli-plugin/internal" + ) + +-func TestSBOMCmdFlags(t *testing.T) { ++// Disabled because it needs a running docker daemon ++func disabledTestSBOMCmdFlags(t *testing.T) { + hiddenPackagesImage := getFixtureImage(t, "image-hidden-packages") + coverageImage := getFixtureImage(t, "image-pkg-coverage") + tmp := t.TempDir() + "/" diff --git a/pkgs/applications/virtualization/docker/sbom.nix b/pkgs/applications/virtualization/docker/sbom.nix new file mode 100644 index 000000000000..7314eb2029fd --- /dev/null +++ b/pkgs/applications/virtualization/docker/sbom.nix @@ -0,0 +1,43 @@ +{ buildGoModule +, fetchFromGitHub +, docker +, lib +}: + +buildGoModule rec { + pname = "docker-sbom"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "docker"; + repo = "sbom-cli-plugin"; + rev = "tags/v${version}"; + hash = "sha256-i3gIogHb0oW/VDuZUo6LGBmvqs/XfMXjpvTTYeGCK7Q="; + }; + + patches = [ + # Disable tests that require a docker daemon to be running + # in the sandbox + ./sbom-disable-tests.patch + ]; + + vendorHash = "sha256-XPPVAdY2NaasZ9bkf24VWWk3X5pjnryvsErYIWkeekc="; + + nativeBuildInputs = [ docker ]; + + installPhase = '' + runHook preInstall + install -D $GOPATH/bin/sbom-cli-plugin $out/libexec/docker/cli-plugins/docker-sbom + + mkdir -p $out/bin + ln -s $out/libexec/docker/cli-plugins/docker-sbom $out/bin/docker-sbom + runHook postInstall + ''; + + meta = with lib; { + description = "Plugin for Docker CLI to support SBOM creation using Syft"; + homepage = "https://github.com/docker/sbom-cli-plugin"; + license = licenses.asl20; + maintainers = with maintainers; [ raboof ]; + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix new file mode 100644 index 000000000000..0a700a525739 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pdm-backend +, more-itertools +, click +}: + +buildPythonPackage rec { + pname = "hyprshade"; + version = "0.9.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "loqusion"; + repo = "hyprshade"; + rev = "refs/tags/v${version}"; + hash = "sha256-ou072V9nZUqf5DEolkMQy979SjaZs4iOuoszw50k4Y8="; + }; + + nativeBuildInputs = [ + pdm-backend + ]; + + propagatedBuildInputs = [ more-itertools click ]; + + meta = with lib; { + homepage = "https://github.com/loqusion/hyprshade"; + description = "Hyprland shade configuration tool"; + license = licenses.mit; + maintainers = with maintainers; [ willswats ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix deleted file mode 100644 index fdd9604f7c79..000000000000 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchurl -, freetype -, fribidi -, libICE -, libSM -, libXaw -, libXext -, libXft -, libXinerama -, libXmu -, libXpm -, libXrandr -, libXrender -, libXt -, pkg-config -, xorgproto -}: - -stdenv.mkDerivation rec { - pname = "oroborus"; - version = "2.0.20"; - - src = fetchurl { - url = "mirror://debian/pool/main/o/oroborus/oroborus_${version}.tar.gz"; - hash = "sha256-UiClQLz2gSxnc/vlg9nqP1T0UsusVb7cqt66jDqae4k=a"; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - freetype - fribidi - libICE - libSM - libXaw - libXext - libXft - libXinerama - libXmu - libXpm - libXrandr - libXrender - libXt - xorgproto - ]; - - # Workaround build failure on -fno-common toolchains: - # ld: workspaces.o:src/keyboard.h:93: multiple definition of - # `NumLockMask'; client.o:src/keyboard.h:93: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - meta = with lib; { - homepage = "https://web.archive.org/web/20191129172107/https://www.oroborus.org/"; - description = "A really minimalistic X window manager"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 9ed4f5886f61..ccd342eaa0d1 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -80,7 +80,8 @@ let else if targetPlatform.libc == "nblibc" then "${sharedLibraryLoader}/libexec/ld.elf_so" else if targetPlatform.system == "i686-linux" then "${sharedLibraryLoader}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${sharedLibraryLoader}/lib/ld-linux-x86-64.so.2" - else if targetPlatform.system == "powerpc64le-linux" then "${sharedLibraryLoader}/lib/ld64.so.2" + # ELFv1 (.1) or ELFv2 (.2) ABI + else if targetPlatform.isPower64 then "${sharedLibraryLoader}/lib/ld64.so.*" # ARM with a wildcard, which can be "" or "-armhf". else if (with targetPlatform; isAarch32 && isLinux) then "${sharedLibraryLoader}/lib/ld-linux*.so.3" else if targetPlatform.system == "aarch64-linux" then "${sharedLibraryLoader}/lib/ld-linux-aarch64.so.1" diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index ac76758ba50e..67a4c337c0d2 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -165,7 +165,9 @@ dontInstall = true; - impureEnvVars = lib.fetchers.proxyImpureEnvVars; + # NIX_NPM_TOKENS environment variable should be a JSON mapping in the shape of: + # `{ "registry.example.com": "example-registry-bearer-token", ... }` + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_NPM_TOKENS" ]; SSL_CERT_FILE = if (hash_.outputHash == "" || hash_.outputHash == lib.fakeSha256 || hash_.outputHash == lib.fakeSha512 || hash_.outputHash == lib.fakeHash) then "${cacert}/etc/ssl/certs/ca-bundle.crt" diff --git a/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs index 62e5752c74c0..9d86bd8091a7 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/main.rs @@ -108,7 +108,7 @@ fn fixup_lockfile( // Recursive helper to fixup v1 lockfile deps fn fixup_v1_deps( - dependencies: &mut serde_json::Map<String, Value>, + dependencies: &mut Map<String, Value>, cache: &Option<HashMap<String, String>>, fixed: &mut bool, ) { diff --git a/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs b/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs index e1b491cccea2..b37652ffdf82 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs @@ -139,9 +139,9 @@ impl Package { None => Specifics::Registry { integrity: pkg .integrity - .expect("non-git dependencies should have assosciated integrity") + .expect("non-git dependencies should have associated integrity") .into_best() - .expect("non-git dependencies should have non-empty assosciated integrity"), + .expect("non-git dependencies should have non-empty associated integrity"), }, }; diff --git a/pkgs/build-support/node/fetch-npm-deps/src/util.rs b/pkgs/build-support/node/fetch-npm-deps/src/util.rs index a165461fa71a..7a220f681c0d 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/util.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/util.rs @@ -3,6 +3,7 @@ use isahc::{ config::{CaCertificate, Configurable, RedirectPolicy, SslOption}, Body, Request, RequestExt, }; +use serde_json::{Map, Value}; use std::{env, path::Path}; use url::Url; @@ -22,6 +23,18 @@ pub fn get_url(url: &Url) -> Result<Body, isahc::Error> { } } + // Respect NIX_NPM_TOKENS environment variable, which should be a JSON mapping in the shape of: + // `{ "registry.example.com": "example-registry-bearer-token", ... }` + if let Some(host) = url.host_str() { + if let Ok(npm_tokens) = env::var("NIX_NPM_TOKENS") { + if let Ok(tokens) = serde_json::from_str::<Map<String, Value>>(&npm_tokens) { + if let Some(token) = tokens.get(host).and_then(|val| val.as_str()) { + request = request.header("Authorization", format!("Bearer {token}")); + } + } + } + } + Ok(request.body(())?.send()?.into_body()) } diff --git a/pkgs/by-name/README.md b/pkgs/by-name/README.md index fbdcfd7ecb79..ba1bd8cb9861 100644 --- a/pkgs/by-name/README.md +++ b/pkgs/by-name/README.md @@ -72,6 +72,22 @@ libfoo = callPackage ../by-name/so/some-package/package.nix { }; ``` +## Manual migration guidelines + +Most packages are still defined in `all-packages.nix` and the [category hierarchy](../README.md#category-hierarchy). +Please hold off migrating your maintained packages to this directory. + +1. An automated migration for the majority of packages [is being worked on](https://github.com/NixOS/nixpkgs/pull/211832). + In order to save on contributor and reviewer time, packages should only be migrated manually afterwards if they couldn't be migrated automatically. + +1. Manual migrations should only be lightly encouraged if the relevant code is being worked on anyways. + For example with a package update or refactoring. + +1. Manual migrations should not remove definitions from `all-packages.nix` with custom arguments. + That is a backwards-incompatible change because it changes the `.override` interface. + Such packages may still be moved to `pkgs/by-name` however, while keeping the definition in `all-packages.nix`. + See also [changing implicit attribute defaults](#changing-implicit-attribute-defaults). + ## Limitations There's some limitations as to which packages can be defined using this structure: diff --git a/pkgs/tools/misc/engage/default.nix b/pkgs/by-name/en/engage/package.nix index f9b0f411ee8a..8d58874557be 100644 --- a/pkgs/tools/misc/engage/default.nix +++ b/pkgs/by-name/en/engage/package.nix @@ -6,7 +6,7 @@ let pname = "engage"; - version = "0.1.2"; + version = "0.1.3"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage { src = fetchgit { url = "https://or.computer.surgery/charles/${pname}"; rev = "v${version}"; - hash = "sha256-7zLFgTLeAIaMMoj0iThH/5UhnV9OUGe9CVwbbShCieo="; + hash = "sha256-B7pDJDoQiigaxcia0LfG7zHEzYtvhCUNpbmfR2ny4ZE="; }; - cargoHash = "sha256-+4uqC0VoBSmkS9hYC1lzWeJmK873slZT04TljHPE+Eo="; + cargoHash = "sha256-Akk7fh7/eyN8gyuh3y3aeeKD2STtrEx+trOm5ww9lgw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/gh/ghunt/package.nix b/pkgs/by-name/gh/ghunt/package.nix new file mode 100644 index 000000000000..ff4e7340409f --- /dev/null +++ b/pkgs/by-name/gh/ghunt/package.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ghunt"; + version = "2.0.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mxrch"; + repo = "ghunt"; + rev = "refs/tags/v${version}"; + hash = "sha256-7awLKX+1fVbufg3++lUUCZg4p07c2yGeefiPFcE1Ij4="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + alive-progress + autoslot + beautifulsoup4 + beautifultable + geopy + httpx + humanize + imagehash + inflection + jsonpickle + pillow + protobuf + python-dateutil + rich + trio + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "ghunt" + ]; + + meta = with lib; { + description = "Offensive Google framework"; + homepage = "https://github.com/mxrch/ghunt"; + changelog = "https://github.com/mxrch/GHunt/releases/tag/v${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/by-name/he/headphones-toolbox/package.nix b/pkgs/by-name/he/headphones-toolbox/package.nix new file mode 100644 index 000000000000..d0f01961e6b6 --- /dev/null +++ b/pkgs/by-name/he/headphones-toolbox/package.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, dpkg +, fetchurl +, autoPatchelfHook +, webkitgtk +}: + +stdenv.mkDerivation (finalAttrs: { + name = "headphones-toolbox"; + version = "0.0.3"; + + src = fetchurl { + url = "https://github.com/george-norton/headphones-toolbox/releases/download/headphones-toolbox-beta-v4r2/ploopy-headphones-toolbox_${finalAttrs.version}_amd64.deb"; + hash = "sha256-r+ybcD6koSIJ/6cck3RNXmf758sRnhS1Y4kaYCNbveA="; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + ]; + + buildInputs = [ + webkitgtk + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv usr/bin $out + mv usr/lib $out + mv usr/share $out + + runHook postInstall + ''; + + meta = with lib; { + description = "A UI for configuring Ploopy Headphones"; + homepage = "https://github.com/george-norton/headphones-toolbox"; + maintainers = with maintainers; [ knarkzel nyanbinary ]; + license = licenses.gpl3Only; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "headphones-toolbox"; + }; +}) diff --git a/pkgs/by-name/ri/ripsecrets/package.nix b/pkgs/by-name/ri/ripsecrets/package.nix index 7f0e4d275e37..d578a13eadaa 100644 --- a/pkgs/by-name/ri/ripsecrets/package.nix +++ b/pkgs/by-name/ri/ripsecrets/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "ripsecrets"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "sirwart"; repo = "ripsecrets"; rev = "v${version}"; - hash = "sha256-p3421sQko/WulSNUxXpjsHPAtRoHHg61angfxJpoyFg="; + hash = "sha256-NDSMxIq6eBXOv/mI662vsIIOfWQEzQ5fDGznC4+gFyE="; }; - cargoHash = "sha256-DJkEhqW5DZOmoNiS4nw+i2G0+KN2d7FbBuKp7fdAwMk="; + cargoHash = "sha256-vp2gQUf6TWFkJ09STOlqlEB+jsGrVGAmix2eSgBDG/o="; meta = with lib; { description = "A command-line tool to prevent committing secret keys into your source code"; diff --git a/pkgs/by-name/sl/sleek-grub-theme/package.nix b/pkgs/by-name/sl/sleek-grub-theme/package.nix new file mode 100644 index 000000000000..efeb01e4d812 --- /dev/null +++ b/pkgs/by-name/sl/sleek-grub-theme/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, withBanner ? "Grub Bootloader" # use override to specify your own banner text +, withStyle ? "white" # use override to specify one of "dark" / "orange" / "bigSur" +}: + +assert builtins.any (s: withStyle == s) ["white" "dark" "orange" "bigSur"]; + +stdenv.mkDerivation { + pname = "sleek-grub-theme"; + version = "unstable-2022-06-04"; + + src = fetchFromGitHub ({ + owner = "sandesh236"; + repo = "sleek--themes"; + rev = "981326a8e35985dc23f1b066fdbe66ff09df2371"; + hash = "sha256-yD4JuoFGTXE/aI76EtP4rEWCc5UdFGi7Ojys6Yp8Z58="; + }); + + installPhase = '' + runHook preInstall + + mkdir -p $out/ + + cp -r 'Sleek theme-${withStyle}'/sleek/* $out/ + sed -i "s/Grub Bootloader/${withBanner}/" $out/theme.txt + + runHook postInstall + ''; + + meta = { + description = "Grub bootloader themes, contains light/dark/orange/bigSur styles"; + homepage = "https://github.com/sandesh236/sleek--themes"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ luochen1990 ]; + }; +} diff --git a/pkgs/games/the-legend-of-edgar/default.nix b/pkgs/by-name/th/the-legend-of-edgar/package.nix index 1efc1c13554c..eab0b772336b 100644 --- a/pkgs/games/the-legend-of-edgar/default.nix +++ b/pkgs/by-name/th/the-legend-of-edgar/package.nix @@ -11,16 +11,15 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "the-legend-of-edgar"; - version = "1.36"; + version = "1.36-unstable-2023-07-11"; src = fetchFromGitHub { - name = "${pname}-${version}-src"; owner = "riksweeney"; repo = "edgar"; - rev = version; - hash = "sha256-u2mg4hpcjPXzuZjYKIC4lgqGJPFRB9baHvaiu/YafZw="; + rev = "8344b385b65e8226455c7e88bd5aca57caa3c520"; + hash = "sha256-dOLKMsyQkVZ7gBiURfr/tFbu3xSqei8A/M2HSZgAFnI="; }; nativeBuildInputs = [ @@ -46,13 +45,11 @@ stdenv.mkDerivation rec { "BIN_DIR=${placeholder "out"}/bin/" ]; - # TODO: remove the setting below when the next version arrives - # https://github.com/riksweeney/edgar/pull/57 - preBuild = '' - export CFLAGS=$(sdl2-config --cflags) - ''; + hardeningDisable = [ + "fortify" + ]; - meta = with lib; { + meta = { homepage = "https://www.parallelrealities.co.uk/games/edgar"; description = "A 2D platform game with a persistent world"; longDescription = '' @@ -67,9 +64,10 @@ stdenv.mkDerivation rec { Amiga and SNES. Edgar must battle his way across the world, solving puzzles and defeating powerful enemies to achieve his quest. ''; - license = licenses.gpl1Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.gpl1Plus; + mainProgram = "edgar"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 36f0dda5165e..525d3d027d82 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -7,7 +7,7 @@ , qtbase , qtimageformats , qtwebengine -, qtx11extras ? null # qt5 only +, qtx11extras , libarchive , libXdmcp , libpthreadstubs @@ -17,17 +17,16 @@ let isQt5 = lib.versions.major qtbase.version == "5"; - in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zeal"; - version = "0.6.1.20230320"; + version = "0.6.1.20230907"; # unstable-date format not suitable for cmake src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; - rev = "a617ae5e06b95cec99bae058650e55b98613916d"; - hash = "sha256-WL2uqA0sZ5Q3lZIA9vkLVyfec/jBkfGcWb6XQ7AuM94="; + rev = "20249153077964d01c7c36b9f4042a40e8c8fbf1"; + hash = "sha256-AyfpMq0R0ummTGvyUHOh/XBUeVfkFwo1VyyLSGoTN8w="; }; # we only need this if we are using a version that hasn't been released. We @@ -36,33 +35,40 @@ stdenv.mkDerivation rec { # line. postPatch = '' sed -i CMakeLists.txt \ - -e 's@^project.*@project(Zeal VERSION ${version})@' + -e 's@^project.*@project(Zeal VERSION ${finalAttrs.version})@' '' + lib.optionalString (!isQt5) '' substituteInPlace src/app/CMakeLists.txt \ --replace "COMPONENTS Widgets" "COMPONENTS Widgets QmlIntegration" ''; - nativeBuildInputs = [ cmake extra-cmake-modules pkg-config wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + wrapQtAppsHook + ]; buildInputs = [ + libXdmcp + libarchive + libpthreadstubs qtbase qtimageformats qtwebengine - libarchive - libXdmcp - libpthreadstubs xcbutilkeysyms - ] ++ lib.optionals isQt5 [ qtx11extras ]; + ] + ++ lib.optionals isQt5 [ qtx11extras ]; - meta = with lib; { + meta = { description = "A simple offline API documentation browser"; longDescription = '' Zeal is a simple offline API documentation browser inspired by Dash (macOS app), available for Linux and Windows. ''; homepage = "https://zealdocs.org/"; - license = licenses.gpl3; - maintainers = with maintainers; [ skeidel peterhoeg ]; - platforms = platforms.linux; + changelog = "https://github.com/zealdocs/zeal/releases"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ skeidel peterhoeg AndersonTorres ]; + inherit (qtbase.meta) platforms; }; -} +}) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 65daffe0ee58..79288cb5f4c8 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -164,7 +164,7 @@ rec { sha256 = "sha256-y1103SS0qkZMhEL5+7kQZ+OBs5tRaqkqOcs4796Fzhg="; }; - noto-fonts-emoji = + noto-fonts-color-emoji = let version = "2.038"; emojiPythonEnv = @@ -217,7 +217,7 @@ rec { ''; meta = with lib; { - description = "Color and Black-and-White emoji fonts"; + description = "Color emoji font"; homepage = "https://github.com/googlefonts/noto-emoji"; license = with licenses; [ ofl asl20 ]; platforms = platforms.all; @@ -225,6 +225,50 @@ rec { }; }; + noto-fonts-monochrome-emoji = + # Metadata fetched from + # https://www.googleapis.com/webfonts/v1/webfonts?key=${GOOGLE_FONTS_TOKEN}&family=Noto+Emoji + let metadata = with builtins; head (fromJSON (readFile ./noto-emoji.json)).items; + urlHashes = with builtins; fromJSON (readFile ./noto-emoji.hashes.json); + + in + stdenvNoCC.mkDerivation { + pname = "noto-fonts-monochrome-emoji"; + version = "${lib.removePrefix "v" metadata.version}.${metadata.lastModified}"; + preferLocalBuild = true; + + dontUnpack = true; + srcs = let + weightNames = { + "300" = "Light"; + regular = "Regular"; + "500" = "Medium"; + "600" = "SemiBold"; + "700" = "Bold"; + }; + in lib.mapAttrsToList + (variant: url: fetchurl { name = "NotoEmoji-${weightNames.${variant}}.ttf"; + hash = urlHashes.${url}; + inherit url; } ) + metadata.files; + + installPhase = '' + for src in $srcs; do + install -D $src $out/share/fonts/noto/$(stripHash $src) + done + ''; + + meta = with lib; { + description = "Monochrome emoji font"; + homepage = "https://fonts.google.com/noto/specimen/Noto+Emoji"; + license = [ licenses.ofl ]; + maintainers = [ maintainers.nicoo ]; + + platforms = platforms.all; + sourceProvenance = [ sourceTypes.binaryBytecode ]; + }; + }; + noto-fonts-emoji-blob-bin = let pname = "noto-fonts-emoji-blob-bin"; diff --git a/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json b/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json new file mode 100644 index 000000000000..2f22a24a34c0 --- /dev/null +++ b/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json @@ -0,0 +1,7 @@ +{ + "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf": "sha256-9ndQqJJzsCkR6KcYRNVW3wXWMxcH+0QzFgQQdCG8vSo=", + "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf": "sha256-AXGLdWebddyJhTKMW/D/6tW8ODcaXrUM96m2hN9wYlg=", + "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf": "sha256-wzF9kKNMeQTYZ2QUT5pIgauhl2qMpZ2nMLNTeAJuqtQ=", + "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf": "sha256-NIelE8X+lKtH6yT3eFPZV7zYUR3Y5GnNobAbf7AckR0=", + "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf": "sha256-zkJuJ8YlTrUV+28wHIqny3yQvjvZqEPG4WXYmaLcY8A=" +} diff --git a/pkgs/data/fonts/noto-fonts/noto-emoji.json b/pkgs/data/fonts/noto-fonts/noto-emoji.json new file mode 100644 index 000000000000..66b0292906b5 --- /dev/null +++ b/pkgs/data/fonts/noto-fonts/noto-emoji.json @@ -0,0 +1,30 @@ +{ + "kind": "webfonts#webfontList", + "items": [ + { + "family": "Noto Emoji", + "variants": [ + "300", + "regular", + "500", + "600", + "700" + ], + "subsets": [ + "emoji" + ], + "version": "v46", + "lastModified": "2023-09-07", + "files": { + "300": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf", + "regular": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf", + "500": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf", + "600": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf", + "700": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf" + }, + "category": "sans-serif", + "kind": "webfonts#webfont", + "menu": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0gwuQeU.ttf" + } + ] +} diff --git a/pkgs/data/fonts/noto-fonts/noto-emoji.py b/pkgs/data/fonts/noto-fonts/noto-emoji.py new file mode 100755 index 000000000000..9f1eadd95bca --- /dev/null +++ b/pkgs/data/fonts/noto-fonts/noto-emoji.py @@ -0,0 +1,183 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i "python3 -I" -p python3 + +from contextlib import contextmanager +from pathlib import Path +from typing import Iterable, Optional +from urllib import request + +import hashlib, json + + +def getMetadata(apiKey: str, family: str = "Noto Emoji"): + '''Fetch the Google Fonts metadata for a given family. + + An API key can be obtained by anyone with a Google account (🚮) from + `https://developers.google.com/fonts/docs/developer_api#APIKey` + ''' + from urllib.parse import urlencode + + with request.urlopen( + "https://www.googleapis.com/webfonts/v1/webfonts?" + + urlencode({ 'key': apiKey, 'family': family }) + ) as req: + return json.load(req) + +def getUrls(metadata) -> Iterable[str]: + '''Fetch all files' URLs from Google Fonts' metadata. + + The metadata must obey the API v1 schema, and can be obtained from: + https://www.googleapis.com/webfonts/v1/webfonts?key=${GOOGLE_FONTS_TOKEN}&family=${FAMILY} + ''' + return ( url for i in metadata['items'] for _, url in i['files'].items() ) + + +def hashUrl(url: str, *, hash: str = 'sha256'): + '''Compute the hash of the data from HTTP GETing a given `url`. + + The `hash` must be an algorithm name `hashlib.new` accepts. + ''' + with request.urlopen(url) as req: + return hashlib.new(hash, req.read()) + + +def sriEncode(h) -> str: + '''Encode a hash in the SRI format. + + Takes a `hashlib` object, and produces a string that + nixpkgs' `fetchurl` accepts as `hash` parameter. + ''' + from base64 import b64encode + return f"{h.name}-{b64encode(h.digest()).decode()}" + +def validateSRI(sri: Optional[str]) -> Optional[str]: + '''Decode an SRI hash, return `None` if invalid. + + This is not a full SRI hash parser, hash options aren't supported. + ''' + from base64 import b64decode + + if sri is None: + return None + + try: + hashName, b64 = sri.split('-', 1) + + h = hashlib.new(hashName) + digest = b64decode(b64, validate=True) + assert len(digest) == h.digest_size + + except: + return None + else: + return sri + + +def hashUrls( + urls: Iterable[str], + knownHashes: dict[str, str] = {}, +) -> dict[str, str]: + '''Generate a `dict` mapping URLs to SRI-encoded hashes. + + The `knownHashes` optional parameter can be used to avoid + re-downloading files whose URL have not changed. + ''' + return { + url: validateSRI(knownHashes.get(url)) or sriEncode(hashUrl(url)) + for url in urls + } + + +@contextmanager +def atomicFileUpdate(target: Path): + '''Atomically replace the contents of a file. + + Yields an open file to write into; upon exiting the context, + the file is closed and (atomically) replaces the `target`. + + Guarantees that the `target` was either successfully overwritten + with new content and no exception was raised, or the temporary + file was cleaned up. + ''' + from tempfile import mkstemp + fd, _p = mkstemp( + dir = target.parent, + prefix = target.name, + ) + tmpPath = Path(_p) + + try: + with open(fd, 'w') as f: + yield f + + tmpPath.replace(target) + + except Exception: + tmpPath.unlink(missing_ok = True) + raise + + +if __name__ == "__main__": + from os import environ + from urllib.error import HTTPError + + environVar = 'GOOGLE_FONTS_TOKEN' + currentDir = Path(__file__).parent + metadataPath = currentDir / 'noto-emoji.json' + + try: + apiToken = environ[environVar] + metadata = getMetadata(apiToken) + + except (KeyError, HTTPError) as exn: + # No API key in the environment, or the query was rejected. + match exn: + case KeyError if exn.args[0] == environVar: + print(f"No '{environVar}' in the environment, " + "skipping metadata update") + + case HTTPError if exn.getcode() == 403: + print("Got HTTP 403 (Forbidden)") + if apiToken != '': + print("Your Google API key appears to be valid " + "but does not grant access to the fonts API.") + print("Aborting!") + raise SystemExit(1) + + case HTTPError if exn.getcode() == 400: + # Printing the supposed token should be fine, as this is + # what the API returns on invalid tokens. + print(f"Got HTTP 400 (Bad Request), is this really an API token: '{apiToken}' ?") + case _: + # Unknown error, let's bubble it up + raise + + # In that case just use the existing metadata + with metadataPath.open() as metadataFile: + metadata = json.load(metadataFile) + + lastModified = metadata["items"][0]["lastModified"]; + print(f"Using metadata from file, last modified {lastModified}") + + else: + # If metadata was successfully fetched, validate and persist it + lastModified = metadata["items"][0]["lastModified"]; + print(f"Fetched current metadata, last modified {lastModified}") + with atomicFileUpdate(metadataPath) as metadataFile: + json.dump(metadata, metadataFile, indent = 2) + metadataFile.write("\n") # Pacify nixpkgs' dumb editor config check + + hashPath = currentDir / 'noto-emoji.hashes.json' + try: + with hashPath.open() as hashFile: + hashes = json.load(hashFile) + except FileNotFoundError: + hashes = {} + + with atomicFileUpdate(hashPath) as hashFile: + json.dump( + hashUrls(getUrls(metadata), knownHashes = hashes), + hashFile, + indent = 2, + ) + hashFile.write("\n") # Pacify nixpkgs' dumb editor config check diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index cb9021d68f3f..c3e41cca36dd 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -10,7 +10,7 @@ , python3 , which , zopfli -, noto-fonts-emoji +, noto-fonts-color-emoji }: let @@ -33,15 +33,15 @@ stdenv.mkDerivation rec { inherit version; srcs = [ - noto-fonts-emoji.src + noto-fonts-color-emoji.src twemojiSrc ]; - sourceRoot = noto-fonts-emoji.src.name; + sourceRoot = noto-fonts-color-emoji.src.name; postUnpack = '' chmod -R +w ${twemojiSrc.name} - mv ${twemojiSrc.name} ${noto-fonts-emoji.src.name} + mv ${twemojiSrc.name} ${noto-fonts-color-emoji.src.name} ''; nativeBuildInputs = [ @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { "s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#" ]; in '' - ${noto-fonts-emoji.postPatch} + ${noto-fonts-color-emoji.postPatch} sed '${templateSubstitutions}' NotoColorEmoji.tmpl.ttx.tmpl > TwitterColorEmoji.tmpl.ttx.tmpl pushd ${twemojiSrc.name}/assets/72x72/ diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index d6ca206b20a1..1b6be1d9bb43 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.08.16"; + version = "23.09.11"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-FXWue9CiX2zh7FXLnlG+SOto2Z4oznWNYpgZlMvVGn4="; + sha256 = "sha256-9GTNE9Gt+dxdfOLD0Qv1utSkwigalAPxixGSC5Nj8XM="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index e8d6b81e1ff1..395fd1ed31fa 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "23.08.16"; + version = "23.09.11"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-zlh3Jh3ZrNo58ijGPwdaiHnTFoT6L3ZC0VTRY0Se3qs="; + sha256 = "sha256-YipdEvmQnqiuxheYS+y5t37uonzr/nH54PVLm4xp31E="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/tau-hydrogen/default.nix b/pkgs/data/icons/tau-hydrogen/default.nix new file mode 100644 index 000000000000..3f7aa63526dd --- /dev/null +++ b/pkgs/data/icons/tau-hydrogen/default.nix @@ -0,0 +1,36 @@ +{ + stdenv, + lib, + fetchFromGitHub, + meson, + ninja, + librsvg, + xorg +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tau-hydrogen"; + version = "1.0.11"; + + src = fetchFromGitHub { + owner = "tau-OS"; + repo = "tau-hydrogen"; + rev = finalAttrs.version; + hash = "sha256-ECrRWWS/Am0lfCIJw/BVZg53oLw79Im8d8KgAYxE+pw="; + }; + + nativeBuildInputs = [ + meson + ninja + librsvg + xorg.xcursorgen + ]; + + meta = with lib; { + description = "The GTK icon theme for tauOS"; + homepage = "https://github.com/tau-OS/tau-hydrogen"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ ashvith-shetty ]; + }; +}) diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index b4e50252fe53..b72bcd6c7c35 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ubuntu/yaru"; license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ]; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k maxeaubrey ]; + maintainers = with maintainers; [ fortuneteller2k amaxine ]; }; } diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 6ae65e980dda..5e60aaf238e9 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "44.2"; + version = "44.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ndOJwUnQwPpXRW7DY9UaiCVflFVY+530KJTOeO+F34k="; + sha256 = "ZIpBuODIdfBOOnh+pnA2vJIehYo25jQ6Q9tyQu5z4XE="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index dfc986f06b6a..4412a3064e91 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "44.3"; + version = "44.4"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "VWlLccLuTq72DZNCgAPy6qTPABhoSPXja0XP5Qb8Mb8="; + sha256 = "HdUebujZL7y5XObd8Ruf7OiNImIsAQFf+pNgFpzUGGY="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 4c0960eb25e3..0497078a126c 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "44.3"; + version = "44.4"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "GFy+vyFQ0+RQVQ43G9sTqLTbCWl4sU+ZUh6WbqzHBVE="; + sha256 = "M3IKWGywqacyr1oH7RPj89MqGml4EjURQKVLygBrlAw="; }; mesonFlags = [ diff --git a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix index e46b49c8f6ea..011f21a976f1 100644 --- a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Integrates maximized windows with the top panel"; homepage = "https://github.com/poehlerj/no-title-bar"; license = licenses.gpl2; - maintainers = with maintainers; [ jonafato svsdep maxeaubrey ]; + maintainers = with maintainers; [ jonafato svsdep amaxine ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 9f2e17dad09d..022c4e543127 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -199,6 +199,9 @@ let wrapProgram $bin/bin/crystal \ --suffix PATH : ${lib.makeBinPath [ pkg-config llvmPackages.clang which ]} \ --suffix CRYSTAL_PATH : lib:$lib/crystal \ + --suffix PKG_CONFIG_PATH : ${ + lib.makeSearchPathOutput "dev" "lib/pkgconfig" finalAttrs.buildInputs + } \ --suffix CRYSTAL_LIBRARY_PATH : ${ lib.makeLibraryPath finalAttrs.buildInputs } diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix index 56da1bc52dde..ef935e73f61f 100644 --- a/pkgs/development/compilers/go/1.21.nix +++ b/pkgs/development/compilers/go/1.21.nix @@ -64,10 +64,6 @@ stdenv.mkDerivation rec { depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; - postPatch = '' - patchShebangs . - ''; - patches = [ (substituteAll { src = ./iana-etc-1.17.patch; @@ -92,8 +88,6 @@ stdenv.mkDerivation rec { GOOS = stdenv.targetPlatform.parsed.kernel.name; GOARCH = goarch stdenv.targetPlatform; # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; GOHOSTARCH = goarch stdenv.buildPlatform; @@ -116,14 +110,16 @@ stdenv.mkDerivation rec { GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; + # Note that we use distpack to avoid moving around cross-compiled binaries. + # The paths are slightly different when buildPlatform != hostPlatform and + # distpack handles assembling outputs in the right place, same as the official + # Go binary releases. See also https://pkg.go.dev/cmd/distpack buildPhase = '' runHook preBuild export GOCACHE=$TMPDIR/go-cache # this is compiled into the binary export GOROOT_FINAL=$out/share/go - export PATH=$(pwd)/bin:$PATH - ${lib.optionalString isCross '' # Independent from host/target, CC should produce code for the building system. # We only set it when cross-compiling. @@ -132,34 +128,16 @@ stdenv.mkDerivation rec { ulimit -a pushd src - ./make.bash + bash make.bash -no-banner -distpack popd runHook postBuild ''; - preInstall = '' - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} - ''} - '' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) '' - rm -rf bin/*_* - ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} - ''} - ''); - installPhase = '' runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc go.env $GOROOT_FINAL - mkdir -p $out/bin - ln -s $GOROOT_FINAL/bin/* $out/bin + mkdir -p $out/{share,bin} + tar -C $out/share -x -z -f "pkg/distpack/go${version}.$GOOS-$GOARCH.tar.gz" + ln -s $out/share/go/bin/* $out/bin runHook postInstall ''; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 732d33608e35..675c50142a9b 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,15 +1,16 @@ { lib, callPackage, stdenv, makeWrapper, fetchurl, ocaml, findlib, dune_3 , ncurses , fix, menhir, menhirLib, menhirSdk, merlin-extend, ppxlib, utop, cppo, ppx_derivers +, dune-build-info }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-reason"; - version = "3.8.2"; + version = "3.9.0"; src = fetchurl { url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; - sha256 = "sha256-etzEXbILje+CrfJxIhH7jthEMoSJdS6O33QoG8HrLvI="; + hash = "sha256-vPAIHs89Bc5o6Ch2obwqSEl8eCJbizEPLPJLM/NWhBY="; }; strictDeps = true; @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + dune-build-info fix menhirSdk ppxlib diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 9ad5d3b4a340..68efeb6094bd 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -85,7 +85,7 @@ let homepage = "https://wiki.gnome.org/Projects/Vala"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ antono jtojnar maxeaubrey ] ++ teams.pantheon.members; + maintainers = with maintainers; [ antono jtojnar amaxine ] ++ teams.pantheon.members; }; }); diff --git a/pkgs/development/embedded/blisp/default.nix b/pkgs/development/embedded/blisp/default.nix index 9758b6a2bc39..fa3adc2fdf22 100644 --- a/pkgs/development/embedded/blisp/default.nix +++ b/pkgs/development/embedded/blisp/default.nix @@ -5,18 +5,19 @@ , cmake , libserialport , pkg-config +, testers , IOKit }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "blisp"; - version = "unstable-2023-06-03"; + version = "0.0.4"; src = fetchFromGitHub { owner = "pine64"; repo = "blisp"; - rev = "048a72408218788d519a87bcdfb23bcf9ed91a84"; - hash = "sha256-hipJrr0D4uEN2hk8ooXeg0gv0X3w4U9ReXbC4oPEPwI="; + rev = "v${finalAttrs.version}"; + hash = "sha256-cN35VLbdQFA3KTZ8PxgpbsLGXqfFhw5eh3nEBRZqAm4="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -31,12 +32,16 @@ stdenv.mkDerivation { "-DBLISP_USE_SYSTEM_LIBRARIES=ON" ]; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "v${finalAttrs.version}"; + }; + meta = with lib; { - description = "ISP tool & library for Bouffalo Labs RISC-V Microcontrollers and SoCs"; + description = "An In-System-Programming (ISP) tool & library for Bouffalo Labs RISC-V Microcontrollers and SoCs"; license = licenses.mit; + mainProgram = "blisp"; homepage = "https://github.com/pine64/blisp"; maintainers = [ maintainers.fortuneteller2k ]; }; -} -# TODO: update when next stable release supports building without vendored -# libraries +}) diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index f937a71fbd47..9b9c21f86b6f 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fixDarwinDylibNames , readline , gitUpdater }: @@ -16,6 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + makeFlags = [ "prefix=$(out)" ]; installFlags = [ "install-shared" ]; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index fb504c5043c8..f80f2f16ccd4 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -57,10 +57,10 @@ in { sourceVersion = { major = "3"; minor = "8"; - patch = "17"; + patch = "18"; suffix = ""; }; - hash = "sha256-LlSwxoGR8WVS9t4ul6I5ZUBXKiGfa7soWRoTfOzEkKk="; + hash = "sha256-P/txzTSaMmunsvrcfn34a6V33ZxJF+UqhAGtvadAXj8="; inherit (darwin) configd; inherit passthruFun; }; @@ -70,10 +70,10 @@ in { sourceVersion = { major = "3"; minor = "9"; - patch = "17"; + patch = "18"; suffix = ""; }; - hash = "sha256-MM4FfETyg/jtk2Bsy9uNUd1Sa9xMYszl4Nwhe/o+jO4="; + hash = "sha256-AVl9sBMsHPezMe/2iuCbWiNaPDyqnJRMKcrH0cTEwAo="; inherit (darwin) configd; inherit passthruFun; }; @@ -96,9 +96,9 @@ in { major = "3"; minor = "12"; patch = "0"; - suffix = "b4"; + suffix = "rc2"; }; - hash = "sha256-8FcQw2ruWFD1wnab52uAvyEq7DUUOP34rcIMOMg2H6w="; + hash = "sha256-EesQN25rr3vqUwAfUYHq7heXeIxNtug6Bh5CI1eSdnQ="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 9fb48b6829aa..c72caa6d585d 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.109/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.110/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 8bc39bd28451..1fd8a2ba15a0 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -1,670 +1,670 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks/ { fetchurl, mirror }: { attica = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/attica-5.109.0.tar.xz"; - sha256 = "1w80fkmwpg5s7k8vgl6p47yw4qw9yh49ngd6lq74r0gxminyqabk"; - name = "attica-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/attica-5.110.0.tar.xz"; + sha256 = "1lp7y0r3npv93kcw1fkgl8c2njbs6y4m8cg32b60pyjahfqspxd6"; + name = "attica-5.110.0.tar.xz"; }; }; baloo = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/baloo-5.109.0.tar.xz"; - sha256 = "1rjv19r39wpjcvbsi0d6853l9zp710mxzf2yzzs26nmjgdcrcvwk"; - name = "baloo-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/baloo-5.110.0.tar.xz"; + sha256 = "0bg2nyp7zp1mka7ng8bwcd0hrbglrdiz7xw43r9q8wycr9qmva1n"; + name = "baloo-5.110.0.tar.xz"; }; }; bluez-qt = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/bluez-qt-5.109.0.tar.xz"; - sha256 = "173lm1qr0dhbyy2c2m9wz1zb5l095kh38l31akcqrjfzaa8kdhl9"; - name = "bluez-qt-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/bluez-qt-5.110.0.tar.xz"; + sha256 = "1xvr85i0lkdpca64dzd7wqasc7acpzvh2kawl9nrfkrn96vrm0cz"; + name = "bluez-qt-5.110.0.tar.xz"; }; }; breeze-icons = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/breeze-icons-5.109.0.tar.xz"; - sha256 = "1cjl1hw2b8srglagnqv9n4c9d066r6dbwfa341v7brjgbzl0nyp0"; - name = "breeze-icons-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/breeze-icons-5.110.0.tar.xz"; + sha256 = "1m5z8g7rvilvwfn65yazci51i83ixv7fc5sh2v5vgxrlmhbysg0s"; + name = "breeze-icons-5.110.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/extra-cmake-modules-5.109.0.tar.xz"; - sha256 = "1dvzid3kvm4p1h8n7f6z1gk1x38pg0aj9zripz9y864prxbva9hm"; - name = "extra-cmake-modules-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/extra-cmake-modules-5.110.0.tar.xz"; + sha256 = "0f347y8q3ckgfq4skh2q69n67v3w9k680db0br4f43i37vdzaikp"; + name = "extra-cmake-modules-5.110.0.tar.xz"; }; }; frameworkintegration = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/frameworkintegration-5.109.0.tar.xz"; - sha256 = "09s4cbj2b8br1agwmdxizkg7yfb0iam7lbsl267hs48qdwdiykcx"; - name = "frameworkintegration-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/frameworkintegration-5.110.0.tar.xz"; + sha256 = "0ghl5p01g3jdj75wzyjwq4b0l0p98r0vkkf6zj6d3lbax207z0sq"; + name = "frameworkintegration-5.110.0.tar.xz"; }; }; kactivities = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kactivities-5.109.0.tar.xz"; - sha256 = "1wajk90vby4f590mjb3nn2lw3p0k58l16s7ci6pi5il7m1qyyzhw"; - name = "kactivities-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kactivities-5.110.0.tar.xz"; + sha256 = "1c1456jc3s7cl2l3kmkgprgngip0j9c7ssd0b0fvjd41dwhzhra5"; + name = "kactivities-5.110.0.tar.xz"; }; }; kactivities-stats = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kactivities-stats-5.109.0.tar.xz"; - sha256 = "0w6j69xkjnrg44vlb7wnd8frc7ry4xyj7zkqqvhvqnh33731dl6v"; - name = "kactivities-stats-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kactivities-stats-5.110.0.tar.xz"; + sha256 = "1agqsdgbmglrzpg9w4df9qdg4hf8g1nnnkq7adp6cxsj3x8c8zx4"; + name = "kactivities-stats-5.110.0.tar.xz"; }; }; kapidox = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kapidox-5.109.0.tar.xz"; - sha256 = "1h1al4pm47nxh72z6p2d5vjzylpnbvz0pz01cyzs9mn4yl3vbk8v"; - name = "kapidox-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kapidox-5.110.0.tar.xz"; + sha256 = "1qi2mcslw0gsxc6p5q78lhg3if01j8dhxf0ypwb8njsfjcr45d24"; + name = "kapidox-5.110.0.tar.xz"; }; }; karchive = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/karchive-5.109.0.tar.xz"; - sha256 = "0rn9pcdivvi53afdvzalham329vbrslam1yl07lj820rwk102jlw"; - name = "karchive-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/karchive-5.110.0.tar.xz"; + sha256 = "1pqc0j4xkhwc6gdgg1q7pl3hjnrscwz8vbdz8jbvpaz51cy5iipw"; + name = "karchive-5.110.0.tar.xz"; }; }; kauth = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kauth-5.109.0.tar.xz"; - sha256 = "1bm0sy2yzikzs71nmlgyz4xmnr73rlb21rcam0366cy9rgy82z9z"; - name = "kauth-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kauth-5.110.0.tar.xz"; + sha256 = "1yymmyvhqgrwdpy5c2narh6d0ac41mw9ifrhckcyr22kdyrmgcz1"; + name = "kauth-5.110.0.tar.xz"; }; }; kbookmarks = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kbookmarks-5.109.0.tar.xz"; - sha256 = "01hzs023yzw9kxmi81qncikks25c5vc1widp9lmhzj044mmrp5sd"; - name = "kbookmarks-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kbookmarks-5.110.0.tar.xz"; + sha256 = "1k04mcfciv3gq4qw5gkpq7189wfxxlr427h4827m3hs3ysbgc4vh"; + name = "kbookmarks-5.110.0.tar.xz"; }; }; kcalendarcore = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kcalendarcore-5.109.0.tar.xz"; - sha256 = "1m6s9qjcmf6hmysvhw4fj0y5rj1l2b363yvnxb4f832lmkif10c5"; - name = "kcalendarcore-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kcalendarcore-5.110.0.tar.xz"; + sha256 = "19zb1g4lbiqy4vcay6hbjx9ak5r00frfn1hahpc544q9l0dznl52"; + name = "kcalendarcore-5.110.0.tar.xz"; }; }; kcmutils = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kcmutils-5.109.0.tar.xz"; - sha256 = "0ihb05azlb9nkd6z2jqw8rzbr5kj1vhyrla00idk50v502dnp7h0"; - name = "kcmutils-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kcmutils-5.110.0.tar.xz"; + sha256 = "0ccgrd757ww890nvajw1s9yvq6iikp316q123rfminrc0mlrpzaq"; + name = "kcmutils-5.110.0.tar.xz"; }; }; kcodecs = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kcodecs-5.109.0.tar.xz"; - sha256 = "19acjg4dk40f2a6gp8mspi4mddnpgzwy94903925a1rc482zwj4n"; - name = "kcodecs-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kcodecs-5.110.0.tar.xz"; + sha256 = "1i15q8kg1dn72sxg9djvg9h4mhqh9rgvnsf3bz0pjd5jbwqqyv1v"; + name = "kcodecs-5.110.0.tar.xz"; }; }; kcompletion = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kcompletion-5.109.0.tar.xz"; - sha256 = "1wdalk1b1p999q4354k0anjqdvpvk9q6mlwc2dnz322bcq1adi3j"; - name = "kcompletion-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kcompletion-5.110.0.tar.xz"; + sha256 = "0a9l6p9kfg074wxz0r9dn43baibrbzbh80x60rds2jaf3yjg212g"; + name = "kcompletion-5.110.0.tar.xz"; }; }; kconfig = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kconfig-5.109.0.tar.xz"; - sha256 = "1n3siz3iqbk6izfk5awqnrxsbjnfardp7hvbacfkwbb8zd8ibaav"; - name = "kconfig-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kconfig-5.110.0.tar.xz"; + sha256 = "1i9idh0rh8ryry5gf22wwgzd15y14jymxjdxbkgx13kqpfyqhaxd"; + name = "kconfig-5.110.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kconfigwidgets-5.109.0.tar.xz"; - sha256 = "1gqlsqnfdscr22zam2sxnwqq13a9g87bhq80h2vwx48sznaglrqy"; - name = "kconfigwidgets-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kconfigwidgets-5.110.0.tar.xz"; + sha256 = "04mlw41xdps7qgnmmccqgs7jc5iipx2vqp9bd91l3sz4p90wj3sg"; + name = "kconfigwidgets-5.110.0.tar.xz"; }; }; kcontacts = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kcontacts-5.109.0.tar.xz"; - sha256 = "1byfsmpfwrk1zmrasz38lmsbh5yr8ds3mshhmwf2m2v7s5kmf789"; - name = "kcontacts-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kcontacts-5.110.0.tar.xz"; + sha256 = "0gib8nlis59kbhydqvf6alwxvy4db94r2p3vpbcdy48gc4i06344"; + name = "kcontacts-5.110.0.tar.xz"; }; }; kcoreaddons = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kcoreaddons-5.109.0.tar.xz"; - sha256 = "002ky4ixjhjcb9p2fzmygaxcg8gjf04aym0q4q7kfqnxsk0pyr7z"; - name = "kcoreaddons-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kcoreaddons-5.110.0.tar.xz"; + sha256 = "0xcd2ph62a7kbm8camp1vnsxlaq1kmqm9hw9gyphcdh0rh6fi3bf"; + name = "kcoreaddons-5.110.0.tar.xz"; }; }; kcrash = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kcrash-5.109.0.tar.xz"; - sha256 = "1yvnnbsxq37q3rbghy4ynhd2578ld6zrxz5glgwv8krzh13x35if"; - name = "kcrash-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kcrash-5.110.0.tar.xz"; + sha256 = "15j70r6afc0lyg41047r27l089gkq8fh39w9iyvhv0h8hfxxah6g"; + name = "kcrash-5.110.0.tar.xz"; }; }; kdav = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kdav-5.109.0.tar.xz"; - sha256 = "080nj1m9ds4h47vgacmg01kh44qbf7xlzvg0ax8sv517p8h9vdn8"; - name = "kdav-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kdav-5.110.0.tar.xz"; + sha256 = "0qz5iq9fi1vk1z7w4wdh7kxrc06vnyrvs7n0llyrjaprzjn8yx6a"; + name = "kdav-5.110.0.tar.xz"; }; }; kdbusaddons = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kdbusaddons-5.109.0.tar.xz"; - sha256 = "0dghclcj5xakffj4567c9nfgcd009wnzass068d781h03ay7c615"; - name = "kdbusaddons-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kdbusaddons-5.110.0.tar.xz"; + sha256 = "0ilzk67h5cxrjf78hw505pvbqvd2lkjk3m0g188pcw0sdg10xb8h"; + name = "kdbusaddons-5.110.0.tar.xz"; }; }; kdeclarative = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kdeclarative-5.109.0.tar.xz"; - sha256 = "1qrp255wylmynhkha1vrswvqdzfamv4vwq4j1sk74bvc5sxla9d2"; - name = "kdeclarative-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kdeclarative-5.110.0.tar.xz"; + sha256 = "1vcqdi4lji97wm5vil2p1g7wi6rwrz0g6aiqf1nzi026fpsc8njj"; + name = "kdeclarative-5.110.0.tar.xz"; }; }; kded = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kded-5.109.0.tar.xz"; - sha256 = "14v262f5rv1s504kj1g97brfya62vpvkx01qf5i7n71s29ymsfry"; - name = "kded-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kded-5.110.0.tar.xz"; + sha256 = "1n8hzkwhqrx4mb7ahqnkga01zslcp82ya22hppfapldy83bfrgyl"; + name = "kded-5.110.0.tar.xz"; }; }; kdelibs4support = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/portingAids/kdelibs4support-5.109.0.tar.xz"; - sha256 = "06za54isyk6ygywy78s0b2zi09lcwv1ay5h69sz9vkri6b3856i0"; - name = "kdelibs4support-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/portingAids/kdelibs4support-5.110.0.tar.xz"; + sha256 = "119hhc0f862kzr5flrlpg9b8xlcl1qxa5xkccad0hpba76pk2af4"; + name = "kdelibs4support-5.110.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/portingAids/kdesignerplugin-5.109.0.tar.xz"; - sha256 = "0afbj0hkrw98xw6v9saim6gpckvmkzl6f1qlx6vsl54yghysih9d"; - name = "kdesignerplugin-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/portingAids/kdesignerplugin-5.110.0.tar.xz"; + sha256 = "146i8n9rrajh03x180z48qi8dn31dywsz052bhbn4yw61ag4w4nc"; + name = "kdesignerplugin-5.110.0.tar.xz"; }; }; kdesu = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kdesu-5.109.0.tar.xz"; - sha256 = "05fla14ar2418frvdw4ygp0zy6d00c50q9w8a3rw7qa91crh08zy"; - name = "kdesu-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kdesu-5.110.0.tar.xz"; + sha256 = "0ll5k4lpn1v4bc365w2ky0qszikfz2r589ni8iyk109qdqciyrr9"; + name = "kdesu-5.110.0.tar.xz"; }; }; kdewebkit = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/portingAids/kdewebkit-5.109.0.tar.xz"; - sha256 = "052mznnjhvpjvd5blrj7xiq6kqjabckwpixmfpv9km4rqpmc11wl"; - name = "kdewebkit-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/portingAids/kdewebkit-5.110.0.tar.xz"; + sha256 = "0p09lby7csx3j513lm91k247iwxby423cz7da51n20qncan8g65v"; + name = "kdewebkit-5.110.0.tar.xz"; }; }; kdnssd = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kdnssd-5.109.0.tar.xz"; - sha256 = "0gc8wmxzv0k9p1cj1bri78b9f7fpd0zbiq4q6j8ad9xhyg3nlmrp"; - name = "kdnssd-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kdnssd-5.110.0.tar.xz"; + sha256 = "0xmahgn572ah8ji4d4afalcl7r2krn971ix5jwcqgrj57m5haj45"; + name = "kdnssd-5.110.0.tar.xz"; }; }; kdoctools = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kdoctools-5.109.0.tar.xz"; - sha256 = "17g6a19ayy4p9xws1dp4336wp8c9x1r1cfdyvbcmfn5s09g5nkm4"; - name = "kdoctools-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kdoctools-5.110.0.tar.xz"; + sha256 = "1g05gppc6qzkag1x18anymbwdswpg32w6jh12x9jfj79vcp7wg4j"; + name = "kdoctools-5.110.0.tar.xz"; }; }; kemoticons = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kemoticons-5.109.0.tar.xz"; - sha256 = "0sy86by8n6nhrv4vr1rydrzp4yif5iw5wrbq6wnk3wi1nva1v8ph"; - name = "kemoticons-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kemoticons-5.110.0.tar.xz"; + sha256 = "1r1d3kw6wzw63kq9wy4ic2b9hcnmm4rs7v9f1z9jhq9m1jp0zy12"; + name = "kemoticons-5.110.0.tar.xz"; }; }; kfilemetadata = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kfilemetadata-5.109.0.tar.xz"; - sha256 = "1smlj047vsg1j505si8fxl5cr3245f8k07ng1bhdwsdvrf1dl95m"; - name = "kfilemetadata-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kfilemetadata-5.110.0.tar.xz"; + sha256 = "07ma48iq5vpnj391shm3s9an3rqhxskfziw6pksmzxxnga0whbl9"; + name = "kfilemetadata-5.110.0.tar.xz"; }; }; kglobalaccel = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kglobalaccel-5.109.0.tar.xz"; - sha256 = "1qm9s7ibm4hq8i139d9hdrhdgcdf6r8r34z4rdb4v3v2nfkmx3m5"; - name = "kglobalaccel-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kglobalaccel-5.110.0.tar.xz"; + sha256 = "1iw22vyrk07pzcsh41cvfp8i8589jm1yqn1cx1ad5rmryzsjalzp"; + name = "kglobalaccel-5.110.0.tar.xz"; }; }; kguiaddons = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kguiaddons-5.109.0.tar.xz"; - sha256 = "1gbzrqvg7j534idy6sy5k8lziqv0pq4b9fmndhv0yqxjn71ncz90"; - name = "kguiaddons-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kguiaddons-5.110.0.tar.xz"; + sha256 = "0ajmxj8nhis6f4hwd64s9qfw3hbip80xrdy3d1wksykbq7g5b89c"; + name = "kguiaddons-5.110.0.tar.xz"; }; }; kholidays = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kholidays-5.109.0.tar.xz"; - sha256 = "0kbg7g1hd40zzjd261rzzpj408yg7dwkgmvcgcqpwy1wcniilnh2"; - name = "kholidays-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kholidays-5.110.0.tar.xz"; + sha256 = "0zikajmic93wqgy9865pf61sdlnsyzzf2jal7bj25is7a1mk8mjc"; + name = "kholidays-5.110.0.tar.xz"; }; }; khtml = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/portingAids/khtml-5.109.0.tar.xz"; - sha256 = "1rr54xx842dxbvf78srfmgylgc3j7c6lyk579j4x92i1hd2fgaar"; - name = "khtml-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/portingAids/khtml-5.110.0.tar.xz"; + sha256 = "17d87vjim32mn0s1d9zl9342aamqg4xmi6xh6d8ghrgms3vqc7in"; + name = "khtml-5.110.0.tar.xz"; }; }; ki18n = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/ki18n-5.109.0.tar.xz"; - sha256 = "0ifzbj5w910q93dw0zm24bdjx64cn1f336a1aqp1wb089fwnr2yx"; - name = "ki18n-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/ki18n-5.110.0.tar.xz"; + sha256 = "03qks9kncvazq2wz3myrjgz5m0gjxm80m1ayv9vjndyyc74a9smw"; + name = "ki18n-5.110.0.tar.xz"; }; }; kiconthemes = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kiconthemes-5.109.0.tar.xz"; - sha256 = "0v76d17kaqvsfq7y2lpa6sqd579m4zzbg0q6d4i81q78vfrzn6fk"; - name = "kiconthemes-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kiconthemes-5.110.0.tar.xz"; + sha256 = "0bb6r7jaknjyhyjhdrlji320qgb7cgxshcgab0209zk8dl8a510d"; + name = "kiconthemes-5.110.0.tar.xz"; }; }; kidletime = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kidletime-5.109.0.tar.xz"; - sha256 = "1pra4a0wh3smgk31814dkd1rqfralzhccid0c9rpi1h3wyk1lfs4"; - name = "kidletime-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kidletime-5.110.0.tar.xz"; + sha256 = "0hc30778d1k0vm4qsp58cf3d5bnws328qxazm8d5a6kxdc7izz44"; + name = "kidletime-5.110.0.tar.xz"; }; }; kimageformats = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kimageformats-5.109.0.tar.xz"; - sha256 = "11qnb7mh6c6jzh98l4frzzmrr2pk6nhqwjq9l06py67sl0dkwlqm"; - name = "kimageformats-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kimageformats-5.110.0.tar.xz"; + sha256 = "0ivks2c2kgd26pr0n0b4x3hb7dmmq52vlp7f6ny14qpvm3cgnscd"; + name = "kimageformats-5.110.0.tar.xz"; }; }; kinit = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kinit-5.109.0.tar.xz"; - sha256 = "18p186bxn438v79ssgf8wlp9ds7silpvqjwgcbh9kjh2k17jv4ax"; - name = "kinit-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kinit-5.110.0.tar.xz"; + sha256 = "0ps2299hf02yvgs971cb4bljbmdbcvcmm2xqz6q0h8asjkpkilv5"; + name = "kinit-5.110.0.tar.xz"; }; }; kio = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kio-5.109.0.tar.xz"; - sha256 = "0qhckh2a2823fh3dijzvfrja7ashn67gyqpny3234nbz2vpnjnpn"; - name = "kio-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kio-5.110.0.tar.xz"; + sha256 = "0sy91zlk60q5jligxp870srfc6fhd3fyk5yamkg266yfvyy9m3r2"; + name = "kio-5.110.0.tar.xz"; }; }; kirigami2 = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kirigami2-5.109.0.tar.xz"; - sha256 = "1zf0rz86y1lja47f0zv8q9dwghjlqxqqkv6val9h2qqqihc6p2yc"; - name = "kirigami2-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kirigami2-5.110.0.tar.xz"; + sha256 = "13j9z0nha3wq97apgkj43bayqijpgy6a2l7f9iryww054aqdjggx"; + name = "kirigami2-5.110.0.tar.xz"; }; }; kitemmodels = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kitemmodels-5.109.0.tar.xz"; - sha256 = "1w5h7asmgq8fmcm3329qjm113m7a9hpfdk4hvkmj919nfsdfbw0n"; - name = "kitemmodels-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kitemmodels-5.110.0.tar.xz"; + sha256 = "06gym33644npci4crhykyfyp2v74pya72kdzmqh4lkzp252pyfhj"; + name = "kitemmodels-5.110.0.tar.xz"; }; }; kitemviews = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kitemviews-5.109.0.tar.xz"; - sha256 = "1af2v0a2abxjn60d2yd3xj2khhy37a76gxmb0k8sjdvpy2wznnad"; - name = "kitemviews-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kitemviews-5.110.0.tar.xz"; + sha256 = "1nqbypn0crbaqa8x19z0fh8mqbr8wbf8nc8wg0irzp32js9vcqyp"; + name = "kitemviews-5.110.0.tar.xz"; }; }; kjobwidgets = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kjobwidgets-5.109.0.tar.xz"; - sha256 = "1dy2lx89v5hlvj37g1vc0bzbgya2sl1i17bwjpzl53461nwda3l6"; - name = "kjobwidgets-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kjobwidgets-5.110.0.tar.xz"; + sha256 = "1bl7igakmh1ipiamigs5s8fj6fy905b3j1dqgq9hxdxk59k1r1h2"; + name = "kjobwidgets-5.110.0.tar.xz"; }; }; kjs = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/portingAids/kjs-5.109.0.tar.xz"; - sha256 = "0ghki0b8jh41kjgi7cj6gvjhr7kxdhygyzsfrxacbhb2av4bxx55"; - name = "kjs-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/portingAids/kjs-5.110.0.tar.xz"; + sha256 = "0xlkdi7qs75ipf87h8m7bvjn4l28y5qy20hvag1gc370fxz54v15"; + name = "kjs-5.110.0.tar.xz"; }; }; kjsembed = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/portingAids/kjsembed-5.109.0.tar.xz"; - sha256 = "1pbqq0nybdmp5yphzr30ms772l4d0x24svr51dwg3pksnm8hpb9r"; - name = "kjsembed-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/portingAids/kjsembed-5.110.0.tar.xz"; + sha256 = "1ynmj8ac9g9amjz0ljz3wf7sjsrwmz1kfi26r36rpqlf9mmkzfqm"; + name = "kjsembed-5.110.0.tar.xz"; }; }; kmediaplayer = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/portingAids/kmediaplayer-5.109.0.tar.xz"; - sha256 = "09snwxf551j5vg558fxjlrlz13zcvzxl5zj030znxb1jsdvsjqlc"; - name = "kmediaplayer-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/portingAids/kmediaplayer-5.110.0.tar.xz"; + sha256 = "1jhh3gsbibi2hrhswg1nz1mdxn2wir5p9cvqpcqv7k8vm6rb82z3"; + name = "kmediaplayer-5.110.0.tar.xz"; }; }; knewstuff = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/knewstuff-5.109.0.tar.xz"; - sha256 = "0vh7l7pqhsb1nm5pcs86rgrf4i5c9ibfr58b9wnf054a3w6fgj1z"; - name = "knewstuff-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/knewstuff-5.110.0.tar.xz"; + sha256 = "0qld8ijy7z60qdlwa9vaq905xgzyvh5zw6ymngs00axl33m9bbbl"; + name = "knewstuff-5.110.0.tar.xz"; }; }; knotifications = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/knotifications-5.109.0.tar.xz"; - sha256 = "0gf19mh5qy2bxvn4bnj9hb5vbf13hcl827gz1kdcv7bkh0fb9c8j"; - name = "knotifications-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/knotifications-5.110.0.tar.xz"; + sha256 = "0zm3d36v9dgqb3pdwpj962wpngfhq08q9x9rj99f88g9dlnmy6gm"; + name = "knotifications-5.110.0.tar.xz"; }; }; knotifyconfig = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/knotifyconfig-5.109.0.tar.xz"; - sha256 = "1la8xwfmngkbk6pnfi0imr5452d6w5pprki7cc5rkwa8cbyrx7ls"; - name = "knotifyconfig-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/knotifyconfig-5.110.0.tar.xz"; + sha256 = "1651rh0av8lqp8rmb3djizsb8ypihkabprgppla3af2xf446n7wp"; + name = "knotifyconfig-5.110.0.tar.xz"; }; }; kpackage = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kpackage-5.109.0.tar.xz"; - sha256 = "0fxzmmig1674rp81s4f214azf8np2ckdygn2z8zbn169c6zaqbbq"; - name = "kpackage-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kpackage-5.110.0.tar.xz"; + sha256 = "1jd85m7pxzah9d6b3zi2nswvsinx85brkiq142vic5l0rm6l89id"; + name = "kpackage-5.110.0.tar.xz"; }; }; kparts = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kparts-5.109.0.tar.xz"; - sha256 = "17pp6ivhwzv7pcaka1sj25nrcapp01z7ddhyvblh88hcq3waa7bb"; - name = "kparts-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kparts-5.110.0.tar.xz"; + sha256 = "13av8v2kggbvyv8nxganjb88q38g3gbykbkwrigywc3767p838r3"; + name = "kparts-5.110.0.tar.xz"; }; }; kpeople = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kpeople-5.109.0.tar.xz"; - sha256 = "1gmryk89gac6krhfj68iq989zgjh0gpd4fj1p3jpqgxf688p2pix"; - name = "kpeople-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kpeople-5.110.0.tar.xz"; + sha256 = "10drcfjcw00qhdlsficxb07hnnsd93smcig8argznpgwd61f807p"; + name = "kpeople-5.110.0.tar.xz"; }; }; kplotting = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kplotting-5.109.0.tar.xz"; - sha256 = "0506wah3343l6wpncgarzsjl8jwy0av2xm8p6rmx1zvzph3m84fj"; - name = "kplotting-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kplotting-5.110.0.tar.xz"; + sha256 = "1fbzy9k0gx1468qsdd1c8fqaml3c01yy0m6n205y3ymkca78hdbk"; + name = "kplotting-5.110.0.tar.xz"; }; }; kpty = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kpty-5.109.0.tar.xz"; - sha256 = "1w0w0ly7gc5vc2g7z73fmn3bq8cn06h6s214ydsn5byf0awn41lq"; - name = "kpty-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kpty-5.110.0.tar.xz"; + sha256 = "1cx9wszi9zlay0vb9wz9hgbmbq006xgssnzzrmby4q4s6bhb92ps"; + name = "kpty-5.110.0.tar.xz"; }; }; kquickcharts = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kquickcharts-5.109.0.tar.xz"; - sha256 = "1bd1v4yvmxp82j09wrb8vncyb61bq6j8zrhgiiq73darcgsqfcvl"; - name = "kquickcharts-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kquickcharts-5.110.0.tar.xz"; + sha256 = "0s8xnsmhx2m6wn7fmmddzwnwc2yr3kvy85vd65m3avfw073rgj5v"; + name = "kquickcharts-5.110.0.tar.xz"; }; }; kross = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/portingAids/kross-5.109.0.tar.xz"; - sha256 = "1gzmfbzbj0r3znwlrpgrzpgrq7sgw8g3jx2rmqnm80si4cnq11hg"; - name = "kross-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/portingAids/kross-5.110.0.tar.xz"; + sha256 = "169zsxrmbdv5xn6s0wmf1l2a3qghn88hgl714i0cnymq5ixy25x5"; + name = "kross-5.110.0.tar.xz"; }; }; krunner = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/krunner-5.109.0.tar.xz"; - sha256 = "0pzk8srglshniqi3z9j290zxfjxh817ki69j1xcicjk48p3s232w"; - name = "krunner-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/krunner-5.110.0.tar.xz"; + sha256 = "0q3jhq2cswnqj5rdkxhizlv06rsxsm38ipxhcsw6p8zqabi1i351"; + name = "krunner-5.110.0.tar.xz"; }; }; kservice = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kservice-5.109.0.tar.xz"; - sha256 = "15b97bdr3sv3vfgb5zydqg1b8nljxx4rxh8bsvld520d11xfivsy"; - name = "kservice-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kservice-5.110.0.tar.xz"; + sha256 = "0rin6v96mcmw53dzw8sw56g7188623d1k4vs18bv44l86gixdhgg"; + name = "kservice-5.110.0.tar.xz"; }; }; ktexteditor = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/ktexteditor-5.109.0.tar.xz"; - sha256 = "1bgjj9wva884kzd0ywpx34k8wgzdpjnn28yfqjqynmkikr9br8fw"; - name = "ktexteditor-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/ktexteditor-5.110.0.tar.xz"; + sha256 = "0iwzw51km3mr8kdva14mxz9bvcfcf09v5igah2axkjaxazxyigla"; + name = "ktexteditor-5.110.0.tar.xz"; }; }; ktextwidgets = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/ktextwidgets-5.109.0.tar.xz"; - sha256 = "180x3rblab5yk6lmbd2310552dhn3vfjalccraq3rqzgvvkh439q"; - name = "ktextwidgets-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/ktextwidgets-5.110.0.tar.xz"; + sha256 = "0cr7n58mak928dysyqhsr1pj0w90amikx9jav4gs4lzb4m4rjp7q"; + name = "ktextwidgets-5.110.0.tar.xz"; }; }; kunitconversion = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kunitconversion-5.109.0.tar.xz"; - sha256 = "1n46qj6am3mkg2apq9g5kvpxvgv0czzvr2a8jqv6rj677ii0kfhl"; - name = "kunitconversion-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kunitconversion-5.110.0.tar.xz"; + sha256 = "083w0gz157j2g8qzm03yq3qwq58wafcq26qcc2ly2fksyyxkzzda"; + name = "kunitconversion-5.110.0.tar.xz"; }; }; kwallet = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kwallet-5.109.0.tar.xz"; - sha256 = "1s34lwi42pkiqyd16mvy5w6khlrpk0dp5v3q37fysmc39q670s4c"; - name = "kwallet-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kwallet-5.110.0.tar.xz"; + sha256 = "0mg5y8cvzvs7w3yy5xnpsps2b6m476l5ilw5kvarrjjpq7ybnkqz"; + name = "kwallet-5.110.0.tar.xz"; }; }; kwayland = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kwayland-5.109.0.tar.xz"; - sha256 = "1pi515hszipy7f1fy4xaabcy9ifrynj0fk3zrnb0827d71ljd2yq"; - name = "kwayland-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kwayland-5.110.0.tar.xz"; + sha256 = "0ggxvywvqfhhhb5370n90dyw0mjwkp3i7rgv58nyqsmby0g08r85"; + name = "kwayland-5.110.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kwidgetsaddons-5.109.0.tar.xz"; - sha256 = "1qp2jab238gs88f12hp5h533x25nlsm5ca3gr04imdsiygwp506n"; - name = "kwidgetsaddons-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kwidgetsaddons-5.110.0.tar.xz"; + sha256 = "1cyphs0r5j2v93pwi9mbn6xd928lnhb0zmyfj5pywdx9n7lv0x6a"; + name = "kwidgetsaddons-5.110.0.tar.xz"; }; }; kwindowsystem = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kwindowsystem-5.109.0.tar.xz"; - sha256 = "18n1g5k2dwwdkpyh5vsqfks4qym4z3f39pgcnr9mnyrnzz4pb008"; - name = "kwindowsystem-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kwindowsystem-5.110.0.tar.xz"; + sha256 = "0l3aknr3zqz9zwqlyhnr8n53bcfb22rm38vdiv0l5vpwjbjn0270"; + name = "kwindowsystem-5.110.0.tar.xz"; }; }; kxmlgui = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/kxmlgui-5.109.0.tar.xz"; - sha256 = "1vnsk8jq7s6hgxc9d1dbcdgd9qyf9s2bc3mc0rss10dkpwrls2dl"; - name = "kxmlgui-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/kxmlgui-5.110.0.tar.xz"; + sha256 = "1j8v52ix9sv7q76cvl2gnpjs602ri57kgfh21bvqd88gf2xnwxjq"; + name = "kxmlgui-5.110.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/portingAids/kxmlrpcclient-5.109.0.tar.xz"; - sha256 = "1d6hf53rrjql4yvlc35fxdra5zvjl06piaiahqbrg7dqkwl88xdj"; - name = "kxmlrpcclient-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/portingAids/kxmlrpcclient-5.110.0.tar.xz"; + sha256 = "0fzd9amj2j4bw54q8fbgczqf785s6siqr1a8wbqf56wyyhki5psx"; + name = "kxmlrpcclient-5.110.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/modemmanager-qt-5.109.0.tar.xz"; - sha256 = "1a2nmpl74r813xa3yqql91rh6cmp1sc1wh6627z3av04ir94x5zj"; - name = "modemmanager-qt-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/modemmanager-qt-5.110.0.tar.xz"; + sha256 = "08q43arx9q81rqwhczzcn4cyl5glalwzjncb120a2cihida2m71v"; + name = "modemmanager-qt-5.110.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/networkmanager-qt-5.109.0.tar.xz"; - sha256 = "0ggyv5ml2668vj0hgajmfvs7i95hi3asdb7sb6sciirg71vmshbz"; - name = "networkmanager-qt-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/networkmanager-qt-5.110.0.tar.xz"; + sha256 = "1bnlvpfhw6l64rgaxx9zkxd5wmwvyal5xmv31vxzf92ig6sgjdqq"; + name = "networkmanager-qt-5.110.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/oxygen-icons5-5.109.0.tar.xz"; - sha256 = "02f6flvgxnqggn7j638z7iny4nxgdvq5rqz4va1wvwj5ck0v9prb"; - name = "oxygen-icons5-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/oxygen-icons5-5.110.0.tar.xz"; + sha256 = "1dmig458gbl0ypb99kj514nwl5gbjpfvixw9lipgc2wwnn1nkia2"; + name = "oxygen-icons5-5.110.0.tar.xz"; }; }; plasma-framework = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/plasma-framework-5.109.0.tar.xz"; - sha256 = "138r00ya985n8ygi28yfmq1i32kai2y1r0h97i09m6zd6v0x23k1"; - name = "plasma-framework-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/plasma-framework-5.110.0.tar.xz"; + sha256 = "0jfln8lrzmcnkqhl8pij5w6mdj6g25rwc332f07g9465y9ap07cf"; + name = "plasma-framework-5.110.0.tar.xz"; }; }; prison = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/prison-5.109.0.tar.xz"; - sha256 = "1pmwx1ch6jmq96xh778slmm3hd0gci8hn3wwmbj3amx2mpddf2c1"; - name = "prison-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/prison-5.110.0.tar.xz"; + sha256 = "019a3z18gq7nb3ahf5dd3b5fixzyfklg60dk2w4win2w19s70wb7"; + name = "prison-5.110.0.tar.xz"; }; }; purpose = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/purpose-5.109.0.tar.xz"; - sha256 = "04nczmx08fxrazzsd45jjcvfmsbilvqz4rsf8zcdh0nmlcpmncri"; - name = "purpose-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/purpose-5.110.0.tar.xz"; + sha256 = "0nl6qh7j5c3ijnq0qw1a5jmj1x5nb9hlssjjn8fdvfr7q6z67rsc"; + name = "purpose-5.110.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/qqc2-desktop-style-5.109.0.tar.xz"; - sha256 = "0fqck5sck8zy70r2mls5g3sgjryvrzibhzls4lbw61yw3zgbl3kh"; - name = "qqc2-desktop-style-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/qqc2-desktop-style-5.110.0.tar.xz"; + sha256 = "04pyhlr89azw0kyjxfpx6phxljck8yiflcszd4xkgiw3n9rjyg3g"; + name = "qqc2-desktop-style-5.110.0.tar.xz"; }; }; solid = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/solid-5.109.0.tar.xz"; - sha256 = "0sfm9c5r2bh766ws2y8zr9pshkbnxnc3dnsxfi41lwcj2xnznkdw"; - name = "solid-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/solid-5.110.0.tar.xz"; + sha256 = "1k64cqlws7nxki21cwg197avfnxsxpw3isry5p7bqyfmq45ydcvd"; + name = "solid-5.110.0.tar.xz"; }; }; sonnet = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/sonnet-5.109.0.tar.xz"; - sha256 = "1fpf8q0wx821zfm64kfmpsfyixd8d6rd0gzcbzwimxmmm1aacfsr"; - name = "sonnet-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/sonnet-5.110.0.tar.xz"; + sha256 = "16qk63yy1y03z4rlc08qzr7mmds1yz0k9x1ws2nzp47khkza250i"; + name = "sonnet-5.110.0.tar.xz"; }; }; syndication = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/syndication-5.109.0.tar.xz"; - sha256 = "1jhmv39jv6h8yq9c3y6ikx6bykff6n9l522q7bp1prg1p03a4q95"; - name = "syndication-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/syndication-5.110.0.tar.xz"; + sha256 = "0dsd05ckfv9fdnrbgprriba7lbbfs2z9qv869pcr4n7pn7x778sd"; + name = "syndication-5.110.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/syntax-highlighting-5.109.0.tar.xz"; - sha256 = "1ixms1vcf9ydk6qgz42g61ac6bqkmbb313k51ymk7kidx7l7lqwy"; - name = "syntax-highlighting-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/syntax-highlighting-5.110.0.tar.xz"; + sha256 = "0gbmgan0cy4xhjcf10g0lffhwvkhhpcgbnk190xlzl4chnmpq9w5"; + name = "syntax-highlighting-5.110.0.tar.xz"; }; }; threadweaver = { - version = "5.109.0"; + version = "5.110.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.109/threadweaver-5.109.0.tar.xz"; - sha256 = "1q6jqawfbwjcfqd57aryd2bw52adkr05lrbij98pix6482am4x3j"; - name = "threadweaver-5.109.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.110/threadweaver-5.110.0.tar.xz"; + sha256 = "085y4m7z0rybsvpqzl2sjwnf8yjm4lnc3n49idj2c0psm8v5ksm0"; + name = "threadweaver-5.110.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index c213e75d5f2d..0c953b8d8710 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.13.5"; + version = "1.14.0"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-XpLbbcB8M63q+0Vj7NrERSXVIjy5KQrVZMvYijUbJhw="; + hash = "sha256-7hFGY255dLgDo93+Nx2we/cfEtwaiaajdVg1VTst1/U="; }; nativeBuildInputs = [ cmake addOpenGLRunpath ]; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 3863710f3c8c..c63ef6d2dc61 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -66,16 +66,16 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "0xzgcnh45x3sqg0jndp9g08zy9bvzvmvfz8imj12j55vkm6f7kl6"; - platforms."x86_64-linux".sha256 = "1942mwlyrz5pxlx9kcnz85rqbz8q8slkivx0001z30l7a6pizgg5"; + platforms."aarch64-linux".sha256 = "1d3ign2bhv1821k0jgmakzgqlpwy358iggrgxnbxswa42ckk9m6d"; + platforms."x86_64-linux".sha256 = "188hd7b11963f23y9rb0n747ssffdc80cdr1hpgwn55cmwhd8gbj"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "116.0.20"; - gitRevision = "d6abd3c"; - chromiumVersion = "116.0.5845.180"; + version = "116.0.21"; + gitRevision = "9c7dc32"; + chromiumVersion = "116.0.5845.181"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; diff --git a/pkgs/development/libraries/opencomposite/cmake-use-find_package-where-needed.patch b/pkgs/development/libraries/opencomposite/cmake-use-find_package-where-needed.patch new file mode 100644 index 000000000000..6af49ff074f2 --- /dev/null +++ b/pkgs/development/libraries/opencomposite/cmake-use-find_package-where-needed.patch @@ -0,0 +1,112 @@ +From 5430196765402655715f759e3de0166ad3fbe1fe Mon Sep 17 00:00:00 2001 +From: Sefa Eyeoglu <contact@scrumplex.net> +Date: Fri, 28 Jul 2023 12:26:58 +0200 +Subject: [PATCH] cmake: use find_package where needed + +Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net> +--- + CMakeLists.txt | 62 ++++---------------------------------------------- + 1 file changed, 4 insertions(+), 58 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bb3c49a..e9d6d56 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -98,66 +98,13 @@ endif () + # === OpenXR === + # Building CMake subprojects is a real pain (IMO), so just build this here + +-set(XrDir libs/openxr-sdk) +-set(XrDirLoader libs/openxr-sdk/src/loader) +-set(XrDirCommon libs/openxr-sdk/src/common) +-if (ANDROID) +- # Whatever consumes this library must then link to an OpenXR loader, such as the Oculus one +- add_library(OpenXR STATIC scripts/empty.c) # Doesn't do anything +-else () +-add_library(OpenXR STATIC +- ${XrDirLoader}/api_layer_interface.cpp +- ${XrDirLoader}/api_layer_interface.hpp +- ${XrDirLoader}/loader_core.cpp +- ${XrDirLoader}/loader_instance.cpp +- ${XrDirLoader}/loader_instance.hpp +- ${XrDirLoader}/loader_logger.cpp +- ${XrDirLoader}/loader_logger.hpp +- ${XrDirLoader}/loader_logger_recorders.cpp +- ${XrDirLoader}/loader_logger_recorders.hpp +- ${XrDirLoader}/manifest_file.cpp +- ${XrDirLoader}/manifest_file.hpp +- ${XrDirLoader}/runtime_interface.cpp +- ${XrDirLoader}/runtime_interface.hpp +- +- ${XrDirLoader}/xr_generated_loader.hpp +- ${XrDirLoader}/xr_generated_loader.cpp +- ${XrDir}/src/xr_generated_dispatch_table.h +- ${XrDir}/src/xr_generated_dispatch_table.c +- +- ${XrDirCommon}/filesystem_utils.cpp +- ${XrDirCommon}/object_info.cpp +- +- ${XrDir}/src/external/jsoncpp/src/lib_json/json_reader.cpp +- ${XrDir}/src/external/jsoncpp/src/lib_json/json_value.cpp +- ${XrDir}/src/external/jsoncpp/src/lib_json/json_writer.cpp +-) +-endif() +-target_include_directories(OpenXR PRIVATE ${XrDirCommon} ${XrDir}/src ${XrDir}/src/external/jsoncpp/include) +-target_include_directories(OpenXR PUBLIC ${XrDir}/include) +-# Platform-dependent flags +-if (WIN32) +- target_compile_definitions(OpenXR PRIVATE -DXR_OS_WINDOWS -DXR_USE_PLATFORM_WIN32 +- -DXR_USE_GRAPHICS_API_D3D11 -DXR_USE_GRAPHICS_API_D3D12 -DXR_USE_GRAPHICS_API_OPENGL) +- target_link_libraries(OpenXR PUBLIC advapi32 pathcch OpenGL32) +-else() +- # TODO Turtle1331 should we include -DXR_USE_PLATFORM_(XLIB|XCB|WAYLAND) here? +- target_compile_definitions(OpenXR PRIVATE -DXR_OS_LINUX +- -DXR_USE_GRAPHICS_API_OPENGL -DXR_USE_GRAPHICS_API_VULKAN) +- target_link_libraries(OpenXR PUBLIC -ldl) +-endif() +-target_link_libraries(OpenXR PUBLIC Vulkan) +- +-if (ANDROID) +- target_compile_definitions(OpenXR PUBLIC -DXR_USE_PLATFORM_ANDROID -DXR_USE_GRAPHICS_API_OPENGL_ES) +-endif() ++find_package(OpenXR REQUIRED) + + # === glm === + # Since we used to use LibOVR's maths library, we need a replacement + # glm is an obvious choice + +-add_library(glm INTERFACE) +-target_include_directories(glm INTERFACE libs/glm) # No separate include directory :( ++find_package(glm REQUIRED) + + # === DrvOpenXR === + add_library(DrvOpenXR STATIC +@@ -189,7 +136,7 @@ add_library(DrvOpenXR STATIC + ) + target_include_directories(DrvOpenXR PUBLIC DrvOpenXR/pub ${CMAKE_BINARY_DIR}) + target_include_directories(DrvOpenXR PRIVATE DrvOpenXR OpenOVR) +-target_link_libraries(DrvOpenXR PUBLIC OpenVR OpenXR glm) ++target_link_libraries(DrvOpenXR PUBLIC OpenVR OpenXR::openxr_loader glm::glm) + target_compile_definitions(DrvOpenXR PRIVATE ${GRAPHICS_API_SUPPORT_FLAGS} -D_CRT_SECURE_NO_WARNINGS) + source_group(Public REGULAR_EXPRESSION DrvOpenXR/pub/*) + +@@ -357,7 +304,7 @@ target_include_directories(OCCore PUBLIC OpenOVR ${CMAKE_BINARY_DIR}) # TODO ma + target_include_directories(OCCore PRIVATE BundledLibs OpenVRHeaders) + target_compile_definitions(OCCore PRIVATE ${GRAPHICS_API_SUPPORT_FLAGS}) + +-target_link_libraries(OCCore OpenVR OpenXR Vulkan glm) ++target_link_libraries(OCCore OpenVR OpenXR::openxr_loader Vulkan glm::glm) + + if (NOT WIN32 AND NOT ANDROID) + find_package(OpenGL REQUIRED) # for glGetError() +@@ -411,7 +358,6 @@ endif () + if (WIN32) + else () + target_compile_options(DrvOpenXR PRIVATE -fPIC) +- target_compile_options(OpenXR PRIVATE -fPIC) + target_compile_options(OCCore PRIVATE -fPIC) + endif () + +-- +2.41.0 + diff --git a/pkgs/development/libraries/opencomposite/default.nix b/pkgs/development/libraries/opencomposite/default.nix new file mode 100644 index 000000000000..a68e75b827bc --- /dev/null +++ b/pkgs/development/libraries/opencomposite/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitLab + +, cmake + +, glm +, libGL +, openxr-loader +, python3 +, vulkan-headers +, vulkan-loader +, xorg +}: + +stdenv.mkDerivation { + pname = "opencomposite"; + version = "unstable-2023-07-02"; + + src = fetchFromGitLab { + owner = "znixian"; + repo = "OpenOVR"; + rev = "a59b16204a1ee61a59413667a516375071a113f0"; + hash = "sha256-JSVd/+A/WldP+A2vOOG4lbwb4QCE/PymEm4VbjUxWrw="; + }; + + patches = [ + # Force OpenComposite to use our OpenXR and glm, instead of its Git submodules + ./cmake-use-find_package-where-needed.patch + ]; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + glm + libGL + openxr-loader + python3 + vulkan-headers + vulkan-loader + xorg.libX11 + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/opencomposite + cp -r bin/ $out/lib/opencomposite + runHook postInstall + ''; + + meta = with lib; { + description = "Reimplementation of OpenVR, translating calls to OpenXR"; + homepage = "https://gitlab.com/znixian/OpenOVR"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ Scrumplex ]; + }; +} diff --git a/pkgs/development/libraries/opencomposite/helper.nix b/pkgs/development/libraries/opencomposite/helper.nix new file mode 100644 index 000000000000..f19f5e868139 --- /dev/null +++ b/pkgs/development/libraries/opencomposite/helper.nix @@ -0,0 +1,18 @@ +{ writeShellApplication + +, monado +, opencomposite +}: +writeShellApplication { + name = "opencomposite-helper"; + text = '' + # Tell Proton to use OpenComposite instead of OpenVR + export VR_OVERRIDE=${opencomposite}/lib/opencomposite + # Help OpenComposite find the OpenXR runtime + export XR_RUNTIME_JSON=${monado}/share/openxr/1/openxr_monado.json + # Tell Steam Pressure Vessel to allow access to Monado + export PRESSURE_VESSEL_FILESYSTEMS_RW=$XDG_RUNTIME_DIR/monado_comp_ipc + exec "$@" + ''; +} + diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/development/libraries/pdfhummus/default.nix index a6d7ee3cdb16..e9d3c45ae8ba 100644 --- a/pkgs/development/libraries/pdfhummus/default.nix +++ b/pkgs/development/libraries/pdfhummus/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pdfhummus"; - version = "4.5.10"; + version = "4.5.11"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-dhbb/9+6ftjde+oh665ujA5CvY+Ume0pz/ghrohcaNE="; + hash = "sha256-nTLyFGnY07gDoahYe5YqSmU/URzdvRKQ1MsXt3164+c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix index 5310ffc279d3..b61db08457fd 100644 --- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet-contrib"; - version = "1.049"; + version = "1.052"; src = fetchurl { url = "https://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; - sha256 = "sha256-ri7WIGvGJ4tl6ZpPeN8O6ykR8wGij7V7UMVzwNWGmYc="; + sha256 = "sha256-veY8KMvfmSvt6k3e38PNUsn+wkGnZ8xFXdStEOghDDk="; }; buildInputs = [ fastjet ]; diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 93ecaa698f7a..a629e8a2ac12 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.13.0"; + version = "6.13.1"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-gfGVVjtzpBGrPrp2k3fOIh54EAMSicyikF1CtaO74y8="; + hash = "sha256-ic1Xnle1fGZ5elf0yH0BF+3spAmIo9kP62WhXLmBVNc="; }; buildInputs = [ qtbase cpp-utilities ]; diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 0d665a1bfde7..fee30ca57346 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -218,18 +218,6 @@ let }; }; - cl-webkit2_3_5_9 = build-asdf-system { - inherit (super.cl-webkit2) pname systems nativeLibs lispLibs; - version = "3.5.9"; - - src = pkgs.fetchFromGitHub { - owner = "joachifm"; - repo = "cl-webkit"; - rev = "3.5.9"; - sha256 = "sha256-YJo5ahL6+HLeJrxFBuZZjuK3OfA6DnAu82vvXMsNBgI="; - }; - }; - prompter = build-asdf-system { pname = "prompter"; version = "0.1.0"; @@ -258,12 +246,12 @@ let nasdf = build-asdf-system { pname = "nasdf"; - version = "20230524-git"; + version = "20230911-git"; src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "ntemplate"; - rev = "51a884f388ec526c32914093fcad6bb2434e3c14"; - sha256 = "sha256-bjQPkiHAxhjsHCnWpCGMsmQlGDJFGtQEdevnhK2k+kY="; + rev = "ab7a018f3a67a999c72710644b10b4545130c139"; + sha256 = "sha256-fXGh0h6CXLoBgK1jRxkSNyQVAY1gvi4iyHQBuzueR5Y="; }; }; @@ -370,7 +358,7 @@ let nyxt-gtk = build-asdf-system { pname = "nyxt"; - version = "3.6.0"; + version = "3.7.0"; lispLibs = (with super; [ alexandria @@ -410,7 +398,6 @@ let spinneret slynk trivia - trivial-clipboard trivial-features trivial-garbage trivial-package-local-nicknames @@ -418,9 +405,31 @@ let unix-opts cluffer cl-cffi-gtk - cl-gobject-introspection quri sqlite + # TODO: Remove these overrides after quicklisp updates past the June 2023 release + (trivial-clipboard.overrideAttrs (final: prev: { + src = pkgs.fetchFromGitHub { + owner = "snmsts"; + repo = "trivial-clipboard"; + rev = "6ddf8d5dff8f5c2102af7cd1a1751cbe6408377b"; + sha256 = "sha256-n15IuTkqAAh2c1OfNbZfCAQJbH//QXeH0Bl1/5OpFRM="; + };})) + (cl-gobject-introspection.overrideAttrs (final: prev: { + src = pkgs.fetchFromGitHub { + owner = "andy128k"; + repo = "cl-gobject-introspection"; + rev = "83beec4492948b52aae4d4152200de5d5c7ac3e9"; + sha256 = "sha256-g/FwWE+Rzmzm5Y+irvd1AJodbp6kPHJIFOFDPhaRlXc="; + };})) + (cl-webkit2.overrideAttrs (final: prev: { + src = pkgs.fetchFromGitHub { + owner = "joachifm"; + repo = "cl-webkit"; + rev = "66fd0700111586425c9942da1694b856fb15cf41"; + sha256 = "sha256-t/B9CvQTekEEsM/ZEp47Mn6NeZaTYFsTdRqclfX9BNg="; + }; + })) ]) ++ (with self; [ history-tree nhooks @@ -432,7 +441,6 @@ let nsymbols nclasses nfiles - cl-webkit2_3_5_9 swank cl-containers ]); @@ -440,8 +448,8 @@ let src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nyxt"; - rev = "3.6.0"; - sha256 = "sha256-DaPEKdYf5R+RS7VQzbdLSqZvEQfxjeGEdX8rwmHRLrY="; + rev = "3.7.0"; + sha256 = "sha256-viiyO4fX3uyGuvojQ1rYYKBldRdVNzeJX1KYlYwfWVU="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index bcc592cd88ad..d4fcd87951ff 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -93,6 +93,7 @@ mapAliases { inherit (pkgs) markdownlint-cli2; # added 2023-08-22 mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21 musescore-downloader = pkgs.dl-librescore; # added 2023-08-19 + inherit (pkgs) near-cli; # added 2023-09-09 node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21 inherit (pkgs) npm-check-updates; # added 2023-08-22 ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04 @@ -108,6 +109,7 @@ mapAliases { 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 surge = pkgs.surge-cli; # Added 2023-09-08 + swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09 thelounge = pkgs.thelounge; # Added 2023-05-22 three = throw "three was removed because it was no longer needed"; # Added 2023-09-08 inherit (pkgs) titanium; # added 2023-08-17 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 66aff39ea45b..5ee9f70d8e33 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -46,7 +46,6 @@ less = "lessc"; localtunnel = "lt"; lua-fmt = "luafmt"; - near-cli = "near"; neovim = "neovim-node-host"; parsoid = "parse.js"; poor-mans-t-sql-formatter-cli = "sqlformat"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 352545b02fb2..56f65d701153 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -172,13 +172,11 @@ , "lv_font_conv" , "madoko" , "markdown-link-check" -, {"markdown-preview-nvim": "../../applications/editors/vim/plugins/markdown-preview-nvim"} , "mastodon-bot" , "mathjax" , "meat" , "mocha" , "multi-file-swagger" -, "near-cli" , "neovim" , "nijs" , "node-gyp" @@ -240,7 +238,6 @@ , "svelte-check" , "svelte-language-server" , "svgo" -, "swagger" , "tailwindcss" , {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"} , "teck-programmer" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index ed41b9eb4b4f..6fc85413c173 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -96775,1119 +96775,6 @@ in bypassCache = true; reconstructLock = true; }; - "markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim" = nodeEnv.buildNodePackage { - name = "markdown-preview"; - packageName = "markdown-preview"; - version = "0.0.10"; - src = ../../applications/editors/vim/plugins/markdown-preview-nvim; - dependencies = [ - sources."@babel/code-frame-7.22.10" - sources."@babel/compat-data-7.22.9" - (sources."@babel/core-7.0.0" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."@babel/generator-7.22.10" - sources."@babel/helper-annotate-as-pure-7.22.5" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.10" - (sources."@babel/helper-compilation-targets-7.22.10" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - (sources."@babel/helper-create-regexp-features-plugin-7.22.9" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."@babel/helper-environment-visitor-7.22.5" - (sources."@babel/helper-function-name-7.22.5" // { - dependencies = [ - sources."@babel/template-7.22.5" - ]; - }) - sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-member-expression-to-functions-7.22.5" - sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.9" - sources."@babel/helper-optimise-call-expression-7.22.5" - sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-remap-async-to-generator-7.22.9" - sources."@babel/helper-replace-supers-7.22.9" - sources."@babel/helper-simple-access-7.22.5" - sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" - sources."@babel/helper-split-export-declaration-7.22.6" - sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.5" - sources."@babel/helper-validator-option-7.22.5" - (sources."@babel/helper-wrap-function-7.22.10" // { - dependencies = [ - sources."@babel/template-7.22.5" - ]; - }) - (sources."@babel/helpers-7.22.10" // { - dependencies = [ - sources."@babel/template-7.22.5" - ]; - }) - sources."@babel/highlight-7.22.10" - sources."@babel/parser-7.22.10" - sources."@babel/plugin-proposal-async-generator-functions-7.20.7" - sources."@babel/plugin-proposal-class-properties-7.0.0" - sources."@babel/plugin-proposal-json-strings-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.0.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" - sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" - sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-dynamic-import-7.0.0" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.22.5" - sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" - sources."@babel/plugin-transform-arrow-functions-7.22.5" - sources."@babel/plugin-transform-async-to-generator-7.22.5" - sources."@babel/plugin-transform-block-scoped-functions-7.22.5" - sources."@babel/plugin-transform-block-scoping-7.22.10" - sources."@babel/plugin-transform-classes-7.22.6" - (sources."@babel/plugin-transform-computed-properties-7.22.5" // { - dependencies = [ - sources."@babel/template-7.22.5" - ]; - }) - sources."@babel/plugin-transform-destructuring-7.22.10" - sources."@babel/plugin-transform-dotall-regex-7.22.5" - sources."@babel/plugin-transform-duplicate-keys-7.22.5" - sources."@babel/plugin-transform-exponentiation-operator-7.22.5" - sources."@babel/plugin-transform-for-of-7.22.5" - sources."@babel/plugin-transform-function-name-7.22.5" - sources."@babel/plugin-transform-literals-7.22.5" - sources."@babel/plugin-transform-modules-amd-7.22.5" - sources."@babel/plugin-transform-modules-commonjs-7.22.5" - sources."@babel/plugin-transform-modules-systemjs-7.22.5" - sources."@babel/plugin-transform-modules-umd-7.22.5" - sources."@babel/plugin-transform-new-target-7.22.5" - sources."@babel/plugin-transform-object-super-7.22.5" - sources."@babel/plugin-transform-parameters-7.22.5" - sources."@babel/plugin-transform-react-display-name-7.22.5" - sources."@babel/plugin-transform-react-jsx-7.22.5" - sources."@babel/plugin-transform-react-jsx-self-7.22.5" - sources."@babel/plugin-transform-react-jsx-source-7.22.5" - sources."@babel/plugin-transform-regenerator-7.22.10" - (sources."@babel/plugin-transform-runtime-7.0.0" // { - dependencies = [ - sources."resolve-1.22.4" - ]; - }) - sources."@babel/plugin-transform-shorthand-properties-7.22.5" - sources."@babel/plugin-transform-spread-7.22.5" - sources."@babel/plugin-transform-sticky-regex-7.22.5" - sources."@babel/plugin-transform-template-literals-7.22.5" - sources."@babel/plugin-transform-typeof-symbol-7.22.5" - sources."@babel/plugin-transform-unicode-regex-7.22.5" - sources."@babel/preset-env-7.0.0" - sources."@babel/preset-react-7.0.0" - sources."@babel/regjsgen-0.8.0" - (sources."@babel/runtime-7.0.0" // { - dependencies = [ - sources."regenerator-runtime-0.12.1" - ]; - }) - (sources."@babel/runtime-corejs2-7.0.0" // { - dependencies = [ - sources."regenerator-runtime-0.12.1" - ]; - }) - sources."@babel/template-7.0.0" - sources."@babel/traverse-7.22.10" - sources."@babel/types-7.22.10" - sources."@chemzqm/msgpack-lite-0.1.29" - sources."@chemzqm/neovim-5.9.5" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" - sources."@webassemblyjs/ast-1.7.8" - sources."@webassemblyjs/floating-point-hex-parser-1.7.8" - sources."@webassemblyjs/helper-api-error-1.7.8" - sources."@webassemblyjs/helper-buffer-1.7.8" - sources."@webassemblyjs/helper-code-frame-1.7.8" - sources."@webassemblyjs/helper-fsm-1.7.8" - sources."@webassemblyjs/helper-module-context-1.7.8" - sources."@webassemblyjs/helper-wasm-bytecode-1.7.8" - sources."@webassemblyjs/helper-wasm-section-1.7.8" - sources."@webassemblyjs/ieee754-1.7.8" - sources."@webassemblyjs/leb128-1.7.8" - sources."@webassemblyjs/utf8-1.7.8" - sources."@webassemblyjs/wasm-edit-1.7.8" - sources."@webassemblyjs/wasm-gen-1.7.8" - sources."@webassemblyjs/wasm-opt-1.7.8" - sources."@webassemblyjs/wasm-parser-1.7.8" - sources."@webassemblyjs/wast-parser-1.7.8" - sources."@webassemblyjs/wast-printer-1.7.8" - sources."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.1" - sources."accepts-1.3.8" - sources."acorn-5.7.4" - sources."acorn-dynamic-import-3.0.0" - sources."after-0.8.2" - sources."ajv-6.12.6" - sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.5.2" - sources."ansi-colors-3.2.4" - sources."ansi-escapes-3.2.0" - sources."ansi-html-0.0.7" - sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" - sources."any-promise-1.3.0" - sources."anymatch-3.1.3" - sources."aproba-1.2.0" - sources."argparse-2.0.1" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-buffer-byte-length-1.0.0" - sources."array-differ-1.0.0" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" - sources."array.prototype.reduce-1.0.5" - sources."arraybuffer.prototype.slice-1.0.1" - sources."arraybuffer.slice-0.0.7" - sources."arrify-1.0.1" - sources."asap-2.0.6" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - (sources."assert-1.5.0" // { - dependencies = [ - sources."inherits-2.0.1" - sources."util-0.10.3" - ]; - }) - sources."assign-symbols-1.0.0" - sources."async-each-1.0.6" - sources."atob-2.1.2" - (sources."autodll-webpack-plugin-0.4.2" // { - dependencies = [ - sources."find-cache-dir-1.0.0" - sources."pkg-dir-2.0.0" - ]; - }) - sources."available-typed-arrays-1.0.5" - sources."babel-core-7.0.0-bridge.0" - (sources."babel-loader-8.0.2" // { - dependencies = [ - sources."find-cache-dir-1.0.0" - sources."pkg-dir-2.0.0" - ]; - }) - sources."babel-plugin-react-require-3.0.0" - sources."babel-plugin-syntax-jsx-6.18.0" - sources."babel-plugin-transform-react-remove-prop-types-0.4.15" - (sources."babel-runtime-6.26.0" // { - dependencies = [ - sources."regenerator-runtime-0.11.1" - ]; - }) - (sources."babel-types-6.26.0" // { - dependencies = [ - sources."to-fast-properties-1.0.3" - ]; - }) - sources."backo2-1.0.2" - sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."base64-arraybuffer-0.1.4" - sources."base64-js-1.5.1" - sources."base64id-2.0.0" - sources."big.js-3.2.0" - sources."binary-extensions-2.2.0" - sources."bindings-1.5.0" - sources."blob-0.0.5" - sources."bluebird-3.7.2" - sources."bn.js-5.2.1" - sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."brorand-1.1.0" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.1" // { - dependencies = [ - sources."readable-stream-3.6.2" - sources."safe-buffer-5.2.1" - ]; - }) - sources."browserify-zlib-0.2.0" - sources."browserslist-4.21.10" - sources."buffer-4.9.2" - sources."buffer-from-1.1.2" - sources."buffer-xor-1.0.3" - sources."bufferutil-4.0.7" - sources."builtin-status-codes-3.0.0" - (sources."cacache-11.3.3" // { - dependencies = [ - sources."glob-7.2.3" - ]; - }) - sources."cache-base-1.0.1" - sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001522" - sources."case-sensitive-paths-webpack-plugin-2.1.2" - sources."chalk-2.4.2" - sources."chart.js-2.9.4" - sources."chartjs-color-2.4.1" - sources."chartjs-color-string-0.6.0" - (sources."chokidar-3.5.3" // { - dependencies = [ - sources."braces-3.0.2" - sources."fill-range-7.0.1" - sources."is-number-7.0.0" - sources."to-regex-range-5.0.1" - ]; - }) - sources."chownr-1.1.4" - sources."chrome-trace-event-1.0.3" - sources."ci-info-1.6.0" - sources."cipher-base-1.0.4" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."cli-cursor-2.1.0" - sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commander-2.17.1" - sources."commondir-1.0.1" - sources."component-bind-1.0.0" - sources."component-emitter-1.3.0" - sources."component-inherit-0.0.3" - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."consola-1.4.5" - sources."console-browserify-1.2.0" - sources."constants-browserify-1.0.0" - sources."convert-source-map-1.9.0" - sources."cookie-0.4.2" - sources."copy-concurrently-1.0.5" - sources."copy-descriptor-0.1.1" - sources."core-js-2.6.12" - sources."core-util-is-1.0.3" - (sources."create-ecdh-4.0.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - (sources."cross-spawn-5.1.0" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) - sources."crypto-browserify-3.12.0" - sources."cyclist-1.0.2" - sources."date-format-4.0.14" - sources."debug-4.3.4" - sources."decode-uri-component-0.2.2" - sources."define-properties-1.2.0" - sources."define-property-2.0.2" - sources."del-3.0.0" - sources."depd-1.1.1" - sources."des.js-1.1.0" - sources."destroy-1.0.4" - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."domain-browser-1.2.0" - sources."duplexify-3.7.1" - sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.499" - (sources."elliptic-6.5.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."emitter-mixin-0.0.3" - sources."emojis-list-2.1.0" - sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.4" - (sources."engine.io-3.6.1" // { - dependencies = [ - sources."debug-4.1.1" - ]; - }) - (sources."engine.io-client-3.5.3" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) - sources."engine.io-parser-2.2.1" - (sources."enhanced-resolve-4.5.0" // { - dependencies = [ - sources."memory-fs-0.5.0" - ]; - }) - sources."entities-2.1.0" - sources."errno-0.1.8" - sources."error-ex-1.3.2" - sources."error-stack-parser-2.1.4" - sources."es-abstract-1.22.1" - sources."es-array-method-boxes-properly-1.0.0" - sources."es-set-tostringtag-2.0.1" - sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - sources."eslint-scope-4.0.3" - sources."esprima-4.0.1" - (sources."esrecurse-4.3.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - sources."estraverse-4.3.0" - sources."esutils-2.0.3" - sources."etag-1.8.1" - sources."event-lite-0.1.3" - sources."event-source-polyfill-0.0.12" - sources."events-3.3.0" - sources."evp_bytestokey-1.0.3" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."ms-2.0.0" - ]; - }) - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."figgy-pudding-3.5.2" - sources."figures-2.0.0" - sources."file-uri-to-path-1.0.0" - sources."filesize-3.6.1" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."find-cache-dir-2.0.0" - (sources."find-up-2.1.0" // { - dependencies = [ - sources."locate-path-2.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - ]; - }) - sources."flatted-3.2.7" - sources."flush-write-stream-1.1.1" - sources."for-each-0.3.3" - sources."for-in-1.0.2" - sources."fragment-cache-0.2.1" - sources."fresh-0.5.2" - (sources."friendly-errors-webpack-plugin-1.7.0" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."supports-color-2.0.0" - ]; - }) - sources."from2-2.3.0" - sources."fs-extra-8.1.0" - sources."fs-write-stream-atomic-1.0.10" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" - sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" - sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.2.1" - sources."get-symbol-description-1.0.0" - sources."get-value-2.0.6" - sources."glob-7.1.2" - sources."glob-parent-5.1.2" - sources."globals-11.12.0" - sources."globalthis-1.0.3" - (sources."globby-6.1.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) - sources."gopd-1.0.1" - sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-ansi-2.0.0" - sources."has-bigints-1.0.2" - (sources."has-binary2-1.0.3" // { - dependencies = [ - sources."isarray-2.0.1" - ]; - }) - sources."has-cors-1.1.0" - sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - sources."safe-buffer-5.2.1" - ]; - }) - sources."hash.js-1.1.7" - sources."highlight.js-10.7.3" - sources."hmac-drbg-1.0.1" - sources."hoist-non-react-statics-2.5.5" - sources."hosted-git-info-2.8.9" - sources."html-entities-1.4.0" - sources."htmlescape-1.1.1" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - sources."http-status-1.0.1" - sources."https-browserify-1.0.0" - sources."ieee754-1.2.1" - sources."iferr-0.1.5" - sources."imurmurhash-0.1.4" - sources."indexof-0.0.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."int64-buffer-0.1.10" - sources."internal-slot-1.0.5" - sources."invariant-2.2.4" - sources."is-accessor-descriptor-1.0.0" - sources."is-array-buffer-3.0.2" - sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.4" - sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.2" - sources."is-buffer-1.1.6" - sources."is-callable-1.2.7" - sources."is-ci-1.2.1" - sources."is-core-module-2.13.0" - sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.5" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-4.0.3" - sources."is-negative-zero-2.0.2" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-number-object-1.0.7" - sources."is-path-cwd-1.0.0" - sources."is-path-in-cwd-1.0.1" - sources."is-path-inside-1.0.1" - sources."is-plain-object-2.0.4" - sources."is-regex-1.1.4" - sources."is-shared-array-buffer-1.0.2" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" - sources."is-weakref-1.0.2" - sources."is-windows-1.0.2" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isobject-3.0.1" - sources."js-levenshtein-1.1.6" - sources."js-tokens-4.0.0" - (sources."js-yaml-3.14.1" // { - dependencies = [ - sources."argparse-1.0.10" - ]; - }) - sources."jsesc-2.5.2" - sources."json-parse-better-errors-1.0.2" - sources."json-schema-traverse-0.4.1" - sources."json5-0.5.1" - sources."jsonfile-4.0.0" - sources."junk-1.0.3" - sources."kind-of-6.0.3" - sources."launch-editor-2.2.1" - sources."linkify-it-3.0.3" - (sources."load-json-file-2.0.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) - sources."loader-runner-2.4.0" - sources."loader-utils-1.1.0" - sources."locate-path-3.0.0" - sources."lodash-4.17.21" - sources."log-update-2.3.0" - sources."log4js-6.9.1" - sources."loose-envify-1.4.0" - sources."lru-cache-5.1.1" - sources."make-dir-1.3.0" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."markdown-it-12.3.2" - sources."markdown-it-anchor-5.3.0" - sources."markdown-it-deflist-2.1.0" - sources."markdown-it-emoji-1.4.0" - sources."markdown-it-footnote-3.0.3" - sources."markdown-it-task-lists-2.1.1" - sources."markdown-it-toc-done-right-4.2.0" - sources."maximatch-0.1.0" - sources."md-it-meta-0.0.2" - sources."md5.js-1.3.5" - sources."mdurl-1.0.1" - sources."memory-fs-0.4.1" - sources."micromatch-3.1.10" - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."mime-1.4.1" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-1.2.0" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.0" - sources."mississippi-3.0.0" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."mkdirp-0.5.6" // { - dependencies = [ - sources."minimist-1.2.8" - ]; - }) - sources."mkdirp-then-1.2.0" - sources."moment-2.29.4" - sources."move-concurrently-1.0.1" - sources."ms-2.1.2" - sources."msgpack-lite-0.1.26" - sources."nan-2.17.0" - sources."nanoid-1.2.1" - sources."nanomatch-1.2.13" - sources."negotiator-0.6.3" - sources."neo-async-2.6.2" - sources."next-7.0.3" - sources."next-routes-1.4.2" - sources."node-gyp-build-4.6.0" - (sources."node-libs-browser-2.2.1" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."node-releases-2.0.13" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."resolve-1.22.4" - ]; - }) - sources."normalize-path-3.0.0" - sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) - sources."object-inspect-1.12.3" - sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.assign-4.1.4" - sources."object.getownpropertydescriptors-2.1.6" - sources."object.pick-1.3.0" - sources."on-finished-2.3.0" - sources."once-1.4.0" - sources."onetime-2.0.1" - sources."os-browserify-0.3.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-map-1.2.0" - sources."p-try-2.2.0" - sources."pako-1.0.11" - sources."parallel-transform-1.2.0" - sources."parse-asn1-5.1.6" - sources."parse-json-2.2.0" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" - sources."pascalcase-0.1.1" - sources."path-browserify-0.0.1" - sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" - sources."path-parse-1.0.7" - sources."path-to-regexp-2.1.0" - (sources."path-type-2.0.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) - sources."pbkdf2-3.1.2" - sources."picocolors-1.0.0" - sources."picomatch-2.3.1" - sources."pify-3.0.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - (sources."pkg-dir-3.0.0" // { - dependencies = [ - sources."find-up-3.0.0" - ]; - }) - sources."plantuml-encoder-1.4.0" - sources."posix-character-classes-0.1.1" - sources."pretty-time-1.1.0" - sources."process-0.11.10" - sources."process-nextick-args-2.0.1" - sources."promise-7.3.1" - sources."promise-inflight-1.0.1" - sources."prop-types-15.6.2" - sources."prop-types-exact-1.2.0" - sources."prr-1.0.1" - sources."pseudomap-1.0.2" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."pump-3.0.0" - (sources."pumpify-1.5.1" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) - sources."punycode-2.3.0" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" - sources."randombytes-2.1.0" - sources."randomfill-1.0.4" - sources."range-parser-1.2.1" - sources."react-16.14.0" - sources."react-dom-16.14.0" - sources."react-error-overlay-4.0.0" - sources."read-pkg-2.0.0" - sources."readable-stream-2.3.8" - sources."readdirp-3.6.0" - (sources."recursive-copy-2.0.6" // { - dependencies = [ - sources."del-2.2.2" - sources."globby-5.0.0" - sources."pify-2.3.0" - ]; - }) - sources."reflect.ownkeys-0.2.0" - sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.1.0" - sources."regenerator-runtime-0.14.0" - (sources."regenerator-transform-0.15.2" // { - dependencies = [ - sources."@babel/runtime-7.22.10" - ]; - }) - sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.5.0" - sources."regexpu-core-5.3.2" - (sources."regjsparser-0.9.1" // { - dependencies = [ - sources."jsesc-0.5.0" - ]; - }) - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - sources."resolve-1.5.0" - sources."resolve-url-0.2.1" - sources."restore-cursor-2.0.0" - sources."ret-0.1.15" - sources."rfdc-1.3.0" - (sources."rimraf-2.7.1" // { - dependencies = [ - sources."glob-7.2.3" - ]; - }) - sources."ripemd160-2.0.2" - sources."run-queue-1.0.3" - (sources."safe-array-concat-1.0.0" // { - dependencies = [ - sources."isarray-2.0.5" - ]; - }) - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - sources."safe-regex-test-1.0.0" - sources."safer-buffer-2.1.2" - sources."scheduler-0.19.1" - sources."schema-utils-1.0.0" - sources."semver-5.7.2" - (sources."send-0.16.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."statuses-1.3.1" - ]; - }) - sources."serialize-javascript-1.4.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."setimmediate-1.0.5" - sources."setprototypeof-1.0.3" - sources."sha.js-2.4.11" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."shell-quote-1.8.1" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - sources."slash-1.0.0" - sources."slice-ansi-1.0.0" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."ms-2.0.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."socket.io-2.5.0" // { - dependencies = [ - sources."debug-4.1.1" - ]; - }) - sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.5.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."isarray-2.0.1" - sources."ms-2.0.0" - sources."socket.io-parser-3.3.3" - ]; - }) - (sources."socket.io-parser-3.4.3" // { - dependencies = [ - sources."component-emitter-1.2.1" - sources."debug-4.1.1" - sources."isarray-2.0.1" - ]; - }) - sources."source-list-map-2.0.1" - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.21" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."source-map-url-0.4.1" - 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."split-string-3.1.0" - sources."sprintf-js-1.0.3" - sources."ssri-6.0.2" - sources."stackframe-1.3.4" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."statuses-1.5.0" - sources."std-env-1.3.1" - sources."stream-browserify-2.0.2" - sources."stream-each-1.2.3" - sources."stream-http-2.8.3" - sources."stream-shift-1.0.1" - sources."streamroller-3.1.5" - sources."string-hash-1.1.3" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.1" - sources."strip-ansi-4.0.0" - ]; - }) - sources."string.prototype.trim-1.2.7" - sources."string.prototype.trimend-1.0.6" - sources."string.prototype.trimstart-1.0.6" - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-bom-3.0.0" - (sources."styled-jsx-3.1.0" // { - dependencies = [ - sources."convert-source-map-1.5.1" - sources."source-map-0.7.3" - ]; - }) - sources."stylis-3.5.3" - sources."stylis-rule-sheet-0.0.10" - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."table-4.0.3" - sources."tapable-1.1.3" - (sources."terser-3.16.1" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."through2-2.0.5" - sources."timers-browserify-2.0.12" - sources."to-array-0.1.4" - sources."to-arraybuffer-1.0.1" - sources."to-fast-properties-2.0.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" - sources."tslib-1.14.1" - sources."tty-browserify-0.0.0" - sources."typed-array-buffer-1.0.0" - sources."typed-array-byte-length-1.0.0" - sources."typed-array-byte-offset-1.0.0" - sources."typed-array-length-1.0.4" - sources."typedarray-0.0.6" - sources."uc.micro-1.0.6" - (sources."uglify-es-3.3.10" // { - dependencies = [ - sources."commander-2.14.1" - sources."source-map-0.6.1" - ]; - }) - (sources."uglifyjs-webpack-plugin-1.3.0" // { - dependencies = [ - sources."cacache-10.0.4" - sources."find-cache-dir-1.0.0" - sources."lru-cache-4.1.5" - sources."mississippi-2.0.0" - sources."pkg-dir-2.0.0" - sources."pump-2.0.1" - sources."schema-utils-0.4.7" - sources."source-map-0.6.1" - sources."ssri-5.3.0" - sources."yallist-2.1.2" - ]; - }) - sources."unbox-primitive-1.0.2" - sources."unfetch-3.0.0" - sources."unicode-canonical-property-names-ecmascript-2.0.0" - sources."unicode-match-property-ecmascript-2.0.0" - sources."unicode-match-property-value-ecmascript-2.1.0" - sources."unicode-property-aliases-ecmascript-2.1.0" - sources."union-value-1.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."universalify-0.1.2" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."upath-1.2.0" - sources."update-browserslist-db-1.0.11" - sources."uri-js-4.4.1" - sources."urix-0.1.0" - (sources."url-0.11.0" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) - sources."use-3.1.1" - sources."utf-8-validate-5.0.10" - (sources."util-0.11.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - sources."util-deprecate-1.0.2" - sources."util.promisify-1.1.2" - sources."uuid-3.4.0" - sources."validate-npm-package-license-3.0.4" - sources."vm-browserify-1.1.2" - sources."watchpack-1.7.5" - (sources."watchpack-chokidar2-2.0.1" // { - dependencies = [ - sources."anymatch-2.0.0" - sources."binary-extensions-1.13.1" - sources."chokidar-2.1.8" - sources."fsevents-1.2.13" - sources."glob-parent-3.1.0" - sources."is-binary-path-1.0.1" - sources."is-glob-3.1.0" - sources."normalize-path-2.1.1" - sources."readdirp-2.2.1" - ]; - }) - (sources."webpack-4.20.2" // { - dependencies = [ - sources."schema-utils-0.4.7" - sources."source-map-0.6.1" - sources."webpack-sources-1.4.3" - ]; - }) - (sources."webpack-dev-middleware-3.4.0" // { - dependencies = [ - sources."mime-2.6.0" - ]; - }) - sources."webpack-hot-middleware-2.22.3" - sources."webpack-log-2.0.0" - sources."webpack-merge-4.2.2" - (sources."webpack-sources-1.2.0" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."webpackbar-2.6.3" - sources."which-1.3.1" - sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.11" - sources."worker-farm-1.5.2" - (sources."wrap-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-3.0.1" - sources."strip-ansi-4.0.0" - ]; - }) - sources."wrappy-1.0.2" - (sources."write-file-webpack-plugin-4.3.2" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."ws-7.4.6" - sources."xmlhttprequest-ssl-1.6.3" - sources."xtend-4.0.2" - sources."y18n-4.0.3" - sources."yallist-3.1.1" - sources."yeast-0.1.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "markdown preview plugin for (neo)vim"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; mastodon-bot = nodeEnv.buildNodePackage { name = "mastodon-bot"; packageName = "mastodon-bot"; @@ -98426,374 +97313,6 @@ in bypassCache = true; reconstructLock = true; }; - near-cli = nodeEnv.buildNodePackage { - name = "near-cli"; - packageName = "near-cli"; - version = "3.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/near-cli/-/near-cli-3.4.2.tgz"; - sha512 = "0EaNAw5SKSIIJrJajG32CNMGfBtZTgIrOVKSXBTWpvo+F0OozsbvuO4UG3ZSRNThXHijxybp58SqPiU3JuzXGA=="; - }; - dependencies = [ - (sources."@babel/code-frame-7.22.10" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/helper-validator-identifier-7.22.5" - (sources."@babel/highlight-7.22.10" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@jest/environment-27.5.1" - sources."@jest/fake-timers-27.5.1" - sources."@jest/types-27.5.1" - sources."@ledgerhq/devices-8.0.7" - sources."@ledgerhq/errors-6.14.0" - sources."@ledgerhq/hw-transport-6.28.8" - sources."@ledgerhq/hw-transport-node-hid-6.27.21" - sources."@ledgerhq/hw-transport-node-hid-noevents-6.27.19" - (sources."@ledgerhq/hw-transport-u2f-5.36.0-deprecated" // { - dependencies = [ - sources."@ledgerhq/devices-5.51.1" - sources."@ledgerhq/errors-5.50.0" - sources."@ledgerhq/hw-transport-5.51.1" - sources."@ledgerhq/logs-5.50.0" - ]; - }) - (sources."@ledgerhq/hw-transport-webhid-5.51.1" // { - dependencies = [ - sources."@ledgerhq/devices-5.51.1" - sources."@ledgerhq/errors-5.50.0" - sources."@ledgerhq/hw-transport-5.51.1" - sources."@ledgerhq/logs-5.50.0" - ]; - }) - (sources."@ledgerhq/hw-transport-webusb-5.53.1" // { - dependencies = [ - sources."@ledgerhq/devices-5.51.1" - sources."@ledgerhq/errors-5.50.0" - sources."@ledgerhq/hw-transport-5.51.1" - sources."@ledgerhq/logs-5.50.0" - ]; - }) - sources."@ledgerhq/logs-6.10.1" - sources."@segment/loosely-validate-event-2.0.0" - sources."@sindresorhus/is-0.14.0" - sources."@sinonjs/commons-1.8.6" - sources."@sinonjs/fake-timers-8.1.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@types/istanbul-lib-coverage-2.0.4" - sources."@types/istanbul-lib-report-3.0.0" - sources."@types/istanbul-reports-3.0.1" - sources."@types/node-20.5.3" - sources."@types/stack-utils-2.0.1" - sources."@types/w3c-web-usb-1.0.6" - sources."@types/yargs-16.0.5" - sources."@types/yargs-parser-21.0.0" - sources."analytics-node-6.2.0" - sources."ansi-align-3.0.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."ascii-table-0.0.9" - sources."asynckit-0.4.0" - sources."axios-0.27.2" - sources."axios-retry-3.2.0" - sources."balanced-match-1.0.2" - sources."base-x-3.0.9" - sources."base64-js-1.5.1" - sources."bindings-1.5.0" - (sources."bip39-3.0.2" // { - dependencies = [ - sources."@types/node-11.11.6" - ]; - }) - sources."bip39-light-1.0.7" - sources."bl-4.1.0" - sources."bn.js-5.2.1" - sources."borsh-0.6.0" - sources."boxen-5.1.2" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."bs58-4.0.1" - sources."buffer-5.7.1" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) - sources."camelcase-6.3.0" - sources."capability-0.2.5" - sources."chalk-4.1.2" - sources."charenc-0.0.2" - sources."chownr-1.1.4" - sources."ci-info-2.0.0" - sources."cipher-base-1.0.4" - sources."cli-boxes-2.2.1" - sources."cliui-7.0.4" - sources."clone-response-1.0.3" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."combined-stream-1.0.8" - sources."component-type-1.2.1" - sources."concat-map-0.0.1" - sources."configstore-5.0.1" - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - sources."crypt-0.0.2" - sources."crypto-random-string-2.0.0" - (sources."debug-4.3.1" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - sources."decompress-response-3.3.0" - sources."deep-extend-0.6.0" - sources."deep-is-0.1.4" - sources."defer-to-connect-1.1.3" - sources."define-lazy-prop-2.0.0" - sources."delayed-stream-1.0.0" - sources."depd-2.0.0" - sources."detect-libc-2.0.2" - sources."dot-prop-5.3.0" - sources."duplexer3-0.1.5" - sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" - sources."error-polyfill-0.1.3" - sources."escalade-3.1.1" - sources."escape-goat-2.1.1" - sources."escape-string-regexp-1.0.5" - sources."events-3.3.0" - sources."expand-template-2.0.3" - sources."file-uri-to-path-1.0.0" - sources."fill-range-7.0.1" - sources."flagged-respawn-1.0.1" - sources."follow-redirects-1.15.2" - sources."form-data-4.0.0" - sources."fs-constants-1.0.0" - sources."fs.realpath-1.0.0" - sources."get-caller-file-2.0.5" - sources."get-stream-4.1.0" - sources."github-from-package-0.0.0" - sources."glob-7.2.3" - sources."global-dirs-3.0.1" - sources."got-9.6.0" - sources."graceful-fs-4.2.11" - sources."has-flag-4.0.0" - sources."has-yarn-2.1.0" - sources."hash-base-3.1.0" - sources."homedir-polyfill-1.0.3" - sources."http-cache-semantics-4.1.1" - (sources."http-errors-1.8.1" // { - dependencies = [ - sources."depd-1.1.2" - ]; - }) - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."import-lazy-2.1.0" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-2.0.0" - sources."ip-regex-4.3.0" - sources."is-buffer-1.1.6" - sources."is-ci-2.0.0" - sources."is-docker-2.2.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-installed-globally-0.4.0" - sources."is-npm-5.0.0" - sources."is-number-7.0.0" - sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" - sources."is-retry-allowed-1.2.0" - sources."is-typedarray-1.0.0" - sources."is-url-1.2.4" - sources."is-wsl-2.2.0" - sources."is-yarn-global-0.3.0" - sources."is2-2.0.9" - sources."jest-environment-node-27.5.1" - sources."jest-message-util-27.5.1" - sources."jest-mock-27.5.1" - (sources."jest-util-27.5.1" // { - dependencies = [ - sources."ci-info-3.8.0" - ]; - }) - sources."join-component-1.1.0" - sources."js-sha256-0.9.0" - sources."js-tokens-4.0.0" - sources."json-buffer-3.0.0" - sources."keyv-3.1.0" - sources."latest-version-5.1.0" - sources."lodash-4.17.21" - sources."lodash.isstring-4.0.1" - sources."lowercase-keys-1.0.1" - sources."lru-cache-6.0.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."md5-2.3.0" - sources."md5.js-1.3.5" - sources."micromatch-4.0.5" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-response-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-classic-0.5.3" - sources."ms-2.1.3" - sources."mustache-4.2.0" - sources."napi-build-utils-1.0.2" - sources."ncp-2.0.0" - (sources."near-api-js-0.44.2" // { - dependencies = [ - sources."bn.js-5.2.0" - ]; - }) - sources."near-hd-key-1.2.1" - sources."near-ledger-js-0.2.1" - sources."near-seed-phrase-0.2.0" - sources."node-abi-3.47.0" - sources."node-addon-api-3.2.1" - sources."node-fetch-2.6.13" - sources."node-gyp-build-4.6.0" - sources."node-hid-2.1.2" - sources."normalize-url-4.5.1" - sources."o3-1.0.3" - sources."once-1.4.0" - sources."open-8.4.2" - sources."p-cancelable-1.1.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."parse-passwd-1.0.0" - sources."path-is-absolute-1.0.1" - sources."pbkdf2-3.1.2" - sources."picomatch-2.3.1" - sources."platform-1.3.6" - sources."prebuild-install-7.1.1" - sources."prepend-http-2.0.0" - (sources."pretty-format-27.5.1" // { - dependencies = [ - sources."ansi-styles-5.2.0" - ]; - }) - sources."pump-3.0.0" - sources."pupa-2.1.1" - sources."randombytes-2.1.0" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."react-is-17.0.2" - sources."readable-stream-3.6.2" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" - sources."remove-trailing-slash-0.1.1" - sources."require-directory-2.1.1" - sources."responselike-1.0.2" - sources."rimraf-3.0.2" - sources."ripemd160-2.0.2" - sources."rxjs-6.6.7" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."semver-7.5.4" - (sources."semver-diff-3.1.1" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."setprototypeof-1.2.0" - sources."sha.js-2.4.11" - sources."signal-exit-3.0.7" - sources."simple-concat-1.0.1" - (sources."simple-get-4.0.1" // { - dependencies = [ - sources."decompress-response-6.0.0" - sources."mimic-response-3.1.0" - ]; - }) - sources."slash-3.0.0" - (sources."stack-utils-2.0.6" // { - dependencies = [ - sources."escape-string-regexp-2.0.0" - ]; - }) - sources."statuses-1.5.0" - sources."stoppable-1.1.0" - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-json-comments-2.0.1" - sources."supports-color-7.2.0" - sources."tar-fs-2.1.1" - sources."tar-stream-2.2.0" - sources."tcp-port-used-1.0.2" - sources."text-encoding-utf-8-1.0.2" - sources."to-readable-stream-1.0.0" - sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - sources."tr46-0.0.3" - sources."tslib-1.14.1" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-1.0.3" - sources."type-detect-4.0.8" - sources."type-fest-0.20.2" - sources."typedarray-to-buffer-3.1.5" - sources."u2f-api-0.2.7" - sources."u3-0.1.1" - sources."unique-string-2.0.0" - sources."update-notifier-5.1.0" - sources."url-parse-lax-3.0.0" - (sources."usb-2.9.0" // { - dependencies = [ - sources."node-addon-api-6.1.0" - ]; - }) - sources."util-deprecate-1.0.2" - sources."uuid-8.3.2" - sources."v8flags-3.2.0" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."widest-line-3.1.0" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."xdg-basedir-4.0.0" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "General purpose command line tools for interacting with NEAR Protocol"; - homepage = "https://github.com/near/near-cli#readme"; - license = "(MIT AND Apache-2.0)"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; neovim = nodeEnv.buildNodePackage { name = "neovim"; packageName = "neovim"; @@ -107651,666 +106170,6 @@ in bypassCache = true; reconstructLock = true; }; - swagger = nodeEnv.buildNodePackage { - name = "swagger"; - packageName = "swagger"; - version = "0.7.5"; - src = fetchurl { - url = "https://registry.npmjs.org/swagger/-/swagger-0.7.5.tgz"; - sha512 = "xUTG61hCAq4/nNoHE/5oYcXoP6CAb1zS9JB+Ps+355rYZHvU5Ecil1IK6H+Fn1R/JKXot0ND0Lpe4D3+41zMUA=="; - }; - dependencies = [ - sources."URIjs-1.16.1" - sources."abbrev-1.1.1" - sources."ansi-align-2.0.0" - sources."ansi-escapes-1.4.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - (sources."anymatch-2.0.0" // { - dependencies = [ - sources."normalize-path-2.1.1" - ]; - }) - sources."append-field-1.0.0" - sources."argparse-1.0.10" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-unique-0.3.2" - sources."asap-2.0.6" - sources."assign-symbols-1.0.0" - sources."async-1.5.2" - sources."async-each-1.0.6" - sources."asynckit-0.4.0" - sources."atob-2.1.2" - sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."binary-extensions-1.13.1" - sources."bindings-1.5.0" - (sources."body-parser-1.12.4" // { - dependencies = [ - sources."debug-2.2.0" - sources."depd-1.0.1" - sources."ee-first-1.1.0" - sources."ms-0.7.1" - sources."on-finished-2.2.1" - sources."qs-2.4.2" - ]; - }) - (sources."boxen-1.3.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."supports-color-5.5.0" - ]; - }) - sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) - sources."buffer-from-1.1.2" - (sources."busboy-0.2.14" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - sources."bytes-1.0.0" - sources."cache-base-1.0.1" - sources."call-bind-1.0.2" - sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.2" - sources."chalk-1.1.3" - sources."charenc-0.0.2" - sources."chokidar-2.1.8" - sources."ci-info-1.6.0" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."cli-boxes-1.0.0" - sources."cli-cursor-1.0.2" - sources."cli-width-1.1.1" - sources."clone-2.1.2" - sources."code-point-at-1.1.0" - sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."combined-stream-1.0.8" - sources."commander-2.20.3" - sources."component-emitter-1.3.0" - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."configstore-3.1.5" - sources."connect-3.7.0" - sources."content-type-1.0.5" - sources."cookiejar-2.1.4" - sources."copy-descriptor-0.1.1" - sources."core-js-2.6.12" - sources."core-util-is-1.0.3" - sources."create-error-class-3.0.2" - (sources."cross-spawn-5.1.0" // { - dependencies = [ - sources."lru-cache-4.1.5" - ]; - }) - sources."crypt-0.0.2" - sources."crypto-random-string-1.0.0" - sources."dag-map-1.0.2" - sources."debug-2.6.9" - sources."decode-uri-component-0.2.2" - sources."deep-extend-0.6.0" - sources."define-property-2.0.2" - sources."delayed-stream-1.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."dezalgo-1.0.4" - (sources."dicer-0.2.5" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - sources."diff-1.4.0" - sources."dot-prop-4.2.1" - sources."duplexer3-0.1.5" - sources."ee-first-1.1.1" - sources."encodeurl-1.0.2" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."etag-1.8.1" - sources."execa-0.7.0" - sources."exit-hook-1.1.1" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" - ]; - }) - sources."extend-3.0.0" - sources."extend-shallow-3.0.2" - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) - sources."fast-safe-stringify-2.1.1" - sources."figures-1.7.0" - sources."file-uri-to-path-1.0.0" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) - sources."finalhandler-1.1.2" - sources."for-in-1.0.2" - sources."form-data-4.0.0" - (sources."formidable-2.1.2" // { - dependencies = [ - sources."qs-6.11.2" - ]; - }) - sources."fragment-cache-0.2.1" - sources."fresh-0.5.2" - sources."fs-extra-0.24.0" - sources."fs.realpath-1.0.0" - sources."fsevents-1.2.13" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" - sources."get-stream-3.0.0" - sources."get-value-2.0.6" - sources."glob-7.2.3" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - sources."global-dirs-0.1.1" - sources."got-6.7.1" - sources."graceful-fs-4.2.11" - (sources."graphlib-2.1.8" // { - dependencies = [ - sources."lodash-4.17.21" - ]; - }) - sources."growl-1.9.2" - (sources."handlebars-4.7.8" // { - dependencies = [ - sources."minimist-1.2.8" - sources."source-map-0.6.1" - ]; - }) - sources."has-1.0.3" - sources."has-ansi-2.0.0" - sources."has-flag-3.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."hexoid-1.0.0" - (sources."http-errors-2.0.0" // { - dependencies = [ - sources."statuses-2.0.1" - ]; - }) - sources."iconv-lite-0.4.8" - sources."ignore-by-default-1.0.1" - sources."import-lazy-2.1.0" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."inquirer-0.10.1" - sources."is-accessor-descriptor-1.0.0" - sources."is-binary-path-1.0.1" - sources."is-buffer-1.1.6" - sources."is-ci-1.2.1" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-extendable-1.0.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."is-glob-4.0.3" - sources."is-installed-globally-0.1.0" - (sources."is-invalid-path-0.1.0" // { - dependencies = [ - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - ]; - }) - sources."is-npm-1.0.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-obj-1.0.1" - sources."is-path-inside-1.0.1" - sources."is-plain-object-2.0.4" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" - sources."is-valid-path-0.1.1" - sources."is-windows-1.0.2" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isobject-3.0.1" - (sources."jade-0.26.3" // { - dependencies = [ - sources."commander-0.6.1" - sources."mkdirp-0.3.0" - ]; - }) - sources."js-string-escape-1.0.1" - sources."js-yaml-3.14.1" - sources."json-refs-2.1.7" - (sources."json-schema-deref-sync-0.6.0" // { - dependencies = [ - sources."lodash-4.17.21" - ]; - }) - sources."jsonfile-2.4.0" - sources."kind-of-6.0.3" - sources."latest-version-3.1.0" - sources."lodash-3.10.1" - sources."lodash-compat-3.10.2" - sources."lodash._arraypool-2.4.1" - sources."lodash._basebind-2.4.1" - sources."lodash._baseclone-2.4.1" - sources."lodash._basecreate-2.4.1" - sources."lodash._basecreatecallback-2.4.1" - sources."lodash._basecreatewrapper-2.4.1" - sources."lodash._createwrapper-2.4.1" - sources."lodash._getarray-2.4.1" - sources."lodash._isnative-2.4.1" - sources."lodash._maxpoolsize-2.4.1" - sources."lodash._objecttypes-2.4.1" - sources."lodash._releasearray-2.4.1" - sources."lodash._setbinddata-2.4.1" - sources."lodash._shimkeys-2.4.1" - sources."lodash._slice-2.4.1" - sources."lodash.assign-2.4.1" - sources."lodash.bind-2.4.1" - sources."lodash.clonedeep-2.4.1" - sources."lodash.foreach-2.4.1" - sources."lodash.forown-2.4.1" - sources."lodash.get-4.4.2" - sources."lodash.identity-2.4.1" - sources."lodash.isarray-2.4.1" - sources."lodash.isequal-4.5.0" - sources."lodash.isfunction-2.4.1" - sources."lodash.isobject-2.4.1" - sources."lodash.keys-2.4.1" - sources."lodash.noop-2.4.1" - sources."lodash.support-2.4.1" - sources."lowercase-keys-1.0.1" - sources."lru-cache-2.7.3" - sources."make-dir-1.3.0" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."md5-2.2.1" - sources."media-typer-0.3.0" - sources."memory-cache-0.2.0" - sources."methods-1.1.2" - sources."micromatch-3.1.10" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."minimatch-3.1.2" - sources."minimist-0.0.8" - sources."mixin-deep-1.3.2" - sources."mkdirp-0.5.1" - (sources."mocha-2.5.3" // { - dependencies = [ - sources."commander-2.3.0" - sources."debug-2.2.0" - sources."escape-string-regexp-1.0.2" - sources."glob-3.2.11" - sources."minimatch-0.3.0" - sources."ms-0.7.1" - sources."supports-color-1.2.0" - ]; - }) - sources."mpath-0.5.2" - sources."ms-2.0.0" - (sources."multer-1.4.4" // { - dependencies = [ - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - ]; - }) - sources."mute-stream-0.0.5" - sources."nan-2.17.0" - sources."nanomatch-1.2.13" - sources."native-promise-only-0.8.1" - sources."neo-async-2.6.2" - (sources."nodemon-1.19.4" // { - dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" - sources."supports-color-5.5.0" - ]; - }) - sources."nopt-1.0.10" - sources."normalize-path-3.0.0" - sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) - sources."object-inspect-1.12.3" - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" - sources."on-finished-2.3.0" - sources."once-1.4.0" - sources."onetime-1.1.0" - sources."p-finally-1.0.0" - sources."package-json-4.0.1" - sources."parseurl-1.3.3" - sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" - sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" - (sources."path-loader-1.0.12" // { - dependencies = [ - sources."debug-4.3.4" - sources."lru-cache-6.0.0" - sources."mime-2.6.0" - sources."ms-2.1.2" - sources."qs-6.11.2" - sources."readable-stream-3.6.2" - sources."semver-7.5.4" - sources."superagent-7.1.6" - sources."yallist-4.0.0" - ]; - }) - (sources."path-to-regexp-1.8.0" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) - sources."pify-3.0.0" - sources."posix-character-classes-0.1.1" - sources."prepend-http-1.0.4" - sources."process-nextick-args-2.0.1" - sources."pseudomap-1.0.2" - sources."pstree.remy-1.1.8" - sources."punycode-2.3.0" - sources."qs-4.0.0" - sources."range-parser-1.2.1" - (sources."raw-body-2.0.2" // { - dependencies = [ - sources."bytes-2.1.0" - ]; - }) - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.8" - ]; - }) - sources."readable-stream-2.3.8" - sources."readdirp-2.2.1" - sources."readline2-1.0.1" - sources."reduce-component-1.0.1" - sources."regex-not-1.0.2" - sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - sources."resolve-url-0.2.1" - sources."restore-cursor-1.0.1" - sources."ret-0.1.15" - sources."rimraf-2.7.1" - sources."run-async-0.1.0" - sources."rx-lite-3.1.2" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - sources."sanitize-filename-1.6.3" - sources."semver-5.7.2" - sources."semver-diff-2.1.0" - (sources."send-0.18.0" // { - dependencies = [ - sources."ms-2.1.3" - sources."on-finished-2.4.1" - sources."statuses-2.0.1" - ]; - }) - sources."serve-static-1.15.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) - sources."setprototypeof-1.2.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."side-channel-1.0.4" - sources."sigmund-1.0.1" - sources."signal-exit-3.0.7" - sources."slash-1.0.0" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.1" - sources."spark-md5-1.0.1" - sources."split-string-3.1.0" - sources."sprintf-js-1.0.3" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."statuses-1.5.0" - sources."streamsearch-0.1.2" - sources."string-3.3.3" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.1" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - ]; - }) - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-eof-1.0.0" - sources."strip-json-comments-2.0.1" - (sources."superagent-1.8.5" // { - dependencies = [ - sources."component-emitter-1.2.1" - sources."cookiejar-2.0.6" - sources."form-data-1.0.0-rc3" - sources."formidable-1.0.17" - sources."isarray-0.0.1" - sources."mime-1.3.4" - sources."qs-2.3.3" - sources."readable-stream-1.0.27-1" - sources."string_decoder-0.10.31" - ]; - }) - sources."supports-color-2.0.0" - sources."swagger-converter-0.2.0" - sources."swagger-editor-2.10.5" - (sources."swagger-test-templates-1.6.0" // { - dependencies = [ - sources."lodash-4.17.21" - ]; - }) - (sources."swagger-tools-0.9.16" // { - dependencies = [ - sources."swagger-converter-0.1.7" - ]; - }) - sources."term-size-1.2.0" - sources."through-2.3.8" - sources."timed-out-4.0.1" - sources."to-iso-string-0.0.2" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" - sources."toidentifier-1.0.1" - sources."touch-3.1.0" - sources."traverse-0.6.7" - sources."truncate-utf8-bytes-1.0.2" - sources."type-is-1.6.18" - sources."typedarray-0.0.6" - sources."uglify-js-3.17.4" - sources."undefsafe-2.0.5" - (sources."union-value-1.0.1" // { - dependencies = [ - sources."is-extendable-0.1.1" - ]; - }) - sources."unique-string-1.0.0" - sources."unpipe-1.0.0" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."unzip-response-2.0.1" - sources."upath-1.2.0" - (sources."update-notifier-2.5.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."supports-color-5.5.0" - ]; - }) - sources."uri-js-3.0.2" - sources."urix-0.1.0" - sources."url-parse-lax-1.0.0" - sources."use-3.1.1" - sources."utf8-byte-length-1.0.4" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."valid-url-1.0.9" - sources."validator-10.11.0" - sources."which-1.3.1" - sources."widest-line-2.0.1" - sources."wordwrap-1.0.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.3" - sources."xdg-basedir-3.0.0" - sources."xtend-4.0.2" - sources."yallist-2.1.2" - sources."z-schema-3.25.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "The Swagger command-line. Provides Swagger utilities and project lifecycle support."; - homepage = "https://github.com/swagger-api/swagger-node#readme"; - license = "Apache 2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; tailwindcss = nodeEnv.buildNodePackage { name = "tailwindcss"; packageName = "tailwindcss"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index c58c474e5a2d..036b73c3e8b3 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -204,14 +204,6 @@ final: prev: { ''; }); - near-cli = prev.near-cli.override { - nativeBuildInputs = with pkgs; [ - libusb1 - final.prebuild-install - final.node-gyp-build - pkg-config - ]; - }; node-gyp = prev.node-gyp.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; diff --git a/pkgs/development/ocaml-modules/pp_loc/default.nix b/pkgs/development/ocaml-modules/pp_loc/default.nix new file mode 100644 index 000000000000..147dd49f5d84 --- /dev/null +++ b/pkgs/development/ocaml-modules/pp_loc/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "pp_loc"; + version = "2.1.0"; + + minimalOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/Armael/pp_loc/releases/download/v${version}/pp_loc-${version}.tbz"; + hash = "sha256-L3NlBdQx6BpP6FGtMQ/ynsTNIMj9N+8FDZ5vEFC6p8s="; + }; + + doCheck = true; + + meta = { + description = "Quote and highlight input fragments at a given source location"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://armael.github.io/pp_loc/pp_loc/"; + }; +} diff --git a/pkgs/development/php-packages/memcache/default.nix b/pkgs/development/php-packages/memcache/default.nix new file mode 100644 index 000000000000..6cb205c61ff6 --- /dev/null +++ b/pkgs/development/php-packages/memcache/default.nix @@ -0,0 +1,31 @@ +{ buildPecl, lib, fetchFromGitHub, php, zlib, pkg-config }: + +buildPecl rec { + pname = "memcache"; + version = "8.2"; + + src = fetchFromGitHub { + owner = "websupport-sk"; + repo = "pecl-memcache"; + rev = version; + hash = "sha256-77GvQ59XUpIZmdYZP6IhtjdkYwXKuNBSG+LBScz2BtI="; + }; + + internalDeps = [ + php.extensions.session + ]; + + configureFlags = [ + "--with-zlib-dir=${zlib.dev}" + ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ zlib ]; + + meta = with lib; { + description = "PHP extension for interfacing with memcached"; + license = licenses.php301; + homepage = "https://github.com/websupport-sk/pecl-memcache"; + maintainers = teams.php.members ++ [ maintainers.krzaczek ]; + }; +} diff --git a/pkgs/development/python-modules/acunetix/default.nix b/pkgs/development/python-modules/acunetix/default.nix new file mode 100644 index 000000000000..b28a6beefbc7 --- /dev/null +++ b/pkgs/development/python-modules/acunetix/default.nix @@ -0,0 +1,42 @@ +{ lib +, aiofiles +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "acunetix"; + version = "0.0.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "hikariatama"; + repo = "acunetix"; + # https://github.com/hikariatama/acunetix/issues/1 + rev = "67584746731b9f7abd1cf10ff8161eb3085800ce"; + hash = "sha256-ycdCz8CNSP0USxv657jf6Vz4iF//reCeO2tG+und86A="; + }; + + propagatedBuildInputs = [ + aiofiles + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "acunetix" + ]; + + meta = with lib; { + description = "Acunetix Web Vulnerability Scanner SDK for Python"; + homepage = "https://github.com/hikariatama/acunetix"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix index 0095813f32cf..f1bee9f07ea1 100644 --- a/pkgs/development/python-modules/aioaladdinconnect/default.nix +++ b/pkgs/development/python-modules/aioaladdinconnect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioaladdinconnect"; - version = "0.1.57"; + version = "0.1.58"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "AIOAladdinConnect"; inherit version; - hash = "sha256-NPcrGViqrUcjuzqmsI0bXxqxcyoZ9Xp/5z4BPemdjrY="; + hash = "sha256-ymynaOKvnqqHIEuQc+5CagsaH5cHnQit8ileoUO6G+I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index e083abc1d7ea..afe7223f91f5 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.0.2"; + version = "3.0.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-EE8+VoZ755wd8s3Gm0lziu+1r4rAFgdjEtqI0apoZ7E="; + hash = "sha256-6fNsiHddnsdjei0/wqx5ifWhM3bALlYG5Gli69+FmnM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index f0ad237f9208..2a6c040afefb 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "0.0.8"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiovodafone"; rev = "refs/tags/v${version}"; - hash = "sha256-o21zaK3dJfURFAt8fPaOd95H7tuqLnFPC01RGHBIz4M="; + hash = "sha256-KIYVGPJSOWEWXuYQXmRgtXwL3kI371jvx7vbfTni2jI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 479ff401a425..b6c88d2df162 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "4.1.8"; + version = "4.1.10"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9YE19dEj4I/bfhGEm4KUXhkA+MiZughZ1LQbJcdsqVU="; + hash = "sha256-K+jHtRDS4V7tHp70QyCdZ9muyPQnAmuIk21FNf9Zhj0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix index 556d26b29f08..bdc296f432a0 100644 --- a/pkgs/development/python-modules/argh/default.nix +++ b/pkgs/development/python-modules/argh/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "argh"; - version = "0.28.1"; + version = "0.29.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-sgkwhvDoCaPswktkohRTCe6PVtA0k2zVnlfFWKNXMp0="; + hash = "sha256-WOQ4zpFpqqLm3hR+POs0zqz+JlVqIwb1Di1G9Sd5rLE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/autoslot/default.nix b/pkgs/development/python-modules/autoslot/default.nix new file mode 100644 index 000000000000..c234b35e0e58 --- /dev/null +++ b/pkgs/development/python-modules/autoslot/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "autoslot"; + version = "2022.12.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "cjrh"; + repo = "autoslot"; + rev = "refs/tags/v${version}"; + hash = "sha256-fG4rRwRubJt2aXChEsMybEKal6LscZI7GA2uwtK5Vtg="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'requires = ["flit"]' 'requires = ["flit_core"]' \ + --replace 'build-backend = "flit.buildapi"' 'build-backend = "flit_core.buildapi"' + ''; + + nativeBuildInputs = [ + flit-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "autoslot" + ]; + + meta = with lib; { + description = "Automatic __slots__ for your Python classes"; + homepage = "https://github.com/cjrh/autoslot"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index 401037eb3dd7..5e84af2a53b7 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "3.1.2"; + version = "3.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-q+J4PUBm42jBcLbiywWwDZxUI0Gsl8GjnLPwniWp+Kw="; + hash = "sha256-Nd/9mUtEEhCiJSF677lsE5UhMrbWiIl3ktQ7FjtyYlQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index b631846b5e43..f681ca357d81 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.16.0"; + version = "0.16.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gbnsTRiT/4YumyaJ1h4VRzDAf8/oSkD3yL9mdACvWWk="; + hash = "sha256-GJhrL6J/L1+tqa7fN5xwE+8IFZZ9kff2g+04H5M7beY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 3b7234cdc955..adca1fe308b0 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -1,43 +1,68 @@ -{ buildPythonPackage +{ lib +, stdenv +, buildPythonPackage , fetchPypi -, futures ? null -, isPy27 -, isPyPy +, fetchFromGitHub +, pythonOlder +, substituteAll +, colorama +, contourpy , jinja2 -, lib , mock , numpy , nodejs , packaging +, pandas , pillow -#, pytestCheckHook# -, pytest -, python-dateutil -, pyyaml -, selenium -, six -, substituteAll , tornado -, typing-extensions -, pytz -, flaky -, networkx +, pytestCheckHook +, pyyaml +, setuptools +, setuptools-git-versioning +, xyzservices , beautifulsoup4 -, requests +, channels +, click +, colorcet +, coverage +, firefox +, geckodriver +, isort +, json5 , nbconvert -, icalendar -, pandas -, pythonImportsCheckHook +, networkx +, psutil +, pygments +, pygraphviz +, pytest +, pytest-asyncio +, pytest-xdist +, pytest-timeout +, requests +, scipy +, selenium +, toml +, typing-extensions }: buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "2.4.3"; + version = "3.2.2"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM="; + hash = "sha256-spWbhSTWnsTniGvDZAdEXwqS4fGVMNO/xARSNqG3pv8="; + }; + + src_test = fetchFromGitHub { + owner = "bokeh"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-PK9iLOCcivr4oF9Riq73dzxGfxzWRk3bdrCCpRrTv5g="; }; patches = [ @@ -48,48 +73,58 @@ buildPythonPackage rec { }) ]; - disabled = isPyPy || isPy27; - nativeBuildInputs = [ - pythonImportsCheckHook - ]; - - pythonImportsCheck = [ - "bokeh" + colorama + nodejs + setuptools + setuptools-git-versioning ]; nativeCheckInputs = [ - mock - pytest - pillow - selenium - pytz - flaky - networkx + pytestCheckHook beautifulsoup4 - requests + channels + click + colorcet + coverage + firefox + geckodriver + isort + json5 nbconvert - icalendar - pandas + networkx + psutil + pygments + pygraphviz + pytest + pytest-asyncio + pytest-xdist + pytest-timeout + requests + scipy + selenium + toml + typing-extensions ]; propagatedBuildInputs = [ - pillow jinja2 - python-dateutil - six - pyyaml - tornado + contourpy numpy packaging - typing-extensions - ] - ++ lib.optionals ( isPy27 ) [ - futures + pandas + pillow + pyyaml + tornado + xyzservices ]; - # This test suite is a complete pain. Somehow it can't find its fixtures. - doCheck = false; + doCheck = false; # need more work + pytestFlagsArray = "tests/test_defaults.py"; + pythonImportsCheck = [ "bokeh" ]; + preCheck = '' + cp -rv ''${src_test}/tests/* ./tests/ + ''; meta = { description = "Statistical and novel interactive HTML plots for Python"; diff --git a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch index f8f33c0021f2..4ebfc7e3f2d6 100644 --- a/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch +++ b/pkgs/development/python-modules/bokeh/hardcode-nodejs-npmjs-paths.patch @@ -1,9 +1,8 @@ -diff --git a/bokeh/util/compiler.py b/bokeh/util/compiler.py -index a752aad7d..8af05ff63 100644 ---- a/bokeh/util/compiler.py -+++ b/bokeh/util/compiler.py -@@ -442,8 +442,8 @@ def _detect_nodejs(): - raise RuntimeError('node.js v%s or higher is needed to allow compilation of custom models ' % version + +diff -ru a/src/bokeh/util/compiler.py b/src/bokeh/util/compiler.py +--- a/src/bokeh/util/compiler.py ++++ b/src/bokeh/util/compiler.py +@@ -411,8 +411,8 @@ + raise RuntimeError(f'node.js v{version_repr} or higher is needed to allow compilation of custom models ' + '("conda install nodejs" or follow https://nodejs.org/en/download/)') -_nodejs = None @@ -11,5 +10,5 @@ index a752aad7d..8af05ff63 100644 +_nodejs = "@node_bin@" +_npmjs = "@npm_bin@" - def _nodejs_path(): + def _nodejs_path() -> str: global _nodejs diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index cec151526074..d9dbcf86fe53 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "9.5.0"; + version = "9.8.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-amMUgRXtvcrALfWwat7W0W60FJQnEeMvHhyxxBCMqUg="; + hash = "sha256-hUx+dUx0Lkz6sEZizHqH8ONk2r19D9MIVuefhBmjEiQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index bec651629d7f..c956c4acb1e2 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.0.0"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Dzr7CSoJhO/F75Ro686lKXCOzP2AxtR6wJOp70IOvUk="; + hash = "sha256-47Z8szHVBz8Sx7g+WiKfLzg3MIFTyMjPLDlgGfPb//U="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/diffsync/default.nix b/pkgs/development/python-modules/diffsync/default.nix new file mode 100644 index 000000000000..81c3b5c7eda4 --- /dev/null +++ b/pkgs/development/python-modules/diffsync/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, colorama +, fetchFromGitHub +, packaging +, poetry-core +, pydantic +, redis +, structlog +}: + +buildPythonPackage rec { + pname = "diffsync"; + version = "1.8.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "networktocode"; + repo = "diffsync"; + rev = "refs/tags/v${version}"; + hash = "sha256-2OhckgJK1qimF0AcYSa8L+AkzfiN5VojWj0x6kwbgyk="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + colorama + packaging + pydantic + redis + structlog + ]; + + pythonImportsCheck = [ + "diffsync" + ]; + + meta = with lib; { + description = "Utility library for comparing and synchronizing different datasets"; + homepage = "https://github.com/networktocode/diffsync"; + changelog = "https://github.com/networktocode/diffsync/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ clerie ]; + }; +} diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 7a288582e935..252c602f9371 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "1.0.2"; + version = "1.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = "refs/tags/${version}"; - hash = "sha256-DfC92gqPP9Lky4gX2v8/AbZgM7uRCKjRQC2nS/sDHsY="; + hash = "sha256-enYo2hZ1C8jqO+8xZhSmIOJQAyrtVUJ9S/e2Bxzhv0I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index f50b07371ffb..b6148c30746c 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.17.0"; + version = "2.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/q+th07TdqnR8Imer8llDSH9siKPkN6bh0GoBsITtCI="; + hash = "sha256-Y7MbZ23LJ4amUNI9Mk2PiGxOFFhq/dDP5uJgpz8SRI4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index e94498a5c6d9..c94cda768501 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.36.1"; + version = "0.36.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-miv7CDpBJ5hUyPzQWLqSndmUYR9Lmaonrilod6uhBo8="; + hash = "sha256-21u6QnmFoa3rCeFMkxdEh4OYtE4QmBr5O9PwV5tKgxg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index 29cbed491c1c..12295ec629f1 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.7.1"; + version = "0.7.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-biQEAuRxz8q0d40IFElf06Iu6RzwikV4kYZOoj9gbWA="; + hash = "sha256-edZ8Y2fk2Kfhjs/c44vP55uPsFCnDt+wiD+q9821y7U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 46c7ab88248a..e194cfa06086 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "intake"; - version = "0.7.0"; + version = "unstable-2023-08-24"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -34,8 +34,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-2LUblA8eVCOfVJ6BJayralNiv6EFt6MzR5ptKksVNA4="; + rev = "81b1567a2030adfb22b856b4f63cefe35de68983"; + hash = "sha256-S2PoUN0Bao5VULfHhgbXXowopPLm/njAHO3dIM8ILno="; }; propagatedBuildInputs = [ @@ -79,6 +79,8 @@ buildPythonPackage rec { --replace "'pytest-runner'" "" ''; + __darwinAllowLocalNetworking = true; + preCheck = '' export HOME=$(mktemp -d); export PATH="$PATH:$out/bin"; @@ -106,7 +108,7 @@ buildPythonPackage rec { "test_ndarray" "test_python" # Timing-based, flaky on darwin and possibly others - "TestServerV1Source.test_idle_timer" + "test_idle_timer" # arrow-cpp-13 related "test_read" "test_pickle" diff --git a/pkgs/development/python-modules/ipymarkup/default.nix b/pkgs/development/python-modules/ipymarkup/default.nix new file mode 100644 index 000000000000..1731c3c2075b --- /dev/null +++ b/pkgs/development/python-modules/ipymarkup/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, intervaltree +}: + +buildPythonPackage rec { + pname = "ipymarkup"; + version = "0.9.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-P0v6EP1mKTIBr4SEp+a8tyO/LjPZpqoAiCZxr5yiaRE="; + }; + + propagatedBuildInputs = [ intervaltree ]; + pythonImportCheck = [ "ipymarkup" ]; + + # Upstream has no tests: + doCheck = false; + + meta = with lib; { + description = "Collection of NLP visualizations for NER and syntax tree markup"; + homepage = "https://github.com/natasha/ipymarkup"; + license = licenses.mit; + maintainers = with maintainers; [ npatsakula ]; + }; +} diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix new file mode 100644 index 000000000000..1e75776f0c32 --- /dev/null +++ b/pkgs/development/python-modules/litellm/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, importlib-metadata +, openai +, python-dotenv +, tiktoken +}: +let + version = "0.1.590"; +in +buildPythonPackage rec { + pname = "litellm"; + format = "pyproject"; + inherit version; + + src = fetchFromGitHub { + owner = "BerriAI"; + repo = "litellm"; + rev = "7cb96e86b4753008cbf8d116aca514750e98d360"; + hash = "sha256-ITMcwGjelNfNGnfBmmdu0Xwph4u0mxiFSfHnysUxWCQ="; + }; + + postPatch = '' + rm -rf dist + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + importlib-metadata + openai + python-dotenv + tiktoken + ]; + + # the import check phase fails trying to do a network request to openai + # pythonImportsCheck = [ "litellm" ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "Use any LLM as a drop in replacement for gpt-3.5-turbo. Use Azure, OpenAI, Cohere, Anthropic, Ollama, VLLM, Sagemaker, HuggingFace, Replicate (100+ LLMs)"; + homepage = "https://github.com/BerriAI/litellm"; + license = licenses.mit; + changelog = "https://github.com/BerriAI/litellm/releases/tag/v${version}"; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/livelossplot/default.nix b/pkgs/development/python-modules/livelossplot/default.nix index 74047e657dd1..dd7a19c22484 100644 --- a/pkgs/development/python-modules/livelossplot/default.nix +++ b/pkgs/development/python-modules/livelossplot/default.nix @@ -13,18 +13,15 @@ buildPythonPackage rec { pname = "livelossplot"; - version = "0.5.4"; + version = "0.5.5"; disabled = pythonOlder "3.6"; - # version number in source is wrong in this release - postPatch = ''substituteInPlace ${pname}/version.py --replace "0.5.3" "0.5.4"''; - src = fetchFromGitHub { owner = "stared"; repo = pname; rev = "v${version}"; - sha256 = "IV6YAidoqVoKvpy+LNNHTPpobiDoGX59bHqJcBtaydk="; + sha256 = "sha256-YU8vX4SubI6txmC/i5fOjcvWfuDFm8+SPmie8Eb1qRs="; }; propagatedBuildInputs = [ bokeh ipython matplotlib numpy ]; diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index b7afeffe9d86..3bf71e64642d 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.6.2"; + version = "1.6.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-zbF+fqgXb8BAN+Nf2pRV/SeOXnJXLXJBIWZyZ6a9zP4="; + hash = "sha256-jppuuzROhVqNHm44gITpnC+xSN4s3ueY00N9v+IoJfE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/natasha/default.nix b/pkgs/development/python-modules/natasha/default.nix new file mode 100644 index 000000000000..ca49c2653b68 --- /dev/null +++ b/pkgs/development/python-modules/natasha/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pymorphy2 +, razdel +, navec +, slovnet +, yagry +, ipymarkup +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "natasha"; + version = "1.6.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Rgguazgq06a8B9jeRnfHD5VTR+Xrd+8OCsQUfaGLEq0="; + }; + + propagatedBuildInputs = [ pymorphy2 navec razdel slovnet yagry ipymarkup ]; + + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tests/" ]; + pythonImportCheck = [ "natasha" ]; + + meta = with lib; { + description = "NLP framework for Russian language"; + homepage = "https://github.com/natasha/natasha"; + license = licenses.mit; + maintainers = with maintainers; [ npatsakula ]; + }; +} diff --git a/pkgs/development/python-modules/navec/default.nix b/pkgs/development/python-modules/navec/default.nix new file mode 100644 index 000000000000..02a55e5d6619 --- /dev/null +++ b/pkgs/development/python-modules/navec/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, razdel +, gensim +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "navec"; + version = "0.10.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-TyNHSxwnmvbGBfhOeHPofEfKWLDFOKP50w2QxgnJ/SE="; + }; + + propagatedBuildInputs = [ numpy razdel ]; + nativeCheckInputs = [ pytestCheckHook gensim ]; + # TODO: remove when gensim usage will be fixed in `navec`. + disabledTests = [ "test_gensim" ]; + pythonImportCheck = [ "navec" ]; + + meta = with lib; { + description = "Compact high quality word embeddings for Russian language"; + homepage = "https://github.com/natasha/navec"; + license = licenses.mit; + maintainers = with maintainers; [ npatsakula ]; + }; +} diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index bee05b436cdc..c1f43e64f8f0 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.5.0"; + version = "1.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uUw48EBUpEUw+A8wxw3qXrnqmFWQzg/zb+8qAGRSlUw="; + hash = "sha256-ocajE7E4xIatEmv58/9gEpWF2plJdiZXjk6ajD2vTzw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 0af1060b5d00..3df9474d3780 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "panel"; - version = "0.14.4"; + version = "1.2.2"; format = "wheel"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-3U/PL8cnbNPw3xEM56YZesQEDXTE79yMCSsjdxwfUU0="; + hash = "sha256-RMRjxcUp6MTs001wdNfC/e6diOcgtqrSaVIOSQfPgTs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index f48ffb81e586..a003c2bf464f 100644 --- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pipenv-poetry-migrate"; - version = "0.4.0"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-QNp+KYOJIKV1fROmIhnWgDXFU8CymXkS2p90bOEPeoQ="; + hash = "sha256-z5pBkB5J8FnuebMW4bPpk0cT2nd5bH/4PBR12g0lEQw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 080ba047ad82..ae20790af63c 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.8.5"; + version = "23.9.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mWnQIQEG1kTytAarhdNf2AI2Sq4TSfNtCN3riklNAeQ="; + hash = "sha256-7AU2K4XQ7B29IY53+uh0yre8RaOZ2GFc8hpyLWQilTE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index 386bf8179ae1..d8a28d81fcb4 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "python-ironicclient"; - version = "5.3.0"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - hash = "sha256-veDhwpSXPtoi27tKI6xebH4haAeq+sUsEEk9TxQSbg4="; + hash = "sha256-Q9yGuYf9TS7RCo9aV1hnNSrHoll7AOUiSpzRYxi+JXU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix index d45febae139c..51385c464342 100644 --- a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix +++ b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix @@ -2,20 +2,38 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm , ujson }: buildPythonPackage rec { pname = "python-lsp-jsonrpc"; - version = "1.0.0"; + version = "1.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-lsp"; repo = pname; - rev = "v${version}"; - sha256 = "0h4bs8s4axcm0p02v59amz9sq3nr4zhzdgwq7iaw6awl27v1hd0i"; + rev = "refs/tags/v${version}"; + hash = "sha256-XTvnDTaP5oweGSq1VItq+SEv7S/LrQq4YP1XQc3bxbk="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov-report html --cov-report term --junitxml=pytest.xml --cov pylsp_jsonrpc --cov test" "" + ''; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ ujson ]; @@ -24,17 +42,14 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ - --replace "--cov pylsp_jsonrpc --cov test" "" - ''; - - pythonImportsCheck = [ "pylsp_jsonrpc" ]; + pythonImportsCheck = [ + "pylsp_jsonrpc" + ]; meta = with lib; { - description = "Python server implementation of the JSON RPC 2.0 protocol."; + description = "Python server implementation of the JSON RPC 2.0 protocol"; homepage = "https://github.com/python-lsp/python-lsp-jsonrpc"; + changelog = "https://github.com/python-lsp/python-lsp-jsonrpc/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 2dca97b7f858..a74ebb5b5bb9 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -4,9 +4,9 @@ , buildPythonPackage , docstring-to-markdown , fetchFromGitHub -, fetchpatch , flake8 , flaky +, importlib-metadata , jedi , matplotlib , mccabe @@ -19,9 +19,9 @@ , pylint , pyqt5 , pytestCheckHook -, pythonRelaxDepsHook , python-lsp-jsonrpc , pythonOlder +, pythonRelaxDepsHook , rope , setuptools , setuptools-scm @@ -35,27 +35,18 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.7.4"; + version = "1.8.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-plciPUROFileVULGBZpwUTkW2NZVHy4Nuf4+fSjd8nM="; + hash = "sha256-hLgMGZumuNY70/qyD9t5pMpYI/g70sqFIt1LEfIEALY="; }; - 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 \ --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ @@ -86,6 +77,8 @@ buildPythonPackage rec { python-lsp-jsonrpc setuptools # `pkg_resources`imported in pylsp/config/config.py ujson + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index e9ec506d6d4b..65dc66a3fc7a 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.10.6"; + version = "4.20.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vO60QMr+J3tE7ZIU7fZP27jMuPeCJH56Hbhjek5ZfXI="; + hash = "sha256-d4pMswABy/KFO2adwufSRRsj879O894nphh3MEjZOl0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/razdel/default.nix b/pkgs/development/python-modules/razdel/default.nix new file mode 100644 index 000000000000..c870ba819ba1 --- /dev/null +++ b/pkgs/development/python-modules/razdel/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "razdel"; + version = "0.5.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-QzTA/f401OiIzw7YVJaMnfFPClR9+Qmnf0Y0+f/mJuY="; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "razdel" ]; + pythonImportCheck = [ "razdel" ]; + + meta = with lib; { + description = "Rule-based system for Russian sentence and word tokenization"; + homepage = "https://github.com/natasha/razdel"; + license = licenses.mit; + maintainers = with maintainers; [ npatsakula ]; + }; +} diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 39e1aa5154d8..b14c9f29fbb8 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -26,16 +26,16 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.177.1"; + version = "2.184.0.post0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-Jqbk3DiV5K+TRXXSgCdoqjvddh6V2qc7mf7LotJdqys="; + hash = "sha256-gQQsHJ9b5ZbbPW0nJRdudSwaL+Hc8kwBpK9um8QWQio="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix index b1fb11573eb7..7cf4f9943992 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "scikit-build-core"; - version = "0.4.8"; + version = "0.5.0"; format = "pyproject"; src = fetchPypi { pname = "scikit_build_core"; inherit version; - hash = "sha256-n6wcrBo4uhFoGQt72Y9irs8GzUbbcYXsjCeyfg2krUs="; + hash = "sha256-pCqVAps0tc+JKFU0LZuURcd0y3l/yyTI/EwvtCsY38o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/simplefix/default.nix b/pkgs/development/python-modules/simplefix/default.nix index 9a5ce3ec4c8c..1f90a3b0ef97 100644 --- a/pkgs/development/python-modules/simplefix/default.nix +++ b/pkgs/development/python-modules/simplefix/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "simplefix"; - version = "1.0.15"; + version = "1.0.16"; src = fetchFromGitHub { repo = "simplefix"; owner = "da4089"; - rev = "v${version}"; - hash = "sha256-GQHMotxNRuRv6zXhrD02T+aFgfYe3RnvUGADsBeSPbA="; + rev = "refs/tags/v${version}"; + hash = "sha256-dkwmWCOeTAoeSY8+1wg7RWX/d57JWc8bGagzrEPMAIU="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/slovnet/default.nix b/pkgs/development/python-modules/slovnet/default.nix new file mode 100644 index 000000000000..83f431a6a8c5 --- /dev/null +++ b/pkgs/development/python-modules/slovnet/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, razdel +, navec +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "slovnet"; + version = "0.6.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-AtIle9ybnMHSQr007iyGHGSPcIPveJj+FGirzDge95k="; + }; + + propagatedBuildInputs = [ numpy navec razdel ]; + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tests/" ]; + disabledTestPaths = [ + # Tries to download model binary artifacts: + "tests/test_api.py" + ]; + pythonImportCheck = [ "slovnet" ]; + + meta = with lib; { + description = "Deep-learning based NLP modeling for Russian language"; + homepage = "https://github.com/natasha/slovnet"; + license = licenses.mit; + maintainers = with maintainers; [ npatsakula ]; + }; +} diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 4edb02182b11..281bcdb74528 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.35"; + version = "3.35.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-j2/n+NEncs1c9FlHA6mNzQw3wP1oIN0gVBunS5/KNjo="; + hash = "sha256-4PA+aXawW9t6XFZFSXGg6YD8Ftv9NRK7073KxPDkNw4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 0fc684b83c87..dae6816a906c 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -49,9 +49,6 @@ in buildPythonPackage { inherit (packages) version; format = "wheel"; - # Python 3.11 still unsupported - disabled = pythonAtLeast "3.11"; - src = let pyVerNoDot = lib.strings.stringAsChars (x: lib.optionalString (x != ".") x) python.pythonVersion; platform = if stdenv.isDarwin then "mac" else "linux"; @@ -152,14 +149,23 @@ in buildPythonPackage { "$out/${python.sitePackages}/tensorflow/compiler/tf2tensorrt/" "$out/${python.sitePackages}/tensorflow/compiler/tf2xla/ops/" "$out/${python.sitePackages}/tensorflow/lite/experimental/microfrontend/python/ops/" + "$out/${python.sitePackages}/tensorflow/lite/python/analyzer_wrapper/" "$out/${python.sitePackages}/tensorflow/lite/python/interpreter_wrapper/" + "$out/${python.sitePackages}/tensorflow/lite/python/metrics/" "$out/${python.sitePackages}/tensorflow/lite/python/optimize/" "$out/${python.sitePackages}/tensorflow/python/" - "$out/${python.sitePackages}/tensorflow/python/framework/" "$out/${python.sitePackages}/tensorflow/python/autograph/impl/testing" + "$out/${python.sitePackages}/tensorflow/python/client" "$out/${python.sitePackages}/tensorflow/python/data/experimental/service" "$out/${python.sitePackages}/tensorflow/python/framework" + "$out/${python.sitePackages}/tensorflow/python/grappler" + "$out/${python.sitePackages}/tensorflow/python/lib/core" + "$out/${python.sitePackages}/tensorflow/python/lib/io" + "$out/${python.sitePackages}/tensorflow/python/platform" "$out/${python.sitePackages}/tensorflow/python/profiler/internal" + "$out/${python.sitePackages}/tensorflow/python/saved_model" + "$out/${python.sitePackages}/tensorflow/python/util" + "$out/${python.sitePackages}/tensorflow/tsl/python/lib/core" "${rpath}" ) diff --git a/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/binary-hashes.nix index e2242ef76d98..37138e455386 100644 --- a/pkgs/development/python-modules/tensorflow/binary-hashes.nix +++ b/pkgs/development/python-modules/tensorflow/binary-hashes.nix @@ -1,39 +1,51 @@ { -version = "2.12.0"; +version = "2.13.0"; linux_py_38_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1lqdb3n8dp2f1vignddfqfbbghidkbrq9g78fqkjir8g318zf1m4"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.13.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "14pnklfp24hpybl5yqvvi2rxxhmc35rkjsijq86acakx0bx6afkw"; }; linux_py_39_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1k595l4gpmar9rg4kim2i41fv25i8p018fdmgxcb5v6836d5ns2m"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.13.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1vqvapsb0fqihkl3xgjy7ywljf7gp5rqdj6iwkv39cfvr9z3rs10"; }; linux_py_310_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1mhq429j9v82jwyqk6dcaz0sh57n0kyf2bfjrjz13xjblssij6rn"; + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.13.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "00mx8qmxaxq2ldh84g3wh21c5aizlnysfbipfm64v8b7c4753ljs"; +}; +linux_py_311_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.13.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0r8fgq06nzfp4rcl4bhxjv57k43n31xc2j27sgn0hfbakxwy483y"; }; linux_py_38_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "009wyvzdlzghb39mmrv36fvjrrrbllyadny9jzb7ixzry4r07193"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.13.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "04hrs1v50sp1bgr921xjsgslng3npnn6sq2f23xvfscdqd4aq8i8"; }; linux_py_39_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "0l1cwsfw91vfgx8xqwz7cdphj1dy6ppfifm7f7f0n0i6rda6l382"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.13.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0whwm93adgw2px8x678ik2nmsz8adi8vmj2np40jsbiq5y68pmkj"; }; linux_py_310_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "0dl3nvr4pk4zknx484qd2mqdkjkms6s4alqrxqkqv2hqa4l9sz9m"; + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.13.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0am36a7n744xjn2m8hkf2cnncczsxigwazmwqsgkj07qwagbdw78"; +}; +linux_py_311_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-2.13.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "09cczbh19mw44n526bqc3h83q5hcfdjwlp38mn3ngch22y86gvhr"; }; mac_py_38_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.12.0-cp38-cp38-macosx_10_15_x86_64.whl"; - sha256 = "0jkxd9ccbq2czn16w3his6k1hxx0nhkrb56bkrskwzss9is4w6d7"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.13.0-cp38-cp38-macosx_10_15_x86_64.whl"; + sha256 = "1fk9ymlm1n8i48dm418g8r3ixw655vk2kms6jzcb6wivlash704l"; }; mac_py_39_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.12.0-cp39-cp39-macosx_10_15_x86_64.whl"; - sha256 = "0n7rsrxlkn143y80579bm8wwsabg2a9x6sx1h7ksw3s2x4sjdz22"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.13.0-cp39-cp39-macosx_10_15_x86_64.whl"; + sha256 = "10pbhfhjzy7zfd85s18nsf0pnir77097hxkqm11bdmcfjgic023s"; }; mac_py_310_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.12.0-cp310-cp310-macosx_10_15_x86_64.whl"; - sha256 = "18fj2jxl8b69jrzjkixhyyrml8qjwcid76y15ggzc5ksrkgw0jmy"; + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.13.0-cp310-cp310-macosx_10_15_x86_64.whl"; + sha256 = "009icsdwvhs2g3csx3jczprgf7rbmggjk8g4qicq0m4qx51m84l9"; +}; +mac_py_311_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.13.0-cp311-cp311-macosx_10_15_x86_64.whl"; + sha256 = "0sjq82q7q7k80f35rrpkjbrm3fd25rfjfi6s6k3a91njc5k45zvg"; }; } diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh index 8cdc11e11fd9..35026dbc35e0 100755 --- a/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -version="2.12.0" +version="2.13.0" bucket="https://storage.googleapis.com/tensorflow" @@ -11,12 +11,15 @@ url_and_key_list=( "linux_py_38_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "linux_py_39_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "linux_py_310_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" +"linux_py_311_cpu $bucket/linux/cpu/tensorflow_cpu-${version}-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "linux_py_38_gpu $bucket/linux/gpu/tensorflow-${version}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "linux_py_39_gpu $bucket/linux/gpu/tensorflow-${version}-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "linux_py_310_gpu $bucket/linux/gpu/tensorflow-${version}-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" +"linux_py_311_gpu $bucket/linux/gpu/tensorflow-${version}-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "mac_py_38_cpu $bucket/mac/cpu/tensorflow-${version}-cp38-cp38-macosx_10_15_x86_64.whl" "mac_py_39_cpu $bucket/mac/cpu/tensorflow-${version}-cp39-cp39-macosx_10_15_x86_64.whl" "mac_py_310_cpu $bucket/mac/cpu/tensorflow-${version}-cp310-cp310-macosx_10_15_x86_64.whl" +"mac_py_311_cpu $bucket/mac/cpu/tensorflow-${version}-cp311-cp311-macosx_10_15_x86_64.whl" ) hashfile=binary-hashes.nix diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix index a63fa00e6400..c2e46990c114 100644 --- a/pkgs/development/python-modules/textnets/default.nix +++ b/pkgs/development/python-modules/textnets/default.nix @@ -12,6 +12,7 @@ , scipy , setuptools , spacy +, spacy-lookups-data , en_core_web_sm , toolz , tqdm @@ -20,14 +21,14 @@ buildPythonPackage rec { pname = "textnets"; - version = "0.8.8"; + version = "0.9.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-rjXEiaPYctrONIZz1Dd5OSDw5z8D2FPXi5TneKizFUQ="; + hash = "sha256-fx2S43IqpSMsfJow26jB/D27dyUFQ1PlXP1rbUIZPPQ="; }; nativeBuildInputs = [ @@ -43,6 +44,7 @@ buildPythonPackage rec { pandas scipy spacy + spacy-lookups-data toolz tqdm wasabi diff --git a/pkgs/development/python-modules/tokentrim/default.nix b/pkgs/development/python-modules/tokentrim/default.nix new file mode 100644 index 000000000000..c830d29b8a94 --- /dev/null +++ b/pkgs/development/python-modules/tokentrim/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, tiktoken +}: + +buildPythonPackage { + pname = "tokentrim"; + version = "unstable-2023-09-07"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "KillianLucas"; + repo = "tokentrim"; + rev = "e98ad3a2ca0e321a7347f76c30be584175495139"; + hash = "sha256-95xitHnbFFaj0xPuLMWvIvuJzoCO3VSd592X1RI9h3A="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + tiktoken + ]; + + pythonImportsCheck = [ "tokentrim" ]; + + # tests connect to openai + doCheck = false; + + meta = with lib; { + description = "Easily trim 'messages' arrays for use with GPTs"; + homepage = "https://github.com/KillianLucas/tokentrim"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/vg/default.nix b/pkgs/development/python-modules/vg/default.nix new file mode 100644 index 000000000000..efda04f78b9d --- /dev/null +++ b/pkgs/development/python-modules/vg/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, poetry-core +, pythonOlder +, pytestCheckHook +, setuptools +}: + +buildPythonPackage rec { + pname = "vg"; + version = "2.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "lace"; + repo = "vg"; + rev = "refs/tags/${version}"; + hash = "sha256-ZNUAfkhjmsxD8cH0fR8Htjs+/F/3R9xfe1XgRyndids="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'requires = ["setuptools", "poetry-core>=1.0.0"]' 'requires = ["poetry-core>=1.0.0"]' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "vg" + ]; + + meta = with lib; { + description = "Linear algebra for humans: a very good vector-geometry and linear-algebra toolbelt"; + homepage = "https://github.com/lace/vg"; + changelog = "https://github.com/lace/vg/blob/${version}/CHANGELOG.md"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ clerie ]; + }; +} diff --git a/pkgs/development/python-modules/yargy/default.nix b/pkgs/development/python-modules/yargy/default.nix new file mode 100644 index 000000000000..30ada41f87b0 --- /dev/null +++ b/pkgs/development/python-modules/yargy/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pymorphy2 +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "yargy"; + version = "0.16.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-yRfu+zKkDCPEa2yojWiScHLdAKuU6Q/V3GqwpitZtZM="; + }; + + propagatedBuildInputs = [ pymorphy2 ]; + pythonImportCheck = [ "yargy" ]; + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tests" ]; + + meta = with lib; { + description = "Rule-based facts extraction for Russian language"; + homepage = "https://github.com/natasha/yargu"; + license = licenses.mit; + maintainers = with maintainers; [ npatsakula ]; + }; +} diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index be93601255fd..5e31db44cfbb 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.103.0"; + version = "0.108.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-15nOSQOM1c9zISsTwY2pdRLIp2/sLnBmb/5LMoWHyfo="; + hash = "sha256-XwSWKuj8gRe4PO0GaV+C4C5plDX9vkDhMjmSx1TpINE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 15709e4cc869..937e63d2fe26 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -1,5 +1,5 @@ -{ docbook_xsl -, docbook_xml_dtd_45 +{ docbook_xml_dtd_45 +, docbook_xsl , fetchFromGitHub , installShellFiles , lib @@ -13,20 +13,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "cppcheck"; - version = "2.11.1"; + version = "2.12.0"; + + outputs = [ "out" "man" ]; src = fetchFromGitHub { owner = "danmar"; repo = "cppcheck"; rev = finalAttrs.version; - hash = "sha256-ZQ1EgnC2JBc0AvSW8PtgMzJoWSPt04Xfh8dqOU+KMfw="; + hash = "sha256-Rfm63ERmTsmmH8W6aiBMx+NiQjzGuoWHqHRRqWishhw="; }; - strictDeps = true; - nativeBuildInputs = [ - docbook_xsl docbook_xml_dtd_45 + docbook_xsl installShellFiles libxslt pkg-config @@ -41,9 +41,12 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ]; - outputs = [ "out" "man" ]; - enableParallelBuilding = true; + strictDeps = true; + + # test/testcondition.cpp:4949(TestCondition::alwaysTrueContainer): Assertion failed. + doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doInstallCheck = true; postPatch = '' substituteInPlace Makefile \ @@ -58,10 +61,6 @@ stdenv.mkDerivation (finalAttrs: { installManPage cppcheck.1 ''; - # test/testcondition.cpp:4949(TestCondition::alwaysTrueContainer): Assertion failed. - doCheck = !(stdenv.isLinux && stdenv.isAarch64); - - doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck @@ -73,13 +72,13 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A static analysis tool for C/C++ code"; - homepage = "http://cppcheck.sourceforge.net/"; + homepage = "http://cppcheck.sourceforge.net"; license = lib.licenses.gpl3Plus; longDescription = '' Check C/C++ code for memory leaks, mismatching allocation-deallocation, buffer overruns and more. ''; - maintainers = with lib.maintainers; [ joachifm ]; + maintainers = with lib.maintainers; [ joachifm paveloom ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index dd80de382475..bd89d788e8b2 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,19 +5,19 @@ buildGoModule rec { pname = "tfsec"; - version = "1.28.2"; + version = "1.28.4"; src = fetchFromGitHub { owner = "aquasecurity"; - repo = pname; - rev = "v${version}"; - hash = "sha256-N1BL0DHppHyfxHQT98y3rtvyCArq/bcbDIiB0NxCsJA="; + repo = "tfsec"; + rev = "refs/tags/v${version}"; + hash = "sha256-WMmRCjKBtPT45it6iUQh5D7TBc8glt+dppksBvDhTN4="; }; ldflags = [ "-s" "-w" - "-X github.com/aquasecurity/tfsec/version.Version=v${version}" + "-X=github.com/aquasecurity/tfsec/version.Version=v${version}" ## not sure if this is needed (https://github.com/aquasecurity/tfsec/blob/master/.goreleaser.yml#L6) # "-extldflags '-fno-PIC -static'" ]; @@ -33,6 +33,7 @@ buildGoModule rec { meta = with lib; { description = "Static analysis powered security scanner for terraform code"; homepage = "https://github.com/aquasecurity/tfsec"; + changelog = "https://github.com/aquasecurity/tfsec/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab marsam peterromfeldhk ]; }; diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix index b2b2e45497d5..97b967d4a2b3 100644 --- a/pkgs/development/tools/build-managers/corrosion/default.nix +++ b/pkgs/development/tools/build-managers/corrosion/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "corrosion"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "corrosion-rs"; repo = "corrosion"; rev = "v${version}"; - hash = "sha256-/PSOAEtJtn9OykPiN3RhRv59wgQNJ0HoMyYS5RCdSCI="; + hash = "sha256-Bvx4Jvd/l1EHB3eoBEizuT4Lou4Ev+CPA7D7iWIe+No="; }; cargoRoot = "generator"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { inherit src; sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-lJaK+0NmlnTsV3h5Pqpqd8uA3g8PGERWfq2aR7FtYrc="; + hash = "sha256-0n45edWVSaYQS+S0H4p55d+ZgD6liHn6iBd3qCtjAh8="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 14bb9ba345e5..d9ab45120857 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "2.3.1"; + version = "2.3.2"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-olwvg/smXPDqKvSdpp30SEsHYWNQXU9ISbOmJH7MKLo="; + hash = "sha256-buDDu5UQmO1ImWXzqwlFZHYbn2FUjAxs8KbQX+g/mvg="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/electron/binary/default.nix b/pkgs/development/tools/electron/binary/default.nix index 29670a44bd9a..eafa67cf3372 100644 --- a/pkgs/development/tools/electron/binary/default.nix +++ b/pkgs/development/tools/electron/binary/default.nix @@ -26,15 +26,6 @@ rec { electron-bin = electron_26-bin; - electron_9-bin = mkElectron "9.4.4" { - x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450"; - x86_64-darwin = "f41c0bf874ddbba00c3d6989d07f74155a236e2d5a3eaf3d1d19ef8d3eb2256c"; - i686-linux = "40e37f8f908a81c9fac1073fe22309cd6df2d68e685f83274c6d2f0959004187"; - armv7l-linux = "2dfe3e21d30526688cc3d3215d06dfddca597a2cb62ff0c9d0d5f33d3e464a33"; - aarch64-linux = "f1145e9a1feb5f2955e5f5565962423ac3c52ffe45ccc3b96c6ca485fa35bf27"; - headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885"; - }; - electron_10-bin = mkElectron "10.4.7" { x86_64-linux = "e3ea75fcedce588c6b59cfa3a6e46ba67b789e14dc2e5b9dfe1ddf3f82b0f995"; x86_64-darwin = "8f01e020563b7fce68dc2e3d4bbf419320d13b088e89eb64f9645e9d73ad88fb"; diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index e960e62fca05..da7b0d662b32 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -1,10 +1,30 @@ { lib , fetchFromGitLab -, python +, fetchPypi , apksigner +, buildPythonApplication +, python3 +, pythonRelaxDepsHook +, androguard +, babel +, clint +, defusedxml +, gitpython +, libcloud +, mwclient +, paramiko +, pillow +, pyasn1 +, pyasn1-modules +, python-vagrant +, pyyaml +, qrcode +, requests +, ruamel-yaml +, yamllint }: -python.pkgs.buildPythonApplication rec { +buildPythonApplication rec { pname = "fdroidserver"; version = "2.2.1"; format = "setuptools"; @@ -27,7 +47,7 @@ python.pkgs.buildPythonApplication rec { ''; preConfigure = '' - ${python.pythonForBuild.interpreter} setup.py compile_catalog + ${python3.pythonForBuild.interpreter} setup.py compile_catalog ''; postInstall = '' @@ -35,15 +55,15 @@ python.pkgs.buildPythonApplication rec { install -m 0755 gradlew-fdroid $out/bin ''; - nativeBuildInputs = with python.pkgs; [ + nativeBuildInputs = [ pythonRelaxDepsHook ]; - buildInputs = with python.pkgs; [ + buildInputs = [ babel ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = [ androguard clint defusedxml @@ -58,7 +78,13 @@ python.pkgs.buildPythonApplication rec { pyyaml qrcode requests - ruamel-yaml + (ruamel-yaml.overrideAttrs (old: { + src = fetchPypi { + pname = "ruamel.yaml"; + version = "0.17.21"; + hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; + }; + })) yamllint ]; @@ -81,7 +107,6 @@ python.pkgs.buildPythonApplication rec { changelog = "https://github.com/f-droid/fdroidserver/blob/${version}/CHANGELOG.md"; description = "Server and tools for F-Droid, the Free Software repository system for Android"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ obfusk ]; + maintainers = with maintainers; [ linsui jugendhacker ]; }; - } diff --git a/pkgs/development/tools/hexo-cli/default.nix b/pkgs/development/tools/hexo-cli/default.nix new file mode 100644 index 000000000000..be5764c9f0c3 --- /dev/null +++ b/pkgs/development/tools/hexo-cli/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "hexo-cli"; + version = "4.3.1"; + + src = fetchFromGitHub { + owner = "hexojs"; + repo = "hexo-cli"; + rev = "v${version}"; + hash = "sha256-mtbg9Fa9LBqG/aNfm4yEo4ymuaxuqhymkO1q6mYA2Fs="; + }; + + npmDepsHash = "sha256-VCHG1YMPRwEBbwgscSv6V+fTNVRpsCxWeyO8co4Zy6k="; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r bin/ dist/ node_modules/ package.json $out/ + + runHook postInstall + ''; + + meta = { + description = "Command line interface for Hexo"; + mainProgram = "hexo"; + homepage = "https://hexo.io/"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index d270627c0cde..d9be7414852f 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "analysis" -version = "0.13.1" +version = "0.13.2" dependencies = [ "config", "diagnostic", @@ -118,7 +118,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.13.1" +version = "0.13.2" dependencies = [ "fast-hash", "str-util", @@ -131,7 +131,7 @@ source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a7847 [[package]] name = "cm-syntax" -version = "0.13.1" +version = "0.13.2" dependencies = [ "lex-util", "paths", @@ -160,7 +160,7 @@ dependencies = [ [[package]] name = "config" -version = "0.13.1" +version = "0.13.2" dependencies = [ "fast-hash", "serde", @@ -188,7 +188,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.13.1" +version = "0.13.2" dependencies = [ "fast-hash", "once_cell", @@ -427,7 +427,7 @@ dependencies = [ [[package]] name = "input" -version = "0.13.1" +version = "0.13.2" dependencies = [ "cm-syntax", "config", @@ -475,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.13.1" +version = "0.13.2" dependencies = [ "analysis", "anyhow", @@ -503,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.13.1" +version = "0.13.2" [[package]] name = "libc" @@ -575,7 +575,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.13.1" +version = "0.13.2" dependencies = [ "analysis", "codespan-reporting", @@ -593,7 +593,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.13.1" +version = "0.13.2" dependencies = [ "anyhow", "env_logger", @@ -613,7 +613,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.13.1" +version = "0.13.2" dependencies = [ "fast-hash", "paths", @@ -624,7 +624,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.13.1" +version = "0.13.2" dependencies = [ "config", "diagnostic", @@ -648,7 +648,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.13.1" +version = "0.13.2" dependencies = [ "lex-util", "paths", @@ -711,7 +711,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "panic-hook" -version = "0.13.1" +version = "0.13.2" dependencies = [ "better-panic", ] @@ -924,7 +924,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.13.1" +version = "0.13.2" dependencies = [ "fast-hash", "str-util", @@ -932,14 +932,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.13.1" +version = "0.13.2" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.13.1" +version = "0.13.2" dependencies = [ "fast-hash", "fmt-util", @@ -950,7 +950,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.13.1" +version = "0.13.2" dependencies = [ "config", "pretty_assertions", @@ -966,7 +966,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.13.1" +version = "0.13.2" dependencies = [ "config", "elapsed", @@ -980,7 +980,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.13.1" +version = "0.13.2" dependencies = [ "fast-hash", "once_cell", @@ -989,7 +989,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.13.1" +version = "0.13.2" dependencies = [ "la-arena", "sml-lab", @@ -1000,7 +1000,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.13.1" +version = "0.13.2" dependencies = [ "config", "cov-mark", @@ -1015,14 +1015,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.13.1" +version = "0.13.2" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.13.1" +version = "0.13.2" dependencies = [ "cov-mark", "diagnostic", @@ -1037,7 +1037,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#0d94e3ce13f2a489dff86151f7 [[package]] name = "sml-naive-fmt" -version = "0.13.1" +version = "0.13.2" dependencies = [ "fast-hash", "sml-comment", @@ -1046,11 +1046,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.13.1" +version = "0.13.2" [[package]] name = "sml-parse" -version = "0.13.1" +version = "0.13.2" dependencies = [ "diagnostic", "event-parse", @@ -1062,14 +1062,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.13.1" +version = "0.13.2" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.13.1" +version = "0.13.2" dependencies = [ "num-bigint", "num-traits", @@ -1078,7 +1078,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.13.1" +version = "0.13.2" dependencies = [ "chain-map", "config", @@ -1101,7 +1101,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.13.1" +version = "0.13.2" dependencies = [ "chain-map", "code-h2-md-map", @@ -1120,7 +1120,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.13.1" +version = "0.13.2" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1128,7 +1128,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.13.1" +version = "0.13.2" dependencies = [ "code-h2-md-map", "fast-hash", @@ -1139,7 +1139,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.13.1" +version = "0.13.2" dependencies = [ "fast-hash", "sml-hir", @@ -1210,7 +1210,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.13.1" +version = "0.13.2" dependencies = [ "analysis", "cm-syntax", @@ -1554,7 +1554,7 @@ dependencies = [ [[package]] name = "xtask" -version = "0.13.1" +version = "0.13.2" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 081333e89294..c0453143061b 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-qq4SACB0heCOB8rJha+9Xi/ZZuAbasOieWM9IdZqYUw="; + hash = "sha256-GiuP5Cx4Qx2LH34v6VeGyWgjJgPR8/qLUOZIrh9ES1U="; }; cargoLock = { diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index 648f20bc7c9e..d5afaae1d81e 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/nix-community/nixd/releases/tag/${version}"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ inclyc Ruixi-rebirth marsam ]; + mainProgram = "nixd"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/tools/language-servers/ruff-lsp/default.nix b/pkgs/development/tools/language-servers/ruff-lsp/default.nix index 23d91d328704..4f4304017c4a 100644 --- a/pkgs/development/tools/language-servers/ruff-lsp/default.nix +++ b/pkgs/development/tools/language-servers/ruff-lsp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "ruff-lsp"; - version = "0.0.38"; + version = "0.0.39"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "astral-sh"; repo = "ruff-lsp"; rev = "v${version}"; - hash = "sha256-JWobbaXmIcd+c/EikiuUva5aHm3VDdeAQK60Krl6tVE="; + hash = "sha256-hbnSx59uSzXHeAhZPZnCzxl+mCZIdr29uUPfQCsm/Ww="; }; postPatch = '' diff --git a/pkgs/development/tools/lightningcss/default.nix b/pkgs/development/tools/lightningcss/default.nix index 56fb8e0a037c..94afda34ba44 100644 --- a/pkgs/development/tools/lightningcss/default.nix +++ b/pkgs/development/tools/lightningcss/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lightningcss"; - version = "1.21.6"; + version = "1.21.8"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; rev = "refs/tags/v${version}"; - sha256 = "esLPAKdqYdpB3/ffsV/NAmfjGU9G8y13f/59bWD0yR0="; + sha256 = "Y1eSi8/YX0iI43Zp6dCBYCZAzRnVO5nSXBykWrp9MjM="; }; - cargoHash = "sha256-8k6BhhBQ8X08vW0a8x8v1YNwiXFrzvWxcL47XdaqWJs="; + cargoHash = "sha256-OUfC0HPNsY0lBv2nM56uzFqfV3SZfOAR//VXDu6BJ+M="; buildFeatures = [ "cli" diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 6192322c2c34..4aa21d29761e 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.28811"; + version = "0.1.28995"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HaBFKjVw6EzhH1oxSeKFmZUDZleFGrxjOegTVCGmrzI="; + sha256 = "sha256-+Gyv3GO6nOueswPAriUm7QkQgEkYEilnBT7hqmiqDW8="; }; vendorHash = "sha256-OWdJ7nFR5hrKQf2H763ezjXkEh0PvtBcjjeSNvH+ca4="; diff --git a/pkgs/development/tools/misc/rsonpath/default.nix b/pkgs/development/tools/misc/rsonpath/default.nix index 448b48ea700d..b078030d8cec 100644 --- a/pkgs/development/tools/misc/rsonpath/default.nix +++ b/pkgs/development/tools/misc/rsonpath/default.nix @@ -1,24 +1,20 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub -, withSimd ? stdenv.isx86_64 }: rustPlatform.buildRustPackage rec { pname = "rsonpath"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "v0ldek"; repo = "rsonpath"; rev = "v${version}"; - hash = "sha256-ip5phYOoUm7I0SsnfXVGzgt+OFXjXKt4hiFjH3nkacA="; + hash = "sha256-WrapSvWoaBVxlpCxau70Et5K9tRs84xsXBDWsuoFI+E="; }; - cargoHash = "sha256-T2aR3PCQ5BcJZ+Aw/yLJ6vbLxkrKrNnsZkXwo0G9BZE="; - - buildNoDefaultFeatures = !withSimd; + cargoHash = "sha256-fGu6eypizOGHCiyAeH7nCLHyfVLMBPNU1xmqfVGhSzw="; cargoBuildFlags = [ "-p=rsonpath" ]; cargoTestFlags = cargoBuildFlags; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 25c08426d0de..22f30c28770b 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.31.4"; + version = "0.31.5"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - hash = "sha256-0IP+83nGODSH/ELKsOA9ylm5fvREtRyiZASMNnwYIL4="; + hash = "sha256-vpPvmWcmA0m2D1M67pcpJwT7oRM1IL56e7LgWWl+YFE="; }; - vendorHash = "sha256-FDKprWyOltFy5WmXME/EfLuYRj92WuhgOV0VdWGanHg="; + vendorHash = "sha256-jrpgMweoA/ZzSDdjc/ZvZcYArg8f6XPZCbznz6yGPfI="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 5d9734e49a51..d1dfed43081d 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -409,9 +409,9 @@ dependencies = [ [[package]] name = "codspeed" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeec2fbed4969dc38b5ca201115dd5c2614b8ef78e0a7221dd5f0977fb1552b" +checksum = "9b3238416c10f19985b52a937c5b3efc3ed7efe8f7ae263d2aab29a09bca9f57" dependencies = [ "colored", "libc", @@ -420,9 +420,9 @@ dependencies = [ [[package]] name = "codspeed-criterion-compat" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b13f0a08d40ce7c95bdf288f725b975e62fcadfa8ba152340943bab6de43af7" +checksum = "fecc18f65b942d2b033545bb3bd8430a23eecbbe53fad3b1342fb0e5514bca7b" dependencies = [ "codspeed", "colored", @@ -522,8 +522,6 @@ dependencies = [ "num-traits", "once_cell", "oorandom", - "plotters", - "rayon", "regex", "serde", "serde_derive", @@ -823,7 +821,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flake8-to-ruff" -version = "0.0.287" +version = "0.0.288" dependencies = [ "anyhow", "clap", @@ -1114,12 +1112,24 @@ dependencies = [ "lazy_static", "linked-hash-map", "regex", + "serde", "similar", "walkdir", "yaml-rust", ] [[package]] +name = "insta-cmd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809d3023d1d6e8d5c2206f199251f75cb26180e41f18cb0f22dd119161cb5127" +dependencies = [ + "insta", + "serde", + "serde_json", +] + +[[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1269,12 +1279,12 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libcst" version = "0.1.0" -source = "git+https://github.com/Instagram/LibCST.git?rev=3cacca1a1029f05707e50703b49fe3dd860aa839#3cacca1a1029f05707e50703b49fe3dd860aa839" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7773d520d4292e200ab1838f2daabe2feed7549f93b0a3c7582160a09e79ffde" dependencies = [ "chic", - "itertools", "libcst_derive", - "once_cell", + "memchr", "paste", "peg", "regex", @@ -1284,7 +1294,8 @@ dependencies = [ [[package]] name = "libcst_derive" version = "0.1.0" -source = "git+https://github.com/Instagram/LibCST.git?rev=3cacca1a1029f05707e50703b49fe3dd860aa839#3cacca1a1029f05707e50703b49fe3dd860aa839" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520197c50ba477f258cd7005ec5ed3a7393693ae6bec664990c7c8d9306a7c0d" dependencies = [ "quote", "syn 1.0.109", @@ -1718,34 +1729,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] -name = "plotters" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" - -[[package]] -name = "plotters-svg" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" -dependencies = [ - "plotters-backend", -] - -[[package]] name = "pmutil" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2054,7 +2037,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.0.287" +version = "0.0.288" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -2152,7 +2135,7 @@ dependencies = [ [[package]] name = "ruff_cli" -version = "0.0.287" +version = "0.0.288" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -2170,6 +2153,7 @@ dependencies = [ "glob", "ignore", "insta", + "insta-cmd", "is-macro", "itertools", "itoa", @@ -2353,7 +2337,6 @@ dependencies = [ "clap", "countme", "insta", - "is-macro", "itertools", "memchr", "once_cell", @@ -2369,7 +2352,9 @@ dependencies = [ "serde_json", "similar", "smallvec", + "static_assertions", "thiserror", + "tracing", "unicode-width", ] @@ -2417,8 +2402,7 @@ dependencies = [ "static_assertions", "test-case", "tiny-keccak", - "unic-emoji-char", - "unic-ucd-ident", + "unicode-ident", "unicode_names2", ] @@ -2452,6 +2436,9 @@ dependencies = [ [[package]] name = "ruff_python_stdlib" version = "0.0.0" +dependencies = [ + "unicode-ident", +] [[package]] name = "ruff_python_trivia" @@ -2464,7 +2451,7 @@ dependencies = [ "ruff_source_file", "ruff_text_size", "smallvec", - "unic-ucd-ident", + "unicode-ident", ] [[package]] @@ -3263,17 +3250,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" [[package]] -name = "unic-emoji-char" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b07221e68897210270a38bde4babb655869637af0f69407f96053a34f76494d" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] name = "unic-ucd-category" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3286,17 +3262,6 @@ dependencies = [ ] [[package]] -name = "unic-ucd-ident" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] name = "unic-ucd-version" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 1d9438ffa599..a5be19cc1720 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -10,19 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.287"; + version = "0.0.288"; src = fetchFromGitHub { owner = "astral-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-T7PuhQnb7Ae9mYdaxDBltJWx5ODTscvEP3LcSEcSuLo="; + hash = "sha256-rDzxGIDUIxK5n8uT0vSFGrp4wOm49KtY7xKRoLZhEF8="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "libcst-0.1.0" = "sha256-FgQE8ofRXQs/zHh7AKscXu0deN3IG+Nk/h+a09Co5R8="; "unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg="; }; }; diff --git a/pkgs/development/tools/rust/cargo-edit/Cargo.lock b/pkgs/development/tools/rust/cargo-edit/Cargo.lock index 86da7d6071e9..de3cfdf9786e 100644 --- a/pkgs/development/tools/rust/cargo-edit/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-edit/Cargo.lock @@ -48,9 +48,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" @@ -218,7 +218,7 @@ dependencies = [ [[package]] name = "cargo-edit" -version = "0.12.1" +version = "0.12.2" dependencies = [ "anyhow", "assert_cmd", @@ -227,6 +227,7 @@ dependencies = [ "cargo-test-support", "cargo_metadata", "clap", + "clap-cargo", "concolor-control", "crates-index", "dunce", @@ -347,20 +348,29 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" +checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" dependencies = [ "clap_builder", "clap_derive", - "once_cell", +] + +[[package]] +name = "clap-cargo" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "383f21342a464d4af96e9a4cad22a0b4f2880d4a5b3bbf5c9654dd1d9a224ee4" +dependencies = [ + "anstyle", + "clap", ] [[package]] name = "clap_builder" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" +checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" dependencies = [ "anstream 0.5.0", "anstyle", @@ -371,9 +381,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index da19ac8c9d20..26d8bc1aa172 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-YKWJR3JgvLd43BpGHrmG3eFj9eRhwGm2e5sfrHdF90U="; + hash = "sha256-tMYuhUb1e/wTMZGwrAa3bz3INAld/ZtQzJqpeG0w/G8="; }; cargoLock = { diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index 99a1610381e9..6c34f3a59054 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.6"; + version = "0.6.7"; src = fetchCrate { inherit pname version; - sha256 = "sha256-yLxWV9/e+0IAe4z11i+wwNb6yUehzQwV+EYCe3Z1MOM="; + sha256 = "sha256-uS0QDRSitwCGlo36OvtpjJ6ejKetjYEAuNEZpGiplQs="; }; - cargoSha256 = "sha256-/Za1T+HYI7mmKQHn7qm1d6hqh1qyp9DAOOMi32Tev9g="; + cargoSha256 = "sha256-Tro0Yp91P9CB/Md6MqbZGkw03QKUe8gh80357mWKMMY="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 88b2f2e24406..24e8f458b60b 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -1,36 +1,76 @@ +# If the tests are broken, it's probably for one of two reasons: +# +# 1. The version of llvm used doesn't match the expectations of rustc and/or +# cargo-llvm-cov. This is relatively unlikely because we pull llvm out of +# rustc's attrset, so it *should* be the right version as long as this is the +# case. +# 2. Nixpkgs has changed its rust infrastructure in a way that causes +# cargo-llvm-cov to misbehave under test. It's likely that even though the +# tests are failing, cargo-llvm-cov will still function properly in actual +# use. This has happened before, and is described [here][0] (along with a +# feature request that would fix this instance of the problem). +# +# For previous test-troubleshooting discussion, see [here][1]. +# +# [0]: https://github.com/taiki-e/cargo-llvm-cov/issues/242 +# [1]: https://github.com/NixOS/nixpkgs/pull/197478 + { stdenv , lib -, fetchCrate +, fetchurl +, fetchFromGitHub , rustPlatform +, rustc }: -rustPlatform.buildRustPackage rec { +let pname = "cargo-llvm-cov"; version = "0.5.31"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-HjnP9H1t660PJ5eXzgAhrdDEgqdzzb+9Dbk5RGUPjaQ="; + owner = "taiki-e"; + homepage = "https://github.com/${owner}/${pname}"; + + llvm = rustc.llvmPackages.llvm; + + # Download `Cargo.lock` from crates.io so we don't clutter up Nixpkgs + cargoLock = fetchurl { + name = "Cargo.lock"; + url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; + sha256 = "sha256-BbrdyJgZSIz6GaTdQv1GiFHufRBSbcoHcqqEmr/HvAM="; + downloadToTemp = true; + postFetch = '' + tar xzf $downloadedFile ${pname}-${version}/Cargo.lock + mv ${pname}-${version}/Cargo.lock $out + ''; + }; +in + +rustPlatform.buildRustPackage { + inherit pname version; + + # Use `fetchFromGitHub` instead of `fetchCrate` because the latter does not + # pull in fixtures needed for the test suite + src = fetchFromGitHub { + inherit owner; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-wRo94JVn4InkhrMHFSsEvm2FFIxUsltA57sMMOcL8b0="; }; - cargoSha256 = "sha256-p6zpRRNX4g+jESNSwouWMjZlFhTBFJhe7LirYtFrZ1g="; - - # skip tests which require llvm-tools-preview - checkFlags = [ - "--skip bin_crate" - "--skip cargo_config" - "--skip clean_ws" - "--skip instantiations" - "--skip merge" - "--skip merge_failure_mode_all" - "--skip no_test" - "--skip open_report" - "--skip real1" - "--skip show_env" - "--skip virtual1" - ]; - - meta = rec { - homepage = "https://github.com/taiki-e/${pname}"; + + # Upstream doesn't include the lockfile so we need to add it back + postUnpack = '' + cp ${cargoLock} source/Cargo.lock + ''; + + cargoSha256 = "sha256-XcsognndhHenYnlJCNMbrNh+S8FX7qxXUjuV1j2qsmY="; + + # `cargo-llvm-cov` reads these environment variables to find these binaries, + # which are needed to run the tests + LLVM_COV = "${llvm}/bin/llvm-cov"; + LLVM_PROFDATA = "${llvm}/bin/llvm-profdata"; + + meta = { + inherit homepage; changelog = homepage + "/blob/v${version}/CHANGELOG.md"; description = "Cargo subcommand to easily use LLVM source-based code coverage"; longDescription = '' @@ -39,6 +79,9 @@ rustPlatform.buildRustPackage rec { library (e.g. fenix or rust-overlay) ''; license = with lib.licenses; [ asl20 /* or */ mit ]; - maintainers = with lib.maintainers; [ wucke13 matthiasbeyer ]; + maintainers = with lib.maintainers; [ wucke13 matthiasbeyer CobaltCause ]; + + # The profiler runtime is (currently) disabled on non-Linux platforms + broken = !(stdenv.isLinux && !stdenv.targetPlatform.isRedox); }; } diff --git a/pkgs/development/tools/rust/cargo-release/Cargo.lock b/pkgs/development/tools/rust/cargo-release/Cargo.lock index dc07a0b57bd6..0e4455addfb7 100644 --- a/pkgs/development/tools/rust/cargo-release/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-release/Cargo.lock @@ -10,42 +10,32 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" 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.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" @@ -67,9 +57,9 @@ 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 0.48.0", @@ -77,9 +67,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 = "assert_fs" @@ -142,12 +132,11 @@ dependencies = [ [[package]] name = "bstr" -version = "1.5.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", - "once_cell", "regex-automata", "serde", ] @@ -178,7 +167,7 @@ dependencies = [ [[package]] name = "cargo-release" -version = "0.24.11" +version = "0.24.12" dependencies = [ "anyhow", "assert_fs", @@ -198,7 +187,7 @@ dependencies = [ "git2", "globset", "ignore", - "indexmap", + "indexmap 1.9.3", "itertools", "log", "maplit", @@ -271,9 +260,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.15.4" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" +checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592" dependencies = [ "camino", "cargo-platform", @@ -300,35 +289,33 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.3.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap-cargo" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca953650a7350560b61db95a0ab1d9c6f7b74d146a9e08fb258b834f3cf7e2c" +checksum = "383f21342a464d4af96e9a4cad22a0b4f2880d4a5b3bbf5c9654dd1d9a224ee4" dependencies = [ + "anstyle", "cargo_metadata", "clap", - "doc-comment", ] [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "strsim", "terminal_size", @@ -336,9 +323,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", @@ -685,6 +672,12 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -803,9 +796,9 @@ dependencies = [ [[package]] name = "git-conventional" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "232911ef08b47d0a792af61277fc3b8f089f0d5962a2cf8d4ae1cfc547355ff3" +checksum = "4b3db1aca6f1a2607dd99beed5d99df831ac73eae5994ff301dae712928e2dac" dependencies = [ "doc-comment", "unicase", @@ -835,11 +828,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", @@ -875,6 +868,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" @@ -990,7 +989,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", ] [[package]] @@ -1130,9 +1139,9 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[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 = "memoffset" @@ -1188,9 +1197,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.2" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl-probe" @@ -1431,26 +1440,32 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +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" @@ -1568,9 +1583,9 @@ 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", ] @@ -1625,9 +1640,9 @@ 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", "anstyle", @@ -1642,14 +1657,14 @@ dependencies = [ "tempfile", "wait-timeout", "walkdir", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[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", ] @@ -1819,9 +1834,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", @@ -1831,20 +1846,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.10" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -1853,9 +1868,9 @@ dependencies = [ [[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", @@ -2191,9 +2206,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[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/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index 59652d402205..af3513842376 100644 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.24.11"; + version = "0.24.12"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "refs/tags/v${version}"; - hash = "sha256-VF0jVk94DncSNB1EnYHGUolVYvykEwluHJiHQShcqQo="; + hash = "sha256-dB5gpaY6OB/IjMvqLUMH41l6Q/xMookxfVGXRcdhcBM="; }; cargoLock = { diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index cc625347de9d..2b1e893fd0c4 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-t71h+s97Ip3Gqs7oCzF8GWpTX0p0ltPt7JT61Gk8xF0="; + hash = "sha256-l9uPn5eLGfCq2E6gogXCefbhxro6iOOYraeIPj9/S50="; }; - cargoHash = "sha256-oJ+zAtTwFSSzwq1gvkRloBj8g30G8Eq7dG2RoaX39lA="; + cargoHash = "sha256-2mbGwElBfo4L/iGZm3iRBR5UGeMFlfaSp79vVvCAIo0="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 37a58bd40522..2a002feb2aac 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-09-04"; - cargoSha256 = "sha256-J8eEHv262v21b1rs3e2seTwaKtvoGne5hXqa2jgQmoY="; + version = "2023-09-11"; + cargoSha256 = "sha256-bdF88QG++8ieFLG9H6D6nR6d9GHna36HMskp6TnTA4c="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-Mk35KaY7OkEKNoj3Q3NEJ0PjFhqUd9Ry+NSzd3K1QUw="; + sha256 = "sha256-6GjjGVCn0lNlGQifjM8AqRRMzVxf/KNyQqmAl8a9HME="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/development/tools/sqldef/default.nix index 6ce1d02e9f85..8fac2f9aa0c4 100644 --- a/pkgs/development/tools/sqldef/default.nix +++ b/pkgs/development/tools/sqldef/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "sqldef"; - version = "0.16.4"; + version = "0.16.7"; src = fetchFromGitHub { owner = "k0kubun"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-HQ6WyeKYRd+pY/P2Bsu7W2eMjgpjUhbwEFE7bADrxDY="; + hash = "sha256-y28dn/LhqQxbszKwOjpiU93oP1tq/H0NL9vonhERLzw="; }; proxyVendor = true; - vendorHash = "sha256-YdZo2XN+425s0K/3COqQx3g1Bpus4uWiwnzrYJ8qdOM="; + vendorHash = "sha256-ugLjaKCVgVl2jhH/blQ44y/c8hxQpbdlxUC4u+FgMGM="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/development/tools/sshs/default.nix b/pkgs/development/tools/sshs/default.nix index 804a6a09642f..74eecc7979c0 100644 --- a/pkgs/development/tools/sshs/default.nix +++ b/pkgs/development/tools/sshs/default.nix @@ -12,10 +12,10 @@ buildGoModule rec { owner = "quantumsheep"; repo = pname; rev = version; - sha256 = "KD971dGm1oQt9GbiUGZm2k4SJrBAA9rnHj7Gu0t3SJw="; + hash = "sha256-KD971dGm1oQt9GbiUGZm2k4SJrBAA9rnHj7Gu0t3SJw="; }; - vendorSha256 = "OCh37wjSs40Q0VQmoc1nXQ4nWddnoUCrI5xgxpxR/Ec="; + vendorHash = "sha256-OCh37wjSs40Q0VQmoc1nXQ4nWddnoUCrI5xgxpxR/Ec="; ldflags = [ "-s" "-w" "-X github.com/quantumsheep/sshs/cmd.Version=${version}" ]; diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index bf201b5eb5b8..1afb444c323d 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R/GFAbaR/f3kO1n4jQyCPOkfG9fRubnuQy0VUg0NqKw="; + sha256 = "sha256-f4U3vzgvFF1N6X8f8zwtqSaQfiwNX7CecpcJ0GKx2P0="; }; - cargoSha256 = "sha256-Ca6HNhdT5/CAI3qyzM7wBuCYYOPOHEyP+QyDia1csUo="; + cargoSha256 = "sha256-az5j0qvP3mZXRJZOmslDb40MSMS+iAvXYVNGw8vt7gg="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' diff --git a/pkgs/development/tools/wlcs/default.nix b/pkgs/development/tools/wlcs/default.nix index 47c48aaa8417..2f666bf70976 100644 --- a/pkgs/development/tools/wlcs/default.nix +++ b/pkgs/development/tools/wlcs/default.nix @@ -2,7 +2,6 @@ , lib , gitUpdater , fetchFromGitHub -, fetchpatch , cmake , pkg-config , boost @@ -12,25 +11,15 @@ stdenv.mkDerivation rec { pname = "wlcs"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "MirServer"; repo = "wlcs"; rev = "v${version}"; - hash = "sha256-QxmWxu+w77/WE5pGXMWXm+NP95QmYo2O8ltZYrgCIWw="; + hash = "sha256-+YM5dT45p9wk0gJeATmhWDFJJMaUdcTfw8GLS/vMkw4="; }; - patches = [ - # Improves pkg-config paths even more - # Remove when https://github.com/MirServer/wlcs/pull/260 merged & in a release - (fetchpatch { - name = "0001-wlcs-pkgsconfig-Use-better-path-concatenations.patch"; - url = "https://github.com/MirServer/wlcs/pull/260/commits/20f28d82fa4dfa6a6e27212dbd6b0f2e8a833c69.patch"; - hash = "sha256-m8zPD27JbX/vN2YQgNhcRsh/O+qLfvoeky5E5ZEeD1I="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config @@ -42,11 +31,6 @@ stdenv.mkDerivation rec { wayland ]; - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=maybe-uninitialized" - ]; - passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index fdfad0cab2e7..2bf239579e4a 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -37,7 +37,7 @@ let pname = "mindustry"; - version = "145.1"; + version = "146"; buildVersion = makeBuildVersion version; selectedGlew = if enableWayland then glew-egl else glew; @@ -46,13 +46,13 @@ let owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - hash = "sha256-xHF+3QIzP6Xekm1arXio4dAveOQpY9MXuiUC7OZFSUA="; + hash = "sha256-pJAJjb8rgDL5q2hfuXH2Cyb1Szu4GixeXoLMdnIAlno="; }; Arc = fetchFromGitHub { owner = "Anuken"; repo = "Arc"; rev = "v${version}"; - hash = "sha256-HkJoYdnC4rwTMEmSO0r82cuhY3ZT7Baj3pyqSbzJrQ4="; + hash = "sha256-L+5fshI1oo1lVdTMTBuPzqtEeR2dq1NORP84rZ83rT0="; }; soloud = fetchFromGitHub { owner = "Anuken"; @@ -131,7 +131,7 @@ let | sh ''; outputHashMode = "recursive"; - outputHash = "sha256-tSQV9A4uxKUVEJuFRxCQVZNb+0wEQrZofQOluQe0cfA="; + outputHash = "sha256-hbWLsWorEo+1BBURvrFMXpxvZjJBZ1p7HVlJN5e5JZc="; }; in diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index 2faa90006b55..c82e1d02afc7 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -5,9 +5,9 @@ , aubio , boost , cmake -, ffmpeg_4 +, ffmpeg +, fmt , gettext -, git , glew , glibmm , glm @@ -15,6 +15,7 @@ , libepoxy , librsvg , libxmlxx +, nlohmann_json , pango , pkg-config , portaudio @@ -22,17 +23,17 @@ stdenv.mkDerivation rec { pname = "performous"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "performous"; + repo = "performous"; rev = "refs/tags/${version}"; - hash = "sha256-ueTSirov/lj4/IzaMqHitbOqx8qqUpsTghcb9DUnNEg="; + hash = "sha256-y7kxLht15vULN9NxM0wzj9+7Uq4/3D5j9oBEnrTIwQ8="; }; cedSrc = fetchFromGitHub { - owner = pname; + owner = "performous"; repo = "compact_enc_det"; rev = "9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e"; hash = "sha256-ztfeblR4YnB5+lb+rwOQJjogl+C9vtPH9IVnYO7oxec="; @@ -46,6 +47,9 @@ stdenv.mkDerivation rec { postPatch = '' mkdir ced-src cp -R ${cedSrc}/* ced-src + + substituteInPlace data/CMakeLists.txt \ + --replace "/usr" "$out" ''; nativeBuildInputs = [ @@ -58,7 +62,8 @@ stdenv.mkDerivation rec { SDL2 aubio boost - ffmpeg_4 + ffmpeg + fmt glew glibmm glm @@ -66,6 +71,7 @@ stdenv.mkDerivation rec { libepoxy librsvg libxmlxx + nlohmann_json pango portaudio ]; diff --git a/pkgs/games/performous/performous-cmake.patch b/pkgs/games/performous/performous-cmake.patch index 5c1a4c91012b..dae399cd54de 100644 --- a/pkgs/games/performous/performous-cmake.patch +++ b/pkgs/games/performous/performous-cmake.patch @@ -1,21 +1,17 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 48af2a89..43786c31 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -75,15 +75,7 @@ else() - message(STATUS "Localization disabled: Gettext tools (msgfmt) missing") - endif() - --include(FetchContent) --FetchContent_Declare(ced-sources -- GIT_REPOSITORY https://github.com/performous/compact_enc_det.git -- #https://github.com/google/compact_enc_det.git -- GIT_TAG master -- SOURCE_DIR ced-src --) +diff --git a/cmake/Modules/FindCed.cmake b/cmake/Modules/FindCed.cmake +index d6e2aca..3085adb 100644 +--- a/cmake/Modules/FindCed.cmake ++++ b/cmake/Modules/FindCed.cmake +@@ -1,11 +1 @@ +-include(LibFetchMacros) +- +-set(Ced_GIT_VERSION "master") - --FetchContent_MakeAvailable(ced-sources) -+add_subdirectory(ced-src) - - option(USE_SELF_BUILT_AUBIO "Use custom aubio local build instead of using system lib (if available)" FALSE) - +-libfetch_git_pkg(Ced +- REPOSITORY ${SELF_BUILT_GIT_BASE}/compact_enc_det.git +- #https://github.com/google/compact_enc_det.git +- REFERENCE ${Ced_GIT_VERSION} +- FIND_PATH compact_enc_det/compact_enc_det.h +-) +-message(STATUS "Found Google CED ${Ced_VERSION}") ++add_subdirectory(../ced-src ced-src) diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 00a8af6d8b70..4b38c86fbdce 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = "https://worldofgoo.com"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ jcumming maxeaubrey ]; + maintainers = with maintainers; [ jcumming amaxine ]; }; } diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 654c8951e65c..5705087ed6ae 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -92,12 +92,12 @@ in rec { catppuccin = mkTmuxPlugin { pluginName = "catppuccin"; - version = "unstable-2023-07-15"; + version = "unstable-2023-08-21"; src = fetchFromGitHub { owner = "catppuccin"; repo = "tmux"; - rev = "e7b50832f9bc59b0b5ef5316ba2cd6f61e4e22fc"; - hash = "sha256-9ZfUqEKEexSh06QyR5C+tYd4tNfBi3PsA+STzUv4+/s="; + rev = "7a284c98e5df4cc84a1a45ad633916f0b2b916b2"; + hash = "sha256-jxcxW0gEfXaSt8VM3UIs0dKNKaHb8JSEQBBV3SVjW/A="; }; postInstall = '' sed -i -e 's|''${PLUGIN_DIR}/catppuccin-selected-theme.tmuxtheme|''${TMUX_TMPDIR}/catppuccin-selected-theme.tmuxtheme|g' $target/catppuccin.tmux diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index bde39a41b525..230f73ef416d 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { changelog = "https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=${version}"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ mic92 dtzWill maxeaubrey ]; + maintainers = with maintainers; [ mic92 dtzWill amaxine ]; }; } diff --git a/pkgs/os-specific/linux/fan2go/default.nix b/pkgs/os-specific/linux/fan2go/default.nix index e7ad27741062..48da98cf5912 100644 --- a/pkgs/os-specific/linux/fan2go/default.nix +++ b/pkgs/os-specific/linux/fan2go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fan2go"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "markusressel"; repo = pname; rev = version; - sha256 = "3pnJaLD+FEQWAAwIiTkcs9VgqO0JwRaK7JLdIygeChY="; + sha256 = "w2Qwu3ZmBkoA86xa7V6pnIBAbfG9mtkAHePkQjefRW8="; }; - vendorSha256 = "9EeiYPNTUEFHxTdvVb2JLU6Qi0oazH+n9MB8Dg+RLJ4="; + vendorSha256 = "6OEdl7ie0dTjXrG//Fvcg4ZyTW/mhrUievDljY2zi/4="; postConfigure = '' substituteInPlace vendor/github.com/md14454/gosensors/gosensors.go \ diff --git a/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix b/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix index 56001cb225aa..a8adefc63468 100644 --- a/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://fwupd.org/"; - maintainers = with maintainers; [ maxeaubrey ]; + maintainers = with maintainers; [ amaxine ]; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index b808fb208c4d..792fef69cbd2 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -92,6 +92,6 @@ stdenv.mkDerivation rec { description = "Wireless daemon for Linux"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill fpletz maxeaubrey ]; + maintainers = with maintainers; [ dtzWill fpletz amaxine ]; }; } diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c8ae911c1287..2e5582677369 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -603,8 +603,8 @@ let microcode = { MICROCODE = yes; - MICROCODE_INTEL = yes; - MICROCODE_AMD = yes; + MICROCODE_INTEL = whenOlder "6.6" yes; + MICROCODE_AMD = whenOlder "6.6" yes; # Write Back Throttling # https://lwn.net/Articles/682582/ # https://bugzilla.kernel.org/show_bug.cgi?id=12309#c655 @@ -913,7 +913,7 @@ let SECCOMP = yes; # used by systemd >= 231 SECCOMP_FILTER = yes; # ditto POSIX_MQUEUE = yes; - FRONTSWAP = yes; + FRONTSWAP = whenOlder "6.6" yes; FUSION = yes; # Fusion MPT device support IDE = whenOlder "5.14" no; # deprecated IDE support, removed in 5.14 IDLE_PAGE_TRACKING = yes; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 1f03029d9028..9a3b32a7f2d2 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.5-rc7"; + version = "6.6-rc1"; 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-5rIcyXN54o9P+RxHZkI/BTO2Ox6uJ0Fi9NVcrN1HczQ="; + hash = "sha256-DRai7HhWVtRB0GiRCvCv2JM2TFKRsZ60ohD6GW0b8As="; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 8dd92c99db4a..7c3084d7ebdb 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole +, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, kmod , fetchpatch }: @@ -271,7 +271,7 @@ let make modules_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" unlink $out/lib/modules/${modDirVersion}/build - unlink $out/lib/modules/${modDirVersion}/source + rm -f $out/lib/modules/${modDirVersion}/source mkdir -p $dev/lib/modules/${modDirVersion}/{build,source} @@ -376,6 +376,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ] ++ optional (lib.versionAtLeast version "5.8") elfutils + ++ optional (lib.versionAtLeast version "6.6") kmod ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 9595de407cb4..24e0ed5adbb1 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -75,6 +75,18 @@ rec { url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; }; + # data center driver compatible with current default cudaPackages + dc = dc_520; + dc_520 = generic rec { + version = "520.61.05"; + url = "https://us.download.nvidia.com/tesla/${version}/NVIDIA-Linux-x86_64-${version}.run"; + sha256_64bit = "sha256-EPYWZwOur/6iN/otDMrNDpNXr1mzu8cIqQl8lXhQlzU=="; + fabricmanagerSha256 = "sha256-o8Kbmkg7qczKQclaGvEyXNzEOWq9ZpQZn9syeffnEiE=="; + useSettings = false; + usePersistenced = false; + useFabricmanager = true; + }; + # Update note: # If you add a legacy driver here, also update `top-level/linux-kernels.nix`, # adding to the `nvidia_x11_legacy*` entries. diff --git a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix new file mode 100644 index 000000000000..58cf8c0e3557 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix @@ -0,0 +1,47 @@ +nvidia_x11: sha256: + +{ stdenv, lib, fetchurl, patchelf }: + +let + sys = with lib; concatStringsSep "-" (reverseList (splitString "-" stdenv.system)); + bsys = builtins.replaceStrings ["_"] ["-"] sys; + fmver = nvidia_x11.version; +in + +stdenv.mkDerivation rec { + pname = "fabricmanager"; + version = fmver; + src = fetchurl { + url = "https://developer.download.nvidia.com/compute/cuda/redist/fabricmanager/" + + "${sys}/${pname}-${sys}-${fmver}-archive.tar.xz"; + inherit sha256; + }; + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + find . + mkdir -p $out/{bin,share/nvidia-fabricmanager} + for bin in nv{-fabricmanager,switch-audit};do + ${patchelf}/bin/patchelf \ + --set-interpreter ${stdenv.cc.libc}/lib/ld-${bsys}.so.2 \ + --set-rpath ${lib.makeLibraryPath [ stdenv.cc.libc ]} \ + bin/$bin + done + mv bin/nv{-fabricmanager,switch-audit} $out/bin/. + for d in etc systemd share/nvidia;do + mv $d $out/share/nvidia-fabricmanager/. + done + for d in include lib;do + mv $d $out/. + done + ''; + + meta = with lib; { + homepage = "https://www.nvidia.com/object/unix.html"; + description = "Fabricmanager daemon for NVLink intialization and control"; + license = licenses.unfreeRedistributable; + platforms = nvidia_x11.meta.platforms; + mainProgram = "nv-fabricmanager"; + maintainers = with maintainers; [ edwtjo ]; + }; +} diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 792fda42ca9c..8ec292f27251 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -4,14 +4,19 @@ , sha256_64bit , sha256_aarch64 ? null , openSha256 ? null -, settingsSha256 +, settingsSha256 ? null , settingsVersion ? version -, persistencedSha256 +, persistencedSha256 ? null , persistencedVersion ? version +, fabricmanagerSha256 ? null +, fabricmanagerVersion ? version , useGLVND ? true , useProfiles ? true , preferGtk2 ? false , settings32Bit ? false +, useSettings ? true +, usePersistenced ? true +, useFabricmanager ? false , ibtSupport ? false , prePatch ? "" @@ -33,14 +38,21 @@ disable32Bit ? stdenv.hostPlatform.system == "aarch64-linux" # 32 bit libs only version of this package , lib32 ? null - # Whether to extract the GSP firmware -, firmware ? openSha256 != null + # Whether to extract the GSP firmware, datacenter drivers needs to extract the + # firmware +, firmware ? openSha256 != null || useFabricmanager + # Whether the user accepts the NVIDIA Software License +, config, acceptLicense ? config.nvidia.acceptLicense or false }: with lib; assert !libsOnly -> kernel != null; assert versionOlder version "391" -> sha256_32bit != null; +assert useSettings -> settingsSha256 != null; +assert usePersistenced -> persistencedSha256 != null; +assert useFabricmanager -> fabricmanagerSha256 != null; +assert useFabricmanager -> !(useSettings || usePersistenced); let nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; @@ -54,12 +66,33 @@ let dbus # for nvidia-powerd ]); + # maybe silly since we've ignored this previously and just unfree.. + throwLicense = throw '' + Use of NVIDIA Software requires license acceptance of the license: + + - License For Customer Use of NVIDIA Software [1] + + You can express acceptance by setting acceptLicense to true your nixpkgs.config. + Example: + + configuration.nix: + nixpkgs.config.allowUnfree = true; + nixpkgs.config.nvidia.acceptLicense = true; + + config.nix: + allowUnfree = true; + nvidia.acceptLicense = true; + + [1]: https://www.nvidia.com/content/DriverDownloads/licence.php?lang=us + ''; + self = stdenv.mkDerivation { - name = "nvidia-x11-${version}${nameSuffix}"; + name = "nvidia-${if useFabricmanager then "dc" else "x11"}-${version}${nameSuffix}"; builder = ./builder.sh; src = + if !acceptLicense && (openSha256 == null) then throwLicense else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { urls = if args ? url then [ args.url ] else [ @@ -127,11 +160,17 @@ let nvidia_x11 = self; broken = brokenOpen; }) openSha256; - settings = (if settings32Bit then pkgsi686Linux.callPackage else callPackage) (import ./settings.nix self settingsSha256) { - withGtk2 = preferGtk2; - withGtk3 = !preferGtk2; - }; - persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256; + settings = if useSettings then + (if settings32Bit then pkgsi686Linux.callPackage else callPackage) (import ./settings.nix self settingsSha256) { + withGtk2 = preferGtk2; + withGtk3 = !preferGtk2; + } else {}; + persistenced = if usePersistenced then + mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256 + else {}; + fabricmanager = if useFabricmanager then + mapNullable (hash: callPackage (import ./fabricmanager.nix self hash) { }) fabricmanagerSha256 + else {}; inherit persistencedVersion settingsVersion; compressFirmware = false; ibtSupport = ibtSupport || (lib.versionAtLeast version "530"); @@ -141,12 +180,12 @@ let meta = with lib; { homepage = "https://www.nvidia.com/object/unix.html"; - description = "X.org driver and kernel module for NVIDIA graphics cards"; + description = "${if useFabricmanager then "Data Center" else "X.org"} driver and kernel module for NVIDIA cards"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ] ++ optionals (sha256_32bit != null) [ "i686-linux" ] ++ optionals (sha256_aarch64 != null) [ "aarch64-linux" ]; - maintainers = with maintainers; [ jonringer kiskae ]; + maintainers = with maintainers; [ jonringer kiskae edwtjo ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" inherit broken; }; diff --git a/pkgs/os-specific/linux/uclibc-ng/default.nix b/pkgs/os-specific/linux/uclibc-ng/default.nix index b357bc50e584..43c9bbfa8f3f 100644 --- a/pkgs/os-specific/linux/uclibc-ng/default.nix +++ b/pkgs/os-specific/linux/uclibc-ng/default.nix @@ -58,11 +58,11 @@ let in stdenv.mkDerivation rec { pname = "uclibc-ng"; - version = "1.0.42"; + version = "1.0.44"; src = fetchurl { url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.xz"; - sha256 = "sha256-7G2uRM6GVYiF5WvDvva9TQgjlxFObh/BV5X3HoBNcBY="; + sha256 = "sha256-ffnZh5VYJzgvHCQA2lE0Vr7Ltvhovf03c3Jl8cvuyZQ="; }; # 'ftw' needed to build acl, a coreutils dependency diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index 1b3962907781..ea7cb80b8fc0 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Dict protocol server and client"; homepage = "http://www.dict.org"; - license = licenses.gpl2; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/dict/libmaa.nix b/pkgs/servers/dict/libmaa.nix index b0762990f2d5..9b31732ed124 100644 --- a/pkgs/servers/dict/libmaa.nix +++ b/pkgs/servers/dict/libmaa.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; meta = with lib; { - description = "Dict protocol server and client"; - maintainers = [ ]; - platforms = platforms.linux; + description = "Provides many low-level data structures which are helpful for writing compilers"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index dbe0840a0fad..7582ccdb954d 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "cf12ab736c512eb719a221cd3f65bb94f93ff2b477803d9474d1334af73c1533"; + sha256 = "f3f4b1d49ec9b81113b14a38354b823bd4a470356ed7e8e555595b6fd1ac80c9"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/fastnetmon-advanced/default.nix b/pkgs/servers/fastnetmon-advanced/default.nix index 35c1707a2d5a..e1422ed1379b 100644 --- a/pkgs/servers/fastnetmon-advanced/default.nix +++ b/pkgs/servers/fastnetmon-advanced/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { description = "A high performance DDoS detector / sensor - commercial edition"; homepage = "https://fastnetmon.com"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ yuka ]; + maintainers = teams.wdz.members; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5ab04b40f2c8..57ace965f4be 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.9.0"; + version = "2023.9.1"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 60004331b366..e36ad7fd6db6 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -283,12 +283,12 @@ let }); zeroconf = super.zeroconf.overridePythonAttrs (oldAttrs: rec { - version = "0.91.1"; + version = "0.98.0"; src = fetchFromGitHub { owner = "python-zeroconf"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-HHADcxXjfukRJtqRjfKI/spZIqOfDT0Etg4oYzNdXIs="; + hash = "sha256-oajSXGQTsJsajRAnS/MkkbSyxTeVvdjvw1eiJaPzZMY="; }; }); @@ -316,7 +316,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.9.0"; + hassVersion = "2023.9.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -332,7 +332,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-XdZYVv60ZCkK0fKmt2kmThRxhv+hfJMtHwgBu3iaW9w="; + hash = "sha256-uOFCaYpw/UVWdkJ3ixu8cMx9sbDy2WnHPxvPvWN1mkE="; }; # Secondary source is git for tests @@ -340,7 +340,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-B+GdUXRvQyBMR7PbVGEZr7hZm7wslBskUTB23APJLIU="; + hash = "sha256-rglLwAlHlwoaF/RxUsKc8+f38D6ztMh2p2fkHLWq9MM="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 72da8c22120d..53861ae2c4f3 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230906.1"; + version = "20230908.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-wR/v49K4bKNnzkRltvdFjVYgZ+jU8PVBJHCF765NY5U="; + hash = "sha256-XZAdS4RjnPmMXYzBmyA4+liH5kdm3U/YqJJGXIaqOGo="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index b838dabe2dcb..fd436207720b 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.9.0"; + version = "2023.9.1"; 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-7G6IIOrQGRF7zLr+2WlZTvixyyoFqrLJiC/BNqUqx20="; + hash = "sha256-USpB/ZanWfLxL3J4/mdKzj3o5rgb9kRrZ/oG4S36CfU="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 849b7f5e2bd0..478be3129e4d 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -16,20 +16,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.91.1"; + version = "1.92.1"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-SOQp+mqADO+iwvKPA50IdxBvVzMiUUZ7f1hwXQYyopA="; + hash = "sha256-rCxoYtdvh+Gu0O2T3uu0k2FFFFc7m09LuKJvkSky3M4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-vkM1U9L9PGDZFw64KAQyRQWtewRzXXWhk35m23x6o+8="; + hash = "sha256-yZeCENWdPv80Na1++/IQFOrhah/VHWwJDNV2dI/yTHg="; }; postPatch = '' diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 013c3190e3b8..6221c467689f 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , gitUpdater , testers , cmake @@ -41,25 +40,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "mir"; - version = "2.13.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "MirServer"; repo = "mir"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ip8p4mjcgmZQJTU4MNvWkTTtSJc+cCL3x1mMDFlZrVY="; + hash = "sha256-IEGeZVNxwzHn5GASCyjNuQsnCzzfQBHdC33MWVMeZws="; }; - patches = [ - # Fixes Mir being able to drop first input device on launch - # Drop when https://github.com/MirServer/mir/issues/2837 fixed in a release - (fetchpatch { - name = "0001-mir-Simplify_probing_of_evdev_input_platform.patch"; - url = "https://github.com/MirServer/mir/commit/7787cfa721934bb43d3255218e7c92e700923fcb.patch"; - hash = "sha256-9C9qcmngd+K8EAcyOYUJFTdFDu1Nt1MM7Y9TRNOXFB4="; - }) - ]; - postPatch = '' # Fix scripts that get run in tests patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in diff --git a/pkgs/servers/misc/irrd/default.nix b/pkgs/servers/misc/irrd/default.nix index 1ba0c158331f..aef559d4e227 100644 --- a/pkgs/servers/misc/irrd/default.nix +++ b/pkgs/servers/misc/irrd/default.nix @@ -153,7 +153,7 @@ py.pkgs.buildPythonPackage rec { description = "An Internet Routing Registry database server, processing IRR objects in the RPSL format"; license = licenses.mit; homepage = "https://github.com/irrdnet/irrd"; - maintainers = with maintainers; [ netali yuka ]; + maintainers = teams.wdz.members; }; } diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/servers/monitoring/unpoller/default.nix index 741142cf8fd7..e471666e588b 100644 --- a/pkgs/servers/monitoring/unpoller/default.nix +++ b/pkgs/servers/monitoring/unpoller/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "unpoller"; - version = "2.8.1"; + version = "2.8.3"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-w0DcU27wrqzWxPwoY/as2vBtJQytz1482tNIXdyvHbY="; + hash = "sha256-ONr8xwvCXLnAlJKbgt/O+lCEKbV2SJXW/1oJPYRtQ3s="; }; - vendorHash = "sha256-2uvQhEEtsnGPQxYnNND6kM1HeN3kFlHzUXiehM+GpMs="; + vendorHash = "sha256-eLHtSEINxrqjlPyJZJwfSGA0gVaxcIolhWnqJxLXkew="; ldflags = [ "-w" "-s" diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index d60af6c137d8..b715f4e60877 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.9.21"; + version = "2.9.22"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-gzwnD9o0lqo1lUw9viSnvjsWSCSmMi2qR9ndtWztMjQ="; + hash = "sha256-ednQfVG1/A8zliJ6oHXvfjIP7EtAiwdVaUSNUdKwn+g="; }; - vendorHash = "sha256-RK5OD1zea4M4/mXjGKhU+igSoE4YaA2/jAL7RFBoouo="; + vendorHash = "sha256-B5za9EcnAytmt0p6oyvXjfeRamsslh+O7n2xMHooLSk="; doCheck = false; diff --git a/pkgs/servers/photofield/default.nix b/pkgs/servers/photofield/default.nix index ca7dd9588286..7ac5282fb978 100644 --- a/pkgs/servers/photofield/default.nix +++ b/pkgs/servers/photofield/default.nix @@ -9,13 +9,13 @@ let pname = "photofield-ui"; - version = "0.10.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "SmilyOrg"; repo = "photofield"; rev = "v${version}"; - hash = "sha256-kcKnE4U+XWYfKw5nZSk+xCtYdagHBMZS3hvukEL8p4M="; + hash = "sha256-AqOhagqH0wRKjwcRHFVw0izC0DBv9uY3B5MMDBJoFVE="; }; webui = buildNpmPackage { @@ -37,7 +37,7 @@ buildGoModule rec { pname = "photofield"; inherit version src; - vendorHash = "sha256-g6jRfPALBAgZVuljq/JiCpea7gZl/8akiabxjRmDsFs="; + vendorHash = "sha256-0rrBHkKZfStwzIv5Us/8Db6z3ZSqassCMWQMpScZq7Y="; preBuild = '' cp -r ${webui}/share/photofield-ui ui/dist diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 3d6ce5840a86..1945068b2376 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -7,14 +7,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-V/q6qpQkdrtMLzihV/0d3B+QUWwG4cYy8c2jNd5npww="; + sha256 = "sha256-9gD39eHIQEd59UNlz/Sw7V7ekBvk/pHETfo8HzfdQDQ="; }; patches = [ @@ -175,7 +175,7 @@ beamPackages.mixRelease rec { description = "ActivityPub microblogging server"; homepage = "https://git.pleroma.social/pleroma/pleroma"; license = licenses.agpl3; - maintainers = with maintainers; [ ninjatrappeur yuka kloenk ]; + maintainers = with maintainers; [ ninjatrappeur yuka kloenk yayayayaka ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index f85e29af1940..37bf7697481c 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { lnl7 pjones thoughtpolice - maxeaubrey + amaxine MayNiklas ]; description = "Media library streaming server"; diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 4e5079206bdc..58ee4cab598f 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.16.10"; + version = "0.18.3"; src = fetchFromGitHub { owner = "pocketbase"; - repo = pname; + repo = "pocketbase"; rev = "v${version}"; - sha256 = "sha256-BH3hJ+5xAJkGj2HoKpee+ZNgMmyQoHEVI0wsXRwIdGw="; + hash = "sha256-UwxE36y99vW/45Lnkm5qaevEToxIVs73YUJVDtr8ziA="; }; - vendorHash = "sha256-h3lkmpHEMr/aueP+lJpa9HJCidEpm7xSKws28+ZSeQA="; + vendorHash = "sha256-vb0957zO27OgrSTUiAt+vuo9NKM5ftz8mbFf613l0eM="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; @@ -32,11 +32,6 @@ buildGoModule rec { mv $out/bin/base $out/bin/pocketbase ''; - patches = [ - # To provide a consistent update experience, we remove the built in update method - ./remove-update-method.patch - ]; - meta = with lib; { description = "Open Source realtime backend in 1 file"; homepage = "https://github.com/pocketbase/pocketbase"; diff --git a/pkgs/servers/pocketbase/remove-update-method.patch b/pkgs/servers/pocketbase/remove-update-method.patch deleted file mode 100644 index a68ae58bd0ba..000000000000 --- a/pkgs/servers/pocketbase/remove-update-method.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/examples/base/main.go b/examples/base/main.go -index 908d31d..04b8f1d 100644 ---- a/examples/base/main.go -+++ b/examples/base/main.go -@@ -10,7 +10,6 @@ import ( - "github.com/pocketbase/pocketbase" - "github.com/pocketbase/pocketbase/apis" - "github.com/pocketbase/pocketbase/core" -- "github.com/pocketbase/pocketbase/plugins/ghupdate" - "github.com/pocketbase/pocketbase/plugins/jsvm" - "github.com/pocketbase/pocketbase/plugins/migratecmd" - ) -@@ -80,9 +79,6 @@ func main() { - Dir: migrationsDir, - }) - -- // GitHub selfupdate -- ghupdate.MustRegister(app, app.RootCmd, nil) -- - app.OnAfterBootstrap().Add(func(e *core.BootstrapEvent) error { - app.Dao().ModelQueryTimeout = time.Duration(queryTimeout) * time.Second - return nil diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index c8113dc3ad98..6801c680b6ec 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.5.5"; + version = "0.6.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - sha256 = "sha256-+jtB6OuoMSF3w5TfW2Q+LaP+8VKC1EpWU4mWZbBDNDM="; + hash = "sha256-LrqkLZ7ouMUrE3vHYC0ZwmblaYL6b5fY2RYEYOOxNYQ="; }; - vendorHash = "sha256-wf2Dfo4uWHg/h2+EfEW5oGUgqf1kAgiTq7ivczI1w+c="; + vendorHash = "sha256-RQQvR4d5dtzboPYJwdeUqfGwSun04gs7hm1YYAt8OPo="; doCheck = false; diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix index 9ceabbe972a1..9a390e258daf 100644 --- a/pkgs/servers/sql/postgresql/ext/periods.nix +++ b/pkgs/servers/sql/postgresql/ext/periods.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "periods"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "xocolatl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XAqjP8Cih+HzqlI8XjgCNzSVQSbaetLRvJReiwHdaIc="; + sha256 = "sha256-ezt+MtDqPM8OmJCD6oQTS644l+XHZoxuivq0PUIXOY8="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index a482c0249668..b288a27baf89 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "4.7.3"; + version = "4.7.4"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-njw7/+C3nMNRKeJ4AMCNTihTVXcouH/VY2vaFeyA5v8="; + sha256 = "sha256-DdE/hqCrju678Xk3xXGVFhKQM3x9skQQKolNJ2/3gbs="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix new file mode 100644 index 000000000000..a0ef596aaded --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, curl, postgresql }: + +stdenv.mkDerivation rec { + pname = "pgsql-http"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "pramsey"; + repo = "pgsql-http"; + rev = "v${version}"; + hash = "sha256-CPHfx7vhWfxkXsoKTzyFuTt47BPMvzi/pi1leGcuD60="; + }; + + buildInputs = [ curl postgresql ]; + + installPhase = '' + install -D -t $out/lib *.so + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control + ''; + + meta = with lib; { + description = "HTTP client for PostgreSQL, retrieve a web page from inside the database"; + homepage = "https://github.com/pramsey/pgsql-http"; + changelog = "https://github.com/pramsey/pgsql-http/releases/tag/v${version}"; + maintainers = [ maintainers.marsam ]; + platforms = postgresql.meta.platforms; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 328f2f64eba7..5745630964e4 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -16,13 +16,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.3.3"; + version = "3.4.0"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "sha256-dOs1bj+F8UIzeRATNgiBtnSPeAgcxoj/nW8PZzp2LRM="; + sha256 = "sha256-rum2CmyITTVBZLMJbEZX8yRFQYZgf4WdHOBdiZeYr50="; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ] @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure - configureFlags="--datadir=$out/share/postgresql --datarootdir=$out/share/postgresql --bindir=$out/bin --docdir=$doc/share/doc/${pname} --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" + configureFlags="--datadir=$out/share/postgresql --datarootdir=$out/share/postgresql --bindir=$out/bin --docdir=$doc/share/doc/${pname} --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev} --disable-extension-upgrades-install" makeFlags="PERL=${perl}/bin/perl datadir=$out/share/postgresql pkglibdir=$out/lib bindir=$out/bin docdir=$doc/share/doc/${pname}" ''; @@ -76,5 +76,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; inherit (postgresql.meta) platforms; + broken = versionOlder postgresql.version "12"; }; } diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 790afeed2af9..64254e826154 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -30,6 +30,8 @@ self: super: { pgroonga = super.callPackage ./ext/pgroonga.nix { }; + pgsql-http = super.callPackage ./ext/pgsql-http.nix { }; + pgvector = super.callPackage ./ext/pgvector.nix { }; plpgsql_check = super.callPackage ./ext/plpgsql_check.nix { }; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 5b1253cd8c8a..f42e5e7ccfc2 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: let - version = "1.48.1"; + version = "1.48.2"; in buildGoModule { pname = "tailscale"; @@ -11,7 +11,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-jWnke49b6inybPmiZOkxI3C8VoYe4Syi84YhvL8zxeI="; + hash = "sha256-5Usi7W4y6JniyxBIfQid1XjDIZRS5oIw+KUMMiFRBwk="; }; vendorHash = "sha256-Fr4VZcKrXnT1PZuEG110KBefjcZzRsQRBSvByELKAy4="; diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/servers/web-apps/healthchecks/default.nix index 142a67d3367a..193452c4354c 100644 --- a/pkgs/servers/web-apps/healthchecks/default.nix +++ b/pkgs/servers/web-apps/healthchecks/default.nix @@ -39,13 +39,36 @@ py.pkgs.buildPythonApplication rec { whitenoise ]; + secrets = [ + "DB_PASSWORD" + "DISCORD_CLIENT_SECRET" + "EMAIL_HOST_PASSWORD" + "LINENOTIFY_CLIENT_SECRET" + "MATRIX_ACCESS_TOKEN" + "PD_APP_ID" + "PUSHBULLET_CLIENT_SECRET" + "PUSHOVER_API_TOKEN" + "S3_SECRET_KEY" + "SECRET_KEY" + "SLACK_CLIENT_SECRET" + "TELEGRAM_TOKEN" + "TRELLO_APP_KEY" + "TWILIO_AUTH" + ]; + localSettings = writeText "local_settings.py" '' import os + STATIC_ROOT = os.getenv("STATIC_ROOT") - SECRET_KEY_FILE = os.getenv("SECRET_KEY_FILE") - if SECRET_KEY_FILE: - with open(SECRET_KEY_FILE, "r") as file: - SECRET_KEY = file.readline() + + ${lib.concatLines (map + (secret: '' + ${secret}_FILE = os.getenv("${secret}_FILE") + if ${secret}_FILE: + with open(${secret}_FILE, "r") as file: + ${secret} = file.readline() + '') + secrets)} ''; installPhase = '' diff --git a/pkgs/servers/web-apps/meme-bingo-web/default.nix b/pkgs/servers/web-apps/meme-bingo-web/default.nix new file mode 100644 index 000000000000..4ba25a524bf9 --- /dev/null +++ b/pkgs/servers/web-apps/meme-bingo-web/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchFromGitea, rustPlatform, makeWrapper }: + +rustPlatform.buildRustPackage rec { + pname = "meme-bingo-web"; + version = "0.2.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "annaaurora"; + repo = "meme-bingo-web"; + rev = "v${version}"; + hash = "sha256-6hQra+10TaaQGzwiYfL+WHmGc6f0Hn8Tybd0lA5t0qc="; + }; + + cargoHash = "sha256-/hBymxNAzyfapUL5Whkg4NBLA7Fc8A1npXEa9MXTAz4="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + mkdir -p $out/share/meme-bingo-web + cp -r {templates,static} $out/share/meme-bingo-web/ + + wrapProgram $out/bin/meme-bingo-web \ + --set MEME_BINGO_TEMPLATES $out/share/meme-bingo-web/templates \ + --set MEME_BINGO_STATIC $out/share/meme-bingo-web/static + ''; + + meta = with lib; { + description = "Play meme bingo using this neat web app"; + homepage = "https://codeberg.org/annaaurora/meme-bingo-web"; + license = licenses.unlicense; + maintainers = with maintainers; [ annaaurora ]; + }; +} diff --git a/pkgs/servers/web-apps/peering-manager/default.nix b/pkgs/servers/web-apps/peering-manager/default.nix index eb07edabf4de..a16683572fa2 100644 --- a/pkgs/servers/web-apps/peering-manager/default.nix +++ b/pkgs/servers/web-apps/peering-manager/default.nix @@ -99,7 +99,7 @@ in py.pkgs.buildPythonApplication rec { homepage = "https://peering-manager.net/"; license = licenses.asl20; description = "BGP sessions management tool"; - maintainers = with maintainers; [ yuka ]; + maintainers = teams.wdz.members; platforms = platforms.linux; }; } diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index 386e92defad3..aa8ddafd4035 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "murex"; - version = "4.4.9500"; + version = "5.0.9310"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4BtpnGsXgGKIY3+SAZpfUnh+tQWsXyuIfXbvUvEAjy4="; + sha256 = "sha256-gwaNz4OgYs5mAMi/HtLOXoIJA/iHPKX+eiVBP2l2YFU="; }; - vendorHash = "sha256-eQfffqNxt6es/3/H59FC5mLn1IU3oMpY/quzgNOgOaU="; + vendorHash = "sha256-PClKzvpztpry8xsYLfWB/9s/qI5k2m8qHBxkxY0AJqI="; subPackages = [ "." ]; diff --git a/pkgs/test/nixpkgs-check-by-name/default.nix b/pkgs/test/nixpkgs-check-by-name/default.nix index a997fc8612c8..cb8a672bc990 100644 --- a/pkgs/test/nixpkgs-check-by-name/default.nix +++ b/pkgs/test/nixpkgs-check-by-name/default.nix @@ -25,6 +25,10 @@ let export NIX_LOG_DIR=$TEST_ROOT/var/log/nix export NIX_STATE_DIR=$TEST_ROOT/var/nix export NIX_STORE_DIR=$TEST_ROOT/store + + # cargo tests run in parallel by default, which would then run into + # https://github.com/NixOS/nix/issues/2706 unless the store is initialised first + nix-store --init ''; postCheck = '' cargo fmt --check diff --git a/pkgs/test/nixpkgs-check-by-name/src/eval.rs b/pkgs/test/nixpkgs-check-by-name/src/eval.rs index d084642ffe7e..17e22495b22a 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/eval.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/eval.rs @@ -30,9 +30,15 @@ pub fn check_values<W: io::Write>( // 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")?; + // We need to canonicalise this path because if it's a symlink (which can be the case on + // Darwin), Nix would need to read both the symlink and the target path, therefore need 2 + // NIX_PATH entries for restrict-eval. But if we resolve the symlinks then only one predictable + // entry is needed. + let attrs_file_path = attrs_file.path().canonicalize()?; + 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() + attrs_file_path.display() ))?; // With restrict-eval, only paths in NIX_PATH can be accessed, so we explicitly specify the @@ -57,9 +63,9 @@ pub fn check_values<W: io::Write>( // 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(&attrs_file_path) .arg("-I") - .arg(attrs_file.path()) + .arg(&attrs_file_path) // Same for the nixpkgs to test .args(["--arg", "nixpkgsPath"]) .arg(&nixpkgs.path) diff --git a/pkgs/test/nixpkgs-check-by-name/src/main.rs b/pkgs/test/nixpkgs-check-by-name/src/main.rs index db22e524553b..751b5dbd0240 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/main.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/main.rs @@ -140,6 +140,42 @@ mod tests { Ok(()) } + /// Tests symlinked temporary directories. + /// This is needed because on darwin, `/tmp` is a symlink to `/private/tmp`, and Nix's + /// restrict-eval doesn't also allow access to the canonical path when you allow the + /// non-canonical one. + /// + /// The error if we didn't do this would look like this: + /// error: access to canonical path '/private/var/folders/[...]/.tmpFbcNO0' is forbidden in restricted mode + #[test] + fn test_symlinked_tmpdir() -> anyhow::Result<()> { + // Create a directory with two entries: + // - actual (dir) + // - symlinked -> actual (symlink) + let temp_root = tempdir()?; + fs::create_dir(temp_root.path().join("actual"))?; + std::os::unix::fs::symlink("actual", temp_root.path().join("symlinked"))?; + let tmpdir = temp_root.path().join("symlinked"); + + // Then set TMPDIR to the symlinked directory + // Make sure to persist the old value so we can undo this later + let old_tmpdir = env::var("TMPDIR").ok(); + env::set_var("TMPDIR", &tmpdir); + + // Then run a simple test with this symlinked temporary directory + // This should be successful + test_nixpkgs("symlinked_tmpdir", Path::new("tests/success"), "")?; + + // Undo the env variable change + if let Some(old) = old_tmpdir { + env::set_var("TMPDIR", old); + } else { + env::remove_var("TMPDIR"); + } + + Ok(()) + } + fn test_nixpkgs(name: &str, path: &Path, expected_errors: &str) -> anyhow::Result<()> { let extra_nix_path = Path::new("tests/mock-nixpkgs.nix"); diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index 11e090b97300..82d9a6d65a31 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -18,13 +18,13 @@ buildDotnetModule rec { pname = "OpenTabletDriver"; - version = "0.6.2.0"; + version = "0.6.3.0"; src = fetchFromGitHub { owner = "OpenTabletDriver"; repo = "OpenTabletDriver"; rev = "v${version}"; - hash = "sha256-D1/DGvSBgG8wZMmyJ7QAHDcsMjC1YgSpxmSYzs6ntJg="; + hash = "sha256-v41qYNBgOXcFnDOJpQYitql1IZP3p8b3may5Pr04dbg="; }; debPkg = fetchurl { diff --git a/pkgs/tools/X11/opentabletdriver/deps.nix b/pkgs/tools/X11/opentabletdriver/deps.nix index 528ad04b6d55..fe821bf70a9c 100644 --- a/pkgs/tools/X11/opentabletdriver/deps.nix +++ b/pkgs/tools/X11/opentabletdriver/deps.nix @@ -19,7 +19,6 @@ (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.9.4"; sha256 = "11wiyy3ykgk1sa9amy3lgcsg2v7d1sz59ggw647vx8ibpjxijjpp"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; }) @@ -107,7 +106,7 @@ (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta1.20253.1"; sha256 = "16saf1fm9q80bb624fkqz0ksrwpnbw9617d7xg3jib7a2wgagm2r"; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.7.0"; sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; }) (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) @@ -139,7 +138,6 @@ (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (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.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; }) diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index ff38638d5bca..5307b38a108a 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.180"; + version = "3.0.181"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-w1t1sx7Pcv444x3YPNSg3fRQdPga2Q9Z1+Iad7OTjOM="; + sha256 = "sha256-xjOoWQyQCVoCDJMXboxFAyil7jRCWU6oIEt7gcPkIPo="; }; - vendorHash = "sha256-bL1S6GML7XuLraVXcd6NcC3VSYAd05F2ktzI0KF3G8A="; + vendorHash = "sha256-S8Nthnr3wASvRyZS5UTHILPnUA+FeZJEwIvT0O39U3I="; subPackages = [ "main" ]; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 5d2485471735..df7fcdfbbb2a 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, python3, fetchPypi, fetchFromGitHub, installShellFiles }: let - version = "2.51.0"; + version = "2.52.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha512-KjkR1YKvL5stfmIbrfzj9Ons4iYyiKQdLiRh7I7Dd43lvJwXaYLNjIYL5SOX3F3D9nmNxCb0qmYAQH0iEmyVjw=="; + hash = "sha256-wa0LmBMv3eQIsWEKMAHks+TvBZmTdFepPGG5XQRvZXk="; }; # put packages that needs to be overridden in the py package scope diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 392063126229..5c2867b9b555 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -289,8 +289,8 @@ 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=").overridePythonAttrs (attrs: { + azure-mgmt-monitor = (overrideAzureMgmtPackage super.azure-mgmt-monitor "6.0.2" "tar.gz" + "sha256-X/v1AOSZq3kSsbptJs7yZIDZrkEVMgGbt41yViGW4Hs=").overridePythonAttrs (attrs: { propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; }); diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 595778084061..7015d60cc84c 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.68.1"; + version = "0.69.1"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9xTX4y+05haMh6solpPpx7y9yG5H1YcWF+Cf8Sdbu+E="; + hash = "sha256-CT8Quz8m+ZB4VsxOrvoSyka3A+AcPC5QpHx8YJkSJ+4="; }; vendorHash = "sha256-U/yV+6WV8Oc0gLcYFyfOeBzzJdNwyyBk3jPRkH3LUrc="; diff --git a/pkgs/tools/bluetooth/bluetuith/default.nix b/pkgs/tools/bluetooth/bluetuith/default.nix index 8aeab2de7a96..4018d06b7432 100644 --- a/pkgs/tools/bluetooth/bluetuith/default.nix +++ b/pkgs/tools/bluetooth/bluetuith/default.nix @@ -20,6 +20,7 @@ buildGoModule rec { homepage = "https://github.com/darkhz/bluetuith"; license = licenses.mit; platforms = platforms.linux; + mainProgram = "bluetuith"; maintainers = with maintainers; [ thehedgeh0g ]; }; } diff --git a/pkgs/tools/graphics/textplots/default.nix b/pkgs/tools/graphics/textplots/default.nix index 689758de2031..041a9fc59904 100644 --- a/pkgs/tools/graphics/textplots/default.nix +++ b/pkgs/tools/graphics/textplots/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "textplots"; - version = "0.8.2"; + version = "0.8.3"; src = fetchCrate { inherit pname version; - hash = "sha256-NBUp5kFiODqoJrg/JBPhtaVsOikppqt2jbd3C3RQ7qg="; + hash = "sha256-rYUo8A5jasGQb9CjW5u5kM7PIocq353R6v+Z7OhzVUg="; }; - cargoHash = "sha256-hHj3Da399gbRbgHgHcBE53HJusWoPbRA184tcCSJ4fc="; + cargoHash = "sha256-1Z+Og3n9/LUzfBoWNXjvNfuQByEq3vtXhGzi6X961w0="; meta = with lib; { description = "Terminal plotting written in Rust"; diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index 047ab022aae4..b2a9781f23ec 100644 --- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "vulkan-caps-viewer"; - version = "3.31"; + version = "3.32"; src = fetchFromGitHub { owner = "SaschaWillems"; repo = "VulkanCapsViewer"; rev = version; - hash = "sha256-+cJtJPpEFHyy+CbPm0IB2nDa7FM1JY8NOsqGB/WIY2A="; + hash = "sha256-SPz8AurANjNwtsPHdZ2lCaC3VEcEAKn93st/7DJ0oyU="; # Note: this derivation strictly requires vulkan-header to be the same it was developed against. # To help us, they've put it in a git-submodule. # The result will work with any vulkan-loader version. diff --git a/pkgs/tools/llm/open-interpreter/default.nix b/pkgs/tools/llm/open-interpreter/default.nix new file mode 100644 index 000000000000..281f77bf2a50 --- /dev/null +++ b/pkgs/tools/llm/open-interpreter/default.nix @@ -0,0 +1,52 @@ +{ lib +, python3 +, fetchFromGitHub +}: +let + version = "0.1.3"; +in +python3.pkgs.buildPythonApplication { + pname = "open-interpreter"; + format = "pyproject"; + inherit version; + + src = fetchFromGitHub { + owner = "KillianLucas"; + repo = "open-interpreter"; + rev = "v${version}"; + hash = "sha256-xmmyDIshEYql41k/7gF+ay7s3mI+iGCjr5gDfLkqLU0="; + }; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + appdirs + astor + gitpython + huggingface-hub + inquirer + litellm + openai + # pyreadline3 # this is a windows deps + python-dotenv + rich + six + tiktoken + tokentrim + wget + ]; + + # the import check phase fails trying to do a network request to openai + # because of litellm + # pythonImportsCheck = [ "interpreter" ]; + + meta = with lib; { + description = "OpenAI's Code Interpreter in your terminal, running locally"; + homepage = "https://github.com/KillianLucas/open-interpreter"; + license = licenses.mit; + changelog = "https://github.com/KillianLucas/open-interpreter/releases/tag/v${version}"; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/tools/misc/eza/default.nix b/pkgs/tools/misc/eza/default.nix index de77265d832e..9a29ab76f15f 100644 --- a/pkgs/tools/misc/eza/default.nix +++ b/pkgs/tools/misc/eza/default.nix @@ -10,20 +10,23 @@ , Security , libiconv , installShellFiles + # once eza upstream gets support for setting up a compatibilty symlink for exa, we should change + # the handling here from postInstall to passing the required argument to the builder. +, exaAlias ? true }: rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-qA9oXAHJyEf5yI1AlofAKs5fNpNQev9FlY/GHNsfo2Q="; + hash = "sha256-Wboe1ww15GVlL9crNMbVHJnlXghcGM7fL5We2+PFII8="; }; - cargoHash = "sha256-xcw2fhEnUheDSJ5vE7Z1EqahVdCluClC7TmC1PFUUV4="; + cargoHash = "sha256-uUUzyDGTYF6hKmP0Wno/btjhC1RjyqdkWu4torGwA0g="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] @@ -43,6 +46,8 @@ rustPlatform.buildRustPackage rec { --bash completions/bash/eza \ --fish completions/fish/eza.fish \ --zsh completions/zsh/_eza + '' + lib.optionalString exaAlias '' + ln -s eza $out/bin/exa ''; meta = with lib; { diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index 6fb4c5df775d..1e9b16a84855 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,11 +1,11 @@ { lib, appimageTools, fetchurl, asar }: let pname = "flexoptix-app"; - version = "5.13.4"; + version = "5.16.0-latest"; src = fetchurl { name = "${pname}-${version}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - hash = "sha256-W+9KmKZ1bPfQfv1DXCJrIswriw4ivBVZPW81tfvRBc0="; + hash = "sha256-A10r8IUB3zWKWmjen90vLXPF7V/Cgo+DhFn/Hsc1Nhg="; }; udevRules = fetchurl { diff --git a/pkgs/tools/misc/near-cli/default.nix b/pkgs/tools/misc/near-cli/default.nix new file mode 100644 index 000000000000..8741f694782c --- /dev/null +++ b/pkgs/tools/misc/near-cli/default.nix @@ -0,0 +1,49 @@ +{ lib +, mkYarnPackage +, fetchFromGitHub +, fetchYarnDeps +}: + +mkYarnPackage rec { + pname = "near-cli"; + version = "3.4.2"; + + src = fetchFromGitHub { + owner = "near"; + repo = "near-cli"; + rev = "v${version}"; + hash = "sha256-C+viNYk+6BA11cdi5GqARU3QTTONTR2B2VEZf/SeeSQ="; + }; + + packageJSON = ./package.json; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-G/Y8xGGOlXH37Bup7mKhEaNh05GTP5CC9e/Xw4TBNMU="; + }; + + doDist = false; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/lib/node_modules" + mv deps/near-cli "$out/lib/node_modules" + rm "$out/lib/node_modules/near-cli/node_modules" + mv node_modules "$out/lib/node_modules/near-cli" + + mkdir -p "$out/bin" + ln -s "$out/lib/node_modules/near-cli/bin/near" "$out/bin" + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/near/near-cli/blob/${src.rev}/CHANGELOG.md"; + description = "General purpose command line tools for interacting with NEAR Protocol"; + homepage = "https://github.com/near/near-cli"; + license = with lib.licenses; [ asl20 mit ]; + mainProgram = "near"; + maintainers = with lib.maintainers; [ ekleog ]; + }; +} diff --git a/pkgs/tools/misc/near-cli/package.json b/pkgs/tools/misc/near-cli/package.json new file mode 100644 index 000000000000..a6b794a99115 --- /dev/null +++ b/pkgs/tools/misc/near-cli/package.json @@ -0,0 +1,83 @@ +{ + "name": "near-cli", + "version": "3.4.2", + "description": "General purpose command line tools for interacting with NEAR Protocol", + "engines": { + "node": ">= 12" + }, + "main": "index.js", + "scripts": { + "pretest": "rm -rf tmp-project", + "test": "npm run test:unit && npm run test:integration", + "test:unit": "jest", + "test:integration": "bash ./test/index.sh", + "lint": "eslint .", + "fix": "eslint . --fix" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/near/near-cli.git" + }, + "author": "Jane Degtiareva", + "license": "(MIT AND Apache-2.0)", + "bugs": { + "url": "https://github.com/near/near-cli/issues" + }, + "homepage": "https://github.com/near/near-cli#readme", + "bin": { + "near": "bin/near" + }, + "devDependencies": { + "danger": "^10.6.6", + "lodash": "^4.17.21", + "eslint": "^7.0.0", + "jest": "^26.1.0", + "strip-ansi": "^7.0.0", + "strip-ansi-cli": "^3.0.0", + "ts-node": "^10.4.0", + "typescript": "^4.5.4" + }, + "dependencies": { + "analytics-node": "^6.1.0", + "ascii-table": "0.0.9", + "bn.js": "^5.1.1", + "bs58": "^4.0.1", + "chalk": "^4.0.0", + "flagged-respawn": "^1.0.1", + "is-ci": "^2.0.0", + "jest-environment-node": "^27.0.6", + "ncp": "^2.0.0", + "near-api-js": "^0.44.2", + "near-seed-phrase": "^0.2.0", + "open": "^8.0.7", + "rimraf": "^3.0.0", + "stoppable": "^1.1.0", + "tcp-port-used": "^1.0.1", + "update-notifier": "^5.0.0", + "uuid": "^8.0.0", + "v8flags": "^3.1.3", + "yargs": "^16.0.3" + }, + "optionalDependencies": { + "@ledgerhq/hw-transport-node-hid": "^6.1.0", + "near-ledger-js": "^0.2.0" + }, + "keywords": [ + "blockchain", + "crypto", + "dapps", + "distributed", + "applications", + "distributed applications" + ], + "files": [ + "bin", + "commands", + "middleware", + "utils", + "config.js", + "get-config.js", + "test_environment.js", + "context" + ] +} diff --git a/pkgs/tools/misc/rtx/default.nix b/pkgs/tools/misc/rtx/default.nix index 1da490915918..c169f9f28cad 100644 --- a/pkgs/tools/misc/rtx/default.nix +++ b/pkgs/tools/misc/rtx/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "rtx"; - version = "2023.8.2"; + version = "2023.9.0"; src = fetchFromGitHub { owner = "jdxcode"; repo = "rtx"; rev = "v${version}"; - hash = "sha256-I5S9HR+syvj5H7xJKhtM7Ja+8wlKL6A01SDb9TjeoS8="; + hash = "sha256-TH2JC+Cjw+ed1O33QKGq+lonIKlu6pHuY1jtrZh/FMM="; }; - cargoHash = "sha256-zbJ+U3PZIGp+BYQbc50+Kgh1KFF7svela3DsyogO/r8="; + cargoHash = "sha256-zJVCzVgwU9lR3E61w+71eUd7Au9LmJcbHtgLvzTj7r4="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index 41c47f7054c7..57584ff7c90e 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -24,13 +24,13 @@ let ]; in stdenv.mkDerivation rec { - version = "5.1.0"; + version = "6.0.0"; pname = "staruml"; src = fetchurl { - url = "https://files.staruml.io/releases-v5/StarUML_${version}_amd64.deb"; - sha256 = "sha256-da1mY3OW24g6Ix0L57CBPbaMeSLzhOOjoBsyZszmNOc="; + url = "https://files.staruml.io/releases-v6/StarUML_${version}_amd64.deb"; + sha256 = "sha256-g35d9YcZrP4D8X9NU84Fz0qmb/2lUUOuZ30iIwgThA0="; }; nativeBuildInputs = [ wrapGAppsHook dpkg ]; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { homepage = "https://staruml.io/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ kashw2 ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix index 9cd4d34876cb..b2b84ea53e66 100644 --- a/pkgs/tools/networking/grpc_cli/default.nix +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.57.0"; + version = "1.58.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-ZPhPi4ODAAohCySVKeypaDID4ZUXvnfidOGK5EMXvh4="; + hash = "sha256-JxkQZSmI3FSAoSd45uciCpsTeGuAvRhG/BGyC4NKOjo="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index bf324c57d497..c586d6a75ef1 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , libcap @@ -21,6 +22,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-f5bL3IdXibIc1xXCuZHwcEV5vhypRE2mLsS3A8HW2QM="; }; + patches = [ (fetchpatch { # https://github.com/traviscross/mtr/pull/468 + url = "https://github.com/traviscross/mtr/commit/5908af4c19188cb17b62f23368b6ef462831a0cb.patch"; + hash = "sha256-rTydtU8+Wc4nGEKh1GOkhcpgME4hwsACy82gKPaIe64="; + }) ]; + # we need this before autoreconfHook does its thing postPatch = '' echo ${version} > .tarball-version diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 4983c30ab00b..74fb6508794b 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -209,7 +209,7 @@ stdenv.mkDerivation rec { description = "Network configuration and management tool"; license = licenses.gpl2Plus; changelog = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/${version}/NEWS"; - maintainers = teams.freedesktop.members ++ (with maintainers; [ domenkozar obadz maxeaubrey ]); + maintainers = teams.freedesktop.members ++ (with maintainers; [ domenkozar obadz amaxine ]); platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/rosenpass/default.nix b/pkgs/tools/networking/rosenpass/default.nix new file mode 100644 index 000000000000..07669cfeb01e --- /dev/null +++ b/pkgs/tools/networking/rosenpass/default.nix @@ -0,0 +1,85 @@ +{ lib +, targetPlatform +, fetchFromGitHub +, rustPlatform +, cmake +, makeWrapper +, pkg-config +, removeReferencesTo +, coreutils +, findutils +, gawk +, wireguard-tools +, bash +, libsodium +}: + +let + rpBinPath = lib.makeBinPath [ + coreutils + findutils + gawk + wireguard-tools + ]; +in +rustPlatform.buildRustPackage rec { + pname = "rosenpass"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-r7/3C5DzXP+9w4rp9XwbP+/NK1axIP6s3Iiio1xRMbk="; + }; + + cargoHash = "sha256-g2w3lZXQ3Kg3ydKdFs8P2lOPfIkfTbAF0MhxsJoX/E4="; + + nativeBuildInputs = [ + cmake # for oqs build in the oqs-sys crate + makeWrapper # for the rp shellscript + pkg-config # let libsodium-sys-stable find libsodium + removeReferencesTo + rustPlatform.bindgenHook # for C-bindings in the crypto libs + ]; + + buildInputs = [ + bash # for patchShebangs to find it + libsodium + ]; + + # otherwise pkg-config tries to link non-existent dynamic libs during the build of liboqs + PKG_CONFIG_ALL_STATIC = true; + + # liboqs requires quite a lot of stack memory, thus we adjust the default stack size picked for + # new threads (which is used by `cargo test`) to be _big enough_ + RUST_MIN_STACK = 8 * 1024 * 1024; # 8 MiB + + # nix defaults to building for aarch64 _without_ the armv8-a + # crypto extensions, but liboqs depends on these + preBuild = lib.optionalString targetPlatform.isAarch + ''NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -march=armv8-a+crypto"''; + + preInstall = '' + install -D rp $out/bin/rp + wrapProgram $out/bin/rp --prefix PATH : "${ rpBinPath }" + for file in doc/*.1 + do + install -D $file $out/share/man/man1/''${file##*/} + done + ''; + + # nix propagates the *.dev outputs of buildInputs for static builds, but that is non-sense for an + # executables only package + postFixup = '' + find -type f -exec remove-references-to -t ${bash.dev} \ + -t ${libsodium.dev} {} \; + ''; + + meta = with lib; { + description = "Build post-quantum-secure VPNs with WireGuard!"; + homepage = "https://rosenpass.eu/"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ wucke13 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 07f1d2796f4b..9fc7bc951adf 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-AB+JNac9553Viw/XVqLFAQnEOwweCz3ltyUbB1gYMmM="; + hash = "sha256-OBLgAuZIqR+81rN886gIai8+uUxHDbOWnGz6jYZnGm8="; }; - vendorHash = "sha256-Je5852dIKjlTAym00V2gNz89Hrl8QygEfkybZlLVktY="; + vendorHash = "sha256-oDUjiMAG/vkSYS1c8lwqVlFzyvTIQrUSeJohHS9X9I0="; tags = [ "with_quic" diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 7eaa8c24c524..6cd2ee26959f 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KyceWyVIgIPx4zw7pUCY2IC9PfbSYzwoDEbw80VhI+s="; + hash = "sha256-X1Ow11ECwu2a/VzimrKGRJKCnZWL8KJ5Gii+pjP5b9E="; }; - vendorHash = "sha256-vvgXlVPQPH6hO4yA3HYB0C6mva9eI2zMIlBhjtZXOTI="; + vendorHash = "sha256-T1xrJ44xB95+ZhQPCYlcbH1gIQm7ETtTnQLl/+TRxVA="; modRoot = "./v2"; diff --git a/pkgs/tools/security/dumpasn1/default.nix b/pkgs/tools/security/dumpasn1/default.nix index d224531940a7..030d73a447be 100644 --- a/pkgs/tools/security/dumpasn1/default.nix +++ b/pkgs/tools/security/dumpasn1/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Display and debug ASN.1 data"; homepage = "https://github.com/katexochen/dumpasn1"; license = licenses.bsd2; + mainProgram = "dumpasn1"; maintainers = with maintainers; [ katexochen ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 99a99e74c4a5..44f7b5dd0fc1 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.9.6"; + version = "0.10.0"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - hash = "sha256-vzdQqiAguwXZ3QNlctnfsuFxNYwBLICVqonFKXdMvSQ="; + hash = "sha256-zTFWIIqIDMI77lg2CB1ug+GeKPVIT1OQ1p80x6tLgGg="; }; - cargoHash = "sha256-clxpTayrWSu0esu8L4/Kf8oKk8zAK3XJwT8IJqHoZpw="; + cargoHash = "sha256-5qLrmU/SfUfiQOOpECTEn8K142STnbhqE3XbJFxKPZg="; nativeBuildInputs = [ gpgme # for gpgme-config diff --git a/pkgs/tools/security/openpgp-card-tools/default.nix b/pkgs/tools/security/openpgp-card-tools/default.nix index c035458c6c32..6a630883580b 100644 --- a/pkgs/tools/security/openpgp-card-tools/default.nix +++ b/pkgs/tools/security/openpgp-card-tools/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , rustPlatform -, fetchCrate +, fetchFromGitea , pkg-config , pcsclite , nettle @@ -12,14 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "openpgp-card-tools"; - version = "0.9.3"; + version = "0.9.4"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-F+j8bK0sBBLWlQzLAcvl6BdiI3Dy8ollwTpL7929nJ8="; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "openpgp-card"; + repo = "openpgp-card-tools"; + rev = "v${version}"; + hash = "sha256-ISIABjuh0BC6OUFa5I9Wou+av7Dp4bZH8Aazi6x7cqY="; }; - cargoHash = "sha256-Wn3fXAft+sju8FhX6YFHRvqt815NhTlfhLJarSemvm0="; + cargoHash = "sha256-+EEpoI9OQvnJR6bVbEuLn3O7w6BchjBzr+oMGsWdP/k="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; buildInputs = [ pcsclite nettle ] ++ lib.optionals stdenv.isDarwin [ PCSC ]; diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index 0a3de075f810..c855fdde9333 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "23.6.1"; + version = "23.8.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-RkYLTZ40ZINg3cNPBJrSOGOzSSfislBmwdUOQHDu32U="; + sha256 = "sha256-sdhTrRh6xkkIDZDGE22hSr5dD179VWdMVs6L1cJ9yiw="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 0a2074d98436..71b22a9706cf 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.8.4"; + version = "0.4.8.5"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-CcHOdKJfw7SMgf8UbL0N1TjLu4/k4pZPwvsrGS9qHSs="; + sha256 = "sha256-aVfP0Uop7udVXFL4OHpG8s4vX+fa35NUfxvHSxZX4Rk="; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index bb56897b9b36..07bbb36327fa 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.13.0"; + version = "3.14.0"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - hash = "sha256-YQvCOdMIMMEtT2K9WBWp5xmDNGeICvgTs0GnX+D4DZI="; + hash = "sha256-Yb4zORtmEgZGu9h05/t4sQ6eTljHba89JZKh7vzIp2Q="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; diff --git a/pkgs/tools/text/dt/default.nix b/pkgs/tools/text/dt/default.nix index be5a00f3613f..bc4c0dd9938e 100644 --- a/pkgs/tools/text/dt/default.nix +++ b/pkgs/tools/text/dt/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dt"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "so-dang-cool"; repo = "dt"; rev = "v${finalAttrs.version}"; - hash = "sha256-C6sG8iqXs64x2AWCxKGFPyoXC1Fn4p2eSLWwJAQ8CSc="; + hash = "sha256-u9MI6mrP+QXr3VDgmXW7GRkHKCiDoA9HlznTEGNsck4="; }; nativeBuildInputs = [ zig_0_11.hook ]; @@ -36,8 +36,10 @@ stdenv.mkDerivation (finalAttrs: { In short, dt is intended to be generally useful, with zero pretense of elegance. ''; + changelog = "https://github.com/so-dang-cool/dt/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ booniepepper ]; + platforms = lib.platforms.unix; mainProgram = "dt"; }; }) diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/tools/text/gjo/default.nix index da8fa212940a..99d988797bfc 100644 --- a/pkgs/tools/text/gjo/default.nix +++ b/pkgs/tools/text/gjo/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "skanehira"; repo = "gjo"; rev = version; - sha256 = "07halr0jzds4rya6hlvp45bjf7vg4yf49w5q60mch05hk8qkjjdw"; + hash = "sha256-vEk5MZqwAMgqMLjwRJwnbx8nVyF3U2iUz0S3L0GmCh4="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Small utility to create JSON objects"; diff --git a/pkgs/tools/text/nawk/default.nix b/pkgs/tools/text/nawk/default.nix index e9ae489a02e3..756b5aa12e61 100644 --- a/pkgs/tools/text/nawk/default.nix +++ b/pkgs/tools/text/nawk/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, bison, buildPackages }: +{ lib, stdenv, fetchFromGitHub, bison, buildPackages, installShellFiles }: stdenv.mkDerivation rec { pname = "nawk"; - version = "20220122"; + version = "20230909"; src = fetchFromGitHub { owner = "onetrueawk"; repo = "awk"; rev = version; - hash = "sha256-W5WkGk4WY3g1qSFjJxFBa8KY1k13oK6WAMg5GH6kKU4="; + hash = "sha256-sBJ+ToFkhU5Ei84nqzbS0bUbsa+60iLSz2oeV5+PXEk="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison ]; + nativeBuildInputs = [ bison installShellFiles ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "HOSTCC=${if stdenv.buildPlatform.isDarwin then "clang" else "cc"}" @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall install -Dm755 a.out "$out/bin/nawk" - install -Dm644 awk.1 "$out/share/man/man1/nawk.1" + installManPage awk.1 runHook postInstall ''; diff --git a/pkgs/tools/typesetting/typstfmt/Cargo.lock b/pkgs/tools/typesetting/typstfmt/Cargo.lock index c4123f470f46..af461f991de2 100644 --- a/pkgs/tools/typesetting/typstfmt/Cargo.lock +++ b/pkgs/tools/typesetting/typstfmt/Cargo.lock @@ -198,9 +198,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.6.2" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "nu-ansi-term" @@ -250,13 +250,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.7", + "regex-automata 0.3.8", "regex-syntax", ] @@ -268,9 +268,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -309,7 +309,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -375,9 +375,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -396,9 +396,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -417,9 +417,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", "serde", @@ -448,7 +448,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.32", ] [[package]] @@ -504,7 +504,7 @@ dependencies = [ [[package]] name = "typstfmt" -version = "0.2.2" +version = "0.2.3" dependencies = [ "lexopt", "typstfmt_lib", @@ -512,7 +512,7 @@ dependencies = [ [[package]] name = "typstfmt_lib" -version = "0.2.2" +version = "0.2.3" dependencies = [ "globmatch", "insta", @@ -559,9 +559,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", diff --git a/pkgs/tools/typesetting/typstfmt/default.nix b/pkgs/tools/typesetting/typstfmt/default.nix index 46298a0761e4..bb5495e83e4f 100644 --- a/pkgs/tools/typesetting/typstfmt/default.nix +++ b/pkgs/tools/typesetting/typstfmt/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "typstfmt"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "astrale-sharp"; repo = "typstfmt"; rev = version; - hash = "sha256-y6uXWKG3npgxIfZeou7Xs8/zqjIFB4BvciDmAJIXw78="; + hash = "sha256-DipssOPbu7rSyfhqpuOqS7Ih+/PlK+/BT+R1Sm4mFPk="; }; cargoLock = { diff --git a/pkgs/tools/video/recyclarr/default.nix b/pkgs/tools/video/recyclarr/default.nix index f41a1c2c521a..b07e91a50c01 100644 --- a/pkgs/tools/video/recyclarr/default.nix +++ b/pkgs/tools/video/recyclarr/default.nix @@ -26,10 +26,10 @@ let or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-WtIT5fkkaNDIot1lY5xacYD8XwuaYYnL0ZrJO9EXB3A="; - arm64-linux_hash = "sha256-aFLdnGYeKJs0Gp83SqvDg3YO2mGVF5ZIONNQwXMGLj8="; - x64-osx_hash = "sha256-eiDO3PdpPk+NXWBKBkpzIHf/1xDe0XByC6NBBfxs55s="; - arm64-osx_hash = "sha256-uPv7ZQm6JbgxpylrSi5X5yX0Enrkhq+1sCmFxaghM94="; + x64-linux_hash = "sha256-vexo2zx6trv5Q8JifLQG93ZNaAY6ym0ShI81HjBUqTs="; + arm64-linux_hash = "sha256-oLtXFkE8b9dxmTwttjJbBSOhxkwInGLpD+WNjDy1ktM="; + x64-osx_hash = "sha256-fVIGBuOhwaWttmAGECVm3i4GPKer37mRq6cBz1BcsBc="; + arm64-osx_hash = "sha256-eD74AcnRxFgD9PvoPYTBqI0/7MGCqu1I2sq8L1XrmMQ="; }."${arch}-${os}_hash"; libPath = { @@ -40,7 +40,7 @@ let in stdenv.mkDerivation rec { pname = "recyclarr"; - version = "5.2.1"; + version = "5.3.1"; src = fetchurl { url = "https://github.com/recyclarr/recyclarr/releases/download/v${version}/recyclarr-${os}-${arch}.tar.xz"; diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index 87422a42f0af..062f21bb4d20 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation (finalAttrs: { nasm ]; + cmakeFlags = [ + "-DSVT_AV1_LTO=ON" + ]; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/tools/video/xjadeo/default.nix b/pkgs/tools/video/xjadeo/default.nix index e7c237e1698e..3774e0a100bf 100644 --- a/pkgs/tools/video/xjadeo/default.nix +++ b/pkgs/tools/video/xjadeo/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "xjadeo"; - version = "0.8.12"; + version = "0.8.13"; src = fetchFromGitHub { owner = "x42"; repo = "xjadeo"; rev = "v${version}"; - sha256 = "sha256-VPmVoCoVyljzqtbkuT3e6jhXClP708V/6zy1bVoET7c="; + sha256 = "sha256-CSq11hFNmo41VXOndBoPxRc9NNUUBtzfWx14DCUFieQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/wayland/way-displays/default.nix b/pkgs/tools/wayland/way-displays/default.nix index ea94ece408ce..bac42d39fd1a 100644 --- a/pkgs/tools/wayland/way-displays/default.nix +++ b/pkgs/tools/wayland/way-displays/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "way-displays"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "alex-courtis"; repo = "way-displays"; rev = version; - sha256 = "sha256-rR181sxaddtn3yFtF1exSGPBU0Yp3VBRyucfuxyXI+Q="; + sha256 = "sha256-X+/aM+/2pO1FbHGwEiC2w9AxPXHf1EVZkyr+CXtprLk="; }; strictDeps = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 95041195aaa1..5bd2366c1bbe 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -157,7 +157,7 @@ mapAliases ({ digibyted = throw "digibyted has been removed since it's unnmaintained: https://github.com/digibyte/digibyte/graphs/code-frequency"; # Added 2022-11-24 bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # Added 2021-08-22 blastem = throw "blastem has been removed from nixpkgs as it would still require python2"; # Added 2022-01-01 - bluezFull = bluez; # Added 2019-12-03 + bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10 bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # Added 2020-12-10 boost159 = throw "boost159 has been deprecated in favor of the latest version"; # Added 2023-01-01 boost15x = throw "boost15x has been deprecated in favor of the latest version"; # Added 2023-01-01 @@ -176,7 +176,7 @@ mapAliases ({ bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16 brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24 bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22 - bro = zeek; # Added 2019-09-29 + bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10 btops = throw "btops has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 btrfsProgs = throw "'btrfsProgs' has been renamed to/replaced by 'btrfs-progs'"; # Converted to throw 2022-02-22 bud = throw "bud has been removed: abandoned by upstream"; # Added 2022-03-14 @@ -223,7 +223,7 @@ mapAliases ({ casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken"; cassandra_2_1 = throw "cassandra_2_1 has been removed, please use cassandra_3_11 instead"; # Added 2022-10-29 cassandra_2_2 = throw "cassandra_2_2 has been removed, please use cassandra_3_11 instead"; # Added 2022-10-29 - catfish = xfce.catfish; # Added 2019-12-22 + catfish = throw "'catfish' has been renamed to/replaced by 'xfce.catfish'"; # Converted to throw 2023-09-10 cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; ccloud-cli = throw "ccloud-cli has been removed, please use confluent-cli instead"; # Added 2023-06-09 ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # Added 2021-03-25 @@ -272,7 +272,7 @@ mapAliases ({ cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05 codimd = hedgedoc; # Added 2020-11-29 inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17 - compton = picom; # Added 2019-12-02 + compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2023-09-10 compton-git = throw "'compton-git' has been renamed to/replaced by 'compton'"; # Converted to throw 2022-02-22 concurrencykit = libck; # Added 2021-03 conntrack_tools = throw "'conntrack_tools' has been renamed to/replaced by 'conntrack-tools'"; # Converted to throw 2022-02-22 @@ -367,6 +367,7 @@ mapAliases ({ ### D ### + oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10 d1x_rebirth = throw "'d1x_rebirth' has been renamed to/replaced by 'dxx-rebirth'"; # Converted to throw 2022-02-22 d2x_rebirth = throw "'d2x_rebirth' has been renamed to/replaced by 'dxx-rebirth'"; # Converted to throw 2022-02-22 dart_dev = throw "Non-stable versions of Dart have been removed"; # Added 2020-01-15 @@ -458,6 +459,7 @@ mapAliases ({ electron_6 = throw "electron_6 has been removed in favor of newer versions"; # added 2022-01-06 electron_7 = throw "electron_7 has been removed in favor of newer versions"; # added 2022-02-08 electron_8 = throw "electron_8 has been removed in favor of newer versions"; # added 2022-02-08 + electron_9 = throw "electron_9 has been removed in favor of newer versions"; # added 2023-09-11 electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned"; # Added 2022-01-01 elementary-planner = throw "elementary-planner has been renamed to planify"; # Added 2023-06-24 @@ -471,8 +473,8 @@ mapAliases ({ emacsMacport = emacs-macport; # Added 2023-08-10 emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 - emacsPackagesNg = emacs.pkgs; # Added 2019-08-07 - emacsPackagesNgFor = emacsPackagesFor; # Added 2019-08-07 + emacsPackagesNg = throw "'emacsPackagesNg' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2023-09-10 + emacsPackagesNgFor = throw "'emacsPackagesNgFor' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2023-09-10 emacsPackagesNgGen = throw "'emacsPackagesNgGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18 @@ -493,6 +495,7 @@ mapAliases ({ erlangR22 = erlang_22; esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12 etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22 + eterm = throw "eterm was removed because it is still insecure: https://github.com/mej/Eterm/issues/7"; # Added 2023-09-10 eteroj.lv2 = throw "'eteroj.lv2' has been renamed to/replaced by 'open-music-kontrollers.eteroj'"; # Added 2022-03-09 euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2"; # Added 2022-01-01 evilvte = throw "evilvte has been removed from nixpkgs for being unmaintained with security issues and dependant on an old version of vte which was removed"; # Added 2022-01-14 @@ -625,10 +628,10 @@ mapAliases ({ gnome-breeze = throw "gnome-breeze has been removed, use libsForQt5.breeze-gtk instead"; # Added 2022-04-22 gnome-firmware-updater = gnome-firmware; # added 2022-04-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 - gnome-mpv = celluloid; # Added 2019-08-22 + gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2023-09-10 gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15 gnome-themes-standard = throw "'gnome-themes-standard' has been renamed to/replaced by 'gnome-themes-extra'"; # Converted to throw 2022-02-22 - gnome_user_docs = gnome-user-docs; # Added 2019-11-20 + gnome_user_docs = throw "'gnome_user_docs' has been renamed to/replaced by 'gnome-user-docs'"; # Converted to throw 2023-09-10 gnome_doc_utils = throw "'gnome_doc_utils' has been renamed to/replaced by 'gnome-doc-utils'"; # Converted to throw 2022-02-22 gnome_themes_standard = throw "'gnome_themes_standard' has been renamed to/replaced by 'gnome-themes-standard'"; # Converted to throw 2022-02-22 @@ -643,12 +646,12 @@ mapAliases ({ gnome3 = gnome; # Added 2021-05-07 gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# Added 2020-07-12 gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # Added 2022-01-16 - gnuradio-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 - gnuradio-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 - gnuradio-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16 - gnuradio-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 - gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 - gnuradio-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 + gnuradio-ais = throw "'gnuradio-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 + gnuradio-gsm = throw "'gnuradio-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 + gnuradio-limesdr = throw "'gnuradio-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10 + gnuradio-nacl = throw "'gnuradio-nacl' has been renamed to/replaced by 'gnuradio3_7.pkgs.nacl'"; # Converted to throw 2023-09-10 + gnuradio-osmosdr = throw "'gnuradio-osmosdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.osmosdr'"; # Converted to throw 2023-09-10 + gnuradio-rds = throw "'gnuradio-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 gnustep-make = throw "'gnustep-make' has been renamed to/replaced by 'gnustep.make'"; # Converted to throw 2022-02-22 gnuvd = throw "gnuvd was removed because the backend service is missing"; # Added 2020-01-14 gobby5 = gobby; # Added 2021-02-01 @@ -667,7 +670,7 @@ mapAliases ({ gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # Added 2020-04-23 googleAuthenticator = throw "'googleAuthenticator' has been renamed to/replaced by 'google-authenticator'"; # Converted to throw 2022-02-22 googleearth = throw "the non-pro version of Google Earth was removed because it was discontinued and downloading it isn't possible anymore"; # Added 2022-01-22 - google-gflags = gflags; # Added 2019-07-25 + google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10 google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07 google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07 gosca = throw "gosca has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-30 @@ -689,16 +692,16 @@ mapAliases ({ gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17 gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 grafana-mimir = throw "'grafana-mimir' has been renamed to/replaced by 'mimir'"; # Added 2022-06-07 - gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 + gr-ais = throw "'gr-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 graylog = throw "graylog is now available in versions 3.3 up to 5.0. Please mind the upgrade path and choose the appropriate version. Direct upgrading from 3.3 to 4.3 or above is not supported"; # Added 2023-04-24 - gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 + gr-gsm = throw "'gr-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # Added 2022-01-05 gringo = clingo; # added 2022-11-27 - gr-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16 - gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 - gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 - gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 + gr-limesdr = throw "'gr-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10 + gr-nacl = throw "'gr-nacl' has been renamed to/replaced by 'gnuradio3_7.pkgs.nacl'"; # Converted to throw 2023-09-10 + gr-osmosdr = throw "'gr-osmosdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.osmosdr'"; # Converted to throw 2023-09-10 + gr-rds = throw "'gr-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 grub2_full = grub2; # Added 2022-11-18 grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11 grv = throw "grv has been dropped due to the lack of maintenance from upstream since 2019"; # Added 2022-06-01 @@ -734,7 +737,7 @@ mapAliases ({ heartbeat6 = throw "heartbeat6 has been removed because it reached end of life"; # Added 2022-10-04 heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22 heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06 - hepmc = hepmc2; # Added 2019-08-05 + hepmc = throw "'hepmc' has been renamed to/replaced by 'hepmc2'"; # Converted to throw 2023-09-10 hicolor_icon_theme = throw "'hicolor_icon_theme' has been renamed to/replaced by 'hicolor-icon-theme'"; # Converted to throw 2022-02-22 holdingnuts = throw "holdingnuts was removed from nixpkgs, as the project is no longer developed"; # Added 2022-05-10 holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01 @@ -754,8 +757,8 @@ mapAliases ({ ibus-qt = throw "ibus-qt has been removed, because it depended on qt4"; # Added 2022-06-09 ical2org = throw "ical2org has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-02 icecat-bin = throw "icecat-bin has been removed, the binary builds are not maintained upstream"; # Added 2022-02-15 - icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 - icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 + icedtea8_web = throw "'icedtea8_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 + icedtea_web = throw "'icedtea_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 icu59 = throw "icu59 has been removed, use a more recent version instead"; # Added 2022-05-14 icu65 = throw "icu65 has been removed, use a more recent version instead"; # Added 2022-05-14 idea = throw "'idea' has been renamed to/replaced by 'jetbrains'"; # Converted to throw 2022-02-22 @@ -772,7 +775,7 @@ mapAliases ({ i-score = throw "i-score has been removed: abandoned upstream"; # Added 2020-11-21 inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped"; index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17 - infiniband-diags = rdma-core; # Added 2019-08-09 + infiniband-diags = throw "'infiniband-diags' has been renamed to/replaced by 'rdma-core'"; # Converted to throw 2023-09-10 ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project"; # Added 2022-01-12 inotifyTools = inotify-tools; intecture-agent = throw "intecture-agent has been removed, because it was no longer maintained upstream"; # added 2021-12-15 @@ -851,7 +854,7 @@ mapAliases ({ kfctl = throw "kfctl is broken and has been archived by upstream" ; # Added 2023-08-21 kgx = gnome-console; # Added 2022-02-19 kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 - kicad-with-packages3d = kicad; # Added 2019-11-25 + kicad-with-packages3d = throw "'kicad-with-packages3d' has been renamed to/replaced by 'kicad'"; # Converted to throw 2023-09-10 kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download"; # Added 2021-03-09 kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned"; # Added 2020-04-28 kino = throw "kino has been removed because it was broken and abandoned"; # Added 2021-04-25 @@ -893,7 +896,7 @@ mapAliases ({ libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22 libcanberra_gtk3 = throw "'libcanberra_gtk3' has been renamed to/replaced by 'libcanberra-gtk3'"; # Converted to throw 2022-02-22 libcap_manpages = throw "'libcap_manpages' has been renamed to/replaced by 'libcap.doc'"; # Converted to throw 2022-02-22 - libcap_pam = if stdenv.isLinux then libcap.pam else null; # Added 2016-04-29 + libcap_pam = throw "'libcap_pam' has been replaced with 'libcap'"; # Converted to throw 2023-09-10 libcap_progs = throw "'libcap_progs' has been renamed to/replaced by 'libcap.out'"; # Converted to throw 2022-02-22 libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore"; # Added 2021-05-16 libcroco = throw "libcroco has been removed as it's no longer used in any derivations"; # Added 2020-03-04 @@ -912,7 +915,7 @@ mapAliases ({ libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # Added 2022-01-21 libgumbo = throw "'libgumbo' has been renamed to/replaced by 'gumbo'"; # Converted to throw 2022-02-22 libheimdal = heimdal; # Added 2022-11-18 - libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14 + libintlOrEmpty = throw "'libintlOrEmpty' has been replaced by gettext"; # Converted to throw 2023-09-10 libixp_hg = libixp; libjpeg_drop = libjpeg_original; # Added 2020-06-05 libjreen = throw "libjreen has been removed, because it did not support a recent version of qt5"; # Added 2022-06-12 @@ -1085,6 +1088,7 @@ mapAliases ({ mariadb_109 = throw "mariadb_109 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 + markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 marp = throw "marp has been removed from nixpkgs, as it's unmaintained and has security issues"; # Added 2022-06-04 matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 @@ -1099,7 +1103,7 @@ mapAliases ({ memtest86 = throw "'memtest86' has been renamed to/replaced by 'memtest86plus'"; # Converted to throw 2022-02-22 mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18 mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 - mess = mame; # Added 2019-10-30 + mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 metal = throw "metal has been removed due to lack of maintainers"; metricbeat6 = throw "metricbeat6 has been removed because it reached end of life"; # Added 2022-10-04 microsoft_gsl = microsoft-gsl; # Added 2023-05-26 @@ -1133,8 +1137,8 @@ mapAliases ({ morituri = throw "'morituri' has been renamed to/replaced by 'whipper'"; # Converted to throw 2022-02-22 moz-phab = mozphab; # Added 2022-08-09 - mozart-binary = mozart2-binary; # Added 2019-09-23 - mozart = mozart2-binary; # Added 2019-09-23 + mozart-binary = throw "'mozart-binary' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 + mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 mpd_clientlib = libmpdclient; # Added 2021-02-11 mpich2 = throw "'mpich2' has been renamed to/replaced by 'mpich'"; # Converted to throw 2022-02-22 @@ -1142,8 +1146,8 @@ mapAliases ({ mqtt-bench = throw "mqtt-bench has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 msf = throw "'msf' has been renamed to/replaced by 'metasploit'"; # Converted to throw 2022-02-22 multimc = throw "multimc was removed from nixpkgs; use prismlauncher instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08 - mumble_git = pkgs.mumble; # Added 2019-08-01 - murmur_git = pkgs.murmur; # Added 2019-08-01 + mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2023-09-10 + murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2023-09-10 mutt-with-sidebar = mutt; # Added 2022-09-17 mysql-client = hiPrio mariadb.client; mysql = mariadb; # moved from top-level 2021-03-14 @@ -1173,7 +1177,7 @@ mapAliases ({ nccl_cudatoolkit_10 = throw "nccl_cudatoolkit_10 has been renamed to cudaPackages_10.nccl"; # Added 2022-04-04 nccl_cudatoolkit_11 = throw "nccl_cudatoolkit_11 has been renamed to cudaPackages_11.nccl"; # Added 2022-04-04 - net_snmp = net-snmp; # Added 2019-12-21 + net_snmp = throw "'net_snmp' has been renamed to/replaced by 'net-snmp'"; # Converted to throw 2023-09-10 nagiosPluginsOfficial = monitoring-plugins; navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07 ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22 @@ -1194,7 +1198,7 @@ mapAliases ({ nilfs_utils = throw "'nilfs_utils' has been renamed to/replaced by 'nilfs-utils'"; # Converted to throw 2022-02-22 nitrokey-udev-rules = libnitrokey; # Added 2023-03-25 nix-direnv-flakes = nix-direnv; - nix-review = nixpkgs-review; # Added 2019-12-22 + nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2023-09-10 nixFlakes = nixVersions.stable; # Added 2021-05-21 nixStable = nixVersions.stable; # Added 2022-01-24 nixUnstable = nixVersions.unstable; # Added 2022-01-26 @@ -1225,6 +1229,7 @@ mapAliases ({ nomad_1_3 = throw "nomad_1_3 has been removed because it's outdated. Use a a newer version instead"; # Added 2023-09-02 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16 + noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09 noto-fonts-extra = noto-fonts; # Added 2023-04-08 nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15 now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # Added 2021-08-05 @@ -1397,7 +1402,7 @@ mapAliases ({ pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; piwik = throw "'piwik' has been renamed to/replaced by 'matomo'"; # Converted to throw 2022-02-22 pixie = throw "pixie has been removed: abandoned by upstream"; # Added 2022-04-21 - pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18 + pkgconfig = throw "'pkgconfig' has been renamed to/replaced by 'pkg-config'"; # Converted to throw 2023-09-10 pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22 pleroma-otp = pleroma; # Added 2021-07-10 plexpy = throw "'plexpy' has been renamed to/replaced by 'tautulli'"; # Converted to throw 2022-02-22 @@ -1408,6 +1413,7 @@ mapAliases ({ polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22 polymc = throw "PolyMC has been removed from nixpkgs due to a hostile takeover by a rogue maintainer. The rest of the maintainers have made a fork which is packaged as 'prismlauncher'"; # Added 2022-10-18 polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01 + pomotroid = throw "pomotroid has been removed from nixpkgs, because it depended on an insecure version of electron"; # Added 2023-09-12 pond = throw "pond has been dropped due to the lack of maintenance from upstream since 2016"; # Added 2022-06-02 poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22 powerdns = pdns; # Added 2022-03-28 @@ -1436,16 +1442,16 @@ mapAliases ({ tlauncher = throw "tlauncher has been removed because there questionable practices and legality concerns"; tsearch_extras = postgresqlPackages.tsearch_extras; - pinentry_curses = pinentry-curses; # Added 2019-10-14 - pinentry_emacs = pinentry-emacs; # Added 2019-10-14 - pinentry_gnome = pinentry-gnome; # Added 2019-10-14 - pinentry_gtk2 = pinentry-gtk2; # Added 2019-10-14 - pinentry_qt = pinentry-qt; # Added 2019-10-14 + pinentry_curses = throw "'pinentry_curses' has been renamed to/replaced by 'pinentry-curses'"; # Converted to throw 2023-09-10 + pinentry_emacs = throw "'pinentry_emacs' has been renamed to/replaced by 'pinentry-emacs'"; # Converted to throw 2023-09-10 + pinentry_gnome = throw "'pinentry_gnome' has been renamed to/replaced by 'pinentry-gnome'"; # Converted to throw 2023-09-10 + pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2023-09-10 + pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10 pinentry_qt5 = pinentry-qt; # Added 2020-02-11 prboom = throw "prboom was removed because it was abandoned by upstream, use prboom-plus instead"; # Added 2022-04-24 privateer = throw "privateer was removed because it was broken"; # Added 2021-05-18 probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03 - processing3 = processing; # Added 2019-08-16 + processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 procps-ng = throw "'procps-ng' has been renamed to/replaced by 'procps'"; # Converted to throw 2022-02-22 proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30 proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead"; # Added 2021-04-12 @@ -1475,7 +1481,7 @@ mapAliases ({ pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # Added 2021-05-14 pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01 pyext = throw "pyext was removed because it does not support python 3.11, is upstream unmaintained and was unused"; # Added 2022-11-21 - pygmentex = texlive.bin.pygmentex; # Added 2019-12-15 + pygmentex = throw "'pygmentex' has been renamed to/replaced by 'texlive.bin.pygmentex'"; # Converted to throw 2023-09-10 pyload = throw "pyload has been removed from nixpkgs. Use pyload-ng instead."; # Added 2021-03-21 pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd"; # Added 2020-10-24 pyo3-pack = maturin; @@ -1612,7 +1618,7 @@ mapAliases ({ scribusUnstable = throw "'scribusUnstable' has been renamed to 'scribus'"; # Added 2022-05-13 scrollkeeper = throw "'scrollkeeper' has been removed due to deprecated LibXML2 headers"; # Added 2022-11-08 scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07 - sdlmame = mame; # Added 2019-10-30 + sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11 session-desktop-appimage = session-desktop; @@ -1698,7 +1704,7 @@ mapAliases ({ sqlite-replication = throw "'sqlite-replication' has been removed since it is no longer required by lxd and is not maintained."; # throw 2022-12-26 sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22 sqliteman = throw "sqliteman has been removed, because it was unmaintained"; # Added 2022-05-26 - squid4 = squid; # added 2019-08-22 + squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10 srcml = throw "'srcml' has been removed: abandoned by upstream"; # Added 2022-07-21 sshfsFuse = throw "'sshfsFuse' has been renamed to/replaced by 'sshfs-fuse'"; # Converted to throw 2022-02-22 ssmtp = throw "'ssmtp' has been removed due to the software being unmaintained. 'msmtp' can be used as a replacement"; # Added 2022-04-17 @@ -1829,13 +1835,13 @@ mapAliases ({ urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # Added 2020-02-02 urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # Added 2020-02-02 usb_modeswitch = throw "'usb_modeswitch' has been renamed to/replaced by 'usb-modeswitch'"; # Converted to throw 2022-02-22 - usbguard-nox = usbguard; # Added 2019-09-04 + usbguard-nox = throw "'usbguard-nox' has been renamed to/replaced by 'usbguard'"; # Converted to throw 2023-09-10 util-linuxCurses = util-linux; # Added 2022-04-12 utillinux = util-linux; # Added 2020-11-24 ### V ### - v4l_utils = v4l-utils; # Added 2019-08-07 + v4l_utils = throw "'v4l_utils' has been renamed to/replaced by 'v4l-utils'"; # Converted to throw 2023-09-10 valkyrie = throw "valkyrie was removed from nixpkgs, because it is unmaintained upstream"; # Added 2022-05-10 vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 vaapiIntel = intel-vaapi-driver; # Added 2023-05-31 @@ -1856,8 +1862,8 @@ mapAliases ({ vimbWrapper = throw "'vimbWrapper' has been renamed to/replaced by 'vimb'"; # Converted to throw 2022-02-22 virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # Added 2021-07-21 virtuoso = throw "virtuoso has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-15 - virtmanager = virt-manager; # Added 2019-10-29 - virtmanager-qt = virt-manager-qt; # Added 2019-10-29 + virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2023-09-10 + virtmanager-qt = throw "'virtmanager-qt' has been renamed to/replaced by 'virt-manager-qt'"; # Converted to throw 2023-09-10 virtviewer = throw "'virtviewer' has been renamed to/replaced by 'virt-viewer'"; # Converted to throw 2022-02-22 vivaldi-widevine = throw "'vivaldi-widevine' has been renamed to/replaced by 'widevine-cdm'"; # Added 2023-02-25 vkBasalt = vkbasalt; # Added 2022-11-22 @@ -1994,8 +2000,7 @@ mapAliases ({ https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 ''; # Added 2020-08-17 - # Added 2019-09-06 - zeroc_ice = pkgs.zeroc-ice; + zeroc_ice = throw "'zeroc_ice' has been renamed to/replaced by 'zeroc-ice'"; # Converted to throw 2023-09-10 # Added 2020-06-22 zeromq3 = throw "zeromq3 has been deprecated by zeromq4"; @@ -2005,7 +2010,7 @@ mapAliases ({ dina-font-pcf = dina-font; # Added 2020-02-09 dnscrypt-proxy2 = dnscrypt-proxy; # Added 2023-02-02 gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7"; - gnatsd = nats-server; # Added 2019-10-28 + gnatsd = throw "'gnatsd' has been renamed to/replaced by 'nats-server'"; # Converted to throw 2023-09-10 obs-gstreamer = throw '' obs-gstreamer has been converted into a plugin for use with wrapOBS. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b94fdd30dc5..3483d061f889 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1837,6 +1837,8 @@ with pkgs; hexdiff = callPackage ../tools/misc/hexdiff { }; + hexo-cli = callPackage ../development/tools/hexo-cli { }; + hostmux = callPackage ../tools/misc/hostmux { }; hsd = callPackage ../tools/misc/hsd { }; @@ -1917,6 +1919,8 @@ with pkgs; mymcplus = python3Packages.callPackage ../tools/games/mymcplus { }; + near-cli = callPackage ../tools/misc/near-cli { }; + networkd-notify = python3Packages.callPackage ../tools/networking/networkd-notify { systemd = pkgs.systemd; }; @@ -2980,8 +2984,6 @@ with pkgs; dterm = callPackage ../applications/terminal-emulators/dterm { }; - eterm = callPackage ../applications/terminal-emulators/eterm { }; - foot = callPackage ../applications/terminal-emulators/foot { }; germinal = callPackage ../applications/terminal-emulators/germinal { }; @@ -5241,8 +5243,6 @@ with pkgs; encpipe = callPackage ../tools/misc/encpipe { }; - engage = callPackage ../tools/misc/engage { }; - ent = callPackage ../tools/misc/ent { }; entwine = callPackage ../applications/graphics/entwine { }; @@ -5701,6 +5701,8 @@ with pkgs; wlroots = wlroots_0_15; }; + hyprshade = python311Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { }; + hysteria = callPackage ../tools/networking/hysteria { }; hyx = callPackage ../tools/text/hyx { }; @@ -6177,6 +6179,10 @@ with pkgs; ondir = callPackage ../tools/misc/ondir { }; + opencomposite = callPackage ../development/libraries/opencomposite { }; + + opencomposite-helper = callPackage ../development/libraries/opencomposite/helper.nix { }; + osdlyrics = callPackage ../applications/audio/osdlyrics { }; ossutil = callPackage ../tools/admin/ossutil { }; @@ -7389,9 +7395,7 @@ with pkgs; ddrutility = callPackage ../tools/system/ddrutility { }; - inherit (callPackages ../applications/networking/p2p/deluge { - libtorrent-rasterbar = libtorrent-rasterbar-1_2_x; - }) + inherit (callPackages ../applications/networking/p2p/deluge { }) deluge-gtk deluged deluge; @@ -11540,6 +11544,8 @@ with pkgs; open-ecard = callPackage ../tools/security/open-ecard { }; + open-interpreter = callPackage ../tools/llm/open-interpreter { }; + openjade = callPackage ../tools/text/sgml/openjade { }; openhantek6022 = libsForQt5.callPackage ../applications/science/electronics/openhantek6022 { }; @@ -12782,6 +12788,8 @@ with pkgs; rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { }; + rosenpass = callPackage ../tools/networking/rosenpass { }; + rot8 = callPackage ../tools/misc/rot8 { }; rowhammer-test = callPackage ../tools/system/rowhammer-test { }; @@ -18661,7 +18669,6 @@ with pkgs; inherit (callPackages ../development/tools/electron/binary { }) electron-bin - electron_9-bin electron_10-bin electron_11-bin electron_12-bin @@ -18681,7 +18688,6 @@ with pkgs; electron_26-bin; electron = electron-bin; - electron_9 = electron_9-bin; electron_10 = electron_10-bin; electron_11 = electron_11-bin; electron_12 = electron_12-bin; @@ -19787,6 +19793,8 @@ with pkgs; lurk = callPackage ../development/tools/lurk { }; + lutgen = callPackage ../applications/graphics/lutgen { }; + maizzle = callPackage ../development/tools/maizzle { }; malt = callPackage ../development/tools/profiling/malt { }; @@ -29918,8 +29926,10 @@ with pkgs; noto-fonts-lgc-plus noto-fonts-cjk-sans noto-fonts-cjk-serif - noto-fonts-emoji - noto-fonts-emoji-blob-bin; + noto-fonts-color-emoji + noto-fonts-emoji-blob-bin + noto-fonts-monochrome-emoji + ; nuclear = callPackage ../applications/audio/nuclear { }; @@ -30254,6 +30264,8 @@ with pkgs; gtk = res.gtk2; }; + tau-hydrogen = callPackage ../data/icons/tau-hydrogen { }; + theme-jade1 = callPackage ../data/themes/jade1 { }; theme-obsidian2 = callPackage ../data/themes/obsidian2 { }; @@ -30411,8 +30423,10 @@ with pkgs; }; zeal-qt5 = libsForQt5.callPackage ../data/documentation/zeal { }; - zeal-qt6 = qt6Packages.callPackage ../data/documentation/zeal { }; zeal = zeal-qt5; + zeal-qt6 = qt6Packages.callPackage ../data/documentation/zeal { + qtx11extras = null; # Because it does not exist in qt6 + }; zilla-slab = callPackage ../data/fonts/zilla-slab { }; @@ -31365,6 +31379,8 @@ with pkgs; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; docker-compose = callPackage ../applications/virtualization/docker/compose.nix { }; docker-compose_1 = python3Packages.callPackage ../applications/virtualization/docker/compose_1.nix { }; + docker-sbom = callPackage ../applications/virtualization/docker/sbom.nix { }; + amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { }; @@ -33770,10 +33786,6 @@ with pkgs; markets = callPackage ../applications/misc/markets { }; - markmind = callPackage ../applications/misc/markmind { - electron = electron_9; - }; - markscribe = callPackage ../tools/text/markscribe { }; magnetico = callPackage ../applications/networking/p2p/magnetico { }; @@ -33830,6 +33842,8 @@ with pkgs; melody = callPackage ../tools/misc/melody { }; + meme-bingo-web = callPackage ../servers/web-apps/meme-bingo-web { }; + meme-image-generator = callPackage ../applications/graphics/meme-image-generator { }; meme-suite = callPackage ../applications/science/biology/meme-suite { }; @@ -34294,7 +34308,10 @@ with pkgs; okteto = callPackage ../development/tools/okteto { }; - onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { }; + onlyoffice-bin_7_2 = callPackage ../applications/office/onlyoffice-bin/7_2.nix { }; + onlyoffice-bin_7_4 = callPackage ../applications/office/onlyoffice-bin/7_4.nix { }; + onlyoffice-bin = onlyoffice-bin_7_2; + onlyoffice-bin_latest = onlyoffice-bin_7_4; onmetal-image = callPackage ../tools/virtualization/onmetal-image { }; @@ -34313,8 +34330,6 @@ with pkgs; opsdroid = callPackage ../applications/networking/opsdroid { }; - oroborus = callPackage ../applications/window-managers/oroborus { }; - osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; ostinato = libsForQt5.callPackage ../applications/networking/ostinato { @@ -34990,10 +35005,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - pomotroid = callPackage ../applications/misc/pomotroid { - electron = electron_9; - }; - ponymix = callPackage ../applications/audio/ponymix { }; pop-launcher = callPackage ../applications/misc/pop-launcher { }; @@ -38609,8 +38620,6 @@ with pkgs; tcl2048 = callPackage ../games/tcl2048 { }; - the-legend-of-edgar = callPackage ../games/the-legend-of-edgar { }; - the-powder-toy = callPackage ../games/the-powder-toy { lua = lua5_1; inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -39769,6 +39778,7 @@ with pkgs; lean = callPackage ../applications/science/logic/lean { }; lean2 = callPackage ../applications/science/logic/lean2 { }; + lean4 = callPackage ../applications/science/logic/lean4 { }; lean3 = lean; elan = callPackage ../applications/science/logic/elan { }; mathlibtools = with python3Packages; toPythonApplication mathlibtools; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 96c95c819f6a..07429cee853a 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -410,6 +410,8 @@ in { nvidia_x11_legacy470 = nvidiaPackages.legacy_470; nvidia_x11_production = nvidiaPackages.production; nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta; + nvidia_dc = nvidiaPackages.dc; + nvidia_dc_520 = nvidiaPackages.dc_520; # this is not a replacement for nvidia_x11* # only the opensource kernel driver exposed for hydra to build diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a029db0f6bdb..fc896cfb1402 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1438,6 +1438,8 @@ let pp = callPackage ../development/ocaml-modules/pp { }; + pp_loc = callPackage ../development/ocaml-modules/pp_loc { }; + pprint = callPackage ../development/ocaml-modules/pprint { }; ppx_bap = janeStreet_0_15.ppx_bap; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 34e0bfb5d7d9..7430c98586b7 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -255,6 +255,8 @@ lib.makeScope pkgs.newScope (self: with self; { maxminddb = callPackage ../development/php-packages/maxminddb { }; + memcache = callPackage ../development/php-packages/memcache { }; + memcached = callPackage ../development/php-packages/memcached { }; mongodb = callPackage ../development/php-packages/mongodb { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 23f07eb89d48..b51139ebff1b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -52,6 +52,8 @@ self: super: with self; { actdiag = callPackage ../development/python-modules/actdiag { }; + acunetix = callPackage ../development/python-modules/acunetix { }; + adafruit-io = callPackage ../development/python-modules/adafruit-io { }; adafruit-nrfutil = callPackage ../development/python-modules/adafruit-nrfutil { }; @@ -910,6 +912,8 @@ self: super: with self; { autopep8 = callPackage ../development/python-modules/autopep8 { }; + autoslot = callPackage ../development/python-modules/autoslot { }; + avahi = toPythonModule (pkgs.avahi.override { inherit python; withPython = true; @@ -2719,6 +2723,8 @@ self: super: with self; { diffimg = callPackage ../development/python-modules/diffimg { }; + diffsync = callPackage ../development/python-modules/diffsync { }; + digital-ocean = callPackage ../development/python-modules/digitalocean { }; digi-xbee = callPackage ../development/python-modules/digi-xbee { }; @@ -5320,6 +5326,8 @@ self: super: with self; { ipykernel = callPackage ../development/python-modules/ipykernel { }; + ipymarkup = callPackage ../development/python-modules/ipymarkup { }; + ipympl = callPackage ../development/python-modules/ipympl { }; ipyparallel = callPackage ../development/python-modules/ipyparallel { }; @@ -6190,6 +6198,8 @@ self: super: with self; { lit = callPackage ../development/python-modules/lit { }; + litellm = callPackage ../development/python-modules/litellm { }; + litemapy = callPackage ../development/python-modules/litemapy { }; littleutils = callPackage ../development/python-modules/littleutils { }; @@ -7019,6 +7029,10 @@ self: super: with self; { nanoleaf = callPackage ../development/python-modules/nanoleaf { }; + navec = callPackage ../development/python-modules/navec { }; + + natasha = callPackage ../development/python-modules/natasha { }; + nomadnet = callPackage ../development/python-modules/nomadnet { }; nox = callPackage ../development/python-modules/nox { }; @@ -11063,6 +11077,8 @@ self: super: with self; { ray = callPackage ../development/python-modules/ray { redis = pkgs.redis; }; + razdel = callPackage ../development/python-modules/razdel { }; + rbtools = callPackage ../development/python-modules/rbtools { }; rchitect = callPackage ../development/python-modules/rchitect { }; @@ -11950,6 +11966,8 @@ self: super: with self; { slob = callPackage ../development/python-modules/slob { }; + slovnet = callPackage ../development/python-modules/slovnet { }; + slowapi = callPackage ../development/python-modules/slowapi { }; slugid = callPackage ../development/python-modules/slugid { }; @@ -12941,6 +12959,8 @@ self: super: with self; { tokenlib = callPackage ../development/python-modules/tokenlib { }; + tokentrim = callPackage ../development/python-modules/tokentrim { }; + tololib = callPackage ../development/python-modules/tololib { }; toml = callPackage ../development/python-modules/toml { }; @@ -13588,6 +13608,8 @@ self: super: with self; { veryprettytable = callPackage ../development/python-modules/veryprettytable { }; + vg = callPackage ../development/python-modules/vg { }; + videocr = callPackage ../development/python-modules/videocr { }; vidstab = callPackage ../development/python-modules/vidstab { }; @@ -14068,6 +14090,8 @@ self: super: with self; { yarg = callPackage ../development/python-modules/yarg { }; + yagry = callPackage ../development/python-modules/yargy { }; + yark = callPackage ../development/python-modules/yark { }; yarl = callPackage ../development/python-modules/yarl { }; |