diff --git a/.github/ISSUE_TEMPLATE/05_update_request.yml b/.github/ISSUE_TEMPLATE/05_update_request.yml index 4b29a2af0126..91944dbd9cf5 100644 --- a/.github/ISSUE_TEMPLATE/05_update_request.yml +++ b/.github/ISSUE_TEMPLATE/05_update_request.yml @@ -22,9 +22,6 @@ body: > For instance, if you were filing a request against the out of date `hello` package, where the current version in Nixpkgs is 1.0.0, but the latest version upstream is 1.0.1, your title would be as follows: > `Update Request: hello 1.0.0 → 1.0.1` - > [!NOTE] - > If you are filing an update request to change a package's source to a fork, please file a new package request instead. Even if the original upstream is outdated, the fork should be considered a new package. - --- - type: "dropdown" id: "version" @@ -74,6 +71,13 @@ body: description: "If applicable, please link the upstream changelog for the latest version." validations: required: false + - type: "textarea" + id: "additional-context" + attributes: + label: "Additional context" + description: "Add any other context about the update here." + validations: + required: false - type: "textarea" id: "maintainers" attributes: diff --git a/README.md b/README.md index 5b00a40c4c0c..fc275f69e4f4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@

[Nixpkgs](https://github.com/nixos/nixpkgs) is a collection of over -100,000 software packages that can be installed with the +120,000 software packages that can be installed with the [Nix](https://nixos.org/nix/) package manager. It also implements [NixOS](https://nixos.org/nixos/), a purely-functional Linux distribution. diff --git a/ci/OWNERS b/ci/OWNERS index 74309937538a..3ea1acac95ac 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -172,13 +172,13 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza /pkgs/top-level/release-python.nix @natsukium # Haskell -/doc/languages-frameworks/haskell.section.md @sternenseemann @maralorn -/maintainers/scripts/haskell @sternenseemann @maralorn -/pkgs/development/compilers/ghc @sternenseemann @maralorn -/pkgs/development/haskell-modules @sternenseemann @maralorn -/pkgs/test/haskell @sternenseemann @maralorn -/pkgs/top-level/release-haskell.nix @sternenseemann @maralorn -/pkgs/top-level/haskell-packages.nix @sternenseemann @maralorn +/doc/languages-frameworks/haskell.section.md @sternenseemann @maralorn @wolfgangwalther +/maintainers/scripts/haskell @sternenseemann @maralorn @wolfgangwalther +/pkgs/development/compilers/ghc @sternenseemann @maralorn @wolfgangwalther +/pkgs/development/haskell-modules @sternenseemann @maralorn @wolfgangwalther +/pkgs/test/haskell @sternenseemann @maralorn @wolfgangwalther +/pkgs/top-level/release-haskell.nix @sternenseemann @maralorn @wolfgangwalther +/pkgs/top-level/haskell-packages.nix @sternenseemann @maralorn @wolfgangwalther # Perl /pkgs/development/interpreters/perl @stigtsp @zakame @marcusramberg diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix index 9b71c6656914..04676476f4b2 100644 --- a/ci/eval/compare/default.nix +++ b/ci/eval/compare/default.nix @@ -9,6 +9,7 @@ beforeResultDir, afterResultDir, touchedFilesJson, + byName ? false, }: let /* @@ -119,6 +120,7 @@ let maintainers = import ./maintainers.nix { changedattrs = lib.attrNames (lib.groupBy (a: a.name) rebuildsPackagePlatformAttrs); changedpathsjson = touchedFilesJson; + inherit byName; }; in runCommand "compare" diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix index 69748a629cff..8fb43be4d8e7 100644 --- a/ci/eval/compare/maintainers.nix +++ b/ci/eval/compare/maintainers.nix @@ -1,5 +1,9 @@ # Almost directly vendored from https://github.com/NixOS/ofborg/blob/5a4e743f192fb151915fcbe8789922fa401ecf48/ofborg/src/maintainers.nix -{ changedattrs, changedpathsjson }: +{ + changedattrs, + changedpathsjson, + byName ? false, +}: let pkgs = import ../../.. { system = "x86_64-linux"; @@ -41,7 +45,18 @@ let ) validPackageAttributes; attrsWithMaintainers = builtins.map ( - pkg: pkg // { maintainers = (pkg.package.meta or { }).maintainers or [ ]; } + pkg: + let + meta = pkg.package.meta or { }; + in + pkg + // { + # TODO: Refactor this so we can ping entire teams instead of the individual members. + # Note that this will require keeping track of GH team IDs in "maintainers/teams.nix". + maintainers = + meta.maintainers or [ ] + ++ lib.flatten (map (team: team.members or [ ]) (meta.teams or [ ])); + } ) attrsWithPackages; relevantFilenames = @@ -83,12 +98,13 @@ let pkg: builtins.map (maintainer: { id = maintainer.githubId; + inherit (maintainer) github; packageName = pkg.name; dueToFiles = pkg.filenames; }) pkg.maintainers ) attrsWithModifiedFiles; - byMaintainer = lib.groupBy (ping: toString ping.id) listToPing; + byMaintainer = lib.groupBy (ping: toString ping.${if byName then "github" else "id"}) listToPing; packagesPerMaintainer = lib.attrsets.mapAttrs ( maintainer: packages: builtins.map (pkg: pkg.packageName) packages diff --git a/doc/build-helpers/dev-shell-tools.chapter.md b/doc/build-helpers/dev-shell-tools.chapter.md index 0168ea39f7aa..12018cd76cee 100644 --- a/doc/build-helpers/dev-shell-tools.chapter.md +++ b/doc/build-helpers/dev-shell-tools.chapter.md @@ -20,12 +20,12 @@ Converts Nix values to strings in the way the [`derivation` built-in function](h ```nix devShellTools.valueToString (builtins.toFile "foo" "bar") -=> "/nix/store/...-foo" +# => "/nix/store/...-foo" ``` ```nix devShellTools.valueToString false -=> "" +# => "" ``` ::: @@ -42,16 +42,22 @@ This function does not support `__structuredAttrs`, but does support `passAsFile devShellTools.unstructuredDerivationInputEnv { drvAttrs = { name = "foo"; - buildInputs = [ hello figlet ]; + buildInputs = [ + hello + figlet + ]; builder = bash; - args = [ "-c" "${./builder.sh}" ]; + args = [ + "-c" + "${./builder.sh}" + ]; }; } -=> { - name = "foo"; - buildInputs = "/nix/store/...-hello /nix/store/...-figlet"; - builder = "/nix/store/...-bash"; -} +# => { +# name = "foo"; +# buildInputs = "/nix/store/...-hello /nix/store/...-figlet"; +# builder = "/nix/store/...-bash"; +#} ``` Note that `args` is not included, because Nix does not added it to the builder process environment. @@ -69,7 +75,10 @@ Takes the relevant parts of a derivation and returns a set of environment variab let pkg = hello; in -devShellTools.derivationOutputEnv { outputList = pkg.outputs; outputMap = pkg; } +devShellTools.derivationOutputEnv { + outputList = pkg.outputs; + outputMap = pkg; +} ``` ::: diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index fd7b41f64c70..cfd0730d031c 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md @@ -491,7 +491,11 @@ It might be useful to manipulate the content downloaded by `fetchurl` directly i In this example, we'll adapt [](#ex-fetchers-fetchurl-nixpkgs-version) to append the result of running the `hello` package to the contents we download, purely to illustrate how to manipulate the content. ```nix -{ fetchurl, hello, lib }: +{ + fetchurl, + hello, + lib, +}: fetchurl { url = "https://raw.githubusercontent.com/NixOS/nixpkgs/23.11/.version"; @@ -714,9 +718,10 @@ A wrapper around `fetchpatch`, which takes: Here is an example of `fetchDebianPatch` in action: ```nix -{ lib -, fetchDebianPatch -, buildPythonPackage +{ + lib, + fetchDebianPatch, + buildPythonPackage, }: buildPythonPackage rec { @@ -914,7 +919,9 @@ It produces packages that cannot be built automatically. { fetchtorrent }: fetchtorrent { - config = { peer-limit-global = 100; }; + config = { + peer-limit-global = 100; + }; url = "magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c"; hash = ""; } diff --git a/doc/build-helpers/images/appimagetools.section.md b/doc/build-helpers/images/appimagetools.section.md index cbd40ab6c35f..7bfc45287d1f 100644 --- a/doc/build-helpers/images/appimagetools.section.md +++ b/doc/build-helpers/images/appimagetools.section.md @@ -33,7 +33,7 @@ let version = "0.6.30"; src = fetchurl { - url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}.AppImage"; + url = "https://github.com/nukeop/nuclear/releases/download/v${version}/nuclear-v${version}.AppImage"; hash = "sha256-he1uGC1M/nFcKpMM9JKY4oeexJcnzV0ZRxhTjtJz6xw="; }; in @@ -66,7 +66,8 @@ let url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage"; hash = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI="; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit pname version src; extraPkgs = pkgs: [ pkgs.at-spi2-core ]; } @@ -106,7 +107,8 @@ let appimageContents = appimageTools.extract { inherit pname version src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit pname version src; extraPkgs = pkgs: [ pkgs.at-spi2-core ]; @@ -150,7 +152,8 @@ let substituteInPlace $out/irccloud.desktop --replace-fail 'Exec=AppRun' 'Exec=${pname}' ''; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit pname version src; extraPkgs = pkgs: [ pkgs.at-spi2-core ]; diff --git a/doc/build-helpers/images/binarycache.section.md b/doc/build-helpers/images/binarycache.section.md index 954f07e93213..46b43bd4f65a 100644 --- a/doc/build-helpers/images/binarycache.section.md +++ b/doc/build-helpers/images/binarycache.section.md @@ -35,7 +35,7 @@ The following derivation will construct a flat-file binary cache containing the ```nix { mkBinaryCache, hello }: mkBinaryCache { - rootPaths = [hello]; + rootPaths = [ hello ]; } ``` diff --git a/doc/build-helpers/images/dockertools.section.md b/doc/build-helpers/images/dockertools.section.md index 04d477bdc506..fbb0df85d647 100644 --- a/doc/build-helpers/images/dockertools.section.md +++ b/doc/build-helpers/images/dockertools.section.md @@ -235,7 +235,11 @@ The following package builds a Docker image that runs the `redis-server` executa The Docker image will have name `redis` and tag `latest`. ```nix -{ dockerTools, buildEnv, redis }: +{ + dockerTools, + buildEnv, + redis, +}: dockerTools.buildImage { name = "redis"; tag = "latest"; @@ -253,7 +257,9 @@ dockerTools.buildImage { config = { Cmd = [ "/bin/redis-server" ]; WorkingDir = "/data"; - Volumes = { "/data" = { }; }; + Volumes = { + "/data" = { }; + }; }; } ``` @@ -286,7 +292,11 @@ It uses `runAsRoot` to create a directory and a file inside the image. This works the same as [](#ex-dockerTools-buildImage-extraCommands), but uses `runAsRoot` instead of `extraCommands`. ```nix -{ dockerTools, buildEnv, hello }: +{ + dockerTools, + buildEnv, + hello, +}: dockerTools.buildImage { name = "hello"; tag = "latest"; @@ -320,7 +330,11 @@ This works the same as [](#ex-dockerTools-buildImage-runAsRoot), but uses `extra Note that with `extraCommands`, we can't directly reference `/` and must create files and directories as if we were already on `/`. ```nix -{ dockerTools, buildEnv, hello }: +{ + dockerTools, + buildEnv, + hello, +}: dockerTools.buildImage { name = "hello"; tag = "latest"; @@ -350,7 +364,11 @@ dockerTools.buildImage { Note that using a value of `"now"` in the `created` attribute will break reproducibility. ```nix -{ dockerTools, buildEnv, hello }: +{ + dockerTools, + buildEnv, + hello, +}: dockerTools.buildImage { name = "hello"; tag = "latest"; @@ -766,7 +784,11 @@ The closure of `config` is automatically included in the generated image. The following package shows a more compact way to create the same output generated in [](#ex-dockerTools-streamLayeredImage-hello). ```nix -{ dockerTools, hello, lib }: +{ + dockerTools, + hello, + lib, +}: dockerTools.streamLayeredImage { name = "hello"; tag = "latest"; @@ -1547,11 +1569,15 @@ The Docker image generated will have a name like `hello--env` and tag ` This example uses [](#ex-dockerTools-streamNixShellImage-hello) as a starting point. ```nix -{ dockerTools, cowsay, hello }: +{ + dockerTools, + cowsay, + hello, +}: dockerTools.streamNixShellImage { tag = "latest"; drv = hello.overrideAttrs (old: { - nativeBuildInputs = old.nativeBuildInputs or [] ++ [ + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ cowsay ]; }); diff --git a/doc/build-helpers/images/makediskimage.section.md b/doc/build-helpers/images/makediskimage.section.md index 3edfa906aa6a..6d9afccdbae5 100644 --- a/doc/build-helpers/images/makediskimage.section.md +++ b/doc/build-helpers/images/makediskimage.section.md @@ -52,23 +52,23 @@ A `deterministic` flag is available for best efforts determinism. To produce a Nix-store only image: ```nix let - pkgs = import {}; + pkgs = import { }; lib = pkgs.lib; make-disk-image = import ; in - make-disk-image { - inherit pkgs lib; - config = {}; - additionalPaths = [ ]; - format = "qcow2"; - onlyNixStore = true; - partitionTableType = "none"; - installBootLoader = false; - touchEFIVars = false; - diskSize = "auto"; - additionalSpace = "0M"; # Defaults to 512M. - copyChannel = false; - } +make-disk-image { + inherit pkgs lib; + config = { }; + additionalPaths = [ ]; + format = "qcow2"; + onlyNixStore = true; + partitionTableType = "none"; + installBootLoader = false; + touchEFIVars = false; + diskSize = "auto"; + additionalSpace = "0M"; # Defaults to 512M. + copyChannel = false; +} ``` Some arguments can be left out, they are shown explicitly for the sake of the example. @@ -78,29 +78,36 @@ Building this derivation will provide a QCOW2 disk image containing only the Nix To produce a NixOS installation image disk with UEFI and bootloader installed: ```nix let - pkgs = import {}; + pkgs = import { }; lib = pkgs.lib; make-disk-image = import ; evalConfig = import ; in - make-disk-image { - inherit pkgs lib; - inherit (evalConfig { +make-disk-image { + inherit pkgs lib; + inherit + (evalConfig { modules = [ { - fileSystems."/" = { device = "/dev/vda"; fsType = "ext4"; autoFormat = true; }; + fileSystems."/" = { + device = "/dev/vda"; + fsType = "ext4"; + autoFormat = true; + }; boot.grub.device = "/dev/vda"; } ]; - }) config; - format = "qcow2"; - onlyNixStore = false; - partitionTableType = "legacy+gpt"; - installBootLoader = true; - touchEFIVars = true; - diskSize = "auto"; - additionalSpace = "0M"; # Defaults to 512M. - copyChannel = false; - memSize = 2048; # Qemu VM memory size in megabytes. Defaults to 1024M. - } + }) + config + ; + format = "qcow2"; + onlyNixStore = false; + partitionTableType = "legacy+gpt"; + installBootLoader = true; + touchEFIVars = true; + diskSize = "auto"; + additionalSpace = "0M"; # Defaults to 512M. + copyChannel = false; + memSize = 2048; # Qemu VM memory size in megabytes. Defaults to 1024M. +} ``` diff --git a/doc/build-helpers/images/ocitools.section.md b/doc/build-helpers/images/ocitools.section.md index 96627615ffb5..5101dd81715b 100644 --- a/doc/build-helpers/images/ocitools.section.md +++ b/doc/build-helpers/images/ocitools.section.md @@ -76,7 +76,11 @@ Note that no user namespace is created, which means that you won't be able to ru This example uses `ociTools.buildContainer` to create a simple container that runs `bash`. ```nix -{ ociTools, lib, bash }: +{ + ociTools, + lib, + bash, +}: ociTools.buildContainer { args = [ (lib.getExe bash) diff --git a/doc/build-helpers/images/portableservice.section.md b/doc/build-helpers/images/portableservice.section.md index c271bc775dba..43e44fe33aec 100644 --- a/doc/build-helpers/images/portableservice.section.md +++ b/doc/build-helpers/images/portableservice.section.md @@ -91,7 +91,12 @@ See [](#ex-portableService-hello) to understand how to use the output of `portab The following example builds a Portable Service image with the `hello` package, along with a service unit that runs it. ```nix -{ lib, writeText, portableService, hello }: +{ + lib, + writeText, + portableService, + hello, +}: let hello-service = writeText "hello.service" '' [Unit] @@ -151,7 +156,13 @@ To make things available globally, you must specify the `symlinks` attribute whe The following package builds on the package from [](#ex-portableService-hello) to make `/etc/ssl` available globally (this is only for illustrative purposes, because `hello` doesn't use `/etc/ssl`). ```nix -{ lib, writeText, portableService, hello, cacert }: +{ + lib, + writeText, + portableService, + hello, + cacert, +}: let hello-service = writeText "hello.service" '' [Unit] @@ -167,7 +178,10 @@ portableService { inherit (hello) version; units = [ hello-service ]; symlinks = [ - { object = "${cacert}/etc/ssl"; symlink = "/etc/ssl"; } + { + object = "${cacert}/etc/ssl"; + symlink = "/etc/ssl"; + } ]; } ``` diff --git a/doc/build-helpers/special/checkpoint-build.section.md b/doc/build-helpers/special/checkpoint-build.section.md index a1ce5608f246..036fee286a99 100644 --- a/doc/build-helpers/special/checkpoint-build.section.md +++ b/doc/build-helpers/special/checkpoint-build.section.md @@ -26,7 +26,9 @@ To change a normal derivation to a checkpoint based build, these steps must be t ## Example {#sec-checkpoint-build-example} ```nix -{ pkgs ? import {} }: +{ + pkgs ? import { }, +}: let inherit (pkgs.checkpointBuildTools) prepareCheckpointBuild @@ -39,5 +41,6 @@ let sed -i 's/Hello, world!/Hello, Nix!/g' src/hello.c ''; }); -in mkCheckpointBuild changedHello helloCheckpoint +in +mkCheckpointBuild changedHello helloCheckpoint ``` diff --git a/doc/build-helpers/special/fakenss.section.md b/doc/build-helpers/special/fakenss.section.md index c890752c0653..7b1b6f2576f2 100644 --- a/doc/build-helpers/special/fakenss.section.md +++ b/doc/build-helpers/special/fakenss.section.md @@ -48,12 +48,19 @@ It is useful with functions in `dockerTools` to allow building Docker images tha This example includes the `hello` binary in the image so it can do something besides just have the extra files. ```nix -{ dockerTools, fakeNss, hello }: +{ + dockerTools, + fakeNss, + hello, +}: dockerTools.buildImage { name = "image-with-passwd"; tag = "latest"; - copyToRoot = [ fakeNss hello ]; + copyToRoot = [ + fakeNss + hello + ]; config = { Cmd = [ "/bin/hello" ]; @@ -70,8 +77,8 @@ The following code uses `override` to add extra lines to `/etc/passwd` and `/etc ```nix { fakeNss }: fakeNss.override { - extraPasswdLines = ["newuser:x:9001:9001:new user:/var/empty:/bin/sh"]; - extraGroupLines = ["newuser:x:9001:"]; + extraPasswdLines = [ "newuser:x:9001:9001:new user:/var/empty:/bin/sh" ]; + extraGroupLines = [ "newuser:x:9001:" ]; } ``` ::: diff --git a/doc/build-helpers/special/fhs-environments.section.md b/doc/build-helpers/special/fhs-environments.section.md index 815f6cac1126..e81dbdfdc641 100644 --- a/doc/build-helpers/special/fhs-environments.section.md +++ b/doc/build-helpers/special/fhs-environments.section.md @@ -36,22 +36,29 @@ Accepted arguments are: You can create a simple environment using a `shell.nix` like this: ```nix -{ pkgs ? import {} }: +{ + pkgs ? import { }, +}: (pkgs.buildFHSEnv { name = "simple-x11-env"; - targetPkgs = pkgs: (with pkgs; [ - udev - alsa-lib - ]) ++ (with pkgs.xorg; [ - libX11 - libXcursor - libXrandr - ]); - multiPkgs = pkgs: (with pkgs; [ - udev - alsa-lib - ]); + targetPkgs = + pkgs: + (with pkgs; [ + udev + alsa-lib + ]) + ++ (with pkgs.xorg; [ + libX11 + libXcursor + libXrandr + ]); + multiPkgs = + pkgs: + (with pkgs; [ + udev + alsa-lib + ]); runScript = "bash"; }).env ``` diff --git a/doc/build-helpers/special/makesetuphook.section.md b/doc/build-helpers/special/makesetuphook.section.md index 179d8d456372..7b83653296eb 100644 --- a/doc/build-helpers/special/makesetuphook.section.md +++ b/doc/build-helpers/special/makesetuphook.section.md @@ -9,7 +9,7 @@ pkgs.makeSetupHook { name = "something-hook"; propagatedBuildInputs = [ pkgs.commandsomething ]; depsTargetTargetPropagated = [ pkgs.libsomething ]; -} ./script.sh; +} ./script.sh ``` ### setup hook that depends on the hello package and runs hello and @shell@ is substituted with path to bash {#sec-pkgs.makeSetupHook-usage-example} @@ -42,7 +42,7 @@ pkgs.makeSetupHook } preConfigureHooks+=(_printHelloHook) '' - ); + ) ``` ## Attributes {#sec-pkgs.makeSetupHook-attributes} diff --git a/doc/build-helpers/special/mkshell.section.md b/doc/build-helpers/special/mkshell.section.md index e39bef7468e3..15443660c9ff 100644 --- a/doc/build-helpers/special/mkshell.section.md +++ b/doc/build-helpers/special/mkshell.section.md @@ -8,11 +8,16 @@ repetition when using it with `nix-shell` (or `nix develop`). Here is a common usage example: ```nix -{ pkgs ? import {} }: +{ + pkgs ? import { }, +}: pkgs.mkShell { packages = [ pkgs.gnumake ]; - inputsFrom = [ pkgs.hello pkgs.gnutar ]; + inputsFrom = [ + pkgs.hello + pkgs.gnutar + ]; shellHook = '' export DEBUG=1 diff --git a/doc/build-helpers/special/vm-tools.section.md b/doc/build-helpers/special/vm-tools.section.md index 46ced7cd9990..7591f62eb462 100644 --- a/doc/build-helpers/special/vm-tools.section.md +++ b/doc/build-helpers/special/vm-tools.section.md @@ -31,25 +31,34 @@ If the build fails and Nix is run with the `-K/--keep-failed` option, a script ` Build the derivation hello inside a VM: ```nix -{ pkgs }: with pkgs; with vmTools; -runInLinuxVM hello +{ pkgs }: with pkgs; with vmTools; runInLinuxVM hello ``` Build inside a VM with extra memory: ```nix -{ pkgs }: with pkgs; with vmTools; -runInLinuxVM (hello.overrideAttrs (_: { memSize = 1024; })) +{ pkgs }: +with pkgs; +with vmTools; +runInLinuxVM ( + hello.overrideAttrs (_: { + memSize = 1024; + }) +) ``` Use VM with a disk image (implicitly sets `diskImage`, see [`vmTools.createEmptyImage`](#vm-tools-createEmptyImage)): ```nix -{ pkgs }: with pkgs; with vmTools; -runInLinuxVM (hello.overrideAttrs (_: { - preVM = createEmptyImage { - size = 1024; - fullName = "vm-image"; - }; -})) +{ pkgs }: +with pkgs; +with vmTools; +runInLinuxVM ( + hello.overrideAttrs (_: { + preVM = createEmptyImage { + size = 1024; + fullName = "vm-image"; + }; + }) +) ``` ## `vmTools.extractFs` {#vm-tools-extractFs} @@ -66,8 +75,7 @@ Takes a file, such as an ISO, and extracts its contents into the store. Extract the contents of an ISO file: ```nix -{ pkgs }: with pkgs; with vmTools; -extractFs { file = ./image.iso; } +{ pkgs }: with pkgs; with vmTools; extractFs { file = ./image.iso; } ``` ## `vmTools.extractMTDfs` {#vm-tools-extractMTDfs} @@ -86,14 +94,12 @@ Generate a script that can be used to run an interactive session in the given im Create a script for running a Fedora 27 VM: ```nix -{ pkgs }: with pkgs; with vmTools; -makeImageTestScript diskImages.fedora27x86_64 +{ pkgs }: with pkgs; with vmTools; makeImageTestScript diskImages.fedora27x86_64 ``` Create a script for running an Ubuntu 20.04 VM: ```nix -{ pkgs }: with pkgs; with vmTools; -makeImageTestScript diskImages.ubuntu2004x86_64 +{ pkgs }: with pkgs; with vmTools; makeImageTestScript diskImages.ubuntu2004x86_64 ``` ## `vmTools.diskImageFuns` {#vm-tools-diskImageFuns} @@ -137,8 +143,13 @@ A set of functions that build a predefined set of minimal Linux distributions im 8GiB image containing Firefox in addition to the default packages: ```nix -{ pkgs }: with pkgs; with vmTools; -diskImageFuns.ubuntu2004x86_64 { extraPackages = [ "firefox" ]; size = 8192; } +{ pkgs }: +with pkgs; +with vmTools; +diskImageFuns.ubuntu2004x86_64 { + extraPackages = [ "firefox" ]; + size = 8192; +} ``` ## `vmTools.diskImageExtraFuns` {#vm-tools-diskImageExtraFuns} diff --git a/doc/build-helpers/testers.chapter.md b/doc/build-helpers/testers.chapter.md index fe1a0954348d..9e46635c600c 100644 --- a/doc/build-helpers/testers.chapter.md +++ b/doc/build-helpers/testers.chapter.md @@ -98,7 +98,8 @@ It has two modes: ```nix { "https://nix\\.dev/manual/nix/[a-z0-9.-]*" = "${nix.doc}/share/doc/nix/manual"; - "https://nixos\\.org/manual/nix/(un)?stable" = "${emptyDirectory}/placeholder-to-disallow-old-nix-docs-urls"; + "https://nixos\\.org/manual/nix/(un)?stable" = + "${emptyDirectory}/placeholder-to-disallow-old-nix-docs-urls"; } ``` @@ -302,18 +303,22 @@ While `testBuildFailure` is designed to keep changes to the original builder's e # Check that a build fails, and verify the changes made during build ```nix -runCommand "example" { - failed = testers.testBuildFailure (runCommand "fail" {} '' - echo ok-ish >$out - echo failing though - exit 3 - ''); -} '' - grep -F 'ok-ish' $failed/result - grep -F 'failing though' $failed/testBuildFailure.log - [[ 3 = $(cat $failed/testBuildFailure.exit) ]] - touch $out -'' +runCommand "example" + { + failed = testers.testBuildFailure ( + runCommand "fail" { } '' + echo ok-ish >$out + echo failing though + exit 3 + '' + ); + } + '' + grep -F 'ok-ish' $failed/result + grep -F 'failing though' $failed/testBuildFailure.log + [[ 3 = $(cat $failed/testBuildFailure.exit) ]] + touch $out + '' ``` ::: @@ -396,15 +401,18 @@ testers.testEqualContents { expected = writeText "expected" '' foo baz baz ''; - actual = runCommand "actual" { - # not really necessary for a package that's in stdenv - nativeBuildInputs = [ gnused ]; - base = writeText "base" '' - foo bar baz - ''; - } '' - sed -e 's/bar/baz/g' $base >$out - ''; + actual = + runCommand "actual" + { + # not really necessary for a package that's in stdenv + nativeBuildInputs = [ gnused ]; + base = writeText "base" '' + foo bar baz + ''; + } + '' + sed -e 's/bar/baz/g' $base >$out + ''; } ``` @@ -515,10 +523,11 @@ Otherwise, the build log explains the difference via `nix-diff`. # Check that two packages produce the same derivation ```nix -testers.testEqualDerivation - "The hello package must stay the same when enabling checks." - hello - (hello.overrideAttrs(o: { doCheck = true; })) +testers.testEqualDerivation "The hello package must stay the same when enabling checks." hello ( + hello.overrideAttrs (o: { + doCheck = true; + }) +) ``` ::: @@ -586,7 +595,10 @@ testers.runCommand { curl -o /dev/null https://example.com touch $out ''; - nativeBuildInputs = with pkgs; [ cacert curl ]; + nativeBuildInputs = with pkgs; [ + cacert + curl + ]; } ``` @@ -603,15 +615,20 @@ If your test is part of the Nixpkgs repository, or if you need a more general en # Run a NixOS test using `runNixOSTest` ```nix -pkgs.testers.runNixOSTest ({ lib, ... }: { - name = "hello"; - nodes.machine = { pkgs, ... }: { - environment.systemPackages = [ pkgs.hello ]; - }; - testScript = '' - machine.succeed("hello") - ''; -}) +pkgs.testers.runNixOSTest ( + { lib, ... }: + { + name = "hello"; + nodes.machine = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.hello ]; + }; + testScript = '' + machine.succeed("hello") + ''; + } +) ``` ::: @@ -634,10 +651,17 @@ A [NixOS VM test network](https://nixos.org/nixos/manual/index.html#sec-nixos-te { name = "my-test"; nodes = { - machine1 = { lib, pkgs, nodes, ... }: { - environment.systemPackages = [ pkgs.hello ]; - services.foo.enable = true; - }; + machine1 = + { + lib, + pkgs, + nodes, + ... + }: + { + environment.systemPackages = [ pkgs.hello ]; + services.foo.enable = true; + }; # machine2 = ...; }; testScript = '' diff --git a/doc/build-helpers/trivial-build-helpers.chapter.md b/doc/build-helpers/trivial-build-helpers.chapter.md index 9e818be674b4..48ed99b2fa36 100644 --- a/doc/build-helpers/trivial-build-helpers.chapter.md +++ b/doc/build-helpers/trivial-build-helpers.chapter.md @@ -66,15 +66,17 @@ runCommandWith :: { # Invocation of `runCommandWith` ```nix -runCommandWith { - name = "example"; - derivationArgs.nativeBuildInputs = [ cowsay ]; -} '' - cowsay > $out < $out </my-program.desktop` to the Nix store. ```nix -{makeDesktopItem}: +{ makeDesktopItem }: makeDesktopItem { name = "my-program"; desktopName = "My Program"; @@ -260,7 +262,10 @@ makeDesktopItem { mimeTypes = [ "video/mp4" ]; categories = [ "Utility" ]; implements = [ "org.my-program" ]; - keywords = [ "Video" "Player" ]; + keywords = [ + "Video" + "Player" + ]; startupNotify = false; startupWMClass = "MyProgram"; prefersNonDefaultGPU = false; @@ -276,18 +281,22 @@ makeDesktopItem { Override the `hello` package to add a desktop item. ```nix -{ copyDesktopItems -, hello -, makeDesktopItem }: +{ + copyDesktopItems, + hello, + makeDesktopItem, +}: hello.overrideAttrs { nativeBuildInputs = [ copyDesktopItems ]; - desktopItems = [(makeDesktopItem { - name = "hello"; - desktopName = "Hello"; - exec = "hello"; - })]; + desktopItems = [ + (makeDesktopItem { + name = "hello"; + desktopName = "Hello"; + exec = "hello"; + }) + ]; } ``` @@ -446,10 +455,9 @@ The store path will include the name, and it will be a file. Write the string `Contents of File` to `/nix/store/`: ```nix -writeText "my-file" - '' +writeText "my-file" '' Contents of File - '' +'' ``` ::: @@ -486,10 +494,9 @@ The store path will be a directory. Write the string `Contents of File` to `/nix/store//share/my-file`: ```nix -writeTextDir "share/my-file" - '' +writeTextDir "share/my-file" '' Contents of File - '' +'' ``` ::: @@ -528,10 +535,9 @@ The store path will include the name, and it will be a file. Write the string `Contents of File` to `/nix/store/` and make the file executable. ```nix -writeScript "my-file" - '' +writeScript "my-file" '' Contents of File - '' +'' ``` This is equivalent to: @@ -570,10 +576,9 @@ The store path will include the name, and it will be a directory. # Usage of `writeScriptBin` ```nix -writeScriptBin "my-script" - '' +writeScriptBin "my-script" '' echo "hi" - '' +'' ``` ::: @@ -614,10 +619,9 @@ This function is almost exactly like [](#trivial-builder-writeScript), except th # Usage of `writeShellScript` ```nix -writeShellScript "my-script" - '' +writeShellScript "my-script" '' echo "hi" - '' +'' ``` ::: @@ -657,10 +661,9 @@ This function is a combination of [](#trivial-builder-writeShellScript) and [](# # Usage of `writeShellScriptBin` ```nix -writeShellScriptBin "my-script" - '' +writeShellScriptBin "my-script" '' echo "hi" - '' +'' ``` ::: @@ -685,26 +688,40 @@ These functions concatenate `files` to the Nix store in a single file. This is u Here are a few examples: ```nix - # Writes my-file to /nix/store/ -concatTextFile { - name = "my-file"; - files = [ drv1 "${drv2}/path/to/file" ]; -} -# See also the `concatText` helper function below. +concatTextFile + { + name = "my-file"; + files = [ + drv1 + "${drv2}/path/to/file" + ]; + } + # See also the `concatText` helper function below. -# Writes executable my-file to /nix/store//bin/my-file -concatTextFile { - name = "my-file"; - files = [ drv1 "${drv2}/path/to/file" ]; - executable = true; - destination = "/bin/my-file"; -} -# Writes contents of files to /nix/store/ -concatText "my-file" [ file1 file2 ] + # Writes executable my-file to /nix/store//bin/my-file + concatTextFile + { + name = "my-file"; + files = [ + drv1 + "${drv2}/path/to/file" + ]; + executable = true; + destination = "/bin/my-file"; + } + # Writes contents of files to /nix/store/ + concatText + "my-file" + [ file1 file2 ] -# Writes contents of files to /nix/store/ -concatScript "my-file" [ file1 file2 ] + # Writes contents of files to /nix/store/ + concatScript + "my-file" + [ + file1 + file2 + ] ``` ## `writeShellApplication` {#trivial-builder-writeShellApplication} @@ -722,7 +739,10 @@ For example, the following shell application can refer to `curl` directly, rathe writeShellApplication { name = "show-nixos-org"; - runtimeInputs = [ curl w3m ]; + runtimeInputs = [ + curl + w3m + ]; text = '' curl -s 'https://nixos.org' | w3m -dump -T text/html @@ -736,7 +756,14 @@ This can be used to put many derivations into the same directory structure. It w Here is an example: ```nix # adds symlinks of hello and stack to current build and prints "links added" -symlinkJoin { name = "myexample"; paths = [ pkgs.hello pkgs.stack ]; postBuild = "echo links added"; } +symlinkJoin { + name = "myexample"; + paths = [ + pkgs.hello + pkgs.stack + ]; + postBuild = "echo links added"; +} ``` This creates a derivation with a directory structure like the following: ``` diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index f316656a585c..db8066c8dc56 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -12,6 +12,8 @@ nixos-render-docs-redirects, writeShellScriptBin, nixpkgs ? { }, + markdown-code-runner, + roboto, }: stdenvNoCC.mkDerivation ( @@ -48,6 +50,8 @@ stdenvNoCC.mkDerivation ( ''; buildPhase = '' + runHook preBuild + substituteInPlace ./languages-frameworks/python.section.md \ --subst-var-by python-interpreter-table "$(<"${pythonInterpreterTable}")" @@ -83,19 +87,27 @@ stdenvNoCC.mkDerivation ( --section-toc-depth 1 \ manual.md \ out/index.html + + runHook postBuild ''; installPhase = '' + runHook preInstall + dest="$out/share/doc/nixpkgs" mkdir -p "$(dirname "$dest")" mv out "$dest" mv "$dest/index.html" "$dest/manual.html" + cp ${roboto.src}/web/Roboto\[ital\,wdth\,wght\].ttf "$dest/Roboto.ttf" + cp ${epub} "$dest/nixpkgs-manual.epub" mkdir -p $out/nix-support/ echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products + + runHook postInstall ''; passthru = { @@ -119,10 +131,14 @@ stdenvNoCC.mkDerivation ( packages = [ devmode' nixos-render-docs-redirects' + markdown-code-runner ]; }; - tests.manpage-urls = callPackage ../tests/manpage-urls.nix { }; + tests = { + manpage-urls = callPackage ../tests/manpage-urls.nix { }; + check-nix-code-blocks = callPackage ../tests/check-nix-code-blocks.nix { }; + }; }; } ) diff --git a/doc/functions/generators.section.md b/doc/functions/generators.section.md index 9d71a0240108..0b073c641e53 100644 --- a/doc/functions/generators.section.md +++ b/doc/functions/generators.section.md @@ -13,17 +13,23 @@ let # specifies how to format a key/value pair mkKeyValue = generators.mkKeyValueDefault { # specifies the generated string for a subset of nix values - mkValueString = v: - if v == true then ''"yes"'' - else if v == false then ''"no"'' - else if isString v then ''"${v}"'' + mkValueString = + v: + if v == true then + ''"yes"'' + else if v == false then + ''"no"'' + else if isString v then + ''"${v}"'' # and delegates all other values to the default generator - else generators.mkValueStringDefault {} v; + else + generators.mkValueStringDefault { } v; } ":"; }; +in # the INI file can now be given as plain old nix values -in customToINI { +customToINI { main = { pushinfo = true; autopush = false; diff --git a/doc/functions/nix-gitignore.section.md b/doc/functions/nix-gitignore.section.md index 8532ab68ac04..416b5435fa58 100644 --- a/doc/functions/nix-gitignore.section.md +++ b/doc/functions/nix-gitignore.section.md @@ -7,20 +7,23 @@ `pkgs.nix-gitignore` exports a number of functions, but you'll most likely need either `gitignoreSource` or `gitignoreSourcePure`. As their first argument, they both accept either 1. a file with gitignore lines or 2. a string with gitignore lines, or 3. a list of either of the two. They will be concatenated into a single big string. ```nix -{ pkgs ? import {} }: { +{ + pkgs ? import { }, +}: +{ - src = nix-gitignore.gitignoreSource [] ./source; - # Simplest version + src = nix-gitignore.gitignoreSource [ ] ./source; + # Simplest version - src = nix-gitignore.gitignoreSource "supplemental-ignores\n" ./source; - # This one reads the ./source/.gitignore and concats the auxiliary ignores + src = nix-gitignore.gitignoreSource "supplemental-ignores\n" ./source; + # This one reads the ./source/.gitignore and concats the auxiliary ignores - src = nix-gitignore.gitignoreSourcePure "ignore-this\nignore-that\n" ./source; - # Use this string as gitignore, don't read ./source/.gitignore. + src = nix-gitignore.gitignoreSourcePure "ignore-this\nignore-that\n" ./source; + # Use this string as gitignore, don't read ./source/.gitignore. - src = nix-gitignore.gitignoreSourcePure ["ignore-this\nignore-that\n" ~/.gitignore] ./source; - # It also accepts a list (of strings and paths) that will be concatenated - # once the paths are turned to strings via readFile. + src = nix-gitignore.gitignoreSourcePure [ "ignore-this\nignore-that\n" ~/.gitignore ] ./source; + # It also accepts a list (of strings and paths) that will be concatenated + # once the paths are turned to strings via readFile. } ``` diff --git a/doc/functions/prefer-remote-fetch.section.md b/doc/functions/prefer-remote-fetch.section.md index 8760c100224a..b3d4a84eb4fd 100644 --- a/doc/functions/prefer-remote-fetch.section.md +++ b/doc/functions/prefer-remote-fetch.section.md @@ -3,8 +3,7 @@ `prefer-remote-fetch` is an overlay that download sources on remote builder. This is useful when the evaluating machine has a slow upload while the builder can fetch faster directly from the source. To use it, put the following snippet as a new overlay: ```nix -self: super: - (super.prefer-remote-fetch self super) +self: super: (super.prefer-remote-fetch self super) ``` A full configuration example for that sets the overlay up for your own account, could look like this diff --git a/doc/hooks/autopatchcil.section.md b/doc/hooks/autopatchcil.section.md new file mode 100644 index 000000000000..f7ed8cb6835f --- /dev/null +++ b/doc/hooks/autopatchcil.section.md @@ -0,0 +1,17 @@ +# autoPatchcilHook {#setup-hook-autopatchcilhook} + +This is a special setup hook which helps in packaging .NET assemblies/programs in that it automatically tries to find missing shared library dependencies of .NET assemblies based on the given `buildInputs` and `nativeBuildInputs`. + +As the hook needs information for the host where the package will be run on, there's a required environment variable called `autoPatchcilRuntimeId` which should be filled in with the RID (Runtime Identifier) of the machine where the output will be run on. If you're using `buildDotnetModule`, it will fall back to `dotnetRuntimeIds` (which is set to `lib.singleton (if runtimeId != null then runtimeId else systemToDotnetRid stdenvNoCC.hostPlatform.system)`) for you if not provided. + +In certain situations you may want to run the main command (`autoPatchcil`) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the `dontAutoPatchcil` environment variable to a non-empty value. + +By default, `autoPatchcil` will fail as soon as any .NET assembly requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the `autoPatchcilIgnoreMissingDeps` environment variable to a non-empty value. `autoPatchcilIgnoreMissingDeps` can be set to a list like `autoPatchcilIgnoreMissingDeps = [ "libcuda.so.1" "libcudart.so.1" ];` or to `[ "*" ]` to ignore all missing dependencies. + +The `autoPatchcil` command requires the `--rid` command line flag, informing the RID (Runtime Identifier) it should assume the assemblies will be executed on, and also recognizes a `--no-recurse` command line flag, which prevents it from recursing into subdirectories. + +::: {.note} +Since, unlike most native binaries, .NET assemblies are compiled once to run on any platform, many assemblies may have PInvoke stubs for libraries that might not be available on the platform that the package will effectively run on. A few examples are assemblies that call native Windows APIs through PInvoke targeting `kernel32`, `gdi32`, `user32`, `shell32` or `ntdll`. + +`autoPatchcil` does its best to ignore dependencies from other platforms by checking the requested file extensions, however not all PInvoke stubs provide an extension so in those cases it will be necessary to list those in `autoPatchcilIgnoreMissingDeps` manually. +::: diff --git a/doc/hooks/index.md b/doc/hooks/index.md index e4b744056c5e..574b7eea8de3 100644 --- a/doc/hooks/index.md +++ b/doc/hooks/index.md @@ -7,6 +7,7 @@ The stdenv built-in hooks are documented in [](#ssec-setup-hooks). ```{=include=} sections autoconf.section.md automake.section.md +autopatchcil.section.md autopatchelf.section.md aws-c-common.section.md bmake.section.md diff --git a/doc/hooks/memcached-test-hook.section.md b/doc/hooks/memcached-test-hook.section.md index 6820cec20a1c..03fc91ab4bf0 100644 --- a/doc/hooks/memcached-test-hook.section.md +++ b/doc/hooks/memcached-test-hook.section.md @@ -20,13 +20,15 @@ stdenv.mkDerivation { If you use a custom `checkPhase`, remember to add the `runHook` calls: ```nix - checkPhase '' +{ + checkPhase = '' runHook preCheck # ... your tests runHook postCheck - '' + ''; +} ``` ## Variables {#sec-memcachedTestHook-variables} @@ -48,6 +50,6 @@ stdenv.mkDerivation { ]; preCheck = '' - memcachedTestPort=1234 - '' + memcachedTestPort=1234; + ''; } diff --git a/doc/hooks/mpi-check-hook.section.md b/doc/hooks/mpi-check-hook.section.md index c182c4cc6195..299069fc89ba 100644 --- a/doc/hooks/mpi-check-hook.section.md +++ b/doc/hooks/mpi-check-hook.section.md @@ -11,15 +11,15 @@ the neceesary environment variables to use Example: ```nix - { mpiCheckPhaseHook, mpi, ... }: - { - # ... +{ mpiCheckPhaseHook, mpi, ... }: +{ + # ... - nativeCheckInputs = [ - openssh - mpiCheckPhaseHook - ]; - } + nativeCheckInputs = [ + openssh + mpiCheckPhaseHook + ]; +} ``` diff --git a/doc/hooks/patch-rc-path-hooks.section.md b/doc/hooks/patch-rc-path-hooks.section.md index 5c870dc782c2..080a03da72d6 100644 --- a/doc/hooks/patch-rc-path-hooks.section.md +++ b/doc/hooks/patch-rc-path-hooks.section.md @@ -29,7 +29,11 @@ Given a package `foo` containing an init script `this-foo.fish` that depends on patch the init script for users to source without having the above dependencies in their `PATH`: ```nix -{ lib, stdenv, patchRcPathFish}: +{ + lib, + stdenv, + patchRcPathFish, +}: stdenv.mkDerivation { # ... @@ -39,7 +43,13 @@ stdenv.mkDerivation { ]; postFixup = '' - patchRcPathFish $out/bin/this-foo.fish ${lib.makeBinPath [ coreutils man which ]} + patchRcPathFish $out/bin/this-foo.fish ${ + lib.makeBinPath [ + coreutils + man + which + ] + } ''; } ``` diff --git a/doc/hooks/postgresql-test-hook.section.md b/doc/hooks/postgresql-test-hook.section.md index 59d7f7a644c9..8b3cc5f03f3e 100644 --- a/doc/hooks/postgresql-test-hook.section.md +++ b/doc/hooks/postgresql-test-hook.section.md @@ -4,7 +4,11 @@ This hook starts a PostgreSQL server during the `checkPhase`. Example: ```nix -{ stdenv, postgresql, postgresqlTestHook }: +{ + stdenv, + postgresql, + postgresqlTestHook, +}: stdenv.mkDerivation { # ... @@ -18,13 +22,13 @@ stdenv.mkDerivation { If you use a custom `checkPhase`, remember to add the `runHook` calls: ```nix - checkPhase '' - runHook preCheck +checkPhase '' + runHook preCheck - # ... your tests + # ... your tests - runHook postCheck - '' + runHook postCheck +'' ``` ## Variables {#sec-postgresqlTestHook-variables} diff --git a/doc/hooks/redis-test-hook.section.md b/doc/hooks/redis-test-hook.section.md index b14d29801a0e..7971b29fa10a 100644 --- a/doc/hooks/redis-test-hook.section.md +++ b/doc/hooks/redis-test-hook.section.md @@ -7,7 +7,7 @@ This hook starts a Redis server during `checkPhase`. Example: { stdenv, redis, - redisTestHook + redisTestHook, }: stdenv.mkDerivation { @@ -21,13 +21,15 @@ stdenv.mkDerivation { If you use a custom `checkPhase`, remember to add the `runHook` calls: ```nix - checkPhase '' +{ + checkPhase = '' runHook preCheck # ... your tests runHook postCheck - '' + ''; +} ``` ## Variables {#sec-redisTestHook-variables} @@ -45,7 +47,11 @@ Bash-only variables: Example usage: ```nix -{ stdenv, redis, redisTestHook }: +{ + stdenv, + redis, + redisTestHook, +}: stdenv.mkDerivation { # ... @@ -55,6 +61,7 @@ stdenv.mkDerivation { ]; preCheck = '' - redisTestPort=6390 - '' + redisTestPort=6390; + ''; } +``` diff --git a/doc/hooks/tauri.section.md b/doc/hooks/tauri.section.md index 400e493d7fee..b46b738d5c88 100644 --- a/doc/hooks/tauri.section.md +++ b/doc/hooks/tauri.section.md @@ -23,15 +23,15 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases. wrapGAppsHook4, }: -rustPlatform.buildRustPackage rec { - # . . . +rustPlatform.buildRustPackage (finalAttrs: { + # ... useFetchCargoVendor = true; cargoHash = "..."; # Assuming our app's frontend uses `npm` as a package manager npmDeps = fetchNpmDeps { - name = "${pname}-npm-deps-${version}"; + name = "${finalAttrs.pname}-npm-deps-${finalAttrs.version}"; inherit src; hash = "..."; }; @@ -61,8 +61,8 @@ rustPlatform.buildRustPackage rec { # And make sure we build there too buildAndTestSubdir = cargoRoot; - # . . . -} + # ... +}) ``` ## Variables controlling cargo-tauri {#tauri-hook-variables-controlling} diff --git a/doc/hooks/versionCheckHook.section.md b/doc/hooks/versionCheckHook.section.md index 6c45b37cd17b..16b1ee97e890 100644 --- a/doc/hooks/versionCheckHook.section.md +++ b/doc/hooks/versionCheckHook.section.md @@ -9,7 +9,7 @@ You use it like this: lib, stdenv, versionCheckHook, - # ... +# ... }: stdenv.mkDerivation (finalAttrs: { diff --git a/doc/hooks/zig.section.md b/doc/hooks/zig.section.md index 8bef293769e5..1c52e9827b41 100644 --- a/doc/hooks/zig.section.md +++ b/doc/hooks/zig.section.md @@ -7,9 +7,10 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases. ## Example code snippet {#zig-hook-example-code-snippet} ```nix -{ lib -, stdenv -, zig +{ + lib, + stdenv, + zig, }: stdenv.mkDerivation { diff --git a/doc/interoperability/cyclonedx.md b/doc/interoperability/cyclonedx.md index 7a3dea3dbc2f..3c141b86d9f9 100644 --- a/doc/interoperability/cyclonedx.md +++ b/doc/interoperability/cyclonedx.md @@ -63,17 +63,27 @@ For example, the `fetchFromGitHub` is commonly used within Nixpkgs but should be `nix:fod` properties may be extracted and evaluated to a derivation using code similar to the following, assuming a fictitious function `filterPropertiesToAttrs`: ```nix -{ pkgs, filterPropertiesToAttrs, properties }: +{ + pkgs, + filterPropertiesToAttrs, + properties, +}: let fodProps = filterPropertiesToAttrs "nix:fod:" properties; methods = { fetchzip = - { name, url, sha256, ... }: + { + name, + url, + sha256, + ... + }: pkgs.fetchzip { inherit name url sha256; }; }; -in methods.${fodProps.method} fodProps +in +methods.${fodProps.method} fodProps ``` diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index 33fffc60c8db..6b9e577f8119 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/doc/languages-frameworks/agda.section.md @@ -48,7 +48,7 @@ You can also reference a GitHub repository agda.withPackages (p: [ (p.standard-library.overrideAttrs (oldAttrs: { version = "1.5"; - src = fetchFromGitHub { + src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v1.5"; @@ -114,7 +114,9 @@ This can be overridden by a different version of `ghc` as follows: ```nix agda.withPackages { - pkgs = [ /* ... */ ]; + pkgs = [ + # ... + ]; ghc = haskell.compiler.ghcHEAD; } ``` @@ -132,8 +134,10 @@ A derivation can then be written using `agdaPackages.mkDerivation`. This has sim Here is an example `default.nix` ```nix -{ nixpkgs ? }: -with (import nixpkgs {}); +{ + nixpkgs ? , +}: +with (import nixpkgs { }); agdaPackages.mkDerivation { version = "1.0"; pname = "my-agda-lib"; @@ -179,8 +183,12 @@ the Agda package set is small and can (still) be maintained by hand. To add an Agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other Agda libraries, so the top line of the `default.nix` can look like: ```nix -{ mkDerivation, standard-library, fetchFromGitHub }: -{} +{ + mkDerivation, + standard-library, + fetchFromGitHub, +}: +{ } ``` Note that the derivation function is called with `mkDerivation` set to `agdaPackages.mkDerivation`, therefore you @@ -200,8 +208,12 @@ mkDerivation { libraryName = "IAL-1.3"; buildPhase = '' + runHook preBuild + patchShebangs find-deps.sh make + + runHook postBuild ''; } ``` diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md index b640ba8d5011..f970776a9b8d 100644 --- a/doc/languages-frameworks/android.section.md +++ b/doc/languages-frameworks/android.section.md @@ -8,23 +8,31 @@ supporting features. Use the `android-studio-full` attribute for a very complete Android SDK, including system images: ```nix -buildInputs = [ android-studio-full ]; +{ + buildInputs = [ android-studio-full ]; +} ``` This is identical to: ```nix -buildInputs = [ androidStudioPackages.stable.full ]; +{ + buildInputs = [ androidStudioPackages.stable.full ]; +} ``` Alternatively, you can pass composeAndroidPackages to the `withSdk` passthru: ```nix -buildInputs = [ - (android-studio.withSdk (androidenv.composeAndroidPackages { - includeNDK = true; - }).androidsdk) -]; +{ + buildInputs = [ + (android-studio.withSdk + (androidenv.composeAndroidPackages { + includeNDK = true; + }).androidsdk + ) + ]; +} ``` These will export `ANDROID_SDK_ROOT` and `ANDROID_NDK_ROOT` to the SDK and NDK directories @@ -35,13 +43,19 @@ in the specified Android build environment. Alternatively, you can deploy the SDK separately with a desired set of plugins, or subsets of an SDK. ```nix -with import {}; +with import { }; let androidComposition = androidenv.composeAndroidPackages { - platformVersions = [ "34" "35" ]; + platformVersions = [ + "34" + "35" + ]; systemImageTypes = [ "google_apis_playstore" ]; - abiVersions = [ "armeabi-v7a" "arm64-v8a" ]; + abiVersions = [ + "armeabi-v7a" + "arm64-v8a" + ]; includeNDK = true; includeExtras = [ "extras;google;auto" @@ -165,7 +179,7 @@ We can also deploy subsets of the Android SDK. For example, to only the `platform-tools` package, you can evaluate the following expression: ```nix -with import {}; +with import { }; let androidComposition = androidenv.composeAndroidPackages { @@ -183,7 +197,7 @@ to use a predefined composition that contains a fairly complete set of Android p The following Nix expression can be used to deploy the entire SDK: ```nix -with import {}; +with import { }; androidenv.androidPkgs.androidsdk ``` @@ -191,7 +205,7 @@ androidenv.androidPkgs.androidsdk It is also possible to use one plugin only: ```nix -with import {}; +with import { }; androidenv.androidPkgs.platform-tools ``` @@ -205,7 +219,7 @@ An emulator spawn script can be configured by invoking the `emulateApp {}` function: ```nix -with import {}; +with import { }; androidenv.emulateApp { name = "emulate-MyAndroidApp"; @@ -221,7 +235,7 @@ It is also possible to specify an APK to deploy inside the emulator and the package and activity names to launch it: ```nix -with import {}; +with import { }; androidenv.emulateApp { name = "emulate-MyAndroidApp"; @@ -344,7 +358,7 @@ requires. Most newer Android projects use Gradle, and this is included for histo purposes. ```nix -with import {}; +with import { }; androidenv.buildApp { name = "MyAndroidApp"; diff --git a/doc/languages-frameworks/astal.section.md b/doc/languages-frameworks/astal.section.md index 34022b9c5850..9b2d59a1c009 100644 --- a/doc/languages-frameworks/astal.section.md +++ b/doc/languages-frameworks/astal.section.md @@ -11,7 +11,9 @@ ags.bundle { pname = "hyprpanel"; version = "1.0.0"; - src = fetchFromGitHub { ... }; + src = fetchFromGitHub { + #... + }; # change your entry file (default is `app.ts`) entry = "app.ts"; @@ -32,7 +34,9 @@ ags.bundle { # GTK 4 support is opt-in enableGtk4 = true; - meta = { ... }; + meta = { + #... + }; } ``` diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 6c88278def19..dc3e55335cb8 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -60,7 +60,10 @@ $ nix-shell -p beamPackages.rebar3 ```nix let - pkgs = import { config = {}; overlays = []; }; + pkgs = import { + config = { }; + overlays = [ ]; + }; in pkgs.mkShell { packages = [ pkgs.beamPackages.rebar3 ]; @@ -120,26 +123,28 @@ If there are git dependencies. { mixNixDeps = import ./mix.nix { inherit beamPackages lib; - overrides = (final: prev: { - # mix2nix does not support git dependencies yet, - # so we need to add them manually - prometheus_ex = beamPackages.buildMix rec { - name = "prometheus_ex"; - version = "3.0.5"; + overrides = ( + final: prev: { + # mix2nix does not support git dependencies yet, + # so we need to add them manually + prometheus_ex = beamPackages.buildMix rec { + name = "prometheus_ex"; + version = "3.0.5"; - # Change the argument src with the git src that you actually need - src = fetchFromGitLab { - domain = "git.pleroma.social"; - group = "pleroma"; - owner = "elixir-libraries"; - repo = "prometheus.ex"; - rev = "a4e9beb3c1c479d14b352fd9d6dd7b1f6d7deee5"; - hash = "sha256-U17LlN6aGUKUFnT4XyYXppRN+TvUBIBRHEUsfeIiGOw="; + # Change the argument src with the git src that you actually need + src = fetchFromGitLab { + domain = "git.pleroma.social"; + group = "pleroma"; + owner = "elixir-libraries"; + repo = "prometheus.ex"; + rev = "a4e9beb3c1c479d14b352fd9d6dd7b1f6d7deee5"; + hash = "sha256-U17LlN6aGUKUFnT4XyYXppRN+TvUBIBRHEUsfeIiGOw="; + }; + # you can re-use the same beamDeps argument as generated + beamDeps = with final; [ prometheus ]; }; - # you can re-use the same beamDeps argument as generated - beamDeps = with final; [ prometheus ]; - }; - }); + } + ); }; } ``` @@ -195,15 +200,21 @@ let hash = lib.fakeHash; mixEnv = ""; # default is "prod", when empty includes all dependencies, such as "dev", "test". # if you have build time environment variables add them here - MY_ENV_VAR="my_value"; + MY_ENV_VAR = "my_value"; }; nodeDependencies = (pkgs.callPackage ./assets/default.nix { }).shell.nodeDependencies; -in packages.mixRelease { - inherit src pname version mixFodDeps; +in +packages.mixRelease { + inherit + src + pname + version + mixFodDeps + ; # if you have build time environment variables add them here - MY_ENV_VAR="my_value"; + MY_ENV_VAR = "my_value"; postBuild = '' ln -sf ${nodeDependencies}/lib/node_modules assets/node_modules @@ -231,7 +242,12 @@ In order to create a service with your release, you could add a `service.nix` in your project with the following ```nix -{config, pkgs, lib, ...}: +{ + config, + pkgs, + lib, + ... +}: let release = pkgs.callPackage ./default.nix; @@ -241,10 +257,16 @@ in { systemd.services.${release_name} = { wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "postgresql.service" ]; + after = [ + "network.target" + "postgresql.service" + ]; # note that if you are connecting to a postgres instance on a different host # postgresql.service should not be included in the requires. - requires = [ "network-online.target" "postgresql.service" ]; + requires = [ + "network-online.target" + "postgresql.service" + ]; description = "my app"; environment = { # RELEASE_TMP is used to write the state of the @@ -292,7 +314,9 @@ in Usually, we need to create a `shell.nix` file and do our development inside of the environment specified therein. Just install your version of Erlang and any other interpreters, and then use your normal build tools. As an example with Elixir: ```nix -{ pkgs ? import {} }: +{ + pkgs ? import { }, +}: with pkgs; let @@ -311,12 +335,14 @@ If you need to use an overlay to change some attributes of a derivation, e.g. if ```nix let - elixir_1_18_1_overlay = (self: super: { + elixir_1_18_1_overlay = ( + self: super: { elixir_1_18 = super.elixir_1_18.override { version = "1.18.1"; sha256 = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; }; - }); + } + ); pkgs = import { overlays = [ elixir_1_18_1_overlay ]; }; in with pkgs; @@ -349,9 +375,9 @@ let nodePackages.prettier ]; - inputs = basePackages ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ] - ++ lib.optionals stdenv.hostPlatform.isDarwin - (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices ]); + inputs = + basePackages + ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]; # define shell startup command hooks = '' @@ -380,7 +406,8 @@ let export ENV_VAR="your_env_var" ''; -in mkShell { +in +mkShell { buildInputs = inputs; shellHook = hooks; } diff --git a/doc/languages-frameworks/bower.section.md b/doc/languages-frameworks/bower.section.md index 346852c49426..3783773e2bf2 100644 --- a/doc/languages-frameworks/bower.section.md +++ b/doc/languages-frameworks/bower.section.md @@ -24,11 +24,15 @@ Running `bower2nix` will produce something like the following output: ```nix { fetchbower, buildEnv }: -buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "angular" "1.5.3" "~1.5.0" "1749xb0firxdra4rzadm4q9x90v6pzkbd7xmcyjk6qfza09ykk9y") - (fetchbower "bootstrap" "3.3.6" "~3.3.6" "1vvqlpbfcy0k5pncfjaiskj3y6scwifxygfqnw393sjfxiviwmbv") - (fetchbower "jquery" "2.2.2" "1.9.1 - 2" "10sp5h98sqwk90y4k6hbdviwqzvzwqf47r3r51pakch5ii2y7js1") -]; } +buildEnv { + name = "bower-env"; + ignoreCollisions = true; + paths = [ + (fetchbower "angular" "1.5.3" "~1.5.0" "1749xb0firxdra4rzadm4q9x90v6pzkbd7xmcyjk6qfza09ykk9y") + (fetchbower "bootstrap" "3.3.6" "~3.3.6" "1vvqlpbfcy0k5pncfjaiskj3y6scwifxygfqnw393sjfxiviwmbv") + (fetchbower "jquery" "2.2.2" "1.9.1 - 2" "10sp5h98sqwk90y4k6hbdviwqzvzwqf47r3r51pakch5ii2y7js1") + ]; +} ``` Using the `bower2nix` command line arguments, the output can be redirected to a file. A name like `bower-packages.nix` would be fine. @@ -80,8 +84,12 @@ gulp.task('build', [], function () { ### Example Full example — default.nix {#ex-buildBowerComponentsDefaultNix} ```nix -{ myWebApp ? { outPath = ./.; name = "myWebApp"; } -, pkgs ? import {} +{ + myWebApp ? { + outPath = ./.; + name = "myWebApp"; + }, + pkgs ? import { }, }: pkgs.stdenv.mkDerivation { @@ -90,16 +98,24 @@ pkgs.stdenv.mkDerivation { buildInputs = [ pkgs.nodePackages.gulp ]; - bowerComponents = pkgs.buildBowerComponents { # note 1 + bowerComponents = pkgs.buildBowerComponents { + # note 1 name = "my-web-app"; generated = ./bower-packages.nix; src = myWebApp; }; + nativeBuildInputs = [ + writableTmpDirAsHomeHook # note 3 + ]; + buildPhase = '' + runHook preBuild + cp --reflink=auto --no-preserve=mode -R $bowerComponents/bower_components . # note 2 - export HOME=$PWD # note 3 ${pkgs.nodePackages.gulp}/bin/gulp build # note 4 + + runHook postBuild ''; installPhase = "mv gulpdist $out"; diff --git a/doc/languages-frameworks/chicken.section.md b/doc/languages-frameworks/chicken.section.md index d1e12e2cccbc..78a4469a8e1d 100644 --- a/doc/languages-frameworks/chicken.section.md +++ b/doc/languages-frameworks/chicken.section.md @@ -60,19 +60,23 @@ all the other eggs: ```nix let - myChickenPackages = pkgs.chickenPackages.overrideScope (self: super: { + myChickenPackages = pkgs.chickenPackages.overrideScope ( + self: super: { # The chicken package itself can be overridden to effect the whole ecosystem. # chicken = super.chicken.overrideAttrs { # src = ... # }; - chickenEggs = super.chickenEggs.overrideScope (eggself: eggsuper: { - srfi-180 = eggsuper.srfi-180.overrideAttrs { - # path to a local copy of srfi-180 - src = <...>; - }; - }); - }); + chickenEggs = super.chickenEggs.overrideScope ( + eggself: eggsuper: { + srfi-180 = eggsuper.srfi-180.overrideAttrs { + # path to a local copy of srfi-180 + src = <...>; + }; + } + ); + } + ); in # Here, `myChickenPackages.chickenEggs.json-rpc`, which depends on `srfi-180` will use # the local copy of `srfi-180`. diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md index ca983eec4f0d..c08ed2bc6f43 100644 --- a/doc/languages-frameworks/coq.section.md +++ b/doc/languages-frameworks/coq.section.md @@ -54,35 +54,78 @@ It also takes other standard `mkDerivation` attributes, they are added as such, Here is a simple package example. It is a pure Coq library, thus it depends on Coq. It builds on the Mathematical Components library, thus it also takes some `mathcomp` derivations as `extraBuildInputs`. ```nix -{ lib, mkCoqDerivation, version ? null -, coq, mathcomp, mathcomp-finmap, mathcomp-bigenough }: +{ + lib, + mkCoqDerivation, + version ? null, + coq, + mathcomp, + mathcomp-finmap, + mathcomp-bigenough, +}: mkCoqDerivation { - /* namePrefix leads to e.g. `name = coq8.11-mathcomp1.11-multinomials-1.5.2` */ - namePrefix = [ "coq" "mathcomp" ]; + # namePrefix leads to e.g. `name = coq8.11-mathcomp1.11-multinomials-1.5.2` + namePrefix = [ + "coq" + "mathcomp" + ]; pname = "multinomials"; owner = "math-comp"; inherit version; - defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.7" "8.12") (isEq "1.11") ]; out = "1.5.2"; } - { cases = [ (range "8.7" "8.11") (range "1.8" "1.10") ]; out = "1.5.0"; } - { cases = [ (range "8.7" "8.10") (range "1.8" "1.10") ]; out = "1.4"; } - { cases = [ (isEq "8.6") (range "1.6" "1.7") ]; out = "1.1"; } - ] null; + defaultVersion = + with lib.versions; + lib.switch + [ coq.version mathcomp.version ] + [ + { + cases = [ + (range "8.7" "8.12") + (isEq "1.11") + ]; + out = "1.5.2"; + } + { + cases = [ + (range "8.7" "8.11") + (range "1.8" "1.10") + ]; + out = "1.5.0"; + } + { + cases = [ + (range "8.7" "8.10") + (range "1.8" "1.10") + ]; + out = "1.4"; + } + { + cases = [ + (isEq "8.6") + (range "1.6" "1.7") + ]; + out = "1.1"; + } + ] + null; release = { "1.5.2".hash = "sha256-mjCx9XKa38Nz9E6wNK7YSqHdJ7YTua5fD3d6J4e7WpU="; "1.5.1".hash = "sha256-Q8tm0y2FQAt2V1kZYkDlHWRia/lTvXAMVjdmzEV11I4="; "1.5.0".hash = "sha256-HIK0f21G69oEW8JG46gSBde/Q2LR3GiBCv680gHbmRg="; - "1.5.0".rev = "1.5"; - "1.4".hash = "sha256-F9g3MSIr3B6UZ3p8QWjz3/Jpw9sudJ+KRlvjiHSO024="; - "1.3".hash = "sha256-BPJTlAL0ETHvLMBslE0KFVt3DNoaGuMrHt2SBGyJe1A="; - "1.2".hash = "sha256-mHXBXSLYO4BN+jfN50y/+XCx0Qq5g4Ac2Y/qlsbgAdY="; - "1.1".hash = "sha256-ejAsMQbB/LtU9j+g160VdGXULrCe9s0gBWzyhKqmCuE="; - "1.0".hash = "sha256-tZTOltEBBKWciDxDMs/Ye4Jnq/33CANrHJ4FBMPtq+I="; + "1.5.0".rev = "1.5"; + "1.4".hash = "sha256-F9g3MSIr3B6UZ3p8QWjz3/Jpw9sudJ+KRlvjiHSO024="; + "1.3".hash = "sha256-BPJTlAL0ETHvLMBslE0KFVt3DNoaGuMrHt2SBGyJe1A="; + "1.2".hash = "sha256-mHXBXSLYO4BN+jfN50y/+XCx0Qq5g4Ac2Y/qlsbgAdY="; + "1.1".hash = "sha256-ejAsMQbB/LtU9j+g160VdGXULrCe9s0gBWzyhKqmCuE="; + "1.0".hash = "sha256-tZTOltEBBKWciDxDMs/Ye4Jnq/33CANrHJ4FBMPtq+I="; }; - propagatedBuildInputs = - [ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp-bigenough ]; + propagatedBuildInputs = [ + mathcomp.ssreflect + mathcomp.algebra + mathcomp-finmap + mathcomp-bigenough + ]; meta = { description = "Coq/SSReflect Library for Monoidal Rings and Multinomials"; @@ -124,12 +167,10 @@ The `overrideCoqDerivation` function lets you easily change arguments to `mkCoqD For example, here is how you could locally add a new release of the `multinomials` library, and set the `defaultVersion` to use this release: ```nix -coqPackages.lib.overrideCoqDerivation - { - defaultVersion = "2.0"; - release."2.0".hash = "sha256-czoP11rtrIM7+OLdMisv2EF7n/IbGuwFxHiPtg3qCNM="; - } - coqPackages.multinomials +coqPackages.lib.overrideCoqDerivation { + defaultVersion = "2.0"; + release."2.0".hash = "sha256-czoP11rtrIM7+OLdMisv2EF7n/IbGuwFxHiPtg3qCNM="; +} coqPackages.multinomials ``` ### `.overrideAttrs` {#coq-overrideAttrs} @@ -140,8 +181,10 @@ For instance, here is how you could add some code to be performed in the derivat ```nix coqPackages.multinomials.overrideAttrs (oldAttrs: { - postInstall = oldAttrs.postInstall or "" + '' - echo "you can do anything you want here" - ''; + postInstall = + oldAttrs.postInstall or "" + + '' + echo "you can do anything you want here" + ''; }) ``` diff --git a/doc/languages-frameworks/crystal.section.md b/doc/languages-frameworks/crystal.section.md index 9953f357048a..5ea70319dd49 100644 --- a/doc/languages-frameworks/crystal.section.md +++ b/doc/languages-frameworks/crystal.section.md @@ -18,7 +18,7 @@ This should have generated a `shards.nix` file. Next create a Nix file for your derivation and use `pkgs.crystal.buildCrystalPackage` as follows: ```nix -with import {}; +with import { }; crystal.buildCrystalPackage rec { pname = "mint"; version = "0.5.0"; @@ -51,14 +51,17 @@ Additionally you can override the default `crystal build` options (which are cur ```nix { - crystalBinaries.mint.options = [ "--release" "--verbose" ]; + crystalBinaries.mint.options = [ + "--release" + "--verbose" + ]; } ``` Depending on the project, you might need additional steps to get it to compile successfully. In Mint's case, we need to link against openssl, so in the end the Nix file looks as follows: ```nix -with import {}; +with import { }; crystal.buildCrystalPackage rec { version = "0.5.0"; pname = "mint"; diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md index bb394a243b79..091fc57a53a0 100644 --- a/doc/languages-frameworks/cuda.section.md +++ b/doc/languages-frameworks/cuda.section.md @@ -12,11 +12,13 @@ compatible are available as well. For example, there can be a To use one or more CUDA packages in an expression, give the expression a `cudaPackages` parameter, and in case CUDA is optional ```nix -{ config -, cudaSupport ? config.cudaSupport -, cudaPackages ? { } -, ... -}: {} +{ + config, + cudaSupport ? config.cudaSupport, + cudaPackages ? { }, + ... +}: +{ } ``` When using `callPackage`, you can choose to pass in a different variant, e.g. @@ -32,11 +34,15 @@ package set to make it the default. This guarantees you get a consistent package set. ```nix { - mypkg = let - cudaPackages = cudaPackages_11_5.overrideScope (final: prev: { - cudnn = prev.cudnn_8_3; - }); - in callPackage { inherit cudaPackages; }; + mypkg = + let + cudaPackages = cudaPackages_11_5.overrideScope ( + final: prev: { + cudnn = prev.cudnn_8_3; + } + ); + in + callPackage { inherit cudaPackages; }; } ``` diff --git a/doc/languages-frameworks/cuelang.section.md b/doc/languages-frameworks/cuelang.section.md index 70329b15fd7d..bbef29ee78a8 100644 --- a/doc/languages-frameworks/cuelang.section.md +++ b/doc/languages-frameworks/cuelang.section.md @@ -27,13 +27,11 @@ Nixpkgs provides a `pkgs.writeCueValidator` helper, which will write a validatio Here is an example: ```nix -pkgs.writeCueValidator - (pkgs.writeText "schema.cue" '' - #Def1: { - field1: string - } - '') - { document = "#Def1"; } +pkgs.writeCueValidator (pkgs.writeText "schema.cue" '' + #Def1: { + field1: string + } +'') { document = "#Def1"; } ``` - The first parameter is the Cue schema file. @@ -43,19 +41,19 @@ pkgs.writeCueValidator Another example, given the following `validator.nix` : ```nix -{ pkgs ? import {} }: +{ + pkgs ? import { }, +}: let - genericValidator = version: - pkgs.writeCueValidator - (pkgs.writeText "schema.cue" '' + genericValidator = + version: + pkgs.writeCueValidator (pkgs.writeText "schema.cue" '' #Version1: { field1: string } #Version2: #Version1 & { field1: "unused" - }'' - ) - { document = "#Version${toString version}"; }; + }'') { document = "#Version${toString version}"; }; in { validateV1 = genericValidator 1; diff --git a/doc/languages-frameworks/dart.section.md b/doc/languages-frameworks/dart.section.md index dfb456ba1941..32a9a0b6f653 100644 --- a/doc/languages-frameworks/dart.section.md +++ b/doc/languages-frameworks/dart.section.md @@ -30,7 +30,11 @@ The `dart` commands run can be overridden through `pubGetScript` and `dartCompil Dart supports multiple [outputs types](https://dart.dev/tools/dart-compile#types-of-output), you can choose between them using `dartOutputType` (defaults to `exe`). If you want to override the binaries path or the source path they come from, you can use `dartEntryPoints`. Outputs that require a runtime will automatically be wrapped with the relevant runtime (`dartaotruntime` for `aot-snapshot`, `dart run` for `jit-snapshot` and `kernel`, `node` for `js`), this can be overridden through `dartRuntimeCommand`. ```nix -{ lib, buildDartApplication, fetchFromGitHub }: +{ + lib, + buildDartApplication, + fetchFromGitHub, +}: buildDartApplication rec { pname = "dart-sass"; @@ -38,8 +42,8 @@ buildDartApplication rec { src = fetchFromGitHub { owner = "sass"; - repo = pname; - rev = version; + repo = "dart-sass"; + tag = version; hash = "sha256-U6enz8yJcc4Wf8m54eYIAnVg/jsGi247Wy8lp1r1wg4="; }; @@ -101,7 +105,7 @@ See the [Dart documentation](#ssec-dart-applications) for more details on requir `flutter` in Nixpkgs always points to `flutterPackages.stable`, which is the latest packaged version. To avoid unforeseen breakage during upgrade, packages in Nixpkgs should use a specific flutter version, such as `flutter319` and `flutter322`, instead of using `flutter` directly. ```nix -{ flutter322, fetchFromGitHub }: +{ flutter322, fetchFromGitHub }: flutter322.buildFlutterApplication { pname = "firmware-updater"; diff --git a/doc/languages-frameworks/dhall.section.md b/doc/languages-frameworks/dhall.section.md index 8d85c9f1daf7..469f1a4fe3d1 100644 --- a/doc/languages-frameworks/dhall.section.md +++ b/doc/languages-frameworks/dhall.section.md @@ -90,7 +90,7 @@ buildDhallPackage { let nixpkgs = builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/94b2848559b12a8ed1fe433084686b2a81123c99.tar.gz"; + url = "https://github.com/NixOS/nixpkgs/archive/94b2848559b12a8ed1fe433084686b2a81123c99.tar.gz"; hash = "sha256-B4Q3c6IvTLg3Q92qYa8y+i4uTaphtFdjp+Ir3QQjdN0="; }; @@ -100,15 +100,17 @@ let overlay = self: super: { dhallPackages = super.dhallPackages.override (old: { - overrides = - self.lib.composeExtensions (old.overrides or (_: _: {})) dhallOverlay; + overrides = self.lib.composeExtensions (old.overrides or (_: _: { })) dhallOverlay; }); }; - pkgs = import nixpkgs { config = {}; overlays = [ overlay ]; }; + pkgs = import nixpkgs { + config = { }; + overlays = [ overlay ]; + }; in - pkgs +pkgs ``` … which we can then build using this command: @@ -190,8 +192,7 @@ Dhall overlay like this: { dhallOverrides = self: super: { # Enable source for all Dhall packages - buildDhallPackage = - args: super.buildDhallPackage (args // { source = true; }); + buildDhallPackage = args: super.buildDhallPackage (args // { source = true; }); true = self.callPackage ./true.nix { }; }; diff --git a/doc/languages-frameworks/dlang.section.md b/doc/languages-frameworks/dlang.section.md index 6e9edefc5e0f..fa211dc6a43d 100644 --- a/doc/languages-frameworks/dlang.section.md +++ b/doc/languages-frameworks/dlang.section.md @@ -22,7 +22,7 @@ buildDubPackage rec { src = fetchFromGitHub { owner = "CyberShadow"; repo = "btdu"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-3sSZq+5UJH02IO0Y1yL3BLHDb4lk8k6awb5ZysBQciE="; }; diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 23e3be414573..ea3448542f5d 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -6,7 +6,7 @@ For local development, it's recommended to use nix-shell to create a dotnet envi ```nix # shell.nix -with import {}; +with import { }; mkShell { name = "dotnet-env"; @@ -21,15 +21,18 @@ mkShell { It's very likely that more than one sdk will be needed on a given project. Dotnet provides several different frameworks (E.g dotnetcore, aspnetcore, etc.) as well as many versions for a given framework. Normally, dotnet is able to fetch a framework and install it relative to the executable. However, this would mean writing to the nix store in nixpkgs, which is read-only. To support the many-sdk use case, one can compose an environment using `dotnetCorePackages.combinePackages`: ```nix -with import {}; +with import { }; mkShell { name = "dotnet-env"; packages = [ - (with dotnetCorePackages; combinePackages [ - sdk_8_0 - sdk_9_0 - ]) + ( + with dotnetCorePackages; + combinePackages [ + sdk_8_0 + sdk_9_0 + ] + ) ]; } ``` @@ -137,11 +140,19 @@ When packaging a new application, you need to fetch its dependencies. Create an Here is an example `default.nix`, using some of the previously discussed arguments: ```nix -{ lib, buildDotnetModule, dotnetCorePackages, ffmpeg }: +{ + lib, + buildDotnetModule, + dotnetCorePackages, + ffmpeg, +}: let - referencedProject = import ../../bar { /* ... */ }; -in buildDotnetModule rec { + referencedProject = import ../../bar { + # ... + }; +in +buildDotnetModule rec { pname = "someDotnetApplication"; version = "0.1"; @@ -156,7 +167,7 @@ in buildDotnetModule rec { dotnet-runtime = dotnetCorePackages.runtime_8_0; executables = [ "foo" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`. - executables = []; # Don't install any executables. + executables = [ ]; # Don't install any executables. packNupkg = true; # This packs the project as "foo-0.1.nupkg" at `$out/share`. diff --git a/doc/languages-frameworks/emscripten.section.md b/doc/languages-frameworks/emscripten.section.md index d1ed62d0503f..0fca82f70aed 100644 --- a/doc/languages-frameworks/emscripten.section.md +++ b/doc/languages-frameworks/emscripten.section.md @@ -41,56 +41,75 @@ One advantage is that when `pkgs.zlib` is updated, it will automatically update (pkgs.zlib.override { stdenv = pkgs.emscriptenStdenv; }).overrideAttrs -(old: rec { - buildInputs = old.buildInputs ++ [ pkg-config ]; - # we need to reset this setting! - env = (old.env or { }) // { NIX_CFLAGS_COMPILE = ""; }; - configurePhase = '' - # FIXME: Some tests require writing at $HOME - HOME=$TMPDIR - runHook preConfigure + (old: { + buildInputs = old.buildInputs ++ [ pkg-config ]; + # we need to reset this setting! + env = (old.env or { }) // { + NIX_CFLAGS_COMPILE = ""; + }; - #export EMCC_DEBUG=2 - emconfigure ./configure --prefix=$out --shared + configurePhase = '' + # FIXME: Some tests require writing at $HOME + HOME=$TMPDIR + runHook preConfigure - runHook postConfigure - ''; - dontStrip = true; - outputs = [ "out" ]; - buildPhase = '' - emmake make - ''; - installPhase = '' - emmake make install - ''; - checkPhase = '' - echo "================= testing zlib using node =================" + #export EMCC_DEBUG=2 + emconfigure ./configure --prefix=$out --shared - echo "Compiling a custom test" - set -x - emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \ - libz.so.${old.version} -I . -o example.js + runHook postConfigure + ''; - echo "Using node to execute the test" - ${pkgs.nodejs}/bin/node ./example.js + dontStrip = true; + outputs = [ "out" ]; - set +x - if [ $? -ne 0 ]; then - echo "test failed for some reason" - exit 1; - else - echo "it seems to work! very good." - fi - echo "================= /testing zlib using node =================" - ''; + buildPhase = '' + runHook preBuild - postPatch = pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin '' - substituteInPlace configure \ - --replace-fail '/usr/bin/libtool' 'ar' \ - --replace-fail 'AR="libtool"' 'AR="ar"' \ - --replace-fail 'ARFLAGS="-o"' 'ARFLAGS="-r"' - ''; -}) + emmake make + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + emmake make install + + runHook postInstall + ''; + + checkPhase = '' + runHook preCheck + + echo "================= testing zlib using node =================" + + echo "Compiling a custom test" + set -x + emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \ + libz.so.${old.version} -I . -o example.js + + echo "Using node to execute the test" + ${pkgs.nodejs}/bin/node ./example.js + + set +x + if [ $? -ne 0 ]; then + echo "test failed for some reason" + exit 1; + else + echo "it seems to work! very good." + fi + echo "================= /testing zlib using node =================" + + runHook postCheck + ''; + + postPatch = pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin '' + substituteInPlace configure \ + --replace-fail '/usr/bin/libtool' 'ar' \ + --replace-fail 'AR="libtool"' 'AR="ar"' \ + --replace-fail 'ARFLAGS="-o"' 'ARFLAGS="-r"' + ''; + }) ``` :::{.example #usage-2-pkgs.buildemscriptenpackage} @@ -100,11 +119,27 @@ One advantage is that when `pkgs.zlib` is updated, it will automatically update This `xmlmirror` example features an Emscripten package that is defined completely from this context and no `pkgs.zlib.override` is used. ```nix -pkgs.buildEmscriptenPackage rec { - name = "xmlmirror"; +pkgs.buildEmscriptenPackage { + pname = "xmlmirror"; + version = "1.2.3"; - buildInputs = [ pkg-config autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; - nativeBuildInputs = [ pkg-config zlib ]; + buildInputs = [ + pkg-config + autoconf + automake + libtool + gnumake + libxml2 + nodejs + openjdk + json_c + ]; + + nativeBuildInputs = [ + pkg-config + writableTmpDirAsHomeHook + zlib + ]; src = pkgs.fetchgit { url = "https://gitlab.com/odfplugfest/xmlmirror.git"; @@ -113,6 +148,8 @@ pkgs.buildEmscriptenPackage rec { }; configurePhase = '' + runHook preConfigure + rm -f fastXmlLint.js* # a fix for ERROR:root:For asm.js, TOTAL_MEMORY must be a multiple of 16MB, was 234217728 # https://gitlab.com/odfplugfest/xmlmirror/issues/8 @@ -122,16 +159,26 @@ pkgs.buildEmscriptenPackage rec { sed -e "s/\$(JSONC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(LIBXML20_LDFLAGS)/\$(JSONC_LDFLAGS) \$(LIBXML20_LDFLAGS) \$(ZLIB_LDFLAGS) /g" -i Makefile.emEnv # https://gitlab.com/odfplugfest/xmlmirror/issues/11 sed -e "s/-o fastXmlLint.js/-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' -o fastXmlLint.js/g" -i Makefile.emEnv + + runHook postConfigure ''; buildPhase = '' - HOME=$TMPDIR + runHook preBuild + make -f Makefile.emEnv + + runHook postBuild ''; - outputs = [ "out" "doc" ]; + outputs = [ + "out" + "doc" + ]; installPhase = '' + runHook preInstall + mkdir -p $out/share mkdir -p $doc/share/${name} @@ -145,9 +192,13 @@ pkgs.buildEmscriptenPackage rec { cp *.json $out/share cp *.rng $out/share cp README.md $doc/share/${name} + runHook postInstall ''; - checkPhase = '' + checkPhase = '' + runHook preCheck + + runHook postCheck ''; } ``` diff --git a/doc/languages-frameworks/factor.section.md b/doc/languages-frameworks/factor.section.md index 62db50e1ff6a..0d67eede4d34 100644 --- a/doc/languages-frameworks/factor.section.md +++ b/doc/languages-frameworks/factor.section.md @@ -125,7 +125,7 @@ factorPackages.buildFactorApplication (finalAttrs: { version = "1.0"; src = fetchurl { - url = "https://some-forge.org/foo-${finalAttrs.version}.tar.gz" + url = "https://some-forge.org/foo-${finalAttrs.version}.tar.gz"; }; }) ``` diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index 8374d55ac2f7..03b030fb7be5 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -96,7 +96,12 @@ Given the requirements above, the package expression would become messy quickly: --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \ --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ - --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" [ pango json-glib ]}" + --prefix GI_TYPELIB_PATH : "${ + lib.makeSearchPath "lib/girepository-1.0" [ + pango + json-glib + ] + }" done ''; } diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index 34bf913ef1e8..c23dba3d0cc1 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -13,14 +13,14 @@ The following is an example expression using `buildGoModule`: ```nix { - pet = buildGoModule rec { + pet = buildGoModule (finalAttrs: { pname = "pet"; version = "0.3.4"; src = fetchFromGitHub { owner = "knqyf263"; repo = "pet"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Gjw1dRrgM8D3G7v6WIM2+50r4HmTXvx0Xxme2fH9TlQ="; }; @@ -32,7 +32,7 @@ The following is an example expression using `buildGoModule`: license = lib.licenses.mit; maintainers = with lib.maintainers; [ kalbasit ]; }; - }; + }); } ``` diff --git a/doc/languages-frameworks/gradle.section.md b/doc/languages-frameworks/gradle.section.md index 762c8003a7a7..3d648ec0ae0b 100644 --- a/doc/languages-frameworks/gradle.section.md +++ b/doc/languages-frameworks/gradle.section.md @@ -21,7 +21,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ciKotTHSEcITfQYKFZ6sY2LZnXGChBJy0+eno8B3YHY="; }; - nativeBuildInputs = [ gradle makeWrapper ]; + nativeBuildInputs = [ + gradle + makeWrapper + ]; # if the package has dependencies, mitmCache must be set mitmCache = gradle.fetchDeps { @@ -72,11 +75,12 @@ The first is to add the derivation arguments required for getting the package. Using the pdftk example above: ```nix -{ lib -, stdenv -, gradle -# ... -, pdftk +{ + lib, + stdenv, + gradle, + # ... + pdftk, }: stdenv.mkDerivation (finalAttrs: { diff --git a/doc/languages-frameworks/hare.section.md b/doc/languages-frameworks/hare.section.md index 0ae8abeba45c..7dfa42311480 100644 --- a/doc/languages-frameworks/hare.section.md +++ b/doc/languages-frameworks/hare.section.md @@ -25,7 +25,8 @@ The following attributes are accepted by `hareHook`: hareHook, lib, stdenv, -}: stdenv.mkDerivation { +}: +stdenv.mkDerivation { pname = ""; version = ""; src = ""; diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 9ad32a3d20fb..3cc16936f3c4 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -58,7 +58,7 @@ Each of those compiler versions has a corresponding attribute set `packages` bui it. However, the non-standard package sets are not tested regularly and, as a result, contain fewer working packages. The corresponding package set for GHC 9.4.8 is `haskell.packages.ghc948`. In fact `haskellPackages` (at the time of writing) is just an alias -for `haskell.packages.ghc966`: +for `haskell.packages.ghc984`: Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`. @@ -297,8 +297,8 @@ Defaults to `false`. : Whether to build (HTML) documentation using [haddock][haddock]. Defaults to `true` if supported. -`testTarget` -: Name of the test suite to build and run. If unset, all test suites will be executed. +`testTargets` +: Names of the test suites to build and run. If unset, all test suites will be executed. `preCompileBuildDriver` : Shell code to run before compiling `Setup.hs`. @@ -487,7 +487,7 @@ so: ```nix let - pkgs = import {}; + pkgs = import { }; inherit (pkgs) haskell; inherit (haskell.lib.compose) overrideCabal; @@ -511,7 +511,7 @@ let previousIntermediates = turtle-full-build-with-incremental-output.intermediates; }) turtle; in - turtle-incremental-build +turtle-incremental-build ``` ## Development environments {#haskell-development-environments} @@ -590,7 +590,9 @@ that: ```nix # Retrieve nixpkgs impurely from NIX_PATH for now, you can pin it instead, of course. -{ pkgs ? import {} }: +{ + pkgs ? import { }, +}: # use the nixpkgs default haskell package set pkgs.haskellPackages.callPackage ./my-project.nix { } @@ -619,6 +621,12 @@ environment. This means you can reuse Nix expressions of packages included in nixpkgs, but also use local Nix expressions like this: `hpkgs: [ (hpkgs.callPackage ./my-project.nix { }) ]`. +`extraDependencies` +: Extra dependencies, in the form of cabal2nix build attributes. An example use +case is when you have Haskell scripts that use libraries that don't occur in +your packages' dependencies. Example: `hpkgs: {libraryHaskellDepends = +[ hpkgs.releaser ]}`. Defaults to `hpkgs: { }`. + `nativeBuildInputs` : Expects a list of derivations to add as build tools to the build environment. This is the place to add packages like `cabal-install`, `doctest` or `hlint`. @@ -654,7 +662,9 @@ Say our example above depends on `distribution-nixpkgs` and we have a project file set up for both, we can add the following `shell.nix` expression: ```nix -{ pkgs ? import {} }: +{ + pkgs ? import { }, +}: pkgs.haskellPackages.shellFor { packages = hpkgs: [ @@ -703,7 +713,12 @@ linked to work reliably. You can override the list of supported GHC versions with e.g. ```nix -pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "94" ]; } +pkgs.haskell-language-server.override { + supportedGhcVersions = [ + "90" + "94" + ]; +} ``` Where all strings `version` are allowed such that `haskell.packages.ghc${version}` is an existing package set. @@ -764,7 +779,7 @@ that depend on that library, you may want to use: ```nix haskellPackages.haskell-ci.overrideScope (self: super: { - Cabal = self.Cabal_3_14_1_0; + Cabal = self.Cabal_3_14_1_1; }) ``` @@ -886,11 +901,9 @@ for this to work. derivation: ```nix - pkgs.haskell.lib.overrideCabal - (pkgs.haskell.lib.justStaticExecutables my-haskell-package) - (drv: { - disallowGhcReference = false; - }) + pkgs.haskell.lib.overrideCabal (pkgs.haskell.lib.justStaticExecutables my-haskell-package) (drv: { + disallowGhcReference = false; + }) ``` Then use `strings` to determine which libraries are responsible: @@ -906,14 +919,12 @@ for this to work. Finally, use `remove-references-to` to delete those store paths from the produced output: ```nix - pkgs.haskell.lib.overrideCabal - (pkgs.haskell.lib.justStaticExecutables my-haskell-package) - (drv: { - postInstall = '' - ${drv.postInstall or ""} - remove-references-to -t ${pkgs.haskellPackages.hs-opentelemetry-sdk} - ''; - }) + pkgs.haskell.lib.overrideCabal (pkgs.haskell.lib.justStaticExecutables my-haskell-package) (drv: { + postInstall = '' + ${drv.postInstall or ""} + remove-references-to -t ${pkgs.haskellPackages.hs-opentelemetry-sdk} + ''; + }) ``` [164630]: https://github.com/NixOS/nixpkgs/issues/164630 @@ -1122,12 +1133,20 @@ Haskell packages using [import from derivation][import-from-derivation]. ```nix # cabal get mtl-2.2.1 && cd mtl-2.2.1 && cabal2nix . -{ mkDerivation, base, lib, transformers }: +{ + mkDerivation, + base, + lib, + transformers, +}: mkDerivation { pname = "mtl"; version = "2.2.1"; src = ./.; - libraryHaskellDepends = [ base transformers ]; + libraryHaskellDepends = [ + base + transformers + ]; homepage = "http://github.com/ekmett/mtl"; description = "Monad classes, using functional dependencies"; license = lib.licenses.bsd3; @@ -1274,60 +1293,69 @@ in # recommended to only use such an overlay if you are enabling profiling on a # platform that doesn't by default, because compiling GHC from scratch is # quite expensive. - (final: prev: - let - inherit (final) lib; - in + ( + final: prev: + let + inherit (final) lib; + in - { - haskell = prev.haskell // { - compiler = prev.haskell.compiler // { - ${ghcName} = prev.haskell.compiler.${ghcName}.override { - # Unfortunately, the GHC setting is named differently for historical reasons - enableProfiledLibs = enableProfiling; - }; - }; - }; - }) - - (final: prev: - let - inherit (final) lib; - haskellLib = final.haskell.lib.compose; - in - - { - haskell = prev.haskell // { - packages = prev.haskell.packages // { - ${ghcName} = prev.haskell.packages.${ghcName}.override { - overrides = hfinal: hprev: { - mkDerivation = args: hprev.mkDerivation (args // { - # Since we are forcing our ideas upon mkDerivation, this change will - # affect every package in the package set. - enableLibraryProfiling = enableProfiling; - - # To actually use profiling on an executable, executable profiling - # needs to be enabled for the executable you want to profile. You - # can either do this globally or… - enableExecutableProfiling = enableProfiling; - }); - - # …only for the package that contains an executable you want to profile. - # That saves on unnecessary rebuilds for packages that you only depend - # on for their library, but also contain executables (e.g. pandoc). - my-executable = haskellLib.enableExecutableProfiling hprev.my-executable; - - # If you are disabling profiling to save on build time, but want to - # retain the ability to substitute from the binary cache. Drop the - # override for mkDerivation above and instead have an override like - # this for the specific packages you are building locally and want - # to make cheaper to build. - my-library = haskellLib.disableLibraryProfiling hprev.my-library; + { + haskell = prev.haskell // { + compiler = prev.haskell.compiler // { + ${ghcName} = prev.haskell.compiler.${ghcName}.override { + # Unfortunately, the GHC setting is named differently for historical reasons + enableProfiledLibs = enableProfiling; }; }; }; - }; - }) + } + ) + + ( + final: prev: + let + inherit (final) lib; + haskellLib = final.haskell.lib.compose; + in + + { + haskell = prev.haskell // { + packages = prev.haskell.packages // { + ${ghcName} = prev.haskell.packages.${ghcName}.override { + overrides = hfinal: hprev: { + mkDerivation = + args: + hprev.mkDerivation ( + args + // { + # Since we are forcing our ideas upon mkDerivation, this change will + # affect every package in the package set. + enableLibraryProfiling = enableProfiling; + + # To actually use profiling on an executable, executable profiling + # needs to be enabled for the executable you want to profile. You + # can either do this globally or… + enableExecutableProfiling = enableProfiling; + } + ); + + # …only for the package that contains an executable you want to profile. + # That saves on unnecessary rebuilds for packages that you only depend + # on for their library, but also contain executables (e.g. pandoc). + my-executable = haskellLib.enableExecutableProfiling hprev.my-executable; + + # If you are disabling profiling to save on build time, but want to + # retain the ability to substitute from the binary cache. Drop the + # override for mkDerivation above and instead have an override like + # this for the specific packages you are building locally and want + # to make cheaper to build. + my-library = haskellLib.disableLibraryProfiling hprev.my-library; + }; + }; + }; + }; + } + ) ] ``` diff --git a/doc/languages-frameworks/hy.section.md b/doc/languages-frameworks/hy.section.md index 49309e4819f5..9eaa7a39fa1e 100644 --- a/doc/languages-frameworks/hy.section.md +++ b/doc/languages-frameworks/hy.section.md @@ -22,10 +22,16 @@ $ nix-shell -p "hy.withPackages (ps: with ps; [ numpy matplotlib ])" Or if you want to extend your `configuration.nix`: ```nix -{ # ... +{ + # ... environment.systemPackages = with pkgs; [ - (hy.withPackages (py-packages: with py-packages; [ numpy matplotlib ])) + (hy.withPackages ( + py-packages: with py-packages; [ + numpy + matplotlib + ] + )) ]; } ``` diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md index 0fa828825749..692a6b64d69d 100644 --- a/doc/languages-frameworks/idris.section.md +++ b/doc/languages-frameworks/idris.section.md @@ -12,7 +12,12 @@ This however only provides the `prelude` and `base` libraries. To install idris ```nix self: super: { - myIdris = with self.idrisPackages; with-packages [ contrib pruviloj ]; + myIdris = + with self.idrisPackages; + with-packages [ + contrib + pruviloj + ]; } ``` @@ -68,13 +73,14 @@ prelude As an example of how a Nix expression for an Idris package can be created, here is the one for `idrisPackages.yaml`: ```nix -{ lib -, build-idris-package -, fetchFromGitHub -, contrib -, lightyear +{ + lib, + build-idris-package, + fetchFromGitHub, + contrib, + lightyear, }: -build-idris-package { +build-idris-package { name = "yaml"; version = "2018-01-25"; @@ -84,7 +90,10 @@ build-idris-package { # different from its package name here. ipkgName = "Yaml"; # Idris dependencies to provide for the build - idrisDeps = [ contrib lightyear ]; + idrisDeps = [ + contrib + lightyear + ]; src = fetchFromGitHub { owner = "Heather"; @@ -111,10 +120,10 @@ $ nix-build -E '(import {}).idrisPackages.callPackage ./yaml.nix {}' Or it's possible to use ```nix -with import {}; +with import { }; { - yaml = idrisPackages.callPackage ./yaml.nix {}; + yaml = idrisPackages.callPackage ./yaml.nix { }; } ``` @@ -134,7 +143,11 @@ For example you could set ```nix build-idris-package { - idrisBuildOptions = [ "--log" "1" "--verbose" ]; + idrisBuildOptions = [ + "--log" + "1" + "--verbose" + ]; # ... } diff --git a/doc/languages-frameworks/idris2.section.md b/doc/languages-frameworks/idris2.section.md index 3ea9b4f988f7..6350f44c8c74 100644 --- a/doc/languages-frameworks/idris2.section.md +++ b/doc/languages-frameworks/idris2.section.md @@ -9,39 +9,50 @@ Importantly, `buildIdris` does not create a single derivation but rather an attr A simple example of a fully packaged library would be the [`LSP-lib`](https://github.com/idris-community/LSP-lib) found in the `idris-community` GitHub organization. ```nix { fetchFromGitHub, idris2Packages }: -let lspLibPkg = idris2Packages.buildIdris { - ipkgName = "lsp-lib"; - src = fetchFromGitHub { - owner = "idris-community"; - repo = "LSP-lib"; - rev = "main"; - hash = "sha256-EvSyMCVyiy9jDZMkXQmtwwMoLaem1GsKVFqSGNNHHmY="; +let + lspLibPkg = idris2Packages.buildIdris { + ipkgName = "lsp-lib"; + src = fetchFromGitHub { + owner = "idris-community"; + repo = "LSP-lib"; + rev = "main"; + hash = "sha256-EvSyMCVyiy9jDZMkXQmtwwMoLaem1GsKVFqSGNNHHmY="; + }; + idrisLibraries = [ ]; }; - idrisLibraries = [ ]; -}; -in lspLibPkg.library { withSource = true; } +in +lspLibPkg.library { withSource = true; } ``` The above results in a derivation with the installed library results (with sourcecode). A slightly more involved example of a fully packaged executable would be the [`idris2-lsp`](https://github.com/idris-community/idris2-lsp) which is an Idris2 language server that uses the `LSP-lib` found above. ```nix -{ callPackage, fetchFromGitHub, idris2Packages }: +{ + callPackage, + fetchFromGitHub, + idris2Packages, +}: # Assuming the previous example lives in `lsp-lib.nix`: -let lspLib = callPackage ./lsp-lib.nix { }; - inherit (idris2Packages) idris2Api; - lspPkg = idris2Packages.buildIdris { - ipkgName = "idris2-lsp"; - src = fetchFromGitHub { - owner = "idris-community"; - repo = "idris2-lsp"; - rev = "main"; - hash = "sha256-vQTzEltkx7uelDtXOHc6QRWZ4cSlhhm5ziOqWA+aujk="; - }; - idrisLibraries = [idris2Api lspLib]; +let + lspLib = callPackage ./lsp-lib.nix { }; + inherit (idris2Packages) idris2Api; + lspPkg = idris2Packages.buildIdris { + ipkgName = "idris2-lsp"; + src = fetchFromGitHub { + owner = "idris-community"; + repo = "idris2-lsp"; + rev = "main"; + hash = "sha256-vQTzEltkx7uelDtXOHc6QRWZ4cSlhhm5ziOqWA+aujk="; }; -in lspPkg.executable + idrisLibraries = [ + idris2Api + lspLib + ]; + }; +in +lspPkg.executable ``` The above uses the default value of `withSource = false` for the `idris2Api` but could be modified to include that library's source by passing `(idris2Api { withSource = true; })` to `idrisLibraries` instead. `idris2Api` in the above derivation comes built in with `idris2Packages`. This library exposes many of the otherwise internal APIs of the Idris2 compiler. diff --git a/doc/languages-frameworks/index.md b/doc/languages-frameworks/index.md index 12e54e2a76ab..2624b9afc5e4 100644 --- a/doc/languages-frameworks/index.md +++ b/doc/languages-frameworks/index.md @@ -98,6 +98,7 @@ scheme.section.md swift.section.md tcl.section.md texlive.section.md +typst.section.md vim.section.md neovim.section.md ``` diff --git a/doc/languages-frameworks/ios.section.md b/doc/languages-frameworks/ios.section.md index eb8e2ca55326..3823b097d7a2 100644 --- a/doc/languages-frameworks/ios.section.md +++ b/doc/languages-frameworks/ios.section.md @@ -29,7 +29,7 @@ Xcode. ```nix let - pkgs = import {}; + pkgs = import { }; xcodeenv = import ./xcodeenv { inherit (pkgs) stdenv; @@ -63,7 +63,7 @@ executing the `xcodeenv.buildApp {}` function: ```nix let - pkgs = import {}; + pkgs = import { }; xcodeenv = import ./xcodeenv { inherit (pkgs) stdenv; @@ -159,7 +159,7 @@ instances: ```nix let - pkgs = import {}; + pkgs = import { }; xcodeenv = import ./xcodeenv { inherit (pkgs) stdenv; @@ -193,7 +193,7 @@ app in the requested simulator instance: ```nix let - pkgs = import {}; + pkgs = import { }; xcodeenv = import ./xcodeenv { inherit (pkgs) stdenv; diff --git a/doc/languages-frameworks/java.section.md b/doc/languages-frameworks/java.section.md index 5208a6388a32..05203c378ae9 100644 --- a/doc/languages-frameworks/java.section.md +++ b/doc/languages-frameworks/java.section.md @@ -7,7 +7,9 @@ stdenv.mkDerivation { pname = "..."; version = "..."; - src = fetchurl { /* ... */ }; + src = fetchurl { + # ... + }; nativeBuildInputs = [ ant @@ -95,7 +97,7 @@ let something = (pkgs.something.override { jre = my_jre; }); other = (pkgs.other.override { jre = my_jre; }); in - <...> +<...> ``` You can also specify what JDK your JRE should be based on, for example @@ -122,7 +124,10 @@ OpenJDK. For instance, to use the GNU Java Compiler: ```nix { - nativeBuildInputs = [ gcj ant ]; + nativeBuildInputs = [ + gcj + ant + ]; } ``` diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 9acfd4181108..56d0c71b8d9c 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -117,12 +117,19 @@ After you have identified the correct system, you need to override your package For example, `dat` requires `node-gyp-build`, so we override its expression in [pkgs/development/node-packages/overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/overrides.nix): ```nix - { - dat = prev.dat.override (oldAttrs: { - buildInputs = [ final.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ]; - meta = oldAttrs.meta // { broken = since "12"; }; - }); - } +{ + dat = prev.dat.override (oldAttrs: { + buildInputs = [ + final.node-gyp-build + pkgs.libtool + pkgs.autoconf + pkgs.automake + ]; + meta = oldAttrs.meta // { + broken = since "12"; + }; + }); +} ``` ### Adding and Updating Javascript packages in nixpkgs {#javascript-adding-or-updating-packages} @@ -185,16 +192,20 @@ It works by utilizing npm's cache functionality -- creating a reproducible cache Here's an example: ```nix -{ lib, buildNpmPackage, fetchFromGitHub }: +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "flood"; version = "4.7.0"; src = fetchFromGitHub { owner = "jesec"; - repo = pname; - rev = "v${version}"; + repo = "flood"; + tag = "v${finalAttrs.version}"; hash = "sha256-BR+ZGkBBfd0dSQqAvujsbgsEPFYw/ThrylxUbOksYxM="; }; @@ -211,7 +222,7 @@ buildNpmPackage rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ winter ]; }; -} +}) ``` In the default `installPhase` set by `buildNpmPackage`, it uses `npm pack --json --dry-run` to decide what files to install in `$out/lib/node_modules/$name/`, where `$name` is the `name` string defined in the package's `package.json`. @@ -323,7 +334,9 @@ buildNpmPackage { npmRoot = ./.; fetcherOpts = { # Pass 'curlOptsList' to 'pkgs.fetchurl' while fetching 'axios' - { "node_modules/axios" = { curlOptsList = [ "--verbose" ]; }; } + "node_modules/axios" = { + curlOptsList = [ "--verbose" ]; + }; }; }; @@ -403,14 +416,16 @@ When packaging an application that includes a `pnpm-lock.yaml`, you need to fetc stdenv, nodejs, # This is pinned as { pnpm = pnpm_9; } - pnpm + pnpm, }: stdenv.mkDerivation (finalAttrs: { pname = "foo"; version = "0-unstable-1980-01-01"; - src = ...; + src = { + #... + }; nativeBuildInputs = [ nodejs @@ -439,7 +454,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "foo"; version = "0-unstable-1980-01-01"; - src = ...; + src = { + # ... + }; pnpmInstallFlags = [ "--shamefully-hoist" ]; @@ -466,14 +483,16 @@ Assuming the following directory structure, we can define `sourceRoot` and `pnpm ``` ```nix - ... +{ + # ... pnpmDeps = pnpm.fetchDeps { - ... + # ... sourceRoot = "${finalAttrs.src.name}/frontend"; }; # by default the working directory is the extracted source pnpmRoot = "frontend"; +} ``` #### PNPM Workspaces {#javascript-pnpm-workspaces} @@ -484,11 +503,13 @@ which will make PNPM only install dependencies for those workspace packages. For example: ```nix -... -pnpmWorkspaces = [ "@astrojs/language-server" ]; -pnpmDeps = pnpm.fetchDeps { - inherit (finalAttrs) pnpmWorkspaces; - ... +{ + # ... + pnpmWorkspaces = [ "@astrojs/language-server" ]; + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pnpmWorkspaces; + #... + }; } ``` @@ -498,13 +519,15 @@ Note that you do not need to set `sourceRoot` to make this work. Usually in such cases, you'd want to use `pnpm --filter= build` to build your project, as `npmHooks.npmBuildHook` probably won't work. A `buildPhase` based on the following example will probably fit most workspace projects: ```nix -buildPhase = '' - runHook preBuild +{ + buildPhase = '' + runHook preBuild - pnpm --filter=@astrojs/language-server build + pnpm --filter=@astrojs/language-server build - runHook postBuild -''; + runHook postBuild + ''; +} ``` #### Additional PNPM Commands and settings {#javascript-pnpm-extraCommands} @@ -513,13 +536,15 @@ If you require setting an additional PNPM configuration setting (such as `dedupe set `prePnpmInstall` to the right commands to run. For example: ```nix -prePnpmInstall = '' - pnpm config set dedupe-peer-dependants false -''; -pnpmDeps = pnpm.fetchDeps { - inherit (finalAttrs) prePnpmInstall; - ... -}; +{ + prePnpmInstall = '' + pnpm config set dedupe-peer-dependants false + ''; + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) prePnpmInstall; + # ... + }; +} ``` In this example, `prePnpmInstall` will be run by both `pnpm.configHook` and by the `pnpm.fetchDeps` builder. @@ -621,9 +646,16 @@ It's important to use the `--offline` flag. For example if you script is `"build ```nix { + nativeBuildInputs = [ + writableTmpDirAsHomeHook + ]; + buildPhase = '' - export HOME=$(mktemp -d) + runHook preBuild + yarn --offline build + + runHook postBuild ''; } ``` @@ -678,7 +710,11 @@ To fix this we will specify different versions of build inputs to use, as well a mkYarnPackage rec { pkgConfig = { node-sass = { - buildInputs = with final;[ python libsass pkg-config ]; + buildInputs = with final; [ + python + libsass + pkg-config + ]; postInstall = '' LIBSASS_EXT=auto yarn --offline run build rm build/config.gypi diff --git a/doc/languages-frameworks/julia.section.md b/doc/languages-frameworks/julia.section.md index 4e7d9d365a39..c0b7fd8d6618 100644 --- a/doc/languages-frameworks/julia.section.md +++ b/doc/languages-frameworks/julia.section.md @@ -19,7 +19,7 @@ This function accepts a list of strings representing Julia package names. For example, you can build a Julia environment with the `Plots` package as follows. ```nix -julia.withPackages ["Plots"] +julia.withPackages [ "Plots" ] ``` Arguments can be passed using `.override`. @@ -28,7 +28,8 @@ For example: ```nix (julia.withPackages.override { precompile = false; # Turn off precompilation -}) ["Plots"] +}) + [ "Plots" ] ``` Here's a nice way to run a Julia environment with a shell one-liner: diff --git a/doc/languages-frameworks/lisp.section.md b/doc/languages-frameworks/lisp.section.md index 73f20436c76f..7f6fe99419bd 100644 --- a/doc/languages-frameworks/lisp.section.md +++ b/doc/languages-frameworks/lisp.section.md @@ -48,7 +48,8 @@ Also one can create a `pkgs.mkShell` environment in `shell.nix`/`flake.nix`: ```nix let sbcl' = sbcl.withPackages (ps: [ ps.alexandria ]); -in mkShell { +in +mkShell { packages = [ sbcl' ]; } ``` @@ -134,7 +135,6 @@ During Quicklisp import: - names starting with a number have a `_` prepended (`3d-vectors`->`_3d-vectors`) - `_` in names is converted to `__` for reversibility - ## Defining packages manually inside Nixpkgs {#lisp-defining-packages-inside} Packages that for some reason are not in Quicklisp, and so cannot be @@ -184,14 +184,17 @@ let domain = "gitlab.common-lisp.net"; owner = "alexandria"; repo = "alexandria"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-1Hzxt65dZvgOFIljjjlSGgKYkj+YBLwJCACi5DZsKmQ="; }; }; - sbcl' = sbcl.withOverrides (self: super: { - inherit alexandria; - }); -in sbcl'.pkgs.alexandria + sbcl' = sbcl.withOverrides ( + self: super: { + inherit alexandria; + } + ); +in +sbcl'.pkgs.alexandria ``` ## Overriding package attributes {#lisp-overriding-package-attributes} @@ -208,7 +211,7 @@ sbcl.pkgs.alexandria.overrideLispAttrs (oldAttrs: rec { domain = "gitlab.common-lisp.net"; owner = "alexandria"; repo = "alexandria"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-1Hzxt65dZvgOFIljjjlSGgKYkj+YBLwJCACi5DZsKmQ="; }; }) @@ -296,6 +299,9 @@ This example wraps CLISP: wrapLisp { pkg = clisp; faslExt = "fas"; - flags = ["-E" "UTF8"]; + flags = [ + "-E" + "UTF8" + ]; } ``` diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md index 87bf7ce885bc..84af997df860 100644 --- a/doc/languages-frameworks/lua.section.md +++ b/doc/languages-frameworks/lua.section.md @@ -27,9 +27,14 @@ Note that nixpkgs patches the non-luajit interpreters to avoid referring to Create a file, e.g. `build.nix`, with the following expression ```nix -with import {}; +with import { }; -lua5_2.withPackages (ps: with ps; [ busted luafilesystem ]) +lua5_2.withPackages ( + ps: with ps; [ + busted + luafilesystem + ] +) ``` and install it in your profile with @@ -46,11 +51,18 @@ If you prefer to, you could also add the environment as a package override to th using `config.nix`, ```nix -{ # ... +{ + # ... - packageOverrides = pkgs: with pkgs; { - myLuaEnv = lua5_2.withPackages (ps: with ps; [ busted luafilesystem ]); - }; + packageOverrides = + pkgs: with pkgs; { + myLuaEnv = lua5_2.withPackages ( + ps: with ps; [ + busted + luafilesystem + ] + ); + }; } ``` @@ -67,10 +79,16 @@ the `nixpkgs` channel was used. For the sake of completeness, here's another example how to install the environment system-wide. ```nix -{ # ... +{ + # ... environment.systemPackages = with pkgs; [ - (lua.withPackages(ps: with ps; [ busted luafilesystem ])) + (lua.withPackages ( + ps: with ps; [ + busted + luafilesystem + ] + )) ]; } ``` @@ -80,13 +98,12 @@ For the sake of completeness, here's another example how to install the environm Use the following overlay template: ```nix -final: prev: -{ +final: prev: { lua = prev.lua.override { packageOverrides = luaself: luaprev: { - luarocks-nix = luaprev.luarocks-nix.overrideAttrs(oa: { + luarocks-nix = luaprev.luarocks-nix.overrideAttrs (oa: { pname = "luarocks-nix"; src = /home/my_luarocks/repository; }); @@ -159,7 +176,11 @@ within a `toLuaModule` call, for instance ```nix { - mynewlib = toLuaModule ( stdenv.mkDerivation { /* ... */ }); + mynewlib = toLuaModule ( + stdenv.mkDerivation { + # ... + } + ); } ``` @@ -194,16 +215,23 @@ The following is an example: version = "34.0.4-1"; src = fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaposix-34.0.4-1.src.rock"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaposix-34.0.4-1.src.rock"; hash = "sha256-4mLJG8n4m6y4Fqd0meUDfsOb9RHSR0qa/KD5KCwrNXs="; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ bit32 lua std_normalize ]; + propagatedBuildInputs = [ + bit32 + lua + std_normalize + ]; meta = { homepage = "https://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; - maintainers = with lib.maintainers; [ vyp lblasc ]; + maintainers = with lib.maintainers; [ + vyp + lblasc + ]; license.fullName = "MIT/X11"; }; }; @@ -242,14 +270,14 @@ The `lua.withPackages` takes a function as an argument that is passed the set of Using the `withPackages` function, the previous example for the luafilesystem environment can be written like this: ```nix -lua.withPackages (ps: [ps.luafilesystem]) +lua.withPackages (ps: [ ps.luafilesystem ]) ``` `withPackages` passes the correct package set for the specific interpreter version as an argument to the function. In the above example, `ps` equals `luaPackages`. But you can also easily switch to using `lua5_1`: ```nix -lua5_1.withPackages (ps: [ps.lua]) +lua5_1.withPackages (ps: [ ps.lua ]) ``` Now, `ps` is set to `lua5_1.pkgs`, matching the version of the interpreter. diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md index 88fe4d0c9224..d70501651f26 100644 --- a/doc/languages-frameworks/maven.section.md +++ b/doc/languages-frameworks/maven.section.md @@ -9,7 +9,13 @@ The following provides a list of common patterns with how to package a Maven pro Consider the following package: ```nix -{ lib, fetchFromGitHub, jre, makeWrapper, maven }: +{ + lib, + fetchFromGitHub, + jre, + makeWrapper, + maven, +}: maven.buildMavenPackage rec { pname = "jd-cli"; @@ -17,8 +23,8 @@ maven.buildMavenPackage rec { src = fetchFromGitHub { owner = "intoolswetrust"; - repo = pname; - rev = "${pname}-${version}"; + repo = "jd-cli"; + tag = "jd-cli-${version}"; hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q="; }; @@ -27,11 +33,15 @@ maven.buildMavenPackage rec { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/jd-cli install -Dm644 jd-cli/target/jd-cli.jar $out/share/jd-cli makeWrapper ${jre}/bin/java $out/bin/jd-cli \ --add-flags "-jar $out/share/jd-cli/jd-cli.jar" + + runHook postInstall ''; meta = { @@ -91,7 +101,7 @@ jd-cli.overrideMavenAttrs (old: rec { # old mvnHash of 1.2.0 maven dependencies mvnHash = "sha256-N9XC1pg6Y4sUiBWIQUf16QSXCuiAPpXEHGlgApviF4I="; -}); +}) ``` ::: @@ -129,7 +139,7 @@ maven.buildMavenPackage rec { "org.apache.maven.surefire:surefire-junit-platform:3.1.2" "org.junit.platform:junit-platform-launcher:1.10.0" ]; -}; +} ``` ::: @@ -246,7 +256,9 @@ This file is then given to the `buildMaven` function, and it returns 2 attribute Here is an [example](https://github.com/fzakaria/nixos-maven-example/blob/main/build-maven-repository.nix) of building the Maven repository ```nix -{ pkgs ? import { } }: +{ + pkgs ? import { }, +}: with pkgs; (buildMaven ./project-info.json).repo ``` @@ -283,22 +295,34 @@ Traditionally the Maven repository is at `~/.m2/repository`. We will override th ::: ```nix -{ lib, stdenv, maven }: +{ + lib, + stdenv, + maven, +}: stdenv.mkDerivation { name = "maven-repository"; buildInputs = [ maven ]; src = ./.; # or fetchFromGitHub, cleanSourceWith, etc buildPhase = '' + runHook preBuild + mvn package -Dmaven.repo.local=$out + + runHook postBuild ''; # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside installPhase = '' + runHook preInstall + find $out -type f \ -name \*.lastUpdated -or \ -name resolver-status.properties -or \ -name _remote.repositories \ -delete + + runHook postInstall ''; # don't do any fixup @@ -337,10 +361,16 @@ If your package uses _SNAPSHOT_ dependencies or _version ranges_; there is a str Regardless of which strategy is chosen above, the step to build the derivation is the same. ```nix -{ stdenv, maven, callPackage }: -# pick a repository derivation, here we will use buildMaven -let repository = callPackage ./build-maven-repository.nix { }; -in stdenv.mkDerivation rec { +{ + stdenv, + maven, + callPackage, +}: +let + # pick a repository derivation, here we will use buildMaven + repository = callPackage ./build-maven-repository.nix { }; +in +stdenv.mkDerivation (finalAttrs: { pname = "maven-demo"; version = "1.0"; @@ -348,14 +378,22 @@ in stdenv.mkDerivation rec { buildInputs = [ maven ]; buildPhase = '' + runHook preBuild + echo "Using repository ${repository}" mvn --offline -Dmaven.repo.local=${repository} package; + + runHook postBuild ''; installPhase = '' - install -Dm644 target/${pname}-${version}.jar $out/share/java + runHook preInstall + + install -Dm644 target/${finalAttrs.pname}-${finalAttrs.version}.jar $out/share/java + + runHook postInstall ''; -} +}) ``` ::: {.tip} @@ -393,35 +431,49 @@ We will read the Maven repository and flatten it to a single list. This list wil We make sure to provide this classpath to the `makeWrapper`. ```nix -{ stdenv, maven, callPackage, makeWrapper, jre }: +{ + stdenv, + maven, + callPackage, + makeWrapper, + jre, +}: let repository = callPackage ./build-maven-repository.nix { }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation (finalAttrs: { pname = "maven-demo"; version = "1.0"; - src = builtins.fetchTarball - "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; + src = builtins.fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ maven ]; buildPhase = '' + runHook preBuild + echo "Using repository ${repository}" mvn --offline -Dmaven.repo.local=${repository} package; + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin classpath=$(find ${repository} -name "*.jar" -printf ':%h/%f'); - install -Dm644 target/${pname}-${version}.jar $out/share/java + install -Dm644 target/maven-demo-${finalAttrs.version}.jar $out/share/java # create a wrapper that will automatically set the classpath # this should be the paths from the dependency derivation - makeWrapper ${jre}/bin/java $out/bin/${pname} \ - --add-flags "-classpath $out/share/java/${pname}-${version}.jar:''${classpath#:}" \ + makeWrapper ${jre}/bin/java $out/bin/maven-demo \ + --add-flags "-classpath $out/share/java/maven-demo-${finalAttrs.version}.jar:''${classpath#:}" \ --add-flags "Main" + + runHook postInstall ''; -} +}) ``` #### MANIFEST file via Maven Plugin {#manifest-file-via-maven-plugin} @@ -471,36 +523,51 @@ Main-Class: Main We will modify the derivation above to add a symlink to our repository so that it's accessible to our JAR during the `installPhase`. ```nix -{ stdenv, maven, callPackage, makeWrapper, jre }: -# pick a repository derivation, here we will use buildMaven -let repository = callPackage ./build-maven-repository.nix { }; -in stdenv.mkDerivation rec { +{ + stdenv, + maven, + callPackage, + makeWrapper, + jre, +}: +let + # pick a repository derivation, here we will use buildMaven + repository = callPackage ./build-maven-repository.nix { }; +in +stdenv.mkDerivation (finalAttrs: { pname = "maven-demo"; version = "1.0"; - src = builtins.fetchTarball - "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; + src = builtins.fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ maven ]; buildPhase = '' + runHook preBuild + echo "Using repository ${repository}" mvn --offline -Dmaven.repo.local=${repository} package; + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin # create a symbolic link for the repository directory ln -s ${repository} $out/repository - install -Dm644 target/${pname}-${version}.jar $out/share/java + install -Dm644 target/maven-demo-${finalAttrs.version}.jar $out/share/java # create a wrapper that will automatically set the classpath # this should be the paths from the dependency derivation - makeWrapper ${jre}/bin/java $out/bin/${pname} \ - --add-flags "-jar $out/share/java/${pname}-${version}.jar" + makeWrapper ${jre}/bin/java $out/bin/maven-demo \ + --add-flags "-jar $out/share/java/maven-demo-${finalAttrs.version}.jar" + + runHook postInstall ''; -} +}) ``` ::: {.note} Our script produces a dependency on `jre` rather than `jdk` to restrict the runtime closure necessary to run the application. diff --git a/doc/languages-frameworks/neovim.section.md b/doc/languages-frameworks/neovim.section.md index 1c58170e3fe6..71bc52b541dc 100644 --- a/doc/languages-frameworks/neovim.section.md +++ b/doc/languages-frameworks/neovim.section.md @@ -91,8 +91,8 @@ wrapNeovimUnstable neovim-unwrapped { You can explore the configuration with`nix repl` to discover these options and override them. For instance: ```nix -neovim.overrideAttrs(oldAttrs: { - autowrapRuntimeDeps = false; +neovim.overrideAttrs (oldAttrs: { + autowrapRuntimeDeps = false; }) ``` @@ -116,9 +116,11 @@ top-level while luarocks installs them in various subfolders by default. For instance: ```nix -rtp-nvim = neovimUtils.buildNeovimPlugin { +{ + rtp-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rtp-nvim; -}; + }; +} ``` To update these packages, you should use the lua updater rather than vim's. @@ -164,16 +166,19 @@ The check hook will fail the build if any modules cannot be loaded. This encoura To only check a specific module, add it manually to the plugin definition [overrides](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). ```nix +{ gitsigns-nvim = super.gitsigns-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; nvimRequireCheck = "gitsigns"; }; +} ``` Some plugins will have lua modules that require a user configuration to function properly or can contain optional lua modules that we dont want to test requiring. We can skip specific modules using `nvimSkipModules`. Similar to `nvimRequireCheck`, it accepts a list of strings. - `nvimSkipModules = [ MODULE1 MODULE2 ];` ```nix +{ asyncrun-vim = super.asyncrun-vim.overrideAttrs { nvimSkipModules = [ # vim plugin with optional toggleterm integration @@ -181,14 +186,17 @@ We can skip specific modules using `nvimSkipModules`. Similar to `nvimRequireChe "asyncrun.toggleterm2" ]; }; +} ``` In rare cases, we might not want to actually test loading lua modules for a plugin. In those cases, we can disable `neovimRequireCheck` with `doCheck = false;`. This can be manually added through plugin definition overrides in the [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). ```nix +{ vim-test = super.vim-test.overrideAttrs { # Vim plugin with a test lua file doCheck = false; }; +} ``` diff --git a/doc/languages-frameworks/nim.section.md b/doc/languages-frameworks/nim.section.md index f0196c9d116f..ef3ecbba7d74 100644 --- a/doc/languages-frameworks/nim.section.md +++ b/doc/languages-frameworks/nim.section.md @@ -7,7 +7,11 @@ Nim programs are built using a lockfile and either `buildNimPackage` or `buildNi The following example shows a Nim program that depends only on Nim libraries: ```nix -{ lib, buildNimPackage, fetchFromGitHub }: +{ + lib, + buildNimPackage, + fetchFromGitHub, +}: buildNimPackage (finalAttrs: { pname = "ttop"; @@ -91,7 +95,9 @@ The `buildNimPackage` and `buildNimSbom` functions generate flags and additional ```nix pkgs.nitter.overrideNimAttrs { # using a different source which has different dependencies from the standard package - src = pkgs.fetchFromGithub { /* … */ }; + src = pkgs.fetchFromGithub { + # … + }; # new lock file generated from the source lockFile = ./custom-lock.json; } @@ -104,21 +110,25 @@ The default overrides are maintained as the top-level `nimOverrides` attrset at For example, to propagate a dependency on SDL2 for lockfiles that select the Nim `sdl2` library, an overlay is added to the set in the `nim-overrides.nix` file: ```nix -{ lib -/* … */ -, SDL2 -/* … */ +{ + lib, + # … + SDL2, +# … }: { - /* … */ + # … sdl2 = lockAttrs: - { buildInputs ? [ ], ... }: + { + buildInputs ? [ ], + ... + }: { buildInputs = buildInputs ++ [ SDL2 ]; }; - /* … */ + # … } ``` @@ -132,22 +142,28 @@ The `nimOverrides` attrset makes it possible to modify overrides in a few differ Override a package internal to its definition: ```nix -{ lib, buildNimPackage, nimOverrides, libressl }: +{ + lib, + buildNimPackage, + nimOverrides, + libressl, +}: let buildNimPackage' = buildNimPackage.override { nimOverrides = nimOverrides.override { openssl = libressl; }; }; -in buildNimPackage' (finalAttrs: { +in +buildNimPackage' (finalAttrs: { pname = "foo"; # … }) - ``` Override a package externally: ```nix -{ pkgs }: { +{ pkgs }: +{ foo = pkgs.foo.override { buildNimPackage = pkgs.buildNimPackage.override { nimOverrides = pkgs.nimOverrides.override { openssl = libressl; }; diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index 7f2c2a63a00b..62a54640b2fb 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -12,13 +12,18 @@ To open a shell able to build a typical OCaml project, put the dependencies in ` For example: ```nix let - pkgs = import {}; - # choose the ocaml version you want to use - ocamlPackages = pkgs.ocaml-ng.ocamlPackages_4_12; + pkgs = import { }; + # choose the ocaml version you want to use + ocamlPackages = pkgs.ocaml-ng.ocamlPackages_4_12; in pkgs.mkShell { # build tools - nativeBuildInputs = with ocamlPackages; [ ocaml findlib dune_2 ocaml-lsp ]; + nativeBuildInputs = with ocamlPackages; [ + ocaml + findlib + dune_2 + ocaml-lsp + ]; # dependencies buildInputs = with ocamlPackages; [ ocamlgraph ]; } @@ -58,7 +63,8 @@ Here is a simple package example. generates. ```nix -{ lib, +{ + lib, fetchFromGitHub, buildDunePackage, ocaml, @@ -66,7 +72,8 @@ Here is a simple package example. alcotest, result, bigstringaf, - ppx_let }: + ppx_let, +}: buildDunePackage rec { pname = "angstrom"; @@ -75,15 +82,21 @@ buildDunePackage rec { minimalOCamlVersion = "4.04"; src = fetchFromGitHub { - owner = "inhabitedtype"; - repo = pname; - rev = version; - hash = "sha256-MK8o+iPGANEhrrTc1Kz9LBilx2bDPQt7Pp5P2libucI="; + owner = "inhabitedtype"; + repo = "angstrom"; + tag = version; + hash = "sha256-MK8o+iPGANEhrrTc1Kz9LBilx2bDPQt7Pp5P2libucI="; }; - checkInputs = [ alcotest ppx_let ]; + checkInputs = [ + alcotest + ppx_let + ]; buildInputs = [ ocaml-syntax-shims ]; - propagatedBuildInputs = [ bigstringaf result ]; + propagatedBuildInputs = [ + bigstringaf + result + ]; doCheck = lib.versionAtLeast ocaml.version "4.05"; meta = { @@ -98,7 +111,11 @@ buildDunePackage rec { Here is a second example, this time using a source archive generated with `dune-release`. It is a good idea to use this archive when it is available as it will usually contain substituted variables such as a `%%VERSION%%` field. This library does not depend on any other OCaml library and no tests are run after building it. ```nix -{ lib, fetchurl, buildDunePackage }: +{ + lib, + fetchurl, + buildDunePackage, +}: buildDunePackage rec { pname = "wtf8"; @@ -107,7 +124,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.02"; src = fetchurl { - url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + url = "https://github.com/flowtype/ocaml-wtf8/releases/download/v${version}/wtf8-v${version}.tbz"; hash = "sha256-d5/3KUBAWRj8tntr4RkJ74KWW7wvn/B/m1nx0npnzyc="; }; diff --git a/doc/languages-frameworks/octave.section.md b/doc/languages-frameworks/octave.section.md index 4ad2cb0d5fbf..8bb75d73f62e 100644 --- a/doc/languages-frameworks/octave.section.md +++ b/doc/languages-frameworks/octave.section.md @@ -39,7 +39,9 @@ $ nix-shell -p 'octave.withPackages (ps: with ps; [ symbolic ])' This will also work in a `shell.nix` file. ```nix -{ pkgs ? import { }}: +{ + pkgs ? import { }, +}: pkgs.mkShell { nativeBuildInputs = with pkgs; [ diff --git a/doc/languages-frameworks/perl.section.md b/doc/languages-frameworks/perl.section.md index 843d46584cdd..50fc4945ff76 100644 --- a/doc/languages-frameworks/perl.section.md +++ b/doc/languages-frameworks/perl.section.md @@ -39,7 +39,7 @@ Perl packages from CPAN are defined in [pkgs/top-level/perl-packages.nix](https: pname = "Class-C3"; version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/F/FL/FLORA/Class-C3-${version}.tar.gz"; hash = "sha256-/5GE5xHT0uYGOQxroqj6LMU7CtKn2s6vMVoSXxL4iK4="; }; }; @@ -51,7 +51,10 @@ Note the use of `mirror://cpan/`, and the `pname` and `version` in the URL defin ```nix { foo = import ../path/to/foo.nix { - inherit stdenv fetchurl /* ... */; + inherit + stdenv + fetchurl # ... + ; inherit (perlPackages) ClassC3; }; } @@ -74,14 +77,18 @@ So what does `buildPerlPackage` do? It does the following: `buildPerlPackage` is built on top of `stdenv`, so everything can be customised in the usual way. For instance, the `BerkeleyDB` module has a `preConfigure` hook to generate a configuration file used by `Makefile.PL`: ```nix -{ buildPerlPackage, fetchurl, db }: +{ + buildPerlPackage, + fetchurl, + db, +}: buildPerlPackage rec { pname = "BerkeleyDB"; version = "0.36"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-${version}.tar.gz"; hash = "sha256-4Y+HGgGQqcOfdiKcFIyMrWBEccVNVAMDBWZlFTMorh8="; }; @@ -100,11 +107,14 @@ Dependencies on other Perl packages can be specified in the `buildInputs` and `p pname = "Class-C3-Componentised"; version = "1.0004"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AS/ASH/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/A/AS/ASH/Class-C3-Componentised-${version}.tar.gz"; hash = "sha256-ASO9rV/FzJYZ0BH572Fxm2ZrFLMZLFATJng1NuU4FHc="; }; propagatedBuildInputs = [ - ClassC3 ClassInspector TestException MROCompat + ClassC3 + ClassInspector + TestException + MROCompat ]; }; } @@ -113,7 +123,13 @@ Dependencies on other Perl packages can be specified in the `buildInputs` and `p On Darwin, if a script has too many `-Idir` flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the `shortenPerlShebang` function from the `postInstall` phase: ```nix -{ lib, stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }: +{ + lib, + stdenv, + buildPerlPackage, + fetchurl, + shortenPerlShebang, +}: { ImageExifTool = buildPerlPackage { @@ -121,7 +137,7 @@ On Darwin, if a script has too many `-Idir` flags in its first line (its “sheb version = "12.50"; src = fetchurl { - url = "https://exiftool.org/${pname}-${version}.tar.gz"; + url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; hash = "sha256-vOhB/FwQMC8PPvdnjDvxRpU6jAZcC6GMQfc0AH4uwKg="; }; diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index 1bcb4ee727a5..ce97da872677 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -45,24 +45,30 @@ extensions. For example, a PHP package with all default extensions and ImageMagick enabled: ```nix -php.withExtensions ({ enabled, all }: - enabled ++ [ all.imagick ]) +php.withExtensions ({ enabled, all }: enabled ++ [ all.imagick ]) ``` To exclude some, but not all, of the default extensions, you can filter the `enabled` list like this: ```nix -php.withExtensions ({ enabled, all }: - (lib.filter (e: e != php.extensions.opcache) enabled) - ++ [ all.imagick ]) +php.withExtensions ( + { enabled, all }: (lib.filter (e: e != php.extensions.opcache) enabled) ++ [ all.imagick ] +) ``` To build your list of extensions from the ground up, you can ignore `enabled`: ```nix -php.withExtensions ({ all, ... }: with all; [ imagick opcache ]) +php.withExtensions ( + { all, ... }: + with all; + [ + imagick + opcache + ] +) ``` `php.withExtensions` provides extensions by wrapping a minimal php @@ -82,7 +88,13 @@ and ImageMagick extensions enabled, and `memory_limit` set to `256M`: ```nix php.buildEnv { - extensions = { all, ... }: with all; [ imagick opcache ]; + extensions = + { all, ... }: + with all; + [ + imagick + opcache + ]; extraConfig = "memory_limit=256M"; } ``` @@ -94,8 +106,16 @@ follows: ```nix let - myPhp = php.withExtensions ({ all, ... }: with all; [ imagick opcache ]); -in { + myPhp = php.withExtensions ( + { all, ... }: + with all; + [ + imagick + opcache + ] + ); +in +{ services.phpfpm.pools."foo".phpPackage = myPhp; } ``` @@ -103,10 +123,17 @@ in { ```nix let myPhp = php.buildEnv { - extensions = { all, ... }: with all; [ imagick opcache ]; + extensions = + { all, ... }: + with all; + [ + imagick + opcache + ]; extraConfig = "memory_limit=256M"; }; -in { +in +{ services.phpfpm.pools."foo".phpPackage = myPhp; } ``` @@ -132,9 +159,14 @@ won't work with that project unless those extensions are loaded. Example of building `composer` with additional extensions: ```nix -(php.withExtensions ({ all, enabled }: - enabled ++ (with all; [ imagick redis ])) -).packages.composer +(php.withExtensions ( + { all, enabled }: + enabled + ++ (with all; [ + imagick + redis + ]) +)).packages.composer ``` ### Overriding PHP packages {#ssec-php-user-guide-overriding-packages} @@ -148,7 +180,7 @@ php.override { packageOverrides = final: prev: { extensions = prev.extensions // { mysqlnd = prev.extensions.mysqlnd.overrideAttrs (attrs: { - patches = attrs.patches or [] ++ [ + patches = attrs.patches or [ ] ++ [ # ... ]; }); @@ -182,7 +214,7 @@ code, while others choose not to. In Nix, there are multiple approaches to building a Composer-based project. -One such method is the `php.buildComposerProject` helper function, which serves +One such method is the `php.buildComposerProject2` helper function, which serves as a wrapper around `mkDerivation`. Using this function, you can build a PHP project that includes both a @@ -217,27 +249,31 @@ To customize the PHP version, you can specify the `php` attribute. Similarly, if you wish to modify the Composer version, use the `composer` attribute. It is important to note that both attributes should be of the `derivation` type. -Here's an example of working code example using `php.buildComposerProject`: +Here's an example of working code example using `php.buildComposerProject2`: ```nix { php, fetchFromGitHub }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "php-app"; version = "1.0.0"; src = fetchFromGitHub { owner = "git-owner"; repo = "git-repo"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-VcQRSss2dssfkJ+iUb5qT+FJ10GHiFDzySigcmuVI+8="; }; # PHP version containing the `ast` extension enabled php = php.buildEnv { - extensions = ({ enabled, all }: enabled ++ (with all; [ - ast - ])); + extensions = ( + { enabled, all }: + enabled + ++ (with all; [ + ast + ]) + ); }; # The composer vendor hash @@ -259,38 +295,45 @@ Here's a working code example to build a PHP library using `mkDerivation` and separate functions and hooks: ```nix -{ stdenvNoCC, fetchFromGitHub, php }: +{ + stdenvNoCC, + fetchFromGitHub, + php, +}: -stdenvNoCC.mkDerivation (finalAttrs: -let - src = fetchFromGitHub { - owner = "git-owner"; - repo = "git-repo"; - rev = finalAttrs.version; - hash = "sha256-VcQRSss2dssfkJ+iUb5qT+FJ10GHiFDzySigcmuVI+8="; - }; -in { - inherit src; - pname = "php-app"; - version = "1.0.0"; +stdenvNoCC.mkDerivation ( + finalAttrs: + let + src = fetchFromGitHub { + owner = "git-owner"; + repo = "git-repo"; + rev = finalAttrs.version; + hash = "sha256-VcQRSss2dssfkJ+iUb5qT+FJ10GHiFDzySigcmuVI+8="; + }; + in + { + inherit src; + pname = "php-app"; + version = "1.0.0"; - buildInputs = [ php ]; + buildInputs = [ php ]; - nativeBuildInputs = [ - php.packages.composer - # This hook will use the attribute `composerRepository` - php.composerHooks.composerInstallHook - ]; + nativeBuildInputs = [ + php.packages.composer + # This hook will use the attribute `composerRepository` + php.composerHooks.composerInstallHook + ]; - composerRepository = php.mkComposerRepository { - inherit (finalAttrs) pname version src; - composerNoDev = true; - composerNoPlugins = true; - composerNoScripts = true; - # Specifying a custom composer.lock since it is not present in the sources. - composerLock = ./composer.lock; - # The composer vendor hash - vendorHash = "sha256-86s/F+/5cBAwBqZ2yaGRM5rTGLmou5//aLRK5SA0WiQ="; - }; -}) + composerRepository = php.mkComposerRepository { + inherit (finalAttrs) pname version src; + composerNoDev = true; + composerNoPlugins = true; + composerNoScripts = true; + # Specifying a custom composer.lock since it is not present in the sources. + composerLock = ./composer.lock; + # The composer vendor hash + vendorHash = "sha256-86s/F+/5cBAwBqZ2yaGRM5rTGLmou5//aLRK5SA0WiQ="; + }; + } +) ``` diff --git a/doc/languages-frameworks/pkg-config.section.md b/doc/languages-frameworks/pkg-config.section.md index 0b25396314cb..f788d5500c0d 100644 --- a/doc/languages-frameworks/pkg-config.section.md +++ b/doc/languages-frameworks/pkg-config.section.md @@ -17,9 +17,12 @@ A good example of all these things is miniz: { pkg-config, testers, ... }: stdenv.mkDerivation (finalAttrs: { - /* ... */ + # ... - nativeBuildInputs = [ pkg-config validatePkgConfig ]; + nativeBuildInputs = [ + pkg-config + validatePkgConfig + ]; passthru.tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; @@ -27,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - /* ... */ + # ... pkgConfigModules = [ "miniz" ]; }; }) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index c38c14e763b0..6594254a0387 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -78,24 +78,25 @@ using setup hooks. The following is an example: ```nix -{ lib -, buildPythonPackage -, fetchPypi +{ + lib, + buildPythonPackage, + fetchPypi, -# build-system -, setuptools -, setuptools-scm + # build-system + setuptools, + setuptools-scm, -# dependencies -, attrs -, pluggy -, py -, setuptools -, six + # dependencies + attrs, + pluggy, + py, + setuptools, + six, -# tests -, hypothesis - }: + # tests + hypothesis, +}: buildPythonPackage rec { pname = "pytest"; @@ -134,7 +135,12 @@ buildPythonPackage rec { description = "Framework for writing tests"; homepage = "https://github.com/pytest-dev/pytest"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ domenkozar lovek323 madjar lsix ]; + maintainers = with lib.maintainers; [ + domenkozar + lovek323 + madjar + lsix + ]; }; } ``` @@ -231,23 +237,31 @@ override first the Python interpreter and pass `packageOverrides` which contains the overrides for packages in the package set. ```nix -with import {}; +with import { }; -(let - python = let - packageOverrides = self: super: { - pandas = super.pandas.overridePythonAttrs(old: rec { - version = "0.19.1"; - src = fetchPypi { - pname = "pandas"; - inherit version; - hash = "sha256-JQn+rtpy/OA2deLszSKEuxyttqBzcAil50H+JDHUdCE="; +( + let + python = + let + packageOverrides = self: super: { + pandas = super.pandas.overridePythonAttrs (old: rec { + version = "0.19.1"; + src = fetchPypi { + pname = "pandas"; + inherit version; + hash = "sha256-JQn+rtpy/OA2deLszSKEuxyttqBzcAil50H+JDHUdCE="; + }; + }); }; - }); - }; - in pkgs.python3.override {inherit packageOverrides; self = python;}; + in + pkgs.python3.override { + inherit packageOverrides; + self = python; + }; -in python.withPackages(ps: [ ps.blaze ])).env + in + python.withPackages (ps: [ ps.blaze ]) +).env ``` The next example shows a non trivial overriding of the `blas` implementation to @@ -258,12 +272,16 @@ be used through out all of the Python package set: python3MyBlas = pkgs.python3.override { packageOverrides = self: super: { # We need toPythonModule for the package set to evaluate this - blas = super.toPythonModule(super.pkgs.blas.override { - blasProvider = super.pkgs.mkl; - }); - lapack = super.toPythonModule(super.pkgs.lapack.override { - lapackProvider = super.pkgs.mkl; - }); + blas = super.toPythonModule ( + super.pkgs.blas.override { + blasProvider = super.pkgs.mkl; + } + ); + lapack = super.toPythonModule ( + super.pkgs.lapack.override { + lapackProvider = super.pkgs.mkl; + } + ); }; }; } @@ -290,9 +308,10 @@ called with `callPackage` and passed `python3` or `python3Packages` (possibly specifying an interpreter version), like this: ```nix -{ lib -, python3Packages -, fetchPypi +{ + lib, + python3Packages, + fetchPypi, }: python3Packages.buildPythonApplication rec { @@ -302,7 +321,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw="; + hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw="; }; build-system = with python3Packages; [ @@ -356,10 +375,12 @@ modifications. ```nix { - opencv = toPythonModule (pkgs.opencv.override { - enablePython = true; - pythonPackages = self; - }); + opencv = toPythonModule ( + pkgs.opencv.override { + enablePython = true; + pythonPackages = self; + } + ); } ``` @@ -394,8 +415,10 @@ The `build-system`'s provided will instead become runtime dependencies of the ed Note that overriding packages deeper in the dependency graph _can_ work, but it's not the primary use case and overriding existing packages can make others break in unexpected ways. -``` nix -{ pkgs ? import { } }: +```nix +{ + pkgs ? import { }, +}: let pyproject = pkgs.lib.importTOML ./pyproject.toml; @@ -418,9 +441,10 @@ let }; }; - pythonEnv = myPython.withPackages (ps: [ ps.my-editable ]); + pythonEnv = myPython.withPackages (ps: [ ps.my-editable ]); -in pkgs.mkShell { +in +pkgs.mkShell { packages = [ pythonEnv ]; } ``` @@ -432,7 +456,7 @@ This example shows how to create an environment that has the Pyramid Web Framewo Saving the following as `default.nix` ```nix -with import {}; +with import { }; python3.buildEnv.override { extraLibs = [ python3Packages.pyramid ]; @@ -453,7 +477,7 @@ packages installed. This is somewhat comparable to `virtualenv`. For example, running `nix-shell` with the following `shell.nix` ```nix -with import {}; +with import { }; (python3.buildEnv.override { extraLibs = with python3Packages; [ @@ -483,7 +507,7 @@ of the packages to be included in the environment. Using the [`withPackages`](#p example for the Pyramid Web Framework environment can be written like this: ```nix -with import {}; +with import { }; python.withPackages (ps: [ ps.pyramid ]) ``` @@ -493,7 +517,7 @@ version as an argument to the function. In the above example, `ps` equals `pythonPackages`. But you can also easily switch to using python3: ```nix -with import {}; +with import { }; python3.withPackages (ps: [ ps.pyramid ]) ``` @@ -505,12 +529,14 @@ supports the `env` attribute. The `shell.nix` file from the previous section can thus be also written like this: ```nix -with import {}; +with import { }; -(python3.withPackages (ps: with ps; [ - numpy - requests -])).env +(python3.withPackages ( + ps: with ps; [ + numpy + requests + ] +)).env ``` In contrast to [`python.buildEnv`](#python.buildenv-function), [`python.withPackages`](#python.withpackages-function) does not support the @@ -758,11 +784,13 @@ Say we want to have Python 3.12, `numpy` and `toolz`, like before, in an environment. We can add a `shell.nix` file describing our dependencies: ```nix -with import {}; -(python312.withPackages (ps: with ps; [ - numpy - toolz -])).env +with import { }; +(python312.withPackages ( + ps: with ps; [ + numpy + toolz + ] +)).env ``` And then at the command line, just typing `nix-shell` produces the same @@ -785,13 +813,14 @@ What's happening here? To combine this with `mkShell` you can: ```nix -with import {}; +with import { }; let pythonEnv = python312.withPackages (ps: [ ps.numpy ps.toolz ]); -in mkShell { +in +mkShell { packages = [ pythonEnv @@ -868,10 +897,16 @@ For the sake of completeness, here's how to install the environment system-wide on NixOS. ```nix -{ # ... +{ + # ... environment.systemPackages = with pkgs; [ - (python310.withPackages(ps: with ps; [ numpy toolz ])) + (python310.withPackages ( + ps: with ps; [ + numpy + toolz + ] + )) ]; } ``` @@ -891,10 +926,11 @@ building Python libraries is [`buildPythonPackage`](#buildpythonpackage-function `toolz` package. ```nix -{ lib -, buildPythonPackage -, fetchPypi -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, }: buildPythonPackage rec { @@ -952,9 +988,10 @@ The following expression creates a derivation for the `toolz` package, and adds it along with a `numpy` package to a Python environment. ```nix -with import {}; +with import { }; -( let +( + let my_toolz = python312.pkgs.buildPythonPackage rec { pname = "toolz"; version = "0.10.0"; @@ -979,10 +1016,13 @@ with import {}; }; }; - in python312.withPackages (ps: with ps; [ - numpy - my_toolz - ]) + in + python312.withPackages ( + ps: with ps; [ + numpy + my_toolz + ] + ) ).env ``` @@ -1014,18 +1054,21 @@ The following example shows which arguments are given to [`buildPythonPackage`]( order to build [`datashape`](https://github.com/blaze/datashape). ```nix -{ lib -, buildPythonPackage -, fetchPypi +{ + lib, + buildPythonPackage, + fetchPypi, -# build dependencies -, setuptools + # build dependencies + setuptools, -# dependencies -, numpy, multipledispatch, python-dateutil + # dependencies + numpy, + multipledispatch, + python-dateutil, -# tests -, pytestCheckHook + # tests + pytestCheckHook, }: buildPythonPackage rec { @@ -1072,12 +1115,13 @@ Python bindings to `libxml2` and `libxslt`. These libraries are only required when building the bindings and are therefore added as [`buildInputs`](#var-stdenv-buildInputs). ```nix -{ lib -, buildPythonPackage -, fetchPypi -, setuptools -, libxml2 -, libxslt +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + libxml2, + libxslt, }: buildPythonPackage rec { @@ -1128,19 +1172,20 @@ The bindings don't expect to find each of them in a different folder, and therefore we have to set `LDFLAGS` and `CFLAGS`. ```nix -{ lib -, buildPythonPackage -, fetchPypi +{ + lib, + buildPythonPackage, + fetchPypi, -# build dependencies -, setuptools + # build dependencies + setuptools, -# dependencies -, fftw -, fftwFloat -, fftwLongDouble -, numpy -, scipy + # dependencies + fftw, + fftwFloat, + fftwLongDouble, + numpy, + scipy, }: buildPythonPackage rec { @@ -1182,7 +1227,10 @@ buildPythonPackage rec { changelog = "https://github.com/pyFFTW/pyFFTW/releases/tag/v${version}"; description = "Pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; homepage = "http://hgomersall.github.com/pyFFTW"; - license = with lib.licenses; [ bsd2 bsd3 ]; + license = with lib.licenses; [ + bsd2 + bsd3 + ]; }; } ``` @@ -1360,17 +1408,20 @@ This is especially helpful to select tests or specify flags conditionally: ```nix { - disabledTests = [ - # touches network - "download" - "update" - ] ++ lib.optionals (pythonAtLeast "3.8") [ - # broken due to python3.8 async changes - "async" - ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ - # can fail when building with other packages - "socket" - ]; + disabledTests = + [ + # touches network + "download" + "update" + ] + ++ lib.optionals (pythonAtLeast "3.8") [ + # broken due to python3.8 async changes + "async" + ] + ++ lib.optionals stdenv.buildPlatform.isDarwin [ + # can fail when building with other packages + "socket" + ]; } ``` @@ -1495,7 +1546,9 @@ automatically add `pythonRelaxDepsHook` if either `pythonRelaxDeps` or ]; unittestFlags = [ - "-s" "tests" "-v" + "-s" + "tests" + "-v" ]; } ``` @@ -1576,10 +1629,11 @@ Let's split the package definition from the environment definition. We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` ```nix -{ lib -, buildPythonPackage -, fetchPypi -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, }: buildPythonPackage rec { @@ -1609,13 +1663,15 @@ It takes an argument [`buildPythonPackage`](#buildpythonpackage-function). We no `callPackage` in the definition of our environment ```nix -with import {}; +with import { }; -( let +( + let toolz = callPackage /path/to/toolz/release.nix { buildPythonPackage = python3Packages.buildPythonPackage; }; - in python3.withPackages (ps: [ + in + python3.withPackages (ps: [ ps.numpy toolz ]) @@ -1643,20 +1699,27 @@ We can override the interpreter and pass `packageOverrides`. In the following example we rename the `pandas` package and build it. ```nix -with import {}; +with import { }; -(let - python = let - packageOverrides = self: super: { - pandas = super.pandas.overridePythonAttrs(old: {name="foo";}); - }; - in pkgs.python310.override { - inherit packageOverrides; - }; +( + let + python = + let + packageOverrides = self: super: { + pandas = super.pandas.overridePythonAttrs (old: { + name = "foo"; + }); + }; + in + pkgs.python310.override { + inherit packageOverrides; + }; -in python.withPackages (ps: [ - ps.pandas -])).env + in + python.withPackages (ps: [ + ps.pandas + ]) +).env ``` Using `nix-build` on this expression will build an environment that contains the @@ -1670,17 +1733,20 @@ environment that uses it. All packages in the Python package set will now use the updated `scipy` version. ```nix -with import {}; +with import { }; -( let +( + let packageOverrides = self: super: { scipy = super.scipy_0_17; }; - in (pkgs.python310.override { + in + (pkgs.python310.override { inherit packageOverrides; - }).withPackages (ps: [ - ps.blaze - ]) + }).withPackages + (ps: [ + ps.blaze + ]) ).env ``` @@ -1692,15 +1758,22 @@ If you want the whole of Nixpkgs to use your modifications, then you can use ```nix let - pkgs = import {}; - newpkgs = import pkgs.path { overlays = [ (self: super: { - python310 = let - packageOverrides = python-self: python-super: { - numpy = python-super.numpy_1_18; - }; - in super.python310.override {inherit packageOverrides;}; - } ) ]; }; -in newpkgs.inkscape + pkgs = import { }; + newpkgs = import pkgs.path { + overlays = [ + (self: super: { + python310 = + let + packageOverrides = python-self: python-super: { + numpy = python-super.numpy_1_18; + }; + in + super.python310.override { inherit packageOverrides; }; + }) + ]; + }; +in +newpkgs.inkscape ``` ### `python setup.py bdist_wheel` cannot create .whl {#python-setup.py-bdist_wheel-cannot-create-.whl} @@ -1790,7 +1863,8 @@ with import { }; let pythonPackages = python3Packages; -in pkgs.mkShell rec { +in +pkgs.mkShell rec { name = "impurePythonEnv"; venvDir = "./.venv"; buildInputs = [ @@ -1845,7 +1919,8 @@ with import { }; let venvDir = "./.venv"; pythonPackages = python3Packages; -in pkgs.mkShell rec { +in +pkgs.mkShell rec { name = "impurePythonEnv"; buildInputs = [ pythonPackages.python @@ -1957,13 +2032,11 @@ The following overlay overrides the call to [`buildPythonPackage`](#buildpythonp ```nix final: prev: { pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ - ( - python-final: python-prev: { - foo = python-prev.foo.overridePythonAttrs (oldAttrs: { - # ... - }); - } - ) + (python-final: python-prev: { + foo = python-prev.foo.overridePythonAttrs (oldAttrs: { + # ... + }); + }) ]; } ``` @@ -1989,13 +2062,14 @@ interpreter of interest, e.g using ```nix let - pkgs = import ./. {}; + pkgs = import ./. { }; mypython = pkgs.python3.override { enableOptimizations = true; reproducibleBuild = false; self = mypython; }; -in mypython +in +mypython ``` ### How to add optional dependencies? {#python-optional-dependencies} @@ -2061,8 +2135,9 @@ Occasionally packages don't make use of a common test framework, which may then #### Common issues {#common-issues} -* Tests that attempt to access `$HOME` can be fixed by using the following - work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)` +* Tests that attempt to access `$HOME` can be fixed by using `writableTmpDirAsHomeHook` in + `nativeCheckInputs`, which sets up a writable temporary directory as the home directory. Alternatively, + you can achieve the same effect manually (e.g. in `preCheck`) with: `export HOME=$(mktemp -d)`. * Compiling with Cython causes tests to fail with a `ModuleNotLoadedError`. This can be fixed with two changes in the derivation: 1) replacing `pytest` with `pytestCheckHook` and 2) adding a `preCheck` containing `cd $out` to run diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index 9b3d1e054a62..cdbcb3aefb7c 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -64,14 +64,18 @@ and then create wrappers manually in `fixupPhase`, using `wrapQtApp`, which itse The `makeWrapper` arguments required for Qt are also exposed in the environment as `$qtWrapperArgs`. ```nix -{ stdenv, lib, wrapQtAppsHook }: +{ + stdenv, + lib, + wrapQtAppsHook, +}: stdenv.mkDerivation { # ... nativeBuildInputs = [ wrapQtAppsHook ]; dontWrapQtApps = true; preFixup = '' - wrapQtApp "$out/bin/myapp" --prefix PATH : /path/to/bin + wrapQtApp "$out/bin/myapp" --prefix PATH : /path/to/bin ''; } ``` diff --git a/doc/languages-frameworks/r.section.md b/doc/languages-frameworks/r.section.md index d25c5e848232..efbd170cd034 100644 --- a/doc/languages-frameworks/r.section.md +++ b/doc/languages-frameworks/r.section.md @@ -7,18 +7,22 @@ use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix fil ```nix { - packageOverrides = super: let self = super.pkgs; in + packageOverrides = + super: + let + self = super.pkgs; + in { - rEnv = super.rWrapper.override { - packages = with self.rPackages; [ - devtools - ggplot2 - reshape2 - yaml - optparse - ]; - }; + rEnv = super.rWrapper.override { + packages = with self.rPackages; [ + devtools + ggplot2 + reshape2 + yaml + optparse + ]; + }; }; } ``` @@ -33,7 +37,7 @@ environment available for other contributors, you can create a `default.nix` file like so: ```nix -with import {}; +with import { }; { myProject = stdenv.mkDerivation { name = "myProject"; @@ -60,16 +64,20 @@ environment, see `rstudioWrapper`, which functions similarly to ```nix { - packageOverrides = super: let self = super.pkgs; in + packageOverrides = + super: + let + self = super.pkgs; + in { - rstudioEnv = super.rstudioWrapper.override { - packages = with self.rPackages; [ - dplyr - ggplot2 - reshape2 - ]; - }; + rstudioEnv = super.rstudioWrapper.override { + packages = with self.rPackages; [ + dplyr + ggplot2 + reshape2 + ]; + }; }; } ``` @@ -81,13 +89,17 @@ Alternatively, you can create a self-contained `shell.nix` without the need to modify any configuration files: ```nix -{ pkgs ? import {} +{ + pkgs ? import { }, }: pkgs.rstudioWrapper.override { - packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ]; + packages = with pkgs.rPackages; [ + dplyr + ggplot2 + reshape2 + ]; } - ``` Executing `nix-shell` will then drop you into an environment equivalent to the diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md index 41985e755188..d11078aacaf2 100644 --- a/doc/languages-frameworks/ruby.section.md +++ b/doc/languages-frameworks/ruby.section.md @@ -36,8 +36,13 @@ As explained [in the `nix-shell` section](https://nixos.org/manual/nix/stable/co Say we want to have Ruby, `nokogori`, and `pry`. Consider a `shell.nix` file with: ```nix -with import {}; -ruby.withPackages (ps: with ps; [ nokogiri pry ]) +with import { }; +ruby.withPackages ( + ps: with ps; [ + nokogiri + pry + ] +) ``` What's happening here? @@ -107,7 +112,13 @@ let name = "gems-for-some-project"; gemdir = ./.; }; -in mkShell { packages = [ gems gems.wrappedRuby ]; } +in +mkShell { + packages = [ + gems + gems.wrappedRuby + ]; +} ``` With this file in your directory, you can run `nix-shell` to build and use the gems. The important parts here are `bundlerEnv` and `wrappedRuby`. @@ -118,7 +129,12 @@ One common issue that you might have is that you have Ruby, but also `bundler` i ```nix # ... -mkShell { buildInputs = [ gems (lowPrio gems.wrappedRuby) ]; } +mkShell { + buildInputs = [ + gems + (lowPrio gems.wrappedRuby) + ]; +} ``` Sometimes a Gemfile references other files. Such as `.ruby-version` or vendored gems. When copying the Gemfile to the nix store we need to copy those files alongside. This can be done using `extraConfigPaths`. For example: @@ -148,41 +164,54 @@ Two places that allow this modification are the `ruby` derivation, or `bundlerEn Here's the `ruby` one: ```nix -{ pg_version ? "10", pkgs ? import { } }: +{ + pg_version ? "10", + pkgs ? import { }, +}: let myRuby = pkgs.ruby.override { defaultGemConfig = pkgs.defaultGemConfig // { pg = attrs: { - buildFlags = - [ "--with-pg-config=${pkgs."postgresql_${pg_version}".pg_config}/bin/pg_config" ]; + buildFlags = [ "--with-pg-config=${pkgs."postgresql_${pg_version}".pg_config}/bin/pg_config" ]; }; }; }; -in myRuby.withPackages (ps: with ps; [ pg ]) +in +myRuby.withPackages (ps: with ps; [ pg ]) ``` And an example with `bundlerEnv`: ```nix -{ pg_version ? "10", pkgs ? import { } }: +{ + pg_version ? "10", + pkgs ? import { }, +}: let gems = pkgs.bundlerEnv { name = "gems-for-some-project"; gemdir = ./.; gemConfig = pkgs.defaultGemConfig // { pg = attrs: { - buildFlags = - [ "--with-pg-config=${pkgs."postgresql_${pg_version}".pg_config}/bin/pg_config" ]; + buildFlags = [ "--with-pg-config=${pkgs."postgresql_${pg_version}".pg_config}/bin/pg_config" ]; }; }; }; -in mkShell { buildInputs = [ gems gems.wrappedRuby ]; } +in +mkShell { + buildInputs = [ + gems + gems.wrappedRuby + ]; +} ``` And finally via overlays: ```nix -{ pg_version ? "10" }: +{ + pg_version ? "10", +}: let pkgs = import { overlays = [ @@ -197,7 +226,8 @@ let }) ]; }; -in pkgs.ruby.withPackages (ps: with ps; [ pg ]) +in +pkgs.ruby.withPackages (ps: with ps; [ pg ]) ``` Then we can get whichever postgresql version we desire and the `pg` gem will always reference it correctly: @@ -278,7 +308,14 @@ Of course you could also make a custom `gemConfig` if you know exactly how to pa Here's another example: ```nix -{ lib, bundlerApp, makeWrapper, git, gnutar, gzip }: +{ + lib, + bundlerApp, + makeWrapper, + git, + gnutar, + gzip, +}: bundlerApp { pname = "r10k"; @@ -288,7 +325,13 @@ bundlerApp { nativeBuildInputs = [ makeWrapper ]; postBuild = '' - wrapProgram $out/bin/r10k --prefix PATH : ${lib.makeBinPath [ git gnutar gzip ]} + wrapProgram $out/bin/r10k --prefix PATH : ${ + lib.makeBinPath [ + git + gnutar + gzip + ] + } ''; } ``` diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 34ac80cac998..9f1f0603523a 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -22,16 +22,20 @@ or use [community maintained Rust toolchains](#using-community-maintained-rust-t Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`: ```nix -{ lib, fetchFromGitHub, rustPlatform }: +{ + lib, + fetchFromGitHub, + rustPlatform, +}: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "ripgrep"; version = "14.1.1"; src = fetchFromGitHub { owner = "BurntSushi"; - repo = pname; - rev = version; + repo = "ripgrep"; + tag = finalAttrs.version; hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg="; }; @@ -44,7 +48,7 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.unlicense; maintainers = [ ]; }; -} +}) ``` `buildRustPackage` requires a `cargoHash` attribute, computed over all crate sources of this package. @@ -100,21 +104,21 @@ be made invariant to the version by setting `cargoDepsName` to `pname`: ```nix -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "broot"; version = "1.2.0"; src = fetchCrate { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aDQA4A5mScX9or3Lyiv/5GyAehidnpKKE0grhbP1Ctc="; }; useFetchCargoVendor = true; cargoHash = "sha256-iDYh52rj1M5Uupvbx2WeDd/jvQZ+2A50V5rp5e2t7q4="; - cargoDepsName = pname; + cargoDepsName = finalAttrs.pname; # ... -} +}) ``` ### Importing a `Cargo.lock` file {#importing-a-cargo.lock-file} @@ -151,11 +155,13 @@ rustPlatform.buildRustPackage { pname = "myproject"; version = "1.0.0"; - cargoLock = let - fixupLockFile = path: f (builtins.readFile path); - in { - lockFileContents = fixupLockFile ./Cargo.lock; - }; + cargoLock = + let + fixupLockFile = path: f (builtins.readFile path); + in + { + lockFileContents = fixupLockFile ./Cargo.lock; + }; # ... } @@ -178,7 +184,7 @@ The output hash of each dependency that uses a git source must be specified in the `outputHashes` attribute. For example: ```nix -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "myproject"; version = "1.0.0"; @@ -203,7 +209,7 @@ For usage outside nixpkgs, `allowBuiltinFetchGit` could be used to avoid having to specify `outputHashes`. For example: ```nix -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "myproject"; version = "1.0.0"; @@ -229,12 +235,15 @@ If you want to use different features for check phase, you can use For example: ```nix -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "myproject"; version = "1.0.0"; buildNoDefaultFeatures = true; - buildFeatures = [ "color" "net" ]; + buildFeatures = [ + "color" + "net" + ]; # disable network features in tests checkFeatures = [ "color" ]; @@ -283,7 +292,10 @@ where they are known to differ. But there are ways to customize the argument: import { crossSystem = (import ).systems.examples.armhf-embedded // { rust.rustcTarget = "thumb-crazy"; - rust.platform = { foo = ""; bar = ""; }; + rust.platform = { + foo = ""; + bar = ""; + }; }; } ``` @@ -310,7 +322,7 @@ so: ```nix rustPlatform.buildRustPackage { - /* ... */ + # ... checkType = "debug"; } ``` @@ -353,7 +365,7 @@ This can be achieved with `--skip` in `checkFlags`: ```nix rustPlatform.buildRustPackage { - /* ... */ + # ... checkFlags = [ # reason for disabling test "--skip=example::tests:example_test" @@ -370,7 +382,7 @@ adapted to be compatible with cargo-nextest. ```nix rustPlatform.buildRustPackage { - /* ... */ + # ... useNextest = true; } ``` @@ -382,7 +394,7 @@ sometimes it may be necessary to disable this so the tests run consecutively. ```nix rustPlatform.buildRustPackage { - /* ... */ + # ... dontUseCargoParallelTests = true; } ``` @@ -394,7 +406,7 @@ should be built in `debug` mode, it can be configured like so: ```nix rustPlatform.buildRustPackage { - /* ... */ + # ... buildType = "debug"; } ``` @@ -415,7 +427,7 @@ source code in a reproducible way. If it is missing or out-of-date one can use the `cargoPatches` attribute to update or add it. ```nix -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { # ... cargoPatches = [ # a patch file to add/update Cargo.lock in the source code @@ -548,12 +560,13 @@ directory of the `tokenizers` project's source archive, we use `sourceRoot` to point the tooling to this directory: ```nix -{ fetchFromGitHub -, buildPythonPackage -, cargo -, rustPlatform -, rustc -, setuptools-rust +{ + fetchFromGitHub, + buildPythonPackage, + cargo, + rustPlatform, + rustc, + setuptools-rust, }: buildPythonPackage rec { @@ -562,13 +575,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "huggingface"; - repo = pname; - rev = "python-v${version}"; + repo = "tokenizers"; + tag = "python-v${version}"; hash = "sha256-rQ2hRV52naEf6PvRsWVCTN7B1oXAQGmnpJw4iIdhamw="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src sourceRoot; + inherit + pname + version + src + sourceRoot + ; hash = "sha256-RO1m8wEd5Ic2M9q+zFHeCJWhCr4Sv3CEWd08mkxsBec="; }; @@ -593,12 +611,12 @@ following example, the crate is in `src/rust`, as specified in the path for `fetchCargoVendor`. ```nix - -{ buildPythonPackage -, fetchPypi -, rustPlatform -, setuptools-rust -, openssl +{ + buildPythonPackage, + fetchPypi, + rustPlatform, + setuptools-rust, + openssl, }: buildPythonPackage rec { @@ -632,10 +650,11 @@ builds the `retworkx` Python package. `fetchCargoVendor` and `maturinBuildHook` is used to perform the build. ```nix -{ lib -, buildPythonPackage -, rustPlatform -, fetchFromGitHub +{ + lib, + buildPythonPackage, + rustPlatform, + fetchFromGitHub, }: buildPythonPackage rec { @@ -646,7 +665,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Qiskit"; repo = "retworkx"; - rev = version; + tag = version; hash = "sha256-11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20="; }; @@ -655,7 +674,10 @@ buildPythonPackage rec { hash = "sha256-QsPCQhNZKYCAogQriQX6pBYQUDAIUsEdRX/63dAqTzg="; }; - nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; # ... } @@ -666,23 +688,24 @@ buildPythonPackage rec { Some projects, especially GNOME applications, are built with the Meson Build System instead of calling Cargo directly. Using `rustPlatform.buildRustPackage` may successfully build the main program, but related files will be missing. Instead, you need to set up Cargo dependencies with `fetchCargoVendor` and `cargoSetupHook` and leave the rest to Meson. `rust` and `cargo` are still needed in `nativeBuildInputs` for Meson to use. ```nix -{ lib -, stdenv -, fetchFromGitLab -, meson -, ninja -, pkg-config -, rustPlatform -, rustc -, cargo -, wrapGAppsHook4 -, blueprint-compiler -, libadwaita -, libsecret -, tinysparql +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + rustPlatform, + rustc, + cargo, + wrapGAppsHook4, + blueprint-compiler, + libadwaita, + libsecret, + tinysparql, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "health"; version = "0.95.0"; @@ -690,12 +713,12 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "health"; - rev = version; + tag = finalAttrs.version; hash = "sha256-PrNPprSS98yN8b8yw2G6hzTSaoE65VbsM3q7FVB4mds="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; + inherit (finalAttrs) pname version src; hash = "sha256-eR1ZGtTZQNhofFUEjI7IX16sMKPJmAl7aIFfPJukecg="; }; @@ -717,7 +740,7 @@ stdenv.mkDerivation rec { ]; # ... -} +}) ``` ## `buildRustCrate`: Compiling Rust crates using Nix instead of Cargo {#compiling-rust-crates-using-nix-instead-of-cargo} @@ -744,8 +767,8 @@ Starting from that file, one can add more overrides, to add features or build inputs by overriding the hello crate in a separate file. ```nix -with import {}; -((import ./hello.nix).hello {}).override { +with import { }; +((import ./hello.nix).hello { }).override { crateOverrides = defaultCrateOverrides // { hello = attrs: { buildInputs = [ openssl ]; }; }; @@ -764,15 +787,17 @@ the override above can be read, as in the following example, which patches the derivation: ```nix -with import {}; -((import ./hello.nix).hello {}).override { +with import { }; +((import ./hello.nix).hello { }).override { crateOverrides = defaultCrateOverrides // { - hello = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") { - postPatch = '' - substituteInPlace lib/zoneinfo.rs \ - --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" - ''; - }; + hello = + attrs: + lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") { + postPatch = '' + substituteInPlace lib/zoneinfo.rs \ + --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + ''; + }; }; } ``` @@ -785,10 +810,10 @@ dependencies. For instance, to override the build inputs for crate crate, we could do: ```nix -with import {}; -((import hello.nix).hello {}).override { +with import { }; +((import hello.nix).hello { }).override { crateOverrides = defaultCrateOverrides // { - libc = attrs: { buildInputs = []; }; + libc = attrs: { buildInputs = [ ]; }; }; } ``` @@ -801,27 +826,27 @@ general. A number of other parameters can be overridden: - The version of `rustc` used to compile the crate: ```nix - (hello {}).override { rust = pkgs.rust; } + (hello { }).override { rust = pkgs.rust; } ``` - Whether to build in release mode or debug mode (release mode by default): ```nix - (hello {}).override { release = false; } + (hello { }).override { release = false; } ``` - Whether to print the commands sent to `rustc` when building (equivalent to `--verbose` in cargo: ```nix - (hello {}).override { verbose = false; } + (hello { }).override { verbose = false; } ``` - Extra arguments to be passed to `rustc`: ```nix - (hello {}).override { extraRustcOpts = "-Z debuginfo=2"; } + (hello { }).override { extraRustcOpts = "-Z debuginfo=2"; } ``` - Phases, just like in any other derivation, can be specified using @@ -833,9 +858,9 @@ general. A number of other parameters can be overridden: before running the build script: ```nix - (hello {}).override { + (hello { }).override { preConfigure = '' - echo "pub const PATH=\"${hi.out}\";" >> src/path.rs" + echo "pub const PATH=\"${hi.out}\";" >> src/path.rs" ''; } ``` @@ -856,12 +881,13 @@ Using the example `hello` project above, we want to do the following: A typical `shell.nix` might look like: ```nix -with import {}; +with import { }; stdenv.mkDerivation { name = "rust-env"; nativeBuildInputs = [ - rustc cargo + rustc + cargo # Example Build-time Additional Dependencies pkg-config @@ -917,15 +943,13 @@ Here is a simple `shell.nix` that provides Rust nightly (default profile) using ```nix with import { }; let - fenix = callPackage - (fetchFromGitHub { - owner = "nix-community"; - repo = "fenix"; - # commit from: 2023-03-03 - rev = "e2ea04982b892263c4d939f1cc3bf60a9c4deaa1"; - hash = "sha256-AsOim1A8KKtMWIxG+lXh5Q4P2bhOZjoUhFWJ1EuZNNk="; - }) - { }; + fenix = callPackage (fetchFromGitHub { + owner = "nix-community"; + repo = "fenix"; + # commit from: 2023-03-03 + rev = "e2ea04982b892263c4d939f1cc3bf60a9c4deaa1"; + hash = "sha256-AsOim1A8KKtMWIxG+lXh5Q4P2bhOZjoUhFWJ1EuZNNk="; + }) { }; in mkShell { name = "rust-env"; @@ -964,8 +988,7 @@ You can also use Rust nightly to build rust packages using `makeRustPlatform`. The below snippet demonstrates invoking `buildRustPackage` with a Rust toolchain from oxalica's overlay: ```nix -with import -{ +with import { overlays = [ (import (fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz")) ]; @@ -977,29 +1000,33 @@ let }; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "ripgrep"; version = "14.1.1"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; - rev = version; + tag = finalAttrs.version; hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg="; }; useFetchCargoVendor = true; cargoHash = "sha256-9atn5qyBDy4P6iUoHFhg+TV6Ur71fiah4oTJbBMeEy4="; + # Tests require network access. Skipping. doCheck = false; meta = { description = "Fast line-oriented regex search tool, similar to ag and ack"; homepage = "https://github.com/BurntSushi/ripgrep"; - license = with lib.licenses; [ mit unlicense ]; - maintainers = with lib.maintainers; []; + license = with lib.licenses; [ + mit + unlicense + ]; + maintainers = with lib.maintainers; [ ]; }; -} +}) ``` Follow the below steps to try that snippet. @@ -1029,19 +1056,28 @@ with the path into which you have `git clone`d the `rustc` git repository: ```nix - (final: prev: /*lib.optionalAttrs prev.stdenv.targetPlatform.isAarch64*/ { - rust_1_72 = - lib.updateManyAttrsByPath [{ - path = [ "packages" "stable" ]; - update = old: old.overrideScope(final: prev: { - rustc-unwrapped = prev.rustc-unwrapped.overrideAttrs (_: { - src = lib.cleanSource /git/scratch/rust; - # do *not* put passthru.isReleaseTarball=true here - }); - }); - }] - prev.rust_1_72; - }) +( + final: prev: # lib.optionalAttrs prev.stdenv.targetPlatform.isAarch64 + { + rust_1_72 = lib.updateManyAttrsByPath [ + { + path = [ + "packages" + "stable" + ]; + update = + old: + old.overrideScope ( + final: prev: { + rustc-unwrapped = prev.rustc-unwrapped.overrideAttrs (_: { + src = lib.cleanSource /git/scratch/rust; + # do *not* put passthru.isReleaseTarball=true here + }); + } + ); + } + ] prev.rust_1_72; + }) ``` If the problem you're troubleshooting only manifests when diff --git a/doc/languages-frameworks/swift.section.md b/doc/languages-frameworks/swift.section.md index 88d98deeb2dd..b9d4b5a7cba8 100644 --- a/doc/languages-frameworks/swift.section.md +++ b/doc/languages-frameworks/swift.section.md @@ -69,42 +69,55 @@ This produces some files in a directory `nix`, which will be part of your Nix expression. The next step is to write that expression: ```nix -{ stdenv, swift, swiftpm, swiftpm2nix, fetchFromGitHub }: +{ + stdenv, + swift, + swiftpm, + swiftpm2nix, + fetchFromGitHub, +}: let # Pass the generated files to the helper. generated = swiftpm2nix.helpers ./nix; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "myproject"; version = "0.0.0"; src = fetchFromGitHub { owner = "nixos"; - repo = pname; - rev = version; - hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + repo = "myproject"; + tag = finalAttrs.version; + hash = ""; }; # Including SwiftPM as a nativeBuildInput provides a buildPhase for you. # This by default performs a release build using SwiftPM, essentially: # swift build -c release - nativeBuildInputs = [ swift swiftpm ]; + nativeBuildInputs = [ + swift + swiftpm + ]; # The helper provides a configure snippet that will prepare all dependencies # in the correct place, where SwiftPM expects them. configurePhase = generated.configure; installPhase = '' + runHook preInstall + # This is a special function that invokes swiftpm to find the location # of the binaries it produced. binPath="$(swiftpmBinPath)" # Now perform any installation steps. mkdir -p $out/bin cp $binPath/myproject $out/bin/ + + runHook postInstall ''; -} +}) ``` ### Custom build flags {#ssec-swiftpm-custom-build-flags} diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md index a31a4357a22f..b3a13dc8b8d2 100644 --- a/doc/languages-frameworks/texlive.section.md +++ b/doc/languages-frameworks/texlive.section.md @@ -10,7 +10,13 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c - Packages cannot be used directly but must be assembled in an environment. To create or add packages to an environment, use ```nix - texliveSmall.withPackages (ps: with ps; [ collection-langkorean algorithms cm-super ]) + texliveSmall.withPackages ( + ps: with ps; [ + collection-langkorean + algorithms + cm-super + ] + ) ``` The function `withPackages` can be called multiple times to add more packages. @@ -18,12 +24,14 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c - `texlive.withPackages` uses the same logic as `buildEnv`. Only parts of a package are installed in an environment: its 'runtime' files (`tex` output), binaries (`out` output), and support files (`tlpkg` output). Moreover, man and info pages are assembled into separate `man` and `info` outputs. To add only the TeX files of a package, or its documentation (`texdoc` output), just specify the outputs: ```nix - texlive.withPackages (ps: with ps; [ - texdoc # recommended package to navigate the documentation - perlPackages.LaTeXML.tex # tex files of LaTeXML, omit binaries - cm-super - cm-super.texdoc # documentation of cm-super - ]) + texlive.withPackages ( + ps: with ps; [ + texdoc # recommended package to navigate the documentation + perlPackages.LaTeXML.tex # tex files of LaTeXML, omit binaries + cm-super + cm-super.texdoc # documentation of cm-super + ] + ) ``` - All packages distributed by TeX Live, which contains most of CTAN, are available and can be found under `texlive.pkgs`: @@ -50,7 +58,12 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c ```nix texlive.combine { - inherit (texlive) scheme-small collection-langkorean algorithms cm-super; + inherit (texlive) + scheme-small + collection-langkorean + algorithms + cm-super + ; } ``` @@ -61,8 +74,8 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c ```nix texlive.combine { # inherit (texlive) whatever-you-want; - pkgFilter = pkg: - pkg.tlType == "run" || pkg.tlType == "bin" || pkg.hasManpages || pkg.pname == "cm-super"; + pkgFilter = + pkg: pkg.tlType == "run" || pkg.tlType == "bin" || pkg.hasManpages || pkg.pname == "cm-super"; # elem tlType [ "run" "bin" "doc" "source" ] # there are also other attributes: version, name } @@ -81,18 +94,18 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c - TeX Live packages are also available under `texlive.pkgs` as derivations with outputs `out`, `tex`, `texdoc`, `texsource`, `tlpkg`, `man`, `info`. They cannot be installed outside of `texlive.combine` but are available for other uses. To repackage a font, for instance, use ```nix - stdenvNoCC.mkDerivation rec { + stdenvNoCC.mkDerivation (finalAttrs: { src = texlive.pkgs.iwona; dontUnpack = true; - inherit (src) pname version; + inherit (finalAttrs.src) pname version; installPhase = '' runHook preInstall install -Dm644 $src/fonts/opentype/nowacki/iwona/*.otf -t $out/share/fonts/opentype runHook postInstall ''; - } + }) ``` See `biber`, `iwona` for complete examples. @@ -114,14 +127,17 @@ When using `pkgFilter`, `texlive.combine` will assign `tlType` respectively `"bi Here is a (very verbose) example. See also the packages `auctex`, `eukleides`, `mftrace` for more examples. ```nix -with import {}; +with import { }; let foiltex = stdenvNoCC.mkDerivation { pname = "latex-foiltex"; version = "2.1.4b"; - outputs = [ "tex" "texdoc" ]; + outputs = [ + "tex" + "texdoc" + ]; passthru.tlDeps = with texlive; [ latex ]; srcs = [ @@ -146,11 +162,18 @@ let ''; nativeBuildInputs = [ - (texliveSmall.withPackages (ps: with ps; [ cm-super hypdoc latexmk ])) + (texliveSmall.withPackages ( + ps: with ps; [ + cm-super + hypdoc + latexmk + ] + )) # multiple-outputs.sh fails if $out is not defined (writeShellScript "force-tex-output.sh" '' out="''${tex-}" '') + writableTmpDirAsHomeHook # Need a writable $HOME for latexmk ]; dontConfigure = true; @@ -162,7 +185,6 @@ let latex foiltex.ins # Generate the documentation - export HOME=. latexmk -pdf foiltex.dtx runHook postBuild @@ -192,22 +214,24 @@ let latex_with_foiltex = texliveSmall.withPackages (_: [ foiltex ]); in - runCommand "test.pdf" { +runCommand "test.pdf" + { nativeBuildInputs = [ latex_with_foiltex ]; - } '' -cat >test.tex <test.tex < main.tex - env HOME=$(mktemp -d) lualatex -interaction=nonstopmode -output-format=pdf -output-directory=$out ./main.tex -'' +runCommandNoCC "lualatex-hello-world" + { + buildInputs = [ texliveFull ]; + } + '' + mkdir $out + echo '\documentclass{article} \begin{document} Hello world \end{document}' > main.tex + env HOME=$(mktemp -d) lualatex -interaction=nonstopmode -output-format=pdf -output-directory=$out ./main.tex + '' ``` Additionally, [the cache of a user can diverge from the nix store](https://github.com/NixOS/nixpkgs/issues/278718). diff --git a/doc/languages-frameworks/typst.section.md b/doc/languages-frameworks/typst.section.md new file mode 100644 index 000000000000..3a4910ad8489 --- /dev/null +++ b/doc/languages-frameworks/typst.section.md @@ -0,0 +1,73 @@ +# Typst {#typst} + +Typst can be configured to include packages from [Typst Universe](https://typst.app/universe/) or custom packages. + +## Custom Environment {#typst-custom-environment} + +You can create a custom Typst environment with a selected set of packages from **Typst Universe** using the following code. It is also possible to specify a Typst package with a specific version (e.g., `cetz_0_3_0`). A package without a version number will always refer to its latest version. + +```nix +typst.withPackages ( + p: with p; [ + polylux_0_4_0 + cetz_0_3_0 + ] +) +``` + +### Handling Outdated Package Hashes {#typst-handling-outdated-package-hashes} + +Since **Typst Universe** does not provide a way to fetch a package with a specific hash, the package hashes in `nixpkgs` can sometimes be outdated. To resolve this issue, you can manually override the package source using the following approach: + +```nix +typst.withPackages.override + (old: { + typstPackages = old.typstPackages.extend ( + _: previous: { + polylux_0_4_0 = previous.polylux_0_4_0.overrideAttrs (oldPolylux: { + src = oldPolylux.src.overrideAttrs { + outputHash = YourUpToDatePolyluxHash; + }; + }); + } + ); + }) + ( + p: with p; [ + polylux_0_4_0 + cetz_0_3_0 + ] + ) +``` + +## Custom Packages {#typst-custom-packages} + +`Nixpkgs` provides a helper function, `buildTypstPackage`, to build custom Typst packages that can be used within the Typst environment. However, all dependencies of the custom package must be explicitly specified in `typstDeps`. + +Here's how to define a custom Typst package: + +```nix +{ + buildTypstPackage, + typstPackages, +}: + +buildTypstPackage (finalAttrs: { + pname = "my-typst-package"; + version = "0.0.1"; + src = ./.; + typstDeps = with typstPackages; [ cetz_0_3_0 ]; +}) +``` + +### Package Scope and Usage {#typst-package-scope-and-usage} + +By default, every custom package is scoped under `@preview`, as shown below: + +```typst +#import "@preview/my-typst-package:0.0.1": * +``` + +Since `@preview` is intended for packages from **Typst Universe**, it is recommended to use this approach **only for temporary or experimental modifications over existing packages** from **Typst Universe**. + +On the other hand, **local packages**, packages scoped under `@local`, are **not** considered part of the Typst environment. This means that local packages must be manually linked to the Typst compiler if needed. diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index da139623a25c..f42995d94693 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -47,11 +47,17 @@ To store your plugins in Vim packages (the native Vim plugin manager, see `:help vim-full.customize { vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; { # loaded on launch - start = [ youcompleteme fugitive ]; + start = [ + youcompleteme + fugitive + ]; # manually loadable by calling `:packadd $plugin-name` # however, if a Vim plugin has a dependency that is not explicitly listed in # opt that dependency will always be added to start to avoid confusion. - opt = [ phpCompletion elm-vim ]; + opt = [ + phpCompletion + elm-vim + ]; # To automatically load a plugin when opening a filetype, add vimrc lines like: # autocmd FileType php :packadd phpCompletion }; @@ -63,18 +69,19 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n ```nix { - packageOverrides = pkgs: with pkgs; { - myVim = vim-full.customize { - # `name` specifies the name of the executable and package - name = "vim-with-plugins"; - # add here code from the example section - }; - myNeovim = neovim.override { - configure = { - # add code from the example section here + packageOverrides = + pkgs: with pkgs; { + myVim = vim-full.customize { + # `name` specifies the name of the executable and package + name = "vim-with-plugins"; + # add here code from the example section + }; + myNeovim = neovim.override { + configure = { + # add code from the example section here + }; }; }; - }; } ``` @@ -100,20 +107,18 @@ let in { environment.systemPackages = [ - ( - pkgs.neovim.override { - configure = { - packages.myPlugins = with pkgs.vimPlugins; { + (pkgs.neovim.override { + configure = { + packages.myPlugins = with pkgs.vimPlugins; { start = [ vim-go # already packaged plugin easygrep # custom package ]; - opt = []; + opt = [ ]; }; # ... }; - } - ) + }) ]; } ``` @@ -129,7 +134,12 @@ plugins the following example can be used: vim-full.customize { vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; { # loaded on launch - plug.plugins = [ youcompleteme fugitive phpCompletion elm-vim ]; + plug.plugins = [ + youcompleteme + fugitive + phpCompletion + elm-vim + ]; }; } ``` @@ -147,8 +157,11 @@ Some plugins require overrides in order to function properly. Overrides are plac ```nix { - deoplete-fish = super.deoplete-fish.overrideAttrs(old: { - dependencies = with super; [ deoplete-nvim vim-fish ]; + deoplete-fish = super.deoplete-fish.overrideAttrs (old: { + dependencies = with super; [ + deoplete-nvim + vim-fish + ]; }); } ``` @@ -199,9 +212,7 @@ You can then reference the generated vim plugins via: ```nix { - myVimPlugins = pkgs.vimPlugins.extend ( - (pkgs.callPackage ./generated.nix {}) - ); + myVimPlugins = pkgs.vimPlugins.extend ((pkgs.callPackage ./generated.nix { })); } ``` diff --git a/doc/packages/cataclysm-dda.section.md b/doc/packages/cataclysm-dda.section.md index f401e9b9efa5..2e7d86f951b8 100644 --- a/doc/packages/cataclysm-dda.section.md +++ b/doc/packages/cataclysm-dda.section.md @@ -48,7 +48,7 @@ let # Unfortunately, this refers to the package before overriding and # parallel building is still disabled. - badExample = myCDDA.withMods (_: []); + badExample = myCDDA.withMods (_: [ ]); inherit (cataclysmDDA) attachPkgs pkgs wrapCDDA; @@ -66,7 +66,7 @@ in # badExample # parallel building disabled # goodExample1.withMods (_: []) # parallel building enabled -goodExample2.withMods (_: []) # parallel building enabled +goodExample2.withMods (_: [ ]) # parallel building enabled ``` ## Customizing with mods {#customizing-with-mods} @@ -75,9 +75,11 @@ To install Cataclysm DDA with mods of your choice, you can use `withMods` attribute: ```nix -cataclysm-dda.withMods (mods: with mods; [ - tileset.UndeadPeople -]) +cataclysm-dda.withMods ( + mods: with mods; [ + tileset.UndeadPeople + ] +) ``` All mods, soundpacks, and tilesets available in nixpkgs are found in @@ -88,42 +90,46 @@ in nixpkgs: ```nix let - customMods = self: super: lib.recursiveUpdate super { - # Modify existing mod - tileset.UndeadPeople = super.tileset.UndeadPeople.overrideAttrs (old: { - # If you like to apply a patch to the tileset for example - patches = [ ./path/to/your.patch ]; - }); + customMods = + self: super: + lib.recursiveUpdate super { + # Modify existing mod + tileset.UndeadPeople = super.tileset.UndeadPeople.overrideAttrs (old: { + # If you like to apply a patch to the tileset for example + patches = [ ./path/to/your.patch ]; + }); - # Add another mod - mod.Awesome = cataclysmDDA.buildMod { - modName = "Awesome"; - version = "0.x"; - src = fetchFromGitHub { - owner = "Someone"; - repo = "AwesomeMod"; - rev = "..."; - hash = "..."; + # Add another mod + mod.Awesome = cataclysmDDA.buildMod { + modName = "Awesome"; + version = "0.x"; + src = fetchFromGitHub { + owner = "Someone"; + repo = "AwesomeMod"; + rev = "..."; + hash = "..."; + }; + # Path to be installed in the unpacked source (default: ".") + modRoot = "contents/under/this/path/will/be/installed"; }; - # Path to be installed in the unpacked source (default: ".") - modRoot = "contents/under/this/path/will/be/installed"; - }; - # Add another soundpack - soundpack.Fantastic = cataclysmDDA.buildSoundPack { - # ditto - }; + # Add another soundpack + soundpack.Fantastic = cataclysmDDA.buildSoundPack { + # ditto + }; - # Add another tileset - tileset.SuperDuper = cataclysmDDA.buildTileSet { - # ditto + # Add another tileset + tileset.SuperDuper = cataclysmDDA.buildTileSet { + # ditto + }; }; - }; in -cataclysm-dda.withMods (mods: with mods.extend customMods; [ - tileset.UndeadPeople - mod.Awesome - soundpack.Fantastic - tileset.SuperDuper -]) +cataclysm-dda.withMods ( + mods: with mods.extend customMods; [ + tileset.UndeadPeople + mod.Awesome + soundpack.Fantastic + tileset.SuperDuper + ] +) ``` diff --git a/doc/packages/citrix.section.md b/doc/packages/citrix.section.md index bcf0924249bc..9b680759f461 100644 --- a/doc/packages/citrix.section.md +++ b/doc/packages/citrix.section.md @@ -28,5 +28,6 @@ let ./custom-cert-1.pem ./custom-cert-2.pem # ... ]; -in citrix_workspace.override { inherit extraCerts; } +in +citrix_workspace.override { inherit extraCerts; } ``` diff --git a/doc/packages/darwin-builder.section.md b/doc/packages/darwin-builder.section.md index 06358c790165..fb71a78d6eb3 100644 --- a/doc/packages/darwin-builder.section.md +++ b/doc/packages/darwin-builder.section.md @@ -89,58 +89,72 @@ $ sudo launchctl kickstart -k system/org.nixos.nix-daemon darwin.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, darwin, nixpkgs, ... }@inputs: - let + outputs = + { + self, + darwin, + nixpkgs, + ... + }@inputs: + let - inherit (darwin.lib) darwinSystem; - system = "aarch64-darwin"; - pkgs = nixpkgs.legacyPackages."${system}"; - linuxSystem = builtins.replaceStrings [ "darwin" ] [ "linux" ] system; + inherit (darwin.lib) darwinSystem; + system = "aarch64-darwin"; + pkgs = nixpkgs.legacyPackages."${system}"; + linuxSystem = builtins.replaceStrings [ "darwin" ] [ "linux" ] system; - darwin-builder = nixpkgs.lib.nixosSystem { - system = linuxSystem; - modules = [ - "${nixpkgs}/nixos/modules/profiles/nix-builder-vm.nix" - { virtualisation = { - host.pkgs = pkgs; - darwin-builder.workingDirectory = "/var/lib/darwin-builder"; - darwin-builder.hostPort = 22; - }; - } - ]; - }; - in { - - darwinConfigurations = { - machine1 = darwinSystem { - inherit system; + darwin-builder = nixpkgs.lib.nixosSystem { + system = linuxSystem; modules = [ + "${nixpkgs}/nixos/modules/profiles/nix-builder-vm.nix" { - nix.distributedBuilds = true; - nix.buildMachines = [{ - hostName = "localhost"; - sshUser = "builder"; - sshKey = "/etc/nix/builder_ed25519"; - system = linuxSystem; - maxJobs = 4; - supportedFeatures = [ "kvm" "benchmark" "big-parallel" ]; - }]; - - launchd.daemons.darwin-builder = { - command = "${darwin-builder.config.system.build.macos-builder-installer}/bin/create-builder"; - serviceConfig = { - KeepAlive = true; - RunAtLoad = true; - StandardOutPath = "/var/log/darwin-builder.log"; - StandardErrorPath = "/var/log/darwin-builder.log"; - }; + virtualisation = { + host.pkgs = pkgs; + darwin-builder.workingDirectory = "/var/lib/darwin-builder"; + darwin-builder.hostPort = 22; }; } ]; }; - }; + in + { - }; + darwinConfigurations = { + machine1 = darwinSystem { + inherit system; + modules = [ + { + nix.distributedBuilds = true; + nix.buildMachines = [ + { + hostName = "localhost"; + sshUser = "builder"; + sshKey = "/etc/nix/builder_ed25519"; + system = linuxSystem; + maxJobs = 4; + supportedFeatures = [ + "kvm" + "benchmark" + "big-parallel" + ]; + } + ]; + + launchd.daemons.darwin-builder = { + command = "${darwin-builder.config.system.build.macos-builder-installer}/bin/create-builder"; + serviceConfig = { + KeepAlive = true; + RunAtLoad = true; + StandardOutPath = "/var/log/darwin-builder.log"; + StandardErrorPath = "/var/log/darwin-builder.log"; + }; + }; + } + ]; + }; + }; + + }; } ``` @@ -154,21 +168,21 @@ To do this, you just need to set the `virtualisation.darwin-builder.*` parameter in the example below and rebuild. ```nix - { - darwin-builder = nixpkgs.lib.nixosSystem { - system = linuxSystem; - modules = [ - "${nixpkgs}/nixos/modules/profiles/nix-builder-vm.nix" - { - virtualisation.host.pkgs = pkgs; - virtualisation.darwin-builder.diskSize = 5120; - virtualisation.darwin-builder.memorySize = 1024; - virtualisation.darwin-builder.hostPort = 33022; - virtualisation.darwin-builder.workingDirectory = "/var/lib/darwin-builder"; - } - ]; - }; - } +{ + darwin-builder = nixpkgs.lib.nixosSystem { + system = linuxSystem; + modules = [ + "${nixpkgs}/nixos/modules/profiles/nix-builder-vm.nix" + { + virtualisation.host.pkgs = pkgs; + virtualisation.darwin-builder.diskSize = 5120; + virtualisation.darwin-builder.memorySize = 1024; + virtualisation.darwin-builder.hostPort = 33022; + virtualisation.darwin-builder.workingDirectory = "/var/lib/darwin-builder"; + } + ]; + }; +} ``` You may make any other changes to your VM in this attribute set. For example, diff --git a/doc/packages/eclipse.section.md b/doc/packages/eclipse.section.md index acf34b57571a..be554de6520b 100644 --- a/doc/packages/eclipse.section.md +++ b/doc/packages/eclipse.section.md @@ -15,11 +15,13 @@ If you prefer to install plugins in a more declarative manner, then Nixpkgs also ```nix { packageOverrides = pkgs: { - myEclipse = with pkgs.eclipses; eclipseWithPlugins { - eclipse = eclipse-platform; - jvmArgs = [ "-Xmx2048m" ]; - plugins = [ plugins.color-theme ]; - }; + myEclipse = + with pkgs.eclipses; + eclipseWithPlugins { + eclipse = eclipse-platform; + jvmArgs = [ "-Xmx2048m" ]; + plugins = [ plugins.color-theme ]; + }; }; } ``` @@ -37,32 +39,34 @@ Expanding the previous example with two plugins using the above functions, we ha ```nix { packageOverrides = pkgs: { - myEclipse = with pkgs.eclipses; eclipseWithPlugins { - eclipse = eclipse-platform; - jvmArgs = [ "-Xmx2048m" ]; - plugins = [ - plugins.color-theme - (plugins.buildEclipsePlugin { - name = "myplugin1-1.0"; - srcFeature = fetchurl { - url = "http://…/features/myplugin1.jar"; - hash = "sha256-123…"; - }; - srcPlugin = fetchurl { - url = "http://…/plugins/myplugin1.jar"; - hash = "sha256-123…"; - }; - }) - (plugins.buildEclipseUpdateSite { - name = "myplugin2-1.0"; - src = fetchurl { - stripRoot = false; - url = "http://…/myplugin2.zip"; - hash = "sha256-123…"; - }; - }) - ]; - }; + myEclipse = + with pkgs.eclipses; + eclipseWithPlugins { + eclipse = eclipse-platform; + jvmArgs = [ "-Xmx2048m" ]; + plugins = [ + plugins.color-theme + (plugins.buildEclipsePlugin { + name = "myplugin1-1.0"; + srcFeature = fetchurl { + url = "http://…/features/myplugin1.jar"; + hash = "sha256-123…"; + }; + srcPlugin = fetchurl { + url = "http://…/plugins/myplugin1.jar"; + hash = "sha256-123…"; + }; + }) + (plugins.buildEclipseUpdateSite { + name = "myplugin2-1.0"; + src = fetchurl { + stripRoot = false; + url = "http://…/myplugin2.zip"; + hash = "sha256-123…"; + }; + }) + ]; + }; }; } ``` diff --git a/doc/packages/emacs.section.md b/doc/packages/emacs.section.md index 2ced251f3e46..322ece4a348f 100644 --- a/doc/packages/emacs.section.md +++ b/doc/packages/emacs.section.md @@ -6,17 +6,21 @@ The Emacs package comes with some extra helpers to make it easier to configure. ```nix { - packageOverrides = pkgs: with pkgs; { - myEmacs = emacs.pkgs.withPackages (epkgs: (with epkgs.melpaStablePackages; [ - company - counsel - flycheck - ivy - magit - projectile - use-package - ])); - }; + packageOverrides = + pkgs: with pkgs; { + myEmacs = emacs.pkgs.withPackages ( + epkgs: + (with epkgs.melpaStablePackages; [ + company + counsel + flycheck + ivy + magit + projectile + use-package + ]) + ); + }; } ``` @@ -24,8 +28,8 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t ```nix { - packageOverrides = pkgs: with pkgs; rec { - myEmacsConfig = writeText "default.el" '' + packageOverrides = pkgs: { + myEmacsConfig = pkgs.writeText "default.el" '' (eval-when-compile (require 'use-package)) @@ -80,19 +84,22 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t (projectile-global-mode)) ''; - myEmacs = emacs.pkgs.withPackages (epkgs: (with epkgs.melpaStablePackages; [ - (runCommand "default.el" {} '' - mkdir -p $out/share/emacs/site-lisp - cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el - '') - company - counsel - flycheck - ivy - magit - projectile - use-package - ])); + myEmacs = emacs.pkgs.withPackages ( + epkgs: + (with epkgs.melpaStablePackages; [ + (runCommand "default.el" { } '' + mkdir -p $out/share/emacs/site-lisp + cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el + '') + company + counsel + flycheck + ivy + magit + projectile + use-package + ]) + ); }; } ``` @@ -108,11 +115,12 @@ let # ... }; in -((emacsPackagesFor emacs).overrideScope overrides).withPackages - (p: with p; [ +((emacsPackagesFor emacs).overrideScope overrides).withPackages ( + p: with p; [ # here both these package will use haskell-mode of our own choice ghc-mod dante - ]) + ] +) ``` } diff --git a/doc/packages/fish.section.md b/doc/packages/fish.section.md index 85b57acd1090..510d406b1ba1 100644 --- a/doc/packages/fish.section.md +++ b/doc/packages/fish.section.md @@ -42,9 +42,12 @@ way to test Fish plugins and scripts without having to alter the environment. ```nix wrapFish { - pluginPkgs = with fishPlugins; [ pure foreign-env ]; - completionDirs = []; - functionDirs = []; + pluginPkgs = with fishPlugins; [ + pure + foreign-env + ]; + completionDirs = [ ]; + functionDirs = [ ]; confDirs = [ "/path/to/some/fish/init/dir/" ]; } ``` diff --git a/doc/packages/ibus.section.md b/doc/packages/ibus.section.md index 0e379723da12..4f298db35943 100644 --- a/doc/packages/ibus.section.md +++ b/doc/packages/ibus.section.md @@ -9,7 +9,8 @@ IBus needs to be configured accordingly to activate `typing-booster`. The config On NixOS, you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module: ```nix -{ pkgs, ... }: { +{ pkgs, ... }: +{ i18n.inputMethod = { enable = true; type = "ibus"; @@ -23,7 +24,12 @@ On NixOS, you need to explicitly enable `ibus` with given engines before customi The IBus engine is based on `hunspell` to support completion in many languages. By default, the dictionaries `de-de`, `en-us`, `fr-moderne` `es-es`, `it-it`, `sv-se` and `sv-fi` are in use. To add another dictionary, the package can be overridden like this: ```nix -ibus-engines.typing-booster.override { langs = [ "de-at" "en-gb" ]; } +ibus-engines.typing-booster.override { + langs = [ + "de-at" + "en-gb" + ]; +} ``` _Note: each language passed to `langs` must be an attribute name in `pkgs.hunspellDicts`._ @@ -35,7 +41,8 @@ The `ibus-engines.typing-booster` package contains a program named `emoji-picker On NixOS, it can be installed using the following expression: ```nix -{ pkgs, ... }: { +{ pkgs, ... }: +{ fonts.packages = with pkgs; [ noto-fonts-color-emoji ]; } ``` diff --git a/doc/packages/krita.section.md b/doc/packages/krita.section.md index ba427bd62ba1..f81068d73211 100644 --- a/doc/packages/krita.section.md +++ b/doc/packages/krita.section.md @@ -23,7 +23,7 @@ list of previous plugins via `pkgs.krita.binaryPlugins`: ```nix (pkgs.krita.override (old: { - binaryPlugins = old.binaryPlugins ++ [ your-plugin ]; + binaryPlugins = old.binaryPlugins ++ [ your-plugin ]; })) ``` diff --git a/doc/packages/python-tree-sitter.section.md b/doc/packages/python-tree-sitter.section.md index e314e4f18f15..6ccaa31a6283 100644 --- a/doc/packages/python-tree-sitter.section.md +++ b/doc/packages/python-tree-sitter.section.md @@ -7,16 +7,20 @@ Python bindings for Tree Sitter grammars are provided through the [py-tree-sitte For example, to experiment with the Rust grammar, you can create a shell environment with the following configuration: ```nix -{ pkgs ? {} }: +{ + pkgs ? { }, +}: pkgs.mkShell { name = "py-tree-sitter-dev-shell"; buildInputs = with pkgs; [ - (python3.withPackages (ps: with ps; [ - tree-sitter - tree-sitter-grammars.tree-sitter-rust - ])) + (python3.withPackages ( + ps: with ps; [ + tree-sitter + tree-sitter-grammars.tree-sitter-rust + ] + )) ]; } ``` diff --git a/doc/packages/urxvt.section.md b/doc/packages/urxvt.section.md index 1d40c92ed73f..e31f0756eb19 100644 --- a/doc/packages/urxvt.section.md +++ b/doc/packages/urxvt.section.md @@ -8,9 +8,15 @@ In `nixpkgs`, urxvt is provided by the package `rxvt-unicode`. It can be configu ```nix rxvt-unicode.override { - configure = { availablePlugins, ... }: { - plugins = with availablePlugins; [ perls resize-font vtwheel ]; - }; + configure = + { availablePlugins, ... }: + { + plugins = with availablePlugins; [ + perls + resize-font + vtwheel + ]; + }; } ``` @@ -20,9 +26,11 @@ In order to add plugins but also keep all default plugins installed, it is possi ```nix rxvt-unicode.override { - configure = { availablePlugins, ... }: { - plugins = (builtins.attrValues availablePlugins) ++ [ custom-plugin ]; - }; + configure = + { availablePlugins, ... }: + { + plugins = (builtins.attrValues availablePlugins) ++ [ custom-plugin ]; + }; } ``` @@ -40,9 +48,11 @@ In addition to `plugins` the options `extraDeps` and `perlDeps` can be used to i ```nix rxvt-unicode.override { - configure = { availablePlugins, ... }: { - pluginsDeps = [ xsel ]; - }; + configure = + { availablePlugins, ... }: + { + pluginsDeps = [ xsel ]; + }; } ``` @@ -50,9 +60,11 @@ rxvt-unicode.override { ```nix rxvt-unicode.override { - configure = { availablePlugins, ... }: { - perlDeps = with perlPackages; [ AnyEvent ]; - }; + configure = + { availablePlugins, ... }: + { + perlDeps = with perlPackages; [ AnyEvent ]; + }; } ``` diff --git a/doc/packages/weechat.section.md b/doc/packages/weechat.section.md index 295397f476b0..f175547de825 100644 --- a/doc/packages/weechat.section.md +++ b/doc/packages/weechat.section.md @@ -3,9 +3,16 @@ WeeChat can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, install an expression that overrides its configuration, such as: ```nix -weechat.override {configure = ({availablePlugins, ...}: { - plugins = with availablePlugins; [ python perl ]; - }); +weechat.override { + configure = ( + { availablePlugins, ... }: + { + plugins = with availablePlugins; [ + python + perl + ]; + } + ); } ``` @@ -16,10 +23,18 @@ The plugins currently available are `python`, `perl`, `ruby`, `guile`, `tcl` and The Python and Perl plugins allows the addition of extra libraries. For instance, the `inotify.py` script in `weechat-scripts` requires D-Bus or libnotify, and the `fish.py` script requires `pycrypto`. To use these scripts, use the plugin's `withPackages` attribute: ```nix -weechat.override { configure = {availablePlugins, ...}: { - plugins = with availablePlugins; [ - (python.withPackages (ps: with ps; [ pycrypto python-dbus ])) - ]; +weechat.override { + configure = + { availablePlugins, ... }: + { + plugins = with availablePlugins; [ + (python.withPackages ( + ps: with ps; [ + pycrypto + python-dbus + ] + )) + ]; }; } ``` @@ -27,23 +42,37 @@ weechat.override { configure = {availablePlugins, ...}: { In order to also keep all default plugins installed, it is possible to use the following method: ```nix -weechat.override { configure = { availablePlugins, ... }: { - plugins = builtins.attrValues (availablePlugins // { - python = availablePlugins.python.withPackages (ps: with ps; [ pycrypto python-dbus ]); - }); -}; } +weechat.override { + configure = + { availablePlugins, ... }: + { + plugins = builtins.attrValues ( + availablePlugins + // { + python = availablePlugins.python.withPackages ( + ps: with ps; [ + pycrypto + python-dbus + ] + ); + } + ); + }; +} ``` WeeChat allows to set defaults on startup using the `--run-command`. The `configure` method can be used to pass commands to the program: ```nix weechat.override { - configure = { availablePlugins, ... }: { - init = '' - /set foo bar - /server add libera irc.libera.chat - ''; - }; + configure = + { availablePlugins, ... }: + { + init = '' + /set foo bar + /server add libera irc.libera.chat + ''; + }; } ``` @@ -53,14 +82,18 @@ Additionally, it's possible to specify scripts to be loaded when starting `weech ```nix weechat.override { - configure = { availablePlugins, ... }: { - scripts = with pkgs.weechatScripts; [ - weechat-xmpp weechat-matrix-bridge wee-slack - ]; - init = '' - /set plugins.var.python.jabber.key "val" - ''; - }; + configure = + { availablePlugins, ... }: + { + scripts = with pkgs.weechatScripts; [ + weechat-xmpp + weechat-matrix-bridge + wee-slack + ]; + init = '' + /set plugins.var.python.jabber.key "val" + ''; + }; } ``` @@ -75,7 +108,10 @@ stdenv.mkDerivation { url = "https://scripts.tld/your-scripts.tar.gz"; hash = "..."; }; - passthru.scripts = [ "foo.py" "bar.lua" ]; + passthru.scripts = [ + "foo.py" + "bar.lua" + ]; installPhase = '' mkdir $out/share cp foo.py $out/share diff --git a/doc/redirects.json b/doc/redirects.json index 15cb82504393..627b4137281d 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -413,6 +413,27 @@ "tester-testEqualArrayOrMap-return": [ "index.html#tester-testEqualArrayOrMap-return" ], + "typst": [ + "index.html#typst", + "doc/languages-frameworks/typst.section.md#typst" + ], + "typst-custom-environment": [ + "index.html#typst-custom-environment", + "doc/languages-frameworks/typst.section.md#typst-custom-environment" + ], + "typst-custom-packages": [ + "index.html#typst-custom-packages", + "doc/languages-frameworks/typst.section.md#typst-custom-packages" + ], + "typst-handling-outdated-package-hashes": [ + "index.html#typst-handling-outdated-package-hashes" + ], + "typst-package-scope-and-usage": [ + "index.html#typst-package-scope-and-usage" + ], + "var-meta-teams": [ + "index.html#var-meta-teams" + ], "variables-specifying-dependencies": [ "index.html#variables-specifying-dependencies" ], @@ -2067,6 +2088,9 @@ "setup-hook-automake": [ "index.html#setup-hook-automake" ], + "setup-hook-autopatchcilhook": [ + "index.html#setup-hook-autopatchcilhook" + ], "setup-hook-autopatchelfhook": [ "index.html#setup-hook-autopatchelfhook" ], diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 2f117e12ae18..05ecbc87f9a4 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -15,6 +15,9 @@ - GCC has been updated from GCC 13 to GCC 14. This introduces some backwards‐incompatible changes; see the [upstream porting guide](https://gcc.gnu.org/gcc-14/porting_to.html) for details. +- The default GHC version has been updated from 9.6 to 9.8. + `haskellPackages` also uses Stackage LTS 23 (instead of LTS 22) as a baseline. + - LLVM has been updated from LLVM 16 (on Darwin) and LLVM 18 (on other platforms) to LLVM 19. This introduces some backwards‐incompatible changes; see the [upstream release notes](https://releases.llvm.org/) for details. @@ -68,6 +71,8 @@ - [testers.shellcheck](https://nixos.org/manual/nixpkgs/unstable/#tester-shellcheck) now warns when `name` is not provided. The `name` argument will become mandatory in a future release. +- [GIMP 3.0](https://www.gimp.org/news/2025/03/16/gimp-3-0-released/) available as `gimp3`. + - `grafana-agent` and `services.grafana-agent` have been removed in favor of Grafana Alloy (`grafana-alloy` and `services.alloy`), as they depend on an EOL compiler version and will become EOL during the 25.05 lifecycle. @@ -91,6 +96,10 @@ Packages wishing to maintain compatibility with Nixpkgs 24.11 must set `useFetchCargoVendor` to `true` explicitly. `rustPlatform.importCargoLock` may also be appropriate in some circumstances. +- `cassandra_3_0` and `cassandra_3_11` have been removed as they have reached end-of-life. Please update to `cassandra_4`. See the [changelog](https://github.com/apache/cassandra/blob/cassandra-4.0.17/NEWS.txt) for more information about the upgrade process. + +- `mariadb_105` has been removed as it has reached end-of-life in 2025-06. Please update to `mariadb_106`. + - NetBox was updated to `>= 4.2.0`. Have a look at the breaking changes of the [4.1 release](https://github.com/netbox-community/netbox/releases/tag/v4.1.0) and the [4.2 release](https://github.com/netbox-community/netbox/releases/tag/v4.2.0), @@ -124,7 +133,7 @@ - `binwalk` was updated to 3.1.0, which has been rewritten in rust. The python module is no longer available. See the release notes of [3.1.0](https://github.com/ReFirmLabs/binwalk/releases/tag/v3.1.0) for more information. -- `pkgs.nextcloud28` has been removed since it's out of support upstream. +- `pkgs.nextcloud28` and `pkgs.nextcloud29` have been removed since they are out of support upstream. - `centrifugo` was updated to v6, which uses a new config format. See [upstream documentation](https://centrifugal.dev/docs/getting-started/migration_v6) for migration. @@ -159,6 +168,8 @@ - The `haka` package and module has been removed because the package was broken and unmaintained for 9 years. +- The `gsignond` package, plugins and module have been removed because they were unmaintained for 6 years. + - `strawberry` has been updated to 1.2, which drops support for the VLC backend and Qt 5. The `strawberry-qt5` package and `withGstreamer`/`withVlc` override options have been removed due to this. @@ -183,6 +194,8 @@ - `mkBinaryCache` now defaults to using `zstd` compression for the binary caches it creates. The previous `xz` compression method can be used by passing `compression = "xz";`. +- `nodejs_latest` was updated from 23.x to 24.x. `nodejs_23` has been removed in favor of `nodejs_24`. + - `nodePackages."@commitlint/config-conventional"` has been removed, as it is a library, and projects should depend on it instead. - zigbee2mqtt is now available in version 2.x as `zigbee2mqtt_2`. In NixOS 25.11 we'll remove `zigbee2mqtt_1` and default to `zigbee2mqtt_2`. See the [breaking changes](https://github.com/Koenkk/zigbee2mqtt/discussions/24198) announcement for 2.0.0. @@ -203,6 +216,8 @@ - `pnpm` was updated to version 10. If your project is incompatible, you can install the previous version from the package attribute `pnpm_9`. +- `dwarf-fortress-packages` now only contains one minor version for each major version since version 0.44. Saves should still be compatible, but you may have to change which minor version you were using if it was one other than the newest. + - `zig_0_9` and `zig_0_10` have been removed, you should upgrade to `zig_0_13` (also available as just `zig`), `zig_0_12` or `zig_0_11` instead. - `webpack-cli` was updated to major version 6, which has breaking changes from the previous version 5.1.4. See the [upstream release notes](https://github.com/webpack/webpack-cli/releases/tag/webpack-cli%406.0.0) for details on these changes. @@ -309,7 +324,7 @@ add `vimPlugins.notmuch-vim` to your (Neo)vim configuration if you want the vim plugin. -- `prisma` and `prisma-engines` have been updated to version 6.3.0, which +- `prisma` and `prisma-engines` have been updated to version 6.6.0, which introduces several breaking changes. See the [Prisma ORM upgrade guide](https://www.prisma.io/docs/orm/more/upgrade-guides/upgrading-versions/upgrading-to-prisma-6) for more information. @@ -343,14 +358,20 @@ - Many androidenv packages are now searchable on [search.nixos.org](https://search.nixos.org). - We now use the latest Google repositories, which should improve aarch64-darwin compatibility. The SDK now additionally evaluates on aarch64-linux, though not all packages are functional. +- `dwarf-fortress` audio now works again. Additionally, the `dfhack` and `dwarf-fortress-full` packages are now exposed at toplevel, making it easier to install and play Dwarf Fortress. Note that `dwarf-fortress-full` is the Nixpkgs equivalent of the Dwarf Fortress Lazy Pack. + - `gerbera` now has wavpack support. - GOverlay has been updated to 1.2, please check the [upstream changelog](https://github.com/benjamimgois/goverlay/releases) for more details. +- `tpm2-pkcs11` now has the variant `tpm2-pkcs11-fapi`, which has been patched to default to the Feature API backend. It has also been split into `tpm2-pkcs11-esapi`, which _only_ supports the older Enhanced System API backend. Note the [differences](https://github.com/tpm2-software/tpm2-pkcs11/blob/1.9.1/docs/FAPI.md), and that `tpm2-pkcs11` itself still needs `TPM2_PKCS11_BACKEND=fapi` exported in order to use the Feature API, whereas `tpm2-pkcs11-fapi` does not, and `tpm2-pkcs11-esapi` just does not support fapi entirely. + - For matrix homeserver Synapse we are now following the upstream recommendation to enable jemalloc as the memory allocator by default. - In `dovecot` package removed hard coding path to module directory. +- `signal-desktop` has been migrated to a from source build. No state migration is necessary. In case there's no working source build available (like on Darwin), the the binary build is still available at `signal-desktop-bin`. + - `ddclient` was updated from 3.11.2 to 4.0.0 [Release notes](https://github.com/ddclient/ddclient/releases/tag/v4.0.0) ### NexusMods.App upgraded {#sec-nixpkgs-release-25.05-incompatibilities-nexusmods-app-upgraded} @@ -391,6 +412,10 @@ - `lib.types.coercedTo` - `lib.types.either` +- The `testTarget` argument of `haskellPackages.mkDerivation` has been deprecated in favour of `testTargets`. + `testTarget` took a space separated string of targets, whereas the new `testTargets` argument takes a list of targets. + For instance, `testTarget = "foo bar baz"` should become `testTargets = [ "foo" "bar" "baz" ]`. + - Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6. - `rustPlatform.buildRustPackage` stops handling the deprecated argument `cargoSha256`. Out-of-tree packages that haven't migrated from `cargoSha256` to `cargoHash` now receive errors. diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md index b06a8ab93a70..e115d9d103ae 100644 --- a/doc/stdenv/cross-compilation.chapter.md +++ b/doc/stdenv/cross-compilation.chapter.md @@ -15,7 +15,13 @@ Nixpkgs follows the [conventions of GNU autoconf](https://gcc.gnu.org/onlinedocs In Nixpkgs, these three platforms are defined as attribute sets under the names `buildPlatform`, `hostPlatform`, and `targetPlatform`. They are always defined as attributes in the standard environment. That means one can access them like: ```nix -{ stdenv, fooDep, barDep, ... }: { +{ + stdenv, + fooDep, + barDep, + ... +}: +{ # ...stdenv.buildPlatform... } ``` @@ -169,11 +175,13 @@ e.g. ```nix { - nativeBuildInputs = [ - meson - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; + nativeBuildInputs = + [ + meson + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; } ``` diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index ddd5eb45441a..908b97cac224 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -91,6 +91,10 @@ For details, see [Source provenance](#sec-meta-sourceProvenance). A list of the maintainers of this Nix expression. Maintainers are defined in [`nixpkgs/maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix). There is no restriction to becoming a maintainer, just add yourself to that list in a separate commit titled “maintainers: add alice” in the same pull request, and reference maintainers with `maintainers = with lib.maintainers; [ alice bob ]`. +### `teams` {#var-meta-teams} + +A list of the teams of this Nix expression. Teams are defined in [`nixpkgs/maintainers/team-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/team-list.nix), and can be defined in a package with `meta.teams = with lib.teams; [ team1 team2 ]`. + ### `mainProgram` {#var-meta-mainProgram} The name of the main binary for the package. This affects the binary `nix run` executes. Example: `"rg"` @@ -145,7 +149,7 @@ The list of Nix platform types for which the [Hydra](https://github.com/nixos/hy ```nix { meta.platforms = lib.platforms.linux; - meta.hydraPlatforms = []; + meta.hydraPlatforms = [ ]; } ``` @@ -169,7 +173,12 @@ This means that `broken` can be used to express constraints, for example: ```nix { - meta.broken = lib.all (map (p: p.meta.broken) [ glibc musl ]); + meta.broken = lib.all ( + map (p: p.meta.broken) [ + glibc + musl + ] + ); } ``` diff --git a/doc/stdenv/multiple-output.chapter.md b/doc/stdenv/multiple-output.chapter.md index 09fdba01c44a..9140f5a952b7 100644 --- a/doc/stdenv/multiple-output.chapter.md +++ b/doc/stdenv/multiple-output.chapter.md @@ -31,7 +31,12 @@ In nixpkgs there is a framework supporting multiple-output derivations. It tries ```nix { - outputs = [ "bin" "dev" "out" "doc" ]; + outputs = [ + "bin" + "dev" + "out" + "doc" + ]; } ``` diff --git a/doc/stdenv/passthru.chapter.md b/doc/stdenv/passthru.chapter.md index 0c0b03fd0dc2..db40d4bbe054 100644 --- a/doc/stdenv/passthru.chapter.md +++ b/doc/stdenv/passthru.chapter.md @@ -18,7 +18,9 @@ Its value can be accessed as if it was set inside a derivation. let hello = stdenv.mkDerivation { pname = "hello"; - src = fetchGit { /* ... */ }; + src = fetchGit { + # ... + }; passthru = { foo = "bar"; diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index b3bbab57eed2..2574de140b73 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -20,14 +20,14 @@ stdenv.mkDerivation { **Since [RFC 0035](https://github.com/NixOS/rfcs/pull/35), this is preferred for packages in Nixpkgs**, as it allows us to reuse the version easily: ```nix -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libfoo"; version = "1.2.3"; src = fetchurl { - url = "http://example.org/libfoo-source-${version}.tar.bz2"; + url = "http://example.org/libfoo-source-${finalAttrs.version}.tar.bz2"; hash = "sha256-tWxU/LANbQE32my+9AXyt3nCT7NBVfJ45CX757EMT3Q="; }; -} +}) ``` Many packages have dependencies that are not provided in the standard environment. It’s usually sufficient to specify those dependencies in the `buildInputs` attribute: @@ -37,7 +37,11 @@ stdenv.mkDerivation { pname = "libfoo"; version = "1.2.3"; # ... - buildInputs = [libbar perl ncurses]; + buildInputs = [ + libbar + perl + ncurses + ]; } ``` @@ -49,13 +53,24 @@ Often it is necessary to override or modify some aspect of the build. To make th stdenv.mkDerivation { pname = "fnord"; version = "4.5"; + # ... + buildPhase = '' + runHook preBuild + gcc foo.c -o foo + + runHook postBuild ''; + installPhase = '' + runHook preInstall + mkdir -p $out/bin cp foo $out/bin + + runHook postInstall ''; } ``` @@ -208,16 +223,20 @@ These dependencies are only injected when [`doCheck`](#var-stdenv-doCheck) is se Consider for example this simplified derivation for `solo5`, a sandboxing tool: ```nix -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "solo5"; version = "0.7.5"; src = fetchurl { - url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz"; + url = "https://github.com/Solo5/solo5/releases/download/v${finalAttrs.version}/solo5-v${finalAttrs.version}.tar.gz"; hash = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw="; }; - nativeBuildInputs = [ makeWrapper pkg-config ]; + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + buildInputs = [ libseccomp ]; postInstall = '' @@ -227,13 +246,23 @@ stdenv.mkDerivation rec { --replace-fail "cp " "cp --no-preserve=mode " wrapProgram $out/bin/solo5-virtio-mkimage \ - --prefix PATH : ${lib.makeBinPath [ dosfstools mtools parted syslinux ]} + --prefix PATH : ${ + lib.makeBinPath [ + dosfstools + mtools + parted + syslinux + ] + } ''; doCheck = true; - nativeCheckInputs = [ util-linux qemu ]; - checkPhase = '' [elided] ''; -} + nativeCheckInputs = [ + util-linux + qemu + ]; + checkPhase = ''[elided]''; +}) ``` - `makeWrapper` is a setup hook, i.e., a shell script sourced by the generic builder of `stdenv`. @@ -272,7 +301,7 @@ This can lead to conflicting dependencies that cannot easily be resolved. # A propagated dependency ```nix -with import {}; +with import { }; let bar = stdenv.mkDerivation { name = "bar"; @@ -442,8 +471,7 @@ If you pass a function to `mkDerivation`, it will receive as its argument the fi mkDerivation (finalAttrs: { pname = "hello"; withFeature = true; - configureFlags = - lib.optionals finalAttrs.withFeature ["--with-feature"]; + configureFlags = lib.optionals finalAttrs.withFeature [ "--with-feature" ]; }) ``` @@ -460,28 +488,32 @@ various bindings: ```nix # `pkg` is the _original_ definition (for illustration purposes) -let pkg = - mkDerivation (finalAttrs: { +let + pkg = mkDerivation (finalAttrs: { # ... # An example attribute - packages = []; + packages = [ ]; # `passthru.tests` is a commonly defined attribute. passthru.tests.simple = f finalAttrs.finalPackage; # An example of an attribute containing a function - passthru.appendPackages = packages': - finalAttrs.finalPackage.overrideAttrs (newSelf: super: { - packages = super.packages ++ packages'; - }); + passthru.appendPackages = + packages': + finalAttrs.finalPackage.overrideAttrs ( + newSelf: super: { + packages = super.packages ++ packages'; + } + ); # For illustration purposes; referenced as # `(pkg.overrideAttrs(x)).finalAttrs` etc in the text below. passthru.finalAttrs = finalAttrs; passthru.original = pkg; }); -in pkg +in +pkg ``` Unlike the `pkg` binding in the above example, the `finalAttrs` parameter always references the final attributes. For instance `(pkg.overrideAttrs(x)).finalAttrs.finalPackage` is identical to `pkg.overrideAttrs(x)`, whereas `(pkg.overrideAttrs(x)).original` is the same as the original `pkg`. @@ -955,7 +987,7 @@ To make GDB find debug information for the `socat` package and its dependencies, ```nix let pkgs = import ./. { - config = {}; + config = { }; overlays = [ (final: prev: { ncurses = prev.ncurses.overrideAttrs { separateDebugInfo = true; }; @@ -974,19 +1006,19 @@ let ]; }; in - pkgs.mkShell { +pkgs.mkShell { - NIX_DEBUG_INFO_DIRS = "${pkgs.lib.getLib myDebugInfoDirs}/lib/debug"; + NIX_DEBUG_INFO_DIRS = "${pkgs.lib.getLib myDebugInfoDirs}/lib/debug"; - packages = [ - pkgs.gdb - pkgs.socat - ]; + packages = [ + pkgs.gdb + pkgs.socat + ]; - shellHook = '' - ${pkgs.lib.getBin pkgs.gdb}/bin/gdb ${pkgs.lib.getBin pkgs.socat}/bin/socat - ''; - } + shellHook = '' + ${pkgs.lib.getBin pkgs.gdb}/bin/gdb ${pkgs.lib.getBin pkgs.socat}/bin/socat + ''; +} ``` This setup works as follows: @@ -1568,6 +1600,10 @@ This flag adds the `-fstack-clash-protection` compiler option, which causes grow The following flags are disabled by default and should be enabled with `hardeningEnable` for packages that take untrusted input like network services. +#### `nostrictaliasing` {#nostrictaliasing} + +This flag adds the `-fno-strict-aliasing` compiler option, which prevents the compiler from assuming code has been written strictly following the standard in regards to pointer aliasing and therefore performing optimizations that may be unsafe for code that has not followed these rules. + #### `pie` {#pie} This flag is disabled by default for normal `glibc` based NixOS package builds, but enabled by default for diff --git a/doc/style.css b/doc/style.css index f517733be972..4ba76cc39114 100644 --- a/doc/style.css +++ b/doc/style.css @@ -7,25 +7,29 @@ body { margin: 0; } -.book { +.book, +.appendix { margin: auto; width: 100%; } @media screen and (min-width: 768px) { - .book { + .book, + .appendix { max-width: 46rem; } } @media screen and (min-width: 992px) { - .book { + .book, + .appendix { max-width: 60rem; } } @media screen and (min-width: 1200px) { - .book { + .book, + .appendix { max-width: 73rem; } } @@ -113,10 +117,10 @@ html { body { font-size: 1rem; - font-family: 'Roboto', sans-serif; + font-family: "Roboto", sans-serif; font-weight: 300; - color: #000000; - background-color: #ffffff; + color: var(--main-text-color); + background-color: var(--background); min-height: 100vh; display: flex; flex-direction: column; @@ -132,7 +136,7 @@ body { a { text-decoration: none; border-bottom: 1px solid; - color: #405d99; + color: var(--link-color); } ul { @@ -163,7 +167,7 @@ h1 { line-height: 110%; font-size: 200%; margin-bottom: 1rem; - color: #6586c8; + color: var(--heading-color); } h2 { @@ -171,7 +175,7 @@ h2 { line-height: 110%; font-size: 170%; margin-bottom: 0.625rem; - color: #6586c8; + color: var(--heading-color); } h2:not(:first-child) { @@ -183,7 +187,7 @@ h3 { line-height: 110%; margin-bottom: 1rem; font-size: 150%; - color: #6586c8; + color: var(--heading-color); } .note h3, @@ -199,7 +203,7 @@ h4 { line-height: 110%; margin-bottom: 1rem; font-size: 140%; - color: #6586c8; + color: var(--heading-color); } h5 { @@ -207,14 +211,14 @@ h5 { line-height: 110%; margin-bottom: 1rem; font-size: 130%; - color: #6a6a6a; + color: var(--small-heading-color); } h6 { font-weight: 800; line-height: 110%; margin-bottom: 1rem; - font-size: 120% + font-size: 120%; } strong { @@ -226,13 +230,13 @@ p { margin-bottom: 1rem; } -dt>*:first-child, -dd>*:first-child { +dt > *:first-child, +dd > *:first-child { margin-top: 0; } -dt>*:last-child, -dd>*:last-child { +dt > *:last-child, +dd > *:last-child { margin-bottom: 0; } @@ -256,8 +260,8 @@ div.appendix .programlisting { border-radius: 0.5rem; padding: 1rem; overflow: auto; - background: #f2f8fd; - color: #000000; + background: var(--codeblock-background); + color: var(--codeblock-text-color); } div.book .note, @@ -277,47 +281,46 @@ div.appendix .important { background: #f4f4f4; } -div.book .note>.title, -div.book .tip>.title, -div.book .warning>.title, -div.book .caution>.title, -div.book .important>.title, -div.appendix .note>.title, -div.appendix .tip>.title, -div.appendix .warning>.title, -div.appendix .caution>.title, -div.appendix .important>.title { +div.book .note > .title, +div.book .tip > .title, +div.book .warning > .title, +div.book .caution > .title, +div.book .important > .title, +div.appendix .note > .title, +div.appendix .tip > .title, +div.appendix .warning > .title, +div.appendix .caution > .title, +div.appendix .important > .title { font-weight: 800; - /* font-family: 'Overpass', serif; */ line-height: 110%; margin-bottom: 1rem; color: inherit; margin-bottom: 0; } -div.book .note> :first-child, -div.book .tip> :first-child, -div.book .warning> :first-child, -div.book .caution> :first-child, -div.book .important> :first-child, -div.appendix .note> :first-child, -div.appendix .tip> :first-child, -div.appendix .warning> :first-child, -div.appendix .caution> :first-child, -div.appendix .important> :first-child { +div.book .note > :first-child, +div.book .tip > :first-child, +div.book .warning > :first-child, +div.book .caution > :first-child, +div.book .important > :first-child, +div.appendix .note > :first-child, +div.appendix .tip > :first-child, +div.appendix .warning > :first-child, +div.appendix .caution > :first-child, +div.appendix .important > :first-child { margin-top: 0; } -div.book .note> :last-child, -div.book .tip> :last-child, -div.book .warning> :last-child, -div.book .caution> :last-child, -div.book .important> :last-child, -div.appendix .note> :last-child, -div.appendix .tip> :last-child, -div.appendix .warning> :last-child, -div.appendix .caution> :last-child, -div.appendix .important> :last-child { +div.book .note > :last-child, +div.book .tip > :last-child, +div.book .warning > :last-child, +div.book .caution > :last-child, +div.book .important > :last-child, +div.appendix .note > :last-child, +div.appendix .tip > :last-child, +div.appendix .warning > :last-child, +div.appendix .caution > :last-child, +div.appendix .important > :last-child { margin-bottom: 0; } @@ -325,16 +328,16 @@ div.book .note, div.book .tip, div.appendix .note, div.appendix .tip { - color: #5277c3; - background: #f2f8fd; + color: var(--note-text-color); + background: var(--note-background); } div.book .warning, div.book .caution, div.appendix .warning, div.appendix .caution { - color: #cc3900; - background-color: #fff5e1; + color: var(--warning-text-color); + background-color: var(--warning-background); } div.book .section, @@ -358,8 +361,8 @@ div.appendix div.example details[open] { border-radius: 4px; } -div.book div.example details>summary, -div.appendix div.example details>summary { +div.book div.example details > summary, +div.appendix div.example details > summary { cursor: pointer; } @@ -368,13 +371,13 @@ div.appendix br.example-break { display: none; } -div.book div.footnotes>hr, -div.appendix div.footnotes>hr { +div.book div.footnotes > hr, +div.appendix div.footnotes > hr { border-color: #d8d8d8; } -div.book div.footnotes>br, -div.appendix div.footnotes>br { +div.book div.footnotes > br, +div.appendix div.footnotes > br { display: none; } @@ -444,3 +447,47 @@ div.appendix .variablelist .term { user-select: none; -webkit-user-select: none; } + +:root { + --background: #fff; + --main-text-color: #000; + --link-color: #405d99; + --heading-color: #6586c8; + --small-heading-color: #6a6a6a; + --note-text-color: #5277c3; + --note-background: #f2f8fd; + --warning-text-color: #cc3900; + --warning-background: #fff5e1; + --codeblock-background: #f2f8fd; + --codeblock-text-color: #000; +} + +@media (prefers-color-scheme: dark) { + :root { + --background: #242424; + --main-text-color: #fff; + --link-color: #6586c8; + --small-heading-color: #fff; + --note-background: none; + --warning-background: none; + --codeblock-background: #393939; + --codeblock-text-color: #fff; + } + + div.book .note, + div.book .tip, + div.appendix .note, + div.appendix .tip, + div.book .warning, + div.book .caution, + div.appendix .warning, + div.appendix .caution { + border: 2px solid; + font-weight: 400; + } +} + +@font-face { + font-family: Roboto; + src: url(Roboto.ttf); +} diff --git a/doc/tests/check-nix-code-blocks.nix b/doc/tests/check-nix-code-blocks.nix new file mode 100644 index 000000000000..5ec934f6bba8 --- /dev/null +++ b/doc/tests/check-nix-code-blocks.nix @@ -0,0 +1,32 @@ +{ + runCommand, + markdown-code-runner, + nixfmt-rfc-style, +}: + +runCommand "manual_check-nix-code-blocks" + { + nativeBuildInputs = [ + markdown-code-runner + nixfmt-rfc-style + ]; + } + '' + set +e + + mdcr --check --config ${./mdcr-config.toml} ${./..} + + if [ $? -ne 0 ]; then + cat < ```nix -import pkgs.path { overlays = [ (self: super: { - foo = super.foo.override { barSupport = true ; }; - })];} +import pkgs.path { + overlays = [ + (self: super: { + foo = super.foo.override { barSupport = true; }; + }) + ]; +} ``` ```nix { mypkg = pkgs.callPackage ./mypkg.nix { - mydep = pkgs.mydep.override { /* ... */ }; + mydep = pkgs.mydep.override { + # ... + }; }; } ``` @@ -55,9 +66,11 @@ Example usages: ```nix { - helloBar = pkgs.hello.overrideAttrs (finalAttrs: previousAttrs: { - pname = previousAttrs.pname + "-bar"; - }); + helloBar = pkgs.hello.overrideAttrs ( + finalAttrs: previousAttrs: { + pname = previousAttrs.pname + "-bar"; + } + ); } ``` @@ -107,7 +120,7 @@ Example usage: url = "ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2"; hash = "sha256-MxBJRcM2rYzQYwJ5XKxhXTQByvSg5jZc5cSHEZoB2IY="; }; - patches = []; + patches = [ ]; }); } ``` @@ -128,8 +141,15 @@ Example usage: ```nix { - f = { a, b }: { result = a+b; }; - c = lib.makeOverridable f { a = 1; b = 2; }; + f = + { a, b }: + { + result = a + b; + }; + c = lib.makeOverridable f { + a = 1; + b = 2; + }; } ``` diff --git a/lib/default.nix b/lib/default.nix index 19316addb8cb..c433ca6a3e09 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -347,6 +347,7 @@ let toSentenceCase addContextFrom splitString + splitStringBy removePrefix removeSuffix versionOlder diff --git a/lib/licenses.nix b/lib/licenses.nix index c202d8d07180..301beb4ea4ae 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1164,6 +1164,13 @@ lib.mapAttrs mkLicense ( fullName = "Sendmail License"; }; + sfl = { + fullName = "Source First License 1.1"; + url = "https://gitlab.futo.org/videostreaming/grayjay/-/blob/master/LICENSE.md"; + free = false; + redistributable = true; + }; + sgi-b-20 = { spdxId = "SGI-B-2.0"; fullName = "SGI Free Software License B v2.0"; diff --git a/lib/options.nix b/lib/options.nix index 85ce6ca77e92..007a14f15b67 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -30,6 +30,7 @@ let inherit (lib.attrsets) attrByPath optionalAttrs + showAttrPath ; inherit (lib.strings) concatMapStrings @@ -40,6 +41,7 @@ let ; inherit (lib.lists) last + toList ; prioritySuggestion = '' Use `lib.mkForce value` or `lib.mkDefault value` to change the priority on any of these definitions. @@ -310,14 +312,14 @@ rec { }: let name' = if isList name then last name else name; - default' = if isList default then default else [ default ]; - defaultText = concatStringsSep "." default'; + default' = toList default; + defaultText = showAttrPath default'; defaultValue = attrByPath default' (throw "${defaultText} cannot be found in ${pkgsText}") pkgs; defaults = if default != null then { default = defaultValue; - defaultText = literalExpression ("${pkgsText}." + defaultText); + defaultText = literalExpression "${pkgsText}.${defaultText}"; } else optionalAttrs nullable { @@ -333,7 +335,7 @@ rec { } // optionalAttrs (example != null) { example = literalExpression ( - if isList example then "${pkgsText}." + concatStringsSep "." example else example + if isList example then "${pkgsText}.${showAttrPath example}" else example ); } ); diff --git a/lib/path/default.nix b/lib/path/default.nix index be559eadf182..1284bed94bb0 100644 --- a/lib/path/default.nix +++ b/lib/path/default.nix @@ -165,7 +165,7 @@ let # This is a workaround for https://github.com/NixOS/nix/issues/12361 which # was needed during the experimental phase of ca-derivations and should be # removed once the issue has been resolved. - || match "[0-9a-z]{52}" (head components) != null; + || components != [ ] && match "[0-9a-z]{52}" (head components) != null; in # No rec! Add dependencies on this file at the top. diff --git a/lib/path/tests/unit.nix b/lib/path/tests/unit.nix index a52b4f44e51d..fa2e004e9c3a 100644 --- a/lib/path/tests/unit.nix +++ b/lib/path/tests/unit.nix @@ -110,6 +110,12 @@ let expected = false; }; + # Root path (empty path components list) + testHasStorePathPrefixRoot = { + expr = hasStorePathPrefix /.; + expected = false; + }; + testHasStorePathPrefixExample1 = { expr = hasStorePathPrefix (storeDirPath + "/nvl9ic0pj1fpyln3zaqrf4cclbqdfn1j-foo/bar/baz"); expected = true; diff --git a/lib/strings.nix b/lib/strings.nix index f8b01ec1ebc5..ba055bc3d22d 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -998,7 +998,11 @@ rec { ::: */ - escapeC = list: replaceStrings list (map (c: "\\x${toLower (lib.toHexString (charToInt c))}") list); + escapeC = + list: + replaceStrings list ( + map (c: "\\x${fixedWidthString 2 "0" (toLower (lib.toHexString (charToInt c)))}") list + ); /** Escape the `string` so it can be safely placed inside a URL @@ -1588,6 +1592,97 @@ rec { in map (addContextFrom s) splits; + /** + Splits a string into substrings based on a predicate that examines adjacent characters. + + This function provides a flexible way to split strings by checking pairs of characters + against a custom predicate function. Unlike simpler splitting functions, this allows + for context-aware splitting based on character transitions and patterns. + + # Inputs + + `predicate` + : Function that takes two arguments (previous character and current character) + and returns true when the string should be split at the current position. + For the first character, previous will be "" (empty string). + + `keepSplit` + : Boolean that determines whether the splitting character should be kept as + part of the result. If true, the character will be included at the beginning + of the next substring; if false, it will be discarded. + + `str` + : The input string to split. + + # Return + + A list of substrings from the original string, split according to the predicate. + + # Type + + ``` + splitStringBy :: (string -> string -> bool) -> bool -> string -> [string] + ``` + + # Examples + :::{.example} + ## `lib.strings.splitStringBy` usage example + + Split on periods and hyphens, discarding the separators: + ```nix + splitStringBy (prev: curr: builtins.elem curr [ "." "-" ]) false "foo.bar-baz" + => [ "foo" "bar" "baz" ] + ``` + + Split on transitions from lowercase to uppercase, keeping the uppercase characters: + ```nix + splitStringBy (prev: curr: builtins.match "[a-z]" prev != null && builtins.match "[A-Z]" curr != null) true "fooBarBaz" + => [ "foo" "Bar" "Baz" ] + ``` + + Handle leading separators correctly: + ```nix + splitStringBy (prev: curr: builtins.elem curr [ "." ]) false ".foo.bar.baz" + => [ "" "foo" "bar" "baz" ] + ``` + + Handle trailing separators correctly: + ```nix + splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "foo.bar.baz." + => [ "foo" "bar" "baz" "" ] + ``` + ::: + */ + splitStringBy = + predicate: keepSplit: str: + let + len = stringLength str; + + # Helper function that processes the string character by character + go = + pos: currentPart: result: + # Base case: reached end of string + if pos == len then + result ++ [ currentPart ] + else + let + currChar = substring pos 1 str; + prevChar = if pos > 0 then substring (pos - 1) 1 str else ""; + isSplit = predicate prevChar currChar; + in + if isSplit then + # Split here - add current part to results and start a new one + let + newResult = result ++ [ currentPart ]; + newCurrentPart = if keepSplit then currChar else ""; + in + go (pos + 1) newCurrentPart newResult + else + # Keep building current part + go (pos + 1) (currentPart + currChar) result; + in + if len == 0 then [ (addContextFrom str "") ] else map (addContextFrom str) (go 0 "" [ ]); + /** Return a string without the specified prefix, if the prefix matches. diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index d17231061d69..aa587f52c4ac 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -631,6 +631,101 @@ runTests { ]; }; + testSplitStringBySimpleDelimiter = { + expr = strings.splitStringBy ( + prev: curr: + builtins.elem curr [ + "." + "-" + ] + ) false "foo.bar-baz"; + expected = [ + "foo" + "bar" + "baz" + ]; + }; + + testSplitStringByLeadingDelimiter = { + expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false ".foo.bar.baz"; + expected = [ + "" + "foo" + "bar" + "baz" + ]; + }; + + testSplitStringByTrailingDelimiter = { + expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "foo.bar.baz."; + expected = [ + "foo" + "bar" + "baz" + "" + ]; + }; + + testSplitStringByMultipleConsecutiveDelimiters = { + expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "foo...bar"; + expected = [ + "foo" + "" + "" + "bar" + ]; + }; + + testSplitStringByKeepingSplitChar = { + expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) true "foo.bar.baz"; + expected = [ + "foo" + ".bar" + ".baz" + ]; + }; + + testSplitStringByCaseTransition = { + expr = strings.splitStringBy ( + prev: curr: builtins.match "[a-z]" prev != null && builtins.match "[A-Z]" curr != null + ) true "fooBarBaz"; + expected = [ + "foo" + "Bar" + "Baz" + ]; + }; + + testSplitStringByEmptyString = { + expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false ""; + expected = [ "" ]; + }; + + testSplitStringByComplexPredicate = { + expr = strings.splitStringBy ( + prev: curr: + prev != "" + && curr != "" + && builtins.match "[0-9]" prev != null + && builtins.match "[a-z]" curr != null + ) true "123abc456def"; + expected = [ + "123" + "abc456" + "def" + ]; + }; + + testSplitStringByUpperCaseStart = { + expr = strings.splitStringBy (prev: curr: builtins.match "[A-Z]" curr != null) true "FooBarBaz"; + expected = [ + "" + "Foo" + "Bar" + "Baz" + ]; + }; + testEscapeShellArg = { expr = strings.escapeShellArg "esc'ape\nme"; expected = "'esc'\\''ape\nme'"; @@ -851,8 +946,8 @@ runTests { }; testEscapeC = { - expr = strings.escapeC [ " " ] "Hello World"; - expected = "Hello\\x20World"; + expr = strings.escapeC [ "\n" " " ] "Hello World\n"; + expected = "Hello\\x20World\\x0a"; }; testEscapeURL = testAllTrue [ diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index d0f25c283dcb..3b19c8c63f26 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -315,14 +315,26 @@ checkConfigOutput '^false$' config.enableAlias ./alias-with-priority-can-overrid checkConfigOutput '^"hello"$' config.package.pname ./declare-mkPackageOption.nix checkConfigOutput '^"hello"$' config.namedPackage.pname ./declare-mkPackageOption.nix checkConfigOutput '^".*Hello.*"$' options.namedPackage.description ./declare-mkPackageOption.nix +checkConfigOutput '^"literalExpression"$' options.namedPackage.defaultText._type ./declare-mkPackageOption.nix +checkConfigOutput '^"pkgs\.hello"$' options.namedPackage.defaultText.text ./declare-mkPackageOption.nix +checkConfigOutput '^"hello"$' config.namedPackageSingletonDefault.pname ./declare-mkPackageOption.nix +checkConfigOutput '^".*Hello.*"$' options.namedPackageSingletonDefault.description ./declare-mkPackageOption.nix +checkConfigOutput '^"pkgs\.hello"$' options.namedPackageSingletonDefault.defaultText.text ./declare-mkPackageOption.nix checkConfigOutput '^"hello"$' config.pathPackage.pname ./declare-mkPackageOption.nix +checkConfigOutput '^"literalExpression"$' options.packageWithExample.example._type ./declare-mkPackageOption.nix checkConfigOutput '^"pkgs\.hello\.override \{ stdenv = pkgs\.clangStdenv; \}"$' options.packageWithExample.example.text ./declare-mkPackageOption.nix +checkConfigOutput '^"literalExpression"$' options.packageWithPathExample.example._type ./declare-mkPackageOption.nix +checkConfigOutput '^"pkgs\.hello"$' options.packageWithPathExample.example.text ./declare-mkPackageOption.nix checkConfigOutput '^".*Example extra description\..*"$' options.packageWithExtraDescription.description ./declare-mkPackageOption.nix checkConfigError 'The option .undefinedPackage. was accessed but has no value defined. Try setting the option.' config.undefinedPackage ./declare-mkPackageOption.nix checkConfigOutput '^null$' config.nullablePackage ./declare-mkPackageOption.nix -checkConfigOutput '^"null or package"$' options.nullablePackageWithDefault.type.description ./declare-mkPackageOption.nix +checkConfigOutput '^"null or package"$' options.nullablePackage.type.description ./declare-mkPackageOption.nix +checkConfigOutput '^"hello"$' config.nullablePackageWithDefault.pname ./declare-mkPackageOption.nix checkConfigOutput '^"myPkgs\.hello"$' options.packageWithPkgsText.defaultText.text ./declare-mkPackageOption.nix checkConfigOutput '^"hello-other"$' options.packageFromOtherSet.default.pname ./declare-mkPackageOption.nix +checkConfigOutput '^"hello"$' config.packageInvalidIdentifier.pname ./declare-mkPackageOption.nix +checkConfigOutput '^"pkgs\.\\"123\\"\.\\"with\\\\\\"quote\\"\.hello"$' options.packageInvalidIdentifier.defaultText.text ./declare-mkPackageOption.nix +checkConfigOutput '^"pkgs\.\\"123\\"\.\\"with\\\\\\"quote\\"\.hello"$' options.packageInvalidIdentifierExample.example.text ./declare-mkPackageOption.nix # submoduleWith diff --git a/lib/tests/modules/declare-mkPackageOption.nix b/lib/tests/modules/declare-mkPackageOption.nix index 058c0addc0c3..3f4f91d7497e 100644 --- a/lib/tests/modules/declare-mkPackageOption.nix +++ b/lib/tests/modules/declare-mkPackageOption.nix @@ -57,5 +57,19 @@ in }; in lib.mkPackageOption myPkgs "hello" { }; + + packageInvalidIdentifier = + let + myPkgs."123"."with\"quote" = { inherit (pkgs) hello; }; + in + lib.mkPackageOption myPkgs [ "123" "with\"quote" "hello" ] { }; + + packageInvalidIdentifierExample = lib.mkPackageOption pkgs "hello" { + example = [ + "123" + "with\"quote" + "hello" + ]; + }; }; } diff --git a/lib/tests/modules/pathWith.nix b/lib/tests/modules/pathWith.nix index 273bc06dfc00..98ba39cb2c4b 100644 --- a/lib/tests/modules/pathWith.nix +++ b/lib/tests/modules/pathWith.nix @@ -58,6 +58,9 @@ in pathInStore.ok1 = "${storeDir}/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"; pathInStore.ok2 = "${storeDir}/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"; pathInStore.ok3 = "${storeDir}/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15/bin/bash"; + pathInStore.ok4 = "/1121rp0gvr1qya7hvy925g5kjwg66acz6sn1ra1hca09f1z5dsab"; # CA derivation + pathInStore.ok5 = "/1121rp0gvr1qya7hvy925g5kjwg66acz6sn1ra1hca09f1z5dsab/bin/bash"; # CA derivation + pathInStore.ok6 = /1121rp0gvr1qya7hvy925g5kjwg66acz6sn1ra1hca09f1z5dsab; # CA derivation, path type pathInStore.bad1 = ""; pathInStore.bad2 = "${storeDir}"; pathInStore.bad3 = "${storeDir}/"; diff --git a/lib/types.nix b/lib/types.nix index 92cdb1491c7c..715da842ac01 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -678,7 +678,14 @@ let check = x: let - isInStore = builtins.match "${builtins.storeDir}/[^.].*" (toString x) != null; + isInStore = lib.path.hasStorePathPrefix ( + if builtins.isPath x then + x + # Discarding string context is necessary to convert the value to + # a path and safe as the result is never used in any derivation. + else + /. + builtins.unsafeDiscardStringContext x + ); isAbsolute = builtins.substring 0 1 (toString x) == "/"; isExpectedType = ( if inStore == null || inStore then isStringLike x else isString x # Do not allow a true path, which could be copied to the store later on. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e6b577276734..d450d043f2e6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2129,6 +2129,11 @@ githubId = 11493130; name = "Asbjørn Olling"; }; + aschleck = { + name = "April Schleck"; + github = "aschleck"; + githubId = 115766; + }; ascii17 = { name = "Allen Conlon"; email = "software@conlon.dev"; @@ -2513,6 +2518,7 @@ }; awwpotato = { email = "awwpotato@voidq.com"; + matrix = "@awwpotato:envs.net"; github = "awwpotato"; githubId = 153149335; name = "awwpotato"; @@ -3379,6 +3385,11 @@ githubId = 33910565; name = "Abdallah Gamal"; }; + bohreromir = { + github = "bohreromir"; + githubId = 40412303; + name = "bohreromir"; + }; boj = { email = "brian@uncannyworks.com"; github = "boj"; @@ -4284,6 +4295,11 @@ name = "CherryKitten"; keys = [ { fingerprint = "264C FA1A 194C 585D F822 F673 C01A 7CBB A617 BD5F"; } ]; }; + cherrypiejam = { + github = "cherrypiejam"; + githubId = 46938348; + name = "Gongqi Huang"; + }; chessai = { email = "chessai1996@gmail.com"; github = "chessai"; @@ -4493,6 +4509,11 @@ githubId = 3956062; name = "Simon Lackerbauer"; }; + cilki = { + github = "cilki"; + githubId = 10459406; + name = "Tyler Cook"; + }; cimm = { email = "8k9ft8m5gv@astil.be"; github = "cimm"; @@ -4931,12 +4952,6 @@ githubId = 32609395; name = "B YI"; }; - copumpkin = { - email = "pumpkingod@gmail.com"; - github = "copumpkin"; - githubId = 2623; - name = "Dan Peebles"; - }; corbanr = { email = "corban@raunco.co"; github = "CorbanR"; @@ -5020,6 +5035,12 @@ githubId = 6470493; name = "Craige McWhirter"; }; + craigf = { + email = "craig@craigfurman.dev"; + github = "craigfurman"; + githubId = 4772216; + name = "Craig Furman"; + }; cransom = { email = "cransom@hubns.net"; github = "cransom"; @@ -5259,6 +5280,12 @@ github = "d4rkstar"; githubId = 4957015; }; + dabao1955 = { + email = "dabao1955@163.com"; + github = "dabao1955"; + githubId = 79307765; + name = "Hang Li"; + }; dadada = { name = "dadada"; email = "dadada@dadada.li"; @@ -6488,6 +6515,12 @@ githubId = 472846; name = "Sebastian Krohn"; }; + dramforever = { + name = "Vivian Wang"; + email = "dramforever@live.com"; + github = "dramforever"; + githubId = 2818072; + }; drawbu = { email = "nixpkgs@drawbu.dev"; github = "drawbu"; @@ -6991,6 +7024,12 @@ githubId = 8146662; name = "Eric Lesiuta"; }; + elfenermarcell = { + email = "elfenermarcell@gmail.com"; + github = "elfenermarcell"; + githubId = 183738665; + name = "Marcell Tóth"; + }; eliandoran = { email = "contact@eliandoran.me"; name = "Elian Doran"; @@ -8450,6 +8489,12 @@ githubId = 12715461; name = "Anders Bo Rasmussen"; }; + fvckgrimm = { + email = "nixpkgs@grimm.wtf"; + github = "fvckgrimm"; + githubId = 55907409; + name = "Grimm"; + }; fwc = { github = "fwc"; githubId = 29337229; @@ -10748,6 +10793,12 @@ github = "jacg"; githubId = 2570854; }; + JachymPutta = { + email = "jachym.putta@gmail.com"; + github = "JachymPutta"; + githubId = 67414100; + name = "Jachym Putta"; + }; jackcres = { email = "crespomerchano@gmail.com"; github = "omarcresp"; @@ -11125,6 +11176,11 @@ github = "jdupak"; githubId = 22683640; }; + jeancaspar = { + name = "Jean Caspar"; + github = "JeanCASPAR"; + githubId = 55629512; + }; jecaro = { email = "jeancharles.quillet@gmail.com"; github = "jecaro"; @@ -12495,12 +12551,6 @@ github = "keenanweaver"; githubId = 37268985; }; - kekschen = { - email = "kx@imkx.dev"; - github = "kek5chen"; - githubId = 52585984; - name = "Kek5chen"; - }; keksgesicht = { name = "Jan Braun"; email = "git@keksgesicht.de"; @@ -12797,6 +12847,12 @@ githubId = 1915; name = "Asherah Connor"; }; + kiyotoko = { + email = "karl.zschiebsch@gmail.com"; + github = "Kiyotoko"; + githubId = 49951907; + name = "Karl Zschiebsch"; + }; kjeremy = { email = "kjeremy@gmail.com"; name = "Jeremy Kolb"; @@ -13166,6 +13222,12 @@ githubId = 70764075; name = "kud"; }; + kuflierl = { + email = "kuflierl@gmail.com"; + github = "kuflierl"; + name = "Kennet Flierl"; + githubId = 41301536; + }; kugland = { email = "kugland@gmail.com"; github = "kugland"; @@ -13407,6 +13469,12 @@ githubId = 632767; name = "Guillaume Maudoux"; }; + LazilyStableProton = { + email = "LazilyStable@proton.me"; + github = "LazyStability"; + githubId = 120277625; + name = "LazilyStableProton"; + }; lblasc = { email = "lblasc@znode.net"; github = "lblasc"; @@ -13833,12 +13901,6 @@ githubId = 74221543; name = "Moritz Goltdammer"; }; - linuxmobile = { - email = "bdiez19@gmail.com"; - github = "linuxmobile"; - githubId = 10554636; - name = "Braian A. Diez"; - }; linuxwhata = { email = "linuxwhata@qq.com"; matrix = "@lwa:envs.net"; @@ -17395,6 +17457,12 @@ github = "noaccOS"; githubId = 24324352; }; + noahfraiture = { + name = "Noahcode"; + email = "pro@noahcode.dev"; + github = "noahfraiture"; + githubId = 94681915; + }; noahgitsham = { name = "Noah Gitsham"; github = "noahgitsham"; @@ -21364,6 +21432,11 @@ github = "samemrecebi"; githubId = 64419750; }; + samfundev = { + name = "samfundev"; + github = "samfundev"; + githubId = 6759716; + }; samhug = { email = "s@m-h.ug"; github = "samhug"; @@ -21814,6 +21887,11 @@ github = "sei40kr"; githubId = 11665236; }; + seiarotg = { + name = "SEIAROTg"; + github = "SEIAROTg"; + githubId = 3611446; + }; seineeloquenz = { name = "Alexander Linder"; github = "SeineEloquenz"; @@ -22395,6 +22473,12 @@ github = "sinanmohd"; githubId = 69694713; }; + sinics = { + name = "Zhifan"; + email = "nonno.felice69uwu@gmail.com"; + matrix = "@c3n21:matrix.org"; + githubId = 37077738; + }; sioodmy = { name = "Antoni Sokołowski"; github = "sioodmy"; @@ -22804,6 +22888,12 @@ githubId = 10437171; keys = [ { fingerprint = "75F0 AB7C FE01 D077 AEE6 CAFD 353E 4A18 EE0F AB72"; } ]; }; + spacedentist = { + email = "sp@cedenti.st"; + github = "spacedentist"; + githubId = 1536420; + name = "Sven Over"; + }; spacefrogg = { email = "spacefrogg-nixos@meterriblecrew.net"; github = "spacefrogg"; @@ -23342,12 +23432,6 @@ githubId = 306190; name = "Svend Sorensen"; }; - sven-of-cord = { - email = "sven@cord.com"; - github = "sven-of-cord"; - githubId = 98333944; - name = "Sven Over"; - }; Svenum = { email = "s.ziegler@holypenguin.net"; github = "Svenum"; @@ -24467,6 +24551,12 @@ githubId = 6118602; name = "Viktor"; }; + tmssngr = { + email = "nixpkgs@syntevo.com"; + github = "tmssngr"; + githubId = 6029561; + name = "Thomas Singer"; + }; tne = { email = "tne@garudalinux.org"; github = "JustTNE"; @@ -24486,8 +24576,9 @@ githubId = 39011842; }; toastal = { + # preferred: xmpp = "toastal@toastal.in.th"; email = "toastal+nix@posteo.net"; - matrix = "@toastal:mozilla.org"; + matrix = "@toastal:clan.lol"; github = "toastal"; githubId = 561087; name = "toastal"; @@ -25962,6 +26053,12 @@ githubId = 20464732; name = "Willi Butz"; }; + willow = { + email = "git@willow.moe"; + github = "kek5chen"; + githubId = 52585984; + name = "Willow"; + }; willow_ch = { email = "nix@w.wolo.dev"; github = "spaghetus"; @@ -26227,6 +26324,13 @@ github = "x3rAx"; githubId = 2268851; }; + x807x = { + name = "x807x"; + email = "s10855168@gmail.com"; + matrix = "@x807x:matrix.org"; + github = "x807x"; + githubId = 86676478; + }; xanderio = { name = "Alexander Sieg"; email = "alex@xanderio.de"; diff --git a/maintainers/scripts/README.md b/maintainers/scripts/README.md index 44a5fc9bc590..d2ab587fb397 100644 --- a/maintainers/scripts/README.md +++ b/maintainers/scripts/README.md @@ -57,6 +57,17 @@ The maintainer is designated by a `selector` which must be one of: [`maintainer-list.nix`]: ../maintainer-list.nix +### `get-maintainer-pings-between.sh` + +Gets which maintainers would be pinged between two Nixpkgs revisions. +Outputs a JSON object on stdout mapping GitHub usernames to the attributes +that they would be getting pinged for. + +Example: + +```sh +maintainers/scripts/get-maintainer-pings-between.sh HEAD^ HEAD +``` ## Conventions diff --git a/maintainers/scripts/get-maintainer-pings-between.sh b/maintainers/scripts/get-maintainer-pings-between.sh new file mode 100755 index 000000000000..4b6d7ff78052 --- /dev/null +++ b/maintainers/scripts/get-maintainer-pings-between.sh @@ -0,0 +1,78 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p git jq + +# Outputs a list of maintainers that would be pinged across two nixpkgs revisions. +# Authors: +# Morgan Jones (@numinit) +# Tristan Ross (@RossComputerGuy) + +set -euo pipefail + +if [ $# -lt 2 ]; then + echo "Usage: $0 " >&2 + exit 1 +fi + +repo="$(git rev-parse --show-toplevel)" +system="$(nix-instantiate --eval --expr builtins.currentSystem)" +rev1="$(git -C "$repo" rev-parse "$1")" +rev2="$(git -C "$repo" rev-parse "$2")" + +echo "Touched files:" >&2 +git -C "$repo" diff --name-only "$rev1" "$rev2" \ + | jq --raw-input --slurp 'split("\n")[:-1]' | tee "$TMPDIR/touched-files.json" >&2 + +# Runs an eval in the given worktree, outputting the path to $TMPDIR/$1.path. +# $1: The revision SHA. +eval_in_worktree() ( + mkdir -p .worktree + local rev="$1" + local tree=".worktree/$rev" + if [ ! -d "$tree" ]; then + git -C "$repo" worktree add -f -d "$tree" "$rev" >&2 + fi + cd "$tree" + + local workdir="$TMPDIR/$rev" + rm -rf "$workdir" + mkdir -p "$workdir" + + nix-build ci -A eval.attrpathsSuperset -o "$workdir/paths" >&2 + mkdir -p "$workdir/intermediates" + nix-build ci -A eval.singleSystem \ + --arg evalSystem "$system" \ + --arg attrpathFile "$workdir/paths/paths.json" \ + --arg chunkSize ${CHUNK_SIZE:-10000} \ + -o "$workdir/intermediates/.intermediate-1" >&2 + + # eval.combine nix-build needs a directory, not a symlink + cp -RL "$workdir/intermediates/.intermediate-1" "$workdir/intermediates/intermediate-1" + chmod -R +w "$workdir/intermediates/intermediate-1" + rm -rf "$workdir/intermediates/.intermediate-1" + + nix-build ci -A eval.combine \ + --arg resultsDir "$workdir/intermediates" \ + -o "$workdir/result" >&2 +) + +eval_in_worktree "$rev1" & +pid1=$! +eval_in_worktree "$rev2" & +pid2=$! + +wait $pid1 +wait $pid2 + +path1="$TMPDIR/$rev1" +path2="$TMPDIR/$rev2" + +# Use the repo this script was executed in to get accurate maintainer info +nix-build "$repo/ci" -A eval.compare \ + --arg beforeResultDir "$path1/result" \ + --arg afterResultDir "$path2/result" \ + --arg touchedFilesJson "$TMPDIR/touched-files.json" \ + --arg byName true \ + -o comparison + +echo "Pinged maintainers (check $repo/comparison for more details)" >&2 +jq < comparison/maintainers.json diff --git a/maintainers/scripts/haskell/merge-and-open-pr.sh b/maintainers/scripts/haskell/merge-and-open-pr.sh index 62565d24d623..ea985acfc9a0 100755 --- a/maintainers/scripts/haskell/merge-and-open-pr.sh +++ b/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -1,8 +1,8 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p git gh -I nixpkgs=. # -# Script to merge the currently open haskell-updates PR into master, bump the -# Stackage version and Hackage versions, and open the next haskell-updates PR. +# Script to merge the currently open haskell-updates PR , bump the Stackage +# version and Hackage versions, and open the next haskell-updates PR. set -eu -o pipefail @@ -79,10 +79,6 @@ fi echo "Merging https://github.com/NixOS/nixpkgs/pull/${curr_haskell_updates_pr_num}..." gh pr merge --repo NixOS/nixpkgs --merge "$curr_haskell_updates_pr_num" -# Update the list of Haskell package versions in NixOS on Hackage. -echo "Updating list of Haskell package versions in NixOS on Hackage..." -./maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh - # Update stackage, Hackage hashes, and regenerate Haskell package set echo "Updating Stackage..." ./maintainers/scripts/haskell/update-stackage.sh --do-commit @@ -100,7 +96,7 @@ git push "$push_remote" haskell-updates new_pr_body=$(cat < bool { + let res = with-env { NIXPKGS_ALLOW_BROKEN: "1" } { + # rather high timeout of half an hour, just to prevent never-ending builds + ^nix-build --no-out-link -j 1 --cores 1 --timeout 1800 -A $"haskellPackages.($package)" | complete + } + if $res.exit_code == 0 { + log warning $"($package) is not broken anymore!" + return false + } else { + log info $"($package) is still broken." + log debug $"($package) build log:\n($res.stderr)" + return true + } +} + +def main [] { + $broken_config | open | get broken-packages + | par-each {|package| if not (is-broken $package) { ^flock -x $broken_config -c $"sed -i -e '/^ - ($package) /d' ($broken_config)" }} +} diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index e72b77ccd349..2430edbdd420 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -8,7 +8,7 @@ set -eu -o pipefail # (should be capitalized like the display name) SOLVER=LTS # Stackage solver verson, if any. Use latest if empty -VERSION=22 +VERSION= TMP_TEMPLATE=update-stackage.XXXXXXX readonly SOLVER readonly VERSION diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py index e4241cced120..9511bfdbc5b8 100755 --- a/maintainers/scripts/kde/generate-sources.py +++ b/maintainers/scripts/kde/generate-sources.py @@ -1,10 +1,10 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.packaging ps.pyyaml ])" +#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.packaging ps.pyyaml ])" nix-update import base64 import binascii import json import pathlib -from typing import Optional +import subprocess from urllib.parse import urljoin, urlparse import bs4 @@ -30,7 +30,13 @@ ROOT_TEMPLATE = jinja2.Template(''' {{ p }} = callPackage ./{{ p }} { }; {%- endfor %} } -'''.strip()); +'''.strip()) + +PROJECTS_WITH_RUST = { + "akonadi-search", + "angelfish", + "kdepim-addons", +} def to_sri(hash): raw = binascii.unhexlify(hash) @@ -65,7 +71,7 @@ def to_sri(hash): type=str, default=None, ) -def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[str]): +def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: str | None): root_dir = nixpkgs / "pkgs/kde" set_dir = root_dir / set generated_dir = root_dir / "generated" @@ -119,6 +125,18 @@ def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[st pkg_dir = set_dir / project_name pkg_file = pkg_dir / "default.nix" + + if project_name in PROJECTS_WITH_RUST: + print(f"Updating cargoDeps hash for {set}/{project_name}...") + subprocess.run([ + "nix-update", + f"kdePackages.{project_name}", + "--version", + "skip", + "--override-filename", + pkg_file + ]) + if not pkg_file.exists(): print(f"Generated new package: {set}/{project_name}") pkg_dir.mkdir(parents=True, exist_ok=True) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 72f1fb1f9a44..bb23782e27d5 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -4,7 +4,7 @@ ansicolors,,,,,,Freed-Wu argparse,,,,,, basexx,,,,,, binaryheap,,,,,,vcunat -bit32,,,,5.3.0-1,5.1,lblasc +bit32,,,,,5.1,lblasc busted,,,,,, busted-htest,,,,,,mrcjkb cassowary,,,,,,alerque diff --git a/maintainers/scripts/update-typst-packages.py b/maintainers/scripts/update-typst-packages.py new file mode 100755 index 000000000000..2264f97d7706 --- /dev/null +++ b/maintainers/scripts/update-typst-packages.py @@ -0,0 +1,226 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p "python3.withPackages (p: with p; [ tomli tomli-w packaging license-expression])" -i python3 + +# This file is formatted with `ruff format`. + +import os +import re +import tomli +import tomli_w +import subprocess +import concurrent.futures +import argparse +import tempfile +import tarfile +from string import punctuation +from packaging.version import Version +from urllib import request +from collections import OrderedDict + + +class TypstPackage: + def __init__(self, **kwargs): + self.pname = kwargs["pname"] + self.version = kwargs["version"] + self.meta = kwargs["meta"] + self.path = kwargs["path"] + self.repo = ( + None + if "repository" not in self.meta["package"] + else self.meta["package"]["repository"] + ) + self.description = self.meta["package"]["description"].rstrip(punctuation) + self.license = self.meta["package"]["license"] + self.params = "" if "params" not in kwargs else kwargs["params"] + self.deps = [] if "deps" not in kwargs else kwargs["deps"] + + @classmethod + def package_name_full(cls, package_name, version): + version_number = map(lambda x: int(x), version.split(".")) + version_nix = "_".join(map(lambda x: str(x), version_number)) + return "_".join((package_name, version_nix)) + + def license_tokens(self): + import license_expression as le + + try: + # FIXME: ad hoc conversion + exception_list = [("EUPL-1.2+", "EUPL-1.2")] + + def sanitize_license_string(license_string, lookups): + if not lookups: + return license_string + return sanitize_license_string( + license_string.replace(lookups[0][0], lookups[0][1]), lookups[1:] + ) + + sanitized = sanitize_license_string(self.license, exception_list) + licensing = le.get_spdx_licensing() + parsed = licensing.parse(sanitized, validate=True) + return [s.key for s in licensing.license_symbols(parsed)] + except le.ExpressionError as e: + print( + f'Failed to parse license string "{self.license}" because of {str(e)}' + ) + exit(1) + + def source(self): + url = f"https://packages.typst.org/preview/{self.pname}-{self.version}.tar.gz" + cmd = [ + "nix", + "store", + "prefetch-file", + "--unpack", + "--hash-type", + "sha256", + "--refresh", + "--extra-experimental-features", + "nix-command", + ] + result = subprocess.run(cmd + [url], capture_output=True, text=True) + hash = re.search(r"hash\s+\'(sha256-.{44})\'", result.stderr).groups()[0] + return url, hash + + def to_name_full(self): + return self.package_name_full(self.pname, self.version) + + def to_attrs(self): + deps = set() + excludes = list(map( + lambda e: os.path.join(self.path, e), + self.meta["package"]["exclude"] if "exclude" in self.meta["package"] else [], + )) + for root, _, files in os.walk(self.path): + for file in filter(lambda f: f.split(".")[-1] == "typ", files): + file_path = os.path.join(root, file) + if file_path in excludes: + continue + with open(file_path, "r") as f: + deps.update( + set( + re.findall( + r"^\s*#import\s+\"@preview/([\w|-]+):(\d+.\d+.\d+)\"", + f.read(), + re.MULTILINE, + ) + ) + ) + self.deps = list( + filter(lambda p: p[0] != self.pname or p[1] != self.version, deps) + ) + source_url, source_hash = self.source() + + return dict( + url=source_url, + hash=source_hash, + typstDeps=[ + self.package_name_full(p, v) + for p, v in sorted(self.deps, key=lambda x: (x[0], Version(x[1]))) + ], + description=self.description, + license=self.license_tokens(), + ) | (dict(homepage=self.repo) if self.repo else dict()) + + +def generate_typst_packages(preview_dir, output_file): + package_tree = dict() + + print("Parsing metadata... from", preview_dir) + for p in os.listdir(preview_dir): + package_dir = os.path.join(preview_dir, p) + for v in os.listdir(package_dir): + package_version_dir = os.path.join(package_dir, v) + with open( + os.path.join(package_version_dir, "typst.toml"), "rb" + ) as meta_file: + try: + package = TypstPackage( + pname=p, + version=v, + meta=tomli.load(meta_file), + path=package_version_dir, + ) + if package.pname in package_tree: + package_tree[package.pname][v] = package + else: + package_tree[package.pname] = dict({v: package}) + except tomli.TOMLDecodeError: + print("Invalid typst.toml:", package_version_dir) + + with open(output_file, "wb") as typst_packages: + + def generate_package(pname, package_subtree): + sorted_keys = sorted(package_subtree.keys(), key=Version, reverse=True) + print(f"Generating metadata for {pname}") + return { + pname: OrderedDict( + (k, package_subtree[k].to_attrs()) for k in sorted_keys + ) + } + + with concurrent.futures.ThreadPoolExecutor(max_workers=100) as executor: + sorted_packages = sorted(package_tree.items(), key=lambda x: x[0]) + futures = list() + for pname, psubtree in sorted_packages: + futures.append(executor.submit(generate_package, pname, psubtree)) + packages = OrderedDict( + (package, subtree) + for future in futures + for package, subtree in future.result().items() + ) + print(f"Writing metadata... to {output_file}") + tomli_w.dump(packages, typst_packages) + + +def main(args): + PREVIEW_DIR = "packages/preview" + TYPST_PACKAGE_TARBALL_URL = ( + "https://github.com/typst/packages/archive/refs/heads/main.tar.gz" + ) + + directory = args.directory + if not directory: + tempdir = tempfile.mkdtemp() + print(tempdir) + typst_tarball = os.path.join(tempdir, "main.tar.gz") + + print( + "Downloading Typst packages source from {} to {}".format( + TYPST_PACKAGE_TARBALL_URL, typst_tarball + ) + ) + with request.urlopen( + request.Request(TYPST_PACKAGE_TARBALL_URL), timeout=15.0 + ) as response: + if response.status == 200: + with open(typst_tarball, "wb+") as f: + f.write(response.read()) + else: + print("Download failed") + exit(1) + with tarfile.open(typst_tarball) as tar: + tar.extractall(path=tempdir, filter="data") + directory = os.path.join(tempdir, "packages-main") + directory = os.path.abspath(directory) + + generate_typst_packages( + os.path.join(directory, PREVIEW_DIR), + args.output, + ) + + exit(0) + + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument( + "-d", "--directory", help="Local Typst Universe repository", default=None + ) + parser.add_argument( + "-o", + "--output", + help="Output file", + default=os.path.join(os.path.abspath("."), "typst-packages-from-universe.toml"), + ) + args = parser.parse_args() + main(args) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 5acd5be85586..3cf63125f0e7 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -227,6 +227,7 @@ with lib.maintainers; pandapip1 qyliss thefossguy + michaelBelsanti ]; githubTeams = [ "cosmic" ]; shortName = "cosmic"; @@ -398,7 +399,6 @@ with lib.maintainers; leona osnyx ma27 - laalsaas ]; scope = "Team for Flying Circus employees who collectively maintain packages."; shortName = "Flying Circus employees"; @@ -527,6 +527,7 @@ with lib.maintainers; cdepillabout maralorn sternenseemann + wolfgangwalther ]; githubTeams = [ "haskell" ]; scope = "Maintain Haskell packages and infrastructure."; diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 824b5eabb965..fd9f6761ac17 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -160,6 +160,8 @@ rec { ./manual.md \ $dst/${common.indexPath} + cp ${pkgs.roboto.src}/web/Roboto\[ital\,wdth\,wght\].ttf "$dst/Roboto.ttf" + mkdir -p $out/nix-support echo "nix-build out $out" >> $out/nix-support/hydra-build-products echo "doc manual $dst" >> $out/nix-support/hydra-build-products diff --git a/nixos/doc/manual/development/nixos-tests.chapter.md b/nixos/doc/manual/development/nixos-tests.chapter.md index ec0e4b9f076a..889a90bae68b 100644 --- a/nixos/doc/manual/development/nixos-tests.chapter.md +++ b/nixos/doc/manual/development/nixos-tests.chapter.md @@ -10,4 +10,5 @@ writing-nixos-tests.section.md running-nixos-tests.section.md running-nixos-tests-interactively.section.md linking-nixos-tests-to-packages.section.md +testing-hardware-features.section.md ``` diff --git a/nixos/doc/manual/development/testing-hardware-features.section.md b/nixos/doc/manual/development/testing-hardware-features.section.md new file mode 100644 index 000000000000..aaf652d731f7 --- /dev/null +++ b/nixos/doc/manual/development/testing-hardware-features.section.md @@ -0,0 +1,152 @@ +# Testing Hardware Features {#sec-nixos-test-testing-hardware-features} + +This section covers how to test various features using NixOS tests that would +normally only be possible with hardware. It is designed to showcase the NixOS test +framework's flexibility when combined with various hardware simulation libraries +or kernel modules. + +## Wi-Fi {#sec-nixos-test-wifi} + +Use `services.vwifi` to set up a virtual Wi-Fi physical layer. Create at least two nodes +for this kind of test: one with vwifi active, and either a station or an access point. +Give each a static IP address on the test network so they will never collide. +This module likely supports other topologies too; document them if you make one. + +This NixOS module leverages [vwifi](https://github.com/Raizo62/vwifi). Read the +upstream repository's documentation for more information. + +### vwifi server {#sec-nixos-test-wifi-vwifi-server} + +This node runs the vwifi server, and otherwise does not interact with the network. +You can run `vwifi-ctrl` on this node to control characteristics of the simulated +physical layer. + +```nix +airgap = + { config, ... }: + { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { + address = "192.168.1.2"; + prefixLength = 24; + } + ]; + services.vwifi = { + server = { + enable = true; + ports.tcp = 8212; + # uncomment if you want to enable monitor mode on another node + # ports.spy = 8213; + openFirewall = true; + }; + }; + }; +``` + +### AP {#sec-nixos-test-wifi-ap} + +A node like this will act as a wireless access point in infrastructure mode. + +```nix +ap = + { config, ... }: + { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { + address = "192.168.1.3"; + prefixLength = 24; + } + ]; + services.hostapd = { + enable = true; + radios.wlan0 = { + channel = 1; + networks.wlan0 = { + ssid = "NixOS Test Wi-Fi Network"; + authentication = { + mode = "wpa3-sae"; + saePasswords = [ { password = "supersecret"; } ]; + enableRecommendedPairwiseCiphers = true; + }; + }; + }; + }; + services.vwifi = { + module = { + enable = true; + macPrefix = "74:F8:F6:00:01"; + }; + client = { + enable = true; + serverAddress = "192.168.1.2"; + }; + }; + }; +``` + +### Station {#sec-nixos-test-wifi-station} + +A node like this acts as a wireless client. + +```nix +station = + { config, ... }: + { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { + address = "192.168.1.3"; + prefixLength = 24; + } + ]; + networking.wireless = { + # No, really, we want it enabled! + enable = lib.mkOverride 0 true; + interfaces = [ "wlan0" ]; + networks = { + "NixOS Test Wi-Fi Network" = { + psk = "supersecret"; + authProtocols = [ "SAE" ]; + }; + }; + }; + services.vwifi = { + module = { + enable = true; + macPrefix = "74:F8:F6:00:02"; + }; + client = { + enable = true; + serverAddress = "192.168.1.2"; + }; + }; + }; +``` + +### Monitor {#sec-nixos-test-wifi-monitor} + +When the monitor mode interface is enabled, this node will receive +all packets broadcast by all other nodes through the spy interface. + +```nix +monitor = + { config, ... }: + { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { + address = "192.168.1.4"; + prefixLength = 24; + } + ]; + + services.vwifi = { + module = { + enable = true; + macPrefix = "74:F8:F6:00:03"; + }; + client = { + enable = true; + spy = true; + serverAddress = "192.168.1.2"; + }; + }; +``` diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 313610aa0b07..ea98245ed2ae 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -77,6 +77,21 @@ "sec-mattermost-plugins-build": [ "index.html#sec-mattermost-plugins-build" ], + "sec-nixos-test-wifi": [ + "index.html#sec-nixos-test-wifi" + ], + "sec-nixos-test-wifi-ap": [ + "index.html#sec-nixos-test-wifi-ap" + ], + "sec-nixos-test-wifi-monitor": [ + "index.html#sec-nixos-test-wifi-monitor" + ], + "sec-nixos-test-wifi-station": [ + "index.html#sec-nixos-test-wifi-station" + ], + "sec-nixos-test-wifi-vwifi-server": [ + "index.html#sec-nixos-test-wifi-vwifi-server" + ], "sec-obtaining": [ "index.html#sec-obtaining" ], @@ -1895,6 +1910,9 @@ "sec-linking-nixos-tests-to-packages": [ "index.html#sec-linking-nixos-tests-to-packages" ], + "sec-nixos-test-testing-hardware-features": [ + "index.html#sec-nixos-test-testing-hardware-features" + ], "chap-developing-the-test-driver": [ "index.html#chap-developing-the-test-driver" ], diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 0a4aedba87fc..b11f36719035 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -139,7 +139,7 @@ The pre-existing `services.ankisyncd` has been marked deprecated and will be dro - [Netbird](https://netbird.io), an open-source VPN management platform, now has a self-hosted management server. Available as [services.netbird.server](#opt-services.netbird.server.enable). -- [nh](https://github.com/viperML/nh), yet another Nix CLI helper. Available as [programs.nh](#opt-programs.nh.enable). +- [nh](https://github.com/nix-community/nh), yet another Nix CLI helper. Available as [programs.nh](#opt-programs.nh.enable). - [oink](https://github.com/rlado/oink), a dynamic DNS client for Porkbun. Available as [services.oink](#opt-services.oink.enable). diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 3978772d32d8..b2cfb519af2d 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -10,7 +10,7 @@ - `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [system.rebuild.enableNg](options.html#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default. -- The `nixos-generate-config` command now supports a optional `--flake` option, which will generate a flake.nix file alongside the `configuration.nix` and `hardware-configuration.nix`, providing an easy instroduction into flake-based system configurations. +- The `nixos-generate-config` command now supports a optional `--flake` option, which will generate a flake.nix file alongside the `configuration.nix` and `hardware-configuration.nix`, providing an easy introduction into flake-based system configurations. - A `nixos-rebuild build-image` sub-command has been added. It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the NixOS manual](https://nixos.org/manual/nixos/unstable/#sec-image-nixos-rebuild-build-image). It is also available for `nixos-rebuild-ng`. @@ -22,6 +22,8 @@ - the global Mesa version can now be managed without a mass rebuild by setting `hardware.graphics.package` - packages that used to depend on Mesa for libgbm or libdri should use `libgbm` or `dri-pkgconfig-stub` as inputs, respectively +- OpenSSH has been updated from 9.9p2 to 10.0p2, dropping support for DSA keys and adding a new `ssh-auth` binary to handle user authentication in a different address space from unauthenticated sessions. Additionally, we now enable a configure option by default that attempts to lock sshd into RAM to prevent it from being swapped out, which may improve performance if the system is under memory pressure. See the [full changelog](https://www.openwall.com/lists/oss-security/2025/04/09/1) for more details. + - The `intel` video driver for X.org (from the xf86-video-intel package) which was previously removed because it was non-functional has been fixed and the driver has been re-introduced. - The Mattermost module ({option}`services.mattermost`) and packages (`mattermost` and `mmctl`) have been substantially updated: @@ -34,7 +36,6 @@ - `services.mattermost.listenAddress` has been split into {option}`services.mattermost.host` and {option}`services.mattermost.port`. If your `listenAddress` contained a port, you will need to edit your configuration. - Mattermost now supports peer authentication on both MySQL and Postgres database backends. Updating {option}`system.stateVersion` to 25.05 or later will result in peer authentication being used by default if the Mattermost server would otherwise be connecting to localhost. This is the recommended configuration. - The Mattermost module will produce eval warnings if a database password would end up in the Nix store, and recommend alternatives such as peer authentication or using the environment file. - - Mattermost's entire test suite is now enabled by default, which will extend build time from sources by up to an hour. A `withoutTests` passthru has been added in case you want to skip it. - We now support `mmctl` for Mattermost administration if both {option}`services.mattermost.socket.enable` and {option}`services.mattermost.socket.export` are set, which export the Mattermost control socket path into the system environment. - A new `pkgs.mattermost.buildPlugin` function has been added, which allows plugins to be built from source, including webapp frontends with a supported package-lock.json. See the Mattermost NixOS test and [manual](https://nixos.org/manual/nixpkgs/unstable/#sec-mattermost-plugins-build) for an example. - Note that the Mattermost module will create an account _without_ a well-known UID if the username differs from the default (`mattermost`). If you used Mattermost with a nonstandard username, you may want to review the module changes before upgrading. @@ -57,6 +58,10 @@ - [Kimai](https://www.kimai.org/), a web-based multi-user time-tracking application. Available as [services.kimai](options.html#opt-services.kimai). +- [Kismet](https://www.kismetwireless.net/), a Wi-Fi, Bluetooth, and RF monitoring application supporting a wide range of hardware. Available as {option}`services.kismet`. + +- [vwifi](https://github.com/Raizo62/vwifi), a Wi-Fi simulator daemon leveraging the `mac80211_hwsim` and `vhost_vsock` kernel modules for efficient simulation of multi-node Wi-Fi networks. Available as {option}`services.vwifi`. + - [Homer](https://homer-demo.netlify.app/), a very simple static homepage for your server. Available as [services.homer](options.html#opt-services.homer). - [Ghidra](https://ghidra-sre.org/), a software reverse engineering (SRE) suite of tools. Available as [programs.ghidra](options.html#opt-programs.ghidra). @@ -137,7 +142,7 @@ - [Zoxide](https://github.com/ajeetdsouza/zoxide), a smarter cd command, inspired by z and autojump. Available as [programs.zoxide](options.html#opt-programs.zoxide.enable) -- [victorialogs][https://docs.victoriametrics.com/victorialogs/], log database from VictoriaMetrics. Available as [services.victorialogs](#opt-services.victorialogs.enable) +- [victorialogs](https://docs.victoriametrics.com/victorialogs/), log database from VictoriaMetrics. Available as [services.victorialogs](#opt-services.victorialogs.enable) - [gokapi](https://github.com/Forceu/Gokapi), Lightweight selfhosted Firefox Send alternative without public upload. AWS S3 supported. Available with [services.gokapi](options.html#opt-services.gokapi.enable) @@ -211,12 +216,18 @@ - [Pareto Security](https://paretosecurity.com/) is an alternative to corporate compliance solutions for companies that care about security but know it doesn't have to be invasive. Available as [services.paretosecurity](#opt-services.paretosecurity.enable) +- [Cursor](https://cursor.com/) is a vscode-based editor that uses AI to help you write code faster. + +- [GNU Rush](https://gnu.org/software/rush/) is a Restricted User Shell, designed for systems providing limited remote access to their resources. Available as [programs.rush](#opt-programs.rush.enable). + - [ipfs-cluster](https://ipfscluster.io/), Pinset orchestration for IPFS. Available as [services.ipfs-cluster](#opt-services.ipfs-cluster.enable) - [bitbox-bridge](https://github.com/BitBoxSwiss/bitbox-bridge), a bridge software that connects BitBox hardware wallets to computers & web wallets like [Rabby](https://rabby.io/). Allows one to interact & transact with smart contracts, Web3 websites & financial services without storing private keys anywhere other than the hardware wallet. Available as [services.bitbox-bridge](#opt-services.bitbox-bridge.enable). - [GoDNS](https://github.com/TimothyYe/godns), a dynamic DNS client written in Go, which supports multiple DNS providers. Available as [services.godns](option.html#opt-services.godns.enable). +- [CookCLI](https://cooklang.org/cli/) Server, a web UI for cooklang recipes. + ## Backward Incompatibilities {#sec-release-25.05-incompatibilities} @@ -250,6 +261,8 @@ to review the new defaults and description of [](#opt-services.nextcloud.poolSettings). +- In `users.users` allocation on systems with multiple users it could happen that collided with others. Now these users get new subuid ranges assigned. When this happens, a warning is issued on the first activation. If the subuids were used (e.g. with rootless container managers like podman), please change the ownership of affected files accordingly. + - The `services.locate` module does no longer support findutil's `locate` due to its inferior performance compared to `mlocate` and `plocate`. The new default is `plocate`. As the `service.locate.localuser` option only applied when using findutil's `locate`, it has also been removed. @@ -259,6 +272,9 @@ - The `gotenberg` package has been updated to 8.16.0, which brings breaking changes to the configuration from version 8.13.0. See the [upstream release notes](https://github.com/gotenberg/gotenberg/releases/tag/v8.13.0) for that release to get all the details. The `services.gotenberg` module has been updated appropriately to ensure your configuration is valid with this new release. +- `varnish` was updated from 7.5.0 to 7.7.0, see [Varnish 7.6.0 upgrade guide](https://varnish-cache.org/docs/7.6/whats-new/upgrading-7.6.html) and +[Varnish 7.7.0 upgrade guide](https://varnish-cache.org/docs/7.7/whats-new/upgrading-7.7.html#whatsnew-upgrading-7-7). + - `asusd` has been upgraded to version 6 which supports multiple aura devices. To account for this, the single `auraConfig` configuration option has been replaced with `auraConfigs` which is an attribute set of config options per each device. The config files may also be now specified as either source files or text strings; to account for this you will need to specify that `text` is used for your existing configs, e.g.: ```diff -services.asusd.asusdConfig = '''file contents''' @@ -351,6 +367,9 @@ - `slskd` has been updated to v0.22.3, which includes breaking changes to `script` integrations. Please review the [changelog](https://github.com/slskd/slskd/releases/tag/0.22.3) and the accompanying [pull request](https://github.com/slskd/slskd/pull/1292). +- `forgejo` and `forgejo-lts` have been updated to v11. + See upstreams [release blog post](https://forgejo.org/2025-04-release-v11-0/) for more information. + - The behavior of `services.hostapd.radios..networks..authentication.enableRecommendedPairwiseCiphers` was changed to not include `CCMP-256` anymore. Since all configured pairwise ciphers have to be supported by the radio, this caused startup failures on many devices which is hard to debug in hostapd. @@ -415,6 +434,11 @@ - `programs.clash-verge.tunMode` was deprecated and removed because now service mode is necessary to start program. Without `programs.clash-verge.enable`, clash-verge-rev will refuse to start. +- `services.discourse` now requires PostgreSQL 15 per default. Please update before upgrading. + +- `services.homepage-dashboard` now requires the `allowedHosts` option to be set in accordance with the [documentation](https://gethomepage.dev/installation/#homepage_allowed_hosts). + +- `luakit` has been updated to 2.4.0. If you use any website which uses IndexedDB or local storage and wish to retain the saved information, [some manual intervention may be required](https://luakit.github.io/news/luakit-2.4.0.html) - `services.netbird.tunnels` was renamed to [`services.netbird.clients`](#opt-services.netbird.clients), hardened (using dedicated less-privileged users) and significantly extended. @@ -441,6 +465,8 @@ - Overriding Wayland compositor is possible using `waylandSessionCompositor` option, but you might need to take care [`xfce4-session`](https://gitlab.xfce.org/xfce/xfce4-session/-/merge_requests/49), [`dbus-update-activation-environment`](https://github.com/labwc/labwc/blob/eaf11face68ee1f1bcc7ce1498304ca8c108c8ba/src/config/session.c#L234) and [`systemctl --user import-environment`](https://github.com/labwc/labwc/blob/eaf11face68ee1f1bcc7ce1498304ca8c108c8ba/src/config/session.c#L239) on startup. - For new Xfce installations, default panel layout has [changed](https://gitlab.xfce.org/xfce/xfce4-panel/-/merge_requests/158/diffs) to not include external panel plugins by default. You can still add them yourself using the "Panel Preferences" dialog. +- PAM services for `i3lock`/`i3lock-color`, `vlock`, `xlock`, and `xscreensaver` now default to disabled unless other corresponding NixOS options are set (`programs.i3lock.enable`, `console.enable`, `services.xserver.enable`, and `services.xscreensaver.enable`, respectively). If for some reason you want one of them back without setting the corresponding option, set, e.g., `security.pam.services.xlock.enable = true`. + - [`system.stateVersion`](#opt-system.stateVersion) is now validated and must be in the `"YY.MM"` format, ideally corresponding to a prior NixOS release. - `services.mysql` now supports easy cluster setup via [`services.mysql.galeraCluster`](#opt-services.mysql.galeraCluster.enable) option. @@ -486,6 +512,8 @@ - `services.avahi.ipv6` now defaults to true. +- A new hardening flag, `nostrictaliasing` was made available, corresponding to the gcc/clang option `-fno-strict-aliasing`. + - In the `services.xserver.displayManager.startx` module, two new options [generateScript](#opt-services.xserver.displayManager.startx.generateScript) and [extraCommands](#opt-services.xserver.displayManager.startx.extraCommands) have been added to to declaratively configure the .xinitrc script. - All services that require a root certificate bundle now use the value of a new read-only option, `security.pki.caBundle`. @@ -514,6 +542,8 @@ - [`services.mongodb.enableAuth`](#opt-services.mongodb.enableAuth) now uses the newer [mongosh](https://github.com/mongodb-js/mongosh) shell instead of the legacy shell to configure the initial superuser. You can configure the mongosh package to use through the [`services.mongodb.mongoshPackage`](#opt-services.mongodb.mongoshPackage) option. +- There is a new set of NixOS test tools for testing virtual Wi-Fi networks in many different topologies. See the {option}`services.vwifi` module, {option}`services.kismet` NixOS test, and [manual](https://nixos.org/manual/nixpkgs/unstable/#sec-nixos-test-wifi) for documentation and examples. + - The paperless module now has an option for regular automatic export of documents data using the integrated document exporter. diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 1866d8095a2b..015d7e4dbe53 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -1,7 +1,7 @@ /* Technical details - `make-disk-image` has a bit of magic to minimize the amount of work to do in a virtual machine. + `make-disk-image` has a bit of magic to minimize the amount of work to do in a virtual machine. It also might arguably have too much, or at least too specific magic, so please consider to work towards the effort of unifying our image builders, as outlined in https://github.com/NixOS/nixpkgs/issues/324817 before adding more. It relies on the [LKL (Linux Kernel Library) project](https://github.com/lkl/linux) which provides Linux kernel as userspace library. @@ -447,8 +447,7 @@ let mkdir -p $root # Copy arbitrary other files into the image - # Semi-shamelessly copied from make-etc.sh. I (@copumpkin) shall factor this stuff out as part of - # https://github.com/NixOS/nixpkgs/issues/23052. + # Semi-shamelessly copied from make-etc.sh. set -f sources_=(${lib.concatStringsSep " " sources}) targets_=(${lib.concatStringsSep " " targets}) diff --git a/nixos/modules/config/nix-flakes.nix b/nixos/modules/config/nix-flakes.nix index 69388e791154..1a7b2724b486 100644 --- a/nixos/modules/config/nix-flakes.nix +++ b/nixos/modules/config/nix-flakes.nix @@ -19,6 +19,10 @@ let cfg = config.nix; + flakeRefFormat = '' + The format of flake references is described in {manpage}`nix3-flake(1)`. + ''; + in { options = { @@ -46,7 +50,11 @@ in type = "indirect"; id = "nixpkgs"; }; - description = "The flake reference to be rewritten."; + description = '' + The flake reference to be rewritten. + + ${flakeRefFormat} + ''; }; to = mkOption { type = referenceAttrs; @@ -55,7 +63,11 @@ in owner = "my-org"; repo = "my-nixpkgs"; }; - description = "The flake reference {option}`from` is rewritten to."; + description = '' + The flake reference {option}`from` is rewritten to. + + ${flakeRefFormat} + ''; }; flake = mkOption { type = types.nullOr types.attrs; @@ -96,6 +108,8 @@ in default = { }; description = '' A system-wide flake registry. + + See {manpage}`nix3-registry(1)` for more information. ''; }; }; diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index a2be448d625b..0d192ae04073 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -54,15 +54,14 @@ sub dry_print { # Functions for allocating free GIDs/UIDs. FIXME: respect ID ranges in # /etc/login.defs. sub allocId { - my ($used, $prevUsed, $idMin, $idMax, $up, $getid) = @_; - my $id = $up ? $idMin : $idMax; + my ($used, $prevUsed, $idMin, $idMax, $delta, $getid) = @_; + my $id = $delta > 0 ? $idMin : $idMax; while ($id >= $idMin && $id <= $idMax) { if (!$used->{$id} && !$prevUsed->{$id} && !defined &$getid($id)) { $used->{$id} = 1; return $id; } - $used->{$id} = 1; - if ($up) { $id++; } else { $id--; } + $id += $delta; } die "$0: out of free UIDs or GIDs\n"; } @@ -77,19 +76,19 @@ sub allocGid { $gidsUsed{$prevGid} = 1; return $prevGid; } - return allocId(\%gidsUsed, \%gidsPrevUsed, 400, 999, 0, sub { my ($gid) = @_; getgrgid($gid) }); + return allocId(\%gidsUsed, \%gidsPrevUsed, 400, 999, -1, sub { my ($gid) = @_; getgrgid($gid) }); } sub allocUid { my ($name, $isSystemUser) = @_; - my ($min, $max, $up) = $isSystemUser ? (400, 999, 0) : (1000, 29999, 1); + my ($min, $max, $delta) = $isSystemUser ? (400, 999, -1) : (1000, 29999, 1); my $prevUid = $uidMap->{$name}; if (defined $prevUid && $prevUid >= $min && $prevUid <= $max && !defined $uidsUsed{$prevUid}) { dry_print("reviving", "would revive", "user '$name' with UID $prevUid"); $uidsUsed{$prevUid} = 1; return $prevUid; } - return allocId(\%uidsUsed, \%uidsPrevUsed, $min, $max, $up, sub { my ($uid) = @_; getpwuid($uid) }); + return allocId(\%uidsUsed, \%uidsPrevUsed, $min, $max, $delta, sub { my ($uid) = @_; getpwuid($uid) }); } # Read the declared users/groups @@ -336,18 +335,14 @@ sub allocSubUid { my ($name, @rest) = @_; # TODO: No upper bounds? - my ($min, $max, $up) = (100000, 100000 * 100, 1); + my ($min, $max, $delta) = (100000, 100000 + 100 * 65536, 65536); my $prevId = $subUidMap->{$name}; if (defined $prevId && !defined $subUidsUsed{$prevId}) { $subUidsUsed{$prevId} = 1; return $prevId; } - my $id = allocId(\%subUidsUsed, \%subUidsPrevUsed, $min, $max, $up, sub { my ($uid) = @_; getpwuid($uid) }); - my $offset = $id - 100000; - my $count = $offset * 65536; - my $subordinate = 100000 + $count; - return $subordinate; + return allocId(\%subUidsUsed, \%subUidsPrevUsed, $min, $max, $delta, sub { undef }); } my @subGids; @@ -367,6 +362,14 @@ foreach my $u (values %usersOut) { if($u->{autoSubUidGidRange}) { my $subordinate = allocSubUid($name); + if (defined $subUidMap->{$name} && $subUidMap->{$name} != $subordinate) { + print STDERR "warning: The subuids for '$name' changed, as they coincided with the subuids of a different user (see /etc/subuid). " + . "The range now starts with $subordinate instead of $subUidMap->{$name}. " + . "If the subuids were used (e.g. with rootless container managers like podman), please change the ownership of affected files accordingly. " + . "Alternatively, to keep the old overlapping ranges, add this to the system configuration: " + . "users.users.$name.subUidRanges = [{startUid = $subUidMap->{$name}; count = 65536;}]; " + . "users.users.$name.subGidRanges = [{startGid = $subUidMap->{$name}; count = 65536;}];\n"; + } $subUidMap->{$name} = $subordinate; my $value = join(":", ($name, $subordinate, 65536)); push @subUids, $value; diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 068e23aa3347..48f8ded73c64 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -343,14 +343,23 @@ in ]; # Don't add `nvidia-uvm` to `kernelModules`, because we want - # `nvidia-uvm` be loaded only after `udev` rules for `nvidia` kernel - # module are applied. + # `nvidia-uvm` be loaded only after the GPU device is available, i.e. after `udev` rules + # for `nvidia` kernel module are applied. + # This matters on Azure GPU instances: https://github.com/NixOS/nixpkgs/pull/267335 # # Instead, we use `softdep` to lazily load `nvidia-uvm` kernel module # after `nvidia` kernel module is loaded and `udev` rules are applied. extraModprobeConfig = '' softdep nvidia post: nvidia-uvm ''; + + # Exception is the open-source kernel module failing to load nvidia-uvm using softdep + # for unknown reasons. + # It affects CUDA: https://github.com/NixOS/nixpkgs/issues/334180 + # Previously nvidia-uvm was explicitly loaded only when xserver was enabled: + # https://github.com/NixOS/nixpkgs/pull/334340/commits/4548c392862115359e50860bcf658cfa8715bde9 + # We are now loading the module eagerly for all users of the open driver (including headless). + kernelModules = lib.optionals useOpenModules [ "nvidia_uvm" ]; }; systemd.tmpfiles.rules = lib.mkIf config.virtualisation.docker.enableNvidia [ "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin" @@ -639,16 +648,11 @@ in boot = { extraModulePackages = if useOpenModules 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" - ] - # With the open driver, nvidia-uvm does not automatically load as - # a softdep of the nvidia module, so we explicitly load it for now. - # See https://github.com/NixOS/nixpkgs/issues/334180 - ++ lib.optionals (config.services.xserver.enable && useOpenModules) [ "nvidia_uvm" ]; + kernelModules = lib.optionals config.services.xserver.enable [ + "nvidia" + "nvidia_modeset" + "nvidia_drm" + ]; # If requested enable modesetting via kernel parameters. kernelParams = diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix index 3f8188ff44e8..db026870d4fc 100644 --- a/nixos/modules/image/repart.nix +++ b/nixos/modules/image/repart.nix @@ -369,11 +369,10 @@ in ; inherit fileSystems definitionsDirectory mkfsEnv; }; - - meta.maintainers = with lib.maintainers; [ - nikstur - willibutz - ]; - }; + + meta.maintainers = with lib.maintainers; [ + nikstur + willibutz + ]; } diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 9d35d0f4fad8..062db2ac3b9d 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,8 +1,8 @@ { - x86_64-linux = "/nix/store/ppvbj1hzk77il5wd5g6q5ibyyd4jsnrl-nix-2.28.1"; - i686-linux = "/nix/store/5lb00s5p37715jh8y9nw6ihdjlzrs2bq-nix-2.28.1"; - aarch64-linux = "/nix/store/2zy7z2ablw09s0fj511x6d6za2vswv09-nix-2.28.1"; - riscv64-linux = "/nix/store/m4fw1gfzx7z3lp2pra1x1bajjb5d4fvi-nix-riscv64-unknown-linux-gnu-2.28.1"; - x86_64-darwin = "/nix/store/yi9ysd086218v1k1i16ilkmnkavgrxsi-nix-2.28.1"; - aarch64-darwin = "/nix/store/v4g8bccvg56b8y4r93c6w1f8125qs3cm-nix-2.28.1"; + x86_64-linux = "/nix/store/pzwdmrz94mya45m1jnsf294c0g3cwy9m-nix-2.28.2"; + i686-linux = "/nix/store/vzqxry2dwq9nzr2y0jk1q7qv3ygv14m1-nix-2.28.2"; + aarch64-linux = "/nix/store/52zak9psh00w8c8iz8x0ny33in5wwr83-nix-2.28.2"; + riscv64-linux = "/nix/store/rkggav1j9wb55zc8jsl1vg81s831aqj8-nix-riscv64-unknown-linux-gnu-2.28.2"; + x86_64-darwin = "/nix/store/afwsvhzqf936zx5v4i7ynqah2qhq7qyj-nix-2.28.2"; + aarch64-darwin = "/nix/store/djcysgb0pgrigaqfnmraviv6nix786zi-nix-2.28.2"; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 238f42652849..8ecc712feb87 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -290,6 +290,7 @@ ./programs/quark-goldleaf.nix ./programs/regreet.nix ./programs/rog-control-center.nix + ./programs/rush.nix ./programs/rust-motd.nix ./programs/ryzen-monitor-ng.nix ./programs/screen.nix @@ -313,6 +314,7 @@ ./programs/system-config-printer.nix ./programs/systemtap.nix ./programs/tcpdump.nix + ./programs/television.nix ./programs/thefuck.nix ./programs/thunar.nix ./programs/thunderbird.nix @@ -367,6 +369,7 @@ ./security/auditd.nix ./security/ca.nix ./security/chromium-suid-sandbox.nix + ./security/default.nix ./security/dhparams.nix ./security/doas.nix ./security/duosec.nix @@ -554,7 +557,6 @@ ./services/desktops/gnome/rygel.nix ./services/desktops/gnome/sushi.nix ./services/desktops/gnome/tinysparql.nix - ./services/desktops/gsignond.nix ./services/desktops/gvfs.nix ./services/desktops/malcontent.nix ./services/desktops/neard.nix @@ -1055,6 +1057,8 @@ ./services/networking/atticd.nix ./services/networking/autossh.nix ./services/networking/avahi-daemon.nix + ./services/networking/ax25/axlisten.nix + ./services/networking/ax25/axports.nix ./services/networking/babeld.nix ./services/networking/bee.nix ./services/networking/biboumi.nix @@ -1171,6 +1175,7 @@ ./services/networking/kea.nix ./services/networking/keepalived/default.nix ./services/networking/keybase.nix + ./services/networking/kismet.nix ./services/networking/knot.nix ./services/networking/kresd.nix ./services/networking/lambdabot.nix @@ -1348,6 +1353,7 @@ ./services/networking/veilid.nix ./services/networking/vdirsyncer.nix ./services/networking/vsftpd.nix + ./services/networking/vwifi.nix ./services/networking/wasabibackend.nix ./services/networking/websockify.nix ./services/networking/wg-access-server.nix @@ -1402,6 +1408,7 @@ ./services/security/certmgr.nix ./services/security/cfssl.nix ./services/security/clamav.nix + ./services/security/e-imzo.nix ./services/security/endlessh-go.nix ./services/security/endlessh.nix ./services/security/esdm.nix @@ -1559,6 +1566,7 @@ ./services/web-apps/isso.nix ./services/web-apps/jirafeau.nix ./services/web-apps/jitsi-meet.nix + ./services/web-apps/karakeep.nix ./services/web-apps/kasmweb/default.nix ./services/web-apps/kanboard.nix ./services/web-apps/kavita.nix diff --git a/nixos/modules/programs/direnv.nix b/nixos/modules/programs/direnv.nix index 751e279b47bc..2558985a822e 100644 --- a/nixos/modules/programs/direnv.nix +++ b/nixos/modules/programs/direnv.nix @@ -13,6 +13,7 @@ let default = true; example = false; }; + format = pkgs.formats.toml { }; in { options.programs.direnv = { @@ -72,11 +73,34 @@ in ''; }; }; + + settings = lib.mkOption { + inherit (format) type; + default = { }; + example = lib.literalExpression '' + { + global = { + log_format = "-"; + log_filter = "^$"; + }; + } + ''; + description = '' + Direnv configuration. Refer to {manpage}`direnv.toml(1)`. + ''; + }; }; config = lib.mkIf cfg.enable { programs = { + direnv.settings = lib.mkIf cfg.silent { + global = { + log_format = lib.mkDefault "-"; + log_filter = lib.mkDefault "^$"; + }; + }; + zsh.interactiveShellInit = lib.mkIf cfg.enableZshIntegration '' if ${lib.boolToString cfg.loadInNixShell} || printenv PATH | grep -vqc '/nix/store'; then eval "$(${lib.getExe cfg.package} hook zsh)" @@ -119,18 +143,19 @@ in (pkgs.symlinkJoin { inherit (cfg.package) name; paths = [ cfg.package ]; + nativeBuildInputs = [ pkgs.makeBinaryWrapper ]; postBuild = '' - rm -rf $out/share/fish + wrapProgram "$out/bin/direnv" \ + --set-default 'DIRENV_CONFIG' '/etc/direnv' + rm -rf "$out/share/fish" ''; }) ]; - variables = { - DIRENV_CONFIG = "/etc/direnv"; - DIRENV_LOG_FORMAT = lib.mkIf cfg.silent ""; - }; - etc = { + "direnv/direnv.toml" = lib.mkIf (cfg.settings != { }) { + source = format.generate "direnv.toml" cfg.settings; + }; "direnv/direnvrc".text = '' ${lib.optionalString cfg.nix-direnv.enable '' #Load nix-direnv diff --git a/nixos/modules/programs/iotop.nix b/nixos/modules/programs/iotop.nix index 39284e960923..1d18edf3d9f8 100644 --- a/nixos/modules/programs/iotop.nix +++ b/nixos/modules/programs/iotop.nix @@ -10,14 +10,17 @@ let in { options = { - programs.iotop.enable = lib.mkEnableOption "iotop + setcap wrapper"; + programs.iotop = { + enable = lib.mkEnableOption "iotop + setcap wrapper"; + package = lib.mkPackageOption pkgs "iotop" { example = "iotop-c"; }; + }; }; config = lib.mkIf cfg.enable { security.wrappers.iotop = { owner = "root"; group = "root"; capabilities = "cap_net_admin+p"; - source = "${pkgs.iotop}/bin/iotop"; + source = lib.getExe cfg.package; }; }; } diff --git a/nixos/modules/programs/nix-ld.nix b/nixos/modules/programs/nix-ld.nix index 84e17c65db82..e41742ac7e0d 100644 --- a/nixos/modules/programs/nix-ld.nix +++ b/nixos/modules/programs/nix-ld.nix @@ -22,7 +22,7 @@ in { meta.maintainers = [ lib.maintainers.mic92 ]; options.programs.nix-ld = { - enable = lib.mkEnableOption ''nix-ld, Documentation: ''; + enable = lib.mkEnableOption ''nix-ld, Documentation: ''; package = lib.mkPackageOption pkgs "nix-ld" { }; libraries = lib.mkOption { type = lib.types.listOf lib.types.package; diff --git a/nixos/modules/programs/rush.nix b/nixos/modules/programs/rush.nix new file mode 100644 index 000000000000..782e6da2c2a3 --- /dev/null +++ b/nixos/modules/programs/rush.nix @@ -0,0 +1,109 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.rush; + + indent = + lines: + lib.pipe lines [ + (lib.splitString "\n") + (builtins.filter (line: line != "")) + (map (line: " " + line)) + (builtins.concatStringsSep "\n") + ]; +in +{ + meta.maintainers = pkgs.rush.meta.maintainers; + + options.programs.rush = with lib.types; { + enable = lib.mkEnableOption "Restricted User Shell."; + + package = lib.mkPackageOption pkgs "rush" { } // { + type = shellPackage; + }; + + global = lib.mkOption { + type = lines; + description = "The `global` statement defines global settings."; + default = ""; + }; + + rules = lib.mkOption { + type = attrsOf lines; + default = { }; + + description = '' + The rule statement configures a GNU Rush rule. This is a block statement, which means that all + statements located between it and the next rule statement (or end of file, whichever occurs first) + modify the definition of that rule. + ''; + }; + + shell = lib.mkOption { + readOnly = true; + type = either shellPackage path; + + description = '' + The resolved shell path that users can inherit to set `rush` as their login shell. + This is a convenience option for use in user definitions. Example: + `users.users.alice = { inherit (config.programs.rush) shell; ... };` + ''; + }; + + wrap = lib.mkOption { + type = bool; + default = config.security.enableWrappers; + defaultText = lib.literalExpression "config.security.enableWrappers"; + + description = '' + Whether to wrap the `rush` binary with a SUID-enabled wrapper. + This is required if {option}`security.enableWrappers` is enabled in your configuration. + ''; + }; + }; + + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + (lib.mkIf cfg.wrap { + security.wrappers.rush = lib.mkDefault { + group = "root"; + owner = "root"; + permissions = "u+rx,g+x,o+x"; + setgid = false; + setuid = true; + source = lib.getExe cfg.package; + }; + }) + + { + programs.rush.shell = if cfg.wrap then config.security.wrapperDir + "/rush" else cfg.package; + + environment = { + shells = [ cfg.shell ]; + systemPackages = [ cfg.package ]; + + etc."rush.rc".text = + lib.pipe + [ + "# This file was created by the module `programs.rush`;" + "rush 2.0" + (lib.optionalString (cfg.global != "") "global\n${indent cfg.global}") + (lib.optionals (cfg.rules != { }) ( + lib.mapAttrsToList (name: content: "rule ${name}\n${indent content}") cfg.rules + )) + ] + [ + (lib.flatten) + (builtins.filter (line: line != "")) + (builtins.concatStringsSep "\n\n") + (lib.mkDefault) + ]; + }; + } + ] + ); +} diff --git a/nixos/modules/programs/television.nix b/nixos/modules/programs/television.nix new file mode 100644 index 000000000000..1989df2b925b --- /dev/null +++ b/nixos/modules/programs/television.nix @@ -0,0 +1,42 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib.options) mkEnableOption mkPackageOption; + inherit (lib.modules) mkIf; + inherit (lib.meta) getExe; + + cfg = config.programs.television; +in +{ + options.programs.television = { + enable = mkEnableOption "Blazingly fast general purpose fuzzy finder TUI"; + package = mkPackageOption pkgs "television" { }; + + enableBashIntegration = mkEnableOption "Bash integration"; + enableZshIntegration = mkEnableOption "Zsh integration"; + enableFishIntegration = mkEnableOption "Fish integration"; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + programs = { + zsh.interactiveShellInit = mkIf cfg.enableZshIntegration '' + eval "$(${getExe cfg.package} init zsh)" + ''; + bash.interactiveShellInit = mkIf cfg.enableBashIntegration '' + eval "$(${getExe cfg.package} init bash)" + ''; + fish.interactiveShellInit = mkIf cfg.enableFishIntegration '' + ${getExe cfg.package} init fish | source + ''; + }; + + }; + + meta.maintainers = with lib.maintainers; [ pbek ]; +} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 0e8711fd489a..94cf7428e09d 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -299,6 +299,9 @@ in See https://www.isc.org/blogs/isc-dhcp-eol/ for details. Please switch to a different implementation like kea or dnsmasq. '') + (mkRemovedOptionModule [ "services" "gsignond" ] '' + The corresponding package was unmaintained, abandoned upstream, used outdated library and thus removed from nixpkgs. + '') (mkRemovedOptionModule [ "services" "haka" ] '' The corresponding package was broken and removed from nixpkgs. '') diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index a4c2f9e29fc3..e0b768b60af4 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -200,10 +200,8 @@ in sed '1,/\[qualifiers\]/d' $footer >> $out ''; - boot.kernelParams = [ - "apparmor=1" - "security=apparmor" - ]; + boot.kernelParams = [ "apparmor=1" ]; + security.lsm = [ "apparmor" ]; systemd.services.apparmor = { after = [ diff --git a/nixos/modules/security/default.nix b/nixos/modules/security/default.nix new file mode 100644 index 000000000000..c8baad1a3dd9 --- /dev/null +++ b/nixos/modules/security/default.nix @@ -0,0 +1,28 @@ +{ config, lib, ... }: +let + cfg = config.security; +in +{ + options = { + security.lsm = lib.mkOption { + type = lib.types.uniq (lib.types.listOf lib.types.str); + default = [ ]; + description = '' + A list of the LSMs to initialize in order. + ''; + }; + }; + + config = lib.mkIf (lib.lists.length cfg.lsm > 0) { + assertions = [ + { + assertion = builtins.length (lib.filter (lib.hasPrefix "security=") config.boot.kernelParams) == 0; + message = "security parameter in boot.kernelParams cannot be used when security.lsm is used"; + } + ]; + + boot.kernelParams = [ + "lsm=${lib.concatStringsSep "," cfg.lsm}" + ]; + }; +} diff --git a/nixos/modules/security/isolate.nix b/nixos/modules/security/isolate.nix index c2df90e426a6..9f0060e305ac 100644 --- a/nixos/modules/security/isolate.nix +++ b/nixos/modules/security/isolate.nix @@ -140,7 +140,7 @@ in systemd.slices.isolate = { description = "Isolate Sandbox Slice"; }; - - meta.maintainers = with maintainers; [ virchau13 ]; }; + + meta.maintainers = with maintainers; [ virchau13 ]; } diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index de74e5cda3c5..ad4e32e82561 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -145,6 +145,11 @@ let description = "Name of the PAM service."; }; + enable = lib.mkEnableOption "this PAM service" // { + default = true; + example = false; + }; + rules = lib.mkOption { # This option is experimental and subject to breaking changes without notice. visible = false; @@ -1566,6 +1571,8 @@ let Defaults env_keep+=SSH_AUTH_SOCK ''; + enabledServices = lib.filterAttrs (name: svc: svc.enable) config.security.pam.services; + in { @@ -2282,7 +2289,7 @@ in }; }; - environment.etc = lib.mapAttrs' makePAMService config.security.pam.services; + environment.etc = lib.mapAttrs' makePAMService enabledServices; security.pam.services = { @@ -2298,11 +2305,11 @@ in ''; # Most of these should be moved to specific modules. - i3lock = { }; - i3lock-color = { }; - vlock = { }; - xlock = { }; - xscreensaver = { }; + i3lock.enable = lib.mkDefault config.programs.i3lock.enable; + i3lock-color.enable = lib.mkDefault config.programs.i3lock.enable; + vlock.enable = lib.mkDefault config.console.enable; + xlock.enable = lib.mkDefault config.services.xserver.enable; + xscreensaver.enable = lib.mkDefault config.services.xscreensaver.enable; runuser = { rootOK = true; @@ -2327,11 +2334,11 @@ in security.apparmor.includes."abstractions/pam" = lib.concatMapStrings (name: "r ${config.environment.etc."pam.d/${name}".source},\n") ( - lib.attrNames config.security.pam.services + lib.attrNames enabledServices ) + ( with lib; - pipe config.security.pam.services [ + pipe enabledServices [ lib.attrValues (catAttrs "rules") (lib.concatMap lib.attrValues) diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix index d47f2ec05521..fbc5fe1ed2b3 100644 --- a/nixos/modules/security/pam_mount.nix +++ b/nixos/modules/security/pam_mount.nix @@ -15,7 +15,7 @@ let ${pkgs.lsof}/bin/lsof | ${pkgs.gnugrep}/bin/grep $MNTPT | ${pkgs.gawk}/bin/awk '{print $2}' | ${pkgs.findutils}/bin/xargs ${pkgs.util-linux}/bin/kill -$SIGNAL ''; - anyPamMount = lib.any (lib.attrByPath [ "pamMount" ] false) ( + anyPamMount = lib.any (svc: svc.enable && svc.pamMount) ( lib.attrValues config.security.pam.services ); in diff --git a/nixos/modules/security/please.nix b/nixos/modules/security/please.nix index dcc3a63384b8..b67f0945521a 100644 --- a/nixos/modules/security/please.nix +++ b/nixos/modules/security/please.nix @@ -121,7 +121,5 @@ in sshAgentAuth = true; usshAuth = true; }; - - meta.maintainers = [ ]; }; } diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix index 5850b17e9cb7..f1b81d451a73 100644 --- a/nixos/modules/services/backup/restic-rest-server.nix +++ b/nixos/modules/services/backup/restic-rest-server.nix @@ -36,6 +36,12 @@ in ''; }; + htpasswd-file = lib.mkOption { + default = null; + type = lib.types.nullOr lib.types.path; + description = "The path to the servers .htpasswd file. Defaults to {dataDir}/htpasswd."; + }; + privateRepos = lib.mkOption { default = false; type = lib.types.bool; @@ -84,6 +90,7 @@ in ExecStart = '' ${cfg.package}/bin/rest-server \ --path ${cfg.dataDir} \ + ${lib.optionalString (cfg.htpasswd-file != null) "--htpasswd-file ${cfg.htpasswd-file}"} \ ${lib.optionalString cfg.appendOnly "--append-only"} \ ${lib.optionalString cfg.privateRepos "--private-repos"} \ ${lib.optionalString cfg.prometheus "--prometheus"} \ @@ -112,6 +119,7 @@ in ProtectControlGroups = true; PrivateDevices = true; ReadWritePaths = [ cfg.dataDir ]; + ReadOnlyPaths = lib.optional (cfg.htpasswd-file != null) cfg.htpasswd-file; RemoveIPC = true; RestrictAddressFamilies = "none"; RestrictNamespaces = true; diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index 0130564778e6..814f0e99a8a7 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -24,10 +24,6 @@ let cfg = config.services.cassandra; - atLeast3 = versionAtLeast cfg.package.version "3"; - atLeast3_11 = versionAtLeast cfg.package.version "3.11"; - atLeast4 = versionAtLeast cfg.package.version "4"; - defaultUser = "cassandra"; cassandraConfig = flip recursiveUpdate cfg.extraConfig ( @@ -41,6 +37,7 @@ let data_file_directories = [ "${cfg.homeDir}/data" ]; commitlog_directory = "${cfg.homeDir}/commitlog"; saved_caches_directory = "${cfg.homeDir}/saved_caches"; + hints_directory = "${cfg.homeDir}/hints"; } // optionalAttrs (cfg.seedAddresses != [ ]) { seed_provider = [ @@ -50,9 +47,6 @@ let } ]; } - // optionalAttrs atLeast3 { - hints_directory = "${cfg.homeDir}/hints"; - } ); cassandraConfigWithAddresses = @@ -97,9 +91,7 @@ let # Delete default password file sed -i '/-Dcom.sun.management.jmxremote.password.file=\/etc\/cassandra\/jmxremote.password/d' "$out/cassandra-env.sh" - ${lib.optionalString atLeast4 '' - cp $package/conf/jvm*.options $out/ - ''} + cp $package/conf/jvm*.options $out/ ''; }; @@ -109,17 +101,17 @@ let fullJvmOptions = cfg.jvmOpts + ++ [ + # Historically, we don't use a log dir, whereas the upstream scripts do + # expect this. We override those by providing our own -Xlog:gc flag. + "-Xlog:gc=warning,heap*=warning,age*=warning,safepoint=warning,promotion*=warning" + ] ++ optionals (cfg.jmxRoles != [ ]) [ "-Dcom.sun.management.jmxremote.authenticate=true" "-Dcom.sun.management.jmxremote.password.file=${cfg.jmxRolesFile}" ] ++ optionals cfg.remoteJmx [ "-Djava.rmi.server.hostname=${cfg.rpcAddress}" - ] - ++ optionals atLeast4 [ - # Historically, we don't use a log dir, whereas the upstream scripts do - # expect this. We override those by providing our own -Xlog:gc flag. - "-Xlog:gc=warning,heap*=warning,age*=warning,safepoint=warning,promotion*=warning" ]; commonEnv = { @@ -169,7 +161,7 @@ in }; package = mkPackageOption pkgs "cassandra" { - example = "cassandra_3_11"; + example = "cassandra_4"; }; jvmOpts = mkOption { @@ -462,14 +454,11 @@ in jmxRolesFile = mkOption { type = types.nullOr types.path; - default = if atLeast3_11 then pkgs.writeText "jmx-roles-file" defaultJmxRolesFile else null; - defaultText = literalMD ''generated configuration file if version is at least 3.11, otherwise `null`''; + default = pkgs.writeText "jmx-roles-file" defaultJmxRolesFile; + defaultText = "generated configuration file"; example = "/var/lib/cassandra/jmx.password"; description = '' Specify your own jmx roles file. - - Make sure the permissions forbid "others" from reading the file if - you're using Cassandra below version 3.11. ''; }; }; @@ -492,8 +481,7 @@ in assertion = cfg.remoteJmx -> cfg.jmxRolesFile != null; message = '' If you want JMX available remotely you need to set a password using - jmxRoles or jmxRolesFile if - using Cassandra older than v3.11. + jmxRoles. ''; } ]; diff --git a/nixos/modules/services/desktops/gsignond.nix b/nixos/modules/services/desktops/gsignond.nix deleted file mode 100644 index 96a54889babf..000000000000 --- a/nixos/modules/services/desktops/gsignond.nix +++ /dev/null @@ -1,46 +0,0 @@ -# Accounts-SSO gSignOn daemon -{ - config, - lib, - pkgs, - ... -}: -let - package = pkgs.gsignond.override { plugins = config.services.gsignond.plugins; }; -in -{ - - meta.maintainers = [ ]; - - ###### interface - - options = { - - services.gsignond = { - - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to enable gSignOn daemon, a DBus service - which performs user authentication on behalf of its clients. - ''; - }; - - plugins = lib.mkOption { - type = lib.types.listOf lib.types.package; - default = [ ]; - description = '' - What plugins to use with the gSignOn daemon. - ''; - }; - }; - }; - - ###### implementation - config = lib.mkIf config.services.gsignond.enable { - environment.etc."gsignond.conf".source = "${package}/etc/gsignond.conf"; - services.dbus.packages = [ package ]; - }; - -} diff --git a/nixos/modules/services/desktops/telepathy.nix b/nixos/modules/services/desktops/telepathy.nix index d4aac1aa0c26..cfab2c3a413f 100644 --- a/nixos/modules/services/desktops/telepathy.nix +++ b/nixos/modules/services/desktops/telepathy.nix @@ -41,7 +41,6 @@ # Enable runtime optional telepathy in gnome-shell services.xserver.desktopManager.gnome.sessionPath = with pkgs; [ telepathy-glib - telepathy-logger ]; }; diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix index 78b7ec080289..bf4e5632271a 100644 --- a/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix +++ b/nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix @@ -39,7 +39,7 @@ writeScriptBin "nvidia-cdi-generator" '' --device-name-strategy ${deviceNameStrategy} \ --ldconfig-path ${lib.getExe' glibc "ldconfig"} \ --library-search-path ${lib.getLib nvidia-driver}/lib \ - --nvidia-ctk-path ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"} + --nvidia-cdi-hook-path ${lib.getExe' nvidia-container-toolkit.tools "nvidia-cdi-hook"} } function additionalMount { diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix index 8b5c5c95b12e..af94fbe6a45b 100644 --- a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix +++ b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix @@ -50,6 +50,15 @@ ''; }; + suppressNvidiaDriverAssertion = lib.mkOption { + default = false; + type = lib.types.bool; + description = '' + Suppress the assertion for installing Nvidia driver. + Useful in WSL where drivers are mounted from Windows, not provided by NixOS. + ''; + }; + mounts = lib.mkOption { type = lib.types.listOf (lib.types.submodule mountType); default = [ ]; @@ -98,8 +107,10 @@ assertions = [ { assertion = - config.hardware.nvidia.datacenter.enable || lib.elem "nvidia" config.services.xserver.videoDrivers; - message = ''`nvidia-container-toolkit` requires nvidia datacenter or desktop drivers: set `hardware.nvidia.datacenter.enable` or add "nvidia" to `services.xserver.videoDrivers`''; + config.hardware.nvidia.datacenter.enable + || lib.elem "nvidia" config.services.xserver.videoDrivers + || config.hardware.nvidia-container-toolkit.suppressNvidiaDriverAssertion; + message = ''`nvidia-container-toolkit` requires nvidia drivers: set `hardware.nvidia.datacenter.enable`, add "nvidia" to `services.xserver.videoDrivers`, or set `hardware.nvidia-container-toolkit.suppressNvidiaDriverAssertion` if the driver is provided by another NixOS module (e.g. from NixOS-WSL)''; } ]; diff --git a/nixos/modules/services/mail/maddy.nix b/nixos/modules/services/mail/maddy.nix index 41d25eaf7885..b086f319c136 100644 --- a/nixos/modules/services/mail/maddy.nix +++ b/nixos/modules/services/mail/maddy.nix @@ -143,6 +143,8 @@ in enable = lib.mkEnableOption "Maddy, a free an open source mail server"; + package = lib.mkPackageOption pkgs "maddy" { }; + user = lib.mkOption { default = "maddy"; type = with lib.types; uniq str; @@ -386,7 +388,7 @@ in systemd = { - packages = [ pkgs.maddy ]; + packages = [ cfg.package ]; services = { maddy = { serviceConfig = { @@ -402,16 +404,16 @@ in script = '' ${lib.optionalString (cfg.ensureAccounts != [ ]) '' ${lib.concatMapStrings (account: '' - if ! ${pkgs.maddy}/bin/maddyctl imap-acct list | grep "${account}"; then - ${pkgs.maddy}/bin/maddyctl imap-acct create ${account} + if ! ${cfg.package}/bin/maddyctl imap-acct list | grep "${account}"; then + ${cfg.package}/bin/maddyctl imap-acct create ${account} fi '') cfg.ensureAccounts} ''} ${lib.optionalString (cfg.ensureCredentials != { }) '' ${lib.concatStringsSep "\n" ( - lib.mapAttrsToList (name: cfg: '' - if ! ${pkgs.maddy}/bin/maddyctl creds list | grep "${name}"; then - ${pkgs.maddy}/bin/maddyctl creds create --password $(cat ${lib.escapeShellArg cfg.passwordFile}) ${name} + lib.mapAttrsToList (name: credentials: '' + if ! ${cfg.package}/bin/maddyctl creds list | grep "${name}"; then + ${cfg.package}/bin/maddyctl creds create --password $(cat ${lib.escapeShellArg credentials.passwordFile}) ${name} fi '') cfg.ensureCredentials )} @@ -486,7 +488,7 @@ in }; environment.systemPackages = [ - pkgs.maddy + cfg.package ]; }; } diff --git a/nixos/modules/services/matrix/mautrix-signal.nix b/nixos/modules/services/matrix/mautrix-signal.nix index 9977011e0035..4695d7c7423c 100644 --- a/nixos/modules/services/matrix/mautrix-signal.nix +++ b/nixos/modules/services/matrix/mautrix-signal.nix @@ -268,7 +268,7 @@ in buildDocsInSandbox = false; doc = ./mautrix-signal.md; maintainers = with lib.maintainers; [ - niklaskorz + alyaeanyx frederictobiasc ]; }; diff --git a/nixos/modules/services/misc/devpi-server.nix b/nixos/modules/services/misc/devpi-server.nix index 309ef8325f9f..16c5fd34ff17 100644 --- a/nixos/modules/services/misc/devpi-server.nix +++ b/nixos/modules/services/misc/devpi-server.nix @@ -125,7 +125,7 @@ in networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; }; - - meta.maintainers = [ lib.maintainers.cafkafk ]; }; + + meta.maintainers = [ lib.maintainers.cafkafk ]; } diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index e22473058d4b..bc48066937ab 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1296,6 +1296,7 @@ in ConditionPathExists = "!${cfg.registry.certFile}"; }; serviceConfig = { + Type = "oneshot"; Slice = "system-gitlab.slice"; }; }; diff --git a/nixos/modules/services/misc/homepage-dashboard.nix b/nixos/modules/services/misc/homepage-dashboard.nix index 72861fdbbe87..1a541963187b 100644 --- a/nixos/modules/services/misc/homepage-dashboard.nix +++ b/nixos/modules/services/misc/homepage-dashboard.nix @@ -4,7 +4,6 @@ lib, ... }: - let cfg = config.services.homepage-dashboard; # Define the settings format used for this program @@ -29,6 +28,19 @@ in description = "Port for Homepage to bind to."; }; + allowedHosts = lib.mkOption { + type = lib.types.str; + default = "localhost:8082,127.0.0.1:8082"; + example = "example.com"; + description = '' + Hosts that homepage-dashboard will be running under. + You will want to change this in order to acess homepage from anything other than localhost. + see the upsream documentation: + + + ''; + }; + environmentFile = lib.mkOption { type = lib.types.str; description = '' @@ -215,6 +227,7 @@ in NIXPKGS_HOMEPAGE_CACHE_DIR = "/var/cache/homepage-dashboard"; PORT = toString cfg.listenPort; LOG_TARGETS = "stdout"; + HOMEPAGE_ALLOWED_HOSTS = cfg.allowedHosts; }; serviceConfig = { diff --git a/nixos/modules/services/misc/moonraker.nix b/nixos/modules/services/misc/moonraker.nix index 43d46a690915..9c6067634209 100644 --- a/nixos/modules/services/misc/moonraker.nix +++ b/nixos/modules/services/misc/moonraker.nix @@ -224,6 +224,8 @@ in platform = "linux"; enable_estimator_updates = false; }; + # suppress PolicyKit warnings if system control is disabled + machine.provider = lib.mkIf (!cfg.allowSystemControl) (lib.mkDefault "none"); }; security.polkit.extraConfig = lib.optionalString cfg.allowSystemControl '' diff --git a/nixos/modules/services/misc/tp-auto-kbbl.nix b/nixos/modules/services/misc/tp-auto-kbbl.nix index 6db22e5aa840..2af0521b848a 100644 --- a/nixos/modules/services/misc/tp-auto-kbbl.nix +++ b/nixos/modules/services/misc/tp-auto-kbbl.nix @@ -37,6 +37,8 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; + services.upower.enable = true; + systemd.services.tp-auto-kbbl = { serviceConfig = { ExecStart = lib.concatStringsSep " " ( diff --git a/nixos/modules/services/misc/tzupdate.nix b/nixos/modules/services/misc/tzupdate.nix index 18fee37ddd1b..454b47620e11 100644 --- a/nixos/modules/services/misc/tzupdate.nix +++ b/nixos/modules/services/misc/tzupdate.nix @@ -18,6 +18,25 @@ in update the timezone. ''; }; + + package = lib.mkPackageOption pkgs "tzupdate" { }; + + timer.enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Enable the tzupdate timer to update the timezone automatically. + ''; + }; + + timer.interval = lib.mkOption { + type = lib.types.str; + default = "hourly"; + description = '' + The interval at which the tzupdate timer should run. See + {manpage}`systemd.time(7)` to understand the format. + ''; + }; }; config = lib.mkIf cfg.enable { @@ -26,15 +45,16 @@ in # zone, which is better than silently overriding it. time.timeZone = null; - # We provide a one-shot service which can be manually run. We could - # provide a service that runs on startup, but it's tricky to get - # a service to run after you have *internet* access. + # We provide a one-shot service that runs at startup once network + # interfaces are up, but we can’t ensure we actually have Internet access + # at that point. It can also be run manually with `systemctl start tzupdate`. systemd.services.tzupdate = { description = "tzupdate timezone update service"; + wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ]; after = [ "network-online.target" ]; script = '' - timezone="$(${lib.getExe pkgs.tzupdate} --print-only)" + timezone="$(${lib.getExe cfg.package} --print-only)" if [[ -n "$timezone" ]]; then echo "Setting timezone to '$timezone'" timedatectl set-timezone "$timezone" @@ -45,6 +65,17 @@ in Type = "oneshot"; }; }; + + systemd.timers.tzupdate = { + enable = cfg.timer.enable; + interval = cfg.timer.interval; + timerConfig = { + OnStartupSec = "30s"; + OnCalendar = cfg.timer.interval; + Persistent = true; + }; + wantedBy = [ "timers.target" ]; + }; }; meta.maintainers = with lib.maintainers; [ doronbehar ]; diff --git a/nixos/modules/services/monitoring/alloy.nix b/nixos/modules/services/monitoring/alloy.nix index 73f967addc91..fe0ed2cab8b3 100644 --- a/nixos/modules/services/monitoring/alloy.nix +++ b/nixos/modules/services/monitoring/alloy.nix @@ -65,6 +65,7 @@ in config = lib.mkIf cfg.enable { systemd.services.alloy = { + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; reloadTriggers = lib.mapAttrsToList (_: v: v.source or null) ( lib.filterAttrs (n: _: lib.hasPrefix "alloy/" n && lib.hasSuffix ".alloy" n) config.environment.etc diff --git a/nixos/modules/services/monitoring/cockpit.nix b/nixos/modules/services/monitoring/cockpit.nix index 7b5e05bfb55c..7f2f5a6ced1b 100644 --- a/nixos/modules/services/monitoring/cockpit.nix +++ b/nixos/modules/services/monitoring/cockpit.nix @@ -12,7 +12,6 @@ let mkEnableOption mkOption mkIf - literalMD mkPackageOption ; settingsFormat = pkgs.formats.ini { }; @@ -26,6 +25,18 @@ in default = [ "cockpit" ]; }; + allowed-origins = lib.mkOption { + type = types.listOf types.str; + + default = [ ]; + + description = '' + List of allowed origins. + + Maps to the WebService.Origins setting and allows merging from multiple modules. + ''; + }; + settings = lib.mkOption { type = settingsFormat.type; @@ -62,14 +73,16 @@ in # generate cockpit settings environment.etc."cockpit/cockpit.conf".source = settingsFormat.generate "cockpit.conf" cfg.settings; - security.pam.services.cockpit = { }; + security.pam.services.cockpit = { + startSession = true; + }; networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; systemd.packages = [ cfg.package ]; systemd.sockets.cockpit.wantedBy = [ "multi-user.target" ]; systemd.sockets.cockpit.listenStreams = [ - "" + "" # workaround so it doesn't listen on both ports caused by the runtime merging (toString cfg.port) ]; @@ -80,6 +93,13 @@ in "L+ /run/cockpit/motd - - - - inactive.motd" "d /etc/cockpit/ws-certs.d 0600 root root 0" ]; + + services.cockpit.allowed-origins = [ + "https://localhost:${toString config.services.cockpit.port}" + ]; + + services.cockpit.settings.WebService.Origins = + builtins.concatStringsSep " " config.services.cockpit.allowed-origins; }; meta.maintainers = pkgs.cockpit.meta.maintainers; diff --git a/nixos/modules/services/networking/ax25/axlisten.nix b/nixos/modules/services/networking/ax25/axlisten.nix new file mode 100644 index 000000000000..ad887885c142 --- /dev/null +++ b/nixos/modules/services/networking/ax25/axlisten.nix @@ -0,0 +1,62 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + types + ; + + inherit (lib.modules) + mkIf + ; + + inherit (lib.options) + mkEnableOption + mkOption + literalExpression + ; + + cfg = config.services.ax25.axlisten; +in +{ + options = { + + services.ax25.axlisten = { + + enable = mkEnableOption "AX.25 axlisten daemon"; + + package = mkOption { + type = types.package; + default = pkgs.ax25-apps; + defaultText = literalExpression "pkgs.ax25-apps"; + description = "The ax25-apps package to use."; + }; + + config = mkOption { + type = types.str; + default = "-art"; + description = '' + Options that will be passed to the axlisten daemon. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + systemd.services.axlisten = { + description = "AX.25 traffic monitor"; + wantedBy = [ "multi-user.target" ]; + after = [ "ax25-axports.target" ]; + requires = [ "ax25-axports.target" ]; + serviceConfig = { + Type = "exec"; + ExecStart = "${cfg.package}/bin/axlisten ${cfg.config}"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/ax25/axports.nix b/nixos/modules/services/networking/ax25/axports.nix new file mode 100644 index 000000000000..257d7ee8c1c5 --- /dev/null +++ b/nixos/modules/services/networking/ax25/axports.nix @@ -0,0 +1,149 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + types + ; + + inherit (lib.strings) + concatStringsSep + optionalString + ; + + inherit (lib.attrsets) + filterAttrs + mapAttrsToList + mapAttrs' + ; + + inherit (lib.modules) + mkIf + ; + + inherit (lib.options) + mkEnableOption + mkOption + mkPackageOption + ; + + cfg = config.services.ax25.axports; + + enabledAxports = filterAttrs (ax25Name: cfg: cfg.enable) cfg; + + axportsOpts = { + + options = { + enable = mkEnableOption "Enables the axport interface"; + + package = mkPackageOption pkgs "ax25-tools" { }; + + tty = mkOption { + type = types.str; + example = "/dev/ttyACM0"; + description = '' + Location of hardware kiss tnc for this interface. + ''; + }; + + callsign = mkOption { + type = types.str; + example = "WB6WLV-7"; + description = '' + The callsign of the physical interface to bind to. + ''; + }; + + description = mkOption { + type = types.str; + # This cannot be empty since some ax25 tools cant parse /etc/ax25/axports without it + default = "NixOS managed tnc"; + description = '' + Free format description of this interface. + ''; + }; + + baud = mkOption { + type = types.int; + example = 57600; + description = '' + The serial port speed of this interface. + ''; + }; + + paclen = mkOption { + type = types.int; + default = 255; + description = '' + Default maximum packet size for this interface. + ''; + }; + + window = mkOption { + type = types.int; + default = 7; + description = '' + Default window size for this interface. + ''; + }; + + kissParams = mkOption { + type = types.nullOr types.str; + default = null; + example = "-t 300 -l 10 -s 12 -r 80 -f n"; + description = '' + Kissattach parameters for this interface. + ''; + }; + }; + }; +in +{ + + options = { + + services.ax25.axports = mkOption { + type = types.attrsOf (types.submodule axportsOpts); + default = { }; + description = "Specification of one or more AX.25 ports."; + }; + }; + + config = mkIf (enabledAxports != { }) { + + environment.etc."ax25/axports" = { + text = concatStringsSep "\n" ( + mapAttrsToList ( + portName: portCfg: + "${portName} ${portCfg.callsign} ${toString portCfg.baud} ${toString portCfg.paclen} ${toString portCfg.window} ${portCfg.description}" + ) enabledAxports + ); + mode = "0644"; + }; + + systemd.targets.ax25-axports = { + description = "AX.25 axports group target"; + }; + + systemd.services = mapAttrs' (portName: portCfg: { + name = "ax25-kissattach-${portName}"; + value = { + description = "AX.25 KISS attached interface for ${portName}"; + wantedBy = [ "multi-user.target" ]; + before = [ "ax25-axports.target" ]; + partOf = [ "ax25-axports.target" ]; + serviceConfig = { + Type = "exec"; + ExecStart = "${portCfg.package}/bin/kissattach ${portCfg.tty} ${portName}"; + }; + postStart = optionalString (portCfg.kissParams != null) '' + ${portCfg.package}/bin/kissparms -p ${portName} ${portCfg.kissParams} + ''; + }; + }) enabledAxports; + }; +} diff --git a/nixos/modules/services/networking/kismet.nix b/nixos/modules/services/networking/kismet.nix new file mode 100644 index 000000000000..4e14e9fd51d4 --- /dev/null +++ b/nixos/modules/services/networking/kismet.nix @@ -0,0 +1,459 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib.trivial) isFloat isInt isBool; + inherit (lib.modules) mkIf; + inherit (lib.options) + literalExpression + mkOption + mkPackageOption + mkEnableOption + ; + inherit (lib.strings) + isString + escapeShellArg + escapeShellArgs + concatMapStringsSep + concatMapAttrsStringSep + replaceStrings + substring + stringLength + hasInfix + hasSuffix + typeOf + match + ; + inherit (lib.lists) all isList flatten; + inherit (lib.attrsets) + attrsToList + filterAttrs + optionalAttrs + mapAttrs' + mapAttrsToList + nameValuePair + ; + inherit (lib.generators) toKeyValue; + inherit (lib) types; + + # Deeply checks types for a given type function. Calls `override` with type and value. + deep = + func: override: type: + let + prev = func type; + in + prev + // { + check = value: prev.check value && (override type value); + }; + + # Deep listOf. + listOf' = deep types.listOf (type: value: all type.check value); + + # Deep attrsOf. + attrsOf' = deep types.attrsOf (type: value: all (item: type.check item.value) (attrsToList value)); + + # Kismet config atoms. + atom = + with types; + oneOf [ + number + bool + str + ]; + + # Composite types. + listOfAtom = listOf' atom; + atomOrList = with types; either atom listOfAtom; + lists = listOf' atomOrList; + kvPair = attrsOf' atomOrList; + kvPairs = listOf' kvPair; + + # Options that eval to a string with a header (foo:key=value) + headerKvPair = attrsOf' (attrsOf' atomOrList); + headerKvPairs = attrsOf' (listOf' (attrsOf' atomOrList)); + + # Toplevel config type. + topLevel = + let + topLevel' = + with types; + oneOf [ + headerKvPairs + headerKvPair + kvPairs + kvPair + listOfAtom + lists + atom + ]; + in + topLevel' + // { + description = "Kismet config stanza"; + }; + + # Throws invalid. + invalid = atom: throw "invalid value '${toString atom}' of type '${typeOf atom}'"; + + # Converts an atom. + mkAtom = + atom: + if isString atom then + if hasInfix "\"" atom || hasInfix "," atom then + ''"${replaceStrings [ ''"'' ] [ ''\"'' ] atom}"'' + else + atom + else if isFloat atom || isInt atom || isBool atom then + toString atom + else + invalid atom; + + # Converts an inline atom or list to a string. + mkAtomOrListInline = + atomOrList: + if isList atomOrList then + mkAtom "${concatMapStringsSep "," mkAtom atomOrList}" + else + mkAtom atomOrList; + + # Converts an out of line atom or list to a string. + mkAtomOrList = + atomOrList: + if isList atomOrList then + "${concatMapStringsSep "," mkAtomOrListInline atomOrList}" + else + mkAtom atomOrList; + + # Throws if the string matches the given regex. + deny = + regex: str: + assert (match regex str) == null; + str; + + # Converts a set of k/v pairs. + convertKv = concatMapAttrsStringSep "," ( + name: value: "${mkAtom (deny "=" name)}=${mkAtomOrListInline value}" + ); + + # Converts k/v pairs with a header. + convertKvWithHeader = header: attrs: "${mkAtom (deny ":" header)}:${convertKv attrs}"; + + # Converts the entire config. + convertConfig = mapAttrs' ( + name: value: + let + # Convert foo' into 'foo+' for support for '+=' syntax. + newName = if hasSuffix "'" name then substring 0 (stringLength name - 1) name + "+" else name; + + # Get the stringified value. + newValue = + if headerKvPairs.check value then + flatten ( + mapAttrsToList (header: values: (map (value: convertKvWithHeader header value) values)) value + ) + else if headerKvPair.check value then + mapAttrsToList convertKvWithHeader value + else if kvPairs.check value then + map convertKv value + else if kvPair.check value then + convertKv value + else if listOfAtom.check value then + mkAtomOrList value + else if lists.check value then + map mkAtomOrList value + else if atom.check value then + mkAtom value + else + invalid value; + in + nameValuePair newName newValue + ); + + mkKismetConf = + options: + (toKeyValue { listsAsDuplicateKeys = true; }) ( + filterAttrs (_: value: value != null) (convertConfig options) + ); + + cfg = config.services.kismet; +in +{ + options.services.kismet = { + enable = mkEnableOption "kismet"; + package = mkPackageOption pkgs "kismet" { }; + user = mkOption { + description = "The user to run Kismet as."; + type = types.str; + default = "kismet"; + }; + group = mkOption { + description = "The group to run Kismet as."; + type = types.str; + default = "kismet"; + }; + serverName = mkOption { + description = "The name of the server."; + type = types.str; + default = "Kismet"; + }; + serverDescription = mkOption { + description = "The description of the server."; + type = types.str; + default = "NixOS Kismet server"; + }; + logTypes = mkOption { + description = "The log types."; + type = with types; listOf str; + default = [ "kismet" ]; + }; + dataDir = mkOption { + description = "The Kismet data directory."; + type = types.path; + default = "/var/lib/kismet"; + }; + httpd = { + enable = mkOption { + description = "True to enable the HTTP server."; + type = types.bool; + default = false; + }; + address = mkOption { + description = "The address to listen on. Note that this cannot be a hostname or Kismet will not start."; + type = types.str; + default = "127.0.0.1"; + }; + port = mkOption { + description = "The port to listen on."; + type = types.port; + default = 2501; + }; + }; + settings = mkOption { + description = '' + Options for Kismet. See: + https://www.kismetwireless.net/docs/readme/configuring/configfiles/ + ''; + default = { }; + type = with types; attrsOf topLevel; + example = literalExpression '' + { + /* Examples for atoms */ + # dot11_link_bssts=false + dot11_link_bssts = false; # Boolean + + # dot11_related_bss_window=10000000 + dot11_related_bss_window = 10000000; # Integer + + # devicefound=00:11:22:33:44:55 + devicefound = "00:11:22:33:44:55"; # String + + # log_types+=wiglecsv + log_types' = "wiglecsv"; + + /* Examples for lists of atoms */ + # wepkey=00:DE:AD:C0:DE:00,FEEDFACE42 + wepkey = [ "00:DE:AD:C0:DE:00" "FEEDFACE42" ]; + + # alert=ADHOCCONFLICT,5/min,1/sec + # alert=ADVCRYPTCHANGE,5/min,1/sec + alert = [ + [ "ADHOCCONFLICT" "5/min" "1/sec" ] + [ "ADVCRYPTCHANGE" "5/min" "1/sec" ] + ]; + + /* Examples for sets of atoms */ + # source=wlan0:name=ath11k + source.wlan0 = { name = "ath11k"; }; + + /* Examples with colon-suffixed headers */ + # gps=gpsd:host=localhost,port=2947 + gps.gpsd = { + host = "localhost"; + port = 2947; + }; + + # apspoof=Foo1:ssid=Bar1,validmacs="00:11:22:33:44:55,aa:bb:cc:dd:ee:ff" + # apspoof=Foo1:ssid=Bar2,validmacs="01:12:23:34:45:56,ab:bc:cd:de:ef:f0" + # apspoof=Foo2:ssid=Baz1,validmacs="11:22:33:44:55:66,bb:cc:dd:ee:ff:00" + apspoof.Foo1 = [ + { ssid = "Bar1"; validmacs = [ "00:11:22:33:44:55" "aa:bb:cc:dd:ee:ff" ]; } + { ssid = "Bar2"; validmacs = [ "01:12:23:34:45:56" "ab:bc:cd:de:ef:f0" ]; } + ]; + + # because Foo1 is a list, Foo2 needs to be as well + apspoof.Foo2 = [ + { + ssid = "Bar2"; + validmacs = [ "00:11:22:33:44:55" "aa:bb:cc:dd:ee:ff" ]; + }; + ]; + } + ''; + }; + extraConfig = mkOption { + description = '' + Literal Kismet config lines appended to the site config. + Note that `services.kismet.settings` allows you to define + all options here using Nix attribute sets. + ''; + default = ""; + type = types.str; + example = '' + # Looks like the following in `services.kismet.settings`: + # wepkey = [ "00:DE:AD:C0:DE:00" "FEEDFACE42" ]; + wepkey=00:DE:AD:C0:DE:00,FEEDFACE42 + ''; + }; + }; + + config = + let + configDir = "${cfg.dataDir}/.kismet"; + settings = + cfg.settings + // { + server_name = cfg.serverName; + server_description = cfg.serverDescription; + logging_enabled = cfg.logTypes != [ ]; + log_types = cfg.logTypes; + } + // optionalAttrs cfg.httpd.enable { + httpd_bind_address = cfg.httpd.address; + httpd_port = cfg.httpd.port; + httpd_auth_file = "${configDir}/kismet_httpd.conf"; + httpd_home = "${cfg.package}/share/kismet/httpd"; + }; + in + mkIf cfg.enable { + systemd.tmpfiles.settings = { + "10-kismet" = { + ${cfg.dataDir} = { + d = { + inherit (cfg) user group; + mode = "0750"; + }; + }; + ${configDir} = { + d = { + inherit (cfg) user group; + mode = "0750"; + }; + }; + }; + }; + systemd.services.kismet = + let + kismetConf = pkgs.writeText "kismet.conf" '' + ${mkKismetConf settings} + ${cfg.extraConfig} + ''; + in + { + description = "Kismet monitoring service"; + wants = [ "basic.target" ]; + after = [ + "basic.target" + "network.target" + ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = + let + capabilities = [ + "CAP_NET_ADMIN" + "CAP_NET_RAW" + ]; + kismetPreStart = pkgs.writeShellScript "kismet-pre-start" '' + owner=${escapeShellArg "${cfg.user}:${cfg.group}"} + mkdir -p ~/.kismet + + # Ensure permissions on directories Kismet uses. + chown "$owner" ~/ ~/.kismet + cd ~/.kismet + + package=${cfg.package} + if [ -d "$package/etc" ]; then + for file in "$package/etc"/*.conf; do + # Symlink the config files if they exist or are already a link. + base="''${file##*/}" + if [ ! -f "$base" ] || [ -L "$base" ]; then + ln -sf "$file" "$base" + fi + done + fi + + for file in kismet_httpd.conf; do + # Un-symlink these files. + if [ -L "$file" ]; then + cp "$file" ".$file" + rm -f "$file" + mv ".$file" "$file" + chmod 0640 "$file" + chown "$owner" "$file" + fi + done + + # Link the site config. + ln -sf ${kismetConf} kismet_site.conf + ''; + in + { + Type = "simple"; + ExecStart = escapeShellArgs [ + "${cfg.package}/bin/kismet" + "--homedir" + cfg.dataDir + "--confdir" + configDir + "--datadir" + "${cfg.package}/share" + "--no-ncurses" + "-f" + "${configDir}/kismet.conf" + ]; + WorkingDirectory = cfg.dataDir; + ExecStartPre = "+${kismetPreStart}"; + Restart = "always"; + KillMode = "control-group"; + CapabilityBoundingSet = capabilities; + AmbientCapabilities = capabilities; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = false; + PrivateTmp = true; + PrivateUsers = false; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "full"; + RestrictNamespaces = true; + RestrictSUIDSGID = true; + User = cfg.user; + Group = cfg.group; + UMask = "0007"; + TimeoutStopSec = 30; + }; + + # Allow it to restart if the wifi interface is not up + unitConfig.StartLimitIntervalSec = 5; + }; + users.groups.${cfg.group} = { }; + users.users.${cfg.user} = { + inherit (cfg) group; + description = "User for running Kismet"; + isSystemUser = true; + home = cfg.dataDir; + }; + }; + + meta.maintainers = with lib.maintainers; [ numinit ]; +} diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index a8c4c3885a71..3a9d911b8048 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -180,12 +180,12 @@ in }; }; - config = mkIf cfg.enable { - meta.maintainers = with lib.maintainers; [ - thoughtpolice - vifino - ]; + meta.maintainers = with lib.maintainers; [ + thoughtpolice + vifino + ]; + config = mkIf cfg.enable { environment.systemPackages = [ chronyPkg ]; users.groups.chrony.gid = config.ids.gids.chrony; diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix index 84f79df52b0e..6debe11753f9 100644 --- a/nixos/modules/services/networking/ntp/ntpd.nix +++ b/nixos/modules/services/networking/ntp/ntpd.nix @@ -126,9 +126,9 @@ in ###### implementation - config = mkIf config.services.ntp.enable { - meta.maintainers = with lib.maintainers; [ thoughtpolice ]; + meta.maintainers = with lib.maintainers; [ thoughtpolice ]; + config = mkIf config.services.ntp.enable { # Make tools such as ntpq available in the system path. environment.systemPackages = [ pkgs.ntp ]; services.timesyncd.enable = mkForce false; diff --git a/nixos/modules/services/networking/ntp/openntpd.nix b/nixos/modules/services/networking/ntp/openntpd.nix index c4ad630826b5..8d7eebde8cdc 100644 --- a/nixos/modules/services/networking/ntp/openntpd.nix +++ b/nixos/modules/services/networking/ntp/openntpd.nix @@ -58,8 +58,9 @@ in ###### implementation + meta.maintainers = with lib.maintainers; [ thoughtpolice ]; + config = mkIf cfg.enable { - meta.maintainers = with lib.maintainers; [ thoughtpolice ]; services.timesyncd.enable = mkForce false; # Add ntpctl to the environment for status checking diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix index 0e02cc74184c..c986fc604a64 100644 --- a/nixos/modules/services/networking/stunnel.nix +++ b/nixos/modules/services/networking/stunnel.nix @@ -222,13 +222,13 @@ in Type = "forking"; }; }; - - meta.maintainers = with lib.maintainers; [ - # Server side - lschuermann - # Client side - das_j - ]; }; + meta.maintainers = with lib.maintainers; [ + # Server side + lschuermann + # Client side + das_j + ]; + } diff --git a/nixos/modules/services/networking/vwifi.nix b/nixos/modules/services/networking/vwifi.nix new file mode 100644 index 000000000000..64b7fbdf45a4 --- /dev/null +++ b/nixos/modules/services/networking/vwifi.nix @@ -0,0 +1,200 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib.modules) mkIf mkMerge; + inherit (lib.options) mkOption mkPackageOption mkEnableOption; + inherit (lib.lists) optional optionals; + inherit (lib.strings) + hasSuffix + escapeShellArgs + ; + inherit (lib) types; + cfg = config.services.vwifi; +in +{ + options = { + services.vwifi = + let + mkOptionalPort = + name: + mkOption { + description = '' + The ${name} port. Set to null if we should leave it unset. + ''; + type = with types; nullOr port; + default = null; + }; + in + { + package = mkPackageOption pkgs "vwifi" { }; + module = { + enable = mkEnableOption "mac80211_hwsim module"; + numRadios = mkOption { + description = "The number of virtual radio interfaces to create."; + type = types.int; + default = 1; + }; + macPrefix = mkOption { + description = '' + The prefix for MAC addresses to use, without the trailing ':'. + If one radio is created, you can specify the whole MAC address here. + The default is defined in vwifi/src/config.h. + ''; + type = types.strMatching "^(([0-9A-Fa-f]{2}:){0,5}[0-9A-Fa-f]{2})$"; + default = "74:F8:F6"; + }; + }; + client = { + enable = mkEnableOption "vwifi client"; + spy = mkEnableOption "spy mode, useful for wireless monitors"; + serverAddress = mkOption { + description = '' + The address of the server. If set to null, will try to use the vsock protocol. + Note that this assumes that the server is spawned on the host and passed through to + QEMU, with something like: + + -device vhost-vsock-pci,id=vwifi0,guest-cid=42 + ''; + type = with types; nullOr str; + default = null; + }; + serverPort = mkOptionalPort "server port"; + extraArgs = mkOption { + description = '' + Extra arguments to pass to vwifi-client. You can use this if you want to bring + the radios up using vwifi-client instead of at boot. + ''; + type = with types; listOf str; + default = [ ]; + example = [ + "--number" + "3" + ]; + }; + }; + server = { + enable = mkEnableOption "vwifi server"; + vsock.enable = mkEnableOption "vsock kernel module"; + ports = { + vhost = mkOptionalPort "vhost"; + tcp = mkOptionalPort "TCP server"; + spy = mkOptionalPort "spy interface"; + control = mkOptionalPort "control interface"; + }; + openFirewall = mkEnableOption "opening the firewall for the TCP and spy ports"; + extraArgs = mkOption { + description = '' + Extra arguments to pass to vwifi-server. You can use this for things including + changing the ports or inducing packet loss. + ''; + type = with types; listOf str; + default = [ ]; + example = [ "--lost-packets" ]; + }; + }; + }; + }; + + config = mkMerge [ + (mkIf cfg.module.enable { + boot.kernelModules = [ + "mac80211_hwsim" + ]; + boot.extraModprobeConfig = '' + # We'll add more radios using vwifi-add-interfaces in the systemd unit. + options mac80211_hwsim radios=0 + ''; + systemd.services.vwifi-add-interfaces = mkIf (cfg.module.numRadios > 0) { + description = "vwifi interface bringup"; + wantedBy = [ "network-pre.target" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = + let + args = [ + (toString cfg.module.numRadios) + cfg.module.macPrefix + ]; + in + "${cfg.package}/bin/vwifi-add-interfaces ${escapeShellArgs args}"; + }; + }; + assertions = [ + { + assertion = !(hasSuffix ":" cfg.module.macPrefix); + message = '' + services.vwifi.module.macPrefix should not have a trailing ":". + ''; + } + ]; + }) + (mkIf cfg.client.enable { + systemd.services.vwifi-client = + let + clientArgs = + optional cfg.client.spy "--spy" + ++ optional (cfg.client.serverAddress != null) cfg.client.serverAddress + ++ optionals (cfg.client.serverPort != null) [ + "--port" + cfg.client.serverPort + ] + ++ cfg.client.extraArgs; + in + rec { + description = "vwifi client"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + requires = after; + serviceConfig = { + ExecStart = "${cfg.package}/bin/vwifi-client ${escapeShellArgs clientArgs}"; + }; + }; + }) + (mkIf cfg.server.enable { + boot.kernelModules = mkIf cfg.server.vsock.enable [ + "vhost_vsock" + ]; + networking.firewall.allowedTCPPorts = mkIf cfg.server.openFirewall ( + optional (cfg.server.ports.tcp != null) cfg.server.ports.tcp + ++ optional (cfg.server.ports.spy != null) cfg.server.ports.spy + ); + systemd.services.vwifi-server = + let + serverArgs = + optionals (cfg.server.ports.vhost != null) [ + "--port-vhost" + (toString cfg.server.ports.vhost) + ] + ++ optionals (cfg.server.ports.tcp != null) [ + "--port-tcp" + (toString cfg.server.ports.tcp) + ] + ++ optionals (cfg.server.ports.spy != null) [ + "--port-spy" + (toString cfg.server.ports.spy) + ] + ++ optionals (cfg.server.ports.control != null) [ + "--port-ctrl" + (toString cfg.server.ports.control) + ] + ++ cfg.server.extraArgs; + in + rec { + description = "vwifi server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + requires = after; + serviceConfig = { + ExecStart = "${cfg.package}/bin/vwifi-server ${escapeShellArgs serverArgs}"; + }; + }; + }) + ]; + + meta.maintainers = with lib.maintainers; [ numinit ]; +} diff --git a/nixos/modules/services/networking/whoogle-search.nix b/nixos/modules/services/networking/whoogle-search.nix index 4665cfc5793d..c0067edce7f0 100644 --- a/nixos/modules/services/networking/whoogle-search.nix +++ b/nixos/modules/services/networking/whoogle-search.nix @@ -64,7 +64,7 @@ in RestartSec = "5s"; }; }; - - meta.maintainers = with lib.maintainers; [ malte-v ]; }; + + meta.maintainers = with lib.maintainers; [ malte-v ]; } diff --git a/nixos/modules/services/networking/xandikos.nix b/nixos/modules/services/networking/xandikos.nix index 1b72cd03ba9c..908107a259a9 100644 --- a/nixos/modules/services/networking/xandikos.nix +++ b/nixos/modules/services/networking/xandikos.nix @@ -87,9 +87,10 @@ in }; + meta.maintainers = with lib.maintainers; [ _0x4A6F ]; + config = mkIf cfg.enable (mkMerge [ { - meta.maintainers = with lib.maintainers; [ _0x4A6F ]; systemd.services.xandikos = { description = "A Simple Calendar and Contact Server"; diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index 1a1465b8e222..03b581c4d8cd 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -108,6 +108,21 @@ in type = lib.types.str; }; + # TODO: turn on by default when it stops being experimental + dumplessUpgrade = lib.mkOption { + default = false; + example = true; + description = '' + Whether to enable (experimental) dumpless upgrade. + + Allows upgrading from Meilisearch >=v1.12 to Meilisearch >=v1.13 without manually + dumping and importing the database. + + More information at https://www.meilisearch.com/docs/learn/update_and_migration/updating#dumpless-upgrade + ''; + type = lib.types.bool; + }; + }; ###### implementation @@ -129,6 +144,7 @@ in MEILI_DUMP_DIR = "/var/lib/meilisearch/dumps"; MEILI_LOG_LEVEL = cfg.logLevel; MEILI_MAX_INDEX_SIZE = cfg.maxIndexSize; + MEILI_EXPERIMENTAL_DUMPLESS_UPGRADE = lib.boolToString cfg.dumplessUpgrade; }; serviceConfig = { ExecStart = "${cfg.package}/bin/meilisearch"; diff --git a/nixos/modules/services/search/tika.nix b/nixos/modules/services/search/tika.nix index 94096b6db29f..5ddd1a551e49 100644 --- a/nixos/modules/services/search/tika.nix +++ b/nixos/modules/services/search/tika.nix @@ -79,7 +79,10 @@ in serviceConfig = let - package = cfg.package.override { inherit (cfg) enableOcr; }; + package = cfg.package.override { + inherit (cfg) enableOcr; + enableGui = false; + }; in { Type = "simple"; diff --git a/nixos/modules/services/security/e-imzo.nix b/nixos/modules/services/security/e-imzo.nix new file mode 100644 index 000000000000..1423f3ec9596 --- /dev/null +++ b/nixos/modules/services/security/e-imzo.nix @@ -0,0 +1,50 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.e-imzo; +in +{ + options = { + services.e-imzo = { + enable = lib.mkEnableOption "E-IMZO"; + + package = lib.mkPackageOption pkgs "e-imzo" { + extraDescription = "Official mirror deletes old versions as soon as they release new one. Feel free to use either unstable or your own custom e-imzo package and ping maintainer."; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.user.services.e-imzo = { + enable = true; + description = "E-IMZO, uzbek state web signing service"; + documentation = [ "https://github.com/xinux-org/e-imzo" ]; + + after = [ + "network-online.target" + "graphical.target" + ]; + wants = [ + "network-online.target" + "graphical.target" + ]; + wantedBy = [ "default.target" ]; + + serviceConfig = { + Type = "simple"; + Restart = "always"; + RestartSec = 1; + ExecStart = lib.getExe cfg.package; + + NoNewPrivileges = true; + SystemCallArchitectures = "native"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ orzklv ]; +} diff --git a/nixos/modules/services/security/paretosecurity.nix b/nixos/modules/services/security/paretosecurity.nix index a1080ede8431..822fe76ec6af 100644 --- a/nixos/modules/services/security/paretosecurity.nix +++ b/nixos/modules/services/security/paretosecurity.nix @@ -4,6 +4,9 @@ pkgs, ... }: +let + cfg = config.services.paretosecurity; +in { options.services.paretosecurity = { @@ -12,9 +15,9 @@ trayIcon = lib.mkEnableOption "tray icon for ParetoSecurity"; }; - config = lib.mkIf config.services.paretosecurity.enable { - environment.systemPackages = [ config.services.paretosecurity.package ]; - systemd.packages = [ config.services.paretosecurity.package ]; + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + systemd.packages = [ cfg.package ]; # In traditional Linux distributions, systemd would read the [Install] section from # unit files and automatically create the appropriate symlinks to enable services. @@ -36,19 +39,17 @@ ]; # Enable the tray icon and timer services if the trayIcon option is enabled - systemd.user = lib.mkIf config.services.paretosecurity.trayIcon { - services.paretosecurity-trayicon = { - wantedBy = [ "graphical-session.target" ]; - }; - services.paretosecurity-user = { - wantedBy = [ "graphical-session.target" ]; - serviceConfig.Environment = [ - "PATH=${config.system.path}/bin:${config.system.path}/sbin" - ]; - }; - timers.paretosecurity-user = { - wantedBy = [ "timers.target" ]; + systemd.user = lib.mkIf cfg.trayIcon { + services = { + paretosecurity-trayicon.wantedBy = [ "graphical-session.target" ]; + paretosecurity-user = { + wantedBy = [ "graphical-session.target" ]; + serviceConfig.Environment = [ + "PATH=${config.system.path}/bin:${config.system.path}/sbin" + ]; + }; }; + timers.paretosecurity-user.wantedBy = [ "timers.target" ]; }; }; } diff --git a/nixos/modules/services/web-apps/cook-cli.nix b/nixos/modules/services/web-apps/cook-cli.nix new file mode 100644 index 000000000000..e1addb21318e --- /dev/null +++ b/nixos/modules/services/web-apps/cook-cli.nix @@ -0,0 +1,113 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + cfg = config.services.cook-cli; + inherit (lib) + mkIf + mkEnableOption + mkPackageOption + mkOption + getExe + types + ; +in +{ + options = { + services.cook-cli = { + enable = lib.mkEnableOption "cook-cli"; + + package = lib.mkPackageOption pkgs "cook-cli" { }; + + autoStart = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to start cook-cli server automatically. + ''; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 9080; + description = '' + Which port cook-cli server will use. + ''; + }; + + basePath = lib.mkOption { + type = lib.types.str; + default = "/var/lib/cook-cli"; + description = '' + Path to the directory cook-cli will look for recipes. + ''; + }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to open the cook-cli server port in the firewall. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.tmpfiles.rules = [ + "d ${cfg.basePath} 0770 cook-cli users" + ]; + + users.users.cook-cli = { + home = "${cfg.basePath}"; + group = "cook-cli"; + isSystemUser = true; + }; + users.groups.cook-cli.members = [ + "cook-cli" + ]; + + systemd.services.cook-cli = { + description = "cook-cli server"; + serviceConfig = { + ExecStart = "${getExe cfg.package} server --host --port ${toString cfg.port} ${cfg.basePath}"; + WorkingDirectory = cfg.basePath; + User = "cook-cli"; + Group = "cook-cli"; + # Hardening options + CapabilityBoundingSet = [ "CAP_SYS_NICE" ]; + AmbientCapabilities = [ "CAP_SYS_NICE" ]; + LockPersonality = true; + NoNewPrivileges = true; + PrivateTmp = true; + ProtectControlGroups = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + ReadWritePaths = cfg.basePath; + RestrictNamespaces = true; + RestrictSUIDSGID = true; + Restart = "on-failure"; + RestartSec = 5; + }; + wantedBy = mkIf cfg.autoStart [ "multi-user.target" ]; + wants = [ "network.target" ]; + }; + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + }; + + meta.maintainers = [ + lib.maintainers.luNeder + lib.maintainers.emilioziniades + ]; +} diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 1d7b3c2ff7be..b454ed97744f 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -13,8 +13,8 @@ let cfg = config.services.discourse; opt = options.services.discourse; - # Keep in sync with https://github.com/discourse/discourse_docker/blob/main/image/base/slim.Dockerfile#L5 - upstreamPostgresqlVersion = lib.getVersion pkgs.postgresql_13; + # Keep in sync with https://github.com/discourse/discourse_docker/blob/main/image/base/Dockerfile PG_MAJOR + upstreamPostgresqlVersion = lib.getVersion pkgs.postgresql_15; postgresqlPackage = if config.services.postgresql.enable then config.services.postgresql.package else pkgs.postgresql; @@ -676,6 +676,8 @@ in dns_query_timeout_secs = null; regex_timeout_seconds = 2; allow_impersonation = true; + log_line_max_chars = 160000; + yjit_enabled = false; }; services.redis.servers.discourse = @@ -901,6 +903,9 @@ in extraConfig + '' proxy_set_header X-Request-Start "t=''${msec}"; + proxy_set_header X-Sendfile-Type ""; + proxy_set_header X-Accel-Mapping ""; + proxy_set_header Client-Ip ""; ''; }; cache = time: '' diff --git a/nixos/modules/services/web-apps/gancio.nix b/nixos/modules/services/web-apps/gancio.nix index 230e93737fdb..c7e10a6e0bf4 100644 --- a/nixos/modules/services/web-apps/gancio.nix +++ b/nixos/modules/services/web-apps/gancio.nix @@ -57,7 +57,7 @@ in default = "http${ lib.optionalString config.services.nginx.virtualHosts."${cfg.settings.hostname}".enableACME "s" }://${cfg.settings.hostname}"; - defaultText = lib.literalExpression ''"https://''${cfg.settings.hostname}"''; + defaultText = lib.literalExpression ''"https://''${config.services.gancio.settings.hostname}"''; example = "https://demo.gancio.org/gancio"; description = "The full URL under which the server is reachable."; }; @@ -89,9 +89,7 @@ in readOnly = true; type = types.nullOr types.str; default = if cfg.settings.db.dialect == "sqlite" then "/var/lib/gancio/db.sqlite" else null; - defaultText = '' - if cfg.settings.db.dialect == "sqlite" then "/var/lib/gancio/db.sqlite" else null - ''; + defaultText = ''if config.services.gancio.settings.db.dialect == "sqlite" then "/var/lib/gancio/db.sqlite" else null''; }; host = mkOption { description = '' @@ -100,9 +98,7 @@ in readOnly = true; type = types.nullOr types.str; default = if cfg.settings.db.dialect == "postgres" then "/run/postgresql" else null; - defaultText = '' - if cfg.settings.db.dialect == "postgres" then "/run/postgresql" else null - ''; + defaultText = ''if config.services.gancio.settings.db.dialect == "postgres" then "/run/postgresql" else null''; }; database = mkOption { description = '' @@ -111,9 +107,7 @@ in readOnly = true; type = types.nullOr types.str; default = if cfg.settings.db.dialect == "postgres" then cfg.user else null; - defaultText = '' - if cfg.settings.db.dialect == "postgres" then cfg.user else null - ''; + defaultText = ''if config.services.gancio.settings.db.dialect == "postgres" then cfg.user else null''; }; }; log_level = mkOption { @@ -174,10 +168,14 @@ in environment.systemPackages = [ (pkgs.runCommand "gancio" { } '' mkdir -p $out/bin - echo "#!${pkgs.runtimeShell} - cd /var/lib/gancio/ - exec ${lib.getExe cfg.package} ''${1:---help} - " > $out/bin/gancio + echo '#!${pkgs.runtimeShell} + cd /var/lib/gancio/ + sudo=exec + if [[ "$USER" != ${cfg.user} ]]; then + sudo="exec /run/wrappers/bin/sudo -u ${cfg.user}" + fi + $sudo ${lib.getExe cfg.package} ''${1:--help} + ' > $out/bin/gancio chmod +x $out/bin/gancio '') ]; diff --git a/nixos/modules/services/web-apps/immich-public-proxy.nix b/nixos/modules/services/web-apps/immich-public-proxy.nix index 85238e1cbacf..817c79bd534c 100644 --- a/nixos/modules/services/web-apps/immich-public-proxy.nix +++ b/nixos/modules/services/web-apps/immich-public-proxy.nix @@ -92,7 +92,6 @@ in }; networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; - - meta.maintainers = with lib.maintainers; [ jaculabilis ]; }; + meta.maintainers = with lib.maintainers; [ jaculabilis ]; } diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix index cc7d5ff6f39e..a647b552678f 100644 --- a/nixos/modules/services/web-apps/immich.nix +++ b/nixos/modules/services/web-apps/immich.nix @@ -389,7 +389,6 @@ in }; }; users.groups = mkIf (cfg.group == "immich") { immich = { }; }; - - meta.maintainers = with lib.maintainers; [ jvanbruegge ]; }; + meta.maintainers = with lib.maintainers; [ jvanbruegge ]; } diff --git a/nixos/modules/services/web-apps/karakeep.nix b/nixos/modules/services/web-apps/karakeep.nix new file mode 100644 index 000000000000..14ec552a41d6 --- /dev/null +++ b/nixos/modules/services/web-apps/karakeep.nix @@ -0,0 +1,225 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.karakeep; + + karakeepEnv = lib.mkMerge [ + { DATA_DIR = "/var/lib/karakeep"; } + (lib.mkIf cfg.meilisearch.enable { + MEILI_ADDR = "http://127.0.0.1:${toString config.services.meilisearch.listenPort}"; + }) + (lib.mkIf cfg.browser.enable { + BROWSER_WEB_URL = "http://127.0.0.1:${toString cfg.browser.port}"; + }) + cfg.extraEnvironment + ]; + + environmentFiles = [ + "/var/lib/karakeep/settings.env" + ] ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile); +in +{ + options = { + services.karakeep = { + enable = lib.mkEnableOption "Enable the Karakeep service"; + package = lib.mkPackageOption pkgs "karakeep" { }; + + extraEnvironment = lib.mkOption { + description = '' + Environment variables to pass to Karakaeep. This is how most settings + can be configured. Changing DATA_DIR is possible but not supported. + + See https://docs.karakeep.app/configuration/ + ''; + type = lib.types.attrsOf lib.types.str; + default = { }; + example = lib.literalExpression '' + { + PORT = "1234"; + DISABLE_SIGNUPS = "true"; + DISABLE_NEW_RELEASE_CHECK = "true"; + } + ''; + }; + + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = '' + An optional path to an environment file that will be used in the web and workers + services. This is useful for loading private keys. + ''; + example = "/var/lib/karakeep/secrets.env"; + }; + + browser = { + enable = lib.mkOption { + description = '' + Enable the karakeep-browser service that runs a chromium instance in + the background with debugging ports exposed. This is necessary for + certain features like screenshots. + ''; + type = lib.types.bool; + default = true; + }; + port = lib.mkOption { + description = "The port the browser should run on."; + type = lib.types.port; + default = 9222; + }; + exe = lib.mkOption { + description = "The browser executable (must be Chrome-like)."; + type = lib.types.str; + default = "${pkgs.chromium}/bin/chromium"; + defaultText = lib.literalExpression "\${pkgs.chromium}/bin/chromium"; + example = lib.literalExpression "\${pkgs.google-chrome}/bin/google-chrome-stable"; + }; + }; + + meilisearch = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Enable Meilisearch and configure Karakeep to use it. Meilisearch is + required for text search. + ''; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + users.groups.karakeep = { }; + users.users.karakeep = { + isSystemUser = true; + group = "karakeep"; + }; + + services.meilisearch = lib.mkIf cfg.meilisearch.enable { + enable = true; + }; + + systemd.services.karakeep-init = { + description = "Initialize Karakeep Data"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + partOf = [ "karakeep.service" ]; + path = [ pkgs.openssl ]; + script = '' + umask 0077 + + if [ ! -f "$STATE_DIRECTORY/settings.env" ]; then + cat <"$STATE_DIRECTORY/settings.env" + # Generated by NixOS Karakeep module + MEILI_MASTER_KEY=$(openssl rand -base64 36) + NEXTAUTH_SECRET=$(openssl rand -base64 36) + EOF + fi + + export DATA_DIR="$STATE_DIRECTORY" + exec "${cfg.package}/lib/karakeep/migrate" + ''; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + User = "karakeep"; + Group = "karakeep"; + StateDirectory = "karakeep"; + PrivateTmp = "yes"; + }; + }; + + systemd.services.karakeep-workers = { + description = "Karakeep Workers"; + wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + "karakeep-init.service" + ]; + partOf = [ "karakeep.service" ]; + path = [ + pkgs.monolith + pkgs.yt-dlp + ]; + environment = karakeepEnv; + serviceConfig = { + User = "karakeep"; + Group = "karakeep"; + ExecStart = "${cfg.package}/lib/karakeep/start-workers"; + StateDirectory = "karakeep"; + EnvironmentFile = environmentFiles; + PrivateTmp = "yes"; + }; + }; + + systemd.services.karakeep-web = { + description = "Karakeep Web"; + wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + "karakeep-init.service" + "karakeep-workers.service" + ]; + partOf = [ "karakeep.service" ]; + environment = karakeepEnv; + serviceConfig = { + ExecStart = "${cfg.package}/lib/karakeep/start-web"; + User = "karakeep"; + Group = "karakeep"; + StateDirectory = "karakeep"; + EnvironmentFile = environmentFiles; + PrivateTmp = "yes"; + }; + }; + + systemd.services.karakeep-browser = lib.mkIf cfg.browser.enable { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + partOf = [ "karakeep.service" ]; + script = '' + export HOME="$CACHE_DIRECTORY" + exec ${cfg.browser.exe} \ + --headless --no-sandbox --disable-gpu --disable-dev-shm-usage \ + --remote-debugging-address=127.0.0.1 \ + --remote-debugging-port=${toString cfg.browser.port} \ + --hide-scrollbars \ + --user-data-dir="$STATE_DIRECTORY" + ''; + serviceConfig = { + Type = "simple"; + Restart = "on-failure"; + + CacheDirectory = "karakeep-browser"; + StateDirectory = "karakeep-browser"; + + DevicePolicy = "closed"; + DynamicUser = true; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RestrictNamespaces = true; + RestrictRealtime = true; + }; + }; + }; + + meta = { + maintainers = [ lib.maintainers.three ]; + }; +} diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index 572b47d2b518..dce0774b07ee 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -41,9 +41,15 @@ let # The directory to store mutable data within dataDir. mutableDataDir = "${cfg.dataDir}/data"; - # The plugin directory. Note that this is the *post-unpack* plugin directory, - # since Mattermost unpacks plugins to put them there. (Hence, mutable data.) - pluginDir = "${mutableDataDir}/plugins"; + # The plugin directory. Note that this is the *pre-unpack* plugin directory, + # since Mattermost looks in mutableDataDir for a directory called "plugins". + # If Mattermost is installed with plugins defined in a Nix configuration, the plugins + # are symlinked here. Otherwise, this is a real directory and the tarballs are uploaded here. + pluginTarballDir = "${mutableDataDir}/plugins"; + + # We need a different unpack directory for Mattermost to sync things to at launch, + # since the above may be a symlink to the store. + pluginUnpackDir = "${mutableDataDir}/.plugins"; # Mattermost uses this as a staging directory to unpack plugins, among possibly other things. # Ensure that it's inside mutableDataDir since it can get rather large. @@ -232,9 +238,12 @@ let services.mattermost.environmentFile = ""; services.mattermost.database.fromEnvironment = true; '' database; - FileSettings.Directory = cfg.dataDir; - PluginSettings.Directory = "${pluginDir}/server"; - PluginSettings.ClientDirectory = "${pluginDir}/client"; + + # Note that the plugin tarball directory is not configurable, and is expected to be in FileSettings.Directory/plugins. + FileSettings.Directory = mutableDataDir; + PluginSettings.Directory = "${pluginUnpackDir}/server"; + PluginSettings.ClientDirectory = "${pluginUnpackDir}/client"; + LogSettings = { FileLocation = cfg.logDir; @@ -800,9 +809,9 @@ in "R- ${tempDir} - - - - -" "d= ${tempDir} 0750 ${cfg.user} ${cfg.group} - -" - # Ensure that pluginDir is a directory, as it could be a symlink on prior versions. + # Ensure that pluginUnpackDir is a directory. # Don't remove or clean it out since it should be persistent, as this is where plugins are unpacked. - "d= ${pluginDir} 0750 ${cfg.user} ${cfg.group} - -" + "d= ${pluginUnpackDir} 0750 ${cfg.user} ${cfg.group} - -" # Ensure that the plugin directories exist. "d= ${mattermostConf.PluginSettings.Directory} 0750 ${cfg.user} ${cfg.group} - -" @@ -819,11 +828,11 @@ in if cfg.pluginsBundle == null then # Create the plugin tarball directory to allow plugin uploads. [ - "d= ${cfg.dataDir}/plugins 0750 ${cfg.user} ${cfg.group} - -" + "d= ${pluginTarballDir} 0750 ${cfg.user} ${cfg.group} - -" ] else # Symlink the plugin tarball directory, removing anything existing, since it's managed by Nix. - [ "L+ ${cfg.dataDir}/plugins - - - - ${cfg.pluginsBundle}" ] + [ "L+ ${pluginTarballDir} - - - - ${cfg.pluginsBundle}" ] ); systemd.services.mattermost = rec { @@ -867,12 +876,13 @@ in # Logs too. oldLogs="$dataDir/logs" newLogs="$logDir" - if [ "$oldLogs" != "$newLogs" ] && [ -d "$oldLogs" ]; then + if [ "$oldLogs" != "$newLogs" ] && [ -d "$oldLogs" ] && [ ! -f "$newLogs/.initial-created" ]; then # Migrate the legacy log location to the new log location. # Allow this to fail if there aren't any logs to move. echo "Moving legacy logs at $oldLogs to $newLogs" >&2 mkdir -p "$newLogs" mv "$oldLogs"/* "$newLogs" || true + touch "$newLogs/.initial-created" fi '' + optionalString (!cfg.mutableConfig) '' diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 4b3be5e9fda3..1864c34ad765 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -205,7 +205,7 @@ let 'class' => '\\OC\\Files\\ObjectStore\\S3', 'arguments' => [ 'bucket' => '${s3.bucket}', - 'autocreate' => ${boolToString s3.autocreate}, + 'verify_bucket_exists' => ${boolToString s3.verify_bucket_exists}, 'key' => '${s3.key}', 'secret' => nix_read_secret('s3_secret'), ${optionalString (s3.hostname != null) "'hostname' => '${s3.hostname}',"} @@ -344,6 +344,10 @@ in [ "services" "nextcloud" "extraOptions" ] [ "services" "nextcloud" "settings" ] ) + (mkRenamedOptionModule + [ "services" "nextcloud" "config" "objectstore" "s3" "autocreate" ] + [ "services" "nextcloud" "config" "objectstore" "s3" "verify_bucket_exists" ] + ) ]; options.services.nextcloud = { @@ -420,7 +424,6 @@ in type = types.package; description = "Which package to use for the Nextcloud instance."; relatedPackages = [ - "nextcloud29" "nextcloud30" "nextcloud31" ]; @@ -654,10 +657,11 @@ in The name of the S3 bucket. ''; }; - autocreate = mkOption { + verify_bucket_exists = mkOption { type = types.bool; + default = true; description = '' - Create the objectstore if it does not exist. + Create the objectstore bucket if it does not exist. ''; }; key = mkOption { @@ -1041,8 +1045,7 @@ in nextcloud31 ); - services.nextcloud.phpPackage = - if versionOlder cfg.package.version "29" then pkgs.php82 else pkgs.php83; + services.nextcloud.phpPackage = pkgs.php83; services.nextcloud.phpOptions = mkMerge [ (mapAttrs (const mkOptionDefault) defaultPHPSettings) diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index 2fe726e61525..c4b0186a77b4 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -489,7 +489,7 @@ in environment = env; path = with pkgs; [ - nodejs_18 + nodejs_20 yarn ffmpeg-headless openssl @@ -945,7 +945,7 @@ in }) (lib.attrsets.setAttrByPath [ cfg.user "packages" ] - [ peertubeEnv pkgs.nodejs_18 pkgs.yarn pkgs.ffmpeg-headless ] + [ peertubeEnv pkgs.nodejs_20 pkgs.yarn pkgs.ffmpeg-headless ] ) (lib.mkIf cfg.redis.enableUnixSocket { ${config.services.peertube.user}.extraGroups = [ "redis-peertube" ]; diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix index 2b0af61aa043..83f79589a947 100644 --- a/nixos/modules/services/web-apps/trilium.nix +++ b/nixos/modules/services/web-apps/trilium.nix @@ -108,11 +108,11 @@ in }; }; + meta.maintainers = with lib.maintainers; [ fliegendewurst ]; + config = lib.mkIf cfg.enable ( lib.mkMerge [ { - meta.maintainers = with lib.maintainers; [ fliegendewurst ]; - users.groups.trilium = { }; users.users.trilium = { description = "Trilium User"; diff --git a/nixos/modules/services/web-apps/wiki-js.nix b/nixos/modules/services/web-apps/wiki-js.nix index 4c742c26afad..f313804a6d28 100644 --- a/nixos/modules/services/web-apps/wiki-js.nix +++ b/nixos/modules/services/web-apps/wiki-js.nix @@ -151,7 +151,7 @@ in WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}"; DynamicUser = true; PrivateTmp = true; - ExecStart = "${pkgs.nodejs_18}/bin/node ${pkgs.wiki-js}/server"; + ExecStart = "${pkgs.nodejs_20}/bin/node ${pkgs.wiki-js}/server"; }; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index e278f2f2f87a..cccae420b3f0 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -199,13 +199,6 @@ in monospace = mkDefault [ "Hack" ]; }; - # Qt application style. - qt = { - enable = mkDefault true; - style = mkDefault "gtk2"; - platformTheme = mkDefault "gtk2"; - }; - environment.pathsToLink = [ "/share" # TODO: https://github.com/NixOS/nixpkgs/issues/47173 ]; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index d5bad47e52a4..3ee04d328c87 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -9,7 +9,7 @@ let cfg = config.services.xserver.displayManager; gdm = pkgs.gdm; - pamCfg = config.security.pam.services; + pamLogin = config.security.pam.services.login; settingsFormat = pkgs.formats.ini { }; configFile = settingsFormat.generate "custom.conf" cfg.gdm.settings; @@ -345,7 +345,7 @@ in gdm-autologin.text = '' auth requisite pam_nologin.so auth required pam_succeed_if.so uid >= 1000 quiet - ${lib.optionalString pamCfg.login.enableGnomeKeyring '' + ${lib.optionalString (pamLogin.enable && pamLogin.enableGnomeKeyring) '' auth [success=ok default=1] ${gdm}/lib/security/pam_gdm.so auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so ''} @@ -369,7 +369,7 @@ in auth requisite pam_faillock.so preauth auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so auth required pam_env.so - ${lib.optionalString pamCfg.login.enableGnomeKeyring '' + ${lib.optionalString (pamLogin.enable && pamLogin.enableGnomeKeyring) '' auth [success=ok default=1] ${gdm}/lib/security/pam_gdm.so auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so ''} diff --git a/nixos/modules/system/boot/uki.nix b/nixos/modules/system/boot/uki.nix index fd9f1cadd340..d9f4713b307c 100644 --- a/nixos/modules/system/boot/uki.nix +++ b/nixos/modules/system/boot/uki.nix @@ -111,8 +111,7 @@ in --config=${cfg.configFile} \ --output="$out/${config.system.boot.loader.ukiFile}" ''; - - meta.maintainers = with lib.maintainers; [ nikstur ]; - }; + + meta.maintainers = with lib.maintainers; [ nikstur ]; } diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 68e5dc88d4be..fed91d189fa9 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -578,21 +578,22 @@ in }; networking.fqdn = mkOption { - readOnly = true; type = types.str; default = if (cfg.hostName != "" && cfg.domain != null) then "${cfg.hostName}.${cfg.domain}" else throw '' - The FQDN is required but cannot be determined. Please make sure that - both networking.hostName and networking.domain are set properly. + The FQDN is required but cannot be determined from `networking.hostName` + and `networking.domain`. Please ensure these options are set properly or + set `networking.fqdn` directly. ''; defaultText = literalExpression ''"''${networking.hostName}.''${networking.domain}"''; description = '' - The fully qualified domain name (FQDN) of this host. It is the result - of combining `networking.hostName` and `networking.domain.` Using this - option will result in an evaluation error if the hostname is empty or + The fully qualified domain name (FQDN) of this host. By default, it is + the result of combining `networking.hostName` and `networking.domain.` + + Using this option will result in an evaluation error if the hostname is empty or no domain is specified. Modules that accept a mere `networking.hostName` but prefer a fully qualified diff --git a/nixos/modules/virtualisation/gce-images.nix b/nixos/modules/virtualisation/gce-images.nix deleted file mode 100644 index 79631ed025df..000000000000 --- a/nixos/modules/virtualisation/gce-images.nix +++ /dev/null @@ -1,20 +0,0 @@ -let - self = { - "14.12" = "gs://nixos-cloud-images/nixos-14.12.471.1f09b77-x86_64-linux.raw.tar.gz"; - "15.09" = "gs://nixos-cloud-images/nixos-15.09.425.7870f20-x86_64-linux.raw.tar.gz"; - "16.03" = "gs://nixos-cloud-images/nixos-image-16.03.847.8688c17-x86_64-linux.raw.tar.gz"; - "17.03" = "gs://nixos-cloud-images/nixos-image-17.03.1082.4aab5c5798-x86_64-linux.raw.tar.gz"; - "18.03" = "gs://nixos-cloud-images/nixos-image-18.03.132536.fdb5ba4cdf9-x86_64-linux.raw.tar.gz"; - "18.09" = "gs://nixos-cloud-images/nixos-image-18.09.1228.a4c4cbb613c-x86_64-linux.raw.tar.gz"; - - # This format will be handled by the upcoming NixOPS 2.0 release. - # The old images based on a GS object are deprecated. - "20.09" = { - project = "nixos-cloud"; - name = "nixos-image-20-09-3531-3858fbc08e6-x86-64-linux"; - }; - - latest = self."20.09"; - }; -in -self diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 14d25ac76569..e5a0d37d6a9c 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -122,9 +122,12 @@ let NIX_BIND_OPT="" if [ -n "$PRIVATE_USERS" ]; then extraFlags+=("--private-users=$PRIVATE_USERS") - if [ "$PRIVATE_USERS" = "pick" ] || { [ "$PRIVATE_USERS" != "identity" ] && [ "$PRIVATE_USERS" -gt 0 ]; }; then - # when user namespacing is enabled, we use `idmap` mount option - # so that bind mounts under /nix get proper owner (and not nobody/nogroup). + if [[ + "$PRIVATE_USERS" = "pick" + || ("$PRIVATE_USERS" =~ ^[[:digit:]]+$ && "$PRIVATE_USERS" -gt 0) + ]]; then + # when user namespacing is enabled, we use `idmap` mount option so that + # bind mounts under /nix get proper owner (and not nobody/nogroup). NIX_BIND_OPT=":idmap" fi fi diff --git a/nixos/release.nix b/nixos/release.nix index 316b66d9bd4e..b7b550fb4721 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -339,32 +339,6 @@ rec { ); - # Test job for https://github.com/NixOS/nixpkgs/issues/121354 to test - # automatic sizing without blocking the channel. - amazonImageAutomaticSize = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] ( - system: - - with import ./.. { inherit system; }; - - hydraJob ( - (import lib/eval-config.nix { - inherit system; - modules = [ - configuration - versionModule - ./maintainers/scripts/ec2/amazon-image.nix - ( - { ... }: - { - virtualisation.diskSize = "auto"; - } - ) - ]; - }).config.system.build.amazonImage - ) - - ); - # An image that can be imported into incus and used for container creation incusContainerImage = forMatchingSystems diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9ffc0db8513b..5f9ae823011f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -213,6 +213,7 @@ in atop = import ./atop.nix { inherit pkgs runTest; }; atticd = runTest ./atticd.nix; atuin = runTest ./atuin.nix; + ax25 = handleTest ./ax25.nix { }; audiobookshelf = runTest ./audiobookshelf.nix; auth-mysql = runTest ./auth-mysql.nix; authelia = runTest ./authelia.nix; @@ -280,8 +281,6 @@ in calibre-server = import ./calibre-server.nix { inherit pkgs runTest; }; canaille = handleTest ./canaille.nix { }; castopod = handleTest ./castopod.nix { }; - cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; }; - cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; }; cassandra_4 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_4; }; centrifugo = runTest ./centrifugo.nix; ceph-multi-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix { }; @@ -368,7 +367,7 @@ in crabfit = handleTest ./crabfit.nix { }; cri-o = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cri-o.nix { }; cryptpad = runTest ./cryptpad.nix; - cups-pdf = handleTest ./cups-pdf.nix { }; + cups-pdf = runTest ./cups-pdf.nix; curl-impersonate = handleTest ./curl-impersonate.nix { }; custom-ca = handleTest ./custom-ca.nix { }; croc = handleTest ./croc.nix { }; @@ -459,7 +458,7 @@ in evcc = runTest ./evcc.nix; fail2ban = runTest ./fail2ban.nix; fakeroute = handleTest ./fakeroute.nix { }; - fancontrol = handleTest ./fancontrol.nix { }; + fancontrol = runTest ./fancontrol.nix; fanout = handleTest ./fanout.nix { }; fcitx5 = handleTest ./fcitx5 { }; fedimintd = runTest ./fedimintd.nix; @@ -594,9 +593,8 @@ in inherit handleTestOn; package = pkgs.hadoop2; }; - haka = handleTest ./haka.nix { }; haste-server = handleTest ./haste-server.nix { }; - haproxy = handleTest ./haproxy.nix { }; + haproxy = runTest ./haproxy.nix; hardened = handleTest ./hardened.nix { }; harmonia = runTest ./harmonia.nix; headscale = handleTest ./headscale.nix { }; @@ -635,7 +633,7 @@ in home-assistant = runTest ./home-assistant.nix; hostname = handleTest ./hostname.nix { }; hound = handleTest ./hound.nix { }; - hub = handleTest ./git/hub.nix { }; + hub = runTest ./git/hub.nix; hydra = runTest ./hydra; i3wm = handleTest ./i3wm.nix { }; icingaweb2 = runTest ./icingaweb2.nix; @@ -696,11 +694,12 @@ in kernel-latest-ath-user-regd = handleTest ./kernel-latest-ath-user-regd.nix { }; kernel-rust = handleTest ./kernel-rust.nix { }; keter = handleTest ./keter.nix { }; - kexec = handleTest ./kexec.nix { }; + kexec = runTest ./kexec.nix; keycloak = discoverTests (import ./keycloak.nix); keyd = handleTest ./keyd.nix { }; keymap = handleTest ./keymap.nix { }; kimai = runTest ./kimai.nix; + kismet = runTest ./kismet.nix; kmonad = runTest ./kmonad.nix; knot = runTest ./knot.nix; komga = handleTest ./komga.nix { }; @@ -739,7 +738,7 @@ in localsend = handleTest ./localsend.nix { }; locate = handleTest ./locate.nix { }; login = handleTest ./login.nix { }; - logrotate = handleTest ./logrotate.nix { }; + logrotate = runTest ./logrotate.nix; loki = handleTest ./loki.nix { }; luks = handleTest ./luks.nix { }; lvm2 = handleTest ./lvm2 { }; @@ -766,10 +765,10 @@ in magic-wormhole-mailbox-server = runTest ./magic-wormhole-mailbox-server.nix; magnetico = handleTest ./magnetico.nix { }; mailcatcher = runTest ./mailcatcher.nix; - mailhog = handleTest ./mailhog.nix { }; + mailhog = runTest ./mailhog.nix; mailpit = runTest ./mailpit.nix; - mailman = handleTest ./mailman.nix { }; - man = handleTest ./man.nix { }; + mailman = runTest ./mailman.nix; + man = runTest ./man.nix; mariadb-galera = handleTest ./mysql/mariadb-galera.nix { }; marytts = handleTest ./marytts.nix { }; mastodon = pkgs.recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; }); @@ -791,7 +790,7 @@ in mediatomb = handleTest ./mediatomb.nix { }; mediawiki = handleTest ./mediawiki.nix { }; meilisearch = handleTest ./meilisearch.nix { }; - memcached = handleTest ./memcached.nix { }; + memcached = runTest ./memcached.nix; merecat = handleTest ./merecat.nix { }; metabase = handleTest ./metabase.nix { }; mihomo = handleTest ./mihomo.nix { }; @@ -829,7 +828,7 @@ in mosquitto = runTest ./mosquitto.nix; moosefs = handleTest ./moosefs.nix { }; movim = import ./web-apps/movim { inherit recurseIntoAttrs runTest; }; - mpd = handleTest ./mpd.nix { }; + mpd = runTest ./mpd.nix; mpv = runTest ./mpv.nix; mtp = handleTest ./mtp.nix { }; multipass = handleTest ./multipass.nix { }; @@ -885,7 +884,7 @@ in # TODO: put in networking.nix after the test becomes more complete networkingProxy = handleTest ./networking-proxy.nix { }; nextcloud = handleTest ./nextcloud { }; - nextflow = handleTestOn [ "x86_64-linux" ] ./nextflow.nix { }; + nextflow = runTestOn [ "x86_64-linux" ] ./nextflow.nix; nextjs-ollama-llm-ui = runTest ./web-apps/nextjs-ollama-llm-ui.nix; nexus = handleTest ./nexus.nix { }; # TODO: Test nfsv3 + Kerberos @@ -913,7 +912,7 @@ in nifi = runTestOn [ "x86_64-linux" ] ./web-apps/nifi.nix; nitter = handleTest ./nitter.nix { }; nix-config = handleTest ./nix-config.nix { }; - nix-ld = handleTest ./nix-ld.nix { }; + nix-ld = runTest ./nix-ld.nix; nix-misc = handleTest ./nix/misc.nix { }; nix-upgrade = handleTest ./nix/upgrade.nix { inherit (pkgs) nixVersions; }; nix-required-mounts = runTest ./nix-required-mounts; @@ -965,7 +964,7 @@ in nzbhydra2 = handleTest ./nzbhydra2.nix { }; ocis = handleTest ./ocis.nix { }; oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix { }; - obs-studio = handleTest ./obs-studio.nix { }; + obs-studio = runTest ./obs-studio.nix; oh-my-zsh = handleTest ./oh-my-zsh.nix { }; ollama = runTest ./ollama.nix; ollama-cuda = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-cuda.nix; @@ -1091,21 +1090,25 @@ in pretalx = runTest ./web-apps/pretalx.nix; prefect = runTest ./prefect.nix; pretix = runTest ./web-apps/pretix.nix; - printing-socket = handleTest ./printing.nix { - socket = true; - listenTcp = true; + printing-socket = runTest { + imports = [ ./printing.nix ]; + _module.args.socket = true; + _module.args.listenTcp = true; }; - printing-service = handleTest ./printing.nix { - socket = false; - listenTcp = true; + printing-service = runTest { + imports = [ ./printing.nix ]; + _module.args.socket = false; + _module.args.listenTcp = true; }; - printing-socket-notcp = handleTest ./printing.nix { - socket = true; - listenTcp = false; + printing-socket-notcp = runTest { + imports = [ ./printing.nix ]; + _module.args.socket = true; + _module.args.listenTcp = false; }; - printing-service-notcp = handleTest ./printing.nix { - socket = false; - listenTcp = false; + printing-service-notcp = runTest { + imports = [ ./printing.nix ]; + _module.args.socket = false; + _module.args.listenTcp = false; }; private-gpt = handleTest ./private-gpt.nix { }; privatebin = runTest ./privatebin.nix; @@ -1172,10 +1175,11 @@ in rsyslogd = handleTest ./rsyslogd.nix { }; rtkit = runTest ./rtkit.nix; rtorrent = handleTest ./rtorrent.nix { }; + rush = runTest ./rush.nix; rustls-libssl = handleTest ./rustls-libssl.nix { }; rxe = handleTest ./rxe.nix { }; sabnzbd = handleTest ./sabnzbd.nix { }; - samba = handleTest ./samba.nix { }; + samba = runTest ./samba.nix; samba-wsdd = handleTest ./samba-wsdd.nix { }; sane = handleTest ./sane.nix { }; sanoid = handleTest ./sanoid.nix { }; @@ -1200,7 +1204,7 @@ in shadowsocks = handleTest ./shadowsocks { }; shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix { }; shiori = handleTest ./shiori.nix { }; - signal-desktop = handleTest ./signal-desktop.nix { }; + signal-desktop = runTest ./signal-desktop.nix; silverbullet = handleTest ./silverbullet.nix { }; simple = handleTest ./simple.nix { }; sing-box = handleTest ./sing-box.nix { }; @@ -1233,7 +1237,7 @@ in stargazer = runTest ./web-servers/stargazer.nix; starship = runTest ./starship.nix; stash = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./stash.nix { }; - static-web-server = handleTest ./web-servers/static-web-server.nix { }; + static-web-server = runTest ./web-servers/static-web-server.nix; step-ca = handleTestOn [ "x86_64-linux" ] ./step-ca.nix { }; stratis = handleTest ./stratis { }; strongswan-swanctl = handleTest ./strongswan-swanctl.nix { }; @@ -1413,14 +1417,14 @@ in imports = [ ./varnish.nix ]; _module.args.package = pkgs.varnish60; }; - varnish75 = runTest { - imports = [ ./varnish.nix ]; - _module.args.package = pkgs.varnish75; - }; varnish76 = runTest { imports = [ ./varnish.nix ]; _module.args.package = pkgs.varnish76; }; + varnish77 = runTest { + imports = [ ./varnish.nix ]; + _module.args.package = pkgs.varnish77; + }; vault = handleTest ./vault.nix { }; vault-agent = handleTest ./vault-agent.nix { }; vault-dev = handleTest ./vault-dev.nix { }; @@ -1458,7 +1462,7 @@ in wpa_supplicant = import ./wpa_supplicant.nix { inherit pkgs runTest; }; wordpress = runTest ./wordpress.nix; wrappers = handleTest ./wrappers.nix { }; - writefreely = handleTest ./web-apps/writefreely.nix { }; + writefreely = import ./web-apps/writefreely.nix { inherit pkgs runTest; }; wstunnel = runTest ./wstunnel.nix; xandikos = runTest ./xandikos.nix; xautolock = runTest ./xautolock.nix; diff --git a/nixos/tests/ax25.nix b/nixos/tests/ax25.nix new file mode 100644 index 000000000000..f1092d5de101 --- /dev/null +++ b/nixos/tests/ax25.nix @@ -0,0 +1,131 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + let + + baud = 57600; + tty = "/dev/ttyACM0"; + port = "tnc0"; + socatPort = 1234; + + createAX25Node = nodeId: { + + boot.kernelPackages = pkgs.linuxPackages_ham; + boot.kernelModules = [ "ax25" ]; + + networking.firewall.allowedTCPPorts = [ socatPort ]; + + environment.systemPackages = with pkgs; [ + libax25 + ax25-tools + ax25-apps + socat + ]; + + services.ax25.axports."${port}" = { + inherit baud tty; + enable = true; + callsign = "NOCALL-${toString nodeId}"; + description = "mocked tnc"; + }; + + services.ax25.axlisten = { + enable = true; + }; + + # All mocks radios will connect back to socat-broker on node 1 in order to get + # all messages that are "broadcasted over the ether" + systemd.services.ax25-mock-hardware = { + description = "mock AX.25 TNC and Radio"; + wantedBy = [ "default.target" ]; + before = [ + "ax25-kissattach-${port}.service" + "axlisten.service" + ]; + after = [ "network.target" ]; + serviceConfig = { + Type = "exec"; + ExecStart = "${pkgs.socat}/bin/socat -d -d tcp:192.168.1.1:${toString socatPort} pty,link=${tty},b${toString baud},raw"; + }; + }; + }; + in + { + name = "ax25Simple"; + nodes = { + node1 = lib.mkMerge [ + (createAX25Node 1) + # mimicking radios on the same frequency + { + systemd.services.ax25-mock-ether = { + description = "mock radio ether"; + wantedBy = [ "default.target" ]; + requires = [ "network.target" ]; + before = [ "ax25-mock-hardware.service" ]; + # broken needs access to "ss" or "netstat" + path = [ pkgs.iproute2 ]; + serviceConfig = { + Type = "exec"; + ExecStart = "${pkgs.socat}/bin/socat-broker.sh tcp4-listen:${toString socatPort}"; + }; + postStart = "${pkgs.coreutils}/bin/sleep 2"; + }; + } + ]; + node2 = createAX25Node 2; + node3 = createAX25Node 3; + }; + testScript = + { ... }: + '' + def wait_for_machine(m): + m.succeed("lsmod | grep ax25") + m.wait_for_unit("ax25-axports.target") + m.wait_for_unit("axlisten.service") + m.fail("journalctl -o cat -u axlisten.service | grep -i \"no AX.25 port data configured\"") + + # start the first node since the socat-broker needs to be running + node1.start() + node1.wait_for_unit("ax25-mock-ether.service") + wait_for_machine(node1) + + node2.start() + node3.start() + wait_for_machine(node2) + wait_for_machine(node3) + + # Node 1 -> Node 2 + node1.succeed("echo hello | ax25_call ${port} NOCALL-1 NOCALL-2") + node2.sleep(1) + node2.succeed("journalctl -o cat -u axlisten.service | grep -A1 \"NOCALL-1 to NOCALL-2 ctl I00\" | grep hello") + + # Node 1 -> Node 3 + node1.succeed("echo hello | ax25_call ${port} NOCALL-1 NOCALL-3") + node3.sleep(1) + node3.succeed("journalctl -o cat -u axlisten.service | grep -A1 \"NOCALL-1 to NOCALL-3 ctl I00\" | grep hello") + + # Node 2 -> Node 1 + # must sleep due to previous ax25_call lingering + node2.sleep(5) + node2.succeed("echo hello | ax25_call ${port} NOCALL-2 NOCALL-1") + node1.sleep(1) + node1.succeed("journalctl -o cat -u axlisten.service | grep -A1 \"NOCALL-2 to NOCALL-1 ctl I00\" | grep hello") + + # Node 2 -> Node 3 + node2.succeed("echo hello | ax25_call ${port} NOCALL-2 NOCALL-3") + node3.sleep(1) + node3.succeed("journalctl -o cat -u axlisten.service | grep -A1 \"NOCALL-2 to NOCALL-3 ctl I00\" | grep hello") + + # Node 3 -> Node 1 + # must sleep due to previous ax25_call lingering + node3.sleep(5) + node3.succeed("echo hello | ax25_call ${port} NOCALL-3 NOCALL-1") + node1.sleep(1) + node1.succeed("journalctl -o cat -u axlisten.service | grep -A1 \"NOCALL-3 to NOCALL-1 ctl I00\" | grep hello") + + # Node 3 -> Node 2 + node3.succeed("echo hello | ax25_call ${port} NOCALL-3 NOCALL-2") + node2.sleep(1) + node2.succeed("journalctl -o cat -u axlisten.service | grep -A1 \"NOCALL-3 to NOCALL-2 ctl I00\" | grep hello") + ''; + } +) diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix index b7cf6ff10cc9..357ebe77f060 100644 --- a/nixos/tests/caddy.nix +++ b/nixos/tests/caddy.nix @@ -74,7 +74,7 @@ services.caddy = { package = pkgs.caddy.withPlugins { plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20241211194404-3865845790a7" ]; - hash = "sha256-WPmJPnyOrAnuJxvn3ywswqvLGV8SZzzn3gU1Tbtpao4="; + hash = "sha256-BJ+//h/bkj6y2Zhxas8oJyrryiTDR2Qpz7+VloqrbwQ="; }; configFile = pkgs.writeText "Caddyfile" '' { diff --git a/nixos/tests/cockpit.nix b/nixos/tests/cockpit.nix index 0433cebf3b56..29692f10aad2 100644 --- a/nixos/tests/cockpit.nix +++ b/nixos/tests/cockpit.nix @@ -23,11 +23,9 @@ import ./make-test-python.nix ( enable = true; port = 7890; openFirewall = true; - settings = { - WebService = { - Origins = "https://server:7890"; - }; - }; + allowed-origins = [ + "https://server:${toString config.services.cockpit.port}" + ]; }; }; client = @@ -123,10 +121,14 @@ import ./make-test-python.nix ( assert "Web console is running in limited access mode" in driver.page_source log("Clicking the sudo button") + for button in driver.find_elements(By.TAG_NAME, "button"): + if 'admin' in button.text: + button.click() driver.switch_to.default_content() - driver.find_element(By.CSS_SELECTOR, 'button.ct-locked').click() + log("Checking that /nonexistent is not a thing") assert '/nonexistent' not in driver.page_source + assert len(driver.find_elements(By.CSS_SELECTOR, '#machine-reconnect')) == 0 driver.close() ''; diff --git a/nixos/tests/cosmic.nix b/nixos/tests/cosmic.nix index 227640c078ee..3f48a384913a 100644 --- a/nixos/tests/cosmic.nix +++ b/nixos/tests/cosmic.nix @@ -75,14 +75,14 @@ if (enableAutologin) then '' with subtest("cosmic-greeter initialisation"): - machine.wait_for_unit("graphical.target") + machine.wait_for_unit("graphical.target", timeout=120) '' else '' from time import sleep - machine.wait_for_unit("graphical.target") - machine.wait_until_succeeds("pgrep --uid ${toString cfg.users.users.cosmic-greeter.name} --full cosmic-greeter") + machine.wait_for_unit("graphical.target", timeout=120) + machine.wait_until_succeeds("pgrep --uid ${toString cfg.users.users.cosmic-greeter.name} --full cosmic-greeter", timeout=30) # Sleep for 10 seconds for ensuring that `greetd` loads the # password prompt for the login screen properly. sleep(10) @@ -96,7 +96,7 @@ # `cosmic-session` target is the Workspaces applet. So, wait # for it to start. The process existing means that COSMIC # now handles any opened windows from now on. - machine.wait_until_succeeds("pgrep --uid ${toString user.uid} --full 'cosmic-panel-button com.system76.CosmicWorkspaces'") + machine.wait_until_succeeds("pgrep --uid ${toString user.uid} --full 'cosmic-panel-button com.system76.CosmicWorkspaces'", timeout=30) # The best way to test for Wayland and XWayland is to launch # the GUI applications and see the results yourself. @@ -121,7 +121,7 @@ machine.wait_until_succeeds(f''''su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} lswt --json | jq ".toplevels" | grep "^ \\"app-id\\": \\"{app_id}\\"$"' '''', timeout=30) machine.succeed(f"pkill {gui_app}", timeout=5) - machine.succeed("echo 'test completed succeessfully' > /${testName}") + machine.succeed("echo 'test completed succeessfully' > /${testName}", timeout=5) machine.copy_from_vm('/${testName}') machine.shutdown() diff --git a/nixos/tests/cups-pdf.nix b/nixos/tests/cups-pdf.nix index 917c3d8d4a8c..00623b14a9db 100644 --- a/nixos/tests/cups-pdf.nix +++ b/nixos/tests/cups-pdf.nix @@ -1,47 +1,45 @@ -import ./make-test-python.nix ( - { lib, pkgs, ... }: - { - name = "cups-pdf"; +{ hostPkgs, lib, ... }: +{ + name = "cups-pdf"; - nodes.machine = - { pkgs, ... }: - { - imports = [ ./common/user-account.nix ]; - environment.systemPackages = [ pkgs.poppler-utils ]; - fonts.packages = [ pkgs.dejavu_fonts ]; # yields more OCR-able pdf - services.printing.cups-pdf.enable = true; - services.printing.cups-pdf.instances = { - opt = { }; - noopt.installPrinter = false; - }; - hardware.printers.ensurePrinters = [ - { - name = "noopt"; - model = "CUPS-PDF_noopt.ppd"; - deviceUri = "cups-pdf:/noopt"; - } - ]; + nodes.machine = + { pkgs, ... }: + { + imports = [ ./common/user-account.nix ]; + environment.systemPackages = [ pkgs.poppler-utils ]; + fonts.packages = [ pkgs.dejavu_fonts ]; # yields more OCR-able pdf + services.printing.cups-pdf.enable = true; + services.printing.cups-pdf.instances = { + opt = { }; + noopt.installPrinter = false; }; + hardware.printers.ensurePrinters = [ + { + name = "noopt"; + model = "CUPS-PDF_noopt.ppd"; + deviceUri = "cups-pdf:/noopt"; + } + ]; + }; - # we cannot check the files with pdftotext, due to - # https://github.com/alexivkin/CUPS-PDF-to-PDF/issues/7 - # we need `imagemagickBig` as it has ghostscript support + # we cannot check the files with pdftotext, due to + # https://github.com/alexivkin/CUPS-PDF-to-PDF/issues/7 + # we need `imagemagickBig` as it has ghostscript support - testScript = '' - from subprocess import run - machine.wait_for_unit("multi-user.target") - for name in ("opt", "noopt"): - text = f"test text {name}".upper() - machine.wait_until_succeeds(f"lpstat -v {name}") - machine.succeed(f"su - alice -c 'echo -e \"\n {text}\" | lp -d {name}'") - # wait until the pdf files are completely produced and readable by alice - machine.wait_until_succeeds(f"su - alice -c 'pdfinfo /var/spool/cups-pdf-{name}/users/alice/*.pdf'") - machine.succeed(f"cp /var/spool/cups-pdf-{name}/users/alice/*.pdf /tmp/{name}.pdf") - machine.copy_from_vm(f"/tmp/{name}.pdf", "") - run(f"${pkgs.imagemagickBig}/bin/convert -density 300 $out/{name}.pdf $out/{name}.jpeg", shell=True, check=True) - assert text.encode() in run(f"${lib.getExe pkgs.tesseract} $out/{name}.jpeg stdout", shell=True, check=True, capture_output=True).stdout - ''; + testScript = '' + from subprocess import run + machine.wait_for_unit("multi-user.target") + for name in ("opt", "noopt"): + text = f"test text {name}".upper() + machine.wait_until_succeeds(f"lpstat -v {name}") + machine.succeed(f"su - alice -c 'echo -e \"\n {text}\" | lp -d {name}'") + # wait until the pdf files are completely produced and readable by alice + machine.wait_until_succeeds(f"su - alice -c 'pdfinfo /var/spool/cups-pdf-{name}/users/alice/*.pdf'") + machine.succeed(f"cp /var/spool/cups-pdf-{name}/users/alice/*.pdf /tmp/{name}.pdf") + machine.copy_from_vm(f"/tmp/{name}.pdf", "") + run(f"${lib.getExe hostPkgs.imagemagickBig} -density 300 $out/{name}.pdf $out/{name}.jpeg", shell=True, check=True) + assert text.encode() in run(f"${lib.getExe hostPkgs.tesseract} $out/{name}.jpeg stdout", shell=True, check=True, capture_output=True).stdout + ''; - meta.maintainers = [ lib.maintainers.yarny ]; - } -) + meta.maintainers = [ lib.maintainers.yarny ]; +} diff --git a/nixos/tests/discourse.nix b/nixos/tests/discourse.nix index 3accebe8f31f..1f8d1b7bdf4c 100644 --- a/nixos/tests/discourse.nix +++ b/nixos/tests/discourse.nix @@ -59,7 +59,7 @@ import ./make-test-python.nix ( environment.systemPackages = [ pkgs.jq ]; - services.postgresql.package = pkgs.postgresql_13; + services.postgresql.package = pkgs.postgresql_15; services.discourse = { enable = true; @@ -104,7 +104,6 @@ import ./make-test-python.nix ( services.dovecot2 = { enable = true; protocols = [ "imap" ]; - modules = [ pkgs.dovecot_pigeonhole ]; }; services.postfix = { diff --git a/nixos/tests/fancontrol.nix b/nixos/tests/fancontrol.nix index da2d5fbd8405..5bfd4b2bd37e 100644 --- a/nixos/tests/fancontrol.nix +++ b/nixos/tests/fancontrol.nix @@ -1,39 +1,37 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - { - name = "fancontrol"; - meta = with pkgs.lib.maintainers; { - maintainers = [ evils ]; +{ pkgs, ... }: +{ + name = "fancontrol"; + meta = with pkgs.lib.maintainers; { + maintainers = [ evils ]; + }; + + nodes.machine = + { ... }: + { + imports = [ ../modules/profiles/minimal.nix ]; + hardware.fancontrol.enable = true; + hardware.fancontrol.config = '' + INTERVAL=42 + DEVPATH=hwmon1=devices/platform/dummy + DEVNAME=hwmon1=dummy + FCTEMPS=hwmon1/device/pwm1=hwmon1/device/temp1_input + FCFANS=hwmon1/device/pwm1=hwmon1/device/fan1_input + MINTEMP=hwmon1/device/pwm1=25 + MAXTEMP=hwmon1/device/pwm1=65 + MINSTART=hwmon1/device/pwm1=150 + MINSTOP=hwmon1/device/pwm1=0 + ''; }; - nodes.machine = - { ... }: - { - imports = [ ../modules/profiles/minimal.nix ]; - hardware.fancontrol.enable = true; - hardware.fancontrol.config = '' - INTERVAL=42 - DEVPATH=hwmon1=devices/platform/dummy - DEVNAME=hwmon1=dummy - FCTEMPS=hwmon1/device/pwm1=hwmon1/device/temp1_input - FCFANS=hwmon1/device/pwm1=hwmon1/device/fan1_input - MINTEMP=hwmon1/device/pwm1=25 - MAXTEMP=hwmon1/device/pwm1=65 - MINSTART=hwmon1/device/pwm1=150 - MINSTOP=hwmon1/device/pwm1=0 - ''; - }; - - # This configuration cannot be valid for the test VM, so it's expected to get an 'outdated' error. - testScript = '' - start_all() - # can't wait for unit fancontrol.service because it doesn't become active due to invalid config - # fancontrol.service is WantedBy multi-user.target - machine.wait_for_unit("multi-user.target") - machine.succeed( - "journalctl -eu fancontrol | tee /dev/stderr | grep 'Configuration appears to be outdated'" - ) - machine.shutdown() - ''; - } -) + # This configuration cannot be valid for the test VM, so it's expected to get an 'outdated' error. + testScript = '' + start_all() + # can't wait for unit fancontrol.service because it doesn't become active due to invalid config + # fancontrol.service is WantedBy multi-user.target + machine.wait_for_unit("multi-user.target") + machine.succeed( + "journalctl -eu fancontrol | tee /dev/stderr | grep 'Configuration appears to be outdated'" + ) + machine.shutdown() + ''; +} diff --git a/nixos/tests/forgejo.nix b/nixos/tests/forgejo.nix index 38ef6cc57ed4..a35ee87ff68c 100644 --- a/nixos/tests/forgejo.nix +++ b/nixos/tests/forgejo.nix @@ -60,7 +60,6 @@ let pkgs.gnupg pkgs.jq pkgs.file - pkgs.htmlq ]; services.openssh.enable = true; @@ -253,27 +252,22 @@ let client.succeed("git -C /tmp/repo push origin main") def poll_workflow_action_status(_) -> bool: - output = server.succeed( - "curl --fail http://localhost:3000/test/repo/actions | " - + 'htmlq ".flex-item-leading span" --attribute "data-tooltip-content"' - ).strip() + try: + response = server.succeed("curl --fail http://localhost:3000/api/v1/repos/test/repo/actions/tasks") + status = json.loads(response).get("workflow_runs")[0].get("status") - # values taken from https://codeberg.org/forgejo/forgejo/src/commit/af47c583b4fb3190fa4c4c414500f9941cc02389/options/locale/locale_en-US.ini#L3649-L3661 - if output in [ "Failure", "Canceled", "Skipped", "Blocked" ]: - raise Exception(f"Workflow status is '{output}', which we consider failed.") - server.log(f"Command returned '{output}', which we consider failed.") + except IndexError: + status = "???" - elif output in [ "Unknown", "Waiting", "Running", "" ]: - server.log(f"Workflow status is '{output}'. Waiting some more...") - return False + server.log(f"Workflow status: {status}") - elif output in [ "Success" ]: - return True + if status == "failure": + raise Exception("Workflow failed") - raise Exception(f"Workflow status is '{output}', which we don't know. Value mappings likely need updating.") + return status == "success" with server.nested("Waiting for the workflow run to be successful"): - retry(poll_workflow_action_status) + retry(poll_workflow_action_status, 60) with subtest("Testing backup service"): server.succeed("${serverSystem}/specialisation/dump/bin/switch-to-configuration test") diff --git a/nixos/tests/git/hub.nix b/nixos/tests/git/hub.nix index 43ae2b7ab30b..622f4b6dac05 100644 --- a/nixos/tests/git/hub.nix +++ b/nixos/tests/git/hub.nix @@ -1,20 +1,18 @@ -import ../make-test-python.nix ( - { pkgs, ... }: - { - name = "hub"; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; +{ pkgs, ... }: +{ + name = "hub"; + meta = with pkgs.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes.hub = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.hub ]; }; - nodes.hub = - { pkgs, ... }: - { - environment.systemPackages = [ pkgs.hub ]; - }; - - testScript = '' - assert "git version ${pkgs.git.version}\nhub version ${pkgs.hub.version}\n" in hub.succeed("hub version") - assert "These GitHub commands are provided by hub" in hub.succeed("hub help") - ''; - } -) + testScript = '' + assert "git version ${pkgs.git.version}\nhub version ${pkgs.hub.version}\n" in hub.succeed("hub version") + assert "These GitHub commands are provided by hub" in hub.succeed("hub help") + ''; +} diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index da27cfbbc195..47695e487db3 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -42,6 +42,10 @@ in environment.systemPackages = with pkgs; [ git ]; + networking.hosts."127.0.0.1" = [ + "registry.localhost" + "pages.localhost" + ]; virtualisation.memorySize = 6144; virtualisation.cores = 4; virtualisation.useNixStoreImage = true; @@ -59,6 +63,12 @@ in localhost = { locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; }; + "pages.localhost" = { + locations."/".proxyPass = "http://localhost:8090"; + }; + "registry.localhost" = { + locations."/".proxyPass = "http://localhost:4567"; + }; }; }; @@ -78,7 +88,7 @@ in smtp.enable = true; pages = { enable = true; - settings.pages-domain = "localhost"; + settings.pages-domain = "pages.localhost"; }; extraConfig = { incoming_email = { @@ -98,6 +108,14 @@ in jwsFile = pkgs.runCommand "oidcKeyBase" { } "${pkgs.openssl}/bin/openssl genrsa 2048 > $out"; }; + registry = { + enable = true; + certFile = "/var/lib/gitlab/registry_auth_cert"; + keyFile = "/var/lib/gitlab/registry_auth_key"; + externalAddress = "registry.localhost"; + externalPort = 443; + }; + # reduce memory usage sidekiq.concurrency = 1; puma.workers = 2; @@ -210,6 +228,7 @@ in gitlab.wait_for_unit("gitlab-sidekiq.service") gitlab.wait_for_file("${nodes.gitlab.services.gitlab.statePath}/tmp/sockets/gitlab.socket") gitlab.wait_until_succeeds("curl -sSf http://gitlab/users/sign_in") + gitlab.wait_for_unit("docker-registry.service") ''; # The actual test of GitLab. Only push data to GitLab if @@ -249,7 +268,7 @@ in with subtest("Setup Git and SSH for Alice"): gitlab.succeed("git config --global user.name Alice") gitlab.succeed("git config --global user.email alice@nixos.invalid") - gitlab.succeed("mkdir -m 700 /root/.ssh") + gitlab.succeed("mkdir -p -m 700 /root/.ssh") gitlab.succeed("cat ${snakeOilPrivateKey} > /root/.ssh/id_ecdsa") gitlab.succeed("chmod 600 /root/.ssh/id_ecdsa") gitlab.succeed( @@ -447,6 +466,10 @@ in """ ) gitlab.succeed("test -s /tmp/archive.tar.bz2") + '' + + '' + with subtest("Test docker registry http is available"): + gitlab.succeed("curl -sSf http://registry.localhost") ''; in diff --git a/nixos/tests/hadoop/hbase.nix b/nixos/tests/hadoop/hbase.nix index efc85c869bf9..f6eb1f7e759a 100644 --- a/nixos/tests/hadoop/hbase.nix +++ b/nixos/tests/hadoop/hbase.nix @@ -116,6 +116,9 @@ import ../make-test-python.nix ( zookeeper.wait_for_unit("zookeeper") zookeeper.wait_for_open_port(2181) + # wait for HDFS cluster to be RW + datanode.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait") + # wait for HBase to start up master.wait_for_unit("hbase-master") regionserver.wait_for_unit("hbase-regionserver") diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix index b3cc19696d7c..bd8b9b288a22 100644 --- a/nixos/tests/haproxy.nix +++ b/nixos/tests/haproxy.nix @@ -1,140 +1,138 @@ -import ./make-test-python.nix ( - { lib, pkgs, ... }: - { - name = "haproxy"; - nodes = { - server = - { ... }: - { - services.haproxy = { - enable = true; - config = '' - global - limited-quic +{ lib, hostPkgs, ... }: +{ + name = "haproxy"; + nodes = { + server = + { pkgs, ... }: + { + services.haproxy = { + enable = true; + config = '' + global + limited-quic - defaults - mode http - timeout connect 10s - timeout client 10s - timeout server 10s + defaults + mode http + timeout connect 10s + timeout client 10s + timeout server 10s - log /dev/log local0 debug err - option logasap - option httplog - option httpslog + log /dev/log local0 debug err + option logasap + option httplog + option httpslog - backend http_server - server httpd [::1]:8000 alpn http/1.1 + backend http_server + server httpd [::1]:8000 alpn http/1.1 - frontend http - bind :80 - bind :443 ssl strict-sni crt /etc/ssl/fullchain.pem alpn h2,http/1.1 - bind quic4@:443 ssl strict-sni crt /etc/ssl/fullchain.pem alpn h3 allow-0rtt + frontend http + bind :80 + bind :443 ssl strict-sni crt /etc/ssl/fullchain.pem alpn h2,http/1.1 + bind quic4@:443 ssl strict-sni crt /etc/ssl/fullchain.pem alpn h3 allow-0rtt - http-after-response add-header alt-svc 'h3=":443"; ma=60' if { ssl_fc } + http-after-response add-header alt-svc 'h3=":443"; ma=60' if { ssl_fc } - http-request use-service prometheus-exporter if { path /metrics } - use_backend http_server + http-request use-service prometheus-exporter if { path /metrics } + use_backend http_server - frontend http-cert-auth - bind :8443 ssl strict-sni crt /etc/ssl/fullchain.pem verify required ca-file /etc/ssl/cacert.crt - bind quic4@:8443 ssl strict-sni crt /etc/ssl/fullchain.pem verify required ca-file /etc/ssl/cacert.crt alpn h3 + frontend http-cert-auth + bind :8443 ssl strict-sni crt /etc/ssl/fullchain.pem verify required ca-file /etc/ssl/cacert.crt + bind quic4@:8443 ssl strict-sni crt /etc/ssl/fullchain.pem verify required ca-file /etc/ssl/cacert.crt alpn h3 - use_backend http_server - ''; - }; - services.httpd = { - enable = true; - virtualHosts.localhost = { - documentRoot = pkgs.writeTextDir "index.txt" "We are all good!"; - adminAddr = "notme@yourhost.local"; - listen = [ - { - ip = "::1"; - port = 8000; - } - ]; - }; - }; - networking.firewall.allowedTCPPorts = [ - 80 - 443 - 8443 - ]; - networking.firewall.allowedUDPPorts = [ - 443 - 8443 - ]; + use_backend http_server + ''; }; - client = - { ... }: - { - environment.systemPackages = [ pkgs.curlHTTP3 ]; + services.httpd = { + enable = true; + virtualHosts.localhost = { + documentRoot = pkgs.writeTextDir "index.txt" "We are all good!"; + adminAddr = "notme@yourhost.local"; + listen = [ + { + ip = "::1"; + port = 8000; + } + ]; + }; }; - }; - testScript = '' - # Helpers - def cmd(command): - print(f"+{command}") - r = os.system(command) - if r != 0: - raise Exception(f"Command {command} failed with exit code {r}") + networking.firewall.allowedTCPPorts = [ + 80 + 443 + 8443 + ]; + networking.firewall.allowedUDPPorts = [ + 443 + 8443 + ]; + }; + client = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.curlHTTP3 ]; + }; + }; + testScript = '' + # Helpers + def cmd(command): + print(f"+{command}") + r = os.system(command) + if r != 0: + raise Exception(f"Command {command} failed with exit code {r}") - def openssl(command): - cmd(f"${pkgs.openssl}/bin/openssl {command}") + def openssl(command): + cmd(f"${lib.getExe hostPkgs.openssl} {command}") - # Generate CA. - openssl("req -new -newkey rsa:4096 -nodes -x509 -days 7 -subj '/C=ZZ/ST=Cloud/L=Unspecified/O=NixOS/OU=Tests/CN=CA Certificate' -keyout cacert.key -out cacert.crt") + # Generate CA. + openssl("req -new -newkey rsa:4096 -nodes -x509 -days 7 -subj '/C=ZZ/ST=Cloud/L=Unspecified/O=NixOS/OU=Tests/CN=CA Certificate' -keyout cacert.key -out cacert.crt") - # Generate and sign Server. - openssl("req -newkey rsa:4096 -nodes -subj '/CN=server/OU=Tests/O=NixOS' -keyout server.key -out server.csr") - openssl("x509 -req -in server.csr -out server.crt -CA cacert.crt -CAkey cacert.key -days 7") - cmd("cat server.crt server.key > fullchain.pem") + # Generate and sign Server. + openssl("req -newkey rsa:4096 -nodes -subj '/CN=server/OU=Tests/O=NixOS' -keyout server.key -out server.csr") + openssl("x509 -req -in server.csr -out server.crt -CA cacert.crt -CAkey cacert.key -days 7") + cmd("cat server.crt server.key > fullchain.pem") - # Generate and sign Client. - openssl("req -newkey rsa:4096 -nodes -subj '/CN=client/OU=Tests/O=NixOS' -keyout client.key -out client.csr") - openssl("x509 -req -in client.csr -out client.crt -CA cacert.crt -CAkey cacert.key -days 7") - cmd("cat client.crt client.key > client.pem") + # Generate and sign Client. + openssl("req -newkey rsa:4096 -nodes -subj '/CN=client/OU=Tests/O=NixOS' -keyout client.key -out client.csr") + openssl("x509 -req -in client.csr -out client.crt -CA cacert.crt -CAkey cacert.key -days 7") + cmd("cat client.crt client.key > client.pem") - # Start the actual test. - start_all() - server.copy_from_host("fullchain.pem", "/etc/ssl/fullchain.pem") - server.copy_from_host("cacert.crt", "/etc/ssl/cacert.crt") - server.succeed("chmod 0644 /etc/ssl/fullchain.pem /etc/ssl/cacert.crt") + # Start the actual test. + start_all() + server.copy_from_host("fullchain.pem", "/etc/ssl/fullchain.pem") + server.copy_from_host("cacert.crt", "/etc/ssl/cacert.crt") + server.succeed("chmod 0644 /etc/ssl/fullchain.pem /etc/ssl/cacert.crt") - client.copy_from_host("cacert.crt", "/etc/ssl/cacert.crt") - client.copy_from_host("client.pem", "/root/client.pem") + client.copy_from_host("cacert.crt", "/etc/ssl/cacert.crt") + client.copy_from_host("client.pem", "/root/client.pem") - server.wait_for_unit("multi-user.target") - server.wait_for_unit("haproxy.service") - server.wait_for_unit("httpd.service") + server.wait_for_unit("multi-user.target") + server.wait_for_unit("haproxy.service") + server.wait_for_unit("httpd.service") - assert "We are all good!" in client.succeed("curl -f http://server/index.txt") - assert "haproxy_process_pool_allocated_bytes" in client.succeed("curl -f http://server/metrics") + assert "We are all good!" in client.succeed("curl -f http://server/index.txt") + assert "haproxy_process_pool_allocated_bytes" in client.succeed("curl -f http://server/metrics") - with subtest("https"): - assert "We are all good!" in client.succeed("curl -f --cacert /etc/ssl/cacert.crt https://server/index.txt") + with subtest("https"): + assert "We are all good!" in client.succeed("curl -f --cacert /etc/ssl/cacert.crt https://server/index.txt") - with subtest("https-cert-auth"): - # Client must succeed in authenticating with the right certificate. - assert "We are all good!" in client.succeed("curl -f --cacert /etc/ssl/cacert.crt --cert-type pem --cert /root/client.pem https://server:8443/index.txt") - # Client must fail without certificate. - client.fail("curl --cacert /etc/ssl/cacert.crt https://server:8443/index.txt") + with subtest("https-cert-auth"): + # Client must succeed in authenticating with the right certificate. + assert "We are all good!" in client.succeed("curl -f --cacert /etc/ssl/cacert.crt --cert-type pem --cert /root/client.pem https://server:8443/index.txt") + # Client must fail without certificate. + client.fail("curl --cacert /etc/ssl/cacert.crt https://server:8443/index.txt") - with subtest("h3"): - assert "We are all good!" in client.succeed("curl -f --http3-only --cacert /etc/ssl/cacert.crt https://server/index.txt") + with subtest("h3"): + assert "We are all good!" in client.succeed("curl -f --http3-only --cacert /etc/ssl/cacert.crt https://server/index.txt") - with subtest("h3-cert-auth"): - # Client must succeed in authenticating with the right certificate. - assert "We are all good!" in client.succeed("curl -f --http3-only --cacert /etc/ssl/cacert.crt --cert-type pem --cert /root/client.pem https://server:8443/index.txt") - # Client must fail without certificate. - client.fail("curl -f --http3-only --cacert /etc/ssl/cacert.crt https://server:8443/index.txt") + with subtest("h3-cert-auth"): + # Client must succeed in authenticating with the right certificate. + assert "We are all good!" in client.succeed("curl -f --http3-only --cacert /etc/ssl/cacert.crt --cert-type pem --cert /root/client.pem https://server:8443/index.txt") + # Client must fail without certificate. + client.fail("curl -f --http3-only --cacert /etc/ssl/cacert.crt https://server:8443/index.txt") - with subtest("reload"): - server.succeed("systemctl reload haproxy") - # wait some time to ensure the following request hits the reloaded haproxy - server.sleep(5) - assert "We are all good!" in client.succeed("curl -f http://server/index.txt") - ''; - } -) + with subtest("reload"): + server.succeed("systemctl reload haproxy") + # wait some time to ensure the following request hits the reloaded haproxy + server.sleep(5) + assert "We are all good!" in client.succeed("curl -f http://server/index.txt") + ''; +} diff --git a/nixos/tests/installed-tests/geocode-glib.nix b/nixos/tests/installed-tests/geocode-glib.nix index 76a32ee2849a..3fc5dc313a24 100644 --- a/nixos/tests/installed-tests/geocode-glib.nix +++ b/nixos/tests/installed-tests/geocode-glib.nix @@ -11,5 +11,5 @@ makeInstalledTest { ]; }; - tested = pkgs.geocode-glib; + tested = pkgs.geocode-glib_2; } diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix index 06bd65405f6f..e06d39a8d826 100644 --- a/nixos/tests/kexec.nix +++ b/nixos/tests/kexec.nix @@ -1,62 +1,60 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "kexec"; - meta = with lib.maintainers; { - maintainers = [ - flokli - lassulus - ]; - }; +{ pkgs, lib, ... }: +{ + name = "kexec"; + meta = with lib.maintainers; { + maintainers = [ + flokli + lassulus + ]; + }; - nodes = { - node1 = - { ... }: - { - virtualisation.vlans = [ ]; - virtualisation.memorySize = 4 * 1024; - }; + nodes = { + node1 = + { ... }: + { + virtualisation.vlans = [ ]; + virtualisation.memorySize = 4 * 1024; + }; - node2 = - { modulesPath, ... }: - { - virtualisation.vlans = [ ]; - environment.systemPackages = [ pkgs.hello ]; - imports = [ - "${modulesPath}/installer/netboot/netboot-minimal.nix" - "${modulesPath}/testing/test-instrumentation.nix" - "${modulesPath}/profiles/qemu-guest.nix" - ]; - }; - }; + node2 = + { modulesPath, ... }: + { + virtualisation.vlans = [ ]; + environment.systemPackages = [ pkgs.hello ]; + imports = [ + "${modulesPath}/installer/netboot/netboot-minimal.nix" + "${modulesPath}/testing/test-instrumentation.nix" + "${modulesPath}/profiles/qemu-guest.nix" + ]; + }; + }; - testScript = - { nodes, ... }: - '' - # Test whether reboot via kexec works. - node1.wait_for_unit("multi-user.target") - node1.succeed('kexec --load /run/current-system/kernel --initrd /run/current-system/initrd --command-line "$(&2 &", check_return=False) - node1.connected = False - node1.connect() - node1.wait_for_unit("multi-user.target") + testScript = + { nodes, ... }: + '' + # Test whether reboot via kexec works. + node1.wait_for_unit("multi-user.target") + node1.succeed('kexec --load /run/current-system/kernel --initrd /run/current-system/initrd --command-line "$(&2 &", check_return=False) + node1.connected = False + node1.connect() + node1.wait_for_unit("multi-user.target") - # Check if the machine with netboot-minimal.nix profile boots up - node2.wait_for_unit("multi-user.target") - node2.shutdown() + # Check if the machine with netboot-minimal.nix profile boots up + node2.wait_for_unit("multi-user.target") + node2.shutdown() - # Kexec node1 to the toplevel of node2 via the kexec-boot script - node1.succeed('touch /run/foo') - node1.fail('hello') - node1.execute('${nodes.node2.system.build.kexecTree}/kexec-boot', check_output=False) - node1.connected = False - node1.connect() - node1.wait_for_unit("multi-user.target") - node1.succeed('! test -e /run/foo') - node1.succeed('hello') - node1.succeed('[ "$(hostname)" = "node2" ]') + # Kexec node1 to the toplevel of node2 via the kexec-boot script + node1.succeed('touch /run/foo') + node1.fail('hello') + node1.execute('${nodes.node2.system.build.kexecTree}/kexec-boot', check_output=False) + node1.connected = False + node1.connect() + node1.wait_for_unit("multi-user.target") + node1.succeed('! test -e /run/foo') + node1.succeed('hello') + node1.succeed('[ "$(hostname)" = "node2" ]') - node1.shutdown() - ''; - } -) + node1.shutdown() + ''; +} diff --git a/nixos/tests/kismet.nix b/nixos/tests/kismet.nix new file mode 100644 index 000000000000..878a341cedea --- /dev/null +++ b/nixos/tests/kismet.nix @@ -0,0 +1,266 @@ +{ pkgs, lib, ... }: + +let + ssid = "Hydra SmokeNet"; + psk = "stayoffmywifi"; + wlanInterface = "wlan0"; +in +{ + name = "kismet"; + + nodes = + let + hostAddress = id: "192.168.1.${toString (id + 1)}"; + serverAddress = hostAddress 1; + in + { + airgap = + { config, ... }: + { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { + address = serverAddress; + prefixLength = 24; + } + ]; + services.vwifi = { + server = { + enable = true; + ports.tcp = 8212; + ports.spy = 8213; + openFirewall = true; + }; + }; + }; + + ap = + { config, ... }: + { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { + address = hostAddress 2; + prefixLength = 24; + } + ]; + services.hostapd = { + enable = true; + radios.${wlanInterface} = { + channel = 1; + networks.${wlanInterface} = { + inherit ssid; + authentication = { + mode = "wpa3-sae"; + saePasswords = [ { password = psk; } ]; + enableRecommendedPairwiseCiphers = true; + }; + }; + }; + }; + services.vwifi = { + module = { + enable = true; + macPrefix = "74:F8:F6:00:01"; + }; + client = { + enable = true; + inherit serverAddress; + }; + }; + }; + + station = + { config, ... }: + { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { + address = hostAddress 3; + prefixLength = 24; + } + ]; + networking.wireless = { + # No, really, we want it enabled! + enable = lib.mkOverride 0 true; + interfaces = [ wlanInterface ]; + networks = { + ${ssid} = { + inherit psk; + authProtocols = [ "SAE" ]; + }; + }; + }; + services.vwifi = { + module = { + enable = true; + macPrefix = "74:F8:F6:00:02"; + }; + client = { + enable = true; + inherit serverAddress; + }; + }; + }; + + monitor = + { config, ... }: + { + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ + { + address = hostAddress 4; + prefixLength = 24; + } + ]; + + services.kismet = { + enable = true; + serverName = "NixOS Kismet Smoke Test"; + serverDescription = "Server testing virtual wifi devices running on Hydra"; + httpd.enable = true; + # Check that the settings all eval correctly + settings = { + # Should append to log_types + log_types' = "wiglecsv"; + + # Should all generate correctly + wepkey = [ + "00:DE:AD:C0:DE:00" + "FEEDFACE42" + ]; + alert = [ + [ + "ADHOCCONFLICT" + "5/min" + "1/sec" + ] + [ + "ADVCRYPTCHANGE" + "5/min" + "1/sec" + ] + ]; + gps.gpsd = { + host = "localhost"; + port = 2947; + }; + apspoof.Foo1 = [ + { + ssid = "Bar1"; + validmacs = [ + "00:11:22:33:44:55" + "aa:bb:cc:dd:ee:ff" + ]; + } + { + ssid = "Bar2"; + validmacs = [ + "01:12:23:34:45:56" + "ab:bc:cd:de:ef:f0" + ]; + } + ]; + apspoof.Foo2 = [ + { + ssid = "Bar2"; + validmacs = [ + "00:11:22:33:44:55" + "aa:bb:cc:dd:ee:ff" + ]; + } + ]; + + # The actual source + source.${wlanInterface} = { + name = "Virtual Wifi"; + }; + }; + extraConfig = '' + # this comment should be ignored + ''; + }; + + services.vwifi = { + module = { + enable = true; + macPrefix = "74:F8:F6:00:03"; + }; + client = { + enable = true; + spy = true; + inherit serverAddress; + }; + }; + + environment.systemPackages = with pkgs; [ + config.services.kismet.package + config.services.vwifi.package + jq + ]; + }; + }; + + testScript = + { nodes, ... }: + '' + import shlex + + # Wait for the vwifi server to come up + airgap.start() + airgap.wait_for_unit("vwifi-server.service") + airgap.wait_for_open_port(${toString nodes.airgap.services.vwifi.server.ports.tcp}) + + httpd_port = ${toString nodes.monitor.services.kismet.httpd.port} + server_name = "${nodes.monitor.services.kismet.serverName}" + server_description = "${nodes.monitor.services.kismet.serverDescription}" + wlan_interface = "${wlanInterface}" + ap_essid = "${ssid}" + ap_mac_prefix = "${nodes.ap.services.vwifi.module.macPrefix}" + station_mac_prefix = "${nodes.station.services.vwifi.module.macPrefix}" + + # Spawn the other nodes. + monitor.start() + + # Wait for the monitor to come up + monitor.wait_for_unit("kismet.service") + monitor.wait_for_open_port(httpd_port) + + # Should be up but require authentication. + url = f"http://localhost:{httpd_port}" + monitor.succeed(f"curl {url} | tee /dev/stderr | grep 'Kismet'") + + # Have to set the password now. + monitor.succeed("echo httpd_username=nixos >> ~kismet/.kismet/kismet_httpd.conf") + monitor.succeed("echo httpd_password=hydra >> ~kismet/.kismet/kismet_httpd.conf") + monitor.systemctl("restart kismet.service") + monitor.wait_for_unit("kismet.service") + monitor.wait_for_open_port(httpd_port) + + # Authentication should now work. + url = f"http://nixos:hydra@localhost:{httpd_port}" + monitor.succeed(f"curl {url}/system/status.json | tee /dev/stderr | jq -e --arg serverName {shlex.quote(server_name)} --arg serverDescription {shlex.quote(server_description)} '.\"kismet.system.server_name\" == $serverName and .\"kismet.system.server_description\" == $serverDescription'") + + # Wait for the station to connect to the AP while Kismet is monitoring + ap.start() + station.start() + + unit = f"wpa_supplicant-{wlan_interface}" + + # Generate handshakes until we detect both devices + success = False + for i in range(100): + station.wait_for_unit(f"wpa_supplicant-{wlan_interface}.service") + station.succeed(f"ifconfig {wlan_interface} down && ifconfig {wlan_interface} up") + station.wait_until_succeeds(f"journalctl -u {shlex.quote(unit)} -e | grep -Eqi {shlex.quote(wlan_interface + ': CTRL-EVENT-CONNECTED - Connection to ' + ap_mac_prefix + '[0-9a-f:]* completed')}") + station.succeed(f"journalctl --rotate --unit={shlex.quote(unit)}") + station.succeed(f"sleep 3 && journalctl --vacuum-time=1s --unit={shlex.quote(unit)}") + + # We're connected, make sure Kismet sees both of our devices + status, stdout = monitor.execute(f"curl {url}/devices/views/all/last-time/0/devices.json | tee /dev/stderr | jq -e --arg macPrefix {shlex.quote(ap_mac_prefix)} --arg ssid {shlex.quote(ap_essid)} '. | (map(select((.\"kismet.device.base.macaddr\"? | startswith($macPrefix)) and .\"dot11.device\"?.\"dot11.device.last_beaconed_ssid_record\"?.\"dot11.advertisedssid.ssid\" == $ssid)) | length) == 1'") + if status != 0: + continue + status, stdout = monitor.execute(f"curl {url}/devices/views/all/last-time/0/devices.json | tee /dev/stderr | jq -e --arg macPrefix {shlex.quote(station_mac_prefix)} '. | (map(select((.\"kismet.device.base.macaddr\"? | startswith($macPrefix)))) | length) == 1'") + if status == 0: + success = True + break + + assert success + ''; +} diff --git a/nixos/tests/logrotate.nix b/nixos/tests/logrotate.nix index 1efbcc4cfed5..603a0f164c46 100644 --- a/nixos/tests/logrotate.nix +++ b/nixos/tests/logrotate.nix @@ -10,137 +10,134 @@ let }; in +{ pkgs, ... }: +{ + name = "logrotate"; + meta = with pkgs.lib.maintainers; { + maintainers = [ martinetd ]; + }; -import ./make-test-python.nix ( - { pkgs, ... }: - rec { - name = "logrotate"; - meta = with pkgs.lib.maintainers; { - maintainers = [ martinetd ]; - }; - - nodes = { - defaultMachine = - { ... }: - { - services.logrotate.enable = true; + nodes = { + defaultMachine = + { ... }: + { + services.logrotate.enable = true; + }; + failingMachine = + { ... }: + { + services.logrotate = { + enable = true; + configFile = pkgs.writeText "logrotate.conf" '' + # self-written config file + su notarealuser notagroupeither + ''; }; - failingMachine = - { ... }: - { - services.logrotate = { - enable = true; - configFile = pkgs.writeText "logrotate.conf" '' - # self-written config file - su notarealuser notagroupeither - ''; - }; - }; - machine = - { config, ... }: - { - imports = [ importTest ]; + }; + machine = + { config, ... }: + { + imports = [ importTest ]; - services.logrotate = { - enable = true; - settings = { - # remove default frequency header and add another - header = { - frequency = null; - delaycompress = true; - }; - # extra global setting... affecting nothing - last_line = { - global = true; - priority = 2000; - shred = true; - }; - # using mail somewhere should add --mail to logrotate invocation - sendmail = { - mail = "user@domain.tld"; - }; - # postrotate should be suffixed by 'endscript' - postrotate = { - postrotate = "touch /dev/null"; - }; - # check checkConfig works as expected: there is nothing to check here - # except that the file build passes - checkConf = { - su = "root utmp"; - createolddir = "0750 root utmp"; - create = "root utmp"; - "create " = "0750 root utmp"; - }; - # multiple paths should be aggregated - multipath = { - files = [ - "file1" - "file2" - ]; - }; - # overriding imported path should keep existing attributes - # (e.g. olddir is still set) - import = { - notifempty = true; - }; + services.logrotate = { + enable = true; + settings = { + # remove default frequency header and add another + header = { + frequency = null; + delaycompress = true; + }; + # extra global setting... affecting nothing + last_line = { + global = true; + priority = 2000; + shred = true; + }; + # using mail somewhere should add --mail to logrotate invocation + sendmail = { + mail = "user@domain.tld"; + }; + # postrotate should be suffixed by 'endscript' + postrotate = { + postrotate = "touch /dev/null"; + }; + # check checkConfig works as expected: there is nothing to check here + # except that the file build passes + checkConf = { + su = "root utmp"; + createolddir = "0750 root utmp"; + create = "root utmp"; + "create " = "0750 root utmp"; + }; + # multiple paths should be aggregated + multipath = { + files = [ + "file1" + "file2" + ]; + }; + # overriding imported path should keep existing attributes + # (e.g. olddir is still set) + import = { + notifempty = true; }; }; }; - }; + }; + }; - testScript = '' - with subtest("whether logrotate works"): - # we must rotate once first to create logrotate stamp - defaultMachine.succeed("systemctl start logrotate.service") - # we need to wait for console text once here to - # clear console buffer up to this point for next wait - defaultMachine.wait_for_console_text('logrotate.service: Deactivated successfully') + testScript = '' + with subtest("whether logrotate works"): + # we must rotate once first to create logrotate stamp + defaultMachine.succeed("systemctl start logrotate.service") + # we need to wait for console text once here to + # clear console buffer up to this point for next wait + defaultMachine.wait_for_console_text('logrotate.service: Deactivated successfully') - defaultMachine.succeed( - # wtmp is present in default config. - "rm -f /var/log/wtmp*", - # we need to give it at least 1MB - "dd if=/dev/zero of=/var/log/wtmp bs=2M count=1", + defaultMachine.succeed( + # wtmp is present in default config. + "rm -f /var/log/wtmp*", + # we need to give it at least 1MB + "dd if=/dev/zero of=/var/log/wtmp bs=2M count=1", - # move into the future and check rotation. - "date -s 'now + 1 month + 1 day'") - defaultMachine.wait_for_console_text('logrotate.service: Deactivated successfully') - defaultMachine.succeed( - # check rotate worked - "[ -e /var/log/wtmp.1 ]", - ) - with subtest("default config does not have mail"): - defaultMachine.fail("systemctl cat logrotate.service | grep -- --mail") - with subtest("using mails adds mail option"): - machine.succeed("systemctl cat logrotate.service | grep -- --mail") - with subtest("check generated config matches expectation"): - machine.succeed( - # copy conf to /tmp/logrotate.conf for easy grep - "conf=$(systemctl cat logrotate | grep -oE '/nix/store[^ ]*logrotate.conf'); cp $conf /tmp/logrotate.conf", - "! grep weekly /tmp/logrotate.conf", - "grep -E '^delaycompress' /tmp/logrotate.conf", - "tail -n 1 /tmp/logrotate.conf | grep shred", - "sed -ne '/\"sendmail\" {/,/}/p' /tmp/logrotate.conf | grep 'mail user@domain.tld'", - "sed -ne '/\"postrotate\" {/,/}/p' /tmp/logrotate.conf | grep endscript", - "grep '\"file1\"\n\"file2\" {' /tmp/logrotate.conf", - "sed -ne '/\"import\" {/,/}/p' /tmp/logrotate.conf | grep noolddir", - ) - # also check configFile option - failingMachine.succeed( - "conf=$(systemctl cat logrotate | grep -oE '/nix/store[^ ]*logrotate.conf'); cp $conf /tmp/logrotate.conf", - "grep 'self-written config' /tmp/logrotate.conf", - ) - with subtest("Check logrotate-checkconf service"): - machine.wait_for_unit("logrotate-checkconf.service") - # wait_for_unit also asserts for success, so wait for - # parent target instead and check manually. - failingMachine.wait_for_unit("multi-user.target") - info = failingMachine.get_unit_info("logrotate-checkconf.service") - if info["ActiveState"] != "failed": - raise Exception('logrotate-checkconf.service was not failed') + # move into the future and check rotation. + "date -s 'now + 1 month + 1 day'") + defaultMachine.wait_for_console_text('logrotate.service: Deactivated successfully') + defaultMachine.succeed( + # check rotate worked + "[ -e /var/log/wtmp.1 ]", + ) + with subtest("default config does not have mail"): + defaultMachine.fail("systemctl cat logrotate.service | grep -- --mail") + with subtest("using mails adds mail option"): + machine.succeed("systemctl cat logrotate.service | grep -- --mail") + with subtest("check generated config matches expectation"): + machine.succeed( + # copy conf to /tmp/logrotate.conf for easy grep + "conf=$(systemctl cat logrotate | grep -oE '/nix/store[^ ]*logrotate.conf'); cp $conf /tmp/logrotate.conf", + "! grep weekly /tmp/logrotate.conf", + "grep -E '^delaycompress' /tmp/logrotate.conf", + "tail -n 1 /tmp/logrotate.conf | grep shred", + "sed -ne '/\"sendmail\" {/,/}/p' /tmp/logrotate.conf | grep 'mail user@domain.tld'", + "sed -ne '/\"postrotate\" {/,/}/p' /tmp/logrotate.conf | grep endscript", + "grep '\"file1\"\n\"file2\" {' /tmp/logrotate.conf", + "sed -ne '/\"import\" {/,/}/p' /tmp/logrotate.conf | grep noolddir", + ) + # also check configFile option + failingMachine.succeed( + "conf=$(systemctl cat logrotate | grep -oE '/nix/store[^ ]*logrotate.conf'); cp $conf /tmp/logrotate.conf", + "grep 'self-written config' /tmp/logrotate.conf", + ) + with subtest("Check logrotate-checkconf service"): + machine.wait_for_unit("logrotate-checkconf.service") + # wait_for_unit also asserts for success, so wait for + # parent target instead and check manually. + failingMachine.wait_for_unit("multi-user.target") + info = failingMachine.get_unit_info("logrotate-checkconf.service") + if info["ActiveState"] != "failed": + raise Exception('logrotate-checkconf.service was not failed') - machine.log(machine.execute("systemd-analyze security logrotate.service | grep -v ✓")[1]) + machine.log(machine.execute("systemd-analyze security logrotate.service | grep -v ✓")[1]) - ''; - } -) + ''; +} diff --git a/nixos/tests/mailhog.nix b/nixos/tests/mailhog.nix index 5192e3471e35..41d4a97abf3a 100644 --- a/nixos/tests/mailhog.nix +++ b/nixos/tests/mailhog.nix @@ -1,30 +1,26 @@ -import ./make-test-python.nix ( - { lib, ... }: - { - name = "mailhog"; - meta.maintainers = with lib.maintainers; [ - jojosch - RTUnreal - ]; +{ lib, ... }: +{ + name = "mailhog"; + meta.maintainers = with lib.maintainers; [ + jojosch + RTUnreal + ]; - nodes.machine = - { pkgs, ... }: - { - services.mailhog.enable = true; - }; + nodes.machine = _: { + services.mailhog.enable = true; + }; - testScript = '' - start_all() + testScript = '' + start_all() - machine.wait_for_unit("mailhog.service") - machine.wait_for_open_port(1025) - machine.wait_for_open_port(8025) - # Test sendmail wrapper (this uses smtp, which tests the connection) - machine.succeed('printf "To: root@example.com\r\n\r\nthis is the body of the email" | sendmail -t -i -f sender@example.com') - res = machine.succeed( - "curl --fail http://localhost:8025/api/v2/messages" - ) - assert all(msg in res for msg in ["this is the body of the email", "sender@example.com", "root@example.com"]) - ''; - } -) + machine.wait_for_unit("mailhog.service") + machine.wait_for_open_port(1025) + machine.wait_for_open_port(8025) + # Test sendmail wrapper (this uses smtp, which tests the connection) + machine.succeed('printf "To: root@example.com\r\n\r\nthis is the body of the email" | sendmail -t -i -f sender@example.com') + res = machine.succeed( + "curl --fail http://localhost:8025/api/v2/messages" + ) + assert all(msg in res for msg in ["this is the body of the email", "sender@example.com", "root@example.com"]) + ''; +} diff --git a/nixos/tests/mailman.nix b/nixos/tests/mailman.nix index d4e09148a9dd..c513c1ed29d3 100644 --- a/nixos/tests/mailman.nix +++ b/nixos/tests/mailman.nix @@ -1,4 +1,5 @@ -import ./make-test-python.nix { +{ ... }: +{ name = "mailman"; nodes.machine = diff --git a/nixos/tests/man.nix b/nixos/tests/man.nix index 510a46a46ec9..5155fcbe055a 100644 --- a/nixos/tests/man.nix +++ b/nixos/tests/man.nix @@ -1,111 +1,109 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - let - manImplementations = [ - "mandoc" - "man-db" +{ pkgs, lib, ... }: +let + manImplementations = [ + "mandoc" + "man-db" + ]; + + machineNames = builtins.map machineSafe manImplementations; + + makeConfig = useImpl: { + # Note: mandoc currently can't index symlinked section directories. + # So if a man section comes from one package exclusively (e. g. + # 1p from man-pages-posix and 2 from man-pages), it isn't searchable. + environment.systemPackages = [ + pkgs.man-pages + pkgs.openssl + pkgs.libunwind ]; - machineNames = builtins.map machineSafe manImplementations; - - makeConfig = useImpl: { - # Note: mandoc currently can't index symlinked section directories. - # So if a man section comes from one package exclusively (e. g. - # 1p from man-pages-posix and 2 from man-pages), it isn't searchable. - environment.systemPackages = [ - pkgs.man-pages - pkgs.openssl - pkgs.libunwind - ]; - - documentation = { - enable = true; - nixos.enable = lib.mkForce true; - dev.enable = true; - man = - { - enable = true; - generateCaches = true; - } - // lib.listToAttrs ( - builtins.map (impl: { - name = impl; - value = { - enable = useImpl == impl; - }; - }) manImplementations - ); - }; + documentation = { + enable = true; + nixos.enable = lib.mkForce true; + dev.enable = true; + man = + { + enable = true; + generateCaches = true; + } + // lib.listToAttrs ( + builtins.map (impl: { + name = impl; + value = { + enable = useImpl == impl; + }; + }) manImplementations + ); }; + }; - machineSafe = builtins.replaceStrings [ "-" ] [ "_" ]; - in - { - name = "man"; - meta.maintainers = [ lib.maintainers.sternenseemann ]; + machineSafe = builtins.replaceStrings [ "-" ] [ "_" ]; +in +{ + name = "man"; + meta.maintainers = [ lib.maintainers.sternenseemann ]; - nodes = lib.listToAttrs ( - builtins.map (i: { - name = machineSafe i; - value = makeConfig i; - }) manImplementations - ); + nodes = lib.listToAttrs ( + builtins.map (i: { + name = machineSafe i; + value = makeConfig i; + }) manImplementations + ); - testScript = - '' - import re - start_all() + testScript = + '' + import re + start_all() - def match_man_k(page, section, haystack): - """ - Check if the man page {page}({section}) occurs in - the output of `man -k` given as haystack. Note: - This is not super reliable, e. g. it can't deal - with man pages that are in multiple sections. - """ + def match_man_k(page, section, haystack): + """ + Check if the man page {page}({section}) occurs in + the output of `man -k` given as haystack. Note: + This is not super reliable, e. g. it can't deal + with man pages that are in multiple sections. + """ - for line in haystack.split("\n"): - # man -k can look like this: - # page(3) - bla - # page (3) - bla - # pagea, pageb (3, 3P) - foo - # pagea, pageb, pagec(3) - bar - pages = line.split("(")[0] - sections = re.search("\\([a-zA-Z1-9, ]+\\)", line) - if sections is None: - continue - else: - sections = sections.group(0)[1:-1] + for line in haystack.split("\n"): + # man -k can look like this: + # page(3) - bla + # page (3) - bla + # pagea, pageb (3, 3P) - foo + # pagea, pageb, pagec(3) - bar + pages = line.split("(")[0] + sections = re.search("\\([a-zA-Z1-9, ]+\\)", line) + if sections is None: + continue + else: + sections = sections.group(0)[1:-1] - if page in pages and f'{section}' in sections: - return True + if page in pages and f'{section}' in sections: + return True - return False + return False - '' - + lib.concatMapStrings (machine: '' - with subtest("Test direct man page lookups in ${machine}"): - # man works - ${machine}.succeed("man man > /dev/null") - # devman works - ${machine}.succeed("man 3 libunwind > /dev/null") - # NixOS configuration man page is installed - ${machine}.succeed("man configuration.nix > /dev/null") + '' + + lib.concatMapStrings (machine: '' + with subtest("Test direct man page lookups in ${machine}"): + # man works + ${machine}.succeed("man man > /dev/null") + # devman works + ${machine}.succeed("man 3 libunwind > /dev/null") + # NixOS configuration man page is installed + ${machine}.succeed("man configuration.nix > /dev/null") - with subtest("Test generateCaches via man -k in ${machine}"): - expected = [ - ("openssl", "ssl", 3), - ("unwind", "libunwind", 3), - ("user", "useradd", 8), - ("user", "userdel", 8), - ("mem", "free", 3), - ("mem", "free", 1), - ] + with subtest("Test generateCaches via man -k in ${machine}"): + expected = [ + ("openssl", "ssl", 3), + ("unwind", "libunwind", 3), + ("user", "useradd", 8), + ("user", "userdel", 8), + ("mem", "free", 3), + ("mem", "free", 1), + ] - for (keyword, page, section) in expected: - matches = ${machine}.succeed(f"man -k {keyword}") - if not match_man_k(page, section, matches): - raise Exception(f"{page}({section}) missing in matches: {matches}") - '') machineNames; - } -) + for (keyword, page, section) in expected: + matches = ${machine}.succeed(f"man -k {keyword}") + if not match_man_k(page, section, matches): + raise Exception(f"{page}({section}) missing in matches: {matches}") + '') machineNames; +} diff --git a/nixos/tests/mattermost/default.nix b/nixos/tests/mattermost/default.nix index bfbbf40b3d8d..4cb9845df880 100644 --- a/nixos/tests/mattermost/default.nix +++ b/nixos/tests/mattermost/default.nix @@ -335,9 +335,23 @@ import ../make-test-python.nix ( if [ "$actualPostAttachmentHash" != "$postAttachmentHash" ]; then echo "Post attachment hash mismatched!" >&2 exit 1 - else + fi + + # Make sure it's on the filesystem in the expected place + fsPath="$(find /var/lib/mattermost/data -name "$(basename -- "$postAttachment")" -print -quit)" + if [ -z "$fsPath" ] || [ ! -f "$fsPath" ]; then + echo "Attachment didn't exist on the filesystem!" >&2 + exit 1 + fi + + # And that the hash matches. + actualFsAttachmentHash="$(sha256sum "$fsPath" | awk '{print $1}')" + if [ "$actualFsAttachmentHash" == "$postAttachmentHash" ]; then echo "Post attachment hash was OK!" >&2 exit 0 + else + echo "Attachment hash mismatched on disk!" >&2 + exit 1 fi else echo "Post didn't exist when it should have!" >&2 @@ -454,11 +468,9 @@ import ../make-test-python.nix ( # Switch to the newer config and make sure the plugins directory is replaced with a directory, # since it could have been a symlink on previous versions. mostlyMutable.systemctl("stop mattermost.service") - mostlyMutable.succeed(f"[ ! -L /var/lib/mattermost/data/plugins ] && rm -rf /var/lib/mattermost/data/plugins && ln -s {mostlyMutablePlugins} /var/lib/mattermost/data/plugins || true") mostlyMutable.succeed('[ -L /var/lib/mattermost/data/plugins ] && [ -d /var/lib/mattermost/data/plugins ]') switch_to_specialisation(mostlyMutable, mostlyMutableToplevel, "upgrade") wait_mattermost_up(mostlyMutable) - mostlyMutable.succeed('[ ! -L /var/lib/mattermost/data/plugins ] && [ -d /var/lib/mattermost/data/plugins ]') # HelpLink should be changed, still, and the post should still exist expect_config(mostlyMutable, esr, '.AboutLink == "https://nixos.org" and .HelpLink == "https://nixos.org/nixos/manual"') diff --git a/nixos/tests/memcached.nix b/nixos/tests/memcached.nix index c3f8734e320c..de2d7ab421b6 100644 --- a/nixos/tests/memcached.nix +++ b/nixos/tests/memcached.nix @@ -1,32 +1,30 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - { - name = "memcached"; +{ pkgs, ... }: +{ + name = "memcached"; - nodes.machine = { - imports = [ ../modules/profiles/minimal.nix ]; - services.memcached.enable = true; - }; + nodes.machine = { + imports = [ ../modules/profiles/minimal.nix ]; + services.memcached.enable = true; + }; - testScript = - let - testScript = - pkgs.writers.writePython3 "test_memcache" - { - libraries = with pkgs.python3Packages; [ memcached ]; - } - '' - import memcache - c = memcache.Client(['localhost:11211']) - c.set('key', 'value') - assert 'value' == c.get('key') - ''; - in - '' - machine.start() - machine.wait_for_unit("memcached.service") - machine.wait_for_open_port(11211) - machine.succeed("${testScript}") - ''; - } -) + testScript = + let + testScript = + pkgs.writers.writePython3 "test_memcache" + { + libraries = [ pkgs.python3Packages.python-memcached ]; + } + '' + import memcache + c = memcache.Client(['localhost:11211']) + c.set('key', 'value') + assert 'value' == c.get('key') + ''; + in + '' + machine.start() + machine.wait_for_unit("memcached.service") + machine.wait_for_open_port(11211) + machine.succeed("${testScript}") + ''; +} diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix index 36215b780c5d..f80c6658c621 100644 --- a/nixos/tests/mpd.nix +++ b/nixos/tests/mpd.nix @@ -1,150 +1,148 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - let - track = pkgs.fetchurl { - # Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in +{ pkgs, lib, ... }: +let + track = pkgs.fetchurl { + # Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in - name = "Blue_Wave_Theory-Skyhawk_Beach.mp3"; - url = "https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3"; - hash = "sha256-91VDWwrcP6Cw4rk72VHvZ8RGfRBrpRE8xo/02dcJhHc="; - meta.license = lib.licenses.cc-by-sa-40; - }; + name = "Blue_Wave_Theory-Skyhawk_Beach.mp3"; + url = "https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3"; + hash = "sha256-91VDWwrcP6Cw4rk72VHvZ8RGfRBrpRE8xo/02dcJhHc="; + meta.license = lib.licenses.cc-by-sa-40; + }; - defaultCfg = rec { - user = "mpd"; - group = "mpd"; - dataDir = "/var/lib/mpd"; - musicDirectory = "${dataDir}/music"; - }; + defaultCfg = rec { + user = "mpd"; + group = "mpd"; + dataDir = "/var/lib/mpd"; + musicDirectory = "${dataDir}/music"; + }; - defaultMpdCfg = { - inherit (defaultCfg) - dataDir - musicDirectory - user - group - ; - enable = true; - }; + defaultMpdCfg = { + inherit (defaultCfg) + dataDir + musicDirectory + user + group + ; + enable = true; + }; - musicService = - { - user, - group, - musicDirectory, - }: - { - description = "Sets up the music file(s) for MPD to use."; - requires = [ "mpd.service" ]; - after = [ "mpd.service" ]; - wantedBy = [ "default.target" ]; - script = '' - cp ${track} ${musicDirectory} - ''; - serviceConfig = { - User = user; - Group = group; - }; + musicService = + { + user, + group, + musicDirectory, + }: + { + description = "Sets up the music file(s) for MPD to use."; + requires = [ "mpd.service" ]; + after = [ "mpd.service" ]; + wantedBy = [ "default.target" ]; + script = '' + cp ${track} ${musicDirectory} + ''; + serviceConfig = { + User = user; + Group = group; }; - - mkServer = - { mpd, musicService }: - { - boot.kernelModules = [ "snd-dummy" ]; - services.mpd = mpd; - systemd.services.musicService = musicService; - }; - in - { - name = "mpd"; - meta = { - maintainers = with lib.maintainers; [ emmanuelrosa ]; }; - nodes = { - client = { ... }: { }; - - serverALSA = - { ... }: - lib.mkMerge [ - (mkServer { - mpd = defaultMpdCfg // { - network.listenAddress = "any"; - extraConfig = '' - audio_output { - type "alsa" - name "ALSA" - mixer_type "null" - } - ''; - }; - musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; }; - }) - { networking.firewall.allowedTCPPorts = [ 6600 ]; } - ]; - - serverPulseAudio = - { ... }: - lib.mkMerge [ - (mkServer { - mpd = defaultMpdCfg // { - extraConfig = '' - audio_output { - type "pulse" - name "The Pulse" - } - ''; - }; - - musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; }; - }) - { - services.pulseaudio = { - enable = true; - systemWide = true; - tcp.enable = true; - tcp.anonymousClients.allowAll = true; - }; - systemd.services.mpd.environment.PULSE_SERVER = "localhost"; - } - ]; + mkServer = + { mpd, musicService }: + { + boot.kernelModules = [ "snd-dummy" ]; + services.mpd = mpd; + systemd.services.musicService = musicService; }; +in +{ + name = "mpd"; + meta = { + maintainers = with lib.maintainers; [ emmanuelrosa ]; + }; - testScript = '' - mpc = "${lib.getExe pkgs.mpc} --wait" + nodes = { + client = { ... }: { }; - # Connects to the given server and attempts to play a tune. - def play_some_music(server): - server.wait_for_unit("mpd.service") - server.succeed(f"{mpc} update") - _, tracks = server.execute(f"{mpc} ls") + serverALSA = + { ... }: + lib.mkMerge [ + (mkServer { + mpd = defaultMpdCfg // { + network.listenAddress = "any"; + extraConfig = '' + audio_output { + type "alsa" + name "ALSA" + mixer_type "null" + } + ''; + }; + musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; }; + }) + { networking.firewall.allowedTCPPorts = [ 6600 ]; } + ]; - for track in tracks.splitlines(): - server.succeed(f"{mpc} add {track}") + serverPulseAudio = + { ... }: + lib.mkMerge [ + (mkServer { + mpd = defaultMpdCfg // { + extraConfig = '' + audio_output { + type "pulse" + name "The Pulse" + } + ''; + }; - _, added_tracks = server.execute(f"{mpc} playlist") + musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; }; + }) + { + services.pulseaudio = { + enable = true; + systemWide = true; + tcp.enable = true; + tcp.anonymousClients.allowAll = true; + }; + systemd.services.mpd.environment.PULSE_SERVER = "localhost"; + } + ]; + }; - # Check we succeeded adding audio tracks to the playlist - assert len(added_tracks.splitlines()) > 0 + testScript = '' + mpc = "${lib.getExe pkgs.mpc} --wait" - server.succeed(f"{mpc} play") + # Connects to the given server and attempts to play a tune. + def play_some_music(server): + server.wait_for_unit("mpd.service") + server.succeed(f"{mpc} update") + _, tracks = server.execute(f"{mpc} ls") - _, output = server.execute(f"{mpc} status") - # Assure audio track is playing - assert "playing" in output + for track in tracks.splitlines(): + server.succeed(f"{mpc} add {track}") - server.succeed(f"{mpc} stop") + _, added_tracks = server.execute(f"{mpc} playlist") + + # Check we succeeded adding audio tracks to the playlist + assert len(added_tracks.splitlines()) > 0 + + server.succeed(f"{mpc} play") + + _, output = server.execute(f"{mpc} status") + # Assure audio track is playing + assert "playing" in output + + server.succeed(f"{mpc} stop") - play_some_music(serverALSA) - play_some_music(serverPulseAudio) + play_some_music(serverALSA) + play_some_music(serverPulseAudio) - client.wait_for_unit("multi-user.target") - client.succeed(f"{mpc} -h serverALSA status") + client.wait_for_unit("multi-user.target") + client.succeed(f"{mpc} -h serverALSA status") - # The PulseAudio-based server is configured not to accept external client connections - # to perform the following test: - client.fail(f"{mpc} -h serverPulseAudio status") - ''; - } -) + # The PulseAudio-based server is configured not to accept external client connections + # to perform the following test: + client.fail(f"{mpc} -h serverPulseAudio status") + ''; +} diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index a5a5e49d3145..dc0bd933f21d 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -139,7 +139,6 @@ let in listToAttrs ( concatMap genTests [ - 29 30 31 ] diff --git a/nixos/tests/nextflow.nix b/nixos/tests/nextflow.nix index b4aad98483b9..62ce7d3ea571 100644 --- a/nixos/tests/nextflow.nix +++ b/nixos/tests/nextflow.nix @@ -1,60 +1,58 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - let - bash = pkgs.dockerTools.pullImage { - imageName = "quay.io/nextflow/bash"; - imageDigest = "sha256:bea0e244b7c5367b2b0de687e7d28f692013aa18970941c7dd184450125163ac"; - sha256 = "161s9f24njjx87qrwq0c9nmnwvyc6iblcxka7hirw78lm7i9x4w5"; - finalImageName = "quay.io/nextflow/bash"; - }; +{ pkgs, ... }: +let + bash = pkgs.dockerTools.pullImage { + imageName = "quay.io/nextflow/bash"; + imageDigest = "sha256:bea0e244b7c5367b2b0de687e7d28f692013aa18970941c7dd184450125163ac"; + sha256 = "161s9f24njjx87qrwq0c9nmnwvyc6iblcxka7hirw78lm7i9x4w5"; + finalImageName = "quay.io/nextflow/bash"; + }; - hello = pkgs.stdenv.mkDerivation { - name = "nextflow-hello"; - src = pkgs.fetchFromGitHub { - owner = "nextflow-io"; - repo = "hello"; - rev = "afff16a9b45c8e8a4f5a3743780ac13a541762f8"; - hash = "sha256-c8FirHc+J5Y439g0BdHxRtXVrOAzIrGEKA0m1mp9b/U="; + hello = pkgs.stdenv.mkDerivation { + name = "nextflow-hello"; + src = pkgs.fetchFromGitHub { + owner = "nextflow-io"; + repo = "hello"; + rev = "afff16a9b45c8e8a4f5a3743780ac13a541762f8"; + hash = "sha256-c8FirHc+J5Y439g0BdHxRtXVrOAzIrGEKA0m1mp9b/U="; + }; + installPhase = '' + cp -r $src $out + ''; + }; + run-nextflow-pipeline = pkgs.writeShellApplication { + name = "run-nextflow-pipeline"; + runtimeInputs = [ pkgs.nextflow ]; + text = '' + export NXF_OFFLINE=true + for b in false true; do + echo "docker.enabled = $b" > nextflow.config + cat nextflow.config + nextflow run -ansi-log false ${hello} + done + ''; + }; +in +{ + name = "nextflow"; + + nodes.machine = + { ... }: + { + environment.systemPackages = [ + run-nextflow-pipeline + pkgs.nextflow + ]; + virtualisation = { + docker.enable = true; }; - installPhase = '' - cp -r $src $out - ''; }; - run-nextflow-pipeline = pkgs.writeShellApplication { - name = "run-nextflow-pipeline"; - runtimeInputs = [ pkgs.nextflow ]; - text = '' - export NXF_OFFLINE=true - for b in false true; do - echo "docker.enabled = $b" > nextflow.config - cat nextflow.config - nextflow run -ansi-log false ${hello} - done - ''; - }; - in - { - name = "nextflow"; - nodes.machine = - { ... }: - { - environment.systemPackages = [ - run-nextflow-pipeline - pkgs.nextflow - ]; - virtualisation = { - docker.enable = true; - }; - }; - - testScript = - { nodes, ... }: - '' - start_all() - machine.wait_for_unit("docker.service") - machine.succeed("docker load < ${bash}") - machine.succeed("run-nextflow-pipeline >&2") - ''; - } -) + testScript = + { nodes, ... }: + '' + start_all() + machine.wait_for_unit("docker.service") + machine.succeed("docker load < ${bash}") + machine.succeed("run-nextflow-pipeline >&2") + ''; +} diff --git a/nixos/tests/nix-ld.nix b/nixos/tests/nix-ld.nix index 03f5c5e89fbf..0b89b99a33b5 100644 --- a/nixos/tests/nix-ld.nix +++ b/nixos/tests/nix-ld.nix @@ -1,14 +1,12 @@ +{ ... }: { - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../.. { inherit system config; }, -}: -let - inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; - shared = + name = "nix-ld"; + + nodes.machine = { config, pkgs, ... }: { programs.nix-ld.enable = true; + environment.systemPackages = [ (pkgs.runCommand "patched-hello" { } '' install -D -m755 ${pkgs.hello}/bin/hello $out/bin/hello @@ -16,25 +14,9 @@ let '') ]; }; -in -{ - nix-ld = makeTest { - name = "nix-ld"; - nodes.machine = shared; - testScript = '' - start_all() - machine.succeed("hello") - ''; - }; - nix-ld-rs = makeTest { - name = "nix-ld-rs"; - nodes.machine = { - imports = [ shared ]; - programs.nix-ld.package = pkgs.nix-ld-rs; - }; - testScript = '' - start_all() - machine.succeed("hello") - ''; - }; + + testScript = '' + start_all() + machine.succeed("hello") + ''; } diff --git a/nixos/tests/obs-studio.nix b/nixos/tests/obs-studio.nix index a1b5bacf0428..7290119a12d7 100644 --- a/nixos/tests/obs-studio.nix +++ b/nixos/tests/obs-studio.nix @@ -1,40 +1,38 @@ -import ./make-test-python.nix ( - { ... }: +{ ... }: - { - name = "obs-studio"; +{ + name = "obs-studio"; - nodes.machine = - { pkgs, ... }: - { - imports = [ - ./common/x11.nix - ./common/user-account.nix + nodes.machine = + { pkgs, ... }: + { + imports = [ + ./common/x11.nix + ./common/user-account.nix + ]; + + programs.obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-vkcapture ]; - - programs.obs-studio = { - enable = true; - plugins = with pkgs.obs-studio-plugins; [ - wlrobs - obs-vkcapture - ]; - enableVirtualCamera = true; - }; + enableVirtualCamera = true; }; + }; - testScript = '' - machine.wait_for_x() - machine.succeed("obs --version") + testScript = '' + machine.wait_for_x() + machine.succeed("obs --version") - # virtual camera tests - machine.succeed("lsmod | grep v4l2loopback") - machine.succeed("ls /dev/video1") - machine.succeed("obs --startvirtualcam >&2 &") - machine.wait_for_window("OBS") - machine.sleep(5) + # virtual camera tests + machine.succeed("lsmod | grep v4l2loopback") + machine.succeed("ls /dev/video1") + machine.succeed("obs --startvirtualcam >&2 &") + machine.wait_for_window("OBS") + machine.sleep(5) - # test plugins - machine.succeed("which obs-vkcapture") - ''; - } -) + # test plugins + machine.succeed("which obs-vkcapture") + ''; +} diff --git a/nixos/tests/paretosecurity.nix b/nixos/tests/paretosecurity.nix index bf9af17e2f5e..051903696119 100644 --- a/nixos/tests/paretosecurity.nix +++ b/nixos/tests/paretosecurity.nix @@ -4,53 +4,45 @@ meta.maintainers = [ lib.maintainers.zupo ]; nodes.terminal = - { - config, - pkgs, - lib, - ... - }: - let - # Create a patched version of the package that points to the local dashboard - # for easier testing - patchedPareto = pkgs.paretosecurity.overrideAttrs (oldAttrs: { - postPatch = '' - substituteInPlace team/report.go \ - --replace-warn 'const reportURL = "https://dash.paretosecurity.com"' \ - 'const reportURL = "http://dashboard"' - ''; - }); - in + { pkgs, ... }: { imports = [ ./common/user-account.nix ]; + networking.firewall.enable = true; services.paretosecurity = { enable = true; - package = patchedPareto; - }; - networking.firewall.enable = true; + # Create a patched version of the package that points to the local dashboard + # for easier testing + package = pkgs.paretosecurity.overrideAttrs (oldAttrs: { + postPatch = + oldAttrs.postPatch or "" + + '' + substituteInPlace team/report.go \ + --replace-warn 'const reportURL = "https://dash.paretosecurity.com"' \ + 'const reportURL = "http://dashboard"' + ''; + }); + }; }; - nodes.dashboard = - { config, pkgs, ... }: - { - networking.firewall.allowedTCPPorts = [ 80 ]; + nodes.dashboard = { + networking.firewall.allowedTCPPorts = [ 80 ]; - services.nginx = { - enable = true; - virtualHosts."dashboard" = { - locations."/api/v1/team/".extraConfig = '' - add_header Content-Type application/json; - return 200 '{"message": "Linked device."}'; - ''; - }; + services.nginx = { + enable = true; + virtualHosts."dashboard" = { + locations."/api/v1/team/".extraConfig = '' + add_header Content-Type application/json; + return 200 '{"message": "Linked device."}'; + ''; }; }; + }; nodes.xfce = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ./common/user-account.nix ]; @@ -76,7 +68,6 @@ environment.systemPackages = [ pkgs.xdotool ]; environment.variables.XAUTHORITY = "/home/alice/.Xauthority"; - }; enableOCR = true; diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix index d59a26f101e8..77c38f9344ef 100644 --- a/nixos/tests/postgresql/anonymizer.nix +++ b/nixos/tests/postgresql/anonymizer.nix @@ -20,7 +20,6 @@ let services.postgresql = { inherit package; enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; extensions = ps: [ ps.anonymizer ]; settings.shared_preload_libraries = [ "anon" ]; }; diff --git a/nixos/tests/postgresql/citus.nix b/nixos/tests/postgresql/citus.nix deleted file mode 100644 index 6739b32d5642..000000000000 --- a/nixos/tests/postgresql/citus.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - pkgs, - makeTest, - genTests, -}: - -let - inherit (pkgs) lib; - - test-sql = pkgs.writeText "postgresql-test" '' - CREATE EXTENSION citus; - - CREATE TABLE examples ( - id bigserial, - shard_key int, - PRIMARY KEY (id, shard_key) - ); - - SELECT create_distributed_table('examples', 'shard_key'); - - INSERT INTO examples (shard_key) SELECT shard % 10 FROM generate_series(1,1000) shard; - ''; - - makeTestFor = - package: - makeTest { - name = "citus-${package.name}"; - meta = with lib.maintainers; { - maintainers = [ typetetris ]; - }; - - nodes.machine = - { ... }: - { - services.postgresql = { - inherit package; - enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; - extensions = - ps: with ps; [ - citus - ]; - settings = { - shared_preload_libraries = "citus"; - }; - }; - }; - - testScript = '' - def check_count(statement, lines): - return 'test $(sudo -u postgres psql postgres -tAc "{}") -eq {}'.format( - statement, lines - ) - - - machine.start() - machine.wait_for_unit("postgresql") - - with subtest("Postgresql with extension citus is available just after unit start"): - machine.succeed( - "sudo -u postgres psql -f ${test-sql}" - ) - - machine.succeed(check_count("SELECT count(*) FROM examples;", 1000)) - - machine.shutdown() - ''; - }; -in -genTests { - inherit makeTestFor; - filter = _: p: !p.pkgs.citus.meta.broken; -} diff --git a/nixos/tests/postgresql/default.nix b/nixos/tests/postgresql/default.nix index 474f54a17201..f7266c2e9db2 100644 --- a/nixos/tests/postgresql/default.nix +++ b/nixos/tests/postgresql/default.nix @@ -36,10 +36,6 @@ in # extensions anonymizer = importWithArgs ./anonymizer.nix; - citus = importWithArgs ./citus.nix; pgjwt = importWithArgs ./pgjwt.nix; - pgvecto-rs = importWithArgs ./pgvecto-rs.nix; - timescaledb = importWithArgs ./timescaledb.nix; - tsja = importWithArgs ./tsja.nix; wal2json = importWithArgs ./wal2json.nix; } diff --git a/nixos/tests/postgresql/pgjwt.nix b/nixos/tests/postgresql/pgjwt.nix index f00d9a939d3d..9a5e12bc3d7d 100644 --- a/nixos/tests/postgresql/pgjwt.nix +++ b/nixos/tests/postgresql/pgjwt.nix @@ -24,7 +24,6 @@ let services.postgresql = { inherit package; enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; extensions = ps: with ps; [ pgjwt diff --git a/nixos/tests/postgresql/pgvecto-rs.nix b/nixos/tests/postgresql/pgvecto-rs.nix deleted file mode 100644 index 506ef921acb7..000000000000 --- a/nixos/tests/postgresql/pgvecto-rs.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - pkgs, - makeTest, - genTests, -}: - -let - inherit (pkgs) lib; - - # Test cases from https://docs.vectorchord.ai/use-case/hybrid-search.html - test-sql = pkgs.writeText "postgresql-test" '' - CREATE EXTENSION vectors; - - CREATE TABLE items ( - id bigserial PRIMARY KEY, - content text NOT NULL, - embedding vectors.vector(3) NOT NULL -- 3 dimensions - ); - - INSERT INTO items (content, embedding) VALUES - ('a fat cat sat on a mat and ate a fat rat', '[1, 2, 3]'), - ('a fat dog sat on a mat and ate a fat rat', '[4, 5, 6]'), - ('a thin cat sat on a mat and ate a thin rat', '[7, 8, 9]'), - ('a thin dog sat on a mat and ate a thin rat', '[10, 11, 12]'); - ''; - - makeTestFor = - package: - makeTest { - name = "pgvecto-rs-${package.name}"; - meta = with lib.maintainers; { - maintainers = [ diogotcorreia ]; - }; - - nodes.machine = - { ... }: - { - services.postgresql = { - inherit package; - enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; - extensions = - ps: with ps; [ - pgvecto-rs - ]; - settings.shared_preload_libraries = "vectors"; - }; - }; - - testScript = - { nodes, ... }: - let - inherit (nodes.machine.services.postgresql.package.pkgs) pgvecto-rs; - in - '' - def check_count(statement, lines): - return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format( - statement, lines - ) - - - machine.start() - machine.wait_for_unit("postgresql") - - with subtest("Postgresql with extension vectors is available just after unit start"): - machine.succeed(check_count("SELECT * FROM pg_available_extensions WHERE name = 'vectors' AND default_version = '${pgvecto-rs.version}';", 1)) - - machine.succeed("sudo -u postgres psql -f ${test-sql}") - - machine.succeed(check_count("SELECT content, embedding FROM items WHERE to_tsvector('english', content) @@ 'cat & rat'::tsquery;", 2)) - - machine.shutdown() - ''; - }; -in -genTests { - inherit makeTestFor; - filter = _: p: !p.pkgs.pgvecto-rs.meta.broken; -} diff --git a/nixos/tests/postgresql/postgresql-jit.nix b/nixos/tests/postgresql/postgresql-jit.nix index e082ff141327..53d35b3e9d64 100644 --- a/nixos/tests/postgresql/postgresql-jit.nix +++ b/nixos/tests/postgresql/postgresql-jit.nix @@ -51,5 +51,4 @@ let in genTests { inherit makeTestFor; - filter = n: _: lib.hasSuffix "_jit" n; } diff --git a/nixos/tests/postgresql/postgresql-tls-client-cert.nix b/nixos/tests/postgresql/postgresql-tls-client-cert.nix index 117b9b0e24a9..6cb86d1ff8fc 100644 --- a/nixos/tests/postgresql/postgresql-tls-client-cert.nix +++ b/nixos/tests/postgresql/postgresql-tls-client-cert.nix @@ -51,7 +51,6 @@ let services.postgresql = { inherit package; enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; enableTCPIP = true; ensureUsers = [ { diff --git a/nixos/tests/postgresql/postgresql-wal-receiver.nix b/nixos/tests/postgresql/postgresql-wal-receiver.nix index c99c3889c027..70f9983700c2 100644 --- a/nixos/tests/postgresql/postgresql-wal-receiver.nix +++ b/nixos/tests/postgresql/postgresql-wal-receiver.nix @@ -32,7 +32,6 @@ let services.postgresql = { inherit package; enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; settings = { max_replication_slots = 10; max_wal_senders = 10; diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix index 7741d14808eb..a88143c6421a 100644 --- a/nixos/tests/postgresql/postgresql.nix +++ b/nixos/tests/postgresql/postgresql.nix @@ -15,41 +15,33 @@ let postgresql-clauses = makeEnsureTestFor package; }; - test-sql = - enablePLv8Test: - pkgs.writeText "postgresql-test" ( - '' - CREATE EXTENSION pgcrypto; -- just to check if lib loading works - CREATE TABLE sth ( - id int - ); - INSERT INTO sth (id) VALUES (1); - INSERT INTO sth (id) VALUES (1); - INSERT INTO sth (id) VALUES (1); - INSERT INTO sth (id) VALUES (1); - INSERT INTO sth (id) VALUES (1); - CREATE TABLE xmltest ( doc xml ); - INSERT INTO xmltest (doc) VALUES ('ok'); -- check if libxml2 enabled - '' - + lib.optionalString enablePLv8Test '' - -- check if hardening gets relaxed - CREATE EXTENSION plv8; - -- try to trigger the V8 JIT, which requires MemoryDenyWriteExecute - DO $$ - let xs = []; - for (let i = 0, n = 400000; i < n; i++) { - xs.push(Math.round(Math.random() * n)) - } - console.log(xs.reduce((acc, x) => acc + x, 0)); - $$ LANGUAGE plv8; - '' + test-sql = pkgs.writeText "postgresql-test" ('' + CREATE EXTENSION pgcrypto; -- just to check if lib loading works + CREATE TABLE sth ( + id int ); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + CREATE TABLE xmltest ( doc xml ); + INSERT INTO xmltest (doc) VALUES ('ok'); -- check if libxml2 enabled + + -- check if hardening gets relaxed + CREATE EXTENSION plv8; + -- try to trigger the V8 JIT, which requires MemoryDenyWriteExecute + DO $$ + let xs = []; + for (let i = 0, n = 400000; i < n; i++) { + xs.push(Math.round(Math.random() * n)) + } + console.log(xs.reduce((acc, x) => acc + x, 0)); + $$ LANGUAGE plv8; + ''); makeTestForWithBackupAll = package: backupAll: - let - enablePLv8Check = !package.pkgs.plv8.meta.broken; - in makeTest { name = "postgresql${lib.optionalString backupAll "-backup-all"}-${package.name}"; meta = with lib.maintainers; { @@ -62,12 +54,9 @@ let services.postgresql = { inherit package; enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; - # plv8 doesn't support postgresql with JIT, so we only run the test - # for the non-jit variant. # TODO(@Ma27) split this off into its own VM test and move a few other # extension tests to use postgresqlTestExtension. - extensions = lib.mkIf enablePLv8Check (ps: with ps; [ plv8 ]); + extensions = ps: with ps; [ plv8 ]; }; services.postgresqlBackup = { @@ -94,7 +83,7 @@ let with subtest("Postgresql is available just after unit start"): machine.succeed( - "cat ${test-sql enablePLv8Check} | sudo -u postgres psql" + "cat ${test-sql} | sudo -u postgres psql" ) with subtest("Postgresql survives restart (bug #1735)"): @@ -184,7 +173,6 @@ let services.postgresql = { inherit package; enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; ensureUsers = [ { name = "all-clauses"; diff --git a/nixos/tests/postgresql/timescaledb.nix b/nixos/tests/postgresql/timescaledb.nix deleted file mode 100644 index 7ad8b0fcc972..000000000000 --- a/nixos/tests/postgresql/timescaledb.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ - pkgs, - makeTest, - genTests, -}: - -let - inherit (pkgs) lib; - - test-sql = pkgs.writeText "postgresql-test" '' - CREATE EXTENSION timescaledb; - CREATE EXTENSION timescaledb_toolkit; - - CREATE TABLE sth ( - time TIMESTAMPTZ NOT NULL, - value DOUBLE PRECISION - ); - - SELECT create_hypertable('sth', 'time'); - - INSERT INTO sth (time, value) VALUES - ('2003-04-12 04:05:06 America/New_York', 1.0), - ('2003-04-12 04:05:07 America/New_York', 2.0), - ('2003-04-12 04:05:08 America/New_York', 3.0), - ('2003-04-12 04:05:09 America/New_York', 4.0), - ('2003-04-12 04:05:10 America/New_York', 5.0) - ; - - WITH t AS ( - SELECT - time_bucket('1 day'::interval, time) AS dt, - stats_agg(value) AS stats - FROM sth - GROUP BY time_bucket('1 day'::interval, time) - ) - SELECT - average(stats) - FROM t; - - SELECT * FROM sth; - ''; - - makeTestFor = - package: - makeTest { - name = "timescaledb-${package.name}"; - meta = with lib.maintainers; { - maintainers = [ typetetris ]; - }; - - nodes.machine = - { ... }: - { - services.postgresql = { - inherit package; - enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; - extensions = - ps: with ps; [ - timescaledb - timescaledb_toolkit - ]; - settings = { - shared_preload_libraries = "timescaledb, timescaledb_toolkit"; - }; - }; - }; - - testScript = '' - def check_count(statement, lines): - return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format( - statement, lines - ) - - - machine.start() - machine.wait_for_unit("postgresql") - - with subtest("Postgresql with extensions timescaledb and timescaledb_toolkit is available just after unit start"): - machine.succeed( - "sudo -u postgres psql -f ${test-sql}" - ) - - machine.fail(check_count("SELECT * FROM sth;", 3)) - machine.succeed(check_count("SELECT * FROM sth;", 5)) - machine.fail(check_count("SELECT * FROM sth;", 4)) - - machine.shutdown() - ''; - }; -in -# Not run by default, because this requires allowUnfree. -# To run these tests: -# NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.postgresql.timescaledb -lib.dontRecurseIntoAttrs (genTests { - inherit makeTestFor; - filter = _: p: !p.pkgs.timescaledb.meta.broken; -}) diff --git a/nixos/tests/postgresql/tsja.nix b/nixos/tests/postgresql/tsja.nix deleted file mode 100644 index 4cc5bd124139..000000000000 --- a/nixos/tests/postgresql/tsja.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - pkgs, - makeTest, - genTests, -}: - -let - inherit (pkgs) lib; - - makeTestFor = - package: - makeTest { - name = "tsja-${package.name}"; - meta = { - maintainers = with lib.maintainers; [ chayleaf ]; - }; - - nodes.master = - { ... }: - { - services.postgresql = { - inherit package; - enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; - extensions = - ps: with ps; [ - tsja - ]; - }; - }; - - testScript = '' - start_all() - master.wait_for_unit("postgresql") - master.succeed("sudo -u postgres psql -f /run/current-system/sw/share/postgresql/extension/libtsja_dbinit.sql") - # make sure "日本語" is parsed as a separate lexeme - master.succeed(""" - sudo -u postgres \\ - psql -c "SELECT * FROM ts_debug('japanese', 'PostgreSQLで日本語のテキスト検索ができます。')" \\ - | grep "{日本語}" - """) - ''; - }; -in -genTests { - inherit makeTestFor; - filter = _: p: !p.pkgs.tsja.meta.broken; -} diff --git a/nixos/tests/postgresql/wal2json.nix b/nixos/tests/postgresql/wal2json.nix index abfe60673753..1252264353f8 100644 --- a/nixos/tests/postgresql/wal2json.nix +++ b/nixos/tests/postgresql/wal2json.nix @@ -17,7 +17,6 @@ let services.postgresql = { inherit package; enable = true; - enableJIT = lib.hasInfix "-jit-" package.name; extensions = with package.pkgs; [ wal2json ]; settings = { wal_level = "logical"; diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 5fee5c6a4989..890bc207a326 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -1,141 +1,138 @@ # Test printing via CUPS. +{ + pkgs, + socket ? true, # whether to use socket activation + listenTcp ? true, # whether to open port 631 on client + ... +}: -import ./make-test-python.nix ( - { - pkgs, - socket ? true, # whether to use socket activation - listenTcp ? true, # whether to open port 631 on client - ... - }: +let + inherit (pkgs) lib; +in - let - inherit (pkgs) lib; - in +{ + name = "printing"; + meta = with lib.maintainers; { + maintainers = [ + domenkozar + matthewbauer + ]; + }; - { - name = "printing"; - meta = with lib.maintainers; { - maintainers = [ - domenkozar - matthewbauer + nodes.server = + { ... }: + { + services.printing = { + enable = true; + stateless = true; + startWhenNeeded = socket; + listenAddresses = [ "*:631" ]; + defaultShared = true; + openFirewall = true; + extraConf = '' + + Order allow,deny + Allow from all + + ''; + }; + # Add a HP Deskjet printer connected via USB to the server. + hardware.printers.ensurePrinters = [ + { + name = "DeskjetLocal"; + deviceUri = "usb://foobar/printers/foobar"; + model = "drv:///sample.drv/deskjet.ppd"; + } ]; }; - nodes.server = - { ... }: - { - services.printing = { - enable = true; - stateless = true; - startWhenNeeded = socket; - listenAddresses = [ "*:631" ]; - defaultShared = true; - openFirewall = true; - extraConf = '' - - Order allow,deny - Allow from all - - ''; - }; - # Add a HP Deskjet printer connected via USB to the server. - hardware.printers.ensurePrinters = [ - { - name = "DeskjetLocal"; - deviceUri = "usb://foobar/printers/foobar"; - model = "drv:///sample.drv/deskjet.ppd"; - } - ]; - }; + nodes.client = + { lib, ... }: + { + services.printing.enable = true; + services.printing.startWhenNeeded = socket; + services.printing.listenAddresses = lib.mkIf (!listenTcp) [ ]; + # Add printer to the client as well, via IPP. + hardware.printers.ensurePrinters = [ + { + name = "DeskjetRemote"; + deviceUri = "ipp://server/printers/DeskjetLocal"; + model = "drv:///sample.drv/deskjet.ppd"; + } + ]; + hardware.printers.ensureDefaultPrinter = "DeskjetRemote"; + }; - nodes.client = - { lib, ... }: - { - services.printing.enable = true; - services.printing.startWhenNeeded = socket; - services.printing.listenAddresses = lib.mkIf (!listenTcp) [ ]; - # Add printer to the client as well, via IPP. - hardware.printers.ensurePrinters = [ - { - name = "DeskjetRemote"; - deviceUri = "ipp://server/printers/DeskjetLocal"; - model = "drv:///sample.drv/deskjet.ppd"; - } - ]; - hardware.printers.ensureDefaultPrinter = "DeskjetRemote"; - }; + testScript = '' + import os + import re - testScript = '' - import os - import re + start_all() - start_all() + with subtest("Make sure that cups is up on both sides and printers are set up"): + server.wait_for_unit("ensure-printers.service") + client.wait_for_unit("ensure-printers.service") - with subtest("Make sure that cups is up on both sides and printers are set up"): - server.wait_for_unit("ensure-printers.service") - client.wait_for_unit("ensure-printers.service") + assert "scheduler is running" in client.succeed("lpstat -r") - assert "scheduler is running" in client.succeed("lpstat -r") + with subtest("UNIX socket is used for connections"): + assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H") - with subtest("UNIX socket is used for connections"): - assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H") + with subtest("HTTP server is available too"): + ${lib.optionalString listenTcp ''client.succeed("curl --fail http://localhost:631/")''} + client.succeed(f"curl --fail http://{server.name}:631/") + server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/") - with subtest("HTTP server is available too"): - ${lib.optionalString listenTcp ''client.succeed("curl --fail http://localhost:631/")''} - client.succeed(f"curl --fail http://{server.name}:631/") - server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/") + with subtest("LP status checks"): + assert "DeskjetRemote accepting requests" in client.succeed("lpstat -a") + assert "DeskjetLocal accepting requests" in client.succeed( + f"lpstat -h {server.name}:631 -a" + ) + client.succeed("cupsdisable DeskjetRemote") + out = client.succeed("lpq") + print(out) + assert re.search( + "DeskjetRemote is not ready.*no entries", + client.succeed("lpq"), + flags=re.DOTALL, + ) + client.succeed("cupsenable DeskjetRemote") + assert re.match( + "DeskjetRemote is ready.*no entries", client.succeed("lpq"), flags=re.DOTALL + ) - with subtest("LP status checks"): - assert "DeskjetRemote accepting requests" in client.succeed("lpstat -a") - assert "DeskjetLocal accepting requests" in client.succeed( - f"lpstat -h {server.name}:631 -a" - ) - client.succeed("cupsdisable DeskjetRemote") - out = client.succeed("lpq") - print(out) - assert re.search( - "DeskjetRemote is not ready.*no entries", - client.succeed("lpq"), - flags=re.DOTALL, - ) - client.succeed("cupsenable DeskjetRemote") - assert re.match( - "DeskjetRemote is ready.*no entries", client.succeed("lpq"), flags=re.DOTALL - ) + # Test printing various file types. + for file in [ + "${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf", + "${pkgs.groff.doc}/share/doc/*/meref.ps", + "${pkgs.cups.out}/share/doc/cups/images/cups.png", + "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt", + ]: + file_name = os.path.basename(file) + with subtest(f"print {file_name}"): + # Print the file on the client. + print(client.succeed("lpq")) + client.succeed(f"lp {file}") + client.wait_until_succeeds( + f"lpq; lpq | grep -q -E 'active.*root.*{file_name}'" + ) - # Test printing various file types. - for file in [ - "${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf", - "${pkgs.groff.doc}/share/doc/*/meref.ps", - "${pkgs.cups.out}/share/doc/cups/images/cups.png", - "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt", - ]: - file_name = os.path.basename(file) - with subtest(f"print {file_name}"): - # Print the file on the client. - print(client.succeed("lpq")) - client.succeed(f"lp {file}") - client.wait_until_succeeds( - f"lpq; lpq | grep -q -E 'active.*root.*{file_name}'" - ) + # Ensure that a raw PCL file appeared in the server's queue + # (showing that the right filters have been applied). Of + # course, since there is no actual USB printer attached, the + # file will stay in the queue forever. + server.wait_for_file("/var/spool/cups/d*-001") + server.wait_until_succeeds(f"lpq -a | grep -q -E '{file_name}'") - # Ensure that a raw PCL file appeared in the server's queue - # (showing that the right filters have been applied). Of - # course, since there is no actual USB printer attached, the - # file will stay in the queue forever. - server.wait_for_file("/var/spool/cups/d*-001") - server.wait_until_succeeds(f"lpq -a | grep -q -E '{file_name}'") + # Delete the job on the client. It should disappear on the + # server as well. + client.succeed("lprm") + client.wait_until_succeeds("lpq -a | grep -q -E 'no entries'") - # Delete the job on the client. It should disappear on the - # server as well. - client.succeed("lprm") - client.wait_until_succeeds("lpq -a | grep -q -E 'no entries'") + retry(lambda _: "no entries" in server.succeed("lpq -a")) - retry(lambda _: "no entries" in server.succeed("lpq -a")) - - # The queue is empty already, so this should be safe. - # Otherwise, pairs of "c*"-"d*-001" files might persist. - server.execute("rm /var/spool/cups/*") - ''; - } -) + # The queue is empty already, so this should be safe. + # Otherwise, pairs of "c*"-"d*-001" files might persist. + server.execute("rm /var/spool/cups/*") + ''; +} diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index 52513b424bb4..cb6dba27a64c 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -56,7 +56,7 @@ import ./make-test-python.nix ( # The password is the plaintext that was encrypted with rabbitmqctl encode above. machine.wait_until_succeeds( - '${pkgs.rabbitmq-java-client}/bin/PerfTest --time 10 --uri amqp://alice:dJT8isYu6t0Xb6u56rPglSj1vK51SlNVlXfwsRxw@localhost' + 'echo Hello World | ${pkgs.lib.getExe pkgs.amqpcat} --producer --uri=amqp://alice:dJT8isYu6t0Xb6u56rPglSj1vK51SlNVlXfwsRxw@localhost --queue test' ) ''; } diff --git a/nixos/tests/rush.nix b/nixos/tests/rush.nix new file mode 100644 index 000000000000..0fcd87d15f58 --- /dev/null +++ b/nixos/tests/rush.nix @@ -0,0 +1,88 @@ +{ pkgs, ... }: +let + inherit (import ./ssh-keys.nix pkgs) snakeOilEd25519PrivateKey snakeOilEd25519PublicKey; + username = "nix-remote-builder"; +in +{ + name = "rush"; + meta = { inherit (pkgs.rush.meta) maintainers platforms; }; + + nodes = { + client = + { ... }: + { + nix.settings.extra-experimental-features = [ "nix-command" ]; + }; + + server = + { config, ... }: + { + nix.settings.trusted-users = [ "${username}" ]; + + programs.rush = { + enable = true; + global = "debug 1"; + + rules = { + daemon = '' + match $# == 2 + match $0 == "nix-daemon" + match $1 == "--stdio" + match $user == "${username}" + chdir "${config.nix.package}/bin" + ''; + + whoami = '' + match $# == 1 + match $0 == "whoami" + match $user == "${username}" + chdir "${dirOf config.environment.usrbinenv}" + ''; + }; + }; + + services.openssh = { + enable = true; + + extraConfig = '' + Match User ${username} + AllowAgentForwarding no + AllowTcpForwarding no + PermitTTY no + PermitTunnel no + X11Forwarding no + Match All + ''; + }; + + users = { + groups."${username}" = { }; + + users."${username}" = { + inherit (config.programs.rush) shell; + group = "${username}"; + isSystemUser = true; + openssh.authorizedKeys.keys = [ snakeOilEd25519PublicKey ]; + }; + }; + }; + }; + + testScript = '' + start_all() + + client.succeed("mkdir -m 700 /root/.ssh") + client.succeed("cat '${snakeOilEd25519PrivateKey}' | tee /root/.ssh/id_ed25519") + client.succeed("chmod 600 /root/.ssh/id_ed25519") + + server.wait_for_unit("sshd") + + client.succeed("ssh-keyscan -H server | tee -a /root/.ssh/known_hosts") + + client.succeed("ssh ${username}@server -- whoami") + client.succeed("nix store info --store 'ssh-ng://${username}@server'") + + client.fail("ssh ${username}@server -- date") + client.fail("nix store info --store 'ssh://${username}@server'") + ''; +} diff --git a/nixos/tests/samba.nix b/nixos/tests/samba.nix index 96f63730b613..b9f2f1384559 100644 --- a/nixos/tests/samba.nix +++ b/nixos/tests/samba.nix @@ -1,50 +1,48 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "samba"; +{ lib, ... }: +{ + name = "samba"; - meta.maintainers = [ lib.maintainers.anthonyroussel ]; + meta.maintainers = [ lib.maintainers.anthonyroussel ]; - nodes = { - client = - { ... }: - { - virtualisation.fileSystems = { - "/public" = { - fsType = "cifs"; - device = "//server/public"; - options = [ "guest" ]; + nodes = { + client = + { ... }: + { + virtualisation.fileSystems = { + "/public" = { + fsType = "cifs"; + device = "//server/public"; + options = [ "guest" ]; + }; + }; + }; + + server = + { ... }: + { + services.samba = { + enable = true; + openFirewall = true; + settings = { + "public" = { + "path" = "/public"; + "read only" = true; + "browseable" = "yes"; + "guest ok" = "yes"; + "comment" = "Public samba share."; }; }; }; + }; + }; - server = - { ... }: - { - services.samba = { - enable = true; - openFirewall = true; - settings = { - "public" = { - "path" = "/public"; - "read only" = true; - "browseable" = "yes"; - "guest ok" = "yes"; - "comment" = "Public samba share."; - }; - }; - }; - }; - }; + testScript = '' + server.start() + server.wait_for_unit("samba.target") + server.succeed("mkdir -p /public; echo bar > /public/foo") - testScript = '' - server.start() - server.wait_for_unit("samba.target") - server.succeed("mkdir -p /public; echo bar > /public/foo") - - client.start() - client.wait_for_unit("remote-fs.target") - client.succeed("[[ $(cat /public/foo) = bar ]]") - ''; - } -) + client.start() + client.wait_for_unit("remote-fs.target") + client.succeed("[[ $(cat /public/foo) = bar ]]") + ''; +} diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix index 22b21f4bcecf..eb9f7b4f5b58 100644 --- a/nixos/tests/signal-desktop.nix +++ b/nixos/tests/signal-desktop.nix @@ -1,82 +1,79 @@ -import ./make-test-python.nix ( - { pkgs, ... }: +{ pkgs, ... }: +let + sqlcipher-signal = pkgs.writeShellScriptBin "sqlcipher" '' + set -eu - let - sqlcipher-signal = pkgs.writeShellScriptBin "sqlcipher" '' - set -eu + readonly CFG=~/.config/Signal/config.json + readonly KEY="$(${pkgs.jq}/bin/jq --raw-output '.key' $CFG)" + readonly DB="$1" + readonly SQL="SELECT * FROM sqlite_master where type='table'" + ${pkgs.sqlcipher}/bin/sqlcipher "$DB" "PRAGMA key = \"x'$KEY'\"; $SQL" + ''; +in +{ + name = "signal-desktop"; + meta = with pkgs.lib.maintainers; { + maintainers = [ + flokli + primeos + ]; + }; - readonly CFG=~/.config/Signal/config.json - readonly KEY="$(${pkgs.jq}/bin/jq --raw-output '.key' $CFG)" - readonly DB="$1" - readonly SQL="SELECT * FROM sqlite_master where type='table'" - ${pkgs.sqlcipher}/bin/sqlcipher "$DB" "PRAGMA key = \"x'$KEY'\"; $SQL" - ''; - in - { - name = "signal-desktop"; - meta = with pkgs.lib.maintainers; { - maintainers = [ - flokli - primeos + nodes.machine = + { ... }: + + { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + + services.xserver.enable = true; + test-support.displayManager.auto.user = "alice"; + environment.systemPackages = with pkgs; [ + signal-desktop + file + sqlite + sqlcipher-signal ]; }; - nodes.machine = - { ... }: + enableOCR = true; - { - imports = [ - ./common/user-account.nix - ./common/x11.nix - ]; + testScript = + { nodes, ... }: + let + user = nodes.machine.config.users.users.alice; + in + '' + start_all() + machine.wait_for_x() - services.xserver.enable = true; - test-support.displayManager.auto.user = "alice"; - environment.systemPackages = with pkgs; [ - signal-desktop - file - sqlite - sqlcipher-signal - ]; - }; + # start signal desktop + machine.execute("su - alice -c signal-desktop >&2 &") - enableOCR = true; + # Wait for the Signal window to appear. Since usually the tests + # are run sandboxed and therefore with no internet, we can not wait + # for the message "Link your phone ...". Nor should we wait for + # the "Failed to connect to server" message, because when manually + # running this test it will be not sandboxed. + machine.wait_for_text("Signal") + machine.wait_for_text("File Edit View Window Help") + machine.screenshot("signal_desktop") - testScript = - { nodes, ... }: - let - user = nodes.machine.config.users.users.alice; - in - '' - start_all() - machine.wait_for_x() - - # start signal desktop - machine.execute("su - alice -c signal-desktop >&2 &") - - # Wait for the Signal window to appear. Since usually the tests - # are run sandboxed and therefore with no internet, we can not wait - # for the message "Link your phone ...". Nor should we wait for - # the "Failed to connect to server" message, because when manually - # running this test it will be not sandboxed. - machine.wait_for_text("Signal") - machine.wait_for_text("File Edit View Window Help") - machine.screenshot("signal_desktop") - - # Test if the database is encrypted to prevent these issues: - # - https://github.com/NixOS/nixpkgs/issues/108772 - # - https://github.com/NixOS/nixpkgs/pull/117555 - print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'")) - machine.fail( - "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database" - ) - # Only SQLCipher should be able to read the encrypted DB: - machine.fail( - "su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables'" - ) - print(machine.succeed( - "su - alice -c 'sqlcipher ~/.config/Signal/sql/db.sqlite'" - )) - ''; - } -) + # Test if the database is encrypted to prevent these issues: + # - https://github.com/NixOS/nixpkgs/issues/108772 + # - https://github.com/NixOS/nixpkgs/pull/117555 + print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'")) + machine.fail( + "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database" + ) + # Only SQLCipher should be able to read the encrypted DB: + machine.fail( + "su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables'" + ) + print(machine.succeed( + "su - alice -c 'sqlcipher ~/.config/Signal/sql/db.sqlite'" + )) + ''; +} diff --git a/nixos/tests/web-apps/writefreely.nix b/nixos/tests/web-apps/writefreely.nix index 3f56e1df8ead..fe9889e75332 100644 --- a/nixos/tests/web-apps/writefreely.nix +++ b/nixos/tests/web-apps/writefreely.nix @@ -1,16 +1,12 @@ { - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../../.. { inherit system config; }, + runTest, + ... }: -with import ../../lib/testing-python.nix { inherit system pkgs; }; -with pkgs.lib; - let writefreelyTest = { name, type }: - makeTest { + runTest { name = "writefreely-${name}"; nodes.machine = diff --git a/nixos/tests/web-servers/static-web-server.nix b/nixos/tests/web-servers/static-web-server.nix index 1c88e70a0957..0727b5cba021 100644 --- a/nixos/tests/web-servers/static-web-server.nix +++ b/nixos/tests/web-servers/static-web-server.nix @@ -1,41 +1,39 @@ -import ../make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "static-web-server"; - meta = { - maintainers = with lib.maintainers; [ mac-chaffee ]; - }; +{ pkgs, lib, ... }: +{ + name = "static-web-server"; + meta = { + maintainers = with lib.maintainers; [ mac-chaffee ]; + }; - nodes.machine = - { pkgs, ... }: - { - services.static-web-server = { - enable = true; - listen = "[::]:8080"; - root = toString ( - pkgs.writeTextDir "nixos-test.html" '' -

Hello NixOS!

- '' - ); - configuration = { - general = { - directory-listing = true; - }; + nodes.machine = + { pkgs, ... }: + { + services.static-web-server = { + enable = true; + listen = "[::]:8080"; + root = toString ( + pkgs.writeTextDir "nixos-test.html" '' +

Hello NixOS!

+ '' + ); + configuration = { + general = { + directory-listing = true; }; }; }; + }; - testScript = '' - machine.start() - machine.wait_for_unit("static-web-server.socket") - machine.wait_for_open_port(8080) - # We don't use wait_until_succeeds() because we're testing socket - # activation which better work on the first request - response = machine.succeed("curl -fsS localhost:8080") - assert "nixos-test.html" in response, "The directory listing page did not include a link to our nixos-test.html file" - response = machine.succeed("curl -fsS localhost:8080/nixos-test.html") - assert "Hello NixOS!" in response - machine.wait_for_unit("static-web-server.service") - ''; - } -) + testScript = '' + machine.start() + machine.wait_for_unit("static-web-server.socket") + machine.wait_for_open_port(8080) + # We don't use wait_until_succeeds() because we're testing socket + # activation which better work on the first request + response = machine.succeed("curl -fsS localhost:8080") + assert "nixos-test.html" in response, "The directory listing page did not include a link to our nixos-test.html file" + response = machine.succeed("curl -fsS localhost:8080/nixos-test.html") + assert "Hello NixOS!" in response + machine.wait_for_unit("static-web-server.service") + ''; +} diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 502ddbf06b77..38f8f1cac98c 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -16,6 +16,7 @@ libjack2, libjpeg, libnghttp2, + libudev-zero, libxkbcommon, makeWrapper, pango, @@ -30,12 +31,12 @@ stdenv.mkDerivation rec { pname = "bitwig-studio-unwrapped"; - version = "5.3.2"; + version = "5.3.5"; src = fetchurl { name = "bitwig-studio-${version}.deb"; url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/"; - hash = "sha256-QKt/myqmoVVffNwkfGcAoknAiZu3D+s7d2lJgtWpvk4="; + hash = "sha256-dfEWOQTZVMUb6v+u2wQlFgTXupokFTjWgKKA6W/Rrzc="; }; nativeBuildInputs = [ @@ -66,6 +67,7 @@ stdenv.mkDerivation rec { xorg.libX11 xorg.libXtst libxkbcommon + libudev-zero pango pipewire (lib.getLib stdenv.cc.cc) diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 25898ef8bd27..7360ec62239c 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -2,7 +2,6 @@ fetchurl, lib, stdenv, - IOKit ? null, }: stdenv.mkDerivation rec { @@ -19,8 +18,6 @@ stdenv.mkDerivation rec { "INSTALL=install" ]; - buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin IOKit; - meta = with lib; { homepage = "http://linukz.org/cd-discid.shtml"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index 54fe24415840..aa640b573ddd 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -9,13 +9,6 @@ which, DarwinTools, xcbuild, - AppKit, - Carbon, - CoreAudio, - CoreMIDI, - CoreServices, - Kernel, - MultitouchSupport, }: stdenv.mkDerivation rec { @@ -38,18 +31,7 @@ stdenv.mkDerivation rec { xcbuild ]; - buildInputs = - [ libsndfile ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Carbon - CoreAudio - CoreMIDI - CoreServices - Kernel - MultitouchSupport - ]; + buildInputs = [ libsndfile ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib; patches = [ ./darwin-limits.patch ]; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index d4fef58281d0..167330ef6c6d 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -6,9 +6,6 @@ ncurses, pkg-config, libiconv, - CoreAudio, - AudioUnit, - VideoToolbox, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib ? null, @@ -152,9 +149,6 @@ stdenv.mkDerivation rec { [ ncurses ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - CoreAudio - AudioUnit - VideoToolbox ] ++ lib.flatten (lib.concatMap (a: a.deps) opts); diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 430bd1cb9fed..f4ae7383d4e6 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -9,10 +9,6 @@ bison, boost, gettext, - Accelerate, - AudioUnit, - CoreAudio, - CoreMIDI, portaudio, alsa-lib ? null, libpulseaudio ? null, @@ -61,10 +57,6 @@ stdenv.mkDerivation { boost ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - AudioUnit - CoreAudio - CoreMIDI portaudio ] ++ lib.optionals stdenv.hostPlatform.isLinux ( diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index 14835a9e0b60..19b5dd800b5b 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -17,9 +17,6 @@ pcaudiolib, sonicSupport ? true, sonic, - CoreAudio, - AudioToolbox, - AudioUnit, alsa-plugins, makeWrapper, }: @@ -63,12 +60,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional mbrolaSupport mbrola ++ lib.optional pcaudiolibSupport pcaudiolib - ++ lib.optional sonicSupport sonic - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreAudio - AudioToolbox - AudioUnit - ]; + ++ lib.optional sonicSupport sonic; # touch ChangeLog to avoid below error on darwin: # Makefile.am: error: required file './ChangeLog.md' not found diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 90e3d80ad14d..17058192ecdb 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -7,10 +7,6 @@ alsa-lib, SDL2, libiconv, - CoreAudio, - CoreMIDI, - CoreServices, - Cocoa, }: stdenv.mkDerivation rec { @@ -30,10 +26,6 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - CoreAudio - CoreMIDI - CoreServices - Cocoa ]; passthru.tests = { diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index e31dbbed38b2..0c6e804aeceb 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -16,7 +16,6 @@ libicns, yaml-cpp, makeWrapper, - Cocoa, includeDemo ? true, }: @@ -54,7 +53,6 @@ stdenv.mkDerivation rec { alsa-lib udev ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optional jackaudioSupport libjack2; cmakeFlags = diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index f98bdae72975..1849a8c428a2 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-RtVKlw2ca8An4FodeD0RN95z9yHDHBgAxsEwLAmW7co="; name = "fix-build-with-new-pipewire.patch"; }) + ./fix-build-on-qt6_9.diff ]; buildInputs = diff --git a/pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff b/pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff new file mode 100644 index 000000000000..9706aa8eb614 --- /dev/null +++ b/pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff @@ -0,0 +1,22 @@ +diff --git a/src/subprojects/AutoEqIntegration/AeqPackageManager.cpp b/src/subprojects/AutoEqIntegration/AeqPackageManager.cpp +index 01940a1..2ec9c5b 100644 +--- a/src/subprojects/AutoEqIntegration/AeqPackageManager.cpp ++++ b/src/subprojects/AutoEqIntegration/AeqPackageManager.cpp +@@ -133,7 +133,7 @@ QtPromise::QPromise AeqPackageManager::getLocalVersion() + return QtPromise::QPromise{[&]( + const QtPromise::QPromiseResolve& resolve, + const QtPromise::QPromiseReject& reject) { +- QFile versionJson = (databaseDirectory() + "/version.json"); ++ QFile versionJson(databaseDirectory() + "/version.json"); + if(!versionJson.exists()) + { + reject(); +@@ -159,7 +159,7 @@ QtPromise::QPromise> AeqPackageManager::getLocalIndex() + return QtPromise::QPromise>{[&]( + const QtPromise::QPromiseResolve>& resolve, + const QtPromise::QPromiseReject>& reject) { +- QFile indexJson = (databaseDirectory() + "/index.json"); ++ QFile indexJson(databaseDirectory() + "/index.json"); + if(!indexJson.exists()) + { + reject(); diff --git a/pkgs/applications/audio/listenbrainz-mpd/default.nix b/pkgs/applications/audio/listenbrainz-mpd/default.nix index f7c33347e13e..63ac2e3b1040 100644 --- a/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ b/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -7,9 +7,6 @@ openssl, libiconv, sqlite, - Security, - SystemConfiguration, - CoreFoundation, installShellFiles, asciidoctor, }: @@ -41,9 +38,6 @@ rustPlatform.buildRustPackage rec { if stdenv.hostPlatform.isDarwin then [ libiconv - Security - SystemConfiguration - CoreFoundation ] else [ diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index ef6d8402ce49..12e6940ccc87 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -5,7 +5,6 @@ SDL2, python3, jack2, - Foundation, alsa-lib, pkg-config, }: @@ -31,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform alsa-lib) alsa-lib - ++ lib.optional stdenv.hostPlatform.isDarwin Foundation ++ lib.optional stdenv.hostPlatform.isLinux jack2; preBuild = '' diff --git a/pkgs/applications/audio/master_me/default.nix b/pkgs/applications/audio/master_me/default.nix index 3c766b701cf9..3f62b0f62d03 100644 --- a/pkgs/applications/audio/master_me/default.nix +++ b/pkgs/applications/audio/master_me/default.nix @@ -8,7 +8,6 @@ libXrandr, pkg-config, python3, - Cocoa, }: stdenv.mkDerivation rec { pname = "master_me"; @@ -28,7 +27,6 @@ stdenv.mkDerivation rec { libGL python3 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXext diff --git a/pkgs/applications/audio/midivisualizer/default.nix b/pkgs/applications/audio/midivisualizer/default.nix index eb409930a3b2..911d9688d286 100644 --- a/pkgs/applications/audio/midivisualizer/default.nix +++ b/pkgs/applications/audio/midivisualizer/default.nix @@ -12,13 +12,6 @@ libXcursor, gtk3, ffmpeg-full, - AppKit, - Carbon, - Cocoa, - CoreAudio, - CoreMIDI, - CoreServices, - Kernel, }: stdenv.mkDerivation (finalAttrs: { @@ -49,15 +42,6 @@ stdenv.mkDerivation (finalAttrs: { libXinerama libXcursor gtk3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Carbon - Cocoa - CoreAudio - CoreMIDI - CoreServices - Kernel ]; installPhase = diff --git a/pkgs/applications/audio/minidsp/default.nix b/pkgs/applications/audio/minidsp/default.nix index 37f87257bdf3..0be81f52a4d5 100644 --- a/pkgs/applications/audio/minidsp/default.nix +++ b/pkgs/applications/audio/minidsp/default.nix @@ -4,8 +4,6 @@ rustPlatform, stdenv, libusb1, - AppKit, - IOKit, pkg-config, }: rustPlatform.buildRustPackage rec { @@ -24,12 +22,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p minidsp -p minidsp-daemon" ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ libusb1 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - IOKit - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libusb1 ]; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix index c8ceef846e1f..24665b7ddc55 100644 --- a/pkgs/applications/audio/mmlgui/default.nix +++ b/pkgs/applications/audio/mmlgui/default.nix @@ -9,8 +9,6 @@ libX11, libXau, libXdmcp, - Carbon, - Cocoa, cppunit, }: @@ -61,10 +59,6 @@ stdenv.mkDerivation { libX11 libXau libXdmcp - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa ]; checkInputs = [ diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 581ace1d3c3c..08d71f5b1684 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -11,7 +11,6 @@ popt, libtool, libiconv, - CoreServices, # Sound sub-systems alsaSupport ? (!stdenv.hostPlatform.isDarwin), alsa-lib, @@ -125,7 +124,6 @@ stdenv.mkDerivation { ++ lib.optional samplerateSupport libsamplerate ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - CoreServices ]; configureFlags = [ diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index d89c9c65838e..a919a0d98c4f 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -10,8 +10,6 @@ withPulse ? stdenv.hostPlatform.isLinux, libpulseaudio, withCoreAudio ? stdenv.hostPlatform.isDarwin, - AudioUnit, - AudioToolbox, withJack ? stdenv.hostPlatform.isUnix, jack, withConplay ? !stdenv.hostPlatform.isWindows, @@ -45,8 +43,6 @@ stdenv.mkDerivation rec { ++ lib.optionals withAlsa [ alsa-lib ] ++ lib.optionals withPulse [ libpulseaudio ] ++ lib.optionals withCoreAudio [ - AudioUnit - AudioToolbox ] ++ lib.optionals withJack [ jack ] ); diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix index ac807528f509..029d728a7305 100644 --- a/pkgs/applications/audio/muso/default.nix +++ b/pkgs/applications/audio/muso/default.nix @@ -5,7 +5,6 @@ rustPlatform, pkg-config, wrapGAppsHook3, - CoreServices, }: rustPlatform.buildRustPackage rec { @@ -23,7 +22,6 @@ rustPlatform.buildRustPackage rec { pkg-config wrapGAppsHook3 ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices; preConfigure = '' substituteInPlace lib/utils.rs \ diff --git a/pkgs/applications/audio/parrot/default.nix b/pkgs/applications/audio/parrot/default.nix index 7dee1402f30a..1d8c4e5ae0e6 100644 --- a/pkgs/applications/audio/parrot/default.nix +++ b/pkgs/applications/audio/parrot/default.nix @@ -9,9 +9,7 @@ unstableGitUpdater, openssl, pkg-config, - stdenv, yt-dlp, - Security, }: rustPlatform.buildRustPackage { pname = "parrot"; @@ -36,7 +34,7 @@ rustPlatform.buildRustPackage { buildInputs = [ libopus openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + ]; postInstall = '' wrapProgram $out/bin/parrot \ diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 874936c25042..8e94213d51b7 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -7,12 +7,12 @@ let pname = "plexamp"; - version = "4.11.5"; + version = "4.12.0"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - hash = "sha512-j8fPp6JcTB/PwsGgvEGqETZ83mGee1MwR4T9eFcNuoLRtlnudM7c3WDgxhpUdv5Nx3XkcMVnW1fntZYN2sIfzA=="; + hash = "sha512-vIH6HPWjL0fzM8rXZhXYUH6qT3mca5WxicRRaQr9RHW511x8pNnRmdwtMDfKtyrhUiZFiE1XAfWBDXmuxbJW/g=="; }; appimageContents = appimageTools.extractType2 { @@ -38,7 +38,7 @@ appimageTools.wrapType2 { meta = with lib; { description = "Beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/77"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/78"; license = licenses.unfree; maintainers = with maintainers; [ killercup diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 7f49c31fd38c..9f48ef0cb7df 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/pd --prefix PATH : ${lib.makeBinPath [ tk ]} + wrapProgram $out/bin/pd-gui --prefix PATH : ${lib.makeBinPath [ tk ]} ''; meta = with lib; { diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index db313704dfad..b7e810f56fa0 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -38,17 +38,17 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.35"; + version = "7.36"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = if stdenv.hostPlatform.isDarwin then - "sha256-X3KNESHUmcs3zcwURKvaDqvkf9P/XncO/hpsOGxKMmg=" + "sha256-++LWAnOUNVe3EOkBMlHizaBSQ5B2DJPhNUT8w2mTuiI=" else { - x86_64-linux = "sha256-VD2VUTZUYi+7rDCG1joElajbfxLiramQwwrUgDDpuPI="; - aarch64-linux = "sha256-TFhv4CS7VCysup3Xy/uXHxaWhG4J8WCgxtaooGFj4vw="; + x86_64-linux = "sha256-wQIDTumxQI8S446u87noYvIx/pyfCa/Xe1U/Ot/7ESY="; + aarch64-linux = "sha256-5AkwRG1+xDVAhEOUTdpK1G7+qjE68zr4hs55mMQivmM="; } .${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 5d10db730f4f..738a85d9d2ac 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -9,7 +9,6 @@ SDL2, libX11, libXext, - Cocoa, utf8proc, nix-update-script, }: @@ -64,8 +63,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libXext - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index f6cbf58d8954..205f8cd80749 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -13,8 +13,6 @@ libvorbis, libopus, soxr, - IOKit, - AudioToolbox, aixlog, popl, pulseaudioSupport ? false, @@ -55,11 +53,7 @@ stdenv.mkDerivation rec { openssl ] ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - AudioToolbox - ]; + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; TARGET = lib.optionalString stdenv.hostPlatform.isDarwin "MACOS"; diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index dace69315ac1..f0b88dea3bed 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -6,8 +6,6 @@ pkg-config, alsa-lib, libxmp, - AudioUnit, - CoreAudio, }: stdenv.mkDerivation rec { @@ -25,13 +23,7 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config ]; - buildInputs = - [ libxmp ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioUnit - CoreAudio - ]; + buildInputs = [ libxmp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; meta = with lib; { description = "Extended module player"; diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index 7c198b099f07..cb6b4b16bcf2 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -83,9 +83,14 @@ stdenv.mkDerivation (finalAttrs: { --inherit-argv0 ''; + patches = [ + # MPRIS's DesktopEntry property needs to match the desktop entry basename + ./fix-mpris-desktop-entry.patch + ]; + desktopItems = [ (makeDesktopItem { - name = "youtube-music"; + name = "com.github.th_ch.youtube_music"; exec = "youtube-music %u"; icon = "youtube-music"; desktopName = "YouTube Music"; diff --git a/pkgs/applications/audio/youtube-music/fix-mpris-desktop-entry.patch b/pkgs/applications/audio/youtube-music/fix-mpris-desktop-entry.patch new file mode 100644 index 000000000000..acbd952069eb --- /dev/null +++ b/pkgs/applications/audio/youtube-music/fix-mpris-desktop-entry.patch @@ -0,0 +1,13 @@ +diff --git a/src/plugins/shortcuts/mpris.ts b/src/plugins/shortcuts/mpris.ts +index 93cb40f9..ad0bede3 100644 +--- a/src/plugins/shortcuts/mpris.ts ++++ b/src/plugins/shortcuts/mpris.ts +@@ -79,7 +79,7 @@ function setupMPRIS() { + instance.canQuit = false; + instance.canUsePlayerControls = true; + instance.supportedUriSchemes = ['http', 'https']; +- instance.desktopEntry = 'youtube-music'; ++ instance.desktopEntry = 'com.github.th_ch.youtube_music'; + return instance; + } + diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index c644d6662775..d6a3a2d93618 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -7,9 +7,6 @@ makeWrapper, webkitgtk_4_0, zenity, - Cocoa, - Security, - WebKit, withGui ? true, }: @@ -31,13 +28,7 @@ rustPlatform.buildRustPackage rec { pkg-config makeWrapper ]; - buildInputs = - lib.optional stdenv.hostPlatform.isDarwin Security - ++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_0 - ++ lib.optionals (withGui && stdenv.hostPlatform.isDarwin) [ - Cocoa - WebKit - ]; + buildInputs = lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_0; buildNoDefaultFeatures = true; buildFeatures = [ "doh" ] ++ lib.optional withGui "webgui"; diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 59e160ee4fb1..09d0be9bc458 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -14,6 +14,7 @@ db48, sqlite, qrencode, + libsystemtap, qtbase ? null, qttools ? null, python3, @@ -60,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: { zeromq zlib ] + ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libsystemtap ] ++ lib.optionals withWallet [ sqlite ] # building with db48 (for legacy descriptor wallet support) is broken on Darwin ++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db48 ] @@ -93,6 +95,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_BENCH" false) + (lib.cmakeBool "WITH_ZMQ" true) + # building with db48 (for legacy wallet support) is broken on Darwin + (lib.cmakeBool "WITH_BDB" (withWallet && !stdenv.hostPlatform.isDarwin)) + (lib.cmakeBool "WITH_USDT" (stdenv.hostPlatform.isLinux)) ] ++ lib.optionals (!finalAttrs.doCheck) [ (lib.cmakeBool "BUILD_TESTS" false) diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index d06ce837c0a3..01e1b624821b 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -1,10 +1,8 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, rocksdb_7_10, - Security, }: let @@ -31,8 +29,6 @@ rustPlatform.buildRustPackage rec { ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; ROCKSDB_LIB_DIR = "${rocksdb}/lib"; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index 8361c2e23f94..c024b07db1ab 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -1,6 +1,5 @@ { cmake, - CoreFoundation, fetchFromGitHub, fetchurl, lib, @@ -11,10 +10,8 @@ protobuf, rustPlatform, rust-jemalloc-sys, - Security, sqlite, stdenv, - SystemConfiguration, testers, }: @@ -59,11 +56,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - SystemConfiguration ]; depositContractSpec = fetchurl { diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index e39d5374b9ad..0ad489b74309 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -16,10 +16,6 @@ unbound, zeromq, - # darwin - CoreData, - IOKit, - trezorSupport ? true, hidapi, libusb1, @@ -88,10 +84,6 @@ stdenv.mkDerivation rec { unbound zeromq ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - CoreData - ] ++ lib.optionals trezorSupport [ python3 hidapi diff --git a/pkgs/applications/blockchains/optimism/geth.nix b/pkgs/applications/blockchains/optimism/geth.nix index e88ce594cd8d..c4b66ebe829b 100644 --- a/pkgs/applications/blockchains/optimism/geth.nix +++ b/pkgs/applications/blockchains/optimism/geth.nix @@ -1,10 +1,7 @@ { - stdenv, lib, buildGoModule, fetchFromGitHub, - libobjc, - IOKit, }: buildGoModule rec { @@ -36,12 +33,6 @@ buildGoModule rec { vendorHash = "sha256-pcIydpKWZt3vwShwzGlPKGq+disdxYFOB8gxHou3mVU="; - # Fix for usb-related segmentation faults on darwin - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - IOKit - ]; - ldflags = [ "-s" "-w" diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 8d74bc87909f..1ae808ec2d50 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -10,8 +10,6 @@ rustPlatform, rustc, stdenv, - Security, - SystemConfiguration, }: let @@ -60,13 +58,9 @@ rustPlatform.buildRustPackage rec { ]; # NOTE: jemalloc is used by default on Linux with unprefixed enabled - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ]; checkInputs = [ cacert diff --git a/pkgs/applications/blockchains/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix index 219e9f530f4c..f1c0bc66f641 100644 --- a/pkgs/applications/blockchains/snarkos/default.nix +++ b/pkgs/applications/blockchains/snarkos/default.nix @@ -3,7 +3,6 @@ fetchFromGitHub, lib, rustPlatform, - Security, curl, pkg-config, openssl, @@ -41,7 +40,6 @@ rustPlatform.buildRustPackage rec { # ROCKSDB_LIB_DIR="${rocksdb}/lib"; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security curl ]; diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix index 66d28bd3bac8..ad3cced89007 100644 --- a/pkgs/applications/blockchains/teos/default.nix +++ b/pkgs/applications/blockchains/teos/default.nix @@ -4,8 +4,6 @@ fetchFromGitHub, protobuf, rustfmt, - stdenv, - darwin, pkg-config, openssl, }: @@ -42,10 +40,6 @@ in rustfmt ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - passthru.updateScript = updateScript; __darwinAllowLocalNetworking = true; @@ -70,13 +64,9 @@ in rustfmt ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; passthru.updateScript = updateScript; diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 1706bcd888d7..dd1375829534 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -15,7 +15,6 @@ makeWrapper, rustPlatform, pkg-config, - Security, stdenv, testers, tl-expected, @@ -55,19 +54,15 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { pkg-config ]; - buildInputs = - [ - boost - db62 - libevent - libsodium - tl-expected - utf8cpp - zeromq - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = [ + boost + db62 + libevent + libsodium + tl-expected + utf8cpp + zeromq + ]; # Use the stdenv default phases (./configure; make) instead of the # ones from buildRustPackage. diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 09fceb7435e5..a42220b34131 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -20,12 +20,12 @@ let sha256Hash = "sha256-VNXErfb4PhljcJwGq863ldh/3i8fMdJirlwolEIk+fI="; }; betaVersion = { - version = "2024.3.2.10"; # "Android Studio Meerkat Feature Drop | 2024.3.2 RC 1" - sha256Hash = "sha256-r5YBpACLzfmChY9ORyvDUNl4j8r32dsqj3W7fbSWZU8="; + version = "2024.3.2.11"; # "Android Studio Meerkat Feature Drop | 2024.3.2 RC 2" + sha256Hash = "sha256-pE17kbLnsEMRtaQencKqckW3uke9IliLkoHP6q3NrQg="; }; latestVersion = { - version = "2025.1.1.4"; # "Android Studio Narwhal | 2025.1.1 Canary 4" - sha256Hash = "sha256-PQe9JEi9Ogoo1hUgPVnCustFgg10v89gTMF7QGi4s1I="; + version = "2025.1.1.6"; # "Android Studio Narwhal | 2025.1.1 Canary 6" + sha256Hash = "sha256-FUDb8/kyvO3M/NJp30VZCyNacJ90y/fawrDTFin7g6o="; }; in { diff --git a/pkgs/applications/editors/eclipse/eclipses.json b/pkgs/applications/editors/eclipse/eclipses.json index 425e38063007..c8f72f11cc17 100644 --- a/pkgs/applications/editors/eclipse/eclipses.json +++ b/pkgs/applications/editors/eclipse/eclipses.json @@ -1,90 +1,90 @@ { "platform_major": "4", - "platform_minor": "34", - "version": "4.34", - "year": "2024", - "month": "12", - "buildmonth": "11", - "dayHourMinute": "201800", + "platform_minor": "35", + "version": "4.35", + "year": "2025", + "month": "03", + "buildmonth": "02", + "dayHourMinute": "280140", "eclipses": { "cpp": { "description": "Eclipse IDE for C/C++ Developers", "dropUrl": false, "hashes": { - "x86_64": "sha256-d3MVeci4jF9adqvgepmZtzoPul+DTMtJlf7v92PMyq0=", - "aarch64": "sha256-gsOmF3bGthd7CEG+HxEQJqACfb+ErWU+fVO2MVR2cz8=" + "x86_64": "sha256-xignTWCuhkcnYIiZn/q8S1oKXpFZKyhpSDqOJEeu75g=", + "aarch64": "sha256-M9XqF2WK9abJwjeV6mxeL6aNXSP+Ey92GkbD5i0Gyzk=" } }, "dsl": { "description": "Eclipse IDE for Java and DSL Developers", "dropUrl": false, "hashes": { - "x86_64": "sha256-bJvODmesfkED5yHnaJGLZSeFctfVCQDA3lvH00S/zbk=", - "aarch64": "sha256-e0rWjD19tUyVJMMbb5THVj28o0HnBFssP0yCAQ5wKnA=" + "x86_64": "sha256-zoL+sTnvlJSseC3UPmiJVN8QpEkblRyge3+VzXGmQhU=", + "aarch64": "sha256-l4mNwCYOieeK0FA+ZYpA6hN+L6r1wn2D4+fFpSgZiyc=" } }, "embedcpp": { "description": "Eclipse IDE for Embedded C/C++ Developers", "dropUrl": false, "hashes": { - "x86_64": "sha256-+DfoJ+QAlI9Ioz4Wbj2LvtpV3vAXjl0wtZBNS9osOYw=", - "aarch64": "sha256-XCpIKoLhrodOJkLPY6uICpuYu5PBUp96MFQCeuOyOUA=" + "x86_64": "sha256-n7XfIreZkpoWEoQz2GZILpymptyVGlkPEjbCDSA3zps=", + "aarch64": "sha256-tCmqqXQvHDo0cRLu3TUWmtUufeO06rIXdqv54hKRjIM=" } }, "modeling": { "description": "Eclipse Modeling Tools", "dropUrl": false, "hashes": { - "x86_64": "sha256-MUe5DU+3/4lzG1hykpgOX/46Pgp9qtoN9MOYk6EFK6o=", - "aarch64": "sha256-/tv7+RsRAFfV5zfU+uFNNlE1rrJavRFOhLYhSkIX0Ec=" + "x86_64": "sha256-FWlZrGYY7VN+FL5liNTaGNLeiZqw2xquFJFQSD6GpKc=", + "aarch64": "sha256-RbYMgWaTRUdHOKYEyi49F7G1gIUhRMsQrCpXmyOZPtc=" } }, "platform": { "description": "Eclipse Platform ${year}-${month}", "dropUrl": true, "hashes": { - "x86_64": "sha256-ZHJkIOAaz87z6Dz/6X62E7ckQIFDtzqgE5ODZeb/Rss=", - "aarch64": "sha256-dLLwLFTeUXoL9Pri4EB48nZGUH/zF2mCt6anv519aP4=" + "x86_64": "sha256-zZjdG/rWx3+yDoAcMOL/Kyq9TZazUT/3FIISRRha3Ww=", + "aarch64": "sha256-gGygUCGsCS5yW0UNvU/VtbpJ0BBqWmbZWQ0+0a3vnII=" } }, "SDK": { "description": "Eclipse ${year}-${month} Classic", "dropUrl": true, "hashes": { - "x86_64": "sha256-DhrNe9nx4RYAaq+NIHCBLX+bOn+dE13yF07hjuRzHZI=", - "aarch64": "sha256-OHE0vxjV9kp43Os2LCLuZFCMLWy3vnCChMC54TyXO9I=" + "x86_64": "sha256-eazgEk7gPiZpEAN03xEcNIqIObBCrq+jHzWLA1+wZMY=", + "aarch64": "sha256-1bJP/j91NyeSjqJB1ljatEWAz4M5xoAmIU9m9Be7uvg=" } }, "java": { "description": "Eclipse IDE for Java Developers", "dropUrl": false, "hashes": { - "x86_64": "sha256-z0hLFqdDSqhUmCiOp0fkTkiybOmCIA118JMBb90yEiY=", - "aarch64": "sha256-JzUgyfPEi9vq497gJhHuobb0TR113hC2suFvNKix7So=" + "x86_64": "sha256-qAYF2EtMP1H3/umZQq0oHKJA4EUFbYJXWgSHw8Xvpw8=", + "aarch64": "sha256-l4QhWyu6dejl2xD/6h/0I4EBpJb6I7aqUbIzLGPdftU=" } }, "jee": { "description": "Eclipse IDE for Enterprise Java and Web Developers", "dropUrl": false, "hashes": { - "x86_64": "sha256-PxQ+jGTEs917IeWuTCgyyx7vAodZr4ju/aa4WQmoGQ0=", - "aarch64": "sha256-g4EHYFjoPONiGwreAmENcXWVinPkDAIE6KyVmZokQAo=" + "x86_64": "sha256-JY2ybTEber2WpmXxbP+/XGYcmRuqGWsFYWs/PMv4hI0=", + "aarch64": "sha256-Bs6CMZB5j7CuBGDo1VTTtlSmEUGo47dGS0/5MZfR2EU=" } }, "committers": { "description": "Eclipse IDE for Eclipse Committers and Eclipse Platform Plugin Developers", "dropUrl": false, "hashes": { - "x86_64": "sha256-g8ILZ9esbXbm+4bImFJkEwE/UNJT2HHCXx/8i+Lvb00=", - "aarch64": "sha256-arV2VgQypj8fSEpqGd8CbJ/FyKE6k+e4x7kXqShDKrw=" + "x86_64": "sha256-uySP2uGSyPOrCwj0X4DUsit3sIlii54GSXl4Y9NDO8Y=", + "aarch64": "sha256-petnMZvKADeHFrcUXk+2xACIaQtdWv0kxuaC7nAtavo=" } }, "rcp": { "description": "Eclipse IDE for RCP and RAP Developers", "dropUrl": false, "hashes": { - "x86_64": "sha256-qqOdASLe11FT4Eot7j/Yf02acHgblV77W3fqTOCrNSQ=", - "aarch64": "sha256-9yA2OLOcp3uKJ88OKqz7vCXMzS52om6ohUJkGZpkjE4=" + "x86_64": "sha256-lq+zD97S2gr+62kHsZ3Dv+HTbEiyiqFW+v4DmHliDPA=", + "aarch64": "sha256-VCE21NJtvVSnYxjS9G+iY2YTspmlzZ3Cj7MyD4LpcSI=" } } } diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix index 167f0fcb86b4..b4e96f6490fb 100644 --- a/pkgs/applications/editors/emacs/build-support/generic.nix +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -61,8 +61,7 @@ lib.extendMkDerivation { propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs; strictDeps = args.strictDeps or true; - # TODO re-enable after #392928 reaches master - # __structuredAttrs = args.__structuredAttrs or true; + __structuredAttrs = args.__structuredAttrs or true; inherit turnCompilationWarningToError ignoreCompilationError; diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 90189ee8b779..cc604b222f32 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -6,21 +6,6 @@ lib.makeScope pkgs.newScope ( inherit (self) callPackage; inheritedArgs = { inherit (pkgs.darwin) sigtool; - inherit (pkgs.darwin.apple_sdk.frameworks) - Accelerate - AppKit - Carbon - Cocoa - GSS - ImageCaptureCore - ImageIO - IOKit - OSAKit - Quartz - QuartzCore - WebKit - ; - inherit (pkgs.darwin.apple_sdk_11_0.frameworks) UniformTypeIdentifiers; }; in { diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 2e058bb5349b..e3ef4bd8e9c1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -810,12 +810,6 @@ let osx-dictionary = if pkgs.stdenv.hostPlatform.isDarwin then super.osx-dictionary.overrideAttrs (old: { - buildInputs = - old.buildInputs - ++ (with pkgs.darwin.apple_sdk.frameworks; [ - CoreServices - Foundation - ]); postBuild = (old.postBuild or "") + '' diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index b8156c5b3bcc..4b2a017ff595 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -114,21 +114,6 @@ "lucid" ), - # macOS dependencies for NS and macPort - Accelerate, - AppKit, - Carbon, - Cocoa, - GSS, - IOKit, - ImageCaptureCore, - ImageIO, - OSAKit, - Quartz, - QuartzCore, - UniformTypeIdentifiers, - WebKit, - # test callPackage, }: @@ -372,27 +357,6 @@ mkDerivation (finalAttrs: { ] ++ lib.optionals withNS [ librsvg - AppKit - GSS - ImageIO - ] - ++ lib.optionals (variant == "macport") [ - Accelerate - AppKit - Carbon - Cocoa - IOKit - OSAKit - Quartz - QuartzCore - WebKit - # TODO are these optional? - GSS - ImageCaptureCore - ImageIO - ] - ++ lib.optionals (variant == "macport" && stdenv.hostPlatform.isAarch64) [ - UniformTypeIdentifiers ]; # Emacs needs to find movemail at run time, see info (emacs) Movemail diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index b4b83ff3a587..4c2e7c090428 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, pkg-config, cmake, hunspell, @@ -24,6 +25,15 @@ stdenv.mkDerivation rec { hash = "sha256-oivhrDF3HikbEtS1cOlHwmQYNYf3IkX+gQGW0V55IWU="; }; + patches = [ + # Fix build, remove at next version bump + # https://github.com/gottcode/focuswriter/pull/208 + (fetchpatch { + url = "https://github.com/gottcode/focuswriter/commit/dd74ed4559a141653a06e7984c1251b992925775.diff"; + hash = "sha256-1bxa91xnkF1MIQlA8JgwPHW/A80ThbVVdVtusmzd22I="; + }) + ]; + nativeBuildInputs = [ pkg-config cmake diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index 1a1b8dcffd17..a88ab68cef87 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { pname = "greenfoot"; - version = "3.8.2"; + version = "3.9.0"; src = fetchurl { # We use the deb here. First instinct might be to go for the "generic" JAR # download, but that is actually a graphical installer that is much harder # to unpack than the deb. - url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${ + url = "https://www.greenfoot.org/download/files/Greenfoot-linux-arm64-${ builtins.replaceStrings [ "." ] [ "" ] version }.deb"; - hash = "sha256-wpmgWtx2jTDjt+7p6HcjU/uy1PRmnAHpJ1rOYb+hV+U="; + hash = "sha256-d5bkK+teTA4fxFb46ovbZE28l8WILGStv3Vg3nJZfv0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index 9afcb4807d6d..53bed7b727e0 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -11,123 +11,123 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2024.3.4", - "sha256": "c23b9aeb1fdd9f88ab977186e9e4558cdb9bdb5e498b7716f4255a845f8880fd", - "url": "https://download.jetbrains.com/cpp/CLion-2024.3.4.tar.gz", - "build_number": "243.25659.42" + "version": "2025.1", + "sha256": "2d1e8d1b8639c29045161567bc3fc8cdfbd9c8fe549d2da92d25e9d9a75c408d", + "url": "https://download.jetbrains.com/cpp/CLion-2025.1.tar.gz", + "build_number": "251.23774.442" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "aafe50930e565e4b94dc6af43140d7bb68b937b8f1dc3d3235d2054071397b0f", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.3.5.tar.gz", - "build_number": "243.24978.79" + "version": "2025.1", + "sha256": "d64bb300274f2509dde9a3c73eb66f45d18158bf46c9e61d3dfc602de8f83b5d", + "url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.tar.gz", + "build_number": "251.23774.426" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2024.3.2", - "sha256": "2a59cb71f21f43ff05b385352e51c3670a13dcf2f287034185d4af101880c68f", - "url": "https://download.jetbrains.com/python/dataspell-2024.3.2.tar.gz", - "build_number": "243.25659.44" + "version": "2025.1", + "sha256": "d0078ceae9f7ae8cc6b57223874e3a818383aedf10fa8b73b2d34a522c52e53d", + "url": "https://download.jetbrains.com/python/dataspell-2025.1.tar.gz", + "build_number": "251.23774.439" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2024.3.3", - "sha256": "4266bc5bceba9c053d5a3b7b74591bf5bc52f11a4deb4bbe4bab03fc97c5b36c", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.3.tar.gz", - "build_number": "243.24978.56" + "version": "2025.1", + "sha256": "d00276adceee00ea5555013778d3ed25254b60383d43e6d4b7f892b10681c673", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.tar.gz", + "build_number": "251.23774.441" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "d59f537fb8d9c741a704605ec00c4b4230211301cd0609c73c66d5edb4eb9340", - "url": "https://download.jetbrains.com/go/goland-2024.3.5.tar.gz", - "build_number": "243.26053.20" + "version": "2025.1", + "sha256": "cc22617f9be233a13644d653f20cba29b05295bcb5bb77ac9621ee5447ae349a", + "url": "https://download.jetbrains.com/go/goland-2025.1.tar.gz", + "build_number": "251.23774.430" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "8a287528d830e6cdec2ded13c974c39a35b7555243c22d8b83113c96c26630aa", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.5.tar.gz", - "build_number": "243.26053.27" + "version": "2025.1", + "sha256": "d73a0182c9e9660789a6998a5f5743a6c2263e49aabd8ada1108efd575d9ec1e", + "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.tar.gz", + "build_number": "251.23774.435" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "f8e8e864f4fedddf1d366a7db23fc4132192c3a6029c614a382186ff564a78a1", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.5.tar.gz", - "build_number": "243.26053.27" + "version": "2025.1", + "sha256": "9946a690072f166607fd7b0d29e9e9c6a24c79fd5d7365a5600366b0b27532ec", + "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.tar.gz", + "build_number": "251.23774.435" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2024.3.1", - "sha256": "b0e1f7bbc56ddf706510a420783418bc61e80bc4ea3c23ae60fb09cee846f01b", - "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.1.tar.gz", - "build_number": "243.24978.546" + "version": "2024.3.2", + "sha256": "54896e4c0a22c2ca27815da40be80f70b40b0d45e86d9bce957e47316f2ad342", + "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.2.tar.gz", + "build_number": "243.24978.603" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "e12efb584eb9b632703d1bee9986d95ac09aceaf76ca40e9188d82b713ff0fc1", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.5.tar.gz", - "build_number": "243.26053.13", + "version": "2025.1", + "sha256": "2ead794b5bc6d31be4ad886788110e9d8e5c708e2e542b20d17a2407b9e58998", + "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.tar.gz", + "build_number": "251.23774.436", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "e8d5aa2a05d35e3cb3cd186d446242c191d03b3d0556b160b6875a830c91cc2b", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.5.tar.gz", - "build_number": "243.26053.29" + "version": "2025.1", + "sha256": "b0dc6661f2b415677bd61c09fa9197483aa412701ecc527c9237a213e3876247", + "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.tar.gz", + "build_number": "251.23774.444" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "dbfbdbd2627bcf5de85673151f3d3b79b12fa373d8c0d7942f40bba3aa397ea3", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.5.tar.gz", - "build_number": "243.26053.29" + "version": "2025.1", + "sha256": "1282907f134a726e17bb7fe8cb7088e406aa4fbf9d910def03633572f3a62f8c", + "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.tar.gz", + "build_number": "251.23774.444" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2024.3.6", - "sha256": "1f9db9f3f90c71fe476e3e17ac78be9fcc982e3f017c598f631b5cd600e6da43", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.6.tar.gz", - "build_number": "243.25659.34" + "version": "2025.1", + "sha256": "bd00eb4d43db2386c6219415b098b0fad5abca5796b813d44beeb76c23408260", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1.tar.gz", + "build_number": "251.23774.437" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "e5fb7daa24307927cfd329340956b4cae1e0f3bb011841834519c4342428d38b", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.5.tar.gz", - "build_number": "243.26053.19" + "version": "2025.1", + "sha256": "6ad3960cf6a0fa88f3cfb6c166c1080ad7c3fb0f72f50379f9cafbe523813437", + "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.tar.gz", + "build_number": "251.23774.429" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2024.3.7", - "sha256": "aec79e12c16082d364617dab83ec63980fddbd66c5734573499b000733c508ad", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.7.tar.gz", - "build_number": "243.26053.17" + "version": "2025.1", + "sha256": "6c3e5c2cc45bfbfe631f6f34f87d45fbc3e3f97d12a8ca9e6de77beab230a210", + "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.tar.gz", + "build_number": "251.23774.445" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2024.3.5", - "sha256": "da587d7ca3ebb08f067143e4a6b35f1aa133aa10af7fc365496838006fcd1aed", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.5.tar.gz", - "build_number": "243.26053.12" + "version": "2025.1", + "sha256": "f181eb1348c04a60f860fd9ea9616261c6c012a7916e76380652d129e87503ea", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.tar.gz", + "build_number": "251.23774.424" }, "writerside": { "update-channel": "Writerside EAP", @@ -150,123 +150,123 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "version": "2024.3.4", - "sha256": "336d19b695392e9a7bf426ae2d93b864ade48216e8df8f96ecfc9b2e9b9afa4f", - "url": "https://download.jetbrains.com/cpp/CLion-2024.3.4-aarch64.tar.gz", - "build_number": "243.25659.42" + "version": "2025.1", + "sha256": "f5bfa7dc9fdcc69558695d0b58fe39e86c75d1b72985845649429c98ba761ff9", + "url": "https://download.jetbrains.com/cpp/CLion-2025.1-aarch64.tar.gz", + "build_number": "251.23774.442" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "20bae6b26f1aa6c88db1779103c8cceacb690caa776d10ef155ef1c17f25f37c", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.3.5-aarch64.tar.gz", - "build_number": "243.24978.79" + "version": "2025.1", + "sha256": "c8bdb2a1d79801889b50ce6de4e859c66a324fb8d3d9211130a7c7803b9f2696", + "url": "https://download.jetbrains.com/datagrip/datagrip-2025.1-aarch64.tar.gz", + "build_number": "251.23774.426" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "version": "2024.3.2", - "sha256": "708e2037711b6bcb6e155ce24082d4347c07295250feabb9715366c7da4d45ba", - "url": "https://download.jetbrains.com/python/dataspell-2024.3.2-aarch64.tar.gz", - "build_number": "243.25659.44" + "version": "2025.1", + "sha256": "e55cfc4e3327aff6bd3447e2980cd1e5cbd9223c8e0330688d65031b1e95d0fd", + "url": "https://download.jetbrains.com/python/dataspell-2025.1-aarch64.tar.gz", + "build_number": "251.23774.439" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", - "version": "2024.3.3", - "sha256": "e7050cfb1b603c6f0bd0dbb90f32a49b3fe9155fb696f12dd261afc000043b81", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.3-aarch64.tar.gz", - "build_number": "243.24978.56" + "version": "2025.1", + "sha256": "d2a6f62d639716fd718542e416e4129e03f44768d1495b6399731cbe44f037ea", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1-aarch64.tar.gz", + "build_number": "251.23774.441" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "12236e5b82e99ce27925567afe049e3ce298b083b764b75ffb67b5b7b8072e61", - "url": "https://download.jetbrains.com/go/goland-2024.3.5-aarch64.tar.gz", - "build_number": "243.26053.20" + "version": "2025.1", + "sha256": "f6b7f36efc9de54c83e49392882075868ba85b418a99cde47031795a79a30426", + "url": "https://download.jetbrains.com/go/goland-2025.1-aarch64.tar.gz", + "build_number": "251.23774.430" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "43b3ac68c07b611baa12bd70adc188b7be81d79b0b3a232aad582df2ffeb2598", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.5-aarch64.tar.gz", - "build_number": "243.26053.27" + "version": "2025.1", + "sha256": "168e2cb680db2ad34633ccea3539151d6fb74989a4b585250814ba65e56dabaa", + "url": "https://download.jetbrains.com/idea/ideaIC-2025.1-aarch64.tar.gz", + "build_number": "251.23774.435" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "0f072350137540672fd4de19768175164a2497290098321dfefaaaff0097f524", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.5-aarch64.tar.gz", - "build_number": "243.26053.27" + "version": "2025.1", + "sha256": "b269898937bb0c3309eeae34ca039cff9532867eb7ee787b577b11bb49c87bda", + "url": "https://download.jetbrains.com/idea/ideaIU-2025.1-aarch64.tar.gz", + "build_number": "251.23774.435" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2024.3.1", - "sha256": "b0e1f7bbc56ddf706510a420783418bc61e80bc4ea3c23ae60fb09cee846f01b", - "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.1.tar.gz", - "build_number": "243.24978.546" + "version": "2024.3.2", + "sha256": "54896e4c0a22c2ca27815da40be80f70b40b0d45e86d9bce957e47316f2ad342", + "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.2.tar.gz", + "build_number": "243.24978.603" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "a55b112177db464081139f6b9aec2a7c22b0f069dd70fdb1bfe56fa1a7f33aa4", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.5-aarch64.tar.gz", - "build_number": "243.26053.13", + "version": "2025.1", + "sha256": "a55cbef6886a645e5dfcbead427d1d2b6997eca6b86c9f4e2eed828980bd822b", + "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1-aarch64.tar.gz", + "build_number": "251.23774.436", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "08fbe137d0153b92a639351e866c2218744517b6cfcf412abedfe1d6c9ad1bc4", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.5-aarch64.tar.gz", - "build_number": "243.26053.29" + "version": "2025.1", + "sha256": "49a4738e18129af75f90cd47744f9a46922a74d905f8e4060a531753a0496d6b", + "url": "https://download.jetbrains.com/python/pycharm-community-2025.1-aarch64.tar.gz", + "build_number": "251.23774.444" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "53ce650a41fefb260a13cb96462857fc5abd98d7a02adf794cde7248e3cefbbb", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.5-aarch64.tar.gz", - "build_number": "243.26053.29" + "version": "2025.1", + "sha256": "4879e9b70aef547fe4a7c846345f496dd1aeaf93be9a62455529409efff97f68", + "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1-aarch64.tar.gz", + "build_number": "251.23774.444" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "version": "2024.3.6", - "sha256": "f8c459c77327e97812507ba4724e6e9911e918425f5a187707cb66efafa47c45", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.6-aarch64.tar.gz", - "build_number": "243.25659.34" + "version": "2025.1", + "sha256": "9d44cdaf7c344be547908e0a5073b49db7bf66d743b5d19dd2ad01ef7f25a0ed", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1-aarch64.tar.gz", + "build_number": "251.23774.437" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "72a331a3c04a3d9f8bf30ad0b5009d4634f0fdcf5becd6a9a5cd00a5728cd9d1", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.5-aarch64.tar.gz", - "build_number": "243.26053.19" + "version": "2025.1", + "sha256": "8cf468eae2788a2076be630b1bfc8ac92efc60701617702acbf765346d6ac293", + "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1-aarch64.tar.gz", + "build_number": "251.23774.429" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "version": "2024.3.7", - "sha256": "537cb7c23cf03a467d311ae00c07b9830f8a7e09807366488d75f84c573ac460", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.7-aarch64.tar.gz", - "build_number": "243.26053.17" + "version": "2025.1", + "sha256": "e645f8929095be8ea83da911b55999ff3199daa6ba68ed32cabb1f3824ce301f", + "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1-aarch64.tar.gz", + "build_number": "251.23774.445" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2024.3.5", - "sha256": "fce5d5c2b8c5aacfabac60ff93b93d7c9a3239adcf8347b3deabd472ac1c1288", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.5-aarch64.tar.gz", - "build_number": "243.26053.12" + "version": "2025.1", + "sha256": "51fd7420fb49ff8851d3b4b1079f8d7afebe9631a76e7d1d4fd3e66d42332c6c", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1-aarch64.tar.gz", + "build_number": "251.23774.424" }, "writerside": { "update-channel": "Writerside EAP", @@ -289,123 +289,123 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2024.3.4", - "sha256": "e92dc5ba5a2c59d09e3751de60ed31b0af012210f8381ffd1c5c3e254cc11718", - "url": "https://download.jetbrains.com/cpp/CLion-2024.3.4.dmg", - "build_number": "243.25659.42" + "version": "2025.1", + "sha256": "856658b830523f451b511d1c9d098287522fe4d31096093742286340411157e4", + "url": "https://download.jetbrains.com/cpp/CLion-2025.1.dmg", + "build_number": "251.23774.442" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2024.3.5", - "sha256": "224a58410ef3e067b0c848607d34f5ac180e76ef95ebd1a9f7a34202d36ea278", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.3.5.dmg", - "build_number": "243.24978.79" + "version": "2025.1", + "sha256": "15d893fe7dfc8a14bc8ce250b9113fad5c1752cdcad9c4e22cb013fc03a28dda", + "url": "https://download.jetbrains.com/datagrip/datagrip-2025.1.dmg", + "build_number": "251.23774.426" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2024.3.2", - "sha256": "474c8a04a699cd1538b9c1c882d0215a79932ed45baf8f0f3ec3be09e8ec9a1f", - "url": "https://download.jetbrains.com/python/dataspell-2024.3.2.dmg", - "build_number": "243.25659.44" + "version": "2025.1", + "sha256": "dd856c72855b0309ea98774a3b4c38cf899b6e307dbd3ced316cd8cc721faa38", + "url": "https://download.jetbrains.com/python/dataspell-2025.1.dmg", + "build_number": "251.23774.439" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2024.3.3", - "sha256": "75cc932a4d7bd2f28f641e21cfc0667ce645dd38109b37cbe3621321f1eb3a2d", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.3.dmg", - "build_number": "243.24978.56" + "version": "2025.1", + "sha256": "3201f442143a52f2ad10d6b4cdbd0bb9d67dd7270b3e396919d8c0140196494c", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1.dmg", + "build_number": "251.23774.441" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2024.3.5", - "sha256": "08739696b428ee2964f314884edbabd6614e5b4ce1ec9021e9d336ee947bb944", - "url": "https://download.jetbrains.com/go/goland-2024.3.5.dmg", - "build_number": "243.26053.20" + "version": "2025.1", + "sha256": "587e7a7e56672405b31252567d47eccbc39a5623ec2b8f4f8bf424b038396b86", + "url": "https://download.jetbrains.com/go/goland-2025.1.dmg", + "build_number": "251.23774.430" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2024.3.5", - "sha256": "94640287fb84238d766a52681083807a087ef28b5c9b66d31f4a7ae06f2bcb8a", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.5.dmg", - "build_number": "243.26053.27" + "version": "2025.1", + "sha256": "9b1fecf56c9d2263f87bced7bb9164669c4e811e958c827480a7144b491e4a52", + "url": "https://download.jetbrains.com/idea/ideaIC-2025.1.dmg", + "build_number": "251.23774.435" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2024.3.5", - "sha256": "8b50dd9783c6f8dde229606a4e2d1d0e4ce95f0db33502053ed957fd532bcc35", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.5.dmg", - "build_number": "243.26053.27" + "version": "2025.1", + "sha256": "86c568d302a2a25185fd912d82c6e99e423767ea1442c716f0ee34292736c35d", + "url": "https://download.jetbrains.com/idea/ideaIU-2025.1.dmg", + "build_number": "251.23774.435" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", - "version": "2024.3.1", - "sha256": "a36d46d6a29f5f86991b1d1e8272bbc27bf00a2c5e562fe7fb3f95075badc85c", - "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.1-macos.dmg", - "build_number": "243.24978.546" + "version": "2024.3.2", + "sha256": "09b69187d9feb5e17865fcdec88ce8a95c4933a8176e37a224c251b60d5aed01", + "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.2-macos.dmg", + "build_number": "243.24978.603" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2024.3.5", - "sha256": "edb7d1ff3aa653f6f73ea2e6f907b026de8613cea3bdc2cb90c79257f387c2a6", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.5.dmg", - "build_number": "243.26053.13", + "version": "2025.1", + "sha256": "9c3bcba68beb364f57fa674fc1c33c4ac7fc86d3835de7b33aed8cfd2dbbda33", + "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1.dmg", + "build_number": "251.23774.436", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2024.3.5", - "sha256": "25d01d39d7e5f1d658548dadee4cd4972f25d60a8c10da3cb482a99c8e3181d3", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.5.dmg", - "build_number": "243.26053.29" + "version": "2025.1", + "sha256": "75e447b1a0e047fe1666bcd840b05ea7a03a0abcab0c1a7775c304d2cdb70c60", + "url": "https://download.jetbrains.com/python/pycharm-community-2025.1.dmg", + "build_number": "251.23774.444" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2024.3.5", - "sha256": "d98e90eccec085c467a547a7ee31ab6611479ea991fe7b99e41e81f491cfeeff", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.5.dmg", - "build_number": "243.26053.29" + "version": "2025.1", + "sha256": "3ee1462eb7fa52593c67a50374a9af9d0ab4d081aa3c7ed72305bcbb1285a16e", + "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1.dmg", + "build_number": "251.23774.444" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2024.3.6", - "sha256": "1677f8b1274149407799ba025f6a9316749a7b8d86ba142f77c807b52874f9fa", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.6.dmg", - "build_number": "243.25659.34" + "version": "2025.1", + "sha256": "e7d2dab3620e597a5f8a96f0611e97a489d7edecc8475f1be3109d3f0ab11327", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1.dmg", + "build_number": "251.23774.437" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2024.3.5", - "sha256": "fb9f10ef6c0e5741bcd35abf148133002d92865899e4a98a276be64ff88b9688", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.5.dmg", - "build_number": "243.26053.19" + "version": "2025.1", + "sha256": "3908c735f5c8293afa9166e48b6d90d717d5e472a3810f5f721026df51e4b07b", + "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1.dmg", + "build_number": "251.23774.429" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2024.3.7", - "sha256": "1326cfb150170e69c2fe62c4f7ff131d90117da3ee07b5e6134e46d44822fba0", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.7.dmg", - "build_number": "243.26053.17" + "version": "2025.1", + "sha256": "b0b41fbcb264aec50022800fb2930e3686d2f9dad07acc49621c85dfc3d4a193", + "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1.dmg", + "build_number": "251.23774.445" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2024.3.5", - "sha256": "6d7d3c7883f1344a08d39c4060dcd32c28039d7217549c88d703e65517be7898", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.5.dmg", - "build_number": "243.26053.12" + "version": "2025.1", + "sha256": "6acb3058c55c400d7a8dffd56edfdedf85cd6cf68735728ff02f123eb6804ac5", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1.dmg", + "build_number": "251.23774.424" }, "writerside": { "update-channel": "Writerside EAP", @@ -428,123 +428,123 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2024.3.4", - "sha256": "e9d601aaed26d8efa82137649acb24c24fdc8d555c42afa9226ed08d3a19fe4d", - "url": "https://download.jetbrains.com/cpp/CLion-2024.3.4-aarch64.dmg", - "build_number": "243.25659.42" + "version": "2025.1", + "sha256": "fdc89423f33affb7740ea6785977912e6030e9bccd06361e7b1a00b598e84f7e", + "url": "https://download.jetbrains.com/cpp/CLion-2025.1-aarch64.dmg", + "build_number": "251.23774.442" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "1ba33de8b5595a7ab3ab683ed21200c6c884c7c9299a9dfe4414ae29b219dc09", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.3.5-aarch64.dmg", - "build_number": "243.24978.79" + "version": "2025.1", + "sha256": "ae95080c1a8696bb4811dc4e18f195aa8f0c49d546ee7e4dbeaed1fe56d4d2ef", + "url": "https://download.jetbrains.com/datagrip/datagrip-2025.1-aarch64.dmg", + "build_number": "251.23774.426" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2024.3.2", - "sha256": "172a8641249784afe4f73359adb1419c2eb8b00bddfa4182bf691e44b3c4baa4", - "url": "https://download.jetbrains.com/python/dataspell-2024.3.2-aarch64.dmg", - "build_number": "243.25659.44" + "version": "2025.1", + "sha256": "f6dd63c5458ea2adeb76a9042ab3316b124fd9cbdcccd4d4b08c2d90e17b49b8", + "url": "https://download.jetbrains.com/python/dataspell-2025.1-aarch64.dmg", + "build_number": "251.23774.439" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2024.3.3", - "sha256": "846eb50e707231e34bc9ad467a5237a43a865061b10a1be6b4abe4a0cc08161b", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.3-aarch64.dmg", - "build_number": "243.24978.56" + "version": "2025.1", + "sha256": "51b25a295182bd916d0b3b2881cf3ebd1ed30577dd7c63253231c80a080df947", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.1-aarch64.dmg", + "build_number": "251.23774.441" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "7f3503352d47551c68818b288938fdb01ebd35d56153f6ed560058b19397796c", - "url": "https://download.jetbrains.com/go/goland-2024.3.5-aarch64.dmg", - "build_number": "243.26053.20" + "version": "2025.1", + "sha256": "6c478fc82467dc3f9970bc03b8c035210a0eb73cef9e32b27d6cd0dac9e166b6", + "url": "https://download.jetbrains.com/go/goland-2025.1-aarch64.dmg", + "build_number": "251.23774.430" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "b96b9fa3de829f0d5e98aa73766b3da4909186a464e3f8e7b8b3c975f1b0978b", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.5-aarch64.dmg", - "build_number": "243.26053.27" + "version": "2025.1", + "sha256": "051f322384f41dae627f0a2487f47a72e2c696ef38b5c256f4348aad0d47dffb", + "url": "https://download.jetbrains.com/idea/ideaIC-2025.1-aarch64.dmg", + "build_number": "251.23774.435" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "8cf632fbb89e6dfbd2a536643450e6ae6671001348461260fe0132ed14ef3d0c", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.5-aarch64.dmg", - "build_number": "243.26053.27" + "version": "2025.1", + "sha256": "2877c9ec5cfef9afa09c489083aa4c93f400d35556953ee757a4ee599432c601", + "url": "https://download.jetbrains.com/idea/ideaIU-2025.1-aarch64.dmg", + "build_number": "251.23774.435" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", - "version": "2024.3.1", - "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.1-macos-aarch64.dmg", - "sha256": "d5000f7309d36ce65929bcdc85b36f543cadb2a5cc2f0675b35edb69489bde8e", - "build_number": "243.24978.546" + "version": "2024.3.2", + "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.2-macos-aarch64.dmg", + "sha256": "9e6b8fb53418cef55bdbc690cc1c817f39b12b81cc3985522c24ee7f6fa5c364", + "build_number": "243.24978.603" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "439aea4e8f919701b058f619dc545ac5207bd2b340b9f1925281a7fe0747fbd6", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.5-aarch64.dmg", - "build_number": "243.26053.13", + "version": "2025.1", + "sha256": "f963bacc18282e83da5adb85d55d8a6db74b8636c5c88777031fe1f222cb6a07", + "url": "https://download.jetbrains.com/webide/PhpStorm-2025.1-aarch64.dmg", + "build_number": "251.23774.436", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "444edd06334a6b35964995b9af8ba998514eb1355f6035b905ec57e1a0ff7320", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.5-aarch64.dmg", - "build_number": "243.26053.29" + "version": "2025.1", + "sha256": "16f53e8200e3c17f1ea99cae469b94110cbc159e2063be0c0ce5e8b2f0214190", + "url": "https://download.jetbrains.com/python/pycharm-community-2025.1-aarch64.dmg", + "build_number": "251.23774.444" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "d92332e6b120669f7f9aded84b82b6c7a64c2512537faf623122e7f2505bbab1", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.5-aarch64.dmg", - "build_number": "243.26053.29" + "version": "2025.1", + "sha256": "8a0f796981c3df2cf19cdaa5aa75b2c3f45adf2e7b779c40d7043d6d8dbcebe3", + "url": "https://download.jetbrains.com/python/pycharm-professional-2025.1-aarch64.dmg", + "build_number": "251.23774.444" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2024.3.6", - "sha256": "bf3f08040194b1280a857886ac40c6518f83b40f60a6ee990d348a7e14b2c023", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.6-aarch64.dmg", - "build_number": "243.25659.34" + "version": "2025.1", + "sha256": "8a3b452dd35ed1be8eca579de47f27febdc68271123a0557354ded179f53bce2", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.1-aarch64.dmg", + "build_number": "251.23774.437" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "e7f12eeb72b3421108b8aafb03c4603b74e6ac8922dc192f2a2d5bb5811d4d48", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.5-aarch64.dmg", - "build_number": "243.26053.19" + "version": "2025.1", + "sha256": "fe19db995e43fbd2b76a90ef31ef61ae15c2ba5a479d40a539d1f768245683f3", + "url": "https://download.jetbrains.com/ruby/RubyMine-2025.1-aarch64.dmg", + "build_number": "251.23774.429" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2024.3.7", - "sha256": "e7d1f13d54637202dcf7a54a2f273b7d9fdc251ae6573df6316fc23dcc8611f2", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.7-aarch64.dmg", - "build_number": "243.26053.17" + "version": "2025.1", + "sha256": "4ee23c7ec5a85e8e42d9d74fb86e03ce9cac8e1d0c827df42360375fd912e81b", + "url": "https://download.jetbrains.com/rustrover/RustRover-2025.1-aarch64.dmg", + "build_number": "251.23774.445" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2024.3.5", - "sha256": "67f1898fcf936f22842a669ebe1cc746d8ae9069086dcf66efa2d86d73e78d5c", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.5-aarch64.dmg", - "build_number": "243.26053.12" + "version": "2025.1", + "sha256": "a2de4c845644d51501d7045b33ecb4f88c045cf6aeceb316d95ed115d4945cb6", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.1-aarch64.dmg", + "build_number": "251.23774.424" }, "writerside": { "update-channel": "Writerside EAP", diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index 97b2c5d70b99..d027877ecb97 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -9,7 +9,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -18,18 +17,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/164/710801/IdeaVIM-2.21.0.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/164/710801/IdeaVIM-2.21.0.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/164/710801/IdeaVIM-2.21.0.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/164/710801/IdeaVIM-2.21.0.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/164/710801/IdeaVIM-2.21.0.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/164/710801/IdeaVIM-2.21.0.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/164/710801/IdeaVIM-2.21.0.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/164/710801/IdeaVIM-2.21.0.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/164/710801/IdeaVIM-2.21.0.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/164/710801/IdeaVIM-2.21.0.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/164/710801/IdeaVIM-2.21.0.zip" }, "name": "ideavim" }, @@ -38,7 +36,7 @@ "idea-ultimate" ], "builds": { - "243.26053.27": "https://plugins.jetbrains.com/files/631/700118/python-243.26053.27.zip" + "251.23774.435": "https://plugins.jetbrains.com/files/631/717448/python-251.23774.456.zip" }, "name": "python" }, @@ -49,7 +47,7 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/1347/696516/scala-intellij-bin-2024.3.42.zip" + "251.23774.435": "https://plugins.jetbrains.com/files/1347/714050/scala-intellij-bin-2025.1.20.zip" }, "name": "scala" }, @@ -62,7 +60,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -71,18 +68,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip" }, "name": "string-manipulation" }, @@ -95,7 +91,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -104,18 +99,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip" }, "name": "handlebars-mustache" }, @@ -128,7 +122,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -137,18 +130,17 @@ ], "builds": { "243.22562.218": null, - "243.22562.220": null, - "243.24978.546": null, - "243.24978.79": null, - "243.25659.34": null, - "243.25659.42": null, - "243.26053.12": null, - "243.26053.13": null, - "243.26053.17": null, - "243.26053.19": null, - "243.26053.20": null, - "243.26053.27": null, - "243.26053.29": null + "243.24978.603": null, + "251.23774.424": null, + "251.23774.426": null, + "251.23774.429": null, + "251.23774.430": null, + "251.23774.435": null, + "251.23774.436": null, + "251.23774.437": null, + "251.23774.442": null, + "251.23774.444": null, + "251.23774.445": null }, "name": "kotlin" }, @@ -161,7 +153,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -170,18 +161,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/6981/690635/ini-243.25659.54.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/6981/690635/ini-243.25659.54.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/6981/711004/ini-251.23774.318.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/6981/711004/ini-251.23774.318.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/6981/711004/ini-251.23774.318.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/6981/711004/ini-251.23774.318.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/6981/711004/ini-251.23774.318.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/6981/711004/ini-251.23774.318.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/6981/711004/ini-251.23774.318.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/6981/711004/ini-251.23774.318.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/6981/711004/ini-251.23774.318.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/6981/711004/ini-251.23774.318.zip" }, "name": "ini" }, @@ -194,7 +184,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -203,18 +192,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" }, "name": "acejump" }, @@ -227,7 +215,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -236,18 +223,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip" }, "name": "grep-console" }, @@ -260,7 +246,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -269,18 +254,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/7177/636663/fileWatcher-243.22562.13.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/7177/636663/fileWatcher-243.22562.13.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip" }, "name": "file-watchers" }, @@ -290,8 +274,8 @@ "phpstorm" ], "builds": { - "243.26053.13": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip" + "251.23774.435": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip" }, "name": "symfony-support" }, @@ -301,8 +285,8 @@ "phpstorm" ], "builds": { - "243.26053.13": "https://plugins.jetbrains.com/files/7320/701175/PHP_Annotations-11.2.0.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7320/701175/PHP_Annotations-11.2.0.zip" + "251.23774.435": null, + "251.23774.436": null }, "name": "php-annotations" }, @@ -313,22 +297,21 @@ "goland", "idea-community", "idea-ultimate", - "pycharm-community", + "pycharm-professional", "rider", "rust-rover", "webstorm" ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip" + "251.23774.424": "https://plugins.jetbrains.com/files/7322/717454/python-ce-251.23774.456.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/7322/717454/python-ce-251.23774.456.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/7322/717454/python-ce-251.23774.456.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/7322/717454/python-ce-251.23774.456.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/7322/717454/python-ce-251.23774.456.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/7322/717454/python-ce-251.23774.456.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/7322/717454/python-ce-251.23774.456.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/7322/717454/python-ce-251.23774.456.zip" }, "name": "python-community-edition" }, @@ -341,7 +324,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -350,18 +332,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/7391/698673/asciidoctor-intellij-plugin-0.44.3.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/7391/698673/asciidoctor-intellij-plugin-0.44.3.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/7391/698673/asciidoctor-intellij-plugin-0.44.3.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/7391/698673/asciidoctor-intellij-plugin-0.44.3.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/7391/698673/asciidoctor-intellij-plugin-0.44.3.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/7391/698673/asciidoctor-intellij-plugin-0.44.3.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/7391/698673/asciidoctor-intellij-plugin-0.44.3.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/7391/698673/asciidoctor-intellij-plugin-0.44.3.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/7391/698673/asciidoctor-intellij-plugin-0.44.3.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/7391/698673/asciidoctor-intellij-plugin-0.44.3.zip" }, "name": "asciidoc" }, @@ -374,7 +355,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -383,18 +363,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.22562.220": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.24978.546": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.24978.79": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.25659.34": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.25659.42": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.26053.12": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.26053.13": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.26053.17": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.26053.19": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.26053.20": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.26053.27": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", - "243.26053.29": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar" + "243.24978.603": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.23774.424": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.23774.426": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.23774.429": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.23774.430": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.23774.435": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.23774.436": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.23774.437": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.23774.442": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.23774.444": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar", + "251.23774.445": "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar" }, "name": "wakatime" }, @@ -407,7 +386,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -415,19 +393,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/7499/711707/gittoolbox-600.1.1_243-signed.zip", + "243.24978.603": "https://plugins.jetbrains.com/files/7499/711707/gittoolbox-600.1.1_243-signed.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/7499/711707/gittoolbox-600.1.1_243-signed.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/7499/711707/gittoolbox-600.1.1_243-signed.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/7499/711707/gittoolbox-600.1.1_243-signed.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/7499/711707/gittoolbox-600.1.1_243-signed.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/7499/711707/gittoolbox-600.1.1_243-signed.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/7499/711707/gittoolbox-600.1.1_243-signed.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/7499/711707/gittoolbox-600.1.1_243-signed.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/7499/711707/gittoolbox-600.1.1_243-signed.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/7499/711707/gittoolbox-600.1.1_243-signed.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/7499/711707/gittoolbox-600.1.1_243-signed.zip" }, "name": "gittoolbox" }, @@ -440,7 +417,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -449,18 +425,17 @@ ], "builds": { "243.22562.218": null, - "243.22562.220": null, - "243.24978.546": "https://plugins.jetbrains.com/files/7724/680796/clouds-docker-impl-243.24978.54.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/7724/680796/clouds-docker-impl-243.24978.54.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/7724/692258/clouds-docker-impl-243.25659.59.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/7724/692258/clouds-docker-impl-243.25659.59.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/7724/680796/clouds-docker-impl-243.24978.54.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/7724/715275/clouds-docker-impl-251.23774.426.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/7724/715275/clouds-docker-impl-251.23774.426.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/7724/715275/clouds-docker-impl-251.23774.426.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/7724/715275/clouds-docker-impl-251.23774.426.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/7724/715275/clouds-docker-impl-251.23774.426.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/7724/715275/clouds-docker-impl-251.23774.426.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/7724/715275/clouds-docker-impl-251.23774.426.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/7724/715275/clouds-docker-impl-251.23774.426.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/7724/715275/clouds-docker-impl-251.23774.426.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/7724/715275/clouds-docker-impl-251.23774.426.zip" }, "name": "docker" }, @@ -473,7 +448,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -482,18 +456,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/8097/636616/graphql-243.22562.13.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/8097/636616/graphql-243.22562.13.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/8097/680200/graphql-243.24978.46.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/8097/680200/graphql-243.24978.46.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/8097/680200/graphql-243.24978.46.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip" }, "name": "graphql" }, @@ -506,7 +479,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -514,17 +486,16 @@ ], "builds": { "243.22562.218": null, - "243.22562.220": null, - "243.24978.546": null, - "243.24978.79": null, - "243.25659.34": null, - "243.25659.42": null, - "243.26053.12": null, - "243.26053.13": null, - "243.26053.19": null, - "243.26053.20": null, - "243.26053.27": null, - "243.26053.29": null + "243.24978.603": null, + "251.23774.424": null, + "251.23774.426": null, + "251.23774.429": null, + "251.23774.430": null, + "251.23774.435": null, + "251.23774.436": null, + "251.23774.437": null, + "251.23774.442": null, + "251.23774.444": null }, "name": "-deprecated-rust" }, @@ -537,7 +508,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -545,17 +515,16 @@ ], "builds": { "243.22562.218": null, - "243.22562.220": null, - "243.24978.546": null, - "243.24978.79": null, - "243.25659.34": null, - "243.25659.42": null, - "243.26053.12": null, - "243.26053.13": null, - "243.26053.19": null, - "243.26053.20": null, - "243.26053.27": null, - "243.26053.29": null + "243.24978.603": null, + "251.23774.424": null, + "251.23774.426": null, + "251.23774.429": null, + "251.23774.430": null, + "251.23774.435": null, + "251.23774.436": null, + "251.23774.437": null, + "251.23774.442": null, + "251.23774.444": null }, "name": "-deprecated-rust-beta" }, @@ -568,7 +537,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -577,18 +545,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/8195/630064/toml-243.21565.122.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/8195/630064/toml-243.21565.122.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/8195/715934/toml-251.23774.429.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/8195/715934/toml-251.23774.429.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/8195/715934/toml-251.23774.429.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/8195/715934/toml-251.23774.429.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/8195/715934/toml-251.23774.429.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/8195/715934/toml-251.23774.429.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/8195/715934/toml-251.23774.429.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/8195/715934/toml-251.23774.429.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/8195/715934/toml-251.23774.429.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/8195/715934/toml-251.23774.429.zip" }, "name": "toml" }, @@ -599,7 +566,7 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip" + "251.23774.435": "https://plugins.jetbrains.com/files/8327/704864/Minecraft_Development-2025.1-1.8.3.zip" }, "name": "minecraft-development" }, @@ -612,7 +579,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -620,19 +586,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/8554/684425/featuresTrainer-243.24978.79.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/8554/684425/featuresTrainer-243.24978.79.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/8554/690630/featuresTrainer-243.25659.54.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/8554/690630/featuresTrainer-243.25659.54.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip" + "243.22562.218": null, + "243.24978.603": "https://plugins.jetbrains.com/files/8554/684425/featuresTrainer-243.24978.79.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/8554/716074/featuresTrainer-251.23774.436.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/8554/716074/featuresTrainer-251.23774.436.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/8554/716074/featuresTrainer-251.23774.436.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/8554/716074/featuresTrainer-251.23774.436.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/8554/716074/featuresTrainer-251.23774.436.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/8554/716074/featuresTrainer-251.23774.436.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/8554/716074/featuresTrainer-251.23774.436.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/8554/716074/featuresTrainer-251.23774.436.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/8554/716074/featuresTrainer-251.23774.436.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/8554/716074/featuresTrainer-251.23774.436.zip" }, "name": "ide-features-trainer" }, @@ -645,7 +610,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -654,18 +618,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip" }, "name": "nixidea" }, @@ -678,7 +641,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -687,18 +649,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip" }, "name": "-env-files" }, @@ -708,8 +669,8 @@ "idea-ultimate" ], "builds": { - "243.26053.20": "https://plugins.jetbrains.com/files/9568/700127/go-plugin-243.26053.27.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/9568/700127/go-plugin-243.26053.27.zip" + "251.23774.430": "https://plugins.jetbrains.com/files/9568/716123/go-plugin-251.23774.435.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/9568/716123/go-plugin-251.23774.435.zip" }, "name": "go" }, @@ -722,7 +683,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -730,19 +690,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.22562.220": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.24978.546": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.24978.79": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.25659.34": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.25659.42": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.26053.12": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.26053.13": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.26053.17": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.26053.19": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.26053.20": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.26053.27": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar", - "243.26053.29": "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar" + "243.22562.218": "https://plugins.jetbrains.com/files/9707/702582/ANSI_Highlighter_Premium-24.3.4.jar", + "243.24978.603": "https://plugins.jetbrains.com/files/9707/702582/ANSI_Highlighter_Premium-24.3.4.jar", + "251.23774.424": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.23774.426": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.23774.429": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.23774.430": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.23774.435": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.23774.436": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.23774.437": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.23774.442": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.23774.444": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar", + "251.23774.445": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar" }, "name": "ansi-highlighter-premium" }, @@ -755,7 +714,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -764,18 +722,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip" }, "name": "key-promoter-x" }, @@ -788,7 +745,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -797,18 +753,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip" }, "name": "randomness" }, @@ -821,7 +776,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -830,18 +784,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip" }, "name": "csv-editor" }, @@ -854,7 +807,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -862,19 +814,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/10080/712102/intellij-rainbow-brackets-2024.2.10-241.zip", + "243.24978.603": "https://plugins.jetbrains.com/files/10080/712102/intellij-rainbow-brackets-2024.2.10-241.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/10080/712102/intellij-rainbow-brackets-2024.2.10-241.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/10080/712102/intellij-rainbow-brackets-2024.2.10-241.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/10080/712102/intellij-rainbow-brackets-2024.2.10-241.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/10080/712102/intellij-rainbow-brackets-2024.2.10-241.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/10080/712102/intellij-rainbow-brackets-2024.2.10-241.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/10080/712102/intellij-rainbow-brackets-2024.2.10-241.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/10080/712102/intellij-rainbow-brackets-2024.2.10-241.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/10080/712102/intellij-rainbow-brackets-2024.2.10-241.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/10080/712102/intellij-rainbow-brackets-2024.2.10-241.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/10080/712102/intellij-rainbow-brackets-2024.2.10-241.zip" }, "name": "rainbow-brackets" }, @@ -887,7 +838,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -896,18 +846,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip" }, "name": "dot-language" }, @@ -920,7 +869,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -929,18 +877,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip" }, "name": "hocon" }, @@ -953,7 +900,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -961,19 +907,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/11058/715249/Extra_Icons-2025.1.4.zip", + "243.24978.603": "https://plugins.jetbrains.com/files/11058/715249/Extra_Icons-2025.1.4.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/11058/715249/Extra_Icons-2025.1.4.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/11058/715249/Extra_Icons-2025.1.4.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/11058/715249/Extra_Icons-2025.1.4.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/11058/715249/Extra_Icons-2025.1.4.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/11058/715249/Extra_Icons-2025.1.4.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/11058/715249/Extra_Icons-2025.1.4.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/11058/715249/Extra_Icons-2025.1.4.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/11058/715249/Extra_Icons-2025.1.4.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/11058/715249/Extra_Icons-2025.1.4.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/11058/715249/Extra_Icons-2025.1.4.zip" }, "name": "extra-icons" }, @@ -986,7 +931,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -994,19 +938,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/11349/714101/aws-toolkit-jetbrains-standalone-3.66-243.zip", + "243.24978.603": "https://plugins.jetbrains.com/files/11349/714101/aws-toolkit-jetbrains-standalone-3.66-243.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/11349/714099/aws-toolkit-jetbrains-standalone-3.66-251.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/11349/714099/aws-toolkit-jetbrains-standalone-3.66-251.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/11349/714099/aws-toolkit-jetbrains-standalone-3.66-251.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/11349/714099/aws-toolkit-jetbrains-standalone-3.66-251.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/11349/714099/aws-toolkit-jetbrains-standalone-3.66-251.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/11349/714099/aws-toolkit-jetbrains-standalone-3.66-251.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/11349/714099/aws-toolkit-jetbrains-standalone-3.66-251.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/11349/714099/aws-toolkit-jetbrains-standalone-3.66-251.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/11349/714099/aws-toolkit-jetbrains-standalone-3.66-251.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/11349/714099/aws-toolkit-jetbrains-standalone-3.66-251.zip" }, "name": "aws-toolkit" }, @@ -1015,7 +958,7 @@ "rider" ], "builds": { - "243.25659.34": "https://plugins.jetbrains.com/files/12024/622380/ReSharperPlugin.CognitiveComplexity-2024.3.0-eap04.zip" + "251.23774.437": "https://plugins.jetbrains.com/files/12024/667413/ReSharperPlugin.CognitiveComplexity-2025.1.0-eap01.zip" }, "name": "cognitivecomplexity" }, @@ -1028,7 +971,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1037,18 +979,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip" }, "name": "vscode-keymap" }, @@ -1061,7 +1002,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1070,18 +1010,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip" }, "name": "eclipse-keymap" }, @@ -1094,7 +1033,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1103,18 +1041,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip" }, "name": "rainbow-csv" }, @@ -1127,7 +1064,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1136,18 +1072,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip" }, "name": "visual-studio-keymap" }, @@ -1160,7 +1095,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1169,18 +1103,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip" }, "name": "indent-rainbow" }, @@ -1193,7 +1126,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1202,18 +1134,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip" }, "name": "protocol-buffers" }, @@ -1226,7 +1157,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1235,18 +1165,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.22562.220": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.24978.546": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.24978.79": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.25659.34": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.25659.42": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.26053.12": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.26053.13": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.26053.17": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.26053.19": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.26053.20": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.26053.27": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "243.26053.29": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "243.24978.603": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.23774.424": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.23774.426": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.23774.429": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.23774.430": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.23774.435": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.23774.436": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.23774.437": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.23774.442": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.23774.444": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "251.23774.445": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -1259,7 +1188,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1268,18 +1196,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.22562.220": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.24978.546": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.24978.79": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.25659.34": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.25659.42": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.26053.12": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.26053.13": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.26053.17": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.26053.19": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.26053.20": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.26053.27": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", - "243.26053.29": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar" + "243.24978.603": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.23774.424": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.23774.426": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.23774.429": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.23774.430": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.23774.435": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.23774.436": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.23774.437": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.23774.442": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.23774.444": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar", + "251.23774.445": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar" }, "name": "mario-progress-bar" }, @@ -1292,7 +1219,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1301,18 +1227,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.22562.220": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.24978.546": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.24978.79": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.25659.34": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.25659.42": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.26053.12": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.26053.13": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.26053.17": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.26053.19": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.26053.20": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.26053.27": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", - "243.26053.29": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar" + "243.24978.603": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.23774.424": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.23774.426": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.23774.429": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.23774.430": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.23774.435": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.23774.436": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.23774.437": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.23774.442": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.23774.444": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar", + "251.23774.445": "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar" }, "name": "which-key" }, @@ -1325,7 +1250,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1333,19 +1257,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/16604/715248/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.6.zip", + "243.24978.603": "https://plugins.jetbrains.com/files/16604/715248/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.6.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/16604/715248/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.6.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/16604/715248/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.6.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/16604/715248/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.6.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/16604/715248/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.6.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/16604/715248/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.6.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/16604/715248/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.6.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/16604/715248/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.6.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/16604/715248/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.6.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/16604/715248/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.6.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/16604/715248/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.6.zip" }, "name": "extra-toolwindow-colorful-icons" }, @@ -1358,7 +1281,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1366,19 +1288,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/17718/704003/github-copilot-intellij-1.5.40-243.zip", + "243.24978.603": "https://plugins.jetbrains.com/files/17718/704003/github-copilot-intellij-1.5.40-243.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/17718/704003/github-copilot-intellij-1.5.40-243.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/17718/704003/github-copilot-intellij-1.5.40-243.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/17718/704003/github-copilot-intellij-1.5.40-243.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/17718/704003/github-copilot-intellij-1.5.40-243.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/17718/704003/github-copilot-intellij-1.5.40-243.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/17718/704003/github-copilot-intellij-1.5.40-243.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/17718/704003/github-copilot-intellij-1.5.40-243.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/17718/704003/github-copilot-intellij-1.5.40-243.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/17718/704003/github-copilot-intellij-1.5.40-243.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/17718/704003/github-copilot-intellij-1.5.40-243.zip" }, "name": "github-copilot" }, @@ -1391,7 +1312,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1400,18 +1320,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -1424,7 +1343,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1433,18 +1351,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip" }, "name": "catppuccin-theme" }, @@ -1457,7 +1374,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1466,18 +1382,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip" }, "name": "codeglance-pro" }, @@ -1490,7 +1405,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1498,19 +1412,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.22562.220": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.24978.546": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.24978.79": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.25659.34": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.25659.42": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.26053.12": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.26053.13": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.26053.17": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.26053.19": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.26053.20": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.26053.27": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar", - "243.26053.29": "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar" + "243.22562.218": "https://plugins.jetbrains.com/files/18922/716266/GerryThemes.jar", + "243.24978.603": "https://plugins.jetbrains.com/files/18922/716266/GerryThemes.jar", + "251.23774.424": "https://plugins.jetbrains.com/files/18922/716266/GerryThemes.jar", + "251.23774.426": "https://plugins.jetbrains.com/files/18922/716266/GerryThemes.jar", + "251.23774.429": "https://plugins.jetbrains.com/files/18922/716266/GerryThemes.jar", + "251.23774.430": "https://plugins.jetbrains.com/files/18922/716266/GerryThemes.jar", + "251.23774.435": "https://plugins.jetbrains.com/files/18922/716266/GerryThemes.jar", + "251.23774.436": "https://plugins.jetbrains.com/files/18922/716266/GerryThemes.jar", + "251.23774.437": "https://plugins.jetbrains.com/files/18922/716266/GerryThemes.jar", + "251.23774.442": "https://plugins.jetbrains.com/files/18922/716266/GerryThemes.jar", + "251.23774.444": "https://plugins.jetbrains.com/files/18922/716266/GerryThemes.jar", + "251.23774.445": "https://plugins.jetbrains.com/files/18922/716266/GerryThemes.jar" }, "name": "gerry-themes" }, @@ -1523,7 +1436,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1532,18 +1444,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip" }, "name": "better-direnv" }, @@ -1556,7 +1467,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1565,18 +1475,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip" }, "name": "mermaid" }, @@ -1589,7 +1498,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1598,18 +1506,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip" }, "name": "ferris" }, @@ -1622,7 +1529,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1631,18 +1537,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip" }, "name": "code-complexity" }, @@ -1655,7 +1560,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1664,18 +1568,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip" }, "name": "developer-tools" }, @@ -1685,22 +1588,20 @@ "goland", "idea-ultimate", "phpstorm", - "pycharm-professional", "rider", "ruby-mine", "rust-rover", "webstorm" ], "builds": { - "243.25659.34": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip" + "251.23774.424": "https://plugins.jetbrains.com/files/21962/712840/clouds-docker-gateway-251.23774.311.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/21962/712840/clouds-docker-gateway-251.23774.311.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/21962/712840/clouds-docker-gateway-251.23774.311.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/21962/712840/clouds-docker-gateway-251.23774.311.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/21962/712840/clouds-docker-gateway-251.23774.311.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/21962/712840/clouds-docker-gateway-251.23774.311.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/21962/712840/clouds-docker-gateway-251.23774.311.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/21962/712840/clouds-docker-gateway-251.23774.311.zip" }, "name": "dev-containers" }, @@ -1711,9 +1612,9 @@ "rust-rover" ], "builds": { - "243.25659.42": "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip" + "251.23774.435": "https://plugins.jetbrains.com/files/22407/716547/intellij-rust-251.23774.445.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/22407/716547/intellij-rust-251.23774.445.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/22407/716547/intellij-rust-251.23774.445.zip" }, "name": "rust" }, @@ -1726,7 +1627,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1734,19 +1634,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/22707/704500/continue-intellij-extension-1.0.8.zip", + "243.24978.603": "https://plugins.jetbrains.com/files/22707/704500/continue-intellij-extension-1.0.8.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/22707/704500/continue-intellij-extension-1.0.8.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/22707/704500/continue-intellij-extension-1.0.8.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/22707/704500/continue-intellij-extension-1.0.8.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/22707/704500/continue-intellij-extension-1.0.8.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/22707/704500/continue-intellij-extension-1.0.8.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/22707/704500/continue-intellij-extension-1.0.8.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/22707/704500/continue-intellij-extension-1.0.8.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/22707/704500/continue-intellij-extension-1.0.8.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/22707/704500/continue-intellij-extension-1.0.8.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/22707/704500/continue-intellij-extension-1.0.8.zip" }, "name": "continue" }, @@ -1759,7 +1658,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1768,18 +1666,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/22857/640903/vcs-gitlab-243.22562.53.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/22857/640903/vcs-gitlab-243.22562.53.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip" }, "name": "gitlab" }, @@ -1792,7 +1689,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1800,19 +1696,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "243.24978.603": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip" }, "name": "catppuccin-icons" }, @@ -1825,7 +1720,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1834,18 +1728,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip" }, "name": "mermaid-chart" }, @@ -1858,7 +1751,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1867,18 +1759,17 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip" + "243.24978.603": "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip", + "251.23774.424": null, + "251.23774.426": null, + "251.23774.429": null, + "251.23774.430": null, + "251.23774.435": null, + "251.23774.436": null, + "251.23774.437": null, + "251.23774.442": null, + "251.23774.444": null, + "251.23774.445": null }, "name": "oxocarbon" }, @@ -1891,7 +1782,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1899,19 +1789,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/23927/715251/Extra_IDE_Tweaks-2025.1.4.zip", + "243.24978.603": "https://plugins.jetbrains.com/files/23927/715251/Extra_IDE_Tweaks-2025.1.4.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/23927/715251/Extra_IDE_Tweaks-2025.1.4.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/23927/715251/Extra_IDE_Tweaks-2025.1.4.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/23927/715251/Extra_IDE_Tweaks-2025.1.4.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/23927/715251/Extra_IDE_Tweaks-2025.1.4.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/23927/715251/Extra_IDE_Tweaks-2025.1.4.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/23927/715251/Extra_IDE_Tweaks-2025.1.4.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/23927/715251/Extra_IDE_Tweaks-2025.1.4.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/23927/715251/Extra_IDE_Tweaks-2025.1.4.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/23927/715251/Extra_IDE_Tweaks-2025.1.4.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/23927/715251/Extra_IDE_Tweaks-2025.1.4.zip" }, "name": "extra-ide-tweaks" }, @@ -1924,7 +1813,6 @@ "idea-ultimate", "mps", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1932,19 +1820,18 @@ "webstorm" ], "builds": { - "243.22562.218": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.24978.546": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip" + "243.22562.218": "https://plugins.jetbrains.com/files/24559/715250/Extra_Tools_Pack-2025.1.5.zip", + "243.24978.603": "https://plugins.jetbrains.com/files/24559/715250/Extra_Tools_Pack-2025.1.5.zip", + "251.23774.424": "https://plugins.jetbrains.com/files/24559/715250/Extra_Tools_Pack-2025.1.5.zip", + "251.23774.426": "https://plugins.jetbrains.com/files/24559/715250/Extra_Tools_Pack-2025.1.5.zip", + "251.23774.429": "https://plugins.jetbrains.com/files/24559/715250/Extra_Tools_Pack-2025.1.5.zip", + "251.23774.430": "https://plugins.jetbrains.com/files/24559/715250/Extra_Tools_Pack-2025.1.5.zip", + "251.23774.435": "https://plugins.jetbrains.com/files/24559/715250/Extra_Tools_Pack-2025.1.5.zip", + "251.23774.436": "https://plugins.jetbrains.com/files/24559/715250/Extra_Tools_Pack-2025.1.5.zip", + "251.23774.437": "https://plugins.jetbrains.com/files/24559/715250/Extra_Tools_Pack-2025.1.5.zip", + "251.23774.442": "https://plugins.jetbrains.com/files/24559/715250/Extra_Tools_Pack-2025.1.5.zip", + "251.23774.444": "https://plugins.jetbrains.com/files/24559/715250/Extra_Tools_Pack-2025.1.5.zip", + "251.23774.445": "https://plugins.jetbrains.com/files/24559/715250/Extra_Tools_Pack-2025.1.5.zip" }, "name": "extra-tools-pack" }, @@ -1955,23 +1842,21 @@ "goland", "idea-ultimate", "phpstorm", - "pycharm-professional", "rider", "ruby-mine", "rust-rover", "webstorm" ], "builds": { - "243.24978.79": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip" + "251.23774.424": null, + "251.23774.426": null, + "251.23774.429": null, + "251.23774.430": null, + "251.23774.435": null, + "251.23774.436": null, + "251.23774.437": null, + "251.23774.442": null, + "251.23774.445": null }, "name": "nix-lsp" }, @@ -1983,7 +1868,6 @@ "idea-community", "idea-ultimate", "phpstorm", - "pycharm-community", "pycharm-professional", "rider", "ruby-mine", @@ -1992,99 +1876,108 @@ ], "builds": { "243.22562.218": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.22562.220": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.24978.79": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.25659.34": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.25659.42": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.26053.12": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.26053.13": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.26053.17": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.26053.19": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.26053.20": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.26053.27": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip", - "243.26053.29": "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip" + "251.23774.424": null, + "251.23774.426": null, + "251.23774.429": null, + "251.23774.430": null, + "251.23774.435": null, + "251.23774.436": null, + "251.23774.437": null, + "251.23774.442": null, + "251.23774.444": null, + "251.23774.445": null }, "name": "markdtask" } }, "files": { "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip": "sha256-frvQ+Dm1ueID6+vNlja0HtecGyn+ppq9GTgmU3kQ+58=", - "https://plugins.jetbrains.com/files/10080/689210/intellij-rainbow-brackets-2024.2.9-241.zip": "sha256-QfJAfpKaHeKo9xQwFd+3pVRxYGTO60puORrZ0rdpaZY=", + "https://plugins.jetbrains.com/files/10080/712102/intellij-rainbow-brackets-2024.2.10-241.zip": "sha256-4w2eFdyytR4+2yTG5JiXdxAetzm34IC370lEtkLiTRA=", "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip": "sha256-25vtwXuBNiYL9E0pKG4dqJDkwX1FckAErdqRPKXybQA=", "https://plugins.jetbrains.com/files/10481/583591/intellij-hocon-2024.2.0.zip": "sha256-Bnnvy+HDNkx2DQM7N+JUa8hQzIA3H/5Y0WpWAjPmhUI=", - "https://plugins.jetbrains.com/files/11058/699177/Extra_Icons-2025.1.3.zip": "sha256-suQxHLMgY0x/XHI1EikPI1mBpsTn4bkKO6HgCBb+OmA=", - "https://plugins.jetbrains.com/files/11349/697687/aws-toolkit-jetbrains-standalone-3.59-243.zip": "sha256-+CeHk1yCPPGP8Vn9irjDqszprqmDTtjqUGuzKk+rJpI=", - "https://plugins.jetbrains.com/files/12024/622380/ReSharperPlugin.CognitiveComplexity-2024.3.0-eap04.zip": "sha256-X2x7uyWoV4aBI8E5bw35QfzmySWzbEAZ2nvdo5i+t+s=", + "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip": "sha256-GO0bXJsHx9O1A6M9NUCv9m4JwKHs5plwSssgx+InNqE=", + "https://plugins.jetbrains.com/files/11058/715249/Extra_Icons-2025.1.4.zip": "sha256-RhbHeugDhkdHy7XHPVUBjcQLB/kGIsN6BzalxvEr9Bs=", + "https://plugins.jetbrains.com/files/11349/714099/aws-toolkit-jetbrains-standalone-3.66-251.zip": "sha256-wJ4fJXvknP2gPF6/wAipSY3i46rc07NJvUH69ZR/0mI=", + "https://plugins.jetbrains.com/files/11349/714101/aws-toolkit-jetbrains-standalone-3.66-243.zip": "sha256-gkdKYyCmjdP1YJlkfE5bJZ9uj1xe66PuqpNpFd/G1dU=", + "https://plugins.jetbrains.com/files/12024/667413/ReSharperPlugin.CognitiveComplexity-2025.1.0-eap01.zip": "sha256-SWIXjxnwAf9dju1oOgzePrTY0lPNNX54Afp5OIkGGi4=", "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip": "sha256-phv8MTGKNGzRviKzX+nIVTbkX4WkU82QVO5zXUQLtAo=", + "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip": "sha256-obbLL8n6gK8oFw8NnJbdAylPHfTv4GheBDnVFOUpwL0=", "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip": "sha256-/g1ucT18ywVJnCePH7WyMWKgM9umowBz5wFObmO7cws=", + "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip": "sha256-HC1s5FqSLVgPNKc5Wiw0RFC6KpozxmjKzbh9rS9nFwc=", "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip": "sha256-Q+gqKG/2bHD49Xtn9MNlYJQGtNF/7tIay9F7ndi8uwA=", "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip": "sha256-VQqK0Cm9ddXN63KYIqimuGOh7EB9VvdlErp/VrWx8SA=", + "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip": "sha256-DKkgt0z/ui0bOLSbnKy51RL7+9HIqeriroi2otZ64mQ=", "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip": "sha256-eKwDE+PMtYhrGbDDZPS5cimssH+1xV4GF6RXXg/3urU=", "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip": "sha256-4I75KqXyFl73S63O+00usrg8QBcuBRBgfjRmCQMpNks=", - "https://plugins.jetbrains.com/files/1347/696516/scala-intellij-bin-2024.3.42.zip": "sha256-IEh/wlpfCK+lpUD+xYpeCDwpEA8NVzfirpyf5MUgC7A=", + "https://plugins.jetbrains.com/files/1347/714050/scala-intellij-bin-2025.1.20.zip": "sha256-AdwKkglDsrPJf4xOejG6aV77+LAjGrTEvLizVw5/Tn4=", "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip": "sha256-Tgu8CfDhO6KugfuLNhmxe89dMm+Qo3fmAg/8hwjUaoc=", + "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip": "sha256-ZYn365EY8+VP1TKM4wBotMj1hYbSSr4J1K5oIZlE2SE=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar": "sha256-mB09zvUg1hLXl9lgW1NEU+DyVel1utZv6s+mFykckYY=", "https://plugins.jetbrains.com/files/15976/593529/IDEA_Which-Key-0.10.3.jar": "sha256-2FlEaHf2rO6xgG3LnZIPt/XKgRGjpLSiEXCncfAf3bI=", "https://plugins.jetbrains.com/files/164/676777/IdeaVIM-2.19.0.zip": "sha256-yKpWQZGxfsKwPVTJLHpF4KGJ5ANCd73uxHlfdFE4Qf4=", - "https://plugins.jetbrains.com/files/16604/699178/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.5.zip": "sha256-ycstNSciTV1LAsvJ3fTXN3NmQ259nkrAeX6MASjdmag=", - "https://plugins.jetbrains.com/files/17718/694875/github-copilot-intellij-1.5.38-243.zip": "sha256-lq5JmR8gPsrZ9rT+byit98KZSzFsl4UppwYAaE9Kjiw=", + "https://plugins.jetbrains.com/files/164/710801/IdeaVIM-2.21.0.zip": "sha256-x+blg81BXwCXk7cwrXmofJs9syJLo58xGwSFFmqpLHE=", + "https://plugins.jetbrains.com/files/16604/715248/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.6.zip": "sha256-S7RPgVZjtSCUsdOJCgo1tm3ooyOfGmLEcvwrdBZEfOM=", + "https://plugins.jetbrains.com/files/17718/704003/github-copilot-intellij-1.5.40-243.zip": "sha256-eljjLNkW1zDx59zxIbbTbi1b+dZxkO1nlFuuOQ8a7YU=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", "https://plugins.jetbrains.com/files/18682/680233/Catppuccin_Theme-3.4.1.zip": "sha256-QOF3nAXOfYhNl3YUK1fc9z5H2uXTPm2X+6fVZ5QP8ZQ=", "https://plugins.jetbrains.com/files/18824/694222/CodeGlancePro-1.9.7-signed.zip": "sha256-8RjKjmadd1o/M+WTLtKPn354bbKgEht4nvWnMcRPN9w=", - "https://plugins.jetbrains.com/files/18922/694217/GerryThemes.jar": "sha256-8Ufa8YuGOG78KRSxo/GiwPFrd/3lwQhLWwAnB6igaGE=", + "https://plugins.jetbrains.com/files/18922/716266/GerryThemes.jar": "sha256-UEqOBSjxz+ovQ+AqZg23QN8LypTc6yUV8/1xT93vjgI=", "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip": "sha256-hoFfIid7lClHDiT+ZH3H+tFSvWYb1tSRZH1iif+kWrM=", "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip": "sha256-jGWRU0g120qYvvFiUFI10zvprTsemuIq3XmIjYxZGts=", + "https://plugins.jetbrains.com/files/20146/717659/Mermaid-0.0.25_IJ.243.zip": "sha256-QqEjnN6lUUtHkDRFWPeV3vqgGB/ZfWGVDqtk8gwJEqY=", "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip": "sha256-N66Bh0AwHmg5N9PNguRAGtpJ/dLMWMp3rxjTgz9poFo=", "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip": "sha256-TZPup3EJ0cBv4i2eVAQwVmmzy0rmt4KptEsk3C7baEM=", "https://plugins.jetbrains.com/files/21667/693656/code-complexity-plugin-1.6.2.zip": "sha256-2qDeC2Fxp4/IfiLPL1JDquJDCzONCp4m92Ht2fnCn/M=", "https://plugins.jetbrains.com/files/21904/665427/intellij-developer-tools-plugin-6.3.0-signed.zip": "sha256-TEx5wg3Sf3rkhl6oj0hRrMdBJW9KMjZ/yNDgNYaeP28=", - "https://plugins.jetbrains.com/files/21962/684422/clouds-docker-gateway-243.24978.79.zip": "sha256-jmfcGDtizib7wQW88sWuzG095nrT0KHyN98trxqISHE=", - "https://plugins.jetbrains.com/files/22407/697137/intellij-rust-243.26053.17__1_.zip": "sha256-P5PmGUNOJJ5+Z1CYQM1ItwrS/JecBPOb9qU3kZK842w=", - "https://plugins.jetbrains.com/files/22707/689483/continue-intellij-extension-1.0.2.zip": "sha256-Kf5kHd8tGVIClWcrin9zOFbQkZyOrwHpfMvdznPkNC0=", + "https://plugins.jetbrains.com/files/21962/712840/clouds-docker-gateway-251.23774.311.zip": "sha256-bJo6iT4VO+XuTJQrcaf8H8ITELvgOWEy90PLuf2HoC8=", + "https://plugins.jetbrains.com/files/22407/716547/intellij-rust-251.23774.445.zip": "sha256-NlkO94GO5epSkkUfAYZUBwUjw9cZg6flajTRAyPv/GU=", + "https://plugins.jetbrains.com/files/22707/704500/continue-intellij-extension-1.0.8.zip": "sha256-jkVAWhxcwf6iWX6/dSK+z7cUR4PvqTdNxASYgaesYg0=", "https://plugins.jetbrains.com/files/22857/640903/vcs-gitlab-243.22562.53.zip": "sha256-lDStIaRy9ZtCXZxM2RRrz/5oZeL90aRVS63wC4XkJNw=", "https://plugins.jetbrains.com/files/22857/654839/vcs-gitlab-243.23654.19.zip": "sha256-VKGZLlL8ALjr6JEQtjhXiIxNrnTPXIoXMToJkJux2dw=", - "https://plugins.jetbrains.com/files/23029/684999/Catppuccin_Icons-1.10.2.zip": "sha256-qkwfEpC2f4vgVsesSiUvd6kK6XnG9DTN4gXUR+rLlK0=", + "https://plugins.jetbrains.com/files/22857/716106/vcs-gitlab-IU-251.23774.435-IU.zip": "sha256-zNNFPPPnYLkSzXX3CA1IMA0cjeXMcPY58+v80/KjVkg=", + "https://plugins.jetbrains.com/files/23029/702798/Catppuccin_Icons-1.11.0.zip": "sha256-w2vt4kuGd5T8OA5DcTTik2ksvCu0T3oynvTqYtMsVyo=", "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip": "sha256-ssaSY1I6FopLBgVKHUyjBrqzxHLSuI/swtDfQWJ7gxU=", "https://plugins.jetbrains.com/files/23806/664310/Oxocarbon-1.4.5.zip": "sha256-zF89Q1LE6xwBeDKv4FSQ6H6cbABjz74Z/qGwddRWp7M=", - "https://plugins.jetbrains.com/files/23927/699176/Extra_IDE_Tweaks-2025.1.3.zip": "sha256-8Q0S6Iqv880JKscoiNfdYnKHFcwQV0raOpOsNe6tgO4=", - "https://plugins.jetbrains.com/files/24559/699180/Extra_Tools_Pack-2025.1.4.zip": "sha256-avn3oqi6KgMQ73Q7rj7AUKzytD0dxtW2k772OWtW/mM=", - "https://plugins.jetbrains.com/files/25594/623962/Nix_LSP-0.1.1.zip": "sha256-Uq5RdVQTyqRMsEwDZT6Kldv2alt0EVMCABEt/xQUHow=", + "https://plugins.jetbrains.com/files/23927/715251/Extra_IDE_Tweaks-2025.1.4.zip": "sha256-L4hr5mAsl9CWCuRLjQfb2sNiXZcZN2ogZlw4/sB0CnU=", + "https://plugins.jetbrains.com/files/24559/715250/Extra_Tools_Pack-2025.1.5.zip": "sha256-d+86LuTPJ3dPkXJzRZPdULolUyyqGQ2RsMAPQcfWnSI=", "https://plugins.jetbrains.com/files/26084/680234/markdtask-2025.1.1.zip": "sha256-NFHB5zWH8pUwz6OT8F7eIiapeEvHX24fj0Eo1qH45Aw=", - "https://plugins.jetbrains.com/files/631/700118/python-243.26053.27.zip": "sha256-/Ceycp+iCxN7nrSg7L1xNqlOY1hzij/ADEvHUWBwTfE=", + "https://plugins.jetbrains.com/files/631/717448/python-251.23774.456.zip": "sha256-wGFO5S8r/JY0hGGh8q4gDo1NBzAzPQNbKurU31UpHbg=", "https://plugins.jetbrains.com/files/6884/630038/handlebars-243.21565.122.zip": "sha256-pFKAZ8xFNfUh7/Hi4NYPDQAhRRYm4WKTpCQELqBfb40=", + "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip": "sha256-34s7pOsqMaGoVYhCuAZtylNwplQOtNQJUppepsl4F4Q=", "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip": "sha256-kL/A2R8j2JKMU61T/xJahPwKPYmwFCFy55NPSoBh/Xc=", "https://plugins.jetbrains.com/files/6981/680778/ini-243.24978.60.zip": "sha256-m2iKdm4f1h+k1XdQvJCd8T83jEKip+H1E1p8XMfrGcg=", - "https://plugins.jetbrains.com/files/6981/690635/ini-243.25659.54.zip": "sha256-TiVoHX56uEAsSWqE7n0jrePiabN3gcNRFNuSeBhvul4=", - "https://plugins.jetbrains.com/files/6981/697705/ini-243.26053.20.zip": "sha256-s4bSXVqrhy3VMQQd2sT+Xv9v0hQwGGIYk0H+wjonFO4=", + "https://plugins.jetbrains.com/files/6981/711004/ini-251.23774.318.zip": "sha256-mEkXewGfOr7foQl8tGJeiEeNL0aX+UCv+zRPdauQXwc=", "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=", "https://plugins.jetbrains.com/files/7125/627704/GrepConsole-13.2.0-IJ2023.3.zip": "sha256-KY5VRiLJJwa9OVVog1W3MboZjwVboYwYm+i4eqooo44=", "https://plugins.jetbrains.com/files/7177/636663/fileWatcher-243.22562.13.zip": "sha256-8IHS3kmmbL8uQYnaMW7NgBIpBKT+XDJ4QDiiPZa5pzo=", "https://plugins.jetbrains.com/files/7177/654841/fileWatcher-243.23654.19.zip": "sha256-mlCow96mI2k7c/oGe064DqjUViOFhNgwNjF6DVyak4E=", + "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip": "sha256-jNHP/vaCaolmvNUQRGmIgSR1ykjDtKqyJ69UIn5cz70=", "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip": "sha256-drNmhJMe+kuY2fcHjY+SQmkACvFk0rVI4vAhyZ/bgLc=", - "https://plugins.jetbrains.com/files/7320/701175/PHP_Annotations-11.2.0.zip": "sha256-qUgbbG+S7RVt7zLU8ngnp7NzJUb23AuKM7KLAWYQLUs=", "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip": "sha256-45UtQRZMtKF6addrrB3A+goeyICMfcZ2FKcJvJSqgg4=", - "https://plugins.jetbrains.com/files/7322/680217/python-ce-243.24978.46.zip": "sha256-4KkUOSN9KnBjpo92LvkN/7ZtDG/gSAFHgDf5ESSsgoY=", + "https://plugins.jetbrains.com/files/7322/717454/python-ce-251.23774.456.zip": "sha256-9Fyt9xVaqFyuvZ3ox/udrUk9d8NnvC1a1IPinC5dL3U=", "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip": "sha256-3RJ7YVFtynyqeLIzdrirCMbWNZmUkJ+DT/9my71H0Dk=", + "https://plugins.jetbrains.com/files/7391/698673/asciidoctor-intellij-plugin-0.44.3.zip": "sha256-/LsS9rrvdt0URhpBuHJ/VQ/Ls7i7imv07F5PLEG9jZg=", "https://plugins.jetbrains.com/files/7425/603907/WakaTime.jar": "sha256-Z7ZWDomXnTdHFKOElMkt53imef6aT7H5XeD6lOOFxfQ=", - "https://plugins.jetbrains.com/files/7499/690185/gittoolbox-600.0.19_243-signed.zip": "sha256-ZbjLwXY+AocK1OtlyPd+wcObiArWSOWMXjtWaLWMbDo=", + "https://plugins.jetbrains.com/files/7499/711707/gittoolbox-600.1.1_243-signed.zip": "sha256-ckG64ci/h0UlaFsTE63DzCAXWqNyLnqTfP5CcdutZM4=", "https://plugins.jetbrains.com/files/7724/680796/clouds-docker-impl-243.24978.54.zip": "sha256-pGAUljrRizCer076iM1oKrNj54tN3VxSvYldfKAsqRE=", - "https://plugins.jetbrains.com/files/7724/692258/clouds-docker-impl-243.25659.59.zip": "sha256-fJatpg7WzrStvABSeIayeFF4bjv059VW6ZTTKQxLNV8=", - "https://plugins.jetbrains.com/files/7724/700105/clouds-docker-impl-243.26053.27.zip": "sha256-WL6AQuo1zE4x2b3M2rjTa7T9AbGKc2urTZBa6PU1i3w=", + "https://plugins.jetbrains.com/files/7724/715275/clouds-docker-impl-251.23774.426.zip": "sha256-hjnAx3bp6tVenCdpYm5Xr0QmyzFEWLUzDCdPyL6bB6k=", "https://plugins.jetbrains.com/files/8097/636616/graphql-243.22562.13.zip": "sha256-rr2pO0mIsqWXYZgwEhcQJlk0lQabxnIPxqRCGdTFaTw=", "https://plugins.jetbrains.com/files/8097/680200/graphql-243.24978.46.zip": "sha256-RJELd6KPzlRu+UwWBPW1fN33Zj0PcgQ0hGCJ6+ii/fI=", - "https://plugins.jetbrains.com/files/8097/688195/graphql-243.25659.42.zip": "sha256-p52AGXhfldRiT7FoWeDQuP38+/9J1KuPDyhM4VUwQTc=", + "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip": "sha256-O+gSW36MwqQqUiZBQl8J4NFNK+jFowtT9k1ykhSraxM=", "https://plugins.jetbrains.com/files/8195/630064/toml-243.21565.122.zip": "sha256-vKigewUGi06by9/6a9HbjN51zPAIafdk6w4MFG4kwG8=", "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip": "sha256-OFoWuz5z0BcZJqWkS+vkcD/Q0e5IUnQRY84/GEQQIb8=", + "https://plugins.jetbrains.com/files/8195/715934/toml-251.23774.429.zip": "sha256-cNWs+ycKlqednnqJAm4AkqF3LTdMt8jhwWWiEDdKQE4=", "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip": "sha256-4c1nxjbEsNs9twmQnJllk1OIVmm0nnUYZ0R7f/6bJt4=", - "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip": "sha256-JugbJM8Lr2kbhP9hdLE3kUStl2vOMUB5wGTwNLxAZd0=", + "https://plugins.jetbrains.com/files/8327/704864/Minecraft_Development-2025.1-1.8.3.zip": "sha256-31AFL7rtpf52Amxn02/HPAzI0Iwww+EJe5OJK2yQqIo=", "https://plugins.jetbrains.com/files/8554/684425/featuresTrainer-243.24978.79.zip": "sha256-1oI8hw6YYhUzhfv5RjtlBFG0OvucqVs/XUXMioRIuzA=", - "https://plugins.jetbrains.com/files/8554/690630/featuresTrainer-243.25659.54.zip": "sha256-xmjPvJVe27gL1DEwtzvKvzEkF80ZGHUCKjLOY2nO+T0=", - "https://plugins.jetbrains.com/files/8554/697631/featuresTrainer-243.26053.13.zip": "sha256-LMoWgp7perGOFj6d32cQTfo+TLFeupgn53ZRLVON0JA=", + "https://plugins.jetbrains.com/files/8554/716074/featuresTrainer-251.23774.436.zip": "sha256-P6ux6UgbjeJW3lF4w696bZ73zumY8hEm1iM98IsKgTQ=", "https://plugins.jetbrains.com/files/8607/673303/NixIDEA-0.4.0.17.zip": "sha256-OFisV6Vs/xlbDvchxfrREDVgVh7wcfGnot+zUrgQU6M=", "https://plugins.jetbrains.com/files/9525/603167/idea-php-dotenv-plugin-2024.3.zip": "sha256-hR7hC2phDJnHXxPy80WlEDFAhZHtMCu7nqYvAb0VeTI=", - "https://plugins.jetbrains.com/files/9568/700127/go-plugin-243.26053.27.zip": "sha256-SqFl1ArPLi/Bc43n0u+pMCAw+8hyqM/D41w4k1DJQcA=", - "https://plugins.jetbrains.com/files/9707/698971/ansi-highlighter-premium-24.3.3.jar": "sha256-TEF4rtS04kQ/h+SKXnbqLjrMGm3jHk0MJ7ffe0lvbs4=", + "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip": "sha256-0c/2qbuu+M6z0gvpme+Mkv23JlQKNTUU+9GL9mh2IFw=", + "https://plugins.jetbrains.com/files/9568/716123/go-plugin-251.23774.435.zip": "sha256-eNA2ATgL3k9WwguCKqPjXj9UPXqRob2XqbpNlVGpG3I=", + "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar": "sha256-XYCD4kOHDeIKhti0T175xhBHR8uscaFN4c9CNlUaCDs=", + "https://plugins.jetbrains.com/files/9707/702582/ANSI_Highlighter_Premium-24.3.4.jar": "sha256-STDhSOshNJU8YOjd1ZMxNl4WaHEp81t9TimFVQGZgWw=", "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip": "sha256-Mzmmq0RzMKZeKfBSo7FHvzeEtPGIrwqEDLAONQEsR1M=", "https://plugins.jetbrains.com/files/9836/681714/intellij-randomness-3.3.6-signed.zip": "sha256-ArwC2HO2cHlTcFKXQBuKzZTuOiiIDEc/SGDsDQUCZmI=" } diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index 2dc71fabd3e2..ed189a4a0142 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -13,7 +13,6 @@ gtk3, openssl, libGL, - libobjc, libxkbcommon, wrapGAppsHook3, wayland, @@ -77,9 +76,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fontconfig - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc ]; postInstall = diff --git a/pkgs/applications/editors/libresprite/default.nix b/pkgs/applications/editors/libresprite/default.nix index 14efdb52adcc..ce7e93fba84f 100644 --- a/pkgs/applications/editors/libresprite/default.nix +++ b/pkgs/applications/editors/libresprite/default.nix @@ -22,9 +22,6 @@ SDL2, SDL2_image, lua, - AppKit, - Cocoa, - Foundation, nixosTests, }: @@ -48,29 +45,23 @@ stdenv.mkDerivation (finalAttrs: { gtest ]; - buildInputs = - [ - curl - freetype - giflib - libjpeg - libpng - libwebp - libarchive - libX11 - pixman - tinyxml-2 - zlib - SDL2 - SDL2_image - lua - # no v8 due to missing libplatform and libbase - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Cocoa - Foundation - ]; + buildInputs = [ + curl + freetype + giflib + libjpeg + libpng + libwebp + libarchive + libX11 + pixman + tinyxml-2 + zlib + SDL2 + SDL2_image + lua + # no v8 due to missing libplatform and libbase + ]; cmakeFlags = [ "-DWITH_DESKTOP_INTEGRATION=ON" diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix index 8d6d1ac8bc04..44c478e7209e 100644 --- a/pkgs/applications/editors/lite-xl/default.nix +++ b/pkgs/applications/editors/lite-xl/default.nix @@ -1,6 +1,5 @@ { fetchFromGitHub, - Foundation, freetype, lib, lua5_4, @@ -29,16 +28,12 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - [ - freetype - lua5_4 - pcre2 - SDL2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - ]; + buildInputs = [ + freetype + lua5_4 + pcre2 + SDL2 + ]; mesonFlags = [ "-Duse_system_lua=true" diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 298c0efc6fe7..a5f327e5a5fc 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -33,7 +33,7 @@ zip, git, makeWrapper, - electron_33, + electron_34, server ? false, # build server version pam, nixosTests, @@ -42,7 +42,7 @@ let # Note: we shouldn't use the latest electron here, since the node-abi dependency might # need to be updated every time the latest electron gets a new abi version number - electron = electron_33; + electron = electron_34; mathJaxSrc = fetchzip { url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip"; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 837e0b9085a0..ec267de59e44 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -14,9 +14,6 @@ url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/68f6d131750aa778807119e03eed70286a17b1cb/trunk/archlinux.vim"; sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c"; }, - # apple frameworks - Carbon, - Cocoa, }: let @@ -41,16 +38,11 @@ stdenv.mkDerivation { gettext pkg-config ]; - buildInputs = - [ - ncurses - bash - gawk - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - ]; + buildInputs = [ + ncurses + bash + gawk + ]; strictDeps = true; diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix index 34aa8e84721a..9b20629618ae 100644 --- a/pkgs/applications/editors/vim/full.nix +++ b/pkgs/applications/editors/vim/full.nix @@ -30,13 +30,6 @@ makeWrapper, wrapGAppsHook3, - # apple frameworks - CoreServices, - CoreData, - Cocoa, - Foundation, - libobjc, - features ? "huge", # One of tiny, small, normal, big or huge wrapPythonDrv ? false, guiSupport ? config.vim.gui or (if stdenv.hostPlatform.isDarwin then "gtk2" else "gtk3"), @@ -195,13 +188,6 @@ stdenv.mkDerivation { ] ++ lib.optional (guiSupport == "gtk2") gtk2-x11 ++ lib.optional (guiSupport == "gtk3") gtk3-x11 - ++ lib.optionals darwinSupport [ - CoreServices - CoreData - Cocoa - Foundation - libobjc - ] ++ lib.optional luaSupport lua ++ lib.optional pythonSupport python3 ++ lib.optional tclSupport tcl diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 3d401f553f35..a92d97d57e3d 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -150,7 +150,6 @@ stdenv.mkDerivation (finalAttrs: { postConfigure = '' substituteInPlace src/auto/config.mk \ --replace " -L${stdenv.cc.libc}/lib" "" \ - --replace " -L${darwin.libobjc}/lib" "" \ --replace " -L${darwin.libunwind}/lib" "" \ --replace " -L${libiconv}/lib" "" diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 9951716d8265..95777334f68e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -74,12 +74,12 @@ final: prev: { CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2025-04-09"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "a89f5f1162b04a0962e5f4c3cdf248a81e7e53cb"; - sha256 = "0bp3zwfhp80581jw367kwxy104yr5rd6vvjlnsylb3nh9c6y7jjw"; + rev = "634aa58117a9b70b3f08a0b150f11afd64f1c0eb"; + sha256 = "11pc0m44yzwd8p7zd4nqjk7w4h0hxlk13p78107xp983m8v4jrzw"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; meta.hydraPlatforms = [ ]; @@ -373,12 +373,12 @@ final: prev: { SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2025-04-10"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "992285058ce208825eb1b9ac82fa6be7d76ffcc1"; - sha256 = "07n4wmai2bf4nxq05mra9qmqi35bfbm30vpl6n03d2f6kjmc6vj1"; + rev = "e623e30df4053cacc67fb7eb04e1bd0fadba52b4"; + sha256 = "0ragdcqr872v689sn8przq0yi4a1birrsma7f64a9g38chkiadx8"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.hydraPlatforms = [ ]; @@ -634,12 +634,12 @@ final: prev: { aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2025-04-01"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "44684bf429dc40e97a6d00ffa09043ac3f692186"; - sha256 = "02zd23np2pn7hivi8sl63lcdn85cfbvsapkyghkwh9prxg8a81zn"; + rev = "2e00d1d4248f08dddfceacb8d2996e51e13e00f6"; + sha256 = "18rhmpqs8440hn4g5786znj37fzb01wa3zws33rlq9vm6sfb0grw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -700,12 +700,12 @@ final: prev: { aider-nvim = buildVimPlugin { pname = "aider.nvim"; - version = "2025-01-07"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "joshuavial"; repo = "aider.nvim"; - rev = "a34a03635a130f16a56e6a50b211bb72cc1aff96"; - sha256 = "00zfkqcldrqmlmj30gany0yqmyrc1i88hv7655bc78i0rihkv7di"; + rev = "1e5fc680a764d2b93f342005d7e4415fec469088"; + sha256 = "0f4gn4mwcghpcy5whah230y22wqaa1hxh8aczysh09fwdnigb4r4"; }; meta.homepage = "https://github.com/joshuavial/aider.nvim/"; meta.hydraPlatforms = [ ]; @@ -726,12 +726,12 @@ final: prev: { ale = buildVimPlugin { pname = "ale"; - version = "2025-04-10"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "366de225fdd9ddef29a5b947c419303278af0c01"; - sha256 = "0hhzbn1zv5bf03gjvsynkykrhzamiiwxqkryfnjbpy6jb6y2gc1g"; + rev = "baaca9a5d7016c52466c3b4cd2d161b317d801ed"; + sha256 = "1difjr5lj2adhp1r0damgfdrdvkj0qki31zc3vm5sqrb8izdh7mn"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; meta.hydraPlatforms = [ ]; @@ -895,12 +895,12 @@ final: prev: { astrolsp = buildVimPlugin { pname = "astrolsp"; - version = "2025-03-28"; + version = "2025-04-15"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrolsp"; - rev = "bb0051597474971b93e1cde2fd960dda978c2378"; - sha256 = "04v1vg0zyp3bjyikxm4qw6agylw4hjv2jg77vspnijvikb2qk6zq"; + rev = "59a0228a6ededb8cebcd8557a61744f5c8afac1f"; + sha256 = "0sxfm6bz044bpicxf40ksa9xbgfsm69v6803q912m335s53ffhwk"; }; meta.homepage = "https://github.com/AstroNvim/astrolsp/"; meta.hydraPlatforms = [ ]; @@ -921,12 +921,12 @@ final: prev: { astroui = buildVimPlugin { pname = "astroui"; - version = "2025-04-09"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astroui"; - rev = "4b1a46eb9576a187246e5fc41cb4670c3daf749e"; - sha256 = "09yxv7kxw5bw1m9x0zv72sm2sqkv9hyjv5q2m0q7lzv44ijqdmrg"; + rev = "fded232ee0001c6bed9b654188e3dd4b0c58317c"; + sha256 = "0vh7qyj0cyd3vq1mv253sd48dcapf7idfnh7wv29qvvpsvwvamxc"; }; meta.homepage = "https://github.com/AstroNvim/astroui/"; meta.hydraPlatforms = [ ]; @@ -1155,12 +1155,12 @@ final: prev: { auto-session = buildVimPlugin { pname = "auto-session"; - version = "2025-04-10"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "095b0b54d40c8cc7fe37f2ae4d948ec3069bb1c2"; - sha256 = "0l0p9jxpwcngxl0isc7vbrqa5xg329h0qpqnfvaq0z2a1cb19xlb"; + rev = "71c8af9a99e96b9d2533cf4bac4dfed1eafab923"; + sha256 = "1g3lm02rhyg4s1kqpmazrdz4r8qibaxgb44pdpl8sfp2w2kssb1l"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; meta.hydraPlatforms = [ ]; @@ -1351,12 +1351,12 @@ final: prev: { base16-nvim = buildVimPlugin { pname = "base16-nvim"; - version = "2025-04-14"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "RRethy"; repo = "base16-nvim"; - rev = "595861241130ad49222755cf90fb5aea8e0eab8d"; - sha256 = "0b42jkzf5kfqj9zazkrvpdih1c06z4v3q6yj516r6va7kp14dkhs"; + rev = "965160025d0facbe9caa863e5beef2a7a488e9d1"; + sha256 = "02w1mn15gydma9canvqrlwf4l5z76s1vs01zanipwwflvwclsb8f"; }; meta.homepage = "https://github.com/RRethy/base16-nvim/"; meta.hydraPlatforms = [ ]; @@ -1546,12 +1546,12 @@ final: prev: { blink-compat = buildVimPlugin { pname = "blink.compat"; - version = "2025-03-17"; + version = "2025-04-15"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.compat"; - rev = "2ed6d9a28b07fa6f3bface818470605f8896408c"; - sha256 = "009475xy41l4dpayswhx65q6a7djzw7rz2ycbrbpyg041y0qynqs"; + rev = "f1836ed7a07f8d082ff6c3fbae1e476ba2adee84"; + sha256 = "0b22c943vbxn8cgfc3m0wmmia9rja6x766ywa798nx7s7x0sd53x"; }; meta.homepage = "https://github.com/Saghen/blink.compat/"; meta.hydraPlatforms = [ ]; @@ -1598,12 +1598,12 @@ final: prev: { blink-ripgrep-nvim = buildVimPlugin { pname = "blink-ripgrep.nvim"; - version = "2025-03-31"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "blink-ripgrep.nvim"; - rev = "56084d1f45c8621d23d4bac724c2dc50b1eb75db"; - sha256 = "1lyczjvwpi5f1mjgw059yzkxxjrk48vcvhdjzkjgakhsq76s125x"; + rev = "ca538d15bd22fedd3408064d2b25ff8d56ec8ce8"; + sha256 = "1rg40x0lvz11rl95b3q3kqzb8ygvyvhcxiw255200ccxl6q21jg8"; }; meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/"; meta.hydraPlatforms = [ ]; @@ -1986,6 +1986,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + claude-code-nvim = buildVimPlugin { + pname = "claude-code.nvim"; + version = "2025-03-29"; + src = fetchFromGitHub { + owner = "greggh"; + repo = "claude-code.nvim"; + rev = "b5c64c42832e5c6c7a02e8e8aa44cfa38a4ae0b2"; + sha256 = "10s4bn1vcmvkgfxdcilqw85zzlfm2qipw25aqw7jjarys5y3jfik"; + }; + meta.homepage = "https://github.com/greggh/claude-code.nvim/"; + meta.hydraPlatforms = [ ]; + }; + clever-f-vim = buildVimPlugin { pname = "clever-f.vim"; version = "2022-10-15"; @@ -2092,12 +2105,12 @@ final: prev: { cmp-ai = buildVimPlugin { pname = "cmp-ai"; - version = "2025-01-06"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-ai"; - rev = "f5e4dcbf763770880d0a01fe2bc139eb47597261"; - sha256 = "093l4cdlmdgrhnv502kkyj4qi4jk656ks90wmfjbkxdffx6xdsrc"; + rev = "5aa4530c1da98fc2e27f406170fe0635bae99c06"; + sha256 = "1ak769vpbnp44vdna2c8b56aa99g1vc3mmbd8y7fnzai700slhdk"; }; meta.homepage = "https://github.com/tzachar/cmp-ai/"; meta.hydraPlatforms = [ ]; @@ -2820,12 +2833,12 @@ final: prev: { coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2025-04-12"; + version = "2025-04-15"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "2bf3a4d979060e897fcee92a1c9f9abab501f06e"; - sha256 = "09rgj3zqbw98l0d20y1jpk7b9xq112nhzyscwmrclhpmv2bb6lg4"; + rev = "993a4a273bf0415296a1a8d512466b183670568a"; + sha256 = "0nrsxl9faaq5rlvfsbwqpil7gczf2lz65jil4nj8kwmfi113rw37"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.hydraPlatforms = [ ]; @@ -2872,12 +2885,12 @@ final: prev: { codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "2025-04-13"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - rev = "d71d8b96c0b1ec8c047fb938552035864d530bb1"; - sha256 = "0rn7vhb5508lq0dx4xipyc249r09jh9ldmp6fqpwbskxw6809ms4"; + rev = "b7c1fb1ced98468b3a9836101eaccdcdfc768c46"; + sha256 = "1pplq2bzdg8vgikvhagml81zqq7qx4svbz5i57wkfhg2976hwdfq"; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; meta.hydraPlatforms = [ ]; @@ -3015,12 +3028,12 @@ final: prev: { competitest-nvim = buildVimPlugin { pname = "competitest.nvim"; - version = "2025-04-09"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "xeluxee"; repo = "competitest.nvim"; - rev = "602cad3f5c4a116cdf8d0e8557bb0a9a2cea7245"; - sha256 = "1fmsbjvd2w9fsc5k5l55sry21gysvxin5lxl4r8d3jvnr649j3w2"; + rev = "c9be46ff8f0649987459b21006215bc5be20a95b"; + sha256 = "0chj7mzqkwg74nbapyzfy5rq9p1vdq54l260rya69qkyzn3brkdi"; }; meta.homepage = "https://github.com/xeluxee/competitest.nvim/"; meta.hydraPlatforms = [ ]; @@ -3132,12 +3145,12 @@ final: prev: { conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2025-04-06"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "eebc724d12c5579d733d1f801386e0ceb909d001"; - sha256 = "122v0svrsss8g4gzy9fz2ppzm2lxf85l4m8wincxsy75x9v3ywgn"; + rev = "372fc521f8421b7830ea6db4d6ea3bae1c77548c"; + sha256 = "0b6qbwyb6ashpia7pk0r5kp82pdrblhmhmx1fprgy7lmgnm8mw97"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -3146,12 +3159,12 @@ final: prev: { conjure = buildVimPlugin { pname = "conjure"; - version = "2025-03-23"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "980452d93fd6165d3f268f50a181ad7ca4c7b990"; - sha256 = "0pwl2h19rx3cqkn5l8qdyvia09zkg7fsjafd3py65imji9anqzxi"; + rev = "dc929e83287d84ac40a8e9635aa806415143beff"; + sha256 = "124xwhlpp356lsa555876nskqi2c9sgyvc2v9wkbfr87i6jhdbk8"; }; meta.homepage = "https://github.com/Olical/conjure/"; meta.hydraPlatforms = [ ]; @@ -3198,12 +3211,12 @@ final: prev: { copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2025-04-14"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "d712de3bc210fd8f28ab91de4bb23693fc0a2328"; - sha256 = "0frwc1kfaa9151bgxickavyk4nznm839i0mrli3dx5iyzn2bziik"; + rev = "dc579f98536029610cfa32c6bad86c0d24363679"; + sha256 = "16zx9a8f2mjmj7ibdsjyj0vqdsc10yl1vrna0kkkgccj957rd99x"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; meta.hydraPlatforms = [ ]; @@ -3224,12 +3237,12 @@ final: prev: { copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2025-04-11"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "250f24cc485aede5d0069e8765542c3787448d8d"; - sha256 = "19n1zzvr7w2j5p2cc3d7fhf41zk3bhlf5nv1751fyf0fq1lacvpb"; + rev = "8d1e0f86d8aaa64070c080589bc2a516beb4024f"; + sha256 = "17q357rawgcvvdgpirqbgglpy110gk7j6lzy2n3ln02ajr8acs61"; }; meta.homepage = "https://github.com/github/copilot.vim/"; meta.hydraPlatforms = [ ]; @@ -3406,12 +3419,12 @@ final: prev: { csvview-nvim = buildVimPlugin { pname = "csvview.nvim"; - version = "2025-04-07"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "hat0uma"; repo = "csvview.nvim"; - rev = "9cc5dcb060c96517d8c34b74e5b81d58529b3ea2"; - sha256 = "1pmdh9y3z51cgywnr8byx8gl82bb7mxw76a86nmzipqhcl38yf6j"; + rev = "6eb9c7293d35c40a71ec1eb9c653d80e8de5a2e9"; + sha256 = "17ax71iyf8n8brxs71ckq218ccwajxqj2ird0pijqdmylm2mcy4z"; }; meta.homepage = "https://github.com/hat0uma/csvview.nvim/"; meta.hydraPlatforms = [ ]; @@ -3484,17 +3497,30 @@ final: prev: { cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2025-04-11"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "274eacedda3362faaa4fa850eebfc5911294992e"; - sha256 = "0g12a6bfcd1ilzzsc2cx1cm4n3w2i9civhd79s4dpzvhcdbnnqfq"; + rev = "982c9b33612a9cd97e6df141c3d8c535c74381c5"; + sha256 = "16cwkcdsxanb37p6k3md4pflspf1cs8asvvjvqm7fjv9hfg38pyl"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; meta.hydraPlatforms = [ ]; }; + dailies-nvim = buildVimPlugin { + pname = "dailies.nvim"; + version = "2025-04-15"; + src = fetchFromGitHub { + owner = "JachymPutta"; + repo = "dailies.nvim"; + rev = "4507da852e8166f35598409656166629141e1d8c"; + sha256 = "1mk29mh6d2h6680yspd773jhwc87ajfb271cm8xyqnp1rgvml7m7"; + }; + meta.homepage = "https://github.com/JachymPutta/dailies.nvim/"; + meta.hydraPlatforms = [ ]; + }; + darkearth-nvim = buildVimPlugin { pname = "darkearth-nvim"; version = "2025-03-28"; @@ -4279,12 +4305,12 @@ final: prev: { dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2025-04-13"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "a64fc20c4ec7e10fc92dc80312457010755bb019"; - sha256 = "1rl81hfpha65gvvf98jd3m9skpfky5nssdmhbz2g8pxc0pkxm1p0"; + rev = "cb7c17bb35fe8860d490dfd1d5c45fce40ecba26"; + sha256 = "1m8yawharg9z01m34l5vwryzq4006wgk766vsjkizcfjiwvyvnjy"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; meta.hydraPlatforms = [ ]; @@ -4305,12 +4331,12 @@ final: prev: { easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "2025-04-13"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "19ffa96ed51a2b536cedfdc107d9002293c606c6"; - sha256 = "0cbcl5a6gir8ww0shsm440qf1dc7a8wmyck2lm4fbmad3r7zfzsz"; + rev = "a2dff2b31d43ef31a87e6e979110f2736ee07db1"; + sha256 = "16478bc60w44i6v39n7rrm7vri2yd1v8dxkap6ygq7w3h81kywhh"; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; meta.hydraPlatforms = [ ]; @@ -4331,12 +4357,12 @@ final: prev: { edge = buildVimPlugin { pname = "edge"; - version = "2025-02-24"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "04b2e25fa08b81e071ad512bdec6e5af114b01b3"; - sha256 = "0mz0k0fx27dvnyim22fr48slqdqpzcaxcljfysx07b5ladn0jhzz"; + rev = "8eeab1bc9d93eec3511cb4d3c87d2d599c7ce3d4"; + sha256 = "1d6k3b6z9a4hrhk9ma3my28iga5y1s6srgv9jxwy6yg2wzi0lf9q"; }; meta.homepage = "https://github.com/sainnhe/edge/"; meta.hydraPlatforms = [ ]; @@ -4515,12 +4541,12 @@ final: prev: { everforest = buildVimPlugin { pname = "everforest"; - version = "2025-02-26"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "29d1f4f8b63dc91db277e977068f912939c8cae8"; - sha256 = "1p946h4zq7qvkkb3y74bh3r4hbx4qykg4zzn088hvkki4ln7xaac"; + rev = "ffa5a2032fd41903135fa829bd4b49ba2e1d5d18"; + sha256 = "1s1m9z8061yvdr124hvwdpfhkyx1l46gcp860rz1bxlbk5h02g1z"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; meta.hydraPlatforms = [ ]; @@ -4907,12 +4933,12 @@ final: prev: { friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2025-04-13"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "31f2a2657b6261724313281fe0d8ba6f43f4a4fa"; - sha256 = "0rkz7zbv1maqhr22nxq39w7pahahcapfyc4rgscmr3bm4dcymk2a"; + rev = "16833311a0c51e7ee9a1ce939000f5b20a5d9d2b"; + sha256 = "03n4f7vi0msdayjjiwk3jia8ip7470nbv058zlj3b14fci6in3kg"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; meta.hydraPlatforms = [ ]; @@ -5037,12 +5063,12 @@ final: prev: { fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2025-03-21"; + version = "2025-04-15"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "1fff637559f29d5edbdb05e03327954a8cd9e406"; - sha256 = "13xh17bqnb1k32jm53x9kqc8x6njwcdha9xbwn2zhm0s8dgqikzx"; + rev = "3cb44a8ba588e1ada409af495bdc6a4d2d37d5da"; + sha256 = "0v1svsw4wj4i2rayvksdpz8q65yvkdq9igpa64qq7xyd07jh6g8n"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; meta.hydraPlatforms = [ ]; @@ -5310,12 +5336,12 @@ final: prev: { go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2025-04-07"; + version = "2025-04-15"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "ef38820e413e10f47d83688dee41785bd885fb2a"; - sha256 = "1widcvlh2a8c8yk1qi35i11nx1cf8cadzj629l2nwbjy3z1vymb8"; + rev = "ecffa1757ac8e84e1e128f12e0fdbf8418354f6f"; + sha256 = "1d208n8iamhxq1gcmm69cahxqfdyc3w8shbdiavllxn2d9if823y"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; meta.hydraPlatforms = [ ]; @@ -5440,12 +5466,12 @@ final: prev: { gruvbox = buildVimPlugin { pname = "gruvbox"; - version = "2023-08-14"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "morhetz"; repo = "gruvbox"; - rev = "f1ecde848f0cdba877acb0c740320568252cc482"; - sha256 = "1qqb0a5fscqglii8vh9v2wqk40cka2f2k7h8ylysh89w9ppnx142"; + rev = "697c00291db857ca0af00ec154e5bd514a79191f"; + sha256 = "0gj1bikyz13jgd5rqmkdgxmva2mnmd672hhn4jd1dr7nw1dghrby"; }; meta.homepage = "https://github.com/morhetz/gruvbox/"; meta.hydraPlatforms = [ ]; @@ -5492,12 +5518,12 @@ final: prev: { gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2025-02-24"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "146f40fd42cbef30fed69b4ef51329aeeaceb909"; - sha256 = "0bgxfflssqhmlq9v613xw017niyram12vnshd3znlgbsblxa5frx"; + rev = "f5f912fbc7cf2d45da6928b792d554f85c7aa89a"; + sha256 = "0ld6rpmz2r4kjz7i0fhjyr7shq8fgcaw04542g0al4k92izb8xmg"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; meta.hydraPlatforms = [ ]; @@ -5518,12 +5544,12 @@ final: prev: { gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2025-04-02"; + version = "2025-04-15"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "12b5420b665e8053d74eb075d8a589477333f67d"; - sha256 = "16fa841cv0dbn7pkcs44r5ch241vhax8jfxgcxwwd0z4srlbj6gy"; + rev = "a933d8666dad9363dc6908ae72cfc832299c2f59"; + sha256 = "02r2h0ip2vzmgmv9b36ff2r6br3ql0b9ggzl8ijsyjy7pgiij04y"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; meta.hydraPlatforms = [ ]; @@ -5753,12 +5779,12 @@ final: prev: { helpview-nvim = buildVimPlugin { pname = "helpview.nvim"; - version = "2025-03-07"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "helpview.nvim"; - rev = "49e8d4782ae73274a35d606fde2844b6e958a0c7"; - sha256 = "1ichkr5f3wcyadjc8n0mbk3x6i128cyl4603h6skdbc17yfm7iw6"; + rev = "493060153bc99927a64b203ea2ee49bb2884c190"; + sha256 = "0gvs61bxzl3mmfvradcsl2wyaamzw8ch8d6yiwhaw9v4a7gspyvl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/helpview.nvim/"; @@ -6300,12 +6326,12 @@ final: prev: { iron-nvim = buildVimPlugin { pname = "iron.nvim"; - version = "2025-04-01"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "Vigemus"; repo = "iron.nvim"; - rev = "93b3b97cf4313613fba5e91055deaf091cd78483"; - sha256 = "1nbi4ypayz2w3z99ycrirgad9yd8cm3n1psxdwwfcr5q6jsyh5l9"; + rev = "c005b01b779f1b6c038e11248db403bb3df6a7f3"; + sha256 = "1nk1aij16akmq7f3s5malzywik0jw6ppd9p2mp7d0p1n8nq9ifnl"; }; meta.homepage = "https://github.com/Vigemus/iron.nvim/"; meta.hydraPlatforms = [ ]; @@ -6379,12 +6405,12 @@ final: prev: { jinja-vim = buildVimPlugin { pname = "jinja.vim"; - version = "2025-02-28"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "HiPhish"; repo = "jinja.vim"; - rev = "a56da59ed3b49f09b4b20e35b80a197bc7f54fe4"; - sha256 = "1k233zaxp4kwkqb74g93jv3w9c9sc4s7ycgadc6knhfy9i3cr4mp"; + rev = "f29c4abc60dae17b2931621748d14d2759e00a6c"; + sha256 = "1f341lg551v72jc0m0c2rbp7nyni0rnfhr66ckggfwnqlskz4xaw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HiPhish/jinja.vim/"; @@ -6576,12 +6602,12 @@ final: prev: { kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2025-04-14"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "5fddda621630fef17e09cec930d2e307f4a5a138"; - sha256 = "1gwqr1rrs1asviv30v7hwb7afgvqx7v1k6spg511qi25zp94108j"; + rev = "f2a5d94d4fe5f67707bf8a36331fdd803044c051"; + sha256 = "11407b8974y7kghjgkc0dhn4kjs7cijjpjmihdzcvyhxvaxfhqsk"; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; meta.hydraPlatforms = [ ]; @@ -6706,12 +6732,12 @@ final: prev: { lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2025-04-11"; + version = "2025-04-21"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "c3fb55496b1e48e2d755734c71f5ba5f1c1d4f59"; - sha256 = "03774wk7pnf0bfxaqv138d2dbvr6799bla9jx0j7msrlmk7pm7s5"; + rev = "b66d9cdd931cbec760ead7bb81e514301466a20c"; + sha256 = "0ndrsmgahnmv3rd9m6hhj3c0w3blbn2cx7ixaflq4c89jhsb0m9k"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; meta.hydraPlatforms = [ ]; @@ -6745,12 +6771,12 @@ final: prev: { leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2025-04-14"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "8a0efa79133fee211017d769c8031512192008b3"; - sha256 = "0pgg26r5rh1r2364yj05w4scarzy6zwsp6w7s9yxgfmk7l9x89yk"; + rev = "2b68ddc0802bd295e64c9e2e75f18f755e50dbcc"; + sha256 = "07bdhfsig70qblvk2x0n35i5apz3mjdr05ba3082mh438ikgfmvx"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; meta.hydraPlatforms = [ ]; @@ -7265,12 +7291,12 @@ final: prev: { lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2025-03-26"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "778d56ff9b387dacd14ae648ed5604394b486f51"; - sha256 = "1rm8ww8krxliwli9m2j6j37xgwgjsrgapvgrcdr6nd4mi6hgmczm"; + rev = "920b1253e1a26732e53fac78412f6da7f674671d"; + sha256 = "0wkcgy2x119sd9xn6k9vs83pvrj0m4ali1ac72pah8pnlzfvkw7i"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; meta.hydraPlatforms = [ ]; @@ -7447,12 +7473,12 @@ final: prev: { markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "2025-04-12"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - rev = "3cc0a687bfddf50eac2370c194f8d7ad14344db2"; - sha256 = "19qbdrhcjdnnqifvl7x8bq0s6s03xr1i4g4jgn205qcx9j8570xz"; + rev = "74983021512660bbade34a46cd03595b993412c0"; + sha256 = "0wrwapf6cxrnkjcccy70azv3nccxlc41gj2az0nra5r4p0w7xfvb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; @@ -7799,12 +7825,12 @@ final: prev: { mini-completion = buildVimPlugin { pname = "mini.completion"; - version = "2025-04-12"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.completion"; - rev = "cf3625d2c4a437f5edf7e61382e0fe522fc76fb7"; - sha256 = "0lpvl1kd7vmyy00p97am9ghj6gdmnk1dbw93wjmnvin057w9sysw"; + rev = "35130cebc63ace7d6e4583f349af8cd3f3141af7"; + sha256 = "0h5z5i62cc780bzw60rbizngvpyl4vk7j858pndyi2g572plz929"; }; meta.homepage = "https://github.com/echasnovski/mini.completion/"; meta.hydraPlatforms = [ ]; @@ -8046,12 +8072,12 @@ final: prev: { mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2025-04-12"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "b418d585d99bd1c1a4b04dc8b2c585471665173a"; - sha256 = "0fvr4f847jp3fyskpn16w995ijzl98bzmjbhfjqm4h37viqib06b"; + rev = "c404fc5717866ff738aadeeb1f54ab8ed270ae1e"; + sha256 = "09yv0iwswrzvinq6rdr9b6l9zd7xgr0sc4psb3k1bpsi58mmc0cg"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; meta.hydraPlatforms = [ ]; @@ -8111,12 +8137,12 @@ final: prev: { mini-snippets = buildVimPlugin { pname = "mini.snippets"; - version = "2025-04-01"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.snippets"; - rev = "e05106957fc178285dbc510ff833985da59d3e5a"; - sha256 = "0pn9i6sfh3fxkjzh9yyyc05lgcgm8wsanvl7axmy4p7a9spnfa2q"; + rev = "d005684e620e76eb2a5fbbbd211a1eba7212b4aa"; + sha256 = "19xmqzgx0lv6m6lp6dn4pcr53clgjyrlnh45j795cy9szizw4y0x"; }; meta.homepage = "https://github.com/echasnovski/mini.snippets/"; meta.hydraPlatforms = [ ]; @@ -8228,12 +8254,12 @@ final: prev: { minuet-ai-nvim = buildVimPlugin { pname = "minuet-ai.nvim"; - version = "2025-04-13"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "milanglacier"; repo = "minuet-ai.nvim"; - rev = "a647a85a7a1ad6bb2624de9ebe25cba2fe4dcc7c"; - sha256 = "0j3fnh56i640h7iyvr7c821p0ncf02xbmars58bf28h10hh3iwyq"; + rev = "f5272221c3378421dc416a0efa5007e1de104b7f"; + sha256 = "1443nr2f80df6d3d4sgm0v9p2biii6si9x7wwbn8padsmsma4837"; }; meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/"; meta.hydraPlatforms = [ ]; @@ -8410,12 +8436,12 @@ final: prev: { nabla-nvim = buildVimPlugin { pname = "nabla.nvim"; - version = "2023-12-23"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "jbyuki"; repo = "nabla.nvim"; - rev = "27a6ea9ed7452bb9e0b19eb0942b5bcf7d051b2f"; - sha256 = "1dnd6s6abwxihliqqyl1vrds14w502m0x7aadlxrrfh970bqikg0"; + rev = "8247b977bd9ef249bee0eea8db57e422c1d12762"; + sha256 = "0pj05zbl31w9a6bs42qvi5kla89zq7w8nffb6s78nqk9m7ny92as"; }; meta.homepage = "https://github.com/jbyuki/nabla.nvim/"; meta.hydraPlatforms = [ ]; @@ -8683,12 +8709,12 @@ final: prev: { neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2025-04-09"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "5224467c6a49a6c77b8a8333f4d9af0abc788e10"; - sha256 = "0dzppxi4w38s3pqsgwd3z0xr1r14bd0v4qpakxw3kjn9wr2d8y7n"; + rev = "1ef260eb4f54515fe121a2267b477efb054d108a"; + sha256 = "0j0gr2pisrj5vsiwsvrd3dkrdrd3q2742srk23rw2x0h055c0mxh"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; meta.hydraPlatforms = [ ]; @@ -8709,12 +8735,12 @@ final: prev: { neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2025-04-14"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "0c3cb10a7ff11acfa3067896a6108db3bd18d8aa"; - sha256 = "14yf91wvw6vfrsyb9i2zhm74hpx7bnw515drw5pnfsp9s49w056a"; + rev = "114aa200d636dd62fb5ec2323f2c291d6168128b"; + sha256 = "1fcdkpnb2pabgz7b6rngkfvqns0q70nw3whmjaw5aapk1sdn28f8"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.hydraPlatforms = [ ]; @@ -8787,12 +8813,12 @@ final: prev: { neogit = buildVimPlugin { pname = "neogit"; - version = "2025-04-08"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "97f83f1dc51dee41e08e3c7a8adf00e1083e3178"; - sha256 = "0xsrfy0lzf9nq62gii67a5k21d1460fdpy32hh40k4i6zpsbn28f"; + rev = "9bb1e73c534f767607e0a888f3de4c942825c501"; + sha256 = "06qcyz3snk8bphbd2n9q4dzizkksn65is0nksd76q0zzkvb9qxhp"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.hydraPlatforms = [ ]; @@ -8878,12 +8904,12 @@ final: prev: { neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; - version = "2024-07-30"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg-telescope"; - rev = "ddb2556644cae922699a239bbb0fe16e25b084b7"; - sha256 = "0p2s3n22fy1vkqc9n55x6kssqs4n0znwlszfrs532hj8m992wbks"; + rev = "7fb6ca6a632c3c095601d379a664c0c1f802dc6c"; + sha256 = "12pbixkb7175qb9wblq01mbpkccm9h0si7b2jjaf7yip8j8frxmn"; }; meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; meta.hydraPlatforms = [ ]; @@ -9076,12 +9102,12 @@ final: prev: { neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2025-04-13"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "b1a01f95d2359e87d43bd6df5cf9135655fe9e1a"; - sha256 = "1b3wsm8794bf0c9n853issfnhyayx439wvjiqj50rfmzhlb1xrq5"; + rev = "aaf371f3d44fbf35ff189d16cb22c2a732309c37"; + sha256 = "1v4hjhfimyr53j28bi1p62cydbrn5nfkj4mk7ljkifrkmnyahbsd"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; meta.hydraPlatforms = [ ]; @@ -9453,12 +9479,12 @@ final: prev: { nfnl = buildVimPlugin { pname = "nfnl"; - version = "2025-04-08"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "c0e153c8c63926647a70b90cc2c98897278f53c8"; - sha256 = "1b7imv4yjbrz96fk8na7f38n38j1n54kgnigmz9m41mk40vf17ja"; + rev = "9f05512f3d933d3aba6ae067f5cb58e891be31a6"; + sha256 = "11cdc18219yaaphjxl00mia8d3rmq7cm9k16751675p36hx26xpy"; }; meta.homepage = "https://github.com/Olical/nfnl/"; meta.hydraPlatforms = [ ]; @@ -9557,12 +9583,12 @@ final: prev: { nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2025-04-14"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "fa95b60dad126efebbf0180ab42ccc66e98f4f84"; - sha256 = "0kw6kb2456va3abn660sswqjmm1wcjivhxp1kfiilr87l6a2b59n"; + rev = "852140cecf00e4d41289da6d20a2dddeca70e967"; + sha256 = "175nysna5xz7mn6ml4xmlrh02aq1ck0qsyhk739wws81zrfk3062"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; meta.hydraPlatforms = [ ]; @@ -9596,12 +9622,12 @@ final: prev: { no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2025-03-07"; + version = "2025-04-15"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "53c8ef094c86e8897be2dcce0259d35914f6cdc0"; - sha256 = "0irbl28jr9h20zyfm5m3wf7saxq1acc48kn3vp4ijc271l0bs97g"; + rev = "8d17abf5ff9208865439e683da7bbe93dde8d4e1"; + sha256 = "1dr43al236bhifrc740vwfwz6xsma4m3fza2qm5xjgjdcz7ib23c"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; meta.hydraPlatforms = [ ]; @@ -9635,12 +9661,12 @@ final: prev: { none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2025-04-13"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "1280b7965b6ed17787ffab1d4e3d9795ecdd0f51"; - sha256 = "01r495800dm1b1n25skv081hb701i3npvwxb5dabg2iy5b6nzyms"; + rev = "fb50cf17e926a037c9f8d96d8db29ddbd04965d4"; + sha256 = "07zfkjdqwlrm1d07za0payqs37gmn4x8m489438nv84sqqhnfrvd"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; meta.hydraPlatforms = [ ]; @@ -9739,12 +9765,12 @@ final: prev: { nvchad = buildVimPlugin { pname = "nvchad"; - version = "2025-04-08"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "46b15ef1b9d10a83ab7df26b14f474d15c01e770"; - sha256 = "1fca00xiqsc3ixl9d8qqypp7hzm6vmyikva2iwcxpdnnrvbvwi2v"; + rev = "84f8170fdab2a9bb82f36fe76c68bca2241c50d8"; + sha256 = "10va5jv8s670jn8ayqylpksb1rcgjr1m43vh0vq5qdxswanqzby7"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; meta.hydraPlatforms = [ ]; @@ -9752,12 +9778,12 @@ final: prev: { nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2025-04-12"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "9201de37eb4992bef5fec974618a9a14082765fe"; - sha256 = "0g8rlw7s38pzy3ig18lzjrww0apqw505q614qb32jidxw715291c"; + rev = "c448a23a66089f73d6ec4090278c054668f4ae69"; + sha256 = "044mlfjgm0a15fjn5gb1a3w259nzsz2y73v2z8akkp519s8vxyvi"; }; meta.homepage = "https://github.com/nvchad/ui/"; meta.hydraPlatforms = [ ]; @@ -9986,12 +10012,12 @@ final: prev: { nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2025-03-29"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "7aade9e99bef5f0735cf966e715b3ce45515d786"; - sha256 = "0cr2y3lkr6ffxxd9b2pj8hr3fzb5dlj003fcknswqwsdhws75l22"; + rev = "98bf130702eaafad8567c0e3ea1171c2552d58bb"; + sha256 = "045sajd5amwxq4964yj4lbh20daa0g8473a0ggbwggxpq6qz2678"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; meta.hydraPlatforms = [ ]; @@ -10090,12 +10116,12 @@ final: prev: { nvim-dap-view = buildVimPlugin { pname = "nvim-dap-view"; - version = "2025-04-14"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "igorlfs"; repo = "nvim-dap-view"; - rev = "de489c1b1e0fa426c5e6c42e05218c707e2c7373"; - sha256 = "1liwi829rj981wi6hhi7mqn662bvxva5a3annrsg7n33z6z7nznc"; + rev = "aeba18d93cd2f32a5f4a710555c6de72085a0e2e"; + sha256 = "1l9cxshd5zjxm0rsc7dq3s5xdk6dyp0hail41mjv020p4iynbis1"; }; meta.homepage = "https://github.com/igorlfs/nvim-dap-view/"; meta.hydraPlatforms = [ ]; @@ -10246,12 +10272,12 @@ final: prev: { nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2025-04-01"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "2fbe9708880020f169ac61bb4fce904c36d9ccad"; - sha256 = "1b2g12inhkjm7xs3lsmfwnrrriik43d3v8ja3rq322xhxrqbhxlz"; + rev = "89607b55b321a9d55979e0cc4229223cd0db4cbd"; + sha256 = "09i8fsr47nq78s7gys6cli73savpmmz3b5cw6jp3997vh085nzfq"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; meta.hydraPlatforms = [ ]; @@ -10259,12 +10285,12 @@ final: prev: { nvim-hlslens = buildVimPlugin { pname = "nvim-hlslens"; - version = "2025-03-28"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "00b9c7359eaaa4804a9be943ea46bc64e6d2e065"; - sha256 = "0hkilzijh6xhscd03pr1khvcza7qy606fj9lw0cranbgkd05nlr4"; + rev = "bf55af8789948fac50d959e6e051af3ed280d9b8"; + sha256 = "0q6s301vh6m4sz8w2i1xrmks7jijzi1qdjq8jxhmzlhvg7kh4c4a"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; meta.hydraPlatforms = [ ]; @@ -10363,12 +10389,12 @@ final: prev: { nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2025-04-11"; + version = "2025-04-15"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "7223b812dde98f4260084fe9303c8301b9831a58"; - sha256 = "0pj5fm6k8684qbpd7q6y9cnznz4s91qjv5wp8f49rivsqxsmg9sr"; + rev = "5ecf13c53c9a66ee97c200970029ab2ebe1c1112"; + sha256 = "127ndcm3hdm5s3xjh1rsijg6wdd9mpp966vds1scdmbqcxssn0zq"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; meta.hydraPlatforms = [ ]; @@ -10441,12 +10467,12 @@ final: prev: { nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2025-04-10"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "5b1bdf306bd3e565908145279e8bbfc594dac3b3"; - sha256 = "0kwdb9wggkgzg9msrvnf15njqm9a8acljdak9fxnfh9al1ks8cav"; + rev = "d698d3b6fd7b1b85657d05a2a31d843ddb682c63"; + sha256 = "0m4hj1yc0s6cb3icshcr3qkd5wknksnnw97axjbacsan5vc6831z"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; meta.hydraPlatforms = [ ]; @@ -10493,12 +10519,12 @@ final: prev: { nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2025-04-14"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "e39da6a820d2a700904117d29f0dd476d64262cf"; - sha256 = "1kmxrvqj48z131myhwlfk50lj0iizxcl97risnnh5rma9lnd189m"; + rev = "32b6a6449aaba11461fffbb596dd6310af79eea4"; + sha256 = "0rbqg3xdsdfklcsadzbbphzrgwa2c54lsipfqd67jq2p4baxsgxn"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.hydraPlatforms = [ ]; @@ -10558,12 +10584,12 @@ final: prev: { nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2025-04-04"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "bc896458ac639dea568e8dc06862074f8cba7fa3"; - sha256 = "0k7c300rf62f50vqzxxdgh7pqpb61im6xbz230fysvdjdx1ddglh"; + rev = "04d8ce24638412a2c93dd79fecca4b2c7b9c07f9"; + sha256 = "19mdfn5ni35ldjmwdg25cwiy9cvkg2cxrdhcjr9xplx7ln6zsld9"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; meta.hydraPlatforms = [ ]; @@ -10597,12 +10623,12 @@ final: prev: { nvim-navic = buildVimPlugin { pname = "nvim-navic"; - version = "2023-11-30"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "8649f694d3e76ee10c19255dece6411c29206a54"; - sha256 = "0964wgwh6i4nm637vx36bshkpd5i63ipwzqmrdbkz5h9bzyng7nj"; + rev = "39231352aec0d1e09cebbffdd9dc20a5dc691ffe"; + sha256 = "1xj2bzax8hynm2x9zbvsaxv1j22chklyygzm1kbqxxs077qn45ws"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; meta.hydraPlatforms = [ ]; @@ -10831,12 +10857,12 @@ final: prev: { nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2025-04-13"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "d519e9fcf7ec32ede158e13161519bf11acfadd1"; - sha256 = "05l3krv534n4639s61lvxh1zdgycyhd37nfsrsm8cybs2grspx9p"; + rev = "cf766a45303e8cd94b624a94dc6c256405ef6bbc"; + sha256 = "1jlk3d7479a278j2rbna9vm7asp8qglgz95w72frmzvkxzmmafba"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; meta.hydraPlatforms = [ ]; @@ -10922,12 +10948,12 @@ final: prev: { nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2025-03-22"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "caf6f633d4d77a29b6e265b560c5a035d171a913"; - sha256 = "130y0b2f69y5rzm64ss34a9zyqkpkybr2d1s4p0pcvvaq1ngq0r0"; + rev = "0e62500b98f4513feaaf7425c135472457ea5b7d"; + sha256 = "0rwzz98n8gyx2bffxg7ga7vxxxcc4crbwimvglx6bxkdg2abwyrn"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; meta.hydraPlatforms = [ ]; @@ -10987,12 +11013,12 @@ final: prev: { nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2025-04-11"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "5bea2b37523a31288e0fcab42f3be5c1bd4516bb"; - sha256 = "1mizgknbbjqv7a8fqc0n7glgabl0fq660nrqwq6w04qqynp0z1ax"; + rev = "64bb47f868e1d120df1ff0cb63fb626c4b076459"; + sha256 = "1zminyhvka47rp0pc2v1i0rw4y6lcn10l4p7wwy0wb5nsxdaj2mp"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; meta.hydraPlatforms = [ ]; @@ -11000,12 +11026,12 @@ final: prev: { nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2025-04-13"; + version = "2025-04-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "7bbed4b548d9a81c14351bda93d16336edefd067"; - sha256 = "1i0fffs915jc340s63pis2rblzr4gji42hg3s99qvbfnf6k4lnpi"; + rev = "684eeac91ed8e297685a97ef70031d19ac1de25a"; + sha256 = "00ccbnnvpcf0lrpbaygzz9wdnf59ixp43z0zry1qvblnjplrlwb7"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; meta.hydraPlatforms = [ ]; @@ -11013,12 +11039,12 @@ final: prev: { nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2025-04-04"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "439789a9a8df9639ecd749bb3286b77117024a6f"; - sha256 = "04x9nza48d2vz262myhhfnmjzcc2fkdjb21mdqvlmnzkhh7ysyz2"; + rev = "6daca3ad780f045550b820f262002f35175a6c04"; + sha256 = "0qprwd44hw9sz0vh14p6lpvs9vxrick462pfkradmal6ak1kfwn3"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; meta.hydraPlatforms = [ ]; @@ -11026,12 +11052,12 @@ final: prev: { nvim-treesitter-endwise = buildVimPlugin { pname = "nvim-treesitter-endwise"; - version = "2025-04-02"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-endwise"; - rev = "63a8f855c6b6019ef9f7f63b5c59b8a00c215d0d"; - sha256 = "1vbjmdafnfcfzj3gczg2py370cjvaaglxr4jwbnaa200vhgn8jj6"; + rev = "8b6436303dda9ce6ed4b3733fd15703eb3589c36"; + sha256 = "134k6b66c0ycqqdxzmsyzpl5igd5vlvxjjbdncswqyxwpypm9mq6"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/"; meta.hydraPlatforms = [ ]; @@ -11091,12 +11117,12 @@ final: prev: { nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2025-04-06"; + version = "2025-04-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "698b5f805722254bca3c509591c1806d268b6c2f"; - sha256 = "0lxikjxgfjbr28xf00p7rphbfp4fwrxj0yma9cin0i74ah5gxam3"; + rev = "205e3369bc83d8cb83f7409c36120e24611f8c5c"; + sha256 = "13qmsnahlj88wxs75kvpn9hj89gnhm4dm6rb400ysrzmmx5ypg39"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; meta.hydraPlatforms = [ ]; @@ -11156,12 +11182,12 @@ final: prev: { nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2025-04-11"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "a026364df62e88037b26d37c9f14c17c006fd577"; - sha256 = "02mqjwc4h29i9s9l8lsfwrx4ac69n3mpr9hw2vg7ji3c20mbh413"; + rev = "fb1da7d49c8f2704bb593a9683dc2ce3933d892a"; + sha256 = "13l8qsm61vxirwgr2m02b6vazwcih6gfh82a5zkcam0syry66rpq"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; meta.hydraPlatforms = [ ]; @@ -11182,12 +11208,12 @@ final: prev: { nvim-various-textobjs = buildVimPlugin { pname = "nvim-various-textobjs"; - version = "2025-04-14"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-various-textobjs"; - rev = "1b6caa4431fc3e637d26db70605736d10f05d2fd"; - sha256 = "1ir083jsvjzzqbjly6csrmrnxq80b65861qmcplpvr7xhl98bdl3"; + rev = "dcf0cd99a1ae0bade0e812a381ac4399d65cc0c3"; + sha256 = "0gczvica73yr5fd1injab5iwwvc7lwby0zq2jy4kdkwjsbwsvcp0"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/"; meta.hydraPlatforms = [ ]; @@ -11325,12 +11351,12 @@ final: prev: { obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2025-04-13"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "obsidian-nvim"; repo = "obsidian.nvim"; - rev = "0cf0dab342e88b8c8102bb352517d1aa88917af0"; - sha256 = "0qd3nhhr33qhfjsjsnjcichq38pq227bgfncibdm11h4jv6fb6l2"; + rev = "6704029e7b2dc0ea5465943cb1c0a331e8e894be"; + sha256 = "1wg5qbj2qcgq55qlbqi5cv2w3x47lmql0bbx94fj45cxxqq1mim3"; }; meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/"; meta.hydraPlatforms = [ ]; @@ -11364,12 +11390,12 @@ final: prev: { octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2025-04-14"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "e3f4b7d711eeb0cefc1e3bff8cf6ddd0e166b868"; - sha256 = "01cyjh8m51g1df8ciy7qqnq0ifkm7w3mg1f4gwpm777bd10jfj25"; + rev = "d00dadb7286b0e1c6dd22448477ebb4277707ca9"; + sha256 = "03xfjfp4yzjw8ab2c1xz9rjadj6g4s1xr3296k6b40jj1cqc7igp"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; meta.hydraPlatforms = [ ]; @@ -11481,12 +11507,12 @@ final: prev: { onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2025-04-13"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "5d9f719f622f798bea37bc243ec46581b8efc9b7"; - sha256 = "0x8r64n9qrvdlyfmk4jw1mpll0s4cvlj6xarfycdn5g8z5445340"; + rev = "d3d3e11331d30f7d5c1453232bad9c24d04e564f"; + sha256 = "00hfm3rav9blsxaf28rz5vnhp5dvg25ychya3si0pzgbpi6y161s"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; meta.hydraPlatforms = [ ]; @@ -11507,12 +11533,12 @@ final: prev: { onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "2025-03-30"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "502abed6c21b19daa6f5f7b0f74d762e137aee3f"; - sha256 = "04zyvh1i3wrdqdn67rp19zr9vz9kn99vvl1awd5agn9sv0hzvadd"; + rev = "039f76baf948acfc7c7d987ad9392fdc2a0e8a1c"; + sha256 = "1m6i7jks0pfzml2i3gzr3y20k9dv3hx2fg0a357cps9rg84nx0qd"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; meta.hydraPlatforms = [ ]; @@ -11572,12 +11598,12 @@ final: prev: { org-roam-nvim = buildVimPlugin { pname = "org-roam.nvim"; - version = "2025-04-11"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "chipsenkbeil"; repo = "org-roam.nvim"; - rev = "d7ac6a394f5158984b29596aee4861fb93030e81"; - sha256 = "1kwimzssknzkcz3lj8k0rr4qv45qlhn0jnag6rq25ps7vn4nbd68"; + rev = "5ff1c9b0d89ac4a142abe3723e535fb127a516e4"; + sha256 = "0c1vcq4rzilyqb8d21jqh8icdqa22n9xswx919mf8pmhz1smbs2c"; }; meta.homepage = "https://github.com/chipsenkbeil/org-roam.nvim/"; meta.hydraPlatforms = [ ]; @@ -11611,12 +11637,12 @@ final: prev: { outline-nvim = buildVimPlugin { pname = "outline.nvim"; - version = "2025-02-23"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "hedyhli"; repo = "outline.nvim"; - rev = "ae473fb51b7b6086de0876328c81a63f9c3ecfef"; - sha256 = "12dayhk8m3d34xip6v8hcmb65jvnp5yp2967mk2693i1kakxc8sy"; + rev = "321f89ef79f168a78685f70d70c52d0e7b563abb"; + sha256 = "1rg907hqdgz3h87ba262jqhph3m72g5r40jy9ngnjxmk0d45bcvx"; }; meta.homepage = "https://github.com/hedyhli/outline.nvim/"; meta.hydraPlatforms = [ ]; @@ -11729,12 +11755,12 @@ final: prev: { papercolor-theme-slim = buildVimPlugin { pname = "papercolor-theme-slim"; - version = "2025-04-14"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "pappasam"; repo = "papercolor-theme-slim"; - rev = "244f209dc93a42534d9712271a37b89f58915525"; - sha256 = "1s7mb5p9nna8v5zfs1swycl25sym4rsdzygzlv6h1z2p932s4r8n"; + rev = "a94f57fadfac6f213e165ffdc9b1bd4a482b73d2"; + sha256 = "0g9419wq38j4g1461690chf4y8k4ks3r0dhyq24b1n09yzpjznl6"; }; meta.homepage = "https://github.com/pappasam/papercolor-theme-slim/"; meta.hydraPlatforms = [ ]; @@ -11755,12 +11781,12 @@ final: prev: { parrot-nvim = buildVimPlugin { pname = "parrot.nvim"; - version = "2025-04-10"; + version = "2025-04-14"; src = fetchFromGitHub { owner = "frankroeder"; repo = "parrot.nvim"; - rev = "8213c2b8a494fafb64e6aa24563c050ea27d9110"; - sha256 = "0a399jx267wbxndrfnir6g2kqmgk52jpy20iwffj81w01l8dy43v"; + rev = "01a6e1f1297a5434dacbcd1e59e063d93b006c9d"; + sha256 = "1lz7la6vgk280wnldgkf09ckir3ypyjjdj8dby062hyjxd3phjiy"; }; meta.homepage = "https://github.com/frankroeder/parrot.nvim/"; meta.hydraPlatforms = [ ]; @@ -12133,12 +12159,12 @@ final: prev: { pum-vim = buildVimPlugin { pname = "pum.vim"; - version = "2025-04-07"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "pum.vim"; - rev = "4bbb2cbd094f9aa70f05ee3398ef727f13bce8af"; - sha256 = "16axpvf0s7s700y4jg5wffsn36zjvfpq5vnnb2ns5rddh2p6jd8f"; + rev = "bde317cfafafefb47920fb4ed4bcd4f3829fe827"; + sha256 = "14a6zpysx3pm7a12r1x4hkf0cd3ycjcj2c8ic8iz358q4c1dcjw2"; }; meta.homepage = "https://github.com/Shougo/pum.vim/"; meta.hydraPlatforms = [ ]; @@ -12498,12 +12524,12 @@ final: prev: { render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "2025-04-12"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "8bb0d4725cc4909a603158d44ff28b6158ad9278"; - sha256 = "18yqhy2y36rydyqs9z3s1h6rghd02bd9kb3rkxs88spm18wvq41z"; + rev = "dfc1299d9f32b53b34b7ac6c3a7553b5fd29977f"; + sha256 = "1r636cyjflhpybjwfi01blbwkrxwi4lvykffrjclwfaf4l4gwddd"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; meta.hydraPlatforms = [ ]; @@ -12629,12 +12655,12 @@ final: prev: { roslyn-nvim = buildVimPlugin { pname = "roslyn.nvim"; - version = "2025-04-12"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "seblyng"; repo = "roslyn.nvim"; - rev = "f64609e4ab21a4cc28af2f526974c961d6adacca"; - sha256 = "1b8k5i4rw4qysvvvygdmxsad8y4vmyyys5vwl76cyh6575vc71n1"; + rev = "d06aa2f6c5990dd195eb12e68bc5a96b6fd23bff"; + sha256 = "10s2mr9xgh4ldjv3fc9sacd4k9k0lniy1fydak1gj9609v2kmrjr"; }; meta.homepage = "https://github.com/seblyng/roslyn.nvim/"; meta.hydraPlatforms = [ ]; @@ -12915,12 +12941,12 @@ final: prev: { sideways-vim = buildVimPlugin { pname = "sideways.vim"; - version = "2025-02-24"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "1dc47d2e0ba04da0f5e654f6b3bd65ce9ca8ce9f"; - sha256 = "13vykz2j2bimgkx08n0awrpjj039k9ggjjgkar9m3sq2hwkm5j3f"; + rev = "3b353b19972a1138261d939055aff4844b9c472f"; + sha256 = "07jsyq5qa3psv314mvy0a4grbpjp936iqsf7ac22v3rylcvp1dmx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -12981,12 +13007,12 @@ final: prev: { smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2025-04-11"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "d3011454da78dd72883e131d4b1e7239a29d086e"; - sha256 = "161pj2aj7kc1dzyglh2dxcid1sc0fh3gwmkiak97wc6g9gja2sd7"; + rev = "26db22d9b09b7c82e1ff03affd64da3f5441febd"; + sha256 = "1mpzwrkm2k7cwsw6jbdjh4pydy3afxjrra55bwi7wsynw3x7k35x"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; meta.hydraPlatforms = [ ]; @@ -13033,12 +13059,12 @@ final: prev: { smear-cursor-nvim = buildVimPlugin { pname = "smear-cursor.nvim"; - version = "2025-04-14"; + version = "2025-04-19"; src = fetchFromGitHub { owner = "sphamba"; repo = "smear-cursor.nvim"; - rev = "3879bc2eb4a2a07a8637256fe33cc4484a23a813"; - sha256 = "09v3p135gh1czz8fy85bi0nrj1shgz51r690nz589v20xr52vipr"; + rev = "a20e2682b551c610bdd1becbf95f6f3b8a896f9a"; + sha256 = "11617sjsy35x51cmlf4sl5fzm4azbzw6fwkv23mwwrpra0j5qj5x"; }; meta.homepage = "https://github.com/sphamba/smear-cursor.nvim/"; meta.hydraPlatforms = [ ]; @@ -13111,12 +13137,12 @@ final: prev: { sonokai = buildVimPlugin { pname = "sonokai"; - version = "2025-02-24"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "9679341d4141ed81376f2bdf5e69b78dc348d212"; - sha256 = "1jbkfcs3ylsv2xsldjalp9agm4w7c5gda5kaawlrxcfngrh0pvnk"; + rev = "f59c796780655c3b9da442d310ad2f2d735f2e56"; + sha256 = "0sxf6z3yzg4hggad172ljy6vxpnfll9q84pqa7n40m26g2alg29x"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; meta.hydraPlatforms = [ ]; @@ -13398,12 +13424,12 @@ final: prev: { statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "2025-03-03"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "c399884e8f64019ec9bb581251f9710915b7f996"; - sha256 = "0ia3hw4jvh3mlsj372ncp7hj27mw98h9jghvw8q9vk37bghy5455"; + rev = "a2580e009a3b4c51b5978768d907dafae2c919ac"; + sha256 = "0k3wj5mzv38wrmq17pd9xpdcc8p3l1bwx078931ylrga5j1ld3vx"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; meta.hydraPlatforms = [ ]; @@ -13554,12 +13580,12 @@ final: prev: { switch-vim = buildVimPlugin { pname = "switch.vim"; - version = "2025-02-13"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "switch.vim"; - rev = "b6bab56113312ebaa53038461c1a61bcb1e4a9d9"; - sha256 = "1n5nlyda1hyvid236i2p74ddf74jwdijsy77j8abwrb4hpsbzblb"; + rev = "f4b831b86e1e65af8c4f8be6434e15bef98d111e"; + sha256 = "1ygv1wj9034r6g2yr9ibb10hnm8z0f1dkf8a3rk5mc59803f3mvs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/switch.vim/"; @@ -14417,12 +14443,12 @@ final: prev: { tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "2025-04-10"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "842983e91e0b8825f1084b8323c7806c8bf64c74"; - sha256 = "01q056nmms882x9526qdmr4nqgpyd1247bsb84gzzbclxhg48m1m"; + rev = "cd401038de4cbae37651cfe02510294ccf5cdc98"; + sha256 = "1ma2zc75v2ryda4r3k20w4kiz5fq2cw85khkvfiqwqv9jlfsz3zn"; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; meta.hydraPlatforms = [ ]; @@ -14600,12 +14626,12 @@ final: prev: { treewalker-nvim = buildVimPlugin { pname = "treewalker.nvim"; - version = "2025-04-05"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "aaronik"; repo = "treewalker.nvim"; - rev = "7d993149867ea05898626bf19df8b7d020de10ef"; - sha256 = "1c0dv8g33hir02d6s46pw9fxfyyrqrhvj3in1w2fjpxcqnw5xs3n"; + rev = "34bf0a6044e0b5e3d93b7012ae7bdf457de91ba1"; + sha256 = "0rixswfrv4xlwalvi3kqhcdi3l14kml6mds32pp0gvjcig9x6myk"; }; meta.homepage = "https://github.com/aaronik/treewalker.nvim/"; meta.hydraPlatforms = [ ]; @@ -14783,12 +14809,12 @@ final: prev: { typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; - version = "2025-04-07"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "a4109c70e7d6a3a86f971cefea04ab6720582ba9"; - sha256 = "1qcwp61sawm69ckah2j3sx2bagdl1m93rxbgzzh212z9fb2gcx3s"; + rev = "885f4cc150f996f5bff5804874f92ff3051c883d"; + sha256 = "0b1mgz21h8hdrnczb6pfh3wizbp00y9cvi67hh04019xsygykhix"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; meta.hydraPlatforms = [ ]; @@ -14822,12 +14848,12 @@ final: prev: { typst-preview-nvim = buildVimPlugin { pname = "typst-preview.nvim"; - version = "2025-04-12"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "chomosuke"; repo = "typst-preview.nvim"; - rev = "2503b188cd2a17ce44fdd21a944a93335e935215"; - sha256 = "0l981pjiz2ycn6rw1xwvmhdjpml7nrrlymwfyc942inw173k1jsg"; + rev = "dea4525d5420b7c32eebda7de15a6beb9d6574fa"; + sha256 = "0y658l2ibq0x4cwa4rl3lab7aw4ba68xcrdnxp81p2rsk0d60qq4"; }; meta.homepage = "https://github.com/chomosuke/typst-preview.nvim/"; meta.hydraPlatforms = [ ]; @@ -14913,12 +14939,12 @@ final: prev: { unison = buildVimPlugin { pname = "unison"; - version = "2025-04-09"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "6d0178a069d195d0a9f987476731e16a1c7fae06"; - sha256 = "0a2r2kbyar38hppplmam9lhs74yfrg2iq39yskyij7dzsq3g0xdw"; + rev = "821869214dbb39d27d5e2a59212683e3e3549d4d"; + sha256 = "1is8f1i4dna0qiq13gj5ag4v9r2rgrispl6mvsa95bl0x795s6w3"; }; meta.homepage = "https://github.com/unisonweb/unison/"; meta.hydraPlatforms = [ ]; @@ -15030,12 +15056,12 @@ final: prev: { vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2025-04-09"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "f188b2e18396ef82091930b58fafecf18b76d7a5"; - sha256 = "004q5lpb1zv2mnib0473gsyhnnpn5hvmjads2yiiz9vlw2nah9kx"; + rev = "b8fb54d5a1e3a19ed25387852e720c558fcfe436"; + sha256 = "1r6lzxvd6niwdwvm2vcvghxiigd0hksfgq1nj4594ygwcdpnq4p5"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; meta.hydraPlatforms = [ ]; @@ -16265,12 +16291,12 @@ final: prev: { vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2025-03-26"; + version = "2025-04-14"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "685e75b34ee0e12f92ec4507ea8bb7f1aaa936e5"; - sha256 = "1ir8m3nks2aqh0jkmkyx46qprg7xm0bva72r83hwai79j1q6fk7j"; + rev = "460432301a5cb280ea265ddfa15c9f3dcd1d26b7"; + sha256 = "0adpm2sv0lwcfgn90lka3wj8slzbx0bl3lp201syrc8w6w7jgljr"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; meta.hydraPlatforms = [ ]; @@ -17084,12 +17110,12 @@ final: prev: { vim-go = buildVimPlugin { pname = "vim-go"; - version = "2025-03-10"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "1d641b739624199ab9ab745d220f36fe7b655d65"; - sha256 = "02qfql3c6njqkq7pbzrqknca638f3fczkx651v3wwl94339ln6ky"; + rev = "59e208d5212b86c8afd69d8590f181594f859ddb"; + sha256 = "09n71iy4wfqvrdfzvvc4za0alc5fsbds7xd4ln6zip17z89hkym7"; }; meta.homepage = "https://github.com/fatih/vim-go/"; meta.hydraPlatforms = [ ]; @@ -17371,12 +17397,12 @@ final: prev: { vim-horizon = buildVimPlugin { pname = "vim-horizon"; - version = "2023-03-17"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "ntk148v"; repo = "vim-horizon"; - rev = "3864f6281b0b852712d8e9ef86edde512f94c1d2"; - sha256 = "152v4x7sj3nidj0710ick0p7xh020cjvhd8bjd28vfqd8xlv2nqw"; + rev = "32baaaca1337a0df287216b0775404fe913eaecd"; + sha256 = "0gaj44w0iixri82r4999pqd46mlixrvsq326696jb5mv2aczlw7b"; }; meta.homepage = "https://github.com/ntk148v/vim-horizon/"; meta.hydraPlatforms = [ ]; @@ -17462,12 +17488,12 @@ final: prev: { vim-illuminate = buildVimPlugin { pname = "vim-illuminate"; - version = "2025-04-11"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "08aa184f1bd508f6a59371b52cba26be07bc016d"; - sha256 = "0sqs4q2qk9hfkh5vn08y664568pl15b88yyvb9za0f5k7v3z1bcw"; + rev = "1fa4b23409e22a03823648e344c77f260e2572cb"; + sha256 = "1z27z6mpj4jazmifyz5scrniqr7sgh9hbkqx4g27yk0dnn9cm9ff"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; meta.hydraPlatforms = [ ]; @@ -18763,12 +18789,12 @@ final: prev: { vim-pandoc-syntax = buildVimPlugin { pname = "vim-pandoc-syntax"; - version = "2025-03-15"; + version = "2025-04-18"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "05ef7f44ebaea37159db8d365058c0a9e2ef14b5"; - sha256 = "0w48hmcs0dfpc28v9bxslxgvizppkcvw0zpj6sxha747bbi715fc"; + rev = "ea3fc415784bdcbae7f0093b80070ca4ff9e44c8"; + sha256 = "0mk33skbybrs4mwrwbsxkj9vcjik7bbrhk0lncxd9pvswnxrw053"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; meta.hydraPlatforms = [ ]; @@ -19530,12 +19556,12 @@ final: prev: { vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2025-02-03"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "9bc2e13f8441b09fd7352a11629a4da0ea4cb058"; - sha256 = "0j4anbhpyyfnb846n7yhx2smr6q7ik11272zyfh7jwdr699c2dcj"; + rev = "869260840bd05c92408c6867e11d7288e3b24d9b"; + sha256 = "0djj139x1pqx4y72mz8hddamwx5ggqyqqcbx309l6mhjiprf0iy5"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; meta.hydraPlatforms = [ ]; @@ -19712,12 +19738,12 @@ final: prev: { vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2025-04-10"; + version = "2025-04-17"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "f48d169fd6b0ab178807f01e73e9937f1377a77c"; - sha256 = "0jkkl3cqib5az534dyzkfrkwys5la9qd8bcrv1j2hcgbcfwf5zw4"; + rev = "0193f11a7da93e8d14357b32413900009c31a90c"; + sha256 = "11z3xqp91p2l5kzmkfyy9v0xky97h60cgcgr1r3ix584jxli55il"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; meta.hydraPlatforms = [ ]; @@ -20806,12 +20832,12 @@ final: prev: { vimtex = buildVimPlugin { pname = "vimtex"; - version = "2025-04-13"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "237671ff5852e30f1ad47a572d55a9c2e2dbe91d"; - sha256 = "0bq2nhf44qbndjbs3hj75s6iigv9g08qz45p8260rvvjq4jln52x"; + rev = "cfd4e528b0b44804b51a2929ddcde0b99ebae52f"; + sha256 = "1a7pifx5i38pakhf946xh1sakc4vslak62hqyx37biyspjvxbym7"; }; meta.homepage = "https://github.com/lervag/vimtex/"; meta.hydraPlatforms = [ ]; @@ -20910,12 +20936,12 @@ final: prev: { visual-whitespace-nvim = buildVimPlugin { pname = "visual-whitespace.nvim"; - version = "2025-04-14"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "mcauley-penney"; repo = "visual-whitespace.nvim"; - rev = "b3a1383c152cf8fbee6c29ac0f48fdb31f16f550"; - sha256 = "0367q0cilcdnx963xs81lim8yf84y7lpka986hvbf84qip83gh1g"; + rev = "8efff74c6811d1e858bbea49be6f21828df96458"; + sha256 = "0rglcg0m45k7js26i3qyxzfcw40sg2rcxk37lhvx5qlah7sdk88b"; }; meta.homepage = "https://github.com/mcauley-penney/visual-whitespace.nvim/"; meta.hydraPlatforms = [ ]; @@ -20936,12 +20962,12 @@ final: prev: { vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2025-03-26"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "49d6014ba151fc6cc585b8d5f057ca7839077bf8"; - sha256 = "1ik0jz4d39jsi117hvcksvzx2b1k3aiqc1x4rgjfd43zg400mi58"; + rev = "5769f298af4abf371528b25623fecb1e069c858c"; + sha256 = "1l9jm1yjfq73bsb1izs26ssd714rc8hshkks4yf52jva2i92p15h"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; meta.hydraPlatforms = [ ]; @@ -21288,12 +21314,12 @@ final: prev: { yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2025-04-12"; + version = "2025-04-20"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "8418e7028f91feacffcf75236fd4e93a5a3fe911"; - sha256 = "1jrwpg3pp50rybzb02np39zpcmibgvv56xl09xpxrhldmmb5p6bp"; + rev = "50446f185d8b97b225d47852813f0e415cd70689"; + sha256 = "0qidjs15lk01j0kmhwv4p2vyfj5dswdf5f9qmzjxh4ha5xs9gmg4"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; meta.hydraPlatforms = [ ]; @@ -21392,12 +21418,12 @@ final: prev: { zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "2025-03-04"; + version = "2025-04-16"; src = fetchFromGitHub { owner = "zenbones-theme"; repo = "zenbones.nvim"; - rev = "dbd485fa5d5230d175e024374d41dab5ad71b119"; - sha256 = "102375anp0b4iygnxcrx173r5cll3x1gwhfm4qnl3xq26691xy9p"; + rev = "0c14c7d00016953c41f22c6eb885ade87010bb69"; + sha256 = "1dv5d2bmqxdm08hzwkh9hal5p30m9hr0z3jb4jyaqxf6nqwjl4pf"; }; meta.homepage = "https://github.com/zenbones-theme/zenbones.nvim/"; meta.hydraPlatforms = [ ]; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix index 2f5c42d5af2b..89a6d7e91767 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix @@ -7,14 +7,14 @@ }: vimUtils.buildVimPlugin { pname = "cmp-async-path"; - version = "0-unstable-2024-10-21"; + version = "0-unstable-2025-04-13"; src = fetchFromGitea { domain = "codeberg.org"; owner = "FelipeLema"; repo = "cmp-async-path"; - rev = "d6d1ffa2075039632a2d71e8fa139818e15ac757"; - hash = "sha256-MZFpNPtSDMZNkfoz+3ZcDxLb8PvDtm9nb1dE0CbYIPQ="; + rev = "0ed1492f59e730c366d261a5ad822fa37e44c325"; + hash = "sha256-J1Iw7yNfvWq7Jul25Eyx4qk9lSiLpZt4TRvTYi1DXtk="; }; checkInputs = [ vimPlugins.nvim-cmp ]; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix index cffd5943faba..14e3240bf058 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix @@ -9,12 +9,12 @@ libuv, }: let - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "mistricky"; repo = "codesnap.nvim"; tag = "v${version}"; - hash = "sha256-OmSgrTYDtNb2plMyzjVvxGrfXB/lGKDpUQhpRqKfAMA="; + hash = "sha256-VHH1jQczzNFiH+5YflhU9vVCkEUoKciV/Z/n9DEZwiY="; }; codesnap-lib = rustPlatform.buildRustPackage { pname = "codesnap-lib"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix new file mode 100644 index 000000000000..0a6bff6bebdc --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix @@ -0,0 +1,26 @@ +{ + lib, + vimUtils, + fetchFromGitLab, + nix-update-script, +}: +vimUtils.buildVimPlugin { + pname = "sonarlint.nvim"; + version = "0-unstable-2025-04-18"; + + src = fetchFromGitLab { + owner = "schrieveslaach"; + repo = "sonarlint.nvim"; + rev = "0b78f1db800f9ba76f81de773ba09ce2222bdcc2"; + hash = "sha256-EUwuIFFe4tmw8u6RqEvOLL0Yi8J5cLBQx7ICxnmkT4k="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://gitlab.com/schrieveslaach/sonarlint.nvim"; + description = "Extensions for the built-in Language Server Protocol support in Neovim for sonarlint-language-server"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.sinics ]; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 1784aca034f1..4b1dfa5ae8ce 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -17,6 +17,7 @@ python3, # Misc dependencies code-minimap, + dailies, dasht, deno, direnv, @@ -374,6 +375,12 @@ in ''; }; + claude-code-nvim = super.claude-code-nvim.overrideAttrs { + dependencies = with self; [ + plenary-nvim + ]; + }; + clighter8 = super.clighter8.overrideAttrs { preFixup = '' sed "/^let g:clighter8_libclang_path/s|')$|${lib.getLib llvmPackages.clang.cc}/lib/libclang.so')|" \ @@ -884,6 +891,12 @@ in ''; }; + dailies-nvim = super.dailies-nvim.overrideAttrs { + runtimeDeps = [ + dailies + ]; + }; + darkearth-nvim = super.darkearth-nvim.overrideAttrs { dependencies = [ self.lush-nvim ]; # Lua module used to build theme @@ -1204,6 +1217,10 @@ in fzf-lua = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.fzf-lua; runtimeDeps = [ fzf ]; + nvimSkipModules = [ + "fzf-lua.shell_helper" + "fzf-lua.spawn" + ]; }; fzf-vim = super.fzf-vim.overrideAttrs { @@ -2222,6 +2239,8 @@ in "nvchad.cheatsheet.grid" "nvchad.cheatsheet.simple" "nvchad.blink.config" + # Circular dependency with base46 + "nvchad.utils" ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c00c22784bba..4a804f2223f9 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -151,6 +151,7 @@ https://github.com/declancm/cinnamon.nvim/,HEAD, https://github.com/projekt0n/circles.nvim/,, https://github.com/zootedb0t/citruszest.nvim/,, https://github.com/xavierd/clang_complete/,, +https://github.com/greggh/claude-code.nvim/,HEAD, https://github.com/rhysd/clever-f.vim/,, https://github.com/bbchung/clighter8/,, https://github.com/ekickx/clipboard-image.nvim/,, @@ -267,6 +268,7 @@ https://github.com/FelikZ/ctrlp-py-matcher/,, https://github.com/amiorin/ctrlp-z/,, https://github.com/ctrlpvim/ctrlp.vim/,, https://github.com/scottmckendry/cyberdream.nvim/,, +https://github.com/JachymPutta/dailies.nvim/,HEAD, https://github.com/ptdewey/darkearth-nvim/,HEAD, https://github.com/dart-lang/dart-vim-plugin/,, https://github.com/rizzatti/dash.vim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix index bbb5f89de32c..d28ceead515b 100644 --- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix +++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "calva"; publisher = "betterthantomorrow"; - version = "2.0.496"; - hash = "sha256-vf6JwsMMAcAZMXTRrczgEpvmmN34eSgsO8QXNL4+DHM="; + version = "2.0.501"; + hash = "sha256-j/WCtyrBc/D37kcjzJ/TVrqXSh9EzDoAe18mYXs43fk="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 262d33be86db..f681d3e44b21 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -259,8 +259,8 @@ let mktplcRef = { name = "ng-template"; publisher = "Angular"; - version = "19.2.3"; - hash = "sha256-fW7JtaFXBR+PL17CUCtIAXndO/fBctisHd/uZg5Dez4="; + version = "19.2.4"; + hash = "sha256-LJpv7ZVnJrPb4Ty0H250WcliCoJS4lXc878BTYHfJ+8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog"; @@ -668,8 +668,8 @@ let mktplcRef = { name = "markdown-mermaid"; publisher = "bierner"; - version = "1.27.0"; - hash = "sha256-09w/k1LlGYtyWWbVgoprJG/qB/zCuedF9Cu7kUXcNrE="; + version = "1.28.0"; + hash = "sha256-NAQD6DK1c13nA/O0QHNxFraImE6C0+Jzj9+f06EkiW0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-mermaid/changelog"; @@ -785,8 +785,8 @@ let mktplcRef = { name = "vscode-tailwindcss"; publisher = "bradlc"; - version = "0.14.14"; - hash = "sha256-LUjVrtL1HmxzzW8OqbadN/p3DdZDwSj2iFeXudV2ULo="; + version = "0.14.15"; + hash = "sha256-BJKPAyXBHX9W0pSxtri67PFL1zA4Vd2OMFfWi5bDnYQ="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog"; @@ -1015,8 +1015,8 @@ let mktplcRef = { name = "coder-remote"; publisher = "coder"; - version = "1.7.0"; - hash = "sha256-uUm5kS8vjCKGpJOdyJcE/ig3DUZSsQ7LbvYodNyWF5w="; + version = "1.7.1"; + hash = "sha256-egtB8mF9bbGb5YJ2pS9uGMzLmJcHAZ7UTswrn6k2k3A="; }; meta = { description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click"; @@ -1162,8 +1162,8 @@ let mktplcRef = { name = "dbclient-jdbc"; publisher = "cweijan"; - version = "1.4.3"; - hash = "sha256-XaV7N3IFe6+gc/qrHkSUikAQghJb6k6+XE5fMYWdyDY="; + version = "1.4.4"; + hash = "sha256-hrymsnprfrRQeS/WRGqdV3MNPw+C+iJCcXF1IfNjGWE="; }; meta = { description = "JDBC Adapter For Database Client"; @@ -1178,8 +1178,8 @@ let mktplcRef = { name = "vscode-database-client2"; publisher = "cweijan"; - version = "8.2.4"; - hash = "sha256-tfUEUFyijRfzH805Eb26fgrIPLPv2GuOsCOqHuQQmQM="; + version = "8.2.5"; + hash = "sha256-t6+LLLGuh67cuvGzv9+ic7AFqQU+bxDc6UByJM0OF7s="; }; meta = { description = "Database Client For Visual Studio Code"; @@ -1192,8 +1192,8 @@ let mktplcRef = { publisher = "DanielGavin"; name = "ols"; - version = "0.1.33"; - hash = "sha256-6XjNiRmdUMgc/cFrn0SmI/ad7eoBBaCQUsu9lItarMc="; + version = "0.1.34"; + hash = "sha256-Xec6UHMe/6ChA4SHCPzMuUAJZejKpGo3YHy9paashmY="; }; meta = { description = "Visual Studio Code extension for Odin language"; @@ -1207,8 +1207,8 @@ let mktplcRef = { publisher = "DanielSanMedium"; name = "dscodegpt"; - version = "3.10.68"; - hash = "sha256-CB6XraQoMoFRhSKZzTVwsXs5ip5PfYraGR6GyULxrl0="; + version = "3.10.84"; + hash = "sha256-s7Zo8zRZ4nsEuoSPwQL3osRs5zlmbcEsCjIJ8janhPs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog"; @@ -1259,8 +1259,8 @@ let mktplcRef = { name = "databricks"; publisher = "databricks"; - version = "2.9.1"; - hash = "sha256-wbq7XtINlPVUqBdmbl/O3P8f7Y/KqGSR+vbtEUofKk4="; + version = "2.9.2"; + hash = "sha256-lGVp/pkYQFqCa1fCEydrNke1yRxUmTRaaN+giuLdISQ="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog"; @@ -1355,8 +1355,8 @@ let mktplcRef = { name = "composer-php-vscode"; publisher = "devsense"; - version = "1.57.17031"; - hash = "sha256-TY7cqUrbxNDS1JT+LgGGgs6mbseoQLq1+BBuybMQsVk="; + version = "1.57.17158"; + hash = "sha256-S/A9Bg4RAd5WDJYDziOahbXqEDeHR/bWaNbh0vzhlww="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.composer-php-vscode/changelog"; @@ -1428,8 +1428,8 @@ let mktplcRef = { name = "profiler-php-vscode"; publisher = "devsense"; - version = "1.57.17031"; - hash = "sha256-fC+8trGmvgYjsnJA6+L6sxFoE6Cr91Q7xdparE9JKyg="; + version = "1.57.17158"; + hash = "sha256-Ng7zuyNQjrQwqjgMl2NC204uPFD6lkbYp+zN+y9NC/A="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.profiler-php-vscode/changelog"; @@ -1486,8 +1486,8 @@ let mktplcRef = { publisher = "discloud"; name = "discloud"; - version = "2.22.40"; - hash = "sha256-YxWla1bayzIX70PxdFSZuJum6ddazzgQKjRH7DpceTY="; + version = "2.22.42"; + hash = "sha256-jIjRMQ279KK8BxcQWWzcRcwfhkTg8W4aGUwqijje7ZY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog"; @@ -1515,8 +1515,8 @@ let mktplcRef = { name = "competitive-programming-helper"; publisher = "DivyanshuAgrawal"; - version = "2025.4.1743875007"; - hash = "sha256-WtzJ9rcssUAk2zACjqWYpwh6aHtzh9eGMGANeeFqCnU="; + version = "2025.4.1744912235"; + hash = "sha256-IUnQOaoBIcvWz72Ck1QC366LARw1UncNnvm04sc8WA0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog"; @@ -1599,8 +1599,8 @@ let # semver scheme, contrary to preview versions which are listed on # the VSCode Marketplace and use a calver scheme. We should avoid # using preview versions, because they expire after two weeks. - version = "17.0.1"; - hash = "sha256-0wRhdVR9q7oFjQQM090oXRxICUMCu7BjgOGkKTxeQmg="; + version = "17.0.3"; + hash = "sha256-jU1N5tJ4V3jzSNW9oE8AH5PRhTmsiIGnu65+IH5NxO0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -1902,8 +1902,8 @@ let mktplcRef = { name = "vscode-jest-runner"; publisher = "firsttris"; - version = "0.4.80"; - hash = "sha256-Qe0EOKohvk/ALYT0QbOiYKOkBvfF63hv3T4VwiIls6A="; + version = "0.4.82"; + hash = "sha256-8sKMxatSaibMESktDJdQ84jINsE05ZVSjLMGjHFw7VI="; }; meta = { description = "Simple way to run or debug a single (or multiple) tests from context-menu"; @@ -2109,8 +2109,8 @@ let publisher = "github"; name = "copilot"; # Verify which version is available with nix run nixpkgs#vsce -- show github.copilot --json - version = "1.297.0"; - hash = "sha256-UVL0Yf8MSY7ETOxmEK+dljrOQL9ctUWVhbYdr0v00b0="; + version = "1.303.0"; + hash = "sha256-xh1jdosoSdIdLbmKQJjIwqwC5aF6Ko7y+GC3Y+gBazI="; }; meta = { @@ -2187,8 +2187,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "6.7.1"; - hash = "sha256-qNOjbDdGrab53YYO4TCqxk8v2pmvjElgeXYU525/6Eg="; + version = "6.11.0"; + hash = "sha256-4fzjJKj4RGzqD+ionUA2Al7UGv5aJNCo8O1JOnS+nqY="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -2345,8 +2345,8 @@ let mktplcRef = { publisher = "haskell"; name = "haskell"; - version = "2.5.3"; - hash = "sha256-3HbUH5+YCPqypGlsaSDwwyN/PoG9KO0YnZ1Ps7ZLQ48="; + version = "2.6.0"; + hash = "sha256-2lvG7yZ+QAoafwyWQkVwyl2MsP8zWWQkTw8hBtib+C0="; }; meta = { license = lib.licenses.mit; @@ -2507,8 +2507,8 @@ let mktplcRef = { name = "vscode-vibrancy-continued"; publisher = "illixion"; - version = "1.1.46"; - hash = "sha256-TcEPr2lpUDsx/G6WXePsS7FUEOKSYSjaapsPEI5xXNU="; + version = "1.1.48"; + hash = "sha256-bTxseGGog4hyk5Hn9b7ggObtiJif7gWxHE0Kb7y7uEk="; }; meta = { downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued"; @@ -2692,8 +2692,8 @@ let mktplcRef = { name = "gruvbox"; publisher = "jdinhlife"; - version = "1.24.6"; - hash = "sha256-nnQxaHnlgBpZSMigr04yqqO+mmZ+HqYq3WQFIRi3pRg="; + version = "1.26.0"; + hash = "sha256-XSDGwJ8zL1y9EZqk2wixMEV5GRjQngs8Pvu9QppWCNI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/jdinhlife.gruvbox/changelog"; @@ -2957,8 +2957,8 @@ let mktplcRef = { name = "vscode-cfn-lint"; publisher = "kddejong"; - version = "0.26.4"; - hash = "sha256-SeLkZurILFc6qVOgbr9epOhspqfOe8EQ+WerrGfh548="; + version = "0.26.5"; + hash = "sha256-/DSGwHkXu6auCN1KZ3pJnMC6PnCHIhXDkCD5oE2fYdk="; }; nativeBuildInputs = [ @@ -3017,8 +3017,8 @@ let mktplcRef = { name = "asn1js"; publisher = "lapo"; - version = "0.1.4"; - hash = "sha256-utbIKlwNHnJZj/51f8hEDmUA/A26De/gY73iT4tXKRU="; + version = "0.2.1"; + hash = "sha256-/75tsueW1PQIHN6YOLajREcMbRnzxzBIGnd7LGAxwBs="; }; meta = { description = "Decode ASN.1 content inside VSCode"; @@ -3080,8 +3080,8 @@ let mktplcRef = { name = "vscode-ltex-plus"; publisher = "ltex-plus"; - version = "15.5.0"; - hash = "sha256-tAqtWX7NHR8ftrtDRY2BGk3VwLa0Wx9OxQo8uGF/JlA="; + version = "15.5.1"; + hash = "sha256-BzIJ7gsjcMimLYeVxcvdP0fyIEmwCXxTxqil5o+810w="; }; meta = { description = "VS Code extension for grammar/spell checking using LanguageTool with support for LaTeX, Markdown, and others"; @@ -3139,8 +3139,8 @@ let mktplcRef = { publisher = "matangover"; name = "mypy"; - version = "0.4.1"; - hash = "sha256-hCgOclEnjhWTLMZPXJkoxgFN4pqZ1MKTzmRtjeHbLeU="; + version = "0.4.2"; + hash = "sha256-T0H2JGr1WgSgXbf3aLvjKK0OOh9O+eg9YLs/ydblb9U="; }; meta.license = lib.licenses.mit; }; @@ -3337,8 +3337,8 @@ let mktplcRef = { publisher = "ms-azuretools"; name = "vscode-docker"; - version = "1.29.4"; - hash = "sha256-j2ACz2Ww5hddoDLHGdxnuQIqerP5ogZ80/wS+Aa5Gdo="; + version = "1.29.5"; + hash = "sha256-WQiVqC/+qJkEHpYTRbg5NbzQG1+jtifvjF/wbQJfQeY="; }; meta = { description = "Docker Extension for Visual Studio Code"; @@ -3357,8 +3357,8 @@ let mktplcRef = { name = "vscode-dotnet-runtime"; publisher = "ms-dotnettools"; - version = "2.3.1"; - hash = "sha256-0bn2B17kJd5uXe/MJCzYin2iWGdKD4H4nUIXdzb5NxM="; + version = "2.3.3"; + hash = "sha256-l+/r0C+BZr8H8qBKenVP3b4qYGR57Lol+Y1Q2XUGl24="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscode-dotnet-runtime/changelog"; @@ -3423,8 +3423,8 @@ let mktplcRef = { name = "vscode-kubernetes-tools"; publisher = "ms-kubernetes-tools"; - version = "1.3.21"; - hash = "sha256-/Y7sRpJzwmo3fgwdrYqNNu8XA+j3zohJBv9vOcm3bRk="; + version = "1.3.22"; + hash = "sha256-9iSOBxsqjFa6OcwD8n8bwHtIvZUZYxgI9ug09Uk2NwE="; }; meta = { license = lib.licenses.mit; @@ -3680,8 +3680,8 @@ let mktplcRef = { name = "remote-wsl"; publisher = "ms-vscode-remote"; - version = "0.88.5"; - hash = "sha256-zTAGRYaOjO1xpfjh6v/lKFM1emR/OexWc1Yo8O5oUgU="; + version = "0.99.0"; + hash = "sha256-zwM4gj11sM00HjaOUFEZ77Vm07iCDwwPmEqiJ97kXL8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/ms-vscode-remote.remote-wsl/changelog"; @@ -3750,8 +3750,8 @@ let mktplcRef = { publisher = "mvllow"; name = "rose-pine"; - version = "2.13.0"; - hash = "sha256-GtQq7eTvb1BuNcA5SJpYRaJo7mhevTAT1uBbqXkRURM="; + version = "2.14.0"; + hash = "sha256-bjYumipeZM5tNl/cTHLcm/EyX4FU1AzQU3W53e0cGfc="; }; meta = { license = lib.licenses.mit; @@ -3874,8 +3874,8 @@ let mktplcRef = { name = "ocaml-platform"; publisher = "ocamllabs"; - version = "1.28.2"; - hash = "sha256-j49r7lhJkHZHkeFXTC/hQNLw4ICQ2JW/ahYUVYwLJd4="; + version = "1.29.0"; + hash = "sha256-Bznz5wpG71zXOAUYkwP5Q0hnYNq6OBfrMX620OvOEK8="; }; }; @@ -4003,8 +4003,8 @@ let mktplcRef = { name = "prisma"; publisher = "Prisma"; - version = "6.5.0"; - hash = "sha256-1aZW8FYFIHsRC3klVHt/0Pp5RteF8XBseuJZuLnRgJE="; + version = "6.6.0"; + hash = "sha256-7l7J4oTunWL2K9UxbnygaeGxxHqhwJRmYfeW2JRgcvc="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog"; @@ -4339,8 +4339,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.48.0"; - hash = "sha256-GtlVj/XvnlsLQb8PwXl6S2OW0mOl8SCR3N76zhZBwxA="; + version = "1.49.0"; + hash = "sha256-/vzQojojvEz0KLebFCE3q4ptqPm40s4UgwxUAwMx8zs="; }; meta = { license = lib.licenses.asl20; @@ -4441,8 +4441,8 @@ let mktplcRef = { publisher = "shopify"; name = "ruby-lsp"; - version = "0.9.13"; - hash = "sha256-Lde17QPuaubrvomwZjWA9f34/Dn0qyG5MQxMLJFWBQ8="; + version = "0.9.16"; + hash = "sha256-X+Ym36NWQOYXW5IcevImdkKU1IAr36YGZrNziacIHWA="; }; meta = { description = "VS Code plugin for connecting with the Ruby LSP"; @@ -4558,8 +4558,8 @@ let mktplcRef = { publisher = "sonarsource"; name = "sonarlint-vscode"; - version = "4.19.0"; - hash = "sha256-IjukIQIs4RoCZyzJiRDgFIPBvIK5Wn8o7NdvbfqlMBI="; + version = "4.20.2"; + hash = "sha256-e1HYFPILERzlBYEBC7q9gUfj65tmruMduVAjzG0CUnM="; }; meta.license = lib.licenses.lgpl3Only; }; @@ -4725,8 +4725,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "109.5.3"; - hash = "sha256-wbU1euQmFyHOEHq2y2JvcAZeV4eee9pM0NKZnSgkRKU="; + version = "109.5.4"; + hash = "sha256-aJjwXQKSpCCmwkaBfdTEgPGWALGb3qRD8JOgTbRWRh8="; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; @@ -4759,8 +4759,8 @@ let mktplcRef = { name = "tabnine-vscode"; publisher = "tabnine"; - version = "3.253.0"; - hash = "sha256-4FDYIDLqb66XylX1WRGqbwqBUc0XgNG6XENEVXC/7Sk="; + version = "3.259.0"; + hash = "sha256-BhJskqQr222VA6Sf7okttUIeYpsi99IyXJIOOWZKQ9M="; }; meta = { license = lib.licenses.mit; @@ -4870,6 +4870,8 @@ let }; }; + tecosaur.latex-utilities = callPackage ./tecosaur.latex-utilities { }; + tekumara.typos-vscode = callPackage ./tekumara.typos-vscode { }; theangryepicbanana.language-pascal = buildVscodeMarketplaceExtension { @@ -5500,6 +5502,23 @@ let }; }; + woberg.godot-dotnet-tools = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "woberg"; + name = "godot-dotnet-tools"; + version = "0.5.1"; + hash = "sha256-qZdQiW1RvzUR5+5QlVdMPBY82IOPUPs3GNOl6bOhnWM="; + }; + meta = { + description = "VSCode extension for Godot 4 Mono supporting C# language"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=woberg.godot-dotnet-tools"; + homepage = "https://github.com/williamoberg/godot-dotnet-tools"; + license = lib.licenses.mit; + # For instructions on configuring this extension see: + # https://wiki.nixos.org/wiki/Godot-Mono + }; + }; + xadillax.viml = buildVscodeMarketplaceExtension { mktplcRef = { name = "viml"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix index 57e0e3e8b276..cf95ef73c57b 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix @@ -61,7 +61,7 @@ let if ! nodeVersion=$($serverNode -v); then echo "Unable to fix Node binary, quitting" - fail_with_exitcode ''${o.InstallExitCode.ServerTransferFailed} + fail_with_exitcode ''${f.UnifiedStatusCode.ServerTransferFailed} fi ${lib.optionalString useLocalExtensions '' diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index 1056575f1476..df71d0b3ce53 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "RooVeterinaryInc"; name = "roo-cline"; - version = "3.11.12"; - hash = "sha256-f7IPxeF/UxywMm8yVEZV/sHTKILZ3n788bhwH4xx89I="; + version = "3.13.2"; + hash = "sha256-ezmBS84RonkqlguLcgGZa4663GpY6yReKKb+r6YzQms="; }; passthru.updateScript = vscode-extensions-update-script { }; diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index 5abec4f2f08c..0c42097b509c 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -10,8 +10,6 @@ esbuild, pkg-config, libsecret, - stdenv, - darwin, setDefaultServerPath ? true, }: @@ -39,18 +37,13 @@ let buildInputs = [ pkgsBuildBuild.libsecret ]; - nativeBuildInputs = - [ - jq - moreutils - esbuild - # Required by `keytar`, which is a dependency of `vsce`. - pkg-config - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - ]; + nativeBuildInputs = [ + jq + moreutils + esbuild + # Required by `keytar`, which is a dependency of `vsce`. + pkg-config + ]; # Follows https://github.com/rust-lang/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65 installPhase = '' diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index 802bd0e389b0..70705435b3fc 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.12.1"; - hash = "sha256-N845Ib84q1sjJgsE7deQO1q1P5vZdAsoBYfB7iEY0qU="; + version = "3.12.3"; + hash = "sha256-HluLBJe7v21vViI7NcbmrXpE/ZBserW4eAvab5swjyQ="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-german/default.nix b/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-german/default.nix index 260d06879d63..c8e6d5859cfa 100644 --- a/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-german/default.nix +++ b/pkgs/applications/editors/vscode/extensions/streetsidesoftware.code-spell-checker-german/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "code-spell-checker-german"; publisher = "streetsidesoftware"; - version = "2.3.2"; - hash = "sha256-40Oc6ycNog9cxG4G5gCps2ADrM/wLuKWFrD4lnd91Z4="; + version = "2.3.3"; + hash = "sha256-sEdr8SQDFWgCq77flvbReILgWtT/ao8cJjrgC7RKO80="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker-german/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/tecosaur.latex-utilities/default.nix b/pkgs/applications/editors/vscode/extensions/tecosaur.latex-utilities/default.nix new file mode 100644 index 000000000000..61a582529ba2 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/tecosaur.latex-utilities/default.nix @@ -0,0 +1,38 @@ +{ + lib, + vscode-utils, + jq, + moreutils, + texlivePackages, +}: + +vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { + mktplcRef = { + name = "latex-utilities"; + publisher = "tecosaur"; + version = "0.4.14"; + hash = "sha256-GsbHzFcN56UbcaqFN9s+6u/KjUBn8tmks2ihK0pg3Ds="; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ texlivePackages.texcount ]; + + postInstall = '' + cd "$out/$installPrefix" + echo -n ${finalAttrs.version} > VERSION + jq '.contributes.configuration.properties."latex-utilities.countWord.path".default = "${texlivePackages.texcount}/bin/texcount"' package.json | sponge package.json + ''; + + meta = { + description = "Add-on to the Visual Studio Code extension LaTeX Workshop"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=tecosaur.latex-utilities"; + homepage = "https://github.com/tecosaur/LaTeX-Utilities"; + changelog = "https://marketplace.visualstudio.com/items/tecosaur.latex-utilities/changelog"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jeancaspar ]; + }; +}) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 437bce33e321..cb09ee43180c 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,22 +36,22 @@ let sha256 = { - x86_64-linux = "0hb1rmrrd7zjihrl080h7jf4dprpr7mvm3ykv13mg0xmmv0d7pww"; - x86_64-darwin = "0bf69y7xxn499r35zxliqx0jvhyd11b46p5a87w62g90q4kcald8"; - aarch64-linux = "05zjk3l05lxh21anxxds6fn98fxlkrak37sz79jg50cxrpn5jvxg"; - aarch64-darwin = "1sjvj4d0d3mcjczb1sjia6gl34vkr91z7jxbyqbf5c88j3zybvw5"; - armv7l-linux = "1m7g179hlz2kri0pqsaigdyfnkkv4xwaxmxrbdpxh0sjb2imv8x2"; + x86_64-linux = "0d9qfifxslwkyv9v42y2h7nbqndq5w16z08qar4vly1hnjnmzzxl"; + x86_64-darwin = "1yyfkgif0nyhgb28wn1wmdq9wyzxybgdfp8j9nknh0nmvmf1r9w6"; + aarch64-linux = "05xj9fswgf24l9mx98hcapzq90820dwwp9mskbbzai3kxy915yqx"; + aarch64-darwin = "0a41szz9gljf31pq5czqwiyrxms5cf1x1058rsacaihvx8vn38ya"; + armv7l-linux = "0iq3y8vj4gm20bxkcrsrnb3g0nf5lg5mpb1bxrg2cy4dgaxjl170"; } .${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.99.2"; + version = "1.99.3"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "4949701c880d4bdb949e3c0e6b400288da7f474b"; + rev = "17baf841131aa23349f217ca7c570c76ee87b957"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -75,7 +75,7 @@ callPackage ./generic.nix rec { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "0rd5j7n0cc3srn8rcm3ia1knp6zwwjvbjw4067xv0nvb8ilalssw"; + sha256 = "02b2hbdhambi4viyxsxsdayj294g45i49n5yj828nwigw71asysv"; }; stdenv = stdenvNoCC; }; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index affc623f5e6c..4d1aa569f066 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -26,11 +26,11 @@ let hash = { - x86_64-linux = "sha256-yK7ORsRAWMJ8yrWROS/jSKdyCyuJ2Y+gIdZlqto+/Xo="; - x86_64-darwin = "sha256-d+8vt5grnLwD/cIIGgb2ogpgZrZLZs+2bqfBrRzLfJw="; - aarch64-linux = "sha256-D93Eh5TPRgd9OxJ4pWsOryS5mOz2amQOHOnO+K99hAg="; - aarch64-darwin = "sha256-xKBWAb23jUi8pI7mZpHOP2eF3PZFh0MWj+BM+alKF18="; - armv7l-linux = "sha256-EqJNi/qMM08voA/Ltle3/28zbgIz/Ae42IE5oXLxcKU="; + x86_64-linux = "sha256-NgbN8hqayBG/5bFS+2f+Jmx8a1RSjHJG8zvvJvtOLGs="; + x86_64-darwin = "sha256-Gt8K3sL81cxeldiG/mNXFzQG1/M2D7Klj/scCAa+RgI="; + aarch64-linux = "sha256-YXKiYVHwo5Nn8e8JGtuuKcXx4JgxfnDr10rvwEy2m3Y="; + aarch64-darwin = "sha256-uBimHECN3qvyHvmGDleR228ms5OBlBFPHafRueUfzBU="; + armv7l-linux = "sha256-DacykoqnE4ZFNn8t5i93k3k/OK0H9krWzw5YoX4+rrM="; } .${system} or throwSystem; @@ -41,7 +41,7 @@ callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.99.02289"; + version = "1.99.32562"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/blink/default.nix b/pkgs/applications/emulators/blink/default.nix index a65ebf5886b3..1474675e21bb 100644 --- a/pkgs/applications/emulators/blink/default.nix +++ b/pkgs/applications/emulators/blink/default.nix @@ -2,6 +2,7 @@ stdenv, fetchFromGitHub, lib, + zlib, }: stdenv.mkDerivation (finalAttrs: { @@ -15,6 +16,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-4wgDftXOYm2fMP+/aTRljDi38EzbbwAJlQkuxjAMl3I="; }; + buildInputs = [ zlib ]; + # Do not include --enable-static and --disable-shared flags during static compilation dontAddStaticConfigureFlags = true; diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix index b60e9ddd38ad..fc6e25d3ab38 100644 --- a/pkgs/applications/emulators/dosbox-x/default.nix +++ b/pkgs/applications/emulators/dosbox-x/default.nix @@ -3,10 +3,7 @@ stdenv, fetchFromGitHub, alsa-lib, - AudioUnit, autoreconfHook, - Carbon, - Cocoa, ffmpeg, fluidsynth, freetype, @@ -86,11 +83,6 @@ stdenv.mkDerivation (finalAttrs: { alsa-lib libxkbfile libXrandr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioUnit - Carbon - Cocoa ]; # Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL2 subdirectory diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index f27d3e06adb5..90ec74cd0485 100644 --- a/pkgs/applications/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -11,7 +11,6 @@ graphicsmagick, libGL, libGLU, - OpenGL, libpng, makeDesktopItem, }: @@ -46,17 +45,10 @@ stdenv.mkDerivation rec { SDL_sound libpng ] - ++ ( - if stdenv.hostPlatform.isDarwin then - [ - OpenGL - ] - else - [ - libGL - libGLU - ] - ); + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libGL + libGLU + ]; # Tests for SDL_net.h for modem & IPX support, not automatically picked up due to being in SDL subdirectory env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL_net}/include/SDL"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix index c0f00af9e778..aa13b32ebbf2 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "mednafen-psx" + lib.optionalString withHw "-hw"; - version = "0-unstable-2025-04-04"; + version = "0-unstable-2025-04-11"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-psx-libretro"; - rev = "90c09d4b8e6923a22538c35f68ace2d9fead134d"; - hash = "sha256-eVoKmGE3N8uePcNpxWjAjgUjTIfEHZR3K2FLtQtLp+M="; + rev = "5d2137e5f15db3b52583e8246bcf2669cebb147b"; + hash = "sha256-Gu5rubuNsMWOCNaNrqRR/hoErmhYdGC+9o/xDXuaWuM="; }; extraBuildInputs = lib.optionals withHw [ diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix index b2e52fd6202f..d4716778840b 100644 --- a/pkgs/applications/emulators/libretro/cores/bluemsx.nix +++ b/pkgs/applications/emulators/libretro/cores/bluemsx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bluemsx"; - version = "0-unstable-2024-12-04"; + version = "0-unstable-2025-04-15"; src = fetchFromGitHub { owner = "libretro"; repo = "bluemsx-libretro"; - rev = "572c91856a5288b7433c619af651e31f00f3ce7e"; - hash = "sha256-fN5zjQGIyx3yIEgIhC50gD3O2F6WPJ/ssiauQ5Z/t9s="; + rev = "efaaa1052dc427d64534531cf59a6a9a659dc6a6"; + hash = "sha256-oCjIQ78YU5SeeefHHwd7l3U+YhwVMf6R2mbsuHAQUYQ="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/applications/emulators/libretro/cores/bsnes.nix index 07f1f03b2148..846b6d9ddb0f 100644 --- a/pkgs/applications/emulators/libretro/cores/bsnes.nix +++ b/pkgs/applications/emulators/libretro/cores/bsnes.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bsnes"; - version = "0-unstable-2025-04-04"; + version = "0-unstable-2025-04-11"; src = fetchFromGitHub { owner = "libretro"; repo = "bsnes-libretro"; - rev = "8d89089d35bedc257dc13bebd3790f70417311a5"; - hash = "sha256-0n2N2Ks8MIy7dcuj2SESjDNxma7RRhAgOxQ5sC3XJTM="; + rev = "b102d6d5817b25aa059b573cd3b7675f2e375fa4"; + hash = "sha256-a77SSoz0C189iNHUB2bcO3X76LPbA/V7pAZtUR03u48="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix index a1f582cda4a9..dd0e95243d5f 100644 --- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix +++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "dosbox-pure"; - version = "0-unstable-2025-03-18"; + version = "0-unstable-2025-04-10"; src = fetchFromGitHub { owner = "schellingb"; repo = "dosbox-pure"; - rev = "619c575db6f81d1911e36f1ecd618c9dead86859"; - hash = "sha256-Pp3OP69KKrznOl1cY5yiKxMJRA7REe4S51zGDHG883c="; + rev = "51ca5126ee67e88827c87c761a097a6318ad25e7"; + hash = "sha256-OBC8y53ljmgmfow7qBWIJYgjAiyv2bVa3CqQFkaJRhQ="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index 9564ccde7b29..f366a11eb0c6 100644 --- a/pkgs/applications/emulators/libretro/cores/fbneo.nix +++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fbneo"; - version = "0-unstable-2025-04-05"; + version = "0-unstable-2025-04-15"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "c21c0a0393a1cc68db7250022d18039a30de51f4"; - hash = "sha256-AZyYUftVHlxR+QHCsIcNI2hTIEDYeInYPdmum++EtpU="; + rev = "ffdacc6a7ce719b6371ad0a6143ce46726ed5d25"; + hash = "sha256-Pdp/pPsZujbAK6pEE5LT6KCdJ/RFW1zR67bWvI/efJI="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix index 3039615973f7..e245cf7dddb2 100644 --- a/pkgs/applications/emulators/libretro/cores/fceumm.nix +++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fceumm"; - version = "0-unstable-2025-04-06"; + version = "0-unstable-2025-04-11"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-fceumm"; - rev = "b349f7f3e211bb7725f133d3818ab98da5059760"; - hash = "sha256-MNYpuipjnDl9GUl5qWGi5W5cFhUCd/weCKuTRdttKJ4="; + rev = "43e6496351b544df0de692fbb01b2a6942073f5c"; + hash = "sha256-kGGvI1rKE/oSF2v3URDY/fLTThYc3Crk9UFN69Rcckg="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix index 8823d203a995..24cd24aa79f4 100644 --- a/pkgs/applications/emulators/libretro/cores/flycast.nix +++ b/pkgs/applications/emulators/libretro/cores/flycast.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "flycast"; - version = "0-unstable-2025-04-05"; + version = "0-unstable-2025-04-15"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "3114394019fc0f772c29d0a1f5493fbdce4745b0"; - hash = "sha256-bp10601cfcsb62Vy88zIjFZ/yBUGVODEt96Me7XX5kY="; + rev = "25a882341d5ebbf8124ddd2a7421592678dfac2e"; + hash = "sha256-N/7JZbEzYaOAoUShkmQd1G61ke1U3OSeFMXS0lqftYU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix index 4c0f638580f3..5f1252b91c49 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003-plus"; - version = "0-unstable-2025-04-07"; + version = "0-unstable-2025-04-16"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-plus-libretro"; - rev = "2b5fc26ee64d963021bc266aa45f19d90b282f92"; - hash = "sha256-ZbebYUOUdaLVTh+VD8AQvAv/zQzr6tugJRl3iYSrUeo="; + rev = "c2128c3e82d884f39d824b5ef2716ac35dfa406b"; + hash = "sha256-acicfUJlDT2Tm3aGTs9tAGaAGCC22ebRXnVLAxgcRI8="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix index 445e0cea6ca3..7dc31a0a0e86 100644 --- a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix +++ b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "pcsx-rearmed"; - version = "0-unstable-2025-03-30"; + version = "0-unstable-2025-04-13"; src = fetchFromGitHub { owner = "libretro"; repo = "pcsx_rearmed"; - rev = "6091efb4d64ed745495455ba82352ec82f55cb4f"; - hash = "sha256-9FyD3a6FE7xtt/UGvRNfopvQPgAg/0QGrJ1NNMEIsyg="; + rev = "febf2246848efb8937ab24c562bba20107bb46f0"; + hash = "sha256-1mnPYr5A6KmZXXbvkE9XkZiCjx/y0Y9/Ed34LQHDbvE="; }; dontConfigure = true; diff --git a/pkgs/applications/emulators/libretro/cores/picodrive.nix b/pkgs/applications/emulators/libretro/cores/picodrive.nix index 04843e9eee1d..59ab241ed787 100644 --- a/pkgs/applications/emulators/libretro/cores/picodrive.nix +++ b/pkgs/applications/emulators/libretro/cores/picodrive.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "picodrive"; - version = "0-unstable-2025-04-03"; + version = "0-unstable-2025-04-10"; src = fetchFromGitHub { owner = "libretro"; repo = "picodrive"; - rev = "1a08d73159820bb31941d8c5ed6242a74bd4b332"; - hash = "sha256-849XeceXoPHpOMlxVtHgL2TYQTHibUbGs0oHBEiCzvw="; + rev = "c4332d608c1005a46ce51236ade9894e0d32e52b"; + hash = "sha256-qu5pnqHHO/k8OO2XXwd/H7AQsutmnMz+RBT6ZZFXZgk="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index 98861e57c740..d33b09679623 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2025-04-04"; + version = "0-unstable-2025-04-07"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "225e37d0dc7b8a7bb6dc3534b992373477f9923d"; - hash = "sha256-bY4RwJyS4R/vjae2UCi4SnIW04IzoQyMOYsW4f+UQg8="; + rev = "f66e60ffda14cc615336d2997c09b3b1b998e8eb"; + hash = "sha256-qGIqXc0xouWcOPMmBUFRyA4DHmdNEopxUR/J+o0H+QE="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index 1a6dab365d44..dcaf99312532 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -13,13 +13,13 @@ }: mkLibretroCore { core = "ppsspp"; - version = "0-unstable-2025-04-06"; + version = "0-unstable-2025-04-15"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; - rev = "031421ba4de8559f8bbdbd9367b29be28f6a45cb"; - hash = "sha256-eaXR/w0Iz9tmTgZKHVcZYXJbXaVPnYudSal0vcsQ9a0="; + rev = "599edb24f01bbb7ce0e685e3c5585a02781549c7"; + hash = "sha256-cPalfNXV6U2jLCTqXedQzn9pyWiscaZrrQM32D70uYE="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/applications/emulators/libretro/cores/puae.nix index 3c0cb10e13ca..1d1b91d8dabf 100644 --- a/pkgs/applications/emulators/libretro/cores/puae.nix +++ b/pkgs/applications/emulators/libretro/cores/puae.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "puae"; - version = "0-unstable-2025-03-27"; + version = "0-unstable-2025-04-15"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-uae"; - rev = "987ac9bf14b813bf14ee6ab0f9d1f95c9d19ea78"; - hash = "sha256-ONL7KjDMF+syiwBG+ivU7b7D7qFVr2gpw5ulnV3OZU8="; + rev = "0faf39cfd84e114d985e020562e75c22b4bc1569"; + hash = "sha256-eJnCHei0/SdJD33SGsRgUL1+IapcvX/FcxHDlYmkob0="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/vecx.nix b/pkgs/applications/emulators/libretro/cores/vecx.nix index e8a21deae253..b33822d8c9ce 100644 --- a/pkgs/applications/emulators/libretro/cores/vecx.nix +++ b/pkgs/applications/emulators/libretro/cores/vecx.nix @@ -7,13 +7,13 @@ }: mkLibretroCore { core = "vecx"; - version = "0-unstable-2024-10-21"; + version = "0-unstable-2025-04-12"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-vecx"; - rev = "a103a212ca8644fcb5d76eac7cdec77223c4fb02"; - hash = "sha256-veCGW5mbR1V7cCzZ4BzDSdPZDycw4WNveie/DDVAzw8="; + rev = "841229a6a81a0461d08af6488f252dcec5266c6a"; + hash = "sha256-bWhXXJCf/ax7n/sOfXibGvcFnCnmULcALoBR1uyIN+I="; }; extraBuildInputs = [ diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 232346606411..ef6854e558f4 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -32,12 +32,8 @@ which, writeScript, zlib, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; -in stdenv.mkDerivation rec { pname = "mame"; version = "0.276"; @@ -105,8 +101,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libpcap - CoreAudioKit - ForceFeedback ]; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/zsnes/2.x.nix b/pkgs/applications/emulators/zsnes/2.x.nix index 94cb5ad8e6e0..cc0ae95a1a27 100644 --- a/pkgs/applications/emulators/zsnes/2.x.nix +++ b/pkgs/applications/emulators/zsnes/2.x.nix @@ -6,6 +6,7 @@ libGL, libGLU, libpng, + libX11, nasm, pkg-config, zlib, @@ -18,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "xyproto"; repo = "zsnes"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-Xz+9YgMpnHyno7vP67aut4tIyG/gTn7SnU2FO2QMND0="; }; @@ -32,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: { libGL libGLU libpng + libX11 zlib ]; diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index 24be5ebeb558..ca3d0dad486c 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, cmake, rustPlatform, pkg-config, @@ -9,7 +8,6 @@ gtk3, glib, openssl, - Security, nix-update-script, }: @@ -32,7 +30,7 @@ rustPlatform.buildRustPackage rec { glib gtk3 openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 3dd69d56b19d..f1ec2668577b 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -45,8 +45,6 @@ libde265Support ? true, libde265, fftw, - ApplicationServices, - Foundation, testers, }: @@ -124,11 +122,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional djvulibreSupport djvulibre ++ lib.optional openexrSupport openexr ++ lib.optional librsvgSupport librsvg - ++ lib.optional openjpegSupport openjpeg - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Foundation - ]; + ++ lib.optional openjpegSupport openjpeg; propagatedBuildInputs = [ fftw ] diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index c04bada3d3ed..8f5b155b6534 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -52,8 +52,6 @@ potrace, coreutils, curl, - ApplicationServices, - Foundation, testers, nixos-icons, perlPackages, @@ -147,11 +145,7 @@ stdenv.mkDerivation (finalAttrs: { librsvg pango ] - ++ lib.optional openjpegSupport openjpeg - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Foundation - ]; + ++ lib.optional openjpegSupport openjpeg; propagatedBuildInputs = [ curl ] diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 52aeb7cfb995..ceb1f60c8a6c 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, itk, - Cocoa, }: stdenv.mkDerivation { @@ -19,7 +18,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ itk ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; + buildInputs = [ itk ]; cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ]; diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index e207d3c68373..2b78ac0d9ca8 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -12,7 +12,6 @@ qttools, xorg, libtiff, - darwin, }: mkDerivation rec { @@ -42,7 +41,7 @@ mkDerivation rec { qtbase xorg.libXt libtiff - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.AGL; + ]; preConfigure = '' NOCONFIGURE=1 ./autogen.sh diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index e3e816116831..d237920dabb8 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "26.0.16"; + version = "26.1.1"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-se3yxIzxeinOnfltv+fSflypwxRHvW/wxKJ43LPsiho="; + hash = "sha256-h9APkOtH7s31r89hqqH12zYqkVMrR2ZxMyc+Zwq21+A="; }; # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-AtrBaN6Pvi5rvncHN64RCHS/fLA0u9WTC+hXsMQe7tU="; + hash = "sha256-kmA0z/vmWH+yD2OQ6VVSE0yPxInTAGjjG+QfcoZHlQ0="; }; nativeBuildInputs = diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix index 89014afb8eb4..c6fe5dc4fc7f 100644 --- a/pkgs/applications/graphics/emulsion/default.nix +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -16,11 +16,6 @@ libxcb, libxkbcommon, wayland, - AppKit, - CoreGraphics, - CoreServices, - Foundation, - OpenGL, }: let rpathLibs = @@ -59,15 +54,7 @@ rustPlatform.buildRustPackage rec { python3 ]; - buildInputs = - rpathLibs - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreGraphics - CoreServices - Foundation - OpenGL - ]; + buildInputs = rpathLibs; postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index 91731416199b..14bfac54b081 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -9,7 +9,6 @@ freetype, libGL, xorg, - AppKit, }: rustPlatform.buildRustPackage rec { @@ -31,19 +30,15 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - expat - fontconfig - freetype - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + expat + fontconfig + freetype + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + ]; postInstall = '' install -Dm444 assets/epick.desktop -t $out/share/applications diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 5f1d20c94fa2..7ffd861b9508 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, help2man, gzip, @@ -10,8 +11,6 @@ # See https://github.com/NixOS/nixpkgs/pull/324022. This may change later. vtk_9, autoPatchelfHook, - Cocoa, - OpenGL, python3Packages, opencascade-occt, assimp, @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { pname = "f3d"; - version = "3.0.0"; + version = "3.1.0"; outputs = [ "out" ] ++ lib.optionals withManual [ "man" ]; @@ -30,9 +29,18 @@ stdenv.mkDerivation rec { owner = "f3d-app"; repo = "f3d"; tag = "v${version}"; - hash = "sha256-mnDmo5qzdnElhvZwBmHL3xC2o8iLuvYyfZXHoaAUG08="; + hash = "sha256-QJQlZXUZyWhpYteHoIsGOj1jdf3Lpy/BMXopeto4IRo="; }; + patches = [ + # https://github.com/f3d-app/f3d/pull/2155 + (fetchpatch { + name = "add-missing-include.patch"; + url = "https://github.com/f3d-app/f3d/commit/3814f3356d888ce59bbe6eda0293c2de73b0c89a.patch"; + hash = "sha256-TeV8byIxX6PBEW06/sS7kHaSS99S88WiyzjHZ/Zh5x4="; + }) + ]; + nativeBuildInputs = [ cmake @@ -54,10 +62,6 @@ stdenv.mkDerivation rec { assimp fontconfig ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - OpenGL - ] ++ lib.optionals withPythonBinding [ python3Packages.python # Using C++ header files, not Python import diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index f25c1064a7ac..fd541500c049 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -17,12 +17,6 @@ libGLU, alsa-lib, fontconfig, - AVFoundation, - Carbon, - Cocoa, - CoreAudio, - Kernel, - OpenGL, }: stdenv.mkDerivation rec { @@ -75,14 +69,6 @@ stdenv.mkDerivation rec { alsa-lib fontconfig libGLU - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AVFoundation - Carbon - Cocoa - CoreAudio - Kernel - OpenGL ]; env.NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/applications/graphics/gimp/2.0/default.nix b/pkgs/applications/graphics/gimp/2.0/default.nix new file mode 100644 index 000000000000..d91dd67a1913 --- /dev/null +++ b/pkgs/applications/graphics/gimp/2.0/default.nix @@ -0,0 +1,222 @@ +{ + stdenv, + lib, + fetchurl, + replaceVars, + autoreconfHook, + pkg-config, + intltool, + babl, + gegl, + gtk2, + glib, + gdk-pixbuf, + isocodes, + pango, + cairo, + freetype, + fontconfig, + lcms, + libpng, + libjpeg, + libjxl, + poppler, + poppler_data, + libtiff, + libmng, + librsvg, + libwmf, + zlib, + libzip, + ghostscript, + aalib, + shared-mime-info, + libexif, + gettext, + makeWrapper, + gtk-doc, + xorg, + glib-networking, + libmypaint, + gexiv2, + harfbuzz, + mypaint-brushes1, + libwebp, + libheif, + libxslt, + libgudev, + openexr, + desktopToDarwinBundle, + gtk-mac-integration-gtk2, + withPython ? false, + python2, +}: + +let + python = python2.withPackages (pp: [ pp.pygtk ]); +in +stdenv.mkDerivation (finalAttrs: { + pname = "gimp"; + version = "2.10.38"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchurl { + url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.bz2"; + sha256 = "sha256-UKhF7sEciDH+hmFweVD1uERuNfMO37ms+Y+FwRM/hW4="; + }; + + patches = [ + # to remove compiler from the runtime closure, reference was retained via + # gimp --version --verbose output + (replaceVars ./remove-cc-reference.patch { + cc_version = stdenv.cc.cc.name; + }) + + # Use absolute paths instead of relying on PATH + # to make sure plug-ins are loaded by the correct interpreter. + ./hardcode-plugin-interpreters.patch + + # GIMP queries libheif.pc for builtin encoder/decoder support to determine if AVIF/HEIC files are supported + # (see https://gitlab.gnome.org/GNOME/gimp/-/blob/a8b1173ca441283971ee48f4778e2ffd1cca7284/configure.ac?page=2#L1846-1852) + # These variables have been removed since libheif 1.18.0 + # (see https://github.com/strukturag/libheif/commit/cf0d89c6e0809427427583290547a7757428cf5a) + # This has already been fixed for the upcoming GIMP 3, but the fix has not been backported to 2.x yet + # (see https://gitlab.gnome.org/GNOME/gimp/-/issues/9080) + ./force-enable-libheif.patch + ]; + + nativeBuildInputs = + [ + autoreconfHook # hardcode-plugin-interpreters.patch changes Makefile.am + pkg-config + intltool + gettext + makeWrapper + gtk-doc + libxslt + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + desktopToDarwinBundle + ]; + + buildInputs = + [ + babl + gegl + gtk2 + glib + gdk-pixbuf + pango + cairo + gexiv2 + harfbuzz + isocodes + freetype + fontconfig + lcms + libpng + libjpeg + libjxl + poppler + poppler_data + libtiff + openexr + libmng + librsvg + libwmf + zlib + libzip + ghostscript + aalib + shared-mime-info + libwebp + libheif + libexif + xorg.libXpm + glib-networking + libmypaint + mypaint-brushes1 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + gtk-mac-integration-gtk2 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libgudev + ] + ++ lib.optionals withPython [ + python + # Duplicated here because python.withPackages does not expose the dev output with pkg-config files + python2.pkgs.pygtk + ]; + + # needed by gimp-2.0.pc + propagatedBuildInputs = [ + gegl + ]; + + configureFlags = + [ + "--without-webkit" # old version is required + "--disable-check-update" + "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" + "--with-icc-directory=/run/current-system/sw/share/color/icc" + # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) + "--libdir=\${exec_prefix}/lib" + ] + ++ lib.optionals (!withPython) [ + "--disable-python" # depends on Python2 which was EOLed on 2020-01-01 + ]; + + enableParallelBuilding = true; + + doCheck = true; + + env = { + NIX_CFLAGS_COMPILE = toString ( + [ ] + ++ lib.optionals stdenv.cc.isGNU [ "-Wno-error=incompatible-pointer-types" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DGDK_OSX_BIG_SUR=16" ] + ); + + # Check if librsvg was built with --disable-pixbuf-loader. + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; + }; + + preConfigure = '' + # The check runs before glib-networking is registered + export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES" + ''; + + postFixup = '' + wrapProgram $out/bin/gimp-${lib.versions.majorMinor finalAttrs.version} \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + + passthru = { + # The declarations for `gimp-with-plugins` wrapper, + # used for determining plug-in installation paths + majorVersion = "${lib.versions.major finalAttrs.version}.0"; + targetLibDir = "lib/gimp/${finalAttrs.passthru.majorVersion}"; + targetDataDir = "share/gimp/${finalAttrs.passthru.majorVersion}"; + targetPluginDir = "${finalAttrs.passthru.targetLibDir}/plug-ins"; + targetScriptDir = "${finalAttrs.passthru.targetDataDir}/scripts"; + + # probably its a good idea to use the same gtk in plugins ? + gtk = gtk2; + + python2Support = withPython; + }; + + meta = with lib; { + description = "GNU Image Manipulation Program"; + homepage = "https://www.gimp.org/"; + maintainers = with maintainers; [ ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + mainProgram = "gimp"; + }; +}) diff --git a/pkgs/applications/graphics/gimp/force-enable-libheif.patch b/pkgs/applications/graphics/gimp/2.0/force-enable-libheif.patch similarity index 100% rename from pkgs/applications/graphics/gimp/force-enable-libheif.patch rename to pkgs/applications/graphics/gimp/2.0/force-enable-libheif.patch diff --git a/pkgs/applications/graphics/gimp/2.0/hardcode-plugin-interpreters.patch b/pkgs/applications/graphics/gimp/2.0/hardcode-plugin-interpreters.patch new file mode 100644 index 000000000000..1528404c31d2 --- /dev/null +++ b/pkgs/applications/graphics/gimp/2.0/hardcode-plugin-interpreters.patch @@ -0,0 +1,11 @@ +--- a/plug-ins/pygimp/Makefile.am ++++ b/plug-ins/pygimp/Makefile.am +@@ -157,7 +157,7 @@ install-interp-file: + echo 'python=$(PYBIN_PATH)' > '$(DESTDIR)$(pyinterpfile)' + echo 'python2=$(PYBIN_PATH)' >> '$(DESTDIR)$(pyinterpfile)' + echo '/usr/bin/python=$(PYBIN_PATH)' >> '$(DESTDIR)$(pyinterpfile)' +- echo ":Python:E::py::`basename $(PYTHON)`:" >> '$(DESTDIR)$(pyinterpfile)' ++ echo ":Python:E::py::$(PYTHON):" >> '$(DESTDIR)$(pyinterpfile)' + + install-data-local: install-env-file install-interp-file + diff --git a/pkgs/applications/graphics/gimp/2.0/remove-cc-reference.patch b/pkgs/applications/graphics/gimp/2.0/remove-cc-reference.patch new file mode 100644 index 000000000000..20c350bdaea1 --- /dev/null +++ b/pkgs/applications/graphics/gimp/2.0/remove-cc-reference.patch @@ -0,0 +1,13 @@ +diff --git a/app/gimp-version.c b/app/gimp-version.c +index 3d1894a036..48bb670b64 100644 +--- a/app/gimp-version.c ++++ b/app/gimp-version.c +@@ -230,7 +230,7 @@ gimp_version (gboolean be_verbose, + GIMP_BUILD_ID, + gimp_version_get_revision (), + GIMP_BUILD_PLATFORM_FAMILY, +- CC_VERSION, ++ "@cc_version@", + lib_versions); + g_free (lib_versions); + diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index e5e552f299f9..639719d8d32d 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -3,21 +3,27 @@ lib, fetchurl, replaceVars, - autoreconfHook, + meson, + ninja, pkg-config, - intltool, babl, + cfitsio, gegl, - gtk2, + gtk3, glib, gdk-pixbuf, + graphviz, isocodes, pango, cairo, + libarchive, + luajit, freetype, fontconfig, lcms, libpng, + libiff, + libilbm, libjpeg, libjxl, poppler, @@ -31,44 +37,57 @@ ghostscript, aalib, shared-mime-info, + python3, libexif, gettext, - makeWrapper, - gtk-doc, + wrapGAppsHook3, + libxslt, + gobject-introspection, + vala, + gi-docgen, + perl, + appstream-glib, + desktop-file-utils, xorg, glib-networking, + json-glib, libmypaint, + llvmPackages, gexiv2, harfbuzz, mypaint-brushes1, libwebp, libheif, - libxslt, + gjs, libgudev, openexr, + xvfb-run, + dbus, + adwaita-icon-theme, + alsa-lib, desktopToDarwinBundle, - AppKit, - Cocoa, - gtk-mac-integration-gtk2, - withPython ? false, - python2, }: let - python = python2.withPackages (pp: [ pp.pygtk ]); + python = python3.withPackages ( + pp: with pp; [ + pygobject3 + ] + ); in stdenv.mkDerivation (finalAttrs: { pname = "gimp"; - version = "2.10.38"; + version = "3.0.2"; outputs = [ "out" "dev" + "devdoc" ]; src = fetchurl { - url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-UKhF7sEciDH+hmFweVD1uERuNfMO37ms+Y+FwRM/hW4="; + url = "https://download.gimp.org/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.xz"; + hash = "sha256-VG3cMMstDnkSPH/LTXghHh7npqrOkaagrYy8v26lcaI="; }; patches = [ @@ -80,26 +99,40 @@ stdenv.mkDerivation (finalAttrs: { # Use absolute paths instead of relying on PATH # to make sure plug-ins are loaded by the correct interpreter. - ./hardcode-plugin-interpreters.patch + # TODO: This now only appears to be used on Windows. + (replaceVars ./hardcode-plugin-interpreters.patch { + python_interpreter = python.interpreter; + PYTHON_EXE = null; + }) - # GIMP queries libheif.pc for builtin encoder/decoder support to determine if AVIF/HEIC files are supported - # (see https://gitlab.gnome.org/GNOME/gimp/-/blob/a8b1173ca441283971ee48f4778e2ffd1cca7284/configure.ac?page=2#L1846-1852) - # These variables have been removed since libheif 1.18.0 - # (see https://github.com/strukturag/libheif/commit/cf0d89c6e0809427427583290547a7757428cf5a) - # This has already been fixed for the upcoming GIMP 3, but the fix has not been backported to 2.x yet - # (see https://gitlab.gnome.org/GNOME/gimp/-/issues/9080) - ./force-enable-libheif.patch + # D-Bus configuration is not available in the build sandbox + # so we need to pick up the one from the package. + (replaceVars ./tests-dbus-conf.patch { + session_conf = "${dbus.out}/share/dbus-1/session.conf"; + }) ]; nativeBuildInputs = [ - autoreconfHook # hardcode-plugin-interpreters.patch changes Makefile.am + meson + ninja pkg-config - intltool gettext - makeWrapper - gtk-doc - libxslt + wrapGAppsHook3 + libxslt # for xsltproc + gobject-introspection + perl + vala + + # for docs + gi-docgen + + # for tests + desktop-file-utils + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + dbus + xvfb-run ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle @@ -107,13 +140,16 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ + appstream-glib # for library babl + cfitsio gegl - gtk2 + gtk3 glib gdk-pixbuf pango cairo + libarchive gexiv2 harfbuzz isocodes @@ -121,6 +157,8 @@ stdenv.mkDerivation (finalAttrs: { fontconfig lcms libpng + libiff + libilbm libjpeg libjxl poppler @@ -135,69 +173,135 @@ stdenv.mkDerivation (finalAttrs: { ghostscript aalib shared-mime-info + json-glib libwebp libheif + python libexif xorg.libXpm + xorg.libXmu glib-networking libmypaint mypaint-brushes1 + + # New file dialogue crashes with “Icon 'image-missing' not present in theme Symbolic” without an icon theme. + adwaita-icon-theme + + # for Lua plug-ins + (luajit.withPackages (pp: [ + pp.lgi + ])) + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + + # for JavaScript plug-ins + gjs ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Cocoa - gtk-mac-integration-gtk2 + llvmPackages.openmp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libgudev - ] - ++ lib.optionals withPython [ - python - # Duplicated here because python.withPackages does not expose the dev output with pkg-config files - python2.pkgs.pygtk ]; - # needed by gimp-2.0.pc propagatedBuildInputs = [ + # needed by gimp-3.0.pc gegl + cairo + pango + gexiv2 ]; - configureFlags = + mesonFlags = [ - "--without-webkit" # old version is required - "--disable-check-update" - "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" - "--with-icc-directory=/run/current-system/sw/share/color/icc" - # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) - "--libdir=\${exec_prefix}/lib" + "-Dbug-report-url=https://github.com/NixOS/nixpkgs/issues/new" + "-Dicc-directory=/run/current-system/sw/share/color/icc" + "-Dcheck-update=no" + (lib.mesonEnable "gudev" stdenv.hostPlatform.isLinux) + (lib.mesonEnable "headless-tests" stdenv.hostPlatform.isLinux) + (lib.mesonEnable "linux-input" stdenv.hostPlatform.isLinux) + # Not very important to do downstream, save a dependency. + "-Dappdata-test=disabled" ] - ++ lib.optionals (!withPython) [ - "--disable-python" # depends on Python2 which was EOLed on 2020-01-01 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-Dalsa=disabled" + "-Djavascript=disabled" ]; - enableParallelBuilding = true; - doCheck = true; env = { - NIX_CFLAGS_COMPILE = toString ( - [ ] - ++ lib.optionals stdenv.cc.isGNU [ "-Wno-error=incompatible-pointer-types" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DGDK_OSX_BIG_SUR=16" ] - ); + # The check runs before glib-networking is registered + GIO_EXTRA_MODULES = "${glib-networking}/lib/gio/modules"; + + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DGDK_OSX_BIG_SUR=16"; # Check if librsvg was built with --disable-pixbuf-loader. PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; }; - preConfigure = '' - # The check runs before glib-networking is registered - export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES" + postPatch = '' + patchShebangs \ + app/tests/create_test_env.sh \ + tools/gimp-mkenums + + # GIMP is executed at build time so we need to fix this. + # TODO: Look into if we can fix the interp thing. + chmod +x plug-ins/python/{colorxhtml,file-openraster,foggify,gradients-save-as-css,histogram-export,palette-offset,palette-sort,palette-to-gradient,python-eval,spyro-plus}.py + patchShebangs \ + plug-ins/python/{colorxhtml,file-openraster,foggify,gradients-save-as-css,histogram-export,palette-offset,palette-sort,palette-to-gradient,python-eval,spyro-plus}.py + ''; + + preBuild = + let + librarySuffix = + if stdenv.hostPlatform.extensions.library == ".so" then + "3.0.so.0" + else if stdenv.hostPlatform.extensions.library == ".dylib" then + "3.0.0.dylib" + else + throw "Unsupported library extension ‘${stdenv.hostPlatform.extensions.library}’"; + in + '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running GIMP in build or check phase, it will try + # to use plug-ins, which import GIMP introspection files which will try + # to load the GIMP libraries which will not be installed yet. + # So we need to replace the absolute path with a local one. + # We are using a symlink that will be overridden during installation. + mkdir -p "$out/lib" + ln -s "$PWD/libgimp/libgimp-${librarySuffix}" \ + "$PWD/libgimpbase/libgimpbase-${librarySuffix}" \ + "$PWD/libgimpcolor/libgimpcolor-${librarySuffix}" \ + "$PWD/libgimpconfig/libgimpconfig-${librarySuffix}" \ + "$PWD/libgimpmath/libgimpmath-${librarySuffix}" \ + "$PWD/libgimpmodule/libgimpmodule-${librarySuffix}" \ + "$out/lib/" + ''; + + preCheck = '' + # Avoid “Error retrieving accessibility bus address” + export NO_AT_BRIDGE=1 + # Fix storing recent file list in tests + export HOME="$TMPDIR" + export XDG_DATA_DIRS="${glib.getSchemaDataDirPath gtk3}:${adwaita-icon-theme}/share:$XDG_DATA_DIRS" + ''; + + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : "${ + lib.makeBinPath [ + # for dot for gegl:introspect (Debug » Show Image Graph, hidden by default on stable release) + graphviz + # for gimp-script-fu-interpreter-3.0 invoked by shebang of some plug-ins + "$out" + ] + }") ''; postFixup = '' - wrapProgram $out/bin/gimp-${lib.versions.majorMinor finalAttrs.version} \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; passthru = { @@ -210,9 +314,7 @@ stdenv.mkDerivation (finalAttrs: { targetScriptDir = "${finalAttrs.passthru.targetDataDir}/scripts"; # probably its a good idea to use the same gtk in plugins ? - gtk = gtk2; - - python2Support = withPython; + gtk = gtk3; }; meta = with lib; { @@ -220,7 +322,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gimp.org/"; maintainers = with maintainers; [ jtojnar ]; license = licenses.gpl3Plus; - platforms = platforms.unix; + platforms = platforms.linux; mainProgram = "gimp"; }; }) diff --git a/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch b/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch index 1528404c31d2..6a0ec0af6262 100644 --- a/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch +++ b/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch @@ -1,11 +1,8 @@ ---- a/plug-ins/pygimp/Makefile.am -+++ b/plug-ins/pygimp/Makefile.am -@@ -157,7 +157,7 @@ install-interp-file: - echo 'python=$(PYBIN_PATH)' > '$(DESTDIR)$(pyinterpfile)' - echo 'python2=$(PYBIN_PATH)' >> '$(DESTDIR)$(pyinterpfile)' - echo '/usr/bin/python=$(PYBIN_PATH)' >> '$(DESTDIR)$(pyinterpfile)' -- echo ":Python:E::py::`basename $(PYTHON)`:" >> '$(DESTDIR)$(pyinterpfile)' -+ echo ":Python:E::py::$(PYTHON):" >> '$(DESTDIR)$(pyinterpfile)' - - install-data-local: install-env-file install-interp-file - +--- a/plug-ins/python/pygimp.interp.in ++++ b/plug-ins/python/pygimp.interp.in +@@ -2,4 +2,4 @@ python=@PYTHON_EXE@ + python3=@PYTHON_EXE@ + /usr/bin/python=@PYTHON_EXE@ + /usr/bin/python3=@PYTHON_EXE@ +-:Python:E::py::python3: ++:Python:E::py::@python_interpreter@: diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index b237c5f1bcf1..9c86343599b1 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -2,7 +2,11 @@ # If you just want a subset of plug-ins, you can specify them explicitly: # `gimp-with-plugins.override { plugins = with gimpPlugins; [ gap ]; }`. -{ lib, pkgs }: +{ + lib, + pkgs, + gimp, +}: let inherit (pkgs) @@ -16,6 +20,10 @@ let fetchFromGitHub fetchFromGitLab ; + + # We cannot use gimp from the arguments directly, or it would be shadowed by the one + # from scope when initializing the scope with it, leading to infinite recursion. + gimpArg = gimp; in lib.makeScope pkgs.newScope ( @@ -29,6 +37,7 @@ lib.makeScope pkgs.newScope ( attrs: let name = attrs.name or "${attrs.pname}-${attrs.version}"; + pkgConfigMajorVersion = lib.versions.major gimp.version; in stdenv.mkDerivation ( { @@ -63,8 +72,10 @@ lib.makeScope pkgs.newScope ( # Override installation paths. env = { - PKG_CONFIG_GIMP_2_0_GIMPLIBDIR = "${placeholder "out"}/${gimp.targetLibDir}"; - PKG_CONFIG_GIMP_2_0_GIMPDATADIR = "${placeholder "out"}/${gimp.targetDataDir}"; + "PKG_CONFIG_GIMP_${pkgConfigMajorVersion}_0_GIMPLIBDIR" = + "${placeholder "out"}/${gimp.targetLibDir}"; + "PKG_CONFIG_GIMP_${pkgConfigMajorVersion}_0_GIMPDATADIR" = + "${placeholder "out"}/${gimp.targetDataDir}"; } // attrs.env or { }; } ); @@ -86,7 +97,7 @@ lib.makeScope pkgs.newScope ( in { # Allow overriding GIMP package in the scope. - inherit (pkgs) gimp; + gimp = gimpArg; bimp = pluginDerivation rec { /* @@ -130,6 +141,7 @@ lib.makeScope pkgs.newScope ( installTargets = [ "install-admin" ]; meta = with lib; { + broken = gimp.majorVersion != "2.0"; description = "Batch Image Manipulation Plugin for GIMP"; homepage = "https://github.com/alessandrofrancesconi/gimp-plugin-bimp"; license = licenses.gpl2Plus; @@ -153,6 +165,7 @@ lib.makeScope pkgs.newScope ( ''; meta = { + broken = gimp.majorVersion != "2.0"; description = "Gimp plug-in for the farbfeld image format"; homepage = "https://github.com/ids1024/gimp-farbfeld"; license = lib.licenses.mit; @@ -192,6 +205,7 @@ lib.makeScope pkgs.newScope ( ''; meta = with lib; { + broken = gimp.majorVersion != "2.0"; description = "GIMP plug-in to do the fourier transform"; homepage = "https://people.via.ecp.fr/~remi/soft/gimp/gimp_plugin_en.php3#fourier"; license = with licenses; [ gpl3Plus ]; @@ -222,7 +236,7 @@ lib.makeScope pkgs.newScope ( }; meta = { - broken = !gimp.python2Support; + broken = gimp.majorVersion != "2.0"; }; }; @@ -240,6 +254,10 @@ lib.makeScope pkgs.newScope ( ninja gettext ]; + + meta = { + broken = gimp.majorVersion != "2.0"; + }; }; waveletSharpen = pluginDerivation { @@ -264,6 +282,10 @@ lib.makeScope pkgs.newScope ( }; installPhase = "installPlugin src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix? + + meta = { + broken = gimp.majorVersion != "2.0"; + }; }; lqrPlugin = pluginDerivation rec { @@ -289,10 +311,15 @@ lib.makeScope pkgs.newScope ( sha256 = "EdjZWM6U1bhUmsOnLA8iJ4SFKuAXHIfNPzxZqel+JrY="; }) ]; + + meta = { + broken = gimp.majorVersion != "2.0"; + }; }; gmic = pkgs.gmic-qt.override { variant = "gimp"; + inherit (self) gimp; }; gimplensfun = pluginDerivation { @@ -320,6 +347,7 @@ lib.makeScope pkgs.newScope ( "; meta = { + broken = gimp.majorVersion != "2.0"; description = "GIMP plugin to correct lens distortion using the lensfun library and database"; homepage = "http://lensfun.sebastiankraft.net/"; diff --git a/pkgs/applications/graphics/gimp/remove-cc-reference.patch b/pkgs/applications/graphics/gimp/remove-cc-reference.patch index 20c350bdaea1..8b62b801f02b 100644 --- a/pkgs/applications/graphics/gimp/remove-cc-reference.patch +++ b/pkgs/applications/graphics/gimp/remove-cc-reference.patch @@ -1,8 +1,8 @@ diff --git a/app/gimp-version.c b/app/gimp-version.c -index 3d1894a036..48bb670b64 100644 +index 6e311c8252..e6fd9d1d78 100644 --- a/app/gimp-version.c +++ b/app/gimp-version.c -@@ -230,7 +230,7 @@ gimp_version (gboolean be_verbose, +@@ -90,7 +90,7 @@ gimp_version (gboolean be_verbose, GIMP_BUILD_ID, gimp_version_get_revision (), GIMP_BUILD_PLATFORM_FAMILY, diff --git a/pkgs/applications/graphics/gimp/tests-dbus-conf.patch b/pkgs/applications/graphics/gimp/tests-dbus-conf.patch new file mode 100644 index 000000000000..da9152eeef01 --- /dev/null +++ b/pkgs/applications/graphics/gimp/tests-dbus-conf.patch @@ -0,0 +1,11 @@ +--- a/build/meson/run_test_env.sh ++++ b/build/meson/run_test_env.sh +@@ -33,7 +33,7 @@ if [ -n "${UI_TEST}" ]; then + OPT="--auto-servernum" + fi + xvfb-run $OPT --server-args="-screen 0 1280x1024x24" \ +- dbus-run-session -- "$@" ++ dbus-run-session --config-file="@session_conf@" -- "$@" + + else + # Run the executable directly, diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 82ff058ba7dc..efac48c2f7e2 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -13,8 +13,14 @@ let lib.attrValues gimpPlugins ); selectedPlugins = lib.filter (pkg: pkg != gimp) (if plugins == null then allPlugins else plugins); - extraArgs = map (x: x.wrapArgs or "") selectedPlugins; - versionBranch = lib.versions.majorMinor gimp.version; + extraArgs = + map (x: x.wrapArgs or "") selectedPlugins + ++ lib.optionals (gimp.majorVersion == "2.0") [ + ''--prefix GTK_PATH : "${gnome-themes-extra}/lib/gtk-2.0"'' + ]; + exeVersion = + if gimp.majorVersion == "2.0" then lib.versions.majorMinor gimp.version else gimp.majorVersion; + majorVersion = lib.versions.major gimp.version; in symlinkJoin { @@ -25,16 +31,15 @@ symlinkJoin { nativeBuildInputs = [ makeWrapper ]; postBuild = '' - for each in gimp-${versionBranch} gimp-console-${versionBranch}; do + for each in gimp-${exeVersion} gimp-console-${exeVersion}; do wrapProgram $out/bin/$each \ - --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ - --set GIMP2_DATADIR "$out/share/gimp/2.0" \ - --prefix GTK_PATH : "${gnome-themes-extra}/lib/gtk-2.0" \ + --set GIMP${majorVersion}_PLUGINDIR "$out/${gimp.targetLibDir}" \ + --set GIMP${majorVersion}_DATADIR "$out/${gimp.targetDataDir}" \ ${toString extraArgs} done set +x for each in gimp gimp-console; do - ln -sf "$each-${versionBranch}" $out/bin/$each + ln -sf "$each-${exeVersion}" $out/bin/$each done ''; diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix index 6e5641cafd2a..be7ca56b14f7 100644 --- a/pkgs/applications/graphics/gnome-obfuscate/default.nix +++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -17,7 +17,6 @@ gtk4, gdk-pixbuf, libadwaita, - Foundation, nix-update-script, }: @@ -60,16 +59,12 @@ stdenv.mkDerivation (finalAttrs: { desktop-file-utils ]; - buildInputs = - [ - glib - gtk4 - gdk-pixbuf - libadwaita - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - ]; + buildInputs = [ + glib + gtk4 + gdk-pixbuf + libadwaita + ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index a0e757cc536f..34f657bf71e9 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -8,7 +8,6 @@ withSixel ? false, libsixel, xorg, - AppKit, withSki ? true, }: @@ -36,8 +35,7 @@ rustPlatform.buildRustPackage rec { libX11 libXrandr ] - ) - ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; + ); buildNoDefaultFeatures = !withSki; buildFeatures = lib.optional withSixel "sixel"; diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix index 209dc697817b..19c02eeec154 100644 --- a/pkgs/applications/graphics/ovito/default.nix +++ b/pkgs/applications/graphics/ovito/default.nix @@ -18,7 +18,6 @@ qtbase, qtsvg, qttools, - VideoDecodeAcceleration, wrapQtAppsHook, copyDesktopItems, # needed to run natively on wayland @@ -44,26 +43,22 @@ stdenv.mkDerivation rec { copyDesktopItems ]; - buildInputs = - [ - boost - bzip2 - ffmpeg - fftwSinglePrec - hdf5 - muparser - netcdf - openssl - python3 - qscintilla - qtbase - qtsvg - qttools - qtwayland - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - VideoDecodeAcceleration - ]; + buildInputs = [ + boost + bzip2 + ffmpeg + fftwSinglePrec + hdf5 + muparser + netcdf + openssl + python3 + qscintilla + qtbase + qtsvg + qttools + qtwayland + ]; # manually create a desktop file desktopItems = [ diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index 16b15a555172..fe173e376ba5 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -1,17 +1,12 @@ { callPackage, lowPrio, - Accelerate, - CoreGraphics, - CoreVideo, }: let base3 = callPackage ./tesseract3.nix { }; base4 = callPackage ./tesseract4.nix { }; - base5 = callPackage ./tesseract5.nix { - inherit Accelerate CoreGraphics CoreVideo; - }; + base5 = callPackage ./tesseract5.nix { }; languages = callPackage ./languages.nix { }; in { diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix index 22059873e4bb..4c1442b42b96 100644 --- a/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -12,9 +12,6 @@ libtiff, icu, pango, - Accelerate, - CoreGraphics, - CoreVideo, }: stdenv.mkDerivation rec { @@ -35,21 +32,15 @@ stdenv.mkDerivation rec { autoreconfHook ]; - buildInputs = - [ - curl - leptonica - libarchive - libpng - libtiff - icu - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - CoreGraphics - CoreVideo - ]; + buildInputs = [ + curl + leptonica + libarchive + libpng + libtiff + icu + pango + ]; passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 4457c9b88c79..95efcf68abda 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -27,9 +27,7 @@ SDL2, SDL2_mixer, wayland-protocols, - Carbon, CoreServices, - OpenCL, callPackage, nixosTests, @@ -73,11 +71,6 @@ stdenv.mkDerivation (finalAttrs: { SDL2_mixer ] ++ lib.optional stdenv.hostPlatform.isLinux wayland-protocols - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - CoreServices - OpenCL - ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) opencl-headers; cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index 3aa61ec06d30..e31bdb555634 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -19,10 +19,6 @@ autoconf, libtool, typescript, - ApplicationServices, - Carbon, - Cocoa, - VideoToolbox, }: rustPlatform.buildRustPackage rec { @@ -41,12 +37,6 @@ rustPlatform.buildRustPackage rec { ffmpeg x264 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Carbon - Cocoa - VideoToolbox - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus libva diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index bf705566c2b3..2e10367ad3d7 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -37,6 +37,7 @@ let timstott savannidgerinel sebtm + bdd ]; platforms = builtins.attrNames sources.${channel}; mainProgram = "1password"; diff --git a/pkgs/applications/misc/1password-gui/sources.json b/pkgs/applications/misc/1password-gui/sources.json index f0dca4321f30..2507f163ebe0 100644 --- a/pkgs/applications/misc/1password-gui/sources.json +++ b/pkgs/applications/misc/1password-gui/sources.json @@ -1,20 +1,20 @@ { "stable": { "x86_64-linux": { - "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.70.x64.tar.gz", - "hash": "sha256-QGKeKX7qxu7heJ6T0I8aayI1P2M3KOmU9faS929BCjI=" + "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.10.72.x64.tar.gz", + "hash": "sha256-vJJ5Dh3K3B0DAEVMifiITNJmOtkCyn0XYS4tdYxoKjM=" }, "aarch64-linux": { - "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.70.arm64.tar.gz", - "hash": "sha256-Uz8YKlIa6zibRv3ObnVVlyEk3sZP5wX+0E/nX02m6SA=" + "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.10.72.arm64.tar.gz", + "hash": "sha256-GLDmBiIXGRQVy7wjW/52gIx97E6Q+A3wJwOGQvW29p8=" }, "x86_64-darwin": { - "url": "https://downloads.1password.com/mac/1Password-8.10.70-x86_64.zip", - "hash": "sha256-s6+LUSHZwCH5PgREt2bkCCR3JeGBj9llQ6rGrOhEPlQ=" + "url": "https://downloads.1password.com/mac/1Password-8.10.72-x86_64.zip", + "hash": "sha256-SijXMG33quuxip2JOkjyB9ITSm9livqXzBPbqMmLVns=" }, "aarch64-darwin": { - "url": "https://downloads.1password.com/mac/1Password-8.10.70-aarch64.zip", - "hash": "sha256-f9b8L4S6CToMukeqrW3EKXAov0rqEMsIpZEGrvDQmg8=" + "url": "https://downloads.1password.com/mac/1Password-8.10.72-aarch64.zip", + "hash": "sha256-y4kK4tL9NjvUT/C6q7WxaX/7LOCr3xkRJTBhqw2jjtQ=" } }, "beta": { diff --git a/pkgs/applications/misc/1password-gui/versions.json b/pkgs/applications/misc/1password-gui/versions.json index 3314aea3f031..e8a8b868bd07 100644 --- a/pkgs/applications/misc/1password-gui/versions.json +++ b/pkgs/applications/misc/1password-gui/versions.json @@ -1,6 +1,6 @@ { - "stable-linux": "8.10.70", - "stable-darwin": "8.10.70", + "stable-linux": "8.10.72", + "stable-darwin": "8.10.72", "beta-linux":"8.10.70-24.BETA", "beta-darwin": "8.10.70-24.BETA" } diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 6d6b3b7a1887..1a7f6081b301 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -6,7 +6,6 @@ autoreconfHook, autoconf-archive, pkg-config, - CoreAudio, enableAlsa ? true, alsa-lib, enableLibao ? true, @@ -84,8 +83,7 @@ stdenv.mkDerivation { amrnb amrwb ] - ++ lib.optional enableLibpulseaudio libpulseaudio - ++ lib.optional stdenv.hostPlatform.isDarwin CoreAudio; + ++ lib.optional enableLibpulseaudio libpulseaudio; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/binocle/default.nix b/pkgs/applications/misc/binocle/default.nix index e2afd9d91b14..8c35e3ff33c2 100644 --- a/pkgs/applications/misc/binocle/default.nix +++ b/pkgs/applications/misc/binocle/default.nix @@ -4,13 +4,6 @@ rustPlatform, fetchFromGitHub, makeWrapper, - AppKit, - CoreFoundation, - CoreGraphics, - CoreVideo, - Foundation, - Metal, - QuartzCore, xorg, vulkan-loader, }: @@ -33,16 +26,6 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreFoundation - CoreGraphics - CoreVideo - Foundation - Metal - QuartzCore - ]; - postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' wrapProgram $out/bin/binocle \ --suffix LD_LIBRARY_PATH : ${ diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index bb395236a66c..9a3037be3be3 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, ninja, qtbase, @@ -12,19 +13,20 @@ libXtst, qtwayland, wayland, + pkg-config, wrapQtAppsHook, kdePackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { pname = "CopyQ"; - version = "9.1.0"; + version = "10.0.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - hash = "sha256-WBJyLfiPPEQ/Cj5uuwy9KhVc1kw4Hv5TeEuRFDydlGk="; + hash = "sha256-lH3WJ6cK2eCnmcLVLnYUypABj73UZjGqqDPp92QE+V4="; }; nativeBuildInputs = [ @@ -32,6 +34,7 @@ stdenv.mkDerivation rec { ninja kdePackages.extra-cmake-modules wrapQtAppsHook + pkg-config ]; buildInputs = [ @@ -48,20 +51,26 @@ stdenv.mkDerivation rec { kdePackages.knotifications ]; - postPatch = '' - substituteInPlace shared/com.github.hluk.copyq.desktop.in \ - --replace copyq "$out/bin/copyq" - ''; + patches = [ + (fetchpatch { + # Can be removed after next release + name = "fix-qchar-construction-for-qt-6.9.patch"; + url = "https://github.com/hluk/CopyQ/commit/f08c0d46a239362c5d3525ef9c3ba943bb00f734.patch"; + hash = "sha256-dsDIUVJHFFqzZ3tFOcYdwol/tm4viHM0CRs6wYfVKbQ="; + }) + ]; - cmakeFlags = [ "-DWITH_QT6=ON" ]; + cmakeFlags = [ + (lib.cmakeBool "WITH_QT6" true) + ]; - meta = with lib; { + meta = { homepage = "https://hluk.github.io/CopyQ"; description = "Clipboard Manager with Advanced Features"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ artturin ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ artturin ]; # NOTE: CopyQ supports windows and osx, but I cannot test these. - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "copyq"; }; -} +}) diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 4302d6cde399..0adaf746640f 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -8,7 +8,6 @@ cairo, poppler, wxGTK, - Cocoa, }: stdenv.mkDerivation rec { @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { cairo poppler wxGTK - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + ]; preConfigure = "./bootstrap"; diff --git a/pkgs/applications/misc/electrum/ltc-aiorpcX-version-bump.patch b/pkgs/applications/misc/electrum/ltc-aiorpcX-version-bump.patch index 8c7af75a5406..a726ca678c59 100644 --- a/pkgs/applications/misc/electrum/ltc-aiorpcX-version-bump.patch +++ b/pkgs/applications/misc/electrum/ltc-aiorpcX-version-bump.patch @@ -23,7 +23,7 @@ index 04b0a77f3..2330ea921 100644 protobuf>=3.12 qdarkstyle>=2.7 -aiorpcx>=0.22.0,<0.23 -+aiorpcx>=0.22.0,<0.24 ++aiorpcx>=0.22.0 aiohttp>=3.3.0,<4.0.0 aiohttp_socks>=0.3 certifi @@ -31,14 +31,12 @@ diff --git a/run_electrum b/run_electrum index a1b30f29e..cb22f8724 100755 --- a/run_electrum +++ b/run_electrum -@@ -67,8 +67,8 @@ def check_imports(): +@@ -67,8 +67,6 @@ def check_imports(): import aiorpcx except ImportError as e: sys.exit(f"Error: {str(e)}. Try 'sudo python3 -m pip install '") - if not ((0, 22, 0) <= aiorpcx._version < (0, 23)): - raise RuntimeError(f'aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.23') -+ if not ((0, 22, 0) <= aiorpcx._version < (0, 24)): -+ raise RuntimeError(f'aiorpcX version {aiorpcx._version} does not match required: 0.22.0<=ver<0.24') # the following imports are for pyinstaller from google.protobuf import descriptor from google.protobuf import message diff --git a/pkgs/applications/misc/eureka-ideas/default.nix b/pkgs/applications/misc/eureka-ideas/default.nix index d43afca3250c..094497db1697 100644 --- a/pkgs/applications/misc/eureka-ideas/default.nix +++ b/pkgs/applications/misc/eureka-ideas/default.nix @@ -5,8 +5,6 @@ pkg-config, libgit2, openssl, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -25,14 +23,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libgit2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = [ + libgit2 + openssl + ]; useNextest = true; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index e9de83749987..501f360f0493 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -17,12 +17,6 @@ gnutar, p7zip, xz, - IOKit, - Carbon, - Cocoa, - AudioToolbox, - OpenGL, - System, withTTYX ? true, libX11, withGUI ? true, @@ -94,15 +88,7 @@ stdenv.mkDerivation rec { debugpy pcpp ] - ) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - Carbon - Cocoa - AudioToolbox - OpenGL - System - ]; + ); postPatch = '' patchShebangs python/src/prebuild.sh diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index d99d9cf44b31..950983d5c9df 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -10,7 +10,6 @@ libSM, libICE, which, - IOKit, copyDesktopItems, makeDesktopItem, wrapGAppsHook3, @@ -38,7 +37,7 @@ stdenv.mkDerivation rec { libX11 libSM libICE - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; + ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix index bd8c911eac89..b99886f953fc 100644 --- a/pkgs/applications/misc/goldendict-ng/default.nix +++ b/pkgs/applications/misc/goldendict-ng/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation { pname = "goldendict-ng"; - version = "25.02.0"; + version = "25.05.0"; src = fetchFromGitHub { owner = "xiaoyifang"; repo = "goldendict-ng"; - tag = "v25.02.0-Release.e895b18c"; - hash = "sha256-k8pGzrSFbAUP7DG3lSAYBa5WeeSUbjZMvMqmxPqdT3E="; + tag = "v25.05.0-Release.2a2b0e16"; + hash = "sha256-PBqkVac867xE4ZcvwTysAK6rQSoEZelKrV9USvFsaLk="; }; nativeBuildInputs = [ @@ -92,6 +92,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ slbtty michojel + linsui ]; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/misc/hollywood/default.nix b/pkgs/applications/misc/hollywood/default.nix index db9319000752..3761121dabd3 100644 --- a/pkgs/applications/misc/hollywood/default.nix +++ b/pkgs/applications/misc/hollywood/default.nix @@ -60,7 +60,6 @@ stdenv.mkDerivation { pygments moreutils util-linux - jp2a man mplayer openssh diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix index a05800414a79..a9b41c42c5c3 100644 --- a/pkgs/applications/misc/inherd-quake/default.nix +++ b/pkgs/applications/misc/inherd-quake/default.nix @@ -4,9 +4,6 @@ rustPlatform, pkg-config, openssl, - stdenv, - CoreServices, - Security, }: rustPlatform.buildRustPackage rec { @@ -25,14 +22,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Knowledge management meta-framework for geeks"; diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix index f7f302628b8c..98dbc260bc31 100644 --- a/pkgs/applications/misc/inlyne/default.nix +++ b/pkgs/applications/misc/inlyne/default.nix @@ -11,7 +11,6 @@ wayland, libGL, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -36,20 +35,16 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - fontconfig - xorg.libXcursor - xorg.libXi - xorg.libXrandr - xorg.libxcb - wayland - libxkbcommon - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.AppKit - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + fontconfig + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libxcb + wayland + libxkbcommon + openssl + ]; checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # time out on darwin diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix index b143fa271636..7c9a2d1cecab 100644 --- a/pkgs/applications/misc/inochi2d/generic.nix +++ b/pkgs/applications/misc/inochi2d/generic.nix @@ -131,13 +131,15 @@ buildDubPackage ( postFixup = '' # Add support for `open file` dialog makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} \ - --prefix PATH : ${lib.makeBinPath [ zenity ]} \ - --prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - libGL - luajit_2_1 - ] - } + --prefix PATH : ${lib.makeBinPath [ zenity ]} + + patchelf $out/share/${pname}/${pname} \ + --add-rpath ${ + lib.makeLibraryPath [ + libGL + luajit_2_1 + ] + } ''; meta = { diff --git a/pkgs/applications/misc/klipper-estimator/default.nix b/pkgs/applications/misc/klipper-estimator/default.nix index 609414f21d7f..0e863c58be61 100644 --- a/pkgs/applications/misc/klipper-estimator/default.nix +++ b/pkgs/applications/misc/klipper-estimator/default.nix @@ -6,8 +6,6 @@ pkg-config, openssl, libgit2, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -30,8 +28,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libgit2 - Security - SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix index ce1897b4aed2..12994582e9d4 100644 --- a/pkgs/applications/misc/mdzk/default.nix +++ b/pkgs/applications/misc/mdzk/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, rustPlatform, - CoreServices, }: rustPlatform.buildRustPackage rec { @@ -25,8 +24,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-+x4pOtszvdzI/zR55ezcxlS52GrWQTuBn7vbnqDTVac="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - meta = with lib; { description = "Plain text Zettelkasten based on mdBook"; homepage = "https://github.com/mdzk-rs/mdzk/"; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 2837666d49b1..f2d0f5e8880e 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, - AppKit, DarwinTools, alsa-utils, at-spi2-core, @@ -86,9 +85,6 @@ stdenv.mkDerivation (finalAttrs: { flac gitMinimal ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - AppKit - ] ++ [ glew jasper diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index 3265a1b61299..01f2f3623b3a 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-u+1KDcC2KGqvmOk6k7hOHE16TMvDg92eMOdNMQQszug="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - meta = with lib; { description = "Command-line tool to generate, analyze, convert and manipulate colors"; homepage = "https://github.com/sharkdp/pastel"; diff --git a/pkgs/applications/misc/pomodoro/default.nix b/pkgs/applications/misc/pomodoro/default.nix index a5049d253d73..c34dd208893c 100644 --- a/pkgs/applications/misc/pomodoro/default.nix +++ b/pkgs/applications/misc/pomodoro/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, rustPlatform, - Foundation, }: rustPlatform.buildRustPackage { @@ -19,7 +18,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-oXOf9G0BMSbFFAsmRaAZzaquFva1i1gJ4ISqJkqSx4k="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; meta = with lib; { description = "Simple CLI pomodoro timer using desktop notifications written in Rust"; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 1144a0924cc2..aa106b61b659 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -11,7 +11,6 @@ cereal, cgal, curl, - darwin, dbus, eigen, expat, @@ -131,9 +130,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withSystemd [ systemd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreWLAN ]; strictDeps = true; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 8a3717a8eefc..6412b1e21a8f 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,8 +2,6 @@ lib, stdenv, fetchFromGitHub, - Libsystem, - SystemConfiguration, installShellFiles, libiconv, rustPlatform, @@ -32,8 +30,6 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Libsystem - SystemConfiguration libiconv ]; diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix index 435da18f8abe..e9017cf243a4 100644 --- a/pkgs/applications/misc/reddsaver/default.nix +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, - Security, }: rustPlatform.buildRustPackage rec { @@ -23,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-xYtdGhuieFudfJz+LxUjP7mV8uItaIvLahCH7vBWTtg="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ openssl ]; # package does not contain tests as of v0.3.3 docCheck = false; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 31e866d0e7c5..3c10b317bf10 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -19,7 +19,6 @@ pyxdg, withQuartz ? stdenv.hostPlatform.isDarwin, - ApplicationServices, withRandr ? stdenv.hostPlatform.isLinux, libxcb, withDrm ? stdenv.hostPlatform.isLinux, @@ -29,9 +28,6 @@ withGeolocation ? true, withCoreLocation ? withGeolocation && stdenv.hostPlatform.isDarwin, - CoreLocation, - Foundation, - Cocoa, withGeoclue ? withGeolocation && stdenv.hostPlatform.isLinux, geoclue, withAppIndicator ? stdenv.hostPlatform.isLinux, @@ -99,12 +95,6 @@ let ++ lib.optional withGeoclue geoclue ++ lib.optional withDrm libdrm ++ lib.optional withVidmode libXxf86vm - ++ lib.optional withQuartz ApplicationServices - ++ lib.optionals withCoreLocation [ - CoreLocation - Foundation - Cocoa - ] ++ lib.optional withAppIndicator ( if (pname != "gammastep") then libappindicator else libayatana-appindicator ); @@ -180,13 +170,13 @@ rec { gammastep = mkRedshift rec { pname = "gammastep"; - version = "2.0.9"; + version = "2.0.11"; src = fetchFromGitLab { owner = "chinstrap"; repo = pname; rev = "v${version}"; - hash = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU="; + hash = "sha256-c8JpQLHHLYuzSC9bdymzRTF6dNqOLwYqgwUOpKcgAEU="; }; meta = redshift.meta // { diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 24e160ab3a62..7051c11cc9eb 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -4,8 +4,6 @@ fetchFromGitHub, openssl, pkg-config, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -29,7 +27,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ openssl ]; meta = with lib; { description = "Impossibly fast web search, made for static sites"; diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix index 6fa567357324..5386625f10f0 100644 --- a/pkgs/applications/misc/survex/default.nix +++ b/pkgs/applications/misc/survex/default.nix @@ -2,8 +2,6 @@ lib, stdenv, fetchurl, - Carbon, - Cocoa, ffmpeg, glib, libGLU, @@ -43,10 +41,6 @@ stdenv.mkDerivation rec { gdal wxGTK32 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # TODO: libGLU doesn't build for macOS because of Mesa issues # (#233265); is it required for anything? diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index caba25669515..b2687050b54b 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -38,14 +38,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.7.3"; + version = "1.7.5"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-XmbdLaJzGjgbB4klu8soAV1m2/LjhbWbAczl/mNTMG4="; + hash = "sha256-/1X+wbVwLu0+SOMaVDJejBA+Z3szgs8IDtAZ9Yj7hXs="; }; buildInputs = diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index df841710a11c..a8c77f1d821b 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -27,13 +27,6 @@ xinput, avahi-compat, - # MacOS / darwin - ApplicationServices, - Carbon, - Cocoa, - CoreServices, - ScreenSaver, - UserNotifications, }: stdenv.mkDerivation rec { @@ -74,14 +67,6 @@ stdenv.mkDerivation rec { openssl pcre ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Carbon - Cocoa - CoreServices - ScreenSaver - UserNotifications - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux libselinux diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix index 76013b492330..4e3e7e441369 100644 --- a/pkgs/applications/misc/terminal-typeracer/default.nix +++ b/pkgs/applications/misc/terminal-typeracer/default.nix @@ -8,7 +8,6 @@ openssl, sqlite, libiconv, - Security, }: rustPlatform.buildRustPackage rec { @@ -35,7 +34,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Security ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 0772cd2d01a2..95c92c7c8e18 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -4,7 +4,6 @@ fetchurl, tcl, tk, - Cocoa, makeWrapper, }: @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ tcl tk - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix index 8b5e672d690f..32ae8dfc7d8c 100644 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -1,12 +1,10 @@ { lib, - stdenv, rustPlatform, fetchFromSourcehut, pkg-config, ncurses, openssl, - Security, }: rustPlatform.buildRustPackage rec { @@ -28,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ]; meta = with lib; { description = "Gemini Project client written in Rust with NCurses"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index d4532106533f..573eed048030 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -520,6 +520,20 @@ let revert = true; hash = "sha256-PuinMLhJ2W4KPXI5K0ujw85ENTB1wG7Hv785SZ55xnY="; }) + ] + ++ lib.optionals (!isElectron && !chromiumVersionAtLeast "137") [ + # Backport "Add more CFI suppressions for inline PipeWire functions" from M137 + # to fix SIGKILL (ud1) when screensharing with PipeWire 1.4+ and is_cfi = true. + # Our chromium builds set is_official_build = true, which in turn enables is_cfi. + # We don't apply this patch to electron, because we build electron with + # is_cfi = false and as such is not affected by this. + # https://chromium-review.googlesource.com/c/chromium/src/+/6421030 + (fetchpatch { + name = "add-more-CFI-suppressions-for-inline-PipeWire-functions.patch"; + url = "https://chromium.googlesource.com/chromium/src/+/0eebf40b9914bca8fe69bef8eea89522c1a5d4ce^!?format=TEXT"; + decode = "base64 -d"; + hash = "sha256-xMqGdu5Q8BGF/OIRdmMzPrrrMGDOSY2xElFfhRsJlDU="; + }) ]; postPatch = diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index bc38c109d23a..76ab98a318d7 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,10 @@ { "chromium": { - "version": "135.0.7049.84", + "version": "135.0.7049.95", "chromedriver": { - "version": "135.0.7049.85", - "hash_darwin": "sha256-L4x/MSCbVt2UIQwbHREDV8br6DmdfuqTJ3//7opK2IU=", - "hash_darwin_aarch64": "sha256-vixXGqbc2UYpydg1RILhrtmr5DdbJ5I1sD8aNikejQU=" + "version": "135.0.7049.96", + "hash_darwin": "sha256-MmL/hQGPk/kGBtbXSekE+lHktucPCv3HFr8VYTnff5w=", + "hash_darwin_aarch64": "sha256-TGiVrAYgeLGniGBZ2dHUBk6Hg996ouBSJHZm9hXExQ4=" }, "deps": { "depot_tools": { @@ -20,8 +20,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "6c019e56001911b3fd467e03bf68c435924d62f4", - "hash": "sha256-BFw1o2cIHBeBudeigH6YTOuLGsp/+pTOeE1lXBO3aio=", + "rev": "de2eb485a1951079e63bdb57ce25544d2dc79c15", + "hash": "sha256-6ydyJWsDawt0bfYAFHotTB9ujmIYsqUUpNwB6q6RNQE=", "recompress": true }, "src/third_party/clang-format/script": { @@ -566,8 +566,8 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "9afffebfa895ea6cdcc05516908c50bd7fe72797", - "hash": "sha256-89rJdhwUJtJCMO7FvVoTYO80swFRkoWUB/ZYs1tOLzE=" + "rev": "2919d07ee57020e3e4b66cce45c61104d80304d2", + "hash": "sha256-zE6a0R8NZ3SE0bHwPan3dTh5kmq5JmYTbDQIvyNICeg=" }, "src/third_party/perfetto": { "url": "https://android.googlesource.com/platform/external/perfetto.git", @@ -616,8 +616,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "6e445bdea696eb6b6a46681dfc1a63edaa517edb", - "hash": "sha256-mSup6nKsEPjJ/HBV7PwjBI4PP7/RdwFm/dnavKeRqzI=" + "rev": "5a44cdd70f04aa65fa063caa1a7e3028d75236f8", + "hash": "sha256-QX3b+S0IuxJKmlMudL6420+bXRhDkWYC7GNRKxKNm8A=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -787,7 +787,7 @@ } }, "ungoogled-chromium": { - "version": "135.0.7049.84", + "version": "135.0.7049.95", "deps": { "depot_tools": { "rev": "85ec2718b5a29990c7eb67778348c9f76a00f392", @@ -798,16 +798,16 @@ "hash": "sha256-8NynNvLNCHxy8EYmsnPovKhXu9DcDcYBhg4A6d2QIfY=" }, "ungoogled-patches": { - "rev": "135.0.7049.84-1", - "hash": "sha256-Cncp+sLFWC8nuepXCbkeHZYgAw2cFIAIaQe9wgun/AA=" + "rev": "135.0.7049.95-1", + "hash": "sha256-kLLtJti5GIF9TT0cH8zvsxywJzD22X8u2bB/tqENSjo=" }, "npmHash": "sha256-wNrZaugdKJCyV1WchkKXzr/I1OW1AtjiC2p7qTZZOqU=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "6c019e56001911b3fd467e03bf68c435924d62f4", - "hash": "sha256-BFw1o2cIHBeBudeigH6YTOuLGsp/+pTOeE1lXBO3aio=", + "rev": "de2eb485a1951079e63bdb57ce25544d2dc79c15", + "hash": "sha256-6ydyJWsDawt0bfYAFHotTB9ujmIYsqUUpNwB6q6RNQE=", "recompress": true }, "src/third_party/clang-format/script": { @@ -1352,8 +1352,8 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "9afffebfa895ea6cdcc05516908c50bd7fe72797", - "hash": "sha256-89rJdhwUJtJCMO7FvVoTYO80swFRkoWUB/ZYs1tOLzE=" + "rev": "2919d07ee57020e3e4b66cce45c61104d80304d2", + "hash": "sha256-zE6a0R8NZ3SE0bHwPan3dTh5kmq5JmYTbDQIvyNICeg=" }, "src/third_party/perfetto": { "url": "https://android.googlesource.com/platform/external/perfetto.git", @@ -1402,8 +1402,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "6e445bdea696eb6b6a46681dfc1a63edaa517edb", - "hash": "sha256-mSup6nKsEPjJ/HBV7PwjBI4PP7/RdwFm/dnavKeRqzI=" + "rev": "5a44cdd70f04aa65fa063caa1a7e3028d75236f8", + "hash": "sha256-QX3b+S0IuxJKmlMudL6420+bXRhDkWYC7GNRKxKNm8A=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 64cc87a62425..f2e7b430f825 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -487,7 +487,7 @@ let done fi - install -D -t $out/share/applications $desktopItem/share/applications/* + install -m 644 -D -t $out/share/applications $desktopItem/share/applications/* '' + lib.optionalString hasMozSystemDirPatch '' diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 482a692d164a..68fdce4c3cc7 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -14,7 +14,6 @@ opusfile, SDL2, the-foundation, - AppKit, zip, enableTUI ? false, ncurses, @@ -53,8 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableTUI [ ncurses sealcurses - ] - ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; + ]; cmakeFlags = [ (lib.cmakeBool "ENABLE_TUI" enableTUI) diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix index bcdc561da2d1..7afe97c3bf9a 100644 --- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix +++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, gperf, pkg-config, buildsystem, @@ -20,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-w1cifwLoP7KnaxK5ARkaCCIp2x8Ac2Lo8xx1RRDCoBw="; }; + patches = [ + # fixes libdom build on gcc 14 due to calloc-transposed-args warning + # remove on next release + (fetchpatch { + name = "fix-calloc-transposed-args.patch"; + url = "https://source.netsurf-browser.org/libsvgtiny.git/patch/?id=9d14633496ae504557c95d124b97a71147635f04"; + hash = "sha256-IRWWjyFXd+lWci/bKR9uPDKbP3ttK6zNB6Cy5bv4huc="; + }) + ]; + nativeBuildInputs = [ gperf pkg-config @@ -38,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; + enableParallelBuilding = true; + meta = { homepage = "https://www.netsurf-browser.org/projects/libsvgtiny/"; description = "NetSurf SVG decoder"; diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index a76be42cf112..f30c4262a176 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -4,6 +4,7 @@ makeWrapper, makeDesktopItem, fetchurl, + openjdk17-bootstrap, jdk11, jdk8, }: @@ -12,7 +13,7 @@ let generic = { version, - sha256, + hash, platform ? "", jdk, ... @@ -52,13 +53,16 @@ let "--user-agent" "Mozilla/5.0" ]; # HTTP 104 otherwise - inherit sha256; + inherit hash; }; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + makeWrapper ${jdk}/bin/java $out/bin/charles \ - --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar" + --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' ${lib.optionalString (lib.versionOlder version "5.0") "-jar $out/share/java/charles.jar"} ${lib.optionalString (lib.versionAtLeast version "5.0") "-XX:+UseZGC -Djava.library.path='$out/share/java' --add-opens java.base/sun.security.ssl=com.charlesproxy --add-opens java.desktop/java.awt.event=com.charlesproxy --add-opens java.base/java.io=com.charlesproxy --add-modules com.jthemedetector,com.formdev.flatlaf --module-path '$out/share/java' -m com.charlesproxy"}" for fn in lib/*.jar; do install -D -m644 $fn $out/share/java/$(basename $fn) @@ -69,27 +73,37 @@ let mkdir -p $out/share/icons cp -r icon $out/share/icons/hicolor + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Web Debugging Proxy"; homepage = "https://www.charlesproxy.com/"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ kalbasit kashw2 ]; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.unfree; - platforms = platforms.unix; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.unfree; + platforms = lib.platforms.unix; }; }; in { + charles5 = ( + generic { + version = "5.0"; + hash = "sha256-gvspRI3uF7bjE4UBuTGS5+n2h0nKudLtW3sqs2GZIyM="; + platform = "_x86_64"; + jdk = openjdk17-bootstrap; + } + ); charles4 = ( generic { - version = "4.6.4"; - sha256 = "KEQYb90kt41dS3TJLZqdaV9P3mQA9UPsEyiFb/knm3w="; + version = "4.6.8"; + hash = "sha256-AaS+zmQTWsGoLEhyGHA/UojmctE7IV0N9fnygNhEPls="; platform = "_amd64"; jdk = jdk11; } @@ -97,7 +111,7 @@ in charles3 = ( generic { version = "3.12.3"; - sha256 = "13zk82ny1w5zd9qcs9qkq0kdb22ni5byzajyshpxdfm4zv6p32ss"; + hash = "sha256-Wotxzf6kutYv1F6q71eJVojVJsATJ81war/w4K1A848="; jdk = jdk8.jre; mainProgram = "charles"; } diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix index 6866703b4454..bdf200e92865 100644 --- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - Security ? null, versionCheckHook, }: @@ -21,8 +20,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-6sRpsXydzKB0ZaV1HeagINgb6ol9dj3XT0+pd53QOCw="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 877a33aec8c5..4ae752d29272 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "25.4.1"; - sha256 = "18hv0lfh1ldy7chjs2ssn62crn71a0mvvn1g8b35l91g8mqyh4ry"; - vendorHash = "sha256-vKehadl94okOd1YfaETgdQwWr8F2gOPGyjzzTjxKyLA="; + version = "25.4.2"; + sha256 = "0i0z2x9x2sf9lpkvw9pnvwp74hxm9rqbdhx9v91qwlsnw8clc950"; + vendorHash = "sha256-jIL/08mSvz6xLlB1Iyj2F9vnfOkadeYf92CeXXx0Otw="; } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 438fb2cfde49..74788f7c5224 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -7,7 +7,6 @@ pkg-config, which, libvirt, - vmnet, withQemu ? false, qemu, makeWrapper, @@ -49,13 +48,7 @@ buildGoModule rec { makeWrapper ]; - buildInputs = - if stdenv.hostPlatform.isDarwin then - [ vmnet ] - else if stdenv.hostPlatform.isLinux then - [ libvirt ] - else - null; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libvirt ]; buildPhase = '' make COMMIT=${src.rev} @@ -80,7 +73,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ ebzzry - copumpkin vdemeester atkinschang Chili-Man diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index e10ba0c7e28f..fb3dd504386d 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "roxctl"; - version = "4.7.1"; + version = "4.7.2"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-AQaMWpI7kFFotEQa536dqKxuP/mHuzNm75RPqUWw1VY="; + sha256 = "sha256-W4g7//0r+XO1l6WoWm55pZAvyTsHNNI3kwBNvNvP+vw="; }; - vendorHash = "sha256-v2aLKU6FBkJqenWzftKmngeXvQBPR03RPR0WcmOiYD0="; + vendorHash = "sha256-eTxcJnAZUKk6VDQhbjxnsiQWEpM2jA228SAhrCqjbF4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 969f5cb7316e..accf1bb287a2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -9,13 +9,13 @@ "vendorHash": null }, "acme": { - "hash": "sha256-0iFJ6+7IpEExvjiC301PaVHWUuxqPlYjkMzwDJ1BzQo=", + "hash": "sha256-GpuIh2wRLv95EIF6Jhw43DZEqtECeVD3XZxMq9Ro3+s=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.31.0", + "rev": "v2.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-P3yrAfuYvN/sapQGj6fBYQtsScacIJW6JLBq+MOJlVc=" + "vendorHash": "sha256-fttldhDW9/MeWe7MVQqz8mFI2EuOkxMZg1CZ/+8ySFU=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -27,13 +27,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-tfkJ86MwXEvWfrUGL4yrHNoMeBWqEtQwCHhvuGRNU4o=", + "hash": "sha256-CpgUw4DJhN9r+rSBrkF0OdASJOyM+zn9s2yQssAYvJ8=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.37.0", + "rev": "v4.38.0", "spdx": "MIT", - "vendorHash": "sha256-bviZHOxZajmx++SG6k/mkjHCa4Q7jMY7CaLUele/jgw=" + "vendorHash": "sha256-mtx5tFO+3lnDoaSUad1kRMPZkddsU1lOVMz6Ln4UdA8=" }, "akamai": { "hash": "sha256-ivIJvWKfL9oYvLZeoErvYKuCZLEwNaZD7jFrIGPlurI=", @@ -207,13 +207,13 @@ "vendorHash": "sha256-DUc06D22wqYG/O27NkOxJ2bu+dwirReAq9Y6p135ICY=" }, "buildkite": { - "hash": "sha256-Zlc82lncNf+jeYBck8QBJKuX4pmQmkkb4vYR+T8DoXU=", + "hash": "sha256-U3D5BRlAATspWMPP8wZk+x4PmS0sEipKaC5rVGVHltA=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.16.3", + "rev": "v1.17.1", "spdx": "MIT", - "vendorHash": "sha256-/d1oml8nUOBx6sOe1k43EhbAyfbObJJuoJCEaHQuIZs=" + "vendorHash": "sha256-6B0YRn7SLMea54bZpfCUSLLUvd3h5L5KIX8ja7vl0vE=" }, "ccloud": { "hash": "sha256-Dpx0eugcHCJV8GNPqjxx4P9ohgJgB10DTnHr+CeN/iQ=", @@ -225,13 +225,13 @@ "vendorHash": "sha256-OqbnkuEy9w6F1DxmlYhRNYhBaYhWV0FtMK4wdwSybh8=" }, "checkly": { - "hash": "sha256-gpCE4W35h/3FBLVTM1o038lDB3dgjIwDs8mXjep07RM=", + "hash": "sha256-0PUapBId0y6R5a3+mTN/p57S3ZrkaB4NDFTO77B/QTY=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.10.1", + "rev": "v1.11.0", "spdx": null, - "vendorHash": "sha256-FaqXLFc7ew7HgCZghNPm4sgmsm25/qMAqhqUtbduccU=" + "vendorHash": "sha256-mhuNDKTzkL6rWdoL54qt1s8lPMFMsRNNoFBGi5i9ksk=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", @@ -243,22 +243,22 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-N+ci49HQq5TMQo7XstYar8SrdOO5tQb92o+R/9LfX3s=", + "hash": "sha256-nUzWtow4FLQzGoxGWA68LAs4Nau7xTdtxATSwsF6s9c=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.32.3", + "rev": "v1.33.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-lQrtAU8zbeIGplfC8+017Ib9d4MFVF0pMvxmE3MLt3M=" + "vendorHash": "sha256-nbz0QEIfnLnMOE/zGILMVBK+/hjYLlWeIqiwOLP6ebQ=" }, "cloudflare": { - "hash": "sha256-5L5fnJCQU2gcXbbUq8KDid8NhedFXyYBgysggPxNxSY=", + "hash": "sha256-FPZBU93x82+szFCC8djO88WFedbsVRFlVxZfTf4uAxI=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v5.2.0", + "rev": "v5.3.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-vh31Teu4PruX3i7EIlfumOn/R6libKzAxMPqhTxqBTA=" + "vendorHash": "sha256-4iDZXMz3GN7vSAXyDtvGL77ChAjJ/2H7PD/AvYi4BMA=" }, "cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", @@ -354,11 +354,11 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { - "hash": "sha256-jReUOuoRybh8g4smxy7QCkJEgUzDnaKhj7VO5ShSGsc=", + "hash": "sha256-q5RMK1HwjnAhgPsdjGSvza83j+gHpbsAcVaUHVrwM+Q=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.50.0", + "rev": "v2.51.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -381,22 +381,22 @@ "vendorHash": "sha256-osSB88Xzvt5DTDE0AY2+QuKClfbGIVJNrXuy4Cbk1Tg=" }, "dnsimple": { - "hash": "sha256-ZKi8+EYLW/Pey0EHTKY0ly7+2Y13mqxMhGia6UUdEtI=", + "hash": "sha256-CkfgHBNtYCFZIMoXpX0ivkm1dyIs4mKSrHaiQ3qt/+w=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v1.8.0", + "rev": "v1.9.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-HBwyjqKSshB4Nl2e/xnMnWgYVolSxvKZHi+bYfM2+Ho=" + "vendorHash": "sha256-WZqwBkVXoFmDikIyt9GWszLA/9YBoQHAdBuWbGKZBZw=" }, "docker": { - "hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=", + "hash": "sha256-0GMZnrmuRKWnI3Fu97MPtKiNh9XSUkFO/U35+ym2xLk=", "homepage": "https://registry.terraform.io/providers/kreuzwerker/docker", "owner": "kreuzwerker", "repo": "terraform-provider-docker", - "rev": "v3.0.2", + "rev": "v3.1.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" + "vendorHash": "sha256-YTxWawv5KbitMD9CoiDLt8FjZUvjyIjcoqQVmz9xZGs=" }, "doppler": { "hash": "sha256-VzdtksB/zrsf3z3J/1UEehiuQYM7cyxTef892PGYrxo=", @@ -417,20 +417,20 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-SCjw2IFRrtcY9jrPUNETr2IZIU9C3wW/WAS2TbzlsWE=", + "hash": "sha256-L/1cNCPmDDxbdJYOtzIl1dCDZBu6DlH96ZN1SisywgQ=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v3.5.0", + "rev": "v3.6.0", "spdx": "MIT", - "vendorHash": "sha256-aTQreRL0UTMYWLs25qsdwdN+PaJcOHwLRA8CjIAsYi0=" + "vendorHash": "sha256-K3tQQytOQ81duLMyCZu9PczsS1NUYF0AmPMQo5UcUXo=" }, "exoscale": { - "hash": "sha256-SL0O4hRVeLqxDEsh/BUZLUsypLPlvD7Z0ozr+RPuuv4=", + "hash": "sha256-RUO4Ge2z4e4N2FWiLtSNv/w2ivgOJVNYQCJvT8hN/8g=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.64.0", + "rev": "v0.64.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -507,20 +507,20 @@ "vendorHash": "sha256-1KTU8nMYUfC+LJHFeIpK6m4RUPWvSHNSXGVJgcnsVl8=" }, "google": { - "hash": "sha256-mB57EqU5FAxvBROXbF7vn4EKTwTEvm8biR/nU9jjgkA=", + "hash": "sha256-GuwIiAyZwa66Vl6dIKdmzHYhWdNrfISy3YKLJQva92U=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v6.29.0", + "rev": "v6.30.0", "spdx": "MPL-2.0", "vendorHash": "sha256-oGO+++WMiXUTCLFdBH2/uAzdN3RtrSNDSUBVMIYmI14=" }, "google-beta": { - "hash": "sha256-XocoPOGErjT2UMoJZA4Tpeq5lzLSXV9SWud+/zFSpfc=", + "hash": "sha256-3E3CvuZ6n5B8PsMmZeO98CxQzTlZExdfCs8t9R5UEwg=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v6.28.0", + "rev": "v6.29.0", "spdx": "MPL-2.0", "vendorHash": "sha256-6dmNe/Ky+FACzDSjp3SCv4N4783K3CszhQ6eXRQ5qzM=" }, @@ -615,11 +615,11 @@ "vendorHash": "sha256-GoOKTT+EOhaPhpbgSW3SycYsE8LEQP0v4eQfiTEnPy8=" }, "huaweicloud": { - "hash": "sha256-kwtQQOVIJy03tW2tRURN0NhYW5MT8O65nRdydnkipx0=", + "hash": "sha256-MzXzdUzhYB7eDW7sNag4PIlz4Z7Q4GZDeHsjLSnc9Ck=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.73.5", + "rev": "v1.73.8", "spdx": "MPL-2.0", "vendorHash": null }, @@ -642,13 +642,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-xz0oqnS0RBuan0QQZ1WvGYtmonL5zDeIvvqrsaYCDeI=", + "hash": "sha256-3dOwxmWt2EqGkr/wL+qA1HNbloXlJcbvxI8NDnmA+rg=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.77.0", + "rev": "v1.77.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-63ZB1XrwVSV8hQ7A9/JLxJ2J41ReyS1KXHJqr95IVLw=" + "vendorHash": "sha256-w6M4506BykzV1oLadsq3Tgck5Lvf5V3Y8v+pwhlu80c=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -678,13 +678,13 @@ "vendorHash": null }, "jetstream": { - "hash": "sha256-RlYl8DNx+XjLjMQ8CbVJH0p2ZwBrDNp2OCvzHxQ7zLA=", + "hash": "sha256-N/cKiMwPHo8581PFg06RjgOGpGB02/CCARTIFu9kH3s=", "homepage": "https://registry.terraform.io/providers/nats-io/jetstream", "owner": "nats-io", "repo": "terraform-provider-jetstream", - "rev": "v0.1.1", + "rev": "v0.2.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-NEGjgtrn6ZowqSF6NAK1NnSjYVUvfWuH/4R5ZPdTZSs=" + "vendorHash": "sha256-Dd02Ikt51eh/FBEtswe8Qr6P5tgQFZJTKgO01gxPX3s=" }, "kafka": { "hash": "sha256-O8fD974eEmIgMAbLsENBkHiS1+2onx7OOrhnwv+cGoo=", @@ -705,13 +705,13 @@ "vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU=" }, "keycloak": { - "hash": "sha256-mlPq3sOaGN/fFAxMmK9ahcupwWd/4gYdNTLGRqDjPLc=", + "hash": "sha256-DqGM7nmblbt0sD5dKzQ7URL9LYbaMSfP01nrjEwyado=", "homepage": "https://registry.terraform.io/providers/keycloak/keycloak", "owner": "keycloak", "repo": "terraform-provider-keycloak", - "rev": "v5.1.1", + "rev": "v5.2.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-51sFU6P4Ynyu9NpQxlbSV7EoB/Lk1da4O0bOuoeMujI=" + "vendorHash": "sha256-I1e1/Qr/22zAXDcEmfx7BHqKVUl8tcomqBk7SQv8aR4=" }, "kubectl": { "hash": "sha256-UQ/xvhs7II+EGH5bKdrVC47hp5dhLqQZeqSBz06ho1s=", @@ -750,13 +750,13 @@ "vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE=" }, "linode": { - "hash": "sha256-7CGut0z0NEu4yeJOCbqgL9CH7uDwGQbUKTnPK62Xbp0=", + "hash": "sha256-yMLX72T2TG1wyGrn0pmpgPFPNVIVMSkiqAAl3OAvEuA=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.36.0", + "rev": "v2.37.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-nrZNJZHb1FJ7csM/C3mR+RUYy/2TeUzQ1sDmQ8Q4F/s=" + "vendorHash": "sha256-hp2gtyC+AXlsbYJlloDnRRvbaF1s/cAc2XIniKdUf08=" }, "linuxbox": { "hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=", @@ -813,13 +813,13 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-Bt4hy8GwEMAmNP8l8kvTxXV48EfJq4SPzihXL44JHSU=", + "hash": "sha256-3m3qmclDxl648j2XuVAqkuhxZTI3Av2ddLwVj4Lw7vM=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2025.4.3", + "rev": "2025.4.10", "spdx": "0BSD", - "vendorHash": "sha256-pKUgvL46lY9K2GBCYpQKkmudCQKhCViAXniMWtrSxbc=" + "vendorHash": "sha256-jOusdVc6FGClk1qyQS2tKW/2I8Mauxs0wLOct58l0e8=" }, "minio": { "hash": "sha256-OIdXZIy+W8yO3y7z/1JzG7QegJmMLTFSoC7FmioscmA=", @@ -858,13 +858,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-wh/6nkBtmZb+nwwGpk4F/YlSbmSFgCjMprnMmXslWHg=", + "hash": "sha256-ybOBWUxboRw+KTnWcDPPXo/oZVJs4qyWEekYoIB8bsI=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.60.0", + "rev": "v3.60.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-9E1I7ZgBwFo7XouQjBkQQVxQKvkwE6dhVF1hZxec+WY=" + "vendorHash": "sha256-WmrqA3wVUStJunm1eiftKekHJaPRvCAua5guqskd6CE=" }, "nexus": { "hash": "sha256-6RPga80ZoqEEFL7I2OVXcrwaxbdhSzZDEV07xL07rZs=", @@ -913,11 +913,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-UG2dXoHHH7sWma4+Zlvtj2aHwcvJPKgTxJFZDxqzKyc=", + "hash": "sha256-S3OsFoSPYOcD+mjOy1gBAVGpqd61G5S2Zl2GGknKA5o=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v6.32.0", + "rev": "v6.34.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -967,13 +967,13 @@ "vendorHash": "sha256-0Atbzx1DjInPMa1lNxyNKfNMILjN4S814TlIAQeTfdI=" }, "opentelekomcloud": { - "hash": "sha256-Wn5KjmQMIHeP99jXh+7ZVfj/DD6fZEZFHdQ0kAKa0yk=", + "hash": "sha256-P+QIEmCHfl1YHT91o2Kv7dc7V1LBfZQOXLh+74eH6dI=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.34", + "rev": "v1.36.35", "spdx": "MPL-2.0", - "vendorHash": "sha256-hpMwKy+DfwM9dPojYO5kKz7RF5mWagxwh5Gl8lefXSc=" + "vendorHash": "sha256-nyT6WIlw1zQ+1lH46Ezy/ZLyg3CV1/4bPf8MdRGGNfA=" }, "openwrt": { "hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=", @@ -1003,11 +1003,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-ed4i9Esj90h4bG4gzGZBqaaJJOsE2fLfip9xyneRAjg=", + "hash": "sha256-7C1oVVLrv1yoBVngUdBAjjLrGeaQhbiLp/g+5danDo4=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.23.1", + "rev": "v3.24.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1102,13 +1102,13 @@ "vendorHash": "sha256-lkooWo0DbpL4zjNQ20TRw+hsHXWZP9u7u95n1WyzTQk=" }, "rootly": { - "hash": "sha256-9D4dOPJAmSdKhJ3TLhQVHsmGxKoD7oiIDBgltCjxl6I=", + "hash": "sha256-bIn3TshuK06MCNznghPeFS5jfFMshz2Zmc9DKoHUEWs=", "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly", "owner": "rootlyhq", "repo": "terraform-provider-rootly", - "rev": "v2.26.2", + "rev": "v2.26.5", "spdx": "MPL-2.0", - "vendorHash": "sha256-iq/Skuegzn9bz7aF6COYeoXQpXmKDkvKJJ/fnJqyJFg=" + "vendorHash": "sha256-IJJjA7SCQib5GdqbS2rnZtbBNB8sYYPYH+vHMGf1Bfk=" }, "rundeck": { "hash": "sha256-OyXIuQu0/NLPIZUzOdnTq2M5Qg6AwOdYG2WozWDmOoQ=", @@ -1129,13 +1129,13 @@ "vendorHash": "sha256-Ry791h5AuYP03nex9nM8X5Mk6PeL7hNDbFyVRvVPJNE=" }, "scaleway": { - "hash": "sha256-9ZdQi1Z1IfidVrqD8vQqmV7lyGalghls4/KJSoX3Kzw=", + "hash": "sha256-17BjGoIkKdMVVQMetx+ksQhLbTl/cCdC05HaB7Sai/4=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.52.0", + "rev": "v2.53.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-hXvpCjWwlk4UuvtxWznP8t3qlvzBvWlrui2VdP0Hruo=" + "vendorHash": "sha256-1N9HByEI0TwI7rdg/OmMObwnb4Hx8oigv5A6hpF0TrY=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1273,22 +1273,22 @@ "vendorHash": "sha256-S3SBp17+qqA64tWydD5DYc9KahycJ+qDrdXvFwu6Lbc=" }, "sysdig": { - "hash": "sha256-9oj8rk4ltVcg5yPWU0WFxG1GvG3w9NM2MKi/UKM1U00=", + "hash": "sha256-FMXo2GJrrZZNrragGle1Sy6hwERoUoDTEKv3N2hJl00=", "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig", "owner": "sysdiglabs", "repo": "terraform-provider-sysdig", - "rev": "v1.52.0", + "rev": "v1.53.0", "spdx": "MPL-2.0", "vendorHash": "sha256-L+XwC7c4ph4lM0+BhHB9oi1R/Av8jlDcqHewOmtPU1s=" }, "tailscale": { - "hash": "sha256-I9t8HyLZmY98g/XjTy6JEryJ8ZOXfegnbymmxVwsy7Q=", + "hash": "sha256-1fHY1eU+8z48j485VONdCsKJWC5hOVbph2pOVGHjYjo=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.18.0", + "rev": "v0.19.0", "spdx": "MIT", - "vendorHash": "sha256-bfcsqBusN311oncfCViG4aWy9rylvhrcjs/WUSbh4dI=" + "vendorHash": "sha256-X2YjJvMboS04ViaIP1ebzIX8txumlvTEpGmEAlZNV9E=" }, "talos": { "hash": "sha256-49woELLSpheuyGnXuwamZwsHdOfjwSB4v8/INzSrMRU=", @@ -1309,22 +1309,22 @@ "vendorHash": "sha256-IKoDnClkmcCDFyt9QqWp10vZjfQpWByoUArY+hkXkVE=" }, "tencentcloud": { - "hash": "sha256-ZLjCtxR9CPYCcEIlm+cTN1lLhLu8D+BAGEvjzKbQhH8=", + "hash": "sha256-GhIdOdS098ko1o1HMdu6EGqNaSQmodhY8mu3hyhMiew=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.181", + "rev": "v1.81.183", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-VQmVnk+dmWHeQ5/edv2QROGJsMjDW2NxEBVzK/a/q0U=", + "hash": "sha256-qjLk+otEUaNgbFKi+UzCuQG2uHCqJca6XD2Vwm6O9mM=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.64.0", + "rev": "v0.65.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-F64pMn3OZcDZGhZI6TeZNgYuTnRALKVm3v7JLR+V82w=" + "vendorHash": "sha256-PSUob2u8hue5ii+kV4bGcvexkIQxzWsHbbEbYO0celU=" }, "thunder": { "hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=", @@ -1463,13 +1463,13 @@ "vendorHash": "sha256-3RylkFRnCG5Z9G/4iV8YJgBnNKYS4T3AhA2JdI+1FEY=" }, "vultr": { - "hash": "sha256-yR8zNnkxzOa3h7W9nWGBk2zgVXIaD3imZSAJakJ3994=", + "hash": "sha256-1ZzydEpNF06NUC0wYtFcPHpdj4FFPI+qF6pVRNsUxTs=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.25.0", + "rev": "v2.26.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-iHChyx/h7zyrL5/isZCpHQdAe8P1na187EF+na0TkpU=" + "vendorHash": "sha256-i9RzGR03pRhRDDGKBROVSB1aK1EMCYQkYsjeczP8AE4=" }, "wavefront": { "hash": "sha256-yNNtOkodzwxKvHQq9GZlUicezGW6u2ih6ry/cOtJQGM=", diff --git a/pkgs/applications/networking/feedreaders/tuifeed/default.nix b/pkgs/applications/networking/feedreaders/tuifeed/default.nix index acb9a3cd87e7..ef4915dc524f 100644 --- a/pkgs/applications/networking/feedreaders/tuifeed/default.nix +++ b/pkgs/applications/networking/feedreaders/tuifeed/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchCrate, rustPlatform, - Security, }: rustPlatform.buildRustPackage rec { @@ -18,8 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-A7kD46gfXWK/OlFVMULlMa7Z9Q1it9/rhGo6pjFa38k="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - doCheck = false; meta = with lib; { diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 71ac15ef0cac..82906428ea9a 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -18,8 +18,6 @@ wxGTK32, gtk3, xdg-utils, - CoreServices, - Security, }: stdenv.mkDerivation { @@ -43,26 +41,21 @@ stdenv.mkDerivation { wrapGAppsHook3 ]; - buildInputs = - [ - boost - dbus - gettext - gnutls - libfilezilla - libidn - nettle - pugixml - sqlite - tinyxml - wxGTK32 - gtk3 - xdg-utils - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - ]; + buildInputs = [ + boost + dbus + gettext + gnutls + libfilezilla + libidn + nettle + pugixml + sqlite + tinyxml + wxGTK32 + gtk3 + xdg-utils + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/gopher/phetch/default.nix b/pkgs/applications/networking/gopher/phetch/default.nix index e5c90097e765..a198f7c0443b 100644 --- a/pkgs/applications/networking/gopher/phetch/default.nix +++ b/pkgs/applications/networking/gopher/phetch/default.nix @@ -1,13 +1,11 @@ { lib, - stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkg-config, openssl, scdoc, - Security, which, }: @@ -36,7 +34,7 @@ rustPlatform.buildRustPackage rec { scdoc which ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ openssl ]; postInstall = '' make manual diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 057b6fb4aebb..257976552302 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,7 +9,7 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.89"; + stable = "0.0.91"; ptb = "0.0.136"; canary = "0.0.621"; development = "0.0.73"; @@ -26,7 +26,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-74M2SAJLS8u37m2bEo/Yblq822EbWWZfpLf5emvTusE="; + hash = "sha256-vGRK1YJoaM4+tUaQd4f7ImaVnUkAdjH+RW7r+bOMx6I="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index ef77a66f3bb4..bf94609409a8 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -173,7 +173,10 @@ stdenv.mkDerivation rec { wrapProgramShell $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ - ${lib.strings.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ + ${lib.strings.optionalString withTTS '' + --run 'if [[ "''${NIXOS_SPEECH:-default}" != "False" ]]; then NIXOS_SPEECH=True; else unset NIXOS_SPEECH; fi' \ + --add-flags "\''${NIXOS_SPEECH:+--enable-speech-dispatcher}" \ + ''} \ ${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \ diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 471a7d47abb6..4c7288d6a328 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -40,11 +40,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "2.0.3"; + version = "2.1.1"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - hash = "sha256-DbM80fyJ+jwB9Yc9vfoiDqW7Sx7MDR0OEkHdOC6nRG4="; + hash = "sha256-1pPrc7lzxaLK1QbxslGYGS8xOxuT231RvZrdvWeGFOk="; }; format = "pyproject"; @@ -139,6 +139,7 @@ python3.pkgs.buildPythonApplication rec { maintainers = with lib.maintainers; [ raskin abbradar + hlad ]; downloadPage = "http://gajim.org/download/"; platforms = lib.platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 35e438c6a61f..1addd4fe76db 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { pname = "pantalaimon"; - version = "0.10.5"; + version = "0.10.6"; pyproject = true; # pypi tarball miss tests @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { owner = "matrix-org"; repo = "pantalaimon"; rev = version; - hash = "sha256-yMhE3wKRbFHoL0vdFR8gMkNU7Su4FHbAwKQYADaaWpk="; + hash = "sha256-g+ZWarZnjlSOpD75yf53Upqj1qDlil7pdbfEsMAsjh0="; }; build-system = @@ -38,7 +38,6 @@ python3Packages.buildPythonApplication rec { with python3Packages; [ aiohttp - appdirs attrs cachetools click @@ -47,6 +46,7 @@ python3Packages.buildPythonApplication rec { logbook (matrix-nio.override { withOlm = true; }) peewee + platformdirs prompt-toolkit ] ++ lib.optionals enableDbusUi optional-dependencies.ui; diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 31aaf069e8e2..94a04fc5bcd6 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -1,42 +1,32 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, - CoreServices, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { pname = "twitch-tui"; - version = "2.6.18"; + version = "2.6.19"; src = fetchFromGitHub { owner = "Xithrius"; repo = pname; tag = "v${version}"; - hash = "sha256-uo9QEwSRIJKjWza8dEQXDCMQ/ydKBk/BX2TaVhX+k1M="; + hash = "sha256-hA66YcxbQem9ymOu3tGA4biKUCoJ2jKnUSK+9+0P2Eg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-H/MAbN7wCg74bNWt5xlNaukvGJLYyzuynYtIqxBOcbo="; + cargoHash = "sha256-DMUE3sTJEz2AxUctnjm0CkvOqMeAw5urLPZkkHvf9A8="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - SystemConfiguration - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Twitch chat in the terminal"; diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index 30023e00057d..3003e119d279 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -4,7 +4,6 @@ rustPlatform, fetchFromGitHub, pkg-config, - Foundation, dbusSupport ? stdenv.hostPlatform.isLinux, dbus, # rustls will be used for TLS if useOpenSSL=false @@ -28,10 +27,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-lyjTl0kbtfQdqSqxti1181+oDVYP4U++v2JEOYvI7aM="; nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux pkg-config; - buildInputs = - lib.optionals dbusSupport [ dbus ] - ++ lib.optionals useOpenSSL [ openssl ] - ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; + buildInputs = lib.optionals dbusSupport [ dbus ] ++ lib.optionals useOpenSSL [ openssl ]; buildFeatures = lib.optional notificationSupport "desktop-notifications"; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 199b238ab388..0195baabcee4 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -13,7 +13,6 @@ pkg-config, libgcrypt, cmake, - libobjc, libresolv, libiconv, asciidoctor, # manpages @@ -38,6 +37,7 @@ pcre2, libargon2, extraBuildInputs ? [ ], + writeScript, }: let @@ -98,16 +98,16 @@ let enabledPlugins = builtins.filter (p: p.enabled) plugins; in -assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins; -stdenv.mkDerivation rec { - version = "4.5.1"; - pname = "weechat"; - hardeningEnable = [ "pie" ]; +assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins; + +stdenv.mkDerivation rec { + pname = "weechat"; + version = "4.6.2"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-Z8FDx7xw5om56obfZ0yan/PPRMzJzf8hvmpWHV6vxSg="; + hash = "sha256-D6AkKhgRb+J/dG27giEhgF2mu129QHUNQsYzBuSJZig="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 @@ -120,19 +120,22 @@ stdenv.mkDerivation rec { cmakeFlags = [ - "-DENABLE_MAN=ON" - "-DENABLE_DOC=ON" - "-DENABLE_DOC_INCOMPLETE=ON" - "-DENABLE_TESTS=${if enableTests then "ON" else "OFF"}" + (lib.cmakeBool "ENABLE_MAN" true) + (lib.cmakeBool "ENABLE_DOC" true) + (lib.cmakeBool "ENABLE_DOC_INCOMPLETE" true) + (lib.cmakeBool "ENABLE_TESTS" enableTests) ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" ] - ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.cmakeFeature "ICONV_LIBRARY" "${libiconv}/lib/libiconv.dylib") + ] + ++ map (p: lib.cmakeBool p.cmakeFlag p.enabled) plugins; nativeBuildInputs = [ cmake pkg-config asciidoctor ] ++ lib.optional enableTests cpputest; + buildInputs = [ ncurses @@ -146,12 +149,13 @@ stdenv.mkDerivation rec { libgcrypt ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc libresolv ] ++ lib.concatMap (p: p.buildInputs) enabledPlugins ++ extraBuildInputs; + hardeningEnable = [ "pie" ]; + env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" # Fix '_res_9_init: undefined symbol' error @@ -167,13 +171,28 @@ stdenv.mkDerivation rec { ''; doInstallCheck = true; + installCheckPhase = '' $out/bin/weechat --version ''; + passthru.updateScript = writeScript "update-weechat" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p coreutils gawk git gnugrep common-updater-scripts + set -eu -o pipefail + + version="$(git ls-remote --refs https://github.com/weechat/weechat | \ + awk '{ print $2 }' | \ + grep "refs/tags/v" | \ + sed -E -e 's,refs/tags/v(.*)$,\1,' | \ + sort --version-sort --reverse | \ + head -n1)" + update-source-version weechat-unwrapped "$version" + ''; + meta = { homepage = "https://weechat.org/"; - changelog = "https://weechat.org/files/doc/weechat/ChangeLog-${version}.html"; + changelog = "https://github.com/weechat/weechat/releases/tag/v${version}"; description = "Fast, light and extensible chat client"; longDescription = '' You can find more documentation as to how to customize this package diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index b46ba1ecdf27..b4570d58434b 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "notmuch"; - version = "0.38.3"; + version = "0.39"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${finalAttrs.version}.tar.xz"; - hash = "sha256-mvRsyA2li0MByiuu/MJaQNES0DFVB+YywPPw8IMo0FQ="; + hash = "sha256-uIuwKnbEa62NMT/Su0+OOSmLUfZvy+swTZ+Aw+73BOM="; }; nativeBuildInputs = @@ -68,14 +68,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withRuby ruby ++ lib.optional withSfsexp sfsexp; - patches = [ - (fetchpatch { - name = "add-workaround-for-Emacs-30-pp-changes.patch"; - url = "https://git.notmuchmail.org/git?p=notmuch;a=patch;h=e3d4721b1ba4836c7646e057b50123fe994652eb"; - hash = "sha256-phfNSOlTajTmaf+DjtdmBAWSm+2tUbrQEChInUlwn5k="; - }) - ]; - postPatch = '' patchShebangs configure test/ @@ -142,10 +134,9 @@ stdenv.mkDerivation (finalAttrs: { ln -s ${test-database} test/test-databases/database-v1.tar.xz '' + '' - # Issues since gnupg: 2.4.0 -> 2.4.1 - rm test/{T350-crypto,T357-index-decryption}.sh # Issues since pbr 6.0.0 bump (ModuleNotFoundError: No module named 'notmuch2') rm test/T055-path-config.sh + rm test/T610-message-property.sh # Flaky, seems to get its paths wrong sometimes (?) # *ERROR*: Opening output file: Permission denied, /nix/store/bzy21v2cd5sq1djzwa9b19q08wpp9mm0-emacs-29.1/bin/OUTPUT rm test/T460-emacs-tree.sh @@ -209,7 +200,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - pythonSourceRoot = "notmuch-${finalAttrs.version}/bindings/python"; + pythonSourceRoot = "notmuch-${finalAttrs.version}/contrib/python-legacy"; gemEnv = buildEnv { name = "notmuch-vim-gems"; paths = with ruby.gems; [ mail ]; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 42f6c8597701..26aeb6f93388 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -9,7 +9,6 @@ gpgSupport ? true, sslSupport ? true, fetchpatch, - Foundation, }: assert gpgSupport -> gpgme != null; @@ -42,10 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = - [ gtk2 ] - ++ lib.optionals gpgSupport [ gpgme ] - ++ lib.optionals sslSupport [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; + [ gtk2 ] ++ lib.optionals gpgSupport [ gpgme ] ++ lib.optionals sslSupport [ openssl ]; configureFlags = lib.optional gpgSupport "--enable-gpgme" ++ lib.optional sslSupport "--enable-ssl"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 446cf51e8d4c..4e91a406cc57 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,797 +1,797 @@ { - version = "128.9.1esr"; + version = "128.9.2esr"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/af/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/af/thunderbird-128.9.2esr.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "9d97842d3b036d8d4e7ebd01e7d86caeae9b098f8fc2a91217b51a934ce303e1"; + sha256 = "aedc246acba5af959ba0413882aa149a458841ac254d62a1f5dafd3bdd9cc472"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/ar/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/ar/thunderbird-128.9.2esr.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "15ca3dcf2439b8be24f7393ba10ddfa650f524f5804f496fab86340b4d5cf7ef"; + sha256 = "11fc9a81c124d723fe5cf13b7afd97915fff67ad88a0df3795524fc1895aea9a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/ast/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/ast/thunderbird-128.9.2esr.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b7c9008d94139159b38b8ae50db8aafa6e42997a2072b9b5b2daffea1dda7111"; + sha256 = "cb8483973123002ae993ecfdccc2c548c8a88eea7a13556bf7b9cc6522710f5b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/be/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/be/thunderbird-128.9.2esr.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "c7a2a2fd2d97471d7f60b5d8acc18d7f3c4b8c699e033575c50668ee22c80a0b"; + sha256 = "daf4fe4ff79cf2dd5bb6974d4b96b1023e48fcf858a47a6a2f80c9f94a241bf5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/bg/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/bg/thunderbird-128.9.2esr.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f89a6a12cc9ba3a334cb3862026c04f8eeb229b3a462ae2092f49ff3c9b064b4"; + sha256 = "1f75adfd5a34d349b7ff3498b74846d7f183dfeffe71c95898edbb1cdd347af5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/br/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/br/thunderbird-128.9.2esr.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "9ef1aa1f33a7278c487579f37aa04fbfec740a5049fc61d63b05a1dfaa67d797"; + sha256 = "0099c80187ed38588577025c18a16f4a1f97d34358c1c141253acb8284c0d7b9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/ca/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/ca/thunderbird-128.9.2esr.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "35bb3fe0d144b15da5cd29b05aea43c5dd89acfc4c27da967130f906579073b7"; + sha256 = "3dd450c1394d0511086fe359397f10ba2286f351a439debdf7243d372dd4e82a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/cak/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/cak/thunderbird-128.9.2esr.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "be4b2423680841d36218676a09cabd10b04b7e1ca8142fbbad6ea561332650f2"; + sha256 = "8be34e4111812242e66e26ce132aa5cfd4207f54c5f6b526177faba1040f7e5b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/cs/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/cs/thunderbird-128.9.2esr.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "e8a6d8f2cae7722a8c7e71c788614b9d2b0a8cdc3a887fe3199c3aa7f02e3ef8"; + sha256 = "56287abaebf7a18f6bb4ccf6b211c3a484fc906ae0a95ff8a57bdb0c0dc610e7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/cy/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/cy/thunderbird-128.9.2esr.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "5fddae03d456b5e8c759206adc2a03cd22c2507378dbb7ac4b99245034af6351"; + sha256 = "b10d11edb5eea9d379ee46e91446d9ad0f4e13c51301fc3c86b1b3b29ce68544"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/da/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/da/thunderbird-128.9.2esr.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "7fc1850aaa9c5095ed9c0f46f29730dd42f435bade4b60289f5c98c7ea2addf6"; + sha256 = "4c2938e2e5d6f3a87332e2facb917e713dac353d1ea59a28ca8061595fc1ab10"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/de/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/de/thunderbird-128.9.2esr.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "5f4e5a820273d4953be0d0ee0f405e34fdb0f263ce9715a9a6e79c88acfb00a8"; + sha256 = "d4936702e75b71a18d36bc4f4c62a4f5bce75e4704ee9f968f4971466798b372"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/dsb/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/dsb/thunderbird-128.9.2esr.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7ca58099cf065727b77abe36bc87827e1ea892d6eb8971f7ec8ab612ec7481ac"; + sha256 = "2aa5d5aa83026a49c4eb24f8ae7d918c1c82f1a5e0f3066b7041296479131c13"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/el/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/el/thunderbird-128.9.2esr.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "a357dead742f2040c9eefddaf1231758dae09d0ef4f1c99bcfffd8cb1f18714c"; + sha256 = "27057c8273f6783a7176959ae2fd19f8e2e2416cc29d64c7b64f30e83f091598"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/en-CA/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/en-CA/thunderbird-128.9.2esr.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "26fd018447d63e7842339a90656e433f14a92a036e98f74ad6d230ad958cea4a"; + sha256 = "103162be5b27f412b24174e98bb75e8d467ad49dfcdebefa0c75371da44be009"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/en-GB/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/en-GB/thunderbird-128.9.2esr.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "291d091d832d99f09cbb603263412312a5e41e00011ccd7905f32ed78c806aa8"; + sha256 = "1b2c8555c69f52be42c6857944b02a04b6a91b9e2438dfd376b8215ae5e7ccf6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/en-US/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/en-US/thunderbird-128.9.2esr.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "4dcbdcf5dfdd48941d6248f625f3bb32b4dbc4acee9a52e4858774576fee1479"; + sha256 = "b32a370c7ccf9344493856a508845dd29c904ecbca9c1faa9c788a42a3d2d89f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/es-AR/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/es-AR/thunderbird-128.9.2esr.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "de19ce4ea6cf94909a4ac52917a4a0e4aa7ad249b609bceb8a2c2bc265fdfe28"; + sha256 = "d8b3f556e025d488d21d5483b7aa3b5648ddb3fca8fd3260f42e01d272febf35"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/es-ES/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/es-ES/thunderbird-128.9.2esr.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "12ec39ae327f52cd0303586e41c1c54e49adab7a35cc8168f360500487cc7b57"; + sha256 = "52060be7f02ea93ca75dd3514a791a7231e45ef688bd748f6e06b159ae346cec"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/es-MX/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/es-MX/thunderbird-128.9.2esr.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "f73a448253c5213d25c1869264d2472b8826e23adbdaca5ac4da73e898bdd50f"; + sha256 = "61e02c8ebbf26f6dbc1714d84a3fb87281a6c0c88ede9a81fc374b873ab886b5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/et/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/et/thunderbird-128.9.2esr.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "38eea34b01cca855669b9b61152aca392c5dea600c2d7779ae33bacb64db0f23"; + sha256 = "c7b35b9b024c830897429ab8a7c3d0d55d8007ac1afd7bdd5981546772101325"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/eu/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/eu/thunderbird-128.9.2esr.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "acba743c685b1797ca7acb187e2db43f4c4b469f89d8d19bd60d1dbcab78f176"; + sha256 = "def113bfe9f855a2a4d898c493f84e95e5919ee9ebe46021fd35b8721f2547c8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/fi/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/fi/thunderbird-128.9.2esr.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "7cc531150a793aea4849aa92d5babbb574bc6d4acf90303c52362a5b18d3f5ef"; + sha256 = "7f60dfd652fffc015232ea0b03b4259d38cb553cc0bef83030d8e1695be6938d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/fr/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/fr/thunderbird-128.9.2esr.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c7a3d05d0fa2458c68b76af73c0b1ad10f9cbc448cca7c5e4c6c020630b664b6"; + sha256 = "e6367e4afb84e73152fc8407001d1442d73356501f208f299d84f41b1ed01e17"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/fy-NL/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/fy-NL/thunderbird-128.9.2esr.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "acbd4ac4ef93f2ee1b90f3b5bc7ed74e96073f16c8eeff62979b7e5e8d58e048"; + sha256 = "9917344f3a065cad38b00f693971f6d9e86823046d55c7060c9b049086dcf998"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/ga-IE/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/ga-IE/thunderbird-128.9.2esr.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "05ded7c2125f4c5ccc50f4a144df54ace0e19088b41aaf0dbbe124b336f5caff"; + sha256 = "3afc13fdd4e4810e81e26bc54c5a44fe83c2235b65b2833fe1b6706bd2f4b139"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/gd/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/gd/thunderbird-128.9.2esr.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "203911429ffd193ed97e0b783ccbb2fd08d462c4532128570f76be41bcf09d2d"; + sha256 = "29d58e819ffc98c494d900b0a799d80f809274d7bb8ed36f36015c6aa4911521"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/gl/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/gl/thunderbird-128.9.2esr.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "7d01a49a8d2be0cc5f811ca3d66762586818a248fc7fca1f5dd210515a98bc09"; + sha256 = "0af1c4a750c6f5eafe11f455de8e037228d89fc638de4f69cbc685fb42f9ba1a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/he/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/he/thunderbird-128.9.2esr.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "b20ac79b9193de95de85cd0038269ff4460dfaba57b698732c627b05370f379d"; + sha256 = "fd3c05162bff13f8c0ab73d0be85c08ee75a93f7b2e57361bd224955eb40ec8f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/hr/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/hr/thunderbird-128.9.2esr.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "d45185dda0f65a0abb773dde6d4ec1214423466b0ae2d843725a7579cba1242d"; + sha256 = "bbc60804dd01dc1b8b8ef7bcf6410401e0e3406e8248783573abc616099ef180"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/hsb/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/hsb/thunderbird-128.9.2esr.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "09c49e5b77f95eb3e18221fd2291fccccf96215011ee27bf8e052599e21e2ab9"; + sha256 = "720a44c20fd9c6bf80d8dcba1f1d3704d222c9dd9ef394e2dff4ed2fe49ba779"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/hu/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/hu/thunderbird-128.9.2esr.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "e3eb8b4ca170bfebd5fd558a63d769dfd95e8af05d34efba9a468eb9bd86a354"; + sha256 = "03391b360918b4fa6a405a5522d82cfb3e68102b6a7ca2bcfbaaf84f1df175ab"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/hy-AM/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/hy-AM/thunderbird-128.9.2esr.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "87a96d47c7843efc1caed5ffb07386881e299f0313d3b8c119f770934dbaec65"; + sha256 = "8d88f133d3499eefb1b4b01ee0ecd7c7a7e0dfd261d0662dc8fb449d66b2ceb8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/id/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/id/thunderbird-128.9.2esr.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "906485269c783dd6716612f5c6205aef3f0e42a70b95fb0ec0fbadfc1afe7e11"; + sha256 = "03ba72e400152d8464cfdf8c115833229171fc517cdf7493b5b753744105f5de"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/is/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/is/thunderbird-128.9.2esr.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "625706ad8cc897c1d1085653804098fd05591c9d4c0cb0ca1e8ed149f3fa5f21"; + sha256 = "13441515e3dfe06d9748abaebf0b982813550761f824f277dd70d991c06a9cca"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/it/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/it/thunderbird-128.9.2esr.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "60f937476a564f0ca306b1e551141539533d1be5868333b01453cd71371c243b"; + sha256 = "e942ead46e2ca5c82faf0a9c3d98ba1a54f22e21571b938bf0780501e76b2e88"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/ja/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/ja/thunderbird-128.9.2esr.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "42e83d01c56b621f4b80988ed6bba32577a78f8093cddbe4fc76a59ee29abf32"; + sha256 = "5423ab42fdeba564049cb97bfc4dc638cc8c07e34866ec19e16aeede83aaa937"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/ka/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/ka/thunderbird-128.9.2esr.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "beb3590dece5f7526f8a776bf28beda0d60feeef7e7ffd28e794b2db86a5880d"; + sha256 = "e1af08dadc08607a513fddd85a73cfeb31a9b7cdc697936fa623fb2d2191c50c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/kab/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/kab/thunderbird-128.9.2esr.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "8e54c0b0db1323d15fa8a4d51437dc2573d63b1ffe6aad36de0c0f0725200849"; + sha256 = "b5da89621f22b454c6ce949811ea408f0a960d17a61db3ead0972277766ecfdf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/kk/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/kk/thunderbird-128.9.2esr.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "7ba337e844bb8047ccd843d0961fb15db412317d5ac26110c3dad1dcc525b0a4"; + sha256 = "62b9e71bfbc61f55a01d993b415eb8f3600180033714001b91642db194ad4c76"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/ko/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/ko/thunderbird-128.9.2esr.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "eaae19443f5f3a6cf06cf20381e85f560b1f792c9fb0048920b9d9c8c54d902d"; + sha256 = "e6b0bdd3f9c24a1fd703d33acf9087133f7e39281e8ff1ddc9ca402058fe2b5d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/lt/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/lt/thunderbird-128.9.2esr.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "7b0d1e42c445ebaef96996cbca8e7f09d7aa1f094c2494b7bcc57be607ea4928"; + sha256 = "93981c55695e5a1b957b2c26d9a8672b114aa39deb4aed150b90538b0bdde906"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/lv/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/lv/thunderbird-128.9.2esr.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "9ebf6a774584523e951ace3e3cc5bc8a0a82bcbc47e244593cb208a888796ca0"; + sha256 = "7062d9bc31ad8e09b9676df1ff3e6e21e56b2531c4e3b02d06451c0ac69b7006"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/ms/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/ms/thunderbird-128.9.2esr.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "57f06ee72a028c319e7796bb744971a6cb657efc03966a0e66a0a3165ac22b25"; + sha256 = "95aec53cbe42d9c8690ad8c6d9bb73f9cad3f6d4aa9e8ed505b84c2206f03312"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/nb-NO/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/nb-NO/thunderbird-128.9.2esr.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d97304820a5e034ecfee67ba3ec28d473ae0a4e86e2fabfd96a6f4bbba3667b7"; + sha256 = "a016a592f41ebcb4c8fdc9d8cb589f5dd0027aef26799a2be600bb79b296c185"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/nl/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/nl/thunderbird-128.9.2esr.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "d2e2f0a3cb16525f14bcd4e296ec7c6810fbc4929e8beec95042c49099265c4e"; + sha256 = "d8c009cc0add26bd182b26275756cbf5e3d7ce6d10294b573efe850dddaf3112"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/nn-NO/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/nn-NO/thunderbird-128.9.2esr.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "ce2b08f1a2e03e5b267289949c144ee91d31d57675b5ed7f886907cd219ae9f6"; + sha256 = "b6e578de4e107e989f2339171e8e4076aad9d1e4257691cb5cd29b0971a0f696"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/pa-IN/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/pa-IN/thunderbird-128.9.2esr.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "b60cdf7abacb912ea42c2663c90d1bae5c61f08255acfddd38eddd0c8c9645e0"; + sha256 = "dbdbf3726d9f319348542d6e6a81fc48446b3f25bc856a0efa72b5330350f539"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/pl/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/pl/thunderbird-128.9.2esr.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "68bca245cdf93b5fcee0a0b1065372cae8b8cb7a54c092c3b7c64b3dca58fd19"; + sha256 = "955113ab1b3c70f1753a00fb16409c3259c30cd406882a5c6432f352e3017758"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/pt-BR/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/pt-BR/thunderbird-128.9.2esr.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "71c01f0a10ac48cadfeb794172c32a9f5383dc27de415f4ab0f67f2dc3371714"; + sha256 = "36013c7d86f3d6e3a06defe59fc89956ecadbf818f3b4fdf8d9c96db8b9030ca"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/pt-PT/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/pt-PT/thunderbird-128.9.2esr.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "53ed652970dc7ed4bb0760ac2063c7e9e0d3eb0205cbf62bfeb10d819f593b8a"; + sha256 = "7665f711c3f2ce910ec0fec70e88fc80fd11671825381a1f0bdbbba3d21fe641"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/rm/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/rm/thunderbird-128.9.2esr.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "2aba6d7912c93f7a8de8b9b296cb36f0347f2f2f2b6f44c5eca6fc8f2fb578e7"; + sha256 = "92b00199c1c2b27567dce33ec4b782eae778baceec8f25cca634a0feb3c26901"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/ro/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/ro/thunderbird-128.9.2esr.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "3fbb350fea8cce0133d552f4f689a1ac1be32d6e69d132d2e480287b7f3522bc"; + sha256 = "874f5cd02709478561e005e5ed902c602ce9218ebacc5097816377b58d014e55"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/ru/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/ru/thunderbird-128.9.2esr.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "77ce5383680e82995b8a26f5171f13bf0d7cb60bc504742d8d7e12ce5cfd8662"; + sha256 = "bc5e5aa0769f6273d1de113c0f8ab92fb93030bc4721ace954ec06d94351838e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/sk/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/sk/thunderbird-128.9.2esr.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "c8d34881fbfb541e23972ca193655bca147b022ded7cd6d871b63c2566a815b0"; + sha256 = "0300518b53382b710c4aade4813c8666f89c64a7f9bc4816782141126508bada"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/sl/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/sl/thunderbird-128.9.2esr.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "86b43dc56e7a70a72cf9be44592be99ca049c31520cb652ef6e528315d5b678c"; + sha256 = "42bc03ec649b3f5a4d774a1ae7c6f7a6900634cbf77507daf94dda8dae0cabbb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/sq/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/sq/thunderbird-128.9.2esr.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "8adda1882ed77a0545dbad80e2847a31836fa3dde0f11b8f100ca510636bee0f"; + sha256 = "5c1c03f5d19706f2cc4a24c55305c67a65812dd6e835ca99a9b3d61824fe3afb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/sr/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/sr/thunderbird-128.9.2esr.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "187afb08bc47cdc9868046727527d1492d7a94aab1785aa4a3945635d925c26f"; + sha256 = "419349e07a5b8b3b0a9dce2f585a4faafec368fbdd16e7a32fb3063a4e5998a3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/sv-SE/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/sv-SE/thunderbird-128.9.2esr.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "898f16e4025ec3d4c3c8700a59750c343d8cb025b36d8082c695149fcbf1344a"; + sha256 = "093a96a329a4b51fa8d1bfb16b3e9e9b7311f54146dfd9ea62bf0522fbc53987"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/th/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/th/thunderbird-128.9.2esr.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "f5d1f83574cefbcd3dc2bcf3adc1c3c12303b4804c5dc8c81036317c269e25d0"; + sha256 = "a010c2ae76a00fcad6369c3df36cd74debfe32a311d30f7b6181832373420700"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/tr/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/tr/thunderbird-128.9.2esr.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "469555d6c270a031763ac1e026460350e082a87992ec0675c94e4a19cb75c834"; + sha256 = "943511923a37304493f326e3b1568cfd301f62cf7e88c1e0ef111be55b318cf5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/uk/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/uk/thunderbird-128.9.2esr.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "16ce3317d358e9e5f0d38636ec97eee3dc9ab483db4e352b6fe6e908e5355f23"; + sha256 = "94f8328389b51c72456808483dc90562b7579cea41cc138f5e03050de861b538"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/uz/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/uz/thunderbird-128.9.2esr.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "5360c4a38473e2033b016a77c763b8135eba81afff180002b229487076c32c23"; + sha256 = "ff7d7dc0981ed84b6d87fd2ed54869198e935dea9c78c5fb673ee87e0f8c1cb1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/vi/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/vi/thunderbird-128.9.2esr.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "5fa646aafbf8ad72bb34478d9223ad0bbfc70d9350d79dfd122ac3277683ce70"; + sha256 = "b103568da22674e02369b9c90b33fc857f546a00d5ed0399766cc57a1e338b08"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/zh-CN/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/zh-CN/thunderbird-128.9.2esr.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "7869a2547b5f76aa740a99c9b1e83863f17d3d9ac8b295d55c874ea774a659f5"; + sha256 = "e2fe71b1273b956a4266c80ec3a7172fa092b06b7a8073dd86159371e0e94bae"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-x86_64/zh-TW/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-x86_64/zh-TW/thunderbird-128.9.2esr.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "2358746aeddac33e24711e1b8ff68672582e5844e028e61861f6625a2e5d3759"; + sha256 = "26520d3ae666780db773a2ccd1d0ad0e2b994818d4a7d3cbb8f6ebe270a7d04e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/af/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/af/thunderbird-128.9.2esr.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "9bf3c33f3a4a1da409703e80f9280153353b198cb7c5c88edab8fc9c4969065d"; + sha256 = "6d0d4bf4a1b709185609fc7ea910712fee98673f39a057940d627f3f859f5cbe"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/ar/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/ar/thunderbird-128.9.2esr.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "509ec9994e3c3fa848b60fd495db084edc373629e4c39f6c5bc5a67e8ed2f0ef"; + sha256 = "4380e84b48ac58733aa4bd3eee3ea1189b9bccc8ea452f564668643f713f472f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/ast/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/ast/thunderbird-128.9.2esr.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "01b51d85a5d81489c34da2f98a7fdce22c70462709d45b4fb85ec8475196b2b3"; + sha256 = "a9e3f8db99044541a5525821bb4da0b6e88e5907e4ae3695ea2a795daa1a0e52"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/be/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/be/thunderbird-128.9.2esr.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "169678717301e4419baabe12558d3d10841466eac68f4e766615facd497cab5c"; + sha256 = "140ab2418316724b8bcfe47540fb14b6126f4cde156e98593b3a77fc50d7f3b1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/bg/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/bg/thunderbird-128.9.2esr.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "edb34a94a08366e0568ecd90ff1665458b241085d9266b359abe6342f4dcbc8d"; + sha256 = "f55043551abf7dd1024ad99b2ace9e4348a4c297fc43de2cb0eb7ed5830ee700"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/br/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/br/thunderbird-128.9.2esr.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "83e84fffd2f55a1f1b2f8e1378edf15f14b05217f375cab585488871857b54f0"; + sha256 = "1f706bdeae7e3fd1276d0122bfe0b59af59a8fbd7ff29553396e4bb9443430d8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/ca/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/ca/thunderbird-128.9.2esr.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "3ab52ff44a283417aaaf599197e8837beca35f95fc070efdb853f9349fd68dcf"; + sha256 = "594775b8bd1af2480f366636adf44133ae5fb54cb5abf717e84b7ca7f66b860f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/cak/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/cak/thunderbird-128.9.2esr.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ead72f2cc80e7af951084d8833099aa35424f5c1c003da2c1ff501aea871c2aa"; + sha256 = "2fc2d907c0d941c7af74bdd2278bd4ffbca295dfd1547c7e12af44734b25cd07"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/cs/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/cs/thunderbird-128.9.2esr.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "44c34cf9094aafc9f51f8a550ba0fe36a97ad224de33dfaa058288d2dd7321b8"; + sha256 = "4685a385d0051d4095c438d732d0a13762e70b92af2b0bcc035560267554c0b6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/cy/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/cy/thunderbird-128.9.2esr.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "2020db13d2bde1e5f44a777c092da4e6478ad4891e2ef5a3e85e7e2d7f0c4ae7"; + sha256 = "5aec56a54e6f74527496941cd2ace3bad36f4ef5c35f419d82ca5b042778bb7e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/da/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/da/thunderbird-128.9.2esr.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "7abf4fbbbf8f5cf1dd6ecb5307850b60292e152979fe1be6faf1ecd3ebb1c0c0"; + sha256 = "2247fbc1cb4d2ceea411220901e169bc0957291a4bddfab424bc6792198d2763"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/de/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/de/thunderbird-128.9.2esr.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "94ac2849a751a706387032f5c72e9aba1e6d15800c8cd044af1c5ff1d5b211fa"; + sha256 = "0d2ae8f5e2da6b286387bed76b6d28d6b0ccf1910d631012742b5c58a0b32aa7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/dsb/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/dsb/thunderbird-128.9.2esr.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "932bcb1a63179319260c6da62135ce15d64f62360e14e6ed21fc4509075ee31b"; + sha256 = "39cb6de6209daa752eb54fe9538f98a099f1430999402ced063c5463455641dd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/el/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/el/thunderbird-128.9.2esr.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "3b7de9890c6bfbb3ae9690b5bf86a2fbc83eb1e839ec5e5f3554cf5639413309"; + sha256 = "dff84142810c597e18d548feb32d4f5e5595da47b5a6f5cb8b6e96ad8f1e2d8d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/en-CA/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/en-CA/thunderbird-128.9.2esr.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "9dbfd79403d677b3878a471f1cb9ad42786f9fa92e0f601bca57110df2be58a1"; + sha256 = "9e84515f768a865f0308d6ba079a022d796aaf96d3a653a3f21706ddab860ec5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/en-GB/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/en-GB/thunderbird-128.9.2esr.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "bf5ec942c5558499225a4c52512901d06b19224dd3fc8279ca4447ffa1894b6c"; + sha256 = "982a5e3a60a96ebfe93f4d11327c22a1c7dc07d158f3dd51ff382996c9561b9f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/en-US/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/en-US/thunderbird-128.9.2esr.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "1b4eaf4bc73c044032d9f04802cfad09487703786e230824ea743301121c8b4c"; + sha256 = "77d58dc23f24d42db2fa7756991a4fd7954d8a8dabafd3ab10e4f95465e908f3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/es-AR/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/es-AR/thunderbird-128.9.2esr.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "18bea0046192e99c7c559ad18fdeb7560517afbabce16438af441b8bf7ddf0cf"; + sha256 = "e51db4457a9a1eb30c1e1bf4aeb679e08a529178c7a25a4b6060403ef4822198"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/es-ES/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/es-ES/thunderbird-128.9.2esr.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "3cd843636c5f7af9273cb0808ef2efeae2dd76ada9598cf410d529acbecd7aa8"; + sha256 = "1f136f3e70124fcdc8efb8253c85e27c758432646f981c375d758291888ddefa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/es-MX/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/es-MX/thunderbird-128.9.2esr.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "ebb76d759493718b5657e0ff2af7f3d2ba1c80876eb3a7958e16ce503ab8e0bf"; + sha256 = "f017e992b6ddfaeb8871fe93cb1f4f86b0fe9a8a5bf8d05126b0056fa85034bd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/et/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/et/thunderbird-128.9.2esr.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "20420f393be8bdf3d44c6bc94bce5d6e17e8f5785c7a31cf20e1abc1a5bded3c"; + sha256 = "638d265b2f86aee9fc0343d3f447bcb4aa541a7bca6063e13a5ca242c3dfe1b0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/eu/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/eu/thunderbird-128.9.2esr.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "08a37d9aa9ff48de69cfa901b89d3f791a8ff257114fe90c9fa5e6af6593a947"; + sha256 = "65bdb8323fd6b8380a619d2fb77194b143a7a1486402357721ba713fa53d4873"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/fi/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/fi/thunderbird-128.9.2esr.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "861b09bf7dc5d5fd25c8e2ff8856777561cb152a1f63a8976ec119f881b1f3a0"; + sha256 = "089e72e19e9e95f0a80e0b3f889c3dc927ed4689733d3997ab4e07192b7b4613"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/fr/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/fr/thunderbird-128.9.2esr.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "8e4374e9ccca3dff1a89c0d2d14446cfb5d4d186b34d6df37f2d19e545f99925"; + sha256 = "d02f0260abfa7cf6d5de86e862db957e7ab7f058870039dd0f78a6ae76a30fbe"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/fy-NL/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/fy-NL/thunderbird-128.9.2esr.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "5ab64aa458f7ecb3932f969de185538be35f6e4504226d1604812ad5c9fff7e1"; + sha256 = "441520418225cbfe7d52daef87149289c8a2b9e7a348eb527449ae519456b130"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/ga-IE/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/ga-IE/thunderbird-128.9.2esr.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "37e9b0bdf4a683d50506f1053af5bcde5ae5526a6f2e2896fcdd26469e83c033"; + sha256 = "4954fecffc9134f7ec422db2324b3b202f63b2ee856d5f580528b53adc88d17c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/gd/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/gd/thunderbird-128.9.2esr.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "72a01edbfd17605e1de3d0f5b2b1eb817659979c75210770096f964bb472679f"; + sha256 = "2042c5cabadec8d05e8a9339c7927f97c290067431d7e2395136abd44a58850d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/gl/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/gl/thunderbird-128.9.2esr.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "8cd153c9dc81cb51d067b96f1e3987adf361a2d4657d252328ca70e9fd289bff"; + sha256 = "4c3b9326505fdd233a7f23446ad00798ace67021de3f1a9589f84c616b7cf6b0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/he/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/he/thunderbird-128.9.2esr.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "b28d7f89450fb962ca462db7f456f005547db1878e420fb4161bd1291e800ac4"; + sha256 = "784a968dcddbcb21770b7c73782b61a7ce181aa2dd91b0b10b18c60547df4f36"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/hr/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/hr/thunderbird-128.9.2esr.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "6d0aaa1d879885babe79f2905cce4c2e6cf6fe8c8eb38849b790260a916b7c9a"; + sha256 = "7a599e61584bd86bd92de1a0939d5bb00b04393291d94d54ab4b3eacd7003399"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/hsb/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/hsb/thunderbird-128.9.2esr.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "cee4e60649eaa0c70f0c9e2ff1e1349936d86b93458c51a79dcb7b4ab6adf0c7"; + sha256 = "084a1218d9bb4d8ff592848811581c9dcef36129597500efd4f941ac450d204e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/hu/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/hu/thunderbird-128.9.2esr.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "4bc89863305e2d0d3af1f7411f0e1612f15c2ef1f664377610bb8bfd09dd9463"; + sha256 = "37510ca117ac9f15bc61a116a3aa55c6da1c6cc5543975cd2449df3e58a27091"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/hy-AM/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/hy-AM/thunderbird-128.9.2esr.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "80725bfd8236f604aba933c438b5572f730bdb60ec7067ddb1937e2082cc2143"; + sha256 = "b88b00b8468bff3fb327a32ec505b5b335d03a9b5b5511ee8c28b392d5888f32"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/id/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/id/thunderbird-128.9.2esr.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d303ca70102f598bd5303580bea9fe4fc88a3c4beab6d84c0b81b0219b0c087e"; + sha256 = "4767274386cc5aad9e7632d9e0d12bdd093e971b162ce23de1dd489bfc9af2d6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/is/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/is/thunderbird-128.9.2esr.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "52cc4b04ad4a494d6808d587bc5ede1364f941f1b96b2597bfd089e01a8fde29"; + sha256 = "b89381d8fb5b73272bb31eb33cd8fe917ec7f3f480d2a6faa252848ad85f2610"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/it/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/it/thunderbird-128.9.2esr.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "30f519edba08ffb994fd0a2a7f8a10268868b7dc49906b0c65e97d7b67603d20"; + sha256 = "643d59b59b983dc863ccb3801bcdf64237e8f8d5e5c6a6205cc0aa073b2b329c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/ja/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/ja/thunderbird-128.9.2esr.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "4cbf3da5ba38e3147523ebb343d6adc45393ad8672943898a95611d451ea3910"; + sha256 = "e8be6e2b502d5d6cf7c6cfb0cb55fb9c59f9559d3f3b2b3c8843501f87723683"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/ka/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/ka/thunderbird-128.9.2esr.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "61d10b661a3e051bedbc326515efd1991940ae75704104a01a85b4e5f6b489be"; + sha256 = "71d0d092470f2e8cb70256770830dfa5c474e3597b1f5f72e9b9ec3d2ed4d737"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/kab/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/kab/thunderbird-128.9.2esr.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "1d5417e9e829877fbaefd2513add2870cf0dc561cfe4a09f84164b669bcd0a73"; + sha256 = "1e010def386dc00e4ba8317c382b2db251109d9245d4f2b6a2c42a212e0be935"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/kk/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/kk/thunderbird-128.9.2esr.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "327b52a6d76240778be23014fb2942bad622f741b6de55a5b15e69f28bfd60f7"; + sha256 = "cbf76587bc7262b554b83566c63c4bb19a7ecdcd84cbb2585ef7ea11a2a1b8aa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/ko/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/ko/thunderbird-128.9.2esr.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "9fcd5bffb8229d1df6da09c37e7dce4f0505f498afd789b339ab9908085b75b6"; + sha256 = "4a12e048ad3e2d366cfb9fa4613cef30bfd346dbd04304ec22d6b93a5a758869"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/lt/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/lt/thunderbird-128.9.2esr.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "694fb0e254d41f9587f12acd963f8098acef58c51071d2de803b8d464cb3dafd"; + sha256 = "3fb97a63f7a5b6693fdbc8ac4de4b96fc5938586854353febd9f889978df5467"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/lv/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/lv/thunderbird-128.9.2esr.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "7ea0197532c58e8122b8f6b5020cd92c7059430fa4317eeccef8b89ef18a9818"; + sha256 = "afc25ba8857040b3d72d47ee1a461bfbd7eaf7cf6dd83f98cc979aaf6945740a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/ms/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/ms/thunderbird-128.9.2esr.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "a2c46178066bfba6bbc9603d4260e12598873f06e4268ef5f63ca5d9caed0128"; + sha256 = "72210013e9a29c780f9a70a712b1672bdbbfc7ab4b0bc782b3ddd8c0a2bdaca1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/nb-NO/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/nb-NO/thunderbird-128.9.2esr.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "cf0cf3f4e361292413d242a58fa2a024a1326e4b1e04b2419ce91df44ba0d77d"; + sha256 = "3776faef5142ea86deb03c88fcb31b129a725a87473311b6a0c762306fc3218b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/nl/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/nl/thunderbird-128.9.2esr.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "3be4782ef8aa9166c32afc341db449f8f68950313c79f51549ee74c7a9a45e00"; + sha256 = "16342df841db75db99fe595587bc24bf2250dee4f716ebee039317fbfb9ba20d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/nn-NO/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/nn-NO/thunderbird-128.9.2esr.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ada81a447673c28feca8f22ffcf686d54417f94dea75be4b2f72d8ab151b4466"; + sha256 = "498a696f70d647dcb9a371c16a18c700007fb4bbda2542ae3d9bcecf28095842"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/pa-IN/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/pa-IN/thunderbird-128.9.2esr.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "5773a02f8b17c2c7cb13f491a0923ab2d78e301cd7985f67af535c2c2f2b396d"; + sha256 = "d27f7f5aaa16d133fbf03d9b2795e1428974061e3c81af3e3342ee784dc0b787"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/pl/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/pl/thunderbird-128.9.2esr.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "86a0bdf01fedb05232ec3c148207daa08c6229529f71021111868bfd8d5cdaaa"; + sha256 = "f41281c9747b34ada507eb879194ac87583ee05e329169515e960386ea961545"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/pt-BR/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/pt-BR/thunderbird-128.9.2esr.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "d5a858fe4d266cf062704a3ee24daa663667b9b47b45f098e2b0c9cbcebee41b"; + sha256 = "eb7c125afa47911856ea7cb40808e0ad19334b7e1a66276ff85a8b4f56855db4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/pt-PT/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/pt-PT/thunderbird-128.9.2esr.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "034c44c0aec3bf46988ffaf2164ff2ddeb20ffdc16b8b8ea99c0df9532357f5f"; + sha256 = "3bce587020ea6d5f05510033e8bd1b424e180e0361d5eb2e906de1583783d70c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/rm/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/rm/thunderbird-128.9.2esr.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "78c8d86c0234122af83a89b04bc7a5aec9c3ae49e97c7acf5caeb9360e8f0262"; + sha256 = "18404d2a3b10273e3a288782eec15f2ff0bd866ce12f2c1ca70e3ecf9e58809a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/ro/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/ro/thunderbird-128.9.2esr.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "4d8597e36cbe0b7da55bcd5d6010f38c9f91daa750b5669a235e32ca0a1b7cef"; + sha256 = "401fb9524b6dc8f5547fe1e61d7f96a02dee5939950c971790370cea05f65519"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/ru/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/ru/thunderbird-128.9.2esr.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "219c9f54680925104dfe9cee61dcabd9d676302c554ab0a672dffbbaa324b866"; + sha256 = "b9e3849896c1e65494572a878d3b6209e613215b54b622800509a94a4e873e02"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/sk/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/sk/thunderbird-128.9.2esr.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "afa67e6fd779c025e49225e5963d1980f67d3eefec5af50c7db64a353ea003e9"; + sha256 = "abb7bd8ee676c1a5278ed4a71b7399391a3e129b3de68f23569f8fd90fae6347"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/sl/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/sl/thunderbird-128.9.2esr.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "341fa6f616d93c72d0aab59bf9e0b81bb03fd74fac95476bcccc050bae9ca721"; + sha256 = "20f9f46aa8e6d540c15ee526ba8b3541b9261b41034ebc6041fadc13fd25cd79"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/sq/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/sq/thunderbird-128.9.2esr.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "d00d604f69ecd41aa2cb2912774f72a5283a59453b6dfc38e6ee916ffd835fd7"; + sha256 = "9acda0361ead5f8574404986954b7787c6500d675339c13e53d07bba807bc16a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/sr/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/sr/thunderbird-128.9.2esr.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "a01408d60aa1bbc7a4f58db9606a4eb5301d9fb7888bf6260477e5975ed72910"; + sha256 = "38a482e78a360897336d3437f8fa985b57f8622403da8278791ec9c7dc49e150"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/sv-SE/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/sv-SE/thunderbird-128.9.2esr.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ced38db1897adeb44d44c33842cf127f2b17c7b39e41f424ea167e4fc45b9119"; + sha256 = "f1e3d53361f5cf0a4ea32d7295089c3003d9fcf0c1b61d2a54e9c9bf9815b085"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/th/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/th/thunderbird-128.9.2esr.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "fa5a8eae240fd7d729a7e0fcc1e91ae03840282d8fd660bea05f0cc5b7165fb8"; + sha256 = "c64c8cd630336e02e5ceb11dbf61eeec11ff9054da653a93e8ad01d1d4d597c5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/tr/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/tr/thunderbird-128.9.2esr.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "e8367613a8a968a02dda57a624b7a00961cb5d21c6b6d305265eb7db6144e18b"; + sha256 = "79c3f55b10d47b3f2979acd5fa35af8c87cd463afd20fb8132ae9488f2aad8e4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/uk/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/uk/thunderbird-128.9.2esr.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "9d4324b315b6ad20509ce2488df0d2c5a783a7332be3d103bd0221e540a8ad69"; + sha256 = "b3f77bb30b22064f9f9aa6b236775d4443933e54b23bcb23d52d8a2fa971e7ec"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/uz/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/uz/thunderbird-128.9.2esr.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "c82d0b6afb9b8e6e2ec1fcfea8675fff65e7969f1cb6565063e4a2f8f0c51c7f"; + sha256 = "a912700990447fda3b0396493f9971f4a23428af2c9e919f9cc5fd98ab111e50"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/vi/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/vi/thunderbird-128.9.2esr.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "8079174af68c26e5219bbd2eea09aab15d4b0a6e0b558d3217fd935058d72b59"; + sha256 = "807bc4eac07775d49f3c693b58efe5fd6da77c8c7a9a3facf242ee39ff014595"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/zh-CN/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/zh-CN/thunderbird-128.9.2esr.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "362075587a623417c1df6d5cce13ad0fdf771370bedede952e3721e727f95c2e"; + sha256 = "714a4625f206447255055b266d461d893fa5bae815515f2d3264a2c17da96101"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.1esr/linux-i686/zh-TW/thunderbird-128.9.1esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.9.2esr/linux-i686/zh-TW/thunderbird-128.9.2esr.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "b00a2007b4e9932fd1439cea37bad1cf845a618264248232571b0d219152efdd"; + sha256 = "bc007c2673b5903a9d532081e063194201f163348c5ad1c80c13cd05e55048ba"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 08de8ea78c46..ba2c8cfa3ca0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -99,8 +99,8 @@ rec { thunderbird-128 = common { applicationName = "Thunderbird ESR"; - version = "128.9.1esr"; - sha512 = "bc53ad210c6942fd4a5d31e693d6f376c009873397ea4e3c36d9de33d9dc1af5a3ff9e6ca9039dd8849ea8b56daa220f08b7bef4e2ea1b86e98dfe3b9b58dc0d"; + version = "128.9.2esr"; + sha512 = "3c8df53304611c1a7f8c02d50cfa1017f4d64c50a93fd6603ce0766cbb5d63c7bc5e0276f155c35817c3efa49f683c05583ddf24257bf8c25f585b67fd732cb5"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-128"; diff --git a/pkgs/applications/networking/mhost/default.nix b/pkgs/applications/networking/mhost/default.nix index aade921aa809..436ac744cb4b 100644 --- a/pkgs/applications/networking/mhost/default.nix +++ b/pkgs/applications/networking/mhost/default.nix @@ -1,10 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -21,11 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-n+ZVsdR+X7tMqZFYsjsWSUr6OkD90s44EFORqRldCNE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; - CARGO_CRATE_NAME = "mhost"; doCheck = false; diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index 7cd4d9349997..1fea4be45eba 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -7,7 +7,6 @@ gsasl, libidn, pkg-config, - Security, nlsSupport ? true, idnSupport ? true, gsaslSupport ? true, @@ -33,8 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - lib.optional stdenv.hostPlatform.isDarwin Security - ++ lib.optional gsaslSupport gsasl + lib.optional gsaslSupport gsasl ++ lib.optional idnSupport libidn ++ lib.optional (sslLibrary == "gnutls") gnutls ++ lib.optional (sslLibrary == "openssl") openssl; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 96934461c2e7..60946106d0dd 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -15,7 +15,6 @@ netcat-gnu, texinfo, which, - Security, withKeyring ? true, libsecret, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, @@ -56,14 +55,11 @@ let "--with-libgsasl" ] ++ optionals stdenv.hostPlatform.isDarwin [ "--with-macosx-keyring" ]; - buildInputs = - [ - gnutls - gsasl - libidn2 - ] - ++ optionals stdenv.hostPlatform.isDarwin [ Security ] - ++ optionals withKeyring [ libsecret ]; + buildInputs = [ + gnutls + gsasl + libidn2 + ] ++ optionals withKeyring [ libsecret ]; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/applications/networking/mujmap/default.nix b/pkgs/applications/networking/mujmap/default.nix index a37177426b10..bda3f618763f 100644 --- a/pkgs/applications/networking/mujmap/default.nix +++ b/pkgs/applications/networking/mujmap/default.nix @@ -3,8 +3,6 @@ fetchFromGitHub, rustPlatform, notmuch, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -23,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ notmuch - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ]; meta = with lib; { description = "JMAP integration for notmuch mail"; diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 3205630ce61c..43f91c227027 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -13,7 +13,6 @@ protobuf, speex, libcap, - utf8proc, alsa-lib, python3, rnnoise, @@ -100,7 +99,6 @@ let qt5.qtsvg rnnoise speex - utf8proc ] ++ lib.optional (!jackSupport) alsa-lib ++ lib.optional jackSupport libjack2 diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index 798d4b906b44..e99d00a8064e 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -1,12 +1,9 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, - CoreServices, - Security, }: rustPlatform.buildRustPackage { @@ -24,12 +21,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-ebqUH01h4B3Aq3apSKpae8ncaFirbrZiDxjiQM9kzg4="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - ]; + buildInputs = [ openssl ]; cargoBuildFlags = [ "--all" ]; diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 45dcb717f2b8..30614b8b7f1f 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -23,7 +23,6 @@ dht, libnatpmp, libiconv, - Foundation, # Build options enableGTK3 ? false, gtkmm3, diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 240979abe9d2..5d0e9484c838 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -7,9 +7,6 @@ libsamplerate, swig, alsa-lib, - AppKit, - CoreFoundation, - Security, python3, pythonSupport ? true, runCommand, @@ -45,17 +42,10 @@ stdenv.mkDerivation (finalAttrs: { python3.pkgs.wheel ]; - buildInputs = - [ - openssl - libsamplerate - ] - ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreFoundation - Security - ]; + buildInputs = [ + openssl + libsamplerate + ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; env = lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; } diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index fd3e768c71d9..fa3d0fc67f68 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -7,7 +7,6 @@ pkg-config, gtk3, ncurses, - darwin, copyDesktopItems, makeDesktopItem, }: @@ -30,12 +29,10 @@ stdenv.mkDerivation rec { pkg-config copyDesktopItems ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isUnix [ - gtk3 - ncurses - ] - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.utmp; + buildInputs = lib.optionals stdenv.hostPlatform.isUnix [ + gtk3 + ncurses + ]; enableParallelBuilding = true; desktopItems = [ diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index c25585d74701..c45c6a659d4a 100644 --- a/pkgs/applications/networking/rymdport/default.nix +++ b/pkgs/applications/networking/rymdport/default.nix @@ -1,13 +1,10 @@ { lib, - stdenv, buildGoModule, fetchFromGitHub, pkg-config, libGL, xorg, - Carbon, - Cocoa, }: buildGoModule rec { @@ -27,23 +24,16 @@ buildGoModule rec { pkg-config ]; - buildInputs = - with xorg; - [ - libGL - libX11 - libXcursor - libXext - libXi - libXinerama - libXrandr - libXxf86vm - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - IOKit - ]; + buildInputs = with xorg; [ + libGL + libX11 + libXcursor + libXext + libXi + libXinerama + libXrandr + libXxf86vm + ]; postInstall = '' for res in $(ls internal/assets/icons | sed -e 's/icon-//g' -e 's/.png//g'); do diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index d613cc647432..af11de02aad6 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitLab, - ApplicationServices, asciidoctor, bcg729, bison, @@ -43,7 +42,6 @@ snappy, spandsp3, speexdsp, - SystemConfiguration, wrapGAppsHook3, zlib-ng, zstd, @@ -148,9 +146,7 @@ stdenv.mkDerivation rec { sbc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices gmp - SystemConfiguration ]; strictDeps = true; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 746b4bb686d9..ed806e43de99 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -19,16 +19,16 @@ let }: buildGoModule rec { pname = stname; - version = "1.29.3"; + version = "1.29.5"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; tag = "v${version}"; - hash = "sha256-dTDrKLAUfZ+12JX6P6cWRs1ArWnDRmfhNAh0ZTTWpYU="; + hash = "sha256-mM+llkF9aMFkMzLptcEz+nXyHcuMHt+dpnqkzJgOZqQ="; }; - vendorHash = "sha256-/t+TIW66A6jKZvDtp/WcldqdkP5PtC6eP/R4Fspywxc="; + vendorHash = "sha256-5U0lsGSO4v++eMvz2r1rG5i/XPLbJAbvM9V66BKE6A8="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index c724658db2aa..671254fdad4b 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -12,7 +12,6 @@ gtk2, glib, libXtst, - Cocoa, }: let @@ -62,13 +61,11 @@ stdenv.mkDerivation rec { makeWrapper stripJavaArchivesHook ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - gtk2 - glib - libXtst - ] - ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + gtk2 + glib + libXtst + ]; dontWrapGApps = true; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 356a46d5ca81..dbad506b8c94 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -10,7 +10,7 @@ libxslt, perl, perlPackages, - box2d, + box2d_2, gettext, zlib, libjpeg, @@ -397,7 +397,7 @@ stdenv.mkDerivation (finalAttrs: { ant bluez5 boost - box2d + box2d_2 cairo clucene_core_2 cppunit diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index c8e6d116bc9a..42f157f81562 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -32,11 +32,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "scribus"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz"; - hash = "sha256-CuWM7UEBAegmVeO0wgoHDPF2cUWtojPc73wguLpr1Ic="; + hash = "sha256-UzvnrwOs+qc27F96P8JWKr0gD+9coqfN7gK19E1hgp4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index a6608f926967..ab7e8d6ac8aa 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -14,8 +14,6 @@ soapysdr-with-plugins, wxGTK32, enableDigitalLab ? false, - Cocoa, - WebKit, }: stdenv.mkDerivation rec { @@ -54,10 +52,6 @@ stdenv.mkDerivation rec { libpulseaudio libGL libX11 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - WebKit ]; cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 2679132bdb8f..40929d11910d 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -11,7 +11,6 @@ libX11, gnuplot, fltk, - GLUT, withGui ? false, }: @@ -40,9 +39,6 @@ stdenv.mkDerivation rec { libusb1 soapysdr ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - GLUT - ] ++ lib.optionals withGui [ fltk libX11 diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix index afa1fcf14bc8..cf9b3be83409 100644 --- a/pkgs/applications/radio/pothos/default.nix +++ b/pkgs/applications/radio/pothos/default.nix @@ -18,7 +18,6 @@ alsa-lib, muparserx, python3, - utf8proc, }: mkDerivation rec { @@ -69,7 +68,6 @@ mkDerivation rec { alsa-lib muparserx python3 - utf8proc ]; postInstall = '' diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix deleted file mode 100644 index 309ca8bf0f6a..000000000000 --- a/pkgs/applications/radio/qlog/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - fetchFromGitHub, - qtbase, - stdenv, - lib, - wrapQtAppsHook, - qmake, - qtcharts, - qtwebengine, - qtserialport, - qtwebchannel, - hamlib, - qtkeychain, - pkg-config, - cups, -}: - -stdenv.mkDerivation rec { - pname = "qlog"; - version = "0.43.0"; - - src = fetchFromGitHub { - owner = "foldynl"; - repo = "QLog"; - rev = "v${version}"; - hash = "sha256-gCXLZ00klyjisLxSvs4wKD0Sg8CFvF0xR+eHpc1D0Jc="; - fetchSubmodules = true; - }; - - env.NIX_LDFLAGS = "-lhamlib"; - - buildInputs = - [ - qtbase - qtcharts - qtwebengine - qtserialport - qtwebchannel - hamlib - qtkeychain - ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin [ - cups - ]); - - nativeBuildInputs = [ - wrapQtAppsHook - qmake - pkg-config - ]; - - meta = with lib; { - description = "Amateur radio logbook software"; - mainProgram = "qlog"; - license = with licenses; [ gpl3Only ]; - homepage = "https://github.com/foldynl/QLog"; - maintainers = with maintainers; [ - oliver-koss - mkg20001 - ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index ed12a0114b28..f90a0a1c7a04 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -3,6 +3,7 @@ stdenv, airspy, airspyhf, + apple-sdk_12, aptdec, boost, cm256cc, @@ -113,6 +114,7 @@ stdenv.mkDerivation (finalAttrs: { zlib ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ] ++ lib.optionals withSDRplay [ sdrplay ]; cmakeFlags = [ diff --git a/pkgs/applications/radio/sdrpp/default.nix b/pkgs/applications/radio/sdrpp/default.nix index 6e140c25bffd..8e486eee2594 100644 --- a/pkgs/applications/radio/sdrpp/default.nix +++ b/pkgs/applications/radio/sdrpp/default.nix @@ -10,7 +10,6 @@ fftwFloat, volk, zstd, - AppKit, # Sources airspy_source ? true, airspy, @@ -107,7 +106,6 @@ stdenv.mkDerivation rec { volk zstd ] - ++ lib.optional stdenv.hostPlatform.isDarwin AppKit ++ lib.optional stdenv.hostPlatform.isLinux libX11 ++ lib.optional airspy_source airspy ++ lib.optional airspyhf_source airspyhf diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix index 975a7dc1c261..d6094e550b49 100644 --- a/pkgs/applications/radio/soapyairspy/default.nix +++ b/pkgs/applications/radio/soapyairspy/default.nix @@ -5,9 +5,6 @@ cmake, airspy, soapysdr, - libobjc, - IOKit, - Security, }: stdenv.mkDerivation rec { @@ -22,16 +19,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = - [ - airspy - soapysdr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - IOKit - Security - ]; + buildInputs = [ + airspy + soapysdr + ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyaudio/default.nix b/pkgs/applications/radio/soapyaudio/default.nix index 003561495c1b..ce2be6ec8a68 100644 --- a/pkgs/applications/radio/soapyaudio/default.nix +++ b/pkgs/applications/radio/soapyaudio/default.nix @@ -11,8 +11,6 @@ libjack2, libusb1, soapysdr, - Accelerate, - CoreAudio, }: stdenv.mkDerivation rec { @@ -41,10 +39,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - CoreAudio ]; cmakeFlags = [ diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix index 31747781cbda..473376de9477 100644 --- a/pkgs/applications/radio/soapybladerf/default.nix +++ b/pkgs/applications/radio/soapybladerf/default.nix @@ -6,9 +6,6 @@ pkg-config, libbladeRF, soapysdr, - libobjc, - IOKit, - Security, }: let @@ -30,16 +27,10 @@ stdenv.mkDerivation { cmake pkg-config ]; - buildInputs = - [ - libbladeRF - soapysdr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - IOKit - Security - ]; + buildInputs = [ + libbladeRF + soapysdr + ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix index 949e5b5bff9d..7bcc40719a37 100644 --- a/pkgs/applications/radio/soapyhackrf/default.nix +++ b/pkgs/applications/radio/soapyhackrf/default.nix @@ -6,9 +6,6 @@ pkg-config, hackrf, soapysdr, - libobjc, - IOKit, - Security, }: let @@ -30,16 +27,10 @@ stdenv.mkDerivation { cmake pkg-config ]; - buildInputs = - [ - hackrf - soapysdr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - IOKit - Security - ]; + buildInputs = [ + hackrf + soapysdr + ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index 16dd80a12cbc..31154d62b863 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -6,9 +6,6 @@ pkg-config, rtl-sdr, soapysdr, - libobjc, - IOKit, - Security, }: stdenv.mkDerivation (finalAttrs: { @@ -26,16 +23,10 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config ]; - buildInputs = - [ - rtl-sdr - soapysdr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - IOKit - Security - ]; + buildInputs = [ + rtl-sdr + soapysdr + ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 115945657121..02d915ffa202 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "soapysdr"; # Don't forget to change passthru.abiVersion - version = "0.8.1-unstable-2024-12-22"; + version = "0.8.1-unstable-2025-03-30-03"; src = fetchFromGitHub { owner = "pothosware"; @@ -26,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: { # Instead of applying several patches for Python 3.12 compat, just take the latest, from: # use old get python lib for v2 (#437) - rev = "309335ec6a52eb712387ed025d705a3c0f7a1e24"; - hash = "sha256-a9414gX4fUAPQaKKqrWgSlFHZH0BWqbgHzhVCKnIn2M="; + rev = "fbf9f3c328868f46029284716df49095ab7b99a6"; + hash = "sha256-W4915c6hV/GR5PZRRXZJW3ERsZmQQQ08EA9wYp2tAVk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix index 062a5c17bf03..722d41bb37cc 100644 --- a/pkgs/applications/radio/soapyuhd/default.nix +++ b/pkgs/applications/radio/soapyuhd/default.nix @@ -7,9 +7,6 @@ uhd, boost, soapysdr, - libobjc, - IOKit, - Security, }: stdenv.mkDerivation rec { @@ -27,17 +24,11 @@ stdenv.mkDerivation rec { cmake pkg-config ]; - buildInputs = - [ - uhd - boost - soapysdr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - IOKit - Security - ]; + buildInputs = [ + uhd + boost + soapysdr + ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index 1f7966a64271..f2595124a1ad 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -6,7 +6,6 @@ makeBinaryWrapper, itk, vtk, - Cocoa, }: stdenv.mkDerivation (finalAttrs: { @@ -25,14 +24,10 @@ stdenv.mkDerivation (finalAttrs: { makeBinaryWrapper ]; - buildInputs = - [ - itk - vtk - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ]; + buildInputs = [ + itk + vtk + ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix index 239011dd7807..cbbc6ab194de 100644 --- a/pkgs/applications/science/biology/blast/default.nix +++ b/pkgs/applications/science/biology/blast/default.nix @@ -9,7 +9,6 @@ cpio, gawk, coreutils, - ApplicationServices, }: stdenv.mkDerivation rec { @@ -101,7 +100,7 @@ stdenv.mkDerivation rec { gawk zlib bzip2 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; + ]; strictDeps = true; diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix deleted file mode 100644 index 32a32488c734..000000000000 --- a/pkgs/applications/science/biology/iv/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - neuron-version, - libX11, - libXext, - patchelf, -}: - -stdenv.mkDerivation rec { - pname = "iv"; - version = "19"; - - src = fetchurl { - url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/iv-${version}.tar.gz"; - sha256 = "07a3g8zzay4h0bls7fh89dd0phn7s34c2g15pij6dsnwpmjg06yx"; - }; - - nativeBuildInputs = [ patchelf ]; - buildInputs = [ libXext ]; - propagatedBuildInputs = [ libX11 ]; - - hardeningDisable = [ "format" ]; - - postInstall = - '' - for dir in $out/*; do # */ - if [ -d $dir/lib ]; then - mv $dir/* $out # */ - rmdir $dir - break - fi - done - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so - ''; - - meta = with lib; { - description = "InterViews graphical library for Neuron"; - license = licenses.bsd3; - homepage = "http://www.neuron.yale.edu/neuron"; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix index ba268b46faad..ef8c738055fc 100644 --- a/pkgs/applications/science/biology/mrtrix/default.nix +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -18,28 +18,63 @@ libXext, less, withGui ? true, + fetchFromGitLab, + fetchpatch, }: +let + # reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19' + # https://github.com/NixOS/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c + eigen' = ( + eigen.overrideAttrs (old: rec { + version = "3.4.0"; + src = fetchFromGitLab { + owner = "libeigen"; + repo = "eigen"; + tag = version; + hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; + }; + patches = (old.patches or [ ]) ++ [ + # Fixes e.g. onnxruntime on aarch64-darwin: + # https://hydra.nixos.org/build/248915128/nixlog/1, + # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. + # + # The patch is from + # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) + # which is two years old, + # but Eigen hasn't had a release in two years either: + # https://gitlab.com/libeigen/eigen/-/issues/2699. + (fetchpatch { + url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; + hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; + }) + ]; + }) + ); +in + stdenv.mkDerivation rec { pname = "mrtrix"; - version = "3.0.4"; + version = "3.0.4-unstable-2025-04-09"; src = fetchFromGitHub { owner = "MRtrix3"; repo = "mrtrix3"; - tag = version; - hash = "sha256-87zBAoBLWQPccGS37XyQ8H0GhL01k8GQFgcLL6IwbcM="; + rev = "7843bfc53a75f465901804ccf3fd6797d77531dd"; + hash = "sha256-C4Io3VkX10eWia4djrYvN12fWmwm0j1G60I8lmFH49w="; fetchSubmodules = true; }; nativeBuildInputs = [ - eigen makeWrapper + less + python ] ++ lib.optional withGui qt5.wrapQtAppsHook; buildInputs = [ ants + eigen' python fftw libtiff @@ -58,36 +93,47 @@ stdenv.mkDerivation rec { nativeInstallCheckInputs = [ bc ]; postPatch = '' - patchShebangs ./build ./configure ./run_tests ./bin/* + patchShebangs --build ./build ./configure ./run_tests + patchShebangs --host ./bin/* # patching interpreters before fixup is needed for tests: - patchShebangs ./bin/* patchShebangs testing/binaries/data/vectorstats/*py substituteInPlace ./run_tests \ - --replace 'git submodule update --init $datadir >> $LOGFILE 2>&1' "" + --replace-fail 'git submodule update --init $datadir >> $LOGFILE 2>&1' "" + # reduce build noise + substituteInPlace ./configure \ + --replace-fail "[ '-Wall' ]" "[]" + + # fix error output (cuts off after a few lines otherwise) substituteInPlace ./build \ - --replace '"less -RX "' '"${less}/bin/less -RX "' + --replace-fail 'stderr=subprocess.PIPE' 'stderr=None' ''; configurePhase = '' - export EIGEN_CFLAGS="-isystem ${eigen}/include/eigen3" + runHook preConfigure + export EIGEN_CFLAGS="-isystem ${eigen'}/include/eigen3" unset LD # similar to https://github.com/MRtrix3/mrtrix3/issues/1519 ./configure ${lib.optionalString (!withGui) "-nogui"}; + runHook postConfigure ''; buildPhase = '' + runHook preBuild ./build (cd testing && ../build) + runHook postBuild ''; installCheckPhase = '' + runHook preInstallCheck ./run_tests units ./run_tests binaries # can also `./run_tests scripts`, but this fails due to lack of FSL package # (and there's no convenient way to disable individual tests) + runHook postInstallCheck ''; doInstallCheck = true; @@ -99,13 +145,19 @@ stdenv.mkDerivation rec { runHook postInstall ''; - postInstall = '' - for prog in $out/bin/*; do - if [[ -x "$prog" ]]; then - wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]} - fi - done - ''; + preFixup = + if withGui then + '' + qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ants ]}) + '' + else + '' + for prog in $out/bin/*; do + if [[ -x "$prog" ]]; then + wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]} + fi + done + ''; meta = with lib; { broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index 02ab02728be5..d8685390bc1d 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -6,13 +6,13 @@ enableHO ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eprover"; - version = "3.1"; + version = "3.2"; src = fetchurl { - url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; - hash = "sha256-+E2z7JAkiNXhZrWRXFbhI5f9NmB0Q4eixab4GlAFqYY="; + url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${finalAttrs.version}/E.tgz"; + hash = "sha256-B0yOX8MGJHY0HOeQ/RWtgATTIta2YnhEvSdoqIML1K4="; }; buildInputs = [ which ]; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e 's/ *CC *= *gcc$//' -i Makefile.vars ''; + configureFlags = [ "--exec-prefix=$(out)" @@ -29,13 +30,13 @@ stdenv.mkDerivation rec { "--enable-ho" ]; - meta = with lib; { + meta = { description = "Automated theorem prover for full first-order logic with equality"; homepage = "http://www.eprover.org/"; - license = licenses.gpl2; - maintainers = with maintainers; [ + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ raskin ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 2dac1f012c9e..4c6c20fe80c8 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -1,6 +1,5 @@ { haskellPackages, - mkDerivation, fetchFromGitHub, lib, stdenv, @@ -13,6 +12,8 @@ }: let + inherit (haskellPackages) mkDerivation; + version = "1.10.0"; src = fetchFromGitHub { owner = "tamarin-prover"; diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix index 2fb6e386346a..ab17053cf6e2 100644 --- a/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ b/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -7,7 +7,6 @@ pkg-config, libiconv, openssl, - Security, }: rustPlatform.buildRustPackage rec { @@ -33,7 +32,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Security ]; postInstall = '' diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index ec1e20a91329..82c0c8fa015f 100644 --- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, installShellFiles, @@ -8,7 +7,6 @@ gfortran, lapack, openssl, - Security, }: rustPlatform.buildRustPackage rec { @@ -27,16 +25,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = - [ - blas - gfortran.cc.lib - lapack - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = [ + blas + gfortran.cc.lib + lapack + openssl + ]; # Enables build against a generic BLAS. buildFeatures = [ "netlib" ]; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 2d0634cec567..04b0d124d413 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -33,10 +33,6 @@ blas, lapack, curl, - Cocoa, - Foundation, - libobjc, - libcxx, tzdata, withRecommendedPackages ? true, enableStrictBarrier ? false, @@ -77,51 +73,44 @@ stdenv.mkDerivation (finalAttrs: { tzdata which ]; - buildInputs = - [ - bzip2 - gfortran - libX11 - libXmu - libXt - libXt - libjpeg - libpng - libtiff - ncurses - pango - pcre2 - readline - (texliveSmall.withPackages ( - ps: with ps; [ - inconsolata - helvetic - ps.texinfo - fancyvrb - cm-super - rsfs - ] - )) - xz - zlib - less - texinfo - graphviz - icu - which - blas - lapack - curl - tcl - tk - jdk - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - Foundation - libobjc - libcxx - ]; + buildInputs = [ + bzip2 + gfortran + libX11 + libXmu + libXt + libXt + libjpeg + libpng + libtiff + ncurses + pango + pcre2 + readline + (texliveSmall.withPackages ( + ps: with ps; [ + inconsolata + helvetic + ps.texinfo + fancyvrb + cm-super + rsfs + ] + )) + xz + zlib + less + texinfo + graphviz + icu + which + blas + lapack + curl + tcl + tk + jdk + ]; strictDeps = true; patches = [ @@ -173,8 +162,8 @@ stdenv.mkDerivation (finalAttrs: { --disable-R-framework --without-x OBJC="clang" - CPPFLAGS="-isystem ${lib.getDev libcxx}/include/c++/v1" - LDFLAGS="-L${lib.getLib libcxx}/lib" + CPPFLAGS="-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1" + LDFLAGS="-L${lib.getLib stdenv.cc.libcxx}/lib" '' + '' ) diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 4b9bd9e6fdcc..6314ee84599c 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -14,9 +14,6 @@ protobuf, doxygen, blas, - Accelerate, - CoreGraphics, - CoreVideo, lmdbSupport ? true, lmdb, leveldbSupport ? true, @@ -82,11 +79,6 @@ stdenv.mkDerivation rec { ++ lib.optionals pythonSupport [ python numpy - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate - CoreGraphics - CoreVideo ]; propagatedBuildInputs = lib.optionals pythonSupport ( diff --git a/pkgs/applications/science/math/mathematica/versions.nix b/pkgs/applications/science/math/mathematica/versions.nix index 103e47e7fb87..32c2aab73c6a 100644 --- a/pkgs/applications/science/math/mathematica/versions.nix +++ b/pkgs/applications/science/math/mathematica/versions.nix @@ -8,6 +8,20 @@ let versions = [ + { + version = "14.2.1"; + lang = "en"; + language = "English"; + sha256 = "sha256-WNLuq9RviYF3Mj8uOALhmvcxGGHVq/TAGFMTGWoYBcc="; + installer = "Wolfram_14.2.1_LIN.sh"; + } + { + version = "14.2.1"; + lang = "en"; + language = "English"; + sha256 = "sha256-DcZbetr5wO3i/DkchgpsW3RGHfa1PslA4fK+bRQ68Bg="; + installer = "Wolfram_14.2.1_LIN_Bndl.sh"; + } { version = "14.2.0"; lang = "en"; diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index b934320025a5..840e76c1fc5a 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -11,12 +11,12 @@ }: let - version = "3.9.2"; + version = "3.9.3"; src = fetchFromGitHub { owner = "openrefine"; repo = "openrefine"; rev = version; - hash = "sha256-Z52YfS+caNe7N3xMv85eoBes6TwkSsGk5/rGaQd/6ds="; + hash = "sha256-wV5ur31JEGcMSLRHQq/H6GlsdpEzTH6ZxBkE9Sj6TkU="; }; npmPkg = buildNpmPackage { diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index dfa7fbf8daf4..622030ebfd98 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -10,7 +10,6 @@ installShellFiles, asciidoctor, libiconv, - Security, }: rustPlatform.buildRustPackage rec { @@ -39,7 +38,6 @@ rustPlatform.buildRustPackage rec { [ curl libiconv - Security ] else [ openssl ] diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix index 1460ea3e8e08..b9a2ae22ff67 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix @@ -1,16 +1,7 @@ { - lib, - rustPlatform, - dbus, - freetype, - gtk3, - libsoup_3, - openssl, - pkg-config, - webkitgtk_4_1, - libappindicator, - makeWrapper, - coolercontrol, + cmake, + stdenv, + qt6, }: { @@ -19,48 +10,26 @@ meta, }: -rustPlatform.buildRustPackage { +stdenv.mkDerivation { pname = "coolercontrol"; inherit version src; - sourceRoot = "${src.name}/coolercontrol-ui/src-tauri"; - - useFetchCargoVendor = true; - cargoHash = "sha256-C0oVtU6esXOkssKyJ4XzLV2vGCPbvVKgvf3wXo9L158="; - - buildFeatures = [ "custom-protocol" ]; + sourceRoot = "${src.name}/coolercontrol"; nativeBuildInputs = [ - makeWrapper - pkg-config + cmake + qt6.wrapQtAppsHook ]; buildInputs = [ - dbus - openssl - freetype - libsoup_3 - gtk3 - webkitgtk_4_1 - libappindicator + qt6.qtbase + qt6.qtwebengine ]; - checkFeatures = [ "custom-protocol" ]; - - # copy the frontend static resources to final build directory - # Also modify tauri.conf.json so that it expects the resources at the new location - postPatch = '' - mkdir -p ui-build - cp -R ${coolercontrol.coolercontrol-ui-data}/* ui-build/ - substituteInPlace tauri.conf.json --replace-fail '"frontendDist": "../dist"' '"frontendDist": "ui-build"' - ''; - postInstall = '' install -Dm644 "${src}/packaging/metadata/org.coolercontrol.CoolerControl.desktop" -t "$out/share/applications/" install -Dm644 "${src}/packaging/metadata/org.coolercontrol.CoolerControl.metainfo.xml" -t "$out/share/metainfo/" install -Dm644 "${src}/packaging/metadata/org.coolercontrol.CoolerControl.png" -t "$out/share/icons/hicolor/256x256/apps/" install -Dm644 "${src}/packaging/metadata/org.coolercontrol.CoolerControl.svg" -t "$out/share/icons/hicolor/scalable/apps/" - wrapProgram $out/bin/coolercontrol \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libappindicator ]} ''; meta = meta // { diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix index 19475bc7572e..0f687c9d5278 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix @@ -1,4 +1,4 @@ -{ buildNpmPackage, autoPatchelfHook }: +{ buildNpmPackage }: { version, @@ -11,15 +11,7 @@ buildNpmPackage { inherit version src; sourceRoot = "${src.name}/coolercontrol-ui"; - npmDepsHash = "sha256-t+QShKaXpQuEzeeu/ljBBEzeYsxqvMpx5waDZ2gyPAI="; - - preBuild = '' - autoPatchelf node_modules/sass-embedded-linux-x64/dart-sass/src/dart - ''; - - nativeBuildInputs = [ autoPatchelfHook ]; - - dontAutoPatchelf = true; + npmDepsHash = "sha256-FFVCE3/E+eiTvTeU53cc1Mdbrl5J3+YgYUYltpnGXz0="; postBuild = '' cp -r dist $out diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix index ee9af95a0ddf..d1e5e43fc8c1 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrold.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix @@ -18,15 +18,14 @@ rustPlatform.buildRustPackage { sourceRoot = "${src.name}/coolercontrold"; useFetchCargoVendor = true; - cargoHash = "sha256-5gqtSZs/unFobEl1MHec2uhGDrWnO6ITlYbB78VasZg="; + cargoHash = "sha256-ZyYyQcaYd3VZ7FL0Hki33JO3LscPfBT5gl+nw2cXvUs="; buildInputs = [ libdrm ]; postPatch = '' # copy the frontend static resources to a directory for embedding mkdir -p ui-build - cp -R ${coolercontrol.coolercontrol-ui-data}/* ui-build/ - substituteInPlace build.rs --replace-fail '"./resources/app"' '"./ui-build"' + cp -R ${coolercontrol.coolercontrol-ui-data}/* resources/app/ # Hardcode a shell substituteInPlace src/repositories/utils.rs \ diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix index 066be7abb8ff..35e138f5f195 100644 --- a/pkgs/applications/system/coolercontrol/default.nix +++ b/pkgs/applications/system/coolercontrol/default.nix @@ -5,13 +5,13 @@ }: let - version = "1.4.5"; + version = "2.1.0"; src = fetchFromGitLab { owner = "coolercontrol"; repo = "coolercontrol"; rev = version; - hash = "sha256-lRw5IcSrLM6aUajt2Ny1IUuGYcAjY1oUDZENyz0wVJI="; + hash = "sha256-xIc0ZecQGyjMQWVaucKomu7SbaHy+ymg5dkOjHjtJ9c="; }; meta = { diff --git a/pkgs/applications/version-management/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix index b131fa6ee7f2..76a8bb0ca03f 100644 --- a/pkgs/applications/version-management/git-gone/default.nix +++ b/pkgs/applications/version-management/git-gone/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, installShellFiles, asciidoctor, }: @@ -36,8 +34,6 @@ rustPlatform.buildRustPackage rec { asciidoctor ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - postInstall = '' asciidoctor --backend=manpage git-gone.1.adoc -o git-gone.1 installManPage git-gone.1 diff --git a/pkgs/applications/version-management/git-stack/default.nix b/pkgs/applications/version-management/git-stack/default.nix index 5107fef5426f..f5e23de6893a 100644 --- a/pkgs/applications/version-management/git-stack/default.nix +++ b/pkgs/applications/version-management/git-stack/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - Security, testers, git-stack, }: @@ -22,10 +20,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-338iRd6zoy2O55sZ0h+s6i8kg4yXFBowRQLge9R9Bqs="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - # Many tests try to access the file system. doCheck = false; diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 974d878f264b..e79f78a7dab5 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -41,8 +41,6 @@ pythonSupport ? true, withpcre2 ? true, sendEmailSupport ? perlSupport, - Security, - CoreServices, nixosTests, withLibsecret ? false, pkg-config, @@ -160,10 +158,6 @@ stdenv.mkDerivation (finalAttrs: { tk ] ++ lib.optionals withpcre2 [ pcre2 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - CoreServices - ] ++ lib.optionals withLibsecret [ glib libsecret @@ -238,7 +232,7 @@ stdenv.mkDerivation (finalAttrs: { # Need to build the main Git documentation before building the # contrib/subtree documentation, as the latter depends on the # asciidoc.conf file created by the former. - make -C Documentation "''${flagsArray[@]}" + make -C Documentation PERL_PATH=${lib.getExe buildPackages.perlPackages.perl} "''${flagsArray[@]}" '' + '' make -C contrib/subtree "''${flagsArray[@]}" all ${lib.optionalString withManual "doc"} @@ -265,13 +259,23 @@ stdenv.mkDerivation (finalAttrs: { preInstall = lib.optionalString osxkeychainSupport '' + mkdir -p $out/libexec/git-core + ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/libexec/git-core/ + + # ideally unneeded, but added for backwards compatibility mkdir -p $out/bin - ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin/ + ln -s $out/libexec/git-core/git-credential-osxkeychain $out/bin/ + rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o '' + lib.optionalString withLibsecret '' + mkdir -p $out/libexec/git-core + ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/libexec/git-core/ + + # ideally unneeded, but added for backwards compatibility mkdir -p $out/bin - ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/bin/ + ln -s $out/libexec/git-core/git-credential-libsecret $out/bin/ + rm -f $PWD/contrib/credential/libsecret/git-credential-libsecret.o ''; @@ -340,8 +344,11 @@ stdenv.mkDerivation (finalAttrs: { '' + lib.optionalString perlSupport '' # wrap perl commands - makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/bin/git-credential-netrc \ + makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/libexec/git-core/git-credential-netrc \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" + # ideally unneeded, but added for backwards compatibility + ln -s $out/libexec/git-core/git-credential-netrc $out/bin/ + wrapProgram $out/libexec/git-core/git-cvsimport \ --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" wrapProgram $out/libexec/git-core/git-archimport \ @@ -419,7 +426,6 @@ stdenv.mkDerivation (finalAttrs: { '' ) + lib.optionalString osxkeychainSupport '' - ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/libexec/git-core/ # enable git-credential-osxkeychain on darwin if desired (default) mkdir -p $out/etc cat > $out/etc/gitconfig << EOF diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index b8dcb9dca0f0..e9a2ea12859b 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.10.1", - "repo_hash": "1bxkfn49dih3i3z6z1l5xx5hrvrxwwr1ag66aw4vmncw4vyxl2wj", + "version": "17.10.4", + "repo_hash": "1ppfg904q1ikl21k21iyzknpd7l51zxpi144416myr5m1a6a3kza", "yarn_hash": "0fw84hf9qswajmjhds59fn6l6xmyha6vja13dvb5slfw9cmbq9pi", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.10.1-ee", + "rev": "v17.10.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.10.1", - "GITLAB_PAGES_VERSION": "17.10.1", + "GITALY_SERVER_VERSION": "17.10.4", + "GITLAB_PAGES_VERSION": "17.10.4", "GITLAB_SHELL_VERSION": "14.41.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0", - "GITLAB_WORKHORSE_VERSION": "17.10.1" + "GITLAB_WORKHORSE_VERSION": "17.10.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 62713f7b9144..45ab20ae40f6 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -10,7 +10,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "17.10.1"; + version = "17.10.4"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -22,7 +22,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-b8HLad4oK5x7uzlr1SQAZt20+OhB3iswhpIQnk4VF/o="; + vendorHash = "sha256-rPTFHQ7b3l9wPURu50sur+PsxKYI4xiRs5uHNab9YUg="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 1eb841c997f5..f10da7686472 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -216,7 +216,10 @@ def update_rubyenv(): # Undo our gemset.nix patches so that bundix runs through subprocess.check_output( - ["sed", "-i", "-e", "1d", "-e", "s:\\${src}/::g", "gemset.nix"], cwd=rubyenv_dir + ["sed", "-i", "-e", "s|\\${src}/||g", "gemset.nix"], cwd=rubyenv_dir + ) + subprocess.check_output( + ["sed", "-i", "-e", "s|^src:[[:space:]]||g", "gemset.nix"], cwd=rubyenv_dir ) subprocess.check_output(["bundle", "lock"], cwd=rubyenv_dir) @@ -227,7 +230,7 @@ def update_rubyenv(): "sed", "-i", "-e", - "1i\\src:", + "1c\\src: {", "-e", 's:path = \\(vendor/[^;]*\\);:path = "${src}/\\1";:g', "-e", diff --git a/pkgs/applications/version-management/gittyup/default.nix b/pkgs/applications/version-management/gittyup/default.nix index cfe26c2de044..25e65657ce8d 100644 --- a/pkgs/applications/version-management/gittyup/default.nix +++ b/pkgs/applications/version-management/gittyup/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, cmark, - darwin, git, libssh2, lua5_4, @@ -60,24 +59,16 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = - [ - cmark - git - hunspell - libssh2 - lua5_4 - openssl - qtbase - qttools - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - Security - ] - ); + buildInputs = [ + cmark + git + hunspell + libssh2 + lua5_4 + openssl + qtbase + qttools + ]; postInstall = '' # Those are not program libs, just some Qt5 libs that the build system leaks for some reason diff --git a/pkgs/applications/version-management/lucky-commit/default.nix b/pkgs/applications/version-management/lucky-commit/default.nix index 3b5c389e70ed..f2295c428aa9 100644 --- a/pkgs/applications/version-management/lucky-commit/default.nix +++ b/pkgs/applications/version-management/lucky-commit/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, withOpenCL ? true, stdenv, - OpenCL, ocl-icd, }: @@ -22,7 +21,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-8Z/bfSDjSrvGbPOVpvIYzOz5wxjkMsuwOWASnOA8ziM="; - buildInputs = lib.optional withOpenCL (if stdenv.hostPlatform.isDarwin then OpenCL else ocl-icd); + buildInputs = lib.optional (withOpenCL && (!stdenv.hostPlatform.isDarwin)) ocl-icd; buildNoDefaultFeatures = !withOpenCL; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 3b6270bf8c65..bc60bd3fcb54 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -16,7 +16,6 @@ guiSupport ? fullBuild, tk, highlightSupport ? fullBuild, - ApplicationServices, # test dependencies runCommand, unzip, @@ -39,11 +38,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.9.1"; + version = "6.9.4"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - hash = "sha256-5XdXfumpep+E08NNU8y4uTVCY9arlkR1JQlPPgpWcnA="; + hash = "sha256-fqDoOeyDRSd90Z0HJQtEJhNNxdZoL/iAqGorCbTjjs0="; }; format = "other"; @@ -78,7 +77,7 @@ let cargo rustc ]; - buildInputs = [ docutils ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; + buildInputs = [ docutils ]; makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional rustSupport "PURE=--rust"; diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 56f2f8e463b1..68af1ce3c04c 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -7,9 +7,6 @@ linkFarm, jam, openssl, - CoreServices, - Foundation, - Security, testers, }: @@ -53,12 +50,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ jam ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Foundation - Security - ]; - outputs = [ "out" "bin" diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 535abf792679..a44df071c8de 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -16,12 +16,6 @@ fixup-yarn-lock, glibcLocales, libiconv, - Cocoa, - CoreFoundation, - CoreGraphics, - CoreServices, - Security, - WebKit, enableMinimal ? false, }: @@ -166,12 +160,6 @@ python311Packages.buildPythonApplication { ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl libiconv - Cocoa - CoreFoundation - CoreGraphics - CoreServices - Security - WebKit ]; HGNAME = "sl"; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 353f567172b4..5513f8bfd0f5 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -16,8 +16,6 @@ openssl, lz4, utf8proc, - CoreServices, - Security, autoconf, libtool, apacheHttpd ? null, diff --git a/pkgs/applications/video/go2tv/default.nix b/pkgs/applications/video/go2tv/default.nix index 77bf7cfb8517..f7ded32020b6 100644 --- a/pkgs/applications/video/go2tv/default.nix +++ b/pkgs/applications/video/go2tv/default.nix @@ -1,12 +1,7 @@ { lib, - stdenv, buildGoModule, fetchFromGitHub, - Carbon, - Cocoa, - Kernel, - UserNotifications, xorg, libglvnd, pkg-config, @@ -28,23 +23,16 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXinerama - xorg.libXi - xorg.libXext - xorg.libXxf86vm - libglvnd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - Cocoa - Kernel - UserNotifications - ]; + buildInputs = [ + xorg.libX11 + xorg.libXcursor + xorg.libXrandr + xorg.libXinerama + xorg.libXi + xorg.libXext + xorg.libXxf86vm + libglvnd + ]; ldflags = [ "-s" diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index cf660186976d..ebcdc89f4f1e 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -3,10 +3,6 @@ fetchFromGitHub, mkDerivation, stdenv, - Cocoa, - CoreAudio, - CoreFoundation, - MediaPlayer, SDL2, cmake, libGL, @@ -59,12 +55,6 @@ mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - CoreAudio - CoreFoundation - MediaPlayer ]; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/formula1/default.nix b/pkgs/applications/video/kodi/addons/formula1/default.nix index ce7733db7f55..1ce01ab9bdac 100644 --- a/pkgs/applications/video/kodi/addons/formula1/default.nix +++ b/pkgs/applications/video/kodi/addons/formula1/default.nix @@ -10,11 +10,11 @@ buildKodiAddon rec { pname = "formula1"; namespace = "plugin.video.formula1"; - version = "2.0.3"; + version = "2.0.4"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-T2q7/bbzarjbqmLQR5g5lBnO0mdrwrWX5/c5GZ48nKM="; + sha256 = "sha256-tyVq/yfnPQ5NAnlYCT8lF/s2voh4NOQPRawXX1+ryTU="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/jurialmunkey/default.nix b/pkgs/applications/video/kodi/addons/jurialmunkey/default.nix new file mode 100644 index 000000000000..ee3e7679fbd2 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/jurialmunkey/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildKodiAddon, + fetchFromGitHub, + requests, + infotagger, +}: + +buildKodiAddon rec { + pname = "jurialmunkey"; + namespace = "script.module.jurialmunkey"; + version = "0.2.21"; + + src = fetchFromGitHub { + owner = "jurialmunkey"; + repo = namespace; + rev = "v${version}"; + hash = "sha256-vcYydVrcVJ7jaeFXCad7pgxvoZy63QLlRS3HO9GsmtU="; + }; + + propagatedBuildInputs = [ + requests + infotagger + ]; + + passthru = { + pythonPath = "resources/modules"; + }; + + meta = with lib; { + homepage = "https://github.com/jurialmunkey/script.module.jurialmunkey/tree/main"; + description = "Common code required by TMDbHelper and other related jurialmunkey add-ons"; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/robotocjksc/default.nix b/pkgs/applications/video/kodi/addons/robotocjksc/default.nix new file mode 100644 index 000000000000..5ed3fa6345bf --- /dev/null +++ b/pkgs/applications/video/kodi/addons/robotocjksc/default.nix @@ -0,0 +1,25 @@ +{ + lib, + buildKodiAddon, + fetchFromGitHub, +}: + +buildKodiAddon rec { + pname = "robotocjksc"; + namespace = "resource.font.robotocjksc"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "jurialmunkey"; + repo = namespace; + rev = "v${version}"; + hash = "sha256-s/h/KKlGYGMvf7RdI9ONk4S+NCzlaDX5w3CdNfbC2KE="; + }; + + meta = with lib; { + homepage = "https://github.com/jurialmunkey/resource.font.robotocjksc"; + description = "Roboto CJKSC fonts"; + license = licenses.asl20; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/texturemaker/default.nix b/pkgs/applications/video/kodi/addons/texturemaker/default.nix new file mode 100644 index 000000000000..bbbd3ff04553 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/texturemaker/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildKodiAddon, + fetchFromGitHub, + jurialmunkey, +}: + +buildKodiAddon rec { + pname = "texturemaker"; + namespace = "script.texturemaker"; + version = "0.2.10"; + + src = fetchFromGitHub { + owner = "jurialmunkey"; + repo = namespace; + rev = "v${version}"; + hash = "sha256-GtUDNc0qatGzgSqQdDJgZnrhI1f+SPyoG9Og+oRFxRM="; + }; + + propagatedBuildInputs = [ + jurialmunkey + ]; + + meta = with lib; { + homepage = "https://github.com/jurialmunkey/script.texturemaker/tree/main"; + description = "Texture Maker helps skinners build gradient based textures"; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index e156fee4a1ff..e880ffb89266 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -65,7 +65,6 @@ libjpegSupport ? true, libjpeg, useUnfreeCodecs ? false, - darwin, buildPackages, }: @@ -176,11 +175,7 @@ stdenv.mkDerivation { ++ lib.optional libpngSupport libpng ++ lib.optional libjpegSupport libjpeg ++ lib.optional bs2bSupport libbs2b - ++ lib.optional v4lSupport libv4l - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.OpenGL - ]; + ++ lib.optional v4lSupport libv4l; configurePlatforms = [ ]; configureFlags = diff --git a/pkgs/applications/video/mpv/scripts/manga-reader.nix b/pkgs/applications/video/mpv/scripts/manga-reader.nix index 77223d041c8a..078dbee89617 100644 --- a/pkgs/applications/video/mpv/scripts/manga-reader.nix +++ b/pkgs/applications/video/mpv/scripts/manga-reader.nix @@ -8,12 +8,12 @@ buildLua { pname = "manga-reader"; - version = "0-unstable-2025-02-16"; + version = "0-unstable-2025-04-16"; src = fetchFromGitHub { owner = "Dudemanguy"; repo = "mpv-manga-reader"; - rev = "68824666b669ec101835f6d7aa510896e82ec30f"; - hash = "sha256-9PGJ2OrAcbJIBLI/XGT2HQpC3KuoYnn1ws9oB9AnHQA="; + rev = "41c4be078fe6250b87eea21545c74d649719f8e4"; + hash = "sha256-uUaKqPtONuoRuVqtP0FwcUdhG2WlPRfizuZIzDPPjac="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/video/mpv/scripts/visualizer.nix b/pkgs/applications/video/mpv/scripts/visualizer.nix index cf80bb47f0af..c26e3f63766c 100644 --- a/pkgs/applications/video/mpv/scripts/visualizer.nix +++ b/pkgs/applications/video/mpv/scripts/visualizer.nix @@ -6,13 +6,13 @@ }: buildLua { pname = "visualizer"; - version = "0-unstable-2024-09-26"; + version = "0-unstable-2025-04-12"; src = fetchFromGitHub { owner = "mfcc64"; repo = "mpv-scripts"; - rev = "bff344ee2aeaa0153c7e593dc262d68bcc3031c6"; - sha256 = "kNf5b153fIbKja1ZUOV3w4taH5CWjAJhGUMywXF6dMg="; + rev = "bf6776f5c3dae8d83ba29b820496af89dc436613"; + sha256 = "9ApUBXjH4TKPP4P/fUXSNYbJu2AH6HBYt+1K+sHB7yE="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix index 2f31975697ca..8aac08543123 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-color-monitor"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "norihiro"; repo = "obs-color-monitor"; tag = finalAttrs.version; - hash = "sha256-4Dagga9BgW1Fiaxqs9QlyTax+SgFyTiNiU3yP2GjIDs="; + hash = "sha256-TwsEIOgQjj1wza7i8nne63oBM3FB6GmMjCq8/PuiWHs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix index fefdefc8eb4f..559d5db86cba 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=./lib" - "-DCMAKE_INSTALL_DATADIR=./usr" + "-DCMAKE_INSTALL_DATADIR=./share" ]; meta = with lib; { diff --git a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix index 6c2074bd7f7e..427f8fe83052 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-shaderfilter"; - version = "2.4.1"; + version = "2.4.3"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-shaderfilter"; rev = version; - sha256 = "sha256-J4g8PTPtVkKNkUTb0Ntz+HT4AaNCtqt58KfZOMS6llE="; + sha256 = "sha256-RJistQXHu0SQTrLEt7dfo443AJIY2WgjIA5nHOijrOk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index b3cd3512a74d..d2f21aceb9a9 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -8,7 +8,6 @@ frei0r, opencolorio, ffmpeg_6, - CoreFoundation, cmake, wrapQtAppsHook, openimageio, @@ -83,7 +82,7 @@ stdenv.mkDerivation { qtwayland qtmultimedia qttools - ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreFoundation; + ]; meta = with lib; { description = "Professional open-source NLE video editor"; diff --git a/pkgs/applications/video/youtube-tui/default.nix b/pkgs/applications/video/youtube-tui/default.nix index b2e2f38bc33d..7c2a4d7f3f60 100644 --- a/pkgs/applications/video/youtube-tui/default.nix +++ b/pkgs/applications/video/youtube-tui/default.nix @@ -10,9 +10,6 @@ makeBinaryWrapper, libsixel, mpv, - CoreFoundation, - Security, - AppKit, }: rustPlatform.buildRustPackage rec { @@ -35,18 +32,12 @@ rustPlatform.buildRustPackage rec { makeBinaryWrapper ]; - buildInputs = - [ - openssl - xorg.libxcb - libsixel - mpv - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - AppKit - ]; + buildInputs = [ + openssl + xorg.libxcb + libsixel + mpv + ]; # sixel-sys is dynamically linked to libsixel postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 658fc8c29f05..253a3b83c636 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.35.0"; + version = "2.35.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-Jt5kh9QnNbILpn5YyKAWewlrkCUhB4jdTXjQlZUNdUM="; + hash = "sha256-Dq2YYiHmtt3j+qHAzsAIW4twbD3viXIjI0MXrV7HIW0="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGoModule rec { rm -rf pkg/e2e/ ''; - vendorHash = "sha256-CIoVaB1yMdes7QNNKu2YZWFkrohZDANbGuwqERUcGyk="; + vendorHash = "sha256-nycjWE3nFmA2csen8jT9lrhwRn5892xIRtrYEn+eVy0="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c4fbc8b1c4a0..c622bf18d993 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -404,11 +404,11 @@ rec { }; docker_28 = callPackage dockerGen rec { - version = "28.0.4"; + version = "28.1.1"; cliRev = "v${version}"; - cliHash = "sha256-DLUcmxbCxJs3EA96SGaesA+GzvHq6DC2vrGe5PvA0dE="; + cliHash = "sha256-bRnJ+c2C4t+94NL82L0S3r84uoJaTDq16YQGvEmo7Sw="; mobyRev = "v${version}"; - mobyHash = "sha256-yvz8MUOU61OuphPaIDu6+1wsbCXkIxJYQKK0fhcVwp0="; + mobyHash = "sha256-FB9btun41PAqqBjb9Ebn7SyjrIg/ILe3xJ+mqu2lqrs="; runcRev = "v1.2.6"; runcHash = "sha256-XMN+YKdQOQeOLLwvdrC6Si2iAIyyHD5RgZbrOHrQE/g="; containerdRev = "v1.7.27"; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index cff5da08d3aa..deaefb7db927 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -116,7 +116,6 @@ stdenv.mkDerivation { platforms = platforms.linux; # Darwin probably works too but I haven't tested it license = licenses.gpl2; maintainers = with maintainers; [ - copumpkin raitobezarius ]; }; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 7c9d5c30312a..68399723ade7 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -33,8 +33,6 @@ libslirp, apple-sdk_13, darwinMinVersionHook, - rez, - setfile, guestAgentSupport ? (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal, numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal, @@ -179,8 +177,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals hexagonSupport [ glib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool - rez - setfile ] ++ lib.optionals (!userOnly) [ dtc ]; @@ -263,6 +259,13 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./fix-qemu-ga.patch + # On macOS, QEMU uses `Rez(1)` and `SetFile(1)` to attach its icon + # to the binary. Unfortunately, those commands are proprietary, + # deprecated since Xcode 6, and operate on resource forks, which + # these days are stored in extended attributes, which aren’t + # supported in the Nix store. So we patch out the calls. + ./skip-macos-icon.patch + # Workaround for upstream issue with nested virtualisation: https://gitlab.com/qemu-project/qemu/-/issues/1008 (fetchpatch { url = "https://gitlab.com/qemu-project/qemu/-/commit/3e4546d5bd38a1e98d4bd2de48631abf0398a3a2.diff"; diff --git a/pkgs/applications/virtualization/qemu/skip-macos-icon.patch b/pkgs/applications/virtualization/qemu/skip-macos-icon.patch new file mode 100644 index 000000000000..4f6f3a9a9e4a --- /dev/null +++ b/pkgs/applications/virtualization/qemu/skip-macos-icon.patch @@ -0,0 +1,14 @@ +diff --git a/scripts/entitlement.sh b/scripts/entitlement.sh +index 0f412949ec..23f56d083a 100755 +--- a/scripts/entitlement.sh ++++ b/scripts/entitlement.sh +@@ -25,9 +25,5 @@ + codesign --entitlements "$ENTITLEMENT" --force -s - "$SRC" + fi + +-# Add the QEMU icon to the binary on Mac OS +-Rez -append "$ICON" -o "$SRC" +-SetFile -a C "$SRC" +- + mv -f "$SRC" "$DST" + trap '' exit diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index c994cf7ec819..5d705eb3a20d 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -2,10 +2,6 @@ stdenv, lib, fetchFromGitHub, - Hypervisor, - vmnet, - xpc, - libobjc, zlib, }: @@ -21,10 +17,6 @@ stdenv.mkDerivation rec { }; buildInputs = [ - Hypervisor - vmnet - xpc - libobjc zlib ]; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index cea706f8e84f..c9cbe06ba560 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -88,6 +88,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/PandorasFox/i3lock-color"; maintainers = with maintainers; [ malyn ]; + mainProgram = "i3lock-color"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/build-support/build-typst-package.nix b/pkgs/build-support/build-typst-package.nix new file mode 100644 index 000000000000..47e35251be20 --- /dev/null +++ b/pkgs/build-support/build-typst-package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenvNoCC, +}: + +/** + `buildTypstPackage` is a helper builder for typst packages. + + # Inputs + + `attrs` + : attrs for stdenvNoCC.mkDerivation + typstDeps (a list of `buildTypstPackage` derivations) + + # Example + ```nix + { buildTypstPackage, typstPackages }: + + buildTypstPackage { + pname = "example"; + version = "0.0.1"; + src = ./.; + typstDeps = with typstPackages; [ oxifmt ]; + } + ``` +*/ + +lib.extendMkDerivation { + constructDrv = stdenvNoCC.mkDerivation; + + excludeDrvArgNames = [ + "typstDeps" + ]; + + extendDrvArgs = + finalAttrs: + { + typstDeps ? [ ], + ... + }@attrs: + { + name = "typst-package-${finalAttrs.pname}-${finalAttrs.version}"; + + installPhase = + let + outDir = "$out/lib/typst-packages/${finalAttrs.pname}/${finalAttrs.version}"; + in + '' + runHook preInstall + mkdir -p ${outDir} + cp -r . ${outDir} + runHook postInstall + ''; + + propagatedBuildInputs = typstDeps; + + passthru = { + inherit typstDeps; + }; + }; +} diff --git a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh index 6a8c86258284..b56bb39c97a9 100644 --- a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh +++ b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh @@ -26,7 +26,7 @@ while (("$n" < "$nParams")); do esac done -if $targetPassed && [[ "$targetValue" != "@defaultTarget@" ]]; then +if $targetPassed && [[ "$targetValue" != "@defaultTarget@" ]] && (( "${NIX_CC_WRAPPER_SUPPRESS_TARGET_WARNING:-0}" < 1 )); then echo "Warning: supplying the --target $targetValue != @defaultTarget@ argument to a nix-wrapped compiler may not work correctly - cc-wrapper is currently not designed with multi-target compilers in mind. You may want to use an un-wrapped compiler instead." >&2 elif [[ $0 != *cpp ]]; then extraBefore+=(-target @defaultTarget@ @machineFlags@) diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 2c3dc8884023..90b6d9b04adc 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -30,7 +30,7 @@ done # Arocc does not support "-B" if [[ -z "@isArocc@" ]]; then # `-B@bintools@/bin' forces cc to use ld-wrapper.sh when calling ld. - NIX_CFLAGS_COMPILE_@suffixSalt@="-B@bintools@/bin/ $NIX_CFLAGS_COMPILE_@suffixSalt@" + NIX_CFLAGS_COMPILE_@suffixSalt@="-B@bintools@/bin/@bintools_targetPrefix@ $NIX_CFLAGS_COMPILE_@suffixSalt@" fi # Export and assign separately in order that a failing $(..) will fail diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index 4440d99ccaba..9fed30303ab8 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -32,7 +32,7 @@ if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then fi if (( "${NIX_DEBUG:-0}" >= 1 )); then - declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection pacret pie pic strictoverflow format trivialautovarinit zerocallusedregs) + declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection nostrictaliasing pacret pie pic strictoverflow format trivialautovarinit zerocallusedregs) declare -A hardeningDisableMap=() # Determine which flags were effectively disabled so we can report below. @@ -91,6 +91,10 @@ for flag in "${!hardeningEnableMap[@]}"; do if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stack-clash-protection >&2; fi hardeningCFlagsBefore+=('-fstack-clash-protection') ;; + nostrictaliasing) + if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling nostrictaliasing >&2; fi + hardeningCFlagsBefore+=('-fno-strict-aliasing') + ;; pie) # NB: we do not use `+=` here, because PIE flags must occur before any PIC flags if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 692474d48c42..3138498e3682 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -872,6 +872,7 @@ stdenvNoCC.mkDerivation { cc = optionalString (!nativeTools) cc; wrapperName = "CC_WRAPPER"; inherit suffixSalt coreutils_bin bintools; + bintools_targetPrefix = bintools.targetPrefix; inherit libc_bin libc_dev libc_lib; inherit darwinPlatformForCC; default_hardening_flags_str = builtins.toString defaultHardeningFlags; diff --git a/pkgs/build-support/dotnet/auto-patchcil-hook/auto-patchcil.sh b/pkgs/build-support/dotnet/auto-patchcil-hook/auto-patchcil.sh new file mode 100644 index 000000000000..898ad68cb969 --- /dev/null +++ b/pkgs/build-support/dotnet/auto-patchcil-hook/auto-patchcil.sh @@ -0,0 +1,118 @@ +#!@shell@ +# shellcheck shell=bash + +declare -a autoPatchcilLibs +declare -a extraAutoPatchcilLibs + +gatherLibraries() { + if [ -d "$1/lib" ]; then + autoPatchcilLibs+=("$1/lib") + fi +} + +addEnvHooks "${targetOffset:?}" gatherLibraries + +# Can be used to manually add additional directories with shared object files +# to be included for the next autoPatchcil invocation. +addAutoPatchcilSearchPath() { + local -a findOpts=() + + while [ $# -gt 0 ]; do + case "$1" in + --) + shift + break + ;; + --no-recurse) + shift + findOpts+=("-maxdepth" 1) + ;; + --*) + echo "addAutoPatchcilSearchPath: ERROR: Invalid command line" \ + "argument: $1" >&2 + return 1 + ;; + *) break ;; + esac + done + + local dir= + while IFS= read -r -d '' dir; do + extraAutoPatchcilLibs+=("$dir") + done < <( + find "$@" "${findOpts[@]}" \! -type d \ + \( -name '*.so' -o -name '*.so.*' \) -print0 | + sed -z 's#/[^/]*$##' | + uniq -z + ) +} + +autoPatchcil() { + local rid= + local norecurse= + while [ $# -gt 0 ]; do + case "$1" in + --) + shift + break + ;; + --rid) + rid="$2" + shift 2 + ;; + --no-recurse) + shift + norecurse=1 + ;; + --*) + echo "autoPatchcil: ERROR: Invalid command line" \ + "argument: $1" >&2 + return 1 + ;; + *) break ;; + esac + done + + if [ -z "$rid" ]; then + echo "autoPatchcil: ERROR: No RID (Runtime ID) provided." >&2 + return 1 + fi + + local ignoreMissingDepsArray=("--ignore-missing") + concatTo ignoreMissingDepsArray autoPatchcilIgnoreMissingDeps + + if [ ${#ignoreMissingDepsArray[@]} -lt 2 ]; then + ignoreMissingDepsArray=() + fi + + local autoPatchcilFlags=( + ${norecurse:+--no-recurse} + --rid "$rid" + "${ignoreMissingDepsArray[@]}" + --paths "$@" + --libs "${autoPatchcilLibs[@]}" + ) + + # shellcheck disable=SC2016 + echoCmd 'patchcil auto flags' "${autoPatchcilFlags[@]}" + @patchcil@ auto "${autoPatchcilFlags[@]}" +} + +autoPatchcilFixupOutput() { + if [[ -z "${dontAutoPatchcil-}" ]]; then + if [ -n "${dotnetRuntimeIds+x}" ]; then + if [[ -n $__structuredAttrs ]]; then + local dotnetRuntimeIdsArray=("${dotnetRuntimeIds[@]}") + else + # shellcheck disable=SC2206 # Intentionally expanding it to preserve old behavior + local dotnetRuntimeIdsArray=($dotnetRuntimeIds) + fi + else + local dotnetRuntimeIdsArray=("") + fi + + autoPatchcil --rid "${autoPatchcilRuntimeId:-${dotnetRuntimeIdsArray[0]}}" -- "${prefix:?}" + fi +} + +fixupOutputHooks+=(autoPatchcilFixupOutput) diff --git a/pkgs/build-support/dotnet/auto-patchcil-hook/default.nix b/pkgs/build-support/dotnet/auto-patchcil-hook/default.nix new file mode 100644 index 000000000000..cbe9105e6115 --- /dev/null +++ b/pkgs/build-support/dotnet/auto-patchcil-hook/default.nix @@ -0,0 +1,14 @@ +{ + lib, + bash, + patchcil, + makeSetupHook, +}: + +makeSetupHook { + name = "auto-patchcil-hook"; + substitutions = { + shell = lib.getExe bash; + patchcil = lib.getExe patchcil; + }; +} ./auto-patchcil.sh diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index e112703773cd..0398121aca90 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -6,7 +6,7 @@ echo "exporting $url (rev $rev) into $out" -$SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ +$SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" --name "$name" \ ${leaveDotGit:+--leave-dotGit} \ ${fetchLFS:+--fetch-lfs} \ ${deepClone:+--deepClone} \ diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 69f35dc3bea0..7ba7fa568cd6 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -47,6 +47,7 @@ Options: --url url Any url understood by 'git clone'. --rev ref Any sha1 or references (such as refs/heads/master) --hash h Expected hash. + --name n Symbolic store path name to use for the result (default: based on URL) --branch-name Branch name to check out into --sparse-checkout Only fetch and checkout part of the repository. --non-cone-mode Use non-cone mode for sparse checkouts. @@ -75,6 +76,7 @@ for arg; do --url) argfun=set_url;; --rev) argfun=set_rev;; --hash) argfun=set_hashType;; + --name) argfun=set_symbolicName;; --branch-name) argfun=set_branchName;; --deepClone) deepClone=true;; --sparse-checkout) argfun=set_sparseCheckout;; @@ -424,6 +426,12 @@ if test -z "$branchName"; then branchName=fetchgit fi +if [ -v symbolicName ]; then + storePathName="$symbolicName" +else + storePathName="$(url_to_name "$url" "$rev")" +fi + tmpHomePath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-git-tmp-home-XXXXXXXXXX")" exit_handlers+=(remove_tmpHomePath) ln -s "${NETRC:-$HOME/.netrc}" "$tmpHomePath/.netrc" @@ -443,7 +451,7 @@ else # If the hash was given, a file with that hash may already be in the # store. if test -n "$expHash"; then - finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" "$(url_to_name "$url" "$rev")") + finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" "$storePathName") if ! nix-store --check-validity "$finalPath" 2> /dev/null; then finalPath= fi @@ -458,7 +466,7 @@ else tmpPath="$(realpath "$(mktemp -d --tmpdir git-checkout-tmp-XXXXXXXX)")" exit_handlers+=(remove_tmpPath) - tmpFile="$tmpPath/$(url_to_name "$url" "$rev")" + tmpFile="$tmpPath/$storePathName" mkdir -p "$tmpFile" # Perform the checkout. diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index db494fc82b27..9b692b4f6dec 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -37,6 +37,9 @@ lib.extendMkDerivation { "buildGoModule: vendorHash is missing" ), + # The go.sum file to track which can cause rebuilds. + goSum ? null, + # Whether to delete the vendor folder supplied with the source. deleteVendor ? false, @@ -69,13 +72,24 @@ lib.extendMkDerivation { vendorHash deleteVendor proxyVendor + goSum ; goModules = if (finalAttrs.vendorHash == null) then "" else (stdenv.mkDerivation { - name = "${finalAttrs.name or "${finalAttrs.pname}-${finalAttrs.version}"}-go-modules"; + name = + let + prefix = "${finalAttrs.name or "${finalAttrs.pname}-${finalAttrs.version}"}-"; + + # If "goSum" is supplied then it can cause "goModules" to rebuild. + # Attach the hash name of the "go.sum" file so we can rebuild when it changes. + suffix = lib.optionalString ( + finalAttrs.goSum != null + ) "-${(lib.removeSuffix "-go.sum" (lib.removePrefix "${builtins.storeDir}/" finalAttrs.goSum))}"; + in + "${prefix}go-modules${suffix}"; nativeBuildInputs = (finalAttrs.nativeBuildInputs or [ ]) ++ [ go @@ -83,7 +97,7 @@ lib.extendMkDerivation { cacert ]; - inherit (finalAttrs) src modRoot; + inherit (finalAttrs) src modRoot goSum; # The following inheritance behavior is not trivial to expect, and some may # argue it's not ideal. Changing it may break vendor hashes in Nixpkgs and diff --git a/pkgs/build-support/mitm-cache/default.nix b/pkgs/build-support/mitm-cache/default.nix index e3f89bacf54c..9c4e89bf3d55 100644 --- a/pkgs/build-support/mitm-cache/default.nix +++ b/pkgs/build-support/mitm-cache/default.nix @@ -1,12 +1,10 @@ { lib, - stdenv, fetchFromGitHub, callPackage, rustPlatform, replaceVars, openssl, - Security, python3Packages, }: @@ -21,10 +19,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eY8mgmQB8wXQ7YJbLvdjXEEgGD+/RDywjvehJYf7ckE="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - useFetchCargoVendor = true; cargoHash = "sha256-DTPlPCumkVI2naYoNdO8T3pQNSawBA0FZ9LxVpqKqN0="; diff --git a/pkgs/build-support/wasm-bindgen-cli/default.nix b/pkgs/build-support/wasm-bindgen-cli/default.nix index 40c120c14b79..1cdbd5d9906a 100644 --- a/pkgs/build-support/wasm-bindgen-cli/default.nix +++ b/pkgs/build-support/wasm-bindgen-cli/default.nix @@ -8,7 +8,6 @@ openssl, stdenv, curl, - darwin, }: { @@ -28,7 +27,6 @@ rustPlatform.buildRustPackage { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl - darwin.apple_sdk.frameworks.Security ]; nativeCheckInputs = [ nodejs_latest ]; diff --git a/pkgs/by-name/aa/aapt/package.nix b/pkgs/by-name/aa/aapt/package.nix index c9944f844520..53bec816b815 100644 --- a/pkgs/by-name/aa/aapt/package.nix +++ b/pkgs/by-name/aa/aapt/package.nix @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation rec { mainProgram = "aapt2"; homepage = "https://developer.android.com/tools/aapt2"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ linsui ]; + maintainers = with lib.maintainers; [ linsui ] ++ lib.teams.android.members; platforms = lib.platforms.unix; badPlatforms = [ # The linux executable only supports x86_64 diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix index 0258e55330d1..e79cfc8f87a3 100644 --- a/pkgs/by-name/ab/abracadabra/package.nix +++ b/pkgs/by-name/ab/abracadabra/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, qt6, faad2, @@ -15,15 +16,29 @@ stdenv.mkDerivation rec { pname = "abracadabra"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - hash = "sha256-yCjMinDCoBTOC5Ks4MUd0MQeitfrIe8bI3Q4ahz36kQ="; + hash = "sha256-kH84xDK1873ekxIYlOw6M3kVH+Sm/Sofb3AAbs4XzE0="; }; + patches = [ + # upstream patches, remove with next upgrade + (fetchpatch { + name = "no-qcustomplot"; + url = "https://github.com/KejPi/AbracaDABra/commit/b0800cfe7abebf79f1edb915b3cf55fe96129017.patch"; + hash = "sha256-8FiXix/riLvkxd2uTJCoUESInPiCsF6B+qaxRGbeUcs="; + }) + (fetchpatch { + name = "fix-missing-include"; + url = "https://github.com/KejPi/AbracaDABra/commit/8f88a3351fccea93c3c83bbfa94e98fb0823b0ae.patch"; + hash = "sha256-9AloBgpUuewUBGM/NTHYUqd0uctJ17QJ0GA5RJN1GLQ="; + }) + ]; + nativeBuildInputs = [ cmake qt6.wrapQtAppsHook diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix index 73a9e3c0a21d..0d1d83b123bc 100644 --- a/pkgs/by-name/ac/actual-server/package.nix +++ b/pkgs/by-name/ac/actual-server/package.nix @@ -7,21 +7,49 @@ cacert, gitMinimal, nodejs_20, + python3, yarn, nixosTests, nix-update-script, }: let - version = "25.3.1"; + version = "25.4.0"; src = fetchFromGitHub { + name = "actualbudget-actual-source"; owner = "actualbudget"; repo = "actual"; tag = "v${version}"; - hash = "sha256-UZ2Z1tkMbGJwka//cIC0aG1KCcTSxUPLzctEaOhnKQA="; + hash = "sha256-+XYl4Bh0+8bs/FCqlig9egLg3SJCy2SRN2ovxWRE1Ok="; + }; + translations = fetchFromGitHub { + name = "actualbudget-translations-source"; + owner = "actualbudget"; + repo = "translations"; + # Note to updaters: this repo is not tagged, so just update this to the Git + # tip at the time the update is performed. + rev = "312fce7791e6722357e5d2f851407f4b7cf4ecb9"; + hash = "sha256-kDArpSFiNJJF5ZGCtcn7Ci7wCpI1cTSknDZ4sQgy/Nc="; }; yarn_20 = yarn.override { nodejs = nodejs_20; }; + SUPPORTED_ARCHITECTURES = builtins.toJSON { + os = [ + "darwin" + "linux" + ]; + cpu = [ + "arm" + "arm64" + "ia32" + "x64" + ]; + libc = [ + "glibc" + "musl" + ]; + }; + # We cannot use fetchYarnDeps because that doesn't support yarn2/berry # lockfiles (see https://github.com/NixOS/nixpkgs/issues/254369) offlineCache = stdenvNoCC.mkDerivation { @@ -34,22 +62,7 @@ let yarn_20 ]; - SUPPORTED_ARCHITECTURES = builtins.toJSON { - os = [ - "darwin" - "linux" - ]; - cpu = [ - "arm" - "arm64" - "ia32" - "x64" - ]; - libc = [ - "glibc" - "musl" - ]; - }; + inherit SUPPORTED_ARCHITECTURES; buildPhase = '' runHook preBuild @@ -57,9 +70,15 @@ let export HOME=$(mktemp -d) yarn config set enableTelemetry 0 yarn config set cacheFolder $out + # At this stage we don't need binaries yet, so we can skip preinstall + # scripts here. + yarn config set enableScripts false yarn config set --json supportedArchitectures "$SUPPORTED_ARCHITECTURES" - yarn workspaces focus @actual-app/sync-server --production + # Install dependencies for all workspaces, and include devDependencies, + # to build web UI. Dependencies will be re-created in offline mode in the + # package's install phase. + yarn install --immutable runHook postBuild ''; @@ -76,14 +95,61 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = - { - aarch64-darwin = "sha256-IJBfBA71PZeE/Zlu2kzQw8l/D4lVAV5I5loRyRfncKA="; - aarch64-linux = "sha256-djE2lt/o/7kd7ci2TW3mhjSptD3etChbvtdbiWqp/wo="; - x86_64-darwin = "sha256-AShd87VFwqDbJZoFJPg6HsdhTx7XMVdZ5sRWLXU8ldM="; - x86_64-linux = "sha256-me0v+RuoleOKFRyJ7iyLTKRnV2Cz2Q1MLc/SE2sSSH8="; - } - .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + outputHash = "sha256-Tac2gOkdc2tzNKB3ARMfJad1MkOphudvN74gI8bGMtY="; + }; + + webUi = stdenvNoCC.mkDerivation { + pname = "actual-server-webui"; + inherit version; + srcs = [ + src + translations + ]; + sourceRoot = "${src.name}/"; + + nativeBuildInputs = [ + nodejs_20 + yarn_20 + ]; + + inherit SUPPORTED_ARCHITECTURES; + + postPatch = '' + ln -sv ../../../${translations.name} ./packages/desktop-client/locale + cp -r ${offlineCache}/node_modules ./node_modules + + patchShebangs --build ./bin ./packages/*/bin + + # Patch all references to `git` to a no-op `true`. This neuter automatic + # translation update. + substituteInPlace bin/package-browser \ + --replace-fail "git" "true" + + # Allow `remove-untranslated-languages` to do its job. + chmod -R u+w ./packages/desktop-client/locale + ''; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + yarn config set enableTelemetry 0 + yarn config set cacheFolder ${offlineCache} + yarn config set --json supportedArchitectures "$SUPPORTED_ARCHITECTURES" + + yarn build:server + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r packages/desktop-client/build $out + + runHook postInstall + ''; + dontFixup = true; }; in stdenv.mkDerivation { @@ -92,15 +158,35 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper + (python3.withPackages (ps: [ ps.setuptools ])) # Used by node-gyp yarn_20 ]; + inherit SUPPORTED_ARCHITECTURES; + installPhase = '' runHook preInstall - mkdir -p $out/{bin,lib,lib/actual/packages/sync-server} - cp -r ${offlineCache}/node_modules/ $out/lib/actual + mkdir -p $out/{bin,lib,lib/actual/packages/sync-server,lib/actual/packages/desktop-client} cp -r ./packages/sync-server/{app.js,src,migrations,package.json} $out/lib/actual/packages/sync-server + # sync-server uses package.json to determine path to web ui. + cp ./packages/desktop-client/package.json $out/lib/actual/packages/desktop-client + cp -r ${webUi} $out/lib/actual/packages/desktop-client/build + + # Re-create node_modules/ to contain just production packages required for + # sync-server itself, using existing offline cache. This will also now build + # binaries. + export HOME=$(mktemp -d) + yarn config set enableNetwork false + yarn config set enableOfflineMode true + yarn config set enableTelemetry 0 + yarn config set cacheFolder ${offlineCache} + yarn config set --json supportedArchitectures "$SUPPORTED_ARCHITECTURES" + + export npm_config_nodedir=${nodejs_20} + + yarn workspaces focus @actual-app/sync-server --production + cp -r ./node_modules $out/lib/actual/ makeWrapper ${lib.getExe nodejs_20} "$out/bin/actual-server" \ --add-flags "$out/lib/actual/packages/sync-server/app.js" \ @@ -110,7 +196,7 @@ stdenv.mkDerivation { ''; passthru = { - inherit offlineCache; + inherit offlineCache webUi; tests = nixosTests.actual; passthru.updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/ad/adguardian/package.nix b/pkgs/by-name/ad/adguardian/package.nix index 10d98113e0c3..f4966916c8ef 100644 --- a/pkgs/by-name/ad/adguardian/package.nix +++ b/pkgs/by-name/ad/adguardian/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-yPDysaslL/7N60eZ/hqZl5ZXIsof/pvlgHYfW1mIWtI="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Terminal-based, real-time traffic monitoring and statistics for your AdGuard Home instance"; mainProgram = "adguardian"; diff --git a/pkgs/by-name/ad/adios2/package.nix b/pkgs/by-name/ad/adios2/package.nix new file mode 100644 index 000000000000..08120d9f2a34 --- /dev/null +++ b/pkgs/by-name/ad/adios2/package.nix @@ -0,0 +1,146 @@ +{ + lib, + stdenv, + fetchFromGitHub, + perl, + cmake, + ninja, + gfortran, + pkg-config, + python3, + python3Packages, + mpi, + bzip2, + lz4, + c-blosc2, + hdf5-mpi, + libfabric, + libpng, + libsodium, + pugixml, + sqlite, + zeromq, + zfp, + zlib, + zlib-ng, + zstd, + ucx, + yaml-cpp, + nlohmann_json, + llvmPackages, + pythonSupport ? false, + withExamples ? false, +}: +stdenv.mkDerivation (finalAttrs: { + version = "2.10.2"; + pname = "adios2"; + + src = fetchFromGitHub { + owner = "ornladios"; + repo = "adios2"; + tag = "v${finalAttrs.version}"; + hash = "sha256-NVyw7xoPutXeUS87jjVv1YxJnwNGZAT4QfkBLzvQbwg="; + }; + + postPatch = + '' + patchShebangs cmake/install/post/generate-adios2-config.sh.in + '' + # Dynamic cast to nullptr on darwin platform, switch to unsafe reinterpret cast. + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace bindings/Python/py11{Attribute,Engine,Variable}.cpp \ + --replace-fail "dynamic_cast" "reinterpret_cast" + ''; + + nativeBuildInputs = + [ + perl + cmake + ninja + gfortran + pkg-config + ] + ++ lib.optionals pythonSupport [ + python3 + python3Packages.pybind11 + ]; + + buildInputs = + [ + mpi + bzip2 + lz4 + c-blosc2 + hdf5-mpi + libfabric + libpng + libsodium + pugixml + sqlite + zeromq + zfp + zlib + zlib-ng # required by c-blocs2 + zstd # required by c-blocs2 + yaml-cpp + nlohmann_json + + # Todo: add these optional dependcies in nixpkgs. + # sz + # mgard + # catalyst + ] + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform ucx) ucx + # openmp required by zfp + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; + + propagatedBuildInputs = lib.optionals pythonSupport [ + (python3Packages.mpi4py.override { inherit mpi; }) + python3Packages.numpy + ]; + + cmakeFlags = [ + (lib.cmakeBool "ADIOS2_USE_HDF5" true) + (lib.cmakeBool "ADIOS2_USE_HDF5_VOL" true) + (lib.cmakeBool "BUILD_TESTING" false) + (lib.cmakeBool "ADIOS2_BUILD_EXAMPLES" withExamples) + (lib.cmakeBool "ADIOS2_USE_EXTERNAL_DEPENDENCIES" true) + (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + (lib.cmakeFeature "CMAKE_INSTALL_PYTHONDIR" python3.sitePackages) + ]; + + # equired for finding the generated adios2-config.cmake file + env.adios2_DIR = "${placeholder "out"}/lib/cmake/adios2"; + + # Ctest takes too much time, so we only perform some smoke Python tests. + doInstallCheck = pythonSupport; + + preCheck = + '' + export PYTHONPATH=$out/${python3.sitePackages}:$PYTHONPATH + '' + + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") '' + rm ../testing/adios2/python/TestBPWriteTypesHighLevelAPI.py + ''; + + pytestFlagsArray = [ + "../testing/adios2/python/Test*.py" + ]; + + pythonImportsCheck = [ "adios2" ]; + + nativeInstallCheckInputs = lib.optionals pythonSupport [ + python3Packages.pythonImportsCheckHook + python3Packages.pytestCheckHook + ]; + + meta = { + homepage = "https://adios2.readthedocs.io/en/latest/"; + description = "The Adaptable Input/Output System version 2"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ qbisi ]; + }; +}) diff --git a/pkgs/by-name/ad/adminer/package.nix b/pkgs/by-name/ad/adminer/package.nix index fbda3c4b7897..cc532ae1f6c5 100644 --- a/pkgs/by-name/ad/adminer/package.nix +++ b/pkgs/by-name/ad/adminer/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "5.1.1"; pname = "adminer"; + version = "5.2.1"; # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file src = fetchurl { url = "https://github.com/vrana/adminer/releases/download/v${finalAttrs.version}/adminer-${finalAttrs.version}.zip"; - hash = "sha256-L1akLFljp4UW/YEVLi317ijY62WN9L4g+OQ127vUP/4="; + hash = "sha256-EQmCZRkH27rqLeNCDysjUGwm8wxMvxbO7cHgV8Vq8yo="; }; nativeBuildInputs = [ @@ -44,17 +44,17 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Database management in a single PHP file"; homepage = "https://www.adminer.org"; - license = with licenses; [ + license = with lib.licenses; [ asl20 gpl2Only ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ jtojnar sstef ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ae/aemu/package.nix b/pkgs/by-name/ae/aemu/package.nix index 03722e15320c..969ec27581df 100644 --- a/pkgs/by-name/ae/aemu/package.nix +++ b/pkgs/by-name/ae/aemu/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitiles, cmake, - darwin, }: stdenv.mkDerivation { @@ -23,9 +22,6 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; cmakeFlags = [ "-DAEMU_COMMON_GEN_PKGCONFIG=ON" diff --git a/pkgs/by-name/ae/aerospace/package.nix b/pkgs/by-name/ae/aerospace/package.nix index a151e3890841..82f4dee258c5 100644 --- a/pkgs/by-name/ae/aerospace/package.nix +++ b/pkgs/by-name/ae/aerospace/package.nix @@ -9,7 +9,7 @@ let appName = "AeroSpace.app"; - version = "0.17.1-Beta"; + version = "0.18.2-Beta"; in stdenv.mkDerivation { pname = "aerospace"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip"; - sha256 = "sha256-IMU0s57dpes7Vm2Wv191LwkRgiF+ZIqNWHzrl4a1Pm0="; + sha256 = "sha256-/Fc4Zk8KvAdaKXyHmeL9nh79CAQLx/Y6URFWIOL5YyQ="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ae/aerospike/package.nix b/pkgs/by-name/ae/aerospike/package.nix index 5a7de5fc4b53..2bef97c2384d 100644 --- a/pkgs/by-name/ae/aerospike/package.nix +++ b/pkgs/by-name/ae/aerospike/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aerospike-server"; - version = "8.0.0.5"; + version = "8.0.0.6"; src = fetchFromGitHub { owner = "aerospike"; repo = "aerospike-server"; rev = version; - hash = "sha256-Ou7lSQHkudE0cuhXUtx9EI3z+udfnHI+CXdgoef2TIw="; + hash = "sha256-pfB/K5CXwuAgLcJtp4fsllFiCRzjZY0Kv83O/1Uohfw="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ah/ahoy/package.nix b/pkgs/by-name/ah/ahoy/package.nix index a1bd10628946..3ce01640ca15 100644 --- a/pkgs/by-name/ah/ahoy/package.nix +++ b/pkgs/by-name/ah/ahoy/package.nix @@ -2,33 +2,42 @@ lib, fetchFromGitHub, buildGoModule, + versionCheckHook, nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "ahoy"; - version = "2.2.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "ahoy-cli"; repo = "ahoy"; - tag = "v${version}"; - hash = "sha256-xwjfY9HudxVz3xEEyRPtWysbojtan56ABBL3KgG0J/8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-wYsPutdO9ZkXQu4mrFV56mrJTeSFF/3oRaHO0ia7DHk="; }; + sourceRoot = "${finalAttrs.src.name}/v2"; + # vendor folder exists vendorHash = null; - passthru = { - updateScript = nix-update-script { }; - }; + ldflags = [ "-X main.version=${finalAttrs.version}" ]; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; meta = { description = "Create self-documenting cli programs from YAML files"; homepage = "https://github.com/ahoy-cli/ahoy"; - changelog = "https://github.com/ahoy-cli/ahoy/releases/tag/v${version}"; + changelog = "https://github.com/ahoy-cli/ahoy/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ genga898 ]; mainProgram = "ahoy"; }; -} +}) diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix index 305167f6ed5c..f39c4e8a6175 100644 --- a/pkgs/by-name/ai/aiken/package.nix +++ b/pkgs/by-name/ai/aiken/package.nix @@ -4,8 +4,6 @@ pkg-config, rustPlatform, fetchFromGitHub, - darwin, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -22,16 +20,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-m6CFu0HA4e/9hWgYcRPjfa0h5vk0zwt5PqgvsuJuPNk="; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/by-name/al/alembic/package.nix similarity index 100% rename from pkgs/development/libraries/alembic/default.nix rename to pkgs/by-name/al/alembic/package.nix diff --git a/pkgs/by-name/al/alephone/package.nix b/pkgs/by-name/al/alephone/package.nix index 5625e8f0671e..110be7dfb561 100644 --- a/pkgs/by-name/al/alephone/package.nix +++ b/pkgs/by-name/al/alephone/package.nix @@ -36,15 +36,15 @@ stdenv.mkDerivation (finalAttrs: { "icons" ]; pname = "alephone"; - version = "1.10"; + version = "1.10.1"; src = fetchurl { url = let - date = "20240822"; + date = "20250302"; in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2"; - hash = "sha256-Es2Uo0RIJHYeO/60XiHVLJe9Eoan8DREtAI2KGjuLaM="; + hash = "sha256-Jn8357JYR6cWISDxzYutLTWBDMTv0h923cSFf+RU8V8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix index ff6921cb57d9..43476269af5c 100644 --- a/pkgs/by-name/al/algia/package.nix +++ b/pkgs/by-name/al/algia/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "algia"; - version = "0.0.84"; + version = "0.0.86"; src = fetchFromGitHub { owner = "mattn"; repo = "algia"; rev = "v${version}"; - hash = "sha256-i7rSmLFtUFSA1pW5IShYnTxjtwZ5z31OP4kVcMQgMxA="; + hash = "sha256-dpvBlFI6xmQOwui7Ma1ewIoxgFctG9fK+pLhjK/71XI="; }; - vendorHash = "sha256-8zAGkz17U7j0WWh8ayLowVhNZQvbIlA2YgXMgVIHuFg="; + vendorHash = "sha256-Yt95kSXAIBxHgX+VUefKrumg9thuvh3c+gnSu/2PSQY="; meta = { description = "CLI application for nostr"; diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix index 5de675497c7f..342cb01d9e0e 100644 --- a/pkgs/by-name/al/aliae/package.nix +++ b/pkgs/by-name/al/aliae/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "aliae"; - version = "0.26.4"; + version = "0.26.5"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = "aliae"; tag = "v${version}"; - hash = "sha256-Xyj/CEvYnVz8bX0vMsFAyRY7Hp6heHFjvq+VeCYWXow="; + hash = "sha256-F5OteK1D0MCNyiZG6iz3vawkx74WJKst2Yr6ca8TYZw="; }; - vendorHash = "sha256-wNcn7ATUumuki8IQIrs7f8cf3uD7sMFlaS6BhgpEMVM="; + vendorHash = "sha256-TsJU1oAc1T+VdUYzrcyflTPYJhG6sPjFNZ7bZKk1KdM="; sourceRoot = "${src.name}/src"; diff --git a/pkgs/by-name/al/alibuild/package.nix b/pkgs/by-name/al/alibuild/package.nix new file mode 100644 index 000000000000..d9315f52f68c --- /dev/null +++ b/pkgs/by-name/al/alibuild/package.nix @@ -0,0 +1,42 @@ +{ + lib, + python3Packages, + fetchPypi, +}: + +python3Packages.buildPythonApplication rec { + pname = "alibuild"; + version = "1.17.18"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-771XCMYNJsQzD7rb/7q5rheeIL8X2bvMWwLkA40CJ9Y="; + }; + + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + + nativeBuildInputs = with python3Packages; [ pip ]; + + dependencies = with python3Packages; [ + requests + pyyaml + boto3 + jinja2 + distro + ]; + + pythonRelaxDeps = [ "boto3" ]; + + doCheck = false; + + meta = { + homepage = "https://alisw.github.io/alibuild/"; + description = "Build tool for ALICE experiment software"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ ktf ]; + }; +} diff --git a/pkgs/by-name/al/alistral/package.nix b/pkgs/by-name/al/alistral/package.nix index e6501719314c..12dfe62bb2bf 100644 --- a/pkgs/by-name/al/alistral/package.nix +++ b/pkgs/by-name/al/alistral/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "alistral"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "RustyNova016"; repo = "Alistral"; tag = "v${finalAttrs.version}"; - hash = "sha256-DrHoVAIPD/F6pY04QXVilXiwD/nWzeVquuHzRiq2sRY="; + hash = "sha256-6p2KMFTdC04lEhNQiu88ALBPrpQUF9JhXDacntoq4lE="; }; # remove if updating to rust 1.85 @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-Jyus5L0z0Z6Qf9vBcO6/h+py0JNKG1FS6qXONUM26BM="; + cargoHash = "sha256-2pi2hfQTLs2HAlgp1DQCMFp/nMJQfcuQFhGlrsWgy5E="; env.RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/al/allure/package.nix b/pkgs/by-name/al/allure/package.nix index bcce322418c9..cbb780c2ee5d 100644 --- a/pkgs/by-name/al/allure/package.nix +++ b/pkgs/by-name/al/allure/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "allure"; - version = "2.33.0"; + version = "2.34.0"; src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz"; - hash = "sha256-ZRAvIBF89LFYWfmO/bPqL85/XQ9l0TRGOs/uQ9no7tA="; + hash = "sha256-1R4x8LjUv4ZQXfFeJ1HkHml3sRLhb1tRV3UqApVEo7U="; }; dontConfigure = true; diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index 1cfc94719116..8403c0b37c79 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -20,14 +20,14 @@ python3Packages.buildPythonApplication rec { pname = "alpaca"; - version = "5.3.0"; + version = "5.2.0"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; tag = version; - hash = "sha256-dp/v5PZoDqSp2h0gtZk97ImDKO201VZMiCBv2XnqoGQ="; + hash = "sha256-uUGsdHrqzA5fZ4LNtX04H4ue9n4JQrkTYW2PCCFYFHc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/al/alt-ergo/package.nix b/pkgs/by-name/al/alt-ergo/package.nix index 1cd2bb503889..e434a1311478 100644 --- a/pkgs/by-name/al/alt-ergo/package.nix +++ b/pkgs/by-name/al/alt-ergo/package.nix @@ -8,11 +8,11 @@ let pname = "alt-ergo"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { url = "https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-${version}.tbz"; - hash = "sha256-EmkxGvJSeKRmiSuoeMyIi6WfF39T3QPxKixiOwP8834="; + hash = "sha256-31YEWjr3n7z70d7q8JAS1bw5C0wiI+HZwlwRwwHZ7ro="; }; in diff --git a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix index 0128d770d227..50a15bc3b2ff 100644 --- a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix +++ b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "amazon-cloudwatch-agent"; - version = "1.300054.0"; + version = "1.300055.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-cloudwatch-agent"; tag = "v${version}"; - hash = "sha256-DakLgM3vNHHzOlQTVMGwIioPhB3YryEcm7T0xepAJu4="; + hash = "sha256-/L3pq8c3d8AruKI5hvpW22bYqPypYNMO5ehdCgVrfZc="; }; - vendorHash = "sha256-rw+doSJGeFl72hHA8FSL3H61KiYwatabQ7jEMOfJZ60="; + vendorHash = "sha256-WhmkVN31snLDGvLCg3pukWIDM5yUXeiYh0ywCF83Y8E="; # See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300049.1/Makefile#L68-L77. subPackages = [ diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 7d87fa200942..00e67db4ca06 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -176,7 +176,6 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ - copumpkin manveru anthonyroussel arianvp diff --git a/pkgs/by-name/am/amber-secret/package.nix b/pkgs/by-name/am/amber-secret/package.nix index c62940c467d1..a05d3fbab349 100644 --- a/pkgs/by-name/am/amber-secret/package.nix +++ b/pkgs/by-name/am/amber-secret/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, }: @@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Gwj0rnbKWifja5NJwskcrFpPoK15HjSQHXolGbgV784="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - meta = { description = "Manage secret values in-repo via public key cryptography"; homepage = "https://github.com/fpco/amber"; diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/by-name/am/amber/package.nix similarity index 93% rename from pkgs/tools/text/amber/default.nix rename to pkgs/by-name/am/amber/package.nix index 043e96d4d39a..8a8eef4bb0d2 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/by-name/am/amber/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, rustPlatform, libiconv, - Security, }: rustPlatform.buildRustPackage rec { @@ -14,7 +13,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "dalance"; repo = pname; - rev = "v${version}"; + tag = "v${version}"; sha256 = "sha256-q0o2PQngbDLumck27V0bIiB35zesn55Y+MwK2GjNVWo="; }; @@ -23,7 +22,6 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Security ]; meta = with lib; { diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix index 8994558d2c03..aae7e13c13af 100644 --- a/pkgs/by-name/am/amnezia-vpn/package.nix +++ b/pkgs/by-name/am/amnezia-vpn/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, pkg-config, kdePackages, @@ -54,16 +55,25 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amnezia-vpn"; - version = "4.8.5.0"; + version = "4.8.6.0"; src = fetchFromGitHub { owner = "amnezia-vpn"; repo = "amnezia-client"; tag = finalAttrs.version; - hash = "sha256-k0BroQYrmJzM0+rSZMf20wHba5NbOK/xm5lbUFBNEHI="; + hash = "sha256-WQbay3dtGNPPpcK1O7bfs/HKO4ytfmQo60firU/9o28="; fetchSubmodules = true; }; + # Temporary patch header file to fix build with QT 6.9 + patches = [ + (fetchpatch { + name = "add-missing-include.patch"; + url = "https://github.com/amnezia-vpn/amnezia-client/commit/c44ce0d77cc3acdf1de48a12459a1a821d404a1c.patch"; + hash = "sha256-Q6UMD8PlKAcI6zNolT5+cULECnxNrYrD7cifvNg1ZrY="; + }) + ]; + postPatch = '' substituteInPlace client/platforms/linux/daemon/wireguardutilslinux.cpp \ @@ -127,11 +137,6 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - postFixup = '' - # Temporary unwrap non-binary executable until qt6.wrapQtAppsHook is fixed - mv $out/libexec/.update-resolv-conf.sh-wrapped $out/libexec/update-resolv-conf.sh - ''; - passthru = { inherit amnezia-tun2socks amnezia-xray; updateScript = nix-update-script { diff --git a/pkgs/by-name/am/amp/package.nix b/pkgs/by-name/am/amp/package.nix index 36f4a1ca6462..1c32dd578eba 100644 --- a/pkgs/by-name/am/amp/package.nix +++ b/pkgs/by-name/am/amp/package.nix @@ -9,7 +9,6 @@ xorg, cmake, libgit2, - darwin, curl, writableTmpDirAsHomeHook, }: @@ -41,14 +40,9 @@ rustPlatform.buildRustPackage rec { xorg.libxcb libgit2 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - curl - Security - AppKit - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + curl + ]; nativeCheckInputs = [ writableTmpDirAsHomeHook diff --git a/pkgs/by-name/an/anakron/package.nix b/pkgs/by-name/an/anakron/package.nix index cf4babb295e6..5cd737856512 100644 --- a/pkgs/by-name/an/anakron/package.nix +++ b/pkgs/by-name/an/anakron/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "anakron"; - version = "0.3.1"; + version = "0.3.3"; src = fetchzip { url = "https://github.com/molarmanful/ANAKRON/releases/download/v${version}/ANAKRON-release_v${version}.zip"; - hash = "sha256-YggeGSFc+NoDUZjV/cEhQGUR278f97X+WpcDLY66iqg"; + hash = "sha256-l4MA3OsMnqPIBWKx3ZO5XnxjE0gnIGyAtsZe2z/9zrw="; }; nativeBuildInputs = [ xorg.mkfontscale ]; diff --git a/pkgs/by-name/an/analog/package.nix b/pkgs/by-name/an/analog/package.nix index 11777f147a24..add6dff6eebd 100644 --- a/pkgs/by-name/an/analog/package.nix +++ b/pkgs/by-name/an/analog/package.nix @@ -2,6 +2,10 @@ stdenv, lib, fetchFromGitHub, + bzip2, + gd, + libjpeg, + libpng, }: stdenv.mkDerivation rec { @@ -15,11 +19,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-NCturEibnpl6+paUZezksHzP33WtAzfIolvBLeEHXjY="; }; + buildInputs = [ + bzip2 + gd + libjpeg + libpng + ]; + postPatch = '' sed -i src/anlghead.h \ -e "s|#define DEFAULTCONFIGFILE .*|#define DEFAULTCONFIGFILE \"$out/etc/analog.cfg\"|g" \ -e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/${pname}/lang/\"|g" - substituteInPlace src/Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" + substituteInPlace src/Makefile \ + --replace-fail "gcc" "${stdenv.cc.targetPrefix}cc" \ + --replace-fail "LIBS = -lm" "LIBS = -lm -lpng -lgd -ljpeg -lz -lbz2" \ + --replace-fail "DEFS =" "DEFS = -DHAVE_GD -DHAVE_ZLIB -DHAVE_BZLIB" ''; installPhase = '' diff --git a/pkgs/by-name/an/andagii/package.nix b/pkgs/by-name/an/andagii/package.nix index 08101b709407..4d7a886ac548 100644 --- a/pkgs/by-name/an/andagii/package.nix +++ b/pkgs/by-name/an/andagii/package.nix @@ -23,14 +23,11 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - # There are multiple claims that the font is GPL, so I include the - # package; but I cannot find the original source, so use it on your - # own risk Debian claims it is GPL - good enough for me. - meta = with lib; { + meta = { homepage = "http://www.i18nguy.com/unicode/unicode-font.html"; description = "Unicode Plane 1 Osmanya script font"; - maintainers = with maintainers; [ raskin ]; - license = "unknown"; - platforms = platforms.all; + maintainers = [ lib.maintainers.raskin ]; + license = lib.licenses.unfreeRedistributable; # upstream uses the term copyleft only + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/an/angryoxide/package.nix b/pkgs/by-name/an/angryoxide/package.nix new file mode 100644 index 000000000000..5abe04cd555a --- /dev/null +++ b/pkgs/by-name/an/angryoxide/package.nix @@ -0,0 +1,59 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libxkbcommon, + sqlite, + zlib, + wayland, +}: + +let + libwifi = fetchFromGitHub { + owner = "Ragnt"; + repo = "libwifi"; + rev = "71268e1898ad88b8b5d709e186836db417b33e81"; + hash = "sha256-2X/TZyLX9Tb54c6Sdla4bsWdq05NU72MVSuPvNfxySk="; + }; +in +rustPlatform.buildRustPackage (finalAttrs: { + pname = "angryoxide"; + version = "0.8.32"; + + src = fetchFromGitHub { + owner = "Ragnt"; + repo = "AngryOxide"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Sla5lvyqZho9JE4QVS9r0fx5+DVlU90c8OSfO4/f0B4="; + }; + + postPatch = '' + rm -r libs/libwifi + ln -s ${libwifi} libs/libwifi + ''; + + useFetchCargoVendor = true; + cargoHash = "sha256-mry4l0a7DZOWkrChU40OVRCBjKwI39cyZtvEBA5tro0="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libxkbcommon + sqlite + wayland + zlib + ]; + + meta = { + description = "802.11 Attack Tool"; + changelog = "https://github.com/Ragnt/AngryOxide/releases/tag/v${finalAttrs.version}"; + homepage = "https://github.com/Ragnt/AngryOxide/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fvckgrimm ]; + mainProgram = "angryoxide"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/an/angular-language-server/package.nix b/pkgs/by-name/an/angular-language-server/package.nix index 9c25a7c6b082..0620f45245e5 100644 --- a/pkgs/by-name/an/angular-language-server/package.nix +++ b/pkgs/by-name/an/angular-language-server/package.nix @@ -16,11 +16,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "angular-language-server"; - version = "19.2.3"; + version = "19.2.4"; src = fetchurl { name = "angular-language-server-${finalAttrs.version}.zip"; url = "https://github.com/angular/vscode-ng-language-service/releases/download/v${finalAttrs.version}/ng-template.vsix"; - hash = "sha256-fW7JtaFXBR+PL17CUCtIAXndO/fBctisHd/uZg5Dez4="; + hash = "sha256-LJpv7ZVnJrPb4Ty0H250WcliCoJS4lXc878BTYHfJ+8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/an/animeko/deps.json b/pkgs/by-name/an/animeko/deps.json new file mode 100644 index 000000000000..a8a33ab6ff92 --- /dev/null +++ b/pkgs/by-name/an/animeko/deps.json @@ -0,0 +1,3513 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://dl.google.com/dl/android/maven2": { + "androidx/annotation#annotation-jvm/1.7.0": { + "jar": "sha256-42uOS4OTpK3HTj1KsirVo2OW8M6i5AtXNOrhSTff0iQ=", + "module": "sha256-B85gw3erlOR8jJAlibl3YDAGT9Gn5NWgGjjXAONeXbQ=", + "pom": "sha256-LT/MEucHiGmSA5JmI39FEUDKqPlMHmLn/E1gLeNFsNc=" + }, + "androidx/annotation#annotation-jvm/1.8.0": { + "jar": "sha256-mqsybZSSgAmRhUNgrCSPSTzn98MYNRkwm3is6eJA9vY=", + "module": "sha256-48tFJVOdDtdLsjjvksae7yKoDkIsDSrLxR5hh/67ChM=", + "pom": "sha256-2fkI7m1IgSSs7VVv2Ka6nf5kf+AUuFrXIhRhEQ0DI2E=" + }, + "androidx/annotation#annotation-jvm/1.8.1": { + "jar": "sha256-mqsybZSSgAmRhUNgrCSPSTzn98MYNRkwm3is6eJA9vY=", + "module": "sha256-yVnjsM3HXBXv4BYF+laqefAz45I44VBji4+r3mqhIaA=", + "pom": "sha256-1JIDczqm+uBGw6PeTnlu7TR1lXVUhqZCc5iYRHWXULQ=" + }, + "androidx/annotation#annotation-jvm/1.9.0": { + "jar": "sha256-Mjbh5ExB2jeMGsm1Fb7gUB2NxRKZFGUQCstN/mQFmk4=", + "module": "sha256-S1hpnRTWadIj2lC7hf/md3UH0x9JDVMFA4ODZ0l15Tg=", + "pom": "sha256-PEA0l9/stnxrIZqvVYVD8wnJSOIoxAB7ADMBEYDw6+U=" + }, + "androidx/annotation#annotation-jvm/1.9.1": { + "jar": "sha256-HjQ5F+vye6lv5NxSscrX/TK3OPvGNVu2zVs7MF1yEtA=", + "module": "sha256-A/tlkXfIYY5HQlklwRvJHzhHA+omwmW+myXNeSkrURw=", + "pom": "sha256-ibmcIY1gAZMWtQqreYFnB7whaWyJagMOGxrgOJYby44=" + }, + "androidx/annotation#annotation/1.7.0": { + "module": "sha256-UwcIZW04BgUHfqi8qa4TcvvRrzjjdfQR1OQyY71RDDw=", + "pom": "sha256-IcYYrIxwkt2VGT8FwLGWGDp86PE2anqRLIAOvuNoqFg=" + }, + "androidx/annotation#annotation/1.8.0": { + "module": "sha256-1ZCg2OAvQF3nSejcgLdB3FA8bj5MnAFtYU12tl8LWe8=", + "pom": "sha256-fDjBim6KzHvYjvrNfhR6iXqUW5nbci5U4LnOJEYQLVs=" + }, + "androidx/annotation#annotation/1.8.1": { + "module": "sha256-5jhuha/dhlBE4hZXXkk+05pjpjJb2SU3miFCnDlByLU=", + "pom": "sha256-txIll07Ah+uWwl72gZ9VscIvUw6FykRrpzX7Zu0E/1w=" + }, + "androidx/annotation#annotation/1.9.0": { + "module": "sha256-dHz857uARn6ipotGGHOPdjoUHND1Yvw1p8IVBCf1oxo=", + "pom": "sha256-73DxHmNYnrfKKI079t8q0gNPFR6F8gux9F0MyeQwhRk=" + }, + "androidx/annotation#annotation/1.9.1": { + "module": "sha256-8gSwW3KKl1YXGLxxYkLkfGKcAIWoDudPylPU1ji8vj8=", + "pom": "sha256-xzOIHC4X1ffIZhzAKpFZyxYLeyCUon1ZORbIfT4lBjY=" + }, + "androidx/arch/core#core-common/2.2.0": { + "jar": "sha256-ZTCKBrHADuGGy54ZMhOD8EO5k4E/FSLEf0o+MwO9ukE=", + "module": "sha256-7fQgDP3C2UYjIlLJnl3LnGG7kJ61RQsmE9HU/cl0uYE=", + "pom": "sha256-HhfUr41kJb4qafivTWVKh+BFYlmp7vFUKGm8sCNUfig=" + }, + "androidx/collection#collection-jvm/1.4.5": { + "jar": "sha256-U5pDQo34ozdiL7eBQB9fDNzVLYs2FfAIWvUckAAv8zM=", + "module": "sha256-0kq0tJY72cP4nhwA15eqeV6wK6/HGNzf0mYhH5k/KyM=", + "pom": "sha256-0eYk/dD1wygCSsORVHJkScQzfZ5WoFR/sLsW1Dn6FlY=" + }, + "androidx/collection#collection-jvm/1.5.0-beta01": { + "jar": "sha256-cLNZJOS6vN/6N9Dlde4DnFai2XEjNCYkxItgMjNwQ0E=", + "module": "sha256-m9Z90440sDcxxzEBAPpp2VYEY7WO82jiTplq39WylHk=", + "pom": "sha256-/TNZM8LOdQe4YcQsRrKMlLKMFVxsFh69V8vgrcZjE+Q=" + }, + "androidx/collection#collection-jvm/1.5.0-beta02": { + "jar": "sha256-cLNZJOS6vN/6N9Dlde4DnFai2XEjNCYkxItgMjNwQ0E=", + "module": "sha256-yWJG1TMsMZqFSrXS9FSuxp7B+OxCE8y9w8Jveoqq4Rg=", + "pom": "sha256-DHhItMroK4NUQVzDv8UOSBU38sDsOHLDdyi2AJNawAw=" + }, + "androidx/collection#collection/1.4.5": { + "module": "sha256-I34e/Faj4lqOpM7sJlWMKZhEv8U6rQb/P1PKHINeKMg=", + "pom": "sha256-DA39zlfaULfpyifTsZv/vjuY8x3cfgPNWEz3eAmns0k=" + }, + "androidx/collection#collection/1.5.0-beta01": { + "module": "sha256-zTV6fk5naCWsI4CaFLSw0HOExeNoUc58UVC3JnqLbxs=", + "pom": "sha256-ZpkVL++tCxICWB6bwx1hXuVwby1ukelKc84D/MZuNHw=" + }, + "androidx/collection#collection/1.5.0-beta02": { + "module": "sha256-XRtuakhubfGGt+zxG0YZ9qnNJjWzMoP+7vVCC7jK4lc=", + "pom": "sha256-dYjYKThPGuEmvP8qMD3kIZH43XcHuMyNv/NHNyGhC+A=" + }, + "androidx/databinding#databinding-common/8.6.1": { + "jar": "sha256-Zsq4JjnawPbCQzRkwJOwdNYIxLuIfsOKm4vErJgSZzI=", + "pom": "sha256-HVKzfmoakn9cRdrzpUt3qvP+ghuVaBfYMgrZeM9HObI=" + }, + "androidx/databinding#databinding-compiler-common/8.6.1": { + "jar": "sha256-9ht4WRdSaUuWDV/o+X/eSaL7ORFkf/q9bX1Wkjf8c2I=", + "pom": "sha256-0KpDvv3NKTdFk5QCJ0aw0l0Hq5S4njiMxd51jjbZsxs=" + }, + "androidx/datastore#datastore-core-jvm/1.1.3": { + "jar": "sha256-Niy60fE4dKIsc2ChjrmVylKjYDeboOpa8bHPDfAxmi8=", + "module": "sha256-UmGZehK21geoJRfnYSIzci3SVeQVrOanr1IzItT1nzk=", + "pom": "sha256-PjzxV7ZBhO8a829Fvu/J4NSxQXboljpDobvM6mUIUxI=" + }, + "androidx/datastore#datastore-core-okio-jvm/1.1.3": { + "jar": "sha256-KRUGtPzjmCSXk+MnIHY1vU3yUYHZU5gI1xgaSr0IdfU=", + "module": "sha256-zVmKuJgBFPskrdXyfKxVldwxG2gi7jUnVC3FwFcWc1s=", + "pom": "sha256-A6bYrsZtSOpv1VS/p0vx77pOBIkA1WipNAoU8qVy3Rw=" + }, + "androidx/datastore#datastore-core-okio/1.1.3": { + "module": "sha256-SWvvC38Y/ZPd0+j/mrdvWq4YdDNrSpwe7n7YgjBdY+w=", + "pom": "sha256-qNiO7HMQohfDyzlAjArdOuyd+iuKJaia8av+HRMUegk=" + }, + "androidx/datastore#datastore-core/1.1.3": { + "module": "sha256-8lm5afpDZrxe0WT0Alngj23e25rLD+1E3BClSnZ0p9Y=", + "pom": "sha256-R0vKoLsIzJYBd+VxG5sKaHqMo/EZdLMSDOLAU9CmDlI=" + }, + "androidx/datastore#datastore-preferences-core-jvm/1.1.3": { + "jar": "sha256-yznhIjtDJNcwxXOivOo6NTCevZNY++YwiZcFo/vKyvY=", + "module": "sha256-jUuuxy3XADVcSt/3NT91dMlHKa0ooV/Z4VCPYllsSLo=", + "pom": "sha256-QPd7mcpDHTWea5G1Fgb8EilaqOJmsQgu0ZpUCiEovAg=" + }, + "androidx/datastore#datastore-preferences-core/1.1.3": { + "module": "sha256-/1gXB5+CMCjyAVpNkP9lmYuGAN9e6mIv1DHHxUy+818=", + "pom": "sha256-4JQxqWCBKD841vntXUIwGhHRtxPmuDAAA1Bl+hB2Z7g=" + }, + "androidx/datastore#datastore-preferences-external-protobuf/1.1.3": { + "jar": "sha256-/LPzc890NCbIXrsNPMZErvrybzm3+lW7kCONQbaJ7Kc=", + "module": "sha256-BN/dYC2DAcG/IiN+nxIO+SJvvAKi/OUSGfsxmGrjAIA=", + "pom": "sha256-DMlR5kOJ0MeRDCa32XgweqPIjMDLtj5r3d8puNH6MeE=" + }, + "androidx/datastore#datastore-preferences-proto/1.1.3": { + "jar": "sha256-Y2hqYS85uMpgO+vjN21V+2ye4opKUXPvpJyJy8yooSc=", + "module": "sha256-lOdNtE+L1YmQpJEE+suE7qeOQ/xdYG3OWFJ4EDO0J4s=", + "pom": "sha256-/4WW0Y9dfYVv9AtvG5hCRNzIYdc28gydatF4RyI6waI=" + }, + "androidx/graphics#graphics-shapes-desktop/1.0.1": { + "jar": "sha256-8wXB4aw+t9IOVFUPSOB7VqlpUUc90/57uJE+0M06XpE=", + "module": "sha256-0lI9c6u+Lx54cQatTh96zuMKfGI3D4W7TXgnAPD9BwE=", + "pom": "sha256-8cK2TcpMcwYnX0QhdnEnQOsCG3ivD4oxbFd75j3rxuc=" + }, + "androidx/graphics#graphics-shapes/1.0.1": { + "module": "sha256-LX9tVQQimfnE+EeKoJS8QJmjRpAnef8wkf7R38K2L1M=", + "pom": "sha256-drUM5mT6RKSxZUIIHgiJkc8xaubnI6pM0BpicZ8aiic=" + }, + "androidx/lifecycle#lifecycle-common-jvm/2.9.0-alpha08": { + "jar": "sha256-rLRTlzoTYO0Y2EBYDm+Ncdyr+lJ6oehZvtSE20xTNbE=", + "module": "sha256-9Xd8ppZxVmGZ3jhyrBFGQCR4uHe+k6CWCncnL4Y0dI4=", + "pom": "sha256-UJ/gyGH21JJu5935B3V2mExTRb7B/6tMBAEs5agCgGY=" + }, + "androidx/lifecycle#lifecycle-common/2.9.0-alpha08": { + "module": "sha256-awUTjQm0RClnOOsshSgBycz8ZB3jUWX8wIZRw9/BlvY=", + "pom": "sha256-gTBpAMV+VZ2TFs75W3MFH2ek74p8vxSjsLTWuN46WX4=" + }, + "androidx/lifecycle#lifecycle-runtime-desktop/2.9.0-alpha08": { + "jar": "sha256-c54I5HdGbNhxhLvRfEkLPrgdBN0X/otowLVJpFnlg+o=", + "module": "sha256-/U2AQwWz+ccQ3pZgTDaaWJzpBWzvPBLXLfCvxgBooCQ=", + "pom": "sha256-/uDg3D+qBrx2tDRs5B5sGGSdgxib5STv7oEbrnlJfOk=" + }, + "androidx/lifecycle#lifecycle-runtime/2.9.0-alpha08": { + "module": "sha256-ihhLC+ff0o4yvI11d31N1fezUgOgWY3BEiNJTpvDmE4=", + "pom": "sha256-K1NQSadO4zEFGDp3frk/K8Pc4eZyLVPtU1tzT2qwgLY=" + }, + "androidx/lifecycle#lifecycle-viewmodel-desktop/2.9.0-alpha08": { + "jar": "sha256-XRIKJZL12D4c15kar6/dlGq9d4aM0i52mqmmAn60sjA=", + "module": "sha256-+eIYGqxXK8p0PmLn4PpC11zD/T0OvROUZ2gB8BcBxcs=", + "pom": "sha256-RSaPE7q3ZjmOeYOGRqUY4NwFic6bUlajze30+d7Wais=" + }, + "androidx/lifecycle#lifecycle-viewmodel/2.9.0-alpha08": { + "module": "sha256-xq8B7ZVLEyTGUB6TGRvOuBgPI4kabPhV6LwOcoZ4n7s=", + "pom": "sha256-Id6ZA7OFAESafBIVSnPS9KZUS8A9rKsH9sv61IdDlSg=" + }, + "androidx/paging#paging-common-jvm/3.3.6": { + "jar": "sha256-m6OQ1JxJCDe+xyT+9mBGVJWnMY3oG2kdRjNOvk2Dqio=", + "module": "sha256-qyJqL/6Vbk7NPrvGJpWo44YTDeJ2ShAPaZMnvX1KJZ4=", + "pom": "sha256-Xm1r7BhBdGnccg6//qQsMgsdYEO9uNS9Os5UP3pWnIg=" + }, + "androidx/paging#paging-common/3.3.6": { + "module": "sha256-laMPLlShL85R6fLzDMER+rayFuBB29jCbYZinBi1fHY=", + "pom": "sha256-QqEut6WreMa24QK2w0SLzhmCfeFj3fwvT6PT9sCjd0A=" + }, + "androidx/performance#performance-annotation-jvm/1.0.0-alpha01": { + "jar": "sha256-jQDt0rDtNUMQF6pZlzl+HdFA1FR/VUYs0YoMYsgX6Ec=", + "module": "sha256-lUXtqn9grdo4UabgVusT23S30C7mkk/Ec9cYtcTlSvI=", + "pom": "sha256-OUJQciGu1ry4UH6wtx4t4AbCapD6Pwz1Xvk/c5/OQAQ=" + }, + "androidx/performance#performance-annotation/1.0.0-alpha01": { + "module": "sha256-p+/urPLRetxNBttusv/ZkRf/UllUPqjH1vLzbWLawTw=", + "pom": "sha256-2iS/vOWDd2juWR/jxTs3X9GFbeXMYPX9OTDffLANuWM=" + }, + "androidx/room#androidx.room.gradle.plugin/2.7.0": { + "pom": "sha256-jO03tXX2KgGYh6AvgkEd9plwN+69ODbdJRNCh6kjpZw=" + }, + "androidx/room#room-common-jvm/2.7.0": { + "jar": "sha256-sqALiMi42BDQfsvfkv3/R9t/DqiE7+XDHNp6UmybGuU=", + "module": "sha256-spo0zB4zdf2SApU2qych9SCnOxwAAAc5935I684GnrM=", + "pom": "sha256-jqAbXXin7uVpeXWrXQ71uKrR+VZtyRWxgHhY9rknC+g=" + }, + "androidx/room#room-common/2.7.0": { + "module": "sha256-7HbDv4WtRYn9CMNSIAGv+niXDrd3IQfLXgbvYON6dOs=", + "pom": "sha256-/NHMaEUFNJFmGFvnQAFSeTMc+tb8gbp6Dwqc5bHYvjM=" + }, + "androidx/room#room-compiler-processing/2.7.0": { + "jar": "sha256-uWCePhQVdZWKAhfe54YQqx5xVwm3XvOD6Fn7lu+wDfA=", + "module": "sha256-r+YNX3hAYJyB8/eNj+iJmkdUfZbSh4S9Don0d3WIM3U=", + "pom": "sha256-re9BpiiLw/dND2YQ/kaZzO8QCpCk85Xbcm6kke6mDRI=" + }, + "androidx/room#room-compiler/2.7.0": { + "jar": "sha256-2QjokrEGOdKTIOpNZL6hxAPgVYKhY1mFVtXqI+sEsM0=", + "module": "sha256-GdNDFFyug3uwErJLIjLamd/3c/3txYWIpofScOA6HWM=", + "pom": "sha256-I0WACHZFgR4KU5COgKdbp5rRq+SHuAx2LfUAv59sCis=" + }, + "androidx/room#room-external-antlr/2.7.0": { + "jar": "sha256-a/eUv/6N4mOCZQJRG0x98FcDErbMmTEsp/xr2wiAyh4=", + "module": "sha256-MWfDNMTvWzrm9Hz/Xc1gFBGoeZwNkF/go7ajUoxhfSE=", + "pom": "sha256-32NsPDSZkkgDFp8ogHawWP1sDwcFsIdXYvu5K9FtTkA=" + }, + "androidx/room#room-gradle-plugin/2.7.0": { + "jar": "sha256-WGQDSy8Jp8aqbeKTYYpbO89705g9eSwWZRTeR6hKGo0=", + "module": "sha256-SJ6pyGRF5MjsvLSN6d/pU07e2ssp07IkuDg6+PvfDb4=", + "pom": "sha256-gtTxMUDD52vJq3mo+8RpY24RGCLZL+T+dA3WjZSoYkQ=" + }, + "androidx/room#room-migration-jvm/2.7.0": { + "jar": "sha256-jFzsjy1docuf3pYP3SJTu/xr50+aSgPs24LaF2YiMaw=", + "module": "sha256-I8rhKFYmQ1YmBrTgdWsM3JJWSyp7tYQvf9BOsJsQgcA=", + "pom": "sha256-BxT33w6jjXRHmxSpQr/08kYsR8jxixPJZa8VX8+rmic=" + }, + "androidx/room#room-migration/2.7.0": { + "module": "sha256-DE8cr5FSvrgFxHMbHsKc+0kdPlA881uSPR1S1XSmjUg=", + "pom": "sha256-9p246bQJHRqqYz8+kT5YNiBL2n34v3kFZH527U8g2C8=" + }, + "androidx/room#room-paging-jvm/2.7.0": { + "jar": "sha256-sk4d9SMJ87PYtjte4pRxJKSBwNeRneu9A04eH+2PoTg=", + "module": "sha256-rEo8iiqO6QHutUnCYUydLpFEqb4MBDcdYn3ENOv5nek=", + "pom": "sha256-2TdAJljNPTJti6QlulPwX+gQcqZsH+NbKmvXCHth3fA=" + }, + "androidx/room#room-paging/2.7.0": { + "module": "sha256-rtb2GsbL168Mo1ojygUDCrc9S04ezPXWrp03gLHRkf0=", + "pom": "sha256-G7J547FpfmE4KmYFc34hvstU0xDHClTpuPaqd0ZkhQ0=" + }, + "androidx/room#room-runtime-jvm/2.7.0": { + "jar": "sha256-REhdvgDmROk7ZMVw7zuAhOJqJezyPTBUcglZlN0SOCw=", + "module": "sha256-nEzKxPSjcjzMYYFO6b33cDuWDXx9QFbLIkI0TZhqnVc=", + "pom": "sha256-inWvKB1RJ5Er9JyRUbHG8V/HhI8+kvO4U2Q9/itqJKY=" + }, + "androidx/room#room-runtime/2.7.0": { + "module": "sha256-hFvOPtZrDS3j59zXLIWeCw7+KV7+DStX6f4ptheteWQ=", + "pom": "sha256-n/HDkKw80IGMI6ARZ2ubg+Pi3b0bZKRXYfBdABPxGvA=" + }, + "androidx/sqlite#sqlite-bundled-jvm/2.5.0": { + "jar": "sha256-vXvOYFl1Dj/2KpKNi7z3y2Jwqu8eI5V6reZXcH4a22M=", + "module": "sha256-qUqhqRd/wWYOK8t5ITN9U1wTnvDPkvwKzb40pdehXVc=", + "pom": "sha256-lcBAf1FDBVMvq24ZjT1ZvEg3O4X4U7nJsgX/xs1hhqs=" + }, + "androidx/sqlite#sqlite-bundled/2.5.0": { + "module": "sha256-nOptix4yytKlCdma3LnVjI6ejW9BNWyjR80ZZlKp7cA=", + "pom": "sha256-QBok46XmeqpSCMY3wQdt4mHi6QATUNdOn8cijtWFSqg=" + }, + "androidx/sqlite#sqlite-jvm/2.5.0": { + "jar": "sha256-v8KIIfcqgyxHp1bH0JFJvbARcdyw1bcD54Wh0HIu/is=", + "module": "sha256-5F90ErgzCNd4k9vb3EM+eU4kJOLOEtX7H/66UEVyTBo=", + "pom": "sha256-Tzgy5s4TGAjOulzCcurjzPbF2vFODoY8pvN91PvKkhU=" + }, + "androidx/sqlite#sqlite/2.5.0": { + "module": "sha256-NplIHJ/Fh59CvG9fIv/8tuXSP3WGLmbwB+/2MdcWl3k=", + "pom": "sha256-rT9uj0qsJCjS/sbcmYdgBKmLeI0EEKj0sWmrV4JtVj8=" + }, + "com/android#signflinger/8.6.1": { + "jar": "sha256-wdyixoNjTuGilCmPnHF5V4r2qG4IC9xA+WGRW8XIFC8=", + "pom": "sha256-HxZNAt/iuj4BXQLj8kgg3iRlktkX8eAPkaGnaTYa+Z0=" + }, + "com/android#zipflinger/8.6.1": { + "jar": "sha256-gd1IVhilCaMjWSm56xMJHYhEUmYd5s5aRcw4scVVQhw=", + "pom": "sha256-5R3NgXBmVPdF4UHUUxw3lY3xrEfunNdWISvWGndYx0U=" + }, + "com/android/application#com.android.application.gradle.plugin/8.6.1": { + "pom": "sha256-NnATbXn6gs8BrM3gQBObBgLTl+nwo3RVm6lvLtWW2Ws=" + }, + "com/android/databinding#baseLibrary/8.6.1": { + "jar": "sha256-eUETcJ2rIbBsJis3lec8twj7rK5hcV80Nh4a9iN6GHA=", + "pom": "sha256-Lek/tvpLtdFPC53HpfcM+MJxM7aJ31tHyf5K+ZcC/sI=" + }, + "com/android/library#com.android.library.gradle.plugin/8.6.1": { + "pom": "sha256-bfpZ48HmjapL4RvLUNueWbh1ikieqUa38d3FscST17o=" + }, + "com/android/tools#annotations/31.6.1": { + "jar": "sha256-slmV+nsiDTX7uOMl3wcfgpFpG/uv+XNMmOOPRewqc+4=", + "pom": "sha256-IWRj0T6tv+FyrXle/98/hWYWFLvK0xWyIBs4z9h8650=" + }, + "com/android/tools#common/31.6.1": { + "jar": "sha256-SSGmYQvyjwKRHrfW4bpJjbmIhOXyM+VScmGaCEG9THk=", + "pom": "sha256-bc+djIuiKoCXnRZ3UceVp790AgJ5J+DQAVS2SVQGcY4=" + }, + "com/android/tools#dvlib/31.6.1": { + "jar": "sha256-XMxJAlggKFBjDFnuy50ppshJuxfxD0ypAX22SfcuSB8=", + "pom": "sha256-za6RmOnCv5LJRoOwCdaq2DENFPYlB+XtUrWPkzaaFdA=" + }, + "com/android/tools#repository/31.6.1": { + "jar": "sha256-FpwueneqMJeIedv4swQ2ZxFlhy/L392mxzWq3bZxA0A=", + "pom": "sha256-Wy1SZioiTKSQkY2NBO11pwKijjKk3M059fQHjDuAvmc=" + }, + "com/android/tools#sdk-common/31.6.1": { + "jar": "sha256-rWbuxoXuvi5q5DA+cMifcjF/p9jMKznjb9+oZFoiYP0=", + "pom": "sha256-jGPiQ8FUZMUpy8d0RExbQLCvEBhvI6wLYJxdH5LxU5k=" + }, + "com/android/tools#sdklib/31.6.1": { + "jar": "sha256-MaLhQQus1+ikZH45fM+RS2hrMjIpbkIpEo47rZZwbiQ=", + "pom": "sha256-t811xH6Y3EkY4FmdmhQgL2ymw1jQwhRTL7syF2cVBGg=" + }, + "com/android/tools/analytics-library#crash/31.6.1": { + "jar": "sha256-LFwmQglnZ1wHS8cUCDH+O/9burx/u8CLop/cPq3MlRA=", + "pom": "sha256-NvqCjh3SQRZx/J6x0GEMMnsuvnMEkHDq4TTa/B6Es+Y=" + }, + "com/android/tools/analytics-library#protos/31.6.1": { + "jar": "sha256-DNE93twi3+NTWkxq3FZNH8OA9pXdH9dM8CEwxRDPtXM=", + "pom": "sha256-+Yz/nvLEIr1Qwd8C/LAqFpUrZSpq5dyxKUTM71DBwLA=" + }, + "com/android/tools/analytics-library#shared/31.6.1": { + "jar": "sha256-GI7Dy4ge1lXfkxHMWHAdyzKZc2UAToqmhUrPtg9uNeE=", + "pom": "sha256-jSxpFb90fFudanGXtCcFXXnMACySZqkOvMLeIyt8F64=" + }, + "com/android/tools/analytics-library#tracker/31.6.1": { + "jar": "sha256-fo9FqtqL7accKXbBXxoxbqoA/UqWgyITEc7SvbwCZAg=", + "pom": "sha256-ZG+eNf6Hg+tmaOcON9/3yNQWLu0ZGXzeLKQZXyp32f0=" + }, + "com/android/tools/build#aapt2-proto/8.6.1-11315950": { + "jar": "sha256-95NZqIrRc08kmq3KiGgHshXyYFVUnCLzTc6pojE9FOo=", + "module": "sha256-lJIZIVzqn+pESWzhbsPEczrj8Wp5dT7swK3SSxG8i0M=", + "pom": "sha256-1CRPdNhw+GpIBkVdAW+5IVtIKJH4omliEBG908ttgyU=" + }, + "com/android/tools/build#aaptcompiler/8.6.1": { + "jar": "sha256-fhn/PUfDvZs5JZbXFSKvckBT7ypf/iazn1sw6B6Ig6E=", + "module": "sha256-0iUxrbUzYh8DC4UMxyzgGBbF4qEcKfEPr0hiFwFLOO0=", + "pom": "sha256-Dt08VAlDjvWKPt31D6OygjTLLLdat/ththA2I3qdhhY=" + }, + "com/android/tools/build#apksig/8.6.1": { + "jar": "sha256-wHDtE5RinXRkGqCQb2Cy/6Hud+Y2ah+TQ39ZcXsa64k=", + "pom": "sha256-Y2IgqwyxLrjpsO9Y9Hje/wQ6+1rI+pwOfjCIxaNFtzc=" + }, + "com/android/tools/build#apkzlib/8.6.1": { + "jar": "sha256-HBpn1vTxhkJ6wWbrqg3YZ/WV1RRPySUlKwX/udGhVrc=", + "pom": "sha256-+A/Fp631hgvcxti+aqP1Wk+HkwmZGFYN02l6sWjxbTY=" + }, + "com/android/tools/build#builder-model/8.6.1": { + "jar": "sha256-UW4P83gUFTJoP7OxbLDnFRe/izU4jCeXb6kGhyiahFg=", + "module": "sha256-oeBqW8yyM+dvrU838ONRwEtvnOs+PRiNwMWSaYJBtOo=", + "pom": "sha256-CwbNfNpMYeDszj94IZgV1bdHSb3fVnab/yNFAim9Fa8=" + }, + "com/android/tools/build#builder-test-api/8.6.1": { + "jar": "sha256-joChV9NorfAWKfWjBseP7R+x3M7uYcRXla4gfZG9q0w=", + "module": "sha256-dCvKxrVZ0bXunzxiNmtEJXoFDMd/OSUrh1769zww9ks=", + "pom": "sha256-PaWDrQnaoX+K8N90eIrkO7FBfEAqAKELcjEbsIEWs58=" + }, + "com/android/tools/build#builder/8.6.1": { + "jar": "sha256-vE7pSfTulTgcg1SH67axlkiJ1hBLAyOXln2ItPIG5I0=", + "module": "sha256-RYhYJQ9RO//baGrO0ACo2s3vkSvQkXlbQF13TpuZSfo=", + "pom": "sha256-Q5TYmYx2pslZaYSNasSzBOaunYwdy6dJ+wuiODezZFQ=" + }, + "com/android/tools/build#bundletool/1.16.0": { + "jar": "sha256-HqK/UnS7rHo7tWGFIdL6EfsE6QDjOopkYCnsYzL8CMg=", + "pom": "sha256-8uiq1EVaQjckYtXhiiaXPWdXEXmmdX84JfIn6Rry8ts=" + }, + "com/android/tools/build#gradle-api/8.6.1": { + "jar": "sha256-B/dr8vj3svN2zIbqvU+KgnkYK2Vw9EDnhD0GbwLF9VY=", + "module": "sha256-KZXYqt4hXuoOQg5PM9v2RKC4pHxkaT5AfCzFdFra7LM=", + "pom": "sha256-GdPcq6tb3TEhEcywDXVL8U0rtG+5xe34fuEor8awjuY=" + }, + "com/android/tools/build#gradle-settings-api/8.6.1": { + "jar": "sha256-fKfb0L6RIEeJkOJfuDzwg6P8ebypZE4kfMVUY1jOKYI=", + "module": "sha256-qzNDgysjM4ATShFTOlRaKo+3GLboSDxtkmMEETNZB74=", + "pom": "sha256-NOp/ZQ+mdHYwCvsxWAIFF4fOfztRDY082faDycpqc8I=" + }, + "com/android/tools/build#gradle/8.6.1": { + "jar": "sha256-lpdzOiFfLtQuWy/EBTSE7IMuqylYTrztlNkskQkAUcE=", + "module": "sha256-KYi7+h3QeXxNVkLISB5RMAMNuTKahKacPoVKmpmUBQU=", + "pom": "sha256-N4nZdy0Ai/FRwZ9rgaRCwv/NZUpXq0k/n664frPY0Eg=" + }, + "com/android/tools/build#manifest-merger/31.6.1": { + "jar": "sha256-qpY9SvRasDHFcHg86ShtIRHusLjDvfROSMqQcUzMt1Q=", + "module": "sha256-WrgUxcYq6ApgHpOLUxOcEPFKicMKVWPFCsRSeHNxsPY=", + "pom": "sha256-yTK9b/FjMsbpwsLtTK/2+/aUBxhTCpByB/t4KV38qLo=" + }, + "com/android/tools/build/jetifier#jetifier-core/1.0.0-beta10": { + "jar": "sha256-Jqu0oTkn2QYhacUEyelP6A6a46T3tauIdasAdTapH14=", + "module": "sha256-8JF1iaQtJ2Fj8QBAq1hC6RiD3L2x1Iv9Hx/Kpywcp7c=", + "pom": "sha256-XJ1C5rfjXU2NAuCjIs8maTs+w2QrEHyPC+WnIdRaDG0=" + }, + "com/android/tools/build/jetifier#jetifier-processor/1.0.0-beta10": { + "jar": "sha256-xQZ6e5KCN6EnGl6ctXEOn4C0lzKTlFvFHjpMhk6kv+0=", + "module": "sha256-NsJVdrGZk982AXBSjMYrckbDd3bWFYFUpnzfj8LVjhM=", + "pom": "sha256-M7F/OWmJQEpJF0dIVpvI7fTjmmKkKjXOk9ylwOS6CEI=" + }, + "com/android/tools/ddms#ddmlib/31.6.1": { + "jar": "sha256-xXHAIk/j5+ZgcZbZXMMUL9wZ8BPo8VEPaMe0pobFOAk=", + "pom": "sha256-NhGKNIRO8zU7wHiko/RwiEI0KK1q0ejNStAVV6Ka6Ok=" + }, + "com/android/tools/layoutlib#layoutlib-api/31.6.1": { + "jar": "sha256-mLrjb/BR4RTdTu9e/6gPvl5VKUT0IzzokhYNos2e6u0=", + "pom": "sha256-7NQxU4aAO6nUO2e4+myS8EkERQHgRdMvQmDZP5yaajA=" + }, + "com/android/tools/lint#lint-model/31.6.1": { + "jar": "sha256-O7YYb3ddznoQY5HiS8w8jScLzN8vVRuSFhxq3AvC7N4=", + "pom": "sha256-1YuNHgi4YrbKf3M/pbGQszNZViI+ZGV9SoxCw1PRVdY=" + }, + "com/android/tools/lint#lint-typedef-remover/31.6.1": { + "jar": "sha256-W09IUhXKTYbvIxn8OYtfIlHmL1RGvF/Q4AZTZI3d4xg=", + "pom": "sha256-dk7anwlKi4/gldYIdZl6hhwiekbfspnUdJ9ook3e4MM=" + }, + "com/android/tools/utp#android-device-provider-ddmlib-proto/31.6.1": { + "jar": "sha256-2p8/Pa4mVEyQZoVJWEdl1YVKh8Ql0s/ld80002AOoJc=", + "pom": "sha256-eOOwDF+DPBf3rKWULwBsorkVu9lg9k1TSo1AoDm62aI=" + }, + "com/android/tools/utp#android-device-provider-gradle-proto/31.6.1": { + "jar": "sha256-rSNCux1vlVY0AKMiST6hwinLk985RPEmG3OZ9xhJQEk=", + "pom": "sha256-da7iacXcaVBY4hK/6bQGXlNPfbVdb+IprrQ62VFU51o=" + }, + "com/android/tools/utp#android-test-plugin-host-additional-test-output-proto/31.6.1": { + "jar": "sha256-OEUGlN5jKMLEy6aW+cBOzdXOaVI1X2jDoi+VQdHWVG8=", + "pom": "sha256-cP+V6yxSgoI6jJjvssM+5tLyGWS4he9IXxkhF0ODIMY=" + }, + "com/android/tools/utp#android-test-plugin-host-apk-installer-proto/31.6.1": { + "jar": "sha256-VD62yNcrLtdFH46TnV2AiQVm8UvCa335yDR1BrJY164=", + "pom": "sha256-771HKHgCPhXZzZNlIth03F/Um+MUIScA9rF6BYFxF8E=" + }, + "com/android/tools/utp#android-test-plugin-host-coverage-proto/31.6.1": { + "jar": "sha256-77TXAUqqc1UkagfC5DeiIx+yUlQP8bzmhyyI3I2onRI=", + "pom": "sha256-orxwsWG8GzB3crqSXOMlRKR1Of3gSnCbMgiFYKvpvtY=" + }, + "com/android/tools/utp#android-test-plugin-host-emulator-control-proto/31.6.1": { + "jar": "sha256-rt7F7EYn2JjMzfQtgDjbIOukSVdTxT0bCzeHNEkcr18=", + "pom": "sha256-tApCizomm6Ik+1p6DQ0swY5TEgFVDuR1Wx1wR4k6mQs=" + }, + "com/android/tools/utp#android-test-plugin-host-logcat-proto/31.6.1": { + "jar": "sha256-kSkCS9jjg1O8o+sm39jjYo4FjVfW6dhFH/w18BZ1HmM=", + "pom": "sha256-OysKImsUosDlrWKdEGL7sppvGVQsXxT+D4mP/wEh5Io=" + }, + "com/android/tools/utp#android-test-plugin-host-retention-proto/31.6.1": { + "jar": "sha256-PbjtOO9JtpTK6kZq4i47Ns7clVezWJ0OB8DN2DKUWRw=", + "pom": "sha256-ZnblwB6LjiWcJJEqrXEx6rC+D+/kBeUZzs6o4+kBoMg=" + }, + "com/android/tools/utp#android-test-plugin-result-listener-gradle-proto/31.6.1": { + "jar": "sha256-y99xvKYOFMMOeyz0uQ8PCj6ME498rdh0sNnArgguAnQ=", + "pom": "sha256-j1FzWv7i9yDS70ZCGHoppH7u2uTuNVyS/X3R9K526rQ=" + }, + "com/google/testing/platform#core-proto/0.0.9-alpha02": { + "jar": "sha256-bYqJBndBUPQ6j60IymTiXGBww5vYpvwTslk/KJJC/pU=", + "pom": "sha256-J855WUJ6L/7kjQ/rRRKKPzbMQX7YqCKvoigiyPWliyU=" + } + }, + "https://plugins.gradle.org/m2": { + "com/fasterxml#oss-parent/56": { + "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" + }, + "com/fasterxml#oss-parent/61": { + "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" + }, + "com/fasterxml/jackson#jackson-base/2.16.2": { + "pom": "sha256-2+E1aBujNdhSI0UNczbqmrJnBPbXHWY2aVcOPXvkDrY=" + }, + "com/fasterxml/jackson#jackson-base/2.18.2": { + "pom": "sha256-71dLcvW0iUgET2g3a4dMiK4JoCncjgX2Shwwvftt4Uo=" + }, + "com/fasterxml/jackson#jackson-bom/2.16.2": { + "pom": "sha256-CZW2YqaOsTyz6Qj7biN58Mo+7rxmVnd8xVhLDCcRHS8=" + }, + "com/fasterxml/jackson#jackson-bom/2.18.2": { + "pom": "sha256-UkfNwwFyXT9n9+8EkDconVr3CdaXK89LFwluRUjSlWs=" + }, + "com/fasterxml/jackson#jackson-parent/2.16": { + "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" + }, + "com/fasterxml/jackson#jackson-parent/2.18.1": { + "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.18.2": { + "jar": "sha256-WBvWEADvdkiUP3gcoFaJ5W0D9gUnSDZajis6m10/oy8=", + "module": "sha256-4Ruvm1NubflNqmNaEBPsPgabhmuOES3cKqBEahVQUNw=", + "pom": "sha256-CyvWlOqJJn7qSBJqilskplI0xkM4dULSRGnRlb+6HPg=" + }, + "com/fasterxml/jackson/core#jackson-core/2.18.2": { + "jar": "sha256-2AVK58DRwtL1XSjkYCbr5YkogfP6tfQ5IzGEOBw7Sh8=", + "module": "sha256-ynjGBDZ2f8w2zhRrd05PUKnLn2MtExcsRLrojgwDz6I=", + "pom": "sha256-4GWwA50h9N/ORr1DEEx9dtWFa9cy4qqGDMWkonDtct4=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.18.2": { + "jar": "sha256-SzZOaFDciRcvzx1N0muP9UiO2kT/RlfiLdJlID3Vqzw=", + "module": "sha256-jH2sL3J4GNiEeoKqTqxrAXTXnPBN+Q3iJGBy5t005wA=", + "pom": "sha256-STo9tkR7eo7Ls3JCNMbOZ31y20sE9roAjw6+rqe+Wp0=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.16.2": { + "module": "sha256-dJwa2Kf8wceyqxu28cVdj0aO7N52dj8XOnBqhbYDu9I=", + "pom": "sha256-PX/SUZIuX9QxAM3Q2LYv8XqhGcbwfkziEa+hRCWLCbk=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.18.2": { + "jar": "sha256-OBocBxHku4hWGmwACLWpRUZWKMoHdkzNZqDZfuB61hI=", + "module": "sha256-evxmQXLDpubGw1hHZaAyncb+q7/mu6ibrq2L0un77Hs=", + "pom": "sha256-9W9UNh5DSV7TuiShoG8OO3QZA+Q+0TLxpq086QErhBU=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.16.2": { + "pom": "sha256-0pd0eUdcVynnGNdKFrH0sDOlhPNKqINfgOy/MHJKnUA=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.18.2": { + "pom": "sha256-4h1diLBHShG3H+lBAMT1KVv6F08u5q5LCtArdhZHhkg=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-guava/2.18.2": { + "jar": "sha256-cb8hy/lU9EZcPgGHpiwwueDi7WEvpk3cuomoeTGyoIo=", + "module": "sha256-GvbeQyGW2+HaV18d3FiWKF3DS/pg6o3/+5/RN8rPnG8=", + "pom": "sha256-7i25uOpx1O5KQrwGqqcT0jbh69iM2JJ/ajKEcCMcPNM=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-joda/2.18.2": { + "jar": "sha256-Hd3EfKqnKAeD1ylsd/anBbepK8lapGkJP84EsTZ4c1c=", + "module": "sha256-l7/z2hhe3gfky7GdnuLX7aQbYeQlaRfLA9EF7fhxaNs=", + "pom": "sha256-fhIcCK11w60LpYCsK1K1Rz3DSIYw1QfituIuTjeeJjU=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.2": { + "jar": "sha256-4tIC1GBuI66vilqWMtsG9f79W2PSUcP1A/n6qnhTDlw=", + "module": "sha256-Jd8o9WC1kI6hAYUATV/Bkyk0hHBj5mcpJID2dbOx7eQ=", + "pom": "sha256-FivnrZea9eDHOc1+0BiJ+Br0ggDJ+RJ5lqElrFGzSkc=" + }, + "com/fasterxml/jackson/datatype#jackson-datatypes-collections/2.18.2": { + "pom": "sha256-VB0YzwMSgDw1e8lKVSkC4P5MdlieH4+dVtJOuwThRLc=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.18.2": { + "pom": "sha256-s6z7kQ0CPpOkGZr8zeH/nsX6sMVQ3E+WilBXEXrLCzY=" + }, + "com/github/ben-manes/caffeine#caffeine/2.9.3": { + "jar": "sha256-Hgp7vvHdeRZTFD8/BdDkiZNL9UgeWKh8nmGc1Gtocps=", + "module": "sha256-J9/TStZlaZDTxzF2NEsJkfLIJwn6swcJs93qj6MAMHA=", + "pom": "sha256-b6TxwQGSgG+O8FtdS+e9n1zli4dvZDZNTpDD/AkjI9w=" + }, + "com/github/curious-odd-man#rgxgen/1.4": { + "jar": "sha256-sTsHS/BFeKORAEFwh0RmSKB54tYmzYQfl5TjTmim6Ow=", + "pom": "sha256-rwIHmlYZmNS7r7ypKLxD5qSjfa6svs0ziBypPNW6TnQ=" + }, + "com/github/java-json-tools#btf/1.3": { + "jar": "sha256-Z8PkYutQgH9OCl9N7jBLvxfNmGpC7l6wsvTJv2TRMNk=", + "pom": "sha256-qb8bOVbm1Gy99zeRKOsXMs3hrGVAl5RNxlobbcQlcPA=" + }, + "com/github/java-json-tools#jackson-coreutils-equivalence/1.0": { + "jar": "sha256-60qa19gD+whL/895PIqB9R10W21DjChHDvnVql+4oYI=", + "pom": "sha256-0Vd8uaSY6Et0+ADXdRiQb/ErXT4vKJ2SqTauCU6sxeE=" + }, + "com/github/java-json-tools#jackson-coreutils/2.0": { + "jar": "sha256-FrOqvTqeslZV3aQz41+b2cfBqnmRQncC9fEfAAgT27A=", + "pom": "sha256-jZ7pOk/dXSvYDrqUonoTDWBo8/heSI61vxSUOHEc6eo=" + }, + "com/github/java-json-tools#json-patch/1.13": { + "jar": "sha256-H3lNJWlltT7zfnC1VQXi7QDdwBhNROLo4f3OWjysx94=", + "pom": "sha256-59lec35Uwo1EuFv2Qw8VNvZEZU1pQr2ogzM4r5aWSw8=" + }, + "com/github/java-json-tools#json-schema-core/1.2.14": { + "jar": "sha256-yFmUL92inCbMsr6DqEU6Ew3jX95viK4Yl4VRa10U+Bw=", + "pom": "sha256-pR/BAI6VN7vFJbpywl4Lz4LzXxscwwfC53jS7fO9V18=" + }, + "com/github/java-json-tools#json-schema-validator/2.2.14": { + "jar": "sha256-zZ48WZuzIpZRf9OsOL7qxwnwpquBstQolJXQNhulmJk=", + "pom": "sha256-W8HTDGddkv+DV3ldOvN172JqvffrMjS2TahmKqEeqZs=" + }, + "com/github/java-json-tools#msg-simple/1.2": { + "jar": "sha256-vvQRG5k6Wz5hSNj1hWIczqwqGInNvDREixFjLg2Kmo8=", + "pom": "sha256-bvPzUgcukUz6FzkzRoXyotAAJRL8Ul+kEtSQ1FCUMKM=" + }, + "com/github/java-json-tools#uri-template/0.10": { + "jar": "sha256-OTb2fY59+j7t7+RQ/1iHF0kwiYLGuLcGU1qIQ5HfT7A=", + "pom": "sha256-MXithX0gGmwpZy4rFGrAuj7MUlNquZaUpGuxJfoBxrk=" + }, + "com/github/jknack#handlebars-jackson2/4.3.1": { + "jar": "sha256-UjLit9Od6+U8/YQ54FLF4i2rnUPROkrm+QziV2D8iRY=", + "pom": "sha256-GLG2aavIFa3VZFQXH3O77lXF8EKe+3P74Wk8E+rWL3A=" + }, + "com/github/jknack#handlebars.java/4.3.1": { + "pom": "sha256-UECkDYFTRzveednE1O+4cSChaQ+uWFtYKAcH1DdCCZk=" + }, + "com/github/jknack#handlebars/4.3.1": { + "jar": "sha256-VCT9EukRzxW+/RY0G0bg4bxoGqYePLHAcMV+aNzNW70=", + "pom": "sha256-/DAp8kYk6YvWC1pGmSEPP1YKOUiTQpzQbMrYROj41BU=" + }, + "com/github/joschi/jackson#jackson-datatype-threetenbp/2.18.2": { + "jar": "sha256-WhH8ZX6ZfW2tJsOilRNaWDRHqkoPoB9CSj2Y4TcZHTA=", + "pom": "sha256-0PmnYltkM3ZwhFZ7X310MqvuZHwX/b/WxFyx4zYvRcU=" + }, + "com/github/mifmif#generex/1.0.2": { + "jar": "sha256-j4ziM8M14I4ROj+Ved4QRvsZkn6CRosbvrzWy6h2C4E=", + "pom": "sha256-R2QJlPzU46EZStsn0s/kEQII7qlCwgSDTZailCVt5hQ=" + }, + "com/github/zafarkhaja#java-semver/0.10.2": { + "jar": "sha256-qOMuF1ddAYjB8+Lle7ldsJeTiDyIU/3oKLY+yx+Zpjo=", + "pom": "sha256-fwBf8/kA6GlV9aU0tamqjqVLtdYLtgrCN1lVCjZnaDU=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson-parent/2.8.9": { + "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s=" + }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/code/gson#gson/2.8.9": { + "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=", + "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" + }, + "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.1.20-1.0.31": { + "pom": "sha256-lrP34a55nJ9OmB1DIOe/SzsXFWRF1s2MvXXH1/1Cv/s=" + }, + "com/google/devtools/ksp#symbol-processing-api/2.1.20-1.0.31": { + "jar": "sha256-dy+FxyWzgCE9grQ9abQImS/U2sr50zJo4kJpQQ6gl5g=", + "module": "sha256-4GCAUjhnrw8wK83PqhzRT0jXO0EG852X7TvKh6yL8Lk=", + "pom": "sha256-uqoBWau+KpclCzYnONSk6a+seGjjZ5uD4jOeOKVWYHo=" + }, + "com/google/devtools/ksp#symbol-processing-common-deps/2.1.20-1.0.31": { + "jar": "sha256-qiyLzpH11PQt9VjLY6CXZMYHmKIcyvsue2Iwjdzc2TY=", + "module": "sha256-lSn8quFQ0UpsBgHuv2mBUEnzv2asHlnOaO57fU2XnUE=", + "pom": "sha256-eeve5b/kHDHPi1u83bvZftu8JhyYbuv+DeZf1WEQ7q4=" + }, + "com/google/devtools/ksp#symbol-processing-gradle-plugin/2.1.20-1.0.31": { + "jar": "sha256-2ewkT6M+FXQk8eA2jNAWxKI4adwsUftrk6+aUuxIIVI=", + "module": "sha256-7q8aYoisLJi7sZRlqpfuLHWSSv1dK+/KO3w7hQP+P/w=", + "pom": "sha256-nQnbav/D80/FQo57fXmATVEROP3h0WIeKtEc9mQhXbY=" + }, + "com/google/errorprone#error_prone_annotations/2.21.1": { + "jar": "sha256-0fPGaqkaxSVJ4Arjsgi6S5r31y1o8jBkNVO+s45hGKw=", + "pom": "sha256-9ZiID+766p1nTcQdsTqzcAS/A3drW7IcBN7ejpIMHxI=" + }, + "com/google/errorprone#error_prone_parent/2.21.1": { + "pom": "sha256-MrsLX/JB/Wuh/upEiuu5zt7xaZvnPLbzGTZTh7gr+Sw=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/32.1.3-jre": { + "pom": "sha256-8oPB8EiXqaiKP6T/RoBOZeghFICaCc0ECUv33gGxhXs=" + }, + "com/google/guava#guava/32.1.3-jre": { + "jar": "sha256-bU4rWhGKq2Lm5eKdGFoCJO7YLIXECsPTPPBKJww7N0Q=", + "module": "sha256-9f/3ZCwS52J7wUKJ/SZ+JgLBf5WQ4jUiw+YxB/YcKUI=", + "pom": "sha256-cA5tRudbWTmiKkHCXsK7Ei88vvTv7UXjMS/dy+mT2zM=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/googlecode/libphonenumber#libphonenumber-parent/8.11.1": { + "pom": "sha256-X12sUXT4TGCi6Z56g8eCb3NJgfvCDqHUN/em/Piq2hY=" + }, + "com/googlecode/libphonenumber#libphonenumber/8.11.1": { + "jar": "sha256-9DDJI5TCBT8WhxWFPaltmZlulONOWikbl8XIalrWKpg=", + "pom": "sha256-irUVuq10qC2rsC6+nm8XLUj0r+0KyAxn7aKIRqbN7dA=" + }, + "com/ibm/icu#icu4j/72.1": { + "jar": "sha256-PfVyskCmjRO1zXeK0jk+iF0mQRQ0zY8JisWYfqLmTOM=", + "pom": "sha256-Pe8rKa9KGa2AXLFTBWklqJqQP5L77hre4S7S/BTETug=" + }, + "com/samskivert#jmustache/1.15": { + "jar": "sha256-GuuWudwXvClUC4wzQujpHul01cYEFl7NRp3XawQcJQw=", + "pom": "sha256-Z77EYiZJjJBFuqct8cnH9mG4XOObYni2TWign0Xry1k=" + }, + "com/strumenta#antlr-kotlin-gradle-plugin/1.0.2": { + "jar": "sha256-neZCtD2Y8AS8TX0wkpVdsuBaL8XKa8Q+tBVqNZVVkos=", + "module": "sha256-t1m4LoiMovlmQAXj1oy58wM2Vdv7KBrG0yqf6XxQ3c4=", + "pom": "sha256-MfifVba08ApogkXzkhvTzCO4Z9PizyAgYSRplmhZPJ0=" + }, + "com/strumenta#antlr-kotlin-target/1.0.2": { + "jar": "sha256-PNB1k/m4DnGNobdHHpfbjjuxU1hTkQk5qnvq+hlpFHQ=", + "module": "sha256-tzg2oj8tHSx6Zij3FLPcGB+QdvuWCRabJ/QwM6bz5AE=", + "pom": "sha256-CH31pxn7CrLgjHvQjgtP8YccIHqWvuz3Sz5sOgKO2UI=" + }, + "com/strumenta/antlr-kotlin#com.strumenta.antlr-kotlin.gradle.plugin/1.0.2": { + "pom": "sha256-k9f3Q5oTfttR/u3P53O0DEMrCq215CigG8erzV8Vn5E=" + }, + "com/sun/activation#all/1.2.2": { + "pom": "sha256-GXPUmcwsEmSv8tbQUqHHFq5hPQGK4cL2EN1qTRwkV44=" + }, + "commons-cli#commons-cli/1.5.0": { + "jar": "sha256-vIuwH8D60lA4VwbiD5J93P9hc/Yzmzh9yHkjd1JWesY=", + "pom": "sha256-TuxDxPwoBMvrQ2mcq/qC+gYocfzB3P0QkCpdglIGdMA=" + }, + "commons-codec#commons-codec/1.11": { + "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", + "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" + }, + "commons-io#commons-io/2.16.1": { + "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=", + "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "de/mannodermaus/android-junit5#de.mannodermaus.android-junit5.gradle.plugin/1.11.2.0": { + "pom": "sha256-t/WMW61Or7HykDeck2obA02h7vt/4A0usFyRxSXbehE=" + }, + "de/mannodermaus/gradle/plugins#android-junit5/1.11.2.0": { + "jar": "sha256-GAKPIqrV1Zx4DhD5Rlg55HpudC8eieZ7iFJSv5BRkAE=", + "module": "sha256-C2TlYxgPaaZloRD36F1C/M3F5Nc2o443uPGUhkmqYBw=", + "pom": "sha256-JUDnyFj7pBcEusJ6/+oBZ+ldhhfxyBwJ3iEjhKr4wbA=" + }, + "dk/brics/automaton#automaton/1.11-8": { + "jar": "sha256-okR19sz+HMek/p404Fzmh7DODG6Mt4Hg7O07GGSCxh4=", + "pom": "sha256-N1e360Vz2a4E37ViqPa9WqtKZbiD31RKTzYJTXz+I78=" + }, + "io/sentry#sentry-kotlin-multiplatform-gradle-plugin/0.11.0": { + "jar": "sha256-oF79yaoh0yoN/JzCh34jdSMHhBQ1HAhvng6H/WnigfA=", + "module": "sha256-BAVFTRMLVMv0d3rlOiVcJRDpnjGMhw5hwD+xYCxhDGk=", + "pom": "sha256-lsnWBhj/V6ICwjZdCW1tN5C5jhcTTzEMfPySFO/dius=" + }, + "io/sentry/kotlin/multiplatform/gradle#io.sentry.kotlin.multiplatform.gradle.gradle.plugin/0.11.0": { + "pom": "sha256-Wx8+RUj2DLyVZUVk+Xk+cbuU1STNcmfaPjL5xTFExP4=" + }, + "io/swagger#swagger-annotations/1.6.14": { + "jar": "sha256-J22F3CEgy8MLCL40t7rlQYRnymmDgUsNHgcYKeu1xQA=", + "pom": "sha256-XG0N2eUofKfwGeaH5i3HsGdnbwSJGV9fW+fmBTlVzLs=" + }, + "io/swagger#swagger-compat-spec-parser/1.0.70": { + "jar": "sha256-QG1OJJTrvLfBPUhPYEuBQEe34mgsw7cg0ixmXXaYjEg=", + "pom": "sha256-ypicQ+g5ALJ/rxXlx5zK+/mzpFs8UDoSgjrvf50BJjk=" + }, + "io/swagger#swagger-core/1.6.14": { + "jar": "sha256-2Xj1GhtYw8rtvflugONH7SndoNr4lEEw54WukqTdnyc=", + "pom": "sha256-zW3kbGB6HDQQElKqyX2EPQnpCxZAfZY2OcDqlQteTaI=" + }, + "io/swagger#swagger-models/1.6.14": { + "jar": "sha256-GMZMZwzhhe7VMZEqXQkj3RpbclxxRyGNcDsoNGyvlMM=", + "pom": "sha256-UXFllcHcdBALjQwb02lzqQ9W0PXI0aPgfk4J/IA3K6s=" + }, + "io/swagger#swagger-parser-project/1.0.70": { + "pom": "sha256-naIUULAVDE+U1YmsSIEtQh3mmNtIPDZ6PXiXbz3X9YU=" + }, + "io/swagger#swagger-parser-safe-url-resolver/1.0.70": { + "jar": "sha256-Ln6L9oFHtNvSS+JcEhd/Tig+krfDxvoD8EZjNkLzVcg=", + "pom": "sha256-pnrulNravyrPHrLB98dCdiweijfcRqflq95yDsNh7LU=" + }, + "io/swagger#swagger-parser/1.0.70": { + "jar": "sha256-lX6gThFPIQq8h6VDkm1mTB/ubvFePd1bhGtPrIPpEYE=", + "pom": "sha256-t1ioajcZscT68y1v4XxTalKGXxYjr1YXidKasKw0r6c=" + }, + "io/swagger#swagger-project/1.6.14": { + "pom": "sha256-9F5u6XAwQIotCRByYaFCqb8e9Y2WXZWYcBDfWZBqmL0=" + }, + "io/swagger/core/v3#swagger-annotations/2.2.21": { + "jar": "sha256-ZEUU+9oJzwvYwql2bsqaQofWxsOzRktc97Qx51sW0W8=", + "pom": "sha256-f+e4Efwks28d4ZBh3M2NNu8TxzAClbrDUq/ODZXhS5Q=" + }, + "io/swagger/core/v3#swagger-core/2.2.21": { + "jar": "sha256-wkL+SD0YHvsxYcjO8jLS8U03T2Cl/3xhrM59YeZBFJ0=", + "pom": "sha256-dfPAX969TtOmiCL93OV4dbFYMeLkfeSPWoWS83nrkNo=" + }, + "io/swagger/core/v3#swagger-models/2.2.21": { + "jar": "sha256-kQ9VvG+elOuM9mB0G8ghVnSkbdtmG1uKdSWyW2VStTg=", + "pom": "sha256-fxD+bKOG8XLV2U71emtTC1WJpP88pxJ6DFy9S4pv8yg=" + }, + "io/swagger/core/v3#swagger-project/2.2.21": { + "pom": "sha256-oiRjNjBIh36joj69WOGddbieayxhGJnmxjZ11e2kopQ=" + }, + "io/swagger/parser/v3#swagger-parser-core/2.1.22": { + "jar": "sha256-Vrr9/sIPaeCstC8QZ/yJdUwO/5MKjmUYdS+1EFnpPro=", + "pom": "sha256-VXT1Zc9Z+wntNm6Aw1PFu6tnEMP+hdMtrsV0RcEUUpM=" + }, + "io/swagger/parser/v3#swagger-parser-project/2.1.22": { + "pom": "sha256-m9KOOxqc4ku4hYtZMikKU/uWTFzTLwuiYIHSiRaGU8U=" + }, + "io/swagger/parser/v3#swagger-parser-safe-url-resolver/2.1.22": { + "jar": "sha256-TLSrNBq3mzOnl3YUVYmG0Spl99F+s5jUZYcxDJhAZkQ=", + "pom": "sha256-pTqKn9Mt9uyasjgEdLq02XOVTkKoEk3PJjg/gW5V0nQ=" + }, + "io/swagger/parser/v3#swagger-parser-v2-converter/2.1.22": { + "jar": "sha256-ZdYDOEa7MOP77YKQKHUh1+4+qciFv4wRKLyAbCGuX5c=", + "pom": "sha256-ro9VZVRvOHC/5RFdggAUVkKw7Y9aDqHS13LtVfLcohI=" + }, + "io/swagger/parser/v3#swagger-parser-v3/2.1.22": { + "jar": "sha256-BG/B+afec2a/unwbF5Dh77DnIN3JR1rVX8Wz00rOkXU=", + "pom": "sha256-28v9n4aXUQZyxQg2+vyMfAs5CbOa8UI3rANkAJsL2AA=" + }, + "io/swagger/parser/v3#swagger-parser/2.1.22": { + "jar": "sha256-F2yeSuhlXHy2sOilbA+kBLFasK6wy3LkopTurQhK6yM=", + "pom": "sha256-jCk5Kv5uPnYrDDmEgP7oSkymWNWr5G7DeTtsvuQkIa0=" + }, + "jakarta/activation#jakarta.activation-api/1.2.2": { + "jar": "sha256-oYepORA671hJp6+EvX4nvi0SDEEK8pFDc3X/4GH08J0=", + "pom": "sha256-XlD+k4BoRx9QSn78QHGCNCW1IOq8b4DHLZNevVRoMJE=" + }, + "jakarta/validation#jakarta.validation-api/2.0.2": { + "jar": "sha256-tC1CQo89kiyJKpCfoEMofVd8DFsWWtm31WjOv4f8nqQ=", + "pom": "sha256-Oy5Oh3+3C6+h2tdcDemZxFYTEoLUcbpR3z25bDt02pI=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.3": { + "pom": "sha256-KA2lMXYBZtRBI2jQ3Yme9K6/0KfYK/IzUC4phWgGrak=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/2.3.3": { + "jar": "sha256-wEU59HLppt0MdoXqgtZ3KCJpq457rKLhRQDjgeDGzsU=", + "pom": "sha256-f+LKXc5LFKZGu/kh0TykLK8qLAZU2hVcdWOGXJiTlv0=" + }, + "javax/validation#validation-api/1.1.0.Final": { + "jar": "sha256-8517pyU+NfWsSAgewbwoxd+bMqxLfbIIU+Wo52v3sO0=", + "pom": "sha256-uGNJEebL5sFLML0G44N9fmko/H4clieN7GFwi2qu4hw=" + }, + "joda-time#joda-time/2.12.7": { + "jar": "sha256-OFKCsAWBjPrM2+i9JCmBHn5kF4LyuIkyprj/UdZo9hY=", + "pom": "sha256-hf3b+kfCmf2OzhyT//1H2cLTyQNaM7XbAXswTGd+hCg=" + }, + "net/java/dev/jna#jna/5.12.1": { + "jar": "sha256-kagUrE9A1g3ukdhC4aith0xiGXmEQD0OPDDTnlXPU7M=", + "pom": "sha256-Zf8lhJuthZVUtQMXeS9Wia20UprkAx6aUkYxnLK4U1Y=" + }, + "net/sf/jopt-simple#jopt-simple/5.0.4": { + "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=", + "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.3.4": { + "jar": "sha256-+SesOExG10n4texolypTrtIeADE1CSmWFu23O/oV/zM=", + "pom": "sha256-nnwfPkiZGUQOjBMInlljcp1bf4D3AjO/uuMJxkmryj4=" + }, + "org/antlr#antlr-master/3.5.3": { + "pom": "sha256-6p43JQ9cTC52tlOL6XtX8zSb2lhe31PzypfiB7OFuJU=" + }, + "org/antlr#antlr-runtime/3.5.3": { + "jar": "sha256-aL+fWjPfyzQDNJXFh+Yja+9ON6pmEpGfWx6EO5Bmn7k=", + "pom": "sha256-EymODgqvr0FP99RAZCfKtuxPv6NkJ/bXEDxDLzLAfSU=" + }, + "org/antlr#antlr4-master/4.13.1": { + "pom": "sha256-28/JebgFKPwMtFP8to28nSsGA6e+LNzpmrL8aHFGnRg=" + }, + "org/antlr#antlr4-runtime/4.13.1": { + "jar": "sha256-VGZdKDjMZkWDQ0aO/FOeRU/JW0aooEsTxqxD/JvmNQU=", + "pom": "sha256-GSJrF7+jj5nqImsi6XQg4qjt4JqXQg+xrPGG2a2kZXE=" + }, + "org/antlr#antlr4/4.13.1": { + "jar": "sha256-ziYdzmlSWDmqn8W9IyzhuBOnpAp1AwcTzEqA74Fw89U=", + "pom": "sha256-ahWaEs/WYoqnNuw//ZM/qUEuXLy3zn7FIXo/9CDGapk=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/30": { + "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache/commons#commons-lang3/3.12.0": { + "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + }, + "org/apache/commons#commons-lang3/3.14.0": { + "jar": "sha256-e5a/PuaJSau1vEZVWawnDgVRWW+jRSP934kOxBjd4Tw=", + "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/42": { + "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/54": { + "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M=" + }, + "org/apache/commons#commons-parent/64": { + "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" + }, + "org/apache/commons#commons-parent/69": { + "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" + }, + "org/apache/commons#commons-text/1.10.0": { + "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=", + "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc=" + }, + "org/apache/httpcomponents#httpclient/4.5.14": { + "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=", + "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.14": { + "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.16": { + "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcore/4.4.16": { + "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=", + "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o=" + }, + "org/apache/maven#maven-parent/41": { + "pom": "sha256-di/N1M6GIcX6Ciz2SVrSaXKoCT60Mqo+QCvC1OJQDFM=" + }, + "org/apache/maven/resolver#maven-resolver-api/1.9.18": { + "jar": "sha256-6/ueHf7qPCAXkFGEWB4AeHS06qydKL//z+UTPXCsYzk=", + "pom": "sha256-gpDaoM1/u6B2ewc2hmkig4fKuumaE8NDP71FcGKa44Q=" + }, + "org/apache/maven/resolver#maven-resolver-util/1.9.18": { + "jar": "sha256-LrDqZnvEiThEeCMd2nUWQH1LWyKhOAdyKYcd6TYqeuI=", + "pom": "sha256-qY5q9c3xskVkhq4LuBKOUv7o1plmKa9gYGu8nBqt+Ow=" + }, + "org/apache/maven/resolver#maven-resolver/1.9.18": { + "pom": "sha256-+x3U5VTNLbzt6WFSlJIecLGDUz9GeROs2aN4f/3WlDs=" + }, + "org/checkerframework#checker-qual/3.37.0": { + "jar": "sha256-5M4TdswnNeHd4iC2KtCRP1EpdwTarRVaM/OGvF2w2fc=", + "module": "sha256-clinadyqJrmBVNIp2FzHLls2ZrC8tjfS2vFuxJiVZjg=", + "pom": "sha256-AjkvvUziGQH5RWFUcrHU1NNZGzqr3wExBfXJLsMstPA=" + }, + "org/commonmark#commonmark-parent/0.21.0": { + "pom": "sha256-qeGddPQOEj3jbHAaUlIg2r5eMjVDZUfbek/TwJi31Qs=" + }, + "org/commonmark#commonmark/0.21.0": { + "jar": "sha256-gQhKcDUEb+MG8NvxbvV6aNCO5clwBOqGfmK120bpivs=", + "pom": "sha256-RhGg7TfAGTzGANRRrUxFfT0NVBxaxlbI2ANL0s0NB1g=" + }, + "org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.2.0": { + "jar": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4=", + "module": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A=", + "pom": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8=" + }, + "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0": { + "pom": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc=" + }, + "org/gradle/toolchains#foojay-resolver/0.9.0": { + "jar": "sha256-woQImj+HVX92Ai2Z8t8oNlaKpIs/5OKSI5LVZrqBQXY=", + "module": "sha256-huXl1QMWJYbAlW/QKippt22nwHIPSuAj82bRkaqXtLg=", + "pom": "sha256-wdtMSmUHZ5Y7dl/Q3d7P4eqLjp9kQo+H3iB/V48DeOc=" + }, + "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.9.0": { + "pom": "sha256-23zxG+5ohO+yiQQTn2LAD4tFhT5gwPQXFc9pV2tr/fA=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/compose/hot-reload#core/1.0.0-alpha03": { + "jar": "sha256-sXY83+E7TDiJLkTqUbKyBEzWdB73v7ppAeWSttDPdss=", + "module": "sha256-6B2a5ZhgmkSrE5l7lgnFu/hU0j/GBP3/Zj071dhUwEw=", + "pom": "sha256-ZDkxOX0cJjb3BJdlmSk5SKNt4II5RquXUz4atBBD7hM=" + }, + "org/jetbrains/compose/hot-reload#gradle-core/1.0.0-alpha03": { + "jar": "sha256-ArOlcPFBb10zQws+/DO6X6uHcr2bAySJnFMpJg+iXQg=", + "module": "sha256-TL4UEllYyAE/juhiFS/rRWTltEFDrb3SuKaqScQTDe0=", + "pom": "sha256-yVcTDcpxhlk+k6lBjKJJwHSEmncZ7cWfNKvOVqDNh9M=" + }, + "org/jetbrains/compose/hot-reload#gradle-plugin/1.0.0-alpha03": { + "jar": "sha256-kT5z6wT3AoGlRRQW5/1KiZD7lJdsvf61zs5UrcPIADw=", + "module": "sha256-4vhcxiwri2vlC3qx79MSLSFBXi19h4xZ4NrMdIMVVIw=", + "pom": "sha256-H/FOLefyU9o7v15vv4DjGgztd39qvRnovBvonqtRYkA=" + }, + "org/jetbrains/compose/hot-reload#orchestration/1.0.0-alpha03": { + "jar": "sha256-tJSgulpBLpxImvtn5FUj5QBnOczDsnLotmZJi5nxazQ=", + "module": "sha256-VD+3LEWr2cBGKPIxa17H8GUVbxmme9Bqr+RA3lKBMsU=", + "pom": "sha256-fsMmjEdZdtzGHnR3idvcj8Ng+bECO+crxahWdUGGt98=" + }, + "org/jetbrains/compose/hot-reload#org.jetbrains.compose.hot-reload.gradle.plugin/1.0.0-alpha03": { + "pom": "sha256-ynIJvP9Ake+iyJdFtsYg/Kt63h9qiM3exgkxsqStie4=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-assignment/2.0.21": { + "module": "sha256-8638yrZURNtqqzwNfSVoZG7AyS8kWCh/KLKu5POXNtw=", + "pom": "sha256-QBfCQqfb3Oca6ApXB7S/OyOoIr8jpodahFp7UTYhzQ8=" + }, + "org/jetbrains/kotlin#kotlin-assignment/2.0.21/gradle85": { + "jar": "sha256-USUeNCELiNTJCAXKZS6Xe93IR4OkVAY5ydIQkJhbrOY=" + }, + "org/jetbrains/kotlin#kotlin-build-statistics/2.0.21": { + "jar": "sha256-gBILdN8DYz1veeCIZBMe7jt6dIb2wF0vLtyGg3U8VNo=", + "pom": "sha256-/iTcYG/sg+yY3Qi8i7HPmeVAXejpF8URnVoMt++sVZ0=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { + "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", + "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.20": { + "jar": "sha256-Uzw2yzYubtLRX1hzLn9MbSvtXJ1RebiXvEsJ0W1gU3c=", + "pom": "sha256-kn9h95cmHFnktTEDFNaf1KOrjvT3A596UyYHXEKkFzo=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { + "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", + "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { + "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", + "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { + "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", + "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { + "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", + "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.21": { + "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=", + "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.20": { + "jar": "sha256-sk9SbQ3++wKWrg9Ks2L51soCV3JcwnMIOprjN+ooJn0=", + "pom": "sha256-wKs06ffQCv3LIv0D5S6PhZpGR9lY4Lh7fQzSY0QWOlo=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=", + "module": "sha256-z29dNExVVVS/rGQFHq0AhcvUM4Z2uqP8h7UD6eSrvjQ=", + "pom": "sha256-gV5yqZ4ZFD1mLSTkYlKlnOdWMC18W9/FlIF9fMexI3g=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21/gradle85": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20": { + "module": "sha256-AsJsJlASRw1yrc3buCTSOOayieEAzUu/moJ1Cj1Jv8A=", + "pom": "sha256-t02/6klcg6xWRwS6qDmk56W3kRiMj3llbJwZ3XfeLxg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20/gradle85": { + "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.21": { + "jar": "sha256-UzVXQrV7qOFvvfCiBDn4s0UnYHHtsUTns9puYL42MYg=", + "pom": "sha256-OMyaLLf55K/UOcMQdvgzFThIsfftITMgCDXRtCDfbqs=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.21": { + "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=", + "module": "sha256-YqcNAg27B4BkexFVGIBHE+Z2BkBa6XoQ2P2jgpOI0Uk=", + "pom": "sha256-1GjmNf3dsw9EQEuFixCyfcVm6Z1bVIusEMIjOp7OF74=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.21": { + "jar": "sha256-lR13mJs1cAljH/HvsSsBYczzKcUpxUalKfih0x+bwDw=", + "module": "sha256-6qn9n4b71E/2BwoZfce90ZgPDUHo20myUoA9A6pMVaw=", + "pom": "sha256-5RVeYOyr2v1kUmVKaYALyyp37n0fxucH+tOo5p8HTCw=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21": { + "module": "sha256-D5iXoGwHo+h9ZHExzDSQofctGuVMEH8T9yJp1TRLCHo=", + "pom": "sha256-RenM7OM+TY36mUHMkS81RYIBqdPwQ3IMMket3lf0f/Y=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21/gradle85": { + "jar": "sha256-nfXH/xOx/GislFDKY8UxEYkdb2R73ewPQ5iz5yJb9tk=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.21": { + "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=", + "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.20": { + "module": "sha256-IF4RacYovsBfHVnkTTIJFSiun9U6fjPsVDvO/bEojeY=", + "pom": "sha256-Y5ymx2U+Gp2pXfKjuuJsy3AcA6/VjHl6tr9vJV9kwwE=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.21": { + "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=", + "pom": "sha256-Y/6HvSI1sSlAnHIqCbYsIKe3eueQGeIgMSSK9zawPFQ=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/2.0.21": { + "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=", + "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/2.1.20": { + "jar": "sha256-pyVic6u53yI1kk2A/dNtZ4tFhGfDB2xmhRxCQ3vdPGY=", + "pom": "sha256-1Gec6AsERY5fzL1pteMUvxwMFnmH4EOVRv3+z7U+M0Y=" + }, + "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21": { + "module": "sha256-kJCVCx7oa4b+KWmV2AKG6opPN5+yshjoVvzt0ErS1Hk=", + "pom": "sha256-7lYZBmzLB5zDMy4kcnQ1n9dQXeLVQPuRtyd5ICW2Siw=" + }, + "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21/gradle85": { + "jar": "sha256-HSNuNiIzuaJx5QsiOlDI2+rdA1C2OiRkYIJWhS2jaKM=" + }, + "org/jetbrains/kotlin#kotlin-serialization/2.1.20": { + "module": "sha256-OMZPybedsk2Y415NutDvDjOxdsKXSTE8c7k6D5bCIgs=", + "pom": "sha256-Ffv0qiQBTCr6vmXjwzrY39LYocR8z5dsBbqKNqGou0I=" + }, + "org/jetbrains/kotlin#kotlin-serialization/2.1.20/gradle85": { + "jar": "sha256-rNawwcN18ocop1LMbI0itREnbFT1DZcb7UM957K9qjI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.25": { + "jar": "sha256-+1Nz3XYbTpPj9TjF6FO7o4pxFDoYFTbo8ZPtbk7ds7g=", + "pom": "sha256-ckCZBrgP9PZNYa6k78tXnSAVKEJm36nXnL2R56IzPzU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.25": { + "jar": "sha256-+U/feDkM6b4wODvwOcWpNcrqM7EfA3/H+Gu87hkoflo=", + "pom": "sha256-iFJunaBb6fYOQo2CJojL5PW7mpJAxaz5W7fHJH4F0lc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + }, + "org/jetbrains/kotlin#kotlin-tooling-core/2.0.21": { + "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=", + "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo=" + }, + "org/jetbrains/kotlin#kotlin-tooling-core/2.1.20": { + "jar": "sha256-tPu1I+hmLUqEUbmjap5/1D9jfLDNapueNoFxlmXavY0=", + "pom": "sha256-PO8cS3yC7KjMAcMMrt0VSQWeZfL51BYsjJ13+6JBMXY=" + }, + "org/jetbrains/kotlin#kotlin-util-io/2.0.21": { + "jar": "sha256-Dv7kwg8+f5ErMceWxOR/nRTqaIA+x+1OXU8kJY46ph4=", + "pom": "sha256-4gD5F2fbCFJsjZSt3OB7kPNCVBSwTs/XzPjkHJ8QmKA=" + }, + "org/jetbrains/kotlin#kotlin-util-io/2.1.20": { + "jar": "sha256-gqOymmEdR85jSuLmxQnN4qhvlLI7hr4whk6z1Lj+jn4=", + "pom": "sha256-eSQnftICC4UQ1F8N0QgREmVoEDAH2D+ZcfwYRmC9hKM=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": { + "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=", + "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU=" + }, + "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.1.20": { + "pom": "sha256-YjXePQABYjdcj3IvCO2hU/CQ4RoDW0qbi+fqxO8UX+Y=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { + "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", + "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", + "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + }, + "org/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.11.2": { + "module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=", + "pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI=" + }, + "org/junit#junit-bom/5.7.1": { + "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", + "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + }, + "org/junit#junit-bom/5.9.0": { + "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=", + "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit/platform#junit-platform-commons/1.11.2": { + "jar": "sha256-A848YFTAEaJpU6Bl2mpISJ0fvBmV5Mo8bXACk+cbWAA=", + "module": "sha256-JDUwwaksy3kIxfplM+srI8HhSb64v/Kx6w3jIbnM35U=", + "pom": "sha256-AsIlCWXiPhdtqNtEtxYTPNZcOFIzwdMf7DF9zxZCpKA=" + }, + "org/mozilla#rhino/1.7.7.2": { + "jar": "sha256-XG2uBQzrcXdKX8gs5uPwOS2vD/qew1lvcNTQfuULiXA=", + "pom": "sha256-B2kGiYfBiVPlHUGeBi9AlW8egvOioUD+qITXxeb6lH8=" + }, + "org/openapi/generator#org.openapi.generator.gradle.plugin/7.12.0": { + "pom": "sha256-cy0Bb5mz68spMTiBTLZzrileVwJ7eszW3rI4i36trvc=" + }, + "org/openapitools#openapi-generator-core/7.12.0": { + "jar": "sha256-1i7L+r769XJwuQlPhT22OSLBurjRvZeySSsU+dXh3cc=", + "pom": "sha256-pM5XOAPpXM/kpE6SfjNl8OjhjXuLyOhuWip4LcIPp/Q=" + }, + "org/openapitools#openapi-generator-gradle-plugin/7.12.0": { + "jar": "sha256-7ebZvRqfYpJphbGh2zs7bL6hpdmA6AriShY8YtKgL+w=", + "module": "sha256-/36BV6Z93iRmMO4NCKQoSmvq+7BGOwUhx82o38uJwO0=", + "pom": "sha256-mpt94GZYvi5qWOspjwNtQVI0KDhhWaoBG04fUezQxFI=" + }, + "org/openapitools#openapi-generator-project/7.12.0": { + "pom": "sha256-A0Cv8o4MgwW361VK1RFPIpHDgmn10mTSxwsjfYs6qL8=" + }, + "org/openapitools#openapi-generator/7.12.0": { + "jar": "sha256-iCgK585kGwsTh5c+b0SB/mzUXLa0DDjpKlABC0vNxf0=", + "pom": "sha256-dy1bhJjSzsifgrn8wlQuCEwknqVNY3JAyQdQF6Qt25A=" + }, + "org/projectlombok#lombok/1.18.30": { + "jar": "sha256-FBUbR1gtVwtN4WoUfs4729GazkruW946VXjIfbnsuZg=", + "pom": "sha256-ZQAfOC9dHORWkjEbsbp8JDyFYZXUkkc9cv+afRzHdpk=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-api/2.0.16": { + "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=", + "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c=" + }, + "org/slf4j#slf4j-api/2.0.9": { + "jar": "sha256-CBiTDcjX3rtAMgRhFpHaWOSdQsULb/z9zgLa23w8K2w=", + "pom": "sha256-nDplT50KoaNLMXjr5TqJx2eS4dgfwelznL6bFhBSM4U=" + }, + "org/slf4j#slf4j-bom/2.0.16": { + "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk=" + }, + "org/slf4j#slf4j-bom/2.0.9": { + "pom": "sha256-6u9FhIB9gSxqC2z4OdXkf1DHVDJ3GbnOCB4nHRXaYkM=" + }, + "org/slf4j#slf4j-ext/1.7.36": { + "jar": "sha256-mlXkRTG1xiOgxTqqn0yr2RG7AFx1EqBMXTTlZNv7N6s=", + "pom": "sha256-VTdBQZqrqQ3JxJgXs2fFQjihNXzVFXZzDVF2e3fKUzE=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/slf4j#slf4j-parent/2.0.16": { + "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU=" + }, + "org/slf4j#slf4j-parent/2.0.9": { + "pom": "sha256-wwfwQkFB8cUArlzw04aOSGbLIZ7V45m2bFoHxh6iH9U=" + }, + "org/slf4j#slf4j-simple/1.7.36": { + "jar": "sha256-Lzm+2UPWJN+o9BAtBXEoOhCHC2qjbxl6ilBvFHAQwQ8=", + "pom": "sha256-xWuAoKa+oqBGPnDQiSrjOKnlB+SGdnpSBFNAmBIFjRs=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/threeten#threetenbp/1.7.0": { + "jar": "sha256-hXkX0jGaTpLcHF4663Wg2shERe0xXnrD2Cu40rKYl38=", + "pom": "sha256-nLthSu/sbVcp7MrdZMmhnpshg/w6Dgk8APN2rPptC0Q=" + }, + "org/yaml#snakeyaml/2.3": { + "jar": "sha256-Y6dv5mtlI2C9TCwQfm8CWNqn1LtJIAi6jCb80jD/kUY=", + "pom": "sha256-D1omWgYzGwBJ41K+MsoyLeGLF/PU27cGNdQNppLjWC8=" + } + }, + "https://repo.maven.apache.org/maven2": { + "co/touchlab#stately-concurrency-jvm/2.0.6": { + "jar": "sha256-xXzbbhXYgkYbZMLTW+5HStX2u2n292NYsAMbjpdifMU=", + "module": "sha256-n0VLzay0uQBBPuzIjvnxynJaJf5WgxZ195hTywqesxc=", + "pom": "sha256-Sn16ELtB2tpniuJG9su7Zq+TkEEA4VA+L+ejydzS4Zw=" + }, + "co/touchlab#stately-concurrency/2.0.6": { + "module": "sha256-IlN5jSsDf4/hgTUWU7fNF1k4fs1pF5rMUNn0B4A/64s=", + "pom": "sha256-L5e3PLF1pEI0TLUmCdQ75sPOwnzOpyekuBs49H+kbDg=" + }, + "co/touchlab#stately-concurrent-collections-jvm/2.0.6": { + "jar": "sha256-eiZz5zS76bg3OXVlw+lvAZM1VrZIpBvy5/LHiM0KJt4=", + "module": "sha256-QP8Kqzsjmb7vobUCrAqy1a1wfRcLYqftfLSVu2QQnZk=", + "pom": "sha256-CRJBRhJXMyyjdGw4Sy/lj7Q/n/ep6ZjZVEqmddCAdqs=" + }, + "co/touchlab#stately-concurrent-collections/2.0.6": { + "module": "sha256-/Pqut7oYe99qycvB0HNJiWSbCn/8bfteU5TBcJYfaLI=", + "pom": "sha256-sid4YljDlKaO0ntiFyaB+JdOQoJHeTBU0XxAxlDEEfI=" + }, + "co/touchlab#stately-strict-jvm/2.0.6": { + "jar": "sha256-cM/Ua0UA8Z6fF7hakUCrQC9c8S1RAtLVbBNPp2vtpHw=", + "module": "sha256-3dQ2UrC12fnIuNPe+e1XZ9OaNKWvQ74o4MQ46Ohsrvk=", + "pom": "sha256-poFWwpzfT/g8rvcucNWk0oSDVxYdNwbJnz3OceVgEbQ=" + }, + "co/touchlab#stately-strict/2.0.6": { + "module": "sha256-TyxtwTMLI7F5yQS56cxGPAip+d0LOXKawSy9I8at6f8=", + "pom": "sha256-A9TEJqxQFp4ofkJnI97GkZOI2npXJF605qNVeWsvswE=" + }, + "com/android/tools/build#transform-api/2.0.0-deprecated-use-gradle-api": { + "jar": "sha256-6LQVGuFnnxq+ehTuNxrJs8ZRrntjKQ0fWGvdD3j6zpo=", + "pom": "sha256-1J0Xn3B9PzoAsqfTYTa1SqjUT6IncHA82C/lL7OeIus=" + }, + "com/eygraber#jsonpathkt-core-jvm/3.0.2": { + "jar": "sha256-p5YDAMnGB+mrTGfGsfI1Q31i1XlsAKM8qNLSTEsAlRc=", + "module": "sha256-xoNNMOycXFQLQunNVozBdhA1vAac71PlgGanCaCAGps=", + "pom": "sha256-xsHLkcRuA4Y0aCpEoOO/k6UEwyigwTuZfh/CS/jWUvo=" + }, + "com/eygraber#jsonpathkt-core/3.0.2": { + "module": "sha256-t/rlfihk0gBJtP5H37obpKZ7nZs4QnPTdrth+fOzHMA=", + "pom": "sha256-nBE2rnSk5zRu3Dw67dLZIjzi4auz/NhLHJu6BSf3Bm4=" + }, + "com/eygraber#jsonpathkt-kotlinx-jvm/3.0.2": { + "jar": "sha256-tyo9Ns009XB66Jr679syLsRojca6knCx79BXqGJDOSQ=", + "module": "sha256-mt9oMtVSnT9dFCYgiR1Dlo9Svl9+b2P/fgyJ2P01Sxk=", + "pom": "sha256-DbV9LdB2fAqSwcRZjt7l42eq0WiA1UMPAwWhHpzgvUw=" + }, + "com/eygraber#jsonpathkt-kotlinx/3.0.2": { + "module": "sha256-D6X/2rSnMu5nKkWKtijyx4sAAAwvI/EE8ovfpUwUuC8=", + "pom": "sha256-1Tqg0V7psdzgrm2Vh3UjYYFR2koOK4k8uh5aCdGWSFo=" + }, + "com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.1": { + "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/github/ajalt/colormath#colormath-jvm/3.6.1": { + "jar": "sha256-oYU+5KX+xjbbu4xElVt6MBXwLOj5z6HCNQeRwsLTY5w=", + "module": "sha256-fHKvGnzj4EFMhBqBgWvDwVpy6X9lKMwHqp+lSFCHpYc=", + "pom": "sha256-PeaemJMjZ5OF480HME/v08BfRFa7MsoyJ8s7y/RNHAo=" + }, + "com/github/ajalt/colormath#colormath/3.6.1": { + "module": "sha256-xA0F1dTNksc2qxDVkR6HjjsIqBRa76mjy20/VUPM8Bc=", + "pom": "sha256-uBYdwuDrGNPXm8koHtFxA3IcwcEvFYo1QydbqSlw/jg=" + }, + "com/github/hypfvieh#dbus-java-core/5.1.0": { + "jar": "sha256-zwHLfTNa9q4l/NWL0vGsmoRlrNUpZwZoo6OQL9jByc8=", + "pom": "sha256-wzg1ufJbGqFilYhA+bHFuK1spezi9s1tQaFNrXn/w2o=" + }, + "com/github/hypfvieh#dbus-java-parent/5.1.0": { + "pom": "sha256-W076MXQHBiM+KijdiegYah39xbo/GMrNPyfjvA/hp8o=" + }, + "com/github/hypfvieh#dbus-java-transport-native-unixsocket/5.1.0": { + "jar": "sha256-J2y5zyB1tipKDgAXVrjG+KtBJfFVQSi3WLG4C4Scou4=", + "pom": "sha256-/NNmULVPly2uVrpHy6DCGZk0SIWLuAPRGil5eqC2B2M=" + }, + "com/github/oshi#oshi-core/5.8.6": { + "jar": "sha256-avZFtrMZxaH+alrAPB+0seypajtifK6JU1L5ibcgkBc=", + "pom": "sha256-iNcNOxnby2YuXDxFceX8mavCZldu+Cv6u7RGkm9MISo=" + }, + "com/github/oshi#oshi-parent/5.8.6": { + "pom": "sha256-Fe+B2OTv+TYQPJ+HYGMM7LNXs5OGTFuvnKWHQTOzkMc=" + }, + "com/github/seancfoley#ipaddress/5.5.1": { + "jar": "sha256-XqReV9sMLWJBkqUEbO6kGwrK95t2ilShTIZ5G7ZFknA=", + "pom": "sha256-SgNmB8ql/IEESw4z3aBYEuXIwwk8rZwtAYkF+up2Klo=" + }, + "com/github/zafarkhaja#java-semver/0.10.2": { + "jar": "sha256-qOMuF1ddAYjB8+Lle7ldsJeTiDyIU/3oKLY+yx+Zpjo=", + "pom": "sha256-fwBf8/kA6GlV9aU0tamqjqVLtdYLtgrCN1lVCjZnaDU=" + }, + "com/google/android#annotations/4.1.1.4": { + "jar": "sha256-unNOHoTAnWFa9qCdMwNLTwRC+Hct7BIO+zdthqVlrhU=", + "pom": "sha256-5LtUdTw2onoOXXAVSlA0/t2P6sQoIpUDS/1IPWx6rng=" + }, + "com/google/api/grpc#proto-google-common-protos/2.17.0": { + "jar": "sha256-TvH+DDJ/wVIdHXU7CxxKh1pUvRTr3tOv/wyjlTILbqk=", + "pom": "sha256-PwKBU6WFxZ9Viz5Dp8mAmmAai7XpEGHWxlj/+iTLjiY=" + }, + "com/google/auto#auto-common/1.2.1": { + "jar": "sha256-9D8p/ipuuvBLJZjN7sMqTjRtSalATpkPX8GcGfOijQ4=", + "pom": "sha256-E7S1AGKUn4sTQ5J8WBU207sFG4r+pQmqb5AvTeKLwbI=" + }, + "com/google/auto#auto-parent/6": { + "pom": "sha256-BfdAxmSBZdsAz2GN1WwgDEcl41jm1U9YU+C+wVc06go=" + }, + "com/google/auto#auto-parent/7": { + "pom": "sha256-pGQm/MtdMnBa2cu8mW94a9BIzIy90h2wRlABafFaQ1Y=" + }, + "com/google/auto/value#auto-value-annotations/1.6.2": { + "jar": "sha256-tIsE3bpA6KwzvwNvBvxDmV/FCEvZS9qs6AfOJ9O+o/s=", + "pom": "sha256-HHbNRi/JbnqpbccM6C8NVAY9bfFts1ycfZzA0amdP/8=" + }, + "com/google/auto/value#auto-value-annotations/1.6.3": { + "jar": "sha256-DpUf7owx9gJwvEZVOoWGABt7k9uxKuwGNzqpmhUDksA=", + "pom": "sha256-4fx4D37gJeZis9pycj2+KsjawKL4kg8mUxXE4b49dlw=" + }, + "com/google/auto/value#auto-value-parent/1.6.2": { + "pom": "sha256-J7ZAyCF59c/2IAnAtyAz2bxg9g6ZAqZoAidLf+N/yBw=" + }, + "com/google/auto/value#auto-value-parent/1.6.3": { + "pom": "sha256-5Z31cytMs01XJxgURvne2c5EJRMaChBiUZ7qGW3k2KE=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson-parent/2.11.0": { + "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" + }, + "com/google/code/gson#gson/2.10.1": { + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/code/gson#gson/2.11.0": { + "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", + "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" + }, + "com/google/crypto/tink#tink/1.7.0": { + "jar": "sha256-iJcKRWoIukxmsBsj5YRsoQlcwU5Uy0g2Pl0uFaEwcwg=", + "pom": "sha256-Ku41I3FfjyzRCyYDyNGeVhrHWDELfiyYU5RtLF57S/c=" + }, + "com/google/dagger#dagger/2.28.3": { + "jar": "sha256-8d0j+K40qOkTZnI5kerQ1kmdGj6RY85VDCALAtdqhys=", + "pom": "sha256-JlupWajhPDoGEz8EtTkWnBAY2v/U0z9TxFOrTLOG9XA=" + }, + "com/google/devtools/ksp#symbol-processing-api/2.0.10-1.0.24": { + "jar": "sha256-3X3eBwvlTeZse91N4ExD+0KeDGK7EypkSM+jNlOvsik=", + "module": "sha256-v8OiFHE2oHw5IP2mGeugc8uTgcVlf++xYc/ViZSPmVI=", + "pom": "sha256-RSj+eY/v7sCVpz6GHBIG+oJUlqDntlInL0D/yWCBTmI=" + }, + "com/google/devtools/ksp#symbol-processing-api/2.1.20-1.0.31": { + "jar": "sha256-dy+FxyWzgCE9grQ9abQImS/U2sr50zJo4kJpQQ6gl5g=", + "module": "sha256-4GCAUjhnrw8wK83PqhzRT0jXO0EG852X7TvKh6yL8Lk=", + "pom": "sha256-uqoBWau+KpclCzYnONSk6a+seGjjZ5uD4jOeOKVWYHo=" + }, + "com/google/devtools/ksp#symbol-processing/2.1.20-1.0.31": { + "jar": "sha256-Ur1VHTVEWTntuCsPTlKCLHVH+Qa8gellmZ5nqSHlQp4=", + "pom": "sha256-hMXtNZ96txDxZjUS7NMqc3khjyaZA05mT9lLc/XJV4E=" + }, + "com/google/errorprone#error_prone_annotations/2.11.0": { + "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" + }, + "com/google/errorprone#error_prone_annotations/2.18.0": { + "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw=" + }, + "com/google/errorprone#error_prone_annotations/2.26.1": { + "jar": "sha256-3iXy2aIVZSm9dl9R2O/fwN+nMB4E77nMdbfxDPXQ4Ps=", + "pom": "sha256-rqfpkeLf3LR/X71QhYdTX3gCvLni/C1Ou1C+QbaE2p8=" + }, + "com/google/errorprone#error_prone_annotations/2.27.0": { + "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", + "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" + }, + "com/google/errorprone#error_prone_annotations/2.3.1": { + "pom": "sha256-PtzmtxG6No7+Frm3qssCFPvWSEFMublllTouftiagZo=" + }, + "com/google/errorprone#error_prone_annotations/2.3.3": { + "jar": "sha256-7FnxtwLZr8CejDkp9cQnd97GI6bqJzGsaUMyx9doD1o=", + "pom": "sha256-v9aSVaDAETr+5NoBNruAsSaMuw1h3wBp2NIrO+8laNU=" + }, + "com/google/errorprone#error_prone_parent/2.11.0": { + "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE=" + }, + "com/google/errorprone#error_prone_parent/2.18.0": { + "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60=" + }, + "com/google/errorprone#error_prone_parent/2.26.1": { + "pom": "sha256-SmrQDTGwpa3Nmk9gUGXVtEX65KBMv4J+XRrBB34vgU0=" + }, + "com/google/errorprone#error_prone_parent/2.27.0": { + "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" + }, + "com/google/errorprone#error_prone_parent/2.3.1": { + "pom": "sha256-dnUl2agRKc0IGWg4KYAzYye+QWKx4iUaGCkR2qczwSM=" + }, + "com/google/errorprone#error_prone_parent/2.3.3": { + "pom": "sha256-awWm9S4rZbTvzjy7pTNbCBsdykuX3mkCNM1TZHmkDzI=" + }, + "com/google/flatbuffers#flatbuffers-java/1.12.0": { + "jar": "sha256-P4wIi03QSphYch8uFiUIyU2w3Yb5YeMG7mPvLtqHG/c=", + "pom": "sha256-yyJrr1RiYHcPIegVKmqoi6FSMNc591DfSA8qZo1D4Os=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#failureaccess/1.0.2": { + "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", + "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/28.1-android": { + "pom": "sha256-+K/LQ/0kw7YibkCL25zsVpFzcVpMLIAXPMrt2E4VGJE=" + }, + "com/google/guava#guava-parent/32.0.1-jre": { + "pom": "sha256-Q+0ONrNT9B5et1zXVmZ8ni35fO8G6xYGaWcVih0DTSo=" + }, + "com/google/guava#guava-parent/33.2.1-jre": { + "pom": "sha256-kJX22O43ZZUCB1EHhYMMwigOeBBnkV+pnP4XQNSGXBQ=" + }, + "com/google/guava#guava/28.1-android": { + "jar": "sha256-4RLOksDwczll7t5z2UWJxZpyEosGsIu6Xr4vnqZy72A=", + "pom": "sha256-AZa+urqiZWDxCO6xBNYph62L6mB9mxPto/Aoa3ZdbqY=" + }, + "com/google/guava#guava/32.0.1-jre": { + "jar": "sha256-vX+iJ1kfuFCWd9DREiz5UVjzuKn0VlP1goHYefbcSMU=", + "pom": "sha256-QsJX9/c203ezGv7u6XirJtcwzXCvYN3nZi4YI1LiSCo=" + }, + "com/google/guava#guava/33.2.1-jre": { + "jar": "sha256-RSstl4e302b6jPXtmhxAQEVC0F7/p6WY2gO7u7dtnzE=", + "module": "sha256-0j7aahwsC9JfijNGzd7sQ7Ufdb+Bm5MeqpgybqZEdCI=", + "pom": "sha256-QoF73BwMjHN9a0Ec+vSoR2nn0nHoebAW/QhQJIoG2rU=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/1.3": { + "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", + "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" + }, + "com/google/j2objc#j2objc-annotations/2.8": { + "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", + "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" + }, + "com/google/jimfs#jimfs-parent/1.1": { + "pom": "sha256-xxVVdR5X4O+RKHDorJYlrnglAqalucGcz4OyqX2LJr0=" + }, + "com/google/jimfs#jimfs/1.1": { + "jar": "sha256-xIKOKNfAqTCvk4dRCzutp9qlwE18Jadce4sIHxwlfd0=", + "pom": "sha256-76huXNki8XtHL9/K5XI02NSsPhSLYlBzffzkVK96ekQ=" + }, + "com/google/protobuf#protobuf-bom/3.22.3": { + "pom": "sha256-E6Mt+53m/Bw8P3r1Pk1cd/130rR2uuOLdLdYHN7i5lU=" + }, + "com/google/protobuf#protobuf-java-util/3.22.3": { + "jar": "sha256-xhX3aHncXDA+TfW5Smr6OVNAWMdUXbLUg/2V2fY8i/4=", + "pom": "sha256-tEcBsGoGSGXsm1YUqT6eKPrdfU38S0YPIcgZ71Pb4tY=" + }, + "com/google/protobuf#protobuf-java/3.22.3": { + "jar": "sha256-WdOI6motLXaujv/3/U0MYMbw9GTD06ub6OWt0JKXVwg=", + "pom": "sha256-GG6nlBUPW0Kup+xgQd83PR2KioMWJPWKVd67YEPscxI=" + }, + "com/google/protobuf#protobuf-parent/3.22.3": { + "pom": "sha256-OZEz1/b1eTTddsSxjoY0j0JFMhCNr0oByPgguGZfCSk=" + }, + "com/google/truth#truth-parent/1.0.1": { + "pom": "sha256-HH/IY4Mu2YCOQ9jBdpH/Fn0xPxETTvx1Yf9R0UIZbX4=" + }, + "com/google/truth#truth/1.0.1": { + "jar": "sha256-HM9DNOepTPAKIKYZtUYrU6zzJ04AtwSYv1soo7wb6bE=", + "pom": "sha256-BGhsbq3NYNi3sKTT9Vk4phaHYObiwkETOQNra/BGow8=" + }, + "com/googlecode/java-diff-utils#diffutils/1.3.0": { + "jar": "sha256-YbpNxJrcqVJDvqoFaa3CojrttSkq54qgEYb6eC69xcI=", + "pom": "sha256-L+Md1jCbD18ZW73EdJz8CvBl1h8Gz+GD39LyCSq4R7Y=" + }, + "com/googlecode/juniversalchardet#juniversalchardet/1.0.3": { + "jar": "sha256-dXv+kGGTuLZR553CbNZ9a1XQdwos37A4FZFQT3edSnY=", + "pom": "sha256-eEY5mzXHzWQqmzoADD4tYtBOs3pFR7aTPMixi8wvCGs=" + }, + "com/guardsquare#proguard-base/7.6.1": { + "jar": "sha256-wmUOZmw0Q3gdxenq7l3ochWT8AvkTp2HzsdhQGNXx3A=", + "module": "sha256-JdmBh6U8Iv9cCQfhdTWgK0Q4Wk3FSISxJ5uhKQg6Zys=", + "pom": "sha256-O3Fie597ZAogi4a7LLfEgUItx6e3izXZny0Y50dSH/0=" + }, + "com/guardsquare#proguard-core/9.1.7": { + "jar": "sha256-2wb6n2tDu304ZCD4VPQapVoRAj3ja61o4EPDrD8zuNU=", + "module": "sha256-CUllErGoVDVOUdGan6XEEjVKLTlZYczHasOIL5WlTgs=", + "pom": "sha256-m+fvKU0pm6gP/ZzKEa0wl+N+QTcbZGSYElqADUqO0qg=" + }, + "com/guardsquare#proguard-gradle/7.6.1": { + "jar": "sha256-ScjoQGfRVpIV8WK59EEiVEIvX4A5eu04C8yyBZeH7xk=", + "module": "sha256-fND7x+oT+8EkO9lAeq2kpBe8HuLXEHcCTcmwn2SsGAc=", + "pom": "sha256-q/PvEB1bM2lv5Ytjm4FzrVAOqQf72Yp4JZV5+s+kkng=" + }, + "com/intellij#annotations/12.0": { + "jar": "sha256-+KsTsUvggP4vYX+Q5VWZdg5KG03u6lxZXfY9DWN17W0=", + "pom": "sha256-+vgt4NwC4MCuMnzWU/NyVUlrLlP84oCzq0yzRVOokIY=" + }, + "com/materialkolor#material-color-utilities-jvm/2.0.2": { + "jar": "sha256-ehw5WMVYOvirrpQhsrFd9NwzwNTdBre8MPt5lVBOUvU=", + "module": "sha256-kPEIT/8zQ6SXWgx4tVu3ihklHZ+5xQ2nWxq4I60HxJg=", + "pom": "sha256-X2qIr8xO02UgBwGJfn81ofQc+oKhq4UwsJGWw99ll8M=" + }, + "com/materialkolor#material-color-utilities/2.0.2": { + "module": "sha256-u3ChedRjiAQYquydGdokwnMI1v97Y6njUeODeqAmOgs=", + "pom": "sha256-hI1hgNrDQj9o+61ebYVQ5CvhnSEw4ZKpi2kIi3N97FU=" + }, + "com/materialkolor#material-kolor-jvm/2.0.2": { + "jar": "sha256-3xSWEBi6K+/P5wTLqUXhjWV5e5Cjv3kH2n+LwMEqcdE=", + "module": "sha256-FGKbUUptRNpHaUEIPdemeJayYZg5PKtvEuVju3zkDqE=", + "pom": "sha256-8/9psHfIIKrR9URczybPUmUfMbcZNvo3t9L6aZOdFls=" + }, + "com/materialkolor#material-kolor/2.0.2": { + "module": "sha256-2rR3ErARsdPdnh0oVnlcwm1+eqd1cHr8YxFhex6PUEc=", + "pom": "sha256-YTrDfhrG8ubIcdEdmZD0G7K8rHytPn1S0RdHHL+SCVA=" + }, + "com/posthog/java#posthog/1.2.0": { + "jar": "sha256-gnEBAD2F9li1yqwPI4IQ/ySEhjR+qVSd6kvBPHWfYao=", + "pom": "sha256-YIqAJ1xuFdnIJ7i/5RZw0LCqjy6jsgd5xT2vokFoTLo=" + }, + "com/squareup#javapoet/1.10.0": { + "jar": "sha256-IO9LguQ/98ZSKBohMTzzuUEJJGet0/pzUJwm9pae/as=", + "pom": "sha256-FpA0CiIiefLLrfNz6Igm+iD388w+wCUvNoGP7TJwGrE=" + }, + "com/squareup#javapoet/1.13.0": { + "jar": "sha256-THUX6EinGzbQadErs79Gpw/UzaMQXYIrDtLhnAC2kpE=", + "pom": "sha256-VKNPqFAqRryQ79tJJiYAWR+oC/mjT1pMeYMRrsFsqXc=" + }, + "com/squareup#javawriter/2.5.0": { + "jar": "sha256-/PsJ+w6gqpfTz+fqeSOYCBNI5GjxJrNgPLOAPyQBl/A=", + "pom": "sha256-4avX8RFs9eDFmUdpPiGJII7JQpayozlMlZ41EdOZp7A=" + }, + "com/squareup#kotlinpoet-javapoet/1.17.0": { + "jar": "sha256-DuzCjrnihTDyUJXqizGJXn02usHQLOWx7EPG9FiudSo=", + "module": "sha256-941d40pspfy5lEpVgLfTp/An0NPHUnQbVPB9c1YrvBI=", + "pom": "sha256-UYdDQZQMIUZXB4KHOYtP80A+UEF1H1AspNeXPnsEB/o=" + }, + "com/squareup#kotlinpoet-jvm/1.17.0": { + "jar": "sha256-MTPU9Iznd2amqMwuVV2JFk387703L0/0P4mn/tNYaRA=", + "module": "sha256-pDRbgzxsew6i8tyeAc9qmc/nL2chZajAA/FIKFYaeWY=", + "pom": "sha256-HEEbqzdRQX0ziGMe9tptORWlBdqReP7kh8bokmy/L10=" + }, + "com/squareup#kotlinpoet/1.17.0": { + "module": "sha256-ZyhcxKgLPMedn4Gj41fQDEr3EpwEkNJCSKgs1aGBKOA=", + "pom": "sha256-V5cDmMARYvZ3D8Ax77UJe5s29kuHpiN0jYjzfCB34pw=" + }, + "com/squareup/okhttp3#okhttp-sse/4.12.0": { + "jar": "sha256-v/T7yu96rC2RDU/0ba+qTm0V2hJ99rrJchbaRpQ6fUw=", + "module": "sha256-c+RIzK9gfU9gO4tuZmGHKk/6PCZBGTyLvE1r2h5Ww0I=", + "pom": "sha256-lKunzO96e5DcolIFhb8LEjNtyO+U1ZGWPu2sV3lnkzw=" + }, + "com/squareup/okhttp3#okhttp/4.12.0": { + "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", + "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", + "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" + }, + "com/squareup/okio#okio-jvm/3.10.2": { + "jar": "sha256-/Qp+dsZzHwDpILe8EcBdgjqTIEVDGt1Ujgld4CCmnt4=", + "module": "sha256-p4CkJMVx4odVASiuADMjVibf/iFsuNs7ICRkmWrZaPA=", + "pom": "sha256-AP000Iv0YxNiofVSLKpXyuKMosfpOS76My72Vs/anUM=" + }, + "com/squareup/okio#okio-jvm/3.4.0": { + "module": "sha256-b+wTzzNhYANkv8xoAEr3x2DOrx/Bu8yVh0KuTWHbFRI=", + "pom": "sha256-ZqiFeYHqbD7IuGE6QJvxLxR5Ze+UmMt6jzcXKMTi2k0=" + }, + "com/squareup/okio#okio/3.10.2": { + "module": "sha256-P94fn79yxsMm1eiktTL0/Z/aLdDLFEK8pODHl9FBI4c=", + "pom": "sha256-7lbAIUoPqfER2nExxVDo3ICvDL9WCVbBzNosZtdQa0E=" + }, + "com/squareup/okio#okio/3.4.0": { + "module": "sha256-aRc2CEF6IRPm+mr+t7RUCyDfcM/aP6Fsc6qk+nAv+tM=", + "pom": "sha256-QOr9s+epasxcFR3pzL7BKFDy37XL53Ph90zrU2JVggM=" + }, + "com/strumenta#antlr-kotlin-runtime-jvm/1.0.2": { + "jar": "sha256-Hy+1MJxqlAq1K0GMHWN055qy79+mqcYbPd16f5VgROQ=", + "module": "sha256-ZOXc7bM5dAyT31zG6rPoWuT/Aj/B46AqnkzPtM4cD1Y=", + "pom": "sha256-/0wnuIMb7JgQPTarjPSKYzVCP64knOwQKFBEWOeDiBc=" + }, + "com/strumenta#antlr-kotlin-runtime/1.0.2": { + "module": "sha256-/O5noEMQ823oFiypQt8rH+rqYf+SWEoJ3KXnYLYkGZA=", + "pom": "sha256-JRjb+jPn3pMMJ1dBpUTwPo86/BRnCMEGvIxRcKVBIPU=" + }, + "com/sun/activation#all/1.2.0": { + "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" + }, + "com/sun/activation#all/1.2.1": { + "pom": "sha256-NgiDv2RIbs7xYbjygvZQNTbdGmcNU6Coccj7IBcOZ5U=" + }, + "com/sun/activation#javax.activation/1.2.0": { + "jar": "sha256-mTMCsWzXBW8h53nMV30XWoELtJAO9zzY+/K1D5KLqc4=", + "pom": "sha256-+Hm26UWFTGkAsNvuHIOE16s95+FX/XrISTdAXEFtKl4=" + }, + "com/sun/istack#istack-commons-runtime/3.0.8": { + "jar": "sha256-T/q7Br5FSgXkOY4gx3+itjCNS4jfvvfKMKdrW31VBe8=", + "pom": "sha256-wuAU00y4TtKH0GSYbEXDBaQSQiinM37M9sQh0U1wjxw=" + }, + "com/sun/istack#istack-commons/3.0.8": { + "pom": "sha256-oPBRfoUS8PvMe4KVwS9lZqPQwthtZVY53GYu+MDH6+U=" + }, + "com/sun/xml/bind#jaxb-bom-ext/2.3.2": { + "pom": "sha256-Gn3sKyfn4FV0TNuM8bkN70/Uc6zRuATv8JgTk1iVm9c=" + }, + "com/sun/xml/bind/mvn#jaxb-parent/2.3.2": { + "pom": "sha256-IN1tw0q3VJrEDaHYLpIiLsQ0etDsDLEY72xXA77VOhg=" + }, + "com/sun/xml/bind/mvn#jaxb-runtime-parent/2.3.2": { + "pom": "sha256-sk+NUfGEpovBuG1IwOPP7+shpE7eHF9zA8WK4EiFM+w=" + }, + "com/sun/xml/bind/mvn#jaxb-txw-parent/2.3.2": { + "pom": "sha256-tV0++psVj0g6MOkseMy2APkzFHM9CJ66m3RDbwGzFKQ=" + }, + "com/sun/xml/fastinfoset#FastInfoset/1.2.16": { + "jar": "sha256-BW86HhRECfIe0Wr8JoBfWOmiHz/OFUPELUAHGdJQxRE=", + "pom": "sha256-4UfSWKtuZpH3BZmpUkAObmx1WPjJwCjb4b4jF4MI6DA=" + }, + "com/sun/xml/fastinfoset#fastinfoset-project/1.2.16": { + "pom": "sha256-kFgkJa3B9AtBNi2vuVFzkxIlrKpeeWINXmvVL2Rikro=" + }, + "commons-codec#commons-codec/1.10": { + "pom": "sha256-vbjbcBLREqbj6o/bfFELMA2Z7/CBnSfd26nEM5fqTPs=" + }, + "commons-codec#commons-codec/1.11": { + "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", + "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" + }, + "commons-codec#commons-codec/1.15": { + "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=", + "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" + }, + "commons-io#commons-io/2.13.0": { + "jar": "sha256-Zx6qOWiNrC/6pGRbPJmAri0OokceSual2hmc0VriNmY=", + "pom": "sha256-2z/tZMLhd06/1rGnSQN3MrFJuREd1+a5hfCN2lVHBDk=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "de/jangassen#jfa/1.2.0": { + "jar": "sha256-8cwY8VldRBroOc2hRlwIsefbRrcsHX87NzIK4WQexys=", + "pom": "sha256-tNgod+BwsV0dTmdrQV9qVCnw4i3U75gX2F5MWcU7yr8=" + }, + "dev/dirs#directories/26": { + "jar": "sha256-bRj+Jaowt+CLkIzSEVHY+W4illxkCs13Ua3Zu/5hN9Q=", + "pom": "sha256-/I3n/GawcvT21bNv67uZx1DG75JxViX1o9hJlAWpRoI=" + }, + "dev/drewhamilton/poko#poko-annotations-jvm/0.18.2": { + "jar": "sha256-5U2qgc0DiSljOuxZYGAi4eqjQyo8pnNJS78a5V5CI00=", + "module": "sha256-oGDXCDj/aGYX9DElgx0QV7KBCBr0bZlC8MCuOM1ge6c=", + "pom": "sha256-BVtbvG8ajpBWbCaYSrVLS4HMmA1QzKilZlIkFmFilN0=" + }, + "dev/drewhamilton/poko#poko-annotations/0.18.2": { + "module": "sha256-SGjNwVoyGxGrPIxbbqrE092oUghR/NLbI0/Deq7r5M4=", + "pom": "sha256-TdmQ/XvDu3R2lhMzoVAl/4Sc7XL5736bCmQankBb5FI=" + }, + "io/coil-kt/coil3#coil-compose-core-jvm/3.1.0": { + "jar": "sha256-iqHXrh0R+WnozcyP7kK37moDbiH3BWfjw0hu3Z19xZQ=", + "module": "sha256-6ucdZ4HM4ykKPjiM2fpZ0mctNIjahwbqiRFkcBrisQ4=", + "pom": "sha256-IkVryyLUfV3o4sKdbElAZNznVYtdGfMTBpw1f+r5B20=" + }, + "io/coil-kt/coil3#coil-compose-core/3.1.0": { + "module": "sha256-LCfu/rg6PgVENUharnPuHLz0w9SGQy0qqzfkxk7xE44=", + "pom": "sha256-CmIgsinPftmV0VSvssT3YXFBxcqY3S8LuF60CDDmGkQ=" + }, + "io/coil-kt/coil3#coil-core-jvm/3.1.0": { + "jar": "sha256-bUShEYjFP07qLofrrcaq2QBpEyybAp/Bs1rrCt3tXvc=", + "module": "sha256-maObXGZpxFXtE10hgduI0HIYJVehl1oT8DKKEmw8iDk=", + "pom": "sha256-dGE3HEWhgeyUR4vPDvALWuaGr8mmlmRUG2wbdmoSteU=" + }, + "io/coil-kt/coil3#coil-core/3.1.0": { + "module": "sha256-KvywLPZHytam/fsYywCHVoSfevdHpKAemBuIMPSIMKE=", + "pom": "sha256-NPm6Yg431Ruux7rY05bTJDzAbe7Kw1pil0/MUGlZCuo=" + }, + "io/coil-kt/coil3#coil-network-core-jvm/3.1.0": { + "jar": "sha256-gzLkXPeSzSTZgUdE24Sw5tM+xurwckvQfdwfznxVWR8=", + "module": "sha256-2GSNiy+ATWSIq79fIIe3XJRs/s5bGO1kCNvAV4Htobw=", + "pom": "sha256-3bv13KN1OnzvdpV8dm0JssLUGlImUCEWHMCCouklg0Y=" + }, + "io/coil-kt/coil3#coil-network-core/3.1.0": { + "module": "sha256-7KfwcYeJQrG/0cIZiwHKX9E+nCev5wEkXDe1OUOGxQY=", + "pom": "sha256-2pkj5T1iBNefNQHFuJ9eDIfpEesc/RgO9FuCRFdhuso=" + }, + "io/coil-kt/coil3#coil-network-ktor3-jvm/3.1.0": { + "jar": "sha256-zE+fjW1EfnVZy5cXw6Rd+9NR3dBqNHJAATIlEhYLAhU=", + "module": "sha256-NL4hHQNYOOVzu8BW1MTBE/0j9mDWQDE/sT49mtouPnI=", + "pom": "sha256-J9d+GTns0g4uh1xv+g1qFaOIRm2BLSxDHqf7Lj1LDSQ=" + }, + "io/coil-kt/coil3#coil-network-ktor3/3.1.0": { + "module": "sha256-RNdytNnbOOlTvpZSG2OLq4/5ytNrU0+FhydwhVLDr8M=", + "pom": "sha256-kS6c9+OHz0df40DvQy4r5spGydJG1mrfan0Mj3LnPoE=" + }, + "io/coil-kt/coil3#coil-svg-jvm/3.1.0": { + "jar": "sha256-QTpTtLbgpAuFHRqZoBpM2RrA3Gj6zv3det/bLVRWWI8=", + "module": "sha256-mau2YXPP/ryK24Fec4o/60Q3hykNUYBZaKfkmq/Cj18=", + "pom": "sha256-+ZVXTLorw3vi6CDxPjSm58ixTJJ41UohDoFJR6B84vE=" + }, + "io/coil-kt/coil3#coil-svg/3.1.0": { + "module": "sha256-EGfUH5lQDPAcbXABXm6leUBHiMNJBBxAhIfMYjofx9k=", + "pom": "sha256-kMjSxVq5L64ip85AistZYi0F2ytsLqpEoESIbMd3Y2o=" + }, + "io/fabric8#kubernetes-client-bom/5.12.2": { + "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs=" + }, + "io/github/g00fy2#versioncompare/1.4.1": { + "jar": "sha256-0mgnvHDjpuBw9bco4vhNvwopE5siGBr2Vm4MFvCNRGU=", + "module": "sha256-rHAoh4apAuF5CeYvf7dyrkIcRgqxDnIAtQIfWONIE2w=", + "pom": "sha256-6nUQLRXjrmYp7wResnYd5EAyW24RYSjC8P1MFj3Slj0=" + }, + "io/github/vinceglb#filekit-compose-jvm/0.8.1": { + "jar": "sha256-SKLBEibYuhb+uwS9Sc9hmRUIuPf1yySO+MfJF94jm70=", + "module": "sha256-/KXuix/ergSiAv7wQIC+cmmBvD2V5n3tNW0ZqaXoXA0=", + "pom": "sha256-O8Jr5JwGJ0Ol+7hfroeQdmOEfGS06TwkEIajeikWq1E=" + }, + "io/github/vinceglb#filekit-compose/0.8.1": { + "module": "sha256-BGWWzoEdlb1bai0cuoAAijQk5HUKyonDH+UGrD14PGs=", + "pom": "sha256-kgInUnnltl0A/vidBVSKiWxH1jDyDteiFgp9ekhPWx8=" + }, + "io/github/vinceglb#filekit-core-jvm/0.8.1": { + "jar": "sha256-iiV81/qR5r/kbeaBA5TME5PaYAlr4tS5PgBKaQftjwA=", + "module": "sha256-k8D9Wi2TIBqCViEbmuWnbrgh8d1SpS7M1bG/Rw/yWLk=", + "pom": "sha256-NJmcDTRavJj3mlBaO1o+OK5AxfG5gWMtacX0NsyBtFk=" + }, + "io/github/vinceglb#filekit-core/0.8.1": { + "module": "sha256-qopIGqRvCjIgtHbyjRoKHtsyoMtFmfmTeae1PI5nYfk=", + "pom": "sha256-m9MD9XiEXZB17a+NhYhDXjkeNmT/IVefaYUJ2unnElY=" + }, + "io/grpc#grpc-api/1.57.0": { + "jar": "sha256-jSw4Qpn4Tuiqf2cPAOfLJrh+IxzzCRR0MHsyt2kQ9xw=", + "pom": "sha256-w/BUp8iGFkfQpVglsKlJ9E/PycZPR5CD2WgTgUxQJhI=" + }, + "io/grpc#grpc-context/1.57.0": { + "jar": "sha256-lT/KzYL1MeabduODT1gwutTCKuhBROBY1x3ICnQwJ10=", + "pom": "sha256-qyZOgr+2q4lfYBavizzERJWryB52nDD6WprgrRa+bMY=" + }, + "io/grpc#grpc-core/1.57.0": { + "jar": "sha256-O+5IxzvExbVb7Xm+DkhK3ya6Vr675XmN2/NHFO8eHOo=", + "pom": "sha256-gYQEX1eR4Azyzbz16IRq/Uj1z35aTzj7W4MDx7Lv5Vs=" + }, + "io/grpc#grpc-netty/1.57.0": { + "jar": "sha256-gdQ/LU7Rj6NBvYQKNzXxQDpwB0oEbhV+J/Z5tyG0ya0=", + "pom": "sha256-7Z3917HtQ1avs8XRQH3ttjTIYC+0EEebSArYwROe4Xs=" + }, + "io/grpc#grpc-protobuf-lite/1.57.0": { + "jar": "sha256-LFB8AtmBuEohdj1E4Jr08nmIHdPiW+MID2NhJYYH8Zg=", + "pom": "sha256-sCO+cAiElIn2Uu7/df0P4aqckF9nHTROFtqv3fkhgZ0=" + }, + "io/grpc#grpc-protobuf/1.57.0": { + "jar": "sha256-SfmG1OqxJhD9ukpokPylLV62U1mJFv24Y6Nm1eKO7Pc=", + "pom": "sha256-wNy4xn/QHapjJW8Pi2jTcHzrfKhc2qt6PGw/9GDhPdE=" + }, + "io/grpc#grpc-stub/1.57.0": { + "jar": "sha256-bm7hQVOfoU2fpHn39RFgVUREPH4BHnjic8+UaKoYMGA=", + "pom": "sha256-bURZSHxiHf8xUQqIgpBjYx6RXS3Md01xkoQYEW5ZqI0=" + }, + "io/insert-koin#koin-core-jvm/3.5.6": { + "jar": "sha256-gjubMViP+QIVwfzq4w36FB0lKOPU5CwoQ+pAyDUr32k=", + "module": "sha256-IiurmbCubv5NKYHgt8fLYFRc6AGHTBVZkVBlZgYm6yE=", + "pom": "sha256-yxpqM0oiFH6G7kBL5IZ5NsBo2bEjuG4p9/Muj5gigok=" + }, + "io/insert-koin#koin-core/3.5.6": { + "module": "sha256-WnEdfzLKDSCiFism3KeuouftaTuHAhG2JSbDNRLJOVk=", + "pom": "sha256-q6P4ZLcET4XYNsJX/+7xpw2qfzR+wrLru0B7lNurny4=" + }, + "io/ktor#ktor-client-auth-jvm/3.1.1": { + "jar": "sha256-329l/zrE5Z84mcVbIUNozKBO7wA+J52/DJLcH3fR3ls=", + "module": "sha256-sZqQXc/2jXqOAYCozlbZvQhTMg1y42nHFO/xaGW8/Eg=", + "pom": "sha256-ChKNLmW/7F6SfniGwera1NAyllUZaOd7JiSLl8fFmqM=" + }, + "io/ktor#ktor-client-auth/3.1.1": { + "module": "sha256-DWnrM+1rLvNXs5QDEElR5y0U+B1t5KhGGsnnYRBz7HY=", + "pom": "sha256-3q0S+EmOKsqGyFJc6YDq7yYwYDejlOImpH3d2SvJxxw=" + }, + "io/ktor#ktor-client-content-negotiation-jvm/3.1.1": { + "jar": "sha256-9fYVfyPmDpqiCpLSsbSW1A6gxQJeB8lveBKmBarupAM=", + "module": "sha256-SCZUx0znKxyZZCV1RpL2GwyxM4BLizYtuH26ka6y1xY=", + "pom": "sha256-ia79EEhHe0Pym1iWYkc26LQj+PRTk2bMkLaMSn8nA2M=" + }, + "io/ktor#ktor-client-content-negotiation/3.1.1": { + "module": "sha256-dnr9WD7WI8oU7iTsSbhAO1bUNWoeQQpyYFr02bfFj2U=", + "pom": "sha256-Di1JFt/rE+LSRzCiv+v1W69RlRjX8hnBUqbmrW6qLbU=" + }, + "io/ktor#ktor-client-core-jvm/3.1.1": { + "jar": "sha256-3HNSBoFanfp2nJZNhjsX852CcVWpWVMs5xesy6EuzZg=", + "module": "sha256-CENjXDvN3YfWsKfm958QwlH4rTUGzBkrp+MtmPqdVmA=", + "pom": "sha256-FmsvLevYylLL8MQrpe3a5QS7Ebbcpupj8vDhkRJNjcY=" + }, + "io/ktor#ktor-client-core/3.0.3": { + "module": "sha256-xct1TTMOkdHNf3fMCCBeeT57xmmpyuGHqiEPs+dc2as=", + "pom": "sha256-6f576kgFKdQhOWzkAMDGhPHLZDpd2O9w40xrOSPU0WA=" + }, + "io/ktor#ktor-client-core/3.1.1": { + "module": "sha256-HENLQIV+SHTQkQeY2WWDys7TW7VcdZN+SqrXXXSZVKg=", + "pom": "sha256-pwvXeScZY9OUOsWxO4t8fDJMYB8n/E5eVUe4cs0Hbzg=" + }, + "io/ktor#ktor-client-logging-jvm/3.1.1": { + "jar": "sha256-scU9pJ/ECVY/TG+5oPfOsz7SoUYpNMmTkuWxzKDmqcE=", + "module": "sha256-f7fPWljnLO1KkqMpaj+2GEJ6sLksLArpQMacO9Jc/DU=", + "pom": "sha256-xBM/E1VdDRDkmrg0W1PtbsSIuer6z/klJC1jHHF/JJw=" + }, + "io/ktor#ktor-client-logging/3.1.1": { + "module": "sha256-5+ChGRMReioaTYFqFmrXAX4SNuP2A1sI7wiCB61wJLs=", + "pom": "sha256-HNgSST22zmdv05YtF8nvkxlUuJAIG1kFUn9Jk1aTZE0=" + }, + "io/ktor#ktor-client-okhttp-jvm/3.1.1": { + "jar": "sha256-T+9oV25+/zsrNG8AbTFhdX3/CuBEItSd8msBwPhdPsk=", + "module": "sha256-q5hd6r5DVjOOBS/BxArKsoYyEZh8TzGS7cUGBpi3tRE=", + "pom": "sha256-VM5iQXFRshxgKoGGb/MHk9VNUYb+Vk+dSWKPUIBDvzY=" + }, + "io/ktor#ktor-client-okhttp/3.1.1": { + "module": "sha256-lHmI2EdO0QQw8tOXS5byK0a9McDNOhio18BQOlTfx60=", + "pom": "sha256-bigHx/DYkJLQgIC3Seq2A4/Syoq91pHrFmxmeK5kgVw=" + }, + "io/ktor#ktor-client-websockets-jvm/3.1.1": { + "jar": "sha256-x+SdwwC+Z/PsxAt/w1643p32hcM6pbSqaYMsRzoNGmM=", + "module": "sha256-K9DsnywbSE/xkIHD/2mjNwuTrKsMACav66KPpIu0JxQ=", + "pom": "sha256-77mNIPrzcCEmODMnUmFJtSaKovcisJSX0/kDljVV1KY=" + }, + "io/ktor#ktor-client-websockets/3.1.1": { + "module": "sha256-ODpIQKD4NNlTGOV4MEiGZ2kwcpm6ZoVuGp9ZbMpGEBM=", + "pom": "sha256-hbNOfoLxMoHliwVRIMaLyP9GhTSRfjvzMZ92vJP2Hjs=" + }, + "io/ktor#ktor-events-jvm/3.1.1": { + "jar": "sha256-edJ+rfJ6J433kMSQ9XyZG+2TYLVaBbyfH3RLIjMLUFs=", + "module": "sha256-WJLv/yddO0Mise6kS906BoD3z/iXiO8WyAl3cKjF+eQ=", + "pom": "sha256-RUqm3g/VPlJIOZnKSd6VjwNBKx1GlF14lqJBsQbBjqg=" + }, + "io/ktor#ktor-events/3.1.1": { + "module": "sha256-wzRhIZmbL3rNh0doWOTY9aZkInpcOyQcc52dQoJb250=", + "pom": "sha256-mgwRaawFQZcZe8CPF8yCeXgjqcJWZHQd04GnazL9QDs=" + }, + "io/ktor#ktor-http-cio-jvm/3.1.1": { + "jar": "sha256-ZZVfvsiA9mb/MOXN7MM+Of/XwLZYwJ2niUlOhSjJTGA=", + "module": "sha256-peUjznqqEclSfeB7wxRak6lzc4Jl/TyB959reYeS5gQ=", + "pom": "sha256-/qMR8z1NKfV6m/wkrecn6vtFullv9JZ5qkVSpewTpo0=" + }, + "io/ktor#ktor-http-cio/3.1.1": { + "module": "sha256-zpUnEGKYRlbN9wmx3vIwThGij+tQpQM07Xnk+F8E7A8=", + "pom": "sha256-sCIN4cXz3pHqhu7SxkHXu0lSfD1iqeivo97xFkeLbaA=" + }, + "io/ktor#ktor-http-jvm/3.1.1": { + "jar": "sha256-wQ4iEltDk+ZhJN35ediJmc/7C/vo1boZIkD7oQTRX7o=", + "module": "sha256-mzpLiic6QZ7i2L5SIsgbJvKRdrakojuBX/RKvDmrDeM=", + "pom": "sha256-8j+CYetHYjfH2lXKZ8awMFS+kGpCF1+/iIvOtIAhKGk=" + }, + "io/ktor#ktor-http/3.1.1": { + "module": "sha256-Bj/oGNpM0JsqAR/mb8lAX/fiuetFaPVekpbQoG8sPA0=", + "pom": "sha256-scSnlJ/nls6z8YMjWYqDxfk9J7U2VFFg4o+WIGGPn7s=" + }, + "io/ktor#ktor-io-jvm/3.1.1": { + "jar": "sha256-MYuRb0fIUXCvS+6fD0VQsODt7Ky14dwsKCl3bI17yas=", + "module": "sha256-J2rXuOWEtkb7XV76b+hFYvhC9Dzwvj/UlkVd/z51ydE=", + "pom": "sha256-YRjAOam6H6htK4CxoZ7Iy/xKIvUZ6vA/VFdXzTqxd8w=" + }, + "io/ktor#ktor-io/3.1.1": { + "module": "sha256-4u15APMHK4VkiSseR1fzRWyJ5HV+nnfcqf8W3DmIiFA=", + "pom": "sha256-mna6AnP0Vy1oTURo784BtATSSsWzokuK4ceWQhx5D+c=" + }, + "io/ktor#ktor-network-jvm/3.1.1": { + "jar": "sha256-CJy7uU8kt14+TEQBuu/ZWG9bFcnYAKbpPzCmSxlZsjk=", + "module": "sha256-AiZQk2xYwEEStePfJD4zaQDmtyKbCkUl8cn1nIPeeis=", + "pom": "sha256-GUk3Y9TxFQvCKfqdD8yERJOQw+q8txxc+yRVupmmkWU=" + }, + "io/ktor#ktor-network/3.1.1": { + "module": "sha256-gP7XcFwFdzTMk8+cf55cD0lo+nWMqlDjvpH+YrpoL5g=", + "pom": "sha256-QLSG36c91ynR99yevJNL5z3pJSKFnbKWqE/28gyGw2Y=" + }, + "io/ktor#ktor-serialization-jvm/3.1.1": { + "jar": "sha256-nJldXoF13kgYMCplAbuZqOEZ1GI8dVUt32DuPWbF594=", + "module": "sha256-TvQH316/TX58e5s19DVmPe10KsUeJcoelb6dOWJtv6c=", + "pom": "sha256-N7BrHSbkoMBbuMk+puGnHZ54zf+XndPAmkwaFFPS4aM=" + }, + "io/ktor#ktor-serialization-kotlinx-json-jvm/3.1.1": { + "jar": "sha256-gdtumyFpbgVyaerBobZE6HHOnnWj2o5oBTq3c5fvwBs=", + "module": "sha256-CEkEG0MWhxZhDsR+ZEv8QOVnvIJhIZsbMQg6ZEjfh3g=", + "pom": "sha256-TpiA/27FDdaawiouv423bdGB43ROw/rLCF+DdPJwfSw=" + }, + "io/ktor#ktor-serialization-kotlinx-json/3.1.1": { + "module": "sha256-zmVZ1QiGCaXMpCVrSXZUnyjQXio8jPjeY+vGE8DVvwI=", + "pom": "sha256-J+jZHK6F3ud002BmizCLErAsuaRt7EI9L4C/+izqYXI=" + }, + "io/ktor#ktor-serialization-kotlinx-jvm/3.1.1": { + "jar": "sha256-UGynsB5FAvvYlIZP5A1KhGwLR6WVTU01+8TI+ABI16A=", + "module": "sha256-R3hXpALaI/FAd8cdDC3qsL9YfRkonR2JIjBQLK5nGbI=", + "pom": "sha256-+qg/wXYrGtneZ6sAj4apLQ0FibrTvA8KyEoKYNSGN0k=" + }, + "io/ktor#ktor-serialization-kotlinx/3.1.1": { + "module": "sha256-A/l5EFJLtQLF2/pkXc8PdIlRT25cynPWbPh85oX9PFk=", + "pom": "sha256-xTkjB+ik4dwgJZoqIre628d2DM8ICoyH0cFXAPuV9OA=" + }, + "io/ktor#ktor-serialization/3.1.1": { + "module": "sha256-Lnp0xtJFkGOeRvOt5X4D4hGL0l27Kn4FFP5PiMoCA2o=", + "pom": "sha256-e0xBuMWwvFPneI6U80sg2Tee1pkMkCuLna4CHKvBoUI=" + }, + "io/ktor#ktor-sse-jvm/3.1.1": { + "jar": "sha256-9MoU6LzJPLDfazwRhRyAzeDsTFMvOifdxPbhfN9QlfI=", + "module": "sha256-wnFsMZK+6WMzsz49jrTSdLuqZYKOdwAAJfzFky0xhcQ=", + "pom": "sha256-Ebf9pIb6xeXY0vs0ey8bLdpvGMIgozJ7FdwEDv7vxcI=" + }, + "io/ktor#ktor-sse/3.1.1": { + "module": "sha256-O/XgdWtXZX72kbUV/UekraLWexcmh2C9pJCe7KXs94U=", + "pom": "sha256-555aU506JSbasDuU/4PFFVe46G0dHBFveXLdb4qB9ZU=" + }, + "io/ktor#ktor-utils-jvm/3.1.1": { + "jar": "sha256-MXZ8uCHKB3KftclmDjjYgZ3Jo7jKm4u2q1D/a9BMuCk=", + "module": "sha256-YE7wk8++XQq2CD/73rAjNXZASXMZs/ipoN1a1SYRQh8=", + "pom": "sha256-LUGC3pBGlMdY+c9CxicYgMpM2EFWdBYB2t0zKyMZ7wQ=" + }, + "io/ktor#ktor-utils/3.1.1": { + "module": "sha256-vnVD0+g6f+TAgP1UWgXSXPsYfcAwg2IkCbv3Yg7HibU=", + "pom": "sha256-OWwgs5DCmMIdK4M24tPWSSfzmoj5zPOaew2h/xkcP40=" + }, + "io/ktor#ktor-websocket-serialization-jvm/3.1.1": { + "jar": "sha256-+zaNzbdiPHF4rKhjMiJknLFRBkaVS0m6NZxckm+Y/EE=", + "module": "sha256-SKFYB5qMwz5EBDrEkaVFtWNL5oMiY44INoclZIenLR0=", + "pom": "sha256-emkQogxJM7X00SJanW4uaE2RGvvxSVFiEO6YBbCyYXI=" + }, + "io/ktor#ktor-websocket-serialization/3.1.1": { + "module": "sha256-y6bmysD6XrDCG2n1ZfWaSSFPnEnc6Qrq8L/QWEyV7fQ=", + "pom": "sha256-GarQzpRZpleFsOJ5XY+87sf0o65DOfy9KrV8Y6zdQ6k=" + }, + "io/ktor#ktor-websockets-jvm/3.1.1": { + "jar": "sha256-INrwtfeSnXsLIH9WMN1SPUcYLSUdysUzqbGcqCQG69s=", + "module": "sha256-IIfo/BNzNDnJk6E0Cl7+ontaV2czRCONpcHr3uLMMAk=", + "pom": "sha256-grzt+ITD43sODDeuhHhiMxOpyTn3NTXoQuKqKwEE7Jw=" + }, + "io/ktor#ktor-websockets/3.1.1": { + "module": "sha256-NaXY4UALTUsTCqUHVhdEoG7u55c17bo/qrW+yVFUBPY=", + "pom": "sha256-UBJv8ak1FyiMAYseKTCfOozAfimsqU4WIpzV6LKjZNc=" + }, + "io/netty#netty-bom/4.1.86.Final": { + "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0=" + }, + "io/netty#netty-buffer/4.1.93.Final": { + "jar": "sha256-AHx9nDeN8C05BWfQ1931Qv/dsCG3MT2/UCOSET/6uwg=", + "pom": "sha256-g/vFTitzuG1Vsgj2GNGioVaRDsFG9+zldWUAe3UK3Xg=" + }, + "io/netty#netty-codec-http/4.1.93.Final": { + "jar": "sha256-2s94znirLSlXAyXbTNJFHqWJY5gH3pWIGg+nFVqea1U=", + "pom": "sha256-o9r/8HG20oToBj2WhD3iu4PPO4iergzJ4K22SlejG4I=" + }, + "io/netty#netty-codec-http2/4.1.93.Final": { + "jar": "sha256-2WzAkEWhNBxtR0lDUqomO4e3L7HS6p7KFhqnOCC/6Ls=", + "pom": "sha256-CEQztC1UH3rEtZKH3SUyhc/aOj1l3nLnNou37D02cnE=" + }, + "io/netty#netty-codec-socks/4.1.93.Final": { + "jar": "sha256-DqR7W6I8odqOuRRsj8dVwScUFGM7Hivizh33ZLoP/yo=", + "pom": "sha256-jNgW7ZkalGBBurTLJL2cjkHuBpJRJRHy2DzvU462Bdc=" + }, + "io/netty#netty-codec/4.1.93.Final": { + "jar": "sha256-mQw3gWjcY2TG/1aXAfTy8SL//omYs+GJ66TE2GjtEIQ=", + "pom": "sha256-Gc3tJnoHDf8avJ0Cm1UvrSYqzBq6XGxnsiePyhE6Jqs=" + }, + "io/netty#netty-common/4.1.93.Final": { + "jar": "sha256-RDuzFlmfsW47rrovtYiBgU1/8LevF2/nbjgHGm6G+MA=", + "pom": "sha256-QtiDsT6zjKv1SWFkYsXzMfUzO/DI/JIVdE+DwBgKT2s=" + }, + "io/netty#netty-handler-proxy/4.1.93.Final": { + "jar": "sha256-KsX3+++gtz73g4iQaTRNVRVQWhSyMDvmk8UALEht8rQ=", + "pom": "sha256-bcUNoOZ/WXgSh0+B6qRUBPfQdrgZnqkIiTKoXBthAkU=" + }, + "io/netty#netty-handler/4.1.93.Final": { + "jar": "sha256-Tl9WOuFO1xM4GBbVgvX8/QYVrvspIDSGzft4LYoAoCs=", + "pom": "sha256-hKFSXKwLR1nvrvKZekf+Gbm1ZC+Sc/oP1YoudsegWf4=" + }, + "io/netty#netty-parent/4.1.93.Final": { + "pom": "sha256-sQnLdvN1/tuKnvdaxYBjFw3rfqLd0CT0Zv723GXN/O4=" + }, + "io/netty#netty-resolver/4.1.93.Final": { + "jar": "sha256-5Zdwtm6Bgi5dERrE5UTX6wxUPgooX1JijlOUGs2O11k=", + "pom": "sha256-WzUMPJHp5V0py+aM/k7yEWzB8DKGd+v59hW6twgsefQ=" + }, + "io/netty#netty-transport-native-unix-common/4.1.93.Final": { + "jar": "sha256-d0FlocTbqssX+cGtZms1aaallxWugo58PUdwP0eaU+c=", + "pom": "sha256-Fbwltn/wpJJysnDvK4z/1iAFfKFssp3/etVmGtyirhI=" + }, + "io/netty#netty-transport/4.1.93.Final": { + "jar": "sha256-paeAGbwc1D28PHt83TgBkSyibR9Jj7VgUU/uSXhkupY=", + "pom": "sha256-DdYqDrPLHqABpNBCbk9cCN8ccNkmVnW/+lxYNhNCLUM=" + }, + "io/perfmark#perfmark-api/0.26.0": { + "jar": "sha256-t9I+k6NFN84zJwgmmg0UBHiKW14ZSegvVTX85Rs+qVs=", + "module": "sha256-MdgyMyR0zkgVD1uuADNDMZE28zav0QdqKJApMZ4+qXo=", + "pom": "sha256-ft7khhbhe2Epfq46gutIOoXlbSVnkpN4qkbzCpUDIto=" + }, + "io/sentry#sentry-kotlin-multiplatform-jvm/0.11.0": { + "jar": "sha256-EMJ6bRCkZK7LXZhhvjqlcnl6Cx/nipa87zUg4F4vZ1A=", + "module": "sha256-jf0/tfj/kN+g0T8Yr1K5nwYCY4Q3kMHHSIVNvpYY74Y=", + "pom": "sha256-XCpFSbIjGBj6v/vivnBZ2k2TC5yb+bsfyPG3rh/owz0=" + }, + "io/sentry#sentry-kotlin-multiplatform/0.11.0": { + "module": "sha256-4dzObB02wWfDljIlMAzF9qTVRHotFmHEuFoIF18YpgM=", + "pom": "sha256-9WZj83fjsVpNX5RQeEAzvJxGVzf665CSme6Ohp/LEDU=" + }, + "io/sentry#sentry/7.18.1": { + "jar": "sha256-npO59Q7db27VOBDSXewyg6CNnS3TEnwq9JMLsqh5qQM=", + "module": "sha256-bgQgjWchfoLi85Wn4N1t18viJc/iIn/RDwaTjOMsQuw=", + "pom": "sha256-DCOMY/KBAE6hfzTIUhqEETJFWFO4JGnUhj9wLY0wvuA=" + }, + "jakarta/activation#jakarta.activation-api/1.2.1": { + "jar": "sha256-iwoPUvqLBcVDGSGgY+2GbvqkHa3y46fuPhlh8rDZZFs=", + "pom": "sha256-QlhcsH3afyOqBOteCUAGGUSiRqZ609FpQvvlaf8DzTE=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.0.0": { + "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.0.0": { + "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.2": { + "pom": "sha256-FaVbfVN8n5lwrq0o0q+XwFn2X/YQL3a70p8SR92Kbfs=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/2.3.2": { + "jar": "sha256-aRVjBAeb3u2fwK47OTifGbPMS6REO8gFCJlTlOrXQuo=", + "pom": "sha256-tTeziNurTMBpC50vsMdBJNZyUxc0VnrPblMTDqsTGtY=" + }, + "javax/annotation#javax.annotation-api/1.3.2": { + "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=", + "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c=" + }, + "javax/inject#javax.inject/1": { + "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=", + "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/bytebuddy#byte-buddy-agent/1.17.4": { + "jar": "sha256-4drn78VWLCmtO2JbkOaGQgjeabrVYyw/k6VH8XYirFE=", + "pom": "sha256-1ghCjJXnT6aXreYmDmCUE8O+oL+Wh72hvoe3BAPi/8k=" + }, + "net/bytebuddy#byte-buddy-parent/1.17.4": { + "pom": "sha256-4FQGL6bGDfvTnqmX8zgQZWTR7w3f5vu+qGeD+toDvak=" + }, + "net/bytebuddy#byte-buddy/1.17.4": { + "jar": "sha256-dHaHMSGaWy4MydKxyeIJLgYiJC5BsZJaa6c0bhYHMbw=", + "pom": "sha256-7sHUc2OcrqtenXbx+KSGRrCQZ7DFyYS3oL5TAoghg10=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "net/java/dev/jna#jna-jpms/5.12.1": { + "jar": "sha256-Az6Kx6dCYkdIvyUWSPFQls9uFavgxMFfSnfKEIFqEyQ=", + "pom": "sha256-/oIEsE54gTuRM65GObdiwZauazmdQ9Z/olFXz7FSXS0=" + }, + "net/java/dev/jna#jna-platform-jpms/5.12.1": { + "jar": "sha256-1zvIB9SAk+9FzjVcZEb9/fO8DucEOysV+wM66hdhEQY=", + "pom": "sha256-CgHHSMhZdtcu2DfW/tp7Rk1DtjlV4JsYhH2FOPMmJc0=" + }, + "net/java/dev/jna#jna-platform/5.13.0": { + "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=", + "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY=" + }, + "net/java/dev/jna#jna-platform/5.15.0": { + "jar": "sha256-GLf259NM6JMJptkFKuGph+jmQFfi9oPgHlDy8rWc0VM=", + "pom": "sha256-oNnHuB/tH6i+iLAv16dWDeGxrFlYOh4sWiGopdxs32c=" + }, + "net/java/dev/jna#jna-platform/5.6.0": { + "jar": "sha256-ns6ovysbOZY5OdGLcEZO72DFCP7Ygg+dyroMNVGOq/c=", + "pom": "sha256-G+s1y0GE5skGp+Murr2FLdPaCiY5YumRNKuUWDI5Tig=" + }, + "net/java/dev/jna#jna/5.13.0": { + "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", + "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + }, + "net/java/dev/jna#jna/5.15.0": { + "jar": "sha256-pWQVjSirUSf8apWAKO1UJ5/gmZZixGQltqOwmipSCU0=", + "pom": "sha256-J2YC/zZ6TDkVXa7MHoy1T0eJ5dgN+Qo6i2YD8d61ngU=" + }, + "net/java/dev/jna#jna/5.6.0": { + "jar": "sha256-VVfiNaiqL5dm1dxgnWeUjyqIMsLXls6p7x1svgs7fq8=", + "pom": "sha256-X+gbAlWXjyRhbTexBgi3lJil8wc+HZsgONhzaoMfJgg=" + }, + "net/sf/jopt-simple#jopt-simple/4.9": { + "jar": "sha256-JsWFbpVLX4ZNt28TuGkZtZxu7Pn9kwuWuqiIRia68vU=", + "pom": "sha256-evfi2LJLR5jwTCt9okyfvRt1V7TgF8IFRIFWWRYHkJI=" + }, + "net/sf/kxml#kxml2/2.3.0": { + "jar": "sha256-8mTdn3mh/eEM5ezFMiHv8kvkyTMcgwt9UvLwintjPeI=", + "pom": "sha256-Mc5gb06VGJNimbsNJ8l4+mHhhf0d58mHT+lZpT40poU=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/15": { + "pom": "sha256-NsLy+XmsZ7RQwMtIDk6br2tA86aB8iupaSKH0ROa1JQ=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" + }, + "org/apache/commons#commons-compress/1.21": { + "jar": "sha256-auz9VFlyillWAc+gcljRMZcv/Dm0kutIvdWWV3ovJEo=", + "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/35": { + "pom": "sha256-cJihq4M27NTJ3CHLvKyGn4LGb2S4rE95iNQbT8tE5Jo=" + }, + "org/apache/commons#commons-parent/42": { + "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/apache/groovy#groovy-bom/4.0.22": { + "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", + "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" + }, + "org/apache/httpcomponents#httpclient/4.5.14": { + "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=", + "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.14": { + "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.6": { + "pom": "sha256-sEK0HyOR7bANNff05Qmu0hI2SMHSRs5Y0Pe5Bcn+H3M=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.16": { + "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c=" + }, + "org/apache/httpcomponents#httpcomponents-parent/10": { + "pom": "sha256-yq+WfZSvshdT82CCxghiBr0fSIJf9ZaTLM66crZdOfo=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcore/4.4.16": { + "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=", + "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o=" + }, + "org/apache/httpcomponents#httpmime/4.5.6": { + "jar": "sha256-CysRAsGNPH4Fp3IUubdQGm9gVhdK5WBODiVndu2nVT4=", + "pom": "sha256-37/W/+KnhMqYF8RjZap/ileDILgFveOdb1WgsJ2KqMo=" + }, + "org/apache/logging#logging-parent/11.3.0": { + "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" + }, + "org/apache/logging#logging-parent/7": { + "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" + }, + "org/apache/logging/log4j#log4j-api/2.20.0": { + "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=", + "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc=" + }, + "org/apache/logging/log4j#log4j-api/2.24.2": { + "jar": "sha256-DKPsvUwxW91fLvavEncS33GMeDNMzlv2+3tKoX/asSY=", + "pom": "sha256-PvzSYUu/xZCVlJDx3FgXwUGRmYHZ6daaZSZKFzHhWKc=" + }, + "org/apache/logging/log4j#log4j-bom/2.20.0": { + "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" + }, + "org/apache/logging/log4j#log4j-bom/2.24.2": { + "pom": "sha256-NQKIlCeybxfvStgWgCxJtJQ/DJOXJoYdEmPlenKiMEY=" + }, + "org/apache/logging/log4j#log4j-core/2.20.0": { + "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=", + "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4=" + }, + "org/apache/logging/log4j#log4j-core/2.24.2": { + "jar": "sha256-enuQ24ZshqEJOz/edYyig5jrsqUz2g15owzAp4UGud8=", + "pom": "sha256-XA2/WcPDVRdm+NdukpIOd0gLFWuTR6L3Uuz+tN1kSxc=" + }, + "org/apache/logging/log4j#log4j-slf4j2-impl/2.20.0": { + "jar": "sha256-uN0+TqnP+hjbXzAc2MU5FYZi5pHv1HAaqHtNCZYb2LA=", + "pom": "sha256-twx2AextJIylCOojNyjIYqBi2lg0doIWdAcvq7OLkU4=" + }, + "org/apache/logging/log4j#log4j/2.20.0": { + "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk=" + }, + "org/apache/logging/log4j#log4j/2.24.2": { + "pom": "sha256-TY1YM2j0eTVGPhpnFQLVkBnHSvSki7sjoiOptI8B9Hk=" + }, + "org/bitbucket/b_c#jose4j/0.9.5": { + "jar": "sha256-gI+zFm8+Z9rZgRwzECmrFoEkL9Urc1vD8z8oEWf8xy4=", + "pom": "sha256-utAkGAobRpy9lOXy2xKEG8rFRD2VRWB/Zzz95nfB2HI=" + }, + "org/bouncycastle#bcpkix-jdk18on/1.77": { + "jar": "sha256-Gsf+jv1bLzjNwWW+WgZ1c0/kSAjauScHIB8DpTXW8bg=", + "pom": "sha256-j7CSbwLixLLcUuR+uwk/kvHTu28UnCpcyl4qZI0sSY0=" + }, + "org/bouncycastle#bcprov-jdk18on/1.77": { + "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=", + "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM=" + }, + "org/bouncycastle#bcutil-jdk18on/1.77": { + "jar": "sha256-lHZzvLxajd4tL6aIpbdZjQym4qdKfqMM2T8E9rOtaPg=", + "pom": "sha256-Fj36ZjL/uSinBcqDciNQys6knM1iPOc2RaXMOw+p5ug=" + }, + "org/checkerframework#checker-compat-qual/2.5.5": { + "jar": "sha256-EdE0skXpysxHRRTS1mtbhhj4A5oUZc3FW7wLNOAAi3o=", + "pom": "sha256-QvIevZGDvgSe5a/IIrNFQDpdp2QDeHVzSgObDW4DU74=" + }, + "org/checkerframework#checker-qual/2.5.8": { + "pom": "sha256-M6xqDxNBrpZkfH1EZfSqPST+l9Jpe87izq5vyLXvLDw=" + }, + "org/checkerframework#checker-qual/3.33.0": { + "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=", + "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=", + "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM=" + }, + "org/checkerframework#checker-qual/3.42.0": { + "jar": "sha256-zK7dM68LeJTZ8vO2RPTRnkOSjjKQLmGsTRB3eDD1qsc=", + "module": "sha256-4PpiK33mPq4RBH726RtMKtDx8OE8uQP/UggKR/V6V0Y=", + "pom": "sha256-v1/KqycvVMvPG753w72WPIIcmrrSBYcIvwvtPIdUlMo=" + }, + "org/codehaus/groovy#groovy-bom/3.0.14": { + "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.18": { + "jar": "sha256-R/BYUrSO6brv74D6PYzqYO+kdTwAExId1/5e7y5ccp0=", + "pom": "sha256-rfUi9IOcNfUynql8QHrr6/qIB7ZEhS3E1c18l7em0uA=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.23": { + "jar": "sha256-n/5Sa/Q6Y0jp2LM7nNb1gKf17tDPBVkTAH7aJj3pdNA=", + "pom": "sha256-VhDbBrczZBrLx6DEioDEAGnbYnutBD+MfI16+09qPSc=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.18": { + "pom": "sha256-Tp31RqR89jBKExfEaHAQCocm++oRsN0YMi+VfkBwlzw=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.23": { + "pom": "sha256-a38FSrhqh/jiWZ81gIsJiZIuhrbKsTmIAhzRJkCktAQ=" + }, + "org/codehaus/mojo#mojo-parent/50": { + "pom": "sha256-+BnK0bFbaneRyLYB6WveM3ZeRoE5WAfbRTfS8N7dSTs=" + }, + "org/codehaus/mojo#mojo-parent/74": { + "pom": "sha256-FHIyWhbwsb2r7SH6SDk3KWSURhApTOJoGyBZ7cZU8rM=" + }, + "org/eclipse/ee4j#project/1.0.2": { + "pom": "sha256-dJWgenl+iOQ8O8GodCG9ix/FXjIpH6GOTjLYAx3chz8=" + }, + "org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": { + "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM=" + }, + "org/glassfish/jaxb#jaxb-bom/2.3.2": { + "pom": "sha256-oQGLtUZ47Z9ayy96QITjhf9RAgH06dv1913GpnX2a+c=" + }, + "org/glassfish/jaxb#jaxb-runtime/2.3.2": { + "jar": "sha256-5uCh6J+2/3hieeagCC1c71LcLr5nBT0EGABzdlK0/Rs=", + "pom": "sha256-lEilrX+mimCD375PQsjIPggrkgKhBUAfxo6UTCZUizQ=" + }, + "org/glassfish/jaxb#txw2/2.3.2": { + "jar": "sha256-SmqfSDOI1GG4GqmijGhbi3TAWXmTvxiEsE7dvKlfSP4=", + "pom": "sha256-p53QAvsDgYP/KGomNb4uaMEDuH4OZHF9jUS/0Bf9M+o=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/jdom#jdom2/2.0.6": { + "jar": "sha256-E0XxG6YG0VYD1nQFUajCGUfAIVZAdw7GcnH+eL6pfPU=", + "pom": "sha256-R7I6ef4za3QbgkNMbgSdaBZSVuQF51wQkh/XL6imXY0=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains#annotations/22.0.0": { + "pom": "sha256-pe8M4dxdO/1vYQD63AN3RVsc+wJRwsIX0yZqWkNYW7U=" + }, + "org/jetbrains#annotations/23.0.0": { + "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", + "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" + }, + "org/jetbrains#annotations/26.0.1": { + "jar": "sha256-IDe+N4mA07qTM+l5VfOyzeOSqhJNBMpzzi7uZlcZkpc=", + "module": "sha256-x/njSbNN+LIRRw4imGJEnDzBPLweeMebKXo3Ryey5gU=", + "pom": "sha256-kEBuKDkHRCqz88ZftqO25RdILNb4Ywgep70sggENrFc=" + }, + "org/jetbrains/androidx/graphics#graphics-shapes/1.0.0-alpha03": { + "module": "sha256-6Q8fmUKy7j76WxfzVB5BKVZaQEmIAA2KM1fOYkXADQY=", + "pom": "sha256-IfsRREjUl71+KtFsG8xpYId4BzWlJTKW5b1sV1PQqLs=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-common/2.9.0-alpha04": { + "module": "sha256-aqFPy1x7azOaQkXjSCA2jWL2o4Wahb9eU4e0Vf1VTK0=", + "pom": "sha256-y0+U9WGyH0BMf7zIZeF5+hHKJTf4sZjQ0IRnNrajdnA=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose-desktop/2.9.0-alpha04": { + "jar": "sha256-0oShPRDCm4/pPqXDlBPLjXQGUyug8Tdg98XOOq6Xe4Q=", + "module": "sha256-esWuBXS3RpwQThCsq1fLSNIWLv+HqKzXVnssnlboViU=", + "pom": "sha256-uegv/vs3HDMYEeBv/sb9ZXxGU4NJllBoU6tYlfZaXpE=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.9.0-alpha04": { + "module": "sha256-zKUN2P4iFsvYiFY9EYeH/MIsJdtDK75DUTVCXEblUhw=", + "pom": "sha256-5Hd36RAmo6FWG6DQRaXA4qAP3U27+vSG6sSV5k4lfHY=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.9.0-alpha04": { + "module": "sha256-bknNPW5DPJhx0PwTQb6lYTv/qA6zDdl3a1t8zFJHuas=", + "pom": "sha256-IbBAlrekoKrDY3mx/9kntqdMo2p7qnXpVeKDCDGooEo=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-compose-desktop/2.9.0-alpha04": { + "jar": "sha256-3f7rkmLQZaY8VAvnMqDmILZ3rHrvLCE6WEViehKSmSE=", + "module": "sha256-GexRNKE1HoJkB7/BdOirRTKG1eeQD116YiGwmDpnb7g=", + "pom": "sha256-48MWNEKfaaHQJ26ICLbpl7QDjCbfXVWTGeMTqe3DYLI=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-compose/2.9.0-alpha04": { + "module": "sha256-+9ayBiK9qNkZRCxpdHOYde6oLKsJaLOnPge4W1IGQ1Q=", + "pom": "sha256-fbPEU9dzg315i1FjOYEM8BJVysWTiBWNFgR+c5Be2gs=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-savedstate-desktop/2.9.0-alpha04": { + "jar": "sha256-FvZbSHgaFMaUIlbxNBVMBUBTKqpCF3t3++WbI+jRs9Y=", + "module": "sha256-sNV0hf7suQu9XH6cEl3m4MjMoggyRlZXUvruc0FviWU=", + "pom": "sha256-HwUIvK17WzGQ0hUOFF4uWjNOnngubx7+0xj7ROm6dwQ=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel-savedstate/2.9.0-alpha04": { + "module": "sha256-gKcAIcYGY/cR5VNPT0yjp00OJRlAeBuYhTF2bK4UQzs=", + "pom": "sha256-y/uF18Nt6BJq+dMSSopge12enEwOhoG+TbsYGpIkYTQ=" + }, + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.9.0-alpha04": { + "module": "sha256-CFQVo5KYYbwCv5xCBLcAn3nq0287BA6wYGECflIfyjQ=", + "pom": "sha256-giBGHdXfQbn0Sf4U+c2i9eoSI2gGbsx9HHa+gbNj+Tg=" + }, + "org/jetbrains/androidx/navigation#navigation-common-desktop/2.9.0-alpha14": { + "jar": "sha256-lQvnQVnErCjzcuGoNdn43Na7/PwhRDXZZXYYknvbKWw=", + "module": "sha256-iv67qHpYcLSEfCMAzWy4v9MN1UsyuyYAMDtos6DAcqY=", + "pom": "sha256-5MbcH3rekEXjNnczStuluQxWGjJi5PZoDcPe/E9F1DA=" + }, + "org/jetbrains/androidx/navigation#navigation-common/2.9.0-alpha14": { + "module": "sha256-P+Epqwk2Z3VEJoKGM1A+rthoAaK8U3Rkt1zEehv+wzI=", + "pom": "sha256-nTK4Sfn/CvXOS8vbr73cVQQL+xYqQdkRGO7HrOyc8JQ=" + }, + "org/jetbrains/androidx/navigation#navigation-compose-desktop/2.9.0-alpha14": { + "jar": "sha256-2fTNWGnlYiKAiO847s/4e1zSUVxXSSA4B/vYO+pTwq0=", + "module": "sha256-XDYB5RxltcvX+zXaQNBYf6Q60lTVaGV/xCZPvmI65Ls=", + "pom": "sha256-RwX+glV/+QAjKDxQ85PncaqNInRtAflZiST+zQz1b3E=" + }, + "org/jetbrains/androidx/navigation#navigation-compose/2.9.0-alpha14": { + "module": "sha256-qcO91XvDZpKz2kv1/bk70d8fstKt3fl3i9+u4gGOSVs=", + "pom": "sha256-mapb841feXzWuyMYMnGi5qzLMVaIP0cNcwREmMsHufw=" + }, + "org/jetbrains/androidx/navigation#navigation-runtime-desktop/2.9.0-alpha14": { + "jar": "sha256-kcV34HYpS8w/d/Uak8aHcTsWHp/UEi4JQ93kL748wY8=", + "module": "sha256-ctyeUp5q13fCG0tGGMFR9xlhxGBXFHLCTiqzc40KzTg=", + "pom": "sha256-rwYCidS9nQbH6aSqZIQ81jvGQJc4R6DGEjtJnuYWVcA=" + }, + "org/jetbrains/androidx/navigation#navigation-runtime/2.9.0-alpha14": { + "module": "sha256-2UTxuyQaMEQPaM1yLJkSv06Sp36qL44OBuq2dxC+7mA=", + "pom": "sha256-kTzW+l0TI2YOAzxJJwoqOybSBomTbqKu82RMxU5oSmw=" + }, + "org/jetbrains/androidx/performance#performance-annotation/1.0.0-alpha02": { + "module": "sha256-y892B/wsGu+lmgMT6hWE6gEIdc8Xnnu0TEYPVZnNc+I=", + "pom": "sha256-tFBttAnpLok73PB36S16gG1UTSN/7gb6JIPrjCFdBcM=" + }, + "org/jetbrains/androidx/savedstate#savedstate-desktop/1.3.0-alpha04": { + "jar": "sha256-41987aa7a73hycDhjM16ps4bdeNGCfgH6ihIBgrY4bc=", + "module": "sha256-rqMsjfibFAKUunDY5cM6DD4s8DH2IEJjJQ312mzVU0A=", + "pom": "sha256-cYUyHCtb5DXgXMQpVT47ML5BykjpBjpALGaPv9S+iWY=" + }, + "org/jetbrains/androidx/savedstate#savedstate/1.3.0-alpha04": { + "module": "sha256-i2FTZNeMO3Ki3XPl5dLnqG9H2K1/dP+1TjERVYhN2Eo=", + "pom": "sha256-ncPtVEigP556xWa9fJkp+RdYrNclUtttMuTum55Ox/4=" + }, + "org/jetbrains/androidx/window#window-core-desktop/1.4.0-alpha03": { + "jar": "sha256-TxK74lqFammMZ5aUQvQZcu3/qS0QfscnRSqs3FV1tg4=", + "module": "sha256-IN2SFn/GNnwrdFYj1igc/p2aGSXsHzstrN6TuCz+StY=", + "pom": "sha256-YwINNUMCxMPapZN9DQt35fOjuVTjkK72gnIpO7g0dic=" + }, + "org/jetbrains/androidx/window#window-core/1.4.0-alpha03": { + "module": "sha256-Uv5LQSghWM8m3ufAnN9Wd1i2IDoUk8gs6XTEM7VVdTQ=", + "pom": "sha256-KzAGtHCQliab2Q5wp683r5UmmqKs1YMeHG4mwsi+P8Y=" + }, + "org/jetbrains/compose#compose-gradle-plugin/1.8.0-alpha04": { + "jar": "sha256-2WBK5Um8q507w3WtQW2ji06xPpYvX5Hb7TIoofXWgxg=", + "module": "sha256-Gth21E1Ko0iLdc4WCDX9MNfJ5zjtIQzUQhYLtpOI9WM=", + "pom": "sha256-u9FEofPKM25kpi+2F1lo1yhlCmIzgzQoJBZqvrZbQf8=" + }, + "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.8.0-alpha04": { + "jar": "sha256-P5gb/7uA9FJx5DwcSTBKZkaPA111MCkA2Km70SPPUM0=", + "module": "sha256-btmw3t87doChrQ5ax3+br5laTF0TQjXEAyiEFrpSxq4=", + "pom": "sha256-vozzwcRUa5YqICnukSMGH951SdvXNmil91k2CQ68Vos=" + }, + "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.8.0-alpha04": { + "pom": "sha256-LloUKySgGL+p98Vv1ABrhlOUxEvzHVDCOfQRT3hLxQc=" + }, + "org/jetbrains/compose/animation#animation-core-desktop/1.8.0-alpha04": { + "jar": "sha256-KRrqHKb+qzsKwxzBZG7i5jQVLigruiY2/dfht+DFtQw=", + "module": "sha256-S/W/S2PMtco+xOpNtVE0LB7OUdiMvrhbsZHph6T5Xyk=", + "pom": "sha256-Pi27qd9WDdTiM94hqVBN0NwjcHgwDLxFc4QEHtTecCg=" + }, + "org/jetbrains/compose/animation#animation-core/1.8.0-alpha04": { + "module": "sha256-fDflvEiuq6jUGjBXSWbJ6DS3k9Exhq+gWWCiRYZzhnM=", + "pom": "sha256-Gx5oYdORxl/GM/eKaNj8oxGjE84p2LfslxlHCy286UY=" + }, + "org/jetbrains/compose/animation#animation-desktop/1.8.0-alpha04": { + "jar": "sha256-cunpgaebbblw+8dwFjiSt3PinbG33L8Khlxew07T+aw=", + "module": "sha256-0oaNiCNmM4ZFs6s1u7vO3g6DzCNYVzn1P/tB9yjVS74=", + "pom": "sha256-EXEmubeGcJmLLT77p77E7PYB93degR1AaVqTgoHzfGM=" + }, + "org/jetbrains/compose/animation#animation/1.8.0-alpha04": { + "module": "sha256-CKEQLW2XTTeC9vPTqP2xxwabAfvt+xOoPrJQvpuj2iA=", + "pom": "sha256-xj9AG9d+sLiw6+6JyJAlHBmR48lyHHfzaG0db6ADX6I=" + }, + "org/jetbrains/compose/annotation-internal#annotation/1.7.1": { + "module": "sha256-OBY3qiWg10JF0HpLhxPDjcUBtU+yWvnWHdwzMR9AFhk=", + "pom": "sha256-exANVYBe1I3wrGACFGbx1YcGM0wXJ9DQhRrNt302Ptk=" + }, + "org/jetbrains/compose/annotation-internal#annotation/1.8.0-alpha04": { + "module": "sha256-IPD+KWwOHKwUt3lpz+YNjrqOhgRFq/pJaP6G8zW1Kmk=", + "pom": "sha256-y+VVh6dkRxbLCSwF7tnKzkcDmzzWqMvbBcDT2kOfKx8=" + }, + "org/jetbrains/compose/collection-internal#collection/1.8.0-alpha04": { + "module": "sha256-vaFu6aIimSDvb3uPClwDQpd/ULoPX9c26t0Ex/cVS6c=", + "pom": "sha256-tdLR02XqaOZqtCrrGsKIOlEEhXKyCQr8Wtj4vciX4vU=" + }, + "org/jetbrains/compose/components#components-resources-desktop/1.8.0-alpha04": { + "jar": "sha256-G1jfMsZ/+08PPbwV/am5WeLsP0PgvFbdsIi+NRI3uaA=", + "module": "sha256-eBTk/GIdZEvVU2yX0kEX5zj7ca1PX9K0gwvkDzRyST4=", + "pom": "sha256-nNjAAz37WdYh2qf3/uMGjmX6WxXFzOQjhUc1ZRf6pZs=" + }, + "org/jetbrains/compose/components#components-resources/1.8.0-alpha04": { + "module": "sha256-QaapFBtuLRStUe2FSWfscImfxAxlzgr9py7+VOqUviM=", + "pom": "sha256-4YEBL4X+jda6rRYB1/ADf4bL168vEtcu7AXg5ucLwuY=" + }, + "org/jetbrains/compose/components#components-ui-tooling-preview-desktop/1.8.0-alpha04": { + "jar": "sha256-AgAr0hEQXk6BQOfXeonP6SGBToYuj314vM/ej+Gyl9A=", + "module": "sha256-5ZNliGoYZ4baEJQFRAwiybLJ7i8j0aqcyiVYfydyY/k=", + "pom": "sha256-JpKpRqmhhwNK+etHaGNO8mfl2XM9cDL84YJ9qN3sdRo=" + }, + "org/jetbrains/compose/components#components-ui-tooling-preview/1.8.0-alpha04": { + "module": "sha256-4AO3yPVIehqTsA0DnKEAKIUiMYgTWk/jG6/wZkTyKpE=", + "pom": "sha256-biX6hgQI0jdlIhg5rrl7pEkRh0Ac3kdAGKgCnfbdeOc=" + }, + "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.8.0-alpha04": { + "pom": "sha256-dIPgJCP4kd0RMgMVhp4Buyyrg3GKAbOyg3zWdIYb8iM=" + }, + "org/jetbrains/compose/desktop#desktop-jvm-macos-x64/1.7.1": { + "pom": "sha256-wmVpVQhvtQIR33ifcfL5M44Tqr+tbRPC8C0Qu4iPmic=" + }, + "org/jetbrains/compose/desktop#desktop-jvm/1.8.0-alpha04": { + "jar": "sha256-IZE7EA1GFlcHsrZW7Vs4vI7aD2Bj9VMnh+nRv3+UPv4=", + "module": "sha256-px3tHKJpOpZPpS18KyGDEaJqeL8iAzkBnkHYFdZGYU8=", + "pom": "sha256-gsz84p4fqrIpVYptzzg9R3aFi2aud5LPxIgrR79+knc=" + }, + "org/jetbrains/compose/desktop#desktop/1.8.0-alpha04": { + "module": "sha256-bsLHN/jwn0KVOFMJFeOZJxXRmQQX1cmAYt2XH+G5CwQ=", + "pom": "sha256-A5sexl6DYuM28keotN4oELcIKFKvMNjz8OxFBvpWZQ0=" + }, + "org/jetbrains/compose/foundation#foundation-desktop/1.8.0-alpha04": { + "jar": "sha256-UsZBh9YVrTi/PfQQaLKgGA2BiND4dfeaRpOPMHP9r7s=", + "module": "sha256-okLMq8ahtwADXCyTAFnyKsMC13Cz1KWk8sTEJncsGgM=", + "pom": "sha256-Jla3YP+wk7QTcc08ppcQM7lGAw6X1Ti4ux0z6YLfeM8=" + }, + "org/jetbrains/compose/foundation#foundation-layout-desktop/1.8.0-alpha04": { + "jar": "sha256-OCl8mANYZ4ojg1m10ru5DhE2tJuADGsvAnboR1q+SMI=", + "module": "sha256-HHEXynrYkcMxjqbl2Yi5xJHJipaCJDOFCOcGrhi2X9U=", + "pom": "sha256-K4qgsUplVMBjD8rpIjDAQae2np2tNs15ILqj66+ZtrE=" + }, + "org/jetbrains/compose/foundation#foundation-layout/1.8.0-alpha04": { + "module": "sha256-3j0zb44v6qd5Brs7Mt3WQN8W3Ci5+SAKcSZDtKT0mU4=", + "pom": "sha256-8F0/i7DVy4p5OtG8OD7D0IElawLjdAPCxanSqncqoEY=" + }, + "org/jetbrains/compose/foundation#foundation/1.8.0-alpha04": { + "module": "sha256-9oLYatpLCjX0kvltrnryeLTkVQRoj6CWOi+F9UmmsCo=", + "pom": "sha256-YdA6m9aCwFJtOkRsur7DUUKl0W+N9aG9zTpa4d6f6OU=" + }, + "org/jetbrains/compose/hot-reload#runtime-api-jvm/1.0.0-alpha03": { + "jar": "sha256-cBMG+ehDNn8KOONndw3kXCGyKsQDOuYzq28EmlrbOCs=", + "module": "sha256-MJrWoqxCI13Bv5SiLm4ydv70iLXDud5MMIkGCnDXnuM=", + "pom": "sha256-rfc6kmMv+o3HXRIBQ87jycO3uTidd7ZiHxpeKxfnI9o=" + }, + "org/jetbrains/compose/hot-reload#runtime-api/1.0.0-alpha03": { + "module": "sha256-v6USCSOJEC7uxPFlokR2i5j7QpCm/yJmYt76w6/8kH4=", + "pom": "sha256-U/KEvIGlcvtWlORFWvxGAc2GdyOzVdbLvuqdZAzahdc=" + }, + "org/jetbrains/compose/hot-reload#runtime-jvm/1.0.0-alpha03": { + "jar": "sha256-s9L61JESmSI/pmo/WxGFQQasUVsqjM0vYI2C2L7Z0KE=", + "module": "sha256-M1PgB201Bp9n0oy+p/afZH/jJBL3IJ85/pAZmdMQoJI=", + "pom": "sha256-ei0jfOFBdd94w134qn0jfG4X+DCou9jppQyG91GlKGY=" + }, + "org/jetbrains/compose/material#material-desktop/1.8.0-alpha04": { + "jar": "sha256-Jigh7AXNWziN0f9Z2e9q/aE1jUyewBXzjOMf90J7Ngg=", + "module": "sha256-R096AAjrxZC/DOA6pAcxDy6Qep2M9ZWOpfZnZbZ4Ftk=", + "pom": "sha256-AaGiVgwez3+fFyDjdjKGa+OiMDTs9LWGhVKWsVpuC6Q=" + }, + "org/jetbrains/compose/material#material-icons-core-desktop/1.7.3": { + "jar": "sha256-vPbIU7bbL/FI0tOq07en6lTZP8e0Lgr9hA622vGhxoE=", + "module": "sha256-e0EAWgTkVmrpU/c4diAmlt7sVBJ+ATzce8P7c0ZwNOM=", + "pom": "sha256-KPX/59+P3dmEwytjUP1xGPxkcPinV2ocaS8zZq72QKY=" + }, + "org/jetbrains/compose/material#material-icons-core/1.6.11": { + "module": "sha256-VcHqxOfrTOt14Cav0FTk+LgZBVPgJ2zuvR/HdXisYcE=", + "pom": "sha256-964wavWzWSCtqddmkygHpwQ7vFLBD8DBVp+BohfGoV0=" + }, + "org/jetbrains/compose/material#material-icons-core/1.7.3": { + "module": "sha256-bzMObQpiopITWjDBxT6lGWrXrrBIZ5r2Hk/JKmYukHY=", + "pom": "sha256-wDviSkFlDR3YN/+tAA7Mf8y+y2EAoOj0gDmEcMQqhGo=" + }, + "org/jetbrains/compose/material#material-icons-extended-desktop/1.7.3": { + "jar": "sha256-3FXTg9yoJ541ORflxak9GSqV58pPkm7lXuC0Yn+Z2GA=", + "module": "sha256-PYIoDQjwjMPjN58f/jiHBUovuDfknStj1JIumjf6ecU=", + "pom": "sha256-cD/QmE10zp88WXPXTsyyxD26VBml9VT91Ux0URHkfzY=" + }, + "org/jetbrains/compose/material#material-icons-extended/1.7.3": { + "module": "sha256-sfqa12veAdmGn5uwxxKc0rByeU8jfgTRXj73yKZqSHI=", + "pom": "sha256-3NyiJy7t6vlAZmO5s4zMl8cXnoWqHKeJMuxhIuVZlYw=" + }, + "org/jetbrains/compose/material#material-ripple-desktop/1.8.0-alpha03": { + "jar": "sha256-vW+Je+w5CQLiVd0+HXLXY5jV6C3r1PDAbDCltfCsSVU=", + "module": "sha256-EtHZWUpaT43b+JNnLr0UNH+46uVvUsDso09uxw205gM=", + "pom": "sha256-0bQRtiT+S+VGZx57wM/MON424kPVd6XK7jGg5DhVDp4=" + }, + "org/jetbrains/compose/material#material-ripple-desktop/1.8.0-alpha04": { + "jar": "sha256-vW+Je+w5CQLiVd0+HXLXY5jV6C3r1PDAbDCltfCsSVU=", + "module": "sha256-oM3vSNacD0JZtYIvq4B2Z4QIYiHfaFioE2o3SpNdA34=", + "pom": "sha256-nLydR64foEZCAi/Z8Rkt4ozRgPFZ2k2SZj6cshQIiHo=" + }, + "org/jetbrains/compose/material#material-ripple/1.8.0-alpha03": { + "module": "sha256-RsSmhJ+KpLqDYBhJAqEx9A6kNmzAa/7eHwLOozoq88I=", + "pom": "sha256-dfywyKynZatgupUyaZC2o3BaMTs7JMefGvPEGfsLAjg=" + }, + "org/jetbrains/compose/material#material-ripple/1.8.0-alpha04": { + "module": "sha256-iTZr4vBCDfaIQuwAb7nKj2FbhbQzXgSOplOAHXazhho=", + "pom": "sha256-HDkzxtQw3cr4HRaHNZF5Xi2EL1bI6LK3+Bn9rhaFmoo=" + }, + "org/jetbrains/compose/material#material/1.8.0-alpha04": { + "module": "sha256-Nw5J10UtSt7rZIbZyjV0xEIBoMfBbEbe7VyLW7xHWus=", + "pom": "sha256-FcN5SQtW5NvA/ziosiKCm00iyQJj5J41CPaiRqdwkbY=" + }, + "org/jetbrains/compose/material3#material3-adaptive-navigation-suite-desktop/1.8.0-alpha04": { + "jar": "sha256-9Uj8r2rhipDxUf74oa4gtk3ajY6pXEtRmkKriHx+lBg=", + "module": "sha256-02VF4O1EUxBsJWEDq0s//c1ITJvBIQXp2/CGDZEqe+s=", + "pom": "sha256-lfSxzo6ZXZ8nO85Wj9aTZcb45iJE4JDbAuXngeaOaXE=" + }, + "org/jetbrains/compose/material3#material3-adaptive-navigation-suite/1.8.0-alpha04": { + "module": "sha256-ZKQWCdUc8i6K/Qt9+ECWl0O7PeWnB29ESj8rOzGOv5g=", + "pom": "sha256-5kU73LVJ/0daXUsa3zSy1KN/529FESSUwdngxXrvg/U=" + }, + "org/jetbrains/compose/material3#material3-desktop/1.8.0-alpha03": { + "jar": "sha256-JURxLAyB9oXJh91EBvN4VambiTVbXP2R+c9V15F94Vc=", + "module": "sha256-fLSR87OVtlX5bqGfSRT6nQJV4aeIE9xXmCUx0a8O0Is=", + "pom": "sha256-Gs17XElZ84eFPvucYiPDkD66znWSRH55vnwKqkNV9K0=" + }, + "org/jetbrains/compose/material3#material3/1.8.0-alpha03": { + "module": "sha256-/AykMQ/v1zUjdyjas194djHfq2fW59SyJ5Ti5ngAb8o=", + "pom": "sha256-mkJqqoq807D8Ab0Gn5jBGs5Dzu5T3W6zmKaBmGccqIE=" + }, + "org/jetbrains/compose/material3/adaptive#adaptive-desktop/1.1.0-alpha04": { + "jar": "sha256-faTVrekedntUkmvz+K6IqQUUq6HFgAtgFoE2GOe/Bxk=", + "module": "sha256-9ZsRYQmNkBDivhHHAhUGb/KrEm4S8AjpjnwtFZA5oWc=", + "pom": "sha256-RijD+D95uC1ctRTiSfuJngonVjxnzjyXl5ovI+9H78M=" + }, + "org/jetbrains/compose/material3/adaptive#adaptive-layout-desktop/1.1.0-alpha04": { + "jar": "sha256-MUflmNxPziKVzbNQh7P9LwVRYwOoK53PftAr6Rva+1I=", + "module": "sha256-SKnOGlvVTbdsdJ+si7fQ6kg2uFurgGGX8OCuk+yHQN0=", + "pom": "sha256-quacszVe3boTYfiNrvs0fy1sFRmM8RUsnQqL5/nNumA=" + }, + "org/jetbrains/compose/material3/adaptive#adaptive-layout/1.1.0-alpha04": { + "module": "sha256-jIaOoEfIH3Q1gcc4e2rE708ZepvtLfGrp0er3ndroyg=", + "pom": "sha256-lWqjI6SbV9FQocBVgJ/4Y1PYt4VAYEi087exf5JwKmM=" + }, + "org/jetbrains/compose/material3/adaptive#adaptive-navigation-desktop/1.1.0-alpha04": { + "jar": "sha256-GLbT0U/iQwJoWJAT7cLu8c+VkF7HZY4vcmBSlFroEc4=", + "module": "sha256-Gj73jQ5kwX/WoMHEdPOkUuy2yyH0WvfDxkJIis5RTus=", + "pom": "sha256-zTTtJpfBL7bdrZ3z9DQRl8EH3Fx2aSbZB8NCDu4BGzw=" + }, + "org/jetbrains/compose/material3/adaptive#adaptive-navigation/1.1.0-alpha04": { + "module": "sha256-VHtOiubu1uUUPILo7b8QVrxejL81ho2TzJFkYJJ5PQw=", + "pom": "sha256-U/JpeqLcjSltxij3HQAOpIJKQeiKE3jYInkNJWCjNos=" + }, + "org/jetbrains/compose/material3/adaptive#adaptive/1.1.0-alpha04": { + "module": "sha256-Vc4jWNA93TUofKnlRJcPlY+nHA9bJjP2htfZci32s8Y=", + "pom": "sha256-DwakDtwakDR3JatlKtuWyGoRzBdJ/thKi3FWMptr6js=" + }, + "org/jetbrains/compose/runtime#runtime-desktop/1.8.0-alpha04": { + "jar": "sha256-dYqLRtj3TT3WoY7PUNssBl2hcU1Tker6jPwNSuAFYyc=", + "module": "sha256-7mwXTJw3AUDwHL8cuOXAbD1j0sK5OcFbgwUuySJtVPc=", + "pom": "sha256-2iWE6NCe5JBcpmt6axdlodHESV7suZzNu9dpE5Yyykw=" + }, + "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.8.0-alpha04": { + "jar": "sha256-M5d4mfkEp+5caZLXkWOvWdIUzYmLCvPTfglOw32O9Zs=", + "module": "sha256-9AfZmTsolCClY7HzhsBtLEMoyeSs5BQe0QdOEvBqL/U=", + "pom": "sha256-A9rVWm5bnC5fR7+lYsyrTFPBbF1H9+lUrYVxUpptCJU=" + }, + "org/jetbrains/compose/runtime#runtime-saveable/1.8.0-alpha04": { + "module": "sha256-QEvySeBkdYZXuELg6Y3C45n5VMs+2Uc+c9iANW5FVLM=", + "pom": "sha256-L3/5oiP1pQLRj25jhd0032jKDPuBZoGO0+iLX5DUOYk=" + }, + "org/jetbrains/compose/runtime#runtime/1.8.0-alpha04": { + "module": "sha256-Ke4vccjmeAhP1xXn6TGv8ODjUAKICzdLy91O4IVO5pk=", + "pom": "sha256-2+tAHC7YOJC8P+S9gbOVRhT+IlcbpCA3NadhlFXROx0=" + }, + "org/jetbrains/compose/ui#ui-backhandler-desktop/1.8.0-alpha04": { + "jar": "sha256-2TtvBgXT16ftfFyheCy/yRlMpKB0zoz75bYBhhgEXvs=", + "module": "sha256-EYbwhN8UwlowXz6W70caow2VZsnKHL6iVU+lPbLlscM=", + "pom": "sha256-BaEAFwP5tXZnw+UKaNMLr+gs4r3q33KyTf2Tsk6rn44=" + }, + "org/jetbrains/compose/ui#ui-backhandler/1.8.0-alpha04": { + "module": "sha256-TBDY0Hn3KGaXliBWYe8TZabnDmpDGKn1QFyWQnxpbxc=", + "pom": "sha256-feZmFnksgkPDl9/stOR/3Dpq8QAOC1EVTxusUEsV7ZQ=" + }, + "org/jetbrains/compose/ui#ui-desktop/1.8.0-alpha04": { + "jar": "sha256-Job8jQ7qgLdf+L7mQ4wW59jYwINBvNTVdIw4nGdJL7k=", + "module": "sha256-Ff5YZ+Jq4s4GcEPEBC+zYPXDXHX/KNruZft5gCHwfEs=", + "pom": "sha256-UeXawNBzLJWDDnmg+CNyua/P1UbA9ieLV/HDVgAjVZk=" + }, + "org/jetbrains/compose/ui#ui-geometry-desktop/1.8.0-alpha04": { + "jar": "sha256-wi1EyFpdVX9holthBwT3BQfHrU/RYa9xK+Ot9cZhRCk=", + "module": "sha256-L68iLOl2A2eWUu7zXtBOjUKJVOq/2VrkpTTmAVzmtv0=", + "pom": "sha256-QD9xIa1KSkSVA70YjcW8WCZpbWDAFz+iv88dBbmmHps=" + }, + "org/jetbrains/compose/ui#ui-geometry/1.8.0-alpha04": { + "module": "sha256-iLjBZ8Ca8KHrRhwwCAeGyIykpkXz4IRDoYerbEmmaho=", + "pom": "sha256-a8eClm810GAi2FmaPhBF61JjLWtxeZUIHh0eHES/Wbc=" + }, + "org/jetbrains/compose/ui#ui-graphics-desktop/1.8.0-alpha04": { + "jar": "sha256-dgUyDYIUnaO3j7g+l6AGw2zuQcnm32vs6eZ6njvSeCc=", + "module": "sha256-RWpENQKtypekjfWFEN2BrpU1GDn7eidYbdEQmls2m9M=", + "pom": "sha256-1Ejf64hTl7MM5v3kHeTMAxM8tuzCyNI1vNrgOt7+has=" + }, + "org/jetbrains/compose/ui#ui-graphics/1.8.0-alpha04": { + "module": "sha256-dgasC7Sv2UrXEFPfZfZmndoWJQLAac0DbYWGlQIpR3o=", + "pom": "sha256-8r5b6KfndcPCq3x3x0oztRK6VQJSnVGUn3UCpVoOY1g=" + }, + "org/jetbrains/compose/ui#ui-test-desktop/1.8.0-alpha04": { + "jar": "sha256-8gwMPdg/+P73LRMdnYbd29Qyqg8TPFaq9Uh4MgKnwPM=", + "module": "sha256-R0xVp9dK9/nca2YPVz53s2biaHPwQh8YTzdMUh4mCSI=", + "pom": "sha256-/5DjfJFuZ9MYZEbybZJDJB6C/umgKs2Qk9h8otDrqbU=" + }, + "org/jetbrains/compose/ui#ui-test-junit4-desktop/1.8.0-alpha04": { + "jar": "sha256-3KpvbErFEDM8mZGRUaXaN+xZWZBWNBQ8410jLV30Mqg=", + "module": "sha256-4mfNKVC5Nrr+2dieyE9yLu2wlvwsyYcYNTouIO4yM4g=", + "pom": "sha256-xOPEs9/VKdwlCqHQzKmdZaNE1jL+Vq6WEEgxTBybseo=" + }, + "org/jetbrains/compose/ui#ui-test-junit4/1.8.0-alpha04": { + "module": "sha256-9BnCIqNd12DsgLydKk5BPHJNLsV7LicVSNR8bBUbEAI=", + "pom": "sha256-Dvgz+9We2mi46oNrGpp3zQLMrkCt6FUQu41TLa8uOg8=" + }, + "org/jetbrains/compose/ui#ui-test/1.8.0-alpha04": { + "module": "sha256-W2m3RxNmKdS5oYN0lMtnkm1aqNz2dSh8ECxUVSwvNTY=", + "pom": "sha256-Dzod4EqSklAgLdCF8GRcNWQqri+ZXDYsRvYKhEiv3Tk=" + }, + "org/jetbrains/compose/ui#ui-text-desktop/1.8.0-alpha04": { + "jar": "sha256-647zK5XWCZCYBUzUlLAPHJ492qSeFkwpbdA4ZscbxF0=", + "module": "sha256-HGLf8eMvWtn0jXhqzIAqjLsomvK8DGCQaH/qoykTm6U=", + "pom": "sha256-RxihxZRXxaJjOirKneQzRgjf7bodUJYF6B9KQfi5BmA=" + }, + "org/jetbrains/compose/ui#ui-text/1.8.0-alpha04": { + "module": "sha256-xWcKB6ER/XjY6lXCrrEX5cB9mxHyOGwKYmFIhuz2TuM=", + "pom": "sha256-hlzfNRHDmpaFFYFgzyTOpd5MZpL2XlQl5Zj8PUH5Fk8=" + }, + "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.8.0-alpha04": { + "jar": "sha256-SXgjEEYpWRoL9Au5lUam/EP84Ku7O/ysdGdI1g6NuoA=", + "module": "sha256-JsNUPNwLW1E66x5Sf2RjGBGUoSXJpuyIMFHa4Ztuym8=", + "pom": "sha256-Fcvhcf1/dQcU/T1Y3w6aL3SuB9axqtArgXWLsVS7Zls=" + }, + "org/jetbrains/compose/ui#ui-tooling-preview/1.8.0-alpha04": { + "module": "sha256-MC3ACIOclhJmen+O2UquZf4Oh3sFSihf9qV4RFmoZbs=", + "pom": "sha256-+lu0KDtKzkAq41dHCKlXcgcw2Bm9bS5DOR7IhzBCHjU=" + }, + "org/jetbrains/compose/ui#ui-unit-desktop/1.8.0-alpha04": { + "jar": "sha256-UFp3/NVE2OFY461bhSre/Nlh64+9NB/rjiGmk5UtuQY=", + "module": "sha256-0bxWb7mqdrA9KB4EzxNvi8Khs3BDLyVGeHYovegjr1s=", + "pom": "sha256-ljirfotctywtFIZ9A7V1MtIdIf6tjArzi5RCzcP7b/g=" + }, + "org/jetbrains/compose/ui#ui-unit/1.8.0-alpha04": { + "module": "sha256-pApTFo4xoFjFBPVZPjwrg1D/bA4w+CQ4wl3ukRuWPcc=", + "pom": "sha256-jBPwgwt41ln/tQHBHTNh8E3BelJzimXhJznwxXRLj7w=" + }, + "org/jetbrains/compose/ui#ui-util-desktop/1.8.0-alpha04": { + "jar": "sha256-zdnzOHJxDBTfdVDa2/yR1VrZo7cTRDHCr460L3V+F68=", + "module": "sha256-6iji9UjrDLhJ9cMEfL07jA8ThL7zN75zei3Y93rWMJ8=", + "pom": "sha256-8pQJk9w30k59Y44xX2ItT0kS1Ob8gOkQ+oqQe5z21eA=" + }, + "org/jetbrains/compose/ui#ui-util/1.8.0-alpha04": { + "module": "sha256-38CfOmAhhkWdmFrU8dCngZjXKMatWV44uimDAHZ+prY=", + "pom": "sha256-B2zeSirC6CxianbCa2ob+PmrGCHve//5qbpbPTxAxl0=" + }, + "org/jetbrains/compose/ui#ui/1.8.0-alpha04": { + "module": "sha256-k/S+3me2wuxyXAXSPgvXBXmlp9NLMla+L6taIH5LnOg=", + "pom": "sha256-2sOUh4F9TSH5g7gA7c+GLhHghZP++mLLqwxgdksIedY=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.1.20": { + "module": "sha256-LBPSZp00NWUMcd8t8VDbTl8QAZKj6B6XnnUrTeCVcxA=", + "pom": "sha256-AudGCweKYIs9brqmIBbZi5cSPtITgU7QorGL2r2+UzU=" + }, + "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.1.20/gradle85": { + "jar": "sha256-CpCRRspmOsVVe9Gcwyum7Cbk6Wf11fDpU8iImxe3n3g=" + }, + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.20": { + "module": "sha256-6NVkojvCA3s++xxbAP+3SuRPmXJFd+L8jYf/u8nLn7U=", + "pom": "sha256-oRA6cKb4/8EITdwIGyS6smpWRJcvnM0UG4mU2fUFRHg=" + }, + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.20/gradle85": { + "jar": "sha256-ZnTyl1XTJq3cdWov3Kvyu2AvAABKDtLbZp2j306EgAY=" + }, + "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-VNSBSyF3IXiP2GU5gSMImi/P91FQ17NdjnMKI34my9E=", + "pom": "sha256-rIU9chaJ+vEV8RiBCjU2/CcvE1to0CdFOqpW6eY79wc=" + }, + "org/jetbrains/kotlin#kotlin-build-common/2.0.21": { + "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=", + "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0=" + }, + "org/jetbrains/kotlin#kotlin-build-statistics/2.1.20": { + "jar": "sha256-TSjxg6dsMKjKwg56P6hwVMLdHbiGSzyc04nhjdmX0x4=", + "pom": "sha256-OR9tc0uDTJG3qAHiI638c2tYDb3ODxOafkvUdknATKM=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { + "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", + "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.20": { + "jar": "sha256-Uzw2yzYubtLRX1hzLn9MbSvtXJ1RebiXvEsJ0W1gU3c=", + "pom": "sha256-kn9h95cmHFnktTEDFNaf1KOrjvT3A596UyYHXEKkFzo=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.21": { + "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=", + "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.1.20": { + "jar": "sha256-bpSJbjIWA+O/6J/vAkeORNHWSj0l1J0GlIkv/AHGCs8=", + "pom": "sha256-EPseNeDocGdH6Og+ro+LQ0BrpmTkIB7J38ua99prQro=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { + "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", + "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.1.20": { + "jar": "sha256-xUoAcYyMDj7oWL9Cdxx/QBxePBc4hh4Y6VNjcQQvobM=", + "pom": "sha256-InQE6sbYCbwNlN74kzbf332afVOHkqI01Svbr8Kuha8=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { + "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", + "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.1.20": { + "jar": "sha256-3jtUI9j7+G6ivRM01AG8SqhOKOxIlFlS0RwAsQsUArY=", + "pom": "sha256-xgNdI3KARTSALDfOVU6MjLqq6EUUp7rWzAlkJNjySUU=" + }, + "org/jetbrains/kotlin#kotlin-compose-compiler-plugin-embeddable/2.1.20": { + "jar": "sha256-z4dQOryWkU8WnJ7WHTCgl1eMJrDaJmb90XLsfP8vrF0=", + "pom": "sha256-9CTFzFuaSpzOgM4GY2kMA4jf9yPI8fQ4vdk0q2F5JYA=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { + "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", + "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.1.20": { + "jar": "sha256-NjCjAYLGNXDrUZrmWqqUGSF9utCBT+3kLI3ecERlpMY=", + "pom": "sha256-+qpgvkJw6RSbWUOSZjlhkr60f/XjpAmF3u3FTlkXItI=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { + "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", + "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.1.20": { + "jar": "sha256-2eg98dhHogG6PAFqeGztCRvpUDmX0J9qnPF5buSJ83Q=", + "pom": "sha256-sdOMCv1uHRXEjBxdFWzmBXj0MxNr7FI/TrGZ968/gik=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.20": { + "jar": "sha256-sk9SbQ3++wKWrg9Ks2L51soCV3JcwnMIOprjN+ooJn0=", + "pom": "sha256-wKs06ffQCv3LIv0D5S6PhZpGR9lY4Lh7fQzSY0QWOlo=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20": { + "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y=", + "module": "sha256-AsJsJlASRw1yrc3buCTSOOayieEAzUu/moJ1Cj1Jv8A=", + "pom": "sha256-t02/6klcg6xWRwS6qDmk56W3kRiMj3llbJwZ3XfeLxg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20/gradle85": { + "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.1.20": { + "jar": "sha256-6vELILujkjoH+PsYL7jNVlaZ4Vfuc9Elma8fXKuiUEA=", + "pom": "sha256-PdYeaTbcUQBs5MN+/+Q+/hQAuEHgnsSx7kqU9rkZOCo=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.1.20": { + "jar": "sha256-APb4Q6vJMNDGGrtOPjAsjRd2EpH5srwlhv4SsMuXXq0=", + "module": "sha256-td7wBfIpohsq1pJt9wjPhLqe+8TsGcY16/5baTcx2wg=", + "pom": "sha256-CjCxRdSY1H2yVdDUzWp3hMXx+QyL+YgsupWCKjvzMHA=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.1.20": { + "jar": "sha256-1jf7pHCzv3E7CmXmcXrV3QOocl/MlFMCiUc6smtC6Cs=", + "module": "sha256-WJm5fnqbFx5sBeVJziqbo8ddJZMVnUsrAVZkFLVoUWo=", + "pom": "sha256-18CRV8ehutuNrk6Jv54N9FRbBM0DqqQJZqJm87hG0sM=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.20": { + "module": "sha256-6Ue1RPTNCcFQr9h5G70yoxN92uMEWn1TlL6lCaq5bFc=", + "pom": "sha256-H2OowlwTZmlled2VLz639CoKSns/avaRpIIjEwb82sk=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.20/gradle85": { + "jar": "sha256-+wFuZDtY4Koq7IkRDq8U54s3aMFX8lQ0V5X9aqEEk+s=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.20": { + "module": "sha256-IF4RacYovsBfHVnkTTIJFSiun9U6fjPsVDvO/bEojeY=", + "pom": "sha256-Y5ymx2U+Gp2pXfKjuuJsy3AcA6/VjHl6tr9vJV9kwwE=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.1.20": { + "jar": "sha256-EyGYEVmGCVkEsMsB76rh2BJJZB75FJ4Fs0T4ZKrpdfQ=", + "pom": "sha256-LZayVvD8kesSvOtuR2HhPXAf8TU/BZL8VymI2uai0Zs=" + }, + "org/jetbrains/kotlin#kotlin-metadata-jvm/2.0.0": { + "jar": "sha256-rY8cfbxaxG9cvS0uXeOcVsnbZd195xaoTgHOIIdYruY=", + "pom": "sha256-PyOxTvYPHkQ9bUHzmYPiOKpkiVjOHYmLarOcx8kYIGY=" + }, + "org/jetbrains/kotlin#kotlin-metadata-jvm/2.1.0": { + "jar": "sha256-uNOpJXS6HfxJvfIFJW0e3gZkFIyxUKti+qhyteG7RjI=", + "pom": "sha256-G8hTyAjj0o3D8Gf2Z/ZSSro0YWl6+VJu/et09Ulojdg=" + }, + "org/jetbrains/kotlin#kotlin-metadata-jvm/2.1.10": { + "jar": "sha256-2obtTzqMiIVZLWuKppH7hge0nzdzyLvQjDsUoxsU0v0=", + "pom": "sha256-OZxrMFNXrzLnNKHaSNydMR73ZhVSBR9IHHJPBeTNwBw=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/2.1.20": { + "jar": "sha256-pyVic6u53yI1kk2A/dNtZ4tFhGfDB2xmhRxCQ3vdPGY=", + "pom": "sha256-1Gec6AsERY5fzL1pteMUvxwMFnmH4EOVRv3+z7U+M0Y=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { + "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", + "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.9.20": { + "jar": "sha256-SbZvmonVD9KVTC6K6sgOT0iLCgkyKiXvrWJhV2cT3A8=", + "pom": "sha256-lCtehgLTF+wTZS8cAiIFK7kIF/KM9v6dRxEvCbPo5n0=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.9.24": { + "jar": "sha256-plFmRFu4XvgWzeEnJ5/gAX0rfMQ5s7lyOQ4bc21k6Uw=", + "pom": "sha256-CghcMAUb1tSrdlrVoMUXnEE7NfdBjyiDFy+9m6GrzMk=" + }, + "org/jetbrains/kotlin#kotlin-reflect/2.0.21": { + "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=", + "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk=" + }, + "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-x88d6VXfIqFihyImvQZ3yaDItmMKLi1z0R0UfNDFO3M=", + "pom": "sha256-cWKsEOFFTpJ2c7FcrQMp2jgvt1jmVPWfy0AHRZ2eyEE=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/2.0.21": { + "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=", + "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/2.1.20": { + "jar": "sha256-rkOX+7OqKhraCSkOdTu6maQRRUiXfDEVUmuZWPTLGgQ=", + "pom": "sha256-D4O1qQFWxhpv8QlVey2YjicQ7j++n0pCV6bqDYdIw9Y=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": { + "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=", + "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/2.1.20": { + "jar": "sha256-X9v2rnIjfOM11gPrEsSbCbycGjPAwB8dYud/8zZjzvs=", + "pom": "sha256-H3dwkEXdkF63UFqUKA037HV/CHCc/p86dKunO7+Z95s=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": { + "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=", + "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.1.20": { + "jar": "sha256-PU93KyOEFGUAF+l0YiVrfE1e36EBPL9Ud1c+sawuKIQ=", + "pom": "sha256-D/9/8dO/qczj77tNs4mJwmilHrZ/ge/QMRuKZGGLhak=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": { + "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=", + "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.1.20": { + "jar": "sha256-9mXXCxoIN/86Dve+xPxdn+1n6nXkaX3hWOtR8epQHD8=", + "pom": "sha256-tjmuINh6gV4wTd0goOTEk34Ttfx6Qme14VwOWQIphmU=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": { + "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=", + "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.1.20": { + "jar": "sha256-afRXrKuYNkwOtXjEl+DDypMLjPuCvndASdoEzeOAh/c=", + "pom": "sha256-PERTORE37EVcdL5Jb3HZpJhpbSVJvmT1mmBkfO7iVT0=" + }, + "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.1.20": { + "jar": "sha256-5pZQZxDSxI0BfMiczB6kkQF5lXcJK3Ah/q2pX/Yv1X8=", + "pom": "sha256-Al1rBx59fPPsennw0/5He9Ydveir9ZbYn41DL3wBmCU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { + "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.0": { + "module": "sha256-K5pa54X4UTqT+M7D9uXgf4sXZvhJezpIfzRBolHWdWM=", + "pom": "sha256-Sp2nqeUpW9VC1YY8rgNfevnKEB8iXEoIkcPS343CqA0=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.10": { + "module": "sha256-fgul3UlZnOJ2woa+M0hY8lEoSiD3bbm8D12g+8mbtfU=", + "pom": "sha256-u8xfrT9+3ktGnUnbpsA+GZMTNlW16BcTteahvt0c60I=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.20": { + "module": "sha256-lNCtKyMZuFxANRz57nB32hLdOFA5LmzxCj/oFZ+8c/c=", + "pom": "sha256-1iLjAAVmBil0Qmj6iRKPt97U1C4XTOsIH2f3BWrJqLs=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { + "jar": "sha256-M9FI2w4R3r0NkGd9KCQrztkH+cd3MAAP1ZeGcIkDnYY=", + "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { + "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", + "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.20": { + "jar": "sha256-xUUdZ6J/M6/QmRPGfhzro4l65wiEsk7w/3EVflW2CGU=", + "pom": "sha256-AS4cVe1q3kF7y4JBEuvqaCrWJd++4WCFw3nM+hT68DM=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.24": { + "jar": "sha256-tmmbhQugeJ8ukEJ5zYvce+qRMP/RV826AB/HQl2KR7c=", + "pom": "sha256-RYapN9W8vDqzBCwECaHHKWFLy6PHpylvJS1ibuNzh9Q=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.1.10": { + "jar": "sha256-L4dvs1tz2YBuyFAHAyZavL1ap8PIH0GiylSoVahkmzQ=", + "pom": "sha256-6yvOL/52LUQE2Or+lYF3XLxbkLsfl/0xZLpyJRfTvsY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=", + "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { + "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", + "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.20": { + "jar": "sha256-+DP8yU8LscMbnni9S9p+oj9Xn/NAiuGpTi61dHCGoqs=", + "pom": "sha256-o7B96wkfKu1Z1lWYhPRPmc/135ufo1okvNa4sGnP9I0=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.24": { + "jar": "sha256-W1u/s+EYS14TMXw9QiN/okrdRDsud4GWHuozTbE2rbE=", + "pom": "sha256-BuBt70n5aq9uXD7EKDauWdbi2mJUcAkUKBZ1Z53J8qU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.1.10": { + "jar": "sha256-sJJg6kgo3Gz8Z9JhJ9rOOK4ru+ilZdLQKXJegcLSWOw=", + "pom": "sha256-YGyBfFx/1hFnDVWVK1dz+lxo8OPNJyelXe07GzzKLYc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.20": { + "module": "sha256-3Mql0xVHD6s5IFAohru4Xy2myGECxl2cBEEFRO7bIBk=", + "pom": "sha256-43IWpzLI6Bqf0FtN2JLDDKwMrXtOP9ovlmP0jogHQcA=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": { + "module": "sha256-3AUdwExqGW8tBtDTya8zufErybT+E5rhKQFAUII2tns=", + "pom": "sha256-Cu6WIJHn3QKIzDykz0qSjFYgcUYCEb+PQXkAkwbmGf4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.1.0": { + "jar": "sha256-1vkbew8wbMopn+x0+3w05IdNb17FuSWgtN4hkB4RnD8=", + "module": "sha256-3PvI6L8yzWen763ZHTEVK86YcJEdbsUIePT9tuA+cOI=", + "pom": "sha256-E05IwXeWwcECfsvmyfHHXHkvU1mHq4nh4d2kP4w2b14=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.1.10": { + "jar": "sha256-XyrByo3Is3o/QxTnFtNpaevwInp1GB0yaZ0Kj2RbHCE=", + "module": "sha256-jSwdcXxzVG1WOC0TbIZQtZpxWZQBciY4GJNKzkTLBI0=", + "pom": "sha256-SSISHT8LxgzkB/Ny3kLQKgt+lOddDD0VCLaDVyHySe8=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.1.20": { + "jar": "sha256-G8x06M6E4sJeqv3hDxJINJzOMGK242l4y+7GENsekwo=", + "module": "sha256-VdKW5FRF9siGmbCJZwbqlVCvh62Uhz3BO2W+u9VmCm8=", + "pom": "sha256-Z1DheZ7lAgd9rlw9WZeW9mdgb2DTXpXLeQRI3HkStAs=" + }, + "org/jetbrains/kotlin#kotlin-tooling-core/2.1.20": { + "jar": "sha256-tPu1I+hmLUqEUbmjap5/1D9jfLDNapueNoFxlmXavY0=", + "pom": "sha256-PO8cS3yC7KjMAcMMrt0VSQWeZfL51BYsjJ13+6JBMXY=" + }, + "org/jetbrains/kotlin#kotlin-util-io/2.1.20": { + "jar": "sha256-gqOymmEdR85jSuLmxQnN4qhvlLI7hr4whk6z1Lj+jn4=", + "pom": "sha256-eSQnftICC4UQ1F8N0QgREmVoEDAH2D+ZcfwYRmC9hKM=" + }, + "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.1.20": { + "jar": "sha256-8tXmhHFbkgtghJaObDPIuwWwtrl5GYAOLyIdlBgkDH0=", + "pom": "sha256-hCdVuVwx20vbks9tQshUGhcB+ivc8lIahwa8sDKgoZc=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/2.1.20": { + "jar": "sha256-/3nFsObkLZIOuxx2uhDMLdvyJOgFZFqO6sreSRbiqs4=", + "pom": "sha256-ps3TjXdd/QfQe9FZ00LPegqWg4qH50guIgxjrtluEoA=" + }, + "org/jetbrains/kotlin/native/cocoapods#org.jetbrains.kotlin.native.cocoapods.gradle.plugin/2.1.20": { + "pom": "sha256-Ud4AgMpY7sAcC9faZsz6yM6cDwasE2UJDIAuZ1j9hTg=" + }, + "org/jetbrains/kotlinx#atomicfu-gradle-plugin/0.27.0": { + "jar": "sha256-Ol911FKwg/txpx9fTjcvZH5kIguP1fXyk4pBDj4ESXc=", + "module": "sha256-HWkjLkplqQUDI3mHA4Gs0ns/IqI4dVPgK+vhpVMA5sA=", + "pom": "sha256-I1EtRWDRpL/Rm2h1wg9DE85ep20RhyUwI4yx58oxNDE=" + }, + "org/jetbrains/kotlinx#atomicfu-jvm/0.27.0": { + "jar": "sha256-K2hGQXAHCosIXYpyJMfAAtvWXqFOH4uXqWBRFaJS9/s=", + "module": "sha256-zi6Gt1JxP/5nAUvdHhLvKQxwLom/rLh6sn+/3X4Tusk=", + "pom": "sha256-WyUzVczAbyUcuFKuBHKkLV+9TQKZWebXgj6dE56gPZk=" + }, + "org/jetbrains/kotlinx#atomicfu-transformer/0.27.0": { + "jar": "sha256-Mun9/FpwR6fnVEc4/YmRFLUnp6RiTfhXAnsehwIAeOw=", + "module": "sha256-eKfmR1/c4aDr+A62Mk5w0km24a/CgrdQPcw8pCk+yMg=", + "pom": "sha256-CiaCvpkn5FD+21SnYt9RxyUXW8f7A8ckPWDy8ckBQrk=" + }, + "org/jetbrains/kotlinx#atomicfu/0.27.0": { + "module": "sha256-umecB1fjmeaKmfl9c4QosvtwB3F93/Dx3uuoYrr0RpA=", + "pom": "sha256-e3Fbn9t9MTr8hRjV/Kv0LrSfzNbNf/RHNqEF6AmUBdg=" + }, + "org/jetbrains/kotlinx#kotlinx-collections-immutable-jvm/0.3.8": { + "jar": "sha256-cumpsAA+xSVLY4GG98oWdbCABr3eTJxMWJlwNCzNLnc=", + "module": "sha256-ak06jrdCIbQ7CP4hv5Vcq9aROJd9z3j4b9DvYiC3Efc=", + "pom": "sha256-LE3NVjaKtStQKwiwLC8dOMBpV5BC9ZeanMEGzkA7u78=" + }, + "org/jetbrains/kotlinx#kotlinx-collections-immutable/0.3.8": { + "module": "sha256-mO+84WKQhF+zCN6UK5GjA4ZYuhUzoNL3eIO5bsqRQAI=", + "pom": "sha256-3IVbPjOh9u/AP72/DZlRG3Swh+lplfAEUfvyyJrgpHc=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.1": { + "pom": "sha256-nL0EumPnOZhWdFcT4xLS8hYaHUTtpQbe1HyNVtr4Rh8=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": { + "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.10.1": { + "jar": "sha256-BpxZiGMyMOB07A05Mh7DzapFR8SekLqTbGPY/JHIwA0=", + "module": "sha256-GN1lRl7IDQ5uXXGBi/EZLvSBfPXSASgrW5sbcTrHlpo=", + "pom": "sha256-f5AURlw6uheoNXqJZcqcnKjJ4aBEfHrqEXxkB4CKUtY=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { + "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", + "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", + "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": { + "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=", + "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=", + "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.10.1": { + "module": "sha256-y/1tFz4KXCmGr5U/ixzPKYAqrQnqympOkRQQj4rKyLE=", + "pom": "sha256-Ip7SIxgcPK8nt6wwHIFp3KLYYxkbcQ5hNVGlh5XANlU=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.8.0": { + "module": "sha256-FE7s1TZd4+MNe0YibAWAUeOZVbXBieMfpMfP+5nWILo=", + "pom": "sha256-yglaS/iLR0+trOgzLBCXC3nLgBu/XfBHo5Ov4Ql28yE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.10.1": { + "jar": "sha256-5fpnTj2mpw/hGI/A1l+GcFN5rto0xZy9ML0VwORlts8=", + "module": "sha256-Z53VZCkanbzH7lbmZCzzqdB7BXGWj9lN5BachzJ/i8U=", + "pom": "sha256-UqJfb2ZMxFkJQmTVEDOeVYOqyQJ/DqqqPXA1XHVQkkY=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-swing/1.10.1": { + "jar": "sha256-qOh6sO902a8KkWo3y3UtfCrrYhHyXWI3mYI1nJZWHdo=", + "module": "sha256-P8dvci/OUdZsWememwHmFMozLBpiW1j1/7H/ZvoBGgA=", + "pom": "sha256-pxygooWV1T8YLSaT9FWC0KsuhQYYe4azqQWNMUR4Y2c=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-test-jvm/1.10.1": { + "jar": "sha256-rD9FbJ4lw/wBVC3CCGVdBYPNN7X3LDWFYme3S9FmSrY=", + "module": "sha256-1Vy3uqS9VxhXovsAlq2pCDkpDPbzlw3hyGo3SusjhYI=", + "pom": "sha256-TvSo5xgZYDxXlcn4ejrRwLktoq61ANQ7TdfkHn6EoYk=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-test-jvm/1.8.0": { + "jar": "sha256-FTXMH0MjXYVm+NW8bRwR8HBBF+TlY/Ls5+aqPmhpXyA=", + "module": "sha256-HS0Zc6L0GowMEmPmCyXneS9ji4xV18ocbQZztkvlfac=", + "pom": "sha256-BtHlPqNm5to7FxkwV1+RYnzxnkUqTnqfDeMNLwQdZFE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-test/1.10.1": { + "module": "sha256-AkvK55oMK20YsLqRTJ9d4UW7+8nckZ8nD4lbLj34cVU=", + "pom": "sha256-ZpLE67CEkFdBfJclBfYjCNOoV62m66JGnTM40HX6JXM=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-test/1.8.0": { + "module": "sha256-DsPHX/2ZpqLfto8wfy8vcxQckz5Yt3sQTxyMrDr9U5Q=", + "pom": "sha256-NV8/pvBjDl6ZuHxywcQ4YgKin0lpFeOHWaOK3gsGkAQ=" + }, + "org/jetbrains/kotlinx#kotlinx-datetime-jvm/0.6.2": { + "jar": "sha256-ECdkkhEp4eRKdPQIt6C42sbRiSxgQuDkj4vbu/eMbS4=", + "module": "sha256-NU2xXaMv4YfblMbCNe96hDNrLdx5PQw3JEOZ320Kx9M=", + "pom": "sha256-OnOPkC80uNtLRGTRs9kj0mVuLKzEY2woadrFIO/Rbik=" + }, + "org/jetbrains/kotlinx#kotlinx-datetime/0.6.2": { + "module": "sha256-F5UTkzbHp4fwwvvyHSFc/1mRxx+AIZyjyiYOA0eIzCg=", + "pom": "sha256-6LX1lHxGTDyHzUJEdZ1odW/Db3pvZGQAFHGmXEX0z6U=" + }, + "org/jetbrains/kotlinx#kotlinx-io-bytestring-jvm/0.6.0": { + "jar": "sha256-uqd6eD1wpmr4jWiYodSXHkqoTmKyZBgFc3m98J+1uto=", + "module": "sha256-Tw2oHhXO+zujubirjmHoaoLtZd2N3S46cF2Euybr/Oo=", + "pom": "sha256-dQpt9xYR1MMAN+mCfSOVSSkKRuDBQBBoi4FM2ZZyG8c=" + }, + "org/jetbrains/kotlinx#kotlinx-io-bytestring-jvm/0.7.0": { + "jar": "sha256-6jimaw/0btgt3tnoHS3OcOX74DvWzFK0/IhpOB3qe30=", + "module": "sha256-D852CxW6wLkL7xvZDJfi0V+sQ6ZtwSCbSq7Jadk0Nv8=", + "pom": "sha256-mhfWfOIxynIhqWkS1WVtjRZ1gJ5FI/LDmupvs+o6bV8=" + }, + "org/jetbrains/kotlinx#kotlinx-io-bytestring/0.6.0": { + "module": "sha256-aO+bxmrpVPRzxZ9R679Ywdewb9b/9zNd0/s9JPipOQA=", + "pom": "sha256-I1NofPyzbJCaW8T08LUj0wv2WuXI34CsxW6enFJb528=" + }, + "org/jetbrains/kotlinx#kotlinx-io-bytestring/0.7.0": { + "module": "sha256-3NfGKkJ9279ezgt5jcEqD41VcSN/UScFEKUHIotjM3k=", + "pom": "sha256-b+eWaxTo7fC/rO+FfIiUpr9EtmFsbwK/7UoJMU7+0Zw=" + }, + "org/jetbrains/kotlinx#kotlinx-io-core-jvm/0.6.0": { + "jar": "sha256-QlI8gII9Me9Z+uQsklLvHTsRicqdPMOt/UAqKdBj5v8=", + "module": "sha256-tZuXjCxEJJpnRkGmlONaKs7LqBLah9NlpRZzQqjKU0c=", + "pom": "sha256-3DNkYsj1BEkGHNRdXLHI9oC+VEGqgQ6UQR/4GQmdT2s=" + }, + "org/jetbrains/kotlinx#kotlinx-io-core-jvm/0.7.0": { + "jar": "sha256-bt7cm+TYeK6oDH3WCfkb/Ef809NsyR/Q8/Mo+9ZlbI8=", + "module": "sha256-dDDspoloWorXVm2MgIIUpylQsdbwNjQd+MTYKah3Bsg=", + "pom": "sha256-I4nhfLeFp854BZ7v7yv5fpGCbCe4PMzhkbTkLtlfiBo=" + }, + "org/jetbrains/kotlinx#kotlinx-io-core/0.6.0": { + "module": "sha256-FIX7aljyQWnRr3PEFDAiUKx4u0axpD4Csa4hILKhJPA=", + "pom": "sha256-QIZ+EY9KW7uz291WZ3DY8Yu07w02MtyE+WyZ+2vD6oE=" + }, + "org/jetbrains/kotlinx#kotlinx-io-core/0.7.0": { + "module": "sha256-gTKXY+sZquO3OGcb7DFrkESEkcO/Unj24Q6kxwKS4iQ=", + "pom": "sha256-fu4E9DS9OmrRjhQFT0SH9DvKyQwDabBFA7FltzG+3Mo=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.6.3": { + "pom": "sha256-KdaYQrt9RJviqkreakp85qpVgn0KsT0Wh0X+bZVzkzI=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.8.0": { + "pom": "sha256-xD5IdSnM/RIJ66hlOrjolZggNGSq+/5fBEje2ZKHFQk=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.6.3": { + "jar": "sha256-KcghqNTiXL/k8s6WzdRSb2H49OaaE1+WEqNKgdk7ZfE=", + "module": "sha256-MpEE29NOS96QVhHUJ8dYTlPD+MQRg2+59pmsnbpbqmw=", + "pom": "sha256-K0qolJn8AbMNHBB1lmmOCvQ0BBLVQBnFAdm6ayk7oro=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.8.0": { + "jar": "sha256-08lOnYKbum4MTNOuR4pAhG3UnVR11nB4d76FOXav5BY=", + "module": "sha256-NzH80jhWGpCpdSs0hfHWNeAbRF5Kd4F9ewd/S50vQi0=", + "pom": "sha256-QVKRtvWbeTemcau136BLJyl811jLUQLNzHWUFJj5wDw=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core/1.6.3": { + "module": "sha256-Nh6eMetylhdLdAhaxJ7dhKTzkAupQxpOQM0cI952oyg=", + "pom": "sha256-0tv2/BU2TIlp1qq24+zMdROZU/LMBXtzDjUmdGWztX4=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core/1.8.0": { + "module": "sha256-mE2aqabpvMONfoNuqNAAsThyCH/GZY0NjWIldjPzlfE=", + "pom": "sha256-nVbnQWLOQn4MSetsuXUSR0Mq3PwukTw4KWY+27qr7hM=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-io-jvm/1.8.0": { + "jar": "sha256-q17I6kiBUZfEan359BimJ5H+kc2lAjuUHOTehy2BDME=", + "module": "sha256-/pQ5hti3/I7HoytonItHbDDM9KNbcKLEWxtffZ00BkM=", + "pom": "sha256-PbZlvwY1l3Inc9mKLQpqSps0FpeEFOnTYfICjTUc0yg=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-io/1.8.0": { + "module": "sha256-+3LQaky980DBOnBPywfUsWJ66NnDCtZnEwb6x1UnB7Q=", + "pom": "sha256-xgC76woBPRA7cbGCa+t0Sbnv/5x4Knl0JKoOdV+Cw0Q=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.6.3": { + "jar": "sha256-0yNBebz/GIbVPWfBHspH9/PPe2PDSdFpZfbbUbfz3Zo=", + "module": "sha256-InoqmtOMAQsQe8gFjNYVF32lqqhts399WNSdnJt/l9A=", + "pom": "sha256-eN9n0GTTuq8a9Ohi6YFGl3YpfGyHi7e/G0Ljky9vr48=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.8.0": { + "jar": "sha256-e3xEWIDO+U3EZPRzPaGzO5S+54gFBB6giuBuhQfkYg4=", + "module": "sha256-l+NZl/6prZY63lv0wDko/lOXS4JlIdSwP7+zyrAgiqo=", + "pom": "sha256-4CSBj4YiByqIM8DTmVd3Uet3ZJymO9DA/AYATWaRd6Q=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json/1.6.3": { + "module": "sha256-gNHYf6CmO/+Dleo5EL2oDQnw9YNQTd6o7QB7x6hrTNQ=", + "pom": "sha256-KcIhdhjlMdfYMsyICupu0aj0B3PkN/WkHXC9FUaNPOM=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json/1.8.0": { + "module": "sha256-lK/eU8GRw+Hge5+AiqF3f4YryKlbxQtGYozQkhnVaFg=", + "pom": "sha256-WAgq+Zc0Ah1bjbKcQ1sR1FyhGxwP14bHhFIsnSxxeVg=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-protobuf-jvm/1.8.0": { + "jar": "sha256-hWHBft8F4n6AKDDzuOnQrEoBhIxcM6eQMpMjgttxzjQ=", + "module": "sha256-wfxTEVd7TXf5mSZWiG2ZqcI6JfmoL8Ka1GkTai1e4fg=", + "pom": "sha256-c5L1fbU2xPK4BkfZQD9mho6mdHuoBFa9+0S/UNTdMY0=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-protobuf/1.8.0": { + "module": "sha256-C2UuSc1eykX730eSf6dH4dgsU8l8IcBSaozSeSAvyLY=", + "pom": "sha256-FGqb0rgoDpxfshb2oI9pSq4OYaroqFVB9leDfqf7QcA=" + }, + "org/jetbrains/skiko#skiko-awt-runtime-linux-x64/0.9.2": { + "jar": "sha256-1bqEsjiWPQTCXG6mfgbqhfjxIPY38iI7Jx/xmyCHago=", + "pom": "sha256-dgQjvLzTxvtYTM38ZmbILq0cjCePzc0hBw3drAh0WMg=" + }, + "org/jetbrains/skiko#skiko-awt-runtime-macos-x64/0.8.18": { + "jar": "sha256-czu+FuSlNbp4+zYYaaM20jfZXipSidJWnSlZudWeeGE=", + "pom": "sha256-yyEZbtoYT2eJZvn/23cBJe0POPoqYIBS7ObM+fLDjtw=" + }, + "org/jetbrains/skiko#skiko-awt/0.9.2": { + "jar": "sha256-4fgV9E9dr88S9nPNozVa5Zw5dUv5nzsR9tAP1wAVYUg=", + "module": "sha256-cRS/M68lkIkGDdO3c/8ew/0ZhGFmN1AXDR+ArDc7/D0=", + "pom": "sha256-u/8yFQDlUOusYZRHz8OFwTW3aYV6Jy+Wh8rdXnyBuXk=" + }, + "org/jetbrains/skiko#skiko/0.9.2": { + "module": "sha256-9bO/I9+wmkJel8IVGQUAdw5PvNU3BMSVHJQzhkibmYc=", + "pom": "sha256-gDnIMi9XqGWuacIkOKLhw8qTahFfCuPbLJYYoK79bxs=" + }, + "org/json#json/20231013": { + "jar": "sha256-DxgZLfKJEU4XqhoNCn+DcsyfXH5Pfjmtz4kG/nFPp9M=", + "pom": "sha256-xQBAI9OfVGNbNbvrQOIaKtVR/KDy41Cxzje9DnyypGY=" + }, + "org/jsoup#jsoup/1.18.1": { + "jar": "sha256-O7Ww7AKZir5FpR83185nwwaLTM1KtjyWWSnsUHTWTpE=", + "pom": "sha256-xN46hPu17vS9IpjW3pgcbNlyKHlQXINz4bZ/EdHK8n0=" + }, + "org/jspecify#jspecify/1.0.0": { + "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=", + "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=", + "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/jvnet/staxex#stax-ex/1.8.1": { + "jar": "sha256-IFIlSQVunlCqNe8LRFouR6U9Br4LCpRn1wTiSD/7BJo=", + "pom": "sha256-j8hPNs5tps6MiTtlOBmaf2mmmgcG2bF6PuajoJRS7tY=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/mozilla#rhino/1.7.10": { + "jar": "sha256-OOswAM9WuMdVnuVYhmp2juvL8lQXRSLWQEt/B491wtQ=", + "pom": "sha256-PHy6D12ldR1ipVZ2iXp64jaHx6Hi++HUdMW8Wka5+bM=" + }, + "org/openani/anitorrent#anitorrent-native-desktop-jni/0.2.0": { + "jar": "sha256-9LiZUNc3YshQre6bkCHh4zA9ZnTCaKBuNIK5Ju99qLI=", + "module": "sha256-c2G9Lw8t3ztqV1yTQmYOyymBpgy5Y9AAvoWJ+i6EVQA=", + "pom": "sha256-iGZteZ475N+d0tVVZ/iISHzIsXd8Tcc9ba93z5uW/Og=" + }, + "org/openani/anitorrent#anitorrent-native-desktop/0.2.0": { + "jar": "sha256-xt6tovrFO46mUj29p3WXsSgAZnRhbxQPBN8jJkxtGqM=", + "module": "sha256-RZc7W63m6YC4b+7n2clkdwBN5SRb5FEVZ88X+3OOUsM=", + "pom": "sha256-hPy+1uzaX5/YloQvdcb+X7Ir3vV/hJD6aBmpY1slvb4=" + }, + "org/openani/anitorrent#anitorrent-native-desktop/0.2.0/linux-x64": { + "jar": "sha256-fExfhUPLpfnTcaElh9C8d3KjuDDvqUDNv/PJF2wbLKw=" + }, + "org/openani/anitorrent#anitorrent-native/0.2.0": { + "module": "sha256-ZWpbvwWi7WTW4Ej8hyxELlSDKv1+wZTUPYPY8LlzI8k=", + "pom": "sha256-fDLSHOpLWBoaqZy56RcVS3vr0x8L3FKQO+larWZSmYQ=" + }, + "org/openani/anitorrent#catalog/0.2.0": { + "module": "sha256-Fp+/oA0z4BUbxPomV8rnAyZ6xF6aQ92b7N7cSh1qyq4=", + "pom": "sha256-biSyM8rPd6AVOIxolBm3JV+kjGfQA4km2WE8pJPY3kI=" + }, + "org/openani/anitorrent/catalog/0.2.0/catalog-0.2.0": { + "toml": "sha256-3yKg8yGXTxBzOV2CstWaymNc11DvlO4E6h9zXzQZ9Nw=" + }, + "org/openani/jsystemthemedetector#jSystemThemeDetector/3.8": { + "jar": "sha256-X/eFF2nvc9yE+f6sNFteBOzgDEaMgTl4HIhUEZxPB+E=", + "module": "sha256-tNPURyLcLU+zp0XR3bPrI2KkCTxbwyQFXPR2947iSbs=", + "pom": "sha256-A9Q+KKmVsrk+45mKFLodgLiJsyAbdvV5ZlKhNzhDIBk=" + }, + "org/openani/mediamp#catalog/0.0.25": { + "module": "sha256-RLBggEOm3icmkUsO/3gynkyUTCglWj9gEsSmtvTcw1A=", + "pom": "sha256-IpCOObVhNrYeZR9JM/SUAlsRU/dQHI1BEOliUP4bLvw=" + }, + "org/openani/mediamp#mediamp-api-desktop/0.0.25": { + "jar": "sha256-wq88zxU6os+DET2GQqnWf7IFQisk8nQfuOMm7yaRhxg=", + "module": "sha256-MXt+vTcFPagmRz20p8Yc3Hfvv6IxnBbEUFbhTRLWAAc=", + "pom": "sha256-xpu0PHOKwpHlQmT55zDFZqkCh3DSNcs+T3O8B7bV4Hc=" + }, + "org/openani/mediamp#mediamp-api/0.0.25": { + "module": "sha256-GGZ5gkP96zF4I9RqwLsTLCVXabkoXY/29o96THCNUnM=", + "pom": "sha256-NvLZVpFI9kzup4+s1Rt8f2iRF5IvLEtRs8I36T1VQq4=" + }, + "org/openani/mediamp#mediamp-compose-desktop/0.0.25": { + "jar": "sha256-oC7g3ItyOR0dT7B8L1ncqpQcYYmkC5CbbgKfmXBbCxQ=", + "module": "sha256-wXl1ZiDOfKEwiNMl/6xvFicuwbwIinx8Br7t+wq6b0w=", + "pom": "sha256-xHDUSQ6Q9AYoh5uMBnqClJOLnjQl9/+EAk5Tr83+Glw=" + }, + "org/openani/mediamp#mediamp-compose/0.0.25": { + "module": "sha256-lnwjp0GSCUlcXdOVXXpREfdwXSCIHop+12vL/4scNkY=", + "pom": "sha256-ypU2W27nTUDFHU5l2RQmwA3qBomypDxcjHK6RyCTzRY=" + }, + "org/openani/mediamp#mediamp-source-ktxio-desktop/0.0.25": { + "jar": "sha256-CmvsMdXJcrr1UcbNQVI8OyPqwxo9pLKYoa1ye5k0764=", + "module": "sha256-+L+8bBK8EWYmgLCZruaHln/EBMG5yHUU6O+Hfc1ydC8=", + "pom": "sha256-rOZygEVU3rbOo93jZUviPVG+UW9ugV7q7AlviGknlaQ=" + }, + "org/openani/mediamp#mediamp-source-ktxio/0.0.25": { + "module": "sha256-tjK6VgNDEW7ql4BkFaqp38X9VAvBaptZPneZpo7Qz8A=", + "pom": "sha256-N3VH1d/xULwg/i48Inp4GfJ+AR7Btm7S9ozveI/FSok=" + }, + "org/openani/mediamp#mediamp-vlc-compose/0.0.25": { + "jar": "sha256-2OhSi5wEWMQNbhNLLZ+FRVibCCccHx/7UV6eWML9h34=", + "module": "sha256-Wr1cLaZulaLEs2xORbkzLEjvka5o2A7gXHoLBwWKJkQ=", + "pom": "sha256-LXuOr48ZOQKU+/PrgMw/SOO9nhB6ghh54fyI9hraiNc=" + }, + "org/openani/mediamp#mediamp-vlc/0.0.25": { + "jar": "sha256-6xtrAnFEE8WkO/BF+vfGLKFpog1va7RwUgS3YR9xuaw=", + "module": "sha256-5amJLVbqLGiq0bSZA1MN0L9iQ46/6q7MrKjTN+rnfzs=", + "pom": "sha256-FWH7XzZbM5nOzozdJwsFiBhGFsGAhPc7fs/SSjTL9xA=" + }, + "org/openani/mediamp/catalog/0.0.25/catalog-0.0.25": { + "toml": "sha256-lT6UFnmhYD/YDIKLIdbjm7HyEJ0KdyhoTYEvWzcw0Ic=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-analysis/9.6": { + "pom": "sha256-+j+ZUCHP9PQTkwbmz/7uoHU5EGRA0psZzAanpjahOFA=" + }, + "org/ow2/asm#asm-analysis/9.7": { + "jar": "sha256-e8a8vCE3mUigyMRn+w+GQgbluBj2vAtUaHL1yflBVW8=", + "pom": "sha256-nDMIDry2Ma5Pd+ti7We/xAy4cujP0Fishj5EXB3Zc98=" + }, + "org/ow2/asm#asm-commons/9.6": { + "pom": "sha256-qYrkiVM0uvj/hr1mUWIQ29mgPxpuFeR92oKvz2tT13w=" + }, + "org/ow2/asm#asm-commons/9.7": { + "jar": "sha256-OJvCR5WOBJ/JoECNOYySxtNwwYA1EgOV1Muh2dkwS3o=", + "pom": "sha256-Ws7j7nJS7ZC4B0x1XQInh0malfr/+YrEpoUQfE2kCbQ=" + }, + "org/ow2/asm#asm-tree/9.6": { + "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM=" + }, + "org/ow2/asm#asm-tree/9.7": { + "jar": "sha256-YvSzvENgRcGstcO6LY7FVuwzaQk9f10Gx0frBLVtUrE=", + "pom": "sha256-o06h4+QSjAEDjbQ8aXbojHec9a+EsFBdombf5pZWaOw=" + }, + "org/ow2/asm#asm-util/9.6": { + "pom": "sha256-UsXB01dAR3nRqZtJqFv506CFAluFFstz2+93yK40AF4=" + }, + "org/ow2/asm#asm-util/9.7": { + "jar": "sha256-N6ZBTTZkGXPxrxBJN8ldbZIbLdtNYSxmxanysT/BQhE=", + "pom": "sha256-XQFNjIcNSHGCW9LdtVZ7Ie9trI7Ei7uNu0ZbCzor9FI=" + }, + "org/ow2/asm#asm/9.6": { + "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", + "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" + }, + "org/ow2/asm#asm/9.7": { + "jar": "sha256-rfRtXjSUC98Ujs3Sap7o7qlElqcgNP9xQQZrPupcTp0=", + "pom": "sha256-3gARXx2E86Cy7jpLb2GS0Gb4bRhdZ7nRUi8sgP6sXwA=" + }, + "org/slf4j#slf4j-api/1.7.30": { + "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" + }, + "org/slf4j#slf4j-api/1.8.0-alpha2": { + "pom": "sha256-q7TTRvEsRpktok1TctybilWE2+hXbAlUkpId+iFpsEo=" + }, + "org/slf4j#slf4j-api/2.0.16": { + "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=", + "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c=" + }, + "org/slf4j#slf4j-bom/2.0.16": { + "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk=" + }, + "org/slf4j#slf4j-parent/1.7.30": { + "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" + }, + "org/slf4j#slf4j-parent/1.8.0-alpha2": { + "pom": "sha256-nWWHTIet1peG5j/+ncT025AuB86ODQmzlRqZ46ptLCg=" + }, + "org/slf4j#slf4j-parent/2.0.16": { + "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU=" + }, + "org/slf4j#slf4j-simple/1.8.0-alpha2": { + "jar": "sha256-ObJOKXTUdzen28wQKUiyzOcb0wNUEKnRb5gRhQhgtcI=", + "pom": "sha256-rqEymqts7JmjCCpSzd/IKFTxEyjspEEpGkhMHUCuNCQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springframework#spring-framework-bom/5.3.24": { + "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=", + "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE=" + }, + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + }, + "org/tensorflow#tensorflow-lite-metadata/0.1.0-rc2": { + "jar": "sha256-LComT4QkmMNtNNKnuRNCSQ2alihiyFuqwazVTsL8ptk=", + "pom": "sha256-mk9eVnQ2bBVskDkWYvA+18WXHWqmODLfdKJx2m/4LpY=" + }, + "org/xerial#sqlite-jdbc/3.41.2.2": { + "jar": "sha256-DNq0EJR+BLZ0Pfmc8VQyZ93RBzV9b3aUjRRb5ZD9SX0=", + "pom": "sha256-rhGjsR3LrBtkA2ieP9jYKyzupV6C2/xLsyrt7fjMrI4=" + }, + "org/yaml#snakeyaml/2.2": { + "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", + "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" + }, + "tech/annexflow/compose#constraintlayout-compose-multiplatform-jvm/0.4.0": { + "jar": "sha256-xKVyQqdp1fCQB2UuS6gQcYmKZTInhQjD2TBn/0Ei6v0=", + "module": "sha256-TPx/6DMO+jmovVcqPHueF7WicqeBhBNKbvWbSnPRXgc=", + "pom": "sha256-nQULYmnCFV2QxFBxHWiJMIrPIvvW5yPnI4JZfoRfF9Y=" + }, + "tech/annexflow/compose#constraintlayout-compose-multiplatform/0.4.0": { + "module": "sha256-+Vs8lwmJ+y8cr2GN1AsbB4b1NC6hIESyTUH4TealwDY=", + "pom": "sha256-vb7fI+JUSZUrzLJYPx60FY9Dm9Zq2Wov9WJFoLdQvBE=" + }, + "uk/co/caprica#vlcj-natives/4.8.1": { + "jar": "sha256-9Hzvkd/fM1YRttEZRcnReU6FgRs4hMH9MfntdqsZ2lA=", + "pom": "sha256-pnZ3QHPk7j14LkcSlnmHf318CucundSwQCXVZnIpLtw=" + }, + "uk/co/caprica#vlcj/4.8.2": { + "jar": "sha256-ME1YXngL6HZbqk+oOzdsIZIHifnlcK7PiIkS1A7tq7U=", + "pom": "sha256-73L1ioRac36UiwFSE9tItp+cUTf3O1B8/ZeOVFxbIAk=" + } + } +} diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix new file mode 100644 index 000000000000..091da058f31d --- /dev/null +++ b/pkgs/by-name/an/animeko/package.nix @@ -0,0 +1,247 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gradle, + jetbrains, + autoPatchelfHook, + fontconfig, + libXinerama, + libXrandr, + file, + gtk3, + glib, + cups, + lcms2, + alsa-lib, + libGL, + libvlc, + libidn, + pulseaudio, + ffmpeg, + libva, + libdvbpsi, + libogg, + chromaprint, + protobuf_21, + libgcrypt, + libdvdnav, + libsecret, + aribb24, + libavc1394, + libmpcdec, + libvorbis, + libebml, + faad2, + libjpeg8, + libkate, + librsvg, + xorg, + libsForQt5, + libupnp, + aalib, + libcaca, + libmatroska, + libopenmpt-modplug, + libsidplayfp, + shine, + libarchive, + gnupg, + srt, + libshout, + ffmpeg_6, + libmpeg2, + xcbutilkeysyms, + lirc, + lua5_2, + taglib, + libspatialaudio, + libmtp, + speexdsp, + libsamplerate, + sox, + libmad, + libnotify, + taglib_1, + zvbi, + libdc1394, + libcddb, + libbluray, + libdvdread, + libvncserver, + twolame, + samba, + libnfs, + flac, + writeShellScript, + nix-update, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "animeko"; + version = "4.9.0"; + + src = fetchFromGitHub { + owner = "open-ani"; + repo = "animeko"; + tag = "v${finalAttrs.version}"; + hash = "sha256-fxnnOczLs88/OWYqHKTrWQyzqnqeODMKfoE3aQweQTc="; + fetchSubmodules = true; + }; + + postPatch = '' + echo "jvm.toolchain.version=21" >> local.properties + sed -i "s/^version.name=.*/version.name=${finalAttrs.version}/" gradle.properties + sed -i "s/^package.version=.*/package.version=${finalAttrs.version}/" gradle.properties + ''; + + gradleBuildTask = "createReleaseDistributable"; + + gradleUpdateTask = finalAttrs.gradleBuildTask; + + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + silent = false; + useBwrap = false; + }; + + env.JAVA_HOME = jetbrains.jdk; + + gradleFlags = [ "-Dorg.gradle.java.home=${jetbrains.jdk}" ]; + + nativeBuildInputs = [ + gradle + autoPatchelfHook + ]; + + buildInputs = [ + fontconfig + libXinerama + libXrandr + file + shine + libmpeg2 + gtk3 + glib + cups + lcms2 + alsa-lib + libidn + pulseaudio + ffmpeg + faad2 + libjpeg8 + libkate + librsvg + xorg.libXpm + libsForQt5.qt5.qtsvg + libsForQt5.qt5.qtbase + libsForQt5.qt5.qtx11extras + libupnp + aalib + libcaca + libva + libdvbpsi + libogg + chromaprint + protobuf_21 + libgcrypt + libsecret + aribb24 + twolame + libmpcdec + libvorbis + libebml + libmatroska + libopenmpt-modplug + libavc1394 + libmtp + libsidplayfp + libarchive + gnupg + srt + libshout + ffmpeg_6 + xcbutilkeysyms + lirc + lua5_2 + taglib + libspatialaudio + speexdsp + libsamplerate + sox + libmad + libnotify + zvbi + libdc1394 + libcddb + libbluray + libdvdread + libvncserver + samba + libnfs + taglib_1 + libdvdnav + flac + ]; + + autoPatchelfIgnoreMissingDeps = [ + "libmpcdec.so.6" + "libsidplay2.so.1" + "libresid-builder.so.0" + "libsrt-gnutls.so.1.5" + "liblua5.2.so.0" + "libspatialaudio.so.0" + "libdc1394.so.25" + "libx265.so.199" + "libdca.so.0" + "liba52-0.7.4.so" + "libFLAC.so.12" + ]; + + dontWrapQtApps = true; + + doCheck = false; + + installPhase = '' + runHook preInstall + + cp -r app/desktop/build/compose/binaries/main-release/app/Ani $out + chmod +x $out/lib/runtime/lib/jcef_helper + substituteInPlace app/desktop/appResources/linux-x64/animeko.desktop \ + --replace-fail "icon" "animeko" + install -Dm644 app/desktop/appResources/linux-x64/animeko.desktop $out/share/applications/animeko.desktop + install -Dm644 app/desktop/appResources/linux-x64/icon.png $out/share/pixmaps/animeko.png + + runHook postInstall + ''; + + preFixup = '' + patchelf --add-needed libGL.so.1 \ + --add-rpath ${ + lib.makeLibraryPath [ + libGL + libvlc + ] + } $out/bin/Ani + ''; + + passthru.updateScript = writeShellScript "update-animeko" '' + ${lib.getExe nix-update} animeko + $(nix-build -A animeko.mitmCache.updateScript) + ''; + + meta = { + description = "One-stop platform for finding, following and watching anime"; + homepage = "https://github.com/open-ani/animeko"; + mainProgram = "Ani"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ emaryn ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode + ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/an/ansible-lint/package.nix b/pkgs/by-name/an/ansible-lint/package.nix index aacb554af567..0b730c94d4d1 100644 --- a/pkgs/by-name/an/ansible-lint/package.nix +++ b/pkgs/by-name/an/ansible-lint/package.nix @@ -1,37 +1,34 @@ { lib, - python3, + python3Packages, fetchPypi, ansible, + writableTmpDirAsHomeHook, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "ansible-lint"; - version = "24.12.2"; - format = "pyproject"; + version = "25.2.1"; + pyproject = true; src = fetchPypi { inherit version; pname = "ansible_lint"; - hash = "sha256-9jYwnE5/ck/BpUTfUpxMI1T1TPNe3hHXUDZq+xFYpGQ="; + hash = "sha256-7Esfz6i+8T9Uf+76IupoZN79kCs6Jn749MU0GXb0X/E="; }; postPatch = '' # it is fine if lint tools are missing substituteInPlace conftest.py \ - --replace "sys.exit(1)" "" + --replace-fail "sys.exit(1)" "" ''; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3Packages; [ setuptools setuptools-scm ]; - pythonRelaxDeps = [ - "ruamel.yaml" - ]; - - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3Packages; [ # https://github.com/ansible/ansible-lint/blob/master/.config/requirements.in ansible-core ansible-compat @@ -48,20 +45,24 @@ python3.pkgs.buildPythonApplication rec { yamllint ]; + pythonRelaxDeps = [ "ruamel.yaml" ]; + # tests can't be easily run without installing things from ansible-galaxy doCheck = false; - nativeCheckInputs = with python3.pkgs; [ - flaky - pytest-xdist - pytestCheckHook - ]; + nativeCheckInputs = + with python3Packages; + [ + flaky + pytest-xdist + pytestCheckHook + ] + ++ [ + writableTmpDirAsHomeHook + ansible + ]; preCheck = '' - # ansible wants to write to $HOME and crashes if it can't - export HOME=$(mktemp -d) - export PATH=$PATH:${lib.makeBinPath [ ansible ]} - # create a working ansible-lint executable export PATH=$PATH:$PWD/src/ansiblelint ln -rs src/ansiblelint/__main__.py src/ansiblelint/ansible-lint @@ -88,12 +89,12 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible ]}" ]; - meta = with lib; { + meta = { description = "Best practices checker for Ansible"; mainProgram = "ansible-lint"; homepage = "https://github.com/ansible/ansible-lint"; changelog = "https://github.com/ansible/ansible-lint/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ sengaya ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sengaya ]; }; } diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index d6a5bea3143e..8eaa69f542e8 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -1,6 +1,5 @@ { lib, - runCommand, fetchFromGitHub, buildNpmPackage, pkg-config, @@ -10,7 +9,6 @@ makeDesktopItem, copyDesktopItems, commandLineArgs ? "", - nix-update-script, }: let @@ -113,17 +111,6 @@ buildNpmPackage { }) ]; - passthru.updateScript = nix-update-script { - # Prevent updating to versions with '-' in them. - # Necessary since Anytype uses Electron-based 'MAJOR.MINOR.PATCH(-{alpha,beta})?' versioning scheme where each - # {alpha,beta} version increases the PATCH version, releasing a new full release version in GitHub instead of a - # pre-release version. - extraArgs = [ - "--version-regex" - "[^-]*" - ]; - }; - meta = { inherit description; homepage = "https://anytype.io/"; diff --git a/pkgs/by-name/ao/aonsoku/package.nix b/pkgs/by-name/ao/aonsoku/package.nix index efa56fbef48d..03fa9cc13a3d 100644 --- a/pkgs/by-name/ao/aonsoku/package.nix +++ b/pkgs/by-name/ao/aonsoku/package.nix @@ -2,16 +2,12 @@ lib, fetchFromGitHub, rustPlatform, - cargo-tauri, nodejs, - pnpm, - + pnpm_8, pkg-config, wrapGAppsHook3, - openssl, - libsoup_2_4, webkitgtk_4_1, glib-networking, nix-update-script, @@ -19,39 +15,38 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "aonsoku"; - version = "0.8.3"; + version = "0.9.1"; src = fetchFromGitHub { owner = "victoralvesf"; repo = "aonsoku"; tag = "v${finalAttrs.version}"; - hash = "sha256-A1U1ubprwYJvyqTe5gVYTo8687sfP/76GfA+2EmtoCo="; + hash = "sha256-qlc7P222e6prYG30iVTAZhP772za3H7gVszfWvOr2NM="; }; - pnpmDeps = pnpm.fetchDeps { + # lockfileVersion: '6.0' need old pnpm + pnpmDeps = pnpm_8.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-BMEBJRycmOgsI1loTPTNY1dVOJ0HTCnzg0QyNAzZMn4="; + hash = "sha256-h1rcM+H2c0lk7bpGeQT5ue9bQIggrCFHkj4o7KxnH08="; }; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; useFetchCargoVendor = true; - cargoHash = "sha256-yuKaf05bQFah3MTC0eF82pMmTJrllWfUKX3SdIWbPjM="; + cargoHash = "sha256-8UtfL8iB1XKP31GT9Ok5hIQSobQTm681uiluG+IhK/s="; patches = [ ./remove_updater.patch ]; nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_8.configHook cargo-tauri.hook - pkg-config wrapGAppsHook3 ]; buildInputs = [ openssl - libsoup_2_4 webkitgtk_4_1 glib-networking ]; diff --git a/pkgs/by-name/ao/aonsoku/remove_updater.patch b/pkgs/by-name/ao/aonsoku/remove_updater.patch index 8f3ac85b61dd..8145cf552b63 100644 --- a/pkgs/by-name/ao/aonsoku/remove_updater.patch +++ b/pkgs/by-name/ao/aonsoku/remove_updater.patch @@ -37,10 +37,3 @@ index 3afc5f6..19785e5 100644 "app": { "withGlobalTauri": true, "security": { -@@ -56,4 +47,4 @@ - } - ] - } --} -\ No newline at end of file -+} diff --git a/pkgs/by-name/ap/apksigner/package.nix b/pkgs/by-name/ap/apksigner/package.nix index 108d15a89e99..84391b020bdc 100644 --- a/pkgs/by-name/ap/apksigner/package.nix +++ b/pkgs/by-name/ap/apksigner/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { mainProgram = "apksigner"; homepage = "https://developer.android.com/studio/command-line/apksigner"; license = licenses.asl20; - maintainers = with maintainers; [ linsui ]; + maintainers = with maintainers; [ linsui ] ++ lib.teams.android.members; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/ap/appimagekit/nix.patch b/pkgs/by-name/ap/appimagekit/nix.patch deleted file mode 100644 index f03922cb5ca4..000000000000 --- a/pkgs/by-name/ap/appimagekit/nix.patch +++ /dev/null @@ -1,82 +0,0 @@ -Submodule lib/libappimage contains modified content -diff --git a/lib/libappimage/cmake/dependencies.cmake b/lib/libappimage/cmake/dependencies.cmake -index 8d96484..c7b17a1 100644 ---- a/lib/libappimage/cmake/dependencies.cmake -+++ b/lib/libappimage/cmake/dependencies.cmake -@@ -91,9 +91,18 @@ if(NOT USE_SYSTEM_SQUASHFUSE) - INCLUDE_DIRS "" - ) - else() -- message(STATUS "Using system squashfuse") -+ message(STATUS "Using system squashfsfuse from ${SQUASHFUSE}") - -- import_pkgconfig_target(TARGET_NAME libsquashfuse PKGCONFIG_TARGET squashfuse) -+ add_library(libsquashfuse INTERFACE IMPORTED GLOBAL) -+ -+ set(squashfuse_INCLUDE_DIRS "${SQUASHFUSE}/include") -+ set(squashfuse_LIBRARIES "${SQUASHFUSE}/lib/libsquashfuse.a;${SQUASHFUSE}/lib/libsquashfuse_ll.a;${SQUASHFUSE}/lib/libfuseprivate.a") -+ -+ set_property( -+ TARGET libsquashfuse -+ PROPERTY INTERFACE_LINK_LIBRARIES ${squashfuse_LIBRARIES} -+ ) -+ include_directories(${squashfuse_INCLUDE_DIRS}) - endif() - - -diff --git a/src/appimagetool.c b/src/appimagetool.c -index 6b37419..23425e7 100644 ---- a/src/appimagetool.c -+++ b/src/appimagetool.c -@@ -38,7 +38,7 @@ - #include - - #include --#include "squashfuse.h" -+#include - - #include - #include -@@ -96,7 +96,7 @@ static void die(const char *msg) { - } - - /* Function that prints the contents of a squashfs file --* using libsquashfuse (#include "squashfuse.h") */ -+* using libsquashfuse (#include ) */ - int sfs_ls(char* image) { - sqfs_err err = SQFS_OK; - sqfs_traverse trv; -diff --git a/src/appimagetoolnoglib.c b/src/appimagetoolnoglib.c -index f900e76..ffa87f8 100644 ---- a/src/appimagetoolnoglib.c -+++ b/src/appimagetoolnoglib.c -@@ -3,7 +3,7 @@ - - #include - #include --#include "squashfuse.h" -+#include - - #include - #include -@@ -118,7 +118,7 @@ int is_regular_file(const char *path) - } - - /* Function that prints the contents of a squashfs file -- * using libsquashfuse (#include "squashfuse.h") */ -+ * using libsquashfuse (#include ) */ - int sfs_ls(char* image) { - sqfs_err err = SQFS_OK; - sqfs_traverse trv; -diff --git a/src/runtime.c b/src/runtime.c -index bada3af..70a642b 100644 ---- a/src/runtime.c -+++ b/src/runtime.c -@@ -29,7 +29,7 @@ - - #define _GNU_SOURCE - --#include "squashfuse.h" -+#include - #include - #include diff --git a/pkgs/by-name/ap/appimagekit/package.nix b/pkgs/by-name/ap/appimagekit/package.nix deleted file mode 100644 index 9f5b5d10bf96..000000000000 --- a/pkgs/by-name/ap/appimagekit/package.nix +++ /dev/null @@ -1,175 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pkg-config, - cmake, - autoconf, - automake, - libtool, - makeWrapper, - wget, - xxd, - desktop-file-utils, - file, - gnupg, - glib, - zlib, - cairo, - openssl, - fuse, - xz, - squashfuse, - inotify-tools, - libarchive, - squashfsTools, - gtest, -}: - -let - - appimagekit_src = fetchFromGitHub { - owner = "AppImage"; - repo = "AppImageKit"; - rev = "8bbf694455d00f48d835f56afaa1dabcd9178ba6"; - hash = "sha256-pqg+joomC5CI9WdKP/h/XKPsruMgZEaIOjPLOqnNPZw="; - fetchSubmodules = true; - }; - - # squashfuse adapted to nix from cmake expression in "${appimagekit_src}/lib/libappimage/cmake/dependencies.cmake" - appimagekit_squashfuse = squashfuse.overrideAttrs rec { - pname = "squashfuse"; - version = "unstable-2016-10-09"; - - src = fetchFromGitHub { - owner = "vasi"; - repo = pname; - rev = "1f980303b89c779eabfd0a0fdd36d6a7a311bf92"; - sha256 = "sha256-BZd1+7sRYZHthULKk3RlgMIy4uCUei45GbSEiZxLPFM="; - }; - - patches = [ - "${appimagekit_src}/lib/libappimage/src/patches/squashfuse.patch" - "${appimagekit_src}/lib/libappimage/src/patches/squashfuse_dlopen.patch" - ]; - - postPatch = '' - cp -v ${appimagekit_src}/lib/libappimage/src/patches/squashfuse_dlopen.[hc] . - ''; - - # Workaround build failure on -fno-common toolchains: - # ld: libsquashfuse_ll.a(libfuseprivate_la-fuseprivate.o):(.bss+0x8): - # multiple definition of `have_libloaded'; runtime.4.o:(.bss.have_libloaded+0x0): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preConfigure = '' - sed -i "/PKG_CHECK_MODULES.*/,/,:./d" configure - sed -i "s/typedef off_t sqfs_off_t/typedef int64_t sqfs_off_t/g" common.h - ''; - - configureFlags = [ - "--disable-demo" - "--disable-high-level" - "--without-lzo" - "--without-lz4" - ]; - - postConfigure = '' - sed -i "s|XZ_LIBS = -llzma |XZ_LIBS = -Bstatic -llzma/|g" Makefile - ''; - - # only static libs and header files - installPhase = '' - mkdir -p $out/lib $out/include - cp -v ./.libs/*.a $out/lib - cp -v ./*.h $out/include - ''; - }; - -in -stdenv.mkDerivation rec { - pname = "appimagekit"; - version = "unstable-2020-12-31"; - - src = appimagekit_src; - - patches = [ ./nix.patch ]; - - postPatch = '' - patchShebangs src/embed-magic-bytes-in-file.sh - ''; - - nativeBuildInputs = [ - pkg-config - cmake - autoconf - automake - libtool - wget - xxd - desktop-file-utils - makeWrapper - ]; - - buildInputs = [ - glib - zlib - cairo - openssl - fuse - xz - inotify-tools - libarchive - squashfsTools - appimagekit_squashfuse - ]; - - preConfigure = '' - export HOME=$(pwd) - ''; - - cmakeFlags = [ - "-DUSE_SYSTEM_XZ=ON" - "-DUSE_SYSTEM_SQUASHFUSE=ON" - "-DSQUASHFUSE=${appimagekit_squashfuse}" - "-DUSE_SYSTEM_LIBARCHIVE=ON" - "-DUSE_SYSTEM_GTEST=ON" - "-DUSE_SYSTEM_MKSQUASHFS=ON" - "-DTOOLS_PREFIX=${stdenv.cc.targetPrefix}" - ]; - - postInstall = '' - mkdir -p $out/lib/appimagekit - cp "${squashfsTools}/bin/mksquashfs" "$out/lib/appimagekit/" - cp "${desktop-file-utils}/bin/desktop-file-validate" "$out/bin" - - wrapProgram "$out/bin/appimagetool" \ - --prefix PATH : "${ - lib.makeBinPath [ - file - gnupg - ] - }" \ - --unset SOURCE_DATE_EPOCH - ''; - - nativeCheckInputs = [ gtest ]; - - # for debugging - passthru = { - squashfuse = appimagekit_squashfuse; - }; - - meta = with lib; { - description = "Tool to package desktop applications as AppImages"; - longDescription = '' - AppImageKit is an implementation of the AppImage format that - provides tools such as appimagetool and appimaged for handling - AppImages. - ''; - license = licenses.mit; - maintainers = with maintainers; [ taeer ]; - homepage = src.meta.homepage; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix index c95aea8d14ee..216251a44741 100644 --- a/pkgs/by-name/ap/apt/package.nix +++ b/pkgs/by-name/ap/apt/package.nix @@ -34,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "apt"; - version = "2.9.35"; + version = "3.0.0"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "apt-team"; repo = "apt"; rev = finalAttrs.version; - hash = "sha256-B4rFOt4J94/XkFw09sdvfogdY1b5R6QYnNC3HVUV9pc="; + hash = "sha256-0jtJ/y8TK/mJeTM5n1WblT9i5OtRg6r5C7kvB+ioMz0="; }; # cycle detection; lib can't be split diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index af4c56d640ae..8cbecd2b1b5f 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.87.1-60573"; + version = "1.90.1-61364"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-UiB5MQl7hRl6nPu4xiwOdhC40bHYIcpPNtWg98HqCJc="; + hash = "sha256-lQelLROhnefvcUholJlABaIgmWebFYGu5rmbnAtHs1c="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/ar/archi/package.nix b/pkgs/by-name/ar/archi/package.nix index 83018c009f95..7e88c8126611 100644 --- a/pkgs/by-name/ar/archi/package.nix +++ b/pkgs/by-name/ar/archi/package.nix @@ -11,6 +11,8 @@ wrapGAppsHook3, _7zz, nixosTests, + copyDesktopItems, + makeDesktopItem, }: stdenv.mkDerivation rec { @@ -48,6 +50,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook + copyDesktopItems ]; sourceRoot = if stdenv.hostPlatform.isDarwin then "." else null; @@ -55,6 +58,8 @@ stdenv.mkDerivation rec { installPhase = if stdenv.hostPlatform.system == "x86_64-linux" then '' + runHook preInstall + mkdir -p $out/bin $out/libexec for f in configuration features p2 plugins Archi.ini; do cp -r $f $out/libexec @@ -70,13 +75,35 @@ stdenv.mkDerivation rec { } \ --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \ --prefix PATH : ${jdk}/bin + + install -Dm444 icon.xpm $out/share/icons/hicolor/256x256/apps/archi.xpm + + runHook postInstall '' else '' + runHook preInstall + mkdir -p "$out/Applications" mv Archi.app "$out/Applications/" + + runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + name = "archi"; + desktopName = "Archi"; + exec = "Archi"; + type = "Application"; + comment = meta.description; + icon = "archi"; + categories = [ + "Development" + ]; + }) + ]; + passthru.updateScript = ./update.sh; passthru.tests = { inherit (nixosTests) archi; }; diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index 1f03ca226775..bbc228e6f17d 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.14.7"; + version = "2.14.10"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-ilXJWPvu3qwzuUN6AsQNyzrTHdQO51IFZcvZiQ/+/tU="; + hash = "sha256-Z+xSA0LrvXHHmNg7+i53Y1mSYnLYURZUglXRKvkld14="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-sfyTXP2vKVJQdUti0TNW/vrKovvN1/PMhEOUI8IiY44="; + vendorHash = "sha256-Xm9J08pxzm3fPQjMA6NDu+DPJGsvtUvj+n/qrOZ9BE4="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/pkgs/development/libraries/arrayfire/no-assets.patch b/pkgs/by-name/ar/arrayfire/no-assets.patch similarity index 100% rename from pkgs/development/libraries/arrayfire/no-assets.patch rename to pkgs/by-name/ar/arrayfire/no-assets.patch diff --git a/pkgs/development/libraries/arrayfire/no-download.patch b/pkgs/by-name/ar/arrayfire/no-download.patch similarity index 100% rename from pkgs/development/libraries/arrayfire/no-download.patch rename to pkgs/by-name/ar/arrayfire/no-download.patch diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/by-name/ar/arrayfire/package.nix similarity index 100% rename from pkgs/development/libraries/arrayfire/default.nix rename to pkgs/by-name/ar/arrayfire/package.nix diff --git a/pkgs/by-name/ar/artem/package.nix b/pkgs/by-name/ar/artem/package.nix index a04e31e6b3f5..9305dabc5f83 100644 --- a/pkgs/by-name/ar/artem/package.nix +++ b/pkgs/by-name/ar/artem/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,10 +23,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - checkFlags = [ # require internet access "--skip=arguments::input::url_input" diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix index b35cc724d2bd..58d2bd27db10 100644 --- a/pkgs/by-name/ar/arti/package.nix +++ b/pkgs/by-name/ar/arti/package.nix @@ -10,21 +10,21 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "arti"; - version = "1.3.2"; + version = "1.4.2"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; group = "tpo"; owner = "core"; repo = "arti"; - tag = "arti-v${version}"; - hash = "sha256-vypPQjTr3FsAz1AyS1J67MF35+HzMLNu5B9wkkEI30A="; + tag = "arti-v${finalAttrs.version}"; + hash = "sha256-dryW7znckIsa7O2H0U7p1urBXtANU6B9Pv11A+pBiho="; }; useFetchCargoVendor = true; - cargoHash = "sha256-brC8ZTB/+LAtNiG9/MGhPzzFcnaEBV/zU9lexZ56N/I="; + cargoHash = "sha256-o4he+WVsXf5GymTOvbBIsdhnGrvDtD8AMWmRMQMNiOw="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; @@ -52,18 +52,18 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { extraArgs = [ "--version-regex=^arti-v(.*)$" ]; }; }; meta = { description = "Implementation of Tor in Rust"; mainProgram = "arti"; homepage = "https://arti.torproject.org/"; - changelog = "https://gitlab.torproject.org/tpo/core/arti/-/blob/arti-v${version}/CHANGELOG.md"; + changelog = "https://gitlab.torproject.org/tpo/core/arti/-/blob/arti-v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ asl20 mit ]; maintainers = with lib.maintainers; [ rapiteanu ]; }; -} +}) diff --git a/pkgs/by-name/ar/artisan/package.nix b/pkgs/by-name/ar/artisan/package.nix new file mode 100644 index 000000000000..4cd977e9dc6c --- /dev/null +++ b/pkgs/by-name/ar/artisan/package.nix @@ -0,0 +1,38 @@ +{ + lib, + appimageTools, + fetchurl, +}: +let + pname = "artisan"; + version = "3.1.0"; + + src = fetchurl { + url = "https://github.com/artisan-roaster-scope/artisan/releases/download/v${version}/${pname}-linux-${version}.AppImage"; + hash = "sha256-PkrqX2CflSCR1e+4Y4K12iuCrYqDMecD1vf8GKz1StQ="; + }; + + appimageContents = appimageTools.extract { + inherit pname version src; + }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/org.artisan_scope.artisan.desktop $out/share/applications/org.artisan_scope.artisan.desktop + install -m 444 -D ${appimageContents}/artisan.png $out/share/applications/artisan.png + ''; + + meta = { + description = "visual scope for coffee roasters"; + homepage = "https://artisan-scope.org/"; + changelog = "https://github.com/artisan-roaster-scope/artisan/releases/tag/v${version}"; + downloadPage = "https://github.com/artisan-roaster-scope/artisan/releases"; + license = lib.licenses.gpl3Only; + mainProgram = "artisan"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ bohreromir ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/as/as31/package.nix b/pkgs/by-name/as/as31/package.nix index 2936f7a79958..5f3104b43907 100644 --- a/pkgs/by-name/as/as31/package.nix +++ b/pkgs/by-name/as/as31/package.nix @@ -2,22 +2,29 @@ lib, stdenv, fetchurl, + fetchpatch, bison, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "as31"; version = "2.3.1"; src = fetchurl { - url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:${pname}-${version}.tar.gz"; - name = "${pname}-${version}.tar.gz"; + url = "mirror://debian/pool/main/a/as31/${finalAttrs.pname}_${finalAttrs.version}.orig.tar.gz"; + name = "${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; hash = "sha256-zSEyWHFon5nyq717Mpmdv1XZ5Hz0e8ZABqsP8M83c1U="; }; patches = [ # Check return value of getline in run.c ./0000-getline-break.patch + + # fix build with gcc14 + (fetchpatch { + url = "https://salsa.debian.org/debian/as31/-/raw/76735fbf1fb00ce70ffd98385137908b7bd9bd5c/debian/patches/update_sizebuf_types.patch"; + hash = "sha256-ERrPdY0afKwXmdSLoWmWR55nKfvmieGlz+nhwFWRnrM="; + }) ]; postPatch = '' @@ -34,12 +41,12 @@ stdenv.mkDerivation rec { bison ]; - meta = with lib; { - homepage = "http://wiki.erazor-zone.de/wiki:projects:linux:as31"; + meta = { + homepage = "https://www.pjrc.com/tech/8051/tools/as31-doc.html"; description = "8031/8051 assembler"; mainProgram = "as31"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix index a79fa32aae9b..c5d94322405a 100644 --- a/pkgs/by-name/as/asciinema-agg/package.nix +++ b/pkgs/by-name/as/asciinema-agg/package.nix @@ -2,13 +2,8 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) Security; -in rustPlatform.buildRustPackage rec { pname = "agg"; version = "1.5.0"; @@ -25,10 +20,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-KQ4g4hWy8FZH4nLiB0874r8FCINXJboZ4C1dAAPA8Gc="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - meta = with lib; { description = "Command-line tool for generating animated GIF files from asciicast v2 files produced by asciinema terminal recorder"; homepage = "https://github.com/asciinema/agg"; diff --git a/pkgs/by-name/as/asdbctl/package.nix b/pkgs/by-name/as/asdbctl/package.nix new file mode 100644 index 000000000000..d6edeff45b59 --- /dev/null +++ b/pkgs/by-name/as/asdbctl/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + pkg-config, + udev, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "asdbctl"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "juliuszint"; + repo = "asdbctl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-S5m1iQlchGKc0PODQNDHpNzaNXRepmk5zfK5aXdiMiM="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-OPmnGh6xN6XeREeIgyYB2aeHUpdQ5hFS5MivcTeY29E="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + udev + ]; + + postInstall = '' + install -Dm444 \ + rules.d/20-asd-backlight.rules \ + $out/lib/udev/rules.d/20-asd-backlight.rules + ''; + + meta = { + description = "Apple Studio Display brightness controll"; + mainProgram = "asdbctl"; + homepage = "https://github.com/juliuszint/asdbctl"; + changelog = "https://github.com/juliuszint/asdbctl/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = [ + lib.maintainers.danieldk + ]; + }; +}) diff --git a/pkgs/by-name/as/assimp/package.nix b/pkgs/by-name/as/assimp/package.nix index 4aaa2ed60876..33a3a0b5de58 100644 --- a/pkgs/by-name/as/assimp/package.nix +++ b/pkgs/by-name/as/assimp/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, cmake, - boost, zlib, }: @@ -25,7 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - boost zlib ]; diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 915bc78835c2..ec8b4841a401 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ast-grep"; - version = "0.36.2"; + version = "0.37.0"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; tag = finalAttrs.version; - hash = "sha256-Ma4HwjbKujPEqJVXwNVV8HgszLlqDw3ogVoHwdKfwpU="; + hash = "sha256-X2FTIyvpz4nEBc7zrPNAq/yTdOlVupwSoDQzvZGDjo8="; }; # error: linker `aarch64-linux-gnu-gcc` not found @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-+qOrRGao2szGHvLE5DGccKMwKApYoAyK+moPtMMKhdE="; + cargoHash = "sha256-0PUXj9LSFFC10H3LHVuiOHCREwFz8AkgkzJDUAGI+V0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix index 3b4a0344be8f..edaff5e252cf 100644 --- a/pkgs/by-name/as/asusctl/package.nix +++ b/pkgs/by-name/as/asusctl/package.nix @@ -17,17 +17,17 @@ }: rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "6.1.10"; + version = "6.1.12"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; rev = version; - hash = "sha256-KCGoaqqXWFApD464jbNcdGhd7DDxrpNcRg/ClM0GrJc="; + hash = "sha256-E/tDd7wQKDgC91x1rGa8Ltn4GMPk3DJDvmMQNafVLyM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-c3uoQWdf4nG2SzLpB/T7AM/wrfxqVZcTVX1eRFZTGhQ="; + cargoHash = "sha256-lvm3xvI01RyaSS39nm3l7Zpn3x23DDBQr+0Gggl4p9U="; postPatch = '' files=" diff --git a/pkgs/by-name/at/atlantis/package.nix b/pkgs/by-name/at/atlantis/package.nix index 170208d48855..a6872325b99d 100644 --- a/pkgs/by-name/at/atlantis/package.nix +++ b/pkgs/by-name/at/atlantis/package.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "atlantis"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - hash = "sha256-6/e3h4et5xzo0Eoh5I90FW9drOUSut1Wz7MgTSlVXGk="; + hash = "sha256-2xgU3H6X9EcbySV9RXN5oCn+7EkfdwebeYsL5+Vl69E="; }; ldflags = [ "-X=main.version=${version}" "-X=main.date=1970-01-01T00:00:00Z" ]; - vendorHash = "sha256-OZBvDblAQ3VZ4AOnfSOlGrcKKzAkngRanwLzU0dPe+s="; + vendorHash = "sha256-1xII3GIQQCku3UzwPJnJu//zAJGuGCOSETR6sU4lPR8="; subPackages = [ "." ]; diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix index e91e6feea075..15d78b50a60f 100644 --- a/pkgs/by-name/at/atlas/package.nix +++ b/pkgs/by-name/at/atlas/package.nix @@ -4,17 +4,16 @@ fetchFromGitHub, installShellFiles, testers, - atlas, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "atlas"; version = "0.32.0"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-iM+Qy8tQAjonXpt36WWIEIAmtqnR0wWtMMxIh76Fv0U="; }; @@ -28,7 +27,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${version}" + "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${finalAttrs.version}" ]; subPackages = [ "." ]; @@ -41,17 +40,17 @@ buildGoModule rec { ''; passthru.tests.version = testers.testVersion { - package = atlas; + package = finalAttrs.finalPackage; command = "atlas version"; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; meta = { description = "Modern tool for managing database schemas"; homepage = "https://atlasgo.io/"; - changelog = "https://github.com/ariga/atlas/releases/tag/v${version}"; + changelog = "https://github.com/ariga/atlas/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "atlas"; }; -} +}) diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index 5e8c267dbf2d..99b38d0e0228 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -8,7 +8,6 @@ pkg-config, stdenv, installShellFiles, - darwin, crates ? [ "attic-client" ], }: rustPlatform.buildRustPackage { @@ -27,17 +26,10 @@ rustPlatform.buildRustPackage { installShellFiles ]; - buildInputs = - [ - nixVersions.nix_2_24 - boost - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - SystemConfiguration - ] - ); + buildInputs = [ + nixVersions.nix_2_24 + boost + ]; cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates; cargoHash = "sha256-AbpWnYfBMrR6oOfy2LkQvIPYsClCWE89bJav+iHTtLM="; diff --git a/pkgs/by-name/au/audacious-plugins/package.nix b/pkgs/by-name/au/audacious-plugins/package.nix index 5614a0450e04..f8d739feb72e 100644 --- a/pkgs/by-name/au/audacious-plugins/package.nix +++ b/pkgs/by-name/au/audacious-plugins/package.nix @@ -110,9 +110,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; postInstall = '' - ln -s ${ - vgmstream.override { buildAudaciousPlugin = true; } - }/lib/audacious/Input/* $out/lib/audacious/Input + ln -s ${vgmstream.audacious}/lib/audacious/Input/* $out/lib/audacious/Input ''; meta = audacious-bare.meta // { diff --git a/pkgs/by-name/au/audiowaveform/package.nix b/pkgs/by-name/au/audiowaveform/package.nix index 2d5d23cb35bb..ba34af45f68f 100644 --- a/pkgs/by-name/au/audiowaveform/package.nix +++ b/pkgs/by-name/au/audiowaveform/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "audiowaveform"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "bbc"; repo = "audiowaveform"; rev = version; - sha256 = "sha256-FcQq0xWs3jH2MfhFQ5r5Vaz8B3akBHBSg8Z/k9An/Wg="; + sha256 = "sha256-GrYShlLUD2vZYN6sJy4FnAMPiV36rOAxZUrK0mxJCRk="; }; cmakeFlags = [ diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix index 1d37501620a8..0ffb1904358c 100644 --- a/pkgs/by-name/au/auth0-cli/package.nix +++ b/pkgs/by-name/au/auth0-cli/package.nix @@ -2,6 +2,8 @@ lib, buildGoModule, fetchFromGitHub, + installShellFiles, + stdenv, }: buildGoModule rec { @@ -34,6 +36,15 @@ buildGoModule rec { --replace-fail "TestFetchUniversalLoginBrandingData" "SkipFetchUniversalLoginBrandingData" ''; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd auth0 \ + --bash <($out/bin/auth0 completion bash) \ + --fish <($out/bin/auth0 completion fish) \ + --zsh <($out/bin/auth0 completion zsh) + ''; + subPackages = [ "cmd/auth0" ]; meta = with lib; { diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index b6b1a3b465da..c8c7410d8d4c 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -278,7 +278,7 @@ let pyyaml requests-oauthlib scim2-filter-parser - sentry-sdk_2 + sentry-sdk service-identity setproctitle structlog diff --git a/pkgs/by-name/au/authoscope/package.nix b/pkgs/by-name/au/authoscope/package.nix index d46c6117c8ae..1c3350aabafb 100644 --- a/pkgs/by-name/au/authoscope/package.nix +++ b/pkgs/by-name/au/authoscope/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, installShellFiles, libcap, @@ -31,15 +29,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libcap - zlib - openssl - ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libcap + zlib + openssl + ]; postInstall = '' installManPage docs/${pname}.1 diff --git a/pkgs/by-name/au/autokbisw/nix/default.nix b/pkgs/by-name/au/autokbisw/nix/default.nix new file mode 100644 index 000000000000..ef16085c27f5 --- /dev/null +++ b/pkgs/by-name/au/autokbisw/nix/default.nix @@ -0,0 +1,7 @@ +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "swift-argument-parser" = "sha256-FSIi4jDX7R35jDHkKzQFJLl4K0Hdx9UWgwxJbHVpsYU="; + }; +} diff --git a/pkgs/by-name/au/autokbisw/nix/workspace-state.json b/pkgs/by-name/au/autokbisw/nix/workspace-state.json new file mode 100644 index 000000000000..67db53fa95f3 --- /dev/null +++ b/pkgs/by-name/au/autokbisw/nix/workspace-state.json @@ -0,0 +1,25 @@ +{ + "object": { + "artifacts": [], + "dependencies": [ + { + "basedOn": null, + "packageRef": { + "identity": "swift-argument-parser", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-argument-parser", + "name": "swift-argument-parser" + }, + "state": { + "checkoutState": { + "revision": "e1465042f195f374b94f915ba8ca49de24300a0d", + "version": "1.0.2" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-argument-parser" + } + ] + }, + "version": 6 +} diff --git a/pkgs/by-name/au/autokbisw/package.nix b/pkgs/by-name/au/autokbisw/package.nix new file mode 100644 index 000000000000..76b601b2ae24 --- /dev/null +++ b/pkgs/by-name/au/autokbisw/package.nix @@ -0,0 +1,45 @@ +{ + fetchFromGitHub, + lib, + swift, + swiftPackages, + swiftpm, + swiftpm2nix, +}: +let + # Nix dir generated by running `swiftpm2nix` in the upstream project + generated = swiftpm2nix.helpers ./nix; +in +swiftPackages.stdenv.mkDerivation rec { + pname = "autokbisw"; + version = "2.0.1"; + src = fetchFromGitHub { + owner = "ohueter"; + repo = "autokbisw"; + tag = version; + hash = "sha256-xNXXgDLWW8pdik3STmhpZATf9REd+8IGeoX/oxGg4vc="; + }; + nativeBuildInputs = [ + swift + swiftpm + ]; + configurePhase = generated.configure; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp $(swiftpmBinPath)/autokbisw $out/bin/ + + runHook postInstall + ''; + + meta = { + description = "Automatic keyboard input language switching for macOS"; + homepage = "https://github.com/ohueter/autokbisw"; + changelog = "https://github.com/ohueter/autokbisw/releases/tag/${version}"; + license = lib.licenses.asl20; + mainProgram = "autokbisw"; + maintainers = with lib.maintainers; [ craigf ]; + platforms = lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 5aa617445dd0..8cf4136e3816 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.72"; + version = "2.0.73"; src = fetchFromGitHub { owner = "maxbrunet"; repo = "automatic-timezoned"; rev = "v${version}"; - sha256 = "sha256-q4Z4NcgHWcl+w7+7e1QWwGsxrQVbyHGUuJxWfzEm5bM="; + sha256 = "sha256-QVWfdeGYMW/BKzgQD191vmEaRZLWi2QOtuOdDyQgwf8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-lTn4UCBuGc0eJ5CgRdpDSGmPxzRQ4wHQ1oseKRjRKR8="; + cargoHash = "sha256-E3qnOMiyPGMXCldmRQVEQVssx7aRHddVPQzt5B+i4Ko="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/by-name/au/autotrace/package.nix b/pkgs/by-name/au/autotrace/package.nix index 40be3cef2fa8..c6505c519f05 100644 --- a/pkgs/by-name/au/autotrace/package.nix +++ b/pkgs/by-name/au/autotrace/package.nix @@ -11,7 +11,6 @@ imagemagick, libpng, pstoedit, - darwin, }: stdenv.mkDerivation rec { @@ -41,16 +40,12 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - [ - glib - imagemagick - libpng - pstoedit - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + glib + imagemagick + libpng + pstoedit + ]; meta = with lib; { homepage = "https://github.com/autotrace/autotrace"; diff --git a/pkgs/by-name/aw/aws-lc/package.nix b/pkgs/by-name/aw/aws-lc/package.nix index b5e4223fa727..e831f7c0d86c 100644 --- a/pkgs/by-name/aw/aws-lc/package.nix +++ b/pkgs/by-name/aw/aws-lc/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - overrideSDK, cmakeMinimal, fetchFromGitHub, ninja, @@ -9,10 +8,7 @@ aws-lc, useSharedLibraries ? !stdenv.hostPlatform.isStatic, }: -let - awsStdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; -in -awsStdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "aws-lc"; version = "1.49.1"; diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index 2d2eaa752c06..1375fd281a4d 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -64,26 +64,25 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli2"; - version = "2.25.5"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.26.4"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; tag = version; - hash = "sha256-l2X7QhhrX0MzdB4WpuqaDcJdRK7G/vfig+F3F1tHM5Y="; + hash = "sha256-QpN4VdRUzWlb0bN8pTbvfZMbCvYwqKJgpPh5UdykzFg="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail 'flit_core>=3.7.1,<3.9.1' 'flit_core>=3.7.1' \ - --replace-fail 'awscrt==0.23.8' 'awscrt>=0.23.6' \ + --replace-fail 'awscrt==0.25.4' 'awscrt>=0.25.4' \ --replace-fail 'cryptography>=40.0.0,<43.0.2' 'cryptography>=43.0.0' \ --replace-fail 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \ --replace-fail 'docutils>=0.10,<0.20' 'docutils>=0.10' \ --replace-fail 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24' \ - --replace-fail 'ruamel.yaml.clib>=0.2.0,<=0.2.8' 'ruamel.yaml.clib>=0.2.0' \ - --replace-fail 'zipp<3.21.0' 'zipp>=3.21.0' + --replace-fail 'ruamel.yaml.clib>=0.2.0,<=0.2.12' 'ruamel.yaml.clib>=0.2.0' \ substituteInPlace requirements-base.txt \ --replace-fail "wheel==0.43.0" "wheel>=0.43.0" diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index 2d0a1e3cb865..ed83a519a8ab 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -25,14 +25,14 @@ in python.pkgs.buildPythonApplication rec { pname = "awsebcli"; - version = "3.21"; + version = "3.22"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-elastic-beanstalk-cli"; tag = version; - hash = "sha256-VU8bXvS4m4eIamjlgGmHE2qwDXWAXvWTa0QHomXR5ZE="; + hash = "sha256-I85VteUjPPWRixXC1mEiMmk46mYPzQJoaYcHV8ztMU4="; }; pythonRelaxDeps = [ @@ -45,12 +45,6 @@ python.pkgs.buildPythonApplication rec { "urllib3" ]; - postPatch = '' - # https://github.com/aws/aws-elastic-beanstalk-cli/pull/469 - substituteInPlace setup.py \ - --replace-fail "scripts=['bin/eb']," "" - ''; - dependencies = with python.pkgs; [ blessed botocore @@ -88,6 +82,9 @@ python.pkgs.buildPythonApplication rec { "test_generate_and_upload_keypair__exit_code_1" "test_generate_and_upload_keypair__exit_code_is_other_than_1_and_0" "test_generate_and_upload_keypair__ssh_keygen_not_present" + + # AssertionError: Expected 'echo' to be called once. Called 2 times + "test_multiple_modules__one_or_more_of_the_specified_modules_lacks_an_env_yaml" ]; meta = with lib; { diff --git a/pkgs/by-name/az/az-pim-cli/package.nix b/pkgs/by-name/az/az-pim-cli/package.nix index 8878135ed3e8..e595583cde3b 100644 --- a/pkgs/by-name/az/az-pim-cli/package.nix +++ b/pkgs/by-name/az/az-pim-cli/package.nix @@ -5,8 +5,9 @@ installShellFiles, stdenv, buildPackages, - versionCheckHook, nix-update-script, + testers, + az-pim-cli, }: buildGoModule (finalAttrs: { pname = "az-pim-cli"; @@ -37,11 +38,13 @@ buildGoModule (finalAttrs: { '' ); - doInstallCheck = true; - nativeInstallCheck = [ versionCheckHook ]; - versionCheckProgramArg = "version"; - - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + command = "HOME=$TMPDIR az-pim-cli --version"; + package = az-pim-cli; + }; + }; meta = { description = "List and activate Azure Entra ID Privileged Identity Management roles from the CLI"; diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index 1e1070f1759d..46daa2984f37 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -43,7 +43,6 @@ cubeb, useDiscordRichPresence ? true, rapidjson, - azahar, }: let inherit (lib) @@ -54,13 +53,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "azahar"; - version = "2120.2"; + version = "2120.3"; src = fetchzip { # TODO: use this when https://github.com/azahar-emu/azahar/issues/779 is resolved # url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz"; - url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-20250329-32bb14f.tar.xz"; - hash = "sha256-OyAc4nePQDuuwb+/ABnNe5ihPqMEoAqNeCYvME7SIio="; + url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-20250414-00e3bbb.tar.xz"; + hash = "sha256-3QKicmpmWDM7x9GDJ8sxm2Xu+0Yfho4LkSWMp+ixzRk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/az/azurite/package.nix b/pkgs/by-name/az/azurite/package.nix index 1e0fdda3c287..db06e0ef5dff 100644 --- a/pkgs/by-name/az/azurite/package.nix +++ b/pkgs/by-name/az/azurite/package.nix @@ -3,7 +3,6 @@ buildNpmPackage, fetchFromGitHub, stdenv, - darwin, libsecret, pkg-config, python3, @@ -26,17 +25,9 @@ buildNpmPackage rec { pkg-config python3 ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - libsecret - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin; - [ - Security - apple_sdk.frameworks.AppKit - ] - ); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libsecret + ]; meta = { description = "An open source Azure Storage API compatible server"; diff --git a/pkgs/by-name/ba/babl/package.nix b/pkgs/by-name/ba/babl/package.nix index bfccb384280f..e99f319fb7e5 100644 --- a/pkgs/by-name/ba/babl/package.nix +++ b/pkgs/by-name/ba/babl/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "babl"; - version = "0.1.110"; + version = "0.1.112"; outputs = [ "out" @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor finalAttrs.version}/babl-${finalAttrs.version}.tar.xz"; - hash = "sha256-v0e+dUDWJ1OJ9mQx7wMGTfU3YxXiQ9C6tEjGqnE/V0M="; + hash = "sha256-+2lmgkIXh8j+zIPoqrSBId7I7jjRGbZSkc/L4xUCink="; }; patches = [ diff --git a/pkgs/by-name/ba/backlight-auto/package.nix b/pkgs/by-name/ba/backlight-auto/package.nix index 3d8dc7338a9c..e6f849bf7096 100644 --- a/pkgs/by-name/ba/backlight-auto/package.nix +++ b/pkgs/by-name/ba/backlight-auto/package.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { + # Does not support zig 0.12 or newer, hasn't been updated in 2 years. + broken = lib.versionAtLeast zig.version "0.12"; description = "Automatically set screen brightness with a webcam"; mainProgram = "backlight-auto"; homepage = "https://len.falken.directory/backlight-auto.html"; diff --git a/pkgs/by-name/ba/badwolf/package.nix b/pkgs/by-name/ba/badwolf/package.nix deleted file mode 100644 index d0a46e9b81ec..000000000000 --- a/pkgs/by-name/ba/badwolf/package.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - ninja, - pkg-config, - ed, - wrapGAppsHook3, - webkitgtk_4_0, - libxml2, - glib-networking, - gettext, -}: - -stdenv.mkDerivation rec { - pname = "badwolf"; - version = "1.3.0"; - - src = fetchgit { - url = "https://hacktivis.me/git/badwolf.git"; - rev = "v${version}"; - hash = "sha256-feWSxK9TJ5MWxUKutuTcdmMk5IbLjNseUAvfm20kQ1U="; - }; - - # configure script not accepting '--prefix' - prefixKey = "PREFIX="; - - nativeBuildInputs = [ - ninja - pkg-config - ed - wrapGAppsHook3 - ]; - - buildInputs = [ - webkitgtk_4_0 - libxml2 - gettext - glib-networking - ]; - - meta = with lib; { - description = "Minimalist and privacy-oriented WebKitGTK+ browser"; - mainProgram = "badwolf"; - homepage = "https://hacktivis.me/projects/badwolf"; - license = with licenses; [ - bsd3 - cc-by-sa-40 - ]; - platforms = platforms.linux; - maintainers = with maintainers; [ - laalsaas - aleksana - ]; - }; -} diff --git a/pkgs/by-name/ba/bandwhich/package.nix b/pkgs/by-name/ba/bandwhich/package.nix index 65a9950e3061..234b5e1f176d 100644 --- a/pkgs/by-name/ba/bandwhich/package.nix +++ b/pkgs/by-name/ba/bandwhich/package.nix @@ -5,7 +5,6 @@ rustPlatform, installShellFiles, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,8 +23,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; - # 10 passed; 47 failed https://hydra.nixos.org/build/148943783/nixlog/1 doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/ba/base16-schemes/package.nix b/pkgs/by-name/ba/base16-schemes/package.nix index 55377a415843..5534fc67a7e5 100644 --- a/pkgs/by-name/ba/base16-schemes/package.nix +++ b/pkgs/by-name/ba/base16-schemes/package.nix @@ -4,16 +4,15 @@ fetchFromGitHub, ... }: - stdenv.mkDerivation (finalAttrs: { pname = "base16-schemes"; - version = "unstable-2024-11-12"; + version = "unstable-2025-04-18"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "schemes"; - rev = "61058a8d2e2bd4482b53d57a68feb56cdb991f0b"; - sha256 = "sha256-Tp1BpaF5qRav7O2TsSGjCfgRzhiasu4IuwROR66gz1o="; + rev = "28c26a621123ad4ebd5bbfb34ab39421c0144bdd"; + hash = "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY="; }; installPhase = '' diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index baf6ce4713c9..3cda30201b89 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -16,13 +16,13 @@ buildNpmPackage rec { pname = "basedpyright"; - version = "1.28.5"; + version = "1.29.0"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; tag = "v${version}"; - hash = "sha256-oaU+E/LAoZTeJjWnjvDDW2sXocNebWZ1HNrjHHgkGJ4="; + hash = "sha256-KWzyWWnNMBvsn+sFUmI94FnpCNVGZCYCxIhHlqbnGIE="; }; npmDepsHash = "sha256-wzetOJxHJXK7oY1cwOG9YOrKKIDhFPD17em6UQ2859M="; diff --git a/pkgs/by-name/ba/bazel-watcher/package.nix b/pkgs/by-name/ba/bazel-watcher/package.nix index a53c794767a0..9cdc9e5085a1 100644 --- a/pkgs/by-name/ba/bazel-watcher/package.nix +++ b/pkgs/by-name/ba/bazel-watcher/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "bazel-watcher"; - version = "0.25.3"; + version = "0.26.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - hash = "sha256-5cRj04e5VVG4NSe4LOLkZIrerT4laLEDeXCqTiJj6MM="; + hash = "sha256-FPyOdKJ8HSerFHDIjUkHKXMgoLmVeuyHYmo0v/8C0do="; }; - vendorHash = "sha256-0I/bvuyosN55oNSMuom4C8rVjxneUaqV19l9OMiwWhU="; + vendorHash = "sha256-H1Bqw5hbOLS4oJeQOdIXQ9c2H8jGtoW1J75BIkTNR9k="; # The dependency github.com/fsnotify/fsevents requires CGO env.CGO_ENABLED = if stdenv.hostPlatform.isDarwin then "1" else "0"; diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 2c1ac93181b4..1963233ec231 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -70,6 +70,10 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=${placeholder "out"}" "VERSION=${finalAttrs.version}" "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" + + # Tries to install to the 'systemd-minimal' and 'udev' nix installation paths + "PKGCONFIG_SERVICEDIR=$(out)/lib/systemd/system" + "PKGCONFIG_UDEVDIR=$(out)/lib/udev" ] ++ lib.optional fuseSupport "BCACHEFS_FUSE=1"; env = { @@ -90,12 +94,6 @@ stdenv.mkDerivation (finalAttrs: { ''; checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; - # Tries to install to the 'systemd-minimal' and 'udev' nix installation paths - installFlags = [ - "PKGCONFIG_SERVICEDIR=$(out)/lib/systemd/system" - "PKGCONFIG_UDEVDIR=$(out)/lib/udev" - ]; - postInstall = '' substituteInPlace $out/libexec/bcachefsck_all \ diff --git a/pkgs/by-name/be/beatprints/package.nix b/pkgs/by-name/be/beatprints/package.nix new file mode 100644 index 000000000000..90e90c64d91e --- /dev/null +++ b/pkgs/by-name/be/beatprints/package.nix @@ -0,0 +1,51 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: +python3Packages.buildPythonApplication rec { + pname = "BeatPrints"; + version = "1.1.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "TrueMyst"; + repo = "BeatPrints"; + rev = "v${version}"; + hash = "sha256-HtYPEnHbJarSC3P337l3IGagk62FgEohSAVyv6PBnIs="; + }; + + build-system = with python3Packages; [ + poetry-core + ]; + + pythonRelaxDeps = [ + "Pillow" + "rich" + ]; + + dependencies = with python3Packages; [ + requests + pylette + lrclibapi + fonttools + questionary + rich + toml + pillow + spotipy + ]; + + meta = with lib; { + description = "Create eye-catching, Pinterest-style music posters effortlessly"; + longDescription = '' + Create eye-catching, Pinterest-style music posters effortlessly. BeatPrints integrates with Spotify and LRClib API to help you design custom posters for your favorite tracks or albums. 🍀 + ''; + homepage = "https://beatprints.readthedocs.io"; + changelog = "https://github.com/TrueMyst/BeatPrints/releases/tag/v${version}"; + mainProgram = "beatprints"; + license = licenses.cc-by-nc-sa-40; + maintainers = with maintainers; [ DataHearth ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index e25728089d55..eba68ca2380e 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -1,54 +1,43 @@ { lib, - stdenvNoCC, fetchurl, appimageTools, makeWrapper, writeShellApplication, curl, - yq, common-updater-scripts, }: let pname = "beeper"; - version = "3.110.1"; + version = "4.0.623"; src = fetchurl { - url = "https://download.beeper.com/versions/3.110.1/linux/appImage/x64"; - hash = "sha256-AwPYwA93zOxExxhkLpCUKsQC/ylKSAygdHBUjd5ZKZk="; + url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage"; + hash = "sha256-K043RQ5BoS1ysnmY+LpRixBmMx2XCbRzhWnWsxg26dg="; }; - appimage = appimageTools.wrapType2 { - inherit version pname src; - extraPkgs = pkgs: [ pkgs.libsecret ]; - }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit version pname src; }; in -stdenvNoCC.mkDerivation rec { - inherit pname version; +appimageTools.wrapType2 { + inherit pname version src; - src = appimage; + extraPkgs = pkgs: [ pkgs.libsecret ]; - nativeBuildInputs = [ makeWrapper ]; + postExtract = '' + # disable creating a desktop file and icon in the home folder during runtime + linuxConfigFilename=$out/resources/app/build/main/linux-*.mjs + echo "export function registerLinuxConfig() {}" > $linuxConfigFilename + ''; - installPhase = '' - runHook preInstall + extraInstallCommands = '' + install -Dm 644 ${appimageContents}/beepertexts.png $out/share/icons/hicolor/512x512/apps/beepertexts.png + install -Dm 644 ${appimageContents}/beepertexts.desktop -t $out/share/applications/ + substituteInPlace $out/share/applications/beepertexts.desktop --replace-fail "AppRun" "beeper" - mkdir -p $out/ - cp -r bin $out/bin - - mkdir -p $out/share/${pname} - cp -a ${appimageContents}/locales $out/share/${pname} - cp -a ${appimageContents}/resources $out/share/${pname} - cp -a ${appimageContents}/usr/share/icons $out/share/ - install -Dm 644 ${appimageContents}/${pname}.desktop -t $out/share/applications/ - - substituteInPlace $out/share/applications/${pname}.desktop --replace "AppRun" "${pname}" - - wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} --no-update" - - runHook postInstall + . ${makeWrapper}/nix-support/setup-hook + wrapProgram $out/bin/beeper \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}} --no-update" \ + --set APPIMAGE beeper ''; passthru = { @@ -56,14 +45,13 @@ stdenvNoCC.mkDerivation rec { name = "update-beeper"; runtimeInputs = [ curl - yq common-updater-scripts ]; text = '' set -o errexit - latestLinux="$(curl -s https://download.todesktop.com/2003241lzgn20jd/latest-linux.yml)" - version="$(echo "$latestLinux" | yq -r .version)" - update-source-version beeper "$version" "" "https://download.beeper.com/versions/$version/linux/appImage/x64" --source-key=src.src + latestLinux="$(curl --silent --output /dev/null --write-out "%{redirect_url}\n" https://api.beeper.com/desktop/download/linux/x64/stable/com.automattic.beeper.desktop)" + version="$(echo "$latestLinux" | grep --only-matching --extended-regexp '[0-9]+\.[0-9]+\.[0-9]+')" + update-source-version beeper "$version" ''; }); }; @@ -81,6 +69,7 @@ stdenvNoCC.mkDerivation rec { jshcmpbll mjm edmundmiller + zh4ngx ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/be/bemenu/package.nix b/pkgs/by-name/be/bemenu/package.nix index ace85ff9ec1b..0da5facf1bbe 100644 --- a/pkgs/by-name/be/bemenu/package.nix +++ b/pkgs/by-name/be/bemenu/package.nix @@ -9,13 +9,14 @@ harfbuzz, pkg-config, scdoc, + makeWrapper, ncursesSupport ? true, ncurses, - waylandSupport ? true, + waylandSupport ? stdenv.hostPlatform.isLinux, wayland, wayland-protocols, wayland-scanner, - x11Support ? true, + x11Support ? stdenv.hostPlatform.isLinux, xorg, }: @@ -30,11 +31,18 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-0vpqJ2jydTt6aVni0ma0g+80PFz+C4xJ5M77sMODkSg="; }; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace GNUmakefile --replace '-soname' '-install_name' + ''; + strictDeps = true; - nativeBuildInputs = [ - pkg-config - scdoc - ] ++ lib.optionals waylandSupport [ wayland-scanner ]; + nativeBuildInputs = + [ + pkg-config + scdoc + ] + ++ lib.optional stdenv.hostPlatform.isDarwin makeWrapper + ++ lib.optional waylandSupport wayland-scanner; buildInputs = [ @@ -66,12 +74,20 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional waylandSupport "wayland" ++ lib.optional x11Support "x11"; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + so="$(find "$out/lib" -name "libbemenu.so.[0-9]" -print -quit)" + for f in "$out/bin/"*; do + install_name_tool -change "$(basename $so)" "$so" $f + wrapProgram $f --set BEMENU_BACKEND curses + done + ''; + meta = with lib; { homepage = "https://github.com/Cloudef/bemenu"; description = "Dynamic menu library and client program inspired by dmenu"; license = licenses.gpl3Plus; maintainers = with maintainers; [ crertel ]; mainProgram = "bemenu"; - platforms = with platforms; linux; + platforms = with platforms; linux ++ darwin; }; }) diff --git a/pkgs/by-name/be/beyond-all-reason/package.nix b/pkgs/by-name/be/beyond-all-reason/package.nix new file mode 100644 index 000000000000..65190afee71d --- /dev/null +++ b/pkgs/by-name/be/beyond-all-reason/package.nix @@ -0,0 +1,32 @@ +{ + lib, + fetchurl, + appimageTools, + openal, +}: +let + version = "1.2988.0"; + pname = "beyond-all-reason"; + + src = fetchurl { + url = "https://github.com/beyond-all-reason/BYAR-Chobby/releases/download/v${version}/Beyond-All-Reason-${version}.AppImage"; + hash = "sha256-ZJW5BdxxqyrM2TJTO0SBp4BXt3ILyi77EZx73X8hqJE="; + }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraPkgs = pkgs: [ openal ]; + + meta = { + homepage = "https://www.beyondallreason.info/"; + downloadPage = "https://www.beyondallreason.info/download"; + changelog = "https://github.com/beyond-all-reason/BYAR-Chobby/releases/tag/v${version}"; + description = "Free Real Time Strategy Game with a grand scale and full physical simulation in a sci-fi setting"; + license = lib.licenses.gpl2Plus; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ + kiyotoko + ]; + }; +} diff --git a/pkgs/by-name/bi/bigloo/package.nix b/pkgs/by-name/bi/bigloo/package.nix index 054acfa7c8f1..c3bd3889c39d 100644 --- a/pkgs/by-name/bi/bigloo/package.nix +++ b/pkgs/by-name/bi/bigloo/package.nix @@ -6,7 +6,6 @@ automake, libtool, gmp, - darwin, libunistring, }: @@ -26,7 +25,6 @@ stdenv.mkDerivation rec { ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.ApplicationServices libunistring ]; diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix index c7220e10e5d7..699bb7a903b0 100644 --- a/pkgs/by-name/bi/bind/package.nix +++ b/pkgs/by-name/bi/bind/package.nix @@ -3,7 +3,6 @@ lib, fetchurl, removeReferencesTo, - darwin, perl, pkg-config, libcap, @@ -66,8 +65,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isLinux libcap ++ lib.optional enableGSSAPI libkrb5 - ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ])) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ])); depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/by-name/bi/binsider/package.nix b/pkgs/by-name/bi/binsider/package.nix index e1fdd004f087..2ab6721f8c36 100644 --- a/pkgs/by-name/bi/binsider/package.nix +++ b/pkgs/by-name/bi/binsider/package.nix @@ -1,6 +1,5 @@ { lib, - darwin, rustPlatform, fetchFromGitHub, stdenv, @@ -21,14 +20,6 @@ rustPlatform.buildRustPackage rec { buildNoDefaultFeatures = !stdenv.hostPlatform.isLinux; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreServices - ] - ); - checkType = "debug"; checkFlags = [ "--skip=test_extract_strings" diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix index cd04a4cde2b5..5b0fc36cc8ab 100644 --- a/pkgs/by-name/bi/bitrise/package.nix +++ b/pkgs/by-name/bi/bitrise/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "bitrise"; - version = "2.30.5"; + version = "2.30.6"; src = fetchFromGitHub { owner = "bitrise-io"; repo = "bitrise"; rev = "v${version}"; - hash = "sha256-j7Gbr+j/5RnM7S6eRZZkmlXgY+vBgfTJ5ZaLz8o7pww="; + hash = "sha256-XMfBkn139BPdcSzC1ByXFxIKXNXgj2ktHjp29DO6API="; }; # many tests rely on writable $HOME/.bitrise and require network access diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index f978f93de241..ad427a5625a8 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -87,7 +87,6 @@ buildNpmPackage rec { }; updateScript = nix-update-script { extraArgs = [ - "--commit" "--version=stable" "--version-regex=^cli-v(.*)$" ]; diff --git a/pkgs/games/black-hole-solver/default.nix b/pkgs/by-name/bl/black-hole-solver/package.nix similarity index 83% rename from pkgs/games/black-hole-solver/default.nix rename to pkgs/by-name/bl/black-hole-solver/package.nix index 3e0ff95336e4..02e0ee253496 100644 --- a/pkgs/games/black-hole-solver/default.nix +++ b/pkgs/by-name/bl/black-hole-solver/package.nix @@ -3,11 +3,10 @@ lib, fetchurl, cmake, - perl, + buildPackages, pkg-config, python3, rinutils, - PathTiny, }: stdenv.mkDerivation rec { @@ -21,24 +20,23 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - perl + (buildPackages.perl.withPackages (ps: [ ps.PathTiny ])) pkg-config python3 ]; - buildInputs = [ rinutils - PathTiny ]; prePatch = '' patchShebangs ./scripts ''; - meta = with lib; { + meta = { description = "Solver for Solitaire variants Golf, Black Hole, and All in a Row"; mainProgram = "black-hole-solve"; homepage = "https://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/"; - license = licenses.mit; + license = lib.licenses.mit; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix index b2122e397bd0..0b545d374d58 100644 --- a/pkgs/by-name/bl/blackfire/php-probe.nix +++ b/pkgs/by-name/bl/blackfire/php-probe.nix @@ -25,6 +25,7 @@ let "8.1" = "sha256-oRd6PbBLOboH9EVRfZl5u71ZoVMFO4K/uftxlL/vm18="; "8.2" = "sha256-95qBidNHIGLGCb3QbUIzBMHsRi2GTPhwAjJg+JTteDk="; "8.3" = "sha256-8TO28o4YYFK1r2tInjXKenki/izHzZL0Dblaippekl8="; + "8.4" = "sha256-Dg+Q0W6Rh2L4J7hmxLxuM3l/dKYHT499Mix4Zpu2Vno="; }; }; "i686-linux" = { @@ -33,6 +34,7 @@ let "8.1" = "sha256-mXJ1hO8NcODG7Wj3lQ+5lkSjcbkKLN5OOzcobigScKI="; "8.2" = "sha256-P5fQTVfE/DvLD4E3kUPE+eeOM9YVNNixgWVRq3Ca5M4="; "8.3" = "sha256-rMUv2EUlepBahMaEvs60i7RFTmaBe4P4qB1hcARqP9Y="; + "8.4" = "sha256-g7v7oN7wfrER9VPk6bGhr+l6GMh2iYHUihcXF9T4GOc="; }; }; "aarch64-linux" = { @@ -41,6 +43,7 @@ let "8.1" = "sha256-Tj7LHXS4m9hF9gY/9vfOQPJVP+vHM1h8XdBY9vyRhFo="; "8.2" = "sha256-6kfotMptfVLPL414mr6LeJZ3ODnjepYQYnKvg4fHIAg="; "8.3" = "sha256-M/GTdinOi3Em7GJOm1iUKkuDNg8La3iQpG+wGHp0ycE="; + "8.4" = "sha256-/wwgP76liAb6//uvDLGD5l+skh4P22Q8KdZN7nlEbXI="; }; }; "aarch64-darwin" = { diff --git a/pkgs/by-name/bl/blackshades/package.nix b/pkgs/by-name/bl/blackshades/package.nix index acdc2e385849..ec2bdfe33d4e 100644 --- a/pkgs/by-name/bl/blackshades/package.nix +++ b/pkgs/by-name/bl/blackshades/package.nix @@ -7,22 +7,47 @@ libGLU, libsndfile, openal, - zig_0_11, + zig_0_14, + runCommand, }: stdenv.mkDerivation (finalAttrs: { pname = "blackshades"; - version = "2.5.1"; + version = "2.5.2-unstable-2025-03-12"; src = fetchFromSourcehut { owner = "~cnx"; repo = "blackshades"; - rev = finalAttrs.version; + rev = "a2fbe0e08bedbbbb1089dbb8f3e3cb4d76917bd0"; fetchSubmodules = true; - hash = "sha256-qdpXpuXHr9w2XMfgOVveWv3JoqdJHVB8TCqZdyaw/DM="; + hash = "sha256-W6ltmWCw7jfiTiNlh60YVF7mz//8s+bgu4F9gy5cDgw="; }; - nativeBuildInputs = [ zig_0_11.hook ]; + postUnpack = '' + ln -s ${ + runCommand "${finalAttrs.finalPackage.name}-zig-deps" + { + inherit (finalAttrs) src; + + nativeBuildInputs = [ zig_0_14 ]; + + outputHashAlgo = null; + outputHashMode = "recursive"; + outputHash = "sha256-wBIfLeaKtTow2Z7gjEgIFmqcTGWgpRWI+k0t294BslM="; + } + '' + export ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) + + runHook unpackPhase + cd $sourceRoot + + zig build --fetch + mv $ZIG_GLOBAL_CACHE_DIR/p $out + '' + } $ZIG_GLOBAL_CACHE_DIR/p + ''; + + nativeBuildInputs = [ zig_0_14.hook ]; buildInputs = [ glfw diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 6d4516c07a6e..24570317174c 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -1,9 +1,4 @@ { - Cocoa, - CoreGraphics, - ForceFeedback, - OpenAL, - OpenGL, SDL, addDriverRunpath, alembic, @@ -53,6 +48,7 @@ llvmPackages, makeWrapper, mesa, + openUsdSupport ? !stdenv.hostPlatform.isDarwin, openal, opencollada-blender, opencolorio, @@ -92,7 +88,6 @@ let (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; openImageDenoiseSupport = (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; - openUsdSupport = !stdenv.hostPlatform.isDarwin; vulkanSupport = !stdenv.hostPlatform.isDarwin; python3 = python3Packages.python; @@ -112,12 +107,12 @@ in stdenv'.mkDerivation (finalAttrs: { pname = "blender"; - version = "4.4.0"; + version = "4.4.1"; srcs = fetchzip { name = "source"; url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; - hash = "sha256-pAzOayAPyRYgTixAyg2prkUtI70uFulRuBYhgU9ZNw4="; + hash = "sha256-5MsJ7UFpwwtaq905CiTkas/qPYOaeiacSSl3qu9h5w0="; }; patches = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; @@ -281,11 +276,6 @@ stdenv'.mkDerivation (finalAttrs: { ] else [ - Cocoa - CoreGraphics - ForceFeedback - OpenAL - OpenGL SDL brotli llvmPackages.openmp diff --git a/pkgs/by-name/bl/blobfuse/package.nix b/pkgs/by-name/bl/blobfuse/package.nix index 2eb2b7b2a6ba..6de880843121 100644 --- a/pkgs/by-name/bl/blobfuse/package.nix +++ b/pkgs/by-name/bl/blobfuse/package.nix @@ -9,19 +9,19 @@ }: let - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-fuse"; rev = "blobfuse2-${version}"; - sha256 = "sha256-QCrBsEh8o4GblCWNcJssm9c6uSQYVs+qrdzfmI9l278="; + sha256 = "sha256-bpMX7flbb/QYZUtq1I1s2lAvrBhW7esPwxN/JupryDo="; }; in buildGoModule { pname = "blobfuse"; inherit version src; - vendorHash = "sha256-ZzpstCTABL9x5NM5tTiWZqOfI+BSKGZfb+ahbFUmcdo="; + vendorHash = "sha256-uWesaZshuBVf4yJiX6YqNMr0GiBkrHhOqefnCrpPCHg="; buildInputs = [ fuse3 ]; diff --git a/pkgs/by-name/bo/boa/package.nix b/pkgs/by-name/bo/boa/package.nix index e3a5a8430d3b..d6ddad303494 100644 --- a/pkgs/by-name/bo/boa/package.nix +++ b/pkgs/by-name/bo/boa/package.nix @@ -7,8 +7,6 @@ bzip2, openssl, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -41,16 +39,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - bzip2 - openssl - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + bzip2 + openssl + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/bo/bochs/package.nix b/pkgs/by-name/bo/bochs/package.nix index d609ef99196b..a28522dce7dd 100644 --- a/pkgs/by-name/bo/bochs/package.nix +++ b/pkgs/by-name/bo/bochs/package.nix @@ -2,7 +2,6 @@ lib, SDL2, curl, - darwin, docbook_xml_dtd_45, docbook_xsl, fetchurl, @@ -62,9 +61,6 @@ stdenv.mkDerivation (finalAttrs: { libGLU libX11 libXpm - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc ]; configureFlags = diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix index fa8533ecc983..cf6aceb59d46 100644 --- a/pkgs/by-name/bo/bolt-launcher/package.nix +++ b/pkgs/by-name/bo/bolt-launcher/package.nix @@ -87,14 +87,14 @@ in let bolt = stdenv.mkDerivation (finalAttrs: { pname = "bolt-launcher"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "AdamCake"; repo = "bolt"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-fNCi2Wu+oOL6p8IBm6bHZ/rcaFmqoKs2DnXQ+ZA9McE="; + hash = "sha256-zEExwQRzDmV0xd3lcxFE2ZVfkyTFYZQe3/c0IWJ9C/c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix index e2be04cc98f9..0a9823869efa 100644 --- a/pkgs/by-name/bo/borgbackup/package.nix +++ b/pkgs/by-name/bo/borgbackup/package.nix @@ -20,14 +20,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "borgbackup"; repo = "borg"; tag = version; - hash = "sha256-n1hCM7Sp0t2bOJEzErEd1PS/Xc7c+KDmJ4PjQuuF140="; + hash = "sha256-1RRizsHY6q1ruofTkRZ4sSN4k6Hoo+sG85w2zz+7yL8="; }; postPatch = '' @@ -45,6 +45,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = with python.pkgs; [ # docs sphinxHook + sphinxcontrib-jquery guzzle-sphinx-theme # shell completions @@ -78,6 +79,13 @@ python.pkgs.buildPythonApplication rec { ''--prefix PATH ':' "${openssh}/bin"'' ]; + preInstallSphinx = '' + # remove invalid outputs for manpages + rm .sphinx/man/man/_static/jquery.js + rm .sphinx/man/man/_static/_sphinx_javascript_frameworks_compat.js + rmdir .sphinx/man/man/_static/ + ''; + postInstall = '' installShellCompletion --cmd borg \ --bash scripts/shell_completions/bash/borg \ diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix index 6456f44e3e6e..752fe1dfe4cd 100644 --- a/pkgs/by-name/bo/borgmatic/package.nix +++ b/pkgs/by-name/bo/borgmatic/package.nix @@ -15,12 +15,12 @@ }: python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.9.14"; + version = "2.0.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-w503lwXlKWlTsguzECUGmsbhvdJzTF4XK+Ib2KuD2DE="; + hash = "sha256-Zem1Zn+S01/rpPOOPhTaRaAgIqq2UixEdjEOodbkk5w="; }; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bo/boringtun/package.nix b/pkgs/by-name/bo/boringtun/package.nix index f5dc75228c26..7c76299df70c 100644 --- a/pkgs/by-name/bo/boringtun/package.nix +++ b/pkgs/by-name/bo/boringtun/package.nix @@ -1,36 +1,32 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "boringtun"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "boringtun"; - rev = "boringtun-cli-${version}"; - sha256 = "sha256-PY7yqBNR4CYh8Y/vk4TYxxJnnv0eig8sjXp4dR4CX04="; + tag = "boringtun-${finalAttrs.version}"; + hash = "sha256-QrgKO0SVU4Z9GlNtZZmOV+Xcm1PonzLbUTGAFFOV/BM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-9qvX6P/DquQDlt6wOzI5ZQXQzNil1cD7KiuegDXtrQ0="; - - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + cargoHash = "sha256-j1I16QC46MMxcK7rbZJgI8KiKJvF29hkuGKiYLc6uW0="; # Testing this project requires sudo, Docker and network access, etc. doCheck = false; - meta = with lib; { + meta = { description = "Userspace WireGuard® implementation in Rust"; homepage = "https://github.com/cloudflare/boringtun"; - license = licenses.bsd3; - maintainers = with maintainers; [ xrelkd ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ xrelkd ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "boringtun-cli"; }; -} +}) diff --git a/pkgs/by-name/bo/bosh-cli/package.nix b/pkgs/by-name/bo/bosh-cli/package.nix index 65e30e9c8014..1625c109899e 100644 --- a/pkgs/by-name/bo/bosh-cli/package.nix +++ b/pkgs/by-name/bo/bosh-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.9.4"; + version = "7.9.5"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GTxl0lsM1BMWTUAQfNYkJupDUCnXWavTnRZrkaCRpPc="; + sha256 = "sha256-CyrOsPx55hZubBV0t5uMTTLVWC1qmEym1IwinvmSlWM="; }; vendorHash = null; diff --git a/pkgs/by-name/bo/box2d/cmake_dont_fetch_enkits.patch b/pkgs/by-name/bo/box2d/cmake_dont_fetch_enkits.patch new file mode 100644 index 000000000000..aa685fb71f14 --- /dev/null +++ b/pkgs/by-name/bo/box2d/cmake_dont_fetch_enkits.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8c1390e..791d3b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -83,10 +83,7 @@ if(PROJECT_IS_TOP_LEVEL) + # Used in tests and samples + FetchContent_Declare( + enkits +- GIT_REPOSITORY https://github.com/dougbinks/enkiTS.git +- GIT_TAG master +- GIT_SHALLOW TRUE +- GIT_PROGRESS TRUE ++ URL @enkits_src@ + ) + FetchContent_MakeAvailable(enkits) + endif() diff --git a/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch b/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch new file mode 100644 index 000000000000..dd76023882df --- /dev/null +++ b/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch @@ -0,0 +1,54 @@ +diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt +index 5020345..97af8c6 100644 +--- a/samples/CMakeLists.txt ++++ b/samples/CMakeLists.txt +@@ -17,47 +17,12 @@ set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "GLFW Examples") + set(GLFW_BUILD_TESTS OFF CACHE BOOL "GLFW Tests") + set(GLFW_INSTALL OFF CACHE BOOL "GLFW Install") + +-FetchContent_Declare( +- glfw +- GIT_REPOSITORY https://github.com/glfw/glfw.git +- GIT_TAG 3.4 +- GIT_SHALLOW TRUE +- GIT_PROGRESS TRUE +-) +-FetchContent_MakeAvailable(glfw) ++find_package(glfw) + + # imgui and glfw backend for GUI + # https://gist.github.com/jeffamstutz/992723dfabac4e3ffff265eb71a24cd9 + # Modified to pin to a specific imgui release +-FetchContent_Populate(imgui +- URL https://github.com/ocornut/imgui/archive/refs/tags/v1.91.3.zip +- SOURCE_DIR ${CMAKE_SOURCE_DIR}/build/imgui +-) +- +-set(IMGUI_DIR ${CMAKE_SOURCE_DIR}/build/imgui) +- +-add_library(imgui STATIC +- ${IMGUI_DIR}/imconfig.h +- ${IMGUI_DIR}/imgui.h +- +- ${IMGUI_DIR}/imgui.cpp +- ${IMGUI_DIR}/imgui_draw.cpp +- ${IMGUI_DIR}/imgui_demo.cpp +- ${IMGUI_DIR}/imgui_tables.cpp +- ${IMGUI_DIR}/imgui_widgets.cpp +- +- ${IMGUI_DIR}/backends/imgui_impl_glfw.cpp +- ${IMGUI_DIR}/backends/imgui_impl_opengl3.cpp +-) +- +-target_link_libraries(imgui PUBLIC glfw glad) +-target_include_directories(imgui PUBLIC ${IMGUI_DIR} ${IMGUI_DIR}/backends) +-target_compile_definitions(imgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS) +-set_target_properties(imgui PROPERTIES +- CXX_STANDARD 20 +- CXX_STANDARD_REQUIRED YES +- CXX_EXTENSIONS NO +-) ++find_package(imgui) + + # jsmn for json + set(JSMN_DIR ${CMAKE_SOURCE_DIR}/extern/jsmn) diff --git a/pkgs/by-name/bo/box2d/package.nix b/pkgs/by-name/bo/box2d/package.nix new file mode 100644 index 000000000000..8b29fa3afa45 --- /dev/null +++ b/pkgs/by-name/bo/box2d/package.nix @@ -0,0 +1,101 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + substituteAll, + + # nativeBuildInputs + cmake, + pkg-config, + + # buildInputs + glfw3, + imgui, + libGLU, + libX11, + libXcursor, + libXi, + libXinerama, + libXrandr, + libglut, + xorgproto, + + nix-update-script, +}: + +let + inherit (lib) cmakeBool; + +in +stdenv.mkDerivation (finalAttrs: { + pname = "box2d"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "erincatto"; + repo = "box2d"; + tag = "v${finalAttrs.version}"; + hash = "sha256-QTSU1+9x8GoUK3hlTDMh43fc4vbNfFR7syt6xVHIuPs="; + }; + + patches = [ + # prevent CMake from trying to download some libraries from the internet + (substituteAll { + src = ./cmake_dont_fetch_enkits.patch; + enkits_src = fetchFromGitHub { + owner = "dougbinks"; + repo = "enkiTS"; + rev = "686d0ec31829e0d9e5edf9ceb68c40f9b9b20ea9"; + hash = "sha256-CerLj/WY+J3mrMvv7dGmZltjAM9v5C/IY4X+Ph78HVs="; + }; + }) + ./cmake_use_system_glfw_and_imgui.patch + ]; + + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.cc.isGNU [ + # error: '*(float *)((char *)&localPointA + offsetof(b2Vec2, y))' may be used uninitialized + "-Wno-error=maybe-uninitialized" + ] + ); + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + glfw3 + (imgui.override { + # GLFW backend is disabled by default on darwin but box2d imports it unconditionally + # https://github.com/erincatto/box2d/blob/v3.1.0/samples/main.cpp#L28 + IMGUI_BUILD_GLFW_BINDING = true; + }) + libGLU + libX11 + libXcursor + libXi + libXinerama + libXrandr + libglut + xorgproto + ]; + + cmakeFlags = [ + (cmakeBool "BOX2D_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck) + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "2D physics engine"; + homepage = "https://box2d.org/"; + changelog = "https://github.com/erincatto/box2d/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.unix; + license = lib.licenses.zlib; + }; +}) diff --git a/pkgs/by-name/bo/box2d_2/package.nix b/pkgs/by-name/bo/box2d_2/package.nix new file mode 100644 index 000000000000..48eb6c42bfc9 --- /dev/null +++ b/pkgs/by-name/bo/box2d_2/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + # nativeBuildInputs + cmake, + pkg-config, + + # buildInputs + glfw3, + libGLU, + libX11, + libXcursor, + libXi, + libXinerama, + libXrandr, + libglut, + xorgproto, + + nix-update-script, +}: + +let + inherit (lib) cmakeBool; + +in +stdenv.mkDerivation (finalAttrs: { + pname = "box2d"; + version = "2.4.2"; + + src = fetchFromGitHub { + owner = "erincatto"; + repo = "box2d"; + tag = "v${finalAttrs.version}"; + hash = "sha256-yvhpgiZpjTPeSY7Ma1bh4LwIokUUKB10v2WHlamL9D8="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + glfw3 + libGLU + libX11 + libXcursor + libXi + libXinerama + libXrandr + libglut + xorgproto + ]; + + cmakeFlags = [ + (cmakeBool "BOX2D_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck) + ]; + + meta = { + description = "2D physics engine"; + homepage = "https://box2d.org/"; + changelog = "https://github.com/erincatto/box2d/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.unix; + license = lib.licenses.zlib; + }; +}) diff --git a/pkgs/by-name/bo/boxflat/package.nix b/pkgs/by-name/bo/boxflat/package.nix index 0c0c3f573700..195165bacb38 100644 --- a/pkgs/by-name/bo/boxflat/package.nix +++ b/pkgs/by-name/bo/boxflat/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonPackage rec { pname = "boxflat"; - version = "1.29.2"; + version = "1.30.0"; pyproject = true; src = fetchFromGitHub { owner = "Lawstorant"; repo = "boxflat"; tag = "v${version}"; - hash = "sha256-ouq21n9G+wP4wpfpnX2gVJrCAANIHNjbIUnCmftwajI="; + hash = "sha256-6fzz3pq9fHoeGMT1Vz5Y8pKLdrprQEV5kLiZt7uJ1KI="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index b7eea6280cc1..98ad818b4868 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "bpftrace"; repo = "bpftrace"; rev = "v${version}"; - hash = "sha256-5pNQuz2ffsixu4AMrw0lth5dHavO6I9Ew3ePOhtUiDE="; + hash = "sha256-AIjWF+MRnzEwvi1+XBxeiyJIX6059Hy8GgVwjZum2cc="; }; buildInputs = with llvmPackages; [ diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 634d7acf32bd..0d11a4b64ec5 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.77.95"; + version = "1.77.97"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-jK9narldfjxgtRjOR2P/0r2hVwFF+D60iCHOIrVTBdM="; + hash = "sha256-1MIcibP89EMCOK4A9lbXxGgwvMKCB+3UxrT+UYiwmtk="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-k4x2TdTIlYPCJ/u30JrwPt0AOSvt16qrxisHjqkDNY8="; + hash = "sha256-6JO67t5yR2psvlYhOMERnMgta+YYTIQx/zen7y3B1Ec="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-apJFnG80joh7RMJndJI7jU6tgS2QwHZpnackVp4rCek="; + hash = "sha256-d2MQMf1twOhcAouIPpdjG5jB/tZ7FGi/lrRJZ/A/ibs="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-wdKIFUwGKJdI7EiMFIrOJuLnMaeBSGgDOk2QUwhNlLE="; + hash = "sha256-vEF26I1+nqBERFdZEKLcDZBDru0RXcwytvblRuqL8/M="; }; }; diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index ad607142586c..a30c2cbcdec4 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.45.1"; + version = "1.46.0"; src = fetchFromGitHub { owner = "Canop"; repo = "broot"; rev = "v${version}"; - hash = "sha256-xLmVqYjQqjWMBm2A5OJl2wFIvxbWviX//J10BnKgWyk="; + hash = "sha256-m7TG3Bxqp87g9GPijy+daP4nYgCJkTmC95U+DgUcWGM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-8QRqRAXyqWS13TxUlSawjh/Qo4Qs5yQtNlqXj0hMW0c="; + cargoHash = "sha256-elpzGgF9o7iV2YaQFFqQ9jafEuYVPImC808MWWFZ4gw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/br/browsers/package.nix b/pkgs/by-name/br/browsers/package.nix index b22741da77b0..d1e96531a95d 100644 --- a/pkgs/by-name/br/browsers/package.nix +++ b/pkgs/by-name/br/browsers/package.nix @@ -10,8 +10,6 @@ glib, gtk3, pango, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -33,21 +31,14 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook3 ]; - buildInputs = - [ - atk - cairo - gdk-pixbuf - glib - gtk3 - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.CoreText - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + atk + cairo + gdk-pixbuf + glib + gtk3 + pango + ]; postInstall = '' install -m 444 \ diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix index 1e9add6b045f..3ef29d223170 100644 --- a/pkgs/by-name/bu/buf/package.nix +++ b/pkgs/by-name/bu/buf/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "buf"; - version = "1.52.0"; + version = "1.52.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-Jg3UcSPkJgYxdxRJJCCzxp+pGarToEQut9k/drIdka4="; + hash = "sha256-oHmTOQBvuJWQdmC/LL72r+n2uwaQC8z3/1BRM0NzMbI="; }; vendorHash = "sha256-+zJ2pCLyXnqFOIWWfnhAzSnUOjQSDo4AqCxBNNZED7E="; diff --git a/pkgs/tools/X11/bumblebee/nixos.patch b/pkgs/by-name/bu/bumblebee/nixos.patch similarity index 100% rename from pkgs/tools/X11/bumblebee/nixos.patch rename to pkgs/by-name/bu/bumblebee/nixos.patch diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/by-name/bu/bumblebee/package.nix similarity index 93% rename from pkgs/tools/X11/bumblebee/default.nix rename to pkgs/by-name/bu/bumblebee/package.nix index 50c9209288e1..cfffcec882f6 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/by-name/bu/bumblebee/package.nix @@ -30,7 +30,9 @@ xorgserver, kmod, xf86videonouveau, - nvidia_x11, + nvidia_x11 ? linuxPackages.nvidia_x11, + linuxPackages, + pkgsi686Linux, virtualgl, libglvnd, automake111x, @@ -38,8 +40,13 @@ # The below should only be non-null in a x86_64 system. On a i686 # system the above nvidia_x11 and virtualgl will be the i686 packages. # TODO: Confusing. Perhaps use "SubArch" instead of i686? - nvidia_x11_i686 ? null, - libglvnd_i686 ? null, + nvidia_x11_i686 ? + if stdenv.hostPlatform.system == "x86_64-linux" then + pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; } + else + null, + libglvnd_i686 ? + if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.libglvnd else null, useDisplayDevice ? false, extraNvidiaDeviceOptions ? "", extraNouveauDeviceOptions ? "", diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index a9f40cf9de02..e138eb260848 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -17,7 +17,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.2.8"; + version = "1.2.10"; pname = "bun"; src = @@ -86,19 +86,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-ioBqQKA3Mp5PtVlFcmf2xOvoIEy7rNsD85s0m+1ao1U="; + hash = "sha256-B4le8PtmEkm4awtyO2WxzEeQx/NoW2PNqQEisAKZlyw="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-Iwg/JW8qHRVcRW4S45xR4x3EG5fGNCDZkV9Du4ar6rE="; + hash = "sha256-VFkv0CN+PskaKTPf8BXhWniYnZcjQELn1TNKTArVBgM="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-vYcbm19aR540MrO4YFQgeSwNOKLot8/H03i0NP8c2og="; + hash = "sha256-wkFtHbo9P80XYa1ytpXaUPFElJbGrQNeadQkp4ZEEUQ="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-QrSLNmdguYb+HWqLE8VwbSZzCDmoV3eQzS6PKHmenzE="; + hash = "sha256-aKFU/xvpaFG00ah8xRl/An74Crea+j1FhxUPrlw0w24="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix index 1928ced398f6..6d73ad238382 100644 --- a/pkgs/by-name/bu/bunbun/package.nix +++ b/pkgs/by-name/bu/bunbun/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, versionCheckHook, nix-update-script, }: @@ -22,15 +20,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-2pgQB2myEnLvrU3ApNL/bwaVcGku+X/TjR6YBqXD7Xg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - IOKit - SystemConfiguration - ] - ); - nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/bu/butt/package.nix b/pkgs/by-name/bu/butt/package.nix index dcbc83ed0c3f..deae52c17a82 100644 --- a/pkgs/by-name/bu/butt/package.nix +++ b/pkgs/by-name/bu/butt/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "butt"; - version = "1.44.0"; + version = "1.45.0"; src = fetchurl { url = "https://danielnoethen.de/butt/release/${finalAttrs.version}/butt-${finalAttrs.version}.tar.gz"; - hash = "sha256-2RC0ChDbyhzjd+4jnBRuR0botIVQugpA1rUZm1yH4Kc="; + hash = "sha256-iEmFEJRsTvHeKGYvnhzYXSC/q0DSw0Z/YgK4buDtg2Q="; }; postPatch = '' diff --git a/pkgs/by-name/bw/bws/package.nix b/pkgs/by-name/bw/bws/package.nix index e7003dc22984..8bc8bdd91761 100644 --- a/pkgs/by-name/bw/bws/package.nix +++ b/pkgs/by-name/bw/bws/package.nix @@ -7,7 +7,6 @@ oniguruma, openssl, stdenv, - darwin, python3, perl, }: @@ -41,9 +40,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index 6122da0739a9..746a8a971242 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -8,19 +8,19 @@ versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "c2patool"; - version = "0.9.12"; + version = "0.16.4"; src = fetchFromGitHub { owner = "contentauth"; - repo = "c2patool"; - rev = "v${version}"; - hash = "sha256-3OaCsy6xt2Pc/Cqm3qbbpr7kiQiA2BM/LqIQnuw73MY="; + repo = "c2pa-rs"; + tag = "c2patool-v${finalAttrs.version}"; + hash = "sha256-mJ9839jW8+HuzyFJuT+PwERGXO765ST5iMmHz4DdbGQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-jod9wKuyhbY+/3NIEMZGoKIA1rT6Y4XoLKqYvzM5fAQ="; + cargoHash = "sha256-cRMeaQUkm5YenLruM+l3BWkWQqYhtRpb4s9HyzRn71k="; # use the non-vendored openssl env.OPENSSL_NO_VENDOR = 1; @@ -30,9 +30,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ - openssl - ]; + buildInputs = [ openssl ]; + + # could not compile `c2pa` (lib test) due to 102 previous errors + doCheck = false; checkFlags = [ # These tests rely on additional executables to be compiled to "target/debug/". @@ -51,18 +52,16 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; - nativeInstallCheckInputs = [ - versionCheckHook - ]; + nativeInstallCheckInputs = [ versionCheckHook ]; - meta = with lib; { - description = "Command line tool for displaying and adding C2PA manifests"; - homepage = "https://github.com/contentauth/c2patool"; - license = with licenses; [ + meta = { + description = "Command line tool for working with C2PA manifests and media assets"; + homepage = "https://github.com/contentauth/c2pa-rs/tree/main/cli"; + license = with lib.licenses; [ asl20 # or mit ]; - maintainers = with maintainers; [ ok-nick ]; + maintainers = with lib.maintainers; [ ok-nick ]; mainProgram = "c2patool"; }; -} +}) diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix index e867d5d0903c..bc219a3cfbf5 100644 --- a/pkgs/by-name/ca/caddy/package.nix +++ b/pkgs/by-name/ca/caddy/package.nix @@ -10,12 +10,12 @@ stdenv, }: let - version = "2.9.1"; + version = "2.10.0"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; tag = "v${version}"; - hash = "sha256-28ahonJ0qeynoqf02gws0LstaL4E08dywSJ8s3tgEDI="; + hash = "sha256-us1TnszA/10OMVSDsNvzRb6mcM4eMR3pQ5EF4ggA958="; }; in buildGoModule { @@ -26,10 +26,10 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; tag = "v${version}"; - hash = "sha256-XW1cBW7mk/aO/3IPQK29s4a6ArSKjo7/64koJuzp07I="; + hash = "sha256-hzDd2BNTZzjwqhc/STbSAHnNlP7g1cFuMehqU1LumQE="; }; - vendorHash = "sha256-qrlpuqTnFn/9oMTMovswpS1eAI7P9gvesoMpsIWKcY8="; + vendorHash = "sha256-9Iu4qmBVkGeSAywLgQuDR7y+TwCBqwhVxhfaXhCDnUc="; subPackages = [ "cmd/caddy" ]; diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/by-name/ca/cage/package.nix similarity index 78% rename from pkgs/applications/window-managers/cage/default.nix rename to pkgs/by-name/ca/cage/package.nix index adfa29198ed4..d11cb43ba4fd 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/by-name/ca/cage/package.nix @@ -8,7 +8,7 @@ wayland-scanner, scdoc, makeWrapper, - wlroots, + wlroots_0_18, wayland, wayland-protocols, pixman, @@ -21,14 +21,14 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cage"; version = "0.2.0"; src = fetchFromGitHub { owner = "cage-kiosk"; repo = "cage"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2SFtz62z0EF8cpFTC6wGi125MD4a5mkXqP/C+7fH+3g="; }; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - wlroots + wlroots_0_18 wayland wayland-protocols pixman @@ -57,19 +57,19 @@ stdenv.mkDerivation rec { libX11 ]; - postFixup = lib.optionalString wlroots.enableXWayland '' + postFixup = lib.optionalString wlroots_0_18.enableXWayland '' wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin" ''; # Tests Cage using the NixOS module by launching xterm: passthru.tests.basic-nixos-module-functionality = nixosTests.cage; - meta = with lib; { + meta = { description = "Wayland kiosk that runs a single, maximized application"; homepage = "https://www.hjdskes.nl/projects/cage/"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ primeos ]; mainProgram = "cage"; }; -} +}) diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/by-name/ca/cagebreak/package.nix similarity index 79% rename from pkgs/applications/window-managers/cagebreak/default.nix rename to pkgs/by-name/ca/cagebreak/package.nix index 93aa7f55d087..6bac3222e742 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/by-name/ca/cagebreak/package.nix @@ -23,18 +23,18 @@ wayland-scanner, withXwayland ? true, xwayland, - wlroots, + wlroots_0_18, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cagebreak"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "project-repo"; - repo = pname; - rev = version; - hash = "sha256-GAANZIEUtuONPBpk0E3fErgOZtm3wB+gWJNwfO6VOTo="; + repo = "cagebreak"; + tag = finalAttrs.version; + hash = "sha256-eJLYv9CalBTOQEOMRg/5ctHByrkA44pfS7K3H4XTdSc="; }; nativeBuildInputs = [ @@ -59,12 +59,12 @@ stdenv.mkDerivation rec { systemd wayland wayland-protocols - wlroots + wlroots_0_18 ]; mesonFlags = [ "-Dman-pages=true" - "-Dversion_override=${version}" + "-Dversion_override=${finalAttrs.version}" "-Dxwayland=${lib.boolToString withXwayland}" ]; @@ -83,15 +83,15 @@ stdenv.mkDerivation rec { --prefix PATH : "${lib.makeBinPath [ xwayland ]}" ''; - meta = with lib; { + meta = { homepage = "https://github.com/project-repo/cagebreak"; description = "Wayland tiling compositor inspired by ratpoison"; - license = licenses.mit; - maintainers = with maintainers; [ berbiche ]; - platforms = platforms.linux; - changelog = "https://github.com/project-repo/cagebreak/blob/${version}/Changelog.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; + changelog = "https://github.com/project-repo/cagebreak/blob/${finalAttrs.version}/Changelog.md"; mainProgram = "cagebreak"; }; passthru.tests.basic = nixosTests.cagebreak; -} +}) diff --git a/pkgs/by-name/ca/cairo/package.nix b/pkgs/by-name/ca/cairo/package.nix index d8a4365afe6f..1d96951ac59c 100644 --- a/pkgs/by-name/ca/cairo/package.nix +++ b/pkgs/by-name/ca/cairo/package.nix @@ -21,7 +21,6 @@ glib, xcbSupport ? x11Support, libxcb, - darwin, testers, }: @@ -60,19 +59,9 @@ stdenv.mkDerivation ( python3 ]; - buildInputs = - [ - docbook_xsl - ] - ++ optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreGraphics - CoreText - ApplicationServices - Carbon - ] - ); + buildInputs = [ + docbook_xsl + ]; patches = [ # Pull upstream fix to fix "out of memory" errors: diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 97927b9289ea..fdfa5d6b195f 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "8.1.1"; + version = "8.2.100"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-lz+QlrajIjA2uvo6Iomejk9Y+djDjUNPAd5BZT3Dz5Y="; + hash = "sha256-lUHnaorIUwoac1YgYimxF8KTJOPSUiJg5BKC+hFy0lc="; }; patches = [ @@ -219,6 +219,7 @@ stdenv.mkDerivation (finalAttrs: { $ETN 'test_qt' # we don't include svg or webp support $ETN 'test_import_of_all_python_modules' # explores actual file paths, gets confused $ETN 'test_websocket_basic' # flakey + ${lib.optionalString stdenv.hostPlatform.isAarch64 "$ETN 'test_piper'"} # https://github.com/microsoft/onnxruntime/issues/10038 ${lib.optionalString (!unrarSupport) "$ETN 'test_unrar'"} ) diff --git a/pkgs/by-name/ca/carapace-bridge/package.nix b/pkgs/by-name/ca/carapace-bridge/package.nix index 3c69aa37c77e..f85cf9bf13ef 100644 --- a/pkgs/by-name/ca/carapace-bridge/package.nix +++ b/pkgs/by-name/ca/carapace-bridge/package.nix @@ -8,19 +8,19 @@ buildGoModule rec { pname = "carapace-bridge"; - version = "1.2.5"; + version = "1.2.7"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bridge"; tag = "v${version}"; - hash = "sha256-NdEGQp3fd/dIZqGYut6tz9oze48ym/+05X8CMQhFKzk="; + hash = "sha256-8i516GwXJFEB4VdvsV1KS0q2U9ZbpRBmZxqzTrzYlPk="; }; # buildGoModule try to run `go mod vendor` instead of `go work vendor` on the # workspace if proxyVendor is off proxyVendor = true; - vendorHash = "sha256-zfV5IcpwtK3n76jWs4ldMlpEqbyNmmXZWDj+fh66luw="; + vendorHash = "sha256-TVqQrqdMmzv1w4Y37pB2t/apdMPm6QO/0VVS3x86GpE="; postPatch = '' substituteInPlace cmd/carapace-bridge/main.go \ diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/by-name/ca/cardpeek/package.nix similarity index 53% rename from pkgs/applications/misc/cardpeek/default.nix rename to pkgs/by-name/ca/cardpeek/package.nix index cc953ba23ec8..84c2f283d035 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/by-name/ca/cardpeek/package.nix @@ -10,7 +10,6 @@ lua5_2, curl, readline, - PCSC, }: let version = "0.8.4"; @@ -29,33 +28,30 @@ stdenv.mkDerivation { postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # replace xcode check and hard-coded PCSC framework path substituteInPlace configure.ac \ - --replace 'if test ! -e "/Applications/Xcode.app/"; then' 'if test yes != yes; then' \ - --replace 'PCSC_HEADERS=`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/*.sdk/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers/ | sort | head -1`' 'PCSC_HEADERS=${PCSC}/Library/Frameworks/PCSC.framework/Headers' + --replace-fail 'if test ! -e "/Applications/Xcode.app/"; then' 'if test yes != yes; then' \ + --replace-fail 'PCSC_HEADERS=`ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/*.sdk/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers/ | sort | head -1`' 'PCSC_HEADERS=$SDKROOT/System/Library/Frameworks/PCSC.framework/Versions/Current/Headers' ''; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = - [ - glib - gtk3 - lua5_2 - curl - readline - ] - ++ lib.optional stdenv.hostPlatform.isDarwin PCSC - ++ lib.optional stdenv.hostPlatform.isLinux pcsclite; + buildInputs = [ + glib + gtk3 + lua5_2 + curl + readline + ] ++ lib.optional stdenv.hostPlatform.isLinux pcsclite; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://github.com/L1L1/cardpeek"; description = "Tool to read the contents of ISO7816 smart cards"; - license = licenses.gpl3Plus; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ embr ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ embr ]; mainProgram = "cardpeek"; }; } diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix index 6495652b190b..ca43b5ba79cb 100644 --- a/pkgs/by-name/ca/cargo-about/package.nix +++ b/pkgs/by-name/ca/cargo-about/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,12 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ zstd ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ zstd ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/ca/cargo-ament-build/Cargo.lock b/pkgs/by-name/ca/cargo-ament-build/Cargo.lock new file mode 100644 index 000000000000..741bf0371325 --- /dev/null +++ b/pkgs/by-name/ca/cargo-ament-build/Cargo.lock @@ -0,0 +1,122 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "anyhow" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "cargo-ament-build" +version = "0.1.9" +dependencies = [ + "anyhow", + "cargo-manifest", + "pico-args", +] + +[[package]] +name = "cargo-manifest" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf5acda331466fdea759172dbc2fb9e650e382dbca6a8dd3f576d9aeeac76da6" +dependencies = [ + "serde", + "serde_derive", + "toml", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "pico-args" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" + +[[package]] +name = "proc-macro2" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "syn" +version = "2.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "indexmap", + "serde", +] + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" diff --git a/pkgs/by-name/ca/cargo-ament-build/package.nix b/pkgs/by-name/ca/cargo-ament-build/package.nix new file mode 100644 index 000000000000..d453f34dba96 --- /dev/null +++ b/pkgs/by-name/ca/cargo-ament-build/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cargo-ament-build"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "ros2-rust"; + repo = "cargo-ament-build"; + tag = "v${finalAttrs.version}"; + hash = "sha256-5D0eB3GCQLgVYuYkHMTkboruiYSAaWy3qZjF/hVpRP0="; + }; + + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ pkg-config ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cargo plugin for use with colcon workspaces"; + homepage = "https://github.com/ros2-rust/cargo-ament-build"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ guelakais ]; + }; +}) diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index e82557f33b24..809edb20ac34 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -6,37 +6,31 @@ bzip2, xz, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-mGb6ZHi6XGYiVe0NHcBx7MWtcSDK2/wXpM4j0GiczEk="; + hash = "sha256-c/8cqHl+Z7+0SDSb6PhrVueKyWZFA1FGQaFwT3G9vFM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-rtDV1wAoUfZOTBSvCjqhGlyDVXJiZ+Wopgu21zJWDfw="; + cargoHash = "sha256-JXsLvo/G2GCdQuseu6TdXKdKbJ0B4yPYRNlZdjG65AU="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - bzip2 - xz - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + xz + zstd + ]; buildNoDefaultFeatures = true; buildFeatures = [ diff --git a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix index 3a4c056117ba..fd690616a5bf 100644 --- a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix +++ b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - darwin, rustPlatform, pkg-config, openssl, @@ -43,12 +42,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; useFetchCargoVendor = true; cargoHash = "sha256-SigRm2ZC7jH1iCEGRpka1G/e9kBEieFVU0YDBl2LfTM="; diff --git a/pkgs/by-name/ca/cargo-bolero/package.nix b/pkgs/by-name/ca/cargo-bolero/package.nix index f31448bc7a1a..b5a8feb9b7ab 100644 --- a/pkgs/by-name/ca/cargo-bolero/package.nix +++ b/pkgs/by-name/ca/cargo-bolero/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bolero"; - version = "0.13.1"; + version = "0.13.2"; src = fetchCrate { inherit pname version; - hash = "sha256-73TjQYkSng93tryaZpBtwq3MdVYZC8enEibx6yTdEKw="; + hash = "sha256-X8C4bNGjJx1VxE5X7ntIsbpMPKHVLU1HSQb7vRdivdg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-0T7KyTQ5kJ4mv5lLxYeo7hxLjSkrmjfenrNV+7GL1hM="; + cargoHash = "sha256-z1JxoJ4D9GRDsD08kn0WZgaqgTmdL57MgwQ+vFghIpY="; buildInputs = [ libbfd diff --git a/pkgs/by-name/ca/cargo-bump/package.nix b/pkgs/by-name/ca/cargo-bump/package.nix index af31e5f60aab..d1985e7a460f 100644 --- a/pkgs/by-name/ca/cargo-bump/package.nix +++ b/pkgs/by-name/ca/cargo-bump/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, pkg-config, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,10 +23,6 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Increments the version number of the current project"; mainProgram = "cargo-bump"; diff --git a/pkgs/by-name/ca/cargo-bundle/package.nix b/pkgs/by-name/ca/cargo-bundle/package.nix index 13c8f86603a9..3001f1ae4020 100644 --- a/pkgs/by-name/ca/cargo-bundle/package.nix +++ b/pkgs/by-name/ca/cargo-bundle/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pkg-config, stdenv, - darwin, libxkbcommon, wayland, }: @@ -28,14 +27,10 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - libxkbcommon - wayland - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libxkbcommon + wayland + ]; meta = with lib; { description = "Wrap rust executables in OS-specific app bundles"; diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix index 9d052d9df626..8deaf38fa346 100644 --- a/pkgs/by-name/ca/cargo-component/package.nix +++ b/pkgs/by-name/ca/cargo-component/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; # requires the wasm32-wasi target doCheck = false; diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix index 61bfb416f9af..6e8cf25fc729 100644 --- a/pkgs/by-name/ca/cargo-deny/package.nix +++ b/pkgs/by-name/ca/cargo-deny/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/ca/cargo-dephell/package.nix b/pkgs/by-name/ca/cargo-dephell/package.nix index d0fbd26e846e..2d20d48146b7 100644 --- a/pkgs/by-name/ca/cargo-dephell/package.nix +++ b/pkgs/by-name/ca/cargo-dephell/package.nix @@ -6,7 +6,6 @@ stdenv, curl, openssl, - darwin, libgit2, }: @@ -39,7 +38,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl - darwin.apple_sdk.frameworks.Security libgit2 ]; diff --git a/pkgs/by-name/ca/cargo-dist/package.nix b/pkgs/by-name/ca/cargo-dist/package.nix index d97e19fb6a5e..072522b8d476 100644 --- a/pkgs/by-name/ca/cargo-dist/package.nix +++ b/pkgs/by-name/ca/cargo-dist/package.nix @@ -7,8 +7,6 @@ bzip2, xz, zstd, - stdenv, - darwin, git, rustup, }: @@ -31,15 +29,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - bzip2 - xz - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + xz + zstd + ]; nativeCheckInputs = [ git diff --git a/pkgs/by-name/ca/cargo-duplicates/package.nix b/pkgs/by-name/ca/cargo-duplicates/package.nix index 8ab9656c8c22..e2fb19230887 100644 --- a/pkgs/by-name/ca/cargo-duplicates/package.nix +++ b/pkgs/by-name/ca/cargo-duplicates/package.nix @@ -7,8 +7,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,16 +28,12 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - curl - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + curl + libgit2 + openssl + zlib + ]; meta = with lib; { description = "Cargo subcommand for displaying when different versions of a same dependency are pulled in"; diff --git a/pkgs/by-name/ca/cargo-geiger/package.nix b/pkgs/by-name/ca/cargo-geiger/package.nix index edfa3438a50d..e1ba2897a054 100644 --- a/pkgs/by-name/ca/cargo-geiger/package.nix +++ b/pkgs/by-name/ca/cargo-geiger/package.nix @@ -4,9 +4,8 @@ fetchFromGitHub, rustPlatform, pkg-config, - openssl, # darwin dependencies - darwin, + openssl, libiconv, curl, }: @@ -36,15 +35,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - Security - libiconv - curl - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + curl + ]; nativeBuildInputs = [ pkg-config ] # curl-sys wants to run curl-config on darwin diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix index 3c4d01d28f37..668174e7aede 100644 --- a/pkgs/by-name/ca/cargo-generate/package.nix +++ b/pkgs/by-name/ca/cargo-generate/package.nix @@ -7,7 +7,6 @@ libgit2, openssl, stdenv, - darwin, gitMinimal, }: @@ -36,14 +35,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libgit2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + openssl + ]; nativeCheckInputs = [ gitMinimal ]; diff --git a/pkgs/by-name/ca/cargo-guppy/package.nix b/pkgs/by-name/ca/cargo-guppy/package.nix index e4d839f57aa4..f7ee8b1fc56e 100644 --- a/pkgs/by-name/ca/cargo-guppy/package.nix +++ b/pkgs/by-name/ca/cargo-guppy/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage { @@ -24,11 +22,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ openssl ]; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ca/cargo-info/package.nix b/pkgs/by-name/ca/cargo-info/package.nix index a9f2a69a3a1d..4225e0690651 100644 --- a/pkgs/by-name/ca/cargo-info/package.nix +++ b/pkgs/by-name/ca/cargo-info/package.nix @@ -4,8 +4,6 @@ fetchFromGitLab, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Cargo subcommand to show crates info from crates.io"; diff --git a/pkgs/by-name/ca/cargo-lambda/package.nix b/pkgs/by-name/ca/cargo-lambda/package.nix index 927bce7f59d0..048966ee8ba5 100644 --- a/pkgs/by-name/ca/cargo-lambda/package.nix +++ b/pkgs/by-name/ca/cargo-lambda/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-lambda"; - version = "1.8.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "cargo-lambda"; repo = "cargo-lambda"; tag = "v${version}"; - hash = "sha256-1i/nBuO7B6GHWmaibO8+w9LNCWGV5HdCP2B3WQPT/7c="; + hash = "sha256-XaCbKasPFmhoiZymnP7aeRkz0za4cJeA98uWkgotuZ8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-i11bDmzCvsv4jTBsjCdryM8rx6FBefUXh4mbiGhyLt4="; + cargoHash = "sha256-gqahTN7wV4xn4xQK+fDnjxtAFp4LSvI3H93XQgHf4fM="; nativeCheckInputs = [ cacert ]; diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix index 51dde7bc7058..21527f9b2e59 100644 --- a/pkgs/by-name/ca/cargo-leptos/package.nix +++ b/pkgs/by-name/ca/cargo-leptos/package.nix @@ -1,19 +1,8 @@ { - darwin, fetchFromGitHub, lib, rustPlatform, - stdenv, }: -let - inherit (darwin.apple_sdk.frameworks) - CoreServices - SystemConfiguration - Security - ; - inherit (lib) optionals; - inherit (stdenv.hostPlatform) isDarwin; -in rustPlatform.buildRustPackage rec { pname = "cargo-leptos"; version = "0.2.28"; @@ -28,12 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Da9ei4yAOfhSQmQgrUDZCmMeJXTfGnYhI1+L0JT/ECs="; - buildInputs = optionals isDarwin [ - SystemConfiguration - Security - CoreServices - ]; - # https://github.com/leptos-rs/cargo-leptos#dependencies buildFeatures = [ "no_downloads" ]; # cargo-leptos will try to install missing dependencies on its own otherwise doCheck = false; # Check phase tries to query crates.io diff --git a/pkgs/by-name/ca/cargo-local-registry/package.nix b/pkgs/by-name/ca/cargo-local-registry/package.nix index 33851806f7ea..f4b30c6b4250 100644 --- a/pkgs/by-name/ca/cargo-local-registry/package.nix +++ b/pkgs/by-name/ca/cargo-local-registry/package.nix @@ -7,8 +7,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,19 +28,12 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - curl - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; + buildInputs = [ + curl + libgit2 + openssl + zlib + ]; # tests require internet access doCheck = false; diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix index 5581bad62b2a..71ef2c04fe79 100644 --- a/pkgs/by-name/ca/cargo-make/package.nix +++ b/pkgs/by-name/ca/cargo-make/package.nix @@ -6,8 +6,6 @@ installShellFiles, bzip2, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,14 +27,10 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = - [ - bzip2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + ]; postInstall = '' installShellCompletion extra/shell/*.bash diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix index 89cd6327686f..c14cb9982ec1 100644 --- a/pkgs/by-name/ca/cargo-mobile2/package.nix +++ b/pkgs/by-name/ca/cargo-mobile2/package.nix @@ -1,19 +1,16 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, git, - darwin, makeWrapper, }: let - inherit (darwin.apple_sdk.frameworks) CoreServices; pname = "cargo-mobile2"; - version = "0.17.6"; + version = "0.20.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,7 +18,7 @@ rustPlatform.buildRustPackage { owner = "tauri-apps"; repo = pname; rev = "cargo-mobile2-v${version}"; - hash = "sha256-kIy5Ic7Zk6twcEbZN/wRLwMK0XeMF0lNkFDIc2vO944="; + hash = "sha256-7/ol4Jb/2s007LeSMo6YYDT5vipsZZF6O4hfJ7ylHGg="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at @@ -29,7 +26,7 @@ rustPlatform.buildRustPackage { # sourceRoot = "${src.name}/tooling/cli"; useFetchCargoVendor = true; - cargoHash = "sha256-An9EuNv+6ttNKp50RutzxtHl/RS5gn9sUNlWtipAujk="; + cargoHash = "sha256-zSUT2zClpSlBDu6vgMv4TZn9Jp0Ych6EQKo1AwkSMXU="; preBuild = '' mkdir -p $out/share/ @@ -37,7 +34,7 @@ rustPlatform.buildRustPackage { export CARGO_HOME=$out/share/ ''; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config git diff --git a/pkgs/by-name/ca/cargo-msrv/package.nix b/pkgs/by-name/ca/cargo-msrv/package.nix index a8c8dd80bb53..72528f1ab810 100644 --- a/pkgs/by-name/ca/cargo-msrv/package.nix +++ b/pkgs/by-name/ca/cargo-msrv/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.17.1"; + version = "0.18.4"; src = fetchFromGitHub { owner = "foresterre"; repo = "cargo-msrv"; tag = "v${version}"; - sha256 = "sha256-cRdnx9K+EkVEKtPxQk+gXK6nkgkpWhpYij/5e7pFzMU="; + sha256 = "sha256-dvCKi40c9PmM05MK+0VGWxny0ZA+9YO/M3zmv5Qv6b0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-D35koQEqHsmXIBgXRCyI8Wyo2OVSuTFCjgm/JjO4VDo="; + cargoHash = "sha256-cIyoGFIxtX4/Dn4RbtMB75WQj+UO44V182u6C5smgSw="; passthru = { updateScript = gitUpdater { diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index 2cd4adad6ebf..4c4202a7f969 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.93"; + version = "0.9.94"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-MH3OPEap56GYT/84wlmDp7B/v45TgyW6KQLTJXHy5wI="; + hash = "sha256-r1Q4/CQwu4FRiymKacmg9SfM/sqagtzNF904TbjaB4c="; }; useFetchCargoVendor = true; - cargoHash = "sha256-7Re6TcHYhwFp4cj/KzJXpL0taH6X/S63lgAW5rtSrZk="; + cargoHash = "sha256-OXxmJcARh94lYxlRgv1fCCifYJwrWaQ21UxRNWI2yFw="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix index c9d50be042e8..204189edcb52 100644 --- a/pkgs/by-name/ca/cargo-public-api/package.nix +++ b/pkgs/by-name/ca/cargo-public-api/package.nix @@ -5,8 +5,6 @@ pkg-config, curl, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; # Tests fail doCheck = false; diff --git a/pkgs/by-name/ca/cargo-raze/package.nix b/pkgs/by-name/ca/cargo-raze/package.nix index b3e40543ed3f..380e4a737475 100644 --- a/pkgs/by-name/ca/cargo-raze/package.nix +++ b/pkgs/by-name/ca/cargo-raze/package.nix @@ -7,7 +7,6 @@ curl, libgit2, openssl, - darwin, }: let version = "0.16.1"; @@ -37,7 +36,7 @@ rustPlatform.buildRustPackage { libgit2 openssl curl - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + ]; preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' # Darwin issue: Os { code: 24, kind: Uncategorized, message: "Too many open files" } diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix index c57bc18292b3..5594a8602be1 100644 --- a/pkgs/by-name/ca/cargo-rdme/package.nix +++ b/pkgs/by-name/ca/cargo-rdme/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - Security, }: rustPlatform.buildRustPackage rec { @@ -15,10 +13,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lVu9w8l3+SeqiMoQ8Bjoslf7tWz49jrrE4g/pDU1axI="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - useFetchCargoVendor = true; cargoHash = "sha256-W800jepxDv6OjbcxRKphAnDU2OuBGGGSLELe8gAfTr8="; diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix index 8e91c3c5bb22..8d755e78ef27 100644 --- a/pkgs/by-name/ca/cargo-release/package.nix +++ b/pkgs/by-name/ca/cargo-release/package.nix @@ -7,7 +7,6 @@ openssl, stdenv, curl, - darwin, git, }: @@ -36,7 +35,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl - darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix index 629d422ec522..4b5e36a361db 100644 --- a/pkgs/by-name/ca/cargo-semver-checks/package.nix +++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, cmake, zlib, - stdenv, - darwin, testers, cargo-semver-checks, nix-update-script, @@ -29,13 +27,9 @@ rustPlatform.buildRustPackage rec { cmake ]; - buildInputs = - [ - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + zlib + ]; checkFlags = [ # requires internet access diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index f35310fe2f32..c342579c0b44 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "1.1.12"; + version = "1.1.14"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-FvZJ0RFa5b9BQuZ1fmkvJhZj59yAsKSkKoTE0Emzdos="; + hash = "sha256-xGNIk/9UYU1F/Qj2tGvBb5rEZWjVoTyzk23OJE6seps="; }; useFetchCargoVendor = true; - cargoHash = "sha256-sYRUyTdTT2+VJHuiY1apom+EQU1hR46fJ6TmwNapHb4="; + cargoHash = "sha256-olnkcA9Vt1+yFzL2ntfDmO4rzMuJ0JjJVqCl15xcdDI="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix index 157a1f175e8c..2e34afa3bd49 100644 --- a/pkgs/by-name/ca/cargo-shuttle/package.nix +++ b/pkgs/by-name/ca/cargo-shuttle/package.nix @@ -5,8 +5,6 @@ pkg-config, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,15 +23,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + zlib + ]; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ca/cargo-supply-chain/package.nix b/pkgs/by-name/ca/cargo-supply-chain/package.nix index 95431b78947f..36b9aca3122c 100644 --- a/pkgs/by-name/ca/cargo-supply-chain/package.nix +++ b/pkgs/by-name/ca/cargo-supply-chain/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-fsW3qTyFMcj/OTouOah1ZFskw075V8jBwhs02AxY7kU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Gather author, contributor and publisher data on crates in your dependency graph"; mainProgram = "cargo-supply-chain"; diff --git a/pkgs/by-name/ca/cargo-swift/package.nix b/pkgs/by-name/ca/cargo-swift/package.nix index a2ebd230797f..10af9e673561 100644 --- a/pkgs/by-name/ca/cargo-swift/package.nix +++ b/pkgs/by-name/ca/cargo-swift/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-swift"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "antoniusnaumann"; repo = "cargo-swift"; rev = "v${version}"; - hash = "sha256-T8cIZJwnA3bFMIEezMrh5LRXV1SRCAVLanQm7rmc0sU="; + hash = "sha256-D6s25pOMdVZXBtBce/KEvqwn/9owrmxDOev3E59qrQ8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Zl5y2pHQIcLU5EDtmxsAv+/0n4DZ/qXwN4Prmm8Nd34="; + cargoHash = "sha256-pypBvfVW7m9dAvrc9ftrBOJ/wC+xLUuhGr7g7DVdZDI="; meta = with lib; { description = "Cargo plugin to easily build Swift packages from Rust code"; diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix index 12e3586d2fad..23d055bb2dc6 100644 --- a/pkgs/by-name/ca/cargo-tally/package.nix +++ b/pkgs/by-name/ca/cargo-tally/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,15 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-aSOEaHlUeP8D0GDdI6iLnuRHFasTt1nM6EGzYxhIPvo="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - DiskArbitration - Foundation - IOKit - ] - ); - meta = with lib; { description = "Graph the number of crates that depend on your crate over time"; mainProgram = "cargo-tally"; diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index ea5f2808dc4a..9be1ca1e89ee 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; tag = "tauri-cli-v${version}"; - hash = "sha256-tUa3Hb2pDqjcQs8isu1PxI5nx4rUzB/rOep2hDsun1Q="; + hash = "sha256-ut5Etn5yf4X3NvFa5JCRH2sQGnC/xzaRhALoyxdjy2k="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nwrKeCKrzwDOdRwkkuRMR91IbtPRxnSrJFyEW0W+1wA="; + cargoHash = "sha256-1YLpK2frSmdCj5aksuZhnHkAZdwHX/ZuVKXyqVJel/s="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-ui/package.nix b/pkgs/by-name/ca/cargo-ui/package.nix index 65a41aa8ca91..d59ff0f0ac72 100644 --- a/pkgs/by-name/ca/cargo-ui/package.nix +++ b/pkgs/by-name/ca/cargo-ui/package.nix @@ -10,7 +10,6 @@ fontconfig, libGL, xorg, - darwin, }: rustPlatform.buildRustPackage rec { @@ -43,9 +42,6 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libXrandr xorg.libxcb - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit ]; postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/ca/cargo-unused-features/package.nix b/pkgs/by-name/ca/cargo-unused-features/package.nix index c669ab159ed6..7502501d53df 100644 --- a/pkgs/by-name/ca/cargo-unused-features/package.nix +++ b/pkgs/by-name/ca/cargo-unused-features/package.nix @@ -6,8 +6,6 @@ pkg-config, libgit2, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,16 +25,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - curl - libgit2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + curl + libgit2 + openssl + ]; env = { LIBGIT2_NO_VENDOR = 1; diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix index 2dc1c2ca2082..034b7544eed2 100644 --- a/pkgs/by-name/ca/cargo-update/package.nix +++ b/pkgs/by-name/ca/cargo-update/package.nix @@ -12,7 +12,6 @@ libssh2, openssl, zlib, - darwin, }: rustPlatform.buildRustPackage rec { @@ -47,7 +46,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl - darwin.apple_sdk.frameworks.Security ]; postBuild = '' diff --git a/pkgs/development/tools/rust/cargo-vet/default.nix b/pkgs/by-name/ca/cargo-vet/package.nix similarity index 52% rename from pkgs/development/tools/rust/cargo-vet/default.nix rename to pkgs/by-name/ca/cargo-vet/package.nix index 6ff8f75f407e..25bde7e2bbd2 100644 --- a/pkgs/development/tools/rust/cargo-vet/default.nix +++ b/pkgs/by-name/ca/cargo-vet/package.nix @@ -2,43 +2,37 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - Security, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-vet"; - version = "0.8.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "mozilla"; - repo = pname; - rev = version; - sha256 = "sha256-VnOqQ1dKgNZSHTzJrD7stoCzNGrSkYxcLDJAsrJUsEQ="; + repo = "cargo-vet"; + tag = "v${finalAttrs.version}"; + hash = "sha256-HSEhFCcdC79OA8MP73De+iLIjcr1XMHxfJ9a1Q3JJYI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-8QbXZtf5kry0/QDrnUVQCtqK4/6EMliOI4Z410QR2Ec="; - - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; + cargoHash = "sha256-+X6DLxWPWMcGzJMVZAj3C5P5MyywIb4ml0Jsyo9/uAE="; # the test_project tests require internet access - checkFlags = [ - "--skip=test_project" - ]; + checkFlags = [ "--skip=test_project" ]; - meta = with lib; { + meta = { description = "Tool to help projects ensure that third-party Rust dependencies have been audited by a trusted source"; mainProgram = "cargo-vet"; homepage = "https://mozilla.github.io/cargo-vet"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # or mit ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ figsoda jk matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-vibe/package.nix b/pkgs/by-name/ca/cargo-vibe/package.nix index 841d7b57ea69..1f0afa5289b0 100644 --- a/pkgs/by-name/ca/cargo-vibe/package.nix +++ b/pkgs/by-name/ca/cargo-vibe/package.nix @@ -7,7 +7,6 @@ dbus, udev, openssl, - darwin, }: rustPlatform.buildRustPackage { pname = "cargo-vibe"; @@ -26,20 +25,10 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - dbus - openssl - ] - ++ lib.optional stdenv.hostPlatform.isLinux udev - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - IOKit - CoreBluetooth - ] - ); + buildInputs = [ + dbus + openssl + ] ++ lib.optional stdenv.hostPlatform.isLinux udev; meta = with lib; { description = "Cargo x Buttplug.io"; diff --git a/pkgs/by-name/ca/cargo-wasi/package.nix b/pkgs/by-name/ca/cargo-wasi/package.nix index ce9289c1a8cf..52772adaaf6e 100644 --- a/pkgs/by-name/ca/cargo-wasi/package.nix +++ b/pkgs/by-name/ca/cargo-wasi/package.nix @@ -5,7 +5,6 @@ pkg-config, stdenv, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,9 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; # Checks need to be disabled here because the current test suite makes assumptions # about the surrounding environment that aren't Nix friendly. See these lines for specifics: diff --git a/pkgs/by-name/ca/cargo-workspaces/package.nix b/pkgs/by-name/ca/cargo-workspaces/package.nix index 219553af4b60..59befd9ae071 100644 --- a/pkgs/by-name/ca/cargo-workspaces/package.nix +++ b/pkgs/by-name/ca/cargo-workspaces/package.nix @@ -6,8 +6,6 @@ libssh2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,16 +24,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libssh2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + libssh2 + openssl + zlib + ]; env = { LIBSSH2_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/by-name/ca/catcli/package.nix similarity index 88% rename from pkgs/tools/filesystems/catcli/default.nix rename to pkgs/by-name/ca/catcli/package.nix index c953e880cd01..2e330b671508 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/by-name/ca/catcli/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "catcli"; - version = "0.9.6"; + version = "1.0"; format = "setuptools"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; tag = "v${version}"; - hash = "sha256-+/kd7oPT6msojPj25bzG9HwVqPj47gIUg9LngbDc3y8="; + hash = "sha256-dAt9NysH3q5YC+vO9XTnapBxFZmC4vWwJ8SxT9CzCQE="; }; postPatch = "patchShebangs . "; @@ -24,6 +24,8 @@ python3.pkgs.buildPythonApplication rec { fusepy pyfzf types-docopt + cmd2 + natsort ]; nativeCheckInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/ca/catppuccin/package.nix b/pkgs/by-name/ca/catppuccin/package.nix index fd168c3021ab..32914fe6da4b 100644 --- a/pkgs/by-name/ca/catppuccin/package.nix +++ b/pkgs/by-name/ca/catppuccin/package.nix @@ -1,5 +1,6 @@ let validThemes = [ + "alacritty" "bat" "bottom" "btop" @@ -55,6 +56,14 @@ let selectedSources = map (themeName: builtins.getAttr themeName sources) themeList; sources = { + alacritty = fetchFromGitHub { + name = "alacritty"; + owner = "catppuccin"; + repo = "alacritty"; + rev = "f6cb5a5c2b404cdaceaff193b9c52317f62c62f7"; + hash = "sha256-H8bouVCS46h0DgQ+oYY8JitahQDj0V9p2cOoD4cQX+Q="; + }; + bat = fetchFromGitHub { name = "bat"; owner = "catppuccin"; @@ -222,6 +231,11 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO local capitalizedVariant=$(sed 's/^\(.\)/\U\1/' <<< "${variant}") local capitalizedAccent=$(sed 's/^\(.\)/\U\1/' <<< "${accent}") + '' + + lib.optionalString (lib.elem "alacritty" themeList) '' + mkdir -p "$out/alacritty" + cp "${sources.alacritty}/catppuccin-${variant}.toml" "$out/alacritty/" + '' + lib.optionalString (lib.elem "bat" themeList) '' mkdir -p "$out/bat" diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 8b03704f2353..8b896d2f8842 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.1.14"; + version = "1.1.15"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-VbFpZilrPR7Ajs1FY0a+qlkBnwvh+F18fmIf2oYlIFE="; + hash = "sha256-iIK/MnhX+1mZCHeGPEsdUO8T4HOpSA3Fy0fnjgVzG5g="; }; vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4="; diff --git a/pkgs/by-name/ce/cegui/package.nix b/pkgs/by-name/ce/cegui/package.nix index cf7c9707744f..241624683aeb 100644 --- a/pkgs/by-name/ce/cegui/package.nix +++ b/pkgs/by-name/ce/cegui/package.nix @@ -7,20 +7,19 @@ freetype, boost, expat, - darwin, libiconv, unstableGitUpdater, }: stdenv.mkDerivation { pname = "cegui"; - version = "0-unstable-2023-03-18"; + version = "0-unstable-2025-04-06"; src = fetchFromGitHub { owner = "paroj"; repo = "cegui"; - rev = "186ce900e293b98f2721c11930248a8de54aa338"; - hash = "sha256-RJ4MnxklcuxC+ZYEbfma5RDc2aeJ95LuTwNk+FnEhdo="; + rev = "a630bcc3f1e4b66edcf0fd00edcb9b29ad8446a3"; + hash = "sha256-9lZ7eBwmxZ33XNDJXQ2lbCcH5JyH0KoY1mj/g+2HOJs="; }; strictDeps = true; @@ -37,8 +36,6 @@ stdenv.mkDerivation { expat ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Foundation libiconv ]; diff --git a/pkgs/by-name/ce/celeste/package.nix b/pkgs/by-name/ce/celeste/package.nix index 48ef60083dde..acc76f8f5302 100644 --- a/pkgs/by-name/ce/celeste/package.nix +++ b/pkgs/by-name/ce/celeste/package.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - darwin, just, pkg-config, wrapGAppsHook4, @@ -58,22 +57,17 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook4 ]; - buildInputs = - [ - cairo - dbus - gdk-pixbuf - glib - graphene - gtk4 - libadwaita - librclone - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + cairo + dbus + gdk-pixbuf + glib + graphene + gtk4 + libadwaita + librclone + pango + ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/ce/celluloid/package.nix b/pkgs/by-name/ce/celluloid/package.nix index 67d17f6b1266..132cc461ccbc 100644 --- a/pkgs/by-name/ce/celluloid/package.nix +++ b/pkgs/by-name/ce/celluloid/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "celluloid"; - version = "0.27"; + version = "0.28"; src = fetchFromGitHub { owner = "celluloid-player"; repo = "celluloid"; - rev = "v${finalAttrs.version}"; - hash = "sha256-zuYt7taIb4w3NIszUpnSYvLIdYQH492tBwhLa6IgWDw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-72t8AVBDvvyf91zR/uXwT/PvNucyjUQFpQUQ5wnekXw="; }; nativeBuildInputs = [ @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/celluloid-player/celluloid/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl3Plus; mainProgram = "celluloid"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ samlukeyes123 ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ce/centerim/package.nix b/pkgs/by-name/ce/centerim/package.nix deleted file mode 100644 index 44abb6a12e6a..000000000000 --- a/pkgs/by-name/ce/centerim/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - gnused, - openssl, - curl, - ncurses, - libjpeg, - withGpg ? true, - gpgme ? null, -}: - -stdenv.mkDerivation rec { - version = "5.0.1"; - pname = "centerim5"; - - src = fetchurl { - url = "http://centerim.org/download/cim5/${pname}-${version}.tar.gz"; - sha256 = "0viz86jflp684vfginhl6aaw4gh2qvalc25anlwljjl3kkmibklk"; - }; - - CXXFLAGS = "-std=gnu++98"; - - buildInputs = [ - openssl - curl - ncurses - libjpeg - ] ++ lib.optional withGpg gpgme; - - preConfigure = '' - ${gnused}/bin/sed -i '1,1i#include ' libicq2000/libicq2000/sigslot.h - ''; - - configureFlags = [ - "--with-openssl=${openssl.dev}" - ]; - - meta = { - homepage = "https://www.centerim.org/"; - description = "Fork of CenterICQ, a curses instant messaging program"; - license = lib.licenses.gpl2Plus; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/by-name/ce/certinfo-go/package.nix b/pkgs/by-name/ce/certinfo-go/package.nix index 23b3e6b9762b..f3f8fc02b470 100644 --- a/pkgs/by-name/ce/certinfo-go/package.nix +++ b/pkgs/by-name/ce/certinfo-go/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "certinfo-go"; - version = "0.1.42"; + version = "0.1.43"; src = fetchFromGitHub { owner = "paepckehh"; repo = "certinfo"; tag = "v${version}"; - hash = "sha256-XnHQTMohpuMnV2trSqZ9PlKWmuOyHGDj+6ljKfUD40A="; + hash = "sha256-vXNk4DrElWmV7yxWEiLZexJQzVBUY08fF0in6hpBwjA="; }; - vendorHash = "sha256-Bbj+8TAJJWhkOxib9cz/Znj5bHAXcgrDONRpGDK+los="; + vendorHash = "sha256-rAXnnd9E3HFvmbI+dIJj0F81NwXXD53QATNNmlOpBRM="; ldflags = [ "-s" diff --git a/pkgs/by-name/ce/certinfo/package.nix b/pkgs/by-name/ce/certinfo/package.nix index 073c6ce3ed9c..b5f79fdd1a86 100644 --- a/pkgs/by-name/ce/certinfo/package.nix +++ b/pkgs/by-name/ce/certinfo/package.nix @@ -4,7 +4,6 @@ buildGo123Module, fetchFromGitHub, libX11, - darwin, }: buildGo123Module rec { @@ -21,10 +20,7 @@ buildGo123Module rec { # clipboard functionality not working on Darwin doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); - buildInputs = - [ ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libX11 ]; vendorHash = null; diff --git a/pkgs/by-name/ce/cewler/package.nix b/pkgs/by-name/ce/cewler/package.nix index a146ef653f64..3a65802c2615 100644 --- a/pkgs/by-name/ce/cewler/package.nix +++ b/pkgs/by-name/ce/cewler/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cewler"; - version = "1.2.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "roys"; repo = "cewler"; rev = "v${version}"; - hash = "sha256-lVI3p6YMugQ3yKHFNxISmUY7XZMuX/TXvVUoZfIeJog="; + hash = "sha256-Od9O71122jVwqZ5ntoBQQtyNQjt2RRbZT8DzWFPUN84="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/cf/cfspeedtest/package.nix b/pkgs/by-name/cf/cfspeedtest/package.nix index e4fe48bb2b10..c9decc92d1c0 100644 --- a/pkgs/by-name/cf/cfspeedtest/package.nix +++ b/pkgs/by-name/cf/cfspeedtest/package.nix @@ -3,28 +3,40 @@ stdenv, rustPlatform, fetchFromGitHub, + installShellFiles, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cfspeedtest"; - version = "1.3.2"; + version = "1.3.4"; src = fetchFromGitHub { owner = "code-inflation"; repo = "cfspeedtest"; - tag = "v${version}"; - hash = "sha256-Q1K5UcrSckEN+6W9UO2u07R3mZ6+J8E1ZYRZqnXif1s="; + tag = "v${finalAttrs.version}"; + hash = "sha256-6ea9qOAFP7+1UIrGASFiAPyem+VDVgzrgD44ELsXRzc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-moYovJamW9xX3niO10bG9K3choDMV3wtuUSCn/5g1Yw="; + cargoHash = "sha256-uyLd4KQa9zWMCuurpdQv0OnCSguE180dm6FzHR+nC40="; - meta = with lib; { + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd cfspeedtest \ + --bash <($out/bin/cfspeedtest --generate-completion bash) \ + --fish <($out/bin/cfspeedtest --generate-completion fish) \ + --zsh <($out/bin/cfspeedtest --generate-completion zsh) + ''; + + meta = { description = "Unofficial CLI for speed.cloudflare.com"; homepage = "https://github.com/code-inflation/cfspeedtest"; - license = with licenses; [ mit ]; - broken = stdenv.hostPlatform.isDarwin; - maintainers = with maintainers; [ colemickens ]; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ + colemickens + stepbrobd + ]; mainProgram = "cfspeedtest"; }; -} +}) diff --git a/pkgs/by-name/ch/chainsaw/package.nix b/pkgs/by-name/ch/chainsaw/package.nix index a9d848a59619..17c763fff44c 100644 --- a/pkgs/by-name/ch/chainsaw/package.nix +++ b/pkgs/by-name/ch/chainsaw/package.nix @@ -2,39 +2,41 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "chainsaw"; - version = "2.10.1"; + version = "2.12.2"; src = fetchFromGitHub { owner = "WithSecureLabs"; repo = "chainsaw"; - tag = "v${version}"; - hash = "sha256-ErDIfLhzCiFm3dZzr6ThjYCplfDKbALAqcu8c0gREH4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-SoQXGpkMrE0vno0dJ00ebB0oR1sDVlgWRSgKQoHlv2A="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LTvCExHQnQIbGGeh4bK6b3r9XXOxREMTOlRQv+BjKrM="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; + cargoHash = "sha256-ncf5fRf9NulcWTOuRE2rdAOIyvz5YEgpB1j/Rfj8vDk="; ldflags = [ "-w" "-s" ]; - meta = with lib; { + checkFlags = [ + # failed + "--skip=analyse_srum_database_json" + "--skip=search_jq_simple_string" + "--skip=search_q_jsonl_simple_string" + "--skip=search_q_simple_string" + ]; + + meta = { description = "Rapidly Search and Hunt through Windows Forensic Artefacts"; homepage = "https://github.com/WithSecureLabs/chainsaw"; - changelog = "https://github.com/WithSecureLabs/chainsaw/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + changelog = "https://github.com/WithSecureLabs/chainsaw/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "chainsaw"; }; -} +}) diff --git a/pkgs/by-name/ch/chamber/package.nix b/pkgs/by-name/ch/chamber/package.nix index 4f6dd8670f67..9f721954031f 100644 --- a/pkgs/by-name/ch/chamber/package.nix +++ b/pkgs/by-name/ch/chamber/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "chamber"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1ySOlP0sFk3+IRt/zstZK6lEE2pzoVSiZz3wFxdesgc="; + sha256 = "sha256-9+I/zH4sHlLQkEn+fCboI3vCjYjlk+hdYnWuxq47r5I="; }; env.CGO_ENABLED = 0; - vendorHash = "sha256-KlouLjW9hVKFi9uz34XHd4CzNOiyO245QNygkB338YQ="; + vendorHash = "sha256-IjCBf1h6r+EDLfgGqP/VfsHaD5oPkIR33nYBAcb6SLY="; ldflags = [ "-s" diff --git a/pkgs/by-name/ch/chatbox/package.nix b/pkgs/by-name/ch/chatbox/package.nix index ed6b6025a0c5..85e2af95a374 100644 --- a/pkgs/by-name/ch/chatbox/package.nix +++ b/pkgs/by-name/ch/chatbox/package.nix @@ -2,14 +2,15 @@ lib, appimageTools, fetchurl, + writeScript, }: let pname = "chatbox"; - version = "1.11.3"; + version = "1.11.12"; src = fetchurl { url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage"; - hash = "sha256-YMZsgbCkG/cZd77DOVZj6jVJDzWMcrt92soxyLNr2QI="; + hash = "sha256-sfR4fXpREPdEoPoez5ugCpn/ubpB6EhkvpVq6rz0BSg="; }; appimageContents = appimageTools.extract { inherit pname version src; }; @@ -25,7 +26,7 @@ appimageTools.wrapType2 { --replace-fail 'Icon=xyz.chatboxapp.app' 'Icon=chatbox' ''; - passthru.updateScript = '' + passthru.updateScript = writeScript "update-chatbox" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep common-updater-scripts version=$(curl -I -X GET https://chatboxai.app/install_chatbox/linux | grep -oP 'Chatbox-\K[0-9]+\.[0-9]+\.[0-9]+') diff --git a/pkgs/by-name/ch/chatgpt/package.nix b/pkgs/by-name/ch/chatgpt/package.nix index 0dc77de11805..9799e446af64 100644 --- a/pkgs/by-name/ch/chatgpt/package.nix +++ b/pkgs/by-name/ch/chatgpt/package.nix @@ -1,7 +1,6 @@ { lib, stdenvNoCC, - darwin, fetchurl, _7zz, undmg, diff --git a/pkgs/by-name/ch/chatterino2/common.nix b/pkgs/by-name/ch/chatterino2/common.nix index feca6623b96e..0e8fb6cd4bb1 100644 --- a/pkgs/by-name/ch/chatterino2/common.nix +++ b/pkgs/by-name/ch/chatterino2/common.nix @@ -7,6 +7,7 @@ boost, openssl, libsecret, + libnotify, libavif, kdePackages, }: @@ -24,13 +25,17 @@ stdenv.mkDerivation { qtsvg qt5compat qtkeychain + qtimageformats ]) ++ [ boost openssl libsecret ] - ++ lib.optional stdenv.hostPlatform.isLinux kdePackages.qtwayland + ++ lib.optionals stdenv.hostPlatform.isLinux [ + kdePackages.qtwayland + libnotify + ] ++ lib.optional enableAvifSupport libavif; cmakeFlags = [ diff --git a/pkgs/by-name/ch/chatterino2/package.nix b/pkgs/by-name/ch/chatterino2/package.nix index cd22b02ec183..7e109330875f 100644 --- a/pkgs/by-name/ch/chatterino2/package.nix +++ b/pkgs/by-name/ch/chatterino2/package.nix @@ -2,7 +2,7 @@ lib, callPackage, fetchFromGitHub, - nix-update-script, + gitUpdater, boost186, }: @@ -12,19 +12,22 @@ ( finalAttrs: _: { pname = "chatterino2"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "Chatterino"; repo = "chatterino2"; tag = "v${finalAttrs.version}"; - hash = "sha256-nrw4dQ7QjPPMbZXMC+p3VgUQKwc1ih6qS13D9+9oNuw="; + hash = "sha256-W2sqlqL6aa68aQ3nE161G64x7K7p8iByX03g1dseQbs="; fetchSubmodules = true; }; passthru = { buildChatterino = args: callPackage ./common.nix args; - updateScript = nix-update-script { }; + updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "beta"; + }; }; meta = { diff --git a/pkgs/by-name/ch/chatterino7/package.nix b/pkgs/by-name/ch/chatterino7/package.nix index 3bff23f94c4c..d3fe6ed076f6 100644 --- a/pkgs/by-name/ch/chatterino7/package.nix +++ b/pkgs/by-name/ch/chatterino7/package.nix @@ -2,7 +2,7 @@ lib, chatterino2, fetchFromGitHub, - nix-update-script, + gitUpdater, boost186, }: @@ -13,17 +13,20 @@ ( finalAttrs: _: { pname = "chatterino7"; - version = "7.5.2"; + version = "7.5.3"; src = fetchFromGitHub { owner = "SevenTV"; repo = "chatterino7"; tag = "v${finalAttrs.version}"; - hash = "sha256-kQeW9Qa8NPs47xUlqggS4Df4fxIoknG8O5IBdOeIo+4="; + hash = "sha256-KrAr3DcQDjb+LP+vIf0qLSSgII0m5rNwhncLNHlLaC8="; fetchSubmodules = true; }; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "beta"; + }; meta = { description = "Chat client for Twitch chat"; @@ -38,7 +41,10 @@ changelog = "https://github.com/SevenTV/chatterino7/blob/${finalAttrs.src.rev}/CHANGELOG.c7.md"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ marie ]; + maintainers = with lib.maintainers; [ + marie + supa + ]; }; } ) diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index c983161978f3..fbfe1c3e8445 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -25,14 +25,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.404"; + version = "3.2.407"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-hxu2FAdLMm54b0SNiHcvdKgxmsDZtA9qEqD/c9vL3Yg="; + hash = "sha256-xVscXBrgaJhQDmtuvQ/eQsWS3Z7rpaOJSptWXaMsby0="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ch/checkpwn/package.nix b/pkgs/by-name/ch/checkpwn/package.nix index a5147b3ae705..4c63aa50be43 100644 --- a/pkgs/by-name/ch/checkpwn/package.nix +++ b/pkgs/by-name/ch/checkpwn/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,10 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-8ALu1Ij4o2fdsRWhlWu6rOIfHZjIIC+fHJ07XIbH66s="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - # requires internet access checkFlags = [ "--skip=test_cli_" diff --git a/pkgs/by-name/ch/cherrybomb/package.nix b/pkgs/by-name/ch/cherrybomb/package.nix index ea40863dd6b6..b1ea2ba7875a 100644 --- a/pkgs/by-name/ch/cherrybomb/package.nix +++ b/pkgs/by-name/ch/cherrybomb/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,10 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-j9CT2HHFY4ANWKvx8t/jgCc3aOiSEJlq8CHstjSc+O4="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "CLI tool that helps you avoid undefined user behavior by validating your API specifications"; mainProgram = "cherrybomb"; diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index 6c91c94e9221..b151adce04b4 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -8,16 +8,16 @@ let argset = { pname = "chezmoi"; - version = "2.61.0"; + version = "2.62.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${argset.version}"; - hash = "sha256-ikknqi6kfXJSI4qfzwYyU97IpQEMUBV+RCPdZIzFHoE="; + hash = "sha256-2n8ePR5WzV6RtfI9ySIy5Zqg8jKXltUNq572kVUyLWY="; }; - vendorHash = "sha256-IWZokKY98/ptitZNFnOajOkGca3vnepCF1CP69NTrKw="; + vendorHash = "sha256-7OD/yRI0TD8PM1IoMazN2W5b8AwKs64068ZectGXFtU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index d9b47b9cad69..a53dc8e88c08 100644 --- a/pkgs/by-name/ch/chirp/package.nix +++ b/pkgs/by-name/ch/chirp/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "chirp"; - version = "0.4.0-unstable-2025-04-01"; + version = "0.4.0-unstable-2025-04-17"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "bc27f6653aa804a5c55a3a1b2244ee43a174854b"; - hash = "sha256-zYNJJvg7ZWDcPAZpahW9tlVuSsvbRGr2PQYOB2Tx1JY="; + rev = "a96c6df2617034673ebb30ffe2c2206d7b42efbd"; + hash = "sha256-FBRUrpHTp/SaJ6aR9dQ+dcdhU2++n6R2h7rFVRiXH/U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chirpstack-fuota-server/package.nix b/pkgs/by-name/ch/chirpstack-fuota-server/package.nix index d81d9ccb284e..8b7f88257f9b 100644 --- a/pkgs/by-name/ch/chirpstack-fuota-server/package.nix +++ b/pkgs/by-name/ch/chirpstack-fuota-server/package.nix @@ -3,7 +3,7 @@ buildGoModule, fetchFromGitHub, versionCheckHook, - nix-update-script, + unstableGitUpdater, }: buildGoModule rec { pname = "chirpstack-fuota-server"; @@ -32,7 +32,9 @@ buildGoModule rec { "-skip=TestStorage" # Depends on external database server ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = { description = "FUOTA server which can be used together with ChirpStack Application Server"; diff --git a/pkgs/by-name/ch/chit/package.nix b/pkgs/by-name/ch/chit/package.nix index dc9fa955817f..218d867f4482 100644 --- a/pkgs/by-name/ch/chit/package.nix +++ b/pkgs/by-name/ch/chit/package.nix @@ -5,7 +5,6 @@ pkg-config, stdenv, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,13 +24,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + ]; # update Carg.lock to work with openssl 3 postPatch = '' diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index 61b8766d6501..73175713bbe9 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -8,7 +8,6 @@ cmake, ninja, ffmpeg-headless, - darwin, zlib, testers, validatePkgConfig, @@ -57,15 +56,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ ffmpeg-headless ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Accelerate - CoreGraphics - CoreVideo - zlib - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + zlib + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_EXAMPLES" withExamples) diff --git a/pkgs/by-name/ch/chromatic/package.nix b/pkgs/by-name/ch/chromatic/package.nix deleted file mode 100644 index d5f3c194133c..000000000000 --- a/pkgs/by-name/ch/chromatic/package.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - rustPlatform, - meson, - ninja, - pkg-config, - rustc, - cargo, - wrapGAppsHook4, - desktop-file-utils, - libxml2, - libadwaita, - portaudio, - libpulseaudio, -}: - -stdenv.mkDerivation rec { - pname = "chromatic"; - version = "0-unstable-2023-08-05"; - - src = fetchFromGitHub { - owner = "nate-xyz"; - repo = "chromatic"; - rev = "ffaeb50dcce74bf3ba1b05f98423cf48f205f55e"; - hash = "sha256-E3v3UoQumBBYDOiXMfCRh5J7bfUCkettHth7SAresCE="; - }; - - patches = [ - # solve error[E0310]: the parameter type `T` may not live long enough - # in rust-serialize crate - ./rustc_serialize_update.patch - ]; - - cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; - patches = [ ./rustc_serialize_update.patch ]; - hash = "sha256-9fdOOkxs4L0sYZIRT9wbgp169mQc2IyFRZlAcOHcOcg="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - rustPlatform.cargoSetupHook - rustc - cargo - wrapGAppsHook4 - desktop-file-utils - libxml2.bin # xmllint - ]; - - buildInputs = [ - libadwaita - portaudio - libpulseaudio - ]; - - meta = with lib; { - description = "Fine-tune your instruments"; - longDescription = '' - Fine-tune your instruments with Chromatic. Chromatic - detects the frequency of audio input, converts it to - a musical note with the correct semitone and octave, - and displays the cents error. Cents are displayed on - an analog gauge to make tuning more visually intuitive. - Requires PulseAudio or PipeWire. - ''; - homepage = "https://github.com/nate-xyz/chromatic"; - license = licenses.gpl3Plus; - mainProgram = "chromatic"; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/ch/chromatic/rustc_serialize_update.patch b/pkgs/by-name/ch/chromatic/rustc_serialize_update.patch deleted file mode 100644 index fa56db4d5399..000000000000 --- a/pkgs/by-name/ch/chromatic/rustc_serialize_update.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index ab2add4..7740629 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1031,9 +1031,9 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - - [[package]] - name = "rustc-serialize" --version = "0.3.24" -+version = "0.3.25" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" -+checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401" - - [[package]] - name = "rustc_version" diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 3ab99086930d..304fb61ac210 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.113.0"; + version = "1.114.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-hzS9ztX2/n4PJIerwQ5DNIuV6975KgyitOvG2jHNM/w="; + hash = "sha256-wNgaOQaL5Vl9bvFMpYNijvyYxlSccGiSsxfk0QRpMCo="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix index 6aa8b9ab771b..c02e6d4a6644 100644 --- a/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.141.0"; + version = "0.142.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = "cirrus-cli"; rev = "v${version}"; - hash = "sha256-ET7fQeEdev+CkH+DGiit2Y/UpISN+WYZl4+Fw3AxbGo="; + hash = "sha256-Vmms4L2am0kUHZuu5RZonZB8opIzgZ0rqgJTs4n9410="; }; - vendorHash = "sha256-BVR/EEEYkilKSJjHA31g3dsXm0LBJFzoFGkrLUa0B4k="; + vendorHash = "sha256-N1Gc/J+WvXmPa1RBy32B262zH71TQXZtHW2+3fipOmg="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/by-name/ci/citations/package.nix b/pkgs/by-name/ci/citations/package.nix index 7fc6357ac63b..b0a21ab3349c 100644 --- a/pkgs/by-name/ci/citations/package.nix +++ b/pkgs/by-name/ci/citations/package.nix @@ -1,6 +1,5 @@ { cargo, - darwin, desktop-file-utils, fetchFromGitLab, gettext, @@ -52,17 +51,13 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 ]; - buildInputs = - [ - glib - gtk4 - gtksourceview5 - libadwaita - poppler - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + glib + gtk4 + gtksourceview5 + libadwaita + poppler + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang ( lib.concatStringsSep " " [ diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix index a565a497adc3..7fc0cf094054 100644 --- a/pkgs/by-name/ci/civo/package.nix +++ b/pkgs/by-name/ci/civo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "civo"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - hash = "sha256-T4xAWEXynkj++jS/7OjA/kT9Wk396IRXm3ikSA5q3Fo="; + hash = "sha256-zOdQ3bodAHEMQdq5DbVD7VoTS66OHFn5gP1HbowzIV4="; }; - vendorHash = "sha256-c4KyK0HtIW08/DQ6PLgA+M8GABrKHjAayZahkvo/Erc="; + vendorHash = "sha256-F0ULVAOLMgBlwRlJekKXKCqSYbU4pAL/AkuPTsUTMsI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/cl/clapper-enhancers/package.nix b/pkgs/by-name/cl/clapper-enhancers/package.nix new file mode 100644 index 000000000000..4de5dca52635 --- /dev/null +++ b/pkgs/by-name/cl/clapper-enhancers/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + libpeas2, + json-glib, + libsoup_3, + glib, + clapper-unwrapped, + gst_all_1, + python3Packages, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "clapper-enhancers"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "Rafostar"; + repo = "clapper-enhancers"; + tag = finalAttrs.version; + hash = "sha256-CUfTz+YvliJXiv/nsdrpDVFSblqoSW7js8vAtJ9u5vM="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + python3Packages.python + python3Packages.wrapPython + ]; + + buildInputs = [ + libpeas2 + json-glib + libsoup_3 + glib + clapper-unwrapped + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + ]; + + pythonPath = with python3Packages; [ + yt-dlp + ]; + + postFixup = '' + buildPythonPath "$out $pythonPath" + for yt_plugin in $out/lib/clapper-enhancers/plugins/yt-dlp/*.py; do + patchPythonScript $yt_plugin + done + ''; + + mesonFlags = [ "-Denhancersdir=${placeholder "out"}/${finalAttrs.passthru.pluginPath}" ]; + + passthru.pluginPath = "lib/clapper-enhancers/plugins"; + + meta = { + description = "Plugins enhancing Clapper library capabilities"; + homepage = "https://github.com/Rafostar/clapper-enhancers"; + license = lib.licenses.lgpl21Only; + inherit (clapper-unwrapped.meta) maintainers platforms; + }; +}) diff --git a/pkgs/by-name/cl/clapper-unwrapped/package.nix b/pkgs/by-name/cl/clapper-unwrapped/package.nix new file mode 100644 index 000000000000..c5bc14eea542 --- /dev/null +++ b/pkgs/by-name/cl/clapper-unwrapped/package.nix @@ -0,0 +1,90 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gobject-introspection, + pkg-config, + ninja, + desktop-file-utils, + shared-mime-info, + meson, + gtk4, + gst_all_1, + libGL, + libadwaita, + libsoup_3, + vala, + cmake, + libmicrodns, + glib-networking, + libpeas2, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "clapper-unwrapped"; + version = "0.8.0"; + + outputs = [ + "out" + "lib" + "dev" + ]; + + src = fetchFromGitHub { + owner = "Rafostar"; + repo = "clapper"; + tag = finalAttrs.version; + hash = "sha256-Yb2fWsdd8jhxkGWKanLn7CAuF4MjyQ27XTrO8ja3hfs="; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + cmake + ninja + pkg-config + desktop-file-utils # for update-desktop-database + gtk4 # for gtk4-update-icon-cache + shared-mime-info # for update-mime-database + vala + ]; + + buildInputs = [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + glib-networking # for TLS support + gtk4 + libGL + libadwaita + libsoup_3 + libmicrodns + libpeas2 + ]; + + postPatch = '' + patchShebangs --build build-aux/meson/postinstall.py + ''; + + preFixup = '' + mkdir -p $out/share/gsettings-schemas + # alias clapper-unwrapped schemas to also provide clapper schemas. + # the precise schema patch can vary based on host platform. + schemas=$(basename $lib/share/gsettings-schemas/clapper-unwrapped-*) + cp -r $lib/share/gsettings-schemas/$schemas $out/share/gsettings-schemas/''${schemas/clapper-unwrapped-/clapper-} + ''; + + meta = { + description = "GNOME media player built using GTK4 toolkit and powered by GStreamer with OpenGL rendering"; + longDescription = '' + Clapper is a GNOME media player built using the GTK4 toolkit. + The media player is using GStreamer as a media backend. + ''; + homepage = "https://github.com/Rafostar/clapper"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/cl/clapper/package.nix b/pkgs/by-name/cl/clapper/package.nix index b1219422261a..596b03a94cd0 100644 --- a/pkgs/by-name/cl/clapper/package.nix +++ b/pkgs/by-name/cl/clapper/package.nix @@ -1,88 +1,41 @@ { - lib, - stdenv, - fetchFromGitHub, - gobject-introspection, - pkg-config, - ninja, - desktop-file-utils, - makeWrapper, - shared-mime-info, + stdenvNoCC, + clapper-unwrapped, wrapGAppsHook4, - meson, - gtk4, - gst_all_1, - libGL, - libadwaita, - libsoup_3, - vala, - cmake, - libmicrodns, - gtuber, - glib-networking, - libpeas2, + gobject-introspection, + xorg, + clapper-enhancers, }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation { pname = "clapper"; - version = "0.8.0"; + inherit (clapper-unwrapped) version meta; - src = fetchFromGitHub { - owner = "Rafostar"; - repo = "clapper"; - tag = finalAttrs.version; - hash = "sha256-Yb2fWsdd8jhxkGWKanLn7CAuF4MjyQ27XTrO8ja3hfs="; - }; + src = clapper-unwrapped; + + dontConfigure = true; + dontBuild = true; nativeBuildInputs = [ + wrapGAppsHook4 gobject-introspection - meson - cmake - ninja - makeWrapper - pkg-config - wrapGAppsHook4 # for gsettings - desktop-file-utils # for update-desktop-database - shared-mime-info # for update-mime-database - vala + xorg.lndir ]; - buildInputs = [ - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - gtuber - glib-networking # for TLS support - gtk4 - libGL - libadwaita - libsoup_3 - libmicrodns - libpeas2 - ]; + buildInputs = [ clapper-unwrapped ] ++ clapper-unwrapped.buildInputs; - postPatch = '' - patchShebangs --build build-aux/meson/postinstall.py + installPhase = '' + runHook preInstall + + mkdir -p $out + lndir $src $out + + runHook postInstall ''; - # The package uses "clappersink" provided by itself preFixup = '' gappsWrapperArgs+=( - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : $out/lib/gstreamer-1.0 + --set-default CLAPPER_ENHANCERS_PATH "${clapper-enhancers}/${clapper-enhancers.passthru.pluginPath}" ) ''; - - meta = { - description = "GNOME media player built using GTK4 toolkit and powered by GStreamer with OpenGL rendering"; - longDescription = '' - Clapper is a GNOME media player built using the GTK4 toolkit. - The media player is using GStreamer as a media backend. - ''; - homepage = "https://github.com/Rafostar/clapper"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ aleksana ]; - platforms = lib.platforms.linux; - }; -}) +} diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 201d47a94935..042639d853b6 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -5,13 +5,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^0.2.69" + "@anthropic-ai/claude-code": "^0.2.74" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "0.2.69", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.69.tgz", - "integrity": "sha512-41rEx924nNM8k8pJqj8aeLOYtQYFyw94aKmKQdBUoewSPIpySiJVC7VUDxm7Q+k+oJhnXB6YQY/8+qxofyuJNA==", + "version": "0.2.74", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.74.tgz", + "integrity": "sha512-/ACVmaEyWTPuFeRAujnCYcDI9cBqY8J4jUgZYQU+71Px8KMmWL6Sk0LrdfQsZLtRUHLRtjUF5qvTM6Nuzxl5dQ==", "hasInstallScript": true, "license": "SEE LICENSE IN README.md", "bin": { diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 9a3e0ea02416..4303fd8f32e4 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "claude-code"; - version = "0.2.69"; + version = "0.2.74"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-ShVescHfUhRwctlHLukRic73yUvuc5LP7qev3Hk1qWg="; + hash = "sha256-J1lJePL0EjpdjHF/d+AxfKpIoJqAJNUtZpsFJO40+uM="; }; - npmDepsHash = "sha256-7jbvsIXulG6dJOnMc5MjDm/Kcyndm4jDSdj85eSp/hc="; + npmDepsHash = "sha256-IWeNlRylGZlbXCvyeb433XQdqEUu2rmQvyn2y//6Kew="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/cl/clean-css-cli/package.nix b/pkgs/by-name/cl/clean-css-cli/package.nix index 195aa7537d1b..4141f0731390 100644 --- a/pkgs/by-name/cl/clean-css-cli/package.nix +++ b/pkgs/by-name/cl/clean-css-cli/package.nix @@ -3,30 +3,29 @@ buildNpmPackage, fetchFromGitHub, }: - -let +buildNpmPackage (finalAttrs: { + pname = "clean-css-cli"; version = "5.6.3"; + src = fetchFromGitHub { owner = "clean-css"; repo = "clean-css-cli"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-tsFNcQg55uY2gL5xLLLS6INLlYzbsU6M3hnsYeOFGEw="; }; -in -buildNpmPackage { - pname = "clean-css-cli"; - inherit version src; npmDepsHash = "sha256-uvI9esVVOE18syHUCJpoiDY+Vh3hJO+GsMOTZSYJaxg="; dontNpmBuild = true; + dontCheckForBrokenSymlinks = true; + meta = { - changelog = "https://github.com/clean-css/clean-css-cli/blob/${src.rev}/History.md"; description = "Command-line interface to the clean-css CSS optimization library"; homepage = "https://github.com/clean-css/clean-css-cli"; + changelog = "https://github.com/clean-css/clean-css-cli/blob/v${finalAttrs.version}/History.md"; license = lib.licenses.mit; mainProgram = "cleancss"; maintainers = with lib.maintainers; [ momeemt ]; }; -} +}) diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index 4c2b76aa1ca3..d88a71de53cf 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -2,7 +2,7 @@ lib, buildNpmPackage, fetchFromGitHub, - nodejs_18, + nodejs_20, installShellFiles, makeWrapper, stdenv, @@ -13,7 +13,7 @@ buildNpmPackage rec { version = "3.12.0"; - nodejs = nodejs_18; + nodejs = nodejs_20; src = fetchFromGitHub { owner = "CleverCloud"; diff --git a/pkgs/by-name/cl/clfft/package.nix b/pkgs/by-name/cl/clfft/package.nix index a7eedd645738..5b12ce60d3d1 100644 --- a/pkgs/by-name/cl/clfft/package.nix +++ b/pkgs/by-name/cl/clfft/package.nix @@ -8,11 +8,9 @@ boost, opencl-clhpp, ocl-icd, - darwin, }: let - inherit (darwin.apple_sdk.frameworks) OpenCL; stdenv = gccStdenv; in stdenv.mkDerivation rec { @@ -43,8 +41,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ opencl-clhpp ocl-icd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenCL ]; + ]; # https://github.com/clMathLibraries/clFFT/issues/237 CXXFLAGS = "-std=c++98"; diff --git a/pkgs/by-name/cl/click/package.nix b/pkgs/by-name/cl/click/package.nix index e1bd2d3d888a..96afcd703127 100644 --- a/pkgs/by-name/cl/click/package.nix +++ b/pkgs/by-name/cl/click/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchFromGitHub, rustPlatform, lib, @@ -24,9 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; meta = with lib; { description = ''The "Command Line Interactive Controller for Kubernetes"''; diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix index 741103455c39..ba25c7e69d2d 100644 --- a/pkgs/by-name/cl/clickable/package.nix +++ b/pkgs/by-name/cl/clickable/package.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "clickable"; - version = "8.3.0"; + version = "8.3.1"; src = fetchFromGitLab { owner = "clickable"; repo = "clickable"; rev = "v${version}"; - hash = "sha256-5fymmsZUYwB+wc1X7Y1HwwJbGRjQPwkk9JLTxnfH8fo="; + hash = "sha256-Vn2PyALaRrE+jJRdZzW+jjCm3f2GfpgrQcFGB7kr4EM="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/cl/clickhouse-backup/package.nix b/pkgs/by-name/cl/clickhouse-backup/package.nix index 5ffa4cf9151c..dd186b8ec8f9 100644 --- a/pkgs/by-name/cl/clickhouse-backup/package.nix +++ b/pkgs/by-name/cl/clickhouse-backup/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.6.13"; + version = "2.6.15"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-8yvhDpSOklkWIi10o0QBd8bUB9qOF+nDhgaOD8G5FqU="; + hash = "sha256-WHIrgKWO8yHHbQ5i3qvCYjxuRPj8sRasjxQ2J1N8q7o="; }; vendorHash = "sha256-4qPZihOuaD8lKF31fhyTDG7gBa0gExLVavazGZWDyAk="; diff --git a/pkgs/by-name/cl/clima/package.nix b/pkgs/by-name/cl/clima/package.nix index 1e73159f8062..650ccfacf768 100644 --- a/pkgs/by-name/cl/clima/package.nix +++ b/pkgs/by-name/cl/clima/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-3BNDo5ksra1d8X6yQZYSlS2CSiZfkuTHkQtIC2ckbKE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Minimal viewer for Termimad"; homepage = "https://github.com/Canop/clima"; diff --git a/pkgs/by-name/cl/clipboard-jh/package.nix b/pkgs/by-name/cl/clipboard-jh/package.nix index d2d0651f5123..5ed2283649a3 100644 --- a/pkgs/by-name/cl/clipboard-jh/package.nix +++ b/pkgs/by-name/cl/clipboard-jh/package.nix @@ -9,7 +9,6 @@ wayland-scanner, wayland, xorg, - darwin, nix-update-script, alsa-lib, openssl, @@ -44,9 +43,6 @@ stdenv.mkDerivation rec { wayland xorg.libX11 alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit ]; cmakeBuildType = "MinSizeRel"; diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix index 22597dd1f781..66bfcc8dab99 100644 --- a/pkgs/by-name/cl/clipcat/package.nix +++ b/pkgs/by-name/cl/clipcat/package.nix @@ -5,7 +5,6 @@ rustPlatform, protobuf, installShellFiles, - darwin, }: rustPlatform.buildRustPackage rec { @@ -22,12 +21,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-UA+NTtZ2qffUPUmvCidnTHwFzD3WOPTlxHR2e2vKwPQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - nativeBuildInputs = [ protobuf installShellFiles diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/by-name/cl/cliscord/package.nix similarity index 63% rename from pkgs/misc/cliscord/default.nix rename to pkgs/by-name/cl/cliscord/package.nix index 5531b8c9805e..41f2f38e74ee 100644 --- a/pkgs/misc/cliscord/default.nix +++ b/pkgs/by-name/cl/cliscord/package.nix @@ -1,36 +1,33 @@ { lib, - stdenv, rustPlatform, + fetchFromGitHub, openssl, pkg-config, - fetchFromGitHub, - Security, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "cliscord"; - version = "unstable-2022-10-07"; + version = "0-unstable-2022-10-07"; src = fetchFromGitHub { owner = "somebody1234"; - repo = pname; + repo = "cliscord"; rev = "d62317d55c07ece8c9d042dcd74b62e58c9bfaeb"; hash = "sha256-dmR49yyErahOUxR9pGW1oYy8Wq5SWOprK317u+JPBv4="; }; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; - useFetchCargoVendor = true; cargoHash = "sha256-bJA+vqbhXeygIAg9HWom3xSuPpJgJY5FLb8UMBjrh7U="; - meta = with lib; { + meta = { description = "Simple command-line tool to send text and files to discord"; homepage = "https://github.com/somebody1234/cliscord"; - license = licenses.mit; - maintainers = with maintainers; [ lom ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lom ]; mainProgram = "cliscord"; }; } diff --git a/pkgs/by-name/cl/clock-rs/package.nix b/pkgs/by-name/cl/clock-rs/package.nix index dc657cba17c9..b6047daa75d7 100644 --- a/pkgs/by-name/cl/clock-rs/package.nix +++ b/pkgs/by-name/cl/clock-rs/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "clock-rs"; - version = "0.1.214"; + version = "0.1.215"; src = fetchFromGitHub { owner = "Oughie"; repo = "clock-rs"; tag = "v${version}"; - sha256 = "sha256-D0Wywl20TFIy8aQ9UkcI6T+5huyRuCCPc+jTeXsZd8g="; + sha256 = "sha256-uDEvJqaaBNRxohYqHE6qfqUF07ynRvGwJKWbYfgPEvg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-W4m4JffqNwebGWYNsMF6U0bDroqXJAixmcmqcqYjyzw="; + cargoHash = "sha256-Zry6mkOUdEgC95Y3U3RCXPJUsmaSoRPlHvUThI92GQU="; meta = { description = "Modern, digital clock that effortlessly runs in your terminal"; diff --git a/pkgs/by-name/cl/clockify/package.nix b/pkgs/by-name/cl/clockify/package.nix index 6441c4bbc202..d25c393bc3a0 100644 --- a/pkgs/by-name/cl/clockify/package.nix +++ b/pkgs/by-name/cl/clockify/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "clockify"; - version = "2.2.9.2224"; + version = "2.3.2.2633"; src = fetchurl { - url = "https://web.archive.org/web/20241218115559/https://clockify.me/downloads/Clockify_Setup.AppImage"; - hash = "sha256-/L70C+sTFJPzXkt1NSak2wVTRtFy2zInIlmLPG5LqeY="; + url = "https://web.archive.org/web/20250419021523/https://clockify.me/downloads/Clockify_Setup.AppImage"; + hash = "sha256-cQP1QkF2uWGsCjYjVdxPFLL8atAjT6rPQbPqeNX0QqQ="; }; extraInstallCommands = diff --git a/pkgs/by-name/cl/clojure-lsp/package.nix b/pkgs/by-name/cl/clojure-lsp/package.nix index e9ed88881c7b..695ada8c5491 100644 --- a/pkgs/by-name/cl/clojure-lsp/package.nix +++ b/pkgs/by-name/cl/clojure-lsp/package.nix @@ -10,18 +10,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2025.03.07-17.42.36"; + version = "2025.03.27-20.21.36"; src = fetchFromGitHub { owner = "clojure-lsp"; repo = "clojure-lsp"; rev = version; - hash = "sha256-3CKY3t2NWGAQNWYhmyiq3IJDMp81Q0LDCrS23XJeIys="; + hash = "sha256-xS/WVTJFCdktYxBvey855PW5Heqlx4EhpDAMHQ5Bj5M="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - hash = "sha256-ZxUSIHUTJW2TtRZiESKAnuBOS7s2UwzqpTTgAxjkR7Q="; + hash = "sha256-g8jX+41gojvoJHV/xMcP+4ROc9LewCUTuDTQcpHQ6+E="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix index 089e3d9d4e4e..f1e211b01386 100644 --- a/pkgs/by-name/cl/clorinde/package.nix +++ b/pkgs/by-name/cl/clorinde/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "clorinde"; - version = "0.14.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "halcyonnouveau"; repo = "clorinde"; tag = "clorinde-v${finalAttrs.version}"; - hash = "sha256-dMTYYvxqy3ev6TSOyOer23twmtT7g7ZOh2vFD67wy9c="; + hash = "sha256-ZCD8unHHA1yFKlmAaQw9zlJWAecu+j3/fwlp/ro2IFc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-lJqg20NVZHTOsQplg6vsB4pa2ltsFBFBs//YkOkfBm4="; + cargoHash = "sha256-V69c/Ks9qNmwqH4IV0uNDRc2eH7HMHpupE3liZofJhA="; cargoBuildFlags = [ "--package=clorinde" ]; diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix index bfaf3e536471..442a83cf3e26 100644 --- a/pkgs/by-name/cl/cloud-hypervisor/package.nix +++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix @@ -57,6 +57,7 @@ rustPlatform.buildRustPackage rec { ]; platforms = [ "aarch64-linux" + "riscv64-linux" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/cl/cloudflare-utils/package.nix b/pkgs/by-name/cl/cloudflare-utils/package.nix index d1f35537098c..80de794035a6 100644 --- a/pkgs/by-name/cl/cloudflare-utils/package.nix +++ b/pkgs/by-name/cl/cloudflare-utils/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "cloudflare-utils"; - version = "1.3.5"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Cyb3r-Jak3"; repo = "cloudflare-utils"; rev = "v${version}"; - hash = "sha256-LbqH48ysOp2s+e+52doHIyaxUbzzCdJqhdvLuIJ3CCc="; + hash = "sha256-/vausJEe5g6Txgq1z7oUUku0w6sd/mmYcZQ8D7dZ03E="; }; - vendorHash = "sha256-fg2BJkXdCWAO83kMoxkHlEyZuVezu9rs0hEda17KObE="; + vendorHash = "sha256-/kbXAljCe07dC/jL4RMeN8tKXhSPMxXY33CqBDySA8w="; meta = { description = "Helpful Cloudflare utility program"; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/by-name/cl/cloudflared/package.nix similarity index 100% rename from pkgs/applications/networking/cloudflared/default.nix rename to pkgs/by-name/cl/cloudflared/package.nix diff --git a/pkgs/applications/networking/cloudflared/tests.nix b/pkgs/by-name/cl/cloudflared/tests.nix similarity index 100% rename from pkgs/applications/networking/cloudflared/tests.nix rename to pkgs/by-name/cl/cloudflared/tests.nix diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 281570d99ab1..67fad206fe40 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -29,13 +29,11 @@ useSharedLibraries ? (!isMinimalBuild && !stdenv.hostPlatform.isCygwin), uiToolkits ? [ ], # can contain "ncurses" and/or "qt5" buildDocs ? !(isMinimalBuild || (uiToolkits == [ ])), - darwin, libsForQt5, gitUpdater, }: let - inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; inherit (libsForQt5) qtbase wrapQtAppsHook; cursesUI = lib.elem "ncurses" uiToolkits; qt5UI = lib.elem "qt5" uiToolkits; @@ -117,9 +115,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional useOpenSSL openssl ++ lib.optional cursesUI ncurses - ++ lib.optional qt5UI qtbase - ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices - ++ lib.optional (stdenv.hostPlatform.isDarwin && !isMinimalBuild) SystemConfiguration; + ++ lib.optional qt5UI qtbase; preConfigure = '' fixCmakeFiles . diff --git a/pkgs/by-name/cm/cminpack/package.nix b/pkgs/by-name/cm/cminpack/package.nix index 08f5ea016148..7d2b48cd3d13 100644 --- a/pkgs/by-name/cm/cminpack/package.nix +++ b/pkgs/by-name/cm/cminpack/package.nix @@ -2,7 +2,6 @@ lib, stdenv, cmake, - darwin, fetchFromGitHub, withBlas ? true, blas, @@ -25,15 +24,9 @@ stdenv.mkDerivation rec { cmake ]; - buildInputs = - lib.optionals withBlas [ - blas - ] - ++ lib.optionals (withBlas && stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk.frameworks.Accelerate - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.CoreVideo - ]; + buildInputs = lib.optionals withBlas [ + blas + ]; cmakeFlags = [ "-DUSE_BLAS=${if withBlas then "ON" else "OFF"}" diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index caa454547a5f..1011182dd86b 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.48.0"; + version = "11.49.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; tag = "v${version}"; - hash = "sha256-d+TWg4T4p0QbLoUco88GIgnHfRpyealSasEzYf1YlXk="; + hash = "sha256-e/tD/yo7tV2JkQER1KW9qO9YIo2TQR3jt8uYup/wEt4="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-w8xc1lGJkDMwjyVKdUlGfhn7DXlJJnqbOUfFg1Z9qC8="; + vendorHash = "sha256-M3pRUXAwXgdWLaEMXRd6hkH4Z2hh4z38SzO6BeOzjeo="; ldflags = [ "-w" diff --git a/pkgs/by-name/co/cobalt/package.nix b/pkgs/by-name/co/cobalt/package.nix index fc3e31e941e6..c347159e9f7d 100644 --- a/pkgs/by-name/co/cobalt/package.nix +++ b/pkgs/by-name/co/cobalt/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cobalt"; - version = "0.19.9"; + version = "0.20.0"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-T88XyrMVCLfhsz3RWD85ErHxAmuTXprOAiS5B8GkH9s="; + hash = "sha256-6WbJjPz+1KX04xMCiylJZiAPjF6jKPTPz7rObgFF4dY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-0BJAbxBbw6wfnDcZkOic13iuWTBEslJ2mQ9nfq+/RXc="; + cargoHash = "sha256-Y9+zJ89XrVk3mZD1s9N7oaXvcBP5RNjp3hMjX1Wz3HA="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/co/cobang/package.nix b/pkgs/by-name/co/cobang/package.nix index dac40f8c7851..c14daf4907ae 100644 --- a/pkgs/by-name/co/cobang/package.nix +++ b/pkgs/by-name/co/cobang/package.nix @@ -1,89 +1,76 @@ { lib, python3Packages, + blueprint-compiler, + desktop-file-utils, fetchFromGitHub, gst_all_1, gobject-introspection, - gtk3, - libhandy, - librsvg, + libadwaita, + libportal-gtk4, + meson, networkmanager, - wrapGAppsHook3, + ninja, + pipewire, + pkg-config, + wrapGAppsHook4, }: python3Packages.buildPythonApplication rec { pname = "cobang"; - version = "0.15.0"; - pyproject = true; + version = "1.6.1"; + pyproject = false; # Built with meson src = fetchFromGitHub { owner = "hongquan"; repo = "CoBang"; tag = "v${version}"; - hash = "sha256-ozHmGpRx+Ts6yrDXwm4OHXTArunQbJOlA/7zJvRNQio="; + hash = "sha256-/0EfE4ZVfDFEbPel/g69sFqsBPMJ4pE9Fqz4t3o7jtY="; }; + # https://github.com/hongquan/CoBang/issues/117 postPatch = '' - # Fixes "Multiple top-level packages discovered in a flat-layout" - sed -i '$ a\[tool.setuptools]' pyproject.toml - sed -i '$ a\packages = ["cobang"]' pyproject.toml + substituteInPlace src/window.blp \ + --replace-fail 'seeing-symbolic' 'scanner-symbolic' ''; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = [ + blueprint-compiler + desktop-file-utils # Needed to recognize gobject namespaces gobject-introspection - wrapGAppsHook3 - setuptools + meson + ninja + pkg-config + wrapGAppsHook4 ]; - buildInputs = with python3Packages; [ + buildInputs = [ + gst_all_1.gst-plugins-base # Requires v4l2src (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) - # For gobject namespaces - libhandy + # gtk4paintablesink + gst_all_1.gst-plugins-rs + libadwaita + libportal-gtk4 networkmanager + pipewire ]; dependencies = with python3Packages; [ - brotlicffi - kiss-headers logbook - pillow - requests - single-version - # Unlisted dependencies - pygobject3 - python-zbar # Needed as a gobject namespace and to fix 'Caps' object is not subscriptable gst-python - ]; - - nativeCheckInputs = with python3Packages; [ - pytestCheckHook - ]; - - pythonRelaxDeps = [ - "Pillow" + pillow + pygobject3 + python-zbar ]; # Wrapping this manually for SVG recognition dontWrapGApps = true; - postInstall = '' - # Needed by the application - cp -R data $out/${python3Packages.python.sitePackages}/ - - # Icons and applications - install -Dm 644 $out/${python3Packages.python.sitePackages}/data/vn.hoabinh.quan.CoBang.svg -t $out/share/pixmaps/ - install -Dm 644 $out/${python3Packages.python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop.in -t $out/share/applications/ - mv $out/${python3Packages.python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop{.in,} - ''; - preFixup = '' - wrapProgram $out/bin/cobang \ - ''${gappsWrapperArgs[@]} \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; meta = { diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index b71bd6670dd4..0f0fc1a79759 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -14,7 +14,9 @@ git, glib, glib-networking, + gnused, gnutls, + iproute2, json-glib, krb5, libssh, @@ -33,6 +35,7 @@ systemd, udev, xmlto, + which, }: stdenv.mkDerivation (finalAttrs: { @@ -63,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.setuptools systemd xmlto + which ]; buildInputs = [ @@ -93,6 +97,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/common/cockpitconf.c \ --replace-fail 'const char *cockpit_config_dirs[] = { PACKAGE_SYSCONF_DIR' 'const char *cockpit_config_dirs[] = { "/etc"' + substituteInPlace src/**/*.c \ + --replace '"/bin/sh"' "\"$(which sh)\"" + # instruct users with problems to create a nixpkgs issue instead of nagging upstream directly substituteInPlace configure.ac \ --replace-fail 'devel@lists.cockpit-project.org' 'https://github.com/NixOS/nixpkgs/issues/new?assignees=&labels=0.kind%3A+bug&template=bug_report.md&title=cockpit%25' @@ -165,8 +172,21 @@ stdenv.mkDerivation (finalAttrs: { } \ --run 'cd $(mktemp -d)' - wrapProgram $out/bin/cockpit-bridge \ - --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages} + for binary in $out/bin/cockpit-bridge $out/libexec/cockpit-askpass; do + chmod +x $binary + wrapProgram $binary \ + --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages} + done + + patchShebangs $out/share/cockpit/issue/update-issue + wrapProgram $out/share/cockpit/issue/update-issue \ + --prefix PATH : ${ + lib.makeBinPath [ + iproute2 + gnused + ] + } + substituteInPlace $out/${python3Packages.python.sitePackages}/cockpit/_vendor/systemd_ctypes/libsystemd.py \ --replace-warn libsystemd.so.0 ${systemd}/lib/libsystemd.so.0 diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 352f1327910a..20003e3e6afe 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -48,26 +48,26 @@ }: let pname = "cursor"; - version = "0.48.8"; + version = "0.48.9"; inherit (stdenvNoCC) hostPlatform; sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/production/7801a556824585b7f2721900066bc87c4a09b743/linux/x64/Cursor-0.48.8-x86_64.AppImage"; - hash = "sha256-/5mwElzN0uURppWCLYPPECs6GzXtB54v2+jQD1RHcJE="; + url = "https://downloads.cursor.com/production/61e99179e4080fecf9d8b92c6e2e3e00fbfb53f4/linux/x64/Cursor-0.48.9-x86_64.AppImage"; + hash = "sha256-Rw96CIN+vL1bIj5o68gWkHeiqgxExzbjwcW4ad10M2I="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/production/7801a556824585b7f2721900066bc87c4a09b743/linux/arm64/Cursor-0.48.8-aarch64.AppImage"; - hash = "sha256-OXGUjTNwc0VZ8Q7arMyhfhN/bPTOCYS9Bfi1I4TJCXY="; + url = "https://downloads.cursor.com/production/61e99179e4080fecf9d8b92c6e2e3e00fbfb53f4/linux/arm64/Cursor-0.48.9-aarch64.AppImage"; + hash = "sha256-RMDYoQSIO0jukhC5j1TjpwCcK0tEnvoVpXbFOxp/K8o="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/7801a556824585b7f2721900066bc87c4a09b743/darwin/x64/Cursor-darwin-x64.dmg"; - hash = "sha256-uLKOjo4aYK0r69a0jFevzE4bJJ0mqg0pJEPYdtlo8tU="; + url = "https://downloads.cursor.com/production/61e99179e4080fecf9d8b92c6e2e3e00fbfb53f4/darwin/x64/Cursor-darwin-x64.dmg"; + hash = "sha256-172BGNNVvpZhk99rQN19tTsxvRADjmtEzgkZazke/v4="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/7801a556824585b7f2721900066bc87c4a09b743/darwin/arm64/Cursor-darwin-arm64.dmg"; - hash = "sha256-xSmBSK9pum6RlvXnyhNA1HM6Y88R2bRASJkLTHfxzMY="; + url = "https://downloads.cursor.com/production/61e99179e4080fecf9d8b92c6e2e3e00fbfb53f4/darwin/arm64/Cursor-darwin-arm64.dmg"; + hash = "sha256-IQ4UZwEBVGMaGUrNVHWxSRjbw8qhLjOJ2KYc9Y26LZU="; }; }; diff --git a/pkgs/by-name/co/code2prompt/package.nix b/pkgs/by-name/co/code2prompt/package.nix index 03c5e6e7b0a8..4170d25e5e63 100644 --- a/pkgs/by-name/co/code2prompt/package.nix +++ b/pkgs/by-name/co/code2prompt/package.nix @@ -4,8 +4,6 @@ rustPlatform, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,12 +28,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.AppKit - ]; + buildInputs = [ openssl ]; meta = { description = "A CLI tool that converts your codebase into a single LLM prompt with a source tree, prompt templating, and token counting"; diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index c95d906d22c9..dea953494d25 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchFromGitea, installShellFiles, lib, @@ -27,18 +26,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - let - d = darwin.apple_sdk.frameworks; - in - [ - d.CoreServices - d.Security - d.SystemConfiguration - ] - ); + buildInputs = [ openssl ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd berg \ diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix new file mode 100644 index 000000000000..cb03a2915dc3 --- /dev/null +++ b/pkgs/by-name/co/codebook/package.nix @@ -0,0 +1,50 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + openssl, + pkg-config, + rustPlatform, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "codebook"; + version = "0.2.10"; + + src = fetchFromGitHub { + owner = "blopker"; + repo = "codebook"; + tag = "v${finalAttrs.version}"; + hash = "sha256-LH5/xMbmHo0vBlPnNTsj3iX6gvBp9PFGZcAy999402E="; + }; + + buildAndTestSubdir = "crates/codebook-lsp"; + cargoHash = "sha256-EbcG99T0T5Hh7bRI5I3gf9qBiOcnl0EoCtVIfcJHeJg="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + env.OPENSSL_NO_VENDOR = 1; + + # Integration tests require internet access for dictionaries + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Unholy spellchecker for code"; + homepage = "https://github.com/blopker/codebook"; + changelog = "https://github.com/blopker/codebook/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + jpds + ]; + mainProgram = "codebook-lsp"; + platforms = with lib.platforms; unix ++ windows; + }; +}) diff --git a/pkgs/by-name/co/codechecker/package.nix b/pkgs/by-name/co/codechecker/package.nix index c39f58b3a783..110f262805ca 100644 --- a/pkgs/by-name/co/codechecker/package.nix +++ b/pkgs/by-name/co/codechecker/package.nix @@ -123,5 +123,6 @@ python3Packages.buildPythonApplication rec { felixsinger ]; mainProgram = "CodeChecker"; + platforms = platforms.darwin ++ platforms.linux; }; } diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix index d61ac2cf6ace..b095c213e35b 100644 --- a/pkgs/by-name/co/codeql/package.nix +++ b/pkgs/by-name/co/codeql/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.20.7"; + version = "2.21.0"; dontConfigure = true; dontBuild = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-PYTKW+zfmOuJr5BClB3JQKeuZH986uct0m4WyDTxxnQ="; + hash = "sha256-pYNjb7jvYNgL6H+jhH1eviwk67JCDt1S5F2yxRaAO6g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/coder/update.sh b/pkgs/by-name/co/coder/update.sh index 60e9a97af221..6c12ef73b191 100755 --- a/pkgs/by-name/co/coder/update.sh +++ b/pkgs/by-name/co/coder/update.sh @@ -23,7 +23,7 @@ update_version_and_hashes() { # Update version number, using '#' as delimiter sed -i "/${channel} = {/,/};/{ s#^\(\s*\)version = .*#\1version = \"$version\";# - }" ./default.nix + }" ./package.nix # Update hashes for each architecture for ARCH in "${!ARCHS[@]}"; do @@ -37,7 +37,7 @@ update_version_and_hashes() { # Update the Nix file with the new hash, using '#' as delimiter and preserving indentation sed -i "/${channel} = {/,/};/{ s#^\(\s*\)${ARCH} = .*#\1${ARCH} = \"${SRI_HASH}\";# - }" ./default.nix + }" ./package.nix done } diff --git a/pkgs/by-name/co/codesnap/package.nix b/pkgs/by-name/co/codesnap/package.nix index 8cfa02716dc4..ae7e891e928b 100644 --- a/pkgs/by-name/co/codesnap/package.nix +++ b/pkgs/by-name/co/codesnap/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { pname = "codesnap"; - version = "0.10.7"; + version = "0.10.8"; src = fetchFromGitHub { owner = "mistricky"; repo = "CodeSnap"; tag = "v${version}"; - hash = "sha256-gDV66eLHcg7OuVR0Wo5x3anqKjnS/BsCCVaR6VOnM+s="; + hash = "sha256-7miAizBKhUM1KGV+WKuOE3ENTsgSvwNtprvcs1R6ivU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bQT+tpoSZ54yppyNJxbOEqQoIKqYZAnRo0j42Ti+EJo="; + cargoHash = "sha256-UDP4nlGF5GnNQdFo4aIYlgCn0HU+bNtJjEjcaO2f/U4="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix new file mode 100644 index 000000000000..2f35a543ccd3 --- /dev/null +++ b/pkgs/by-name/co/codex/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + versionCheckHook, +}: + +buildNpmPackage rec { + pname = "codex"; + version = "0.1.2504161510"; # from codex-cli/package.json + + src = fetchFromGitHub { + owner = "openai"; + repo = "codex"; + rev = "b0ccca555685b1534a0028cb7bfdcad8fe2e477a"; + hash = "sha256-WTnP6HZfrMjUoUZL635cngpfvvjrA2Zvm74T2627GwA="; + }; + + sourceRoot = "${src.name}/codex-cli"; + + npmDepsHash = "sha256-riVXC7T9zgUBUazH5Wq7+MjU1FepLkp9kHLSq+ZVqbs="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = { + description = "Lightweight coding agent that runs in your terminal"; + homepage = "https://github.com/openai/codex"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.malo ]; + mainProgram = "codex"; + }; +} diff --git a/pkgs/by-name/co/codipack/package.nix b/pkgs/by-name/co/codipack/package.nix index 73fffb6c9935..3f1a717a507c 100644 --- a/pkgs/by-name/co/codipack/package.nix +++ b/pkgs/by-name/co/codipack/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "codipack"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "SciCompKL"; repo = "CoDiPack"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZD9P4yWcF9zGeTyw6ENAcGoPyc8QcBdNZNnqRV4MH8s="; + hash = "sha256-feYtPDV0t7b49NIL5s6ZoBttRG2Bkwc0gOX6R6xDIbs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/coinlive/package.nix b/pkgs/by-name/co/coinlive/package.nix index f8c073ab8ce9..26d3d9eb6ba8 100644 --- a/pkgs/by-name/co/coinlive/package.nix +++ b/pkgs/by-name/co/coinlive/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, openssl, pkg-config, @@ -25,13 +23,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/co/commonsBcel/package.nix b/pkgs/by-name/co/commonsBcel/package.nix index 3be849e9332e..68f15b6bdd7b 100644 --- a/pkgs/by-name/co/commonsBcel/package.nix +++ b/pkgs/by-name/co/commonsBcel/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-bcel/"; description = "Gives users a convenient way to analyze, create, and manipulate (binary) Java class files"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/pkgs/by-name/co/commonsCompress/package.nix b/pkgs/by-name/co/commonsCompress/package.nix index 73ca1feda9b8..eba0861bb8bb 100644 --- a/pkgs/by-name/co/commonsCompress/package.nix +++ b/pkgs/by-name/co/commonsCompress/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-compress"; description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files"; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/co/commonsFileUpload/package.nix b/pkgs/by-name/co/commonsFileUpload/package.nix index e21b8078c2a2..506ebdc09124 100644 --- a/pkgs/by-name/co/commonsFileUpload/package.nix +++ b/pkgs/by-name/co/commonsFileUpload/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-fileupload"; description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications"; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/co/commonsIo/package.nix b/pkgs/by-name/co/commonsIo/package.nix index 92156099c103..022887316b5f 100644 --- a/pkgs/by-name/co/commonsIo/package.nix +++ b/pkgs/by-name/co/commonsIo/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-io"; description = "Library of utilities to assist with developing IO functionality"; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/co/commonsLang/package.nix b/pkgs/by-name/co/commonsLang/package.nix index 44850f72f064..a3077e666774 100644 --- a/pkgs/by-name/co/commonsLang/package.nix +++ b/pkgs/by-name/co/commonsLang/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Provides additional methods to manipulate standard Java library classes"; homepage = "https://commons.apache.org/proper/commons-lang"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; platforms = with lib.platforms; unix; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; diff --git a/pkgs/by-name/co/commonsMath/package.nix b/pkgs/by-name/co/commonsMath/package.nix index 0353b1dc682b..6254ce20ce4d 100644 --- a/pkgs/by-name/co/commonsMath/package.nix +++ b/pkgs/by-name/co/commonsMath/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-math/"; description = "Library of lightweight, self-contained mathematics and statistics components"; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/co/conceal/package.nix b/pkgs/by-name/co/conceal/package.nix index 37c276d22096..866eb72c001c 100644 --- a/pkgs/by-name/co/conceal/package.nix +++ b/pkgs/by-name/co/conceal/package.nix @@ -8,19 +8,21 @@ conceal, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "conceal"; - version = "0.5.5"; + version = "0.6.1"; src = fetchFromGitHub { owner = "TD-Sky"; repo = "conceal"; - rev = "v${version}"; - sha256 = "sha256-BYLDSRgBba6SoGsL/NTV/OTG1/V9RSr8lisj42JqBRM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-kgJcxckXfwnKZ3MyJ+GE1LiQmu9YdfqFrtL9gBJ330E="; }; useFetchCargoVendor = true; - cargoHash = "sha256-yCHN7N+hRrWfuCEBA6gh2S/rRP+ZkHCjFBGGY9/LTb4="; + cargoHash = "sha256-Ym/HnUOLIKfCFWgusx92QeQYaNp9tfrhg5V1h02q3e0="; + + env.CONCEAL_GEN_COMPLETIONS = "true"; nativeBuildInputs = [ installShellFiles ]; @@ -36,17 +38,17 @@ rustPlatform.buildRustPackage rec { passthru.tests = testers.testVersion { package = conceal; command = "conceal --version"; - version = "conceal ${version}"; + version = "conceal ${finalAttrs.version}"; }; - meta = with lib; { + meta = { description = "Trash collector written in Rust"; homepage = "https://github.com/TD-Sky/conceal"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jedsek kashw2 ]; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/co/conserve/package.nix b/pkgs/by-name/co/conserve/package.nix index 2095e4091881..831fc448615b 100644 --- a/pkgs/by-name/co/conserve/package.nix +++ b/pkgs/by-name/co/conserve/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-r14ApN9kGWIyeNlbqrb+vOvvmH2n+O5ovvtSVNTMASo="; - buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk.frameworks.Security - ]; - checkFlags = [ # expected to panic if unix user has no secondary group, # which is the case in the nix sandbox diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix index 2a56fd2830a7..81ca074ff9cb 100644 --- a/pkgs/by-name/co/convco/package.nix +++ b/pkgs/by-name/co/convco/package.nix @@ -7,7 +7,6 @@ libiconv, openssl, pkg-config, - darwin, }: rustPlatform.buildRustPackage rec { @@ -33,7 +32,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security ]; checkFlags = [ diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index a45cbf962503..5f873a8fdd61 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -1,12 +1,10 @@ { lib, - stdenv, fetchFromGitHub, buildNpmPackage, rustPlatform, pkg-config, openssl, - darwin, }: rustPlatform.buildRustPackage rec { pname = "cook-cli"; @@ -29,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; postPatch = '' rm -rf "ui/public" diff --git a/pkgs/by-name/co/copier/package.nix b/pkgs/by-name/co/copier/package.nix index cceaf852271c..80e24c2f99b1 100644 --- a/pkgs/by-name/co/copier/package.nix +++ b/pkgs/by-name/co/copier/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "copier"; - version = "9.4.1"; + version = "9.6.0"; pyproject = true; src = fetchFromGitHub { @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { postFetch = '' rm $out/tests/demo/doc/ma*ana.txt ''; - hash = "sha256-bNz3xFYksgdN9iXbkZIHWsHpRa9aICxBZmzy/t0+3z0="; + hash = "sha256-mezmXrOvfqbZGZadNZklQZt/OEKqRYnwugNkZc88t6o="; }; POETRY_DYNAMIC_VERSIONING_BYPASS = version; @@ -49,16 +49,14 @@ python3.pkgs.buildPythonApplication rec { questionary ]; - makeWrapperArgs = [ - "--suffix PATH : ${lib.makeBinPath [ git ]}" - ]; + makeWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ git ]}" ]; - meta = with lib; { + meta = { description = "Library and command-line utility for rendering projects templates"; homepage = "https://copier.readthedocs.io"; changelog = "https://github.com/copier-org/copier/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ greg ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ greg ]; mainProgram = "copier"; }; } diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index f03224ab18f4..7cdc2a195941 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -45,11 +45,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.294.0"; + version = "1.304.0"; src = fetchzip { url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-native-${finalAttrs.version}.zip"; - hash = "sha256-8nB8vlrSy+949HiJRCa9yFqu/GAaluFH1VzE63AUUs8="; + hash = "sha256-F0urL3bMlNcxHTrePYsagEx2664C7USYAcnhCCzB/rA="; stripRoot = false; }; diff --git a/pkgs/by-name/co/copycat/package.nix b/pkgs/by-name/co/copycat/package.nix index 7569bdb81082..f088947528c2 100644 --- a/pkgs/by-name/co/copycat/package.nix +++ b/pkgs/by-name/co/copycat/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-gjFVvP2h+HJdDdNVtqTT1E1s4ZYXfWuhtMBRJkWRcDw="; - buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk_11_0.frameworks.AppKit - ]; - meta = { description = "Utility to copy project tree contents to clipboard"; homepage = "https://github.com/DeeKahy/CopyCat"; diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix index cb8f3ec9840f..9873b60cea3d 100644 --- a/pkgs/by-name/co/coroot-node-agent/package.nix +++ b/pkgs/by-name/co/coroot-node-agent/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "coroot-node-agent"; - version = "1.23.16"; + version = "1.23.17"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot-node-agent"; rev = "v${version}"; - hash = "sha256-gd43AL8fnRU7zvQj5GEqX5sbX8JxISXdNfKbzx1eJuE="; + hash = "sha256-IHOS0Xh0JAWC4NvRbpTQZJ+Se5YjtT+D2gK0w1YaprY="; }; - vendorHash = "sha256-czrw7KnBRdoY/SuiZznhViUN9C+BYjH8difcQPFIHU8="; + vendorHash = "sha256-dX/hUWuHn5qV/wOyaaA+hnL6pp1OJ6Bw4W/UY8u1UZc="; buildInputs = [ systemdLibs ]; diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix index dc170735861e..4f210041fac1 100644 --- a/pkgs/by-name/co/coroot/package.nix +++ b/pkgs/by-name/co/coroot/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "coroot"; - version = "1.9.10"; + version = "1.10.1"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot"; rev = "v${version}"; - hash = "sha256-7ylShJhf1ZUK3JM8yV0WlSdJ3b/IOq4iq5+4pjdIGOw="; + hash = "sha256-3HSILiqgmEm/ZzyvhNspnAuHGw/CyyeYd9f561bZjF4="; }; - vendorHash = "sha256-wyxNT8g5TUCjlxauL7NmCf4HZ91V2nD64L1L/rYH864="; + vendorHash = "sha256-1yKb8CuNcwpHWC0eDIs2Ml3H7xGYaTCGxyrtuyLvd8c="; npmDeps = fetchNpmDeps { src = "${src}/front"; hash = "sha256-inZV+iv837+7ntBae/oLSNLxpzoqEcJNPNdBE+osJHQ="; diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index b98edd71f986..37182f07f3a2 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -4,15 +4,10 @@ fetchFromGitHub, rustPlatform, just, + libcosmicAppHook, which, - pkg-config, - makeBinaryWrapper, - libxkbcommon, - wayland, - appstream-glib, - desktop-file-utils, - intltool, nixosTests, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -29,25 +24,15 @@ rustPlatform.buildRustPackage (finalAttrs: { useFetchCargoVendor = true; cargoHash = "sha256-utip7E8NST88mPaKppkuOcdW+QkFoRqWy3a2McvMHo8="; - postPatch = '' - substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" - ''; - nativeBuildInputs = [ just which - pkg-config - makeBinaryWrapper - ]; - buildInputs = [ - libxkbcommon - wayland - appstream-glib - desktop-file-utils - intltool + libcosmicAppHook ]; dontUseJustBuild = true; + # Runs the default checkPhase instead + dontUseJustCheck = true; justFlags = [ "--set" @@ -58,26 +43,32 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-notifications" ]; - postInstall = '' - wrapProgram $out/bin/cosmic-notifications \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wayland ]}" - ''; + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; - passthru.tests = { - inherit (nixosTests) - cosmic - cosmic-autologin - cosmic-noxwayland - cosmic-autologin-noxwayland - ; + updateScript = nix-update-script { + extraArgs = [ + "--version" + "unstable" + "--version-regex" + "epoch-(.*)" + ]; + }; }; - meta = with lib; { + meta = { homepage = "https://github.com/pop-os/cosmic-notifications"; description = "Notifications for the COSMIC Desktop Environment"; mainProgram = "cosmic-notifications"; - license = licenses.gpl3Only; - maintainers = teams.cosmic.members; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.cosmic.members; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix index fbfe4c5fe5ee..7a01b5746413 100644 --- a/pkgs/by-name/co/cosmic-protocols/package.nix +++ b/pkgs/by-name/co/cosmic-protocols/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "cosmic-protocols"; - version = "0-unstable-2025-03-21"; + version = "0-unstable-2025-04-14"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-protocols"; - rev = "ee0d46f4b7e1508011a98225f14c4a0528ab2914"; - hash = "sha256-oD9BYWX0uPpdsOYAyFq/pI6zxM0SfEb8lq9QA2yrBZY="; + rev = "67df697105486fa4c9dd6ce00889c8b0526c9bb4"; + hash = "sha256-rogV5BTloAatfinrgl7I6hakybLkPRKhnwlILBGKkQU="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index 5174eaa5a661..c37320999138 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, rustPlatform, cmake, just, @@ -36,6 +37,14 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-UKg3TIpyaqtynk6wLFFPpv69F74hmqfMVPra2+iFbvE="; }; + patches = [ + # TODO: This is merged and will be included in the 7th Alpha release, remove it then. + (fetchpatch { + url = "https://github.com/pop-os/cosmic-settings/commit/2e2898b31fabcb3f3b561e6c4cea2aca9de9b284.patch"; + hash = "sha256-ZGJlGmR6lZB697uQ+ZsjvisNbPKBlBdRK/Ti541ZdlE="; + }) + ]; + useFetchCargoVendor = true; cargoHash = "sha256-mf/Cw3/RLrCYgsk7JKCU2+oPn1VPbD+4JzkUmbd47m8="; diff --git a/pkgs/by-name/co/cotp/package.nix b/pkgs/by-name/co/cotp/package.nix index 69535aef9427..6b41c6d5496f 100644 --- a/pkgs/by-name/co/cotp/package.nix +++ b/pkgs/by-name/co/cotp/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "cotp"; - version = "1.9.2"; + version = "1.9.4"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-5wVIjh16AYwrzjbPgvjsQhihu/vwdQfzU2kZS6eSTWs="; + hash = "sha256-O9qss8vxsGyBWaCTt3trjnFVol5ib/G7IZIj742A/XI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-6VdlXQymOFZgMksGRQ7f9ZGrzKblYlQAoBFUhi4wuM0="; + cargoHash = "sha256-Y8kGOeDKjdG+5zuA1mDx4h5IbKETjZU+SiFWiUv3xkw="; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; diff --git a/pkgs/by-name/cp/cpp-utilities/package.nix b/pkgs/by-name/cp/cpp-utilities/package.nix index add68cdfa169..a542b899ec27 100644 --- a/pkgs/by-name/cp/cpp-utilities/package.nix +++ b/pkgs/by-name/cp/cpp-utilities/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.28.0"; + version = "5.28.1"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-EdqM7RsvJzMQWtwqnohbC5JJRVZJYgpTLJW1rPmTB4s="; + sha256 = "sha256-+VbVVRtOKNjJNQYU/QOU5hfARxHicsQQgm2TH5y8qx8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cp/cpuid/package.nix b/pkgs/by-name/cp/cpuid/package.nix index e656212991f9..0278b1cc9f9a 100644 --- a/pkgs/by-name/cp/cpuid/package.nix +++ b/pkgs/by-name/cp/cpuid/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20241023"; + version = "20250419"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-/HdDWo1dKzVRcTMB6M24PmKjz+3IQTKw7JsbteUkT9w="; + sha256 = "sha256-Mcz8A/k92ISKZ5jydPoDeR9cO/uxp2f+IIamnONyess="; }; # For pod2man during the build process. diff --git a/pkgs/by-name/cr/crabfit-api/package.nix b/pkgs/by-name/cr/crabfit-api/package.nix index 7012a40ea5b2..abffd72bd555 100644 --- a/pkgs/by-name/cr/crabfit-api/package.nix +++ b/pkgs/by-name/cr/crabfit-api/package.nix @@ -8,8 +8,6 @@ protobuf, openssl, sqlite, - stdenv, - darwin, adaptor ? "sql", }: @@ -53,16 +51,10 @@ rustPlatform.buildRustPackage rec { protobuf ]; - buildInputs = - [ - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + sqlite + ]; buildFeatures = [ "${adaptor}-adaptor" ]; diff --git a/pkgs/by-name/cr/createrepo_c/package.nix b/pkgs/by-name/cr/createrepo_c/package.nix index dca06c3efc40..f81fb02fbb2b 100644 --- a/pkgs/by-name/cr/createrepo_c/package.nix +++ b/pkgs/by-name/cr/createrepo_c/package.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { homepage = "https://rpm-software-management.github.io/createrepo_c/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/cr/creek/build.zig.zon.nix b/pkgs/by-name/cr/creek/build.zig.zon.nix index 551c0489363f..557d54ac178c 100644 --- a/pkgs/by-name/cr/creek/build.zig.zon.nix +++ b/pkgs/by-name/cr/creek/build.zig.zon.nix @@ -1,110 +1,31 @@ -# generated by zon2nix (https://github.com/Cloudef/zig2nix) +# generated by zon2nix (https://github.com/nix-community/zon2nix) + { - lib, linkFarm, - fetchurl, + fetchzip, fetchgit, - runCommandLocal, - zig, - name ? "zig-packages", }: -let - unpackZigArtifact = - { - name, - artifact, - }: - runCommandLocal name { nativeBuildInputs = [ zig ]; } '' - hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})" - mv "$TMPDIR/p/$hash" "$out" - chmod 755 "$out" - ''; - fetchZig = - { - name, - url, - hash, - }: - let - artifact = fetchurl { inherit url hash; }; - in - unpackZigArtifact { inherit name artifact; }; - - fetchGitZig = - { - name, - url, - hash, - }: - let - parts = lib.splitString "#" url; - url_base = builtins.elemAt parts 0; - url_without_query = builtins.elemAt (lib.splitString "?" url_base) 0; - rev_base = builtins.elemAt parts 1; - rev = - if builtins.match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}"; - in - fetchgit { - inherit name rev hash; - url = url_without_query; - deepClone = false; - }; - - fetchZigArtifact = - { - name, - url, - hash, - }: - let - parts = lib.splitString "://" url; - proto = builtins.elemAt parts 0; - path = builtins.elemAt parts 1; - fetcher = { - "git+http" = fetchGitZig { - inherit name hash; - url = "http://${path}"; - }; - "git+https" = fetchGitZig { - inherit name hash; - url = "https://${path}"; - }; - http = fetchZig { - inherit name hash; - url = "http://${path}"; - }; - https = fetchZig { - inherit name hash; - url = "https://${path}"; - }; - }; - in - fetcher.${proto}; -in -linkFarm name [ +linkFarm "zig-packages" [ { - name = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56"; - path = fetchZigArtifact { - name = "zig-pixman"; - url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz"; - hash = "sha256-CYgFIOR9H5q8UUpFglaixOocCMT6FGpcKQQBUVWpDKQ="; + name = "fcft-2.0.0-zcx6C5EaAADIEaQzDg5D4UvFFMjSEwDE38vdE9xObeN9"; + path = fetchzip { + url = "https://git.sr.ht/~novakane/zig-fcft/archive/v2.0.0.tar.gz"; + hash = "sha256-qDEtiZNSkzN8jUSnZP/itqh8rMf+lakJy4xMB0I8sxQ="; }; } { - name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242"; - path = fetchZigArtifact { - name = "zig-wayland"; - url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz"; - hash = "sha256-gxzkHLCq2NqX3l4nEly92ARU5dqP1SqnjpGMDgx4TXA="; + name = "pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX"; + path = fetchzip { + url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.3.0.tar.gz"; + hash = "sha256-8tA4auo5FEI4IPnomV6bkpQHUe302tQtorFQZ1l14NU="; }; } { - name = "1220a4029ee3ee70d3175c69878e2b70dccd000c4324bc74ba800d8a143b7250fb38"; - path = fetchZigArtifact { - name = "zig-fcft"; - url = "https://git.sr.ht/~novakane/zig-fcft/archive/1.1.0.tar.gz"; - hash = "sha256-osL/zsXqa8tC/Qvzf0/wXeNCzw02F2viCo+d8Gh2S7U="; + name = "wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl"; + path = fetchzip { + url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.3.0.tar.gz"; + hash = "sha256-ydEavD9z20wRwn9ZVX56ZI2T5i1tnm3LupVxfa30o84="; }; } ] diff --git a/pkgs/by-name/cr/creek/package.nix b/pkgs/by-name/cr/creek/package.nix index c9971a1e6bad..e68f872896fa 100644 --- a/pkgs/by-name/cr/creek/package.nix +++ b/pkgs/by-name/cr/creek/package.nix @@ -1,7 +1,7 @@ { callPackage, lib, - zig_0_13, + zig_0_14, stdenv, fetchFromGitHub, fcft, @@ -12,43 +12,46 @@ wayland-protocols, }: let - zig = zig_0_13; + zig = zig_0_14; in stdenv.mkDerivation (finalAttrs: { pname = "creek"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "nmeum"; repo = "creek"; tag = "v${finalAttrs.version}"; - hash = "sha256-3Q690DEMgPqURTHKzJwH5iVyTLvgYqNpxuwAEV+/Lyw="; + hash = "sha256-5TANQt/VWafm6Lj4dYViiK0IMy/chGr/Gzq0S66HZqI="; }; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ zig.hook pkg-config - wayland wayland-scanner ]; buildInputs = [ fcft pixman + wayland wayland-protocols ]; - deps = callPackage ./build.zig.zon.nix { - inherit zig; - }; + deps = callPackage ./build.zig.zon.nix { }; zigBuildFlags = [ "--system" "${finalAttrs.deps}" ]; + passthru.updateScript = ./update.sh; + meta = { - homepage = "https://git.8pit.net/creek"; + homepage = "https://github.com/nmeum/creek"; + changelog = "https://github.com/nmeum/creek/releases/v${finalAttrs.version}"; description = "Malleable and minimalist status bar for the River compositor"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ alexandrutocar ]; diff --git a/pkgs/by-name/cr/creek/update.sh b/pkgs/by-name/cr/creek/update.sh new file mode 100755 index 000000000000..a346ab54c950 --- /dev/null +++ b/pkgs/by-name/cr/creek/update.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash common-updater-scripts gnused nixfmt-rfc-style + +latest_tag=$(list-git-tags --url=https://github.com/nmeum/creek | sed 's/^v//' | tail -n 1) + +update-source-version creek "$latest_tag" + +wget "https://raw.githubusercontent.com/nmeum/creek/v${latest_tag}/build.zig.zon" +nix --extra-experimental-features 'nix-command flakes' run github:nix-community/zon2nix# -- build.zig.zon >pkgs/by-name/cr/creek/build.zig.zon.nix + +nixfmt pkgs/by-name/cr/creek/build.zig.zon.nix + +rm -rf build.zig.zon diff --git a/pkgs/by-name/cr/criu/package.nix b/pkgs/by-name/cr/criu/package.nix index 728a1ad28939..a07fb3169214 100644 --- a/pkgs/by-name/cr/criu/package.nix +++ b/pkgs/by-name/cr/criu/package.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { asciidoc xmlto libpaper - libuuid docbook_xsl which makeWrapper @@ -64,6 +63,7 @@ stdenv.mkDerivation rec { libnet nftables libbsd + libuuid ]; propagatedBuildInputs = [ @@ -95,6 +95,7 @@ stdenv.mkDerivation rec { "powerpc" = "ppc64"; "s390" = "s390"; "mips" = "mips"; + "loongarch" = "loongarch64"; }; in [ @@ -146,6 +147,7 @@ stdenv.mkDerivation rec { "x86_64-linux" "aarch64-linux" "armv7l-linux" + "loongarch64-linux" ]; maintainers = [ maintainers.thoughtpolice ]; }; diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix index 5453a266f42e..6016103abd34 100644 --- a/pkgs/by-name/cr/crosvm/package.nix +++ b/pkgs/by-name/cr/crosvm/package.nix @@ -21,12 +21,12 @@ rustPlatform.buildRustPackage { pname = "crosvm"; - version = "0-unstable-2025-04-07"; + version = "0-unstable-2025-04-16"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "7cb0f63341ca728c2d0f53c94fadfd20dd307186"; - hash = "sha256-xEKOEEGyfrfCGzI2+brkVwHcKKKLctNU+adgzVNGses="; + rev = "28a224e3fb19ce9fe1ce2a32b952af4c96e10bea"; + hash = "sha256-LRXtGSSFAhRoSIFLfAhYyrBVx1tsxHgpQIfyKTI2Awk="; fetchSubmodules = true; }; @@ -85,6 +85,7 @@ rustPlatform.buildRustPackage { license = licenses.bsd3; platforms = [ "aarch64-linux" + "riscv64-linux" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/cr/crudini/package.nix b/pkgs/by-name/cr/crudini/package.nix index ae8387c374b3..d42b2ce0ec8e 100644 --- a/pkgs/by-name/cr/crudini/package.nix +++ b/pkgs/by-name/cr/crudini/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "crudini"; - version = "0.9.5"; + version = "0.9.6"; format = "pyproject"; src = fetchFromGitHub { owner = "pixelb"; repo = "crudini"; - rev = version; - hash = "sha256-BU4u7uBsNyDOwWUjOIlBWcf1AeUXXZ+johAe+bjws1U="; + tag = version; + hash = "sha256-XW9pdP+aie6v9h35gLYM0wVrcsh+dcEB7EueATOV4w4="; }; postPatch = '' diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix index 800c57d798c6..dec64a4a3229 100644 --- a/pkgs/by-name/cr/cryptomator/package.nix +++ b/pkgs/by-name/cr/cryptomator/package.nix @@ -17,18 +17,18 @@ let in maven.buildMavenPackage rec { pname = "cryptomator"; - version = "1.15.2"; + version = "1.15.3"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; tag = version; - hash = "sha256-uhsX4VIA8NNUjxa0dHyB5bhWMxjd2LJfcKJInxROQRY="; + hash = "sha256-3HGSeTUzfcXuNFxPuhkQBQ8CTEvgrNjpFtqOuluCeRs="; }; mvnJdk = jdk; mvnParameters = "-Dmaven.test.skip=true -Plinux"; - mvnHash = "sha256-KfQdYsPdmQRQqjx/kpDQR9tYjb54goA31w55x6VX6KM="; + mvnHash = "sha256-vC2ULlBm/170ElcQC898N4kmWfuWwb7hFpF1oMIukyQ="; preBuild = '' VERSION=${version} diff --git a/pkgs/by-name/cr/cryptsetup/package.nix b/pkgs/by-name/cr/cryptsetup/package.nix index 3e2b74a4d588..8ba13330dfe1 100644 --- a/pkgs/by-name/cr/cryptsetup/package.nix +++ b/pkgs/by-name/cr/cryptsetup/package.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { [ "--with-crypto_backend=openssl" "--disable-ssh-token" + "--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" ] ++ lib.optionals (!rebuildMan) [ "--disable-asciidoc" diff --git a/pkgs/by-name/cs/csaf-tool/package.nix b/pkgs/by-name/cs/csaf-tool/package.nix new file mode 100644 index 000000000000..7bf230eb5a7a --- /dev/null +++ b/pkgs/by-name/cs/csaf-tool/package.nix @@ -0,0 +1,5 @@ +{ + python3Packages, +}: + +python3Packages.toPythonApplication python3Packages.csaf-tool diff --git a/pkgs/by-name/cs/csvlens/package.nix b/pkgs/by-name/cs/csvlens/package.nix index b5842124d09e..6d84f0302b14 100644 --- a/pkgs/by-name/cs/csvlens/package.nix +++ b/pkgs/by-name/cs/csvlens/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, rustPlatform, fetchFromGitHub, }: @@ -17,10 +15,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JlyDw+VL/vpKTvvBlDIwVIovhKJX2pV4UTY47cLR1IE="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; - useFetchCargoVendor = true; cargoHash = "sha256-nfw8mMauOTDCBh9O2ye96p8WXDFta4DXXb9kJVz7f3E="; diff --git a/pkgs/by-name/cu/cups-pdf-to-pdf/package.nix b/pkgs/by-name/cu/cups-pdf-to-pdf/package.nix index 97ec5a226c9d..2df2785e28d2 100644 --- a/pkgs/by-name/cu/cups-pdf-to-pdf/package.nix +++ b/pkgs/by-name/cu/cups-pdf-to-pdf/package.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation { buildInputs = [ cups ]; postPatch = '' - sed -r 's|(gscall, size, ")cp |\1${coreutils}/bin/cp |' cups-pdf.c -i + substituteInPlace cups-pdf.c \ + --replace-fail '"cp ' '"${lib.getExe' coreutils "cp"} ' ''; # gcc command line is taken from original cups-pdf's README file @@ -44,11 +45,11 @@ stdenv.mkDerivation { passthru.tests.vmtest = nixosTests.cups-pdf; - meta = with lib; { + meta = { description = "CUPS backend that turns print jobs into searchable PDF files"; homepage = "https://github.com/alexivkin/CUPS-PDF-to-PDF"; - license = licenses.gpl2Only; - maintainers = [ maintainers.yarny ]; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.yarny ]; longDescription = '' cups-pdf is a CUPS backend that generates a PDF file for each print job and puts this file into a folder on the local machine such that the print job's owner can access the file. diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index fe28b750ab15..c6fd0ebeee21 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - darwin, pkg-config, perl, nixosTests, @@ -158,15 +157,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional wolfsslSupport wolfssl ++ lib.optional rustlsSupport rustls-ffi ++ lib.optional zlibSupport zlib - ++ lib.optional zstdSupport zstd - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - CoreServices - SystemConfiguration - ] - ); + ++ lib.optional zstdSupport zstd; # for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html preConfigure = '' diff --git a/pkgs/by-name/cu/curlie/bump-golang-x-sys.patch b/pkgs/by-name/cu/curlie/bump-golang-x-sys.patch deleted file mode 100644 index 0de9769d2216..000000000000 --- a/pkgs/by-name/cu/curlie/bump-golang-x-sys.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/go.mod b/go.mod -index bebd23f..2ad575f 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,8 +1,8 @@ - module github.com/rs/curlie - - require ( -- golang.org/x/crypto v0.1.0 -- golang.org/x/sys v0.1.0 -+ golang.org/x/crypto v0.0.0-20180524125353-159ae71589f3 -+ golang.org/x/sys v0.0.0-20211110154304-99a53858aa08 - ) - - go 1.13 -diff --git a/go.sum b/go.sum -index 6b2e5c3..452bcf9 100644 ---- a/go.sum -+++ b/go.sum -@@ -1,4 +1,6 @@ - github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -+golang.org/x/crypto v0.0.0-20180524125353-159ae71589f3 h1:mPCVkWhSH1DSDQg4ZwAFYMo/+evpqK1WzBt33b9TXRE= -+golang.org/x/crypto v0.0.0-20180524125353-159ae71589f3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= - golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= - golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= -@@ -10,6 +12,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug - golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= - golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -+golang.org/x/sys v0.0.0-20211110154304-99a53858aa08 h1:WecRHqgE09JBkh/584XIE6PMz5KKE/vER4izNUi30AQ= -+golang.org/x/sys v0.0.0-20211110154304-99a53858aa08/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= - golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --- -2.40.1 diff --git a/pkgs/by-name/cu/curlie/package.nix b/pkgs/by-name/cu/curlie/package.nix index b215a3dfb105..0d26874856cd 100644 --- a/pkgs/by-name/cu/curlie/package.nix +++ b/pkgs/by-name/cu/curlie/package.nix @@ -1,32 +1,28 @@ { + lib, buildGoModule, fetchFromGitHub, - lib, curlie, testers, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "curlie"; - version = "1.7.2"; + version = "1.8.2"; src = fetchFromGitHub { owner = "rs"; - repo = pname; - rev = "v${version}"; - hash = "sha256-YOsq3cB+Pn2eC1Dky3fobBRR7GMxcf/tvWr6i3Vq/BE="; + repo = "curlie"; + tag = "v${finalAttrs.version}"; + hash = "sha256-BlpIDik4hkU4c+KCyAmgUURIN362RDQID/qo6Ojp2Ek="; }; - patches = [ - ./bump-golang-x-sys.patch - ]; - - vendorHash = "sha256-VsPdMUfS4UVem6uJgFISfFHQEKtIumDQktHQFPC1muc="; + vendorHash = "sha256-GBccl8V87u26dtrGpHR+rKqRBqX6lq1SBwfsPvj/+44="; ldflags = [ "-s" "-w" - "-X main.version=${version}" + "-X main.version=${finalAttrs.version}" ]; passthru.tests.version = testers.testVersion { @@ -34,11 +30,11 @@ buildGoModule rec { command = "curlie version"; }; - meta = with lib; { + meta = { description = "Frontend to curl that adds the ease of use of httpie, without compromising on features and performance"; homepage = "https://curlie.io/"; - maintainers = with maintainers; [ ma27 ]; - license = licenses.mit; + maintainers = with lib.maintainers; [ ma27 ]; + license = lib.licenses.mit; mainProgram = "curlie"; }; -} +}) diff --git a/pkgs/by-name/cv/cve-prioritizer/package.nix b/pkgs/by-name/cv/cve-prioritizer/package.nix index 705951a13d3c..dde4e6415855 100644 --- a/pkgs/by-name/cv/cve-prioritizer/package.nix +++ b/pkgs/by-name/cv/cve-prioritizer/package.nix @@ -1,37 +1,21 @@ { lib, fetchFromGitHub, - fetchpatch, python3, }: python3.pkgs.buildPythonApplication rec { pname = "cve-prioritizer"; - version = "1.8.0"; + version = "1.9.0"; pyproject = true; src = fetchFromGitHub { owner = "TURROKS"; repo = "CVE_Prioritizer"; rev = "refs/tags/v${version}"; - hash = "sha256-ade/gcRrdvVsp5F61ZndsNL3s3gq8TDk/dZvPc55S/8="; + hash = "sha256-FJN/AM4NFctMszzIBdvww7OtC7fimb++tbtRZ77ll5c="; }; - patches = [ - # Add script, https://github.com/TURROKS/CVE_Prioritizer/pull/33 - (fetchpatch { - name = "add-script.patch"; - url = "https://github.com/TURROKS/CVE_Prioritizer/commit/c29f2332cde7d79e0c9f34c0a1811611a8fb73c9.patch"; - hash = "sha256-/hnS+YKO4zNGVGTG+KsugJH7Bt2OE8Q2F+7ZX+uhFlU="; - }) - ]; - - postPatch = '' - # https://github.com/TURROKS/CVE_Prioritizer/pull/32 - substituteInPlace pyproject.toml \ - --replace-fail "CVE Prioritizer" "cve-prioritizer" - ''; - build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/by-name/cy/cyber/package.nix b/pkgs/by-name/cy/cyber/package.nix index 651e8aed7d6d..a2e219ef6f2e 100644 --- a/pkgs/by-name/cy/cyber/package.nix +++ b/pkgs/by-name/cy/cyber/package.nix @@ -2,22 +2,22 @@ lib, stdenv, fetchFromGitHub, - zig_0_11, + zig_0_12, }: stdenv.mkDerivation rec { pname = "cyber"; - version = "unstable-2023-09-19"; + version = "0-unstable-2025-12-10"; src = fetchFromGitHub { owner = "fubark"; repo = "cyber"; - rev = "f95cd189cf090d26542a87b1d2ced461e75fa1a7"; - hash = "sha256-ctEd8doXMKq3L9/T+jOcWqlBQN0pVhsu9DjBXsg/u/4="; + rev = "2a2298d6aa12f9136b18cd85965f4a58e484f506"; + hash = "sha256-d81z+wUIQ/KUVa+GyXbT+E8dsG8Mdt1hZW1Qe1mmAiw="; }; nativeBuildInputs = [ - zig_0_11.hook + zig_0_12.hook ]; zigBuildFlags = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fubark/cyber"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; - inherit (zig_0_11.meta) platforms; + inherit (zig_0_12.meta) platforms; broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/cy/cypress/package.nix b/pkgs/by-name/cy/cypress/package.nix index 649d3757879f..7bb238cd612c 100644 --- a/pkgs/by-name/cy/cypress/package.nix +++ b/pkgs/by-name/cy/cypress/package.nix @@ -13,7 +13,6 @@ udev, unzip, xorg, - darwin, }: let @@ -65,34 +64,20 @@ stdenv.mkDerivation rec { (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux ( - with xorg; - [ - libXScrnSaver - libXdamage - libXtst - libxshmfence - nss - gtk2 - alsa-lib - gtk3 - libgbm - ] - ) - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - CoreServices - CoreMedia - CoreAudio - AudioToolbox - AVFoundation - Foundation - ApplicationServices - ] - ); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux ( + with xorg; + [ + libXScrnSaver + libXdamage + libXtst + libxshmfence + nss + gtk2 + alsa-lib + gtk3 + libgbm + ] + ); runtimeDependencies = lib.optional stdenv.hostPlatform.isLinux (lib.getLib udev); diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index a617fc7fa180..37804ca9e831 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -3,13 +3,11 @@ atk, cairo, callPackage, - darwin, fetchFromGitHub, gdk-pixbuf, glib, gobject-introspection, gtk4, - overrideSDK, pango, pkg-config, rustPlatform, @@ -21,11 +19,7 @@ }: let - buildRustPackage' = rustPlatform.buildRustPackage.override { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - }; - - self = buildRustPackage' { + self = rustPlatform.buildRustPackage { pname = "czkawka"; version = "9.0.0"; @@ -45,22 +39,14 @@ let wrapGAppsHook4 ]; - buildInputs = - [ - atk - cairo - gdk-pixbuf - glib - gtk4 - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - Foundation - ] - ); + buildInputs = [ + atk + cairo + gdk-pixbuf + glib + gtk4 + pango + ]; nativeCheckInputs = [ xvfb-run ]; diff --git a/pkgs/by-name/da/dailies/package.nix b/pkgs/by-name/da/dailies/package.nix new file mode 100644 index 000000000000..6893c8f0502b --- /dev/null +++ b/pkgs/by-name/da/dailies/package.nix @@ -0,0 +1,27 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage { + pname = "dailies"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "JachymPutta"; + repo = "dailies"; + rev = "66938203c644a54adcc1dbbe44ad37d348f3e986"; + hash = "sha256-hT+tffJ4F4VfblfYmb1o0hl5EZjU/QOgDYudKS8EvJg="; + }; + + cargoHash = "sha256-R8r6YFo0Ih7esJl/OpcNNmmmB9pGxOXCc+3/ZivaWSw="; + + meta = with lib; { + description = "Daily journaling in plain markdown"; + homepage = "https://github.com/JachymPutta/dailies"; + license = licenses.mit; + maintainers = with maintainers; [ JachymPutta ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/da/daisydisk/package.nix b/pkgs/by-name/da/daisydisk/package.nix index 9ee74970ce10..c6309a84d5c0 100644 --- a/pkgs/by-name/da/daisydisk/package.nix +++ b/pkgs/by-name/da/daisydisk/package.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "daisydisk"; - version = "4.30"; + version = "4.31"; src = fetchzip { url = "https://daisydiskapp.com/download/DaisyDisk.zip"; - hash = "sha256-4nVD5FXj0Ol+QQ7NYUxGH3DzkXEpTawJoZpUgdIUNVY="; + hash = "sha256-z0F1sHihmXR5hN/AwrxLr9ZxfcCN+OSeWvWBe+qwWMU="; stripRoot = false; }; diff --git a/pkgs/by-name/da/daktilo/package.nix b/pkgs/by-name/da/daktilo/package.nix index dde3104c7622..2fcd06953ac4 100644 --- a/pkgs/by-name/da/daktilo/package.nix +++ b/pkgs/by-name/da/daktilo/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, - darwin, unixtools, pkg-config, alsa-lib, @@ -30,16 +28,12 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - alsa-lib - xorg.libX11 - xorg.libXi - xorg.libXtst - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + alsa-lib + xorg.libX11 + xorg.libXi + xorg.libXtst + ]; nativeCheckInputs = [ unixtools.script diff --git a/pkgs/by-name/da/dalfox/package.nix b/pkgs/by-name/da/dalfox/package.nix index ee4b66bc9474..924a520e9acd 100644 --- a/pkgs/by-name/da/dalfox/package.nix +++ b/pkgs/by-name/da/dalfox/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dalfox"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "hahwul"; repo = "dalfox"; tag = "v${version}"; - hash = "sha256-F4CXVgHdEjSMK3YIF5X6zCVVI17GkIE3KGAE1OxfhyY="; + hash = "sha256-EM5T8uBMSkjxd7wTaMFPpbErAhcN2oLaV2g8MAxb0lQ="; }; - vendorHash = "sha256-Nt0Rgwrjs2irKPnt5G/32VH3Wj19+xnh+gLspWDnKCY="; + vendorHash = "sha256-EgNE3Z/NZ1lV0BPVe4MhB9bIYSMLftzYfmw65ktSo7A="; ldflags = [ "-w" diff --git a/pkgs/by-name/da/dalphaball/package.nix b/pkgs/by-name/da/dalphaball/package.nix new file mode 100644 index 000000000000..5a1142f993e2 --- /dev/null +++ b/pkgs/by-name/da/dalphaball/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gfortran, + gmp, +}: + +stdenv.mkDerivation rec { + pname = "dalphaball"; + version = "0-unstable-2023-06-15"; + + src = fetchFromGitHub { + owner = "outpace-bio"; + repo = "DAlphaBall"; + rev = "7b9dc05fa2a40f7ea36c6d89973d150eaed459d9"; + hash = "sha256-mUxEL9b67z/mG+0pcM5uQ/jPAfEUpJlXOXPmqDea+U4="; + }; + + sourceRoot = "${src.name}/src"; + strictDeps = true; + + nativeBuildInputs = [ + gfortran + ]; + + buildInputs = [ + gfortran.cc.lib + gmp + ]; + + installPhase = '' + runHook preInstall + install -Dm755 DAlphaBall.gcc $out/bin/DAlphaBall + runHook postInstall + ''; + + meta = { + description = "Computes the surface area and volume of unions of many balls"; + mainProgram = "DAlphaBall"; + homepage = "https://github.com/outpace-bio/DAlphaBall"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ aschleck ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/da/dapr-cli/package.nix b/pkgs/by-name/da/dapr-cli/package.nix index 22bea35fd699..4c33c477ef6e 100644 --- a/pkgs/by-name/da/dapr-cli/package.nix +++ b/pkgs/by-name/da/dapr-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "dapr-cli"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "dapr"; repo = "cli"; rev = "v${version}"; - hash = "sha256-ex6H5N5h5ScacyakgFDh8/xJMfS6Q6d2FmfcBXiCl+4="; + hash = "sha256-hMBXNJKerRjI2vWsqRlMHyxlgyfN6WNbwVbMpe59rM4="; }; - vendorHash = "sha256-k7TrQX6w034T4LfEfywCQC5OXo9hVDNrEyJe/qOKOEk="; + vendorHash = "sha256-RH802JcEHzrVEf4t7O0croSc36LNM6MtFXFJtDffIvU="; proxyVendor = true; diff --git a/pkgs/by-name/da/darklua/package.nix b/pkgs/by-name/da/darklua/package.nix index 29e620568ab5..666bc7ba60d5 100644 --- a/pkgs/by-name/da/darklua/package.nix +++ b/pkgs/by-name/da/darklua/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, rustPlatform, fetchFromGitHub, }: @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-DQkj4t+l6FJnJQ+g96CXypssbRzHbS6X9AOG0LGDclg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' rm .cargo/config.toml diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index c005a716ddaa..03e4a14efc04 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -47,11 +47,11 @@ libpng, librsvg, libsecret, - libsoup_2_4, libsysprof-capture, libthai, libtiff, libwebp, + libxml2, libxslt, lua, util-linux, @@ -133,11 +133,11 @@ stdenv.mkDerivation rec { libpng librsvg libsecret - libsoup_2_4 libsysprof-capture libthai libtiff libwebp + libxml2 libxslt lua openexr diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix index aecbc0bc5151..47aced70a01e 100644 --- a/pkgs/by-name/da/databricks-cli/package.nix +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "databricks-cli"; - version = "0.246.0"; + version = "0.247.1"; src = fetchFromGitHub { owner = "databricks"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-G9+PkmwRYj6Zwc65tscohjv9X4vZmIQXuYK9Lhl0hgQ="; + hash = "sha256-c9ZcqJuue5Nccuhpoxud0LevJD2jNPAYuIrBaEuUihY="; }; # Otherwise these tests fail asserting that the version is 0.0.0-dev @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}" ''; - vendorHash = "sha256-AQsZBNQA3upH4kNuf0Y7CP6IDuIDGPVYeqATAaBKFIk="; + vendorHash = "sha256-c+fg2eJiuLr7UuWier7VFdLNFGDo0aCMo0q8/spnmSE="; excludedPackages = [ "bundle/internal" diff --git a/pkgs/applications/misc/databricks-sql-cli/default.nix b/pkgs/by-name/da/databricks-sql-cli/package.nix similarity index 100% rename from pkgs/applications/misc/databricks-sql-cli/default.nix rename to pkgs/by-name/da/databricks-sql-cli/package.nix diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix index 3b1d7284116f..18d1735c31d9 100644 --- a/pkgs/by-name/da/datafusion-cli/package.nix +++ b/pkgs/by-name/da/datafusion-cli/package.nix @@ -2,30 +2,24 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "datafusion-cli"; - version = "45.0.0"; + version = "47.0.0"; src = fetchFromGitHub { name = "datafusion-cli-source"; owner = "apache"; repo = "arrow-datafusion"; - rev = version; - sha256 = "sha256-XIxUp4i68psNtKoFR/uVJHCToz681m2q8qUhtMQKCLo="; + tag = finalAttrs.version; + hash = "sha256-IKG0sLF5LAS2Tch3hdzsGHwAf2k43aVvMo1a29pxza0="; }; - sourceRoot = "${src.name}/datafusion-cli"; - useFetchCargoVendor = true; - cargoHash = "sha256-qJjZ4Um2K27IJy7w99kJGs5ZB1y57xd6P896+Hm2GOg="; + cargoHash = "sha256-kl2+cVQhEkRsQWO8w3WEtXAoVIqj3s3IcbRBn175yxg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildAndTestSubdir = "datafusion-cli"; checkFlags = [ # Some tests not found fake path @@ -41,12 +35,15 @@ rustPlatform.buildRustPackage rec { "--skip=tests::test_parquet_metadata_works_with_strings" ]; - meta = with lib; { + # timeout + doCheck = false; + + meta = { description = "cli for Apache Arrow DataFusion"; mainProgram = "datafusion-cli"; homepage = "https://arrow.apache.org/datafusion"; - changelog = "https://github.com/apache/arrow-datafusion/blob/${version}/datafusion/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; + changelog = "https://github.com/apache/arrow-datafusion/blob/${finalAttrs.version}/datafusion/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ happysalada ]; }; -} +}) diff --git a/pkgs/by-name/db/db-rest/package.nix b/pkgs/by-name/db/db-rest/package.nix index 6aa4e722d169..761170f118ca 100644 --- a/pkgs/by-name/db/db-rest/package.nix +++ b/pkgs/by-name/db/db-rest/package.nix @@ -2,7 +2,7 @@ lib, buildNpmPackage, fetchFromGitHub, - nodejs_18, + nodejs, nix-update-script, nixosTests, }: @@ -10,7 +10,7 @@ buildNpmPackage rec { pname = "db-rest"; version = "6.1.0"; - nodejs = nodejs_18; + inherit nodejs; src = fetchFromGitHub { owner = "derhuerst"; diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix index 405fc0a2d5eb..7aace6837282 100644 --- a/pkgs/by-name/dc/dcgm/package.nix +++ b/pkgs/by-name/dc/dcgm/package.nix @@ -6,7 +6,7 @@ catch2, cmake, ninja, - cudaPackages_11_8, + cudaPackages_11, cudaPackages_12, boost, fmt_9, @@ -24,7 +24,7 @@ let # The runtime closure, thankfully, is quite small as it does not # include the CUDA libraries. cudaPackageSets = [ - cudaPackages_11_8 + cudaPackages_11 cudaPackages_12 ]; diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix index 2d92cac2eea7..ec27b1091aba 100644 --- a/pkgs/by-name/de/debian-devscripts/package.nix +++ b/pkgs/by-name/de/debian-devscripts/package.nix @@ -27,13 +27,13 @@ let exec ''${EDITOR-${nano}/bin/nano} "$@" ''; in -stdenv.mkDerivation rec { - version = "2.23.5"; +stdenv.mkDerivation (finalAttrs: { pname = "debian-devscripts"; + version = "2.25.10"; src = fetchurl { - url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - hash = "sha256-j0fUVTS/lPKFdgeMhksiJz2+E5koB07IK2uEj55EWG0="; + url = "mirror://debian/pool/main/d/devscripts/devscripts_${finalAttrs.version}.tar.xz"; + hash = "sha256-pEzXrKV/bZbYG7j5QXjRDATZRGLt0fhdpwTDbCoKcus="; }; patches = [ @@ -45,15 +45,19 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace scripts/Makefile --replace /usr/share/dpkg ${dpkg}/share/dpkg - substituteInPlace scripts/debrebuild.pl --replace /usr/bin/perl ${perlPackages.perl}/bin/perl + substituteInPlace scripts/debrebuild.pl \ + --replace-fail "/usr/bin/perl" "${perlPackages.perl}/bin/perl" patchShebangs scripts + # Remove man7 target to avoid missing *.7 file error + substituteInPlace doc/Makefile \ + --replace-fail " install_man7" "" ''; nativeBuildInputs = [ makeWrapper pkg-config ]; + buildInputs = [ xz @@ -121,15 +125,14 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$out/${python.sitePackages}" \ --prefix PATH : "${dpkg}/bin" done - ln -s cvs-debi $out/bin/cvs-debc ln -s debchange $out/bin/dch ln -s pts-subscribe $out/bin/pts-unsubscribe ''; - meta = with lib; { + meta = { description = "Debian package maintenance scripts"; - license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO - maintainers = with maintainers; [ raskin ]; - platforms = platforms.unix; + license = lib.licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/de/decasify/package.nix b/pkgs/by-name/de/decasify/package.nix index e45007c8879e..23a8fe5f0883 100644 --- a/pkgs/by-name/de/decasify/package.nix +++ b/pkgs/by-name/de/decasify/package.nix @@ -14,18 +14,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "decasify"; - version = "0.8.0"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/alerque/decasify/releases/download/v${finalAttrs.version}/decasify-${finalAttrs.version}.tar.zst"; - hash = "sha256-HTUAb/yL3H4B/n/Ecd/fDpnTYiqwco/E07sa6pFIIU4="; + hash = "sha256-XPl4HfhkwhHRkfc64BTafeHgLK1lB4UHKP6loLn5Ruc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; dontConfigure = true; nativeBuildInputs = [ zstd ]; - hash = "sha256-TywF5nh3ptA4a/wUSlSd7fzcuX4cA2OHT1MbcnjfMq0="; + hash = "sha256-rbFacCK/HU2D7QbVfMgKr9VevfutBJJtbXbKodTmkrc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/decktape/package.nix b/pkgs/by-name/de/decktape/package.nix index 7f5a1bf304e0..6ab216c334fd 100644 --- a/pkgs/by-name/de/decktape/package.nix +++ b/pkgs/by-name/de/decktape/package.nix @@ -6,16 +6,16 @@ }: buildNpmPackage rec { name = "decktape"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = "astefanutti"; repo = "decktape"; rev = "v${version}"; - hash = "sha256-V7JoYtwP7iQYFi/WhFpkELs7mNKF6CqrMyjWhxLkcTA="; + hash = "sha256-SsdjqkMEVD0pVgIZ9Upmrz/1KOWcb1KUy/v/xTCVGc0="; }; - npmDepsHash = "sha256-rahrIhB0GhqvzN2Vu6137Cywr19aQ70gVbNSSYzFD+s="; + npmDepsHash = "sha256-Z5fLGMvxVhM8nW81PQ5ZFPHK6m2uoYUv0A4XsTa3Z2Y="; npmPackFlags = [ "--ignore-scripts" ]; dontNpmBuild = true; diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index ad7130123726..0f709042822f 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -12,7 +12,6 @@ python3, rustPlatform, stdenv, - darwin, testers, deltachat-desktop, yq, @@ -65,10 +64,6 @@ stdenv.mkDerivation (finalAttrs: { copyDesktopItems ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; VERSION_INFO_GIT_REF = finalAttrs.src.tag; diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index cf4b6c66bc0e..5f5dc8ba7b8d 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, rustPlatform, cmake, + yq, protobuf, installShellFiles, librusty_v8 ? callPackage ./librusty_v8.nix { @@ -18,39 +19,37 @@ let canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "deno"; - version = "2.2.8"; + version = "2.2.11"; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; - tag = "v${version}"; - hash = "sha256-pGhqfQR+42XUY0v99fvSyLQPlvzCWntq4qS9vyuJEpY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-6mRu1B02bX7Ax0d7MgI1cGalIKOqFMN+xP8ii+pUJWE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-FJ3wPkL1Pgw6S66n5hyQfUZWTVXs4oZ0bJJaN22OxoY="; + cargoHash = "sha256-YZ6O31R/1L7m25Z+6Xq6b44cRAX1jgRFPlhmoFVYFok="; postPatch = '' # Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857 - substituteInPlace Cargo.toml --replace-fail "libffi = \"=3.2.0\"" "libffi = { version = \"3.2.0\", features = [\"system\"] }" + tomlq -ti '.workspace.dependencies.libffi = { "version": .workspace.dependencies.libffi, "features": ["system"] }' Cargo.toml ''; # uses zlib-ng but can't dynamically link yet # https://github.com/rust-lang/libz-sys/issues/158 - nativeBuildInputs = - [ - rustPlatform.bindgenHook - # required by libz-ng-sys crate - cmake - # required by deno_kv crate - protobuf - installShellFiles - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - lld - ]; + nativeBuildInputs = [ + rustPlatform.bindgenHook + # for tomlq to adjust Cargo.toml + yq + # required by libz-ng-sys crate + cmake + # required by deno_kv crate + protobuf + installShellFiles + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ]; configureFlags = lib.optionals stdenv.cc.isClang [ # This never worked with clang, but became a hard error recently: https://github.com/llvm/llvm-project/commit/3d5b610c864c8f5980eaa16c22b71ff1cf462fae @@ -89,7 +88,7 @@ rustPlatform.buildRustPackage rec { installCheckPhase = lib.optionalString canExecute '' runHook preInstallCheck $out/bin/deno --help - $out/bin/deno --version | grep "deno ${version}" + $out/bin/deno --version | grep "deno ${finalAttrs.version}" runHook postInstallCheck ''; @@ -98,7 +97,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://deno.land/"; - changelog = "https://github.com/denoland/deno/releases/tag/v${version}"; + changelog = "https://github.com/denoland/deno/releases/tag/v${finalAttrs.version}"; description = "Secure runtime for JavaScript and TypeScript"; longDescription = '' Deno aims to be a productive and secure scripting environment for the modern programmer. @@ -122,4 +121,4 @@ rustPlatform.buildRustPackage rec { "aarch64-darwin" ]; }; -} +}) diff --git a/pkgs/by-name/de/deploy-rs/package.nix b/pkgs/by-name/de/deploy-rs/package.nix index f5f9e30197a2..e618554e01b5 100644 --- a/pkgs/by-name/de/deploy-rs/package.nix +++ b/pkgs/by-name/de/deploy-rs/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage { @@ -20,11 +18,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-e+Exc0lEamAieZ7QHJBYvmnmM/9YHdLRD3La4U5FRMo="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - meta = { description = "Multi-profile Nix-flake deploy tool"; homepage = "https://github.com/serokell/deploy-rs"; diff --git a/pkgs/by-name/de/detect-it-easy/package.nix b/pkgs/by-name/de/detect-it-easy/package.nix index df1eeece456a..ba20cccd88d9 100644 --- a/pkgs/by-name/de/detect-it-easy/package.nix +++ b/pkgs/by-name/de/detect-it-easy/package.nix @@ -51,9 +51,8 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/share/icons ''; - # clean up wrongly created dirs in `install.sh` and broken .desktop file postInstall = '' - grep -v "Version=#VERSION#" $src/LINUX/die.desktop > $out/share/applications/die.desktop + cp -r $src/XYara/yara_rules $out/lib/die/ ''; meta = { diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix index d852ff4e50c8..c944fb162903 100644 --- a/pkgs/by-name/de/devcontainer/package.nix +++ b/pkgs/by-name/de/devcontainer/package.nix @@ -11,6 +11,7 @@ docker, yarn, docker-compose, + nix-update-script, }: let @@ -18,18 +19,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "devcontainer"; - version = "0.72.0"; + version = "0.75.0"; src = fetchFromGitHub { owner = "devcontainers"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-3rSWD6uxwcMQdHBSmmAQ0aevqevVXINigCj06jjEcRc="; + hash = "sha256-mzS5ejiD8HuvcD6aHIgbRU1pi43P8AiuDLaIlwpGllE="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-KSVr6RlBEeDAo8D+7laTN+pSH8Ukl6WTpeAULuG2fq8="; + hash = "sha256-ix9rixdrvt6hYtx4QTvsg3fm2uz3MvZxFZQfKkTDWc8="; }; nativeBuildInputs = [ @@ -81,6 +82,8 @@ stdenv.mkDerivation (finalAttrs: { } ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Dev container CLI, run and manage your dev environments via a devcontainer.json"; homepage = "https://containers.dev/"; diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 38b949855124..196ddfcadef4 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -26,7 +26,7 @@ let doInstallCheck = false; }); - version = "1.5"; + version = "1.5.2"; in rustPlatform.buildRustPackage { pname = "devenv"; @@ -36,11 +36,11 @@ rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-bJlcIFcEhobOiaJsxub48fR8nIZDU4QK4FIycmDW2mk="; + hash = "sha256-rXtUUxfQ34ukTy2OyHwuypnSgK95FRPGwJf69QnWMrc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-9veQGMUEJDVXNouhpU8pAx8lJZHLyZbFSnMGMK58VVw="; + cargoHash = "sha256-oiOh8m7MypViLbzy/13NpSiOwkfRwybUpDs91f+HbGA="; buildAndTestSubdir = "devenv"; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/by-name/de/devpi-client/package.nix similarity index 100% rename from pkgs/development/tools/devpi-client/default.nix rename to pkgs/by-name/de/devpi-client/package.nix diff --git a/pkgs/by-name/de/dezoomify-rs/package.nix b/pkgs/by-name/de/dezoomify-rs/package.nix index fa273a1b4040..01a3eebb0880 100644 --- a/pkgs/by-name/de/dezoomify-rs/package.nix +++ b/pkgs/by-name/de/dezoomify-rs/package.nix @@ -2,7 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix index 80a957991a90..fafc747564fb 100644 --- a/pkgs/by-name/di/diebahn/package.nix +++ b/pkgs/by-name/di/diebahn/package.nix @@ -18,7 +18,6 @@ libadwaita, pango, gettext, - darwin, blueprint-compiler, nix-update-script, }: @@ -51,24 +50,15 @@ stdenv.mkDerivation rec { blueprint-compiler ]; - buildInputs = - [ - cairo - gdk-pixbuf - glib - gtk4 - libadwaita - openssl - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - Foundation - Security - ] - ); + buildInputs = [ + cairo + gdk-pixbuf + glib + gtk4 + libadwaita + openssl + pango + ]; # Darwin needs to link against gettext from nixpkgs instead of the one vendored by gettext-sys # because the vendored copy does not build with newer versions of clang. diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index c39ab8df0019..4da34b3c9b68 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -4,6 +4,7 @@ lib, fetchFromGitLab, fetchgit, + fetchpatch, cmake, ninja, @@ -62,18 +63,25 @@ in stdenv.mkDerivation (finalAttrs: { pname = "digikam"; - version = "8.5.0"; + version = "8.6.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "graphics"; repo = "digikam"; rev = "v${finalAttrs.version}"; - hash = "sha256-KO6kq0SlYzu7sh6+7JQWhIeHNowy3fx03OFTdDwyR10="; + hash = "sha256-CMyvNOAlIqD6OeqUquQ+/sOiBXmEowZe3/qmaXxh0X0="; }; patches = [ ./disable-tests-download.patch + + # Fix build with Qt 6.9 + # FIXME: remove in next update + (fetchpatch { + url = "https://invent.kde.org/graphics/digikam/-/commit/325b19fc7f0d04cdc1308f235c207c1ab43e945d.patch"; + hash = "sha256-bsxaNuLuU9MyDRmenOqO4JuzsbpUvfKQwcSCDfLHoWQ="; + }) ]; strictDeps = true; diff --git a/pkgs/by-name/di/dillo/package.nix b/pkgs/by-name/di/dillo/package.nix index cc6b32b1d205..e32387f02ca2 100644 --- a/pkgs/by-name/di/dillo/package.nix +++ b/pkgs/by-name/di/dillo/package.nix @@ -3,16 +3,12 @@ autoreconfHook, fetchFromGitHub, fltk, - giflib, - libXcursor, - libXi, - libXinerama, libjpeg, libpng, + libwebp, libressl, mbedtls, openssl, - perl, pkg-config, stdenv, which, @@ -48,15 +44,11 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - fltk - giflib - libXcursor - libXi - libXinerama libjpeg libpng - perl + libwebp ssl + fltk ]; outputs = [ @@ -88,6 +80,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "dillo"; maintainers = with lib.maintainers; [ ]; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/di/dim/package.nix b/pkgs/by-name/di/dim/package.nix index 53ab3a0ed685..2ead070f750d 100644 --- a/pkgs/by-name/di/dim/package.nix +++ b/pkgs/by-name/di/dim/package.nix @@ -4,7 +4,6 @@ rustPlatform, fetchFromGitHub, buildNpmPackage, - darwin, makeWrapper, ffmpeg, git, @@ -14,9 +13,11 @@ libva, fetchpatch, }: -rustPlatform.buildRustPackage rec { + +rustPlatform.buildRustPackage (finalAttrs: { pname = "dim"; version = "0-unstable-2023-12-29"; + src = fetchFromGitHub { owner = "Dusk-Labs"; repo = "dim"; @@ -26,8 +27,8 @@ rustPlatform.buildRustPackage rec { frontend = buildNpmPackage { pname = "dim-ui"; - inherit version; - src = "${src}/ui"; + inherit (finalAttrs) version; + src = "${finalAttrs.src}/ui"; postPatch = '' ln -s ${./package-lock.json} package-lock.json @@ -37,7 +38,9 @@ rustPlatform.buildRustPackage rec { installPhase = '' runHook preInstall + cp -r build $out + runHook postInstall ''; }; @@ -62,6 +65,12 @@ rustPlatform.buildRustPackage rec { ]; postPatch = '' + substituteInPlace dim-core/src/lib.rs \ + --replace-fail "#![deny(warnings)]" "#![warn(warnings)]" + substituteInPlace dim-events/src/lib.rs \ + --replace-fail "#![deny(warnings)]" "#![warn(warnings)]" + substituteInPlace dim-database/src/lib.rs \ + --replace-fail "#![deny(warnings)]" "#![warn(warnings)]" ln -sf ${./Cargo.lock} Cargo.lock ''; @@ -75,14 +84,7 @@ rustPlatform.buildRustPackage rec { git ]; - buildInputs = - [ sqlite ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ] - ++ lib.optional libvaSupport libva; + buildInputs = [ sqlite ] ++ lib.optional libvaSupport libva; buildFeatures = lib.optional libvaSupport "vaapi"; @@ -120,4 +122,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ lib.maintainers.misterio77 ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/di/direnv/package.nix b/pkgs/by-name/di/direnv/package.nix index 3ad784acfc22..06bcfa467f36 100644 --- a/pkgs/by-name/di/direnv/package.nix +++ b/pkgs/by-name/di/direnv/package.nix @@ -6,6 +6,7 @@ bash, fish, zsh, + writableTmpDirAsHomeHook, }: buildGoModule rec { @@ -36,11 +37,15 @@ buildGoModule rec { nativeCheckInputs = [ fish zsh + writableTmpDirAsHomeHook ]; checkPhase = '' - export HOME=$(mktemp -d) + runHook preCheck + make test-go test-bash test-fish test-zsh + + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/by-name/di/discordchatexporter-desktop/package.nix b/pkgs/by-name/di/discordchatexporter-desktop/package.nix index ad643bceca4d..836913be9ff7 100644 --- a/pkgs/by-name/di/discordchatexporter-desktop/package.nix +++ b/pkgs/by-name/di/discordchatexporter-desktop/package.nix @@ -40,7 +40,7 @@ buildDotnetModule rec { homepage = "https://github.com/Tyrrrz/DiscordChatExporter"; license = licenses.gpl3Plus; changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md"; - maintainers = with maintainers; [ kekschen ]; + maintainers = with maintainers; [ willow ]; platforms = [ "x86_64-linux" ]; mainProgram = "discordchatexporter"; }; diff --git a/pkgs/by-name/di/distgen/package.nix b/pkgs/by-name/di/distgen/package.nix index fc2f68fdf22f..2cf615a79017 100644 --- a/pkgs/by-name/di/distgen/package.nix +++ b/pkgs/by-name/di/distgen/package.nix @@ -6,32 +6,44 @@ python3.pkgs.buildPythonApplication rec { pname = "distgen"; - version = "1.18"; + version = "2.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-lS6OeEaPiK8Pskuoww9KwyNhKnGQ+dHhdPmZn1Igj0Q="; + hash = "sha256-VG9EX9LHoZamBM3PEm5qGpViK39qD+PA8vcHTzvsW+o="; }; - nativeCheckInputs = with python3.pkgs; [ - pytest - mock + build-system = with python3.pkgs; [ + setuptools + argparse-manpage ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ distro jinja2 six pyyaml ]; - checkPhase = "make test-unit PYTHON=${python3.executable}"; + nativeCheckInputs = with python3.pkgs; [ + pytest + mock + ]; - meta = with lib; { + checkPhase = '' + runHook preCheck + + make test-unit PYTHON=${python3.executable} + + runHook postCheck + ''; + + meta = { description = "Templating system/generator for distributions"; mainProgram = "dg"; - license = licenses.gpl2Plus; - homepage = "https://distgen.readthedocs.io/"; - maintainers = with maintainers; [ bachp ]; + license = lib.licenses.gpl2Plus; + homepage = "https://distgen.readthedocs.io"; + maintainers = with lib.maintainers; [ bachp ]; }; } diff --git a/pkgs/by-name/di/diswall/package.nix b/pkgs/by-name/di/diswall/package.nix index 5d491178bd3b..da7faadf9365 100644 --- a/pkgs/by-name/di/diswall/package.nix +++ b/pkgs/by-name/di/diswall/package.nix @@ -1,14 +1,9 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) Security; -in rustPlatform.buildRustPackage rec { pname = "diswall"; version = "0.6.1"; @@ -20,10 +15,6 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-t2ZBi3ab6OUWzc0L0Hq/ay+s3KNDMeu6mkYxti48BuE="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; - useFetchCargoVendor = true; cargoHash = "sha256-I4jfeOtK+ho2jksGHgQqHE+L6UzS240t+7v3/Eb/xAs="; diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix index 3c181f50deb4..0bd513a08e5c 100644 --- a/pkgs/by-name/dm/dmd/generic.nix +++ b/pkgs/by-name/dm/dmd/generic.nix @@ -15,7 +15,6 @@ curl, tzdata, gdb, - Foundation, callPackage, targetPackages, fetchpatch, @@ -138,14 +137,10 @@ stdenv.mkDerivation (finalAttrs: { git ]; - buildInputs = - [ - curl - tzdata - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - ]; + buildInputs = [ + curl + tzdata + ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/dm/dmlive/package.nix b/pkgs/by-name/dm/dmlive/package.nix index 68158f7ec19d..c3fbc6542b78 100644 --- a/pkgs/by-name/dm/dmlive/package.nix +++ b/pkgs/by-name/dm/dmlive/package.nix @@ -20,17 +20,17 @@ in rustPlatform.buildRustPackage { pname = "dmlive"; - version = "5.5.7-unstable-2025-01-25"; + version = "5.5.8-unstable-2025-04-06"; src = fetchFromGitHub { owner = "THMonster"; repo = "dmlive"; - rev = "79b4d9430fca3ebb86c57ee506989f620ea68a21"; # no tag - hash = "sha256-0DDKKd4IZj+3AyVMG4FXjCbvvMg5iDCiF1B6nB8n3lU="; + rev = "b066a637093871de9962e08d4f0ae0b77bd8f1f4"; # no tag + hash = "sha256-pAsxr6zGCDZ0qysGT1+2+5+WKI2QopGxnZWpfnxk/fI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-UwKQivYZyXYADbwf4VA1h2y7YzpxefUgDYQG+NaLMwE="; + cargoHash = "sha256-GVko8GK5Muha4uqDMgk7VkFoFCVcmk0vM1GUELvSzgM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/dn/dns-root-data/package.nix b/pkgs/by-name/dn/dns-root-data/package.nix index 76c420f7d056..8d2a25648754 100644 --- a/pkgs/by-name/dn/dns-root-data/package.nix +++ b/pkgs/by-name/dn/dns-root-data/package.nix @@ -5,7 +5,6 @@ }: let - rootHints = fetchurl { # Original source https://www.internic.net/domain/named.root # occasionally suffers from pointless hash changes, @@ -16,25 +15,21 @@ let ]; hash = "sha256-4lG/uPnNHBNIZ/XIeDM1w3iukrpeW0JIjTnGSwkJ8U4="; }; - - rootKey = ./root.key; - rootDs = ./root.ds; - in - stdenv.mkDerivation { pname = "dns-root-data"; - version = "2024-06-20"; + version = "2025-04-14"; buildCommand = '' mkdir $out cp ${rootHints} $out/root.hints - cp ${rootKey} $out/root.key - cp ${rootDs} $out/root.ds + cp ${./root.key} $out/root.key + cp ${./root.ds} $out/root.ds ''; meta = with lib; { - description = "DNS root data including root zone and DNSSEC key"; + homepage = "https://www.iana.org/domains/root/files"; + description = "DNS root data including root hints and DNSSEC root trust anchor + key"; maintainers = with maintainers; [ fpletz vcunat diff --git a/pkgs/by-name/dn/dns-root-data/root.key b/pkgs/by-name/dn/dns-root-data/root.key index edfc762ad602..a4764873b532 100644 --- a/pkgs/by-name/dn/dns-root-data/root.key +++ b/pkgs/by-name/dn/dns-root-data/root.key @@ -1 +1,2 @@ -. 172800 IN DNSKEY 257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= ;{id = 20326 (ksk), size = 2048b} +. 86400 IN DNSKEY 257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= ;{id = 20326 (ksk), size = 2048b} +. 86400 IN DNSKEY 257 3 8 AwEAAa96jeuknZlaeSrvyAJj6ZHv28hhOKkx3rLGXVaC6rXTsDc449/cidltpkyGwCJNnOAlFNKF2jBosZBU5eeHspaQWOmOElZsjICMQMC3aeHbGiShvZsx4wMYSjH8e7Vrhbu6irwCzVBApESjbUdpWWmEnhathWu1jo+siFUiRAAxm9qyJNg/wOZqqzL/dL/q8PkcRU5oUKEpUge71M3ej2/7CPqpdVwuMoTvoB+ZOT4YeGyxMvHmbrxlFzGOHOijtzN+u1TQNatX2XBuzZNQ1K+s2CXkPIZo7s6JgZyvaBevYtxPvYLw4z9mR7K2vaF18UYH9Z9GNUUeayffKC73PYc= ;{id = 38696 (ksk), size = 2048b} diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix index 724c016a474d..a8a49ae35d4e 100644 --- a/pkgs/by-name/dn/dnsproxy/package.nix +++ b/pkgs/by-name/dn/dnsproxy/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.75.2"; + version = "0.75.3"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; rev = "v${version}"; - hash = "sha256-lxrb6DIYompvLX3R7HI63C7ZbNW76J28Xnt7AHTVwmQ="; + hash = "sha256-pUCkKnW0t3ogpGrQKkR4AbmMqdeY7DieATX5GmlFv9E="; }; - vendorHash = "sha256-PIj91tN9LbNaBE5gLTYD7p9dgcRaFe1i7PnWNJ5H580="; + vendorHash = "sha256-imML/SK4NdHGH5FsjvKjt5GM3vwi6v+pF1Mu8Dy8Lms="; ldflags = [ "-s" diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix index 7038b1d52e1a..33f0d56825a8 100644 --- a/pkgs/by-name/do/docfd/package.nix +++ b/pkgs/by-name/do/docfd/package.nix @@ -2,7 +2,6 @@ lib, ocamlPackages, stdenv, - overrideSDK, fetchFromGitHub, python3, dune_3, @@ -13,13 +12,7 @@ docfd, }: -let - # Needed for x86_64-darwin - buildDunePackage' = ocamlPackages.buildDunePackage.override { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - }; -in -buildDunePackage' rec { +ocamlPackages.buildDunePackage rec { pname = "docfd"; version = "10.1.3"; diff --git a/pkgs/by-name/do/docker-credential-gcr/package.nix b/pkgs/by-name/do/docker-credential-gcr/package.nix index 18a0f7a1580d..fca6d9a8c079 100644 --- a/pkgs/by-name/do/docker-credential-gcr/package.nix +++ b/pkgs/by-name/do/docker-credential-gcr/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "docker-credential-gcr"; - version = "2.1.27"; + version = "2.1.28"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; tag = "v${version}"; - hash = "sha256-WoTbqqbFoIS525uytYAYmzrFbRYBi1C65Z5EDwzu6GI="; + hash = "sha256-8aFkafSsn8BZz6tB3wh2OqQA6E10NyY3J1XqNgelk+A="; }; postPatch = '' diff --git a/pkgs/by-name/do/docker-language-server/package.nix b/pkgs/by-name/do/docker-language-server/package.nix new file mode 100644 index 000000000000..c6c06164e655 --- /dev/null +++ b/pkgs/by-name/do/docker-language-server/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + docker, + gotestsum, +}: + +buildGoModule rec { + pname = "docker-language-server"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "docker"; + repo = "docker-language-server"; + tag = "v${version}"; + hash = "sha256-st7ZsifOJy2se0dgJHtonMSQC1hO8z3yhPYJ4H5nqAk="; + }; + + vendorHash = "sha256-Odyc1pGp52f8S2bXT7v4Rpk2H3vxr+DghsNcFUVU62k="; + + nativeCheckInputs = [ + docker + gotestsum + ]; + + checkPhase = '' + runHook preCheck + gotestsum -- $(go list ./... | grep -vE "e2e-tests|/buildkit$|/scout$") -timeout 30s -skip "TestCollectDiagnostics" + go test $(go list ./... | grep e2e-tests) -timeout 120s -skip "TestPublishDiagnostics|TestHover" + runHook postCheck + ''; + + ldflags = [ + "-s" + "-w" + "-X 'github.com/docker/docker-language-server/internal/pkg/cli/metadata.Version=${version}'" + ]; + + meta = with lib; { + homepage = "https://github.com/docker/docker-language-server"; + description = "Language server for providing language features for file types in the Docker ecosystem (Dockerfiles, Compose files, and Bake files)"; + mainProgram = "docker-language-server"; + license = licenses.asl20; + maintainers = with maintainers; [ baongoc124 ]; + }; +} diff --git a/pkgs/by-name/do/dockutil/package.nix b/pkgs/by-name/do/dockutil/package.nix index 264523e970fd..598f504eb993 100644 --- a/pkgs/by-name/do/dockutil/package.nix +++ b/pkgs/by-name/do/dockutil/package.nix @@ -8,7 +8,6 @@ swiftpm, swiftpm2nix, swiftPackages, - darwin, libarchive, p7zip, # Building from source on x86_64 fails (among other things) due to: @@ -56,8 +55,6 @@ let swiftpm ]; - buildInputs = with darwin.apple_sdk.frameworks; [ Cocoa ]; - configurePhase = generated.configure; installPhase = '' diff --git a/pkgs/by-name/do/doctave/package.nix b/pkgs/by-name/do/doctave/package.nix index 854a56de0709..d1cd037a130b 100644 --- a/pkgs/by-name/do/doctave/package.nix +++ b/pkgs/by-name/do/doctave/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,10 +26,6 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - meta = { description = "Batteries-included developer documentation site generator"; homepage = "https://github.com/doctave/doctave"; diff --git a/pkgs/by-name/do/docuum/package.nix b/pkgs/by-name/do/docuum/package.nix index 1ce408dfdabc..90cb06b6babb 100644 --- a/pkgs/by-name/do/docuum/package.nix +++ b/pkgs/by-name/do/docuum/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,10 +23,6 @@ rustPlatform.buildRustPackage rec { "--skip=format::tests::code_str_display" ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - ]; - meta = with lib; { description = "Least recently used (LRU) eviction of Docker images"; homepage = "https://github.com/stepchowfun/docuum"; diff --git a/pkgs/by-name/do/dogedns/package.nix b/pkgs/by-name/do/dogedns/package.nix index 0a6a950e93f1..23f798d7061a 100644 --- a/pkgs/by-name/do/dogedns/package.nix +++ b/pkgs/by-name/do/dogedns/package.nix @@ -7,7 +7,6 @@ pkg-config, openssl, pandoc, - darwin, }: rustPlatform.buildRustPackage rec { @@ -45,9 +44,7 @@ rustPlatform.buildRustPackage rec { installShellFiles pandoc ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; postInstall = '' installShellCompletion completions/doge.{bash,fish,zsh} diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix index c22d4afd73d5..3b945d1a564d 100644 --- a/pkgs/by-name/do/dolphin-emu/package.nix +++ b/pkgs/by-name/do/dolphin-emu/package.nix @@ -53,14 +53,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "dolphin-emu"; - version = "2503"; + version = "2503a"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-oqJKXFcsFgoYjUqdk3Z/CIFhOa8w0drcF4JwtHRI1Hs="; + hash = "sha256-vhXiEgJO8sEv937Ed87LaS7289PLZlxQGFTZGFjs1So="; }; strictDeps = true; diff --git a/pkgs/by-name/do/done/package.nix b/pkgs/by-name/do/done/package.nix index 7b4398e1e2bb..e7c1e70b8d6e 100644 --- a/pkgs/by-name/do/done/package.nix +++ b/pkgs/by-name/do/done/package.nix @@ -16,7 +16,6 @@ libsecret, openssl, sqlite, - darwin, gettext, }: @@ -48,18 +47,14 @@ stdenv.mkDerivation rec { wrapGAppsHook4 ]; - buildInputs = - [ - gdk-pixbuf - gtk4 - libadwaita - libsecret - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; + buildInputs = [ + gdk-pixbuf + gtk4 + libadwaita + libsecret + openssl + sqlite + ]; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { GETTEXT_DIR = gettext; diff --git a/pkgs/by-name/do/doomretro/package.nix b/pkgs/by-name/do/doomretro/package.nix index 2eb11cd61ea4..b332fafe1aa5 100644 --- a/pkgs/by-name/do/doomretro/package.nix +++ b/pkgs/by-name/do/doomretro/package.nix @@ -4,15 +4,11 @@ SDL2_image, SDL2_mixer, cmake, - darwin, fetchFromGitHub, pkg-config, stdenv, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; version = "5.6.2"; @@ -33,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_image SDL2_mixer - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + ]; strictDeps = true; diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix index c1e5796fb5d0..9b75421ff976 100644 --- a/pkgs/by-name/do/doppler/package.nix +++ b/pkgs/by-name/do/doppler/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "doppler"; - version = "3.73.0"; + version = "3.73.1"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - hash = "sha256-CHPaY8Z8ov+loIViQceD4ZW26MtXN1hpkY00p3Yy1n4="; + hash = "sha256-9UF9ZMQWfhncJkRFieYIawtv0EnfngeS7Sw5uPtyheI="; }; - vendorHash = "sha256-w3P/VbQrOJ9BMVw2thX/nU4loi4x8Nn/R2AJV5LzZBY="; + vendorHash = "sha256-tSRtgkDPvDlEfwuNhahvs3Pvt4h7QAJrJtb1XQXGaFM="; ldflags = [ "-s -w" diff --git a/pkgs/by-name/do/dotherside/package.nix b/pkgs/by-name/do/dotherside/package.nix old mode 100755 new mode 100644 diff --git a/pkgs/by-name/do/dotnet-ef/package.nix b/pkgs/by-name/do/dotnet-ef/package.nix index aaca7b41c30c..40a125634e65 100644 --- a/pkgs/by-name/do/dotnet-ef/package.nix +++ b/pkgs/by-name/do/dotnet-ef/package.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "dotnet-ef"; - version = "9.0.3"; + version = "9.0.4"; - nugetHash = "sha256-oRBN6Qh5PuVofmboqCpFJR3hUD+MruRYp4whjd9Yu9g="; + nugetHash = "sha256-eQ821C6bx98LJEcdSiozgAaHD2m2+hKVowRTL+L6vzM="; meta = { description = "The Entity Framework Core tools help with design-time development tasks."; diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix index 87339d21f6f9..789fa76979b9 100644 --- a/pkgs/by-name/do/dotter/package.nix +++ b/pkgs/by-name/do/dotter/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, nix-update-script, rustPlatform, - darwin, which, installShellFiles, }: @@ -23,10 +22,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-UBZZu8D1fbNOn2obviP+/Qw+E/OoNKRA4NXzqCqghGs="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - nativeCheckInputs = [ which installShellFiles diff --git a/pkgs/by-name/dp/dpkg/package.nix b/pkgs/by-name/dp/dpkg/package.nix index ba98905413e8..b85ad1a50ba5 100644 --- a/pkgs/by-name/dp/dpkg/package.nix +++ b/pkgs/by-name/dp/dpkg/package.nix @@ -15,7 +15,6 @@ pkg-config, diffutils, glibc ? !stdenv.hostPlatform.isDarwin, - darwin, }: stdenv.mkDerivation rec { @@ -86,7 +85,7 @@ stdenv.mkDerivation rec { xz zstd libmd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + ]; nativeBuildInputs = [ makeWrapper perl diff --git a/pkgs/by-name/dp/dput-ng/package.nix b/pkgs/by-name/dp/dput-ng/package.nix index ababbef6edf0..ec8978f63f7d 100644 --- a/pkgs/by-name/dp/dput-ng/package.nix +++ b/pkgs/by-name/dp/dput-ng/package.nix @@ -5,7 +5,7 @@ nix-update-script, }: let - version = "1.40"; + version = "1.42"; in python3.pkgs.buildPythonApplication { pname = "dput-ng"; @@ -16,8 +16,8 @@ python3.pkgs.buildPythonApplication { domain = "salsa.debian.org"; owner = "debian"; repo = "dput-ng"; - rev = "refs/tags/${version}"; - hash = "sha256-97NrRUmIjrP41NyI4KOEzHLlaqxehZIhSVyx9hRZ0dw="; + tag = "debian/${version}"; + hash = "sha256-v1Q2vPQcghHZXSxnbjZ/0wFVNj1ApKFduUkEhBea1hI="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/dr/dracula-theme/package.nix b/pkgs/by-name/dr/dracula-theme/package.nix index 1346f68d2719..c118df801d0b 100644 --- a/pkgs/by-name/dr/dracula-theme/package.nix +++ b/pkgs/by-name/dr/dracula-theme/package.nix @@ -8,7 +8,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2025-04-01"; + version = "4.0.0-unstable-2025-04-18"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "ceeb13795df115d150fca7c8ae1721b9a618cb3b"; - hash = "sha256-vdA3pkMha+vFQwAspZVLIkNi1VviArN+VUoievdrHZM="; + rev = "82837065c824158d4242c19ea7dded7645b9a9f1"; + hash = "sha256-jOhG8k3pn+sWFTyYIjtmGyi1k6Eye94s7p6wHHsP1W4="; }; propagatedUserEnvPkgs = [ diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix new file mode 100644 index 000000000000..cce9fef8ec3f --- /dev/null +++ b/pkgs/by-name/dr/drawterm/package.nix @@ -0,0 +1,102 @@ +{ + stdenv, + lib, + fetchFrom9Front, + unstableGitUpdater, + installShellFiles, + makeWrapper, + apple-sdk_13, + xorg, + pkg-config, + wayland-scanner, + pipewire, + wayland, + wayland-protocols, + libxkbcommon, + wlr-protocols, + pulseaudio, + nixosTests, + withWayland ? false, +}: +let + withXorg = !(withWayland || stdenv.hostPlatform.isDarwin); +in +stdenv.mkDerivation { + pname = "drawterm"; + version = "0-unstable-2025-03-18"; + + src = fetchFrom9Front { + owner = "plan9front"; + repo = "drawterm"; + rev = "0b43ac046ca81d78e9eca535ab1e92971d30405a"; + hash = "sha256-L0a81zwzIKwnRK/Mu/kW1oHoJCroa+VDNGj7CI90WMQ="; + }; + + enableParallelBuilding = true; + strictDeps = true; + nativeBuildInputs = + [ + installShellFiles + makeWrapper + ] + ++ lib.optionals withWayland [ + pkg-config + wayland-scanner + ]; + + buildInputs = + lib.optionals withWayland [ + pipewire + wayland + wayland-protocols + libxkbcommon + wlr-protocols + ] + ++ lib.optionals withXorg [ + xorg.libX11 + xorg.libXt + ] + ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_13; + + makeFlags = + lib.optional withWayland "CONF=linux" + ++ lib.optional (!(withWayland || stdenv.hostPlatform.isDarwin)) "CONF=unix" + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "CONF=osx-cocoa" + "CC=clang" + ]; + + installPhase = + '' + installManPage drawterm.1 + '' + + lib.optionalString withWayland '' + install -Dm755 -t $out/bin/ drawterm + '' + + lib.optionalString (!(withWayland || stdenv.hostPlatform.isDarwin)) '' + # wrapping the oss output with pulse seems to be the easiest + mv drawterm drawterm.bin + install -Dm755 -t $out/bin/ drawterm.bin + makeWrapper ${pulseaudio}/bin/padsp $out/bin/drawterm --add-flags $out/bin/drawterm.bin + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,bin} + mv gui-cocoa/drawterm.app $out/Applications/ + mv drawterm $out/Applications/drawterm.app/ + ln -s $out/Applications/drawterm.app/drawterm $out/bin/ + ''; + + passthru = { + updateScript = unstableGitUpdater { shallowClone = false; }; + tests = nixosTests.drawterm; + }; + + meta = { + description = "Connect to Plan 9 CPU servers from other operating systems"; + homepage = "https://drawterm.9front.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ moody ]; + platforms = with lib.platforms; linux ++ darwin; + mainProgram = "drawterm"; + }; +} diff --git a/pkgs/by-name/ds/dsda-doom/package.nix b/pkgs/by-name/ds/dsda-doom/package.nix index 96f619706a79..dde6e731f5c5 100644 --- a/pkgs/by-name/ds/dsda-doom/package.nix +++ b/pkgs/by-name/ds/dsda-doom/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "dsda-doom"; - version = "0.28.3"; + version = "0.29.0"; src = fetchFromGitHub { owner = "kraflab"; repo = "dsda-doom"; rev = "v${version}"; - hash = "sha256-66o/k5DvyKxwa0sZPCfSycVRxEhrRhUJXJVz2p817OE="; + hash = "sha256-mcg3GAQ90Qg7d1+/ci/XlTTF2q0tB6j+pp+Fb1Mpcao="; }; sourceRoot = "${src.name}/prboom2"; diff --git a/pkgs/by-name/dt/dt/package.nix b/pkgs/by-name/dt/dt/package.nix index 550d137b206c..aaa9070bf69b 100644 --- a/pkgs/by-name/dt/dt/package.nix +++ b/pkgs/by-name/dt/dt/package.nix @@ -3,21 +3,21 @@ stdenv, fetchFromGitHub, testers, - zig_0_11, + zig_0_12, }: stdenv.mkDerivation (finalAttrs: { pname = "dt"; - version = "1.3.1"; + version = "1.3.1-unstable-2024-07-16"; src = fetchFromGitHub { owner = "so-dang-cool"; repo = "dt"; - rev = "v${finalAttrs.version}"; - hash = "sha256-qHfvHf4T0wWnzqp5FfLg7n7te24xc2aMEdTK3Iia8Q0="; + rev = "0d16ca2867131e99a93a412231465cf68f2e594f"; + hash = "sha256-pfTlOMJpOPbXZaJJvOKDUyCZxFHNLRRUteJFWT9IKOU="; }; - nativeBuildInputs = [ zig_0_11.hook ]; + nativeBuildInputs = [ zig_0_12.hook ]; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; @@ -37,7 +37,8 @@ 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}"; + # TODO: uncomment when dt pushes a new release + # 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; diff --git a/pkgs/by-name/dt/dtool/package.nix b/pkgs/by-name/dt/dtool/package.nix index 3d154e94567f..3420b9e8db97 100644 --- a/pkgs/by-name/dt/dtool/package.nix +++ b/pkgs/by-name/dt/dtool/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,10 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-C0H5cIMMfUPJ2iJCUs1jEu3Ln8CdDgbgstMnH/f9FRY="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; # FIXME: remove patch when upstream version of rustc-serialize is updated cargoPatches = [ ./rustc-serialize-fix.patch ]; diff --git a/pkgs/by-name/du/duckdb/versions.json b/pkgs/by-name/du/duckdb/versions.json index 071631c3216b..e86a40a50599 100644 --- a/pkgs/by-name/du/duckdb/versions.json +++ b/pkgs/by-name/du/duckdb/versions.json @@ -1,5 +1,5 @@ { - "version": "1.2.1", - "rev": "8e52ec43959ab363643d63cb78ee214577111da4", - "hash": "sha256-ez5BBZ+Yw+UkdpI3VvRZrYZPfk3Nkk3JmrJBdg8N+e0=" + "version": "1.2.2", + "rev": "7c039464e452ddc3330e2691d3fa6d305521d09b", + "hash": "sha256-cHQcEA9Gpza/edEVyXUYiINC/Q2b3bf+zEQbl/Otfr4=" } diff --git a/pkgs/by-name/du/dufs/package.nix b/pkgs/by-name/du/dufs/package.nix index b62086b95b52..f7e22cd77abc 100644 --- a/pkgs/by-name/du/dufs/package.nix +++ b/pkgs/by-name/du/dufs/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, installShellFiles, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,10 +22,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - # FIXME: checkPhase on darwin will leave some zombie spawn processes # see https://github.com/NixOS/nixpkgs/issues/205620 doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix index a1176888b5a0..7ee666de7072 100644 --- a/pkgs/by-name/du/dumbpipe/package.nix +++ b/pkgs/by-name/du/dumbpipe/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,13 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-uuY0nh4VHzyM7+cbgyycr5I3IjE0OeQ0eg12qVXe4BQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - SystemConfiguration - ] - ); - meta = with lib; { description = "Connect A to B - Send Data"; homepage = "https://www.dumbpipe.dev/"; diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix index ea3406aa4c01..d212809cf1de 100644 --- a/pkgs/by-name/du/dummyhttp/package.nix +++ b/pkgs/by-name/du/dummyhttp/package.nix @@ -2,8 +2,6 @@ lib, fetchFromGitHub, rustPlatform, - darwin, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-bjNB0aoG9Mrz1JzD80j2Czfg0pfU2uGlFFsi5WO4pdU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Super simple HTTP server that replies a fixed body with a fixed response code"; homepage = "https://github.com/svenstaro/dummyhttp"; diff --git a/pkgs/by-name/du/duply/package.nix b/pkgs/by-name/du/duply/package.nix index c963bc589be8..d3157d64781e 100644 --- a/pkgs/by-name/du/duply/package.nix +++ b/pkgs/by-name/du/duply/package.nix @@ -14,21 +14,24 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "duply"; - version = "2.4"; + version = "2.5.5"; src = fetchurl { - url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.4.x/duply_${version}.tgz"; - hash = "sha256-DCrp3o/ukzkfnVaLbIK84bmYnXvqKsvlkGn3GJY3iNg="; + url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.5.x/duply_${finalAttrs.version}.tgz"; + hash = "sha256-ABryuV5jJNoxcJLsSjODLOHuLKrSEhY3buzy1cQh+AU="; }; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ txt2man ]; postPatch = "patchShebangs ."; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" mkdir -p "$out/share/man/man1" install -vD duply "$out/bin" @@ -45,9 +48,11 @@ stdenv.mkDerivation rec { which ]} "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1" + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Shell front end for the duplicity backup tool"; mainProgram = "duply"; longDescription = '' @@ -57,8 +62,8 @@ stdenv.mkDerivation rec { secure backups on non-trusted spaces are no child's play? ''; homepage = "https://duply.net/"; - license = licenses.gpl2Only; - maintainers = [ maintainers.bjornfor ]; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.bjornfor ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/dv/dvdplusrwtools/package.nix b/pkgs/by-name/dv/dvdplusrwtools/package.nix index e16f95fe7412..49bb2b6e1948 100644 --- a/pkgs/by-name/dv/dvdplusrwtools/package.nix +++ b/pkgs/by-name/dv/dvdplusrwtools/package.nix @@ -5,12 +5,8 @@ fetchpatch, cdrtools, m4, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) IOKit; -in stdenv.mkDerivation rec { pname = "dvd+rw-tools"; version = "7.1"; @@ -76,7 +72,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ m4 ]; - buildInputs = [ cdrtools ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; + buildInputs = [ cdrtools ]; makeFlags = [ "prefix=${placeholder "out"}" diff --git a/pkgs/applications/audio/easyabc/hardcoded-paths.patch b/pkgs/by-name/ea/easyabc/hardcoded-paths.patch similarity index 100% rename from pkgs/applications/audio/easyabc/hardcoded-paths.patch rename to pkgs/by-name/ea/easyabc/hardcoded-paths.patch diff --git a/pkgs/applications/audio/easyabc/default.nix b/pkgs/by-name/ea/easyabc/package.nix similarity index 100% rename from pkgs/applications/audio/easyabc/default.nix rename to pkgs/by-name/ea/easyabc/package.nix diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix index 305dbbd60330..39871a0e8bea 100644 --- a/pkgs/by-name/ea/easytier/package.nix +++ b/pkgs/by-name/ea/easytier/package.nix @@ -5,7 +5,6 @@ rustPlatform, protobuf, nix-update-script, - darwin, withQuic ? false, # with QUIC protocol support }: @@ -29,10 +28,6 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - buildNoDefaultFeatures = stdenv.hostPlatform.isMips; buildFeatures = lib.optional stdenv.hostPlatform.isMips "mips" ++ lib.optional withQuic "quic"; diff --git a/pkgs/by-name/eb/ebusd/package.nix b/pkgs/by-name/eb/ebusd/package.nix index d0549942bcc9..cc2a2e9d7f02 100644 --- a/pkgs/by-name/eb/ebusd/package.nix +++ b/pkgs/by-name/eb/ebusd/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "ebusd"; - version = "24.1"; + version = "25.1"; src = fetchFromGitHub { owner = "john30"; repo = "ebusd"; rev = version; - sha256 = "sha256-+3QOB7/yCgR4j2UGfhWQ5s5sldoNfWSzX7qa//FHeJ4="; + sha256 = "sha256-rj0Wkfk3Tpm58fbCUkgCdHt5MvW+tGgDyUd5COXfBc0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ec/echidna/package.nix b/pkgs/by-name/ec/echidna/package.nix new file mode 100644 index 000000000000..9d551e510535 --- /dev/null +++ b/pkgs/by-name/ec/echidna/package.nix @@ -0,0 +1,120 @@ +{ + lib, + stdenv, + makeWrapper, + haskellPackages, + fetchFromGitHub, + # dependencies + slither-analyzer, +}: + +haskellPackages.mkDerivation rec { + pname = "echidna"; + version = "2.2.6"; + + src = fetchFromGitHub { + owner = "crytic"; + repo = "echidna"; + tag = "v${version}"; + sha256 = "sha256-5nzis7MXOqs0bhx2jrEexjZYZI2qY6D0D7AWO+SPs+A="; + }; + + isExecutable = true; + + buildTools = with haskellPackages; [ + hpack + ]; + + executableHaskellDepends = with haskellPackages; [ + # base dependencies + aeson + base + containers + directory + hevm + MonadRandom + mtl + text + # library dependencies + ansi-terminal + async + base16-bytestring + binary + brick + bytestring + data-bword + data-dword + deepseq + exceptions + extra + filepath + hashable + html-conduit + html-entities + http-conduit + ListLike + optics + optics-core + process + random + rosezipper + semver + signal + split + strip-ansi-escape + time + unliftio + utf8-string + vector + vty + vty-crossplatform + wai-extra + warp + word-wrap + xml-conduit + yaml + # executable dependencies + code-page + filepath + hashable + optparse-applicative + time + with-utf8 + ]; + + executableToolDepends = [ + makeWrapper + ]; + + preConfigure = '' + hpack + ''; + + postInstall = + with haskellPackages; + # https://github.com/NixOS/nixpkgs/pull/304352 + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' + remove-references-to -t ${warp.out} "$out/bin/echidna" + remove-references-to -t ${wreq.out} "$out/bin/echidna" + '' + # make slither-analyzer a runtime dependency + + '' + wrapProgram $out/bin/echidna \ + --prefix PATH : ${lib.makeBinPath [ slither-analyzer ]} + ''; + + doHaddock = false; + + # tests depend on a specific version of solc + doCheck = false; + + homepage = "https://github.com/crytic/echidna"; + description = "Ethereum smart contract fuzzer"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + arturcygan + hellwolf + ]; + platforms = lib.platforms.unix; + mainProgram = "echidna"; +} diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/by-name/ec/ecryptfs/package.nix similarity index 100% rename from pkgs/tools/security/ecryptfs/default.nix rename to pkgs/by-name/ec/ecryptfs/package.nix diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix index b3096e533c7a..2d4846946a6d 100644 --- a/pkgs/by-name/ec/ecs-agent/package.nix +++ b/pkgs/by-name/ec/ecs-agent/package.nix @@ -32,7 +32,7 @@ buildGoModule rec { changelog = "https://github.com/aws/amazon-ecs-agent/raw/v${version}/CHANGELOG.md"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; mainProgram = "agent"; }; } diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json new file mode 100644 index 000000000000..6c0f419eb511 --- /dev/null +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json @@ -0,0 +1,1002 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://jitpack.io": { + "com/github/wille#oslib/d6ee6549bb": { + "jar": "sha256-gsLPIH1GGImqdghCGBWtZM5PNgUlvfBanhKlQOarw3w=", + "pom": "sha256-7wF38tn4fbnw0w7dQy2wLlhqHejMkVb8HcZRgvDh5oA=" + } + }, + "https://nexus.jixxed.nl/nexus/content/repositories/releases/nl": { + "jixxed#opencv/4.5.3-0": { + "jar": "sha256-PwimnmKzejFrZdIsiNLtTExlvRvWKxKPDBbMTe4KhQQ=", + "pom": "sha256-yE9S2bEo5C5Y+j2+eQOHGnpJ1G1Soee7rNFHiRr/pNo=" + }, + "jixxed/lept4j#lept4j/1.16.6": { + "jar": "sha256-nZH3ZJ4mabbNGm4rijF22oOPaMqjPQj9Yb1ry7GX81U=", + "module": "sha256-dIssWUftjqegtJqcPuyCuti0oFhBYZ16cIPjWPlCweA=", + "pom": "sha256-k31BbQcMlLWOjhhkUgrWnOUyb/zKBhRzq8hC6p6d/eY=" + }, + "jixxed/tess4j#tess4j/5.2.9": { + "jar": "sha256-gsiiiVKkAttbXSZs4Pooxy+z+tY/d+mGBpoUMxPkQ2I=", + "module": "sha256-cf6jtMnOwWWJcSa+mJO1j9D21kCWkIhp4E6TzZVOD34=", + "pom": "sha256-twbAdpEaiT5DuA7JosdbWEF/kJbt5K5YpKP6ISDgx28=" + } + }, + "https://plugins.gradle.org/m2": { + "com/cedarsoftware#json-io/4.14.1": { + "jar": "sha256-UY3ynWhbHfjcpYCfEr9udnDY280SKAt/z5mjWNRs/fw=", + "pom": "sha256-4DILOzeTeilHRecS0ZEUBGkLmrL2cNb1UHmtLKhPDHY=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/zaxxer#SparseBitSet/1.3": { + "jar": "sha256-92uFrbDAByGuJnt8/eTaf3HTEhzCFgyfwAwMifjFPIo=", + "pom": "sha256-EY1n40Uymhjf9OvRVX+V8MCrS0y51nh0nWZvkjAAF2g=" + }, + "commons-codec#commons-codec/1.17.1": { + "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=", + "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" + }, + "commons-io#commons-io/2.18.0": { + "jar": "sha256-88oPjWPEDiOlbVQQHGDV7e4Ta0LYS/uFvHljCTEJz4s=", + "pom": "sha256-Y9lpQetE35yQ0q2yrYw/aZwuBl5wcEXF2vcT/KUrz8o=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "net/jsign#jsign-core/7.1": { + "jar": "sha256-92AtTJ/J91V51wwG90cVyEUx5EeHAPcNYw9WgPeMUmo=", + "pom": "sha256-EeW9Bzs4r0LcFMdTXH1ZnDEqMe9HxQHqaTNbvZXwDEk=" + }, + "net/jsign#jsign-crypto/7.1": { + "jar": "sha256-3P5NOHVoAr2A1N52s8a8oHdJEUivci+shVARrLMtorg=", + "pom": "sha256-hN+APkSaW0h9usa4LajKuFrlJQnGas4SAnryjoZIN2c=" + }, + "net/jsign#jsign-gradle-plugin/7.1": { + "jar": "sha256-x01Z+Hu1gbj3eSe4Qofdv0OJKznKrnPirmSa57ziTCY=", + "module": "sha256-oT75n6y0JT26M4h7rNSABL10PDpzrMejv74nEjeI8yY=", + "pom": "sha256-lHnrsn/BXGGCNMRvRXGZWKiYUoTKAMqm7jwcrW2w8+I=" + }, + "net/jsign#jsign-parent/7.1": { + "pom": "sha256-IZZHpKDOVcG4bMrbQRLPsaEkteDcISP0ohsCUqcQMMI=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/32": { + "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" + }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" + }, + "org/apache/commons#commons-collections4/4.4": { + "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", + "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" + }, + "org/apache/commons#commons-lang3/3.17.0": { + "jar": "sha256-bucx31yOWil2ocoCO2uzIOqNNTn75kyKHVy3ZRJ8M7Q=", + "pom": "sha256-NRxuSUDpObHzMN9H9g8Tujg9uB7gCBga9UHzoqbSpWw=" + }, + "org/apache/commons#commons-math3/3.6.1": { + "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=", + "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/48": { + "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" + }, + "org/apache/commons#commons-parent/71": { + "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM=" + }, + "org/apache/commons#commons-parent/73": { + "pom": "sha256-TtRFYLB/hEhHnf0eg6Qiuk6D5gs25RsocaxQKm1cG+o=" + }, + "org/apache/commons#commons-parent/78": { + "pom": "sha256-Ai0gLmVe3QTyoQ7L5FPZKXeSTTg4Ckyow1nxgXqAMg4=" + }, + "org/apache/commons#commons-text/1.13.0": { + "jar": "sha256-HjI6UBEn33jtCYfzRdadZdDqf6PU+1s/hKrro6iyDzg=", + "pom": "sha256-1GYUvcptEZXDM7qfcwzQhYXE8zKkPqe5C2A1rYBIcdg=" + }, + "org/apache/groovy#groovy-bom/4.0.22": { + "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", + "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" + }, + "org/apache/logging#logging-parent/11.3.0": { + "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" + }, + "org/apache/logging/log4j#log4j-api/2.24.3": { + "jar": "sha256-W0oKDNDnUd7UMcFiRCvb3VMyjR+Lsrrl/Bu+7g9m2A8=", + "pom": "sha256-vAXeM1M6Elmtusv8yCbNZjdqLZxO5T+4NgCfRKRbgjk=" + }, + "org/apache/logging/log4j#log4j-bom/2.24.3": { + "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg=" + }, + "org/apache/logging/log4j#log4j/2.24.3": { + "pom": "sha256-wUG0hj/AzqtYOJShPh+eUsAfwtdYcn1nR/a5nVBA87E=" + }, + "org/apache/poi#poi/5.4.0": { + "jar": "sha256-rOceeYcwWeJzA2Z0VgtQw9a5RbfKFosNSWKtdlCuHuw=", + "pom": "sha256-rK0VkHGQpeZ7hZfM+wEx795ZbC+gXYrZ9LnGHaMfNkU=" + }, + "org/beryx#badass-jlink-plugin/3.1.1": { + "jar": "sha256-nSZZZ0y6Ic/QwU2qCoRboSrTOu9Oi8FSrqHAr9fYRWg=", + "module": "sha256-SbchA0l5YXx6x1VVyjjSeL1ZKwLIPY6DAAJHfc7Zzz8=", + "pom": "sha256-gpCklq0NVdcv9gBvCrO3NBSX1CBvlRs/+c/cFkKVKJs=" + }, + "org/bouncycastle#bcpkix-lts8on/2.73.7": { + "jar": "sha256-WHRYb7Se7ryZuH8SNShnm8Wlw4j+pL+E0semmQguKK0=", + "pom": "sha256-D3mEND0EU+Y5uoyNTXwNGFLfA8ye4UkoQgi/5KPnH44=" + }, + "org/bouncycastle#bcprov-lts8on/2.73.7": { + "jar": "sha256-LIzWo/7zyhSubiig3gDBbWJ2d9KML/AqAFE/rrK3/7E=", + "pom": "sha256-4MwaYuJQsJ+WbzbXnGUU82JXnb+cNy8t3qlXrd7C+qw=" + }, + "org/bouncycastle#bcutil-lts8on/2.73.7": { + "jar": "sha256-03ALDCPuKZzSRYYhZyIGpfNIlR84t+iOk7IaHxu+Zxg=", + "pom": "sha256-J4GHqnKeqbOMnpcHM5JeJNCsqT+j3yQ1iZ4SZKUDVrU=" + }, + "org/bouncycastle/bcutil-lts8on/maven-metadata": { + "xml": { + "groupId": "org.bouncycastle", + "lastUpdated": "20241107225957", + "release": "2.73.7" + } + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/gradlex#extra-java-module-info/1.11": { + "jar": "sha256-Z3+h2llhAw5z7rmNUoxF/rX69fXLH1ts3297I7L3YCk=", + "module": "sha256-HupoMVnjhje5y70/1RGeDKP1R5vGPfKoItJ+Cv4Yxu4=", + "pom": "sha256-JmY0IO3vtV1IsgYLN6K8DH0UociY2vZ0v1YuM/8LYnE=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.0": { + "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", + "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" + }, + "org/junit#junit-bom/5.11.0-M2": { + "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", + "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg=" + }, + "org/junit#junit-bom/5.11.2": { + "module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=", + "pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm/9.7.1": { + "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=", + "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + } + }, + "https://repo.maven.apache.org/maven2": { + "ch/qos/logback#logback-classic/1.5.17": { + "jar": "sha256-5700LZHlChXx4W+ApSbOff/EGNr3PNIJTbT4AsAgSIA=", + "pom": "sha256-qV4brkazX89CLuy93poeCCBhDtWb6r2D7uIZIYG8rL8=" + }, + "ch/qos/logback#logback-core/1.5.17": { + "jar": "sha256-L71fAnKxo1RuV0CliOc14HGs0M0CJuBI9xGUajDqwzc=", + "pom": "sha256-cWqhFMrn3xr+FcvuqN35EtWtdg82p6ir04+whl9F2G4=" + }, + "ch/qos/logback#logback-parent/1.5.17": { + "pom": "sha256-mnyL+zxKF2l86OrTojo8ysvccjphQkF98KrrqMHtBno=" + }, + "com/fasterxml#oss-parent/30": { + "pom": "sha256-0OJUZlIJgf9X7K29yUA00dFpA7kulQvp+dQkQcWU+fA=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml#oss-parent/61": { + "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" + }, + "com/fasterxml/jackson#jackson-base/2.17.2": { + "pom": "sha256-fPnFn70UyQVnRxN7kNcKleh3YN/huCRWufAjF9W1b68=" + }, + "com/fasterxml/jackson#jackson-base/2.18.3": { + "pom": "sha256-1bv9PIRFIw5Ji2CS3oCa/WXPUE0BOTLat7Pf1unzpP0=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, + "com/fasterxml/jackson#jackson-bom/2.18.3": { + "pom": "sha256-8dTGrrMhGGUMgF/pu8XulA+o8s19DwT6Q2BVHponspA=" + }, + "com/fasterxml/jackson#jackson-bom/2.9.4": { + "pom": "sha256-ez/Ek1+/U/x5ypo75e1NLIL8pMU/hF0+EzgpMTic4CE=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/fasterxml/jackson#jackson-parent/2.18.1": { + "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw=" + }, + "com/fasterxml/jackson#jackson-parent/2.9.1": { + "pom": "sha256-fATwKdKA+7gnTnUCHckPObLGIv40mdrwf8NQgcLZ2f8=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.17.2": { + "jar": "sha256-hzpgbiNQeWn5u76pOdXhknSoh3XqWhabp+LXlapRVuE=", + "module": "sha256-KMxD6Y54gYA+HoKFIeOKt67S+XejbCVR3ReQ9DDz688=", + "pom": "sha256-Q3gYTWCK3Nu7BKd4vGRmhj8HpFUqcgREZckQQD+ewLs=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.18.3": { + "jar": "sha256-iqV0DYC1pQJVCLQbutuqH7N3ImfGKLLjBoGk9F+LiTE=", + "module": "sha256-RkWF2yH0irFZ6O9XnNfo5tMHoEdhGZZRw+zBf05ydF0=", + "pom": "sha256-ucmLqeKephtpPUyMgBlo/qriILKyACNkp7zsUkmYOEs=" + }, + "com/fasterxml/jackson/core#jackson-core/2.17.2": { + "jar": "sha256-choYkkHasFJdnoWOXLYE0+zA7eCB4t531vNPpXeaW0Y=", + "module": "sha256-OCgvt1xzPSOV3TTcC1nsy7Q6p8wxohomFrqqivy38jY=", + "pom": "sha256-F4IeGYjoMnB6tHGvGjBvSl7lATTyLY0nF7WNqFnrNbs=" + }, + "com/fasterxml/jackson/core#jackson-core/2.18.3": { + "jar": "sha256-BWvE0+XlPOghRQ+pez+eD43eElz22miENTux8JWC4dk=", + "module": "sha256-mDbVp/Iba8VNfybeh8izBd3g5PGEsqyJUOmhsd9Hw0A=", + "pom": "sha256-N9xrj2ORpHCawhXKmPojQcbdZWE8InfZak/YKi9Q48k=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.17.2": { + "jar": "sha256-wEmT8zwPhFNCZTeE8U84Nz0AUoDmNZ21+AhwHPrnPAw=", + "module": "sha256-9HC96JRNV9axUMqov1O7mCqZ6x1lkecxr8uXKrPddx8=", + "pom": "sha256-0kUGmLrpC+M48rmfrtppTNRQrbUhJCE+elO0Ehm1QGI=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.18.3": { + "jar": "sha256-UQvdp1p6YYbFvzO4USOUiKFFCQauV1cSHy4cxIp+EI8=", + "module": "sha256-ZCqggPhbIAV3ifrPKsaibhR4NbUDPidSDstpe8RD/Lo=", + "pom": "sha256-5Y9IrBTk29SFldaeILrTUBnsEoFRTvfvFV4YByraYX8=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.17.2": { + "jar": "sha256-lBvNixOBuzsNcm+rQWJPqOzg7nts8oYK2V6BV85nM3Y=", + "module": "sha256-snbSUVf4i+6mnT9ENGWFZLcfMazeHUsaFPiYS+lTw0M=", + "pom": "sha256-7eVVk8YoXTmdlgc6GQy5v/QlZ5WqjWO5AXcrsxI+SDs=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.17.2": { + "pom": "sha256-5pgyMzCpqCySDlqJtlsPciXI5zPBIqGPeWoEpuMfpcs=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.18.3": { + "jar": "sha256-H1F6+RrOVBUFJc2zCgEvyhmlNhlFZHVvWAwhrPx+BKA=", + "module": "sha256-7QX+6N/FAwRMH4PwROBtcYwzYEK8FzqloevfdzQXyG8=", + "pom": "sha256-/14lbEPjXWUtZhVeVmqYYqWbuzCM3GNvSIi96PVq9Tw=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.3": { + "jar": "sha256-Lh3y/rk2g9N5lpzq94t2oKwRXGfQRnGVj9307tbmQB0=", + "module": "sha256-Kt37kDio5g8OlWOZLC3sdYpQxDvH8ECVnYXbbp1o04w=", + "pom": "sha256-LIA9pFO2CM4OQ6FscvAaWf5Dg++oV6jxszQhc2bqJk0=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.18.3": { + "pom": "sha256-rehezbxjw22XyQcnNfQfeUGO+K0EA755gtr/9BxfruM=" + }, + "com/github/jai-imageio#jai-imageio-core/1.4.0": { + "jar": "sha256-itPGjp7/+xCsh/+LxYmt9ksEpynFGUwHnv0GQ2B/1yo=", + "pom": "sha256-Ac0LjPRGoe4kVuyeg8Q11gRH0G6fVJBMTm/sCPfO8qw=" + }, + "com/github/scribejava#scribejava-core/8.3.3": { + "jar": "sha256-sh6swSmDsN5YWwXvMHs18BLkjyiYpKzbpSm7sNN5xEM=", + "pom": "sha256-RTjKMQCqU9DsNChWti1s/MSkhMs0eV9V2z1DTOW2trY=" + }, + "com/github/scribejava#scribejava-java8/8.3.3": { + "jar": "sha256-1d1We3CV8hdA2jD2kddiUh0QWwfiW8TWaP/aHAtTcMw=", + "pom": "sha256-BB+QpyayExaVyzy1Z/rUDCn/jPl+qB/dfYrROr7LoXI=" + }, + "com/github/scribejava#scribejava/8.3.3": { + "pom": "sha256-KkpDgAox1XD2wY1TmtgWIZ2xgTuY/gsjq2X4mg4N+lc=" + }, + "com/github/virtuald#curvesapi/1.08": { + "jar": "sha256-rZWwi4u/nX0X5eAIFImPojMk8yvFti8aN4AealbOAHk=", + "pom": "sha256-Ny4ZrFGNWM5atVPKgDiMf+mSDFVU0TYtGGRabdvF0SY=" + }, + "com/google/code/findbugs#annotations/1.3.9": { + "jar": "sha256-caURebGKBtZ7JYLc4pM0+hFsS8N8syktVbcIB1FFNm4=", + "pom": "sha256-8RHyLXx/ZkZzjuYxx+43p0HoDhScRLHWmKfXF2OxjrE=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.11.0": { + "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" + }, + "com/google/code/gson#gson/2.11.0": { + "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", + "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" + }, + "com/google/code/javaparser#javaparser/1.0.11": { + "jar": "sha256-07/l/m/qZK8XuRm58nlY9cMvmRJbuAjMgtEFW5lZfYI=", + "pom": "sha256-3X6lRUWd+GeIiSwv+0ZTXflvVyvAumeVHm5WY4mxSwA=" + }, + "com/google/errorprone#error_prone_annotations/2.27.0": { + "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", + "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" + }, + "com/google/errorprone#error_prone_annotations/2.36.0": { + "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=", + "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw=" + }, + "com/google/errorprone#error_prone_parent/2.27.0": { + "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" + }, + "com/google/errorprone#error_prone_parent/2.36.0": { + "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw=" + }, + "com/google/guava#failureaccess/1.0.2": { + "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", + "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/33.4.0-jre": { + "pom": "sha256-Okme00oNnuDxvMOSMAIaHNTi990EJqtoRPWFRl1B3Nc=" + }, + "com/google/guava#guava/33.4.0-jre": { + "jar": "sha256-uRjJin5E2+lOvZ/j5Azdqttak+anjrYAi0LfI3JB5Tg=", + "module": "sha256-gg6BfobEk6p6/9bLuZHuYJJbbIt0VB90LLIgcPbyBFk=", + "pom": "sha256-+pTbQAIt38d1r57PsTDM5RW5b3QNr4LyCvhG2VBUE0s=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/3.0.0": { + "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=", + "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc=" + }, + "com/ibm/icu#icu4j/68.1": { + "jar": "sha256-B+T4suXJvOIq/BXtmAY8D8k29eYT2CD+rnypB17FUlk=", + "pom": "sha256-R/+TDdpm090lSpWVqG7GuYUGTrTGge4gxla02Au7G7Q=" + }, + "com/sun/codemodel#codemodel-project/2.6": { + "pom": "sha256-8lrv48rP+RHhQrssqJIzSzfoYDJ2jDSvI6qCUL3IA0c=" + }, + "com/sun/codemodel#codemodel/2.6": { + "jar": "sha256-JzWBbWj4WtyhQReZUYiWU841Wufnq065KjIuoO9nF2c=", + "pom": "sha256-zLydWo8aIDows0R6Ax8OQulTuhTJ3TieFl24lK2zEBw=" + }, + "com/zaxxer#SparseBitSet/1.3": { + "jar": "sha256-92uFrbDAByGuJnt8/eTaf3HTEhzCFgyfwAwMifjFPIo=", + "pom": "sha256-EY1n40Uymhjf9OvRVX+V8MCrS0y51nh0nWZvkjAAF2g=" + }, + "commons-codec#commons-codec/1.17.1": { + "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=", + "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" + }, + "commons-io#commons-io/2.17.0": { + "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=", + "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek=" + }, + "commons-io#commons-io/2.18.0": { + "jar": "sha256-88oPjWPEDiOlbVQQHGDV7e4Ta0LYS/uFvHljCTEJz4s=", + "pom": "sha256-Y9lpQetE35yQ0q2yrYw/aZwuBl5wcEXF2vcT/KUrz8o=" + }, + "commons-io#commons-io/2.4": { + "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI=" + }, + "commons-lang#commons-lang/2.6": { + "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", + "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "de/saxsys#mvvmfx-parent/1.8.0": { + "pom": "sha256-tp0rfN1IaPX4/rFgaV7mvP/PsIf7LYGeXXW7o1AjbJs=" + }, + "de/saxsys#mvvmfx-testing-utils/1.8.0": { + "jar": "sha256-9RoATqZIkdSi+ZH1Ou1TZHW4/yCZtaaS5Ooj14HprZs=", + "pom": "sha256-7ilAMnc/PJ3pzZ1SVpCoYrOzoerSjZJtc5gkdoVB3vo=" + }, + "eu/lestard#doc-annotations/0.2": { + "jar": "sha256-Yl5U0tQDYG0hdD/PbYsHJD7yhEQ9pNwvpBKUQX34Glw=", + "pom": "sha256-YT1F0/kGPP++cdD0u1U1yHa+JOOkeWTXEFWqCDRBJI4=" + }, + "io/freefair/gradle#lombok-plugin/8.13": { + "jar": "sha256-fflln33kA74dOIdl++dhqewWdlHaajzQbouDynEYmaU=", + "module": "sha256-mXEiI3+Zn2jUIX6psNFzZUrrbU/c4k8Hn4+FE0RrT18=", + "pom": "sha256-L0O8PILyGGcy2G82s+P+rW5Sw1Ckflr1bQ1dFOjRmGo=" + }, + "io/github/classgraph#classgraph/4.8.179": { + "jar": "sha256-FlWDV/I0BSNwEJEnpF1pqb1thkaSVZR5JjRIbcSLFZ0=", + "pom": "sha256-CWp5YnTWPaeMCTueed63lFJp3CK8F+ZqKYhazkQwaJs=" + }, + "io/github/pustike#commons-csv/1.7.0": { + "jar": "sha256-PB0BZmOIW/KPqgi3rE//Ewin5PFd6BZvd2D5jC5m3LI=", + "pom": "sha256-UYDXyvGI2yrRUaUnH7E633Yr0vKsMA67chuOWbCgEzY=" + }, + "io/github/pustike#pustike-maven-parent/0.1.2": { + "pom": "sha256-plHNjRj4HWkfRLASOeVqdTyLrB7qXCv5Pm7MrITyyfc=" + }, + "io/github/secretx33#path-matching-resource-pattern-resolver/0.1": { + "jar": "sha256-IGrMJabQ3GkpCeyt1fvgszqdXmjNYtd8TK7ueV8g2Co=", + "module": "sha256-xHicQ5mvi3Tvfn92kaJMaNPKWZpEAHYY8tpJ5PCdyu4=", + "pom": "sha256-ZMltCzuWkUhheYf0ZSPZAbT7pl4QHgtJmN8rNoeTrYA=" + }, + "io/netty#netty-bom/4.1.22.Final": { + "pom": "sha256-Bfr/tDn8I95kagaujM1hc0Sz0xcpVXH5PpgykGHZNa8=" + }, + "io/projectreactor#reactor-bom/Bismuth-SR7": { + "pom": "sha256-8V34qRAvk+7YOr1Aw5XxauNsUKmmB+llR0KUKr49NDk=" + }, + "io/reactivex/rxjava3#rxjava/3.1.10": { + "jar": "sha256-6fJW+egFVy3V/UWxQNs2DX3ERNDDgwSbLT1+vwXYSqs=", + "module": "sha256-rwV/vBEyR6Pp/cYOWU+dh2xPW8oZy4sb2myBGP9ixpU=", + "pom": "sha256-EeldzI+ywwumAH/f9GxW+HF2/lwwLFGEQThZEk1Tq60=" + }, + "io/sentry#sentry/8.4.0": { + "jar": "sha256-TFc6haFIX5k+Uuy0uXI/T/QVqueFWH1RCI+n56jZw98=", + "module": "sha256-5yIJjgS/2HbMLx9pBPG8aH8bWfebrQdkHB+OogYVcdQ=", + "pom": "sha256-wuHcDpGz4k39fPrdOMEiSRYg1tlJ4rdi7adB1F3Z3BE=" + }, + "jakarta/json/bind#jakarta.json.bind-api/2.0.0": { + "jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=", + "pom": "sha256-AXlsHbeq949i6pb7CHZalZb8StYYdCxtJk5F4BrmuFU=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "jakarta/validation#jakarta.validation-api/3.0.2": { + "jar": "sha256-KRwl5pEMxqfr2W1Ma66/bXw3Z2xUgsLZYUbpAbYsH8k=", + "pom": "sha256-CnucYyeWiv4NgvfPT6y9p+FXloxYCNaby4AZhjspjcQ=" + }, + "javax/json/bind#javax.json.bind-api/1.0": { + "jar": "sha256-zTvjkfWZ1L71m/sVUleta5HkUh0ZuOlysN+1LfsMX8E=", + "pom": "sha256-LjhZwbI5E9p6sDuwsY2ITXMKCmPE/xda6ZGJnz/R7h8=" + }, + "javax/servlet#javax.servlet-api/4.0.1": { + "jar": "sha256-g6A92HfTZ0V28Np7kHVchSSvCZzPBgf8YaqXFTWtfGA=", + "pom": "sha256-FAVeYVW4oqYype7GoeW+DAoLo4D36T+ctMuPfk+Vm/E=" + }, + "javax/validation#validation-api/2.0.1.Final": { + "jar": "sha256-mHO0bfGDPJ7o9bwf9oUzdRFdrdiJe8taDf+1hIg17mw=", + "pom": "sha256-q7nT5k03c0RnMqMO6gsbWmOIi7FDMdKioY8zhdGkw4k=" + }, + "joda-time#joda-time/2.13.0": { + "jar": "sha256-qbRQ2W2QYW+f5WV6KThbTQB3+Z+LyAhB+T4lRaPNYj4=", + "pom": "sha256-z3axJyUkKrwNv2c0z4nMKddt3Itnaklq1/xA0cUVUkM=" + }, + "joda-time#joda-time/2.4": { + "pom": "sha256-hvCkCbZaMW7tZ5shz1hLkhe1WzqJLCz8UIZlNOdvXiQ=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/bytebuddy#byte-buddy-agent/1.15.11": { + "jar": "sha256-MW0sB5XCpNTEdW8ub5NJg3x0MKw04Ed+rYdNBfXMGeU=", + "pom": "sha256-tfoTlvFHl7jYCIJ+d0O6il8gO0iJvjLklj1EvV7XWag=" + }, + "net/bytebuddy#byte-buddy-parent/1.15.11": { + "pom": "sha256-jcUZ16PnkhEqfNhB6vvsTwDbxjPQha3SDEXwq0dspJY=" + }, + "net/bytebuddy#byte-buddy/1.15.11": { + "jar": "sha256-+giZiq4ee9roO94HEsUOhETXHA4MGWuyJHrejUrQ65A=", + "pom": "sha256-IFuLJUGWcX6B2tZyu4aacZr8lt8pf5fYEe/+H0NlPa4=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "net/java#jvnet-parent/5": { + "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" + }, + "net/java/dev/jna#jna-platform/5.17.0": { + "jar": "sha256-t+PUbIe60utAmw5wSRa82BIGFo41cxLf3dDiU2ec2eA=", + "pom": "sha256-CjC3l622giFH75jLJJ7z+/SiQ1QqqGv59C+tnmgwWkQ=" + }, + "net/java/dev/jna#jna/5.17.0": { + "jar": "sha256-s6lAjnxR4I7w47/MCPRD9uwPYZG6jNfBjVPSsi5b28A=", + "pom": "sha256-UBoP8F2EpK0Q9t4lvpT0k5i3CjG+jzoO2fTGtE++/uQ=" + }, + "net/rdrei/android/buildtimetracker#gradle-plugin/0.11.1": { + "jar": "sha256-VTLp3rXka/R3KpkXFRrW4TqRLj8jZH8ffuoi/DsLTsg=", + "pom": "sha256-7Q14MGZb9YiDq6YmLjFkhd8K1MfrNHPbLVCV3vKN8UE=" + }, + "net/sf/opencsv#opencsv/2.3": { + "jar": "sha256-3Aulv/YUDckjOZcwJqDsvdwqOwG91G7Z0WvswvbXjeY=", + "pom": "sha256-V/VgdWXWqQ3uZyKAHUUkgT2dJ4UEbylUoYhh379KIUk=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/32": { + "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" + }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" + }, + "org/apache#apache/7": { + "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + }, + "org/apache#apache/9": { + "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" + }, + "org/apache/commons#commons-collections4/4.4": { + "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", + "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" + }, + "org/apache/commons#commons-compress/1.27.1": { + "jar": "sha256-KT2A9UtTa3QJXc1+o88KKbv8NAJRkoEzJJX0Qg03DRY=", + "pom": "sha256-34zBqDh9TOhCNjtyCf3G0135djg5/T/KtVig+D+dhBw=" + }, + "org/apache/commons#commons-compress/1.8": { + "jar": "sha256-nPUKdbYsyFMU/43jSUkoOwTi3E3KEuWMYoP3M1i3tuQ=", + "pom": "sha256-OPhEKHDCaR2YIlGfLP+46JxwQQBQt8RsuhdqiCGeRCk=" + }, + "org/apache/commons#commons-lang3/3.16.0": { + "jar": "sha256-CHCd101gK3Bc5AF9JlRCEAVqS6WD1bIMCTc0Bv56APg=", + "pom": "sha256-4oA4OVbC5ywd6zowezt18F7kNkm31D8CFfe2x7Fe6iw=" + }, + "org/apache/commons#commons-lang3/3.17.0": { + "jar": "sha256-bucx31yOWil2ocoCO2uzIOqNNTn75kyKHVy3ZRJ8M7Q=", + "pom": "sha256-NRxuSUDpObHzMN9H9g8Tujg9uB7gCBga9UHzoqbSpWw=" + }, + "org/apache/commons#commons-math3/3.6.1": { + "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=", + "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA=" + }, + "org/apache/commons#commons-parent/17": { + "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" + }, + "org/apache/commons#commons-parent/25": { + "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo=" + }, + "org/apache/commons#commons-parent/33": { + "pom": "sha256-U9ABE1Li5RBvN52vzNrHdU7G8PeCQ8AwXklp9azd+Ps=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/48": { + "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" + }, + "org/apache/commons#commons-parent/69": { + "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" + }, + "org/apache/commons#commons-parent/71": { + "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM=" + }, + "org/apache/commons#commons-parent/72": { + "pom": "sha256-Q0Xev8dnsa6saKvdcvxn0YtSHUs5A3KhG2P/DFhrIyA=" + }, + "org/apache/commons#commons-parent/73": { + "pom": "sha256-TtRFYLB/hEhHnf0eg6Qiuk6D5gs25RsocaxQKm1cG+o=" + }, + "org/apache/commons#commons-parent/74": { + "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss=" + }, + "org/apache/commons#commons-parent/78": { + "pom": "sha256-Ai0gLmVe3QTyoQ7L5FPZKXeSTTg4Ckyow1nxgXqAMg4=" + }, + "org/apache/commons#commons-text/1.12.0": { + "jar": "sha256-3gIyV/8WYESla9GqkSToQ80F2sWAbMcFqTEfNVbVoV8=", + "pom": "sha256-stQ0HJIZgcs11VcPT8lzKgijSxUo3uhMBQfH8nGaM08=" + }, + "org/apache/groovy#groovy-bom/4.0.22": { + "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", + "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" + }, + "org/apache/logging#logging-parent/1": { + "pom": "sha256-NLK/T1MagJFolhZy/0GdGr+WcluN/lKYDwDIxOsTS9Y=" + }, + "org/apache/logging#logging-parent/11.3.0": { + "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" + }, + "org/apache/logging/log4j#log4j-api/2.24.3": { + "jar": "sha256-W0oKDNDnUd7UMcFiRCvb3VMyjR+Lsrrl/Bu+7g9m2A8=", + "pom": "sha256-vAXeM1M6Elmtusv8yCbNZjdqLZxO5T+4NgCfRKRbgjk=" + }, + "org/apache/logging/log4j#log4j-bom/2.10.0": { + "pom": "sha256-8CEjRUmwLxK23xRaaw5ixrl4FCfjDjckmgX2XF3R7WY=" + }, + "org/apache/logging/log4j#log4j-bom/2.24.2": { + "pom": "sha256-NQKIlCeybxfvStgWgCxJtJQ/DJOXJoYdEmPlenKiMEY=" + }, + "org/apache/logging/log4j#log4j-bom/2.24.3": { + "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg=" + }, + "org/apache/logging/log4j#log4j/2.24.3": { + "pom": "sha256-wUG0hj/AzqtYOJShPh+eUsAfwtdYcn1nR/a5nVBA87E=" + }, + "org/apache/pdfbox#fontbox/2.0.26": { + "jar": "sha256-lGdMfRDqRdmw3BA4eJJjf8jvtcadLnJpTxxm/rm7btc=", + "pom": "sha256-/9HyFyWhzqeUvBLaOkkbcuFtvI0C4hxkBytWlulTaEo=" + }, + "org/apache/pdfbox#jbig2-imageio/3.0.4": { + "jar": "sha256-KcspUWIvEKz2H9BlbE5vpVYhlKkJX3odJqpCbi9rF+s=", + "pom": "sha256-KOp8SskuCYX3lqi8aJCnvviSZwetrf0eLIVsmwvho4s=" + }, + "org/apache/pdfbox#pdfbox-debugger/2.0.26": { + "jar": "sha256-3CEgFauTVbQKUuxoedRz3/8gXNBZgvJIIjtON2CIjck=", + "pom": "sha256-yifQaKzj1+7LJYTubcnnHA9BM712dI3UmA3U6HbQDGs=" + }, + "org/apache/pdfbox#pdfbox-parent/2.0.26": { + "pom": "sha256-AbK5hUr4mKXO1gWzRpbLY6QFRc0TID9jILvltoDjPD0=" + }, + "org/apache/pdfbox#pdfbox-tools/2.0.26": { + "jar": "sha256-pzhZchSiCFreKRcr6GAmdIW95JAGY63ZUS9vy+qXzU8=", + "pom": "sha256-Gj86SvqIlLz1A5vKNk8wOUxtUqaUeDLm6W8tZa5dxY8=" + }, + "org/apache/pdfbox#pdfbox/2.0.26": { + "jar": "sha256-tG67QUA4S0WjnpHiO1lc6dzYujqe6RTxX0CkKp+AU3M=", + "pom": "sha256-KNkHvwQvNchyx5J0uBE1zIs9EE0p38twug3vly8oVyg=" + }, + "org/apache/poi#poi-ooxml-lite/5.4.0": { + "jar": "sha256-u1qKbIMyec7VGvtgQqoVrl1coxLuaC5XDiORe1IrB54=", + "pom": "sha256-YQpkM3ly/xl/ozbmjHfmOVWxFYa8Htsfxnk55FUvF+I=" + }, + "org/apache/poi#poi-ooxml/5.4.0": { + "jar": "sha256-mGk0Qu19RHkd5KV5YrbIIK5njg66nPhUaBti/2LJYR0=", + "pom": "sha256-WI8k6TVvKMHQmJw0q15ia/NIq8Aie4rIy0ZmpPgICnY=" + }, + "org/apache/poi#poi/5.4.0": { + "jar": "sha256-rOceeYcwWeJzA2Z0VgtQw9a5RbfKFosNSWKtdlCuHuw=", + "pom": "sha256-rK0VkHGQpeZ7hZfM+wEx795ZbC+gXYrZ9LnGHaMfNkU=" + }, + "org/apache/xmlbeans#xmlbeans/5.3.0": { + "jar": "sha256-bMado7TTW4PF5HfNTauiBORBCYM+NK8rmoosh4gomRc=", + "pom": "sha256-kG0Z2CtlNlFIxGTw3znNwzkeJ5/kYPBZAIukzofJD1c=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/assertj#assertj-core/3.27.3": { + "jar": "sha256-W4omIF9tXqYK2c5lzkpAoq/kxIq+7GG9B0CgiMJOifU=", + "pom": "sha256-jrN+QWt4B+e/833QN8QMBrlWk6dgWcX7m+uFSaTO19w=" + }, + "org/checkerframework#checker-qual/3.43.0": { + "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=", + "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=", + "pom": "sha256-kxO/U7Pv2KrKJm7qi5bjB5drZcCxZRDMbwIxn7rr7UM=" + }, + "org/controlsfx#controlsfx/11.2.1": { + "jar": "sha256-63VY0JTDa4Yw6oqab40k+K9F0ak6N14R4gbXbAgiFDA=", + "pom": "sha256-veC6xL8EPqp19uTOEbpXfHneak+5Mfd1e93Y36MwKTc=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/ee4j#project/1.0.9": { + "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" + }, + "org/eclipse/jetty#jetty-bom/9.4.8.v20171121": { + "pom": "sha256-XGevE5TfPI1hIb5IJZBXONeF8MdwavuFUEofoi1dhN4=" + }, + "org/eclipse/parsson#jakarta.json/1.1.7": { + "jar": "sha256-WQX1IoOnSR4GulhVYQPUXDGZpCYCq8021RDO2mVJD/A=", + "pom": "sha256-93B73rz8Qp+mp0HmwoVRFWD3e3QCyneU5hE0/XYfBMo=" + }, + "org/eclipse/parsson#parsson-bundles/1.1.7": { + "pom": "sha256-2YsPO+YvMNOU4FQabtJeq+MMN7kYd88c4tjjo1vIJHo=" + }, + "org/eclipse/parsson#project/1.1.7": { + "pom": "sha256-r171oT3deNwLoRUh3IOhKkVytRPILxAbsxDxGGxccU0=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/jboss#jboss-parent/20": { + "pom": "sha256-EPDPw9IEh4JYXQ2yWkN40BAvn0hQy/5v1sWf4tI6gb8=" + }, + "org/jboss#jboss-parent/9": { + "pom": "sha256-FMdH0KO7ovUps/hgsHiA+xzvICZW5mSc2iy5jbY+x54=" + }, + "org/jboss#jboss-vfs/3.2.16.Final": { + "jar": "sha256-UXVXDX63voy3azf//+HSS1w3pqcdWuf82khHM65KdR4=", + "pom": "sha256-YUO95rZLf0gG3jFCkvJ508tL8Lb+RWaSbB4iKu4E3Mo=" + }, + "org/jboss/logging#jboss-logging/3.1.4.GA": { + "jar": "sha256-SGo2AO/ihtfjgOVw+Ol8rKCxStg2fEo4oyYaCNww3Ug=", + "pom": "sha256-56t6X2Bh4kP/bEvAuTggWhHqyq5+GvNDhpB8jaPOql4=" + }, + "org/jfxtras#jmetro/11.6.16": { + "jar": "sha256-X6v+k5kULSxCzepdifdJ0n1e8N01698l4LYwkspZ3vE=", + "pom": "sha256-zRJGTYfPiIZTRNQ12wQtbuNsHgs+C+ik+orKAn4r/Ws=" + }, + "org/jsonschema2pojo#jsonschema2pojo-core/1.2.2": { + "jar": "sha256-0epGqRFUHRDrKehIOPdvBmZkoJqOZuHUmPyQzcuyffo=", + "pom": "sha256-mtHVe8hrJzXr7xqJinGIgJR8I7wa95dJ0J702YzRluE=" + }, + "org/jsonschema2pojo#jsonschema2pojo-gradle-plugin/1.2.2": { + "jar": "sha256-OBH9Jv72Sa+cgkMzcz3Iy6KiaNjViqr91z98XAMDZJI=", + "pom": "sha256-enXFZUIwx7+kFKQB96w4vzMzuclEZxomD0pOazBFfJA=" + }, + "org/jsonschema2pojo#jsonschema2pojo/1.2.2": { + "pom": "sha256-PEgC9gguyH1+igs206MyaDTRj9c8E5EM8pFrhQvNrDM=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.0": { + "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", + "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" + }, + "org/junit#junit-bom/5.11.0-M2": { + "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", + "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg=" + }, + "org/junit#junit-bom/5.11.2": { + "module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=", + "pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI=" + }, + "org/junit#junit-bom/5.12.1": { + "module": "sha256-TdKqnplFecYwRX35lbkZsDVFYzZGNy6q3R0WXQv1jBo=", + "pom": "sha256-fIJrxyvt3IF9rZJjAn+QEqD1Wjd9ON+JxCkyolAcK/A=" + }, + "org/junit/jupiter#junit-jupiter-api/5.12.1": { + "jar": "sha256-pAHgtgNz7fffCWLCXrMhPkUaR3h5LTOnaHbDuKW7IJs=", + "module": "sha256-iv9r5FYIFhBl7mO4QDyfKTE6HdnzkfP5eIVlpiMxGXY=", + "pom": "sha256-zqRvFdpTNT8vtSYZyvbcAH7CqE8O2vQMwSV/jjzvd9w=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.12.1": { + "jar": "sha256-Dn8tvrkb+usNTLM6SHNRuvDlpu1ykGFU2P2ZddMpxZI=", + "module": "sha256-tvSQZ/FmJdFN7gmT8weKTGYeF8kOV0yf0SoWRur98tA=", + "pom": "sha256-GCeXDlNI10sY6757guDLGdxOj5np1NmEyyZJTVcTPao=" + }, + "org/junit/jupiter#junit-jupiter-params/5.12.1": { + "jar": "sha256-WVFwaZnjWVHU3w7KbgkdNhn2WanBCFjy9aPOGRy1dnM=", + "module": "sha256-KYwQtU+G3dtCeclfSYnRW+DV5QDEU+yTXv1Wd8v6Guk=", + "pom": "sha256-dHNtHnFnHQDeQFyxnD2GhOHFl9BwfeJmH7gHGyeEJ8M=" + }, + "org/junit/jupiter#junit-jupiter/5.12.1": { + "jar": "sha256-IoqUye50PVW/6gm1djBoHqeyCmYaR3RH9cH2DcEtnjo=", + "module": "sha256-OY71Q1eCyqfceKDRVRBpP6Xt7w/HP5PFVOZ3FxtCIj4=", + "pom": "sha256-m42YgPjFl2/JUEKEnzsSwRWdom5UUkMSY3edCx54yKQ=" + }, + "org/junit/platform#junit-platform-commons/1.12.1": { + "jar": "sha256-wxYWNYGqpWSSgBIrEuo2/k6cICoaImd1P+p8nh3wVes=", + "module": "sha256-ypN54aC/xbLOQ8dOh0SxT7fEkhPiISv1pH7QIv3bMM4=", + "pom": "sha256-tzKBEektR47QlWxjCgwkZm52gbUTgWj6FchbUJRqcAM=" + }, + "org/junit/platform#junit-platform-engine/1.12.1": { + "jar": "sha256-f+3/k/2SrsfSn8YNwB+gJyRrNrgIhCOl78SUnl9q/6Q=", + "module": "sha256-Vb3CX4rhKh3yQQisSArgiAKMiOMV+ou01HbU4RXyrGE=", + "pom": "sha256-TANohTegh/d9NLNNjczZO5NhcWu5u/S0ucbYMXkBS5w=" + }, + "org/junit/platform#junit-platform-launcher/1.12.1": { + "jar": "sha256-67sU57KfYHMOrt6GLtadfeDVgeoMA4+mogKVXHVB9SU=", + "module": "sha256-e+5FMgZp1sP8SKnaJV9Xn7zlgA+mY8QgT6NL1XgkUfQ=", + "pom": "sha256-nd9DNXV223LpTvM8ipY09gOrQEb+Cubl4ZJMq2aIjtk=" + }, + "org/junit/platform#junit-platform-runner/1.12.1": { + "jar": "sha256-8CRNhGbpUwHWD8ApxTmnIoisMyjQbj85i17ExH+g6HA=", + "module": "sha256-5//N1KRB6el0+dplvHFeGWxq7cUCb0xAs+25Z5ujIzA=", + "pom": "sha256-M5dYHbZeZOijCNkGv+E1d/qLgkKxDvGiIfVYuCxHjHA=" + }, + "org/junit/platform#junit-platform-suite-api/1.12.1": { + "jar": "sha256-s0gUUihPfFDV4KeXsTrRwuNp2QCxfQpOhQBampjT8Ss=", + "module": "sha256-ghsnFZa3qC3Onrjj/DVF+KenIkvU02HgOjFSv6LnZwY=", + "pom": "sha256-gqr1cn4YGh2dKvvUM5xdAUPOIIbJ/0HY6b52LZo2w8A=" + }, + "org/junit/platform#junit-platform-suite-commons/1.12.1": { + "jar": "sha256-C0oBRu0aKysb94NhNDn0sdFHvM+0PlGokbgEXs9PFd4=", + "module": "sha256-+LP4UlNiXd4TqWypShqH74pqJeF7fJpXbFrNQyPAan0=", + "pom": "sha256-C1cZJGVJXHjj5px8Ko2oVs6xHV+tlO/1pw8aYtepW3M=" + }, + "org/leadpony/justify#justify-parent/3.1.0": { + "pom": "sha256-ckfhOlVhg4gPqnP7EeWQJ7R+fG1Ghx0sUIg3WwDbJY0=" + }, + "org/leadpony/justify#justify/3.1.0": { + "jar": "sha256-zQVe+z52gWhOHP7Vx9AnyrguHbqYrXPSGbTijzgndGg=", + "pom": "sha256-oXqgosC8+KGRF6qSDoYcxKIEIb0aOR0iTJGjhsgezak=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/mockito#mockito-core/5.16.1": { + "jar": "sha256-1yv30j7BnQUTxoC8fruszvDGQ68iyCxez9mZshCfx5c=", + "pom": "sha256-5p0IpMRp7l0fa3BXYsKKZWEUOSDSfHbrSnrFYGPurnw=" + }, + "org/mockito#mockito-inline/5.2.0": { + "jar": "sha256-7lLhwpmmMhhPuidKk3CZPgkUBCn15RbmxVcP1ldLKX8=", + "pom": "sha256-cG00cOVtMaO1YwaY0Qeb79uYMUWwGE5LorhNo4eo9oQ=" + }, + "org/mockito#mockito-junit-jupiter/5.16.1": { + "jar": "sha256-fd+TxJfcsHv09pR2aj2NXupvom8CwYywoeWYpTR+c/A=", + "pom": "sha256-XTWQpYRiDj/p8nCrppdmeBs0aUB0JoMLT71pYYDu8kc=" + }, + "org/objenesis#objenesis-parent/3.3": { + "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" + }, + "org/objenesis#objenesis/3.3": { + "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=", + "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM=" + }, + "org/ocpsoft#ocpsoft-parent/9": { + "pom": "sha256-8XwebTdP/zgg7hx7ZBsy+fE6mF6/u0J3mhbjSHRiOWY=" + }, + "org/ocpsoft/prettytime#prettytime-parent/3.2.5.Final": { + "pom": "sha256-z20CLDkObRRnpgtIGusI+qNPpvDq+i2jkgi5yPoxxKQ=" + }, + "org/ocpsoft/prettytime#prettytime/3.2.5.Final": { + "jar": "sha256-My3AACjoNlsnD7+1rAd7gHfp4OtYdGSiUqjtBHAiV+k=", + "pom": "sha256-pxdAoV6nREoA8+5lj8XBLxONl1aqPvHAeq8KImyN+/k=" + }, + "org/openjfx#javafx-base/23.0.1": { + "jar": "sha256-iEU6jUzJIXQMhOMV6AIbnZhLCSDTySMYfF/QwswdaDw=", + "pom": "sha256-0mUw12g4dhZPL+FpnXe//CbJlfUSgCr0IFUXwhSs+mc=" + }, + "org/openjfx#javafx-base/23.0.1/linux": { + "jar": "sha256-7sBxSvCRmRxVt9v23ePYWSsf6LoEbagc2IUDuAvpi2M=" + }, + "org/openjfx#javafx-controls/23.0.1": { + "jar": "sha256-3XcaHc2LdE4WcgNao8YoM+Y0ZfpgZrOgwuon8XfL1O8=", + "pom": "sha256-zUsIKtIxRfbipieHQ3FsCu3fit8vO/iu1ihYCFWk46g=" + }, + "org/openjfx#javafx-controls/23.0.1/linux": { + "jar": "sha256-LQyxs8l1c4lHywYBT+IkCrNrS29oxG6SbQiWCYJbqdw=" + }, + "org/openjfx#javafx-fxml/23.0.1": { + "pom": "sha256-h45/OrAgdht3KLq0VkfIU7z+Qnc4MCqlLdOrzHXsDuo=" + }, + "org/openjfx#javafx-fxml/23.0.1/linux": { + "jar": "sha256-+zQCUfl7tvMxg/oBzlqXaBbjFqmI3EBIGj57VQgtmJo=" + }, + "org/openjfx#javafx-graphics/23.0.1": { + "jar": "sha256-kJCrtogUiOdLj4fkWoI47DMk7ETsxg/B+3tQMtgJURE=", + "pom": "sha256-st72CewOe6tjk5EdDP7xnZZo0NPcsvAB/luMWaiU24g=" + }, + "org/openjfx#javafx-graphics/23.0.1/linux": { + "jar": "sha256-NVPB6tM9naWVgGkCKlBr/X4FxX7m9nR5spFz8taBZEw=" + }, + "org/openjfx#javafx-media/23.0.1": { + "pom": "sha256-tfRj6GKtVPWcSsQbkRA/4PqvPe6WOL4AczNi7p6cWko=" + }, + "org/openjfx#javafx-media/23.0.1/linux": { + "jar": "sha256-OP/Uy68DzVJMKslEStdK5ZNGuJpgmM15G1zSvzzUU6I=" + }, + "org/openjfx#javafx-swing/23.0.1": { + "jar": "sha256-nNkwvgpUAQhXNRTE+aSL/yln3Kg/XjGR7//vQH7ade0=", + "pom": "sha256-uht/UEeiXgkbdKJpJKQ2St+eoWqKLESnEbvledqikyw=" + }, + "org/openjfx#javafx-swing/23.0.1/linux": { + "jar": "sha256-+FtFmvQtjKJ18NiRocwcjUuMudSPMuXhYau9Rt6YaqY=" + }, + "org/openjfx#javafx/23.0.1": { + "pom": "sha256-S7WEqBPU9lbMNxf+dQpLLI/2mj1W+6E53MHms4FV2F4=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm/9.7.1": { + "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=", + "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg=" + }, + "org/projectlombok#lombok/1.18.36": { + "jar": "sha256-c7awW2otNltwC6sI0w+U3p0zZJC8Cszlthgf70jL8Y4=", + "pom": "sha256-iaIdJYdshWLBShDxsh77/M6dU7BYaGuChf6iJ2xTKQ4=" + }, + "org/rauschig#jarchivelib/0.6.0": { + "jar": "sha256-u/9XGPF0HRYkJreWaPJKznhTPHicnEBJtbewxTF39BQ=", + "pom": "sha256-Y0BG5S8/+G4gszZgQlw+1rbubYRjE8CLPJ/lLuTWOE8=" + }, + "org/reactivestreams#reactive-streams/1.0.4": { + "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", + "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag=" + }, + "org/slf4j#slf4j-api/2.0.17": { + "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", + "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" + }, + "org/slf4j#slf4j-bom/2.0.17": { + "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" + }, + "org/slf4j#slf4j-parent/2.0.17": { + "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springframework#spring-framework-bom/5.0.4.RELEASE": { + "pom": "sha256-vARmNMfO1m+IEPEWTqcG1f7DrZOJtWasn8TvgXStI9U=" + }, + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + }, + "org/springframework/boot#spring-boot-dependencies/2.0.0.RELEASE": { + "pom": "sha256-VdUqa8/P2w40ocAbbPHaMU07cT7feez+0eRhSFdBxbA=" + }, + "org/springframework/boot#spring-boot-starter-parent/2.0.0.RELEASE": { + "pom": "sha256-ziyTLoAco1guJxzDiVbuGjpI2i2X5h3FDKCq2do0ofU=" + }, + "org/springframework/data#spring-data-releasetrain/Kay-SR5": { + "pom": "sha256-lV8UZffEvad8rka5LUbnISQt3PBrxALEGwOmrN3wq14=" + }, + "org/springframework/data/build#spring-data-build/2.0.5.RELEASE": { + "pom": "sha256-fllWbrTcJFEQsPt+V1ER8Bb6DMogNJwpweRswQHF6Cg=" + }, + "org/springframework/integration#spring-integration-bom/5.0.3.RELEASE": { + "pom": "sha256-zogyzAu5v9EzwXRPeq7FCz+IJRt0Ar82vncUAR69fcA=" + }, + "org/springframework/security#spring-security-bom/5.0.3.RELEASE": { + "pom": "sha256-wMstyax5q53Efb0R7cDxtAzoq4XRdPZmzzEcIY146tI=" + }, + "org/springframework/session#spring-session-bom/Apple-SR1": { + "pom": "sha256-qsKfFgb+KZpdGQjrE1ekXyMMvTTtqNGDVYiGiTIaw1U=" + }, + "org/tukaani#xz/1.5": { + "jar": "sha256-hvMPqHdfo6Ys2znR7XimAZFkwQWIZASNQsvuJE4m6EA=", + "pom": "sha256-Q5HcceKs5oshCpdj6SnnNlNIAD3bXh9g9G7ciAnCLw4=" + }, + "org/yaml#snakeyaml/2.2": { + "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", + "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" + } + } +} diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix new file mode 100644 index 000000000000..c9d9aa86786e --- /dev/null +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix @@ -0,0 +1,120 @@ +{ + stdenv, + lib, + fetchFromGitHub, + gradle, + jdk23, + makeWrapper, + wrapGAppsHook3, + libXxf86vm, + libXtst, + libglvnd, + glib, + copyDesktopItems, + makeDesktopItem, + nix-update-script, +}: +stdenv.mkDerivation rec { + pname = "ed-odyssey-materials-helper"; + version = "2.156"; + + src = fetchFromGitHub { + owner = "jixxed"; + repo = "ed-odyssey-materials-helper"; + tag = version; + hash = "sha256-T7Mh9QZRQbDJmW976bOg5YNQoFxJ2SUFl6qBjos8LSo="; + }; + + nativeBuildInputs = [ + gradle + makeWrapper + wrapGAppsHook3 + copyDesktopItems + ]; + + patches = [ + # We'll set up the edomh: URL scheme in makeDesktopItem, + # so this removes 1) the popup about it when you first start the program, 2) the option in the settings + # and makes the program always know that it is set up + ./remove-urlscheme-settings.patch + ]; + postPatch = '' + # oslib doesn't seem to do releases and hasn't had a change since 2021, so always use commit d6ee6549bb + # it is not the latest commit because using a commit here whose hash starts with a number causes issues, but this works + substituteInPlace build.gradle \ + --replace-fail '"com.github.wille:oslib:master-SNAPSHOT"' '"com.github.wille:oslib:d6ee6549bb"' + substituteInPlace application/src/main/java/module-info.java \ + --replace-fail 'requires oslib.master.SNAPSHOT;' 'requires oslib.d6ee6549bb;' + ''; + + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; + + gradleFlags = [ "-Dorg.gradle.java.home=${jdk23}" ]; + + gradleBuildTask = "application:jpackage"; + gradleUpdateTask = "application:nixDownloadDeps"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{share/ed-odyssey-materials-helper,bin} + cp -r application/build/jpackage/Elite\ Dangerous\ Odyssey\ Materials\ Helper/* $out/share/ed-odyssey-materials-helper + + mkdir -p $out/share/icons/hicolor/512x512/apps/ + ln -s $out/share/ed-odyssey-materials-helper/lib/Elite\ Dangerous\ Odyssey\ Materials\ Helper.png $out/share/icons/hicolor/512x512/apps/ed-odyssey-materials-helper.png + + runHook postInstall + ''; + + dontWrapGApps = true; + + postFixup = '' + # The logs would go into the current directory, so the wrapper will cd to the config dir first + makeShellWrapper $out/share/ed-odyssey-materials-helper/bin/Elite\ Dangerous\ Odyssey\ Materials\ Helper $out/bin/ed-odyssey-materials-helper \ + --run 'mkdir -p ~/.config/odyssey-materials-helper/ && cd ~/.config/odyssey-materials-helper/' \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + libXxf86vm + glib + libXtst + libglvnd + ] + } "''${gappsWrapperArgs[@]}" + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ed-odyssey-materials-helper"; + type = "Application"; + desktopName = "Elite Dangerous Odyssey Materials Helper"; + comment = "Helper for managing materials in Elite Dangerous Odyssey"; + icon = "ed-odyssey-materials-helper"; + exec = "ed-odyssey-materials-helper %u"; + categories = [ "Game" ]; + mimeTypes = [ "x-scheme-handler/edomh" ]; + }) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Helper for managing materials in Elite Dangerous Odyssey"; + homepage = "https://github.com/jixxed/ed-odyssey-materials-helper"; + downloadPage = "https://github.com/jixxed/ed-odyssey-materials-helper/releases/tag/${version}"; + changelog = "https://github.com/jixxed/ed-odyssey-materials-helper/releases/tag/${version}"; + license = lib.licenses.gpl3Only; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # mitm cache + ]; + maintainers = with lib.maintainers; [ + elfenermarcell + toasteruwu + ]; + mainProgram = "ed-odyssey-materials-helper"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-urlscheme-settings.patch b/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-urlscheme-settings.patch new file mode 100644 index 000000000000..f2afddaeb1eb --- /dev/null +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-urlscheme-settings.patch @@ -0,0 +1,42 @@ +diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java +index a38ae02d..1c164911 100644 +--- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java ++++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java +@@ -112,7 +112,6 @@ public class FXApplication extends Application { + } + PreferencesService.setPreference(PreferenceConstants.APP_SETTINGS_VERSION, System.getProperty("app.version")); + whatsnewPopup(); +- urlSchemePopup(); + eddnPopup(); + versionPopup(); + MaterialTrackingService.initialize(); +diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/registry/UbuntuRegistrationHandler.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/registry/UbuntuRegistrationHandler.java +index 6ac788ea..a5281983 100644 +--- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/registry/UbuntuRegistrationHandler.java ++++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/registry/UbuntuRegistrationHandler.java +@@ -62,11 +62,7 @@ public class UbuntuRegistrationHandler implements RegistrationHandler { + + @Override + public boolean isRegistered() { +- if (!IS_JAVA) { +- final File file = new File(System.getProperty(USER_HOME) + DESKTOP_FILE_PATH); +- return file.exists() && file.isFile(); +- } +- return false; ++ return true; + } + + +diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/sections/General.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/sections/General.java +index 3b00de60..78d6afd7 100644 +--- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/sections/General.java ++++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/sections/General.java +@@ -99,7 +99,7 @@ public class General extends VBox implements Template { + final HBox supportPackageSetting = createSupportPackageSetting(); + final HBox wipSetting = createWIPSetting(); + this.getStyleClass().addAll("settingsblock", SETTINGS_SPACING_10_CLASS); +- this.getChildren().addAll(generalLabel, langSetting, fontSetting, customJournalFolderSetting, pollSetting, urlSchemeLinkingSetting, exportInventory, blueprintExpandedSetting, importFromClipboardSetting,importSlefFromClipboardSetting,supportPackageSetting); ++ this.getChildren().addAll(generalLabel, langSetting, fontSetting, customJournalFolderSetting, pollSetting, exportInventory, blueprintExpandedSetting, importFromClipboardSetting,importSlefFromClipboardSetting,supportPackageSetting); + } + + @Override diff --git a/pkgs/by-name/ed/ed/package.nix b/pkgs/by-name/ed/ed/package.nix index 8f225e715437..334b5ddc35a1 100644 --- a/pkgs/by-name/ed/ed/package.nix +++ b/pkgs/by-name/ed/ed/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ed"; - version = "1.21"; + version = "1.21.1"; src = fetchurl { url = "mirror://gnu/ed/ed-${finalAttrs.version}.tar.lz"; - hash = "sha256-YOJJmHJ9RTpc8CxUZkuXU23kais0zR9PZ8HBphu7rXU="; + hash = "sha256-1tDHGSsCsFGckCqTcZBT6GWt5aeEo7Mn2T2IhFeyPEs="; }; nativeBuildInputs = [ lzip ]; diff --git a/pkgs/by-name/ed/edge-runtime/package.nix b/pkgs/by-name/ed/edge-runtime/package.nix index e6133bf1389e..19607f2c995c 100644 --- a/pkgs/by-name/ed/edge-runtime/package.nix +++ b/pkgs/by-name/ed/edge-runtime/package.nix @@ -5,7 +5,6 @@ fetchFromGitHub, rustPlatform, nix-update-script, - darwin, openssl, pkg-config, }: @@ -39,16 +38,7 @@ rustPlatform.buildRustPackage { rustPlatform.bindgenHook ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - CoreFoundation - SystemConfiguration - ] - ); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix index 673e38d05875..f4f0a50af6e3 100644 --- a/pkgs/by-name/ed/eduke32/package.nix +++ b/pkgs/by-name/ed/eduke32/package.nix @@ -15,17 +15,10 @@ libGL, SDL2, SDL2_mixer, - darwin, graphicsmagick, }: let - inherit (darwin.apple_sdk.frameworks) - AGL - Cocoa - GLUT - OpenGL - ; wrapper = "eduke32-wrapper"; swWrapper = "voidsw-wrapper"; furyWrapper = "fury-wrapper"; @@ -61,12 +54,6 @@ stdenv.mkDerivation (finalAttrs: { alsa-lib gtk2 libGL - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AGL - Cocoa - GLUT - OpenGL ]; nativeBuildInputs = diff --git a/pkgs/by-name/ed/eduli/package.nix b/pkgs/by-name/ed/eduli/package.nix index e6fea3a303b4..e30cb785ba3a 100644 --- a/pkgs/by-name/ed/eduli/package.nix +++ b/pkgs/by-name/ed/eduli/package.nix @@ -10,8 +10,8 @@ stdenvNoCC.mkDerivation rec { src = fetchzip { name = "${pname}-${version}"; - url = "http://language.moe.gov.tw/001/Upload/Files/site_content/M0001/MoeLI-3.0.zip"; - sha256 = "0b4kjdk0h0hx446swi0wzawia0mf16qh9b6v4h4nqg8qx0p2sd3c"; + url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/MoeLI-3.0.zip"; + hash = "sha256-bDQtLugYPWwJJNusBLEJrgIVufocRK4NIR0CCGaTkyw="; }; installPhase = '' diff --git a/pkgs/by-name/ei/eigenmath/package.nix b/pkgs/by-name/ei/eigenmath/package.nix index ac943176d96a..02f72b00d352 100644 --- a/pkgs/by-name/ei/eigenmath/package.nix +++ b/pkgs/by-name/ei/eigenmath/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "338-unstable-2025-04-03"; + version = "338-unstable-2025-04-18"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "d12a72a9d6a01d0eaf84a8a9bfe255674b9ef1d3"; - hash = "sha256-rmIxgLTXWN0lrtmdMp4morAjHbmhKiHv2WW6yGg8C7Q="; + rev = "2e11a03c19d9f8194a14b8578bcffc3d76d3b113"; + hash = "sha256-Clsch47VfLqGi6RaQF8T+6cSRpsZjjJDMUYTK3tSidg="; }; checkPhase = diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index 6e6e0668064b..dee0cad6572c 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -141,7 +141,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ejabberd"; - version = "25.03"; + version = "25.04"; nativeBuildInputs = [ makeWrapper @@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "processone"; repo = "ejabberd"; tag = finalAttrs.version; - hash = "sha256-VEH1V8v2wQ9qf6Xcj00xHw30tWo0s9AhPyoB7d5B8k8="; + hash = "sha256-BIt5kLEtvMUlyntQ98Mgidmo6lJHbt/LJYrbxPaJxPo="; }; passthru.tests = { diff --git a/pkgs/by-name/el/elan/package.nix b/pkgs/by-name/el/elan/package.nix index db820df47826..18fe3c7d0de9 100644 --- a/pkgs/by-name/el/elan/package.nix +++ b/pkgs/by-name/el/elan/package.nix @@ -16,17 +16,17 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - hash = "sha256-6/5yIIO0Avf6YpD7+7B30bnwtcPXi2k4RqWFO8hBaII="; + hash = "sha256-3L5kGcj+iXjVYV4ZlBfHsVfOWQVv6iJ325Phtqi3GQA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-4HYRglFhEpEnRu8gPSNFFAT2v4/3ccwd02LZfNJUzbM="; + cargoHash = "sha256-FO/Qd6hIl34YCW9nWKtv0fykbqyL+vbmWboewTB9Dak="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index 6c2c1af2e9c1..732b2cc0676d 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.96"; + "version" = "1.11.97"; "hashes" = { - "desktopSrcHash" = "sha256-oTU/Pvl4gBp69OrUrXEYXupl0WphsEWt32sB4v6T+gA="; - "desktopYarnHash" = "sha256-zMdSA/CkMDXirWZ2uCPTgZ5iErV7rGyR+xcLh9sPDA8="; + "desktopSrcHash" = "sha256-4ea5C1I/bdGsy4CxsNB1GWL8RQnJpHr/MbIOB5Z+gFA="; + "desktopYarnHash" = "sha256-HI/aRf9pGao8m8z3oA0wdbjDQth3zijJeskV2D+KsgM="; }; } diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 8efe960d6b4f..c3da8dc800a3 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -8,7 +8,7 @@ nodejs, fetchYarnDeps, jq, - electron_34, + electron_35, element-web, sqlcipher, callPackage, @@ -22,7 +22,7 @@ let pinData = import ./element-desktop-pin.nix; inherit (pinData.hashes) desktopSrcHash desktopYarnHash; executableName = "element-desktop"; - electron = electron_34; + electron = electron_35; keytar = callPackage ./keytar { inherit electron; }; diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index e6e132a09f70..efbc4f9e8d79 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.96"; + "version" = "1.11.97"; "hashes" = { - "webSrcHash" = "sha256-EfSQEyMG9v5Boev98FyfzLA3hZLzxSGxAnZFfbc2aVA="; - "webYarnHash" = "sha256-Dp7WXEjWSDQjpmnJUrloIQau6is8YxTYzJmnQBIk+Ys="; + "webSrcHash" = "sha256-x7VS4l2uwXq2wjZeGwnaENHlhwnVz5Gt3f55kiH2Zhk="; + "webYarnHash" = "sha256-uwuBwAZYjt3WsbUCM8q9PaiV5WxKSpyJyVzM8gJOhPo="; }; } diff --git a/pkgs/by-name/el/elf-info/package.nix b/pkgs/by-name/el/elf-info/package.nix index 776a386483f6..051e238e7fec 100644 --- a/pkgs/by-name/el/elf-info/package.nix +++ b/pkgs/by-name/el/elf-info/package.nix @@ -5,14 +5,14 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "elf-info"; version = "0.3.0"; src = fetchFromGitHub { owner = "kevin-lesenechal"; repo = "elf-info"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-wbFVuoarOoxV9FqmuHJ9eZlG4rRqy1rsnuqbGorC2Rk="; }; @@ -28,4 +28,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ viperML ]; mainProgram = "elf"; }; -} +}) diff --git a/pkgs/by-name/el/elfcat/package.nix b/pkgs/by-name/el/elfcat/package.nix index b0c5dc1265e4..f82b051828f6 100644 --- a/pkgs/by-name/el/elfcat/package.nix +++ b/pkgs/by-name/el/elfcat/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "elfcat"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "ruslashev"; repo = "elfcat"; rev = version; - sha256 = "sha256-lmoOwxRGXcInoFb2YDawLKaebkcUftzpPZ1iTXbl++c="; + sha256 = "sha256-8jyOYV455APlf8F6HmgyvgfNGddMzrcGhj7yFQT6qvg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3rqxST7dcp/2+B7DiY92C75P0vQyN2KY3DigBEZ1W1w="; + cargoHash = "sha256-oVl+40QunvKZIbhsOgqNTsvWduCXP/QJ0amT8ECSsMU="; meta = with lib; { description = "ELF visualizer, generates HTML files from ELF binaries"; diff --git a/pkgs/by-name/el/eliza/package.nix b/pkgs/by-name/el/eliza/package.nix new file mode 100644 index 000000000000..b241cbe1de63 --- /dev/null +++ b/pkgs/by-name/el/eliza/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "eliza"; + version = "0-unstable-2025-02-21"; + src = fetchFromGitHub { + owner = "anthay"; + repo = "ELIZA"; + rev = "27bcf6e5fb1d32812cc0aab8133fa5e395d41773"; + hash = "sha256-/i8mckRQWTK1yI/MNaieSuE+dx94DMdrABkqf/bXQbM="; + }; + + doCheck = true; + + # Unit tests are executed automatically on execution + checkPhase = '' + runHook preCheck + echo Corki is mana | ./eliza + runHook postCheck + ''; + + buildPhase = '' + runHook preBuild + $CXX -std=c++20 -pedantic -o eliza ./src/eliza.cpp + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm544 ./eliza $out/bin/eliza + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version=branch=master" + ]; + }; + + meta = { + description = "C++ simulation of Joseph Weizenbaum’s 1966 ELIZA"; + longDescription = '' + This is an implementation in C++ of ELIZA that attempts to be as close + to the original as possible. + It was made to closely follow Joseph Weizenbaum’s description of his program + given in his January 1966 Communications of the ACM paper, and later changed + to follow the ELIZA source code found on 2021 and the SLIP programming + function HASH(D,N) found on 2022. + It is controlled by a script identical to the one given in the appendix of + the 1966 paper. + ''; + license = lib.licenses.cc0; + mainProgram = "eliza"; + homepage = "https://github.com/anthay/ELIZA"; + maintainers = with lib.maintainers; [ EmanuelM153 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix index c5a1475eaaae..ecfb50a5d1b0 100644 --- a/pkgs/by-name/el/ell/package.nix +++ b/pkgs/by-name/el/ell/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.71"; + version = "0.73"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - hash = "sha256-nbfWjV0zPPx2kcnD/aRaWSXUGIqrUX7Z4U45ASk5Ric="; + hash = "sha256-pwAlRh+rkfPA6dXOGZcIidyCD2ioxVPSJjnyvrWuwow="; }; nativeBuildInputs = [ @@ -41,6 +41,11 @@ stdenv.mkDerivation rec { # Runs multiple dbus instances on the same port failing the bind. enableParallelChecking = false; + # 'unit/test-hwdb' fails in the sandbox as it relies on + # '/etc/udev/hwdb.bin' file presence in the sandbox. `nixpkgs` does + # not provide it today in any form. Let's skip the test. + env.XFAIL_TESTS = "unit/test-hwdb"; + # tests sporadically fail on musl doCheck = !stdenv.hostPlatform.isMusl; diff --git a/pkgs/by-name/el/elvis/package.nix b/pkgs/by-name/el/elvis/package.nix index b3740b94bfe2..ce4c70ee3085 100644 --- a/pkgs/by-name/el/elvis/package.nix +++ b/pkgs/by-name/el/elvis/package.nix @@ -36,13 +36,22 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ ncurses ]; - configureFlags = [ "--ioctl=termios" ]; + configureFlags = [ + "--ioctl=termios" + "--libs=-lncurses" + ]; strictDeps = false; postPatch = '' substituteInPlace configure \ - --replace-fail '-lcurses' '-lncurses' + --replace-fail '-lcurses' '-lncurses' \ + --replace-fail 'if [ -f /usr/include/sys/wait.h ]' 'if true' + ''; + + postConfigure = '' + echo >>config.h '#undef NEED_MEMMOVE' + echo >>config.h '#define NEED_IOCTL_H' ''; installPhase = '' diff --git a/pkgs/by-name/em/emblem/package.nix b/pkgs/by-name/em/emblem/package.nix index d5687cfd4469..99f5cc76ca30 100644 --- a/pkgs/by-name/em/emblem/package.nix +++ b/pkgs/by-name/em/emblem/package.nix @@ -13,7 +13,6 @@ wrapGAppsHook4, libadwaita, libxml2, - darwin, nix-update-script, }: @@ -48,14 +47,10 @@ stdenv.mkDerivation rec { rustc ]; - buildInputs = - [ - libadwaita - libxml2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + libadwaita + libxml2 + ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/en/ente-cli/package.nix b/pkgs/by-name/en/ente-cli/package.nix index 0f89c077239b..05d8ea33570c 100644 --- a/pkgs/by-name/en/ente-cli/package.nix +++ b/pkgs/by-name/en/ente-cli/package.nix @@ -1,26 +1,21 @@ { lib, buildGoModule, - ente-cli, fetchFromGitHub, installShellFiles, nix-update-script, stdenv, testers, }: -let - version = "0.2.3"; - canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform; -in -buildGoModule { +buildGoModule (finalAttrs: { pname = "ente-cli"; - inherit version; + version = "0.2.3"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; - tag = "cli-v${version}"; + tag = "cli-v${finalAttrs.version}"; hash = "sha256-qKMFoNtD5gH0Y+asD0LR5d3mxGpr2qVWXIUzJTSezeI="; sparseCheckout = [ "cli" ]; }; @@ -34,7 +29,7 @@ buildGoModule { ldflags = [ "-s" "-w" - "-X main.AppVersion=cli-v${version}" + "-X main.AppVersion=cli-v${finalAttrs.version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -50,27 +45,30 @@ buildGoModule { # also guarding with `isLinux` because ENTE_CLI_SECRETS_PATH doesn't help on darwin: # > error setting password in keyring: exit status 195 # - + lib.optionalString (stdenv.buildPlatform.isLinux && canExecute) '' - export ENTE_CLI_CONFIG_PATH=$TMP - export ENTE_CLI_SECRETS_PATH=$TMP/secrets + + + lib.optionalString + (stdenv.buildPlatform.isLinux && stdenv.buildPlatform.canExecute stdenv.hostPlatform) + '' + export ENTE_CLI_CONFIG_PATH=$TMP + export ENTE_CLI_SECRETS_PATH=$TMP/secrets - installShellCompletion --cmd ente \ - --bash <($out/bin/ente completion bash) \ - --fish <($out/bin/ente completion fish) \ - --zsh <($out/bin/ente completion zsh) - ''; + installShellCompletion --cmd ente \ + --bash <($out/bin/ente completion bash) \ + --fish <($out/bin/ente completion fish) \ + --zsh <($out/bin/ente completion zsh) + ''; passthru = { # only works on linux, see comment above about ENTE_CLI_SECRETS_PATH on darwin tests.version = lib.optionalAttrs stdenv.hostPlatform.isLinux ( testers.testVersion { - package = ente-cli; + package = finalAttrs.finalPackage; command = '' env ENTE_CLI_CONFIG_PATH=$TMP \ ENTE_CLI_SECRETS_PATH=$TMP/secrets \ ente version ''; - version = "Version cli-v${ente-cli.version}"; + version = "Version cli-v${finalAttrs.version}"; } ); updateScript = nix-update-script { @@ -87,11 +85,11 @@ buildGoModule { The Ente CLI is a Command Line Utility for exporting data from Ente. It also does a few more things, for example, you can use it to decrypting the export from Ente Auth. ''; homepage = "https://github.com/ente-io/ente/tree/main/cli#readme"; - changelog = "https://github.com/ente-io/ente/releases/tag/cli-v${version}"; + changelog = "https://github.com/ente-io/ente/releases/tag/cli-v${finalAttrs.version}"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.zi3m5f ]; mainProgram = "ente"; }; -} +}) diff --git a/pkgs/by-name/en/envio/package.nix b/pkgs/by-name/en/envio/package.nix index d54fb62c911c..8578b8307378 100644 --- a/pkgs/by-name/en/envio/package.nix +++ b/pkgs/by-name/en/envio/package.nix @@ -1,18 +1,13 @@ { lib, - stdenv, fetchFromGitHub, installShellFiles, - darwin, gpgme, libgpg-error, pkg-config, rustPlatform, }: -let - inherit (darwin.apple_sdk.frameworks) Security; -in rustPlatform.buildRustPackage rec { pname = "envio"; version = "0.6.1"; @@ -35,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgpg-error gpgme - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + ]; postInstall = '' installManPage man/*.1 diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix index 9379db80d7ad..2fe4094532cf 100644 --- a/pkgs/by-name/en/envoy-bin/package.nix +++ b/pkgs/by-name/en/envoy-bin/package.nix @@ -8,7 +8,7 @@ versionCheckHook, }: let - version = "1.33.2"; + version = "1.34.0"; inherit (stdenv.hostPlatform) system; throwSystem = throw "envoy-bin is not available for ${system}."; @@ -21,8 +21,8 @@ let hash = { - aarch64-linux = "sha256-gew2iaghIu/wymgMSBdvTTUbb5iBp5zJ2QeKb7Swtqg="; - x86_64-linux = "sha256-vS/4fF78lf14gNcQkV9XPBqrTZxV2NqIbc2R30P610E="; + aarch64-linux = "sha256-VVEYQ25ZNmWftuhLOOZnxKaosQFeMHsQdkAzIq+zEM0="; + x86_64-linux = "sha256-FavpvY1hYNOnlFQE2NV3O8z9gyKGpD01oU/wute9iRA="; } .${system} or throwSystem; in diff --git a/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch b/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch index da29f34774c9..a241949a0c99 100644 --- a/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch +++ b/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch @@ -4,6 +4,7 @@ Date: Mon, 22 Apr 2024 11:52:59 +0200 Subject: [PATCH] nixpkgs: use system Python Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> +Signed-off-by: Luke Granger-Brown --- bazel/python_dependencies.bzl | 9 ++++----- bazel/repositories_extra.bzl | 17 +---------------- diff --git a/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch b/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch index b3f66ac22552..cb8c5d20b671 100644 --- a/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch +++ b/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch @@ -4,15 +4,16 @@ Date: Mon, 22 Apr 2024 11:58:00 +0200 Subject: [PATCH] nixpkgs: use system Go Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> +Signed-off-by: Luke Granger-Brown --- bazel/dependency_imports.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl -index c68eb4bf3ed2d39d46d38d7bd0eeab2c74a507fa..addee4f6af74ea78ae778b73384e01db83ac6694 100644 +index aef33aa103dc1136e63e165fb9ee6a267f52ba54..c5aefca14b729b548c4e90857202eb82576b507d 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl -@@ -20,7 +20,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common") +@@ -22,7 +22,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common") load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains", "rust_repository_set") # go version for rules_go diff --git a/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch b/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch index b8be06be0730..684e73b5c838 100644 --- a/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch +++ b/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch @@ -4,18 +4,19 @@ Date: Mon, 22 Apr 2024 11:59:22 +0200 Subject: [PATCH] nixpkgs: use system C/C++ toolchains Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> +Signed-off-by: Luke Granger-Brown --- bazel/dependency_imports.bzl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl -index addee4f6af74ea78ae778b73384e01db83ac6694..dc1967e43b2b71358d2767a3d83b52819987290d 100644 +index c5aefca14b729b548c4e90857202eb82576b507d..6938ce63abb53661e8d1fb71eaaab03ba0cc37c6 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl -@@ -26,7 +26,11 @@ JQ_VERSION = "1.7" - YQ_VERSION = "4.24.4" +@@ -30,7 +30,11 @@ YQ_VERSION = "4.24.4" + BUF_VERSION = "v1.50.0" - def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, yq_version = YQ_VERSION): + def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, yq_version = YQ_VERSION, buf_version = BUF_VERSION): - rules_foreign_cc_dependencies() + rules_foreign_cc_dependencies( + register_default_tools=False, # no prebuilt toolchains diff --git a/pkgs/by-name/en/envoy/0004-nixpkgs-bump-rules_rust-to-0.60.0.patch b/pkgs/by-name/en/envoy/0004-nixpkgs-bump-rules_rust-to-0.60.0.patch new file mode 100644 index 000000000000..40b808952e3d --- /dev/null +++ b/pkgs/by-name/en/envoy/0004-nixpkgs-bump-rules_rust-to-0.60.0.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Luke Granger-Brown +Date: Thu, 17 Apr 2025 02:40:18 +0100 +Subject: [PATCH] nixpkgs: bump rules_rust to 0.60.0 + +Signed-off-by: Luke Granger-Brown +--- + bazel/repository_locations.bzl | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl +index 6904bc93bdda3ee2308f13d61e62295fa11d799b..e4574878a566cceb4dc2343f3cade0350ea5e5ff 100644 +--- a/bazel/repository_locations.bzl ++++ b/bazel/repository_locations.bzl +@@ -1465,8 +1465,8 @@ REPOSITORY_LOCATIONS_SPEC = dict( + project_name = "Bazel rust rules", + project_desc = "Bazel rust rules (used by Wasm)", + project_url = "https://github.com/bazelbuild/rules_rust", +- version = "0.56.0", +- sha256 = "f1306aac0b258b790df01ad9abc6abb0df0b65416c74b4ef27f4aab298780a64", ++ version = "0.60.0", ++ sha256 = "7825214ccad7c2482cb490ac91dbc1e88b30223062796ce328aca893b74ae342", + # Note: rules_rust should point to the releases, not archive to avoid the hassle of bootstrapping in crate_universe. + # This is described in https://bazelbuild.github.io/rules_rust/crate_universe.html#setup, otherwise bootstrap + # is required which in turn requires a system CC toolchains, not the bazel controlled ones. +@@ -1477,7 +1477,7 @@ REPOSITORY_LOCATIONS_SPEC = dict( + "dataplane_ext", + ], + extensions = ["envoy.wasm.runtime.wasmtime"], +- release_date = "2024-12-16", ++ release_date = "2025-04-08", + cpe = "N/A", + license = "Apache-2.0", + license_url = "https://github.com/bazelbuild/rules_rust/blob/{version}/LICENSE.txt", diff --git a/pkgs/by-name/en/envoy/package.nix b/pkgs/by-name/en/envoy/package.nix index 757343e39f2d..0246405d0bbf 100644 --- a/pkgs/by-name/en/envoy/package.nix +++ b/pkgs/by-name/en/envoy/package.nix @@ -34,16 +34,16 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.33.0"; - rev = "b0f43d67aa25c1b03c97186a200cc187f4c22db3"; - hash = "sha256-zqekRpOlaA2IrwwFUEwASa1uokET98h5sr7EwzWgcbU="; + version = "1.34.0"; + rev = "d7809ba2b07fd869d49bfb122b27f6a7977b4d94"; + hash = "sha256-SKdUrBXe0E3fMo73NROFO9Ck5FZidF/awP+QRA5t3VM="; }; # these need to be updated for any changes to fetchAttrs depsHash = { - x86_64-linux = "sha256-4CQkHlXbDpRiqzeyserVf9PpLx3ME7TtZ2H88ggog6U="; - aarch64-linux = "sha256-FxkfBWiG0NIInl28w+l4YvaV2VFuCtjn5VBAKvJoxM8="; + x86_64-linux = "sha256-CiP9qH8/+nNZM8BNz84eVwWphVyDNo2KOYcK0wOsXn0="; + aarch64-linux = "sha256-9HGg68R546JY1EOm22tg9CuPt0nU+FooFcLG9A2hkzE="; } .${stdenv.system} or (throw "unsupported system ${stdenv.system}"); @@ -59,6 +59,8 @@ buildBazelPackage rec { repo = "envoy"; inherit (srcVer) hash rev; }; + # By convention, these patches are generated like: + # git format-patch --zero-commit --signoff --no-numbered --minimal --full-index --no-signature patches = [ # use system Python, not bazel-fetched binary Python ./0001-nixpkgs-use-system-Python.patch @@ -68,6 +70,9 @@ buildBazelPackage rec { # use system C/C++ tools ./0003-nixpkgs-use-system-C-C-toolchains.patch + + # bump rules_rust to support newer Rust + ./0004-nixpkgs-bump-rules_rust-to-0.60.0.patch ]; postPatch = '' chmod -R +w . @@ -92,6 +97,12 @@ buildBazelPackage rec { --replace-fail 'crate_universe_dependencies()' 'crate_universe_dependencies(rust_toolchain_cargo_template="@@//bazel/nix:cargo", rust_toolchain_rustc_template="@@//bazel/nix:rustc")' \ --replace-fail 'crates_repository(' 'crates_repository(rust_toolchain_cargo_template="@@//bazel/nix:cargo", rust_toolchain_rustc_template="@@//bazel/nix:rustc",' + # patch rules_rust for envoy specifics, but also to support old Bazel + # (Bazel 6 doesn't have ctx.watch, but ctx.path is sufficient for our use) + cp ${./rules_rust.patch} bazel/rules_rust.patch + substituteInPlace bazel/repositories.bzl \ + --replace-fail ', "@envoy//bazel:rules_rust_ppc64le.patch"' "" + substitute ${./rules_rust_extra.patch} bazel/nix/rules_rust_extra.patch \ --subst-var-by bash "$(type -p bash)" cat bazel/nix/rules_rust_extra.patch bazel/rules_rust.patch > bazel/nix/rules_rust.patch @@ -133,6 +144,7 @@ buildBazelPackage rec { sed -i \ -e 's,${python3},__NIXPYTHON__,' \ -e 's,${stdenv.shellPackage},__NIXSHELL__,' \ + -e 's,${builtins.storeDir}/[^/]\+/bin/bash,__NIXBASH__,' \ $bazelOut/external/com_github_luajit_luajit/build.py \ $bazelOut/external/local_config_sh/BUILD \ $bazelOut/external/*_pip3/BUILD.bazel \ @@ -180,9 +192,12 @@ buildBazelPackage rec { sed -i \ -e 's,__NIXPYTHON__,${python3},' \ -e 's,__NIXSHELL__,${stdenv.shellPackage},' \ + -e 's,__NIXBASH__,${stdenv.shell},' \ $bazelOut/external/com_github_luajit_luajit/build.py \ $bazelOut/external/local_config_sh/BUILD \ - $bazelOut/external/*_pip3/BUILD.bazel + $bazelOut/external/*_pip3/BUILD.bazel \ + $bazelOut/external/rules_rust/util/process_wrapper/private/process_wrapper.sh \ + $bazelOut/external/rules_rust/crate_universe/src/metadata/cargo_tree_rustc_wrapper.sh # Install repinned rules_rust lockfile cp $bazelOut/external/Cargo.Bazel.lock source/extensions/dynamic_modules/sdk/rust/Cargo.Bazel.lock diff --git a/pkgs/by-name/en/envoy/rules_rust.patch b/pkgs/by-name/en/envoy/rules_rust.patch new file mode 100644 index 000000000000..7261cb2fc760 --- /dev/null +++ b/pkgs/by-name/en/envoy/rules_rust.patch @@ -0,0 +1,101 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Luke Granger-Brown +Date: Thu, 17 Apr 2025 02:44:24 +0100 +Subject: [PATCH] rules_rust base + +Signed-off-by: Luke Granger-Brown +--- + cargo/private/cargo_bootstrap.bzl | 8 ++++---- + crate_universe/extensions.bzl | 10 +++++----- + crate_universe/src/lockfile.rs | 4 ++-- + rust/private/rustc.bzl | 4 ++-- + 4 files changed, 13 insertions(+), 13 deletions(-) + +diff --git cargo/private/cargo_bootstrap.bzl cargo/private/cargo_bootstrap.bzl +index a8021c49d62037ef32c7c64d5bb4a5efe3a8b4aa..f63d7c23ae0bddc9f3fece347a3a2b5b0afe6d8d 100644 +--- cargo/private/cargo_bootstrap.bzl ++++ cargo/private/cargo_bootstrap.bzl +@@ -173,13 +173,13 @@ def _detect_changes(repository_ctx): + # 'consumed' which means changes to it will trigger rebuilds + + for src in repository_ctx.attr.srcs: +- repository_ctx.watch(src) ++ repository_ctx.path(src) + +- repository_ctx.watch(repository_ctx.attr.cargo_lockfile) +- repository_ctx.watch(repository_ctx.attr.cargo_toml) ++ repository_ctx.path(repository_ctx.attr.cargo_lockfile) ++ repository_ctx.path(repository_ctx.attr.cargo_toml) + + if repository_ctx.attr.cargo_config: +- repository_ctx.watch(repository_ctx.attr.cargo_config) ++ repository_ctx.path(repository_ctx.attr.cargo_config) + + def _cargo_bootstrap_repository_impl(repository_ctx): + # Pretend to Bazel that this rule's input files have been used, so that it will re-run the rule if they change. +diff --git crate_universe/extensions.bzl crate_universe/extensions.bzl +index a749b10c8d469bd316d78034059c94b1fd98dbef..8f8c84dac1ec330d5e8e6abbd930387cb6c9f29e 100644 +--- crate_universe/extensions.bzl ++++ crate_universe/extensions.bzl +@@ -957,17 +957,17 @@ def _crate_impl(module_ctx): + fail("Spec specified for repo {}, but the module defined repositories {}".format(repo, local_repos)) + + for cfg in mod.tags.from_cargo + mod.tags.from_specs: +- # Preload all external repositories. Calling `module_ctx.watch` will cause restarts of the implementation ++ # Preload all external repositories. Calling `module_ctx.path` will cause restarts of the implementation + # function of the module extension when the file has changed. + if cfg.cargo_lockfile: +- module_ctx.watch(cfg.cargo_lockfile) ++ module_ctx.path(cfg.cargo_lockfile) + if cfg.lockfile: +- module_ctx.watch(cfg.lockfile) ++ module_ctx.path(cfg.lockfile) + if cfg.cargo_config: +- module_ctx.watch(cfg.cargo_config) ++ module_ctx.path(cfg.cargo_config) + if hasattr(cfg, "manifests"): + for m in cfg.manifests: +- module_ctx.watch(m) ++ module_ctx.path(m) + + cargo_path, rustc_path = _get_host_cargo_rustc(module_ctx, host_triple, cfg.host_tools_repo) + cargo_bazel_fn = new_cargo_bazel_fn( +diff --git crate_universe/src/lockfile.rs crate_universe/src/lockfile.rs +index 3e0ce6265fda6fbdd9e3e989e3e4e4443b615b8c..0fafcea8fbc7a590676d34d2c4ca8c413b953955 100644 +--- crate_universe/src/lockfile.rs ++++ crate_universe/src/lockfile.rs +@@ -146,10 +146,10 @@ impl Digest { + )); + hasher.update(b"\0"); + +- hasher.update(Digest::compute_single_hash(cargo_version, "Cargo version")); ++ hasher.update(Digest::compute_single_hash("hermetic", "Cargo version")); + hasher.update(b"\0"); + +- hasher.update(Digest::compute_single_hash(rustc_version, "Rustc version")); ++ hasher.update(Digest::compute_single_hash("hermetic", "Rustc version")); + hasher.update(b"\0"); + + let hash = hasher.finalize().encode_hex::(); +diff --git rust/private/rustc.bzl rust/private/rustc.bzl +index d78c28902c8f73ae655b8f6b5df3db5a1805aa19..321a24a946c33d5e3452758a72a77b52d5a3eccf 100644 +--- rust/private/rustc.bzl ++++ rust/private/rustc.bzl +@@ -1059,7 +1059,7 @@ def construct_arguments( + + if toolchain.llvm_cov and ctx.configuration.coverage_enabled: + # https://doc.rust-lang.org/rustc/instrument-coverage.html +- rustc_flags.add("--codegen=instrument-coverage") ++ pass + + if toolchain._experimental_link_std_dylib: + rustc_flags.add("--codegen=prefer-dynamic") +@@ -1563,7 +1563,7 @@ def rustc_compile_action( + }) + crate_info = rust_common.create_crate_info(**crate_info_dict) + +- if crate_info.type in ["staticlib", "cdylib"]: ++ if crate_info.type in ["staticlib", "cdylib"] and not out_binary: + # These rules are not supposed to be depended on by other rust targets, and + # as such they shouldn't provide a CrateInfo. However, one may still want to + # write a rust_test for them, so we provide the CrateInfo wrapped in a provider diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index 7155cda71398..61c3e00d8e0a 100644 --- a/pkgs/by-name/en/enzyme/package.nix +++ b/pkgs/by-name/en/enzyme/package.nix @@ -7,13 +7,13 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "enzyme"; - version = "0.0.173"; + version = "0.0.174"; src = fetchFromGitHub { owner = "EnzymeAD"; repo = "Enzyme"; rev = "v${version}"; - hash = "sha256-Yyn0yWcOWb379rzaA+KW0KiLVg0nbIwJJQ8NhQAsuN8="; + hash = "sha256-L+h9ASl1LOJLaXAsxr6nxzai3MGOpjOTZ6uhb2rkeaQ="; }; postPatch = '' diff --git a/pkgs/by-name/eo/eolie/package.nix b/pkgs/by-name/eo/eolie/package.nix deleted file mode 100644 index ef455d62358c..000000000000 --- a/pkgs/by-name/eo/eolie/package.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ - lib, - fetchgit, - meson, - ninja, - pkg-config, - nix-update-script, - python3, - gtk3, - libsecret, - gst_all_1, - webkitgtk_4_0, - glib, - glib-networking, - gtkspell3, - hunspell, - desktop-file-utils, - gobject-introspection, - wrapGAppsHook3, - gnome-settings-daemon, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "eolie"; - version = "0.9.99"; - - format = "other"; - doCheck = false; - - src = fetchgit { - url = "https://gitlab.gnome.org/World/eolie"; - tag = version; - fetchSubmodules = true; - sha256 = "077jww5mqg6bbqbj0j1gss2j3dxlfr2xw8bc43k8vg52drqg6g8w"; - }; - - nativeBuildInputs = [ - desktop-file-utils - gobject-introspection - meson - ninja - pkg-config - wrapGAppsHook3 - ]; - - buildInputs = with gst_all_1; [ - glib-networking - gst-libav - gst-plugins-base - gst-plugins-ugly - gstreamer - gnome-settings-daemon - gtk3 - gtkspell3 - hunspell - libsecret - webkitgtk_4_0 - glib - ]; - - propagatedBuildInputs = with python3.pkgs; [ - pyfxa - beautifulsoup4 - cryptography - pycairo - pygobject3 - python-dateutil - pycrypto - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - dontWrapGApps = true; - preFixup = '' - buildPythonPath "$out $propagatedBuildInputs" - patchPythonScript "$out/libexec/eolie-sp" - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - strictDeps = false; - - meta = with lib; { - description = "New GNOME web browser"; - mainProgram = "eolie"; - homepage = "https://gitlab.gnome.org/World/eolie"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ samdroid-apps ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/er/erigon/package.nix b/pkgs/by-name/er/erigon/package.nix index afc0879a9631..27a309f52acf 100644 --- a/pkgs/by-name/er/erigon/package.nix +++ b/pkgs/by-name/er/erigon/package.nix @@ -7,7 +7,7 @@ let pname = "erigon"; - version = "3.0.0"; + version = "3.0.2"; in buildGoModule { inherit pname version; @@ -16,11 +16,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-63wh9D5D9qzABEvKCBxBRHYuGBnlX+hrme56STkyoQU="; + hash = "sha256-1rMlRlEUheW6g3kigh+DjQxtNJOrqrADPkjQn7TQr1g="; fetchSubmodules = true; }; - vendorHash = "sha256-Mvat9+mbgpept9g8pYNf4a/bAGZGBM0MAM417DDIT9w="; + vendorHash = "sha256-tCohubwCk5HERoAaGWgEsl5kpI8w8dn0oZCZ2AxkKXk="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/by-name/er/errbot/package.nix b/pkgs/by-name/er/errbot/package.nix index 8ff4c4cf431a..0707e72359ed 100644 --- a/pkgs/by-name/er/errbot/package.nix +++ b/pkgs/by-name/er/errbot/package.nix @@ -58,13 +58,13 @@ python3.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "errbot" ]; - meta = with lib; { + meta = { changelog = "https://github.com/errbotio/errbot/blob/${version}/CHANGES.rst"; description = "Chatbot designed to be simple to extend with plugins written in Python"; homepage = "http://errbot.io/"; - maintainers = [ ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ hlad ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; # flaky on darwin, "RuntimeError: can't start new thread" mainProgram = "errbot"; }; diff --git a/pkgs/by-name/es/eslint/package.nix b/pkgs/by-name/es/eslint/package.nix index 14267e6c1aaa..91e0a7cd3f3c 100644 --- a/pkgs/by-name/es/eslint/package.nix +++ b/pkgs/by-name/es/eslint/package.nix @@ -3,14 +3,8 @@ buildNpmPackage, fetchFromGitHub, stdenv, - overrideSDK, }: -let - buildNpmPackage' = buildNpmPackage.override { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - }; -in -buildNpmPackage' rec { +buildNpmPackage rec { pname = "eslint"; version = "9.20.0"; diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix index f365a2c54794..266144cd4808 100644 --- a/pkgs/by-name/es/espflash/package.nix +++ b/pkgs/by-name/es/espflash/package.nix @@ -6,11 +6,8 @@ installShellFiles, udev, stdenv, - CoreServices, - Security, nix-update-script, openssl, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -36,11 +33,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - SystemConfiguration ]; useFetchCargoVendor = true; diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix index 4c059307e757..97f30042b558 100644 --- a/pkgs/by-name/es/esphome/dashboard.nix +++ b/pkgs/by-name/es/esphome/dashboard.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20250212.0"; + version = "20250415.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "dashboard"; rev = "refs/tags/${version}"; - hash = "sha256-9yXG9jwB284xTM6L3HWQCRD9Ki1F8yHaEl1vDNDxogw="; + hash = "sha256-HpmHII1pSsSO/hEHcy/QHv7jxslpz9a6EeHcEZQ+VIA="; }; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-B0Lx4aH+7NVSMY9qUUOiVeLgIL5wI3JolC9eLzjbRRA="; + hash = "sha256-SiH6CqFOpDQMMtRcgxr0LSJKuziZoYVjgVTpKBoebbg="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index adcab8b4f515..3254453a303e 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -22,14 +22,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2025.3.3"; + version = "2025.4.0"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; tag = version; - hash = "sha256-757vkpIppL0f4DsTVFwTNZLzWUtScJQKhEFz9wEtCnE="; + hash = "sha256-qK/vQQdgtYrWUglVaBWDcTbgeDUrDB4rpQ+4q65Hre4="; }; build-systems = with python.pkgs; [ @@ -50,8 +50,7 @@ python.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools==" "setuptools>=" \ - --replace-fail "wheel~=" "wheel>=" + --replace-fail "setuptools==" "setuptools>=" # ensure component dependencies are available cat requirements_optional.txt >> requirements.txt diff --git a/pkgs/by-name/es/espup/package.nix b/pkgs/by-name/es/espup/package.nix index 8e60ada716f5..7b21b7297b7c 100644 --- a/pkgs/by-name/es/espup/package.nix +++ b/pkgs/by-name/es/espup/package.nix @@ -9,7 +9,6 @@ xz, zstd, stdenv, - darwin, testers, writableTmpDirAsHomeHook, nix-update-script, @@ -34,18 +33,12 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellFiles ]; - buildInputs = - [ - bzip2 - openssl - xz - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + xz + zstd + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix index 634ecfbbf4d0..d60842ae2133 100644 --- a/pkgs/by-name/et/eternal-terminal/package.nix +++ b/pkgs/by-name/et/eternal-terminal/package.nix @@ -9,7 +9,6 @@ protobuf, zlib, catch2, - darwin, }: stdenv.mkDerivation rec { diff --git a/pkgs/by-name/et/ethtool/package.nix b/pkgs/by-name/et/ethtool/package.nix index 9362d2d4007e..13b15abe5f2a 100644 --- a/pkgs/by-name/et/ethtool/package.nix +++ b/pkgs/by-name/et/ethtool/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "ethtool"; - version = "6.11"; + version = "6.14"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/ethtool-${version}.tar.xz"; - sha256 = "sha256-jZH1xyrj8lt+iNR4EnncsyD3HjAFiRQ3CxxXTJazEgI="; + hash = "sha256-kzi7AOSSh407vjzSiU5g2zWBNjTCCNsLIPXH7oTaabE="; }; nativeBuildInputs = [ @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { libmnl ]; + enableParallelBuilding = true; + passthru = { updateScript = writeScript "update-ethtool" '' #!/usr/bin/env nix-shell diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 0a4ed0777d54..a5af18874903 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,16 +17,16 @@ }: let - version = "0.203.1"; + version = "0.203.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-TdEK63F7LQwyj6aPA1NKqZLUn2cnP0XgS51vqfzNVJ8="; + hash = "sha256-OMZUJ98oiKKFsgSKLxQtdnoId4yHBNO+wKjhsgZNo6w="; }; - vendorHash = "sha256-TqtJlsT/uaqQe/mAh1hw92N3uw6GLkdwh9aIMmdNbkY="; + vendorHash = "sha256-oC6aX8hAQfLpEEkpsPYm6ALxFqReKgDiAFse2WJGt60="; commonMeta = with lib; { license = licenses.mit; @@ -52,7 +52,7 @@ buildGo124Module rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-LaP6Ee13OKwRoAZ7oF/nH8rE5zqFYzrhq6CwPaaF9SE="; + hash = "sha256-5d6GoFrNgMV6Teb9/cE8MYrO7FowlZfwcGxHjsymQWM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ex/excalidraw_export/bump-nan.patch b/pkgs/by-name/ex/excalidraw_export/bump-nan.patch new file mode 100644 index 000000000000..db257d139d8c --- /dev/null +++ b/pkgs/by-name/ex/excalidraw_export/bump-nan.patch @@ -0,0 +1,18 @@ +diff --git a/package-lock.json b/package-lock.json +index 89dd54f..2f364e4 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -805,9 +805,10 @@ + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/nan": { +- "version": "2.18.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", +- "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==" ++ "version": "2.22.0", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", ++ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", ++ "license": "MIT" + }, + "node_modules/node-fetch": { + "version": "2.7.0", diff --git a/pkgs/by-name/ex/excalidraw_export/package.nix b/pkgs/by-name/ex/excalidraw_export/package.nix index f0180e09e907..1f118e677a6b 100644 --- a/pkgs/by-name/ex/excalidraw_export/package.nix +++ b/pkgs/by-name/ex/excalidraw_export/package.nix @@ -5,7 +5,6 @@ cairo, pango, pkg-config, - stdenv, }: buildNpmPackage { @@ -19,7 +18,13 @@ buildNpmPackage { hash = "sha256-E5kYI8+hzObd2WNVBd0aQDKMH1Sns539loCQfClJs1Q="; }; - npmDepsHash = "sha256-5yec7BCi1c/e+y00TqxIeoazs49+WdKdfsskAqnVkFs="; + patches = [ + # for compatibility with nodejs_22 + # generated by running: `npm update nan` + ./bump-nan.patch + ]; + + npmDepsHash = "sha256-bU+q83Pmw6+mCF5rTR0DyYstUYVN+YxH9T9H7ZA15so="; npmBuildScript = "compile"; @@ -35,6 +40,5 @@ buildNpmPackage { license = lib.licenses.mit; maintainers = with lib.maintainers; [ venikx ]; mainProgram = "excalidraw_export"; - broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix index 66dd61875dc9..30c19cb1ab85 100644 --- a/pkgs/by-name/ex/exegol/package.nix +++ b/pkgs/by-name/ex/exegol/package.nix @@ -6,12 +6,12 @@ }: python3Packages.buildPythonApplication rec { pname = "exegol"; - version = "4.3.10"; + version = "4.3.11"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-BtOW7EBbFil7yyhL6uayTUUkDldI8+xxolfQZtX+00c="; + hash = "sha256-+LnZSFRW7EvG+cPwMStgO6qD4AjOGkLzCarXBrW3Aak="; }; build-system = with python3Packages; [ pdm-backend ]; diff --git a/pkgs/by-name/ex/exempi/package.nix b/pkgs/by-name/ex/exempi/package.nix index 26b57d89e758..e8131c0d8b57 100644 --- a/pkgs/by-name/ex/exempi/package.nix +++ b/pkgs/by-name/ex/exempi/package.nix @@ -6,7 +6,6 @@ zlib, boost, libiconv, - darwin, }: stdenv.mkDerivation rec { @@ -34,7 +33,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.CoreServices ]; doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit; diff --git a/pkgs/by-name/ex/exercise-timer/package.nix b/pkgs/by-name/ex/exercise-timer/package.nix new file mode 100644 index 000000000000..0f28d728448b --- /dev/null +++ b/pkgs/by-name/ex/exercise-timer/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + alsa-lib, + appstream-glib, + cargo, + desktop-file-utils, + fetchFromGitHub, + glib, + gtk4, + libadwaita, + meson, + ninja, + nix-update-script, + pkg-config, + rustPlatform, + rustc, + wrapGAppsHook4, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "exercise-timer"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "mfep"; + repo = "exercise-timer"; + tag = "v${finalAttrs.version}"; + hash = "sha256-6MBSUYFZ8nMZX7acam8T0uJWb9E2/L9vnKzJq14p4BY="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-fmY89VGv9tSMaILFnAVTAyp9PWGsvSCZ/9DfF5LI3xM="; + }; + + nativeBuildInputs = [ + appstream-glib + cargo + desktop-file-utils + glib + gtk4 + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustc + wrapGAppsHook4 + ]; + + buildInputs = [ + alsa-lib + libadwaita + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Timer app for high intensity interval training"; + homepage = "https://apps.gnome.org/Hiit/"; + changelog = "https://github.com/mfep/exercise-timer/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.gnome-circle.members; + mainProgram = "hiit"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index c7d49ff6baef..149e76b5b517 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2025-04-14"; + version = "2025-04-19"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-yoQB2QM9Fg4tKKPeGTM68+Su98mt8znkINNQY9cVUoI="; + hash = "sha256-Gq+Yg9Qf1D86vM0d+FFPneztm0KMdbheghmef334+Ps="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ex/exportarr/package.nix b/pkgs/by-name/ex/exportarr/package.nix index 329fa3b7aa90..3f02b4ae9451 100644 --- a/pkgs/by-name/ex/exportarr/package.nix +++ b/pkgs/by-name/ex/exportarr/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "exportarr"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "onedr0p"; repo = "exportarr"; rev = "v${version}"; - hash = "sha256-iNcdD2zigBZ2phtCkHRV0GZPrEjopV0K+vin1Zkb3Oo="; + hash = "sha256-8EHFnqQ3h9/X2lR+9UuuJeSPMonuVQVDYiMDoroDajs="; }; - vendorHash = "sha256-F5WOSsjeOzMaj4Yze11OnqpgL1l87wpgl3OQEGya//M="; + vendorHash = "sha256-yzzhlhrfzj+qlG4wY+qGM0/sTUUlVQAgwiKNUEIVN0g="; subPackages = [ "cmd/exportarr" ]; diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 1a4c30b169ac..b2db5105301c 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "eza"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; tag = "v${finalAttrs.version}"; - hash = "sha256-edBFMqY+61kFumLTcVFgnmhE4d+bMVz+udR5h02kDk0="; + hash = "sha256-HtukMHiTWWejbq+cpeyF4QmTaBP4yvvyVb/xaacHKwI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-VqwgsYyoZM+88IkMJxDtIi5WtPDRg0Izk7WenTNuLAI="; + cargoHash = "sha256-T/ryAhBM0ECttDx3vMesLfTXfnHecM/0gpOCcg/o2kI="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ez/ezno/package.nix b/pkgs/by-name/ez/ezno/package.nix index 9c04adecdb0a..7cf45f25c4b1 100644 --- a/pkgs/by-name/ez/ezno/package.nix +++ b/pkgs/by-name/ez/ezno/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-v4lgHx+sR58CshZJCUYrtaW4EDFBUKFPJJ6V+eyf5Bc="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - cargoBuildFlags = [ "--bin" "ezno" diff --git a/pkgs/by-name/ez/eztrace/0001-otf2-backend-cross.patch b/pkgs/by-name/ez/eztrace/0001-otf2-backend-cross.patch new file mode 100644 index 000000000000..4b4dfc058204 --- /dev/null +++ b/pkgs/by-name/ez/eztrace/0001-otf2-backend-cross.patch @@ -0,0 +1,27 @@ +diff --git a/cmake_modules/FindOTF2.cmake b/cmake_modules/FindOTF2.cmake +index 2853f92a..af1f3225 100644 +--- a/cmake_modules/FindOTF2.cmake ++++ b/cmake_modules/FindOTF2.cmake +@@ -15,11 +15,11 @@ IF(NOT OTF2_CONFIG OR NOT EXISTS ${OTF2_CONFIG}) + ELSE() + message(STATUS "OTF2 installation found. (using ${OTF2_CONFIG})") + +- execute_process(COMMAND ${OTF2_CONFIG} "--cppflags" OUTPUT_VARIABLE OTF2_INCLUDE_PATH) ++ execute_process(COMMAND ${OTF2_CONFIG} "--cppflags" "--target" "backend" OUTPUT_VARIABLE OTF2_INCLUDE_PATH) + STRING(REPLACE "\n" "" OTF2_INCLUDE_PATH ${OTF2_INCLUDE_PATH}) + STRING(REPLACE "-I" "" OTF2_INCLUDE_PATH ${OTF2_INCLUDE_PATH}) + +- execute_process(COMMAND ${OTF2_CONFIG} "--ldflags" OUTPUT_VARIABLE _LINK_LD_ARGS) ++ execute_process(COMMAND ${OTF2_CONFIG} "--ldflags" "--target" "backend" OUTPUT_VARIABLE _LINK_LD_ARGS) + STRING( REPLACE " " ";" _LINK_LD_ARGS ${_LINK_LD_ARGS} ) + FOREACH( _ARG ${_LINK_LD_ARGS} ) + IF(${_ARG} MATCHES "^-L") +@@ -29,7 +29,7 @@ ELSE() + ENDIF(${_ARG} MATCHES "^-L") + ENDFOREACH(_ARG) + +- execute_process(COMMAND ${OTF2_CONFIG} "--libs" OUTPUT_VARIABLE _LINK_LD_ARGS) ++ execute_process(COMMAND ${OTF2_CONFIG} "--libs" "--target" "backend" OUTPUT_VARIABLE _LINK_LD_ARGS) + STRING( REPLACE " " ";" _LINK_LD_ARGS ${_LINK_LD_ARGS} ) + FOREACH( _ARG ${_LINK_LD_ARGS} ) + IF(${_ARG} MATCHES "^-l") diff --git a/pkgs/by-name/ez/eztrace/0002-absolute-cmake-install-paths.patch b/pkgs/by-name/ez/eztrace/0002-absolute-cmake-install-paths.patch new file mode 100644 index 000000000000..67e3ec25b71b --- /dev/null +++ b/pkgs/by-name/ez/eztrace/0002-absolute-cmake-install-paths.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b36a8a94..74c6de2e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -195,8 +195,16 @@ set(EZTRACE_LIB_DIR ${CMAKE_INSTALL_FULL_LIBDIR}) + #set(__PPTRACE_BINARY_TYPE "PPTRACE_BINARY_TYPE_BFD") + #set(abs_top_builddir ${CMAKE_BINARY_DIR}) + +-set(INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") +-set(INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") ++if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR}) ++ set(INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}") ++else() ++ set(INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") ++endif() ++if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) ++ set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}") ++else() ++ set(INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") ++endif() + set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + + # Subdirectory diff --git a/pkgs/by-name/ez/eztrace/package.nix b/pkgs/by-name/ez/eztrace/package.nix index 8a5b3dbeb91c..a55d917bfde2 100644 --- a/pkgs/by-name/ez/eztrace/package.nix +++ b/pkgs/by-name/ez/eztrace/package.nix @@ -2,43 +2,98 @@ lib, stdenv, fetchFromGitLab, + cmake, gfortran, libelf, libiberty, - zlib, - # Once https://gitlab.com/eztrace/eztrace/-/issues/41 - # is released we can switch to latest binutils. - libbfd_2_38, - libopcodes_2_38, - autoreconfHook, + libbfd, + libopcodes, + otf2, + versionCheckHook, }: -stdenv.mkDerivation rec { - pname = "EZTrace"; - version = "1.1-11"; +stdenv.mkDerivation (finalAttrs: { + pname = "eztrace"; + version = "2.1.1"; + + outputs = [ + "out" + "dev" + "lib" + "man" + ]; src = fetchFromGitLab { owner = "eztrace"; repo = "eztrace"; - rev = "eztrace-${version}"; - hash = "sha256-A6HMr4ib5Ka1lTbbTQOdq3kIdCoN/CwAKRdXdv9wpfU="; + tag = "${finalAttrs.version}"; + hash = "sha256-ccW4YjEf++tkdIJLze2x8B/SWbBBXnYt8UV9OH8+KGU="; }; - nativeBuildInputs = [ - gfortran - autoreconfHook + # Possibly upstream these patches. + patches = [ + ./0001-otf2-backend-cross.patch # To fix cross. + ./0002-absolute-cmake-install-paths.patch # To fix generated .pc file ]; + + postPatch = '' + substituteInPlace src/eztrace-lib/eztrace_otf2.c \ + --replace-fail "/bin/rm" "rm" + substituteInPlace cmake_modules/FindOTF2.cmake \ + --replace-fail "find_program(OTF2_CONFIG otf2-config REQUIRED)" \ + "find_program(OTF2_CONFIG "${lib.getExe' otf2 "otf2-config"}" REQUIRED)" \ + --replace-fail "find_program(OTF2_PRINT otf2-print REQUIRED)" \ + "find_program(OTF2_PRINT "${lib.getExe' otf2 "otf2-print"}" REQUIRED)" + # 2.1.1 incorrectly reports 2.1.0. TODO: Remove after next release + substituteInPlace CMakeLists.txt \ + --replace-fail "2.1.0" "${finalAttrs.version}" + patchShebangs test + ''; + + strictDeps = true; + + cmakeFlags = [ + (lib.cmakeBool "EZTRACE_ENABLE_MEMORY" true) + # This test is somewhat flaky and fails once per several rebuilds. + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;memory_tests") + ]; + + nativeBuildInputs = [ + cmake + gfortran + ]; + buildInputs = [ libelf libiberty - zlib - libbfd_2_38 - libopcodes_2_38 + libbfd + libopcodes + otf2 ]; - meta = with lib; { + doCheck = true; + nativeCheckInputs = [ + otf2 # `otf2-print` needed by compiler_instrumentation_tests,pthread_tests,posixio_tests + ]; + + postInstall = '' + moveToOutput bin/eztrace_create_plugin "$dev" + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = { description = "Tool that aims at generating automatically execution trace from HPC programs"; - license = licenses.cecill-b; - maintainers = [ ]; + homepage = "https://eztrace.gitlab.io/eztrace/index.html"; + downloadPage = "https://gitlab.com/eztrace/eztrace/"; + license = lib.licenses.cecill-b; + maintainers = [ lib.maintainers.xokdvium ]; + mainProgram = "eztrace"; + badPlatforms = [ + # Undefined symbols for architecture x86_64: + # > "___cyg_profile_func_enter", referenced from: + lib.systems.inspect.patterns.isDarwin + ]; }; -} +}) diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix index 3174edbb7e73..5032f6afb684 100644 --- a/pkgs/by-name/fa/faas-cli/package.nix +++ b/pkgs/by-name/fa/faas-cli/package.nix @@ -24,13 +24,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.17.3"; + version = "0.17.4"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-K+FlucmtGCB+4mQpqsXRvCHlHQ4vfA9vG7xSwFigJvU="; + sha256 = "sha256-GM2gRfrdfUhfBn2atG21H7bNbW1HtgwQ7d7kMXvyMAs="; }; vendorHash = null; diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix index 4a16f27ec927..777a2bffbdb4 100644 --- a/pkgs/by-name/fa/fabric-ai/package.nix +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "fabric-ai"; - version = "1.4.167"; + version = "1.4.171"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "fabric"; tag = "v${version}"; - hash = "sha256-M6YL111YQahrFLaZt+b3EooziCTDpZnO5hGBj1XBVxY="; + hash = "sha256-NHsgsK7h+PeunGKAgkIOmINPJugkx7nuNvAU4jwsrAI="; }; vendorHash = "sha256-ax0ZLvLfbmpzO93xRqonHJz1zHs6u0+Mu0WegR1eW60="; diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index 63d9bca496a2..f8f6ea32e40f 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -3,14 +3,14 @@ "alpha": { "experimental": { "candidateHashFilenames": [ - "factorio_linux_2.0.43.tar.xz" + "factorio_linux_2.0.45.tar.xz" ], - "name": "factorio_alpha_x64-2.0.43.tar.xz", + "name": "factorio_alpha_x64-2.0.45.tar.xz", "needsAuth": true, - "sha256": "971c293f46d2e021be762eb23c45c17746aa5b8ec74e30fef5f46fa32bb7e1aa", + "sha256": "32b004a648dfc8b8e2bb6b82f648e5be458a13b7fefad79487a1d663c6f3b711", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.43/alpha/linux64", - "version": "2.0.43" + "url": "https://factorio.com/get-download/2.0.45/alpha/linux64", + "version": "2.0.45" }, "stable": { "candidateHashFilenames": [ @@ -51,14 +51,14 @@ "expansion": { "experimental": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.43.tar.xz" + "factorio-space-age_linux_2.0.45.tar.xz" ], - "name": "factorio_expansion_x64-2.0.43.tar.xz", + "name": "factorio_expansion_x64-2.0.45.tar.xz", "needsAuth": true, - "sha256": "43d98f9dfa4edc15a622b9881f71673902710ef8aa12cccc7f6e8ccd7962488e", + "sha256": "7a81be62a051b80166c9f6c9e94fca2e19a0ac65f19769f99a624772f87cdab4", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.43/expansion/linux64", - "version": "2.0.43" + "url": "https://factorio.com/get-download/2.0.45/expansion/linux64", + "version": "2.0.45" }, "stable": { "candidateHashFilenames": [ @@ -75,15 +75,15 @@ "headless": { "experimental": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.43.tar.xz", - "factorio_headless_x64_2.0.43.tar.xz" + "factorio-headless_linux_2.0.45.tar.xz", + "factorio_headless_x64_2.0.45.tar.xz" ], - "name": "factorio_headless_x64-2.0.43.tar.xz", + "name": "factorio_headless_x64-2.0.45.tar.xz", "needsAuth": false, - "sha256": "bde6e167330c4439ce7df3ac519ea445120258ef676f1f6ad31d0c2816d3aee3", + "sha256": "4fd7e04bb3ea7d12da8e1c3befc6b53b3c0064775c960a5a9db6a943f2259fc2", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.43/headless/linux64", - "version": "2.0.43" + "url": "https://factorio.com/get-download/2.0.45/headless/linux64", + "version": "2.0.45" }, "stable": { "candidateHashFilenames": [ diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix index 7a708681c53a..1fe6de31cb6e 100644 --- a/pkgs/by-name/fa/factoriolab/package.nix +++ b/pkgs/by-name/fa/factoriolab/package.nix @@ -10,13 +10,13 @@ }: buildNpmPackage rec { pname = "factoriolab"; - version = "3.12.1"; + version = "3.13.3"; src = fetchFromGitHub { owner = "factoriolab"; repo = "factoriolab"; tag = "v${version}"; - hash = "sha256-EhCxeZ1rxdYl3JejUiE+Ss02hm91tmXuyJ/2UgS+ZIw="; + hash = "sha256-HYf6G06dK3wvCOLnKx1aDteQ0SxBDE+yulGJa9VZE9Q="; }; buildInputs = [ vips ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/fa/faircamp/package.nix b/pkgs/by-name/fa/faircamp/package.nix index bbb53aabcecf..9419d8a99341 100644 --- a/pkgs/by-name/fa/faircamp/package.nix +++ b/pkgs/by-name/fa/faircamp/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitea, makeWrapper, @@ -10,7 +9,6 @@ vips, ffmpeg, callPackage, - darwin, testers, faircamp, }: @@ -38,15 +36,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - glib - libopus - vips - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ + glib + libopus + vips + ]; postInstall = '' wrapProgram $out/bin/faircamp \ diff --git a/pkgs/by-name/fa/fangfrisch/package.nix b/pkgs/by-name/fa/fangfrisch/package.nix index 42e854feb3c5..a60e95aab5f5 100644 --- a/pkgs/by-name/fa/fangfrisch/package.nix +++ b/pkgs/by-name/fa/fangfrisch/package.nix @@ -3,6 +3,9 @@ python3, fetchFromGitHub, nix-update-script, + + # support setting socks proxies in `ALL_PROXY` environment variable + supportSocks ? true, }: let version = "1.9.2"; @@ -24,10 +27,13 @@ python3.pkgs.buildPythonApplication { python3.pkgs.wheel ]; - propagatedBuildInputs = with python3.pkgs; [ - requests - sqlalchemy - ]; + propagatedBuildInputs = + with python3.pkgs; + [ + requests + sqlalchemy + ] + ++ lib.optional supportSocks pysocks; pythonImportsCheck = [ "fangfrisch" ]; diff --git a/pkgs/by-name/fa/fast-float/package.nix b/pkgs/by-name/fa/fast-float/package.nix index 9ecdb4239114..c4b7ca10efaf 100644 --- a/pkgs/by-name/fa/fast-float/package.nix +++ b/pkgs/by-name/fa/fast-float/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fast-float"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { owner = "fastfloat"; repo = "fast_float"; rev = "v${finalAttrs.version}"; - hash = "sha256-Y13JdBk8pZyg748fEOj+O/6gMAaqNXIE2fLY5tsMGB0="; + hash = "sha256-lKEzRYKdpjsqixC9WBoILccqB2ZkUtPUzT4Q4+j0oac="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 913e8fe8378d..fcdbd9325607 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -45,13 +45,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.40.4"; + version = "2.41.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-s9QIjN4x1wovnq3eOQEyWhqSK1nlefGnnC9n356qEE4="; + hash = "sha256-7BTQiUf78CKozZAUdw0Y1U7EO+ZvMDim3N/PPebDMNg="; }; outputs = [ diff --git a/pkgs/by-name/fa/fastp/package.nix b/pkgs/by-name/fa/fastp/package.nix index 89ae4a59486d..d5eeeb41954a 100644 --- a/pkgs/by-name/fa/fastp/package.nix +++ b/pkgs/by-name/fa/fastp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fastp"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "OpenGene"; repo = "fastp"; rev = "v${version}"; - sha256 = "sha256-Jl2Os/6yLWXTDv6irInYlUHpz6QTw8CEMVGFXblAay0="; + sha256 = "sha256-vTAuuhnJ5O2mUFUxM5RIq8w/Zo3SmAgQIDd99YpDcww="; }; buildInputs = [ diff --git a/pkgs/by-name/fc/fcast-receiver/package.nix b/pkgs/by-name/fc/fcast-receiver/package.nix index ae1a093fe214..8225fc2cfce4 100644 --- a/pkgs/by-name/fc/fcast-receiver/package.nix +++ b/pkgs/by-name/fc/fcast-receiver/package.nix @@ -6,31 +6,32 @@ copyDesktopItems, makeWrapper, electron, + rsync, }: buildNpmPackage rec { pname = "fcast-receiver"; - version = "1.0.14"; + version = "2.0.0"; src = fetchFromGitLab { domain = "gitlab.futo.org"; owner = "videostreaming"; repo = "fcast"; - rev = "c7a1cb27c470870df50dbf0de00a133061298d46"; - hash = "sha256-9xF1DZ2wt6zMoUQywmvnNN3Z8m4GhOFJElENhozF9c8="; + rev = "4af2a537ef431918a5cf53b3ba18abe6b2d18c1e"; + hash = "sha256-Y3IyxYLGRi/fLh5A3ap+5x3Wny9WRplaYtBM3R3I8+U="; }; sourceRoot = "${src.name}/receivers/electron"; makeCacheWritable = true; - npmDepsHash = "sha256-gpbFZ8rKYR/GUY1l4eH5io/lz6FpJLUTl5h8q3haxvw="; + npmDepsHash = "sha256-GXlqOukGWtt3KP+xsAiDsUG2Naej0v2RL7Vq3hqcavE="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; desktopItems = [ (makeDesktopItem { - name = pname; + name = "fcast-receiver"; desktopName = "FCast Receiver"; genericName = "Media Streaming Receiver"; exec = "fcast-receiver"; @@ -42,24 +43,26 @@ buildNpmPackage rec { nativeBuildInputs = [ copyDesktopItems makeWrapper + rsync ]; postInstall = '' - install -Dm644 $out/lib/node_modules/fcast-receiver/app.png $out/share/pixmaps/fcast-receiver.png + install -Dm644 assets/icons/app/icon.png $out/share/pixmaps/fcast-receiver.png + ln -s $out/lib/node_modules/fcast-receiver/package.json $out/lib/node_modules/fcast-receiver/dist/package.json makeWrapper ${electron}/bin/electron $out/bin/fcast-receiver \ --add-flags $out/lib/node_modules/fcast-receiver/dist/bundle.js ''; - meta = with lib; { + meta = { description = "FCast Receiver, an open-source media streaming receiver"; longDescription = '' FCast Receiver is a receiver for an open-source media streaming protocol, FCast, an alternative to Chromecast and AirPlay. ''; homepage = "https://fcast.org/"; - license = licenses.gpl3; - maintainers = with maintainers; [ ymstnt ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ ymstnt ]; mainProgram = "fcast-receiver"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/fc/fceux/package.nix b/pkgs/by-name/fc/fceux/package.nix index 7f01638b96c5..8b9d74774649 100644 --- a/pkgs/by-name/fc/fceux/package.nix +++ b/pkgs/by-name/fc/fceux/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, SDL2, cmake, fetchFromGitHub, @@ -12,7 +13,6 @@ pkg-config, qt5, qt6, - stdenv, x264, # Configurable options ___qtVersion ? "5", @@ -31,13 +31,13 @@ assert lib.elem ___qtVersion [ ]; stdenv.mkDerivation (finalAttrs: { pname = "fceux"; - version = "2.6.6-unstable-2024-06-09"; + version = "2.6.6-unstable-2025-01-20"; src = fetchFromGitHub { owner = "TASEmulators"; repo = "fceux"; - rev = "f980ec2bc7dc962f6cd76b9ae3131f2eb902c9e7"; - hash = "sha256-baAjrTzRp61Lw1p5axKJ97PuFiuBNQewXrlN0s8o7us="; + rev = "2b8f6e76271341616920bb7e0c54ee48570783d3"; + hash = "sha256-2QDiAk2HO9oQ1gNvc7QFZSCbWkCDYW5OJWT8f4bmXyg="; }; nativeBuildInputs = [ @@ -60,15 +60,19 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + postInstall = '' + substituteInPlace $out/share/applications/fceux.desktop \ + --replace-fail "/usr/bin/" "" \ + --replace-fail "/usr/share/pixmaps/" "" + ''; + meta = { - homepage = "http://www.fceux.com/"; + homepage = "http://www.fceux.com"; description = "Nintendo Entertainment System (NES) Emulator"; - changelog = "https://github.com/TASEmulators/blob/fceux/${finalAttrs.src.rev}/changelog.txt"; + changelog = "https://github.com/TASEmulators/fceux/blob/${finalAttrs.src.rev}/changelog.txt"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "fceux"; - maintainers = with lib.maintainers; [ - sbruder - ]; + maintainers = with lib.maintainers; [ sbruder ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/fc/fcgi/package.nix b/pkgs/by-name/fc/fcgi/package.nix index 08e34c4b5914..d9882080e7f5 100644 --- a/pkgs/by-name/fc/fcgi/package.nix +++ b/pkgs/by-name/fc/fcgi/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fcgi"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { owner = "FastCGI-Archives"; repo = "fcgi2"; rev = finalAttrs.version; - hash = "sha256-GI2RL0djfCej7bBhxR6cK/FrTbDYEl75SEfQFgl0ctA="; + hash = "sha256-DsL44onRIUnf99Y+hTjMOaEVp6cjbdqksm4V+1od6pU="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix index e809565a6179..0b3155ff4e00 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-moegirl"; - version = "20250309"; + version = "20250409"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; - hash = "sha256-0ZXlPpeaxXK3dI2uGBmISpCGM9isQdPxJRTcoIa75fg="; + hash = "sha256-OuAJbuQs/yiCFJAG1qkS+0INdpmjdwc7vvz5WZruQ98="; }; dontUnpack = true; diff --git a/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix index 7c82ebddaa9d..69329bff762f 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-zhwiki"; version = "0.2.5"; - date = "20240909"; + date = "20250415"; src = fetchurl { url = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki/releases/download/${finalAttrs.version}/zhwiki-${finalAttrs.date}.dict"; - hash = "sha256-djXrwl1MmiAf0U5Xvm4S7Fk2fKNRm5jtc94KUYIrcm8="; + hash = "sha256-8dFBoP3UcYCl6EYojn14Bp7aYe/Z9cf4drSmeheHbLw="; }; dontUnpack = true; diff --git a/pkgs/by-name/fd/fdroidserver/package.nix b/pkgs/by-name/fd/fdroidserver/package.nix index c894d37d1798..43f628f4ee95 100644 --- a/pkgs/by-name/fd/fdroidserver/package.nix +++ b/pkgs/by-name/fd/fdroidserver/package.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { pname = "fdroidserver"; - version = "2.3.5"; + version = "2.4.0"; pyproject = true; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { owner = "fdroid"; repo = "fdroidserver"; tag = version; - hash = "sha256-ESSjC44tdWpmtB+VhEDnUTQz+ZJVQ4jLBjj+0hMSAQA="; + hash = "sha256-PQZz3dyX6vCS0axHfSINMMX5ETdVs44K9XjR87gtd3s="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/fe/fedistar/package.nix b/pkgs/by-name/fe/fedistar/package.nix index 33b5d07a62e5..40cb8ca8a726 100644 --- a/pkgs/by-name/fe/fedistar/package.nix +++ b/pkgs/by-name/fe/fedistar/package.nix @@ -18,19 +18,19 @@ let pnpm = pnpm_10; pname = "fedistar"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "h3poteto"; repo = "fedistar"; tag = "v${version}"; - hash = "sha256-W05vWCP4zHrijFzmdCPbX/aN4UbJ0ALXGMHyMAEEig4="; + hash = "sha256-Q2j6K4ys/z77+n3kdGJ15rWbFlbbIHBWB9hOARsgg2A="; }; fedistar-frontend = stdenvNoCC.mkDerivation (finalAttrs: { pname = "fedistar-frontend"; inherit version src; pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-s2Kz5+xsrjGB11zAChSTaJNUewGFA6JAcj4kuId+CDY="; + hash = "sha256-xXVsjAXmrsOp+mXrYAxSKz4vX5JApLZ+Rh6hrYlnJDI="; }; nativeBuildInputs = [ pnpm.configHook @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage { sourceRoot = "${src.name}/src-tauri"; useFetchCargoVendor = true; - cargoHash = "sha256-0Z1V352rUXP+yKT55UOrH9ByJDYGJl/tYJG2ofJAKA0="; + cargoHash = "sha256-ZJgyrFDtzAH3XqDdnJ27Yn+WsTMrZR2+lnkZ6bw6hzg="; postPatch = '' substituteInPlace ./tauri.conf.json \ diff --git a/pkgs/by-name/fe/felix-fm/package.nix b/pkgs/by-name/fe/felix-fm/package.nix index de70bdf3729a..b303ecccfc93 100644 --- a/pkgs/by-name/fe/felix-fm/package.nix +++ b/pkgs/by-name/fe/felix-fm/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.16.0"; + version = "2.16.1"; src = fetchFromGitHub { owner = "kyoheiu"; repo = "felix"; tag = "v${version}"; - hash = "sha256-h/sytTRufqFgnhbg67qtTx6XhnC/UzgT4zFq4bJYhQM="; + hash = "sha256-QslV0MVbIuiFDmd8A69+7nTPAUhDrn/dndZsIiNkeZ8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dS90DVFmXOFBv7qKfsOpR5WvdRqR9ZqmapXaCVdG3ic="; + cargoHash = "sha256-1JjvfXyjGUHIwJJAlI2pB829kHcPrVmKOp+msDk5Qp4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fe/ferrishot/package.nix b/pkgs/by-name/fe/ferrishot/package.nix new file mode 100644 index 000000000000..ef4dfe09093d --- /dev/null +++ b/pkgs/by-name/fe/ferrishot/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + makeBinaryWrapper, + writableTmpDirAsHomeHook, + libGL, + libX11, + libxkbcommon, + libxcb, + wayland, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ferrishot"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "nik-rev"; + repo = "ferrishot"; + tag = "v${finalAttrs.version}"; + hash = "sha256-QnIHLkxqL/4s6jgIbGmzR5tqCjH7yJcfpx0AhdxqVKc="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-TJWS8LzLTQSr+0uw0x38mNJrjYvMzr90URYI8UcRQqc="; + + nativeBuildInputs = + [ + makeBinaryWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # error: unable to open output file '/homeless-shelter/.cache/clang/ModuleCache/354UBE8EJRBZ3/Cocoa-31YYBL2V1XGQP.pcm': 'No such file or directory' + writableTmpDirAsHomeHook + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libxcb + ]; + + postInstall = + let + runtimeDeps = + [ + libGL + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + libxkbcommon + wayland + ]; + in + '' + wrapProgram $out/bin/ferrishot \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Screenshot app written in Rust"; + homepage = "https://github.com/nik-rev/ferrishot"; + changelog = "https://github.com/nik-rev/ferrishot/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "ferrishot"; + }; +}) diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index 66c57b296a66..5f460dff6adf 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -6,10 +6,10 @@ let pname = "fflogs"; - version = "8.16.31"; + version = "8.16.56"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-E/obhD5AwgF81oj4UXEjOmTGElHITxPalUrhbnN6IYs="; + hash = "sha256-ahStMcNvtvOVK3K9W73gSuymmicuYRWZdpfeFQ5uNCI="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/ff/ffmpeg-normalize/package.nix b/pkgs/by-name/ff/ffmpeg-normalize/package.nix index bcfc78b66e9c..4ffaeca2b432 100644 --- a/pkgs/by-name/ff/ffmpeg-normalize/package.nix +++ b/pkgs/by-name/ff/ffmpeg-normalize/package.nix @@ -4,23 +4,31 @@ fetchPypi, ffmpeg, }: + python3Packages.buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.28.3"; + version = "1.31.3"; src = fetchPypi { - inherit pname version; - hash = "sha256-8wNPuVRQRQpFK6opgwqdKYMYmAFRqq8p/T5V9kC8QaY="; + inherit version; + pname = "ffmpeg_normalize"; + hash = "sha256-sewDSBUX6gCZSIHeRtpx5fQGtOKN8OWZKrtCF2bgI9Y="; }; - propagatedBuildInputs = [ - ffmpeg - python3Packages.ffmpeg-progress-yield - ]; - dependencies = with python3Packages; [ colorlog ]; + dependencies = + with python3Packages; + [ + colorlog + ffmpeg-progress-yield + ] + ++ [ ffmpeg ]; checkPhase = '' + runHook preCheck + $out/bin/ffmpeg-normalize --help > /dev/null + + runHook postCheck ''; meta = { diff --git a/pkgs/by-name/fh/fh/package.nix b/pkgs/by-name/fh/fh/package.nix index d8126f791aa7..1d0e0ae613b0 100644 --- a/pkgs/by-name/fh/fh/package.nix +++ b/pkgs/by-name/fh/fh/package.nix @@ -4,9 +4,7 @@ fetchFromGitHub, installShellFiles, stdenv, - darwin, gcc, - libcxx, cacert, }: @@ -32,13 +30,11 @@ rustPlatform.buildRustPackage rec { checkInputs = [ cacert ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration gcc.cc.lib ]; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_COMPILE = "-I${lib.getDev libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"; }; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/by-name/fh/fheroes2/package.nix b/pkgs/by-name/fh/fheroes2/package.nix index dbe215a34360..628566cecad1 100644 --- a/pkgs/by-name/fh/fheroes2/package.nix +++ b/pkgs/by-name/fh/fheroes2/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - hash = "sha256-CowCP+gZuGSXWbALYBkmyn+RlDgOGho/Px34GutrBX0="; + hash = "sha256-PXh8yPalXQ91roSzvWXLnHVgjz7unyWytR1x3bvh2OU="; }; nativeBuildInputs = [ imagemagick ]; diff --git a/pkgs/by-name/fi/fiddler-everywhere/package.nix b/pkgs/by-name/fi/fiddler-everywhere/package.nix index cee3021695df..f166197bb6e7 100644 --- a/pkgs/by-name/fi/fiddler-everywhere/package.nix +++ b/pkgs/by-name/fi/fiddler-everywhere/package.nix @@ -8,11 +8,11 @@ let pname = "fiddler-everywhere"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage"; - hash = "sha256-AqwIzjnSq579cSgBbslPXINhXAtGvl8Z7nOWdHzCmro="; + hash = "sha256-b90O45IOF1F39fKOxyUk8ONTWhH7A367jJpzeKukj04="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/fi/fido2-manage/package.nix b/pkgs/by-name/fi/fido2-manage/package.nix index 633a148451e4..b6440098e92f 100644 --- a/pkgs/by-name/fi/fido2-manage/package.nix +++ b/pkgs/by-name/fi/fido2-manage/package.nix @@ -23,7 +23,6 @@ libuv, libsolv, libcouchbase, - darwin, }: let pythonEnv = python3.withPackages (ps: [ ps.tkinter ]); @@ -69,8 +68,6 @@ stdenv.mkDerivation rec { libuv libsolv libcouchbase - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.PCSC ]; cmakeFlags = [ "-USE_PCSC=ON" ]; diff --git a/pkgs/by-name/fi/filen-cli/package.nix b/pkgs/by-name/fi/filen-cli/package.nix index c841cfa9fd64..5a2cbe596878 100644 --- a/pkgs/by-name/fi/filen-cli/package.nix +++ b/pkgs/by-name/fi/filen-cli/package.nix @@ -6,7 +6,6 @@ makeWrapper, nix-update-script, versionCheckHook, - darwin, libsecret, nodejs, perl, @@ -15,16 +14,16 @@ buildNpmPackage (finalAttrs: { pname = "filen-cli"; - version = "0.0.32"; + version = "0.0.33"; src = fetchFromGitHub { owner = "FilenCloudDienste"; repo = "filen-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-sSwRgtjBfmvZ8jEzMoiqGNSaxE+bRvx1udGf9g8EwfM="; + hash = "sha256-piGXcPUwJDOg8EAYML0BiSPRM+1LogU8s2BXtBud5ww="; }; - npmDepsHash = "sha256-RXA/kVvLrmrsxj6T6H2soTMYmC6VRWNjuQfefgVB/qY="; + npmDepsHash = "sha256-4GdipHnaqv3LrejMXF73duNyZKgD/0ApzUjiI/QQ30g="; inherit nodejs; @@ -42,12 +41,7 @@ buildNpmPackage (finalAttrs: { ]; # for keytar - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ libsecret ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libsecret ]; postPatch = '' # The version string is substituted during publishing: diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 114f38ce4453..df2b746892fc 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.266"; + version = "2.13.278"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-96DSnobVyG50iS6NyCMpZ74KWEtkCyNdFyGXLwrSZxo="; + hash = "sha256-/488GRkU3pQDEkQhLoKQ4ohv4olSnCaLAca/jvq/lsA="; }; - vendorHash = "sha256-ilof8neXlw2Oa3OVceiRbXBkj5nfw+b6VMjMWhPgJqI="; + vendorHash = "sha256-QulVxCaPvXlFwkxe15Et1+rReolABBssTxZspV8KzMs="; ldflags = [ "-s" diff --git a/pkgs/by-name/fi/fim-rs/package.nix b/pkgs/by-name/fi/fim-rs/package.nix index 2ecb4b4142d1..1c43375c7f37 100644 --- a/pkgs/by-name/fi/fim-rs/package.nix +++ b/pkgs/by-name/fi/fim-rs/package.nix @@ -1,11 +1,9 @@ { lib, bzip2, - darwin, fetchFromGitHub, pkg-config, rustPlatform, - stdenv, zstd, }: @@ -32,17 +30,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - bzip2 - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/fi/fim/native-tools.patch b/pkgs/by-name/fi/fim/native-tools.patch new file mode 100644 index 000000000000..643e535dbd2c --- /dev/null +++ b/pkgs/by-name/fi/fim/native-tools.patch @@ -0,0 +1,26 @@ +diff --git a/doc/Makefile.in b/doc/Makefile.in +index be8ebe5..13ae676 100644 +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -684,7 +684,7 @@ fimgs.man.html: fimgs.man + if test ! -s $@ ; then $(MAN2TXT) ./$< > $<.txt && $(srcdir)/vim2html.pl tags $<.txt && mv $<.txt.html $@ ; fi + + doctags$(EXEEXT): doctags.c +- $(CC) -o $@ $< ++ @cc_for_build@ -o $@ $< + + #clean: + # $(RM) -f doctags.o doctags$(EXEEXT) FIM.html tags fim-stylesheet.css fim.man.html fimgs.man.html +diff --git a/src/Makefile.in b/src/Makefile.in +index 76f5e1e..027159c 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -1132,7 +1132,7 @@ help-acm.cpp: fim.h + $(ECHO) '//#endif' >> $@ + + b2ba$(EXEEXT): b2ba.c +- $(CC) -o $@ $< ++ @cc_for_build@ -o $@ $< + + @FIM_WANT_CUSTOM_HARDCODED_CONSOLEFONT_TRUE@@HAVE_RUNNABLE_TESTS_TRUE@default_font_byte_array.h: $(FIM_CUSTOM_HARDCODED_CONSOLEFONT) b2ba$(EXEEXT) + @FIM_WANT_CUSTOM_HARDCODED_CONSOLEFONT_TRUE@@HAVE_RUNNABLE_TESTS_TRUE@ ./b2ba$(EXEEXT) < $< > $@ diff --git a/pkgs/by-name/fi/fim/package.nix b/pkgs/by-name/fi/fim/package.nix index 8e8954f52d50..3a452fac4bda 100644 --- a/pkgs/by-name/fi/fim/package.nix +++ b/pkgs/by-name/fi/fim/package.nix @@ -4,13 +4,17 @@ autoconf, automake, pkg-config, + substituteAll, lib, perl, flex, bison, readline, libexif, - x11Support ? true, + bash, + buildPackages, + # SDL depends on Qt, which doesn't cross-compile + x11Support ? (stdenv.buildPlatform.canExecute stdenv.hostPlatform), SDL, svgSupport ? true, inkscape, @@ -35,24 +39,33 @@ stdenv.mkDerivation rec { sha256 = "sha256-/p7bjeZM46DJOQ9sgtebhkNpBPj2RJYY3dMXhzHnNmg="; }; + patches = [ + # build tools with a build compiler + (substituteAll { + src = ./native-tools.patch; + cc_for_build = lib.getExe buildPackages.stdenv.cc; + }) + ]; + postPatch = '' - substituteInPlace doc/vim2html.pl \ - --replace /usr/bin/perl ${perl}/bin/perl + patchShebangs --build doc/vim2html.pl ''; nativeBuildInputs = [ autoconf automake + bison + flex + perl pkg-config ]; buildInputs = [ - perl flex - bison readline libexif + bash ] ++ lib.optional x11Support SDL ++ lib.optional svgSupport inkscape @@ -62,6 +75,15 @@ stdenv.mkDerivation rec { ++ lib.optional jpegSupport libjpeg ++ lib.optional pngSupport libpng; + configureFlags = [ + # mmap works on all relevant platforms + "ac_cv_func_mmap_fixed_mapped=yes" + # system regexp works on all relevant platforms + "fim_cv_regex_broken=no" + ]; + + env.LIBAA_CONFIG = lib.getExe' (lib.getDev aalib) "aalib-config"; + env.LIBPNG_CONFIG = lib.getExe' (lib.getDev libpng) "libpng-config"; env.NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-lSDL"; meta = with lib; { diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix index 02c93f920022..d083de8340f4 100644 --- a/pkgs/by-name/fi/finamp/package.nix +++ b/pkgs/by-name/fi/finamp/package.nix @@ -1,6 +1,7 @@ { lib, - flutter327, + stdenv, + flutter, mpv-unwrapped, patchelf, fetchFromGitHub, @@ -8,16 +9,16 @@ makeDesktopItem, }: let - version = "0.9.14-beta"; + version = "0.9.15-beta"; in -flutter327.buildFlutterApplication { +flutter.buildFlutterApplication { inherit version; pname = "finamp"; src = fetchFromGitHub { owner = "jmshrv"; repo = "finamp"; rev = version; - hash = "sha256-SDzKB5KLHkJ3xcJY67TNBXDiDlBOApKrh4x0OZR/K/M="; + hash = "sha256-ekCdHU9z8nxcIFz3oN0txlIKWAwhMV8Q5/t5QYvbzCc="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -64,6 +65,8 @@ flutter327.buildFlutterApplication { ]; meta = { + # Finamp depends on `ìsar`, which for Linux is only compiled for x86_64. https://github.com/jmshrv/finamp/issues/766 + broken = stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isx86_64; description = "Open source Jellyfin music player"; homepage = "https://github.com/jmshrv/finamp"; license = lib.licenses.mpl20; diff --git a/pkgs/by-name/fi/finamp/pubspec.lock.json b/pkgs/by-name/fi/finamp/pubspec.lock.json index 824acc28dd8d..89636bc09f2d 100644 --- a/pkgs/by-name/fi/finamp/pubspec.lock.json +++ b/pkgs/by-name/fi/finamp/pubspec.lock.json @@ -17,7 +17,7 @@ "version": "0.3.3" }, "analyzer": { - "dependency": "direct overridden", + "dependency": "direct main", "description": { "name": "analyzer", "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e", @@ -27,7 +27,7 @@ "version": "6.11.0" }, "analyzer_plugin": { - "dependency": "transitive", + "dependency": "direct overridden", "description": { "name": "analyzer_plugin", "sha256": "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161", @@ -50,31 +50,31 @@ "dependency": "transitive", "description": { "name": "archive", - "sha256": "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a", + "sha256": "0c64e928dcbefddecd234205422bcfc2b5e6d31be0b86fef0d0dd48d7b4c9742", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.0.4" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.0" + "version": "2.7.0" }, "async": { "dependency": "transitive", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, "audio_service": { "dependency": "direct main", @@ -90,11 +90,11 @@ "dependency": "direct main", "description": { "name": "audio_service_mpris", - "sha256": "b16db3584a4b2464c0bfd575c1a21765723d257931222f8adfcb0511f940d352", + "sha256": "fdab1ae1f659c6db36d5cc396e46e4ee9663caefa6153f8453fcd01d57567c08", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.5" + "version": "0.2.0" }, "audio_service_platform_interface": { "dependency": "direct main", @@ -140,11 +140,11 @@ "dependency": "direct main", "description": { "name": "background_downloader", - "sha256": "ed64a215cd24c83a478f602364a3ca86a6dafd178ad783188cc32c6956d5e529", + "sha256": "c3814aa0466368a4c1c32d24bc73ded752edacf06731ead43857a3ac992ed52d", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.4" + "version": "8.9.5" }, "balanced_text": { "dependency": "direct main", @@ -181,14 +181,14 @@ "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "build": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "build", "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", @@ -271,21 +271,21 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", + "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.3" + "version": "8.9.5" }, "characters": { "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "checked_yaml": { "dependency": "transitive", @@ -351,11 +351,11 @@ "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "code_builder": { "dependency": "transitive", @@ -371,11 +371,11 @@ "dependency": "direct main", "description": { "name": "collection", - "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.19.0" + "version": "1.19.1" }, "color": { "dependency": "transitive", @@ -431,31 +431,31 @@ "dependency": "direct dev", "description": { "name": "custom_lint", - "sha256": "3486c470bb93313a9417f926c7dd694a2e349220992d7b9d14534dc49c15bba9", + "sha256": "409c485fd14f544af1da965d5a0d160ee57cd58b63eeaa7280a4f28cf5bda7f1", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.0" + "version": "0.7.5" }, "custom_lint_builder": { "dependency": "transitive", "description": { "name": "custom_lint_builder", - "sha256": "42cdc41994eeeddab0d7a722c7093ec52bd0761921eeb2cbdbf33d192a234759", + "sha256": "107e0a43606138015777590ee8ce32f26ba7415c25b722ff0908a6f5d7a4c228", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.0" + "version": "0.7.5" }, "custom_lint_core": { "dependency": "transitive", "description": { "name": "custom_lint_core", - "sha256": "02450c3e45e2a6e8b26c4d16687596ab3c4644dd5792e3313aa9ceba5a49b7f5", + "sha256": "31110af3dde9d29fb10828ca33f1dce24d2798477b167675543ce3d208dee8be", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.0" + "version": "0.7.5" }, "custom_lint_visitor": { "dependency": "transitive", @@ -501,11 +501,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "72d146c6d7098689ff5c5f66bcf593ac11efc530095385356e131070333e64da", + "sha256": "306b78788d1bb569edb7c55d622953c2414ca12445b41c9117963e03afc5c513", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.3.0" + "version": "11.3.3" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -541,21 +541,21 @@ "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.2" }, "ffi": { "dependency": "transitive", "description": { "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "file": { "dependency": "transitive", @@ -571,11 +571,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "3d57312a53746ed4eb8c843dc50372454bbda37dd0c01a4d40fedc83e2ce4921", + "sha256": "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.5" + "version": "9.2.1" }, "file_sizes": { "dependency": "direct main", @@ -627,21 +627,21 @@ "dependency": "transitive", "description": { "name": "flutter_gen_core", - "sha256": "53890b653738f34363d9f0d40f82104c261716bd551d3ba65f648770b6764c21", + "sha256": "3eaa2d3d8be58267ac4cd5e215ac965dd23cae0410dc073de2e82e227be32bfc", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.9.0" + "version": "5.10.0" }, "flutter_gen_runner": { "dependency": "direct dev", "description": { "name": "flutter_gen_runner", - "sha256": "de70b42eb5329f712c8b041069d081ad5fb5109f32d6d1ea9c1b39596786215d", + "sha256": "e74b4ead01df3e8f02e73a26ca856759dbbe8cb3fd60941ba9f4005cd0cd19c9", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.9.0" + "version": "5.10.0" }, "flutter_launcher_icons": { "dependency": "direct dev", @@ -673,11 +673,11 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", + "sha256": "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.24" + "version": "2.0.27" }, "flutter_riverpod": { "dependency": "direct main", @@ -785,11 +785,11 @@ "dependency": "transitive", "description": { "name": "freezed_annotation", - "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2", + "sha256": "c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.4" + "version": "3.0.0" }, "frontend_server_client": { "dependency": "transitive", @@ -841,35 +841,35 @@ "source": "hosted", "version": "2.0.0" }, - "hive": { + "hive_ce": { "dependency": "direct main", "description": { - "name": "hive", - "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941", + "name": "hive_ce", + "sha256": "ac66daee46ad46486a1ed12cf91e9d7479c875fb46889be8d2c96b557406647f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.3" + "version": "2.10.1" }, - "hive_flutter": { + "hive_ce_flutter": { "dependency": "direct main", "description": { - "name": "hive_flutter", - "sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc", + "name": "hive_ce_flutter", + "sha256": "74c1d5f10d803446b4e7913bb272137e2724ba8a56465444f9e7713aeb60a877", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "2.2.0" }, - "hive_generator": { + "hive_ce_generator": { "dependency": "direct dev", "description": { - "name": "hive_generator", - "sha256": "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4", + "name": "hive_ce_generator", + "sha256": "0b1c750e2d10c55a14cde16d479ada42704be6cef43c54b728ed0e4e02f7d808", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "1.8.2" }, "hotreloader": { "dependency": "transitive", @@ -915,11 +915,11 @@ "dependency": "transitive", "description": { "name": "image", - "sha256": "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6", + "sha256": "13d3349ace88f12f4a0d175eb5c12dcdd39d35c4c109a8a13dfeb6d0bd9e31c3", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.2" + "version": "4.5.3" }, "image_size_getter": { "dependency": "transitive", @@ -1015,11 +1015,11 @@ "dependency": "direct dev", "description": { "name": "json_serializable", - "sha256": "c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c", + "sha256": "81f04dee10969f89f604e1249382d46b97a1ccad53872875369622b5bfc9e58a", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.9.0" + "version": "6.9.4" }, "just_audio": { "dependency": "direct main", @@ -1065,21 +1065,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.7" + "version": "10.0.8" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.8" + "version": "3.0.9" }, "leak_tracker_testing": { "dependency": "transitive", @@ -1145,11 +1145,11 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "transitive", @@ -1193,14 +1193,14 @@ "version": "1.0.9" }, "meta": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { "dependency": "transitive", @@ -1246,31 +1246,31 @@ "dependency": "transitive", "description": { "name": "package_config", - "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.2.0" }, "package_info_plus": { "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "67eae327b1b0faf761964a1d2e5d323c797f3799db0e85aa232db8d9e922bc35", + "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.2.1" + "version": "8.3.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "205ec83335c2ab9107bbba3f8997f9356d72ca3c715d2f038fc773d0366b4c76", + "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.2.0" }, "palette_generator": { "dependency": "direct main", @@ -1287,11 +1287,11 @@ "dependency": "direct main", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "path_parsing": { "dependency": "transitive", @@ -1317,11 +1317,11 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", + "sha256": "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.15" + "version": "2.2.16" }, "path_provider_foundation": { "dependency": "transitive", @@ -1367,31 +1367,31 @@ "dependency": "direct main", "description": { "name": "permission_handler", - "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.3.1" + "version": "11.4.0" }, "permission_handler_android": { "dependency": "transitive", "description": { "name": "permission_handler_android", - "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", + "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.13" + "version": "12.1.0" }, "permission_handler_apple": { "dependency": "transitive", "description": { "name": "permission_handler_apple", - "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", + "sha256": "f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.4.5" + "version": "9.4.6" }, "permission_handler_html": { "dependency": "transitive", @@ -1407,11 +1407,11 @@ "dependency": "transitive", "description": { "name": "permission_handler_platform_interface", - "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9", + "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.3" + "version": "4.3.0" }, "permission_handler_windows": { "dependency": "transitive", @@ -1487,11 +1487,11 @@ "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.2.0" }, "pubspec_parse": { "dependency": "transitive", @@ -1507,11 +1507,11 @@ "dependency": "transitive", "description": { "name": "qs_dart", - "sha256": "98a068f7224fe17b68028dbbd43dd48a6049d2de2175f50b2fad2e08f2811f0e", + "sha256": "c775dbe663cd59365050220b3499dee259b72ad6b352a3e087a15bd77e161b74", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.3.3+1" }, "recursive_regex": { "dependency": "transitive", @@ -1537,11 +1537,11 @@ "dependency": "transitive", "description": { "name": "riverpod_analyzer_utils", - "sha256": "c6b8222b2b483cb87ae77ad147d6408f400c64f060df7a225b127f4afef4f8c8", + "sha256": "03a17170088c63aab6c54c44456f5ab78876a1ddb6032ffde1662ddab4959611", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.8" + "version": "0.5.10" }, "riverpod_annotation": { "dependency": "direct main", @@ -1557,21 +1557,21 @@ "dependency": "direct dev", "description": { "name": "riverpod_generator", - "sha256": "63546d70952015f0981361636bf8f356d9cfd9d7f6f0815e3c07789a41233188", + "sha256": "44a0992d54473eb199ede00e2260bd3c262a86560e3c6f6374503d86d0580e36", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.3" + "version": "2.6.5" }, "riverpod_lint": { "dependency": "direct dev", "description": { "name": "riverpod_lint", - "sha256": "83e4caa337a9840469b7b9bd8c2351ce85abad80f570d84146911b32086fbd99", + "sha256": "89a52b7334210dbff8605c3edf26cfe69b15062beed5cbfeff2c3812c33c9e35", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.3" + "version": "2.6.5" }, "rxdart": { "dependency": "direct main", @@ -1730,14 +1730,14 @@ "version": "1.0.0" }, "source_gen": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "source_gen", - "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.0" + "version": "2.0.0" }, "source_helper": { "dependency": "transitive", @@ -1753,11 +1753,11 @@ "dependency": "transitive", "description": { "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "split_view": { "dependency": "direct main", @@ -1834,11 +1834,11 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.0" + "version": "1.12.1" }, "state_notifier": { "dependency": "transitive", @@ -1854,11 +1854,11 @@ "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "stream_transform": { "dependency": "transitive", @@ -1874,11 +1874,11 @@ "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.1" }, "synchronized": { "dependency": "transitive", @@ -1894,21 +1894,21 @@ "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.7.4" }, "time": { "dependency": "transitive", @@ -1994,11 +1994,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "sha256": "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.14" + "version": "6.3.15" }, "url_launcher_ios": { "dependency": "transitive", @@ -2134,11 +2134,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.0" + "version": "14.3.1" }, "wakelock_plus": { "dependency": "direct main", @@ -2184,11 +2184,11 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web_socket": { "dependency": "transitive", @@ -2214,21 +2214,21 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e", + "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.10.1" + "version": "5.12.0" }, "win32_registry": { "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.5" + "version": "2.1.0" }, "window_manager": { "dependency": "direct main", @@ -2279,10 +2279,20 @@ }, "source": "hosted", "version": "3.1.3" + }, + "yaml_writer": { + "dependency": "transitive", + "description": { + "name": "yaml_writer", + "sha256": "69651cd7238411179ac32079937d4aa9a2970150d6b2ae2c6fe6de09402a5dc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" } }, "sdks": { - "dart": ">=3.6.0 <4.0.0", + "dart": ">=3.7.0 <4.0.0", "flutter": ">=3.27.0" } } diff --git a/pkgs/by-name/fi/findomain/package.nix b/pkgs/by-name/fi/findomain/package.nix index 344844b98588..7df036a80722 100644 --- a/pkgs/by-name/fi/findomain/package.nix +++ b/pkgs/by-name/fi/findomain/package.nix @@ -5,8 +5,6 @@ installShellFiles, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,13 +26,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/fi/findup/package.nix b/pkgs/by-name/fi/findup/package.nix index baa0248200ed..1be7ec2b1a05 100644 --- a/pkgs/by-name/fi/findup/package.nix +++ b/pkgs/by-name/fi/findup/package.nix @@ -3,11 +3,8 @@ stdenv, fetchFromGitHub, testers, - zig_0_11, + zig, }: -let - zig = zig_0_11; -in stdenv.mkDerivation (finalAttrs: { pname = "findup"; version = "1.1.2"; @@ -24,6 +21,8 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = { + # Doesn't support zig 0.12 or newer, last commit was 2 years ago. + broken = lib.versionAtLeast zig.version "0.12"; homepage = "https://github.com/booniepepper/findup"; description = "Search parent directories for sentinel files"; license = lib.licenses.mit; diff --git a/pkgs/by-name/fi/firezone-gateway/package.nix b/pkgs/by-name/fi/firezone-gateway/package.nix index 0e6010b3b92d..5157879a57d1 100644 --- a/pkgs/by-name/fi/firezone-gateway/package.nix +++ b/pkgs/by-name/fi/firezone-gateway/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage rec { pname = "firezone-gateway"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "firezone"; repo = "firezone"; tag = "gateway-${version}"; - hash = "sha256-2MDQyMCQIqV1Kbem53jnE8DGUZ6SrZqp2LpGJXvLBgA="; + hash = "sha256-ra5ZWPwNhyZEc9pBkcITvQyomgQ22yiWI16dnv1Fm3E="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Yz9xuH8Eph1pzv0siTpvdSXZLj/AjS5PR06CitK9NdE="; + cargoHash = "sha256-5B9nvFanHXZV8p8m2vsRLC5pSzwL2lX+V651oV8joJs="; sourceRoot = "${src.name}/rust"; buildAndTestSubdir = "gateway"; RUSTFLAGS = "--cfg system_certs"; diff --git a/pkgs/by-name/fi/firezone-headless-client/package.nix b/pkgs/by-name/fi/firezone-headless-client/package.nix index 459411058d54..f29c84710b6b 100644 --- a/pkgs/by-name/fi/firezone-headless-client/package.nix +++ b/pkgs/by-name/fi/firezone-headless-client/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage rec { pname = "firezone-headless-client"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "firezone"; repo = "firezone"; tag = "headless-client-${version}"; - hash = "sha256-IVbMdRtb6cu4obTFYPAYQXu9sXH7vT7K9j79IXg0KXk="; + hash = "sha256-ra5ZWPwNhyZEc9pBkcITvQyomgQ22yiWI16dnv1Fm3E="; }; useFetchCargoVendor = true; - cargoHash = "sha256-8//Gg45iJw9rfEn08FW+wDbg7Dz2MyKFGf3p2Td7kHA="; + cargoHash = "sha256-5B9nvFanHXZV8p8m2vsRLC5pSzwL2lX+V651oV8joJs="; sourceRoot = "${src.name}/rust"; buildAndTestSubdir = "headless-client"; RUSTFLAGS = "--cfg system_certs"; diff --git a/pkgs/by-name/fi/fish/1d78c8bd4295262a3118f478e6b3a7c7536fa282.patch b/pkgs/by-name/fi/fish/1d78c8bd4295262a3118f478e6b3a7c7536fa282.patch deleted file mode 100644 index 873b112d864e..000000000000 --- a/pkgs/by-name/fi/fish/1d78c8bd4295262a3118f478e6b3a7c7536fa282.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 1d78c8bd4295262a3118f478e6b3a7c7536fa282 Mon Sep 17 00:00:00 2001 -From: Johannes Altmanninger -Date: Wed, 19 Mar 2025 09:39:04 +0100 -Subject: [PATCH] Fix concurrent setlocale() in string escape tests - -In our C++ implementation, these tests were run serially. As pointed out in -https://github.com/fish-shell/fish-shell/issues/11254#issuecomment-2735623229 -we run them in parallel now, which means that one test could be changing -the global locale used by another. - -In theory this could be fine because all tests are setting setting the -global locale to the same thing but the existence of a lock suggests that -setlocale() is not guaranteed to be atomic, so it's possible that another -thread uses a temporarily-invalid locale. - -Fixes #11254 ---- - src/tests/string_escape.rs | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/src/tests/string_escape.rs b/src/tests/string_escape.rs -index ba8ee7534ebf..4428d679cd35 100644 ---- a/src/tests/string_escape.rs -+++ b/src/tests/string_escape.rs -@@ -1,3 +1,5 @@ -+use std::sync::MutexGuard; -+ - use crate::common::{ - escape_string, str2wcstring, unescape_string, wcs2string, EscapeFlags, EscapeStringStyle, - UnescapeStringStyle, ENCODE_DIRECT_BASE, ENCODE_DIRECT_END, -@@ -10,21 +12,21 @@ use rand::{Rng, RngCore}; - - /// wcs2string is locale-dependent, so ensure we have a multibyte locale - /// before using it in a test. --fn setlocale() { -- let _guard = LOCALE_LOCK.lock().unwrap(); -+fn setlocale() -> MutexGuard<'static, ()> { -+ let guard = LOCALE_LOCK.lock().unwrap(); - - #[rustfmt::skip] - const UTF8_LOCALES: &[&str] = &[ - "C.UTF-8", "en_US.UTF-8", "en_GB.UTF-8", "de_DE.UTF-8", "C.utf8", "UTF-8", - ]; - if crate::libc::MB_CUR_MAX() > 1 { -- return; -+ return guard; - } - for locale in UTF8_LOCALES { - let locale = std::ffi::CString::new(locale.to_owned()).unwrap(); - unsafe { libc::setlocale(libc::LC_CTYPE, locale.as_ptr()) }; - if crate::libc::MB_CUR_MAX() > 1 { -- return; -+ return guard; - } - } - panic!("No UTF-8 locale found"); -@@ -100,7 +102,7 @@ fn test_escape_var() { - } - - fn escape_test(escape_style: EscapeStringStyle, unescape_style: UnescapeStringStyle) { -- setlocale(); -+ let _locale_guard = setlocale(); - let seed: u128 = 92348567983274852905629743984572; - let mut rng = get_seeded_rng(seed); - -@@ -174,7 +176,7 @@ fn str2hex(input: &[u8]) -> String { - /// string comes back through double conversion. - #[test] - fn test_convert() { -- setlocale(); -+ let _locale_guard = setlocale(); - let seed = get_rng_seed(); - let mut rng = get_seeded_rng(seed); - let mut origin = Vec::new(); diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index e61a9134f602..1b4c0b375201 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -152,13 +152,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fish"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "fish-shell"; repo = "fish-shell"; tag = finalAttrs.version; - hash = "sha256-Mj4v2ubYr4ufs7aU/1AdY239byiCJHKXam64af/VO3U="; + hash = "sha256-UpoZPipXZbzLWCOXzDjfyTDrsKyXGbh3Rkwj5IeWeY4="; }; env = { @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-4kqBrpeneCpF0WohP1ZArKrV3duHAE01XA5+GT9f56w="; + hash = "sha256-FkJB33vVVz7Kh23kfmjQDn61X2VkKLG9mUt8f3TrCHg="; }; patches = [ @@ -188,10 +188,6 @@ stdenv.mkDerivation (finalAttrs: { # * # * ./nix-darwin-path.patch - - # remove 4.0.2 - # https://github.com/fish-shell/fish-shell/issues/11254 - ./1d78c8bd4295262a3118f478e6b3a7c7536fa282.patch ]; # Fix FHS paths in tests diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix index 8fd0f00138a2..d77f785d09e7 100644 --- a/pkgs/by-name/fi/fishnet/package.nix +++ b/pkgs/by-name/fi/fishnet/package.nix @@ -3,32 +3,38 @@ rustPlatform, fetchFromGitHub, fetchurl, - testers, - fishnet, + versionCheckHook, + writeShellApplication, + curl, + jq, + nix-update, + common-updater-scripts, }: let # These files can be found in Stockfish/src/evaluate.h - nnueBigFile = "nn-1111cefa1111.nnue"; + nnueBigFile = "nn-1c0000000000.nnue"; + nnueBigHash = "sha256-HAAAAAAApn1imZnZMtDDc/dFDOQ80S0FYoaPTq+a4q0="; nnueBig = fetchurl { url = "https://tests.stockfishchess.org/api/nn/${nnueBigFile}"; - sha256 = "sha256-ERHO+hERa3cWG9SxTatMUPJuWSDHVvSGFZK+Pc1t4XQ="; + hash = nnueBigHash; }; nnueSmallFile = "nn-37f18f62d772.nnue"; + nnueSmallHash = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0="; nnueSmall = fetchurl { url = "https://tests.stockfishchess.org/api/nn/${nnueSmallFile}"; - sha256 = "sha256-N/GPYtdy8xB+HWqso4mMEww8hvKrY+ZVX7vKIGNaiZ0="; + hash = nnueSmallHash; }; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "fishnet"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "lichess-org"; repo = "fishnet"; - rev = "v${version}"; - hash = "sha256-JhllThFiHeC/5AAFwwZQ0mgbENIWP1cA7aD01DeDVL8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-+JkqxO7wwYZHwWRMboKGe8uo/F223efR+9pIsAIoFpU="; fetchSubmodules = true; }; @@ -40,10 +46,38 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-aUSppXw0UDqCDX7YX+sYNEcmiABXDn0nrow0H9UjpaA="; + cargoHash = "sha256-WjBrv4GApT7LTnexLDhY7Zni5kLtvUzaGs2YuA3UiHE="; - passthru.tests.version = testers.testVersion { - package = fishnet; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; + versionCheckProgramArg = "--version"; + + passthru = { + updateScript = lib.getExe (writeShellApplication { + name = "update-${finalAttrs.pname}"; + + runtimeInputs = [ + curl + jq + nix-update + common-updater-scripts + ]; + + runtimeEnv = { + PNAME = finalAttrs.pname; + PKG_FILE = builtins.toString ./package.nix; + GITHUB_REPOSITORY = "${finalAttrs.src.owner}/${finalAttrs.src.repo}"; + NNUE_BIG_FILE = nnueBigFile; + NNUE_BIG_HASH = nnueBigHash; + NNUE_SMALL_FILE = nnueSmallFile; + NNUE_SMALL_HASH = nnueSmallHash; + }; + + text = builtins.readFile ./update.bash; + }); }; meta = with lib; { @@ -60,4 +94,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "fishnet"; }; -} +}) diff --git a/pkgs/by-name/fi/fishnet/update.bash b/pkgs/by-name/fi/fishnet/update.bash new file mode 100644 index 000000000000..8bf6997f3936 --- /dev/null +++ b/pkgs/by-name/fi/fishnet/update.bash @@ -0,0 +1,43 @@ +new_version="$( + curl --fail --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/$GITHUB_REPOSITORY/releases/latest" | + jq '.tag_name | ltrimstr("v")' --raw-output +)" +stockfish_revision="$( + curl --fail --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/$GITHUB_REPOSITORY/contents/Stockfish?ref=v$new_version" | + jq .sha --raw-output +)" +stockfish_header="$( + curl --fail --silent "https://raw.githubusercontent.com/official-stockfish/Stockfish/$stockfish_revision/src/evaluate.h" +)" +new_nnue_big_file="$( + echo "$stockfish_header" | + grep --perl-regexp --only-matching 'EvalFileDefaultNameBig "\Knn-(\w+).nnue' +)" +new_nnue_big_hash="$( + nix hash to-sri --type sha256 "$( + nix-prefetch-url --type sha256 "https://tests.stockfishchess.org/api/nn/${new_nnue_big_file}" + )" +)" +new_nnue_small_file="$( + echo "$stockfish_header" | + grep --perl-regexp --only-matching 'EvalFileDefaultNameSmall "\Knn-(\w+).nnue' +)" +new_nnue_small_hash="$( + nix hash to-sri --type sha256 "$( + nix-prefetch-url --type sha256 "https://tests.stockfishchess.org/api/nn/${new_nnue_small_file}" + )" +)" + +# Update NNUE +pkg_body="$(<"$PKG_FILE")" +pkg_body="${pkg_body//"$NNUE_BIG_FILE"/"$new_nnue_big_file"}" +pkg_body="${pkg_body//"$NNUE_BIG_HASH"/"$new_nnue_big_hash"}" +pkg_body="${pkg_body//"$NNUE_SMALL_FILE"/"$new_nnue_small_file"}" +pkg_body="${pkg_body//"$NNUE_SMALL_HASH"/"$new_nnue_small_hash"}" +echo "$pkg_body" >"$PKG_FILE" + +# Update version, src +update-source-version "$PNAME" "$new_version" --ignore-same-version --print-changes + +# Update cargoHash +nix-update --version=skip "$PNAME" diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index b9406b492a2d..f9b3d6c86070 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -8,14 +8,14 @@ }: python3Packages.buildPythonApplication rec { pname = "fittrackee"; - version = "0.9.3"; + version = "0.9.4"; pyproject = true; src = fetchFromGitHub { owner = "SamR1"; repo = "FitTrackee"; tag = "v${version}"; - hash = "sha256-ofFQJqBKGavXatlpm1bsM2+A1My/9dSzl9X/o9lVDb8="; + hash = "sha256-01lkPboF4KaCPnZHYVXUdIhXpJYGwcRPubnbjMm3mLY="; }; build-system = [ diff --git a/pkgs/by-name/fi/fityk/package.nix b/pkgs/by-name/fi/fityk/package.nix index b20eb0ea4a3e..0793e847e9a8 100644 --- a/pkgs/by-name/fi/fityk/package.nix +++ b/pkgs/by-name/fi/fityk/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, autoreconfHook, wxGTK32, - boost, + boost186, lua, zlib, bzip2, @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ wxGTK32 - boost + boost186 lua zlib bzip2 diff --git a/pkgs/by-name/fl/flac/package.nix b/pkgs/by-name/fl/flac/package.nix index 7c5bd5c6fc44..afc1ac74c150 100644 --- a/pkgs/by-name/fl/flac/package.nix +++ b/pkgs/by-name/fl/flac/package.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-B6XRai5UOAtY/7JXNbI3YuBgazi1Xd2ZOs6vvLq9LIs="; }; + hardeningDisable = [ "trivialautovarinit" ]; + nativeBuildInputs = [ cmake doxygen diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix index 0155d14ea793..1bfbe8d0c2a5 100644 --- a/pkgs/by-name/fl/flake-checker/package.nix +++ b/pkgs/by-name/fl/flake-checker/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,14 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-FDfsA87VATJ4CpXoJ0eFoFl5z9Jtv6tPjkCf7kz6g00="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); - meta = with lib; { description = "Health checks for your Nix flakes"; homepage = "https://github.com/${src.owner}/${src.repo}"; diff --git a/pkgs/by-name/fl/flake-edit/package.nix b/pkgs/by-name/fl/flake-edit/package.nix index b54936e1a895..8b01aaab4055 100644 --- a/pkgs/by-name/fl/flake-edit/package.nix +++ b/pkgs/by-name/fl/flake-edit/package.nix @@ -4,10 +4,8 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, installShellFiles, nix-update-script, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,12 +27,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; env.ASSET_DIR = "target/assets"; diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix index 882685e3ced5..bc0d3fafdf7b 100644 --- a/pkgs/by-name/fl/flameshot/package.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -1,8 +1,6 @@ { stdenv, lib, - overrideSDK, - darwin, fetchFromGitHub, fetchpatch, cmake, @@ -18,11 +16,7 @@ assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport); -let - stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; -in - -stdenv'.mkDerivation { +stdenv.mkDerivation { pname = "flameshot"; # wlr screenshotting is currently only available on unstable version (>12.1.0) version = "12.1.0-unstable-2025-03-10"; diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix index 85b2d93857c1..8ee30bdfc468 100644 --- a/pkgs/by-name/fl/flaresolverr/package.nix +++ b/pkgs/by-name/fl/flaresolverr/package.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "flaresolverr"; - version = "3.3.21"; + version = "3.3.21-unstable-2025-03-04"; src = fetchFromGitHub { owner = "FlareSolverr"; repo = "FlareSolverr"; - rev = "v${finalAttrs.version}"; - hash = "sha256-M/snpYKZK3pgzlhYjRYEiAPlK9DUKYRiiu43KcrAy9g="; + rev = "ce5369dd413cd71a81ce38a5ccd379f6c9352e23"; + hash = "sha256-cZ/YT4H2OU5l3AosROnkoyT5qrva5lxKshQMS626f2E="; }; nativeBuildInputs = [ makeWrapper ]; @@ -79,7 +79,5 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "flaresolverr"; maintainers = with maintainers; [ paveloom ]; inherit (undetected-chromedriver.meta) platforms; - # See https://github.com/NixOS/nixpkgs/issues/332776 - broken = true; }; }) diff --git a/pkgs/by-name/fl/fleeting-plugin-aws/package.nix b/pkgs/by-name/fl/fleeting-plugin-aws/package.nix index f066d23f6427..9ae805bcdbc0 100644 --- a/pkgs/by-name/fl/fleeting-plugin-aws/package.nix +++ b/pkgs/by-name/fl/fleeting-plugin-aws/package.nix @@ -6,44 +6,37 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "fleeting-plugin-aws"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitLab { owner = "gitlab-org/fleeting/plugins"; repo = "aws"; - tag = "v${version}"; - hash = "sha256-8vEduf+xh9R3+GoouXJS2h/ELlzKXDmLBLekaXGn7SE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-3m7t2uGO7Rlfckb8mdYVutW0/ng0OiUAH5XTBoB//ZU="; }; - vendorHash = "sha256-bfEzPPP280peOK4Jyu1fyfFCaFnRLoPmsjJ+G1BoVW4="; + vendorHash = "sha256-hfuszGVWfMreGz22+dkx0/cxznjq2XZf7pAn4TWOQ5M="; - subPackages = [ "cmd/fleeting-plugin-aws" ]; - - # See https://gitlab.com/gitlab-org/fleeting/plugins/aws/-/blob/v1.0.0/Makefile?ref_type=tags#L20-22. + # Needed for "fleeting-plugin-aws -version" to not show "dev". # - # Needed for "fleeting-plugin-aws version" to not show "dev". + # https://gitlab.com/gitlab-org/fleeting/plugins/aws/-/blob/v1.0.0/Makefile?ref_type=tags#L20-22 ldflags = let - # See https://gitlab.com/gitlab-org/fleeting/plugins/aws/-/blob/v1.0.0/Makefile?ref_type=tags#L14. - # - # Couldn't find a way to substitute "go list ." into "ldflags". ldflagsPackageVariablePrefix = "gitlab.com/gitlab-org/fleeting/plugins/aws"; in [ "-X ${ldflagsPackageVariablePrefix}.NAME=fleeting-plugin-aws" - "-X ${ldflagsPackageVariablePrefix}.VERSION=v${version}" - "-X ${ldflagsPackageVariablePrefix}.REVISION=${src.rev}" + "-X ${ldflagsPackageVariablePrefix}.VERSION=${finalAttrs.version}" + "-X ${ldflagsPackageVariablePrefix}.REFERENCE=v${finalAttrs.version}" ]; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgram = "${builtins.placeholder "out"}/bin/fleeting-plugin-aws"; - - versionCheckProgramArg = "version"; + versionCheckProgramArg = "-version"; passthru = { updateScript = nix-update-script { }; @@ -56,4 +49,4 @@ buildGoModule rec { mainProgram = "fleeting-plugin-aws"; maintainers = with lib.maintainers; [ commiterate ]; }; -} +}) diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index 944f97be02da..ae94950eacbe 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.15.31"; + version = "3.15.32"; pyproject = true; src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; tag = "v${version}"; - hash = "sha256-Q1o7jSFvwTD9qPXst6J9Vg/pY9olEPSUegBHOZueDEk="; + hash = "sha256-jKjsqj5q3egjyRzISW4UXpTpxq9QeqUQMfJ0wjC1PsQ="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/fl/flix/package.nix b/pkgs/by-name/fl/flix/package.nix index d023bbdd6e08..9ed61907d595 100644 --- a/pkgs/by-name/fl/flix/package.nix +++ b/pkgs/by-name/fl/flix/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.58.1"; + version = "0.59.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-YD0H6t5Qj6k8jUfjuMzgY3K2iAN+u4kvcjaqMANkrsw="; + sha256 = "sha256-Rh1i0wL6+Td0j+eJ4qCYYSz8dmG1Op7Z0cGBBjjJ68Q="; }; dontUnpack = true; diff --git a/pkgs/by-name/fl/fluidsynth/package.nix b/pkgs/by-name/fl/fluidsynth/package.nix index 789f290cd987..653da761f4d6 100644 --- a/pkgs/by-name/fl/fluidsynth/package.nix +++ b/pkgs/by-name/fl/fluidsynth/package.nix @@ -1,6 +1,5 @@ { stdenv, - darwin, lib, fetchFromGitHub, buildPackages, @@ -45,17 +44,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - AudioUnit - CoreAudio - CoreMIDI - CoreServices - ] - ); + ]; cmakeFlags = [ "-Denable-framework=off" diff --git a/pkgs/by-name/fn/fntsample/package.nix b/pkgs/by-name/fn/fntsample/package.nix deleted file mode 100644 index 6790f71a9503..000000000000 --- a/pkgs/by-name/fn/fntsample/package.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchFromGitHub, - cmake, - pkg-config, - cairo, - fontconfig, - freetype, - glib, - libXdmcp, - makeWrapper, - pango, - pcre, - perlPackages, -}: - -let - ucd-blocks = fetchurl { - url = "https://www.unicode.org/Public/15.0.0/ucd/Blocks.txt"; - hash = "sha256-Up3F0PY4bVLy9W4AS7+rSM4tWH7qnTi6VGxAUkkb2CA="; - }; -in -stdenv.mkDerivation rec { - pname = "fntsample"; - version = "5.4"; - - src = fetchFromGitHub { - owner = "eugmes"; - repo = "fntsample"; - rev = "release/${version}"; - hash = "sha256-O5RT68wPWwzCb51JZWWNcIubWoM7NZw/MRiaHXPDmF0="; - }; - - cmakeFlags = [ - "-DUNICODE_BLOCKS=${ucd-blocks.outPath}" - ]; - - outputs = [ - "out" - "man" - ]; - - nativeBuildInputs = [ - cmake - makeWrapper - pkg-config - ]; - - buildInputs = [ - cairo - fontconfig - freetype - glib - libXdmcp - pango - perlPackages.perl - pcre - ]; - - postFixup = - let - perlPath = - with perlPackages; - makePerlPath [ - ExporterTiny - ListMoreUtils - PDFAPI2 - libintl-perl - ]; - in - '' - for cmd in pdfoutline pdf-extract-outline; do - wrapProgram "$out/bin/$cmd" --prefix PERL5LIB : "${perlPath}" - done - ''; - - meta = with lib; { - homepage = "https://github.com/eugmes/fntsample"; - description = "PDF and PostScript font samples generator"; - license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = platforms.unix; - }; -} -# TODO: factor/package ucd-blocks diff --git a/pkgs/by-name/fo/foodfetch/package.nix b/pkgs/by-name/fo/foodfetch/package.nix new file mode 100644 index 000000000000..fc4cfca5c529 --- /dev/null +++ b/pkgs/by-name/fo/foodfetch/package.nix @@ -0,0 +1,40 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + openssl, + pkg-config, + versionCheckHook, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "foodfetch"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "noahfraiture"; + repo = "foodfetch"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TUgj3zS18lCtkyxYrG4f156YqFSCGXzfbK6b+Owacto="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-ZPV6sDQHV+G0HxRAVlcilh4tCCQspTnxnH1aHxVP8tI="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/noahfraiture/foodfetch/releases/tag/v${finalAttrs.version}"; + description = "Yet another fetch to quickly get recipes"; + homepage = "https://github.com/noahfraiture/foodfetch"; + license = lib.licenses.mit; + mainProgram = "foodfetch"; + maintainers = with lib.maintainers; [ noahfraiture ]; + }; +}) diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix index b667d212b46b..34d21354f255 100644 --- a/pkgs/by-name/fo/foot/package.nix +++ b/pkgs/by-name/fo/foot/package.nix @@ -27,7 +27,7 @@ }: let - version = "1.21.0"; + version = "1.22.0"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -104,7 +104,7 @@ stdenv.mkDerivation { owner = "dnkl"; repo = "foot"; rev = version; - hash = "sha256:19hkw4g2l00wasmk5dn34rf3bhqh6zbwwhvz98bdcv90p761jws4"; + hash = "sha256-OCDFfOEyE8CrgisswSfPXH1rNoaM1C1ztm9R77P0MOk="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/fo/fooyin/package.nix b/pkgs/by-name/fo/fooyin/package.nix index f4723504c5cf..e2341b74e49b 100644 --- a/pkgs/by-name/fo/fooyin/package.nix +++ b/pkgs/by-name/fo/fooyin/package.nix @@ -10,12 +10,14 @@ kdsingleapplication, pipewire, taglib, + libebur128, libvgm, libsndfile, libarchive, libopenmpt, game-music-emu, SDL2, + fetchpatch, }: stdenv.mkDerivation (finalAttrs: { @@ -42,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { pipewire SDL2 # input plugins + libebur128 libvgm libsndfile libarchive @@ -63,6 +66,15 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "INSTALL_FHS" true) ]; + # Remove after next release + patches = [ + (fetchpatch { + name = "qbrush.patch"; + url = "https://github.com/fooyin/fooyin/commit/e44e08abb33f01fe85cc896170c55dbf732ffcc9.patch"; + hash = "sha256-soDj/SFctxxsnkePv4dZgyDHYD2eshlEziILOZC4ddM="; + }) + ]; + env.LANG = "C.UTF-8"; meta = { diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 4e475c733c22..1aacb193be16 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -40,9 +40,9 @@ let pname = "forgejo-frontend"; inherit src version npmDepsHash; - patches = [ - ./package-json-npm-build-frontend.patch - ]; + buildPhase = '' + ./node_modules/.bin/webpack + ''; # override npmInstallHook installPhase = '' @@ -128,6 +128,10 @@ buildGoModule rec { in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + preInstall = '' + mv "$GOPATH/bin/forgejo.org" "$GOPATH/bin/gitea" + ''; + postInstall = '' mkdir $data cp -R ./{templates,options} ${frontend}/public $data @@ -187,7 +191,7 @@ buildGoModule rec { description = "Self-hosted lightweight software forge"; homepage = "https://forgejo.org"; changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/v${version}"; - license = if lib.versionAtLeast version "9.0.0" then lib.licenses.gpl3Plus else lib.licenses.mit; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ emilylange urandom diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix index 5b42631ffce4..164d97538163 100644 --- a/pkgs/by-name/fo/forgejo/lts.nix +++ b/pkgs/by-name/fo/forgejo/lts.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "7.0.14"; - hash = "sha256-DtGJStiXuJl0m4K6+DNxsBBaj9dB4bEmMqpGS3WGPD4="; - npmDepsHash = "sha256-R78/L6HS8pUNccrctBJ2E8ndS/RBHd+mTvl0JPoxr8Q="; - vendorHash = "sha256-18tJJ3dBVR9d7PFBRFtOVVtZAcdKucmbOTXHdk7U89s="; + version = "11.0.0"; + hash = "sha256-j/SmfWFfYDApqGXcH/gRF6c7gUCTkLYFTglgtdq9u/U="; + npmDepsHash = "sha256-laHHXq59/7+rJSYTD1Aq/AvFcio6vsnWkeV8enq3yTg="; + vendorHash = "sha256-REHrSuvAB5fbJ1WR+rggGZUSMy0FWnAkQQbTIqN2K2E="; lts = true; nixUpdateExtraArgs = [ "--override-filename" diff --git a/pkgs/by-name/fo/forgejo/package-json-npm-build-frontend.patch b/pkgs/by-name/fo/forgejo/package-json-npm-build-frontend.patch deleted file mode 100644 index f04634fc1844..000000000000 --- a/pkgs/by-name/fo/forgejo/package-json-npm-build-frontend.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/package.json b/package.json -index 0abf6fe8b9..9d6ae0fdff 100644 ---- a/package.json -+++ b/package.json -@@ -1,4 +1,7 @@ - { -+ "scripts": { -+ "build": "node_modules/.bin/webpack" -+ }, - "type": "module", - "engines": { - "node": ">= 18.0.0" diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index f2cc87fe1fe3..26d62dc48bd8 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,11 +1 @@ -import ./generic.nix { - version = "10.0.3"; - hash = "sha256-bt1lgp6UiZeiZiIN3vZZbUygHVX1lEE5uOkPXrjk68o="; - npmDepsHash = "sha256-e3SE6cu1xCBdoMRqp2Gcjcay/EwjF+bTdPOlpL1STvw="; - vendorHash = "sha256-b3+zxsKRylgfdW0Yiz0QryObMKdtiMCt0hB3DtAGFrQ="; - lts = false; - nixUpdateExtraArgs = [ - "--override-filename" - "pkgs/by-name/fo/forgejo/package.nix" - ]; -} +{ forgejo-lts }: forgejo-lts diff --git a/pkgs/by-name/fo/formatjson5/package.nix b/pkgs/by-name/fo/formatjson5/package.nix index 000dae2e8e34..e77a03029509 100644 --- a/pkgs/by-name/fo/formatjson5/package.nix +++ b/pkgs/by-name/fo/formatjson5/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, nix-update-script, fetchpatch, }: @@ -30,8 +28,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-1CSt9dPVHdOqfQXio7/eXiDLWt+iOe6Qj+VtWblwSDE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoBuildFlags = [ "--example formatjson5" ]; postInstall = diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix index 1469d6233642..94e20e3eee59 100644 --- a/pkgs/by-name/fo/fortune-kind/package.nix +++ b/pkgs/by-name/fo/fortune-kind/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, rustPlatform, - darwin, libiconv, makeBinaryWrapper, installShellFiles, @@ -30,7 +29,6 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security ]; buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/fq/fq/package.nix b/pkgs/by-name/fq/fq/package.nix index b388edd34a3f..e18cd0d41e22 100644 --- a/pkgs/by-name/fq/fq/package.nix +++ b/pkgs/by-name/fq/fq/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "fq"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - hash = "sha256-I3mVAPNWjRHG0td1ulzGOthiNybfWLx1HgwPjFfBHCo="; + hash = "sha256-/yRTeWyHVZZzWbkI/VhYD/T5KZq8E2j678LE8gn5ILE="; }; - vendorHash = "sha256-p2cvv983gYTvyLPYIGVsk6N7yUzBpiPzgJ3sMRNWPTo="; + vendorHash = "sha256-vp7JQSnzijCkWximw4E2abd39l0qjIGkl+mPfEoli0w="; ldflags = [ "-s" diff --git a/pkgs/by-name/fr/freealut/package.nix b/pkgs/by-name/fr/freealut/package.nix index ac833b59882f..6ca129b98a5a 100644 --- a/pkgs/by-name/fr/freealut/package.nix +++ b/pkgs/by-name/fr/freealut/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - darwin, fetchurl, openal, testers, @@ -18,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openal - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.OpenAL; + ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/by-name/fr/freerouting/deps.json b/pkgs/by-name/fr/freerouting/deps.json new file mode 100644 index 000000000000..66a5f44ce708 --- /dev/null +++ b/pkgs/by-name/fr/freerouting/deps.json @@ -0,0 +1,1241 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/github/ben-manes#gradle-versions-plugin/0.52.0": { + "jar": "sha256-zuihUdLgvp86hcouXYeg2lyRpIHt8bx/e1e1Ywj9PA0=", + "module": "sha256-r6cL5O0h646QJ2hPFfpeKXXz0uRtIpN76jmhDkj3nd0=", + "pom": "sha256-WESi8/+pqARY0m7ex3EjeuYxXN3yBp1Qp+hUFj5A8Q0=" + }, + "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.52.0": { + "pom": "sha256-sLbWCz+UCuWgFAfwNJ6d86Ayph+FXkoXt9vakSprU3Y=" + }, + "com/googlecode/javaewah#JavaEWAH/1.1.13": { + "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=", + "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q=" + }, + "com/jcraft#jsch.agentproxy.connector-factory/0.0.7": { + "jar": "sha256-tXaTDWqCJ2ESM2U1jZAoE1HYjOwt2EWRKHPBaWGE1ss=", + "pom": "sha256-lF56Y404MC7i80AGfeiMrtJADpoleZ3ypkxSiT/Bn4c=" + }, + "com/jcraft#jsch.agentproxy.core/0.0.7": { + "jar": "sha256-xcsh/teP0sWB5AJ25Ci2QH5IAe2wuqH37wwQJdBqOn8=", + "pom": "sha256-TqaBg8WkOU9XTdHWEb7NVPuFzcN/JbYksUXoEXbamyQ=" + }, + "com/jcraft#jsch.agentproxy.pageant/0.0.7": { + "jar": "sha256-YJt7nQCykCE5dURlK2SQRSCcQRZXkGErKw3290yN+yc=", + "pom": "sha256-vIcohgnVllCFP/GZEcVWyAU+sOBdvSALJg3GINgdanc=" + }, + "com/jcraft#jsch.agentproxy.sshagent/0.0.7": { + "jar": "sha256-/QP960AxKEaggnzOGy+Tdz0NHMwTS9uVPfrC0s1EsyE=", + "pom": "sha256-6iFoORPB3VDbNhEsiXMIam5gz9lbt527y5t4biN0aes=" + }, + "com/jcraft#jsch.agentproxy.svnkit-trilead-ssh2/0.0.7": { + "jar": "sha256-0PVPplDvcTAEbddSwc9Gst0fEAljLPgq0KLcbn3eD1c=", + "pom": "sha256-u9gSP7yf+LnLoLUUT85XF7m2Ul8CkFzefBY9wwCVLi4=" + }, + "com/jcraft#jsch.agentproxy.usocket-jna/0.0.7": { + "jar": "sha256-V7gWnEh3pIIKV9+exeUwbRldYz2QZy08wF6odrptSZk=", + "pom": "sha256-peH2EtT1ckKV+zhvIDm1RcXukdAY6MeFOoFKfu2WkiM=" + }, + "com/jcraft#jsch.agentproxy.usocket-nc/0.0.7": { + "jar": "sha256-IxKU9lj7hVwMjQcPwcZU0rgncqzAkujVulPprnF6cJY=", + "pom": "sha256-p4RfFCCwRqHcLfSEmmfo4mdxJt5pm688X0vTy3l9q4w=" + }, + "com/jcraft#jsch.agentproxy/0.0.7": { + "pom": "sha256-SiFwxOx95EbWQ6yuwF/ruLxSwM0PX+rZ9Ib3VRGS0R0=" + }, + "com/squareup/moshi#moshi-kotlin/1.12.0": { + "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=", + "module": "sha256-KnvKZtbM8WhVy1oKp8lRWPaIklomPv5MIEsjclSGH6E=", + "pom": "sha256-gwdSmAK8nLCHd24CabvdaSBG+kpz8ZDVgUpaj5JmJ24=" + }, + "com/squareup/moshi#moshi/1.15.2": { + "jar": "sha256-dn91ksbGHraTVJom0zPBIfU4OCa9KHuJmGeqMm2uVeQ=", + "module": "sha256-2VLG3ZGntCbD8KUe3D986zSQrAH/GDAVJ63+x6eDfdk=", + "pom": "sha256-MXodP7cFQDG/6QzKibECSQH9m5/MqZFmws54U7X8e9k=" + }, + "com/squareup/okhttp3#okhttp/4.12.0": { + "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", + "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", + "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" + }, + "com/squareup/okio#okio-jvm/3.7.0": { + "jar": "sha256-2LNa3Ch2j0OuWv5qfRqiqHi6UeC5ak8wiBHzsfWxPlU=", + "module": "sha256-b64CAbCuSKGWBt4Ab/6YQtjQ/CoeQ04Hhc7Ni3Wr5HQ=", + "pom": "sha256-d07LnSsHlLT7J+eeCHYMpWC39U+qlRm5GDxn/rRfLJc=" + }, + "com/squareup/okio#okio/3.6.0": { + "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", + "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" + }, + "com/squareup/okio#okio/3.7.0": { + "module": "sha256-88rgCfC2yEL7vFLOd1QsGdGdVu6ZpeVVZH8Lr8nVDPo=", + "pom": "sha256-H2KMRSg726uM4DwHps+3akeLjdrhgL2PNKusJz5Id24=" + }, + "com/squareup/retrofit2#converter-moshi/2.11.0": { + "jar": "sha256-2/rp294LYeXFZxZIyNn9SG766a0H1XPtAb0N5GiNmyw=", + "module": "sha256-8jl8dvQPuHPUydGvgwtEolty75gpsCYJnikTB4uN8z4=", + "pom": "sha256-MB/EqjCHlmkS/fQEko2EOtcUPO8wm3fuVeD+srWoyBU=" + }, + "com/squareup/retrofit2#converter-scalars/2.11.0": { + "jar": "sha256-ZH1+gaxh7t9pG6adgvDVaFCHq/DVj+fYa2Q9AoCNqRE=", + "module": "sha256-SaqPyhyulzzMqBdmncrXltVqeQ7UdQnweTMHdc8zJnQ=", + "pom": "sha256-s9ShAXMYUHQencArE1u4FRHlM0wUe74tqtL1afVmNkU=" + }, + "com/squareup/retrofit2#retrofit/2.11.0": { + "jar": "sha256-n0+7znByhYT77tONQGHzbUR36JvKdLTirIrraBmw/kM=", + "module": "sha256-6bsuIBhEyI5HUGJPkRSmNUtRtwlItE1ca0qU6M0HCoE=", + "pom": "sha256-3iKB4huk2YSrrxPcBn84C8WBaXBoxlaKu5uZjZ13cF4=" + }, + "com/trilead#trilead-ssh2/1.0.0-build222": { + "jar": "sha256-Vj3ED1sX9OIVT6QaFq5/QMxJARvFQAsIcOuvYaR7nCI=", + "pom": "sha256-75Gy9XGcmybCOqVFwhjriwuar411/SQENmVQb7m0Gck=" + }, + "com/vanniktech#central-portal/0.31.0": { + "jar": "sha256-GsMUNiQjV6MW4jN71oTxq7r1MtxagCvYbdw28Bcp0OY=", + "module": "sha256-FKAo3EKBTP5A1rny5XTVyl9IFO6y2QHwsccKIMrAY0g=", + "pom": "sha256-gidBpXylV2yZetGSm6kSA2HRCzsA7q738lQHN7ECrAw=" + }, + "com/vanniktech#gradle-maven-publish-plugin/0.31.0": { + "jar": "sha256-1X3Ie7i7D0pTCtgP59itRnGPo0CLihh7Ge+oXwEHC+8=", + "module": "sha256-iV4wIVzJI0hiCmq8revzyCrZBQrlpW2SPIuL5UMjpUo=", + "pom": "sha256-l/0mpZgLNmJQRMurOtmRFoaJMgRtOHiviKwT1SU1sQ8=" + }, + "com/vanniktech#nexus/0.31.0": { + "jar": "sha256-Gw/b2F1DtN4WeiSOAwy5kXhNjZxV++KBkrdsnMbcMfU=", + "module": "sha256-07nTaSMYOe581Yy58MdwgEnNMo1wt3+d8MrDQ+oXOHw=", + "pom": "sha256-WVW+8/ZacFVaArcAtu85VV+dKxxqJcCz2h1SulmlTLU=" + }, + "com/vanniktech/maven/publish#com.vanniktech.maven.publish.gradle.plugin/0.31.0": { + "pom": "sha256-ujOevsuNfOFCZJTQ5jINW3OWi5T9CDWMhK1fWIBcBJg=" + }, + "de/regnis/q/sequence#sequence-library/1.0.4": { + "jar": "sha256-Uwefbn2LoiSnc4fZt/o+6LNvn0gqLxhr7iNUdNsM0oI=", + "pom": "sha256-St7mXSTvSwPtnrv/f77+TpCmkZ1uIGbQh1+s02AREzg=" + }, + "gradle/plugin/net/nemerosa#versioning/3.1.0": { + "jar": "sha256-ioN4R3z2FiGi2zTa+E5SUuDss0QHCaelmGE+d8HlXHQ=", + "pom": "sha256-44iuHyzRiDIJW7w7Q/jZYIwpDeFkqHXFjoSsUEWlAaE=" + }, + "net/i2p/crypto#eddsa/0.3.0": { + "jar": "sha256-TdoRINuFZkDb7AQUDtIyQiFaB1/hJ73voNz6KfsxJn0=", + "pom": "sha256-trE4eOS66Ldo1+pXMstNZqsvXp/nB8Chp3bN6d5SBRs=" + }, + "net/java/dev/jna#jna-platform/5.6.0": { + "jar": "sha256-ns6ovysbOZY5OdGLcEZO72DFCP7Ygg+dyroMNVGOq/c=", + "pom": "sha256-G+s1y0GE5skGp+Murr2FLdPaCiY5YumRNKuUWDI5Tig=" + }, + "net/java/dev/jna#jna/5.6.0": { + "jar": "sha256-VVfiNaiqL5dm1dxgnWeUjyqIMsLXls6p7x1svgs7fq8=", + "pom": "sha256-X+gbAlWXjyRhbTexBgi3lJil8wc+HZsgONhzaoMfJgg=" + }, + "net/java/dev/jna#platform/3.4.0": { + "jar": "sha256-6onVCQyDA7pOmgBW5tiiBCnz4CFBHpUL/Z66O25s8Vw=", + "pom": "sha256-jwwU9ikSwInYE4YBXnjPIS+elvZ1s7wOUZweLZKqiVA=" + }, + "net/nemerosa/versioning#net.nemerosa.versioning.gradle.plugin/3.1.0": { + "pom": "sha256-3Opp7NhR9dPaEyosVQyl4IekS2HrqbjynN2P8fOcVCA=" + }, + "org/ajoberstar/grgit#grgit-core/4.1.1": { + "jar": "sha256-xiaqQz1tE/JFvSyGW/RvGqNFdUC/0FqoRHSzoe5MIxk=", + "module": "sha256-GA51C4e+Jj7fOkCETQPlZ7XlAuwQnFOUF+PWvFYbI+M=", + "pom": "sha256-wkiIc3GeJd21UjYt7lY1OSwWNiCsFWACg9mf094XklM=" + }, + "org/antlr#antlr-master/3.4": { + "pom": "sha256-AyizHZ8cfwY+N+APYsVsjl0D/qHVcpgsGtjm8YcvDu4=" + }, + "org/antlr#antlr-runtime/3.4": { + "jar": "sha256-W3z1O3swsDQCP1gDDIFHxDPyvuD+feyPrmvr83CMWmM=", + "pom": "sha256-leQDwVx8oMqp7S+Ex1bJsBKT7onbcCzYmFqKOOEf/vo=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache/sshd#sshd-common/2.8.0": { + "jar": "sha256-gdCmJ0TBSR53vcjLqHh1Z4AvXjQc+6TIXGkAoDPZI1Q=", + "pom": "sha256-JIqw3VkR83i95/FxgY0SG63ZaLfcKCzypKOBXBcmT5o=" + }, + "org/apache/sshd#sshd-core/2.8.0": { + "jar": "sha256-LvYvH6+4PLIr8B7tY0u95g4XD1Bd8wzNS9iyUGoZZW4=", + "pom": "sha256-tHfcGFRfPCbIKjyFV//KSKgfINyafaCMK1QqSwiTTpE=" + }, + "org/apache/sshd#sshd/2.8.0": { + "pom": "sha256-iaBghZaN3+jjBCnvUInctxa3DM2EaCfgAoNEP/2hU8k=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.1.0.202203080745-r": { + "pom": "sha256-3/gbocif/btk7dP/uJ9keXBGV+wpuRxfAdmquDpaS1E=" + }, + "org/eclipse/jgit#org.eclipse.jgit.ui/6.1.0.202203080745-r": { + "jar": "sha256-ZbpBDeAaVXUYvVmOgHdALvPiHbe+uE4pcWusEEQwwSM=", + "pom": "sha256-3ORYL0xnGsdEd/tP34bKZ8GZ16SgLOxJTjYkbVkQ36A=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.1.0.202203080745-r": { + "jar": "sha256-tU+fsU9iVUoTG+5t0qbfqsgnYgN75fLXgAPU3dZ8fmc=", + "pom": "sha256-LkpfRlmqrNsmlT0fQR7Co/pJWJuDyMsKfJakUYUh5Tg=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-bom/2.0.21": { + "pom": "sha256-1Ufg3iVCLZY+IsepRPO13pQ8akmClbUtv/49KJXNm+g=" + }, + "org/jetbrains/kotlin#kotlin-reflect/2.0.21": { + "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=", + "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.0.21": { + "jar": "sha256-cS9IB2Dt7uSKhDaea+ifarUjdUCLsso74U72Y/cr7jE=", + "pom": "sha256-TXE+dTi5Kh15cX6nHPHQI1eoThFFDEbLkuMgee40224=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.0.21": { + "jar": "sha256-FcjArLMRSDwGjRaXUBllR0tw39gKx5WA7KOgPPUeSh0=", + "pom": "sha256-MQ1tXGVBPjEQuUAr2AdfyuP0vlGdH9kHMTahj+cnvFc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.1.10": { + "jar": "sha256-XyrByo3Is3o/QxTnFtNpaevwInp1GB0yaZ0Kj2RbHCE=", + "module": "sha256-jSwdcXxzVG1WOC0TbIZQtZpxWZQBciY4GJNKzkTLBI0=", + "pom": "sha256-SSISHT8LxgzkB/Ny3kLQKgt+lOddDD0VCLaDVyHySe8=" + }, + "org/lz4#lz4-java/1.4.1": { + "jar": "sha256-8O+lzhMY8OPnNPNSONrMRBxlEMtvP+5tHP0+uuFeK+8=", + "pom": "sha256-Vig2NEoy0Fbmqt30mLSREhQfpAj0CQ71bIBnP+5ZgUs=" + }, + "org/slf4j#jcl-over-slf4j/1.7.32": { + "jar": "sha256-YPO9pZIuORKInMoTEdGyJ3U2EL9gy05ekU6LLqoDJrQ=", + "pom": "sha256-XxjqwsVFj/zEAkFWEMO3jkmQAhaL+OyP4u/h3lBqJ1Y=" + }, + "org/slf4j#slf4j-api/1.7.30": { + "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" + }, + "org/slf4j#slf4j-api/1.7.32": { + "jar": "sha256-NiT4R0wa9G11+YvAl9eGSjI8gbOAiqQ2iabhxgHAJ74=", + "pom": "sha256-ABzeWzxrqRBwQlz+ny5pXkrri8KQotTNllMRJ6skT+U=" + }, + "org/slf4j#slf4j-parent/1.7.30": { + "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" + }, + "org/slf4j#slf4j-parent/1.7.32": { + "pom": "sha256-WrNJ0PTHvAjtDvH02ThssZQKL01vFSFQ4W277MC4PHA=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/6": { + "pom": "sha256-tDBtE+j1OSRYobMIZvHP8WGz0uaZmojQWe6jkyyKhJk=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/springframework#spring-framework-bom/5.3.11": { + "module": "sha256-ZjK2+djzXWen0eEwFGgX3pexeksM12GsFx78EDavKds=", + "pom": "sha256-HNBfCB7CrRGtOFn0MMOZbBT8HwDcX+k4js4yWrlGuSo=" + }, + "org/testcontainers#testcontainers-bom/1.16.1": { + "pom": "sha256-UGG6hMmFNuWmtM4oD7zssA4zXzsExdSEYpFi/LRiR3g=" + }, + "org/tmatesoft/sqljet#sqljet/1.1.14": { + "jar": "sha256-qFlc0zYu/wjCa5E6PzwZjeZfdzPJk3Wz9JIDWjQfX0U=", + "pom": "sha256-aqUr7yL3Q45a79BnJh90yLH6Kk+t5Dp9zj9w6Asp2+8=" + }, + "org/tmatesoft/svnkit#svnkit/1.10.6": { + "jar": "sha256-xcp91U2EdvJDSxnpMwySbHbifT2bShAsJ8YXzYe25Sg=", + "pom": "sha256-bjy3A/VSiur6i7sFRFPjm4YPk/02b9DaV7GEp9PM7Wg=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/fasterxml#oss-parent/56": { + "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml#oss-parent/61": { + "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" + }, + "com/fasterxml/jackson#jackson-base/2.18.0": { + "pom": "sha256-EFZMv/uFf5BlqhG1hJqMMIw1NfD1PG9Muytvt7NQf5c=" + }, + "com/fasterxml/jackson#jackson-base/2.18.2": { + "pom": "sha256-71dLcvW0iUgET2g3a4dMiK4JoCncjgX2Shwwvftt4Uo=" + }, + "com/fasterxml/jackson#jackson-bom/2.16.0": { + "pom": "sha256-Wqooh0QFvwT7qOLFcVkieCRGG6b31VKr246NOgum+L8=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, + "com/fasterxml/jackson#jackson-bom/2.18.0": { + "pom": "sha256-ut3oZMpztsoE3p9+5J5knhpeivj4x8FoLHRr5eI0xYc=" + }, + "com/fasterxml/jackson#jackson-bom/2.18.1": { + "pom": "sha256-84SrzK8Mb712GDdi9yVv1nkBLtgdt/KiZofouWWgFKc=" + }, + "com/fasterxml/jackson#jackson-bom/2.18.2": { + "pom": "sha256-UkfNwwFyXT9n9+8EkDconVr3CdaXK89LFwluRUjSlWs=" + }, + "com/fasterxml/jackson#jackson-parent/2.16": { + "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/fasterxml/jackson#jackson-parent/2.18": { + "pom": "sha256-Vp3ADWi05t993oVimeHANT+kC9rxI+DfVj7L7kFlhtk=" + }, + "com/fasterxml/jackson#jackson-parent/2.18.1": { + "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.18.0": { + "module": "sha256-DwmMCDBXb8nHVdQ9fzFuinV8k4ErNXdRJbNo/rzWA10=", + "pom": "sha256-pqA47zy3L8FXW5w4ZdpK2arX0COo1J3K0DeRBlVx6Bw=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.18.2": { + "jar": "sha256-WBvWEADvdkiUP3gcoFaJ5W0D9gUnSDZajis6m10/oy8=", + "module": "sha256-4Ruvm1NubflNqmNaEBPsPgabhmuOES3cKqBEahVQUNw=", + "pom": "sha256-CyvWlOqJJn7qSBJqilskplI0xkM4dULSRGnRlb+6HPg=" + }, + "com/fasterxml/jackson/core#jackson-core/2.18.2": { + "jar": "sha256-2AVK58DRwtL1XSjkYCbr5YkogfP6tfQ5IzGEOBw7Sh8=", + "module": "sha256-ynjGBDZ2f8w2zhRrd05PUKnLn2MtExcsRLrojgwDz6I=", + "pom": "sha256-4GWwA50h9N/ORr1DEEx9dtWFa9cy4qqGDMWkonDtct4=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.18.0": { + "module": "sha256-LEnsfnQwbUh/lVkbqJiQRhnDKi4/0bWG+z5jIskaTmI=", + "pom": "sha256-+Mn0Od1EsdAkLWbmlB2pfFe6hONANu7peqHDr/vxugQ=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.18.2": { + "jar": "sha256-SzZOaFDciRcvzx1N0muP9UiO2kT/RlfiLdJlID3Vqzw=", + "module": "sha256-jH2sL3J4GNiEeoKqTqxrAXTXnPBN+Q3iJGBy5t005wA=", + "pom": "sha256-STo9tkR7eo7Ls3JCNMbOZ31y20sE9roAjw6+rqe+Wp0=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.2": { + "jar": "sha256-4tIC1GBuI66vilqWMtsG9f79W2PSUcP1A/n6qnhTDlw=", + "module": "sha256-Jd8o9WC1kI6hAYUATV/Bkyk0hHBj5mcpJID2dbOx7eQ=", + "pom": "sha256-FivnrZea9eDHOc1+0BiJ+Br0ggDJ+RJ5lqElrFGzSkc=" + }, + "com/fasterxml/jackson/module#jackson-module-jakarta-xmlbind-annotations/2.18.0": { + "module": "sha256-6aQaUS6VsgUzABoREWCbYDP6M+h3km8gZkXy1PiOBes=", + "pom": "sha256-nKcuS5p/JlhHVuYubVJUywo0KvdNvJ5hguPWAUsgUb4=" + }, + "com/fasterxml/jackson/module#jackson-module-jakarta-xmlbind-annotations/2.18.2": { + "jar": "sha256-Uxa1ItppOIvIt1Yigw7QEtXsVJFDxaQ5EDqRJFsio/8=", + "module": "sha256-Q5AJmjK1DI3v2vTMNAx0gWEG843VdsPZWkq3ykUez0M=", + "pom": "sha256-mVJ0ggsVcllY1Rr9xj4gCf9DCg4+9J8eT/kv0+YjZKg=" + }, + "com/fasterxml/jackson/module#jackson-modules-base/2.18.0": { + "pom": "sha256-vtjbLqeIGzWwOA9V+67R1Wv+P9o6AmB0Ww9dXqzteyk=" + }, + "com/fasterxml/jackson/module#jackson-modules-base/2.18.2": { + "pom": "sha256-wVCoPSPNizMiqqSYmEh0J5vi3I1f4qN5B9P1arYOJpw=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.18.2": { + "pom": "sha256-s6z7kQ0CPpOkGZr8zeH/nsX6sMVQ3E+WilBXEXrLCzY=" + }, + "com/google/android#annotations/4.1.1.4": { + "jar": "sha256-unNOHoTAnWFa9qCdMwNLTwRC+Hct7BIO+zdthqVlrhU=", + "pom": "sha256-5LtUdTw2onoOXXAVSlA0/t2P6sQoIpUDS/1IPWx6rng=" + }, + "com/google/api#api-common/2.46.1": { + "jar": "sha256-ixHh4eQnAsuAlI58piqeBt34L+V6Gc1o+VSOrIDzkHE=", + "pom": "sha256-diOqbWZj9b9KnOJx+AVT3egdBjLw8SrzXMU6TOSpg80=" + }, + "com/google/api#gapic-generator-java-bom/2.55.1": { + "pom": "sha256-BO/rnxxRucOvI11DoVJthjo4OMGxzZbOptT86SqGu90=" + }, + "com/google/api#gapic-generator-java-pom-parent/2.55.1": { + "pom": "sha256-vxonIudPxkgBrU+9YGbBPeIt75ceMItgInkJaYXCFkw=" + }, + "com/google/api#gax-bom/2.63.1": { + "pom": "sha256-WiT34MEyGsJaFWb3fR8nUqq3YXoTJNhPBTpwp8FEJXo=" + }, + "com/google/api#gax-grpc/2.63.1": { + "jar": "sha256-T4VZlSQGjc1UMf7aFykW365iLh5gWgeShTOmnZErNns=", + "pom": "sha256-QP43LcIR3jaZfeP9HLl98mx8C23vaf0+QGmIEKWoSkw=" + }, + "com/google/api#gax-httpjson/2.63.1": { + "jar": "sha256-KR5gb1PqAh/yW1dHvC40e59uJyhfqkgjnWdi/iUVtg0=", + "pom": "sha256-NjoT74bUoElJRajKhTDGUuMsejAaOOT9yw5UfsgNhU4=" + }, + "com/google/api#gax-parent/2.63.1": { + "pom": "sha256-hD9mtfE8ZlZCkIrUAeHeRa9vtIye8ben8aJ3SEp4UTs=" + }, + "com/google/api#gax/2.63.1": { + "jar": "sha256-JnUkE/drg5Hazv/0DbhnwdM9C/Y9MpVN4+m7dM3LhWg=", + "pom": "sha256-32FUy5HAC1OIU47+47lF5EQ20D/2FrPx5qOex8OXcRM=" + }, + "com/google/api-client#google-api-client-appengine/2.7.2": { + "jar": "sha256-zDXdQfCMWsgR8kO1Qowxnfes1ivvpk3f8cfYBW6U0LM=", + "pom": "sha256-NImEhTIALS3l1ztR1lN1flXmcP0u+H4sQam3BzpGA0U=" + }, + "com/google/api-client#google-api-client-bom/2.7.2": { + "pom": "sha256-o5uDySbr9qL5GIOI3FQpvHQcs90QFld1UyBnGD99M6w=" + }, + "com/google/api-client#google-api-client-parent/2.7.2": { + "pom": "sha256-c4/ewj9isT6dL6Iv8l/LWHyphMWNzKGxWQNL02ibtJM=" + }, + "com/google/api-client#google-api-client-servlet/2.7.2": { + "jar": "sha256-TP3FNHiCCDCKEVS/eIhEpFtjeCatoDyGe68VppbnoGY=", + "pom": "sha256-3kO6r7e2VXzv4QZoPL7Tc9LPkWeaqo8lsMPzfhpdMPM=" + }, + "com/google/api-client#google-api-client/2.7.2": { + "jar": "sha256-Y7dUt8SpI0fEmSxC0pWBL40u1rnodD7bpKjJi5Lpyps=", + "pom": "sha256-PNpCXKfxGpP1wEL2Y3araUAi8orbRfPTXpXhFev9xmk=" + }, + "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1/3.12.0": { + "jar": "sha256-TeYjr/KUthTM8isfrYiNnaWi2SSEqGCbBXGdLZI9Ebs=", + "pom": "sha256-9FjoYv0EZ4D7fPBFmkg4bvgG/JMz6uFneUjsJS8f6sk=" + }, + "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1beta1/0.184.0": { + "jar": "sha256-oWqch+T3QhiuKftsfA5qCyelBoPsK/f2v7aHpHgRKnk=", + "pom": "sha256-YYXOpFNpP/ZfWvQsr46Ft1FRINP3FxNX7IleumIDfzs=" + }, + "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1beta2/0.184.0": { + "jar": "sha256-9ybriUXUX6NYRG0fBGoGHjNo4IWEU2HlsEPov4s2HC8=", + "pom": "sha256-1titj8csyJAh+xauBP2dd/icU84JnhB6mExO4RdKn9o=" + }, + "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1/3.12.0": { + "jar": "sha256-55/y9F22mVJWYJdaTwTvb4sa/2OTJxDta6yh84FVmRc=", + "pom": "sha256-s3ruiW6Bcc2wFOyzDvCiirPm3Bxxry5Pkjujf8SsdUY=" + }, + "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1alpha/3.12.0": { + "jar": "sha256-Q54YMAQ/sJJN62Wy7EGPQ5lUyFpL9P13sNGIyXBZvfc=", + "pom": "sha256-nrKJAXyemoNJFyNaEEeGVhhEK9uNgrtrFGDrxkH6agI=" + }, + "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1beta1/0.184.0": { + "jar": "sha256-hjnMViPkBW/0ipHzW5T2Y7uaJzZvHHoUw4ocSLjvLhc=", + "pom": "sha256-qVoVE1VebLER1lCIiEWSzMGT9FZVztBSdSJhOyxVXrg=" + }, + "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1beta2/0.184.0": { + "jar": "sha256-krDF/jrUOvGTUnmUocLarL5dmCFuVpKsd2K+Xlpen/Q=", + "pom": "sha256-lc3/5aWp/y9pn/ztNIlx7oL1Yd8ZRkJDTd0kfflRQ+o=" + }, + "com/google/api/grpc#proto-google-common-protos/2.54.1": { + "jar": "sha256-L8/yX+ipD8rLFGqQAiLEl7oKmlMSceaxNadkUNI7HvI=", + "pom": "sha256-fzVVVf/csSv1/lfvkDxV1lAocME49lH+0HbNT3B7IJ0=" + }, + "com/google/api/grpc#proto-google-iam-v1/1.49.1": { + "jar": "sha256-E478oqzdcbykEzcxp/jmGcj6aoWFkBq/Lio1cANTynQ=", + "pom": "sha256-rk1N8JaymJnfM9B8QmnxmqyTUkPbcffMuh2V6nXIHcA=" + }, + "com/google/apis#google-api-services-bigquery/v2-rev20250313-2.0.0": { + "jar": "sha256-jmWTYcp9BugyGRlQoWgYjnpV4AqqWnKEjCkIjYQ2el4=", + "pom": "sha256-gyPxaKdgRPhvs6lf5oXqnMcVANZqzHPplv72SXcau10=" + }, + "com/google/auth#google-auth-library-bom/1.30.0": { + "pom": "sha256-mSCzPghCOTmuWu2116O+wBWYvyZkSti6bnul2ov3ajY=" + }, + "com/google/auth#google-auth-library-bom/1.33.1": { + "pom": "sha256-DWWi+qKz3r8WdvFTRyOLPWiKFauUnz1J9UshC5vup+I=" + }, + "com/google/auth#google-auth-library-credentials/1.33.1": { + "jar": "sha256-M2fWJ8X00fowejxv+V21ate2Ea5Eg/4h1yh3+gN/8SU=", + "pom": "sha256-1L+g1iarHEiwAgUbhk3+WC7hp3JwfmV/2KshSuouniM=" + }, + "com/google/auth#google-auth-library-oauth2-http/1.33.1": { + "jar": "sha256-anLsK7I1DKGXABnjiNAICBNuTaLjApbp2MNG44ULDqo=", + "pom": "sha256-36m2t54T9RzuazU8HJK2z2W4X/JTYOjRql4o7O2pB9c=" + }, + "com/google/auth#google-auth-library-parent/1.33.1": { + "pom": "sha256-rDpyUAgfZYd11n6eEQqOUmeB2I+7iNuktHkstH02Yg0=" + }, + "com/google/auto/value#auto-value-annotations/1.11.0": { + "jar": "sha256-WgVc5CVTM7M0bhqHA9pb+P8ElTIob9zTFxLWJKvhEd0=", + "pom": "sha256-KuwW406j4BFiGgMi9PNvj5v5iLtURitVcJduieoHsSI=" + }, + "com/google/auto/value#auto-value-parent/1.11.0": { + "pom": "sha256-Wg0dcYVS6KRdzOASjRtrliP6lxqCzSRXUyM7pyCMsp0=" + }, + "com/google/auto/value#auto-value/1.11.0": { + "jar": "sha256-qvjWN7/tPEIENrn6zxt6iNEsh4U3TkICOCeDAFMZwsM=", + "pom": "sha256-Gl3C8igShj2zDdO669qWFq7Ql6Ggo+HkYi+dgFEuIWc=" + }, + "com/google/cloud#first-party-dependencies/3.45.1": { + "pom": "sha256-6/JeHVfkUxklQ268l14Mug2NI70W4qGBsD8Ne8GBa5U=" + }, + "com/google/cloud#google-cloud-bigquery/2.49.0": { + "jar": "sha256-/Xft/YhbdWtM0PnuD5nLsyJeGmmH4D/Pd9iQwQmLjI0=", + "pom": "sha256-MtwV0Y4nNfyKvZIs0ROk3dF20gZ7ovYtngjo/gs3tWU=" + }, + "com/google/cloud#google-cloud-bigquerystorage/3.12.0": { + "jar": "sha256-V3PGmXAFLX/v7olB5E7Ovbx708tzjKaN0zjEUh1nD34=", + "pom": "sha256-RJZxHGylJlVp1rJuzqtJnRIucQKvRSofgE3jxIxKBOM=" + }, + "com/google/cloud#google-cloud-core-bom/2.53.1": { + "pom": "sha256-3Fg9b8fIPxu4ZzBD6FF3leW5OShxdJLNYo2DYP2mvBs=" + }, + "com/google/cloud#google-cloud-core-http/2.53.1": { + "jar": "sha256-yew4ILjxfKUAXmCLnwAsBJRnzMiIyGpU9E3fHrWulQY=", + "pom": "sha256-ucfOXO4BQlInn0OeTeLI9GieVNxQp8kSjPk6yM2g3Vo=" + }, + "com/google/cloud#google-cloud-core-parent/2.53.1": { + "pom": "sha256-+jVVS2/ZAnNaLxeRx0sFnBlo27UAZxiUXlb+Zk6ApoM=" + }, + "com/google/cloud#google-cloud-core/2.53.1": { + "jar": "sha256-WOAI8RmnqvaNLRP1MOmX22eXt6qnDgjFY0IWJ77TgrA=", + "pom": "sha256-kkCD7+kGOFNOMW8n4hgeX68rouWH0tL5UoprxsxWtvk=" + }, + "com/google/cloud#google-cloud-shared-config/1.14.4": { + "pom": "sha256-JdZSrtqJZR9/vqORqMDzoYkOmDLx166FkTowtVHUYg8=" + }, + "com/google/cloud#google-cloud-shared-config/1.15.0": { + "pom": "sha256-6drXGU9AdIgPYjR+/Q1MtfIw8migajTVwdPE6hmLVIs=" + }, + "com/google/cloud#google-cloud-shared-dependencies/3.45.1": { + "pom": "sha256-IwAFTjzkYszJStSakFJS52e49huMtnM/MK/bfFylvAI=" + }, + "com/google/cloud#native-image-shared-config/1.12.0": { + "pom": "sha256-aIc9CD0SZ5QfqWL2PWc5SzXp1Ayv/0FPLmK0N7S3Yo8=" + }, + "com/google/cloud#native-image-shared-config/1.14.0": { + "pom": "sha256-hYFgPADWXFCDAU1tpnUm9pM/ihoB8GHUqTgzA6IpOl4=" + }, + "com/google/cloud#native-image-shared-config/1.14.4": { + "pom": "sha256-jl1OmgNqUS10l0iQhxE2l9b/761kQJtG5KUoLkC6xIs=" + }, + "com/google/cloud#native-image-shared-config/1.15.0": { + "pom": "sha256-GjFbRvb4f7j0NLroUbFroJk1srJ6IAE+8sWSRTz4uwo=" + }, + "com/google/cloud#third-party-dependencies/3.45.1": { + "pom": "sha256-5ztLcHd+ioYTyAcwb+ejYCutACYoBavpULZc/C8bRiA=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.12.1": { + "pom": "sha256-yeewt+Mb574iaEl5wGgAHGUssRPE5u2JTjm2Q97gf8E=" + }, + "com/google/code/gson#gson/2.12.1": { + "jar": "sha256-6+4T1ft0d81/HMAQ4MNW34yoBwlxUkjal/eeNcy0++w=", + "pom": "sha256-C1c17IX0UoLx4sdpd5gAQnsVCoFj9AUJOpKAtxyrGXg=" + }, + "com/google/errorprone#error_prone_annotations/2.36.0": { + "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=", + "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw=" + }, + "com/google/errorprone#error_prone_parent/2.36.0": { + "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw=" + }, + "com/google/flatbuffers#flatbuffers-java/23.5.26": { + "jar": "sha256-jRDKwuqYeIlgd7pDfXb9sbmgf1WoY8Vgu4oCSwQQP4s=", + "pom": "sha256-2uQpwGnFrFkXFDSfYZZ0cZm3kK5qkuLizzDu0mx+ATk=" + }, + "com/google/guava#failureaccess/1.0.2": { + "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", + "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" + }, + "com/google/guava#guava-bom/33.0.0-jre": { + "pom": "sha256-WbIwZqWpS4vzI5vUKICZGPsXMG49tJZpqVCaDqRph2g=" + }, + "com/google/guava#guava-bom/33.4.0-jre": { + "pom": "sha256-OuGXeIQNiENUgMjFC69z6qKi/A8hxzrgkX0A2mU8J1Y=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/33.4.0-android": { + "pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM=" + }, + "com/google/guava#guava-parent/33.4.0-jre": { + "pom": "sha256-Okme00oNnuDxvMOSMAIaHNTi990EJqtoRPWFRl1B3Nc=" + }, + "com/google/guava#guava/33.4.0-android": { + "module": "sha256-T1fpmXE67O0x+j3jwJSyCTuU9p7+Lcne48VlWKRyZNU=", + "pom": "sha256-6Zh7Tm0QAgNaBekAqosGuEvGpCxoEC6R80cVybIZgO0=" + }, + "com/google/guava#guava/33.4.0-jre": { + "jar": "sha256-uRjJin5E2+lOvZ/j5Azdqttak+anjrYAi0LfI3JB5Tg=", + "module": "sha256-gg6BfobEk6p6/9bLuZHuYJJbbIt0VB90LLIgcPbyBFk=", + "pom": "sha256-+pTbQAIt38d1r57PsTDM5RW5b3QNr4LyCvhG2VBUE0s=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/http-client#google-http-client-apache-v2/1.46.3": { + "jar": "sha256-tGMWOo4AEZSTN0BRQjOioAIWfF7u/XB2VFClq5O8P7Y=", + "pom": "sha256-yVhhxkBwEToAoc+eOeFQesgXxFrKc1Fl4xkzJI7J2wo=" + }, + "com/google/http-client#google-http-client-appengine/1.45.2": { + "pom": "sha256-pJ52DcJ03lzgVoYlRdTFcknPadCb+zCo5E04fkKxZVw=" + }, + "com/google/http-client#google-http-client-appengine/1.46.3": { + "jar": "sha256-sPSHlLI0Q5rZ6bRPY4dMeOjFU9A6qJ8oZMojHjxZC0M=", + "pom": "sha256-p9ZDOXVMtv/Km16PwHeR5J2KshWiPyz4m2cuQiWCM5o=" + }, + "com/google/http-client#google-http-client-bom/1.43.3": { + "pom": "sha256-K9C6F9zatcBDtHXQR3XKphHUINxWEIsY402T0nmwJrk=" + }, + "com/google/http-client#google-http-client-bom/1.45.2": { + "pom": "sha256-9IAlaC2K0ywkfnkpeFtgE1H2O7GchuNpb+BO58k0uSU=" + }, + "com/google/http-client#google-http-client-bom/1.46.2": { + "pom": "sha256-6BeAyCZ1MnrqcIELkkwqYrA3r0pDCQKOCkBA2oFewNo=" + }, + "com/google/http-client#google-http-client-bom/1.46.3": { + "pom": "sha256-r0QQlY2/bmzlxwD5vAs/l3IgSV2IxfGYh+R4UZ6akEM=" + }, + "com/google/http-client#google-http-client-gson/1.46.2": { + "pom": "sha256-rtOiq+NedKsn31cOeaLmWHVdgn7R2FLK0OxD2oW3hRU=" + }, + "com/google/http-client#google-http-client-gson/1.46.3": { + "jar": "sha256-dO7mXFY4cWWUaeuF1wPlpyI0JwEK1UWYL9xT19tXMmY=", + "pom": "sha256-Sjn0RPSQFro7EIJcewOXpXg+pjvxq0Rz8mfGlVgI7GQ=" + }, + "com/google/http-client#google-http-client-parent/1.45.2": { + "pom": "sha256-cKoIl+oZpXKtZxOgBMDPM3pKlIPjJ9Vg7Fc8cagyL+U=" + }, + "com/google/http-client#google-http-client-parent/1.46.2": { + "pom": "sha256-zdH6LQtME8ouzz2JCbIvQc+zj/v05SyVKqR3uiblqlM=" + }, + "com/google/http-client#google-http-client-parent/1.46.3": { + "pom": "sha256-VcDDglOHTIIdVHvyppjBSAjmzkrd/Rr+B/lzrC4sUqI=" + }, + "com/google/http-client#google-http-client/1.46.2": { + "pom": "sha256-WsHW8s3ajzhPWdxALNUCn/dTf78rdNDdxt8d+1zcBaU=" + }, + "com/google/http-client#google-http-client/1.46.3": { + "jar": "sha256-JJCgbkS38q28/ifkCZpXbA7o0mlDcYjVORrNSMbTQxA=", + "pom": "sha256-3+9xCym9Qan65IfqaFaA841iHnHENJJfOB1wUMKud/4=" + }, + "com/google/j2objc#j2objc-annotations/3.0.0": { + "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=", + "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc=" + }, + "com/google/oauth-client#google-oauth-client-bom/1.36.0": { + "pom": "sha256-9oGcT6yZOGhd1zog0o0MVkakhmeJsmh0EbavFlPkAcU=" + }, + "com/google/oauth-client#google-oauth-client-bom/1.37.0": { + "pom": "sha256-1enI/oNNA3wnCBgptUai77VkTXWBIi7BQ5/ir2S+Kh8=" + }, + "com/google/oauth-client#google-oauth-client-parent/1.36.0": { + "pom": "sha256-NkKag9g4ALNEMrnyaRRfZwaLlD2EAHjWg5eFBobkhz8=" + }, + "com/google/oauth-client#google-oauth-client-parent/1.37.0": { + "pom": "sha256-BGf+8kkGcurQ896kpd40U4hNQKvWlF4h6GRs5K6KxTw=" + }, + "com/google/oauth-client#google-oauth-client/1.36.0": { + "pom": "sha256-RGUF2XB71ipzmwdpAC5Ynwfz+Xlkg3zV+W1rhUC27CQ=" + }, + "com/google/oauth-client#google-oauth-client/1.37.0": { + "jar": "sha256-6mQCxsms+6FYxk8IBSnpJJL6XZlMt7G7YuTNnxJcBOA=", + "pom": "sha256-oD5bhIk4Vc3kp2SyQdK/88y0hI+Vmx3DEPXLbwqCrpg=" + }, + "com/google/protobuf#protobuf-bom/3.23.1": { + "pom": "sha256-zCdyXo5JDH81NLRlbM60rJA9I6N/A4hF81UKUZ2sBt8=" + }, + "com/google/protobuf#protobuf-bom/3.25.5": { + "pom": "sha256-CA4phBcyOLUOBkwiav/7sbAjNSApXHkKf9PWrkWT8GM=" + }, + "com/google/protobuf#protobuf-java-util/3.25.5": { + "jar": "sha256-2sxYssPS+o1L3cGsuIHnjWz3wTfdeLwdZ/aspzJDao0=", + "pom": "sha256-oJ0ZDqpqeWFrxfS1QE6UsMq1WYA6mMigkMQJmWL0H5I=" + }, + "com/google/protobuf#protobuf-java/3.25.5": { + "jar": "sha256-hUAkf62eBrrvqPtF6zE4AtAZ9IXxQwDg+da1Vu2I51M=", + "pom": "sha256-51IDIVeno5vpvjeGaEB1RSpGzVhrKGWr0z5wdWikyK8=" + }, + "com/google/protobuf#protobuf-parent/3.25.5": { + "pom": "sha256-ZMwOOtboX1rsj53Pk0HRN56VJTZP9T4j4W2NWCRnPvc=" + }, + "com/sun/istack#istack-commons-runtime/4.1.2": { + "jar": "sha256-f9Z5I2H03QD4xWr0ogzswAZt7qSo897Dg0ivI/wilu4=", + "pom": "sha256-EiKikL7dtvbpK8mZvOvDaW/NbXIhWFbSJHJ6e8LcOso=" + }, + "com/sun/istack#istack-commons/4.1.2": { + "pom": "sha256-2Ig+twNkcB2uDjdEnIj9knUResPYYEDonxvj6dR+nJ0=" + }, + "com/sun/xml/bind#jaxb-bom-ext/4.0.5": { + "pom": "sha256-vDnKsUxxStmKeyoG96ybM3bgeVVCaa03KhfXEd9Yp6E=" + }, + "com/sun/xml/bind/mvn#jaxb-parent/4.0.5": { + "pom": "sha256-xrVu/pzFnzx4NT0oTFXo3PFivoX4IrJs+BAjxvkI9/c=" + }, + "com/sun/xml/bind/mvn#jaxb-runtime-parent/4.0.5": { + "pom": "sha256-/nf5B+HRRTqtaa92NX6tEKXkkzyKkI9XqZ2ncTBw00A=" + }, + "com/sun/xml/bind/mvn#jaxb-txw-parent/4.0.5": { + "pom": "sha256-yu7EM19YqOOcl+oK6JvqnCtJro2bD82SUjjgKNOESU8=" + }, + "commons-codec#commons-codec/1.18.0": { + "jar": "sha256-ugBfMEzvkqPe3iSjitWsm4r8zw2PdYOdbBM4Y0z39uQ=", + "pom": "sha256-dLkW2ksDhMYZ5t1MGN7+iqQ4f3lSBSU8+0u7L0WM3c4=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "io/grpc#grpc-alts/1.70.0": { + "jar": "sha256-tLISXos7vCt37XFX8onnhwjgNWUrlTr2v5DX9O+Y4bU=", + "pom": "sha256-Jk/sChAI4+jauRJry0UPEKTG4SE+irnzOVBZcVw/EiE=" + }, + "io/grpc#grpc-api/1.70.0": { + "jar": "sha256-RfryrBvyeR6P2rzlNoSoa2LJm4TLom+xOluj9Kv4DWw=", + "pom": "sha256-C7+SrQC+fNQmMXDatDAC1y9AAdzblhL7b0ofVeJNBMs=" + }, + "io/grpc#grpc-auth/1.70.0": { + "jar": "sha256-dNcx7prSSwonMByRt+KThjlLTPxrbpaCEHY8kPEXQrI=", + "pom": "sha256-RgwaSczKe0J8/tPIG7hmkn+8DE59MMbbY9VX5Eab/yU=" + }, + "io/grpc#grpc-bom/1.60.0": { + "pom": "sha256-5pcWWUmamLYwCAsrVhiia0Kh3+VhExetDUor9bm7FJI=" + }, + "io/grpc#grpc-bom/1.70.0": { + "pom": "sha256-05Jeafef8/CV7HepVsN0QpPlxg91yDcVnxLnZAQ2J7U=" + }, + "io/grpc#grpc-context/1.70.0": { + "jar": "sha256-6ygkgxwKwD50Hv2oaxQaqGOkgevEqvWlwfE6SB27QP8=", + "pom": "sha256-rnYbtXTUmkD593I8CK0OtCOTDfQIV3Fwd021ouVfvxQ=" + }, + "io/grpc#grpc-core/1.70.0": { + "jar": "sha256-wrVXa4s2OxsQBmc8SS2RJQC6qhWBQwp/nAXoLMW9+6Q=", + "pom": "sha256-4/A0XupqaSlPwGuO1CywLBv3K5ncZcpwvCGTxltmX0o=" + }, + "io/grpc#grpc-googleapis/1.70.0": { + "jar": "sha256-1Koo5DfRptGdvwZQk7DjSwQwiWJXfjHMtI885xWNeyc=", + "pom": "sha256-ktQ/A+48dt7SKS8rVnhXm4RNCocnb2Yk9vLS+/D1j2I=" + }, + "io/grpc#grpc-grpclb/1.70.0": { + "jar": "sha256-iHxVkr/2xPOa7/zacMjRu4cFjNiE0c04xwlj4reFCVc=", + "pom": "sha256-t8VIOmqyw7v1b/7enwmOyh8R4Rk3VYQ1ftXRB0mRJH4=" + }, + "io/grpc#grpc-inprocess/1.70.0": { + "jar": "sha256-2UELBtOTg5gOFIl4XZs0fIaIOXZPtp5YgydHHVtz558=", + "pom": "sha256-1xcjDdZEa9hrRblwFGCOHnPtTS/iuOJz9tx0+SJ/iHw=" + }, + "io/grpc#grpc-netty-shaded/1.70.0": { + "jar": "sha256-5cU98JoT8kdNN+D/B7bHT3zJYYeaNS9LySyUY7zBQWQ=", + "pom": "sha256-9A6oYHUpi26hMFus6Ae+nPtyHF0e9+jHSwmaQkglcLQ=" + }, + "io/grpc#grpc-protobuf-lite/1.70.0": { + "jar": "sha256-58wsqJgWcoUcvr+Dokv7k8GysFjnXBqBenV7kU8zQD0=", + "pom": "sha256-n3tCXI8wKW2EqB9CtsRv+YL/G8DpUpFHatpIYQugKjg=" + }, + "io/grpc#grpc-protobuf/1.70.0": { + "jar": "sha256-m5gDntgmYExG1qyPihgtQT00jsar4mRnc2sFqpLn4dM=", + "pom": "sha256-vbgvEfJM0qRm8ZzqmOOAXOXNE/TfrEC7MCZKaGN4+2g=" + }, + "io/grpc#grpc-stub/1.70.0": { + "jar": "sha256-Wtqh7B90S2euFKjbw5yVicAQ+tD9VXsKApZiAuTSOhg=", + "pom": "sha256-kakbfQ6AJnSkU6gHm2CVQv+1IjDsa/03bRdY7sX2OtI=" + }, + "io/grpc#grpc-util/1.70.0": { + "jar": "sha256-aDr/k9LKvET/Idyat3lPiue0xl0YdIyEdFNTEeq+jcQ=", + "pom": "sha256-UBYBc8lJdZVwQfpf5wc27ylG1w9h3n9o+Bf9AdNa5xg=" + }, + "io/netty#netty-bom/4.1.104.Final": { + "pom": "sha256-WmXgahWdINO0gAYkpXDGRtvucQsrU5s0SaJoVYwonpw=" + }, + "io/netty#netty-bom/4.1.115.Final": { + "pom": "sha256-JdyLuDN9/BhsSfyM9PaltsfPQUY2L19EDaytzQ35dhs=" + }, + "io/netty#netty-buffer/4.1.119.Final": { + "jar": "sha256-MiJiGNhUwuUdSTWn6+RmO3Lsua9NqIG4a/UY5hrtSNM=", + "pom": "sha256-ZxrAlb6wlY6qKsRVFJKWSVO3ZDD3VBbGa93g8++Qb0k=" + }, + "io/netty#netty-common/4.1.119.Final": { + "jar": "sha256-mRppsVlNytmSbiaOfpRTDP2qif7vQq8mkiowLT4ukhI=", + "pom": "sha256-PMa/2IxM0XguEknOg8O1TyruD8YVy32HoFU3i66XUyM=" + }, + "io/netty#netty-parent/4.1.119.Final": { + "pom": "sha256-/zqMSVFYZZvdITF/YSVIv1jXFNswT87Gm4BJake2hgM=" + }, + "io/opencensus#opencensus-api/0.31.1": { + "jar": "sha256-8UdNR/S2sAFVitJ7lS417aXMcUZ4iHf8UpOMbroks4I=", + "pom": "sha256-VW9CfhIJDvs2pgh/dBCr/kXeEBByktlvpj5BdRdOy3Y=" + }, + "io/opencensus#opencensus-contrib-http-util/0.31.1": { + "jar": "sha256-PqmVtVpAaL4imJtwzCmk14jC0yjR1QYTp6mv0T/dLQo=", + "pom": "sha256-6+IsQiIX1mLHzumUdvC1LIBXftRFeGrCmSUb76pMB1s=" + }, + "io/opentelemetry#opentelemetry-api/1.47.0": { + "jar": "sha256-ZWbx8RM9YR/06Lj9uOsYV3uXBCViAxU2Pum+Q4Q7FL8=", + "module": "sha256-zCE6CaI+2/bRdOu7k/tl0oCeD8o/m2o0Vbi7a9xE/jQ=", + "pom": "sha256-X2xsLNziNhUfBA1Kmp+OwQW5GV0PFrWu2FVy8wDqyR0=" + }, + "io/opentelemetry#opentelemetry-bom/1.47.0": { + "module": "sha256-QdK1ilQMmkQ1iAmy1jZIDtR8Alovp77NenjEy3TklL4=", + "pom": "sha256-VcVgSi3oNT9k7MTF1CyPvxARFc+s00QWABnKY468ilc=" + }, + "io/opentelemetry#opentelemetry-context/1.47.0": { + "jar": "sha256-FbT8QjTm3KbVSADVcmlOy9B7pSwV/FsiG02lUXzo2Q0=", + "module": "sha256-M4aB6NwaH2T/tvcHjEa2+WD+lGN5ni3r6+fVjAb8XbM=", + "pom": "sha256-WUMqp3bD8etmBrhU53g1+iPlJBUPfg36PGUQ61ekQsM=" + }, + "io/perfmark#perfmark-api/0.27.0": { + "jar": "sha256-x7R4UD7FJOVd8ZtCTUbSfIporrgBZk+t1PBptx9S0PY=", + "module": "sha256-n2xOamK43v0UFzrNt9spPQhjU7Ikkj7vYpP1gWGJPMo=", + "pom": "sha256-IsF1wsGCNmdjDITnMiV2f1lwSS2ObL/7gaZXXbpHLSY=" + }, + "jakarta/activation#jakarta.activation-api/2.1.3": { + "jar": "sha256-AbF21xihaSY+eCkGkfxHmXcYa8xrMzSHMlCE1lhvRic=", + "pom": "sha256-slSZQMF7aGWjT2E1t3Iu2Mv+9tC2wNs3LDDwNGvIzVg=" + }, + "jakarta/annotation#jakarta.annotation-api/3.0.0": { + "jar": "sha256-sB9VVSKEz7FJQR5k6rynXpQtJtLheGsykUJQ5DMK+qI=", + "pom": "sha256-n8Zqhzdd+EQ6umvcwdT/B/EmVCWDeFpIKpJioZv+jq4=" + }, + "jakarta/inject#jakarta.inject-api/2.0.1": { + "jar": "sha256-99yYBi/M8UEmq7dRtk+rEsMSVm6MvchINZi//OqTr3w=", + "pom": "sha256-5/1yMuljB6V1sklMk2fWjPQ+yYJEqs48zCPhdz/6b9o=" + }, + "jakarta/json#jakarta.json-api/2.1.3": { + "jar": "sha256-vJNBQoBeodeU8UQFY5ZaOGGiqft0FOzT/kTyZQBzRBQ=", + "pom": "sha256-QWpzlxOFoL5D+dqKR3qmT0gUrFIYfYjz4k8hW3+J394=" + }, + "jakarta/json/bind#jakarta.json.bind-api/3.0.1": { + "jar": "sha256-2TfwHBLUFvCmFah82CUcK91F91AkTr4ojEum1GnbA3c=", + "pom": "sha256-99lfbceYkWL3oXL79NKkwTZYCw6vVu7C3pvZjTdlDFE=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "jakarta/servlet#jakarta.servlet-api/6.0.0": { + "jar": "sha256-wDTrGvsViYfbtTpf6gyt9hHI2ujardWcRNnVq3ASnO8=", + "pom": "sha256-PVolnfvSuUDklcMFy6K2BhWSPcgXjgMrfvYMuyQThDk=" + }, + "jakarta/validation#jakarta.validation-api/3.1.1": { + "jar": "sha256-Y84AFWOIw2XzrBvnH8+vEUaC/AxFICC1325+wjbhQqs=", + "pom": "sha256-qxnpAKv5Awo3+DI+Ws66WNQK+I47UqBYuOA95II1ync=" + }, + "jakarta/ws/rs#all/3.1.0": { + "pom": "sha256-1P3UF4DgZarNWsCZzQSQFxk3zFEi3CyO8biKh7PJQkw=" + }, + "jakarta/ws/rs#jakarta.ws.rs-api/3.1.0": { + "jar": "sha256-azs2KLi0rt2g0kwzVDNemFSX2O88UQuPMCjpINW4Zj0=", + "pom": "sha256-xpejA+n/wxlj6xwnW793pYOn1IKWWsTxuybckeWV/78=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.2": { + "pom": "sha256-SCzbRtTdL1r33IhMim3nPd/+ba9UnvNqbAd/1uQe7Qg=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/4.0.2": { + "jar": "sha256-DWvP5Hdj6FBHrPfDmDNtyE/4XrytCny287nT6YEkVAY=", + "pom": "sha256-q3Jz4mpUgks7czPUlW5uzSbeE6XrPZDuYwIxk6ktcr4=" + }, + "javax/annotation#javax.annotation-api/1.3.2": { + "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=", + "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" + }, + "org/apache/arrow#arrow-bom/15.0.2": { + "pom": "sha256-smxLzIdQ3lilf5FewSm3Ldwe4aiQQTcuBIIEz2dmB3k=" + }, + "org/apache/arrow#arrow-format/15.0.2": { + "jar": "sha256-hM8dWwy7YHshrS1LUXNB1YlakZEES24ND/IVYLJlIyE=", + "pom": "sha256-YZWyjPHXfR//+fr3qXfpTwFxH5pKPdam7T/zKB9jGLw=" + }, + "org/apache/arrow#arrow-java-root/15.0.2": { + "pom": "sha256-3eYwjnKSWsQMNj6gXovBzMUgoe5FFBon6XoeVQdq2UA=" + }, + "org/apache/arrow#arrow-memory-core/15.0.2": { + "jar": "sha256-x8v4+MO0BbagQ20a5aIFH0+0p/a7ViCVTBLBSiLD3VA=", + "pom": "sha256-t1b9yPpEvDDHCr+nx0ylBGdvWzfJrDMNWb8vf0Kx0uU=" + }, + "org/apache/arrow#arrow-memory-netty/15.0.2": { + "jar": "sha256-MM28fUhUgVH36jBMjglZE0vtLGvCspWeqQf05/ekN7A=", + "pom": "sha256-Re5EvLlgCgH9YpP/VQF+GOJlkoxaw9VTm8bFU1gBZ0s=" + }, + "org/apache/arrow#arrow-memory/15.0.2": { + "pom": "sha256-GOiz1kGw1br6LdC2/IyTLpObYwUU2zV+tJEFruapgKs=" + }, + "org/apache/arrow#arrow-vector/15.0.2": { + "jar": "sha256-xNJolSQFmqV5LYewPX+xlcam65CFdZmDxBF8OA7ki3U=", + "pom": "sha256-mdlD/xCSUHbFJfk+aS3DEATyaurn6qbFDswFZxUZ148=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/79": { + "pom": "sha256-Yo3zAUis08SRz8trc8euS1mJ5VJqsTovQo3qXUrRDXo=" + }, + "org/apache/groovy#groovy-bom/4.0.22": { + "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", + "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" + }, + "org/apache/httpcomponents#httpclient/4.5.14": { + "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=", + "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.14": { + "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.16": { + "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcore/4.4.16": { + "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=", + "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o=" + }, + "org/apache/logging#logging-parent/11.3.0": { + "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" + }, + "org/apache/logging/log4j#log4j-api/2.24.3": { + "jar": "sha256-W0oKDNDnUd7UMcFiRCvb3VMyjR+Lsrrl/Bu+7g9m2A8=", + "pom": "sha256-vAXeM1M6Elmtusv8yCbNZjdqLZxO5T+4NgCfRKRbgjk=" + }, + "org/apache/logging/log4j#log4j-bom/2.24.3": { + "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg=" + }, + "org/apache/logging/log4j#log4j-core/2.24.3": { + "jar": "sha256-frQIRZauJb08YWmOSOjQq2WpJgdYiE7Vy7nG5VxEpWo=", + "pom": "sha256-v9XAxKrGECQsy2H/ABCK1zeA2iCi9ym+Bjg2qXZXf1c=" + }, + "org/apache/logging/log4j#log4j/2.24.3": { + "pom": "sha256-wUG0hj/AzqtYOJShPh+eUsAfwtdYcn1nR/a5nVBA87E=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/checkerframework#checker-compat-qual/2.5.6": { + "jar": "sha256-EdE0skXpysxHRRTS1mtbhhj4A5oUZc3FW7wLNOAAi3o=", + "pom": "sha256-FxNsR1rgzd9LMvf66tVIbCzEWgZI69MH6uDbNUuWCLE=" + }, + "org/checkerframework#checker-qual/3.49.0": { + "jar": "sha256-i52aNuqvfA/CZQPIPNl9jJwPnikTzCpukqwmxzXU3L4=", + "module": "sha256-YA0Z+9XjfemEh8OYBF4UCmUc9brRx5xcl88MyYRMQuQ=", + "pom": "sha256-yEUftI7+1jgbMpFG1PrvtvTYq/E79XLCaosawoCW54A=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.24": { + "jar": "sha256-xyDm5by+ay9I3tdaR7zNt2Pu3nnRQzAQLg01Lj2J7ZI=", + "pom": "sha256-iEhPYKatQjipf+us8rMz6eCMF4uPGAoFo+2/9KOKg24=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.24": { + "pom": "sha256-Sd2rQ8g2HcLvDB/4fLWQ+nIxcCq59i4m1RLcGKHxzQQ=" + }, + "org/codehaus/mojo#mojo-parent/84": { + "pom": "sha256-L+UQYYsvYPzV8vuCvEssLDRASNdPML5xn8uGgp7orDA=" + }, + "org/conscrypt#conscrypt-openjdk-uber/2.5.2": { + "jar": "sha256-6vU32Y4DPQ8EUc0bjMdOAte1XsiC2mPIgGDYBrqJw0g=", + "pom": "sha256-tf1UhzL5MlRdd3iQ65lSIr/oZiMjUb6QgTfjnDxnLYs=" + }, + "org/eclipse#yasson/3.0.4": { + "jar": "sha256-9lgoX54+GjmZ4uqSaV/DOJKyWDBdKtr7cphegUUt3Qc=", + "pom": "sha256-2mB8ukIh4FJA4wjjTR9I0LDhrfBed2Mr7MA/mp9fw5A=" + }, + "org/eclipse/angus#angus-activation-project/2.0.2": { + "pom": "sha256-r5GIoQy4qk61/+bTkfHuIVnx6kp/2JDuaYYj5vN52PY=" + }, + "org/eclipse/angus#angus-activation/2.0.2": { + "jar": "sha256-bdO8/8IrzoOwc3ag4uCU5JZKMZXUEY+0PjgO81Q2zB4=", + "pom": "sha256-deViGn3IWMmW7nDGtNiE2QHRh4Ns5sZxIMr5VH5vxXE=" + }, + "org/eclipse/collections#eclipse-collections-api/11.1.0": { + "jar": "sha256-G4YI7PTmgfAxwpooxAP3FHb+XfOo8MDdjHrTO5GYQhI=", + "pom": "sha256-FrNfjbqEJ72caQTFkdzyKeN+oq2AWNatQf77jjTM5x8=" + }, + "org/eclipse/collections#eclipse-collections-parent/11.1.0": { + "pom": "sha256-jjE9sGTinEJIK8p12LuRKH1ByKPZ+xqg8qExI3JI14k=" + }, + "org/eclipse/collections#eclipse-collections/11.1.0": { + "jar": "sha256-iIF0neeRwoxszqYhMUo6FUz+du93wwBUtucUw9x2lp0=", + "pom": "sha256-rDVVCe3JA1Q4bVCeSSieeX0+coQ5Ugw//E9vksymD2M=" + }, + "org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/ee4j#project/1.0.8": { + "pom": "sha256-DQx7blSjXq9sJG4QfrGox6yP8KC4TEibB6NXcTrfZ0s=" + }, + "org/eclipse/ee4j#project/1.0.9": { + "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" + }, + "org/eclipse/jetty#jetty-core/12.0.19": { + "pom": "sha256-WlnJIoSqiWT9xOKQweakAaySfXmabfw3/eQ7GZ19ajk=" + }, + "org/eclipse/jetty#jetty-http/12.0.19": { + "jar": "sha256-BSICiO7RSRZ9pQbSFBMamI8wuVZS7ZKSBhTBWDPGSaU=", + "pom": "sha256-dIGCV/cZF26ofN91AXQkAQTDMGjYCxFDr601C7TeG4E=" + }, + "org/eclipse/jetty#jetty-io/12.0.19": { + "jar": "sha256-xs9Rz7QhmIpR0e3tAFzAabzpwqe/YcdNO5d+PFtekpc=", + "pom": "sha256-NGjexy5gMl01t5CFPx/CzL9r2/OPVtHxb9vyrERDZCs=" + }, + "org/eclipse/jetty#jetty-project/12.0.19": { + "pom": "sha256-4+ZN8tcwhMyChBtFyR3rZnkI9GIKLliMIvORKGCfxuI=" + }, + "org/eclipse/jetty#jetty-security/12.0.19": { + "jar": "sha256-NxOrBXh4etewjObIEJrL0+ne+Z4F3aD7OqdwEymme+c=", + "pom": "sha256-x/lnUYg9Stf9QGpYk6H8U7FXxcKzH2FC9+AbAYH8kPA=" + }, + "org/eclipse/jetty#jetty-server/12.0.19": { + "jar": "sha256-rXPzXFuYbvpNpQCvhkeyxVbSPiTDZFs3sG/YfQqecXA=", + "pom": "sha256-5sj3pEpmUzDh6PYZeIHSJp+6lpLHsBes/t/QQS6vzw4=" + }, + "org/eclipse/jetty#jetty-session/12.0.19": { + "jar": "sha256-vdYjUPrtOVBhivUPs3kkYrv6qUg24IUEVO5zZU5wulA=", + "pom": "sha256-cJT4uwG5bQL+YBcupTCkSxlDOG2n0wz64VtFtF9qAFU=" + }, + "org/eclipse/jetty#jetty-util/12.0.19": { + "jar": "sha256-kBuDmdZHU9jEjWyGV251jPfgLzaCR1XcIjqRCrXLxSU=", + "pom": "sha256-+3BLTg7ELNmVEgTn0I+XAqfoxrjn8QESYowyFxRqXW0=" + }, + "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.0.19": { + "jar": "sha256-unkQYcra4mm6jlFDZu+anv+MSpZDbxgwIOtHYkpZte0=", + "pom": "sha256-8nOgRAMEk3coOm+1AtX/XSEHBwkWqI2YEk5IaAw6pKo=" + }, + "org/eclipse/jetty/ee10#jetty-ee10/12.0.19": { + "pom": "sha256-g0v8BRMOoPBy9Yq/2YyKKLu8RYNqPi7bMXAQvFfkm+I=" + }, + "org/eclipse/parsson#parsson/1.1.7": { + "jar": "sha256-wh2wGPisbPeYk/Gvd/HNM3k3vRKub6PUsQ9aAIGe5Ww=", + "pom": "sha256-rrQE5/DBSnbsyLpuIezZL4D3wQQCpEb/XZwx1Q8I4tM=" + }, + "org/eclipse/parsson#project/1.1.7": { + "pom": "sha256-r171oT3deNwLoRUh3IOhKkVytRPILxAbsxDxGGxccU0=" + }, + "org/glassfish/hk2#external/3.0.6": { + "pom": "sha256-HRyIIn2+K7eMKkSn472dteOqOvcPFKZjI6qBsKXUnpw=" + }, + "org/glassfish/hk2#hk2-api/3.0.6": { + "jar": "sha256-wEmiGp/ZMWx+KRorwog19w0lr/tiPcFZmoO2uE7IOk8=", + "pom": "sha256-1qw9qzMZyFheEkaCpXfGLu1yoOZLR8Q+Bugld669aX4=" + }, + "org/glassfish/hk2#hk2-locator/3.0.6": { + "jar": "sha256-4mZNIbAXw6oVGLkTJkYCvqYE7cVNNWEDwQr7qZq9BPw=", + "pom": "sha256-JxO73h0Aikt6Z2PzNSTH8AccY/qCzAaR5M4yPpicpis=" + }, + "org/glassfish/hk2#hk2-parent/3.0.6": { + "pom": "sha256-AL2rCNWOtMDpdwVCBWS2mzoGNMhYP1jATawyY/O9K2U=" + }, + "org/glassfish/hk2#hk2-utils/3.0.6": { + "jar": "sha256-/ITYWgdEtXbZ7H21hF7rmY7VMqlFDdGcjJIsPuaSYgY=", + "pom": "sha256-NUOJtRSguxyTA1F6CWe+GFfaFMB3p5hm9vjSNG0KeEg=" + }, + "org/glassfish/hk2#osgi-resource-locator/1.0.3": { + "jar": "sha256-qrXXhJ98/Nosx8VBuhvTZRUdQidvFRyCU4ckXf3j3XQ=", + "pom": "sha256-i2Yi64HlVymfvZqoVLxax20wf3rl53BYZImli7Uziyo=" + }, + "org/glassfish/hk2/external#aopalliance-repackaged/3.0.6": { + "jar": "sha256-qCttGjSDJO+I3IB8fNeq9jOYXL/3swA2+2GhuGmB2EA=", + "pom": "sha256-+WC9Fv4TmZXL8T1AoEJhbIueGH+CtOXDK6pGr8m5/Nw=" + }, + "org/glassfish/jaxb#jaxb-bom/4.0.5": { + "pom": "sha256-7JfsQtk308iVGXl+RCRvgN4IUIGax6euZ1xEl7cHXDk=" + }, + "org/glassfish/jaxb#jaxb-core/4.0.5": { + "jar": "sha256-rT/ZvwDePtqYWfcLbPsBHi/pkEgE4WomZQkoiOzg/co=", + "pom": "sha256-S1OSE3b7/exg46j+8FjMPcmdn8o+nJUOhZKYeYRghXI=" + }, + "org/glassfish/jaxb#jaxb-runtime/4.0.5": { + "jar": "sha256-SF2JQOdjc6fzAIFepVBL9bcmwjRCWtMJcQGdEzEkzKQ=", + "pom": "sha256-d8T6BuLZyVN2LC5jUXN3oa4oWbGBssEzdZy1poKojKA=" + }, + "org/glassfish/jaxb#txw2/4.0.5": { + "jar": "sha256-kXNVvEUUgfMNBDsk0SMRBReWavNDg5AXc4goENykgOU=", + "pom": "sha256-a2gzdWAy4YOaQBRoFaWY7IsFg6Lv+9Rd311UMB9Ky6s=" + }, + "org/glassfish/jersey#project/3.1.10": { + "pom": "sha256-HwCrKqQxlS9Eb7DXajOYoWstCgzmAP/L/g8iKp9aRSU=" + }, + "org/glassfish/jersey/containers#jersey-container-servlet-core/3.1.10": { + "jar": "sha256-/RXn43IV13LM2ujUB2xBoRrT/snKiKH4qPbaz0Zju2k=", + "pom": "sha256-/08eBDeM5Au1jmt9dk24TJIXQ2PQlOO2W7Auqr9HOlw=" + }, + "org/glassfish/jersey/containers#jersey-container-servlet/3.1.10": { + "jar": "sha256-Sq3GbS02r7Jzs4mFgdaqUeD5kjCNVv1RuOMgHvpGH2c=", + "pom": "sha256-PKD2TQbThE//ImrPIn7MS7xQxeEksF9mH4QYJmZqe00=" + }, + "org/glassfish/jersey/containers#project/3.1.10": { + "pom": "sha256-srKeL9s0eph5sEbHW+rV6E9O/C0gQp9KVCoMsxkYRSM=" + }, + "org/glassfish/jersey/core#jersey-client/3.1.10": { + "jar": "sha256-ls+GwjtRXaIKMKOWM6kg8SpCDR5fAsVe9Vd8omlNEcY=", + "pom": "sha256-yCh1KxtdmOSer+v/bKTR5TK1pjJ33Xw/DqUOsyhuzEE=" + }, + "org/glassfish/jersey/core#jersey-common/3.1.10": { + "jar": "sha256-uN9d6H1I1qv1VfNAdVoFbIyymmYK+VjpWduKTLNVK1Q=", + "pom": "sha256-37Tr4q/ZEifpSSJXnGk6Wx6+UOupnI9HDFwZZjgipBY=" + }, + "org/glassfish/jersey/core#jersey-server/3.1.10": { + "jar": "sha256-GzOpvkF7cvfO7zr+l4B4G2YSKw8dt48vglApiAcs+rA=", + "pom": "sha256-ablIlDXkJYVymFSLzSYiC7+lazUOaI7vltV85vp8zM0=" + }, + "org/glassfish/jersey/ext#jersey-entity-filtering/3.1.10": { + "jar": "sha256-qvtmbou6oDtIguIS66TFZ/rwgdW2U0CIy12OyIWUhnM=", + "pom": "sha256-vGtOiqMPFeMrYKS3qYKQGJr4wwSZth5k1w1Z35ODHUU=" + }, + "org/glassfish/jersey/ext#project/3.1.10": { + "pom": "sha256-zmX1BhgfgD0o60fjmvz7Pm6/kfmaTmQsuOj2nvUWPYc=" + }, + "org/glassfish/jersey/inject#jersey-hk2/3.1.10": { + "jar": "sha256-AO1xxJaoVqwfcyckgqer4ntalrgjwpzAj0twjI0+ZH4=", + "pom": "sha256-bVISCGYiCVFDE0s8bLtZSypaGgALKu3a/TYj9M09uuU=" + }, + "org/glassfish/jersey/inject#project/3.1.10": { + "pom": "sha256-u1gO4XOEs5H3+uNuGHxlOqYVeVFmN2aggn/AwglTJlg=" + }, + "org/glassfish/jersey/media#jersey-media-json-binding/3.1.10": { + "jar": "sha256-RUFLx5YJXhtr+STdnu0jr0DhQrXjvXwq8DkKtyvhsvQ=", + "pom": "sha256-PwtFyLyViVmwBiZq1sNKJa7c082sINL4HA6lPra3S+o=" + }, + "org/glassfish/jersey/media#jersey-media-json-jackson/3.1.10": { + "jar": "sha256-3W8yv0OBtxqhfWEgFIUlIuEc2V81ksUzsiO3GTXCzNg=", + "pom": "sha256-CG9x4al4e0x7T4ts7HHzAuiQQ6DlSAP2ixo2/20eLpc=" + }, + "org/glassfish/jersey/media#jersey-media-sse/3.1.10": { + "jar": "sha256-fE+fD5UA/BSqeX4eNdPTiyLdf4VfdkAGcAA3CWUFFm4=", + "pom": "sha256-GYURmdPVQFG8CAiUTYG6/CMQURJ61cKUn7afG2gFbXg=" + }, + "org/glassfish/jersey/media#project/3.1.10": { + "pom": "sha256-IKAKpgkjN0iGlSW0V1WWPD1Js41DuBfIXIhZ1jc7AZw=" + }, + "org/hibernate/search#hibernate-search-bom/7.1.2.Final": { + "pom": "sha256-BAbGloTq1BCta0E1tShrtggnsLWiEdXl0T0iM1lATPA=" + }, + "org/infinispan#infinispan-bom/15.0.11.Final": { + "pom": "sha256-l1ZGl2WLzh5IwN06lHdoxhNyMtYVGVhBQhz8Q7GE6Cw=" + }, + "org/infinispan#infinispan-build-configuration-parent/15.0.11.Final": { + "pom": "sha256-utwbV7pKcUvVQfHty5kdfpBpDLJCNO8kd4ju3eO3jgo=" + }, + "org/javassist#javassist/3.30.2-GA": { + "jar": "sha256-66NykJlLXkho86+Y/xE/YkSmsJk4XZrUaIEwfTywGq8=", + "pom": "sha256-QieFHLcOQ/c6zti//mkt465EEsSmLc3/BV5RPuPYAaM=" + }, + "org/jboss#jboss-parent/43": { + "pom": "sha256-PDredvuIOs25qKAzVdHfQGb/ucjHjwmyGenA/Co/Qxc=" + }, + "org/json#json/20250107": { + "jar": "sha256-hdTBqxktMRf9Asf/8ewP5jreRc9W3vf+lQ7wYM8G6Z8=", + "pom": "sha256-ph+87jbeXMAb7ZMEYseLwEvBZBCwHZtfEABq8UoRvFY=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.4": { + "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", + "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" + }, + "org/junit#junit-bom/5.12.0": { + "module": "sha256-v/EC0wjRgUHrv+gdhjsFmaMPe7rK291WmKnUNpL9pi8=", + "pom": "sha256-rhFA2ksa+nWxxD/+oO8MreDDR/r1mWO1xJk/RzJwCNQ=" + }, + "org/junit#junit-bom/5.8.2": { + "module": "sha256-QM+tmT+nDs3yr3TQxW2hSE7iIJZL6Pkyz+YyvponM/o=", + "pom": "sha256-g2Bpyp6O48VuSDdiItopEmPxN70/0W2E/dR+/MPyhuI=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.2": { + "jar": "sha256-GAjuh+D3GM1uJfO3WvwXlWrIo+3EjH6bq58Z+aeeOAE=", + "module": "sha256-fpr03/9iZ6zd0VfZ4Rug1dyRszL6dLxMZZOeRReht3A=", + "pom": "sha256-yb3jYieVswp3NTHoXFgy+NyKp37N0xPu4jXJg8v9Anc=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.2": { + "jar": "sha256-dTt3Js3RWLs0ztuUwWHiKRiW9HgyoentpT2XACCoGE4=", + "module": "sha256-pWIExxbCN5lwyo4/4qcuOgMM2QJzKNPOFFfdEMAVDn4=", + "pom": "sha256-Ckt92UuvnF+7ZaLpFz0IUii9ACQhNkgCWtBnAk8cZrs=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.2": { + "jar": "sha256-0cItb+VINWjAjIkT80q9IwNJDDSAzmwYouoxxl5EECo=", + "module": "sha256-UCPk4+wVbsa9PPZV8wcM/Fo+iq1dUbS74CWnkulJjXM=", + "pom": "sha256-tGngEBcBfYW8AlIlMCBS+kXPK1n5QVhCRzlGtPpJx8Y=" + }, + "org/junit/jupiter#junit-jupiter/5.8.2": { + "jar": "sha256-T1wcxkMiRM0W42qg4Ct0vONKgf+VoT1j1QlR7Ezj9L0=", + "module": "sha256-2d9Hs8dDGIOrHx8dggwpgOvL11PtxMgrmb9ewsUzrS4=", + "pom": "sha256-Q/Vic+es8z4PW10Qecf/pCRTHwHieUqdZHOt/RCkXS4=" + }, + "org/junit/platform#junit-platform-commons/1.8.2": { + "jar": "sha256-0uAV/KcTDnmvL0YI3FRBXksQtZLXczPey0saJ0wYUFA=", + "module": "sha256-NChH0wRv6kNVlWkttPBdXwOeDh0eIE9NV1WQJVcIJiY=", + "pom": "sha256-zoUuNMahhKpsgO6N8EcXE6dAgTQTTwjjwcPdh8a1mrc=" + }, + "org/junit/platform#junit-platform-engine/1.8.2": { + "jar": "sha256-C30AD4w+jl99a4GWSZNue5k4MU6HyPmDgFIY6ldWflk=", + "module": "sha256-66d7Nu/fdaZ/RkODM4JfnkSPVQ1SHnJJ2VA1hYDuY2s=", + "pom": "sha256-AWhkMmYGDtko71qBgjAD7PrnmpqMC7/Xb0IBxsnXccU=" + }, + "org/junit/platform#junit-platform-launcher/1.8.2": { + "jar": "sha256-giFWQJ/YPmguTFGZs0YAVCmbU4oFjCxtD1ybalvbdZQ=", + "module": "sha256-4XQA7HvnYIwfiI1yG0MAHpc2wVDUD5jIoLzalWPYyus=", + "pom": "sha256-tfancaautzyJpud/Vtcp9LqOta/dDxD0TbRNaq25UJU=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-bom/9.7.1": { + "pom": "sha256-qNMCypF0b46grZBx9i/zoNq9Ov5h2hTMgMHIdc9hi0I=" + }, + "org/slf4j#slf4j-api/2.0.17": { + "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", + "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" + }, + "org/slf4j#slf4j-bom/2.0.17": { + "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" + }, + "org/slf4j#slf4j-nop/2.0.17": { + "jar": "sha256-Nxb4NknsZhYaLt79T0nfNNHdHFHNz5QZlsaYcmDwqCk=", + "pom": "sha256-5eVI3OjByXkTin6WyjVFEPoM4QPwpt9TofWyXpKYubI=" + }, + "org/slf4j#slf4j-parent/2.0.17": { + "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + }, + "org/testcontainers#testcontainers-bom/1.20.4": { + "pom": "sha256-oVFHwtqO3sE0AdHT5qCgG2Gea2e2bBA1ks7zpwzB7Ik=" + }, + "org/threeten#threeten-extra/1.8.0": { + "jar": "sha256-UeTSHtxOlEf3dgwFDguu5119lz84e6YFoXq9xNJP1tg=", + "pom": "sha256-pdjN8lkr2h70BZZYg9stpDGyZ8dt4wDQdYIeIPbcDH0=" + }, + "org/threeten#threetenbp/1.7.0": { + "jar": "sha256-hXkX0jGaTpLcHF4663Wg2shERe0xXnrD2Cu40rKYl38=", + "pom": "sha256-nLthSu/sbVcp7MrdZMmhnpshg/w6Dgk8APN2rPptC0Q=" + } + } +} diff --git a/pkgs/by-name/fr/freerouting/package.nix b/pkgs/by-name/fr/freerouting/package.nix new file mode 100644 index 000000000000..62a5892a5f93 --- /dev/null +++ b/pkgs/by-name/fr/freerouting/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeBinaryWrapper, + makeDesktopItem, + jdk, + gradle, + copyDesktopItems, + jre, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "freerouting"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "freerouting"; + repo = "freerouting"; + tag = "v${finalAttrs.version}"; + hash = "sha256-K4fwbvSPuKAAnIcTDBSAI1/6HuCB7c9rCGTJcyAj5dQ="; + }; + + gradleBuildTask = "executableJar"; + + nativeBuildInputs = [ + makeBinaryWrapper + jdk + gradle + copyDesktopItems + ]; + + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/freerouting} + cp build/libs/freerouting-executable.jar $out/share/freerouting + + makeWrapper ${lib.getExe jre} $out/bin/freerouting \ + --add-flags "-jar $out/share/freerouting/freerouting-executable.jar" + + install -Dm644 ${finalAttrs.src}/design/icon/freerouting_icon_256x256_v1.png \ + $out/share/icons/hicolor/256x256/apps/freerouting.png + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = finalAttrs.pname; + exec = "freerouting"; + icon = "freerouting"; + desktopName = "Freerouting"; + comment = finalAttrs.meta.description; + categories = [ + "Electricity" + "Engineering" + "Graphics" + ]; + }) + ]; + + meta = { + description = "Advanced PCB auto-router"; + homepage = "https://www.freerouting.org"; + changelog = "https://github.com/freerouting/freerouting/releases/tag/v${finalAttrs.version}"; + longDescription = '' + Freerouting is an advanced autorouter for all PCB programs that support + the standard Specctra or Electra DSN interface. ''; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ srounce ]; + platforms = with lib.platforms; linux ++ darwin; + mainProgram = "freerouting"; + }; +}) diff --git a/pkgs/by-name/fr/freetds/package.nix b/pkgs/by-name/fr/freetds/package.nix index ccb6c6fbc87c..b8726b762384 100644 --- a/pkgs/by-name/fr/freetds/package.nix +++ b/pkgs/by-name/fr/freetds/package.nix @@ -15,11 +15,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.4.26"; + version = "1.4.27"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-dGQaZswr+uMCwqZKSyaKPbj7DMc2TceXXETFfWXNjRw="; + hash = "sha256-jAcexiW401UtI54kvtjdVfkJjg/Jk5fhySajwnpKMs0="; }; buildInputs = [ diff --git a/pkgs/by-name/fr/fretboard/package.nix b/pkgs/by-name/fr/fretboard/package.nix index ba4ed09bac00..4f12d0298133 100644 --- a/pkgs/by-name/fr/fretboard/package.nix +++ b/pkgs/by-name/fr/fretboard/package.nix @@ -2,7 +2,6 @@ lib, blueprint-compiler, cargo, - darwin, desktop-file-utils, fetchFromGitHub, glib, @@ -47,15 +46,11 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 ]; - buildInputs = - [ - glib - gtk4 - libadwaita - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + glib + gtk4 + libadwaita + ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.cc.isClang [ diff --git a/pkgs/by-name/fr/frida-tools/package.nix b/pkgs/by-name/fr/frida-tools/package.nix index 9cd64d846448..ab5fe8501a2b 100644 --- a/pkgs/by-name/fr/frida-tools/package.nix +++ b/pkgs/by-name/fr/frida-tools/package.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "frida-tools"; - version = "13.6.1"; + version = "13.7.1"; src = fetchPypi { inherit pname version; - hash = "sha256-imNW0vorY90lp2OkhYLYwgpyW+Vxd1kdq3Lvd4/iNVA="; + hash = "sha256-c0Gq1ep75WAvTGIj4c7xSy0NjCGK5wrRPYzeYyFHDgU="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 8adf6628cc7a..eaf2fe1b630a 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -12,14 +12,14 @@ }: let - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { name = "frigate-${version}-source"; owner = "blakeblackshear"; repo = "frigate"; tag = "v${version}"; - hash = "sha256-qgiVE5UUjxRLya0mD2vfKdzdTdy5ThYOrHAGoFQ9PWA="; + hash = "sha256-rnsc2VXaypIPVtYQHTGe9lg7PuAyjfjz4aeATmFzp5s="; }; frigate-web = callPackage ./web.nix { @@ -207,7 +207,7 @@ python.pkgs.buildPythonApplication rec { }; meta = with lib; { - changelog = "https://github.com/blakeblackshear/frigate/releases/tag/v${version}"; + changelog = "https://github.com/blakeblackshear/frigate/releases/tag/${src.tag}"; description = "NVR with realtime local object detection for IP cameras"; longDescription = '' A complete and local NVR designed for Home Assistant with AI diff --git a/pkgs/by-name/fr/frog-protocols/package.nix b/pkgs/by-name/fr/frog-protocols/package.nix index 0219d0461ff5..908475a3c895 100644 --- a/pkgs/by-name/fr/frog-protocols/package.nix +++ b/pkgs/by-name/fr/frog-protocols/package.nix @@ -3,7 +3,7 @@ lib, meson, ninja, - nix-update-script, + unstableGitUpdater, stdenv, testers, }: @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ]; passthru = { - updateScript = nix-update-script { }; + updateScript = unstableGitUpdater { }; tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; }; diff --git a/pkgs/by-name/fs/fstar/package.nix b/pkgs/by-name/fs/fstar/package.nix new file mode 100644 index 000000000000..5d2561fbb7e7 --- /dev/null +++ b/pkgs/by-name/fs/fstar/package.nix @@ -0,0 +1,121 @@ +{ + callPackage, + fetchFromGitHub, + installShellFiles, + lib, + makeWrapper, + nix-update-script, + ocaml-ng, + removeReferencesTo, + util-linux, + which, +}: + +let + # The version of ocaml fstar uses. + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + + fstarZ3 = callPackage ./z3 { }; +in +ocamlPackages.buildDunePackage rec { + pname = "fstar"; + version = "2025.03.25"; + + src = fetchFromGitHub { + owner = "FStarLang"; + repo = "FStar"; + rev = "v${version}"; + hash = "sha256-PhjfThXF6fJlFHtNEURG4igCnM6VegWODypmRvnZPdA="; + }; + + duneVersion = "3"; + + nativeBuildInputs = [ + ocamlPackages.menhir + which + util-linux + installShellFiles + makeWrapper + removeReferencesTo + ]; + + prePatch = '' + patchShebangs .scripts/*.sh + patchShebangs ulib/ml/app/ints/mk_int_file.sh + ''; + + buildInputs = with ocamlPackages; [ + batteries + menhir + menhirLib + pprint + ppx_deriving + ppx_deriving_yojson + ppxlib + process + sedlex + stdint + yojson + zarith + memtrace + mtime + ]; + + preConfigure = '' + mkdir -p cache + export DUNE_CACHE_ROOT="$(pwd)/cache" + export PATH="${lib.makeBinPath [ fstarZ3 ]}''${PATH:+:}$PATH" + export PREFIX="$out" + ''; + + buildPhase = '' + runHook preBuild + make -j$NIX_BUILD_CORES + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + make install + + remove-references-to -t '${ocamlPackages.ocaml}' $out/bin/fstar.exe + + for binary in $out/bin/*; do + wrapProgram "$binary" --prefix PATH : "${lib.makeBinPath [ fstarZ3 ]}" + done + + src="$(pwd)" + cd $out + installShellCompletion --bash $src/.completion/bash/fstar.exe.bash + installShellCompletion --fish $src/.completion/fish/fstar.exe.fish + installShellCompletion --zsh --name _fstar.exe $src/.completion/zsh/__fstar.exe + cd $src + + runHook postInstall + ''; + + enableParallelBuilding = true; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "v(\d{4}\.\d{2}\.\d{2})$" + ]; + }; + z3 = fstarZ3; + }; + + meta = with lib; { + description = "ML-like functional programming language aimed at program verification"; + homepage = "https://www.fstar-lang.org"; + changelog = "https://github.com/FStarLang/FStar/raw/v${version}/CHANGES.md"; + license = licenses.asl20; + maintainers = with maintainers; [ + numinit + ]; + mainProgram = "fstar.exe"; + platforms = with platforms; darwin ++ linux; + }; +} diff --git a/pkgs/by-name/fs/fstar/z3/4-8-5-typos.diff b/pkgs/by-name/fs/fstar/z3/4-8-5-typos.diff new file mode 100644 index 000000000000..64a4887e0ef4 --- /dev/null +++ b/pkgs/by-name/fs/fstar/z3/4-8-5-typos.diff @@ -0,0 +1,26 @@ +diff --git a/src/util/lp/lp_core_solver_base.h b/src/util/lp/lp_core_solver_base.h +index 4c17df2..4c3c311 100644 +--- a/src/util/lp/lp_core_solver_base.h ++++ b/src/util/lp/lp_core_solver_base.h +@@ -600,8 +600,6 @@ public: + out << " \n"; + } + +- bool column_is_free(unsigned j) const { return this->m_column_type[j] == free; } +- + bool column_has_upper_bound(unsigned j) const { + switch(m_column_types[j]) { + case column_type::free_column: +diff --git a/src/util/lp/static_matrix_def.h b/src/util/lp/static_matrix_def.h +index 7949573..2f1cb42 100644 +--- a/src/util/lp/static_matrix_def.h ++++ b/src/util/lp/static_matrix_def.h +@@ -86,7 +86,7 @@ static_matrix::static_matrix(static_matrix const &A, unsigned * /* basis * + init_row_columns(m, m); + while (m--) { + for (auto & col : A.m_columns[m]){ +- set(col.var(), m, A.get_value_of_column_cell(col)); ++ set(col.var(), m, A.get_column_cell(col)); + } + } + } diff --git a/pkgs/by-name/fs/fstar/z3/default.nix b/pkgs/by-name/fs/fstar/z3/default.nix new file mode 100644 index 000000000000..b0429deb8d0c --- /dev/null +++ b/pkgs/by-name/fs/fstar/z3/default.nix @@ -0,0 +1,106 @@ +{ + fetchFromGitHub, + fetchpatch, + lib, + replaceVars, + stdenvNoCC, + z3, +}: + +let + # fstar has a pretty hard dependency on certain z3 patch versions. + # https://github.com/FStarLang/FStar/issues/3689#issuecomment-2625073641 + # We need to package all the Z3 versions it prefers here. + fstarNewZ3Version = "4.13.3"; + fstarNewZ3 = + if z3.version == fstarNewZ3Version then + z3 + else + z3.overrideAttrs (final: rec { + version = fstarNewZ3Version; + src = fetchFromGitHub { + owner = "Z3Prover"; + repo = "z3"; + rev = "z3-${version}"; + hash = "sha256-odwalnF00SI+sJGHdIIv4KapFcfVVKiQ22HFhXYtSvA="; + }; + }); + + fstarOldZ3Version = "4.8.5"; + fstarOldZ3 = + if z3.version == fstarOldZ3Version then + z3 + else + z3.overrideAttrs (prev: rec { + version = fstarOldZ3Version; + src = fetchFromGitHub { + owner = "Z3Prover"; + repo = "z3"; + rev = "Z3-${version}"; # caps matter + hash = "sha256-ytG5O9HczbIVJAiIGZfUXC/MuYH7d7yLApaeTRlKXoc="; + }; + patches = + let + static-matrix-patch = fetchpatch { + # clang / gcc fixes. fixes typos in some member names + name = "gcc-15-fixes.patch"; + url = "https://github.com/Z3Prover/z3/commit/2ce89e5f491fa817d02d8fdce8c62798beab258b.patch"; + includes = [ "src/@dir@/lp/static_matrix.h" ]; + stripLen = 3; + extraPrefix = "src/@dir@/"; + hash = "sha256-+H1/VJPyI0yq4M/61ay8SRCa6OaoJ/5i+I3zVTAPUVo="; + }; + + # replace @dir@ in the path of the given list of patches + fixupPatches = dir: map (patch: replaceVars patch { dir = dir; }); + in + prev.patches or [ ] + ++ fixupPatches "util" [ + ./lower-bound-typo.diff + static-matrix-patch + ./tail-matrix.diff + ] + ++ [ + ./4-8-5-typos.diff + ]; + + postPatch = + let + python = lib.findFirst (pkg: lib.hasPrefix "python" pkg.pname) null prev.nativeBuildInputs; + in + + assert python != null; + + prev.postPatch or "" + + + lib.optionalString + ((lib.versionAtLeast python.version "3.12") && (lib.versionOlder version "4.8.14")) + '' + # See https://github.com/Z3Prover/z3/pull/5729. This is a specialization of this patch for 4.8.5. + for file in scripts/mk_util.py src/api/python/CMakeLists.txt; do + substituteInPlace "$file" \ + --replace-fail "distutils.sysconfig.get_python_lib()" "sysconfig.get_path('purelib')" \ + --replace-fail "distutils.sysconfig" "sysconfig" + done + ''; + + }); +in +stdenvNoCC.mkDerivation { + name = "fstar-z3"; + dontUnpack = true; + + installPhase = '' + mkdir -p $out/bin + ln -s ${lib.getExe fstarNewZ3} $out/bin/z3-${lib.escapeShellArg fstarNewZ3.version} + ln -s ${lib.getExe fstarOldZ3} $out/bin/z3-${lib.escapeShellArg fstarOldZ3.version} + ''; + + passthru = rec { + new = fstarNewZ3; + "z3_${lib.replaceStrings [ "." ] [ "_" ] fstarNewZ3.version}" = new; + + old = fstarOldZ3; + "z3_${lib.replaceStrings [ "." ] [ "_" ] fstarOldZ3.version}" = old; + }; +} diff --git a/pkgs/by-name/fs/fstar/z3/lower-bound-typo.diff b/pkgs/by-name/fs/fstar/z3/lower-bound-typo.diff new file mode 100644 index 000000000000..254c35be5369 --- /dev/null +++ b/pkgs/by-name/fs/fstar/z3/lower-bound-typo.diff @@ -0,0 +1,13 @@ +diff --git a/src/@dir@/lp/column_info.h b/src/@dir@/lp/column_info.h +index 1dc0c60..9cbeea6 100644 +--- a/src/@dir@/lp/column_info.h ++++ b/src/@dir@/lp/column_info.h +@@ -47,7 +47,7 @@ public: + m_lower_bound_is_strict == c.m_lower_bound_is_strict && + m_upper_bound_is_set == c.m_upper_bound_is_set&& + m_upper_bound_is_strict == c.m_upper_bound_is_strict&& +- (!m_lower_bound_is_set || m_lower_bound == c.m_low_bound) && ++ (!m_lower_bound_is_set || m_lower_bound == c.m_lower_bound) && + (!m_upper_bound_is_set || m_upper_bound == c.m_upper_bound) && + m_cost == c.m_cost && + m_is_fixed == c.m_is_fixed && diff --git a/pkgs/by-name/fs/fstar/z3/tail-matrix.diff b/pkgs/by-name/fs/fstar/z3/tail-matrix.diff new file mode 100644 index 000000000000..4f680e7617d2 --- /dev/null +++ b/pkgs/by-name/fs/fstar/z3/tail-matrix.diff @@ -0,0 +1,12 @@ +diff --git a/src/@dir@/lp/tail_matrix.h b/src/@dir@/lp/tail_matrix.h +index 2047e8c..c84340e 100644 +--- a/src/@dir@/lp/tail_matrix.h ++++ b/src/@dir@/lp/tail_matrix.h +@@ -43,7 +43,6 @@ public: + const tail_matrix & m_A; + unsigned m_row; + ref_row(const tail_matrix& m, unsigned row): m_A(m), m_row(row) {} +- T operator[](unsigned j) const { return m_A.get_elem(m_row, j);} + }; + ref_row operator[](unsigned i) const { return ref_row(*this, i);} + }; diff --git a/pkgs/by-name/fu/fum/package.nix b/pkgs/by-name/fu/fum/package.nix index 5e44c8745a31..cc95bfdf5ff2 100644 --- a/pkgs/by-name/fu/fum/package.nix +++ b/pkgs/by-name/fu/fum/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/qxb3/fum"; changelog = "https://github.com/qxb3/fum/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ linuxmobile ]; + maintainers = with lib.maintainers; [ FKouhai ]; platforms = lib.platforms.linux; mainProgram = "fum"; }; diff --git a/pkgs/by-name/fu/functiontrace-server/package.nix b/pkgs/by-name/fu/functiontrace-server/package.nix index b406745ceb3c..06a5af1d65e7 100644 --- a/pkgs/by-name/fu/functiontrace-server/package.nix +++ b/pkgs/by-name/fu/functiontrace-server/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,10 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-sPleuZV7eXlQjKqeHCIlRwu1FzneBh460yAElnxi6Do="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; - meta = with lib; { description = "Server for FunctionTrace, a graphical Python profiler"; homepage = "https://functiontrace.com"; diff --git a/pkgs/by-name/fu/funzzy/package.nix b/pkgs/by-name/fu/funzzy/package.nix index 64b5ae43073b..f3f659bcc5bd 100644 --- a/pkgs/by-name/fu/funzzy/package.nix +++ b/pkgs/by-name/fu/funzzy/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-n9UHyr7W4hrN0+2dsYAYqkP/uzBv74p5XHU0g2MReJY="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - meta = with lib; { description = "Lightweight watcher"; homepage = "https://github.com/cristianoliveira/funzzy"; diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix index 286a7e51dc4f..3f93b15dad98 100644 --- a/pkgs/by-name/fu/furnace/package.nix +++ b/pkgs/by-name/fu/furnace/package.nix @@ -18,7 +18,6 @@ withJACK ? stdenv.hostPlatform.isUnix, libjack2, withGUI ? true, - darwin, portaudio, alsa-lib, # Enable GL/GLES rendering @@ -73,13 +72,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ # portaudio pkg-config is pulling this in as a link dependency, not set in propagatedBuildInputs alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - ] - ); + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_GUI" withGUI) diff --git a/pkgs/by-name/fw/fw/package.nix b/pkgs/by-name/fw/fw/package.nix index 5bc5eb315ebd..1c362653909f 100644 --- a/pkgs/by-name/fw/fw/package.nix +++ b/pkgs/by-name/fw/fw/package.nix @@ -6,8 +6,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,15 +26,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/fy/fyne/package.nix b/pkgs/by-name/fy/fyne/package.nix index 1fdf6bb79b62..43fd2d976b75 100644 --- a/pkgs/by-name/fy/fyne/package.nix +++ b/pkgs/by-name/fy/fyne/package.nix @@ -11,44 +11,32 @@ libXrandr, libXxf86vm, pkg-config, - stdenv, - darwin, }: buildGoModule rec { pname = "fyne"; - version = "2.5.5"; + version = "2.6.0"; src = fetchFromGitHub { owner = "fyne-io"; repo = "fyne"; tag = "v${version}"; - hash = "sha256-cttw4Al7zn7hlKu8n7by+m2p9Xm7ZoCtMb9VuAFdP6k="; + hash = "sha256-e3UHOAtafOn1Nxfnjut04uKK3S/gv/08qAiGEW8r5Tc="; }; - vendorHash = "sha256-X6K7IV+yjKXw/1A5HikS0T8rtrn7gLZM2d0VoyIdOT4="; + vendorHash = "sha256-3lXDkiQoq+rDUN8Am9Bd/DJ5CKQqfQucbHKQrkS4wIg="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libGL - libX11 - libXcursor - libXinerama - libXi - libXrandr - libXxf86vm - ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - Carbon - Cocoa - Kernel - UserNotifications - ] - )); + buildInputs = [ + libGL + libX11 + libXcursor + libXinerama + libXi + libXrandr + libXxf86vm + ]; doCheck = false; diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index 5ca024df633f..da1181ce8be1 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.61.1"; + version = "0.61.2"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf"; rev = "v${version}"; - hash = "sha256-PKfVG2eYsg3J1OixDzXsmxCtsuFhdEGyxuYtwPEdVi8="; + hash = "sha256-k5yxsD7hTvinVYDOJb6rmI7ppkVW09dOivD8028Onxk="; }; vendorHash = "sha256-WcrJfvY3GZLDuRr2PZR1ooNPJ6FQ4S3RvUc2+zePw5w="; diff --git a/pkgs/by-name/g-/g-ls/package.nix b/pkgs/by-name/g-/g-ls/package.nix new file mode 100644 index 000000000000..bea5ed3e1b43 --- /dev/null +++ b/pkgs/by-name/g-/g-ls/package.nix @@ -0,0 +1,48 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + installShellFiles, +}: + +buildGoModule rec { + pname = "g-ls"; + version = "0.30.0"; + + src = fetchFromGitHub { + owner = "Equationzhao"; + repo = "g"; + tag = "v${version}"; + hash = "sha256-OaYWorybwUxG452b0vEKwryxmRaNTQ5xDWe9GmEWuGE="; + }; + + vendorHash = "sha256-E/4iB1apLCOEtijCZymObz0Zjlf0+dQC37ALSbl1tr0="; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion \ + --bash completions/bash/g-completion.bash \ + --zsh completions/zsh/_g \ + --fish completions/fish/g.fish + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Powerful ls alternative written in Go"; + homepage = "https://github.com/Equationzhao/g"; + changelog = "https://github.com/Equationzhao/g/releases/tag/${src.tag}"; + license = lib.licenses.mit; + mainProgram = "g"; + maintainers = with lib.maintainers; [ Ruixi-rebirth ]; + }; +} diff --git a/pkgs/by-name/g3/g3proxy/package.nix b/pkgs/by-name/g3/g3proxy/package.nix index f32e62aae86a..b9dcdad4c4e5 100644 --- a/pkgs/by-name/g3/g3proxy/package.nix +++ b/pkgs/by-name/g3/g3proxy/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, pkg-config, - stdenv, - darwin, c-ares, python3, lua5_4, @@ -43,14 +41,10 @@ rustPlatform.buildRustPackage rec { cmake ]; - buildInputs = - [ - c-ares - lua5_4 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + c-ares + lua5_4 + ]; meta = { description = "Enterprise-oriented Generic Proxy Solutions"; diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix index cded6b78595c..af8206fd4f33 100644 --- a/pkgs/by-name/ga/gallery-dl/package.nix +++ b/pkgs/by-name/ga/gallery-dl/package.nix @@ -8,7 +8,7 @@ let pname = "gallery-dl"; - version = "1.29.3"; + version = "1.29.4"; in python3Packages.buildPythonApplication { inherit pname version; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication { owner = "mikf"; repo = "gallery-dl"; tag = "v${version}"; - hash = "sha256-LzMiJxMl6IWtUloWxBAMLvkhnTQpHkz/gjWl5gW2sZ0="; + hash = "sha256-dQK1AWmdlfb1cRcYzXWUsXmRgjQRc++zEHZvLUygMwg="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/ga/gambit-project/package.nix b/pkgs/by-name/ga/gambit-project/package.nix index 7dedb213faa4..cb3d63379136 100644 --- a/pkgs/by-name/ga/gambit-project/package.nix +++ b/pkgs/by-name/ga/gambit-project/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, stdenv, wxGTK31, - darwin, withGui ? true, }: @@ -21,9 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook ] ++ lib.optional withGui wxGTK31; - buildInputs = - lib.optional withGui wxGTK31 - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa; + buildInputs = lib.optional withGui wxGTK31; strictDeps = true; diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 54b9f6261972..23b59aeb52b8 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -48,14 +48,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.16.3"; + version = "3.16.4"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-4Pbyv+EAgwjabVJ4oW3jSmi0Rzpe+BxCN8mM5/beEco="; + hash = "sha256-2AxqvZA1eZaJFKMfRljCIcP0M2nMngw0FQiXsfBW7IA="; }; patches = [ diff --git a/pkgs/by-name/ga/gapless/package.nix b/pkgs/by-name/ga/gapless/package.nix index eba06f9754cf..9541ab1c910b 100644 --- a/pkgs/by-name/ga/gapless/package.nix +++ b/pkgs/by-name/ga/gapless/package.nix @@ -16,14 +16,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gapless"; - version = "4.3.1"; + version = "4.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-zLjpYGZR/o76onSjwfpHEx26vd8rUa/1PXL+DuC8C2o="; + hash = "sha256-10AFaUmqVkL4q8xgewfosN2/SziNhat9p6x/+9mBdyU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ga/garnet/deps.json b/pkgs/by-name/ga/garnet/deps.json index e20e2b18532d..420770cc04a9 100644 --- a/pkgs/by-name/ga/garnet/deps.json +++ b/pkgs/by-name/ga/garnet/deps.json @@ -4,6 +4,11 @@ "version": "1.44.1", "hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk=" }, + { + "pname": "Azure.Identity", + "version": "1.13.0", + "hash": "sha256-BXru3jP4oQchrBF/c3WDekZeRJlUxenBwVZ5YsifseI=" + }, { "pname": "Azure.Storage.Blobs", "version": "12.24.0", @@ -21,8 +26,8 @@ }, { "pname": "KeraLua", - "version": "1.4.1", - "hash": "sha256-ouRL7+0bW/VYUNNYQoXenXzYO0HNF3D1IsScqtah3DE=" + "version": "1.4.4", + "hash": "sha256-MF7DBdc8xNiEcauNer7YFRgjbUU4ANmc2uQKrzVDRDs=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", @@ -104,6 +109,21 @@ "version": "9.0.3", "hash": "sha256-iBwolNt6Lb2OqjDWBVnUj8vZDSID9EQw/JPI1xcuFus=" }, + { + "pname": "Microsoft.Identity.Client", + "version": "4.65.0", + "hash": "sha256-gkBVLb8acLYexNM4ZzMJ0qfDp2UqjUt0yiu3MfMcWig=" + }, + { + "pname": "Microsoft.Identity.Client.Extensions.Msal", + "version": "4.65.0", + "hash": "sha256-Xmy/evicLvmbC+6ytxwVE646uVcJB5yMpEK73H5tzD0=" + }, + { + "pname": "Microsoft.IdentityModel.Abstractions", + "version": "6.35.0", + "hash": "sha256-bxyYu6/QgaA4TQYBr5d+bzICL+ktlkdy/tb/1fBu00Q=" + }, { "pname": "Microsoft.IdentityModel.Abstractions", "version": "8.6.1", @@ -179,6 +199,11 @@ "version": "6.0.1", "hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI=" }, + { + "pname": "System.Memory", + "version": "4.5.5", + "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + }, { "pname": "System.Memory.Data", "version": "1.0.2", @@ -199,6 +224,11 @@ "version": "6.0.0", "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "4.5.0", + "hash": "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc=" + }, { "pname": "System.Text.Encodings.Web", "version": "6.0.0", diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index dd613b092872..da96b1357102 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "garnet"; - version = "1.0.61"; + version = "1.0.63"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; tag = "v${version}"; - hash = "sha256-Xvc/ECu/aIduHABZ08J3+iDgvOBs3vLCpzHJwfuLSp0="; + hash = "sha256-pOAeWQcZTkvnJGAP8H4dOABcHSEfGI4xTC/eS/3QoTM="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix index 1360e24b10cd..b383e8e9f582 100644 --- a/pkgs/by-name/ga/gat/package.nix +++ b/pkgs/by-name/ga/gat/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gat"; - version = "0.21.2"; + version = "0.22.0"; src = fetchFromGitHub { owner = "koki-develop"; repo = "gat"; tag = "v${version}"; - hash = "sha256-l5VkcUm1Cy1R0gTOS9Yt4HPILYrnUpjZCM4x78QS2WU="; + hash = "sha256-DJv7vll4I6jHpW7O7rc+Sn+Cr63Z1P4rZsIj5FPBEGw="; }; - vendorHash = "sha256-gePgJZdPuV6VTgyLKTjRohxoIdvBr7/J98FCp9dzjV0="; + vendorHash = "sha256-TUMfQBQaoJu731qYQuQ41K9JJvGocbbNpkX2LpkhHNc="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/ga/gaw/package.nix b/pkgs/by-name/ga/gaw/package.nix index d65c354f633f..91a0c4d43b4b 100644 --- a/pkgs/by-name/ga/gaw/package.nix +++ b/pkgs/by-name/ga/gaw/package.nix @@ -1,19 +1,78 @@ { stdenv, - fetchurl, + runCommandLocal, lib, + htmlq, + curl, + cacert, gtk3, pkg-config, }: stdenv.mkDerivation rec { - pname = "gaw"; - version = "20220315"; + pname = "gaw3"; + version = "20250128"; - src = fetchurl { - url = "https://download.tuxfamily.org/gaw/download/gaw3-${version}.tar.gz"; - sha256 = "0j2bqi9444s1mfbr7x9rqp232xf7ab9z7ifsnl305jsklp6qmrbg"; - }; + # https://www.rvq.fr/php/ndl.php?id=gaw.* + # https://www.rvq.fr/php/ndl.php?id=gaw3-20250128.tar.gz + src = + runCommandLocal "gaw3-${version}.tar.gz" + { + BASE = "https://www.rvq.fr/php/ndl.php"; + FNAME = "gaw3-${version}.tar.gz"; + + nativeBuildInputs = [ + htmlq + curl + ]; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "sha256-3uO+209+cmu231iabyYmABmgegyxAxswWDWA/v8WSy0="; + } + '' + # fetch download page + html_form=$( + curl "$BASE?id=$FNAME" | + tr '\n' ' ' | tr -s ' ' | # minimize whitespace + htmlq tr | # select table rows, one per line + grep "$FNAME" | # filter for row of interest + head -n1 | # first match, just in case + htmlq form --base "$BASE" + ) + + declare -a curl_args=() + + # hidden fields + declare -a input_names=() + readarray -td $'\n' input_names < <( + htmlq <<<"$html_form" "input[type=hidden]" -a name + ) + for input_name in "''${input_names[@]}"; do + input_value=$( + htmlq <<<"$html_form" "input[type=hidden][name=''${input_name}]" -a value + ) + echo "$input_name = $input_value" + curl_args+=( --form "$input_name=$input_value" ) + done + + # destination + curl_args+=( + "https://www.rvq.fr/$( htmlq <<<"$html_form" form -a action )" + ) + + # POST and download + (set -x + curl -X POST "''${curl_args[@]}" $NIX_CURL_FLAGS --output "$FNAME" + ) + + # unpack and strip root dir + mkdir unpack/ + tar xvf "$FNAME" --directory=unpack/ + [[ "$(printf "%s\n" unpack/* | wc -l)" -eq 1 ]] + cp -a unpack/* $out + ''; nativeBuildInputs = [ pkg-config ]; @@ -28,7 +87,7 @@ stdenv.mkDerivation rec { input from sound cards. Data can be imported to gaw using files, direct tcp/ip connection or directly from the sound card. ''; - homepage = "http://gaw.tuxfamily.org"; + homepage = "https://www.rvq.fr/linux/gaw.php"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fbeffa ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/by-name/gd/gdal/package.nix similarity index 91% rename from pkgs/development/libraries/gdal/default.nix rename to pkgs/by-name/gd/gdal/package.nix index f908456749ad..c140cd76be7a 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/by-name/gd/gdal/package.nix @@ -3,7 +3,6 @@ stdenv, callPackage, fetchFromGitHub, - fetchpatch, useMinimalFeatures ? false, useArmadillo ? (!useMinimalFeatures), @@ -84,29 +83,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.10.2"; + version = "3.10.3"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; - rev = "v${finalAttrs.version}"; - hash = "sha256-PanWqieJU1opR8iAwGsAeAt5cPXNOkwT5E6D6xPNCWs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-dILIEg5BXRbRcHEh6U1FfPgR/U3J0q4ypRMM6yakuwc="; }; - patches = [ - # Fix tests for GEOS 3.13.1 - (fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/e873236abfb7885d0b987934041c6b61f6aea5d0.patch"; - hash = "sha256-iThP8Dfu6k6uhb+jB5Vs5P10UVeY6rLotdDAgX1v6vE="; - }) - - # Fix tests for PROJ 9.6.0 - (fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/49ef64108b6875e5b90a4fb6cadd089e84fe53c1.patch"; - hash = "sha256-+HQvE5zxwCU03qRRjtzN9t7QgFfgRu4YZNZ9VRfKYEw="; - }) - ]; - nativeBuildInputs = [ bison @@ -323,7 +308,7 @@ stdenv.mkDerivation (finalAttrs: { __darwinAllowLocalNetworking = true; meta = with lib; { - changelog = "https://github.com/OSGeo/gdal/blob/v${finalAttrs.version}/NEWS.md"; + changelog = "https://github.com/OSGeo/gdal/blob/${finalAttrs.src.tag}/NEWS.md"; description = "Translator library for raster geospatial data formats"; homepage = "https://www.gdal.org/"; license = licenses.mit; diff --git a/pkgs/development/libraries/gdal/tests.nix b/pkgs/by-name/gd/gdal/tests.nix similarity index 100% rename from pkgs/development/libraries/gdal/tests.nix rename to pkgs/by-name/gd/gdal/tests.nix diff --git a/pkgs/by-name/gd/gdbm/package.nix b/pkgs/by-name/gd/gdbm/package.nix index 9a46d37d698d..8edf67ea8926 100644 --- a/pkgs/by-name/gd/gdbm/package.nix +++ b/pkgs/by-name/gd/gdbm/package.nix @@ -8,13 +8,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdbm"; - version = "1.24"; + version = "1.25"; src = fetchurl { url = "mirror://gnu/gdbm/gdbm-${finalAttrs.version}.tar.gz"; - hash = "sha256-aV6YJ/33Y1E/EzkQvH5s/bkYeUOk/slD5XRJcj0rjb8="; + hash = "sha256-0C2zxZJu2Hf4gXuBzR+S9T73TKjG21Q/u6AnGzTzk+w="; }; + patches = [ + # Remove on next release. + ./upstream-darwin-clock-nanosleep-fix.patch + ./upstream-lockwait-test-fixes.patch + ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; configureFlags = [ (lib.enableFeature true "libgdbm-compat") ]; diff --git a/pkgs/by-name/gd/gdbm/upstream-darwin-clock-nanosleep-fix.patch b/pkgs/by-name/gd/gdbm/upstream-darwin-clock-nanosleep-fix.patch new file mode 100644 index 000000000000..cbc1045305b7 --- /dev/null +++ b/pkgs/by-name/gd/gdbm/upstream-darwin-clock-nanosleep-fix.patch @@ -0,0 +1,26 @@ +From ed0a865345681982ea02c6159c0f3d7702c928a1 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Thu, 27 Mar 2025 20:29:10 +0200 +Subject: Use nanosleep instead of clock_nanosleep + +The latter is not available on macOS +--- + src/lock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lock.c b/src/lock.c +index a43d9c3..cf28478 100644 +--- a/src/lock.c ++++ b/src/lock.c +@@ -291,7 +291,7 @@ _gdbm_lockwait_retry (GDBM_FILE dbf, struct timespec const *ts, + if (timespec_cmp (&ttw, iv) < 0) + break; + timespec_sub (&ttw, iv); +- if (clock_nanosleep (CLOCK_REALTIME, 0, iv, &r)) ++ if (nanosleep (iv, &r)) + { + if (errno == EINTR) + timespec_add (&ttw, &r); +-- +cgit v1.2.3 + diff --git a/pkgs/by-name/gd/gdbm/upstream-lockwait-test-fixes.patch b/pkgs/by-name/gd/gdbm/upstream-lockwait-test-fixes.patch new file mode 100644 index 000000000000..1bf42fde28fb --- /dev/null +++ b/pkgs/by-name/gd/gdbm/upstream-lockwait-test-fixes.patch @@ -0,0 +1,192 @@ +From 5be83b4c5da7c6a68817908b19f8925af09e9b2c Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Thu, 10 Apr 2025 17:31:56 +0300 +Subject: Fix timeout calculation in lockwait signal test. + +* tests/t_lockwait.c (runtest_signal): mark start time right +after setting alarm, not before it. +--- + tests/t_lockwait.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/tests/t_lockwait.c b/tests/t_lockwait.c +index a5e74c8..3547af7 100644 +--- a/tests/t_lockwait.c ++++ b/tests/t_lockwait.c +@@ -323,9 +323,6 @@ runtest_signal (struct timespec *ts) + struct sigaction act; + struct timeval now; + +- gettimeofday (&now, NULL); +- start = tv_to_ms (&now); +- + if (pipe (sig_fd)) + { + perror ("pipe"); +@@ -341,6 +338,8 @@ runtest_signal (struct timespec *ts) + return -1; + } + alarm (ts_to_ms (&ts[1]) / MILLI); ++ gettimeofday (&now, NULL); ++ start = tv_to_ms (&now); + } + + op.lock_wait = GDBM_LOCKWAIT_SIGNAL; +-- +cgit v1.2.3 + +From 6f165a8e1745dbd9b88f6fb6882dff7997cfdf74 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Thu, 10 Apr 2025 21:07:41 +0300 +Subject: More fixes to lockwait test + +* tests/t_lockwait.c (sighan): Close fd. +(runtest_signal): compensate for alarm(2) second precision +--- + tests/t_lockwait.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/t_lockwait.c b/tests/t_lockwait.c +index 3547af7..b378819 100644 +--- a/tests/t_lockwait.c ++++ b/tests/t_lockwait.c +@@ -170,6 +170,7 @@ static void + sighan (int sig) + { + write (sig_fd[1], &sig, sizeof (sig)); ++ close (sig_fd[1]); + } + + static int runtest_retry (struct timespec *ts); +@@ -364,7 +365,8 @@ runtest_signal (struct timespec *ts) + + pfd.fd = sig_fd[0]; + pfd.events = POLLIN; +- switch (poll (&pfd, 1, ts_to_ms (&ts[1]) - tv_to_ms (&now) + start)) { ++ switch (poll (&pfd, 1, ++ ts_to_ms (&ts[1]) - tv_to_ms (&now) + start + MILLI)) { + case 1: + break; + +-- +cgit v1.2.3 + +From aa9baca52ad155ae501ba586ff7b08f4b08e5434 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Fri, 11 Apr 2025 07:53:58 +0300 +Subject: Adjust timeouts for setitimer interface in lockwait test. + +* tests/t_lockwait.c: Setitimer (at least on some systems) restarts +the timer set by alarm(2). To calculate the ETA of SIGALRM, call +alarm after gdbm_open_ext returns. +--- + tests/t_lockwait.c | 66 ++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 39 insertions(+), 27 deletions(-) + +diff --git a/tests/t_lockwait.c b/tests/t_lockwait.c +index b378819..dfae838 100644 +--- a/tests/t_lockwait.c ++++ b/tests/t_lockwait.c +@@ -322,7 +322,6 @@ runtest_signal (struct timespec *ts) + if (!(ts[1].tv_sec == 0 && ts[1].tv_nsec == 0)) + { + struct sigaction act; +- struct timeval now; + + if (pipe (sig_fd)) + { +@@ -338,9 +337,6 @@ runtest_signal (struct timespec *ts) + fprintf (stderr, "%s: sigaction: %s", progname, strerror (errno)); + return -1; + } +- alarm (ts_to_ms (&ts[1]) / MILLI); +- gettimeofday (&now, NULL); +- start = tv_to_ms (&now); + } + + op.lock_wait = GDBM_LOCKWAIT_SIGNAL; +@@ -354,42 +350,58 @@ runtest_signal (struct timespec *ts) + } + gdbm_close (dbf); + +- if (start > 0) ++ if (!(ts[1].tv_sec == 0 && ts[1].tv_nsec == 0)) + { + struct pollfd pfd; + struct timeval now; +- int sig; ++ int n, t, sig; + +- restart: ++ alarm (ts_to_ms (&ts[1]) / MILLI); + gettimeofday (&now, NULL); ++ start = tv_to_ms (&now); + + pfd.fd = sig_fd[0]; + pfd.events = POLLIN; +- switch (poll (&pfd, 1, +- ts_to_ms (&ts[1]) - tv_to_ms (&now) + start + MILLI)) { +- case 1: +- break; + +- case 0: +- fprintf (stderr, "%s: failed waiting for alarm\n", progname); +- return 1; +- +- default: +- if (errno == EINTR) goto restart; +- fprintf (stderr, "%s: poll: %s\n", progname, strerror (errno)); +- return 1; +- } +- +- if (read (sig_fd[0], &sig, sizeof (sig)) != sizeof (sig)) ++ do + { +- fprintf (stderr, "%s: read: %s\n", progname, strerror (errno)); +- return 1; ++ gettimeofday (&now, NULL); ++ t = ts_to_ms (&ts[1]) - tv_to_ms (&now) + start + MILLI; ++ if (t < 0) ++ { ++ n = 0; ++ break; ++ } + } +- close (sig_fd[0]); +- if (sig != SIGALRM) ++ while ((n = poll (&pfd, 1, t)) == -1 && errno == EINTR); ++ ++ switch (n) + { +- fprintf (stderr, "%s: unexpected data read\n", progname); ++ case 1: ++ if (read (sig_fd[0], &sig, sizeof (sig)) != sizeof (sig)) ++ { ++ fprintf (stderr, "%s: read: %s\n", progname, strerror (errno)); ++ return 1; ++ } ++ close (sig_fd[0]); ++ if (sig != SIGALRM) ++ { ++ fprintf (stderr, "%s: unexpected data read\n", progname); ++ return 1; ++ } ++ break; ++ ++ case 0: ++ fprintf (stderr, "%s: failed waiting for alarm\n", progname); + return 1; ++ ++ default: ++ if (errno != EINTR) ++ { ++ fprintf (stderr, "%s: poll: %s\n", ++ progname, strerror (errno)); ++ return 1; ++ } + } + } + +-- +cgit v1.2.3 + diff --git a/pkgs/by-name/gd/gdlv/package.nix b/pkgs/by-name/gd/gdlv/package.nix index 87858f7a6752..2aeace32b8fe 100644 --- a/pkgs/by-name/gd/gdlv/package.nix +++ b/pkgs/by-name/gd/gdlv/package.nix @@ -1,12 +1,7 @@ { lib, - stdenv, buildGoModule, fetchFromGitHub, - AppKit, - CoreGraphics, - Foundation, - Metal, }: buildGoModule rec { pname = "gdlv"; @@ -22,13 +17,6 @@ buildGoModule rec { vendorHash = null; subPackages = "."; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreGraphics - Foundation - Metal - ]; - meta = with lib; { description = "GUI frontend for Delve"; mainProgram = "gdlv"; diff --git a/pkgs/by-name/gd/gdrive3/package.nix b/pkgs/by-name/gd/gdrive3/package.nix index 07dd3f449d13..dee540bec883 100644 --- a/pkgs/by-name/gd/gdrive3/package.nix +++ b/pkgs/by-name/gd/gdrive3/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-ZIswHJBV1uwrnSm5BmQgb8tVD1XQMTQXQ5DWvBj1WDk="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Google Drive CLI Client"; homepage = "https://github.com/glotlabs/gdrive"; diff --git a/pkgs/by-name/ge/gearlever/package.nix b/pkgs/by-name/ge/gearlever/package.nix index 427c2cc28e13..895797545a58 100644 --- a/pkgs/by-name/ge/gearlever/package.nix +++ b/pkgs/by-name/ge/gearlever/package.nix @@ -11,24 +11,26 @@ desktop-file-utils, libadwaita, file, - p7zip, + _7zz, which, appimage-run, gtk4, bintools, libnotify, + dwarfs, + squashfsTools, }: python3Packages.buildPythonApplication rec { pname = "gearlever"; - version = "3.0.2"; + version = "3.2.2"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "mijorus"; repo = "gearlever"; tag = version; - hash = "sha256-b5CH7qJKsXwARCIv4EiwGcc3nH/GKGkb8gwxPWYAr4s="; + hash = "sha256-8gvulVq3RQZ/v7DCJ1Azrs23WMEznJCaalyjqD6iCU8="; }; postPatch = @@ -76,13 +78,15 @@ python3Packages.buildPythonApplication rec { "--prefix PATH : ${ lib.makeBinPath [ file - p7zip + _7zz # 7zz which appimage-run desktop-file-utils # update-desktop-database gtk4.dev # gtk4-launch bintools # readelf libnotify # notify-send + dwarfs # dwarfsextract, dwarfsck + squashfsTools # unsquashfs ] }" ]; diff --git a/pkgs/by-name/ge/gel/package.nix b/pkgs/by-name/ge/gel/package.nix index f82431586d1d..84d82806f0e2 100644 --- a/pkgs/by-name/ge/gel/package.nix +++ b/pkgs/by-name/ge/gel/package.nix @@ -16,19 +16,19 @@ }: rustPlatform.buildRustPackage rec { pname = "gel"; - version = "7.0.3"; + version = "7.2.0"; src = fetchFromGitHub { owner = "geldata"; repo = "gel-cli"; tag = "v${version}"; - hash = "sha256-QP4LtLgF2OWCsPCFzpLR8k/RetfEevSd8Uv/PciHCwk="; + hash = "sha256-HqMfReKt1Gl2c7ectgcW514ARCgfNi8PaykvKJUZirY="; fetchSubmodules = true; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-s8UKYZs4GorM0qvAvE+HL+Qma2x05IDtuqYebMDrZHk="; + hash = "sha256-rxlJQSh3CN4lBFOWFMZmdH91xgRnBbywXA/gakSKsck="; }; nativeBuildInputs = [ @@ -60,11 +60,6 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; }; - # cli warns when edgedb found but gel doesn't - postInstall = '' - mv $out/bin/edgedb $out/bin/gel - ''; - doCheck = false; passthru.tests.version = testers.testVersion { diff --git a/pkgs/by-name/ge/gen-license/package.nix b/pkgs/by-name/ge/gen-license/package.nix index d55dda6ebc21..2a2d292e17fc 100644 --- a/pkgs/by-name/ge/gen-license/package.nix +++ b/pkgs/by-name/ge/gen-license/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-xXzUobB8RMyJOC4lKayE+6SKC7NW1dNWGUUH3i1TaW0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Create licenses for your projects right from your terminal"; mainProgram = "gen-license"; diff --git a/pkgs/by-name/ge/geocode-glib/installed-tests-path.patch b/pkgs/by-name/ge/geocode-glib_2/installed-tests-path.patch similarity index 100% rename from pkgs/by-name/ge/geocode-glib/installed-tests-path.patch rename to pkgs/by-name/ge/geocode-glib_2/installed-tests-path.patch diff --git a/pkgs/by-name/ge/geocode-glib/package.nix b/pkgs/by-name/ge/geocode-glib_2/package.nix similarity index 70% rename from pkgs/by-name/ge/geocode-glib/package.nix rename to pkgs/by-name/ge/geocode-glib_2/package.nix index 9461c9fcb412..46cf04ba34d4 100644 --- a/pkgs/by-name/ge/geocode-glib/package.nix +++ b/pkgs/by-name/ge/geocode-glib_2/package.nix @@ -11,13 +11,13 @@ docbook-xsl-nons, gobject-introspection, gnome, - libsoup_2_4, + libsoup_3, json-glib, glib, nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geocode-glib"; version = "3.26.4"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/geocode-glib-${version}.tar.xz"; + url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor finalAttrs.version}/geocode-glib-${finalAttrs.version}.tar.xz"; sha256 = "LZpoJtFYRwRJoXOHEiFZbaD4Pr3P+YuQxwSQiQVqN6o="; }; @@ -53,28 +53,30 @@ stdenv.mkDerivation rec { buildInputs = [ glib - libsoup_2_4 + libsoup_3 json-glib ]; mesonFlags = [ - "-Dsoup2=${lib.boolToString (lib.versionOlder libsoup_2_4.version "2.99")}" + "-Dsoup2=false" "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "geocode-glib"; }; tests = { installed-tests = nixosTests.installed-tests.geocode-glib; }; }; - meta = with lib; { + meta = { + changelog = "https://gitlab.gnome.org/GNOME/geocode-glib/-/blob/${finalAttrs.version}/NEWS?ref_type=tags"; description = "Convenience library for the geocoding and reverse geocoding using Nominatim service"; - license = licenses.lgpl2Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; + homepage = "https://gitlab.gnome.org/GNOME/geocode-glib"; + license = lib.licenses.lgpl2Plus; + maintainers = lib.teams.gnome.members; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ge/geteduroam-cli/package.nix b/pkgs/by-name/ge/geteduroam-cli/package.nix index 60a000488a20..f9e6f4dfa4cc 100644 --- a/pkgs/by-name/ge/geteduroam-cli/package.nix +++ b/pkgs/by-name/ge/geteduroam-cli/package.nix @@ -5,14 +5,14 @@ versionCheckHook, nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "geteduroam-cli"; version = "0.8"; src = fetchFromGitHub { owner = "geteduroam"; repo = "linux-app"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2iAvE38r3iwulBqW+rrbrpNVgQlDhhcVUsjZSOT5P1A="; }; @@ -40,6 +40,6 @@ buildGoModule rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ viperML ]; platforms = lib.platforms.linux; - changelog = "https://github.com/geteduroam/linux-app/releases/tag/${version}"; + changelog = "https://github.com/geteduroam/linux-app/releases/tag/${finalAttrs.version}"; }; -} +}) diff --git a/pkgs/by-name/ge/gex/package.nix b/pkgs/by-name/ge/gex/package.nix index 53a20c7308a3..0ecba4acd1e0 100644 --- a/pkgs/by-name/ge/gex/package.nix +++ b/pkgs/by-name/ge/gex/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, libgit2, - darwin, nix-update-script, }: @@ -24,13 +22,9 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - buildInputs = - [ - libgit2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + ]; env = { LIBGIT2_NO_VENDOR = 1; diff --git a/pkgs/by-name/gf/gfal2/package.nix b/pkgs/by-name/gf/gfal2/package.nix index 273c0411f02d..63ea071efaee 100644 --- a/pkgs/by-name/gf/gfal2/package.nix +++ b/pkgs/by-name/gf/gfal2/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gfal2"; - version = "2.23.0"; + version = "2.23.2"; src = fetchFromGitHub { owner = "cern-fts"; repo = "gfal2"; rev = "v${finalAttrs.version}"; - hash = "sha256-LEvmjd3A+7JHfUOAnyRyXMsJd/8JO2rVpcIT7QGSJoo="; + hash = "sha256-gyEmz0sNHyxjvJA/3uSzLW42PQ3UVKx6nptNYl/3ExM="; }; passthru.enablePluginStatus = { diff --git a/pkgs/by-name/gf/gfbgraph/package.nix b/pkgs/by-name/gf/gfbgraph/package.nix deleted file mode 100644 index bc283264de3a..000000000000 --- a/pkgs/by-name/gf/gfbgraph/package.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - pkg-config, - glib, - librest, - gnome-online-accounts, - gnome, - libsoup_2_4, - json-glib, - gobject-introspection, - gtk-doc, - docbook-xsl-nons, -}: - -stdenv.mkDerivation rec { - pname = "gfbgraph"; - version = "0.2.5"; - - outputs = [ - "out" - "dev" - "devdoc" - ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "nLOBs/eLoRNt+Xrz8G47EdzCqzOawI907aD4BX1mA+M="; - }; - - nativeBuildInputs = [ - pkg-config - gobject-introspection - gtk-doc - docbook-xsl-nons - ]; - - buildInputs = [ - glib - gnome-online-accounts - ]; - - propagatedBuildInputs = [ - libsoup_2_4 - json-glib - librest - ]; - - configureFlags = [ - "--enable-introspection" - "--enable-gtk-doc" - ]; - - enableParallelBuilding = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/GNOME/libgfbgraph"; - description = "GLib/GObject wrapper for the Facebook Graph API"; - maintainers = teams.gnome.members; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/gf/gfxstream/package.nix b/pkgs/by-name/gf/gfxstream/package.nix index ccae47da4d48..48de695bb91f 100644 --- a/pkgs/by-name/gf/gfxstream/package.nix +++ b/pkgs/by-name/gf/gfxstream/package.nix @@ -8,7 +8,6 @@ pkg-config, python3, aemu, - darwin, libdrm, libglvnd, vulkan-headers, @@ -47,23 +46,13 @@ stdenv.mkDerivation { pkg-config python3 ]; - buildInputs = - [ - aemu - libglvnd - vulkan-headers - vulkan-loader - xorg.libX11 - ] - ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ libdrm ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.IOSurface - darwin.apple_sdk.frameworks.OpenGL - darwin.apple_sdk.frameworks.QuartzCore - ]; + buildInputs = [ + aemu + libglvnd + vulkan-headers + vulkan-loader + xorg.libX11 + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ libdrm ]; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = toString [ diff --git a/pkgs/by-name/gg/ggh/package.nix b/pkgs/by-name/gg/ggh/package.nix new file mode 100644 index 000000000000..ecd85026f9ff --- /dev/null +++ b/pkgs/by-name/gg/ggh/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "ggh"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "byawitz"; + repo = "ggh"; + tag = "v${finalAttrs.version}"; + hash = "sha256-itNx/AcLUQCH99ZCOXiXPWNg3mx+UhHepidqmzPY8Oc="; + }; + + vendorHash = "sha256-WPPjpxCD3WA3E7lx5+DPvG31p8djera5xRn980eaJT8="; + + ldflags = [ + "-s" + "-w" + "-X main.version=v${finalAttrs.version}" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Recall your SSH sessions (also search your SSH config file)"; + homepage = "https://github.com/byawitz/ggh"; + changelog = "https://github.com/byawitz/ggh/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.ilarvne ]; + platforms = lib.platforms.unix; + mainProgram = "ggh"; + }; +}) diff --git a/pkgs/by-name/gh/gh-classroom/package.nix b/pkgs/by-name/gh/gh-classroom/package.nix new file mode 100644 index 000000000000..910e31d7f12f --- /dev/null +++ b/pkgs/by-name/gh/gh-classroom/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + buildPackages, + fetchFromGitHub, + buildGoModule, + nix-update-script, + installShellFiles, +}: +buildGoModule (finalAttrs: { + pname = "gh-classroom"; + version = "0.1.14"; + + src = fetchFromGitHub { + owner = "github"; + repo = "gh-classroom"; + tag = "v${finalAttrs.version}"; + hash = "sha256-h9j8B/MGZ4JJOJRj41IIQ9trQJZ4oqvT6ee9lc0P4oo="; + }; + + vendorHash = "sha256-UFV3KiRnefrdOwRsHQeo8mx8Z+sI1Rk5yu3jdZxUHxo="; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${finalAttrs.version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + installShellCompletion --cmd gh-classroom \ + --bash <(${emulator} $out/bin/gh-classroom --bash-completion) \ + --fish <(${emulator} $out/bin/gh-classroom --fish-completion) \ + --zsh <(${emulator} $out/bin/gh-classroom --zsh-completion) + '' + ); + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/github/gh-classroom"; + description = "Extension for the GitHub CLI, that enhances it for educators using GitHub classroom"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ _0x5a4 ]; + mainProgram = "gh-classroom"; + }; +}) diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index 2cd13236cea1..3a5f20b47e83 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "gh-gei"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "github"; repo = "gh-gei"; rev = "v${version}"; - hash = "sha256-orDjHgyqwBo/LOuujCp/6p4G0SWDA/ZDWvtTfH1ofrU="; + hash = "sha256-KwFS3l25fBB8pH7O5/nmY5FShHCcGNW+g20K1G+/pak="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx; diff --git a/pkgs/by-name/gh/gh-skyline/package.nix b/pkgs/by-name/gh/gh-skyline/package.nix index 2e2024557344..b4d2ba692582 100644 --- a/pkgs/by-name/gh/gh-skyline/package.nix +++ b/pkgs/by-name/gh/gh-skyline/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gh-skyline"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "github"; repo = "gh-skyline"; tag = "v${version}"; - hash = "sha256-2i1f3iOrabTc+r5iUzghF3sJ7vgpTC1dmzY/z6h/oCg="; + hash = "sha256-jcdOLoyOXq270SaObMpCD+ts6Hj8wqSAjUZWEg3F9+w="; }; - vendorHash = "sha256-g4YqNts50RUBh1Gu9vSI29uvk0iHSnMgI1+KBFm5rNI="; + vendorHash = "sha256-rCFHYofUQlfRMP7bJav2se7oAkE7rS8KJl1n8kCsSag="; ldflags = [ "-s" diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index 4d27294ce455..1c1df63ecdfa 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gh"; - version = "2.69.0"; + version = "2.70.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; tag = "v${version}"; - hash = "sha256-T5H84RH5uBXXNCiyd27ZjDu4g5UBK4yUjZWQAFp3cH0="; + hash = "sha256-FMv/W7Q9IZw0Pxj37Y/npLXHiF9s2tKqbNc9pmKrhcQ="; }; - vendorHash = "sha256-BJK8XzCdbbyzj1rEJtnE6hKOy7Q9xSrkicBPzxz9gkw="; + vendorHash = "sha256-q0JkYiOiAUDrdEzcrclnzU9WrxGTJxNn9nkihPvAqXo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gh/ghciwatch/package.nix b/pkgs/by-name/gh/ghciwatch/package.nix index 0da0ca63a6d9..69694f1670ad 100644 --- a/pkgs/by-name/gh/ghciwatch/package.nix +++ b/pkgs/by-name/gh/ghciwatch/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, nix-update-script, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -21,11 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-kH5YTadpaUXDma+7SfBJxrOIsd9Gm0EU3MfhFmQ3U80="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - ]; - # integration tests are not run but the macros need this variable to be set GHC_VERSIONS = ""; checkFlags = "--test \"unit\""; diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index 07ff98dce31e..6473cb5be1f8 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.150.0"; + version = "2.153.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-6XoOv1ynZomcWS156DybhfDlrThi3tepqNTtw/1M/zU="; + hash = "sha256-0TRhG0fRO9Hm4OX2GLcL7r3PyvsZbZl+5f9qCpF7hwQ="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -27,7 +27,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-bLy+5hHyZDnSJ+IH3DPECScaRsXgPNr5ttuHfCpn5kU="; + npmDepsHash = "sha256-1I5IKenVF5xPaqz3m6RBdah6S0lBRZBIuMqnPnepYsU="; nativeBuildInputs = [ prisma diff --git a/pkgs/by-name/gh/ghostie/package.nix b/pkgs/by-name/gh/ghostie/package.nix index 1737072421f6..8c80579becf7 100644 --- a/pkgs/by-name/gh/ghostie/package.nix +++ b/pkgs/by-name/gh/ghostie/package.nix @@ -6,7 +6,6 @@ openssl, sqlite, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,14 +26,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; + buildInputs = [ + openssl + sqlite + ]; # 4 out of 5 tests are notification tests which do not work in nix builds doCheck = false; diff --git a/pkgs/by-name/gh/ghq/package.nix b/pkgs/by-name/gh/ghq/package.nix index e644d316f253..705cbfab18a5 100644 --- a/pkgs/by-name/gh/ghq/package.nix +++ b/pkgs/by-name/gh/ghq/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + installShellFiles, testers, nix-update-script, ghq, @@ -26,9 +27,13 @@ buildGoModule rec { "-X=main.Version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' - install -m 444 -D ${src}/misc/zsh/_ghq $out/share/zsh/site-functions/_ghq - install -m 444 -D ${src}/misc/bash/_ghq $out/share/bash-completion/completions/_ghq + installShellCompletion \ + --bash $src/misc/bash/_ghq \ + --fish $src/misc/fish/ghq.fish \ + --zsh $src/misc/zsh/_ghq ''; passthru = { diff --git a/pkgs/by-name/gi/gildas/package.nix b/pkgs/by-name/gi/gildas/package.nix index 6370487384b4..0c3755f6f425 100644 --- a/pkgs/by-name/gi/gildas/package.nix +++ b/pkgs/by-name/gi/gildas/package.nix @@ -12,7 +12,6 @@ perl, groff, which, - darwin, ncurses, }: @@ -49,34 +48,26 @@ stdenv.mkDerivation rec { which ]; - buildInputs = - [ - gtk2-x11 - lesstif - cfitsio - python3Env - ncurses - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; [ CoreFoundation ] - ); + buildInputs = [ + gtk2-x11 + lesstif + cfitsio + python3Env + ncurses + ]; patches = [ ./wrapper.patch ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ([ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./clang.patch ./cpp-darwin.patch - ]); + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; # Workaround for https://github.com/NixOS/nixpkgs/issues/304528 env.GAG_CPP = lib.optionalString stdenv.hostPlatform.isDarwin "${gfortran.outPath}/bin/cpp"; - NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks" - ); - configurePhase = '' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python3Env} diff --git a/pkgs/by-name/gi/gimoji/package.nix b/pkgs/by-name/gi/gimoji/package.nix index ea4c142d369e..d6837ec1452b 100644 --- a/pkgs/by-name/gi/gimoji/package.nix +++ b/pkgs/by-name/gi/gimoji/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-vAhHCNsViYyNSKeSGUL2oIp8bp5UCm8HReyDuoFvfqs="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; - meta = with lib; { description = "Easily add emojis to your git commit messages"; homepage = "https://github.com/zeenix/gimoji"; diff --git a/pkgs/by-name/gi/girouette/package.nix b/pkgs/by-name/gi/girouette/package.nix index 36092e7bb808..11ef95495dd4 100644 --- a/pkgs/by-name/gi/girouette/package.nix +++ b/pkgs/by-name/gi/girouette/package.nix @@ -5,8 +5,6 @@ pkg-config, dbus, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,14 +25,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - dbus - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + dbus + openssl + ]; meta = with lib; { description = "Show the weather in the terminal, in style"; diff --git a/pkgs/by-name/gi/git-agecrypt/package.nix b/pkgs/by-name/gi/git-agecrypt/package.nix index 5136e112ffee..95e48e29d5e6 100644 --- a/pkgs/by-name/gi/git-agecrypt/package.nix +++ b/pkgs/by-name/gi/git-agecrypt/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, libgit2, git, pkg-config, @@ -32,7 +30,7 @@ rustPlatform.buildRustPackage { buildInputs = [ libgit2 zlib - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + ]; meta = with lib; { description = "Alternative to git-crypt using age instead of GPG"; diff --git a/pkgs/by-name/gi/git-chain/package.nix b/pkgs/by-name/gi/git-chain/package.nix index 32bdb30fc5f5..54957d139fbb 100644 --- a/pkgs/by-name/gi/git-chain/package.nix +++ b/pkgs/by-name/gi/git-chain/package.nix @@ -6,8 +6,6 @@ openssl, git, nix-update-script, - stdenv, - darwin, }: rustPlatform.buildRustPackage { @@ -26,14 +24,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - ] - ); + buildInputs = [ openssl ]; nativeCheckInputs = [ git ]; diff --git a/pkgs/by-name/gi/git-dive/package.nix b/pkgs/by-name/gi/git-dive/package.nix index f98afaf57f86..c3190b1517b3 100644 --- a/pkgs/by-name/gi/git-dive/package.nix +++ b/pkgs/by-name/gi/git-dive/package.nix @@ -6,8 +6,6 @@ libgit2, oniguruma, zlib, - stdenv, - darwin, gitMinimal, }: @@ -29,15 +27,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libgit2 - oniguruma - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + oniguruma + zlib + ]; nativeCheckInputs = [ gitMinimal diff --git a/pkgs/by-name/gi/git-gr/package.nix b/pkgs/by-name/gi/git-gr/package.nix index c778dd82857b..2996a06c9853 100644 --- a/pkgs/by-name/gi/git-gr/package.nix +++ b/pkgs/by-name/gi/git-gr/package.nix @@ -6,7 +6,6 @@ rustPlatform, installShellFiles, libiconv, - darwin, nix-update-script, pkg-config, openssl, @@ -40,8 +39,6 @@ rustPlatform.buildRustPackage { lib.optional stdenv.hostPlatform.isLinux openssl ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration ]; postInstall = lib.optionalString canRunGitGr '' diff --git a/pkgs/by-name/gi/git-igitt/package.nix b/pkgs/by-name/gi/git-igitt/package.nix index e8937ae98db9..843b1bc8e51c 100644 --- a/pkgs/by-name/gi/git-igitt/package.nix +++ b/pkgs/by-name/gi/git-igitt/package.nix @@ -6,8 +6,6 @@ libgit2, oniguruma, zlib, - stdenv, - darwin, nix-update-script, }: @@ -34,7 +32,7 @@ rustPlatform.buildRustPackage { libgit2 oniguruma zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; env = { RUSTONIG_SYSTEM_LIBONIG = true; diff --git a/pkgs/by-name/gi/git-ignore/package.nix b/pkgs/by-name/gi/git-ignore/package.nix index 992c25b89a3c..a125753eec39 100644 --- a/pkgs/by-name/gi/git-ignore/package.nix +++ b/pkgs/by-name/gi/git-ignore/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,10 +23,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - postInstall = '' assets=$releaseDir/../assets installManPage $assets/git-ignore.1 diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix index d0ca3b0f5c00..9e7f188964ca 100644 --- a/pkgs/by-name/gi/git-mit/package.nix +++ b/pkgs/by-name/gi/git-mit/package.nix @@ -7,8 +7,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: let @@ -39,15 +37,11 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; env = { LIBGIT2_NO_VENDOR = 1; diff --git a/pkgs/by-name/gi/git-prole/package.nix b/pkgs/by-name/gi/git-prole/package.nix index dcb17af0894b..ce67f6958484 100644 --- a/pkgs/by-name/gi/git-prole/package.nix +++ b/pkgs/by-name/gi/git-prole/package.nix @@ -1,12 +1,16 @@ { lib, + stdenv, + buildPackages, fetchFromGitHub, rustPlatform, git, - bash, nix-update-script, + installShellFiles, }: let + emulatorAvailable = stdenv.hostPlatform.emulatorAvailable buildPackages; + emulator = stdenv.hostPlatform.emulator buildPackages; version = "0.5.3"; in rustPlatform.buildRustPackage { @@ -20,14 +24,32 @@ rustPlatform.buildRustPackage { hash = "sha256-QwLkByC8gdAnt6geZS285ErdH8nfV3vsWjMF4hTzq9Y="; }; + buildFeatures = [ "clap_mangen" ]; + useFetchCargoVendor = true; cargoHash = "sha256-qghc8HtJfpTYXAwC2xjq8lLlCu419Ttnu/AYapkAulI="; nativeCheckInputs = [ git - bash ]; + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = lib.optionalString emulatorAvailable '' + manpages=$(mktemp -d) + ${emulator} $out/bin/git-prole manpages "$manpages" + for manpage in "$manpages"/*; do + installManPage "$manpage" + done + + installShellCompletion --cmd git-prole \ + --bash <(${emulator} $out/bin/git-prole completions bash) \ + --fish <(${emulator} $out/bin/git-prole completions fish) \ + --zsh <(${emulator} $out/bin/git-prole completions zsh) + ''; + meta = { homepage = "https://github.com/9999years/git-prole"; changelog = "https://github.com/9999years/git-prole/releases/tag/v${version}"; diff --git a/pkgs/by-name/gi/git-repo/package.nix b/pkgs/by-name/gi/git-repo/package.nix index 28766f08da6a..41b7a06a50c5 100644 --- a/pkgs/by-name/gi/git-repo/package.nix +++ b/pkgs/by-name/gi/git-repo/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.53"; + version = "2.54"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-mPmOnq9j9vnfTynGbOoChLslpyTpIzH6+B2fv5PTHZY="; + hash = "sha256-rZCpuJ4TpbVbTxq7qHfhokoj7qCj9/YcA9PGgd9ROCg="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/by-name/gi/git-together/package.nix b/pkgs/by-name/gi/git-together/package.nix index 8b56b68280a0..e2a04faa8292 100644 --- a/pkgs/by-name/gi/git-together/package.nix +++ b/pkgs/by-name/gi/git-together/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,7 +18,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.Security; + buildInputs = [ openssl ]; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/gi/git-wait/package.nix b/pkgs/by-name/gi/git-wait/package.nix index 8288a70d3c06..f5417c49b36c 100644 --- a/pkgs/by-name/gi/git-wait/package.nix +++ b/pkgs/by-name/gi/git-wait/package.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, stdenv, - darwin, git, }: @@ -22,11 +21,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-tA0WjghBB2K71IlZ1u9K67tZWGe9VNFOfI2YdrqCUw0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - ]; - checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=tests::wait_if_index_lock_is_present" ]; diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index 59a5dfa0729b..cf7ef674ace1 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "17.10.1"; + version = "17.10.4"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -21,7 +21,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-uyXxNuHQUlXCNQcrEIoaJXpatfM5fcIk5MCNYt8QW9A="; + hash = "sha256-NUTo5JVolc4WUinyCn4BKDqJPn3KWXOnBs6MRj7178o="; }; vendorHash = "sha256-umtSuLQiohSarzZDU7tHEYI6t8B7MlkaDu8//fnr1Ms="; diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix index d140654911b9..6438e973c3cf 100644 --- a/pkgs/by-name/gi/github-mcp-server/package.nix +++ b/pkgs/by-name/gi/github-mcp-server/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "github-mcp-server"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "github"; repo = "github-mcp-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-cIS6awIzGadeDdIfSmHKlL9NhouZwQAND7Au8zz0HJA="; + hash = "sha256-FMkulZoZtvu2aZC1qAszoIbKpWRoyY2LyQEUw6irawM="; }; - vendorHash = "sha256-eBKTnuJk705oE//ejdwu/hi1hq8N88C6e4dEkKuM+5g="; + vendorHash = "sha256-LjwvIn/7PLZkJrrhNdEv9J6sj5q3Ljv70z3hDeqC5Sw="; ldflags = [ "-s" diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix index 8f3d34548a38..0d837e9899bd 100644 --- a/pkgs/by-name/gi/gitkraken/package.nix +++ b/pkgs/by-name/gi/gitkraken/package.nix @@ -1,58 +1,57 @@ { lib, stdenv, - libXcomposite, - libgnome-keyring, - makeWrapper, - udev, - curlWithGnuTls, - alsa-lib, - libXfixes, - atk, - gtk3, - libXrender, - pango, - adwaita-icon-theme, - cairo, - freetype, - fontconfig, - libX11, - libXi, - libxcb, - libXext, - libXcursor, - glib, - libXScrnSaver, - libxkbfile, - libXtst, - nss, - nspr, - cups, - fetchzip, - expat, - gdk-pixbuf, - libXdamage, - libXrandr, - dbus, - makeDesktopItem, - openssl, - wrapGAppsHook3, buildPackages, + copyDesktopItems, + fetchzip, + makeDesktopItem, + makeWrapper, + adwaita-icon-theme, + alsa-lib, at-spi2-atk, at-spi2-core, - libuuid, + atk, + cacert, + cairo, + cups, + curlWithGnuTls, + dbus, e2fsprogs, + expat, + fontconfig, + freetype, + gdk-pixbuf, + git, + glib, + gtk3, krb5, + libGL, + libX11, + libXScrnSaver, + libXcomposite, + libXcursor, + libXdamage, + libXext, + libXfixes, + libXi, + libXrandr, + libXrender, + libXtst, libdrm, libgbm, - unzip, - copyDesktopItems, - libxshmfence, + libgnome-keyring, + libuuid, + libxcb, libxkbcommon, - git, - libGL, + libxkbfile, + libxshmfence, + nspr, + nss, + openssl, + pango, + udev, + unzip, zlib, - cacert, }: let @@ -80,25 +79,28 @@ let src = srcs.${stdenv.hostPlatform.system} or throwSystem; - meta = with lib; { + meta = { homepage = "https://www.gitkraken.com/git-client"; description = "Simplifying Git for any OS"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + license = lib.licenses.unfree; platforms = builtins.attrNames srcs; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ nicolas-goudry Rishik-Y ]; mainProgram = "gitkraken"; }; + passthru.updateScript = ./update.sh; + linux = stdenv.mkDerivation rec { inherit pname version src meta + passthru ; dontBuild = true; @@ -228,6 +230,7 @@ let version src meta + passthru ; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/gitkraken/update.sh b/pkgs/by-name/gi/gitkraken/update.sh new file mode 100755 index 000000000000..dfc7dd773ac2 --- /dev/null +++ b/pkgs/by-name/gi/gitkraken/update.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts curl jq + +set -euo pipefail + +scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) +nixpkgs=$(realpath "$scriptDir"/../../../..) + +# All architectures are released together, therefore we get the latest version from the linux release +# NOTE: for some reason, the darwin RELEASES (ie. /darwin/RELEASES) file returns a frozen version... +echo >&2 "=== Obtaining version data from release.axocdn.com..." +version=$(curl -fsSL https://release.axocdn.com/linux/RELEASES | jq -r '.name') + +# Hardcoded URLs to compute hashes +declare -A tarballs=( + ["x86_64-linux"]="https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz" + ["x86_64-darwin"]="https://release.axocdn.com/darwin/GitKraken-v${version}.zip" + ["aarch64-darwin"]="https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip" +) + +for arch in "${!tarballs[@]}"; do + # We precalculate the hash before calling update-source-version because it attempts to calculate each architecture's + # package's hash by running `nix-build --system -A gitkraken.src` which causes cross compiling headaches + echo >&2 "=== Downloading ${arch} package and computing its hash..." + hash=$(nix-hash --sri --type sha256 "$(nix-prefetch-url --print-path --unpack "${tarballs[${arch}]}" | tail -n1)") + echo >&2 "=== Updating package.nix for ${arch}..." + # update-source-version expects to be at the root of nixpkgs + (cd "${nixpkgs}" && update-source-version gitkraken "${version}" "${hash}" --system="${arch}" --version-key="srcs.${arch}") +done + +echo >&2 "=== Done!" diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix index 1dc740ba16f2..20f10ef517a4 100644 --- a/pkgs/by-name/gi/gitlab-ci-local/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -5,6 +5,9 @@ nix-update-script, gitlab-ci-local, testers, + makeBinaryWrapper, + rsync, + gitMinimal, }: buildNpmPackage rec { @@ -20,12 +23,26 @@ buildNpmPackage rec { npmDepsHash = "sha256-fndSJd15sZ/sIFvh+MzNw25kuP9D9+Qc0mDqgnvjnPo="; + nativeBuildInputs = [ + makeBinaryWrapper + ]; + postPatch = '' # remove cleanup which runs git commands substituteInPlace package.json \ --replace-fail "npm run cleanup" "true" ''; + postInstall = '' + wrapProgram $out/bin/gitlab-ci-local \ + --prefix PATH : "${ + lib.makeBinPath [ + rsync + gitMinimal + ] + }" + ''; + passthru = { updateScript = nix-update-script { }; tests.version = testers.testVersion { diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix index 83ef36cce08d..c38041e4f577 100644 --- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix @@ -2,31 +2,25 @@ rustPlatform, lib, fetchFromGitHub, - darwin, openssl, pkg-config, - stdenv, }: rustPlatform.buildRustPackage rec { pname = "gitlab-ci-ls"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "alesbrelih"; repo = "gitlab-ci-ls"; rev = "${version}"; - hash = "sha256-SVsQnY/TrFQXgvT5goXQqb5MYxU7untDq361EY7KRDQ="; + hash = "sha256-rgdrbPqpdQlIVcQMLAi2rtTPpeWj+azbm6FaqUBHIIw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-7qZN198hqAmAd3WH8g+ceSGvQuZ0EheHeMwmvBd9if4="; + cargoHash = "sha256-WjTfIKWu5fivPXmlGXduHWA5dKmKz2620tprtuoJbD4="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; meta = with lib; { homepage = "https://github.com/alesbrelih/gitlab-ci-ls"; diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index 7edd5a1c238e..2c7cc930f1d2 100644 --- a/pkgs/by-name/gi/gitlab-pages/package.nix +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -6,14 +6,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.10.1"; + version = "17.10.4"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-B/v0jj5hoNmF9cygvi9eLQ4pLuZ1+wIyNnJN2uCAXdE="; + hash = "sha256-kvmM8cWAAlDT+FJBVUiZD9h/qT6iAaz+gOncvyCsvtY="; }; vendorHash = "sha256-o2DgP2YP2aejtuQ4NC90kysvwDy0XvSb4CW5oE2x2qQ="; diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix index 925b13b71b61..eb00dfbd7918 100644 --- a/pkgs/by-name/gi/gitlab-timelogs/package.nix +++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchCrate, iconv, lib, @@ -23,7 +22,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration iconv ]; diff --git a/pkgs/by-name/gi/gitmoji-cli/package.nix b/pkgs/by-name/gi/gitmoji-cli/package.nix index d46464012331..96291cf3d626 100644 --- a/pkgs/by-name/gi/gitmoji-cli/package.nix +++ b/pkgs/by-name/gi/gitmoji-cli/package.nix @@ -1,83 +1,55 @@ { lib, - stdenv, + stdenvNoCC, fetchFromGitHub, fetchYarnDeps, - makeWrapper, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, nodejs, - fixup-yarn-lock, - yarn, - testers, + versionCheckHook, + nix-update-script, }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "gitmoji-cli"; - version = "9.0.0"; + version = "9.6.0"; src = fetchFromGitHub { owner = "carloscuesta"; repo = "gitmoji-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-cIc0AaP1AwhoVJLnonC9qvDWNZW4L6/jsQ3Q6z5VXI0="; + hash = "sha256-LhqwC7F0745KFzGHw9WUkPYxhIkFEmCPTxS1fuZKVHQ="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-HXMRCTiUti/GZ1dzd+XbFOao3+QLC1t7H0TT9MS5lz4="; + hash = "sha256-/O+UMOYn3dBgy2uBBCeg4vHzC+fXA+7fj7Xk03miZSA="; }; nativeBuildInputs = [ - makeWrapper + yarnConfigHook + yarnBuildHook + yarnInstallHook + # Needed for executing package.json scripts nodejs - fixup-yarn-lock - yarn ]; - configurePhase = '' - runHook preConfigure + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/gitmoji"; - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror $offlineCache - fixup-yarn-lock yarn.lock - yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install - patchShebangs node_modules - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - yarn --offline build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - yarn --offline --production install - - mkdir -p "$out/lib/node_modules/gitmoji-cli" - cp -r lib node_modules package.json "$out/lib/node_modules/gitmoji-cli" - - makeWrapper "${nodejs}/bin/node" "$out/bin/gitmoji" \ - --add-flags "$out/lib/node_modules/gitmoji-cli/lib/cli.js" - - runHook postInstall - ''; - - passthru.tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; - }; - }; + passthru.updateScript = nix-update-script { }; meta = { description = "Gitmoji client for using emojis on commit messages"; homepage = "https://github.com/carloscuesta/gitmoji-cli"; + changelog = "https://github.com/carloscuesta/gitmoji-cli/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; mainProgram = "gitmoji"; - maintainers = with lib.maintainers; [ nequissimus ]; + maintainers = with lib.maintainers; [ + nequissimus + yzx9 + ]; }; }) diff --git a/pkgs/applications/version-management/gitmux/default.nix b/pkgs/by-name/gi/gitmux/package.nix similarity index 100% rename from pkgs/applications/version-management/gitmux/default.nix rename to pkgs/by-name/gi/gitmux/package.nix diff --git a/pkgs/by-name/gi/gitnr/package.nix b/pkgs/by-name/gi/gitnr/package.nix index 867bc19a9bd8..404aaaaf90fc 100644 --- a/pkgs/by-name/gi/gitnr/package.nix +++ b/pkgs/by-name/gi/gitnr/package.nix @@ -6,7 +6,6 @@ libxkbcommon, openssl, stdenv, - darwin, wayland, }: @@ -32,9 +31,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland diff --git a/pkgs/by-name/gi/gitrs/package.nix b/pkgs/by-name/gi/gitrs/package.nix index d6a3942e7320..9e3de5731e9f 100644 --- a/pkgs/by-name/gi/gitrs/package.nix +++ b/pkgs/by-name/gi/gitrs/package.nix @@ -5,7 +5,6 @@ openssl, pkg-config, libiconv, - darwin, rustPlatform, }: @@ -31,8 +30,6 @@ rustPlatform.buildRustPackage rec { [ openssl.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration ]; meta = with lib; { diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index 240fe153c07f..51e87ffddcd5 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -6,39 +6,32 @@ libgit2, openssl, zlib, - stdenv, - darwin, git, }: rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.29.0"; + version = "0.30.3"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-c2YVcE+a/9Z6qTLEbcSFE6393SEeudyvdbzCRJfszcc="; + hash = "sha256-WXz8H68EpvkUEpdEbdukggbjFXUPA+FRcZTsk48W6TU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-+tSNUtsDFKqx5W8+cuxyFsG1etm44eYgoYuoUt5tw3E="; + cargoHash = "sha256-0+KHO7CGYdifQGbtywuK5xQmS2BuxFX50eMGpo5RRYU="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; nativeCheckInputs = [ git diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix index f1db72724190..2f24dbef6752 100644 --- a/pkgs/by-name/gi/gitui/package.nix +++ b/pkgs/by-name/gi/gitui/package.nix @@ -8,7 +8,6 @@ pkg-config, cmake, xclip, - darwin, nix-update-script, }: let @@ -38,8 +37,6 @@ rustPlatform.buildRustPackage { ++ lib.optional stdenv.hostPlatform.isLinux xclip ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.AppKit ]; postPatch = '' diff --git a/pkgs/by-name/gl/gl2ps/package.nix b/pkgs/by-name/gl/gl2ps/package.nix index 6838bccacc0a..f1a5a9746f4f 100644 --- a/pkgs/by-name/gl/gl2ps/package.nix +++ b/pkgs/by-name/gl/gl2ps/package.nix @@ -8,7 +8,6 @@ libGL, libGLU, libglut, - darwin, }: stdenv.mkDerivation rec { @@ -33,9 +32,6 @@ stdenv.mkDerivation rec { libGL libGLU libglut - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.OpenGL ]; meta = with lib; { diff --git a/pkgs/by-name/gl/gl3w/package.nix b/pkgs/by-name/gl/gl3w/package.nix index ed2150bd6be4..ad6297a38205 100644 --- a/pkgs/by-name/gl/gl3w/package.nix +++ b/pkgs/by-name/gl/gl3w/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation { pname = "gl3w"; - version = "0-unstable-2023-10-10"; + version = "0-unstable-2025-04-08"; src = fetchFromGitHub { owner = "skaslev"; repo = "gl3w"; - rev = "3a33275633ce4be433332dc776e6a5b3bdea6506"; - hash = "sha256-kEm5QItpasSFJQ32YBHPpc+itz/nQ8bQMCavbOTGT/w="; + rev = "1528d8918447a61e97fe669d7b3e280a60b9a161"; + hash = "sha256-a3fe67xh2nyIu/ytMb9D8S/7QMz23uJUDX7LOfwIJgU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix index e850fcda9fe2..141e85552bf6 100644 --- a/pkgs/by-name/gl/glamoroustoolkit/package.nix +++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.1.19"; + version = "1.1.21"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-rfn3IC3N6b7w40H7I7GmPv7xjCa+Ackh5GQ3lWbcdZY="; + hash = "sha256-KQOTCB34zxy34y5gq+xUjBiBO5zKSZHRDtQY/DnRkdo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index ac440677aabb..d40556da08fb 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "glance"; - version = "0.7.9"; + version = "0.7.13"; src = fetchFromGitHub { owner = "glanceapp"; repo = "glance"; tag = "v${finalAttrs.version}"; - hash = "sha256-CUuYwbcKJ985fKcUEV6UNLgOZCjUCOzxNRV+pt5vbnc="; + hash = "sha256-MinskibgOCb8OytC+Uxg31g00Ha/un7MF+uvL9xosUU="; }; - vendorHash = "sha256-lURRHlZoxbuW1SXxrxy2BkMndcEllGFmVCB4pXBad8Q="; + vendorHash = "sha256-+7mOCU5GNQV8+s9QPki+7CDi4qtOIpwjC//QracwzHI="; ldflags = [ "-s" diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index 453cdd80532c..3d8d079a82ae 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (final: { pname = "glaze"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; rev = "v${final.version}"; - hash = "sha256-9ru8T0xUmkKBg6rNg+myzU8bjqWkQGG2B0APPHjyAAE="; + hash = "sha256-1Mk/BaU1D4SASC47pHlfno6n39WR5lUVPtboqz70+4s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/by-name/gl/gleam/package.nix similarity index 57% rename from pkgs/development/compilers/gleam/default.nix rename to pkgs/by-name/gl/gleam/package.nix index b816a9b48024..e1f12e9220f2 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/by-name/gl/gleam/package.nix @@ -1,65 +1,58 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, git, pkg-config, openssl, - erlang, + erlang_27, nodejs, bun, deno, - Security, + versionCheckHook, nix-update-script, - SystemConfiguration, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "gleam"; version = "1.10.0"; src = fetchFromGitHub { owner = "gleam-lang"; - repo = pname; - tag = "v${version}"; + repo = "gleam"; + tag = "v${finalAttrs.version}"; hash = "sha256-0qK9dWkKnoXbIIBMN3p5noPEke/bgC8Bjtmf6lwtyr4="; }; + cargoHash = "sha256-EoRu8p6cUe1li54nVUkf+3qywIsDXh4ptIVLluJ3eFs="; + nativeBuildInputs = [ git pkg-config - erlang + erlang_27 nodejs bun deno ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; - - useFetchCargoVendor = true; - cargoHash = "sha256-EoRu8p6cUe1li54nVUkf+3qywIsDXh4ptIVLluJ3eFs="; + buildInputs = [ openssl ]; checkFlags = [ # Makes a network request "--skip=tests::echo::echo_dict" ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Statically typed language for the Erlang VM"; mainProgram = "gleam"; homepage = "https://gleam.run/"; - changelog = "https://github.com/gleam-lang/gleam/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = teams.beam.members ++ [ lib.maintainers.philtaken ]; + changelog = "https://github.com/gleam-lang/gleam/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = lib.teams.beam.members ++ [ lib.maintainers.philtaken ]; }; -} +}) diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index f252df75413f..584acabb7ce5 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -31,7 +31,6 @@ tzdata, desktop-file-utils, shared-mime-info, - darwin, makeHardcodeGsettingsPatch, testers, gobject-introspection, @@ -178,18 +177,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ libselinux util-linuxMinimal # for libmount - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - Carbon - Cocoa - CoreFoundation - CoreServices - Foundation - ] - ); + ]; depsBuildBuild = [ pkg-config # required to find native gi-docgen diff --git a/pkgs/by-name/gl/glicol-cli/package.nix b/pkgs/by-name/gl/glicol-cli/package.nix index 3bb374b47600..e432df1a798d 100644 --- a/pkgs/by-name/gl/glicol-cli/package.nix +++ b/pkgs/by-name/gl/glicol-cli/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pkg-config, stdenv, - darwin, alsa-lib, }: @@ -27,13 +26,9 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AudioUnit - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; meta = with lib; { description = "Cross-platform music live coding in terminal"; diff --git a/pkgs/by-name/gl/glitchtip/frontend.nix b/pkgs/by-name/gl/glitchtip/frontend.nix index f17f728f62f8..34a157cec600 100644 --- a/pkgs/by-name/gl/glitchtip/frontend.nix +++ b/pkgs/by-name/gl/glitchtip/frontend.nix @@ -2,29 +2,36 @@ lib, fetchFromGitLab, buildNpmPackage, + fetchNpmDeps, jq, moreutils, }: buildNpmPackage (finalAttrs: { pname = "glitchtip-frontend"; - version = "4.2.5"; + version = "4.2.10"; src = fetchFromGitLab { owner = "glitchtip"; repo = "glitchtip-frontend"; tag = "v${finalAttrs.version}"; - hash = "sha256-yLpDjHnt8ZwpT+KlmEtXMYgrpnbYlVzJ/MZMELVO/j8="; + hash = "sha256-6ZOwAP6VB/uBrV6Yjc9jvzTNdfInekbLO/9PO57S9X8="; }; - npmDepsHash = "sha256-sR/p/JRVuaemN1euZ/VrJ0j1q7fkS/Zi6R1m6lPvygs="; + npmDeps = fetchNpmDeps { + inherit (finalAttrs) src; + hash = "sha256-uEyET3y8LfjTasaJ+Hl206/Q7ov69mA7oNa0mhgcUEQ="; + }; postPatch = '' - ${lib.getExe jq} '. + { - "devDependencies": .devDependencies | del(.cypress, ."cypress-localstorage-commands") - }' package.json | ${lib.getExe' moreutils "sponge"} package.json + jq '.devDependencies |= del(.cypress, ."cypress-localstorage-commands")' package.json | sponge package.json ''; + nativeBuildInputs = [ + moreutils + jq + ]; + buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix index bdb275631e8e..83fe0368f370 100644 --- a/pkgs/by-name/gl/glitchtip/package.nix +++ b/pkgs/by-name/gl/glitchtip/package.nix @@ -2,6 +2,8 @@ lib, python313, fetchFromGitLab, + fetchFromGitHub, + rustPlatform, callPackage, stdenv, makeWrapper, @@ -10,9 +12,27 @@ let python = python313.override { + self = python; packageOverrides = final: prev: { django = final.django_5; - django-extensions = prev.django-extensions.overridePythonAttrs { doCheck = false; }; + symbolic = prev.symbolic.overridePythonAttrs rec { + version = "10.2.1"; + src = fetchFromGitHub { + owner = "getsentry"; + repo = "symbolic"; + tag = version; + hash = "sha256-3u4MTzaMwryGpFowrAM/MJOmnU8M+Q1/0UtALJib+9A="; + # the `py` directory is not included in the tarball, so we fetch the source via git instead + forceFetchGit = true; + }; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src postPatch; + hash = "sha256-cpIVzgcxKfEA5oov6/OaXqknYsYZUoduLTn2qIXGL5U="; + }; + postPatch = '' + ln -s ${./symbolic_Cargo.lock} Cargo.lock + ''; + }; }; }; @@ -25,7 +45,6 @@ let brotli celery celery-batches - dj-stripe django django-allauth django-anymail @@ -39,7 +58,6 @@ let django-organizations django-prometheus django-redis - django-sql-utils django-storages google-cloud-logging gunicorn @@ -69,14 +87,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glitchtip"; - version = "4.2.5"; + version = "4.2.10"; pyproject = true; src = fetchFromGitLab { owner = "glitchtip"; repo = "glitchtip-backend"; tag = "v${finalAttrs.version}"; - hash = "sha256-OTf2rvx+ONnB7pLB7rinztXL7l2eZfIuI7PosCXaOH8="; + hash = "sha256-EGk/mhDlqGrJm/j5rTKeKRkJ/fRTspwtPJ+5OHwplfM="; }; propagatedBuildInputs = pythonPackages; diff --git a/pkgs/by-name/gl/glitchtip/symbolic_Cargo.lock b/pkgs/by-name/gl/glitchtip/symbolic_Cargo.lock new file mode 100644 index 000000000000..5ac24d4be5ed --- /dev/null +++ b/pkgs/by-name/gl/glitchtip/symbolic_Cargo.lock @@ -0,0 +1,2737 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "Inflector" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli 0.28.1", +] + +[[package]] +name = "addr2line" +version = "10.2.1" +dependencies = [ + "anyhow", + "clap", + "symbolic", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anyhow" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" + +[[package]] +name = "anylog" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e2e9a7b2d67ca2b6e886b610ae20ac845cf37980df84892e38f6046e8fc225f" +dependencies = [ + "chrono", + "lazy_static", + "regex", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "ast_node" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab31376d309dd3bfc9cfb3c11c93ce0e0741bbe0354b20e7f8c60b044730b79" +dependencies = [ + "proc-macro2", + "quote", + "swc_macros_common", + "syn 2.0.60", +] + +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" + +[[package]] +name = "backtrace" +version = "0.3.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +dependencies = [ + "addr2line 0.21.0", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "better_scoped_tls" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de" +dependencies = [ + "scoped-tls", +] + +[[package]] +name = "binary-merge" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597bb81c80a54b6a4381b23faba8d7774b144c94cbd1d6fe3f1329bd776554ab" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "breakpad-symbols" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "962e48eab21c8cc026fb28919961ea4f45bb0d424eb58f215b0f245e2699b6c8" +dependencies = [ + "async-trait", + "circular", + "debugid", + "minidump-common", + "nom", + "range-map", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "brownstone" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5839ee4f953e811bfdcf223f509cb2c6a3e1447959b0bff459405575bc17f22" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "bstr" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +dependencies = [ + "lazy_static", + "memchr", + "regex-automata 0.1.10", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.0.96" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits 0.2.18", + "serde", + "wasm-bindgen", + "windows-targets", +] + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "circular" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fc239e0f6cb375d2402d48afb92f76f5404fd1df208a41930ec81eda078bea" + +[[package]] +name = "clap" +version = "3.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +dependencies = [ + "atty", + "bitflags 1.3.2", + "clap_lex", + "indexmap", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "windows-sys", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpp_demangle" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crc32fast" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "criterion" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +dependencies = [ + "anes", + "atty", + "cast", + "ciborium", + "clap", + "criterion-plot", + "itertools", + "lazy_static", + "num-traits 0.2.18", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "serde", + "uuid", +] + +[[package]] +name = "debuginfo_debug" +version = "10.2.1" +dependencies = [ + "anyhow", + "clap", + "symbolic", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "dmsort" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0bc8fbe9441c17c9f46f75dfe27fa1ddb6c68a461ccaed0481419219d4f10d3" + +[[package]] +name = "dump_cfi" +version = "10.2.1" +dependencies = [ + "anyhow", + "clap", + "symbolic", +] + +[[package]] +name = "dump_sources" +version = "10.2.1" +dependencies = [ + "clap", + "symbolic", +] + +[[package]] +name = "either" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" + +[[package]] +name = "elementtree" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3efd4742acf458718a6456e0adf0b4d734d6b783e452bbf1ac36bf31f4085cb3" +dependencies = [ + "string_cache", +] + +[[package]] +name = "elsa" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding" +version = "0.2.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" +dependencies = [ + "encoding-index-japanese", + "encoding-index-korean", + "encoding-index-simpchinese", + "encoding-index-singlebyte", + "encoding-index-tradchinese", +] + +[[package]] +name = "encoding-index-japanese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-korean" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-simpchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-singlebyte" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-tradchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding_index_tests" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" + +[[package]] +name = "enum-primitive-derive" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c375b9c5eadb68d0a6efee2999fef292f45854c3444c86f09d8ab086ba942b0e" +dependencies = [ + "num-traits 0.2.18", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "from_variant" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc9cc75639b041067353b9bce2450d6847e547276c6fbe4487d7407980e07db" +dependencies = [ + "proc-macro2", + "swc_macros_common", + "syn 2.0.60", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-macro", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "getrandom" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +dependencies = [ + "fallible-iterator", + "stable_deref_trait", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "goblin" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6b4de4a8eb6c46a8c77e1d3be942cb9a8bf073c22374578e5ba4b08ed0ff68" +dependencies = [ + "log", + "plain", + "scroll", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "if_chain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" + +[[package]] +name = "indent_write" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cfe9645a18782869361d9c8732246be7b410ad4e919d3609ebabdac00ba12c3" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "inplace-vec-builder" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf64c2edc8226891a71f127587a2861b132d2b942310843814d5001d99a1d307" +dependencies = [ + "smallvec", +] + +[[package]] +name = "insta" +version = "1.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc" +dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "serde", + "similar", +] + +[[package]] +name = "is-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "joinery" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5" + +[[package]] +name = "js-source-scopes" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8da074711c234172331e301df3f78c7a3988e6e8fab0a128a1fb9ff235f384d" +dependencies = [ + "indexmap", + "sourcemap", + "swc_common", + "swc_ecma_parser", + "swc_ecma_visit", + "thiserror", + "tracing", +] + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + +[[package]] +name = "lexical" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" +dependencies = [ + "lexical-core", +] + +[[package]] +name = "lexical-core" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" +dependencies = [ + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", +] + +[[package]] +name = "lexical-parse-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-parse-integer" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-util" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "lexical-write-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" +dependencies = [ + "lexical-util", + "lexical-write-integer", + "static_assertions", +] + +[[package]] +name = "lexical-write-integer" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.154" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "maybe-owned" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + +[[package]] +name = "minidump" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8cb3a9530388df2ec8118130d17f57939c1d17e900a20f88a9f68169ab20c3c" +dependencies = [ + "debugid", + "encoding", + "memmap2", + "minidump-common", + "num-traits 0.2.18", + "range-map", + "scroll", + "thiserror", + "time", + "tracing", + "uuid", +] + +[[package]] +name = "minidump-common" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97dbaf56dfe28d07e1fecffce410976774dcac1f0d7f6d797b437468e989e687" +dependencies = [ + "bitflags 1.3.2", + "debugid", + "enum-primitive-derive", + "num-traits 0.2.18", + "range-map", + "scroll", + "smart-default", + "tracing", +] + +[[package]] +name = "minidump-processor" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18166049057bbbd113418bbf6dc2d68b932bef8bda5103e717492569522e7476" +dependencies = [ + "async-trait", + "breakpad-symbols", + "debugid", + "futures-util", + "memmap2", + "minidump", + "minidump-common", + "scroll", + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "minidump_stackwalk" +version = "10.2.1" +dependencies = [ + "async-trait", + "clap", + "minidump", + "minidump-processor", + "symbolic", + "thiserror", + "tokio", + "tracing", + "tracing-subscriber", + "walkdir", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "msvc-demangler" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfb67c6dd0fa9b00619c41c5700b6f92d5f418be49b45ddb9970fbd4569df3c8" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nom-supreme" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bd3ae6c901f1959588759ff51c95d24b491ecb9ff91aa9c2ef4acc5b1dcab27" +dependencies = [ + "brownstone", + "indent_write", + "joinery", + "memchr", + "nom", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits 0.2.18", + "serde", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits 0.2.18", +] + +[[package]] +name = "num-traits" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ + "num-traits 0.2.18", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "object_debug" +version = "10.2.1" +dependencies = [ + "clap", + "symbolic", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking_lot" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] +name = "pdb" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82040a392923abe6279c00ab4aff62d5250d1c8555dc780e4b02783a7aa74863" +dependencies = [ + "fallible-iterator", + "scroll", + "uuid", +] + +[[package]] +name = "pdb-addr2line" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4e89a9f2f40b2389ba6da0814c8044bf942bece03dffa1514f84e3b525f4f9a" +dependencies = [ + "bitflags 1.3.2", + "elsa", + "maybe-owned", + "pdb", + "range-collections", + "thiserror", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + +[[package]] +name = "plotters" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +dependencies = [ + "num-traits 0.2.18", + "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 = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro2" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proguard" +version = "5.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b88dddb086b00f5539a95d2c7a2373358fd8bfadb7b1297cc29e0196403a1b98" +dependencies = [ + "lazy_static", + "uuid", +] + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "range-collections" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61fdfd79629e2b44a1d34b4d227957174cb858e6b86ee45fad114edbcfc903ab" +dependencies = [ + "binary-merge", + "inplace-vec-builder", + "smallvec", +] + +[[package]] +name = "range-map" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87dc8ff3b0f3e32dbba6e49c592c0191a3a2cabbf6f7e5a78e1010050b9a42e1" +dependencies = [ + "num-traits 0.1.43", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.3", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scroll" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" +dependencies = [ + "scroll_derive", +] + +[[package]] +name = "scroll_derive" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.200" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.200" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "serde_json" +version = "1.0.116" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "similar" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" +dependencies = [ + "bstr", + "unicode-segmentation", +] + +[[package]] +name = "similar-asserts" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e041bb827d1bfca18f213411d51b665309f1afb37a04a5d1464530e13779fc0f" +dependencies = [ + "console", + "similar", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "smart-default" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "smartstring" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +dependencies = [ + "autocfg", + "static_assertions", + "version_check", +] + +[[package]] +name = "sourcemap" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4cbf65ca7dc576cf50e21f8d0712d96d4fcfd797389744b7b222a85cdf5bd90" +dependencies = [ + "data-encoding", + "debugid", + "if_chain", + "rustc_version", + "serde", + "serde_json", + "unicode-id", + "url", +] + +[[package]] +name = "sourcemapcache_debug" +version = "10.2.1" +dependencies = [ + "anyhow", + "clap", + "symbolic", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", +] + +[[package]] +name = "string_enum" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05e383308aebc257e7d7920224fa055c632478d92744eca77f99be8fa1545b90" +dependencies = [ + "proc-macro2", + "quote", + "swc_macros_common", + "syn 2.0.60", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "swc_atoms" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f54563d7dcba626d4acfe14ed12def7ecc28e004debe3ecd2c3ee07cc47e449" +dependencies = [ + "once_cell", + "rustc-hash", + "serde", + "string_cache", + "string_cache_codegen", + "triomphe", +] + +[[package]] +name = "swc_common" +version = "0.31.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d00f960c667c59c133f30492f4d07f26242fcf988a066d3871e6d3d838d528" +dependencies = [ + "ast_node", + "better_scoped_tls", + "cfg-if", + "either", + "from_variant", + "new_debug_unreachable", + "num-bigint", + "once_cell", + "rustc-hash", + "serde", + "siphasher", + "string_cache", + "swc_atoms", + "swc_eq_ignore_macros", + "swc_visit", + "tracing", + "unicode-width", + "url", +] + +[[package]] +name = "swc_ecma_ast" +version = "0.106.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebf4d6804b1da4146c4c0359d129e3dd43568d321f69d7953d9abbca4ded76ba" +dependencies = [ + "bitflags 2.5.0", + "is-macro", + "num-bigint", + "scoped-tls", + "string_enum", + "swc_atoms", + "swc_common", + "unicode-id", +] + +[[package]] +name = "swc_ecma_parser" +version = "0.136.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45d40421c607d7a48334f78a9b24a5cbde1f36250f9986746ec082208d68b39f" +dependencies = [ + "either", + "lexical", + "num-bigint", + "serde", + "smallvec", + "smartstring", + "stacker", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "tracing", + "typed-arena", +] + +[[package]] +name = "swc_ecma_visit" +version = "0.92.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f61da6cac0ec3b7e62d367cfbd9e38e078a4601271891ad94f0dac5ff69f839" +dependencies = [ + "num-bigint", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_visit", + "tracing", +] + +[[package]] +name = "swc_eq_ignore_macros" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "swc_macros_common" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91745f3561057493d2da768437c427c0e979dff7396507ae02f16c981c4a8466" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "swc_visit" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043d11fe683dcb934583ead49405c0896a5af5face522e4682c16971ef7871b9" +dependencies = [ + "either", + "swc_visit_macros", +] + +[[package]] +name = "swc_visit_macros" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae9ef18ff8daffa999f729db056d2821cd2f790f3a11e46422d19f46bb193e7" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "swc_macros_common", + "syn 2.0.60", +] + +[[package]] +name = "symbolic" +version = "10.2.1" +dependencies = [ + "symbolic-cfi", + "symbolic-common", + "symbolic-debuginfo", + "symbolic-demangle", + "symbolic-il2cpp", + "symbolic-ppdb", + "symbolic-sourcemapcache", + "symbolic-symcache", + "symbolic-unreal", +] + +[[package]] +name = "symbolic-cabi" +version = "10.2.1" +dependencies = [ + "proguard", + "sourcemap", + "symbolic", + "tempfile", +] + +[[package]] +name = "symbolic-cfi" +version = "10.2.1" +dependencies = [ + "insta", + "similar-asserts", + "symbolic-common", + "symbolic-debuginfo", + "symbolic-testutils", + "thiserror", +] + +[[package]] +name = "symbolic-common" +version = "10.2.1" +dependencies = [ + "debugid", + "memmap2", + "serde", + "similar-asserts", + "stable_deref_trait", + "symbolic-testutils", + "tempfile", + "uuid", +] + +[[package]] +name = "symbolic-debuginfo" +version = "10.2.1" +dependencies = [ + "bitvec", + "criterion", + "dmsort", + "elementtree", + "elsa", + "fallible-iterator", + "flate2", + "gimli 0.27.3", + "goblin", + "insta", + "lazy_static", + "lazycell", + "nom", + "nom-supreme", + "parking_lot", + "pdb-addr2line", + "regex", + "scroll", + "serde", + "serde_json", + "similar-asserts", + "smallvec", + "symbolic-common", + "symbolic-ppdb", + "symbolic-testutils", + "tempfile", + "thiserror", + "wasmparser", + "zip", +] + +[[package]] +name = "symbolic-demangle" +version = "10.2.1" +dependencies = [ + "cc", + "cpp_demangle", + "msvc-demangler", + "rustc-demangle", + "similar-asserts", + "symbolic-common", +] + +[[package]] +name = "symbolic-il2cpp" +version = "10.2.1" +dependencies = [ + "indexmap", + "serde_json", + "symbolic-common", + "symbolic-debuginfo", +] + +[[package]] +name = "symbolic-ppdb" +version = "10.2.1" +dependencies = [ + "indexmap", + "symbolic-common", + "symbolic-testutils", + "thiserror", + "uuid", + "watto", +] + +[[package]] +name = "symbolic-sourcemapcache" +version = "10.2.1" +dependencies = [ + "itertools", + "js-source-scopes", + "sourcemap", + "symbolic-testutils", + "thiserror", + "tracing", + "watto", +] + +[[package]] +name = "symbolic-symcache" +version = "10.2.1" +dependencies = [ + "criterion", + "indexmap", + "insta", + "similar-asserts", + "symbolic-common", + "symbolic-debuginfo", + "symbolic-il2cpp", + "symbolic-testutils", + "thiserror", + "tracing", + "watto", +] + +[[package]] +name = "symbolic-testutils" +version = "10.2.1" + +[[package]] +name = "symbolic-unreal" +version = "10.2.1" +dependencies = [ + "anylog", + "bytes", + "chrono", + "elementtree", + "flate2", + "insta", + "lazy_static", + "regex", + "scroll", + "serde", + "similar-asserts", + "symbolic-testutils", + "thiserror", + "time", +] + +[[package]] +name = "symcache_debug" +version = "10.2.1" +dependencies = [ + "anyhow", + "clap", + "symbolic", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" + +[[package]] +name = "thiserror" +version = "1.0.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +dependencies = [ + "backtrace", + "pin-project-lite", + "tokio-macros", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "triomphe" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" +dependencies = [ + "serde", + "stable_deref_trait", +] + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-id" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" + +[[package]] +name = "unreal_engine_crash" +version = "10.2.1" +dependencies = [ + "clap", + "symbolic", +] + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "uuid" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +dependencies = [ + "sha1_smol", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.60", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasmparser" +version = "0.95.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" +dependencies = [ + "indexmap", + "url", +] + +[[package]] +name = "watto" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6746b5315e417144282a047ebb82260d45c92d09bf653fa9ec975e3809be942b" +dependencies = [ + "leb128", + "thiserror", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", + "flate2", +] diff --git a/pkgs/by-name/gl/glitchtip/update.sh b/pkgs/by-name/gl/glitchtip/update.sh index 7076d162d211..e0a5cf370e59 100755 --- a/pkgs/by-name/gl/glitchtip/update.sh +++ b/pkgs/by-name/gl/glitchtip/update.sh @@ -1,5 +1,9 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update +#!nix-shell -i bash -p curl jq nix-update -nix-update glitchtip -nix-update glitchtip.frontend +set -eou pipefail + +version=$(curl ${GITLAB_TOKEN:+-H "Private-Token: $GITLAB_TOKEN"} -sL https://gitlab.com/api/v4/projects/15450933/repository/tags | jq -r '.[0].name') + +nix-update --version="$version" glitchtip +nix-update --version="$version" glitchtip.frontend diff --git a/pkgs/by-name/gl/globalplatform/package.nix b/pkgs/by-name/gl/globalplatform/package.nix index 6da23ccfb95d..ed6469b940b0 100644 --- a/pkgs/by-name/gl/globalplatform/package.nix +++ b/pkgs/by-name/gl/globalplatform/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, pcsclite, - PCSC, pkg-config, cmake, zlib, @@ -40,9 +39,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pcsclite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - PCSC ]; cmakeFlags = [ diff --git a/pkgs/by-name/gl/glrnvim/package.nix b/pkgs/by-name/gl/glrnvim/package.nix index fc2de8e52d78..b504b09afefd 100644 --- a/pkgs/by-name/gl/glrnvim/package.nix +++ b/pkgs/by-name/gl/glrnvim/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,14 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-oE1HXmJbKHegubqhsovat1ce/4rjdKGGTnmDdbRBo/k="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - DiskArbitration - Foundation - ] - ); - postInstall = '' install -Dm644 glrnvim.desktop -t $out/share/applications install -Dm644 glrnvim.svg $out/share/icons/hicolor/scalable/apps/glrnvim.svg diff --git a/pkgs/by-name/gm/gmic-qt/package.nix b/pkgs/by-name/gm/gmic-qt/package.nix index 4a07ba02bcef..629097841c03 100644 --- a/pkgs/by-name/gm/gmic-qt/package.nix +++ b/pkgs/by-name/gm/gmic-qt/package.nix @@ -100,7 +100,14 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "ENABLE_DYNAMIC_LINKING" true) (lib.cmakeBool "ENABLE_SYSTEM_GMIC" true) - (lib.cmakeFeature "GMIC_QT_HOST" (if variant == "standalone" then "none" else variant)) + (lib.cmakeFeature "GMIC_QT_HOST" ( + if variant == "standalone" then + "none" + else if variant == "gimp" && gimp.majorVersion == "3.0" then + "gimp3" + else + variant + )) ]; postFixup = lib.optionalString (variant == "gimp") '' diff --git a/pkgs/by-name/gm/gmsh/fix-python.patch b/pkgs/by-name/gm/gmsh/fix-python.patch deleted file mode 100644 index 41c5c3b8f976..000000000000 --- a/pkgs/by-name/gm/gmsh/fix-python.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/api/gmsh.py b/api/gmsh.py -index f525284..a225c85 100644 ---- a/api/gmsh.py -+++ b/api/gmsh.py -@@ -78,6 +78,8 @@ if not libpath: - else: - libpath = find_library("gmsh") - -+libpath = "@LIBPATH@" -+ - # ... and print a warning if everything failed - if not libpath: - print("Warning: could not find Gmsh shared library " + libname + diff --git a/pkgs/by-name/gm/gmsh/package.nix b/pkgs/by-name/gm/gmsh/package.nix index c3c7092d0b79..dd3d3efd0a31 100644 --- a/pkgs/by-name/gm/gmsh/package.nix +++ b/pkgs/by-name/gm/gmsh/package.nix @@ -15,6 +15,7 @@ libGLU, xorg, opencascade-occt, + llvmPackages, python ? null, enablePython ? false, }: @@ -54,12 +55,12 @@ stdenv.mkDerivation rec { xorg.libSM xorg.libICE ] + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp ++ lib.optional enablePython python; enableParallelBuilding = true; patches = [ - ./fix-python.patch (fetchpatch { url = "https://gitlab.onelab.info/gmsh/gmsh/-/commit/7d5094fb0a5245cb435afd3f3e8c35e2ecfe70fd.patch"; hash = "sha256-3atm1NGsMI4KEct2xakRG6EasRpF6YRI4raoVYxBV4g="; @@ -67,7 +68,8 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace api/gmsh.py --subst-var-by LIBPATH ${placeholder "out"}/lib/libgmsh.so + substituteInPlace api/gmsh.py \ + --replace-fail 'find_library("gmsh")' \"$out/lib/libgmsh${stdenv.hostPlatform.extensions.sharedLibrary}\" ''; # N.B. the shared object is used by bindings diff --git a/pkgs/by-name/gm/gmt/package.nix b/pkgs/by-name/gm/gmt/package.nix index b4d4f268fe15..780905919816 100644 --- a/pkgs/by-name/gm/gmt/package.nix +++ b/pkgs/by-name/gm/gmt/package.nix @@ -48,21 +48,11 @@ stdenv.mkDerivation (finalAttrs: { dcw-gmt gshhg-gmt ] - ++ ( - if stdenv.hostPlatform.isDarwin then - with darwin.apple_sdk.frameworks; - [ - Accelerate - CoreGraphics - CoreVideo - ] - else - [ - fftwSinglePrec - blas - lapack - ] - ); + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + fftwSinglePrec + blas + lapack + ]; propagatedBuildInputs = [ ghostscript ]; diff --git a/pkgs/by-name/gn/gn/generic.nix b/pkgs/by-name/gn/gn/generic.nix index 218a46d3fb98..ca28240fa705 100644 --- a/pkgs/by-name/gn/gn/generic.nix +++ b/pkgs/by-name/gn/gn/generic.nix @@ -4,7 +4,6 @@ fetchgit, fetchpatch, cctools, - darwin, writeText, ninja, python3, @@ -54,19 +53,9 @@ stdenv.mkDerivation { ninja python3 ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin; - with apple_sdk.frameworks; - [ - libobjc - cctools - - # frameworks - ApplicationServices - Foundation - AppKit - ] - ); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + ]; env.NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/by-name/gn/gnome-network-displays/package.nix b/pkgs/by-name/gn/gnome-network-displays/package.nix index 849c4ab8bece..1bd0659f21ba 100644 --- a/pkgs/by-name/gn/gnome-network-displays/package.nix +++ b/pkgs/by-name/gn/gnome-network-displays/package.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-network-displays"; - version = "0.94.0"; + version = "0.96.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-network-displays/${lib.versions.majorMinor finalAttrs.version}/gnome-network-displays-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-FzNaA2Our7gb8FgEmYjRtphGVcQt3pw+wQNyLHtKI4M="; + sha256 = "sha256-PB5EsTJHEO3l+4uxBZjYX5c0ySPiaM3CSHYFY97qpJc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-solanum/package.nix b/pkgs/by-name/gn/gnome-solanum/package.nix index b23b4c3dda2d..8225396d41fb 100644 --- a/pkgs/by-name/gn/gnome-solanum/package.nix +++ b/pkgs/by-name/gn/gnome-solanum/package.nix @@ -21,22 +21,21 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "solanum"; - version = "5.0.0"; + version = "6.0.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Solanum"; - rev = version; - hash = "sha256-Xf/b/9o6zHF1hjHSyAXb90ySoBj+DMMe31e6RfF8C4Y="; + tag = finalAttrs.version; + hash = "sha256-Wh9/88Vc4mtjL0U1Vrw+GEEBPjEv+5NrWd/Kw1glp+w="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-jtMTW9tIf0UGbE9bJU31maub+o0agf0pDRO4s9QReyc="; + inherit (finalAttrs) pname version src; + hash = "sha256-krjbeutochFk5md+THlYBW4iEwfFDbK89DYHZyd3IKo="; }; postPatch = '' @@ -71,12 +70,12 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { homepage = "https://gitlab.gnome.org/World/Solanum"; description = "Pomodoro timer for the GNOME desktop"; - maintainers = with maintainers; [ linsui ] ++ lib.teams.gnome-circle.members; - license = licenses.gpl3Plus; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ linsui ] ++ lib.teams.gnome-circle.members; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; mainProgram = "solanum"; }; -} +}) diff --git a/pkgs/by-name/gn/gnuchess/package.nix b/pkgs/by-name/gn/gnuchess/package.nix index 8c140d6fc48e..69e0d4f07325 100644 --- a/pkgs/by-name/gn/gnuchess/package.nix +++ b/pkgs/by-name/gn/gnuchess/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "gnuchess"; - version = "6.2.9"; + version = "6.2.11"; src = fetchurl { url = "mirror://gnu/chess/gnuchess-${version}.tar.gz"; - sha256 = "sha256-3fzCC911aQCpq2xCx9r5CiiTv38ZzjR0IM42uuvEGJA="; + sha256 = "sha256-2BFA7qXGnRSwz7Y4FtS0yeGPulH1Jn3lsVOfRok56b0="; }; buildInputs = [ diff --git a/pkgs/by-name/go/go-blueprint/package.nix b/pkgs/by-name/go/go-blueprint/package.nix index 87019c44fe02..5bb40fc4d1a5 100644 --- a/pkgs/by-name/go/go-blueprint/package.nix +++ b/pkgs/by-name/go/go-blueprint/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "go-blueprint"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "Melkeydev"; repo = "go-blueprint"; rev = "v${version}"; - hash = "sha256-8J+PxFHrNkX2McBn1tO7Q1X4tWtMWDIRsxzKtRhM/Jk="; + hash = "sha256-xWv/4/7+eqSBLmyuF+vLLZzMn8A8sE6vkldER145FQQ="; }; ldflags = [ diff --git a/pkgs/by-name/go/go-chromecast/package.nix b/pkgs/by-name/go/go-chromecast/package.nix index 1fa05bc3e503..64de2292f07e 100644 --- a/pkgs/by-name/go/go-chromecast/package.nix +++ b/pkgs/by-name/go/go-chromecast/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "go-chromecast"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "vishen"; repo = "go-chromecast"; tag = "v${version}"; - hash = "sha256-6I10UZ7imH1R78L2uM/697PskPYjhKSiPHoMM7EFElU="; + hash = "sha256-FFe87Z0aiNP5aGAiJ2WJkKRAMCQGWEBB0gLDGBpE3fk="; }; - vendorHash = "sha256-cu8PuZLkWLatU46VieaeoV5oyejyjR0uVUMVzOrheLM="; + vendorHash = "sha256-MOC9Yqo5p02eZLFJYBE8CxHxZv3RcpqV2sEPZOWiDeE="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix index 5c6035799e8d..e409dd140fac 100644 --- a/pkgs/by-name/go/go-ethereum/package.nix +++ b/pkgs/by-name/go/go-ethereum/package.nix @@ -1,10 +1,7 @@ { lib, - stdenv, buildGoModule, fetchFromGitHub, - libobjc, - IOKit, nixosTests, }: @@ -18,13 +15,13 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.15.6"; + version = "1.15.8"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - hash = "sha256-BdNv0rx+9/F0leNj2AAej8psy8X8HysDrIXheVOOkSo="; + hash = "sha256-dEGPObm3Hy2MHOYrk+lga0PAeHrdSt0jfsTrk74wCUA="; }; proxyVendor = true; @@ -59,12 +56,6 @@ buildGoModule rec { # Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.11.6/build/ci.go#L218 tags = [ "urfave_cli_no_docs" ]; - # Fix for usb-related segmentation faults on darwin - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libobjc - IOKit - ]; - passthru.tests = { inherit (nixosTests) geth; }; meta = with lib; { diff --git a/pkgs/by-name/go/go-xmlstruct/package.nix b/pkgs/by-name/go/go-xmlstruct/package.nix new file mode 100644 index 000000000000..e93841f889ec --- /dev/null +++ b/pkgs/by-name/go/go-xmlstruct/package.nix @@ -0,0 +1,50 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "go-xmlstruct"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "twpayne"; + repo = "go-xmlstruct"; + tag = "v${finalAttrs.version}"; + hash = "sha256-7nDxLvTu/l3bbkG/MYFWqO0KGNfVVwW9/WqvKvj0wOc="; + }; + + vendorHash = "sha256-dxnMWxcWu67FI833bFoxy+5s2ELp3gXisLiTACZRzGU="; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + # The --help flag doesn't actually exist in goxmlstruct, causing it to return exit code 2, + # but this error condition is the only way to get the usage information. + output=$($out/bin/goxmlstruct --help 2>&1 || true) + + if ! echo "$output" | grep -q "Usage of $out/bin/goxmlstruct:"; then + echo "Expected usage information not found in output" + echo "Got: $output" + exit 1 + fi + + runHook postInstallCheck + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Generate Go structs from multiple XML documents"; + mainProgram = "goxmlstruct"; + homepage = "https://github.com/twpayne/go-xmlstruct"; + changelog = "https://github.com/twpayne/go-xmlstruct/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dvcorreia ]; + }; +}) diff --git a/pkgs/by-name/go/gobang/package.nix b/pkgs/by-name/go/gobang/package.nix index 12f6e8f38c7e..69bf2531e07e 100644 --- a/pkgs/by-name/go/gobang/package.nix +++ b/pkgs/by-name/go/gobang/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: let version = "0.1.0-alpha.5"; @@ -24,14 +22,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-K9oo0QrqcPNdV7WMlgSCVc+7AVfoyDkovvJLqKJPvTQ="; - buildInputs = - with darwin.apple_sdk.frameworks; - lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - SystemConfiguration - ]; - meta = { description = "Cross-platform TUI database management tool written in Rust"; homepage = "https://github.com/tako8ki/gobang"; diff --git a/pkgs/by-name/go/goconst/package.nix b/pkgs/by-name/go/goconst/package.nix index eb28baa3d818..6dc8cc6b8074 100644 --- a/pkgs/by-name/go/goconst/package.nix +++ b/pkgs/by-name/go/goconst/package.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "goconst"; - version = "1.8.0"; + version = "1.8.1"; excludedPackages = [ "tests" ]; @@ -14,7 +14,7 @@ buildGoModule rec { owner = "jgautheron"; repo = "goconst"; rev = "v${version}"; - sha256 = "sha256-pEkwEVnxZ7d10FE1CG5Ym9JBbzZl8mnabzdPg5gfKuo="; + sha256 = "sha256-pvCmCf3ZjhB4lxP6GLO6vnhNswKdNDWgD2YyHmRi6oE="; }; vendorHash = null; diff --git a/pkgs/by-name/go/gocryptfs/package.nix b/pkgs/by-name/go/gocryptfs/package.nix index d894040fd55b..39269c428e47 100644 --- a/pkgs/by-name/go/gocryptfs/package.nix +++ b/pkgs/by-name/go/gocryptfs/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "gocryptfs"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0iCCIAOAzLIeZ+eZYJTVXgOyKIsQnKe/XazFVECZDTM="; + sha256 = "sha256-lDIKMcZLAE1ehijzhpx6G966xzdhusT40Dy06LXBn74="; }; vendorHash = "sha256-WfTJ8TuFupEa391XQMDl3hKTjrmRHJqvYb1haAGHW/U="; diff --git a/pkgs/by-name/go/gofumpt/package.nix b/pkgs/by-name/go/gofumpt/package.nix index 12435ba1918d..13f35f5982b8 100644 --- a/pkgs/by-name/go/gofumpt/package.nix +++ b/pkgs/by-name/go/gofumpt/package.nix @@ -3,28 +3,27 @@ buildGoModule, fetchFromGitHub, nix-update-script, - testers, - gofumpt, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gofumpt"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "mvdan"; - repo = pname; - rev = "v${version}"; - hash = "sha256-mJM0uKztX0OUQvynnxeKL9yft7X/Eh28ERg8SbZC5Ws="; + repo = "gofumpt"; + rev = "v${finalAttrs.version}"; + hash = "sha256-37wYYB0k8mhQq30y1oo77qW3bIqqN/K/NG1RgxK6dyI="; }; - vendorHash = "sha256-kJysyxROvB0eMAHbvNF+VXatEicn4ln2Vqkzp7GDWAQ="; + vendorHash = "sha256-T6/xEXv8+io3XwQ2keacpYYIdTnYhTTUCojf62tTwbA="; env.CGO_ENABLED = "0"; ldflags = [ "-s" - "-X main.version=v${version}" + "-X main.version=v${finalAttrs.version}" ]; checkFlags = [ @@ -32,23 +31,20 @@ buildGoModule rec { "-skip=^TestScript/diagnose$" ]; - passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = gofumpt; - version = "v${version}"; - }; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Stricter gofmt"; homepage = "https://github.com/mvdan/gofumpt"; - changelog = "https://github.com/mvdan/gofumpt/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ + changelog = "https://github.com/mvdan/gofumpt/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ rvolosatovs katexochen ]; mainProgram = "gofumpt"; }; -} +}) diff --git a/pkgs/games/gogdl/default.nix b/pkgs/by-name/go/gogdl/package.nix similarity index 90% rename from pkgs/games/gogdl/default.nix rename to pkgs/by-name/go/gogdl/package.nix index 08161f7f3c1f..267a40076442 100644 --- a/pkgs/games/gogdl/default.nix +++ b/pkgs/by-name/go/gogdl/package.nix @@ -1,15 +1,12 @@ { lib, writeScript, - buildPythonApplication, + python3Packages, fetchFromGitHub, - pythonOlder, - setuptools, - requests, cacert, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "gogdl"; version = "1.1.2"; format = "pyproject"; @@ -21,9 +18,9 @@ buildPythonApplication rec { hash = "sha256-pK6JeTJeBq9qVfflNSYs3s4HuD0Kz6k9DDUVHL81FV0="; }; - disabled = pythonOlder "3.8"; + disabled = python3Packages.pythonOlder "3.8"; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ setuptools requests ]; diff --git a/pkgs/by-name/go/gol/package.nix b/pkgs/by-name/go/gol/package.nix index 2ce3bfd8e370..b71f97318f8d 100644 --- a/pkgs/by-name/go/gol/package.nix +++ b/pkgs/by-name/go/gol/package.nix @@ -8,16 +8,16 @@ maven.buildMavenPackage rec { pname = "gol"; - version = "0.2.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "clarisma"; repo = "gol-tool"; tag = version; - hash = "sha256-jAkBFrtdVsK67n8Oo+/MGPL/JKRsu/6tbqy711exlwo="; + hash = "sha256-roFtoSpNByNVGkl7ESt5O6b4voVzX8Nbow1dI6Sqgss"; }; - mvnHash = "sha256-GCyTk/Lmh41qpCeex/qrN7cgPoNCsmmOKeBYllbtTZk"; + mvnHash = "sha256-lKmoftSkyyb/pIthrsJaZ3p9l5V5K3FdK6sOBoZyhe8"; mvnParameters = "compile assembly:single -Dmaven.test.skip=true"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/go/golangci-lint-langserver/package.nix b/pkgs/by-name/go/golangci-lint-langserver/package.nix index b6695d6ae77e..7a0f959cec5a 100644 --- a/pkgs/by-name/go/golangci-lint-langserver/package.nix +++ b/pkgs/by-name/go/golangci-lint-langserver/package.nix @@ -8,22 +8,19 @@ buildGoModule rec { pname = "golangci-lint-langserver"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "nametake"; repo = "golangci-lint-langserver"; tag = "v${version}"; - hash = "sha256-wNofr/s8K+vbvNZWrQ97g2V0fNAS2P/Zf7tsOmly+gc="; + hash = "sha256-mwYhOUH5PAbPRfP86dw9w6lIZYz/iL+f863XWOhBFy0="; }; - vendorHash = "sha256-SsGw26y/ZIBFp9dBk55ebQgJiLWOFRNe21h6huYE84I="; + vendorHash = "sha256-kbGTORTTxfftdU8ffsfh53nT7wZldOnBZ/1WWzN89Uc="; subPackages = [ "." ]; - # renable after https://github.com/nametake/golangci-lint-langserver/pull/52 - doCheck = false; - nativeCheckInputs = [ golangci-lint writableTmpDirAsHomeHook diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index 4d1517f03fc9..039deb97ab33 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -7,16 +7,16 @@ buildGo124Module rec { pname = "golangci-lint"; - version = "2.0.2"; + version = "2.1.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-+IndC9znKgVGiFWW0aCNjhxPwX1kDFnfG2+SKEQ15Rc="; + hash = "sha256-CAO+oo3l3mlZIiC1Srhc0EfZffQOHvVkamPHzSKRSFw="; }; - vendorHash = "sha256-B6mCvJtIfRbAv6fZ8Ge82nT9oEcL3WR4D+AAVs9R3zM="; + vendorHash = "sha256-2GQp/sgYRlDengx8uy3zzqi9hwHh4CQUHoj1zaxNNLE="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/pkgs/by-name/go/goldboot/package.nix b/pkgs/by-name/go/goldboot/package.nix new file mode 100644 index 000000000000..badc531c25c1 --- /dev/null +++ b/pkgs/by-name/go/goldboot/package.nix @@ -0,0 +1,57 @@ +{ + fetchFromGitHub, + rustPlatform, + lib, + versionCheckHook, + pkg-config, + zstd, + OVMF, + qemu, + qemu-utils, + openssl, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "goldboot"; + version = "0.0.10"; + + src = fetchFromGitHub { + owner = "fossable"; + repo = "goldboot"; + rev = "goldboot-v${finalAttrs.version}"; + hash = "sha256-O9yhyJZpjQxC0HP43RsOgPMOKp6d23SNhMLiGtmwXzs="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-NF0Fj+r6qWcM4VEIm1fzveZuz6MIaG32Z+zBfSMC/t4="; + + buildAndTestSubdir = "goldboot"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + zstd + OVMF + qemu + qemu-utils + openssl + ]; + + # Tests require networking, so skip them for now + doCheck = false; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + mainProgram = "goldboot"; + description = "Immutable infrastructure for the desktop"; + homepage = "https://github.com/fossable/goldboot"; + changelog = "https://github.com/fossable/goldboot/releases/tag/goldboot-v${finalAttrs.version}"; + license = lib.licenses.agpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ cilki ]; + }; +}) diff --git a/pkgs/by-name/go/golds/package.nix b/pkgs/by-name/go/golds/package.nix index c456084e31ad..e83216488c64 100644 --- a/pkgs/by-name/go/golds/package.nix +++ b/pkgs/by-name/go/golds/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "golds"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "go101"; repo = "golds"; tag = "v${version}"; - hash = "sha256-maYkVZlr8VW3nsNLVD+ib8TfltBkDrgWiC7VyeEJIy4="; + hash = "sha256-j6k68+hiXsXW5WLnmbN/iFLFpyU64z/1+DKuaAnNbac="; }; # nixpkgs is not using the go distpack archive and missing a VERSION file in the source diff --git a/pkgs/by-name/go/gollama/package.nix b/pkgs/by-name/go/gollama/package.nix index 6f34784912ca..6441a569cdd1 100644 --- a/pkgs/by-name/go/gollama/package.nix +++ b/pkgs/by-name/go/gollama/package.nix @@ -2,42 +2,31 @@ lib, fetchFromGitHub, buildGoModule, - versionCheckHook, + nix-update-script, }: buildGoModule rec { pname = "gollama"; - version = "1.28.5"; + version = "1.33.0"; src = fetchFromGitHub { owner = "sammcj"; repo = "gollama"; tag = "v${version}"; - hash = "sha256-7wCBflX34prZJl4HhZUU2a2qHxaBs1fMKHpwE0vX1GE="; + hash = "sha256-hgIOOBfE9t1/oUmFvmtHyuWaOgftzxCiT3xmEJ6d45I="; }; - postPatch = '' - substituteInPlace main.go \ - --replace-fail 'Version = "1.28.0"' 'Version = "${version}"' - ''; - - vendorHash = "sha256-Y5yg54em+vqoWXxS3JVQVPEM+fLXgoblmY+48WpxSCQ="; + vendorHash = "sha256-AE3uD9Si4Gm1W+jIvwg9kQFqqgJQLAh7eLPs8qtJAGI="; doCheck = false; - ldFlags = [ + ldflags = [ "-s" "-w" + "-X main.Version=${version}" ]; - # FIXME: error when running `env -i gollama`: - # "Error initializing logging: $HOME is not defined" - doInstallCheck = false; - nativeInstallCheckInputs = [ - versionCheckHook - ]; - - versionCheckProgramArg = "-v"; + passthru.updateScript = nix-update-script { }; meta = { description = "Go manage your Ollama models"; diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix index 35feec1bf524..0555e1bbaa2c 100644 --- a/pkgs/by-name/go/gopeed/package.nix +++ b/pkgs/by-name/go/gopeed/package.nix @@ -8,13 +8,13 @@ }: let - version = "1.6.11"; + version = "1.7.0"; src = fetchFromGitHub { owner = "GopeedLab"; repo = "gopeed"; tag = "v${version}"; - hash = "sha256-ayPqLRWYSa0rSHqGFS4xp3wUVAl4tfsSPs/SQcUQD60="; + hash = "sha256-9xAArQhf1lAWL6mbx6wuGY3xhKAMigpWFrX8P6/olMY="; }; metaCommon = { diff --git a/pkgs/by-name/go/gose/package.nix b/pkgs/by-name/go/gose/package.nix index f61f3d1c8c64..bb227d90e677 100644 --- a/pkgs/by-name/go/gose/package.nix +++ b/pkgs/by-name/go/gose/package.nix @@ -7,13 +7,13 @@ lib, }: let - version = "0.10.2"; + version = "0.10.4"; src = fetchFromGitHub { repo = "gose"; owner = "stv0g"; tag = "v${version}"; - hash = "sha256-xyAOag2/GaIVttTLnx/6ljkpWbJmsOfyYyWzOAHOQ2I="; + hash = "sha256-CYMpibAvuOScKoCP212MSoAt0hhQhEP0uQK7y/YPk9Q="; }; frontend = buildNpmPackage { @@ -37,7 +37,7 @@ buildGoModule { inherit version; inherit src; - vendorHash = "sha256-/Drb5Mxz37rNYfHdydl3z+xvFtjGwuzSsG4gkbx/h1o="; + vendorHash = "sha256-oz2nmJxnmhj2InN4E7tyz5iWr4geraGszz3QePKuEMM="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/go/goshs/package.nix b/pkgs/by-name/go/goshs/package.nix new file mode 100644 index 000000000000..4e22ec4e92d2 --- /dev/null +++ b/pkgs/by-name/go/goshs/package.nix @@ -0,0 +1,50 @@ +{ + buildGoModule, + fetchFromGitHub, + gitUpdater, + stdenv, + versionCheckHook, + lib, +}: + +buildGoModule (finalAttrs: { + pname = "goshs"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "patrickhener"; + repo = "goshs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Sthe19Wb3zBg4kOh+aDC0CxAwMD9+LcNsy6u7qEj+f8="; + }; + + vendorHash = "sha256-+bb+3ZYzRVxRh1WQEKa+WqH29fHErNWaTcHO70wCwPY="; + + ldflags = [ + "-s" + "-w" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + # utils_test.go:62: route ip+net: no such network interface + # does not work in sandbox even with __darwinAllowLocalNetworking + "-skip=^TestGetIPv4Addr$" + ]; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + description = "Simple, yet feature-rich web server written in Go"; + homepage = "https://goshs.de"; + changelog = "https://github.com/patrickhener/goshs/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + fab + matthiasbeyer + seiarotg + ]; + mainProgram = "goshs"; + }; +}) diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix index f666cb2f7e5f..33eec234f389 100644 --- a/pkgs/by-name/go/gossip/package.nix +++ b/pkgs/by-name/go/gossip/package.nix @@ -1,6 +1,5 @@ { cmake, - darwin, fetchFromGitHub, SDL2, ffmpeg_6, @@ -66,14 +65,6 @@ rustPlatform.buildRustPackage rec { libxkbcommon openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.ForceFeedback - darwin.apple_sdk.frameworks.AVFoundation - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland libX11 diff --git a/pkgs/by-name/go/gotestsum/package.nix b/pkgs/by-name/go/gotestsum/package.nix index 810fe5438fe8..11a808c00534 100644 --- a/pkgs/by-name/go/gotestsum/package.nix +++ b/pkgs/by-name/go/gotestsum/package.nix @@ -3,41 +3,36 @@ fetchFromGitHub, buildGoModule, }: -let - version = "1.12.0"; -in -buildGoModule { +buildGoModule (finalAttrs: { pname = "gotestsum"; - - # move back to stable releases when build is successful - version = "${version}-unstable-2024-09-17"; + version = "1.12.1"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; - rev = "2f61a73f997821b2e5a1823496e8362630e213f9"; - hash = "sha256-5zgchATcpoM4g5Mxex9wYanzrR0Pie9GYqx48toORkM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-nIdGon14bAaSxUmJNlpLztQVbA8SJ76+Ve46gbM0awk="; }; - vendorHash = "sha256-DR4AyEhgD71hFFEAnPfSxaWYFFV7FlPugZBHUjDynEE="; + vendorHash = "sha256-x48jjd6cIX/M8U+5QwrKalt1iLgeQKeJItLJsxXrPgY="; doCheck = false; ldflags = [ "-s" "-w" - "-X gotest.tools/gotestsum/cmd.version=${version}" + "-X gotest.tools/gotestsum/cmd.version=${finalAttrs.version}" ]; subPackages = [ "." ]; meta = { homepage = "https://github.com/gotestyourself/gotestsum"; - changelog = "https://github.com/gotestyourself/gotestsum/releases/tag/v${version}"; + changelog = "https://github.com/gotestyourself/gotestsum/releases/tag/v${finalAttrs.version}"; description = "Human friendly `go test` runner"; mainProgram = "gotestsum"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ isabelroses ]; }; -} +}) diff --git a/pkgs/by-name/go/gotify-desktop/package.nix b/pkgs/by-name/go/gotify-desktop/package.nix index 6ebaeef8d379..0f3f652bd45e 100644 --- a/pkgs/by-name/go/gotify-desktop/package.nix +++ b/pkgs/by-name/go/gotify-desktop/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "gotify-desktop"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "desbma"; repo = "gotify-desktop"; rev = version; - sha256 = "sha256-P6zZAd3381/JamrEdbZRVFouhDsPNy1cNAjy4K3jGro="; + sha256 = "sha256-QhzvY7MeOvrL+xxeV7gPXWRo3EinMMdS9A7oh38gYjU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-od8eaOwf5k//HuzD4CNCOu8JGJv1P1TJTW0shgEnFDc="; + cargoHash = "sha256-fNOC8atr5/LgQcGf9jdxec9AQt3YIR+hem/xL10YYqY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix index 2fd26d1dd832..a504f94d7693 100644 --- a/pkgs/by-name/gp/gpauth/package.nix +++ b/pkgs/by-name/gp/gpauth/package.nix @@ -2,7 +2,6 @@ rustPlatform, lib, fetchFromGitHub, - libsoup_2_4, openssl, pkg-config, perl, @@ -29,7 +28,6 @@ rustPlatform.buildRustPackage rec { pkg-config ]; buildInputs = [ - libsoup_2_4 openssl webkitgtk_4_1 ]; diff --git a/pkgs/by-name/gp/gpredict-unstable/package.nix b/pkgs/by-name/gp/gpredict-unstable/package.nix new file mode 100644 index 000000000000..b048563a747b --- /dev/null +++ b/pkgs/by-name/gp/gpredict-unstable/package.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitHub, + goocanvas3, + nix-update-script, + gpredict, +}: + +(gpredict.override { + goocanvas2 = goocanvas3; +}).overrideAttrs + (finalAttrs: { + # Next version is 2.4.0 + version = "2.4.0-unstable-2024-09-17"; + + src = fetchFromGitHub { + owner = "csete"; + repo = "gpredict"; + rev = "91a4a3fb15e7eab0374d1bb7c859d386818b48ee"; + hash = "sha256-/XCJ+jCSY4o0OLVVY6OGvnmMw6aI/iQOhjyLYWPj7Ec="; + }; + + patches = [ ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + }) diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/by-name/gp/gpredict/package.nix similarity index 92% rename from pkgs/applications/science/astronomy/gpredict/default.nix rename to pkgs/by-name/gp/gpredict/package.nix index 7f0e0836d9ca..efefa509f622 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/by-name/gp/gpredict/package.nix @@ -11,18 +11,18 @@ curl, goocanvas2, gpsd, - hamlib, + hamlib_4, wrapGAppsHook3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gpredict"; version = "2.2.1"; src = fetchFromGitHub { owner = "csete"; repo = "gpredict"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+hgjImfT3nWMBYwde7+KC/hzd84pwQbpoJvaJSNG4E8="; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { gtk3 goocanvas2 gpsd - hamlib + hamlib_4 ]; meta = { @@ -69,12 +69,13 @@ stdenv.mkDerivation rec { well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the NORAD Keplerian elements. ''; - license = lib.licenses.gpl2Only; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; homepage = "http://gpredict.oz9aec.net/"; maintainers = with lib.maintainers; [ markuskowa cmcdragonkai + pandapip1 ]; }; -} +}) diff --git a/pkgs/by-name/gp/gpsd/package.nix b/pkgs/by-name/gp/gpsd/package.nix index adcde9cc1d97..553f2780c448 100644 --- a/pkgs/by-name/gp/gpsd/package.nix +++ b/pkgs/by-name/gp/gpsd/package.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation rec { patches = [ ./sconstruct-env-fixes.patch + ./sconstrict-rundir-fixes.patch # fix build with Python 3.12 (fetchpatch { diff --git a/pkgs/by-name/gp/gpsd/sconstrict-rundir-fixes.patch b/pkgs/by-name/gp/gpsd/sconstrict-rundir-fixes.patch new file mode 100644 index 000000000000..386211198b65 --- /dev/null +++ b/pkgs/by-name/gp/gpsd/sconstrict-rundir-fixes.patch @@ -0,0 +1,21 @@ +diff -Naur gpsd-3.25.orig/SConscript gpsd-3.25/SConscript +--- gpsd-3.25.orig/SConscript 2025-03-29 13:33:34 ++++ gpsd-3.25/SConscript 2025-03-29 13:34:24 +@@ -15,6 +15,7 @@ + import os + import pickle + import re ++import platform + # replacement for functions from the commands module, which is deprecated. + import subprocess + import sys +@@ -399,7 +400,7 @@ + def_group = "dialout" + + # darwin and BSDs do not have /run, maybe others. +-if os.path.exists("/run"): ++if "BSD" in os.uname().sysname or platform.system() == "Darwin": + rundir = "/run" + else: + rundir = "/var/run" + \ No newline at end of file diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix index 2f128bb06305..a5a56b609a87 100644 --- a/pkgs/by-name/gp/gptscript/package.nix +++ b/pkgs/by-name/gp/gptscript/package.nix @@ -2,8 +2,6 @@ lib, buildGoModule, fetchFromGitHub, - darwin, - stdenv, }: buildGoModule rec { pname = "gptscript"; @@ -18,8 +16,6 @@ buildGoModule rec { vendorHash = "sha256-ajglXWGJhSJtcrbSBmxmriXFTT+Vb4xYq0Ec9SYRlQk="; - propagatedBuildInputs = with darwin; lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/gq/gql/package.nix b/pkgs/by-name/gq/gql/package.nix index 1891f035c073..a8a37f7028dd 100644 --- a/pkgs/by-name/gq/gql/package.nix +++ b/pkgs/by-name/gq/gql/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-5n95+BcdjdjZyT3fvRv8acPV3jK9IppsKklI0zuA5mw="; + hash = "sha256-/cTU+LBoXnMzNKd18nYoGkEN/cfUVQIDFBFQNrmdWuM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-2JaPT/83672qnF2y3YKFhnQ/hNQ/GXnHfRcQIn0rnc8="; + cargoHash = "sha256-4sdbTcDDvA7MYMiTKKAWg0sYnBPeVj3eBCo7HTZYkUY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gq/gqlgenc/package.nix b/pkgs/by-name/gq/gqlgenc/package.nix index 760f744e5d55..76a829dd2fd6 100644 --- a/pkgs/by-name/gq/gqlgenc/package.nix +++ b/pkgs/by-name/gq/gqlgenc/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-RGHfDrFr2HO4i+YQeNzYrEcU+Xe286f3f5g/yUmpxpA="; + sha256 = "sha256-3Qz1o91IPKjhzIYzKcdl456AWn6nsrcQ04VglBlpe54="; }; excludedPackages = [ "example" ]; - vendorHash = "sha256-h3ePmfRkGqVXdtjX2cU5y2HnX+VkmTWNwrEkhLAmrlU="; + vendorHash = "sha256-Ax5MA4wqQdXSDEIkiG5TcvFIN6YtyXuiJOdQGPYIb+Y="; meta = with lib; { description = "Go tool for building GraphQL client with gqlgen"; diff --git a/pkgs/by-name/gr/graphw00f/package.nix b/pkgs/by-name/gr/graphw00f/package.nix index f77d33c1540e..35560b8b7149 100644 --- a/pkgs/by-name/gr/graphw00f/package.nix +++ b/pkgs/by-name/gr/graphw00f/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "graphw00f"; - version = "1.1.19"; + version = "1.2.1"; format = "other"; src = fetchFromGitHub { owner = "dolevf"; repo = "graphw00f"; tag = version; - hash = "sha256-w2iVgs3WnEYCiCfwxB/HcwNRoWTlLfVJIzfp1VbrQXA="; + hash = "sha256-8fOvcc//UdDawgGMAhbYQ/O5kd1l2skWGDlFNYocNY8="; }; dependencies = with python3.pkgs; [ requests ]; diff --git a/pkgs/by-name/gr/grayjay/deps.json b/pkgs/by-name/gr/grayjay/deps.json new file mode 100644 index 000000000000..d525290b1b91 --- /dev/null +++ b/pkgs/by-name/gr/grayjay/deps.json @@ -0,0 +1,1037 @@ +[ + { + "pname": "coverlet.collector", + "version": "3.1.2", + "hash": "sha256-v7ZoEFZyhF8VcRZj1uim4HNiRsG+XdJ4x/dwPBIWUz8=" + }, + { + "pname": "coverlet.collector", + "version": "6.0.0", + "hash": "sha256-IEmweTMapcPhFHpmJsPXfmMhravYOrWupgjeOvMmQ4o=" + }, + { + "pname": "Dapper", + "version": "2.1.28", + "hash": "sha256-qCbqEwIB/j6HToEPpDEdQGGIPGQNmrULrCHnEGZSd5c=" + }, + { + "pname": "Fizzler", + "version": "1.2.0", + "hash": "sha256-lHoNw1Ze197Tkhlpg4QjX5wC0Xmeu7TUKBTzEineE60=" + }, + { + "pname": "Fizzler.Systems.HtmlAgilityPack", + "version": "1.2.1", + "hash": "sha256-ov8Kc3nBcRxk0I+WPR11QFlD1607ck31M+37SjIElbc=" + }, + { + "pname": "Google.Protobuf", + "version": "3.25.3", + "hash": "sha256-uG40xD6QkxoTOaTYfBAeVOIPE38qlbCa2RxUzOH0HLE=" + }, + { + "pname": "HtmlAgilityPack", + "version": "1.11.58", + "hash": "sha256-VCrBPH6Waw3LmZEKStBSd5uSH2vicndwYazYX6IdnYE=" + }, + { + "pname": "libsodium", + "version": "1.0.20", + "hash": "sha256-BsitQQnUSm1YupzI5N/LFx0kPFdk1FP8VdM1S3uttvs=" + }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "9.0.0", + "hash": "sha256-BsXNOWEgfFq3Yz7VTtK6m/ov4/erRqyBzieWSIpmc1U=" + }, + { + "pname": "Microsoft.ClearScript.Core", + "version": "7.4.5", + "hash": "sha256-6wRLv+fbo2SF9irQ8BwmUR7JcQAlyEk1Dov+teSXY+E=" + }, + { + "pname": "Microsoft.ClearScript.V8", + "version": "7.4.5", + "hash": "sha256-MXl1n1RF6z95IbpXmSGAwraP8EpvPli16ySFGfc/ZxY=" + }, + { + "pname": "Microsoft.ClearScript.V8.ICUData", + "version": "7.4.5", + "hash": "sha256-54bbiVJoXDrePISZHuEcOax+kgyaIftL684bt3EgYy8=" + }, + { + "pname": "Microsoft.ClearScript.V8.Native.linux-x64", + "version": "7.4.5", + "hash": "sha256-MCRTRO7WiWnWYdvYSwv1kvZakcVcvckio98SJLhYgoM=" + }, + { + "pname": "Microsoft.ClearScript.V8.Native.osx-arm64", + "version": "7.4.5", + "hash": "sha256-SbcABxK8rPIE6SV1JBP2U3FYmrgaY7iB9sFQKNLyAVs=" + }, + { + "pname": "Microsoft.ClearScript.V8.Native.osx-x64", + "version": "7.4.5", + "hash": "sha256-IvttjtyJXWVhuJNkqqxNpLwM3WtljHuHSaKtSkblAqE=" + }, + { + "pname": "Microsoft.ClearScript.V8.Native.win-x64", + "version": "7.4.3", + "hash": "sha256-8lRSVozrki7h64MIgP6v0VWEV1fR1op+hjHd8S4nJ88=" + }, + { + "pname": "Microsoft.ClearScript.V8.Native.win-x64", + "version": "7.4.5", + "hash": "sha256-WF4K7g1w510viiXHJJjKQrsD/mvb99tF76yBCljN1Qw=" + }, + { + "pname": "Microsoft.CodeCoverage", + "version": "17.3.2", + "hash": "sha256-APxmbKMNQKWuFQMJjkVr2zIqv/bLUTMm5NRGVLegBbg=" + }, + { + "pname": "Microsoft.CodeCoverage", + "version": "17.6.0", + "hash": "sha256-sYk+9Gj1M1HI6yEB8ZJQ4fiqGjYos+orebV8blFDSQs=" + }, + { + "pname": "Microsoft.CSharp", + "version": "4.0.1", + "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8=" + }, + { + "pname": "Microsoft.CSharp", + "version": "4.3.0", + "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8=" + }, + { + "pname": "Microsoft.CSharp", + "version": "4.7.0", + "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" + }, + { + "pname": "Microsoft.Data.Sqlite", + "version": "8.0.1", + "hash": "sha256-2yNZYPTdqYRss9OqC40RjOL7HSXK97p9awIDd/MrRPk=" + }, + { + "pname": "Microsoft.Data.Sqlite.Core", + "version": "8.0.1", + "hash": "sha256-H3yveFzvMNKKVnEIa1bvqb2q2MKxS9Am+fsk3KX298Y=" + }, + { + "pname": "Microsoft.NET.Test.Sdk", + "version": "17.3.2", + "hash": "sha256-1fZ/rrSbuyYUfvwyA3otFQdL0Y/H48goAVyhiLs1oF4=" + }, + { + "pname": "Microsoft.NET.Test.Sdk", + "version": "17.6.0", + "hash": "sha256-pogseJyMGIikTZORsDXKwyAhRPTkxiOAAV+ceR6/3K4=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.0.1", + "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.0.1", + "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.3.2", + "hash": "sha256-wdLQSEjvFjApEKU82Ev+y1kHVxeIlrjkuj3wNktGQy8=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.6.0", + "hash": "sha256-weQPisiWSuM5VEeZco4S0QHEXd2bZZwlbyHoaCET4uc=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "17.3.2", + "hash": "sha256-ySBqawHGZ/Dwoj2UnAzk1Ezxt4qR1AuEY73U/buqNiE=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "17.6.0", + "hash": "sha256-Ee2SKz5/571l1aYP0b/Gfamsz+v6cjzyu2sKTC6Ld5s=" + }, + { + "pname": "Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" + }, + { + "pname": "Microsoft.Win32.Registry", + "version": "5.0.0", + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" + }, + { + "pname": "MSTest.TestAdapter", + "version": "2.2.10", + "hash": "sha256-xpt9NDMDkoV/SzTWLgpKbqMOnhbUKZlBrdFwMGwpzHA=" + }, + { + "pname": "MSTest.TestAdapter", + "version": "3.0.4", + "hash": "sha256-cxynZ6I681YIclJeGtv1OiAxMOdx7FDyVIzNOg10Tgo=" + }, + { + "pname": "MSTest.TestFramework", + "version": "2.2.10", + "hash": "sha256-PEoY4N5F+xhQa6wXiX8SaVHAxw9C7fN+zSNfoModt0g=" + }, + { + "pname": "MSTest.TestFramework", + "version": "3.0.4", + "hash": "sha256-aJqGvGfM2fl2dG05PFgPth/1qMhVpDRBMWuNu4yt4Dc=" + }, + { + "pname": "NETStandard.Library", + "version": "1.6.1", + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" + }, + { + "pname": "Newtonsoft.Json", + "version": "10.0.3", + "hash": "sha256-WEHCjp+OMr5axXQjFsh7TMDE/ttE35nMv5RBPdcxfhs=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.1", + "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" + }, + { + "pname": "Newtonsoft.Json", + "version": "9.0.1", + "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU=" + }, + { + "pname": "NuGet.Frameworks", + "version": "5.11.0", + "hash": "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM=" + }, + { + "pname": "runtime.any.System.Collections", + "version": "4.3.0", + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" + }, + { + "pname": "runtime.any.System.Globalization", + "version": "4.3.0", + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" + }, + { + "pname": "runtime.any.System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" + }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" + }, + { + "pname": "runtime.any.System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.any.System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" + }, + { + "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" + }, + { + "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" + }, + { + "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.native.System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" + }, + { + "pname": "runtime.native.System.Net.Http", + "version": "4.3.0", + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" + }, + { + "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" + }, + { + "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" + }, + { + "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" + }, + { + "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" + }, + { + "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" + }, + { + "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" + }, + { + "pname": "runtime.unix.Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" + }, + { + "pname": "runtime.unix.System.Console", + "version": "4.3.0", + "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" + }, + { + "pname": "runtime.unix.System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" + }, + { + "pname": "runtime.unix.System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" + }, + { + "pname": "runtime.unix.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" + }, + { + "pname": "runtime.unix.System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "runtime.unix.System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" + }, + { + "pname": "SQLitePCLRaw.bundle_e_sqlite3", + "version": "2.1.6", + "hash": "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718=" + }, + { + "pname": "SQLitePCLRaw.core", + "version": "2.1.6", + "hash": "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E=" + }, + { + "pname": "SQLitePCLRaw.lib.e_sqlite3", + "version": "2.1.6", + "hash": "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0=" + }, + { + "pname": "SQLitePCLRaw.provider.e_sqlite3", + "version": "2.1.6", + "hash": "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8=" + }, + { + "pname": "System.AppContext", + "version": "4.3.0", + "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" + }, + { + "pname": "System.Buffers", + "version": "4.3.0", + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" + }, + { + "pname": "System.Buffers", + "version": "4.5.1", + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" + }, + { + "pname": "System.Collections", + "version": "4.0.11", + "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0=" + }, + { + "pname": "System.Collections", + "version": "4.3.0", + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" + }, + { + "pname": "System.Collections.Concurrent", + "version": "4.3.0", + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" + }, + { + "pname": "System.Collections.NonGeneric", + "version": "4.3.0", + "hash": "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8=" + }, + { + "pname": "System.Collections.Specialized", + "version": "4.3.0", + "hash": "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk=" + }, + { + "pname": "System.ComponentModel", + "version": "4.3.0", + "hash": "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU=" + }, + { + "pname": "System.ComponentModel.Primitives", + "version": "4.3.0", + "hash": "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus=" + }, + { + "pname": "System.ComponentModel.TypeConverter", + "version": "4.3.0", + "hash": "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54=" + }, + { + "pname": "System.Console", + "version": "4.3.0", + "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.0.11", + "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.3.0", + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" + }, + { + "pname": "System.Diagnostics.TextWriterTraceListener", + "version": "4.3.0", + "hash": "sha256-gx3IHPvPNRmwpLwtswu12U/ow4f/7OPAeHxyMxw5qyU=" + }, + { + "pname": "System.Diagnostics.Tools", + "version": "4.0.1", + "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U=" + }, + { + "pname": "System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" + }, + { + "pname": "System.Diagnostics.TraceSource", + "version": "4.3.0", + "hash": "sha256-xpxwaXsRcgso8Gj0cqY4+Hvvz6vZkmEMh5/J204j3M8=" + }, + { + "pname": "System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" + }, + { + "pname": "System.Dynamic.Runtime", + "version": "4.0.11", + "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4=" + }, + { + "pname": "System.Dynamic.Runtime", + "version": "4.3.0", + "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU=" + }, + { + "pname": "System.Globalization", + "version": "4.0.11", + "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw=" + }, + { + "pname": "System.Globalization", + "version": "4.3.0", + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" + }, + { + "pname": "System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" + }, + { + "pname": "System.Globalization.Extensions", + "version": "4.3.0", + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" + }, + { + "pname": "System.IO", + "version": "4.1.0", + "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw=" + }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, + { + "pname": "System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" + }, + { + "pname": "System.IO.Compression.ZipFile", + "version": "4.3.0", + "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" + }, + { + "pname": "System.IO.FileSystem", + "version": "4.0.1", + "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" + }, + { + "pname": "System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.0.1", + "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.3.0", + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" + }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.0", + "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0=" + }, + { + "pname": "System.Linq", + "version": "4.1.0", + "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794=" + }, + { + "pname": "System.Linq", + "version": "4.3.0", + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" + }, + { + "pname": "System.Linq.Expressions", + "version": "4.1.0", + "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4=" + }, + { + "pname": "System.Linq.Expressions", + "version": "4.3.0", + "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" + }, + { + "pname": "System.Memory", + "version": "4.5.3", + "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" + }, + { + "pname": "System.Memory", + "version": "4.5.4", + "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E=" + }, + { + "pname": "System.Memory", + "version": "4.5.5", + "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" + }, + { + "pname": "System.Net.Http", + "version": "4.3.0", + "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" + }, + { + "pname": "System.Net.NameResolution", + "version": "4.3.0", + "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" + }, + { + "pname": "System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.4.0", + "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" + }, + { + "pname": "System.ObjectModel", + "version": "4.0.12", + "hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s=" + }, + { + "pname": "System.ObjectModel", + "version": "4.3.0", + "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + }, + { + "pname": "System.Reflection", + "version": "4.1.0", + "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs=" + }, + { + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.0.1", + "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.3.0", + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.0.1", + "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.3.0", + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.0.1", + "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.3.0", + "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" + }, + { + "pname": "System.Reflection.Extensions", + "version": "4.0.1", + "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ=" + }, + { + "pname": "System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "1.6.0", + "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.0.1", + "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Reflection.TypeExtensions", + "version": "4.1.0", + "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4=" + }, + { + "pname": "System.Reflection.TypeExtensions", + "version": "4.3.0", + "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.0.1", + "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" + }, + { + "pname": "System.Runtime", + "version": "4.1.0", + "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "4.5.3", + "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.1.0", + "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.0.1", + "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.1.0", + "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" + }, + { + "pname": "System.Runtime.InteropServices.RuntimeInformation", + "version": "4.3.0", + "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" + }, + { + "pname": "System.Runtime.Numerics", + "version": "4.3.0", + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" + }, + { + "pname": "System.Runtime.Serialization.Formatters", + "version": "4.3.0", + "hash": "sha256-Feic7MGKVG4imh7kpLkPHmApQzYjq7SxHnazh2wZkoQ=" + }, + { + "pname": "System.Runtime.Serialization.Primitives", + "version": "4.1.1", + "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA=" + }, + { + "pname": "System.Runtime.Serialization.Primitives", + "version": "4.3.0", + "hash": "sha256-zu5m1M9usend+i9sbuD6Xbizdo8Z6N5PEF9DAtEVewc=" + }, + { + "pname": "System.Security.AccessControl", + "version": "5.0.0", + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" + }, + { + "pname": "System.Security.Claims", + "version": "4.3.0", + "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.3.0", + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.3.0", + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.3.0", + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.3.0", + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" + }, + { + "pname": "System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" + }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.3.0", + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Security.Cryptography.X509Certificates", + "version": "4.3.0", + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + }, + { + "pname": "System.Security.Principal", + "version": "4.3.0", + "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.3.0", + "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "5.0.0", + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.0.11", + "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encoding.Extensions", + "version": "4.0.11", + "hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI=" + }, + { + "pname": "System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "9.0.0", + "hash": "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0=" + }, + { + "pname": "System.Text.Json", + "version": "9.0.0", + "hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk=" + }, + { + "pname": "System.Text.RegularExpressions", + "version": "4.1.0", + "hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c=" + }, + { + "pname": "System.Text.RegularExpressions", + "version": "4.3.0", + "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" + }, + { + "pname": "System.Threading", + "version": "4.0.11", + "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac=" + }, + { + "pname": "System.Threading", + "version": "4.3.0", + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.0.11", + "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.0.0", + "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.3.0", + "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.5.4", + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + }, + { + "pname": "System.Threading.ThreadPool", + "version": "4.3.0", + "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" + }, + { + "pname": "System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" + }, + { + "pname": "System.Xml.ReaderWriter", + "version": "4.0.11", + "hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA=" + }, + { + "pname": "System.Xml.ReaderWriter", + "version": "4.3.0", + "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" + }, + { + "pname": "System.Xml.XDocument", + "version": "4.0.11", + "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg=" + }, + { + "pname": "System.Xml.XDocument", + "version": "4.3.0", + "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" + }, + { + "pname": "System.Xml.XmlDocument", + "version": "4.3.0", + "hash": "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4=" + }, + { + "pname": "ZstdNet", + "version": "1.4.5", + "hash": "sha256-8ilfyR4ajq9hXTgsZQbvfFW0T00BfW5Cv77B4qKCNlw=" + } +] diff --git a/pkgs/by-name/gr/grayjay/package.nix b/pkgs/by-name/gr/grayjay/package.nix new file mode 100644 index 000000000000..52ee039d8c9a --- /dev/null +++ b/pkgs/by-name/gr/grayjay/package.nix @@ -0,0 +1,191 @@ +{ + buildDotnetModule, + fetchFromGitLab, + dotnetCorePackages, + buildNpmPackage, + lib, + libz, + icu, + openssl, + xorg, + gtk3, + glib, + nss, + nspr, + dbus, + atk, + cups, + libdrm, + expat, + libxkbcommon, + pango, + cairo, + udev, + alsa-lib, + mesa, + libGL, + libsecret, + nix-update-script, + autoPatchelfHook, + makeDesktopItem, + copyDesktopItems, + libgcc, + krb5, + wrapGAppsHook3, +}: +let + version = "5"; + src = fetchFromGitLab { + domain = "gitlab.futo.org"; + owner = "videostreaming"; + repo = "Grayjay.Desktop"; + tag = version; + hash = "sha256-xrbYghNymny6MQrvFn++GaI+kUoOphPQMWcqH47U1Yg="; + fetchSubmodules = true; + fetchLFS = true; + }; + frontend = buildNpmPackage { + name = "grayjay-frontend"; + inherit version src; + + sourceRoot = "source/Grayjay.Desktop.Web"; + + npmBuildScript = "build"; + npmDepsHash = "sha256-pTEbMSAJwTY6ZRriPWfBFnRHSYufSsD0d+hWGz35xFM="; + + installPhase = '' + runHook preInstall + cp -r dist/ $out + runHook postInstall + ''; + }; +in +buildDotnetModule { + pname = "grayjay"; + + inherit version src frontend; + + buildInputs = [ + openssl + libgcc + xorg.libX11 + gtk3 + glib + alsa-lib + mesa + nspr + nss + icu + krb5 + ]; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook3 + copyDesktopItems + ]; + + dontWrapGApps = true; + + desktopItems = [ + (makeDesktopItem { + name = "Grayjay"; + exec = "Grayjay"; + icon = "grayjay"; + comment = "Cross platform media application for streaming and downloading media"; + desktopName = "Grayjay Desktop"; + categories = [ "Network" ]; + }) + ]; + + projectFile = [ + "Grayjay.ClientServer/Grayjay.ClientServer.csproj" + "Grayjay.Engine/Grayjay.Engine/Grayjay.Engine.csproj" + "Grayjay.Desktop.CEF/Grayjay.Desktop.CEF.csproj" + "FUTO.MDNS/FUTO.MDNS/FUTO.MDNS.csproj" + "JustCef/DotCef.csproj" + ]; + + testProjectFile = [ + "Grayjay.Desktop.Tests/Grayjay.Desktop.Tests.csproj" + "Grayjay.Engine/Grayjay.Engine.Tests/Grayjay.Engine.Tests.csproj" + ]; + + nugetDeps = ./deps.json; + + dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; + + executables = [ "Grayjay" ]; + + preBuild = '' + rm -r Grayjay.ClientServer/wwwroot/web + cp -r ${frontend} Grayjay.ClientServer/wwwroot/web + ''; + + postInstall = '' + chmod +x $out/lib/grayjay/cef/dotcefnative + chmod +x $out/lib/grayjay/ffmpeg + rm $out/lib/grayjay/Portable + ln -s /tmp/grayjay-launch $out/lib/grayjay/launch + ln -s /tmp/grayjay-cef-launch $out/lib/grayjay/cef/launch + mkdir -p $out/share/icons/hicolor/scalable/apps + ln -s $out/lib/grayjay/grayjay.png $out/share/icons/hicolor/scalable/apps/grayjay.png + ''; + + makeWrapperArgs = [ + "--chdir" + "${placeholder "out"}/lib/grayjay" + ]; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + runtimeDeps = [ + libz + + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxcb + + dbus + atk + cups + libdrm + expat + libxkbcommon + pango + cairo + udev + libGL + libsecret + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "frontend" + "--url" + "https://github.com/futo-org/Grayjay.Desktop" + ]; + }; + + meta = { + description = "Cross-platform application to stream and download content from various sources"; + longDescription = '' + Grayjay is a cross-platform application that enables users to + stream and download multimedia content from various online sources, + most prominently YouTube. + It also offers an extensible plugin API to create and import new + integrations. + ''; + homepage = "https://grayjay.app/desktop/"; + license = lib.licenses.sfl; + maintainers = with lib.maintainers; [ samfundev ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "Grayjay"; + }; +} diff --git a/pkgs/by-name/gr/gridlock/package.nix b/pkgs/by-name/gr/gridlock/package.nix index fc65506c631e..5f609d110b22 100644 --- a/pkgs/by-name/gr/gridlock/package.nix +++ b/pkgs/by-name/gr/gridlock/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage { @@ -31,13 +29,9 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; postInstall = '' moveToOutput bin/nyarr $nyarr diff --git a/pkgs/by-name/gr/grig/0001-Fix-grig-for-hamlib-4.6.x.patch b/pkgs/by-name/gr/grig/0001-Fix-grig-for-hamlib-4.6.x.patch new file mode 100644 index 000000000000..2ddbeb767705 --- /dev/null +++ b/pkgs/by-name/gr/grig/0001-Fix-grig-for-hamlib-4.6.x.patch @@ -0,0 +1,56 @@ +diff --git a/src/main.c b/src/main.c +index d16a7f7..2c596e9 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -125,7 +125,7 @@ static gint grig_app_delete (GtkWidget *, GdkEvent *, gpointer); + static void grig_app_destroy (GtkWidget *, gpointer); + static void grig_show_help (void); + static void grig_show_version (void); +-static gint grig_list_add (const struct rig_caps *, void *); ++static gint grig_list_add (struct rig_caps *, void *); + static gint grig_list_compare (gconstpointer, gconstpointer); + static void grig_sig_handler (int sig); + +@@ -729,7 +729,7 @@ grig_list_rigs () + * \sa grig_list_rigs, grig_list_compare + */ + static gint +-grig_list_add (const struct rig_caps *caps, void *array) ++grig_list_add (struct rig_caps *caps, void *array) + { + grig_rig_info_t *info; + +diff --git a/src/rig-selector.c b/src/rig-selector.c +index 425d41a..e040c0e 100644 +--- a/src/rig-selector.c ++++ b/src/rig-selector.c +@@ -46,7 +46,7 @@ static void add (GtkWidget *, gpointer); + static void delete (GtkWidget *, gpointer); + static void edit (GtkWidget *, gpointer); + static void cancel (GtkWidget *, gpointer); +-static void connect (GtkWidget *, gpointer); ++static void connectrig (GtkWidget *, gpointer); + static void selection_changed (GtkTreeSelection *sel, gpointer data); + + static void render_civ (GtkTreeViewColumn *col, +@@ -191,7 +191,7 @@ rig_selector_execute () + g_signal_connect (G_OBJECT (cancbut), "clicked", + G_CALLBACK (cancel), window); + g_signal_connect (G_OBJECT (conbut), "clicked", +- G_CALLBACK (connect), window); ++ G_CALLBACK (connectrig), window); + g_signal_connect (G_OBJECT (delbut), "clicked", + G_CALLBACK (delete), NULL); + g_signal_connect (G_OBJECT (newbut), "clicked", +@@ -439,7 +439,7 @@ static void cancel (GtkWidget *button, gpointer window) + * simply destroys the rig selector window and whereby control is returned + * to the main() function. + */ +-static void connect (GtkWidget *button, gpointer window) ++static void connectrig (GtkWidget *button, gpointer window) + { + + +-- +2.47.0 + diff --git a/pkgs/by-name/gr/grig/package.nix b/pkgs/by-name/gr/grig/package.nix index 189eaeaa3639..d6dfabd09375 100644 --- a/pkgs/by-name/gr/grig/package.nix +++ b/pkgs/by-name/gr/grig/package.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-OgIgHW9NMW/xSSti3naIR8AQWUtNSv5bYdOcObStBlM="; }; + patches = [ + # https://github.com/fillods/grig/issues/22 + ./0001-Fix-grig-for-hamlib-4.6.x.patch + ]; + nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/by-name/gr/grpc-client-cli/package.nix b/pkgs/by-name/gr/grpc-client-cli/package.nix index c1a9082d3262..553163ec721c 100644 --- a/pkgs/by-name/gr/grpc-client-cli/package.nix +++ b/pkgs/by-name/gr/grpc-client-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grpc-client-cli"; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "vadimi"; repo = "grpc-client-cli"; rev = "v${version}"; - sha256 = "sha256-+Njo3cqqWhQMYsO7VLScPemmBMCf55khzLqBmODqEng="; + sha256 = "sha256-SypJITKuB9oYRy40XiyrVMJAD4GVgEK2uTDuxbvazPk="; }; - vendorHash = "sha256-iZh/Ax9Gf3YNUgk2vNvTewuq97nUE3POaOb9/poVrCY="; + vendorHash = "sha256-ZHHK/wI1TZwIqqPuwvZNFDcICC9tEMHAo1feBWEyql4="; meta = with lib; { description = "generic gRPC command line client"; diff --git a/pkgs/games/gshogi/default.nix b/pkgs/by-name/gs/gshogi/package.nix similarity index 100% rename from pkgs/games/gshogi/default.nix rename to pkgs/by-name/gs/gshogi/package.nix diff --git a/pkgs/by-name/gt/gtree/package.nix b/pkgs/by-name/gt/gtree/package.nix index 03a40721b2f5..48b27869537a 100644 --- a/pkgs/by-name/gt/gtree/package.nix +++ b/pkgs/by-name/gt/gtree/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gtree"; - version = "1.11.3"; + version = "1.11.4"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-VGlSc0NMl1yMoqLyIwxJn1s24Uw2DAv4BO2hM/7ffXA="; + hash = "sha256-a2kQVn/3PyGZliPOB/2hFULK+YJBv7JVv0p7cbmfsN0="; }; - vendorHash = "sha256-F4obYTU8LNsrNZtgFSf1A1a2N5aG2U94cXr91uVJT4s="; + vendorHash = "sha256-ARmyA8qYKv8xTmpaN77D/NlBfFJFVTGudpBeQG5apso="; subPackages = [ "cmd/gtree" diff --git a/pkgs/by-name/gu/gum/package.nix b/pkgs/by-name/gu/gum/package.nix index e242ac853313..a9d90274c258 100644 --- a/pkgs/by-name/gu/gum/package.nix +++ b/pkgs/by-name/gu/gum/package.nix @@ -23,11 +23,17 @@ buildGoModule rec { installShellFiles ]; - ldflags = [ - "-s" - "-w" - "-X=main.Version=${version}" - ]; + ldflags = + [ + "-s" + "-w" + "-X=main.Version=${version}" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic) [ + "-linkmode=external" + "-extldflags" + "-static" + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' $out/bin/gum man > gum.1 diff --git a/pkgs/by-name/gu/gurk-rs/package.nix b/pkgs/by-name/gu/gurk-rs/package.nix index 5d15310837aa..c58d34f1765c 100644 --- a/pkgs/by-name/gu/gurk-rs/package.nix +++ b/pkgs/by-name/gu/gurk-rs/package.nix @@ -4,7 +4,6 @@ protobuf, rustPlatform, fetchFromGitHub, - darwin, pkgsBuildHost, openssl, pkg-config, @@ -14,9 +13,6 @@ gurk-rs, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in rustPlatform.buildRustPackage rec { pname = "gurk-rs"; version = "0.6.4"; @@ -41,7 +37,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + buildInputs = [ openssl ]; NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-framework" diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 5afdcbeab9aa..c7f280a5b3a5 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0.20250130"; + version = "2.3.0.20250421"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "26b116e9536be8cf07036185e3edf9d721c9bac2"; - sha256 = "sha256-WjsUUnSs3kXjAmh+V/lzL1QlxxXNCph99UsC29YAirQ="; + rev = "be7c58007376d5a01f20400ca54bb8db01528ccd"; + sha256 = "sha256-ewuTRdDtAQF1z/r0ukkaCaNS5gOFgykGvuqUmocEsBg="; }; outputs = [ diff --git a/pkgs/by-name/ha/halp/package.nix b/pkgs/by-name/ha/halp/package.nix index d90f793c3a7f..c4c2703b91ce 100644 --- a/pkgs/by-name/ha/halp/package.nix +++ b/pkgs/by-name/ha/halp/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, installShellFiles, stdenv, - darwin, unixtools, }: @@ -31,10 +30,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - nativeCheckInputs = [ unixtools.script ]; diff --git a/pkgs/by-name/ha/handbrake/package.nix b/pkgs/by-name/ha/handbrake/package.nix index 46153f48d145..679c110e9044 100644 --- a/pkgs/by-name/ha/handbrake/package.nix +++ b/pkgs/by-name/ha/handbrake/package.nix @@ -58,8 +58,6 @@ libdvdnav, libdvdcss, libbluray, - # Darwin-specific - darwin, # GTK # NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus, # which in turn depends on systemd. systemd is not supported on Darwin, so @@ -87,12 +85,6 @@ }: let - inherit (darwin.apple_sdk.frameworks) - AudioToolbox - Foundation - VideoToolbox - ; - inherit (darwin) libobjc; version = "1.9.2"; src = fetchFromGitHub { @@ -295,12 +287,6 @@ let udev ] ++ optional useFdk fdk_aac - ++ optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - Foundation - libobjc - VideoToolbox - ] # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, # look at ./make/configure.py search "enable_nvenc" ++ optional stdenv.hostPlatform.isLinux nv-codec-headers; diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix index ca90891d22e7..25c1962cc517 100644 --- a/pkgs/by-name/ha/haproxy/package.nix +++ b/pkgs/by-name/ha/haproxy/package.nix @@ -35,11 +35,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-IYUuSjdLuNmz3aXcg0r+ZVf0ItcCn0/j6sPDBfUSR2A="; + hash = "sha256-o5UmRO+TmzYmDZHYGjNWNqqbRFcrTLi2ABJy+IVFxmY="; }; buildInputs = diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix index ac28476af6ac..dc7254268dae 100644 --- a/pkgs/by-name/ha/harbor-cli/package.nix +++ b/pkgs/by-name/ha/harbor-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "harbor-cli"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "goharbor"; repo = "harbor-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-E385kRj46HKzAbfLhsfcoTPDqX/GlsNi/GRMfv1GTFg="; + hash = "sha256-oTZhwF4DOTMAHzCide795Q+djPTzyn5Zj0Ov/3P4lAQ="; }; - vendorHash = "sha256-X4bjV0c9yKe73oqC4I8Stao7+jWWbEWmi73LOFHrVyc="; + vendorHash = "sha256-rGWGRPahJg9AtGXCmCbKTzrhIIP6ejyoMryyV7jSUZw="; excludedPackages = [ "dagger" diff --git a/pkgs/by-name/ha/hardinfo/package.nix b/pkgs/by-name/ha/hardinfo/package.nix deleted file mode 100644 index c7cb86f6d6ef..000000000000 --- a/pkgs/by-name/ha/hardinfo/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - which, - pkg-config, - gtk2, - pcre, - glib, - libxml2, - libsoup_2_4 ? null, -}: - -stdenv.mkDerivation rec { - pname = "hardinfo"; - version = "0.5.1"; - - src = fetchurl { - url = "mirror://sourceforge/project/hardinfo.berlios/hardinfo-${version}.tar.bz2"; - sha256 = "0yhvfc5icam3i4mphlz0m9d9d2irjw8mbsxq203x59wjgh6nrpx0"; - }; - - # Not adding 'hostname' command, the build shouldn't depend on what the build - # host is called. - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - which - gtk2 - pcre - glib - libxml2 - libsoup_2_4 - ]; - - # Fixes '#error You must compile this program without "-O"' - hardeningDisable = [ "all" ]; - - # Ignore undefined references to a bunch of libsoup symbols - NIX_LDFLAGS = "--unresolved-symbol=ignore-all"; - - preConfigure = '' - patchShebangs configure - - # -std=gnu89 fixes build error, copied from - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757525 - sed -i -e "s/^CFLAGS = \(.*\)/CFLAGS = \1 -std=gnu89/" Makefile.in - - substituteInPlace ./arch/linux/common/modules.h --replace /sbin/modinfo modinfo - substituteInPlace ./arch/linux/common/os.h --replace /lib/libc.so.6 ${stdenv.cc.libc}/lib/libc.so - ''; - - # Makefile supports DESTDIR but not PREFIX (it hardcodes $DESTDIR/usr/). - installFlags = [ "DESTDIR=$(out)" ]; - postInstall = '' - mv "$out/usr/"* "$out" - rmdir "$out/usr" - ''; - - meta = with lib; { - homepage = "http://hardinfo.org/"; - description = "Display information about your hardware and operating system"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ bjornfor ]; - platforms = [ - "x86_64-linux" - "i686-linux" - ]; # ARMv7 and AArch64 are unsupported - mainProgram = "hardinfo"; - }; -} diff --git a/pkgs/by-name/ha/hardinfo2/package.nix b/pkgs/by-name/ha/hardinfo2/package.nix index 1e2e9f23a381..44385da328b3 100644 --- a/pkgs/by-name/ha/hardinfo2/package.nix +++ b/pkgs/by-name/ha/hardinfo2/package.nix @@ -26,17 +26,20 @@ util-linux, libXdmcp, libXtst, + mesa-demos, + makeWrapper, + dmidecode, }: stdenv.mkDerivation (finalAtrs: { pname = "hardinfo2"; - version = "2.2.7"; + version = "2.2.10"; src = fetchFromGitHub { owner = "hardinfo2"; repo = "hardinfo2"; tag = "release-${finalAtrs.version}"; - hash = "sha256-IIH2SH4Ph25VFx652RQFZX8rL0ZlwjjfVrb+txLF3Ks="; + hash = "sha256-Ea1uhzAQEn8oDvWslGzrqoI2yzVDGxwTqbthfKEkYyQ="; }; nativeBuildInputs = [ @@ -44,6 +47,7 @@ stdenv.mkDerivation (finalAtrs: { pkg-config wrapGAppsHook4 libsForQt5.wrapQtAppsHook + makeWrapper ]; preFixup = '' @@ -80,6 +84,11 @@ stdenv.mkDerivation (finalAtrs: { (lib.cmakeFeature "CMAKE_INSTALL_SERVICEDIR" "${placeholder "out"}/lib") ]; + postFixup = '' + wrapProgram $out/bin/hardinfo2 \ + --prefix PATH : "${dmidecode}/bin:${mesa-demos}/bin" + ''; + meta = { homepage = "http://www.hardinfo2.org"; description = "System information and benchmarks for Linux systems"; diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 2f6765b866ab..371ce858ca15 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.28.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-g+noAc+vKli2T8C2EAK4ejw/2DWZPhtKbezyt53iHYg="; + hash = "sha256-bar4AdLovV8MBGF/yGHbcw1w3MQ4FFbmJkiDDS2Iq5g="; }; buildAndTestSubdir = "harper-ls"; useFetchCargoVendor = true; - cargoHash = "sha256-Ql1WdwDnXBC4JHO/uzJJlacQC44bOaHo2i3M9atjf3I="; + cargoHash = "sha256-CJZSBs8EtUstUNDUt3QQhv/f/GriaGzF9fw9IJWDNAk="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/hash-slinger/package.nix b/pkgs/by-name/ha/hash-slinger/package.nix index c6a9ecd04be3..1bf69ea7ecac 100644 --- a/pkgs/by-name/ha/hash-slinger/package.nix +++ b/pkgs/by-name/ha/hash-slinger/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hash-slinger"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "letoams"; repo = "hash-slinger"; rev = version; - sha256 = "sha256-c6IZHUFuhcccUWZYSOUGFbKpTtwMclIvEvDX8gE5d8o="; + sha256 = "sha256-IN+jo2EuGx+3bnANKz+d/3opFBUCSmkBS/sCU3lT7Zs="; }; pythonPath = with python3.pkgs; [ diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix index 704a7415e350..17d5da0a683c 100644 --- a/pkgs/by-name/ha/havn/package.nix +++ b/pkgs/by-name/ha/havn/package.nix @@ -4,14 +4,14 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "havn"; version = "0.2.1"; src = fetchFromGitHub { owner = "mrjackwills"; repo = "havn"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SXsCJzKfm77/IH3H7L5STylusmlN9DN4xd12Vt6L3TM="; }; @@ -29,10 +29,10 @@ rustPlatform.buildRustPackage rec { meta = { homepage = "https://github.com/mrjackwills/havn"; description = "Fast configurable port scanner with reasonable defaults"; - changelog = "https://github.com/mrjackwills/havn/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/mrjackwills/havn/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; mainProgram = "havn"; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ha/hawkeye/package.nix b/pkgs/by-name/ha/hawkeye/package.nix index bbe5bff7a8dc..2dc04ad5a976 100644 --- a/pkgs/by-name/ha/hawkeye/package.nix +++ b/pkgs/by-name/ha/hawkeye/package.nix @@ -5,29 +5,29 @@ pkg-config, }: -rustPackages.rustPlatform.buildRustPackage rec { +rustPackages.rustPlatform.buildRustPackage (finalAttrs: { pname = "hawkeye"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "korandoru"; repo = "hawkeye"; - tag = "v${version}"; - hash = "sha256-wT6c2wA31+xFcgPUp4djuvsHxwWyEderQTPSzLLqeAg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-reeNsnWvn7sSfyqjGIk8jFnv8HaEBJsqitmNbRa9eTM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-qWn9duoGmYVHGBnjT57/m2BT/yc9BNUGHSn748ZmAzg="; + cargoHash = "sha256-vvAbdY6C/cCiDu4hl4AL3Gh+TrbC93rn/l6NzgAsFuo="; nativeBuildInputs = [ pkg-config ]; meta = { - homepage = "https://github.com/korandoro/hawkeye"; + homepage = "https://github.com/korandoru/hawkeye"; description = "Simple license header checker and formatter, in multiple distribution forms"; license = lib.licenses.asl20; mainProgram = "hawkeye"; maintainers = with lib.maintainers; [ matthiasbeyer ]; }; -} +}) diff --git a/pkgs/by-name/ha/haylxon/package.nix b/pkgs/by-name/ha/haylxon/package.nix index 3d965efa3743..36ee26365a18 100644 --- a/pkgs/by-name/ha/haylxon/package.nix +++ b/pkgs/by-name/ha/haylxon/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,8 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-cKYHC8qz81P4xtehGQIvNH/g/pa90IJQbKz0RM9tjws="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - meta = { description = "Save screenshots of urls and webpages from terminal"; homepage = "https://github.com/pwnwriter/haylxon"; diff --git a/pkgs/by-name/he/health/package.nix b/pkgs/by-name/he/health/package.nix index 5766a60ba94e..76770dabbf9b 100644 --- a/pkgs/by-name/he/health/package.nix +++ b/pkgs/by-name/he/health/package.nix @@ -13,7 +13,6 @@ libadwaita, libsecret, tinysparql, - darwin, nix-update-script, }: @@ -46,16 +45,11 @@ stdenv.mkDerivation rec { blueprint-compiler ]; - buildInputs = - [ - libadwaita - libsecret - tinysparql - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + libadwaita + libsecret + tinysparql + ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.cc.isClang [ diff --git a/pkgs/by-name/he/hebbot/package.nix b/pkgs/by-name/he/hebbot/package.nix index f93de6fc5dd9..2a37463e1bc2 100644 --- a/pkgs/by-name/he/hebbot/package.nix +++ b/pkgs/by-name/he/hebbot/package.nix @@ -8,7 +8,6 @@ openssl, autoconf, automake, - darwin, unstableGitUpdater, sqlite, }: @@ -37,14 +36,9 @@ rustPlatform.buildRustPackage rec { automake ]; - buildInputs = - [ - openssl - ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; env = { OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/he/hedgedoc/package.nix b/pkgs/by-name/he/hedgedoc/package.nix index 700bbe3abe2d..8091974a7f06 100644 --- a/pkgs/by-name/he/hedgedoc/package.nix +++ b/pkgs/by-name/he/hedgedoc/package.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation { makeBinaryWrapper (python3.withPackages (ps: with ps; [ setuptools ])) # required to build sqlite3 bindings yarn + writableTmpDirAsHomeHook # A writable home directory is required for yarn ]; buildInputs = [ @@ -67,7 +68,6 @@ stdenv.mkDerivation { buildPhase = '' runHook preBuild - export HOME=$(mktemp -d) yarn config set enableTelemetry 0 yarn config set cacheFolder ${offlineCache} export npm_config_nodedir=${nodejs} # prevent node-gyp from downloading headers diff --git a/pkgs/by-name/he/heisenbridge/package.nix b/pkgs/by-name/he/heisenbridge/package.nix index dcd4526ef5ce..e8251a4307db 100644 --- a/pkgs/by-name/he/heisenbridge/package.nix +++ b/pkgs/by-name/he/heisenbridge/package.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "heisenbridge"; - version = "1.15.2"; + version = "1.15.3"; src = fetchFromGitHub { owner = "hifi"; repo = pname; tag = "v${version}"; - sha256 = "sha256-7zOpjIRYm+F8my+Gk/SXFIpzXMublPuzo93GpD8SxvU="; + sha256 = "sha256-wH3IZcY4CtawEicKCkFMh055SM0chYHsPKxYess9II0="; }; postPatch = '' diff --git a/pkgs/by-name/he/helm-ls/package.nix b/pkgs/by-name/he/helm-ls/package.nix index 3ffedc478a9c..b64a74de60c5 100644 --- a/pkgs/by-name/he/helm-ls/package.nix +++ b/pkgs/by-name/he/helm-ls/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-k/JJoLRykIY/ZmjqG+ZzXuMPQRcoumqisPKrD9PPyd0="; + hash = "sha256-+OS4B85Eu5iVFrXYOxMia5WE+GTAnvQpSdZv81scDTA="; }; - vendorHash = "sha256-VAxmMDZIbbcGHoRL06oqWkDnWZBuweKyoCLSqItWHyg="; + vendorHash = "sha256-1BO/0Ous4mclainPV+nqk5K+tHKgRnaxMtsI4xAhZF4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix index eaef48ad9e31..a4c29ca51752 100644 --- a/pkgs/by-name/he/hermitcli/package.nix +++ b/pkgs/by-name/he/hermitcli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hermit"; - version = "0.44.5"; + version = "0.44.6"; src = fetchFromGitHub { rev = "v${version}"; owner = "cashapp"; repo = "hermit"; - hash = "sha256-QPGN90iZd6UamSJv0v0eDRmLhKAhNRZW6jWhU9iRlfY="; + hash = "sha256-PNzMR9bYR7Dv62kN6tYBdabGR01iXw537WRUtJXl1CE="; }; - vendorHash = "sha256-TF9GtXvOyd6NH6bxT6YLibUby4VmrNBQrtw/0qhqxzQ="; + vendorHash = "sha256-GnZqM5ZKpg2yKAzUaXLOOKspbpjNnihscftkDT/7P9w="; subPackages = [ "cmd/hermit" ]; diff --git a/pkgs/games/heroic/fix-non-steam-shortcuts.patch b/pkgs/by-name/he/heroic-unwrapped/fix-non-steam-shortcuts.patch similarity index 100% rename from pkgs/games/heroic/fix-non-steam-shortcuts.patch rename to pkgs/by-name/he/heroic-unwrapped/fix-non-steam-shortcuts.patch diff --git a/pkgs/games/heroic/default.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix similarity index 95% rename from pkgs/games/heroic/default.nix rename to pkgs/by-name/he/heroic-unwrapped/package.nix index 7f2ce5c9b8e4..f6ac7868637f 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/by-name/he/heroic-unwrapped/package.nix @@ -7,7 +7,8 @@ nodejs, python3, makeWrapper, - electron, + # Upstream uses EOL Electron 31. Use next oldest version. + electron_33, vulkan-helper, gogdl, legendary-heroic, @@ -15,6 +16,9 @@ comet-gog, }: +let + electron = electron_33; +in stdenv.mkDerivation (finalAttrs: { pname = "heroic-unwrapped"; version = "2.16.1"; @@ -95,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { install -D "flatpak/com.heroicgameslauncher.hgl.desktop" "$out/share/applications/com.heroicgameslauncher.hgl.desktop" install -D "src/frontend/assets/heroic-icon.svg" "$out/share/icons/hicolor/scalable/apps/com.heroicgameslauncher.hgl.svg" substituteInPlace "$out/share/applications/com.heroicgameslauncher.hgl.desktop" \ - --replace-fail "Exec=heroic-run" "Exec=heroic" + --replace-fail "Exec=heroic-run --ozone-platform-hint=auto" "Exec=heroic" runHook postInstall ''; diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/by-name/he/heroic/package.nix similarity index 100% rename from pkgs/games/heroic/fhsenv.nix rename to pkgs/by-name/he/heroic/package.nix diff --git a/pkgs/by-name/he/hevi/deps.nix b/pkgs/by-name/he/hevi/deps.nix new file mode 100644 index 000000000000..8875577d8775 --- /dev/null +++ b/pkgs/by-name/he/hevi/deps.nix @@ -0,0 +1,42 @@ +# generated by zon2nix (https://github.com/nix-community/zon2nix) + +{ + linkFarm, + fetchzip, + fetchgit, +}: + +linkFarm "zig-packages" [ + { + name = "12204a4669fa6e8ebb1720e3581a24c1a7f538f2f4ee3ebc91a9e36285c89572d761"; + path = fetchgit { + url = "https://github.com/MFAshby/zig-lsp-kit.git"; + rev = "1c07e3e3305f8dd6355735173321c344fc152d3e"; + hash = "sha256-WBJ7hbc69W3mtzrMLwehcKccSbVe/8Dy9sX4IA4VbcY="; + }; + } + { + name = "1220841471bd4891cbb199d27cc5e7e0fb0a5b7c5388a70bd24fa3eb7285755c396c"; + path = fetchgit { + url = "https://github.com/kubkon/zig-yaml.git"; + rev = "beddd5da24de91d430ca7028b00986f7745b13e9"; + hash = "sha256-CJms2LjwoYNlbhapFYzvOImuaMH/zikllYeQ2/VlHi0="; + }; + } + { + name = "12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147"; + path = fetchgit { + url = "https://github.com/ziglibs/known-folders.git"; + rev = "0ad514dcfb7525e32ae349b9acc0a53976f3a9fa"; + hash = "sha256-X+XkFj56MkYxxN9LUisjnkfCxUfnbkzBWHy9pwg5M+g="; + }; + } + { + name = "1220c198cdaf6cb73fca6603cc5039046ed10de2e9f884cae9224ff826731df1c68d"; + path = fetchgit { + url = "https://github.com/kristoff-it/ziggy"; + rev = "ae30921d8c98970942d3711553aa66ff907482fe"; + hash = "sha256-dZemnsmM0383HnA7zhykyO/DnG0mx+PVjjr9NiIfu4I="; + }; + } +] diff --git a/pkgs/by-name/he/hevi/package.nix b/pkgs/by-name/he/hevi/package.nix new file mode 100644 index 000000000000..9e30696da500 --- /dev/null +++ b/pkgs/by-name/he/hevi/package.nix @@ -0,0 +1,39 @@ +{ + callPackage, + fetchFromGitHub, + lib, + stdenv, + zig_0_13, +}: + +let + zig = zig_0_13; +in +stdenv.mkDerivation (finalAttrs: { + pname = "hevi"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "Arnau478"; + repo = "hevi"; + tag = "v${finalAttrs.version}"; + hash = "sha256-wnpuM2qlbeDIupDPQPKdWmjAKepCG0+u3uxcLDFB09w="; + }; + + nativeBuildInputs = [ + zig.hook + ]; + + postPatch = '' + ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p + ''; + + meta = { + description = "Hex viewer"; + homepage = "https://github.com/Arnau478/hevi"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.jmbaur ]; + mainProgram = "hevi"; + inherit (zig.meta) platforms; + }; +}) diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix index 98025c5222c2..b34fc0a7bd30 100644 --- a/pkgs/by-name/he/hexpatch/package.nix +++ b/pkgs/by-name/he/hexpatch/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "hexpatch"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "Etto48"; repo = "HexPatch"; tag = "v${version}"; - hash = "sha256-soiF4JCTOI/3SE53FdyLE0+qF80F0VVklMuUkCVps1g="; + hash = "sha256-/wPRCqHvRiH8snD6D9qyk7YdbchOi0BUz/kI5EitOls="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3k0sQDO1wt16IB7Qx49S/Qxk4osw1SLv97cAffbgDZc="; + cargoHash = "sha256-bJaL2ni0ei9LeeMdt5Zo68ECbzrBtvAZULjHOLcnacY="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/hi/hidapitester/package.nix b/pkgs/by-name/hi/hidapitester/package.nix new file mode 100644 index 000000000000..50ad7fc0d24d --- /dev/null +++ b/pkgs/by-name/hi/hidapitester/package.nix @@ -0,0 +1,58 @@ +{ + stdenv, + lib, + fetchFromGitHub, + hidapi, + udev, + pkg-config, + nix-update-script, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hidapitester"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "todbot"; + repo = "hidapitester"; + tag = "v${finalAttrs.version}"; + hash = "sha256-OpLeKTouCB3efsXWJO0lZxUHxtDKeBY7OYk0HwC2NF4="; + }; + + postUnpack = '' + cp --no-preserve=mode -r ${hidapi.src} hidapi + export HIDAPI_DIR=$PWD/hidapi + ''; + + env.HIDAPITESTER_VERSION = finalAttrs.version; + + buildInputs = [ + udev + hidapi + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + installPhase = '' + runHook preInstall + install -Dm755 hidapitester $out/bin/hidapitester + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = { + description = "Simple command-line program to test HIDAPI"; + homepage = "https://github.com/todbot/hidapitester"; + changelog = "https://github.com/todbot/hidapitester/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ lykos153 ]; + license = lib.licenses.gpl3Only; + mainProgram = "hidapitester"; + }; +}) diff --git a/pkgs/by-name/hi/hidviz/package.nix b/pkgs/by-name/hi/hidviz/package.nix index e3f154965be8..129b1094c875 100644 --- a/pkgs/by-name/hi/hidviz/package.nix +++ b/pkgs/by-name/hi/hidviz/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "hidviz"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "hidviz"; repo = "hidviz"; rev = "v${version}"; - hash = "sha256-9crHFYVNNxJjwJojwqB8qdAGyr1Ieux9qC3m3rpIJw0="; + hash = "sha256-ThDDQ3FN+cLCbdQCrC5zhL4dgg2zAbRWvtei7+qmQg8="; }; preConfigure = '' diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix index 2feeef5c1829..d365d3049346 100644 --- a/pkgs/by-name/hi/hifile/package.nix +++ b/pkgs/by-name/hi/hifile/package.nix @@ -2,8 +2,8 @@ lib, appimageTools, fetchurl, - version ? "0.9.9.23", - hash ? "sha256-BTHiLTgLqtUCuxnpPeI5nwe8tYMp+uxFKm01qHnC8A0=", + version ? "0.9.9.25", + hash ? "sha256-yxZIp33lBQZebo9UyqLqtAMM9oRJ23jr0YdIcjwnimY=", }: let diff --git a/pkgs/by-name/hj/hjson-go/package.nix b/pkgs/by-name/hj/hjson-go/package.nix index f0b906ad0808..1918981eaf35 100644 --- a/pkgs/by-name/hj/hjson-go/package.nix +++ b/pkgs/by-name/hj/hjson-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "hjson-go"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "hjson"; repo = pname; rev = "v${version}"; - hash = "sha256-fonPxk/9ue8LzHTdKpuHJcucQoMl4P6gq+tbjS8Ui7Q="; + hash = "sha256-0xFTxnXMJA98+Y6gwO8zCDPQvLecG1qmbGAISCFMaPw="; }; vendorHash = null; diff --git a/pkgs/by-name/hm/hmm/package.nix b/pkgs/by-name/hm/hmm/package.nix index 9a749f166e8d..270227b33aea 100644 --- a/pkgs/by-name/hm/hmm/package.nix +++ b/pkgs/by-name/hm/hmm/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchCrate, perl, + writableTmpDirAsHomeHook, }: rustPlatform.buildRustPackage rec { @@ -20,15 +21,12 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ perl + writableTmpDirAsHomeHook ]; # FIXME: remove patch when upstream version of rustc-serialize is updated # https://github.com/NixOS/nixpkgs/pull/310673 cargoPatches = [ ./rustc-serialize-fix.patch ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; - meta = with lib; { description = "Small command-line note-taking app"; homepage = "https://github.com/samwho/hmm"; diff --git a/pkgs/by-name/ho/hoard/package.nix b/pkgs/by-name/ho/hoard/package.nix index 52d8badc95fb..11b888c4c59b 100644 --- a/pkgs/by-name/ho/hoard/package.nix +++ b/pkgs/by-name/ho/hoard/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,13 +22,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "CLI command organizer written in rust"; diff --git a/pkgs/by-name/ho/hoarder/helpers/hoarder-cli b/pkgs/by-name/ho/hoarder/helpers/hoarder-cli deleted file mode 100755 index 0a957eacaad9..000000000000 --- a/pkgs/by-name/ho/hoarder/helpers/hoarder-cli +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -set -eu -o pipefail -HOARDER_LIB_PATH= -NODEJS= -exec "$NODEJS/bin/node" "$HOARDER_LIB_PATH/apps/cli/dist/index.mjs" "$@" diff --git a/pkgs/by-name/ho/hobbits/package.nix b/pkgs/by-name/ho/hobbits/package.nix new file mode 100644 index 000000000000..2e5f1dbbd55d --- /dev/null +++ b/pkgs/by-name/ho/hobbits/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + pffft, + libpcap, + libusb1, + python3, + qt5, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hobbits"; + version = "0.55.0"; + + src = fetchFromGitHub { + owner = "Mahlet-Inc"; + repo = "hobbits"; + tag = "v${finalAttrs.version}"; + hash = "sha256-W6QBLj+GkmM88cOVSIc1PLiVXysjv74J7citFW6SRDM="; + }; + + postPatch = '' + substituteInPlace src/hobbits-core/settingsdata.cpp \ + --replace-warn "pythonHome = \"/usr\"" "pythonHome = \"${python3}\"" + substituteInPlace cmake/gitversion.cmake \ + --replace-warn "[Mystery Build]" "${finalAttrs.version}" + substituteInPlace CMakeLists.txt \ + --replace-warn "SELF_CONTAINED_APP OR APPLE" "SELF_CONTAINED_APP" + ''; + + buildInputs = [ + pffft + libpcap + libusb1 + python3 + ]; + + nativeBuildInputs = [ + cmake + pkg-config + qt5.wrapQtAppsHook + ]; + + cmakeFlags = [ (lib.cmakeBool "USE_SYSTEM_PFFFT" true) ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,bin} + mv $out/hobbits.app $out/Applications + wrapProgram $out/Applications/hobbits.app/Contents/MacOS/hobbits \ + --prefix DYLD_LIBRARY_PATH : $out/Applications/hobbits.app/Contents/Frameworks + ln -s $out/Applications/hobbits.app/Contents/MacOS/hobbits $out/bin/hobbits + # Prevent wrapping + find $out/Applications -type f -name "*.dylib" -exec chmod -x {} \; + ''; + + meta = { + description = "Multi-platform GUI for bit-based analysis, processing, and visualization"; + homepage = "https://github.com/Mahlet-Inc/hobbits"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = with lib.platforms; linux ++ darwin; + }; +}) diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 159256228a67..be82f1836b24 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -19,14 +19,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2025-04-09"; + version = "0-unstable-2025-04-19"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "79461936709b12e17adb9c91dd02d1c66d577f09"; - hash = "sha256-reYpe0J1J+wH34JFs7KKp0G5nP7+XSQ5z0ZLFJcfJr8="; + rev = "9676e8a52a177d80c8a42f66566362a6d74ecf78"; + hash = "sha256-bvcatss0xodcdxXm0LUSLPd2jjrhqO3yFSu3stOfQXg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix index f9f55510bfff..9b19565ce446 100644 --- a/pkgs/by-name/ho/homepage-dashboard/package.nix +++ b/pkgs/by-name/ho/homepage-dashboard/package.nix @@ -7,7 +7,6 @@ python3, stdenv, cctools, - darwin, lib, nixosTests, enableLocalIcons ? false, @@ -62,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ nodePackages.node-gyp-build - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + ]; env.PYTHON = "${python3}/bin/python"; diff --git a/pkgs/by-name/ho/honeymarker/package.nix b/pkgs/by-name/ho/honeymarker/package.nix new file mode 100644 index 000000000000..b1538db6752a --- /dev/null +++ b/pkgs/by-name/ho/honeymarker/package.nix @@ -0,0 +1,24 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "honeymarker"; + version = "0.2.1"; + vendorHash = "sha256-ZuDobjC/nizZ7G0o/zVTQmDfDjcdBhfPcmkhgwFc7VU="; + + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeymarker"; + rev = "v${version}"; + hash = "sha256-tiwX94CRvXnUYpiux94XhOj2abn1Uc+wjcDOmw79ab4="; + }; + + meta = with lib; { + description = "provides a simple CRUD interface for dealing with per-dataset markers on honeycomb.io"; + homepage = "https://honeycomb.io/"; + license = licenses.asl20; + maintainers = [ maintainers.iand675 ]; + }; +} diff --git a/pkgs/by-name/ho/honeytail/package.nix b/pkgs/by-name/ho/honeytail/package.nix new file mode 100644 index 000000000000..f6b6ea561fd0 --- /dev/null +++ b/pkgs/by-name/ho/honeytail/package.nix @@ -0,0 +1,24 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "honeytail"; + version = "1.6.0"; + vendorHash = "sha256-LtiiLGLjhbfT49A6Fw5CbSbnmTHMxtcUssr+ayCVrvY="; + + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeytail"; + rev = "v${version}"; + hash = "sha256-S0hIgNNzF1eNe+XJs+PT7EUIl5oJCXu+B/zQago4sf8="; + }; + + meta = with lib; { + description = "agent for ingesting log file data into honeycomb.io and making it available for exploration"; + homepage = "https://honeycomb.io/"; + license = licenses.asl20; + maintainers = [ maintainers.iand675 ]; + }; +} diff --git a/pkgs/by-name/ho/honeyvent/package.nix b/pkgs/by-name/ho/honeyvent/package.nix new file mode 100644 index 000000000000..9b018da8a14f --- /dev/null +++ b/pkgs/by-name/ho/honeyvent/package.nix @@ -0,0 +1,24 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "honeyvent"; + version = "1.1.0"; + vendorHash = null; + + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeyvent"; + rev = "v${version}"; + hash = "sha256-yFQEOshjaH6fRCQ7IZChANI9guZlTXk35p1NzQvxUdI="; + }; + + meta = with lib; { + description = "CLI for sending individual events to honeycomb.io"; + homepage = "https://honeycomb.io/"; + license = licenses.asl20; + maintainers = [ maintainers.iand675 ]; + }; +} diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix index 9e4cc9f9eec2..bc3ec4f995cc 100644 --- a/pkgs/by-name/ht/htb-toolkit/package.nix +++ b/pkgs/by-name/ht/htb-toolkit/package.nix @@ -5,7 +5,6 @@ pkg-config, openssl, stdenv, - darwin, coreutils, gnome-keyring, libsecret, @@ -44,10 +43,6 @@ rustPlatform.buildRustPackage { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gnome-keyring - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration ]; postPatch = '' diff --git a/pkgs/by-name/ht/html2pdf/package.nix b/pkgs/by-name/ht/html2pdf/package.nix new file mode 100644 index 000000000000..2e5b249857ac --- /dev/null +++ b/pkgs/by-name/ht/html2pdf/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + makeWrapper, + chromium, + withChromium ? (lib.meta.availableOn stdenv.hostPlatform chromium), + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "html2pdf"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "ilaborie"; + repo = "html2pdf"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Z1fb7pDjawMIhJgl4ao2VoV6zpfcGy/48Dt7JtIxgJo="; + }; + + cargoHash = "sha256-T5A2b7Qcg8dQKndaD8P5RAutBZeINOqIBUHR2VDOeo0="; + + # Avoiding "rustfmt not found" error in auto_generate_cdp. + # ref: https://github.com/mdrokz/auto_generate_cdp/pull/8 + env.DO_NOT_FORMAT = "true"; + + nativeBuildInputs = [ + makeWrapper + ]; + + postInstall = lib.optionalString withChromium ( + let + runtimeInputs = [ + chromium + ]; + in + '' + wrapProgram "$out/bin/html2pdf" --prefix PATH : '${lib.makeBinPath runtimeInputs}' + '' + ); + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI tool to convert local HTML files to PDF"; + homepage = "https://github.com/ilaborie/html2pdf"; + changelog = "https://github.com/ilaborie/html2pdf/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ + kachick + ]; + mainProgram = "html2pdf"; + }; +}) diff --git a/pkgs/applications/misc/html5validator/default.nix b/pkgs/by-name/ht/html5validator/package.nix similarity index 100% rename from pkgs/applications/misc/html5validator/default.nix rename to pkgs/by-name/ht/html5validator/package.nix diff --git a/pkgs/by-name/ht/htop-vim/package.nix b/pkgs/by-name/ht/htop-vim/package.nix index 937d212c37eb..b10a23cc8c62 100644 --- a/pkgs/by-name/ht/htop-vim/package.nix +++ b/pkgs/by-name/ht/htop-vim/package.nix @@ -6,7 +6,6 @@ autoreconfHook, pkg-config, ncurses, - darwin, libcap, libnl, sensorsSupport ? stdenv.hostPlatform.isLinux, @@ -53,7 +52,6 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.IOKit ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap libnl diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix index e8734388ad8c..f86da87740f3 100644 --- a/pkgs/by-name/ht/httm/package.nix +++ b/pkgs/by-name/ht/httm/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.46.7"; + version = "0.46.8"; src = fetchFromGitHub { owner = "kimono-koans"; repo = "httm"; rev = version; - hash = "sha256-GSYkgDDDkvQnuW8zeLL703L8tlgklhB3OKulJdmrRoY="; + hash = "sha256-IGhEKtu4RMhI7VYn6I4M9eFY6MdcWxiHsu90rY0l8sw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-UxOm6G0hQfi7L49YQEshfNkPMy7LPNX2VBg0F9uLMiY="; + cargoHash = "sha256-LmQ3+yqSO7vhnV6XshUSSe6QkYVcradVsmIcLrdNE94="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ht/httplz/package.nix b/pkgs/by-name/ht/httplz/package.nix index 391b4f400bc9..695d17726b38 100644 --- a/pkgs/by-name/ht/httplz/package.nix +++ b/pkgs/by-name/ht/httplz/package.nix @@ -7,8 +7,6 @@ pkg-config, ronn, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -31,11 +29,7 @@ rustPlatform.buildRustPackage rec { ronn ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ openssl ]; cargoBuildFlags = [ "--bin" diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index c1493553c3f8..f16367c83ea6 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "hugo"; - version = "0.146.1"; + version = "0.146.4"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; tag = "v${finalAttrs.version}"; - hash = "sha256-WZJdojnjQCzmpZjM8Cjh9iAP+Qtcq+XAY4sRGdua0t4="; + hash = "sha256-acOHFKNtzGV6CAhdBBBWAyS9Iuf3rq4XaIUnf2m6UWE="; }; vendorHash = "sha256-LSNy65sIuq/zK3swdUvxGwbo/3ulq+JP5ur7M7aTdAs="; diff --git a/pkgs/by-name/hu/huion-switcher/package.nix b/pkgs/by-name/hu/huion-switcher/package.nix new file mode 100644 index 000000000000..668543cb4e36 --- /dev/null +++ b/pkgs/by-name/hu/huion-switcher/package.nix @@ -0,0 +1,60 @@ +{ + lib, + nix-update-script, + fetchFromGitHub, + rustPlatform, + udev, + pkg-config, + installShellFiles, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "huion-switcher"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "whot"; + repo = "huion-switcher"; + tag = finalAttrs.version; + hash = "sha256-+cMvBVtJPbsJhEmOh3SEXZrVwp9Uuvx6QmUCcpenS20="; + }; + + buildInputs = [ udev ]; + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-yj55FMdf91ZG95yuMt3dQFhUjYM0/sUfFKB+W+5xEfo="; + + postInstall = '' + mv huion-switcher.{man,1} + installManPage huion-switcher.1 + + # Install 80-huion-switcher.rules + + # Mind the trailing space! We leave the args to huion-switcher in place + substituteInPlace "80-huion-switcher.rules" --replace-fail \ + "IMPORT{program}=\"huion-switcher " \ + "IMPORT{program}=\"$out/bin/huion-switcher " + + install -Dm 0644 -t "$out/lib/udev/rules.d" "80-huion-switcher.rules" + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Utility to switch Huion devices into raw tablet mode"; + homepage = "https://github.com/whot/huion-switcher"; + changelog = "https://github.com/whot/huion-switcher/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + mainProgram = "huion-switcher"; + maintainers = with lib.maintainers; [ dramforever ]; + }; +}) diff --git a/pkgs/by-name/hy/hydra-cli/package.nix b/pkgs/by-name/hy/hydra-cli/package.nix index 0f171a6b81e6..e7467882d85d 100644 --- a/pkgs/by-name/hy/hydra-cli/package.nix +++ b/pkgs/by-name/hy/hydra-cli/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, testers, hydra-cli, }: @@ -30,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index 84ae45ccbb6a..d0d4aed3be32 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -130,13 +130,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "0-unstable-2025-04-07"; + version = "0-unstable-2025-04-16"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "1c52c4c0ed596ea71de370562ed5af1604bd2183"; - hash = "sha256-pcZA2SA7nskxsvDYp3nzF5V258b67YrZONv9G3PhLCE="; + rev = "bdde73acbd66c569e8171b42b810adf92a56f76a"; + hash = "sha256-1hj8JJ4ngqzJ8Xt3WvCBnQmwTnzzaZaQlCJcPWQvvM4="; }; outputs = [ diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index e2b8a72ee143..f020a7951433 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.4.0"; + version = "3.4.4"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-d2ZtCAbj7xYkLhsuTPi9/ORb+Nkk5KbGvaDSaawqGcU="; + hash = "sha256-7mYwjxfef9uiBI2idLUqQxJ4hiWiPVCdMnw1MaovUEM="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/by-name/hy/hydrus/package.nix b/pkgs/by-name/hy/hydrus/package.nix index f539663e8845..2697fbd4f9fc 100644 --- a/pkgs/by-name/hy/hydrus/package.nix +++ b/pkgs/by-name/hy/hydrus/package.nix @@ -16,14 +16,14 @@ python3Packages.buildPythonApplication rec { pname = "hydrus"; - version = "614"; + version = "617"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; tag = "v${version}"; - hash = "sha256-7UYi2dbpoGy373akOKFJjssxMdCKjpv4IgPMqBoe93Q="; + hash = "sha256-yvnfG7XxGowa3wRZjNsl/WnptdllWWFT/eIFq0TEey8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index 74d105fafb7c..bde9e41f1867 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -28,13 +28,13 @@ gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlock"; rev = "v${finalAttrs.version}"; - hash = "sha256-KTRgq+0rMBz31AAjrDvQprPHbVobCwIo9+gkcUujglw="; + hash = "sha256-9i7uciOr3+hjvesMBlrVq5TgR6fSXYP5RziCnMgfi/E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hypseus-singe/package.nix b/pkgs/by-name/hy/hypseus-singe/package.nix new file mode 100644 index 000000000000..275c276f0455 --- /dev/null +++ b/pkgs/by-name/hy/hypseus-singe/package.nix @@ -0,0 +1,87 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + cmake, + makeWrapper, + pkg-config, + + bash, + SDL2, + SDL2_image, + SDL2_ttf, + libmpeg2, + libvorbis, + libzip, + libX11, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hypseus-singe"; + version = "2.11.3"; + + src = fetchFromGitHub { + owner = "DirtBagXon"; + repo = "hypseus-singe"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-hLl+/tJrBXo6m/cJxmn2bSLXcNLM8B6SKrM702Z8K8E="; + }; + + patches = [ ./use-shared-mpeg2.patch ]; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + makeWrapper + pkg-config + ]; + + buildInputs = + [ + bash + SDL2 + SDL2_image + SDL2_ttf + libmpeg2 + libvorbis + libzip + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + ]; + + env.NIX_CFLAGS_COMPILE = toString [ + "-I${lib.getDev SDL2_image}/include/SDL2" + "-I${lib.getDev SDL2_ttf}/include/SDL2" + ]; + + preConfigure = '' + cd src + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 hypseus $out/bin/hypseus.bin + cd ../.. + install -Dm755 scripts/run.sh $out/bin/hypseus + install -Dm755 scripts/singe.sh $out/bin/singe + + substituteInPlace $out/bin/{hypseus,singe} \ + --replace-fail "/bin/cat" "cat" \ + --replace-fail hypseus.bin $out/bin/hypseus.bin + + runHook postInstall + ''; + + meta = { + description = "Laserdisc game emulator, the SDL2 version of Daphne and Singe"; + homepage = "https://github.com/DirtBagXon/hypseus-singe"; + license = lib.licenses.gpl3Only; + mainProgram = "hypseus"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch b/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch new file mode 100644 index 000000000000..3348146e3ddc --- /dev/null +++ b/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch @@ -0,0 +1,59 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 6a85063..73dbd39 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -50,13 +50,12 @@ include(GetGitRevisionDescription) + include(InstallRequiredSystemLibraries) + include(FindPkgConfig) + include(ExternalProject) +-include(BuildLibMPEG2) + + use_cxx11( ) + + PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2) + PKG_SEARCH_MODULE(SDL2_TTF REQUIRED SDL2_ttf) +-build_libmpeg2( ) ++PKG_SEARCH_MODULE(MPEG2 REQUIRED libmpeg2) + + message(STATUS "Target: ${CMAKE_SYSTEM_NAME} ${CMAKE_TARGET_ARCHITECTURES}") + +@@ -110,7 +109,6 @@ add_subdirectory(timer) + add_subdirectory(video) + add_subdirectory(vldp) + +-add_dependencies( vldp libmpeg2 ) + add_dependencies( ldp-out vldp ) + add_dependencies( game vldp ) + add_dependencies( sound vldp ) +diff --git a/src/vldp/vldp_internal.cpp b/src/vldp/vldp_internal.cpp +index 16a74cb..2605011 100644 +--- a/src/vldp/vldp_internal.cpp ++++ b/src/vldp/vldp_internal.cpp +@@ -40,9 +40,9 @@ + #include + + #include +- ++extern "C" { + #include +- ++} + #ifdef VLDP_DEBUG + #define FRAMELOG "frame_report.txt" + #endif +diff --git a/src/vldp/vldp_internal.h b/src/vldp/vldp_internal.h +index 88450e9..1ea83ef 100644 +--- a/src/vldp/vldp_internal.h ++++ b/src/vldp/vldp_internal.h +@@ -26,9 +26,9 @@ + #define VLDP_INTERNAL_H + + #include "vldp.h" // for the VLDP_BOOL definition and SDL.h +- ++extern "C" { + #include +- ++} + // this is which version of the .dat file format we are using + #define DAT_VERSION 3 + diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index 397fb528ddd3..4cc9de283d48 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -37,18 +37,17 @@ pcre2, perl, pkg-config, - fetchpatch, }: stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.7.1"; + version = "3.7.3"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; - rev = finalAttrs.version; - hash = "sha256-4JF2ZAp8dx2fpSYRUz4I8US3oIZrSS90oljuxQDm38A="; + tag = finalAttrs.version; + hash = "sha256-A9LLVIU00ddINMiiuBapp4dc4/w8Z+TeC+zXV1CtTCE="; }; strictDeps = true; @@ -95,17 +94,6 @@ stdenv.mkDerivation (finalAttrs: { pcre2 ]; - patches = [ - # https://github.com/NixOS/nixpkgs/issues/385959 - # https://github.com/bbidulock/icewm/issues/794 - # TODO: remove this patch when it is included in a release - (fetchpatch { - name = "fdomenu-icons-quoted"; - url = "https://github.com/bbidulock/icewm/commit/74bb0a2989127a3ff87d2932ff547713bc710cfe.patch"; - hash = "sha256-/rMSJYGAJs9cgNu5j4Mov/PfO7ocXQeNRq0vasfRcKA="; - }) - ]; - cmakeFlags = [ "-DPREFIX=$out" "-DCFGDIR=/etc/icewm" diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix index a7e1c389581d..0c957cae08b9 100644 --- a/pkgs/by-name/ic/icloudpd/package.nix +++ b/pkgs/by-name/ic/icloudpd/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "icloudpd"; - version = "1.27.2"; + version = "1.27.4"; pyproject = true; src = fetchFromGitHub { owner = "icloud-photos-downloader"; repo = "icloud_photos_downloader"; tag = "v${version}"; - hash = "sha256-XRQadI2NCtjJ02uRoigDP92TmfAUoItmG42fM3QE6kI="; + hash = "sha256-jZuyy5wYRysX6a+IFO+VYcaN/PMJRpM9aEAOYzJxJUA="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/ic/icon-library/package.nix b/pkgs/by-name/ic/icon-library/package.nix index 7c3185aedc87..bee499147760 100644 --- a/pkgs/by-name/ic/icon-library/package.nix +++ b/pkgs/by-name/ic/icon-library/package.nix @@ -16,7 +16,6 @@ gtk4, gtksourceview5, libadwaita, - darwin, }: stdenv.mkDerivation rec { @@ -45,17 +44,13 @@ stdenv.mkDerivation rec { rustc wrapGAppsHook4 ]; - buildInputs = - [ - gdk-pixbuf - glib - gtk4 - gtksourceview5 - libadwaita - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + gdk-pixbuf + glib + gtk4 + gtksourceview5 + libadwaita + ]; meta = with lib; { homepage = "https://gitlab.gnome.org/World/design/icon-library"; diff --git a/pkgs/by-name/id/idutils/package.nix b/pkgs/by-name/id/idutils/package.nix index f7640baffc8d..fd6e2b8fdc84 100644 --- a/pkgs/by-name/id/idutils/package.nix +++ b/pkgs/by-name/id/idutils/package.nix @@ -12,7 +12,6 @@ texinfo, perl, rsync, - darwin, }: stdenv.mkDerivation rec { @@ -31,13 +30,9 @@ stdenv.mkDerivation rec { ./bootstrap --force --gnulib-srcdir=${gnulib} --skip-po --bootstrap-sync --no-git ''; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - emacs - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + emacs + ]; nativeBuildInputs = [ gnulib diff --git a/pkgs/by-name/ig/igvm-tooling/package.nix b/pkgs/by-name/ig/igvm-tooling/package.nix index 557bcee8aa0d..05629f538466 100644 --- a/pkgs/by-name/ig/igvm-tooling/package.nix +++ b/pkgs/by-name/ig/igvm-tooling/package.nix @@ -5,7 +5,7 @@ fetchpatch, which, acpica-tools, - nix-update-script, + unstableGitUpdater, }: python3.pkgs.buildPythonApplication rec { @@ -62,7 +62,9 @@ python3.pkgs.buildPythonApplication rec { find $out/share/igvm-tooling/acpi -name "*.dsl" -exec iasl -f {} \; ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "igvm-"; + }; meta = { description = "IGVM Image Generator"; diff --git a/pkgs/by-name/il/ilmbase/package.nix b/pkgs/by-name/il/ilmbase/package.nix index ecca1b5159a5..74fcb9fe9a57 100644 --- a/pkgs/by-name/il/ilmbase/package.nix +++ b/pkgs/by-name/il/ilmbase/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = " A library for 2D/3D vectors and matrices and other mathematical objects, functions and data types for computer graphics"; + description = "Library for 2D/3D vectors and matrices and other mathematical objects, functions and data types for computer graphics"; homepage = "https://www.openexr.com/"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/by-name/im/imapdedup/package.nix b/pkgs/by-name/im/imapdedup/package.nix index 84109cebd593..0e66b83b5c11 100644 --- a/pkgs/by-name/im/imapdedup/package.nix +++ b/pkgs/by-name/im/imapdedup/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication rec { pname = "imapdedup"; - version = "1.1"; + version = "1.2"; pyproject = true; src = fetchFromGitHub { owner = "quentinsf"; repo = "IMAPdedup"; tag = version; - hash = "sha256-s49nnMjX1beZKTrlcjzp0nESIVRb/LZDycpnzz8fG+o="; + hash = "sha256-CmWkLz9hdmedUxcojmUVTkPjqpaMmtEeHnF7aglKR+s="; }; build-system = with python3Packages; [ hatchling ]; diff --git a/pkgs/by-name/im/implot/demos/default.nix b/pkgs/by-name/im/implot/demos/default.nix index 00bd02f69ed4..45d5d54ac83a 100644 --- a/pkgs/by-name/im/implot/demos/default.nix +++ b/pkgs/by-name/im/implot/demos/default.nix @@ -5,7 +5,6 @@ fetchpatch, cmake, pkg-config, - darwin, fmt, gtk3, iir1, @@ -54,18 +53,15 @@ stdenv.mkDerivation { pkg-config ]; - buildInputs = - [ - curl - fmt - iir1 - imgui - imnodes - implot - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + buildInputs = [ + curl + fmt + iir1 + imgui + imnodes + implot + openssl + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ]; meta = { description = "Standalone ImPlot Demos"; diff --git a/pkgs/by-name/im/imtui/package.nix b/pkgs/by-name/im/imtui/package.nix index 4bb5187ab518..a587f8bce7ab 100644 --- a/pkgs/by-name/im/imtui/package.nix +++ b/pkgs/by-name/im/imtui/package.nix @@ -12,7 +12,6 @@ withNcurses ? (!withEmscripten), ncurses, static ? withEmscripten, - darwin, }: stdenv.mkDerivation rec { @@ -34,8 +33,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional withEmscripten emscripten ++ lib.optional withCurl curl - ++ lib.optional withNcurses ncurses - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ++ lib.optional withNcurses ncurses; postPatch = '' diff --git a/pkgs/by-name/in/industrializer/package.nix b/pkgs/by-name/in/industrializer/package.nix index 6c51086f6521..ec16b8b80101 100644 --- a/pkgs/by-name/in/industrializer/package.nix +++ b/pkgs/by-name/in/industrializer/package.nix @@ -6,10 +6,12 @@ audiofile, autoconf, automake, + gettext, gnome2, gtk2, libGL, libjack2, + libpulseaudio, libtool, libxml2, pkg-config, @@ -28,6 +30,10 @@ stdenv.mkDerivation (finalAttrs: { pkg-config autoconf automake + gettext # autopoint + libxml2 # AM_PATH_XML2 + alsa-lib # AM_PATH_ALSA + libtool ]; buildInputs = [ @@ -37,10 +43,12 @@ stdenv.mkDerivation (finalAttrs: { gtk2 libGL libjack2 - libtool libxml2 + libpulseaudio ]; + strictDeps = true; + preConfigure = "./autogen.sh"; # jack.c:190:5: error: initialization of 'const gchar * (*)(int)' {aka 'const char * (*)(int)'} from incompatible pointer type 'const char * (*)(int * (*)()) diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index 854f0c3d284b..76660af9bf6a 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "inputplumber"; - version = "0.52.1"; + version = "0.53.0"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${version}"; - hash = "sha256-Jgy6fHR1gdRX6HGMSA6QkoNq9eZBwM4P3f972CwsGUk="; + hash = "sha256-pb1vyXJh0nmW8kc6hp6dgr84419Qcm6rjatzkjC4QNY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-/E2pmz1ohYQouLDnBCUYfpRWMc+rNEZ0FJR+RsSli04="; + cargoHash = "sha256-zUK73enMMvrF196ILLNIx77IkvaMtTdbMRJXd8fzMzQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix index c5aab60d33bc..16b529f39ecc 100644 --- a/pkgs/by-name/in/intel-compute-runtime/package.nix +++ b/pkgs/by-name/in/intel-compute-runtime/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "25.09.32961.7"; + version = "25.13.33276.16"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; tag = version; - hash = "sha256-Rdy6ACGclhBn8bulHdjHuLzaGO2jj04iDGoXeHgl6Hs="; + hash = "sha256-dGOFWmgPOcSQtpfmYTTPLYeHfwba6gp9nJRF999hybw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/in/intelli-shell/package.nix b/pkgs/by-name/in/intelli-shell/package.nix index e2fec783cb76..79cf30615328 100644 --- a/pkgs/by-name/in/intelli-shell/package.nix +++ b/pkgs/by-name/in/intelli-shell/package.nix @@ -7,8 +7,6 @@ openssl, sqlite, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,16 +27,12 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libgit2 - openssl - sqlite - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + openssl + sqlite + zlib + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/in/intentrace/package.nix b/pkgs/by-name/in/intentrace/package.nix index 79c51be8f854..149215230e4c 100644 --- a/pkgs/by-name/in/intentrace/package.nix +++ b/pkgs/by-name/in/intentrace/package.nix @@ -5,7 +5,7 @@ }: let - version = "0.8.0"; + version = "0.9.0"; in rustPlatform.buildRustPackage { inherit version; @@ -15,11 +15,11 @@ rustPlatform.buildRustPackage { owner = "sectordistrict"; repo = "intentrace"; tag = "v${version}"; - hash = "sha256-ONOYxtY4e+lxjp1nQ7L8O0xwhEqS3f56KmDFtNo4s80="; + hash = "sha256-0TrM6Kb+5v7d98VJOsZXtsYZ4BGIbqXA3B6d4gqvl90="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EyOCs7PpsTd2NQbqcXb4ZlZPPTvHQlraxy5liTA2hcE="; + cargoHash = "sha256-XHhu5B2GyZvKj9egbSOLJ7W/4BNdcGDYHYmb97Lhcpc="; meta = { description = "Prettified Linux syscall tracing tool (like strace)"; diff --git a/pkgs/by-name/in/interactive-html-bom/package.nix b/pkgs/by-name/in/interactive-html-bom/package.nix index a4eaac2c705d..527f3ad89002 100644 --- a/pkgs/by-name/in/interactive-html-bom/package.nix +++ b/pkgs/by-name/in/interactive-html-bom/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "interactive-html-bom"; - version = "2.9.0"; + version = "2.10.0"; pyproject = true; src = fetchFromGitHub { owner = "openscopeproject"; repo = "InteractiveHtmlBom"; tag = "v${version}"; - hash = "sha256-jUHEI0dWMFPQlXei3+0m1ruHzpG1hcRnxptNOXzXDqQ="; + hash = "sha256-o7GWdAFFK3zK0fc7aTSwOsd/c4uPg3cJfR0SXbl2RW8="; }; build-system = [ python3Packages.hatchling ]; @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec { description = "Interactive HTML BOM generation for KiCad, EasyEDA, Eagle, Fusion360 and Allegro PCB designer"; homepage = "https://github.com/openscopeproject/InteractiveHtmlBom/"; license = lib.licenses.mit; - changelog = "https://github.com/openscopeproject/InteractiveHtmlBom/releases/tag/v${version}"; + changelog = "https://github.com/openscopeproject/InteractiveHtmlBom/releases/tag/${src.tag}"; maintainers = with lib.maintainers; [ wuyoli ]; mainProgram = "generate_interactive_bom"; }; diff --git a/pkgs/by-name/in/inxi/package.nix b/pkgs/by-name/in/inxi/package.nix index 72ac2b9aaa72..8010260e3658 100644 --- a/pkgs/by-name/in/inxi/package.nix +++ b/pkgs/by-name/in/inxi/package.nix @@ -62,16 +62,16 @@ let ++ recommendedSystemPrograms ++ recommendedDisplayInformationPrograms; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "inxi"; - version = "3.3.37-1"; + version = "3.3.38-1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "smxi"; repo = "inxi"; - rev = version; - hash = "sha256-LyIKjXdfE2sK81zFpXPneaFyfKqa4tU4GfXtt89TZOg="; + tag = finalAttrs.version; + hash = "sha256-+2NPQUn2A8Xy5ByKYS3MOcad6xXvkqcusWEMr7mkEwA="; }; nativeBuildInputs = [ makeWrapper ]; @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { cp inxi.1 $out/share/man/man1/ ''; - meta = with lib; { + meta = { description = "Full featured CLI system information tool"; longDescription = '' inxi is a command line system information script built for console and @@ -97,10 +97,10 @@ stdenv.mkDerivation rec { Processes, RAM usage, and a wide variety of other useful information. ''; homepage = "https://smxi.org/docs/inxi.htm"; - changelog = "https://github.com/smxi/inxi/blob/${version}/inxi.changelog"; - license = licenses.gpl3Plus; - platforms = platforms.unix; + changelog = "https://codeberg.org/smxi/inxi/src/tag/${finalAttrs.version}/inxi.changelog"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; maintainers = [ ]; mainProgram = "inxi"; }; -} +}) diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix index 006137bbc3db..90f9b1140ad5 100644 --- a/pkgs/by-name/io/iosevka/package.nix +++ b/pkgs/by-name/io/iosevka/package.nix @@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "33.0.1"; + version = "33.2.1"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-Yosl6dqbYLsX1whkSazHHlbZ4zhJ5jSZmrdi22BLBJM="; + hash = "sha256-3veB083ZJUfQy7xqnQDnooV2comlQI3ZKNZkJiowpJg="; }; - npmDepsHash = "sha256-/a2VVz8w2a2KfOgWAg0AWmdbPqQ7bN6rBHhv6b1TwYg="; + npmDepsHash = "sha256-la57MOeG6f0ArnUwTOCseevZDR+Qg7kbxNT3cIAr/xE="; nativeBuildInputs = [ diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix index 01138c9e3517..8906373f993c 100644 --- a/pkgs/by-name/ir/iroh/package.nix +++ b/pkgs/by-name/ir/iroh/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,14 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-O/j+/sRyMtqd4GaER2trn9SEFpZuSlc5q1MTXU+rwLg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); - # Some tests require network access which is not available in nix build sandbox. doCheck = false; diff --git a/pkgs/by-name/ir/irust/package.nix b/pkgs/by-name/ir/irust/package.nix index 83c2880931db..11e764c78986 100644 --- a/pkgs/by-name/ir/irust/package.nix +++ b/pkgs/by-name/ir/irust/package.nix @@ -21,17 +21,17 @@ rustPlatform.buildRustPackage rec { pname = "irust"; - version = "1.72.0"; + version = "1.73.0"; src = fetchFromGitHub { owner = "sigmaSd"; repo = "IRust"; rev = "irust@${version}"; - hash = "sha256-PRs6pG2aJQkmsZ1nRBaOTIrmjcYnaI9zZIHKJS/pueQ="; + hash = "sha256-oBHqyOqUNXO5c3TYFp84fDKA+R8ZmrgFCQswu7yXkGw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-oWMKJLVmJ/UQuTNUwZ7VWOFtFa/mJGgbRMQC3aNK3Y0="; + cargoHash = "sha256-YRptwZm00Px+3S+QFZAZxg25ObwmRdbgonzbMnBBb50="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/is/isabelle/components/isabelle-linter.nix b/pkgs/by-name/is/isabelle/components/isabelle-linter.nix index 61a484a7f54b..6063638edd6e 100644 --- a/pkgs/by-name/is/isabelle/components/isabelle-linter.nix +++ b/pkgs/by-name/is/isabelle/components/isabelle-linter.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "isabelle-linter"; - version = "2024-1.0.1"; + version = "2025-1.0.0"; src = fetchFromGitHub { owner = "isabelle-prover"; repo = "isabelle-linter"; - rev = "Isabelle2024-v1.0.1"; - hash = "sha256-oTrwcfJgbkpkIweDIyc6lZjAvdS9J4agPoJgZzH+PuQ="; + rev = "Isabelle2025-v1.0.0"; + hash = "sha256-cH9EoIbKa6cqLjw83gnYvCy+Dq0d5fFmJCabdPrRJeI="; }; nativeBuildInputs = [ isabelle ]; diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index c8f5d1306e5b..363bf860b8c9 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchFromGitHub, coreutils, nettools, java, @@ -10,7 +11,6 @@ veriT, vampire, eprover-ho, - naproche, rlwrap, perl, procps, @@ -21,6 +21,15 @@ }: let + vampire' = vampire.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "vprover"; + repo = "vampire"; + tag = "v4.8HO4Sledgahammer"; + hash = "sha256-CmppaGa4M9tkE1b25cY1LSPFygJy5yV4kpHKbPqvcVE="; + }; + }); + sha1 = stdenv.mkDerivation { pname = "isabelle-sha1"; version = "2024"; @@ -46,7 +55,7 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "isabelle"; - version = "2024"; + version = "2025"; dirname = "Isabelle${version}"; @@ -54,17 +63,17 @@ stdenv.mkDerivation (finalAttrs: rec { if stdenv.hostPlatform.isDarwin then fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz"; - hash = "sha256-IgNfmW9x6h8DBj9vFEGV62oEl01NkW7QdyzXlWmii8c="; + hash = "sha256-6ldUwiiFf12dOuJU7JgUeX8kU+opDfILL23LLvDi5/g="; } else if stdenv.hostPlatform.isx86 then fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - hash = "sha256-YDqq+KvqNll687BlHSwWKobAoN1EIHZvR+VyQDljkmc="; + hash = "sha256-PR1m3jcYI/4xqormZjj3NXW6wkTwCzGu4dy2LzgUfFY="; } else fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux_arm.tar.gz"; - hash = "sha256-jXWVv18WwrVnqVX1s4Lnyf7DkOzPa3EdLXYxgtKD+YA="; + hash = "sha256-p/Hp+7J5gJy5s6BVD5Ma1Mu2OS53I8BS7gKSOYYB0PE="; }; nativeBuildInputs = [ java ]; @@ -72,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: rec { buildInputs = [ polyml veriT - vampire + vampire' eprover-ho nettools ]; @@ -103,8 +112,8 @@ stdenv.mkDerivation (finalAttrs: rec { EOF cat >contrib/vampire-*/etc/settings <>etc/settings for comp in contrib/jdk* contrib/polyml-* contrib/verit-* contrib/vampire-* contrib/e-*; do diff --git a/pkgs/by-name/is/isponsorblocktv/package.nix b/pkgs/by-name/is/isponsorblocktv/package.nix index c684e58c1748..dd5651d38efd 100644 --- a/pkgs/by-name/is/isponsorblocktv/package.nix +++ b/pkgs/by-name/is/isponsorblocktv/package.nix @@ -1,5 +1,6 @@ { fetchFromGitHub, + fetchpatch, lib, python3Packages, }: @@ -16,6 +17,20 @@ python3Packages.buildPythonApplication rec { hash = "sha256-/lUs4EuifHKKyA8QiLsbqz0h6mxJpsFMjovpYE8+SxY="; }; + patches = [ + # Port iSponsorBlockTV to pyytlounge v3 + (fetchpatch { + url = "https://github.com/lukegb/iSponsorBlockTV/commit/89b7b1c029cfbe3b5a481647cdd2d03dec5259ce.patch"; + hash = "sha256-ISMrNrfPTnEbb0lZbREf+kAniJopWx3FePMGFm4ycJY="; + }) + + # Update setup_wizard for Textual v3 + (fetchpatch { + url = "https://github.com/lukegb/iSponsorBlockTV/commit/89dd1d65335689c73a78509689396888599bbe58.patch"; + hash = "sha256-hhWXcqNK3b3mXLCK7W0eXNWgP4lPSl6qgB59Fx8+yeA="; + }) + ]; + build-system = with python3Packages; [ hatchling hatch-requirements-txt diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix index 1a4b2f80e207..39e1fb0cab2d 100644 --- a/pkgs/by-name/is/istioctl/package.nix +++ b/pkgs/by-name/is/istioctl/package.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.25.1"; + version = "1.25.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-DAr7JHZsop1+BuPKC5mD+9pL4JFEp6jjjeSvX+I9uH0="; + hash = "sha256-8CisYUKQCspgs3uXFcM4MNsWbsYSgd7VYv++3JzSOik="; }; - vendorHash = "sha256-dhAJEjKq1wfti2j2xt3NoQUoVRgowIKJhUfJxsFG5yw="; + vendorHash = "sha256-TfIzpdq2H7RHqx9xVrGiStGn4lIROR36li/JDe7W2pQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/iw/iwd/package.nix b/pkgs/by-name/iw/iwd/package.nix index 86b4dd7f86de..1e0e63ddf38c 100644 --- a/pkgs/by-name/iw/iwd/package.nix +++ b/pkgs/by-name/iw/iwd/package.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "3.3"; + version = "3.4"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - hash = "sha256-+CoXoTlQu7ofXPueia1t1vpeH092fYBxLYB+xV4WNEs="; + hash = "sha256-I7oe6FYXtyCJLEmSreeCNiO9CDg6y/sCnk4c9muq2dk="; }; outputs = [ diff --git a/pkgs/by-name/j/j/package.nix b/pkgs/by-name/j/j/package.nix index 53d18a9254c1..b4354a1626ce 100644 --- a/pkgs/by-name/j/j/package.nix +++ b/pkgs/by-name/j/j/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "jsoftware"; repo = "jsource"; - rev = "${version}"; + tag = version; hash = "sha256-Afa2QzzgJYijcavurgGH/qwyofNn4rtFMIHzlqJwFGU="; }; diff --git a/pkgs/by-name/ja/jamin/package.nix b/pkgs/by-name/ja/jamin/package.nix index ff055c731049..f8fc0b8fe939 100644 --- a/pkgs/by-name/ja/jamin/package.nix +++ b/pkgs/by-name/ja/jamin/package.nix @@ -13,19 +13,20 @@ perlPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.95.0"; pname = "jamin"; src = fetchurl { - url = "mirror://sourceforge/jamin/jamin-${version}.tar.gz"; - sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn"; + url = "mirror://sourceforge/jamin/jamin-${finalAttrs.version}.tar.gz"; + hash = "sha256-di/uiGgvJ4iORt+wE6mrXnmFM7m2dkP/HXdgUBk5uzw="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ fftwFloat @@ -44,17 +45,19 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: jamin-preferences.o:/build/jamin-0.95.0/src/hdeq.h:64: multiple definition of # `l_notebook1'; jamin-callbacks.o:/build/jamin-0.95.0/src/hdeq.h:64: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; + # `incompatible-pointer-types` fixes build on GCC 14, otherwise fails with: + # error: passing argument 4 of 'lo_server_thread_add_method' from incompatible pointer type + env.NIX_CFLAGS_COMPILE = "-fcommon -Wno-error=incompatible-pointer-types"; postInstall = '' wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa ''; - meta = with lib; { + meta = { homepage = "https://jamin.sourceforge.net"; description = "JACK Audio Mastering interface"; - license = licenses.gpl2; - maintainers = [ maintainers.nico202 ]; - platforms = platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.nico202 ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index 13f0949c976c..99326fed642d 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -6,7 +6,6 @@ libGL, libheif, libjpeg, - darwin, pkg-config, stdenv, enableHEIFCodec ? true, @@ -50,9 +49,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableOpenGL [ libglut libGL - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa ]; # Since "build" already exists and is populated, cmake tries to use it, diff --git a/pkgs/by-name/ja/java-service-wrapper/package.nix b/pkgs/by-name/ja/java-service-wrapper/package.nix index c85a95861fc6..786495577c77 100644 --- a/pkgs/by-name/ja/java-service-wrapper/package.nix +++ b/pkgs/by-name/ja/java-service-wrapper/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "java-service-wrapper"; - version = "3.5.60"; + version = "3.6.0"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - hash = "sha256-h3iW4U83XAyIHDpQ+O6RC8ZQSziPu/5lEo5512PQhxc="; + hash = "sha256-b9H7teM3zIXvuek1UNlxlzjxPNPy82ElATAGT/Fvjgw="; }; strictDeps = true; diff --git a/pkgs/by-name/jb/jbrowse/package.nix b/pkgs/by-name/jb/jbrowse/package.nix index 9afec3edf96f..faed5998f1a5 100644 --- a/pkgs/by-name/jb/jbrowse/package.nix +++ b/pkgs/by-name/jb/jbrowse/package.nix @@ -6,11 +6,11 @@ let pname = "jbrowse"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-NgqihP3l5a2nrw4LeykypLPDnUmD6MEHSM+hPndhqFI="; + sha256 = "sha256-v4irH+U1w/XYTqT2z60Ce4hhA9Ej9pRCHuov9bViEy8="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/jd/jd-diff-patch/package.nix b/pkgs/by-name/jd/jd-diff-patch/package.nix index 873e8510e699..6468239793fd 100644 --- a/pkgs/by-name/jd/jd-diff-patch/package.nix +++ b/pkgs/by-name/jd/jd-diff-patch/package.nix @@ -4,32 +4,35 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "jd-diff-patch"; - version = "2.1.2"; + version = "2.2.2"; src = fetchFromGitHub { owner = "josephburnett"; repo = "jd"; - rev = "v${version}"; - sha256 = "sha256-chCxbbRZEE29KVnTQWID889kJ2H4qJGVL+vsxzr6VtA="; + rev = "v${finalAttrs.version}"; + hash = "sha256-sA3NzCl9dR6cZnZNFa7Sqb1KUPSWA1h8ReZqR+SRjgk"; }; + sourceRoot = "${finalAttrs.src.name}/v2"; + # not including web ui excludedPackages = [ "gae" "pack" ]; - vendorHash = null; + vendorHash = "sha256-Ol+9YwtJ5P6au1aW2ss9mrU9l5G3iBviX5q1qC0K+vc="; - meta = with lib; { + meta = { description = "Commandline utility and Go library for diffing and patching JSON values"; homepage = "https://github.com/josephburnett/jd"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bryanasdev000 + juliusfreudenberger ]; mainProgram = "jd"; }; -} +}) diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix index 818724a409bb..aac9207c2697 100644 --- a/pkgs/by-name/je/jen/package.nix +++ b/pkgs/by-name/je/jen/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchCrate, fetchpatch, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,10 +25,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-qYEnKFC1Y24TEY0dXa9N7QNvxhHULq+vd4Wej/RK8HQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Simple CLI generation tool for creating large datasets"; mainProgram = "jen"; diff --git a/pkgs/by-name/jh/jhentai/package.nix b/pkgs/by-name/jh/jhentai/package.nix index f3243b9b4f68..a967c7adbb03 100644 --- a/pkgs/by-name/jh/jhentai/package.nix +++ b/pkgs/by-name/jh/jhentai/package.nix @@ -2,62 +2,77 @@ autoPatchelfHook, lib, fetchFromGitHub, - flutter, - pkg-config, + flutter324, webkitgtk_4_1, + runCommand, + yq, + jhentai, + _experimental-update-script-combinators, + gitUpdater, }: -flutter.buildFlutterApplication rec { + +flutter324.buildFlutterApplication rec { pname = "jhentai"; - version = "8.0.5"; + version = "8.0.6+277"; src = fetchFromGitHub { owner = "jiangtian616"; repo = "JHenTai"; tag = "v${version}"; - hash = "sha256-LL1TyLF37NtwTRN9vhHBY+xHDg0E0ACt2ilacIKpduU="; + hash = "sha256-uS9jRgOKjByZazT6KCf9oOTeC6VPv7cIjtx5SNgIO7A="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; - postUnpack = '' - substituteInPlace $sourceRoot/linux/my_application.cc \ - --replace-fail "gtk_widget_realize(GTK_WIDGET(window))" "gtk_widget_show(GTK_WIDGET(window))" - ''; - - nativeBuildInputs = [ - pkg-config - autoPatchelfHook - ]; - - buildInputs = [ - webkitgtk_4_1 - ]; - gitHashes = { desktop_webview_window = "sha256-QDlumlZ3pbmBRkMSJJVgz8HcCdANzV3cU142URvkY1w="; dio = "sha256-eHGAV/yIqTaC/wJeSXiPwonPePq+GT1u1dgjbBrW8OI="; flutter_draggable_gridview = "sha256-kntjeWEhRl4rdJBO8kt7GCaaLdPWy6b7zmBIjHyP7h8="; flutter_slidable = "sha256-nBPEZBvKV3D/eEa/cYb7jgbJ60rbh823yDJALLz1/8c="; flutter_socks_proxy = "sha256-a8XZTPTz521o7G7NsEXv2E/H7uVJcY4rcouIkdQC+jg="; - flutter_windowmanager = "sha256-+T2w1VLnrkzyvODGmWefa6aN1N+/i4itBgps2zouAas="; - j_downloader = "sha256-x5RG/SqbfOiRd51dL8H+phLIBrpVdOJiASWhbB5gCNQ="; + j_downloader = "sha256-Ct4TZvxKVWirEnSLs+pekDuf+b8tHFUZTdupBflGvJM="; like_button = "sha256-OVzfpIEnw88496H345NHn7nZ48+QDTaneBzN2UCdwk8="; photo_view = "sha256-k/+ncCzGkF4XmFpo3wmJOQbElSh2r+SlyeI3M9yDFtM="; + fluttertoast = "sha256-/2VJ1x7l5Idjwkm4Ennz8H/EC3j4/slRODj/82yO3iI="; + http_proxy = "sha256-GFb2xy8RSn6x/JGHRSa7Gl5TAsY+DHo8k3xxPqXGmfo="; + scrollable_positioned_list = "sha256-8WfyUpTs+Cfv2VzFECrW/DGoKOsu9KY6hf6sP81xuBg="; + system_network_proxy = "sha256-TAiFiIbO3v2awkaw8YYj7YnmuplnkSBclUVdGyHIRCs="; + zoom_view = "sha256-/JPvmLg8syn5IlKucj3R765kedCZ1LdzkreUIsvdwEg="; }; + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ webkitgtk_4_1 ]; + flutterBuildFlags = [ "--target lib/src/main.dart" ]; postInstall = '' - install -Dm644 ./linux/assets/top.jtmonster.jhentai.desktop $out/share/applications/top.jtmonster.jhentai.desktop - install -Dm644 ./assets/icon_512.png $out/share/icons/hicolor/512x512/apps/top.jtmonster.jhentai.png + install -Dm644 linux/assets/top.jtmonster.jhentai.desktop $out/share/applications/jhentai.desktop + install -Dm644 assets/icon/JHenTai_512.png $out/share/icons/hicolor/512x512/apps/top.jtmonster.jhentai.png ''; extraWrapProgramArgs = '' - --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" + --prefix LD_LIBRARY_PATH : $out/app/jhentai/lib ''; + passthru = { + pubspecSource = + runCommand "pubspec.lock.json" + { + buildInputs = [ yq ]; + inherit (jhentai) src; + } + '' + cat $src/pubspec.lock | yq > $out + ''; + updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { rev-prefix = "v"; }) + (_experimental-update-script-combinators.copyAttrOutputToFile "jhentai.pubspecSource" ./pubspec.lock.json) + ]; + }; + meta = { description = "Cross-platform manga app made for e-hentai & exhentai by Flutter"; homepage = "https://github.com/jiangtian616/JHenTai"; diff --git a/pkgs/by-name/jh/jhentai/pubspec.lock.json b/pkgs/by-name/jh/jhentai/pubspec.lock.json index 3a94a6aebe7b..d2ccdbdc8ab9 100644 --- a/pkgs/by-name/jh/jhentai/pubspec.lock.json +++ b/pkgs/by-name/jh/jhentai/pubspec.lock.json @@ -4,21 +4,27 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", + "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77", "url": "https://pub.dev" }, "source": "hosted", - "version": "67.0.0" + "version": "73.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", + "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.1" + "version": "6.8.0" }, "analyzer_plugin": { "dependency": "transitive", @@ -74,21 +80,21 @@ "dependency": "transitive", "description": { "name": "args", - "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "2.6.0" }, "asn1lib": { "dependency": "transitive", "description": { "name": "asn1lib", - "sha256": "58082b3f0dca697204dbab0ef9ff208bfaea7767ea771076af9a343488428dda", + "sha256": "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.3" + "version": "1.5.8" }, "async": { "dependency": "transitive", @@ -104,31 +110,31 @@ "dependency": "transitive", "description": { "name": "audio_session", - "sha256": "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261", + "sha256": "b2a26ba8b7efa1790d6460e82971fde3e398cfbe2295df9dea22f3499d2c12a7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.21" + "version": "0.1.23" }, "battery_plus": { "dependency": "direct main", "description": { "name": "battery_plus", - "sha256": "ca67f5457a473f132fec42a4445c8c19a98205c1bc20f8feaa5a7f50d42f750f", + "sha256": "220c8f1961efb01d6870493b5ac5a80afaeaffc8757f7a11ed3025a8570d29e7", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.1" + "version": "6.2.0" }, "battery_plus_platform_interface": { "dependency": "transitive", "description": { "name": "battery_plus_platform_interface", - "sha256": "942707f90e2f7481dcb178df02e22a9c6971b3562b848d6a1b8c7cff9f1a1fec", + "sha256": "e8342c0f32de4b1dfd0223114b6785e48e579bfc398da9471c9179b907fa4910", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.0.1" }, "blur": { "dependency": "direct main", @@ -194,21 +200,21 @@ "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21", + "sha256": "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.8" + "version": "2.4.11" }, "build_runner_core": { - "dependency": "direct dev", + "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "88a57f2ac99849362e73878334caa9f06ee25f31d2adced882b8337838c84e1e", + "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.2.9" + "version": "7.3.2" }, "built_collection": { "dependency": "transitive", @@ -224,11 +230,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.2" + "version": "8.9.3" }, "cached_network_image": { "dependency": "direct overridden", @@ -274,11 +280,11 @@ "dependency": "transitive", "description": { "name": "charcode", - "sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306", + "sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.4.0" }, "checked_yaml": { "dependency": "transitive", @@ -304,11 +310,11 @@ "dependency": "transitive", "description": { "name": "cli_util", - "sha256": "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.5" + "version": "0.4.2" }, "clipboard": { "dependency": "direct main", @@ -334,11 +340,11 @@ "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.10.0" + "version": "4.10.1" }, "collection": { "dependency": "direct main", @@ -354,31 +360,31 @@ "dependency": "transitive", "description": { "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.1.2" }, "coverage": { "dependency": "transitive", "description": { "name": "coverage", - "sha256": "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e", + "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.8.0" + "version": "1.11.1" }, "cross_file": { "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.4+1" + "version": "0.3.4+2" }, "crypto": { "dependency": "direct main", @@ -424,11 +430,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.6" + "version": "2.3.7" }, "dbus": { "dependency": "transitive", @@ -455,21 +461,21 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91", + "sha256": "c4af09051b4f0508f6c1dc0a5c085bf014d5c9a4a0678ce1799c2b4d716387a0", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.0" + "version": "11.1.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "device_info_plus_platform_interface", - "sha256": "d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64", + "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.2" }, "dio": { "dependency": "direct main", @@ -496,21 +502,21 @@ "dependency": "direct main", "description": { "name": "drift", - "sha256": "4e0ffee40d23f0b809e6cff1ad202886f51d629649073ed42d9cd1d194ea943e", + "sha256": "df027d168a2985a2e9da900adeba2ab0136f0d84436592cf3cd5135f82c8579c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.19.1+1" + "version": "2.21.0" }, "drift_dev": { "dependency": "direct dev", "description": { "name": "drift_dev", - "sha256": "ac7647c6cedca99724ca300cff9181f6dd799428f8ed71f94159ed0528eaec26", + "sha256": "4592cea370f1dcd8afc67987c28402797d9ddb4aa3ae372cb675497c0741816c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.19.1" + "version": "2.21.1" }, "encrypt": { "dependency": "transitive", @@ -586,41 +592,41 @@ "dependency": "transitive", "description": { "name": "ffi", - "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "file": { "dependency": "transitive", "description": { "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" }, "file_picker": { "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "824f5b9f389bfc4dddac3dea76cd70c51092d9dff0b2ece7ef4f53db8547d258", + "sha256": "aac85f20436608e01a6ffd1fdd4e746a7f33c93a2c83752e626bdfaea139b877", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.6" + "version": "8.1.3" }, "fixnum": { "dependency": "transitive", "description": { "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "flex_color_picker": { "dependency": "direct main", @@ -652,11 +658,11 @@ "dependency": "transitive", "description": { "name": "flutter_cache_manager", - "sha256": "ceff65d74d907b1b772e22cf04daad60fb472461638977d9fae8b00a63e01e3d", + "sha256": "a77f77806a790eb9ba0118a5a3a936e81c4fea2b61533033b2b0c3d50bbde5ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.3" + "version": "3.4.0" }, "flutter_displaymode": { "dependency": "direct main", @@ -683,11 +689,11 @@ "dependency": "direct dev", "description": { "name": "flutter_launcher_icons", - "sha256": "ce0e501cfc258907842238e4ca605e74b7fd1cdf04b3b43e86c43f3e40a1592c", + "sha256": "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.11.0" + "version": "0.14.1" }, "flutter_lints": { "dependency": "direct dev", @@ -719,11 +725,11 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "9d98bd47ef9d34e803d438f17fd32b116d31009f534a6fa5ce3a1167f189a6de", + "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.21" + "version": "2.0.24" }, "flutter_rating_bar": { "dependency": "direct main", @@ -771,11 +777,11 @@ "dependency": "transitive", "description": { "name": "flutter_svg", - "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2", + "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.10+1" + "version": "2.0.17" }, "flutter_test": { "dependency": "direct dev", @@ -809,26 +815,26 @@ "source": "hosted", "version": "0.15.2" }, - "flutter_windowmanager": { + "flutter_windowmanager_plus": { "dependency": "direct main", "description": { - "path": ".", - "ref": "HEAD", - "resolved-ref": "3f5e7dae93e3c83368d2db0da7ee0dbcfd14d895", - "url": "https://github.com/AQuadic/flutter_windowmanager" + "name": "flutter_windowmanager_plus", + "sha256": "4e2bf7c7f374699fd74d59785f1d74efd40052c24a5edde5a4d825cc72608d40", + "url": "https://pub.dev" }, - "source": "git", - "version": "0.2.0" + "source": "hosted", + "version": "1.0.1" }, "fluttertoast": { "dependency": "direct main", "description": { - "name": "fluttertoast", - "sha256": "7cc92eabe01e3f1babe1571c5560b135dfc762a34e41e9056881e2196b178ec1", - "url": "https://pub.dev" + "path": ".", + "ref": "patch-1", + "resolved-ref": "ac29e14f4e7aa32adfa222b6354759e36488a1a2", + "url": "https://github.com/MarlonJD/FlutterToast" }, - "source": "hosted", - "version": "8.1.2" + "source": "git", + "version": "8.2.8" }, "font_awesome_flutter": { "dependency": "direct main", @@ -841,14 +847,14 @@ "version": "9.2.0" }, "frontend_server_client": { - "dependency": "transitive", + "dependency": "direct dev", "description": { "name": "frontend_server_client", - "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "4.0.0" }, "fwfh_cached_network_image": { "dependency": "transitive", @@ -904,11 +910,11 @@ "dependency": "transitive", "description": { "name": "fwfh_webview", - "sha256": "f67890bc0d6278da98bd197469ae9511c859f7db327e92299fe0ea0cf46c4057", + "sha256": "c0a8b664b642f40f4c252a0ab4e72c22dcd97c7fb3a7e50a6b4bdb6f63afca19", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.15.2" + "version": "0.15.3" }, "get": { "dependency": "direct main", @@ -994,41 +1000,42 @@ "dependency": "transitive", "description": { "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "http_parser": { "dependency": "transitive", "description": { "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.2" }, "http_proxy": { "dependency": "direct main", "description": { - "name": "http_proxy", - "sha256": "7d5bc7ad1b0c6d0cfb5da97c5bfe302082f93d32cf5c67d484d1a4085b3ffa58", - "url": "https://pub.dev" + "path": ".", + "ref": "HEAD", + "resolved-ref": "02ec76afab6bf24fd1f8c1d90a2f4c8f9d82d11f", + "url": "https://github.com/jiangtian616/http_proxy" }, - "source": "hosted", - "version": "1.2.1" + "source": "git", + "version": "1.2.2" }, "image": { "dependency": "transitive", "description": { "name": "image", - "sha256": "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6", + "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0" + "version": "4.3.0" }, "integral_isolates": { "dependency": "direct main", @@ -1054,11 +1061,11 @@ "dependency": "transitive", "description": { "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.5" }, "iregexp": { "dependency": "transitive", @@ -1075,11 +1082,11 @@ "description": { "path": ".", "ref": "HEAD", - "resolved-ref": "ddf5d6b3e9cf62aa0cf35d3035f9cf8024477a7d", + "resolved-ref": "8ac5fba3ba7caa71cd60e3ffc24c9755c31e76dd", "url": "https://github.com/jiangtian616/JDownloader" }, "source": "git", - "version": "0.0.2" + "version": "0.0.3" }, "js": { "dependency": "transitive", @@ -1105,31 +1112,31 @@ "dependency": "transitive", "description": { "name": "json_class", - "sha256": "668be1a27c493dd8822fe8c3ce3563ccd788e2b214d77a0b8b3bfad50272e7f9", + "sha256": "f27de435c3b47ceea23c13d0516afa98c71c62c7a762a6c8f1df665189eb855e", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0+16" + "version": "3.0.1" }, "json_path": { "dependency": "transitive", "description": { "name": "json_path", - "sha256": "dc25b4e2297a6bd39fb52b7d122a7787b7dab751fb278d315b54706b98bb76db", + "sha256": "7a06bbb1cfad390b20fb7a2ca5e67d9ba59633879c6d71142b80fbf61c3b66f6", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.2" + "version": "0.7.4" }, "just_audio": { "dependency": "transitive", "description": { "name": "just_audio", - "sha256": "ee50602364ba83fa6308f5512dd560c713ec3e1f2bc75f0db43618f0d82ef71a", + "sha256": "1a1eb86e7d81e69a1d36943f2b3efd62dece3dad2cafd9ec2e62e6db7c04d9b7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.39" + "version": "0.9.43" }, "just_audio_platform_interface": { "dependency": "transitive", @@ -1145,31 +1152,31 @@ "dependency": "transitive", "description": { "name": "just_audio_web", - "sha256": "0edb481ad4aa1ff38f8c40f1a3576013c3420bf6669b686fe661627d49bc606c", + "sha256": "9a98035b8b24b40749507687520ec5ab404e291d2b0937823ff45d92cb18d448", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.11" + "version": "0.4.13" }, "leak_tracker": { "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.7" + "version": "10.0.5" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.8" + "version": "3.0.5" }, "leak_tracker_testing": { "dependency": "transitive", @@ -1226,21 +1233,21 @@ "dependency": "transitive", "description": { "name": "local_auth_android", - "sha256": "e99c44ca0bce08f26f25e2a2e07d3b443d69986e1c3acf67c1449f7d847e3625", + "sha256": "6763aaf8965f21822624cb2fd3c03d2a8b3791037b5efb0fe4b13e110f5afc92", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.43" + "version": "1.0.46" }, "local_auth_darwin": { "dependency": "transitive", "description": { "name": "local_auth_darwin", - "sha256": "e424ebf90d5233452be146d4a7da4bcd7a70278b67791592f3fde1bda8eef9e2", + "sha256": "5c5127061107278ab4cafa1ac51b3b6760282bf1a2abf011270908a429d1634b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.4.2" }, "local_auth_platform_interface": { "dependency": "transitive", @@ -1276,11 +1283,21 @@ "dependency": "transitive", "description": { "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2-main.4" }, "matcher": { "dependency": "direct overridden", @@ -1326,11 +1343,11 @@ "dependency": "transitive", "description": { "name": "mime", - "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", + "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.5" + "version": "1.0.6" }, "nested": { "dependency": "transitive", @@ -1356,41 +1373,41 @@ "dependency": "transitive", "description": { "name": "octo_image", - "sha256": "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "package_config": { - "dependency": "transitive", - "description": { - "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd", "url": "https://pub.dev" }, "source": "hosted", "version": "2.1.0" }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, "package_info_plus": { "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "4de6c36df77ffbcef0a5aefe04669d33f2d18397fea228277b852a2d4e58e860", + "sha256": "894f37107424311bdae3e476552229476777b8752c5a2a2369c0cb9a2d5442ef", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.1" + "version": "8.0.3" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66", + "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "path": { "dependency": "direct main", @@ -1416,11 +1433,11 @@ "dependency": "transitive", "description": { "name": "path_parsing", - "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf", + "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "1.1.0" }, "path_provider": { "dependency": "direct main", @@ -1436,21 +1453,21 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "e84c8a53fe1510ef4582f118c7b4bdf15b03002b51d7c2b66983c65843d61193", + "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.8" + "version": "2.2.15" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "path_provider_linux": { "dependency": "transitive", @@ -1496,11 +1513,11 @@ "dependency": "transitive", "description": { "name": "permission_handler_android", - "sha256": "b29a799ca03be9f999aa6c39f7de5209482d638e6f857f6b93b0875c618b7e54", + "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.7" + "version": "12.0.13" }, "permission_handler_apple": { "dependency": "transitive", @@ -1516,21 +1533,21 @@ "dependency": "transitive", "description": { "name": "permission_handler_html", - "sha256": "6cac773d389e045a8d4f85418d07ad58ef9e42a56e063629ce14c4c26344de24", + "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.2" + "version": "0.1.3+5" }, "permission_handler_platform_interface": { "dependency": "transitive", "description": { "name": "permission_handler_platform_interface", - "sha256": "48d4fcf201a1dad93ee869ab0d4101d084f49136ec82a8a06ed9cfeacab9fd20", + "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.1" + "version": "4.2.3" }, "permission_handler_windows": { "dependency": "transitive", @@ -1577,11 +1594,11 @@ "dependency": "transitive", "description": { "name": "platform", - "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.5" + "version": "3.1.6" }, "plugin_platform_interface": { "dependency": "transitive", @@ -1627,31 +1644,31 @@ "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.1.5" }, "pubspec_parse": { "dependency": "transitive", "description": { "name": "pubspec_parse", - "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "quiver": { "dependency": "transitive", "description": { "name": "quiver", - "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "recase": { "dependency": "transitive", @@ -1667,11 +1684,11 @@ "dependency": "direct main", "description": { "name": "receive_sharing_intent", - "sha256": "912bebb551bce75a14098891fd750305b30d53eba0d61cc70cd9973be9866e8d", + "sha256": "ec76056e4d258ad708e76d85591d933678625318e411564dcb9059048ca3a593", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.5" + "version": "1.8.1" }, "retry": { "dependency": "direct main", @@ -1786,42 +1803,43 @@ "scrollable_positioned_list": { "dependency": "direct main", "description": { - "name": "scrollable_positioned_list", - "sha256": "ca7fcaa743db712d4f7b1580526f494d0093c77a721a65705ee51fbeac7a2bd3", - "url": "https://pub.dev" + "path": "packages/scrollable_positioned_list", + "ref": "HEAD", + "resolved-ref": "5dc660081452cfb76f574e1252eb34ba69c40257", + "url": "https://github.com/jiangtian616/flutter.widgets" }, - "source": "hosted", - "version": "0.3.5" + "source": "git", + "version": "0.3.8+1" }, "share_plus": { "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "fb5319f3aab4c5dda5ebb92dca978179ba21f8c783ee4380910ef4c1c6824f51", + "sha256": "3af2cda1752e5c24f2fc04b6083b40f013ffe84fb90472f30c6499a9213d5442", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.3" + "version": "10.1.1" }, "share_plus_platform_interface": { "dependency": "transitive", "description": { "name": "share_plus_platform_interface", - "sha256": "251eb156a8b5fa9ce033747d73535bf53911071f8d3b6f4f0b578505ce0d4496", + "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.0" + "version": "5.0.2" }, "shelf": { "dependency": "transitive", "description": { "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.1" + "version": "1.4.2" }, "shelf_packages_handler": { "dependency": "transitive", @@ -1837,11 +1855,11 @@ "dependency": "transitive", "description": { "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.1.3" }, "shelf_web_socket": { "dependency": "transitive", @@ -1867,7 +1885,7 @@ "dependency": "transitive", "description": "flutter", "source": "sdk", - "version": "0.0.0" + "version": "0.0.99" }, "smart_auth": { "dependency": "transitive", @@ -1893,21 +1911,21 @@ "dependency": "transitive", "description": { "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "source_maps": { "dependency": "transitive", "description": { "name": "source_maps", - "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.10.12" + "version": "0.10.13" }, "source_span": { "dependency": "transitive", @@ -1933,31 +1951,61 @@ "dependency": "transitive", "description": { "name": "sqflite", - "sha256": "a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d", + "sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3+1" + "version": "2.4.1" + }, + "sqflite_android": { + "dependency": "transitive", + "description": { + "name": "sqflite_android", + "sha256": "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4", + "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4" + "version": "2.5.4+6" + }, + "sqflite_darwin": { + "dependency": "transitive", + "description": { + "name": "sqflite_darwin", + "sha256": "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1+1" + }, + "sqflite_platform_interface": { + "dependency": "transitive", + "description": { + "name": "sqflite_platform_interface", + "sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" }, "sqlite3": { "dependency": "transitive", "description": { "name": "sqlite3", - "sha256": "fde692580bee3379374af1f624eb3e113ab2865ecb161dbe2d8ac2de9735dbdb", + "sha256": "c284434c408d207863800341298cadfde23abe074a0f01b19c9d8cce4edb8eaa", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.5" + "version": "2.6.0" }, "sqlite3_flutter_libs": { "dependency": "direct main", @@ -1973,21 +2021,21 @@ "dependency": "transitive", "description": { "name": "sqlparser", - "sha256": "3be52b4968fc2f098ba735863404756d2fe3ea0729cf006a5b5612618f74ca04", + "sha256": "d77749237609784e337ec36c979d41f6f38a7b279df98622ae23929c8eb954a4", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.37.1" + "version": "0.39.2" }, "stack_trace": { "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.12.0" + "version": "1.11.1" }, "stream_channel": { "dependency": "transitive", @@ -2003,21 +2051,21 @@ "dependency": "transitive", "description": { "name": "stream_transform", - "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "string_scanner": { "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.2.0" }, "syncfusion_flutter_charts": { "dependency": "direct main", @@ -2033,30 +2081,31 @@ "dependency": "transitive", "description": { "name": "syncfusion_flutter_core", - "sha256": "4347f4d2f5d89461df2c53e6fbf53aef38c7f05ed79b0760d935fb1ec836213b", + "sha256": "325f519ce4ad8edd81811c21b853d72018529e353584490824da0555156ba076", "url": "https://pub.dev" }, "source": "hosted", - "version": "27.1.48" + "version": "27.2.5" }, "synchronized": { "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558", + "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0+1" + "version": "3.3.0+3" }, "system_network_proxy": { "dependency": "direct main", "description": { - "name": "system_network_proxy", - "sha256": "d24394993d60150918d00f8fd1fe940e37faaa602dbd790eb5cc8858d3309e83", - "url": "https://pub.dev" + "path": "system_network_proxy", + "ref": "HEAD", + "resolved-ref": "2880fba3b30efec1be35fbcc2a199755f9536bac", + "url": "https://github.com/jiangtian616/system_network_proxy" }, - "source": "hosted", + "source": "git", "version": "1.0.2" }, "system_network_proxy_linux": { @@ -2173,21 +2222,21 @@ "dependency": "transitive", "description": { "name": "timing", - "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "1.0.2" }, "typed_data": { "dependency": "transitive", "description": { "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.4.0" }, "universal_platform": { "dependency": "transitive", @@ -2223,41 +2272,41 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "c24484594a8dea685610569ab0f2547de9c7a1907500a9bc5e37e4c9a3cbfb23", + "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.6" + "version": "6.3.14" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e", + "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.1" + "version": "6.3.2" }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811", + "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.2.1" }, "url_launcher_macos": { "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", + "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "3.2.2" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -2273,21 +2322,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a", + "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.3" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.4" }, "uuid": { "dependency": "direct main", @@ -2303,31 +2352,31 @@ "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3", + "sha256": "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.11+1" + "version": "1.1.15" }, "vector_graphics_codec": { "dependency": "transitive", "description": { "name": "vector_graphics_codec", - "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da", + "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.11+1" + "version": "1.1.13" }, "vector_graphics_compiler": { "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81", + "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.11+1" + "version": "1.1.16" }, "vector_math": { "dependency": "transitive", @@ -2343,51 +2392,51 @@ "dependency": "transitive", "description": { "name": "video_player", - "sha256": "e30df0d226c4ef82e2c150ebf6834b3522cf3f654d8e2f9419d376cdc071425d", + "sha256": "4a8c3492d734f7c39c2588a3206707a05ee80cef52e8c7f3b2078d430c84bc17", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.9.1" + "version": "2.9.2" }, "video_player_android": { "dependency": "transitive", "description": { "name": "video_player_android", - "sha256": "b6f0a6d241e4a3435806cb7cb78cb666db8889c1866e432b6acd204707b3ac01", + "sha256": "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.3" + "version": "2.7.16" }, "video_player_avfoundation": { "dependency": "transitive", "description": { "name": "video_player_avfoundation", - "sha256": "d1e9a824f2b324000dc8fb2dcb2a3285b6c1c7c487521c63306cc5b394f68a7c", + "sha256": "8a4e73a3faf2b13512978a43cf1cdda66feeeb900a0527f1fbfd7b19cf3458d3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "2.6.7" }, "video_player_platform_interface": { "dependency": "transitive", "description": { "name": "video_player_platform_interface", - "sha256": "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6", + "sha256": "229d7642ccd9f3dc4aba169609dd6b5f3f443bb4cc15b82f7785fcada5af9bbb", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.2" + "version": "6.2.3" }, "video_player_web": { "dependency": "transitive", "description": { "name": "video_player_web", - "sha256": "ff4d69a6614b03f055397c27a71c9d3ddea2b2a23d71b2ba0164f59ca32b8fe2", + "sha256": "881b375a934d8ebf868c7fb1423b2bfaa393a0a265fa3f733079a86536064a10", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.3" }, "visibility_detector": { "dependency": "transitive", @@ -2403,41 +2452,41 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.0" + "version": "14.2.5" }, "wakelock_plus": { "dependency": "direct main", "description": { "name": "wakelock_plus", - "sha256": "4fa83a128b4127619e385f686b4f080a5d2de46cff8e8c94eccac5fcf76550e5", + "sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.7" + "version": "1.2.8" }, "wakelock_plus_platform_interface": { "dependency": "transitive", "description": { "name": "wakelock_plus_platform_interface", - "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16", + "sha256": "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "waterfall_flow": { "dependency": "direct main", @@ -2453,21 +2502,21 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "1.1.0" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", + "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.5" + "version": "2.4.0" }, "webkit_inspection_protocol": { "dependency": "transitive", @@ -2493,11 +2542,11 @@ "dependency": "transitive", "description": { "name": "webview_flutter_android", - "sha256": "060e1a621add859dc822f3e4c59b01468e8515ea78cfc5ac4c6b28bc903b5f74", + "sha256": "47a8da40d02befda5b151a26dba71f47df471cddd91dfdb7802d0a87c5442558", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.16.5" + "version": "3.16.9" }, "webview_flutter_platform_interface": { "dependency": "transitive", @@ -2513,31 +2562,31 @@ "dependency": "transitive", "description": { "name": "webview_flutter_wkwebview", - "sha256": "9c62cc46fa4f2d41e10ab81014c1de470a6c6f26051a2de32111b2ee55287feb", + "sha256": "4adc14ea9a770cc9e2c8f1ac734536bd40e82615bd0fa6b94be10982de656cc7", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.14.0" + "version": "3.17.0" }, "win32": { "dependency": "transitive", "description": { "name": "win32", - "sha256": "a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4", + "sha256": "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.5.1" + "version": "5.10.0" }, "win32_registry": { "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6", + "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.4" + "version": "1.1.5" }, "window_manager": { "dependency": "direct main", @@ -2553,11 +2602,11 @@ "dependency": "transitive", "description": { "name": "xdg_directories", - "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.1.0" }, "xml": { "dependency": "direct main", @@ -2573,11 +2622,11 @@ "dependency": "transitive", "description": { "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.3" }, "yaon": { "dependency": "transitive", @@ -2589,6 +2638,17 @@ "source": "hosted", "version": "1.1.4+10" }, + "zoom_view": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "HEAD", + "resolved-ref": "9e29df74754faaef6368a70f0b38d32b9e373123", + "url": "https://github.com/jiangtian616/zoom_view" + }, + "source": "git", + "version": "0.0.15" + }, "zoom_widget": { "dependency": "direct main", "description": { @@ -2601,7 +2661,7 @@ } }, "sdks": { - "dart": ">=3.4.0 <4.0.0", - "flutter": ">=3.22.0" + "dart": ">=3.5.1 <4.0.0", + "flutter": ">=3.24.0" } } diff --git a/pkgs/by-name/ji/jitsi-meet-electron/package.nix b/pkgs/by-name/ji/jitsi-meet-electron/package.nix index 0be61315c429..524666c29dcb 100644 --- a/pkgs/by-name/ji/jitsi-meet-electron/package.nix +++ b/pkgs/by-name/ji/jitsi-meet-electron/package.nix @@ -11,18 +11,9 @@ libXi, libXtst, zlib, - darwin, electron, }: -let - inherit (darwin.apple_sdk.frameworks) - Carbon - CoreFoundation - ApplicationServices - OpenGL - ; -in buildNpmPackage rec { pname = "jitsi-meet-electron"; version = "2025.2.0"; @@ -43,20 +34,13 @@ buildNpmPackage rec { ]; # robotjs node-gyp dependencies - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - libpng - libX11 - libXi - libXtst - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - CoreFoundation - ApplicationServices - OpenGL - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libpng + libX11 + libXi + libXtst + zlib + ]; npmDepsHash = "sha256-TckV91RJo06OKb8nIvxBCxu28qyHtA/ACDshOlaCQxA="; diff --git a/pkgs/by-name/ji/jitterentropy/package.nix b/pkgs/by-name/ji/jitterentropy/package.nix index c86203432849..bf5a6409a6f5 100644 --- a/pkgs/by-name/ji/jitterentropy/package.nix +++ b/pkgs/by-name/ji/jitterentropy/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "jitterentropy"; - version = "3.6.2"; + version = "3.6.3"; src = fetchFromGitHub { owner = "smuellerDD"; repo = "jitterentropy-library"; rev = "v${version}"; - hash = "sha256-A1Y+7CqzoQ6xoTwWU8gfq+dYJ+PiIpqtOOZSL0uVby4="; + hash = "sha256-A7a0kg9JRiNNKJbLJu5Fbu6ZgCwv3+3oDhZr3jwNXmM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/jo/josh/package.nix b/pkgs/by-name/jo/josh/package.nix index cfb33fa796bb..a2544073b83c 100644 --- a/pkgs/by-name/jo/josh/package.nix +++ b/pkgs/by-name/jo/josh/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, libgit2, @@ -8,7 +7,6 @@ pkg-config, makeWrapper, git, - darwin, }: let @@ -40,14 +38,10 @@ rustPlatform.buildRustPackage { makeWrapper ]; - buildInputs = - [ - libgit2 - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.Security - ]; + buildInputs = [ + libgit2 + openssl + ]; cargoBuildFlags = cargoFlags; cargoTestFlags = cargoFlags; diff --git a/pkgs/by-name/jo/joshuto/package.nix b/pkgs/by-name/jo/joshuto/package.nix index fb923caea595..72e1c48a3d94 100644 --- a/pkgs/by-name/jo/joshuto/package.nix +++ b/pkgs/by-name/jo/joshuto/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, installShellFiles, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,10 +22,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd joshuto \ --bash <($out/bin/joshuto completions bash) \ diff --git a/pkgs/by-name/jo/josm/package.nix b/pkgs/by-name/jo/josm/package.nix index d82472488856..6cb59e4006fa 100644 --- a/pkgs/by-name/jo/josm/package.nix +++ b/pkgs/by-name/jo/josm/package.nix @@ -11,21 +11,21 @@ }: let pname = "josm"; - version = "19307"; + version = "19369"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-08dacfJrRbdk8Bj+lDW2s8YuGVvnKdvMQN825lusohk="; + hash = "sha256-rcnfrKaKVWvPLdr8hab380Ao661NVj+pCZMIGiUM0aQ="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip"; - hash = "sha256-wFLQXGOaRnFDZEDlZwmv8wb3pNJbVxocYVjc8wy1Q10="; + hash = "sha256-zIiOq14o972Z+V4Cc3IFjcgd50G1VDEoxbcYVtOR5C4="; }; pkg = fetchFromGitHub { owner = "JOSM"; repo = "josm"; tag = "${version}-tested"; - hash = "sha256-TwheY/9gXbKH36jZLMoV9xIBeq59FpHUUoselaiYGzA="; + hash = "sha256-mPuf98HfvmAHcnOiFKHUtqNVg7sy5XZP2hnm7ZdaUQo="; }; }; diff --git a/pkgs/by-name/jr/jrnl/package.nix b/pkgs/by-name/jr/jrnl/package.nix index c60e20d95751..3d0113ed4aa1 100644 --- a/pkgs/by-name/jr/jrnl/package.nix +++ b/pkgs/by-name/jr/jrnl/package.nix @@ -41,6 +41,8 @@ python3.pkgs.buildPythonApplication rec { rich ]; + pythonRelaxDeps = [ "rich" ]; + nativeCheckInputs = with python3.pkgs; [ pytest-bdd pytest-xdist diff --git a/pkgs/by-name/js/jsoncons/package.nix b/pkgs/by-name/js/jsoncons/package.nix index bc10504103e4..d5ffd1d6dd42 100644 --- a/pkgs/by-name/js/jsoncons/package.nix +++ b/pkgs/by-name/js/jsoncons/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jsoncons"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "danielaparker"; repo = "jsoncons"; tag = "v${finalAttrs.version}"; - hash = "sha256-BYmIGcQvy38KIWQp8Zr3Anz9HIfbXUhj4G+VgkusjhU="; + hash = "sha256-Q7qtLLTvJcIFPSx6MkS7SI89MBcM88g3KmX/b3BAKwI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/js/jsonnet/package.nix b/pkgs/by-name/js/jsonnet/package.nix index 498cf26dadf2..5d844ade98af 100644 --- a/pkgs/by-name/js/jsonnet/package.nix +++ b/pkgs/by-name/js/jsonnet/package.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { description = "Purely-functional configuration language that helps you define JSON data"; maintainers = with lib.maintainers; [ benley - copumpkin ]; license = lib.licenses.asl20; homepage = "https://github.com/google/jsonnet"; diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix index 9e00162f8c3c..7bbb04ea228a 100644 --- a/pkgs/by-name/js/jsonschema-cli/package.nix +++ b/pkgs/by-name/js/jsonschema-cli/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage rec { pname = "jsonschema-cli"; - version = "0.29.1"; + version = "0.30.0"; src = fetchCrate { inherit pname version; - hash = "sha256-HHS8dt3bJZ3dPWqB5K0h5KQTn/wHRYvIROfYmqfxolw="; + hash = "sha256-AjBVvEixkP7khm3/0U81E/G7tCKoqnfNG05gpgYlqNE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-RIt+b1Yokc4UMFPxOzO5GARsI32wL71ZmcoN+P/KE5c="; + cargoHash = "sha256-3hZAEjJrJ5vw6kXwY+xTv/mO0lx/KNmXA2lULJkX9aE="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/development/misc/juce/juce-8.0.4-cmake_install.patch b/pkgs/by-name/ju/juce/juce-8.0.4-cmake_install.patch similarity index 100% rename from pkgs/development/misc/juce/juce-8.0.4-cmake_install.patch rename to pkgs/by-name/ju/juce/juce-8.0.4-cmake_install.patch diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/by-name/ju/juce/package.nix similarity index 96% rename from pkgs/development/misc/juce/default.nix rename to pkgs/by-name/ju/juce/package.nix index 9e73c6a52567..f2a5779e737d 100644 --- a/pkgs/development/misc/juce/default.nix +++ b/pkgs/by-name/ju/juce/package.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "juce"; - version = "8.0.6"; + version = "8.0.7"; src = fetchFromGitHub { owner = "juce-framework"; repo = "juce"; tag = finalAttrs.version; - hash = "sha256-uwZVBrvb5O9LEh00y93UeEu4u4rd+tLRCdQdxsMpXNg="; + hash = "sha256-nl4pUSkUKqpMoehzq0MS5pjHpYDkrFpUsY8BwpQObCM="; }; patches = [ diff --git a/pkgs/by-name/ju/jumppad/package.nix b/pkgs/by-name/ju/jumppad/package.nix index 672c8b188c45..66cc90d457cb 100644 --- a/pkgs/by-name/ju/jumppad/package.nix +++ b/pkgs/by-name/ju/jumppad/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "jumppad"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "jumppad-labs"; repo = "jumppad"; rev = version; - hash = "sha256-2QF37dDQP+rSaLeNE9a41sA8iWnlUQaeXS00FoLdnfY="; + hash = "sha256-dzxFNOMFXbygTs4WIrG7aZ7LlEpkxepTgOP/QVq9z8s="; }; vendorHash = "sha256-BuXbizA/OJiP11kSIO476tWPYPzGTKmzPHeyIqs8pWc="; diff --git a/pkgs/by-name/ju/jumpy/package.nix b/pkgs/by-name/ju/jumpy/package.nix index a3839536694b..5c2ac20a8e82 100644 --- a/pkgs/by-name/ju/jumpy/package.nix +++ b/pkgs/by-name/ju/jumpy/package.nix @@ -12,7 +12,6 @@ vulkan-loader, wayland, xorg, - darwin, }: rustPlatform.buildRustPackage rec { @@ -50,7 +49,6 @@ rustPlatform.buildRustPackage rec { xorg.libXrandr ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/ju/just-formatter/package.nix b/pkgs/by-name/ju/just-formatter/package.nix new file mode 100644 index 000000000000..1fcbc2062e75 --- /dev/null +++ b/pkgs/by-name/ju/just-formatter/package.nix @@ -0,0 +1,25 @@ +{ + fetchCrate, + lib, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "just-formatter"; + version = "1.1.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-HTv55WquFieWmkEKX5sbBOVyYxzjcB/NrMkxbQsff90="; + }; + + cargoHash = "sha256-pJVvA2uzZzU5Rvh20gosYeasgCB6GAUjaWwqGWvLqAc="; + + meta = { + homepage = "https://github.com/eli-yip/just-formatter"; + description = "Format justfile from stdin to stdout"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vuimuich ]; + mainProgram = "just-formatter"; + }; +} diff --git a/pkgs/by-name/ju/just-lsp/package.nix b/pkgs/by-name/ju/just-lsp/package.nix new file mode 100644 index 000000000000..d41b255d3b6a --- /dev/null +++ b/pkgs/by-name/ju/just-lsp/package.nix @@ -0,0 +1,32 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "just-lsp"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "terror"; + repo = "just-lsp"; + tag = finalAttrs.version; + hash = "sha256-c/fdj4lEmID4u97fGPXnPLULS7Rxe6P8icmsfjGjT+w="; + }; + + cargoHash = "sha256-qPMtYaCvSAnLXrLX20QKbgXo9L1HYxJW4uZIzXhpD/A="; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Language server for just"; + homepage = "https://github.com/terror/just-lsp"; + license = lib.licenses.cc0; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "just-lsp"; + }; +}) diff --git a/pkgs/by-name/jw/jwx/package.nix b/pkgs/by-name/jw/jwx/package.nix index 2350f9673073..a6bb653c9b65 100644 --- a/pkgs/by-name/jw/jwx/package.nix +++ b/pkgs/by-name/jw/jwx/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "jwx"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = pname; rev = "v${version}"; - hash = "sha256-UXiF3X1jLk4dCGKmZlx9V08hzNJV+s/K2Wei9i+A6dg="; + hash = "sha256-JDv1lqfhE16v3hJhf9OD2P2IS1KeLyewHxNlS7Ci2bk="; }; vendorHash = "sha256-ZS7xliFymXTE8hlc3GEMNonP5sJTZGirw5YQNzPCl3Y="; diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix index bc8ec3d0f597..8dd6a6f14518 100644 --- a/pkgs/by-name/jx/jx/package.nix +++ b/pkgs/by-name/jx/jx/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "jx"; - version = "3.11.76"; + version = "3.11.78"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "sha256-XoLJ1YabI3UZpfqIudH8a1rhSr/RI0oYKYHPx2FHAJQ="; + sha256 = "sha256-ZGOCjNxj2tcIW82HN6MQBedIJEuguqeTP1GdkXeMJew="; }; vendorHash = "sha256-8I4yTzLAL7E0ozHcBZDNsJLHkTh+SjT0SjDSECGRYIc="; diff --git a/pkgs/by-name/k2/k2pdfopt/package.nix b/pkgs/by-name/k2/k2pdfopt/package.nix index 8feb2b25d2b5..a7da6638c61b 100644 --- a/pkgs/by-name/k2/k2pdfopt/package.nix +++ b/pkgs/by-name/k2/k2pdfopt/package.nix @@ -4,6 +4,7 @@ runCommand, fetchzip, fetchurl, + fetchpatch, fetchFromGitHub, cmake, jbig2dec, @@ -117,13 +118,43 @@ stdenv.mkDerivation rec { cp ${k2pdfopt_src}/mupdf_mod/pdf-* ./source/pdf/ ''; }; + # mupdf_patch no longer applies cleanly against mupdf 1.25.0 or later, due to a conflicting + # hunk (mupdf_conflict) introduced in commit bd8d337939f36f55b96cb6984f5c7bbf2f488ce0 of mupdf. + # This merge conflict can be resolved as desired by reverting mupdf_conflict, applying mupdf_patch, + # and finally reapplying mupdf_conflict, with an increased fuzz factor (see mupdf_modded below). + # TODO: remove workaround with conflicting hunk when mupdf in k2pdfopt is updated to 1.25.0 or later + mupdf_conflict = + hash: revert: + fetchpatch { + name = "mupdf-conflicting-hunk" + (lib.optionalString revert "-reverted") + ".patch"; + url = "https://github.com/ArtifexSoftware/mupdf/commit/bd8d337939f36f55b96cb6984f5c7bbf2f488ce0.patch"; + inherit hash revert; + includes = [ "source/fitz/stext-device.c" ]; + postFetch = '' + filterdiff -#6 "$out" > "$tmpfile" + mv "$tmpfile" "$out" + ''; + }; mupdf_modded = mupdf.overrideAttrs ( { patches ? [ ], ... }: { - patches = patches ++ [ mupdf_patch ]; + # The fuzz factor is increased to automatically resolve the merge conflict. + patchFlags = [ + "-p1" + "-F3" + ]; + # Reverting and reapplying the conflicting hunk is necessary, otherwise the result will be faulty. + patches = patches ++ [ + # revert conflicting hunk + (mupdf_conflict "sha256-24tl9YBuZBYhb12yY3T0lKsA7NswfK0QcMYhb2IpepA=" true) + # apply modifications + mupdf_patch + # reapply conflicting hunk + (mupdf_conflict "sha256-bnBV7LyX1w/BXxBFF1bkA8x+/0I9Am33o8GiAeEKHYQ=" false) + ]; # This function is missing in font.c, see font-win32.c postPatch = '' echo "void pdf_install_load_system_font_funcs(fz_context *ctx) {}" >> source/fitz/font.c diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix index 20677c9c43be..b03a5a4c82e6 100644 --- a/pkgs/by-name/k9/k9s/package.nix +++ b/pkgs/by-name/k9/k9s/package.nix @@ -7,17 +7,18 @@ testers, nix-update-script, k9s, + writableTmpDirAsHomeHook, }: buildGoModule rec { pname = "k9s"; - version = "0.40.10"; + version = "0.50.3"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-QGymGiTHT3Qnf9l/hhE3lgJ7TBBjKMe2k1aJ32khU0E="; + hash = "sha256-kv52OcQqi88kdGuWjZxE3+tSANOpTSbATrmJitUUicA="; }; ldflags = [ @@ -32,12 +33,11 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-jAxrOdQcMIH7uECKGuuiTZlyV4aJ/a76IuKGouWg/r4="; + vendorHash = "sha256-FliIL1yMEvsvrjemaV5B++6OBQMXU/9EvBD1hiEwnnw="; # TODO investigate why some config tests are failing doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); - # Required to workaround test check error: - preCheck = "export HOME=$(mktemp -d)"; + # For arch != x86 # {"level":"fatal","error":"could not create any of the following paths: /homeless-shelter/.config, /etc/xdg","time":"2022-06-28T15:52:36Z","message":"Unable to create configuration directory for k9s"} passthru = { @@ -62,6 +62,8 @@ buildGoModule rec { --zsh <($out/bin/k9s completion zsh) ''; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + meta = with lib; { description = "Kubernetes CLI To Manage Your Clusters In Style"; homepage = "https://github.com/derailed/k9s"; diff --git a/pkgs/by-name/ka/kaf/package.nix b/pkgs/by-name/ka/kaf/package.nix index 697d6ca51305..34a542b8ac3a 100644 --- a/pkgs/by-name/ka/kaf/package.nix +++ b/pkgs/by-name/ka/kaf/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kaf"; - version = "0.2.11"; + version = "0.2.13"; src = fetchFromGitHub { owner = "birdayz"; repo = "kaf"; rev = "v${version}"; - hash = "sha256-SKQg3BCwvVwjZUkTjrMlSrfa8tu2VC8+ckMZpBJhnZE="; + hash = "sha256-tjHRIbTJJ8HPp2Jk7R2rl+ZN+ie6xRlssx4clcGc4U4="; }; vendorHash = "sha256-1QcQeeYQFsStK27NVdyCAb1Y40lyifBf0dlSgzocG3Y="; diff --git a/pkgs/by-name/ka/kahip/package.nix b/pkgs/by-name/ka/kahip/package.nix new file mode 100644 index 000000000000..19b79ba4ac33 --- /dev/null +++ b/pkgs/by-name/ka/kahip/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch2, + cmake, + mpi, + metis, + python3Packages, + pythonSupport ? false, + isILP64 ? false, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "kahip"; + version = "3.18"; + + src = fetchFromGitHub { + owner = "KaHIP"; + repo = "KaHIP"; + tag = "v${finalAttrs.version}"; + hash = "sha256-l8DhVb2G6pQQcH3Wq4NsKw30cSK3sG+gCYRdpibw4ZI="; + }; + + patches = [ + (fetchpatch2 { + url = "https://github.com/KaHIP/KaHIP/commit/9d4978c7540a1ccbc9807367d6e3852114e86567.patch?full_index=1"; + hash = "sha256-nIJL0YmVp9+JUhzEXjoabD1qNEnhtrBnjMWnitYt0eU="; + }) + ]; + + nativeBuildInputs = + [ cmake ] + ++ lib.optionals pythonSupport [ + python3Packages.python + python3Packages.pybind11 + ]; + + buildInputs = [ + mpi + metis + ]; + + cmakeFlags = [ + (lib.cmakeBool "64BITMODE" isILP64) + (lib.cmakeBool "BUILDPYTHONMODULE" pythonSupport) + (lib.cmakeFeature "CMAKE_INSTALL_PYTHONDIR" python3Packages.python.sitePackages) + ]; + + doInstallCheck = pythonSupport; + + nativeInstallCheckInputs = lib.optionals pythonSupport [ + python3Packages.pythonImportsCheckHook + ]; + + pythonImportsCheck = [ "kahip" ]; + + meta = { + homepage = "https://kahip.github.io/"; + downloadPage = "https://github.com/KaHIP/KaHIP/"; + changelog = "https://github.com/KaHIP/KaHIP/releases/tag/v${finalAttrs.version}"; + description = "Karlsruhe HIGH Quality Partitioning"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ qbisi ]; + }; +}) diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix index 80e0c4b31c74..bbbe29f0fd80 100644 --- a/pkgs/by-name/ka/kakoune-lsp/package.nix +++ b/pkgs/by-name/ka/kakoune-lsp/package.nix @@ -4,10 +4,6 @@ fetchFromGitHub, replaceVars, perl, - stdenv, - CoreServices, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -26,12 +22,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-fb6RDcOLtkrUqw+BX2oa43d84BGF8IA2HxhdGgB94iU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - SystemConfiguration - ]; - meta = { description = "Kakoune Language Server Protocol Client"; homepage = "https://github.com/kakoune-lsp/kakoune-lsp"; diff --git a/pkgs/by-name/ka/kalker/package.nix b/pkgs/by-name/ka/kalker/package.nix index 62d73f96b129..be92531e950c 100644 --- a/pkgs/by-name/ka/kalker/package.nix +++ b/pkgs/by-name/ka/kalker/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + fetchpatch, gmp, mpfr, libmpc, @@ -19,7 +20,17 @@ rustPlatform.buildRustPackage rec { }; useFetchCargoVendor = true; - cargoHash = "sha256-IYxgh6ni3BFnocHGKwKUqgSC2xUjn0b/4pBqRC5iY8U="; + cargoHash = "sha256-LEP2ebthwtpPSRmJt0BW/T/lB6EE+tylyVv+PDt8UoQ="; + + cargoPatches = [ + # Fixes build issue by just running cargo update + # Can be removed on next release + (fetchpatch { + name = "bump_cargo_deps.patch"; + url = "https://github.com/PaddiM8/kalker/commit/81bf66950a9dfeca4ab5fdd12774c93e40021eb1.patch"; + hash = "sha256-XT8jXTMIMOFw8OieoQM7IkUqw3SDi1c9eE1cD15BI9I="; + }) + ]; buildInputs = [ gmp diff --git a/pkgs/by-name/ka/kana/package.nix b/pkgs/by-name/ka/kana/package.nix index ba8cf79ef86a..fc4d2aa1b860 100644 --- a/pkgs/by-name/ka/kana/package.nix +++ b/pkgs/by-name/ka/kana/package.nix @@ -12,7 +12,6 @@ desktop-file-utils, libadwaita, gst_all_1, - darwin, }: stdenv.mkDerivation rec { @@ -53,10 +52,7 @@ stdenv.mkDerivation rec { gst-plugins-base gst-plugins-bad gst-plugins-good - ]) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + ]); # Workaround for the gettext-sys issue # https://github.com/Koka/gettext-rs/issues/114 diff --git a/pkgs/by-name/ka/kanha/package.nix b/pkgs/by-name/ka/kanha/package.nix index 1e42a8430dd8..1395e113ac21 100644 --- a/pkgs/by-name/ka/kanha/package.nix +++ b/pkgs/by-name/ka/kanha/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, openssl, }: @@ -20,16 +18,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-bO37UYApe1CbwcfG8j/1UPu6DlYqlGPLsh0epxh8x3M="; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - CoreFoundation - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; meta = { description = "Web-app pentesting suite written in rust"; diff --git a/pkgs/by-name/ka/karakeep/helpers/karakeep b/pkgs/by-name/ka/karakeep/helpers/karakeep new file mode 100755 index 000000000000..a749bbdd0b1f --- /dev/null +++ b/pkgs/by-name/ka/karakeep/helpers/karakeep @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -eu -o pipefail +KARAKEEP_LIB_PATH= +NODEJS= +exec "$NODEJS/bin/node" "$KARAKEEP_LIB_PATH/apps/cli/dist/index.mjs" "$@" diff --git a/pkgs/by-name/ho/hoarder/helpers/migrate b/pkgs/by-name/ka/karakeep/helpers/migrate similarity index 57% rename from pkgs/by-name/ho/hoarder/helpers/migrate rename to pkgs/by-name/ka/karakeep/helpers/migrate index e11a50542340..92f4705e5cd7 100755 --- a/pkgs/by-name/ho/hoarder/helpers/migrate +++ b/pkgs/by-name/ka/karakeep/helpers/migrate @@ -1,10 +1,10 @@ #!/usr/bin/env bash set -eu -o pipefail -HOARDER_LIB_PATH= +KARAKEEP_LIB_PATH= RELEASE= NODE_ENV=production [[ -d "$DATA_DIR" ]] # Ensure DATA_DIR is defined and exists export RELEASE NODE_ENV -exec "$HOARDER_LIB_PATH/node_modules/.bin/tsx" "$HOARDER_LIB_PATH/packages/db/migrate.ts" "$@" +exec "$KARAKEEP_LIB_PATH/node_modules/.bin/tsx" "$KARAKEEP_LIB_PATH/packages/db/migrate.ts" "$@" diff --git a/pkgs/by-name/ho/hoarder/helpers/start-web b/pkgs/by-name/ka/karakeep/helpers/start-web similarity index 60% rename from pkgs/by-name/ho/hoarder/helpers/start-web rename to pkgs/by-name/ka/karakeep/helpers/start-web index 93c920f07a55..daa6a93167b3 100755 --- a/pkgs/by-name/ho/hoarder/helpers/start-web +++ b/pkgs/by-name/ka/karakeep/helpers/start-web @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -eu -o pipefail -HOARDER_LIB_PATH= +KARAKEEP_LIB_PATH= RELEASE= NODEJS= NODE_ENV=production @@ -8,4 +8,4 @@ NODE_ENV=production [[ -d "$DATA_DIR" ]] # Ensure DATA_DIR is defined and exists export RELEASE NODE_ENV -exec "$NODEJS/bin/node" "$HOARDER_LIB_PATH/apps/web/.next/standalone/apps/web/server.js" +exec "$NODEJS/bin/node" "$KARAKEEP_LIB_PATH/apps/web/.next/standalone/apps/web/server.js" diff --git a/pkgs/by-name/ho/hoarder/helpers/start-workers b/pkgs/by-name/ka/karakeep/helpers/start-workers similarity index 51% rename from pkgs/by-name/ho/hoarder/helpers/start-workers rename to pkgs/by-name/ka/karakeep/helpers/start-workers index 5af794341bb5..9bb764f6ed3c 100755 --- a/pkgs/by-name/ho/hoarder/helpers/start-workers +++ b/pkgs/by-name/ka/karakeep/helpers/start-workers @@ -1,11 +1,11 @@ #!/usr/bin/env bash set -eu -o pipefail -HOARDER_LIB_PATH= +KARAKEEP_LIB_PATH= RELEASE= NODE_ENV=production -NODE_PATH="$HOARDER_LIB_PATH/apps/workers" +NODE_PATH="$KARAKEEP_LIB_PATH/apps/workers" [[ -d "$DATA_DIR" ]] # Ensure DATA_DIR is defined and exists export RELEASE NODE_ENV NODE_PATH -exec "$HOARDER_LIB_PATH/node_modules/.bin/tsx" "$HOARDER_LIB_PATH/apps/workers/index.ts" +exec "$KARAKEEP_LIB_PATH/node_modules/.bin/tsx" "$KARAKEEP_LIB_PATH/apps/workers/index.ts" diff --git a/pkgs/by-name/ho/hoarder/package.nix b/pkgs/by-name/ka/karakeep/package.nix similarity index 63% rename from pkgs/by-name/ho/hoarder/package.nix rename to pkgs/by-name/ka/karakeep/package.nix index bd8dd0a2862d..bb9df1978dbd 100644 --- a/pkgs/by-name/ho/hoarder/package.nix +++ b/pkgs/by-name/ka/karakeep/package.nix @@ -14,14 +14,14 @@ let pnpm = pnpm_9; in stdenv.mkDerivation (finalAttrs: { - pname = "hoarder"; - version = "0.23.0"; + pname = "karakeep"; + version = "0.23.2"; src = fetchFromGitHub { - owner = "hoarder-app"; - repo = "hoarder"; + owner = "karakeep-app"; + repo = "karakeep"; tag = "v${finalAttrs.version}"; - hash = "sha256-ro2+jXfp83JfQ9HQr0imy7aohSFbH5J6Wx5bxhMT5TM="; + hash = "sha256-Cm6e1XEmMHzQ3vODxa9+Yuwt+9zLvQ9S7jmwAozjA/k="; }; patches = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ''; }; - hash = "sha256-FzQPBIwe7OQ1KHaMtWaFe+RI+pXko5Ly11/jOmYSuFA="; + hash = "sha256-HZb11CAbnlGSmP/Gxyjncd/RuIWkPv3GvwYs9QZ12Ss="; }; buildPhase = '' runHook preBuild @@ -81,56 +81,56 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/share/doc/hoarder - cp README.md LICENSE $out/share/doc/hoarder + mkdir -p $out/share/doc/karakeep + cp README.md LICENSE $out/share/doc/karakeep - # Copy necessary files into lib/hoarder while keeping the directory structure + # Copy necessary files into lib/karakeep while keeping the directory structure LIB_TO_COPY="node_modules apps/web/.next/standalone apps/cli/dist apps/workers packages/db packages/shared packages/trpc" - HOARDER_LIB_PATH="$out/lib/hoarder" + KARAKEEP_LIB_PATH="$out/lib/karakeep" for DIR in $LIB_TO_COPY; do - mkdir -p "$HOARDER_LIB_PATH/$DIR" - cp -a $DIR/{.,}* "$HOARDER_LIB_PATH/$DIR" - chmod -R u+w "$HOARDER_LIB_PATH/$DIR" + mkdir -p "$KARAKEEP_LIB_PATH/$DIR" + cp -a $DIR/{.,}* "$KARAKEEP_LIB_PATH/$DIR" + chmod -R u+w "$KARAKEEP_LIB_PATH/$DIR" done # NextJS requires static files are copied in a specific way # https://nextjs.org/docs/pages/api-reference/config/next-config-js/output#automatically-copying-traced-files - cp -r ./apps/web/public "$HOARDER_LIB_PATH/apps/web/.next/standalone/apps/web/" - cp -r ./apps/web/.next/static "$HOARDER_LIB_PATH/apps/web/.next/standalone/apps/web/.next/" + cp -r ./apps/web/public "$KARAKEEP_LIB_PATH/apps/web/.next/standalone/apps/web/" + cp -r ./apps/web/.next/static "$KARAKEEP_LIB_PATH/apps/web/.next/standalone/apps/web/.next/" # Copy and patch helper scripts for HELPER_SCRIPT in ${./helpers}/*; do HELPER_SCRIPT_NAME="$(basename "$HELPER_SCRIPT")" - cp "$HELPER_SCRIPT" "$HOARDER_LIB_PATH/" - substituteInPlace "$HOARDER_LIB_PATH/$HELPER_SCRIPT_NAME" \ - --replace-warn "HOARDER_LIB_PATH=" "HOARDER_LIB_PATH=$HOARDER_LIB_PATH" \ + cp "$HELPER_SCRIPT" "$KARAKEEP_LIB_PATH/" + substituteInPlace "$KARAKEEP_LIB_PATH/$HELPER_SCRIPT_NAME" \ + --replace-warn "KARAKEEP_LIB_PATH=" "KARAKEEP_LIB_PATH=$KARAKEEP_LIB_PATH" \ --replace-warn "RELEASE=" "RELEASE=${finalAttrs.version}" \ --replace-warn "NODEJS=" "NODEJS=${nodejs}" - chmod +x "$HOARDER_LIB_PATH/$HELPER_SCRIPT_NAME" - patchShebangs "$HOARDER_LIB_PATH/$HELPER_SCRIPT_NAME" + chmod +x "$KARAKEEP_LIB_PATH/$HELPER_SCRIPT_NAME" + patchShebangs "$KARAKEEP_LIB_PATH/$HELPER_SCRIPT_NAME" done # The cli should be in bin/ mkdir -p $out/bin - mv "$HOARDER_LIB_PATH/hoarder-cli" $out/bin/ + mv "$KARAKEEP_LIB_PATH/karakeep" $out/bin/ runHook postInstall ''; postFixup = '' # Remove large dependencies that are not necessary during runtime - rm -rf $out/lib/hoarder/node_modules/{@next,next,@swc,react-native,monaco-editor,faker,@typescript-eslint,@microsoft,@typescript-eslint,pdfjs-dist} + rm -rf $out/lib/karakeep/node_modules/{@next,next,@swc,react-native,monaco-editor,faker,@typescript-eslint,@microsoft,@typescript-eslint,pdfjs-dist} # Remove broken symlinks find $out -type l ! -exec test -e {} \; -delete ''; meta = { - homepage = "https://github.com/hoarder-app/hoarder"; - description = "Self-hostable bookmark-everything app with a touch of AI for the data hoarders out there"; + homepage = "https://karakeep.app/"; + description = "Self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.three ]; - mainProgram = "hoarder-cli"; + mainProgram = "karakeep"; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ho/hoarder/patches/dont-lock-pnpm-version.patch b/pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch similarity index 100% rename from pkgs/by-name/ho/hoarder/patches/dont-lock-pnpm-version.patch rename to pkgs/by-name/ka/karakeep/patches/dont-lock-pnpm-version.patch diff --git a/pkgs/by-name/ho/hoarder/patches/fix-migrations-path.patch b/pkgs/by-name/ka/karakeep/patches/fix-migrations-path.patch similarity index 100% rename from pkgs/by-name/ho/hoarder/patches/fix-migrations-path.patch rename to pkgs/by-name/ka/karakeep/patches/fix-migrations-path.patch diff --git a/pkgs/by-name/ho/hoarder/patches/use-local-font.patch b/pkgs/by-name/ka/karakeep/patches/use-local-font.patch similarity index 100% rename from pkgs/by-name/ho/hoarder/patches/use-local-font.patch rename to pkgs/by-name/ka/karakeep/patches/use-local-font.patch diff --git a/pkgs/by-name/ka/kargo/package.nix b/pkgs/by-name/ka/kargo/package.nix index cb74557dc06a..674b81ec60dc 100644 --- a/pkgs/by-name/ka/kargo/package.nix +++ b/pkgs/by-name/ka/kargo/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "kargo"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "akuity"; repo = "kargo"; tag = "v${version}"; - hash = "sha256-1zPSYvAhobhcZWIeIh0zTYPMg32r4PATvBIfKEcg9IU="; + hash = "sha256-yLBq3zc9GcuLaS/Muup+15vpj99bHV2ImGvL4UuMuj4="; }; - vendorHash = "sha256-+c7cUCI6Yy3qzDOWWvqEGss6QvTrS3gYScm8M48rGVA="; + vendorHash = "sha256-1J/9AXKU6jLZh6B5jWCoQeStborTOGjxFkZ1Vk2Yw+8="; subPackages = [ "cmd/cli" ]; diff --git a/pkgs/by-name/kb/kbt/package.nix b/pkgs/by-name/kb/kbt/package.nix index d100621bff69..08b1503ea263 100644 --- a/pkgs/by-name/kb/kbt/package.nix +++ b/pkgs/by-name/kb/kbt/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, stdenv, pkg-config, - darwin, xorg, }: @@ -26,13 +25,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + xorg.libX11 + ]; meta = with lib; { description = "Keyboard tester in terminal"; diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix index 2a4abe1194ce..7df5288488e1 100644 --- a/pkgs/by-name/kc/kcl/package.nix +++ b/pkgs/by-name/kc/kcl/package.nix @@ -1,6 +1,5 @@ { buildGoModule, - darwin, fetchFromGitHub, installShellFiles, kclvm_cli, @@ -34,16 +33,10 @@ buildGoModule rec { installShellFiles ]; - buildInputs = - [ - kclvm - kclvm_cli - ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]); + buildInputs = [ + kclvm + kclvm_cli + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' export HOME=$(mktemp -d) diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix index 7c33e7e0b9eb..94eb2b4bf18d 100644 --- a/pkgs/by-name/kc/kclvm/package.nix +++ b/pkgs/by-name/kc/kclvm/package.nix @@ -5,7 +5,6 @@ fetchFromGitHub, protobuf, pkg-config, - darwin, rustc, }: rustPlatform.buildRustPackage rec { @@ -24,13 +23,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-o7YFyqRWAMjq23mcAqDrcN4infdBgp1KNvviYOLR35s="; - buildInputs = - [ rustc ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ rustc ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id $out/lib/libkclvm_cli_cdylib.dylib $out/lib/libkclvm_cli_cdylib.dylib diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix index 4d350cebdf48..b205e1484df0 100644 --- a/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/pkgs/by-name/kc/kclvm_cli/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, kclvm, - darwin, rustc, }: rustPlatform.buildRustPackage rec { @@ -23,16 +21,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ZhrjxHqwWwcVkCVkJJnVm2CZLfRlrI2383ejgI+B2KQ="; cargoPatches = [ ./cargo_lock.patch ]; - buildInputs = - [ - kclvm - rustc - ] - ++ (lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]); + buildInputs = [ + kclvm + rustc + ]; meta = with lib; { description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/by-name/kd/kdiff3/package.nix similarity index 73% rename from pkgs/tools/text/kdiff3/default.nix rename to pkgs/by-name/kd/kdiff3/package.nix index aeb8b5f9c32d..30ddc904204c 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/by-name/kd/kdiff3/package.nix @@ -3,42 +3,38 @@ lib, fetchurl, extra-cmake-modules, - kdoctools, - wrapQtAppsHook, boost, - kcrash, - kconfig, - kinit, - kparts, - kiconthemes, + kdePackages, }: stdenv.mkDerivation (finalAttrs: { pname = "kdiff3"; - version = "1.11.5"; + version = "1.12.2"; src = fetchurl { url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz"; - hash = "sha256-Qg8Ys7lolpigXhAvikFxkEkHTaaPlslL4Y0bgpfutUU="; + hash = "sha256-MaN8vPnUIHintIRdQqwaAzp9cjKlq66qAo9kJbufpDk="; }; nativeBuildInputs = [ extra-cmake-modules - kdoctools - wrapQtAppsHook + kdePackages.kdoctools + kdePackages.wrapQtAppsHook ]; - buildInputs = [ + buildInputs = with kdePackages; [ + qtbase boost kconfig kcrash - kinit kparts kiconthemes ]; cmakeFlags = [ "-Wno-dev" ]; + env.LANG = "C.UTF-8"; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s "$out/Applications/KDE/kdiff3.app/Contents/MacOS" "$out/bin" ''; @@ -49,6 +45,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://invent.kde.org/sdk/kdiff3"; license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; - platforms = with platforms; linux ++ darwin; + inherit (kdePackages.qtbase.meta) platforms; }; }) diff --git a/pkgs/applications/misc/keepassxc/darwin.patch b/pkgs/by-name/ke/keepassxc/darwin.patch similarity index 100% rename from pkgs/applications/misc/keepassxc/darwin.patch rename to pkgs/by-name/ke/keepassxc/darwin.patch diff --git a/pkgs/applications/misc/keepassxc/firefox-native-messaging-host.json b/pkgs/by-name/ke/keepassxc/firefox-native-messaging-host.json similarity index 100% rename from pkgs/applications/misc/keepassxc/firefox-native-messaging-host.json rename to pkgs/by-name/ke/keepassxc/firefox-native-messaging-host.json diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/by-name/ke/keepassxc/package.nix similarity index 56% rename from pkgs/applications/misc/keepassxc/default.nix rename to pkgs/by-name/ke/keepassxc/package.nix index 42d69a6f863c..170cc7bfe8e3 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/by-name/ke/keepassxc/package.nix @@ -3,54 +3,46 @@ stdenv, fetchFromGitHub, cmake, - qttools, + libsForQt5, apple-sdk_15, asciidoctor, botan3, curl, darwinMinVersionHook, - kio, libXi, libXtst, libargon2, libusb1, minizip, + nix-update-script, pcsclite, pkg-config, qrencode, - qtbase, - qtmacextras, - qtsvg, - qtx11extras, readline, wrapGAppsHook3, - wrapQtAppsHook, zlib, - LocalAuthentication, - withKeePassBrowser ? true, withKeePassBrowserPasskeys ? true, - withKeePassFDOSecrets ? true, + withKeePassFDOSecrets ? stdenv.hostPlatform.isLinux, withKeePassKeeShare ? true, withKeePassNetworking ? true, withKeePassSSHAgent ? true, - withKeePassTouchID ? true, withKeePassX11 ? true, - withKeePassYubiKey ? true, + withKeePassYubiKey ? stdenv.hostPlatform.isLinux, nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "keepassxc"; version = "2.7.10"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; - rev = version; + tag = finalAttrs.version; hash = "sha256-FBoqCYNM/leN+w4aV0AJMx/G0bjHbI9KVWrnmq3NfaI="; }; @@ -64,40 +56,58 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch ]; - cmakeFlags = - [ - "-DKEEPASSXC_BUILD_TYPE=Release" - "-DWITH_GUI_TESTS=ON" - "-DWITH_XC_UPDATECHECK=OFF" - ] - ++ (lib.optional (!withKeePassX11) "-DWITH_XC_X11=OFF") - ++ (lib.optional (withKeePassFDOSecrets && stdenv.hostPlatform.isLinux) "-DWITH_XC_FDOSECRETS=ON") - ++ (lib.optional (withKeePassYubiKey && stdenv.hostPlatform.isLinux) "-DWITH_XC_YUBIKEY=ON") - ++ (lib.optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") - ++ (lib.optional withKeePassBrowserPasskeys "-DWITH_XC_BROWSER_PASSKEYS=ON") - ++ (lib.optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") - ++ (lib.optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON") - ++ (lib.optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON"); + cmakeFlags = [ + (lib.cmakeFeature "KEEPASSXC_BUILD_TYPE" "Release") + (lib.cmakeBool "WITH_GUI_TESTS" true) + (lib.cmakeBool "WITH_XC_UPDATECHECK" false) + (lib.cmakeBool "WITH_XC_X11" withKeePassX11) + (lib.cmakeBool "WITH_XC_BROWSER" withKeePassBrowser) + (lib.cmakeBool "WITH_XC_BROWSER_PASSKEYS" withKeePassBrowserPasskeys) + (lib.cmakeBool "WITH_XC_KEESHARE" withKeePassKeeShare) + (lib.cmakeBool "WITH_XC_NETWORKING" withKeePassNetworking) + (lib.cmakeBool "WITH_XC_SSHAGENT" withKeePassSSHAgent) + (lib.cmakeBool "WITH_XC_FDOSECRETS" withKeePassFDOSecrets) + (lib.cmakeBool "WITH_XC_YUBIKEY" withKeePassYubiKey) + ]; doCheck = true; - checkPhase = '' - runHook preCheck + checkPhase = + let + disabledTests = lib.concatStringsSep "|" ( + [ + # flaky + "testcli" + "testgui" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # QWidget: Cannot create a QWidget without QApplication + "testautotype" - export LC_ALL="en_US.UTF-8" - export QT_QPA_PLATFORM=offscreen - export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" - # testcli, testgui and testkdbx4 are flaky - skip them all - # testautotype on darwin throws "QWidget: Cannot create a QWidget without QApplication" - make test ARGS+="-E 'testcli|testgui${lib.optionalString stdenv.hostPlatform.isDarwin "|testautotype|testkdbx4"}' --output-on-failure" + # FAIL! : TestDatabase::testExternallyModified() Compared values are not the same + # Actual (((spyFileChanged.count()))): 0 + # Expected (1) : 1 + # Loc: [/tmp/nix-build-keepassxc-2.7.10.drv-2/source/tests/TestDatabase.cpp(288)] + "testdatabase" + ] + ); + in + '' + runHook preCheck - runHook postCheck - ''; + export LC_ALL="en_US.UTF-8" + export QT_QPA_PLATFORM=offscreen + export QT_PLUGIN_PATH="${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}" + + make test ARGS+="-E '${disabledTests}' --output-on-failure" + + runHook postCheck + ''; nativeBuildInputs = [ asciidoctor cmake - wrapQtAppsHook - qttools + libsForQt5.wrapQtAppsHook + libsForQt5.qttools pkg-config ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) wrapGAppsHook3; @@ -127,35 +137,43 @@ stdenv.mkDerivation rec { buildInputs = [ - curl botan3 - kio + curl libXi libXtst libargon2 + libsForQt5.kio + libsForQt5.qtbase + libsForQt5.qtsvg minizip pcsclite qrencode - qtbase - qtsvg readline zlib ] - ++ lib.optional (stdenv.hostPlatform.isDarwin && withKeePassTouchID) LocalAuthentication ++ lib.optionals stdenv.hostPlatform.isDarwin [ - qtmacextras + libsForQt5.qtmacextras apple-sdk_15 # ScreenCaptureKit, required by livekit, is only available on 12.3 and up: # https://developer.apple.com/documentation/screencapturekit (darwinMinVersionHook "12.3") ] - ++ lib.optional stdenv.hostPlatform.isLinux libusb1 - ++ lib.optional withKeePassX11 qtx11extras; + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libusb1 + ] + ++ lib.optionals withKeePassX11 [ + libsForQt5.qtx11extras + ]; - passthru.tests = nixosTests.keepassxc; + passthru = { + tests = { + inherit (nixosTests) keepassxc; + }; + updateScript = nix-update-script { }; + }; - meta = with lib; { + meta = { description = "Offline password manager with many features"; longDescription = '' A community fork of KeePassX, which is itself a port of KeePass Password Safe. @@ -165,12 +183,13 @@ stdenv.mkDerivation rec { using the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser) ''; homepage = "https://keepassxc.org/"; - license = licenses.gpl2Plus; + changelog = "https://github.com/keepassxreboot/keepassxc/blob/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.gpl2Plus; mainProgram = "keepassxc"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ blankparticle sigmasquadron ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/ke/kepler/package.nix b/pkgs/by-name/ke/kepler/package.nix index 845e6fff4ce3..ebdadf611ed2 100644 --- a/pkgs/by-name/ke/kepler/package.nix +++ b/pkgs/by-name/ke/kepler/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, libpq, openssl, @@ -28,15 +26,11 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - libpq - openssl - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libpq + openssl + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/ke/kexec-tools/package.nix b/pkgs/by-name/ke/kexec-tools/package.nix index 5eef5475390e..f546ac0e3747 100644 --- a/pkgs/by-name/ke/kexec-tools/package.nix +++ b/pkgs/by-name/ke/kexec-tools/package.nix @@ -4,6 +4,7 @@ buildPackages, fetchurl, fetchpatch, + nixosTests, zlib, }: @@ -46,6 +47,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests.kexec = nixosTests.kexec; + meta = with lib; { homepage = "http://horms.net/projects/kexec/kexec-tools"; description = "Tools related to the kexec Linux feature"; diff --git a/pkgs/by-name/ke/keymapp/package.nix b/pkgs/by-name/ke/keymapp/package.nix index 5383f2ea61ee..ab67776b821d 100644 --- a/pkgs/by-name/ke/keymapp/package.nix +++ b/pkgs/by-name/ke/keymapp/package.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "keymapp"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz"; - hash = "sha256-GXmmQssrsEpsqfERSa8ZFGo0r72qsdsbFtmic8+SCfQ="; + hash = "sha256-LWO4aeNmGgZ+T41pb6HwC3tnwaiGviDIq63QMsrlkEc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ke/keypunch/package.nix b/pkgs/by-name/ke/keypunch/package.nix index f87e343aa4e4..a386ee380ecb 100644 --- a/pkgs/by-name/ke/keypunch/package.nix +++ b/pkgs/by-name/ke/keypunch/package.nix @@ -63,10 +63,13 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/bragefuglseth/keypunch"; license = lib.licenses.gpl3Plus; mainProgram = "keypunch"; - maintainers = with lib.maintainers; [ - tomasajt - getchoo - ]; + maintainers = + with lib.maintainers; + [ + tomasajt + getchoo + ] + ++ lib.teams.gnome-circle.members; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/kh/khal/package.nix b/pkgs/by-name/kh/khal/package.nix index ffc0c69aeb52..974d71af3065 100644 --- a/pkgs/by-name/kh/khal/package.nix +++ b/pkgs/by-name/kh/khal/package.nix @@ -4,48 +4,22 @@ fetchFromGitHub, glibcLocales, installShellFiles, - python3, + python3Packages, }: -let - python = python3.override { - packageOverrides = self: super: { - # https://github.com/pimutils/khal/issues/1361 - icalendar = super.icalendar.overridePythonAttrs (old: rec { - version = "5.0.13"; - src = fetchFromGitHub { - owner = "collective"; - repo = "icalendar"; - tag = "v${version}"; - hash = "sha256-2gpWfLXR4HThw23AWxY2rY9oiK6CF3Qiad8DWHCs4Qk="; - }; - patches = [ ]; - build-system = with self; [ setuptools ]; - dependencies = with self; [ - python-dateutil - pytz - ]; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "khal"; - version = "0.11.3"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "pimutils"; repo = "khal"; tag = "v${version}"; - hash = "sha256-YP2kQ/qXPDwvFvlHf+A2Ymvk49dmt5tAnTaOhrOV92M="; + hash = "sha256-pbBdScyYQMdT2NjCk2dKPkR75Zcizzco2IkXpHkgPR8="; }; - postPatch = '' - sed -i /intersphinx/d doc/source/conf.py - ''; - - build-system = with python.pkgs; [ + build-system = with python3Packages; [ setuptools setuptools-scm ]; @@ -55,8 +29,7 @@ python.pkgs.buildPythonApplication rec { installShellFiles ]; - dependencies = with python.pkgs; [ - atomicwrites + dependencies = with python3Packages; [ click click-log configobj @@ -73,7 +46,7 @@ python.pkgs.buildPythonApplication rec { urwid ]; - nativeCheckInputs = with python.pkgs; [ + nativeCheckInputs = with python3Packages; [ freezegun hypothesis packaging @@ -90,7 +63,7 @@ python.pkgs.buildPythonApplication rec { # man page PATH="${ - python3.withPackages ( + python3Packages.python.withPackages ( ps: with ps; [ sphinx sphinxcontrib-newsfeed @@ -120,6 +93,6 @@ python.pkgs.buildPythonApplication rec { homepage = "https://lostpackets.de/khal/"; changelog = "https://github.com/pimutils/khal/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ antonmosich ]; }; } diff --git a/pkgs/by-name/ki/kics/package.nix b/pkgs/by-name/ki/kics/package.nix index ae24b8f850a2..2f6540ce1758 100644 --- a/pkgs/by-name/ki/kics/package.nix +++ b/pkgs/by-name/ki/kics/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kics"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; tag = "v${version}"; - hash = "sha256-q1vpMXnW/tnOXjxnqp9KQHe6hWx4/DXXqLnR4+e0+vM="; + hash = "sha256-fw0OjSR9f0EuXq+QcRwt1+k22UdhPI1lNmSUahckimE="; }; - vendorHash = "sha256-Cp4kfAViBUkC7LMZFUrJtHKrIYxsc25fqbuw2a5Eh9w="; + vendorHash = "sha256-1Wr8649Yy3cAhj46YuRiHBiFtdWq/4M5H5lnLH+ThBE="; subPackages = [ "cmd/console" ]; diff --git a/pkgs/by-name/ki/kismet/package.nix b/pkgs/by-name/ki/kismet/package.nix index 9bb47dc7c7ca..cc38baff02f9 100644 --- a/pkgs/by-name/ki/kismet/package.nix +++ b/pkgs/by-name/ki/kismet/package.nix @@ -15,6 +15,7 @@ lm_sensors, networkmanager, nix-update-script, + nixosTests, pcre2, pkg-config, openssl, @@ -115,6 +116,7 @@ stdenv.mkDerivation (finalPackage: { enableParallelBuilding = true; passthru = { + tests.kismet = nixosTests.kismet; updateScript = nix-update-script { extraArgs = [ "--version-regex" diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix index cc60333b66b2..4eeb2099de2a 100644 --- a/pkgs/by-name/ki/kitex/package.nix +++ b/pkgs/by-name/ki/kitex/package.nix @@ -6,15 +6,15 @@ kitex, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "kitex"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "cloudwego"; repo = "kitex"; - rev = "v${version}"; - hash = "sha256-1dgQgc9XljawyH+MIDPNqcwHMH0yW2BMY8TZnc+P13I="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ivuAqHOerGkaEX/zfzViY1xhNrymMOBv8RPGAPNYp/4="; }; vendorHash = "sha256-31OgNcAL2NJq5b96UmQnVecdusY4AtUP/O2MVCmPk+8="; @@ -33,7 +33,7 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = kitex; - version = "v${version}"; + version = "v${finalAttrs.version}"; }; meta = { @@ -43,4 +43,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "kitex"; }; -} +}) diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index cf8920486320..f1ccf11f0250 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -28,11 +28,6 @@ installShellFiles, dbus, sudo, - Libsystem, - Cocoa, - Kernel, - UniformTypeIdentifiers, - UserNotifications, libcanberra, libicns, wayland-scanner, @@ -85,17 +80,10 @@ buildPythonApplication rec { xxHash ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - Kernel - UniformTypeIdentifiers - UserNotifications libpng python3 zlib ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - Libsystem - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fontconfig libunistring diff --git a/pkgs/by-name/kl/klog-rs/package.nix b/pkgs/by-name/kl/klog-rs/package.nix index 9c0e15bce9d4..cf85787623fa 100644 --- a/pkgs/by-name/kl/klog-rs/package.nix +++ b/pkgs/by-name/kl/klog-rs/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "klog-rs"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "tobifroe"; repo = "klog"; rev = version; - hash = "sha256-t53HC5eBC587jyvJKxlG3B3Im7RM6bDcZfUO4npgGfM="; + hash = "sha256-X7VUbn2DQx4Wo526COGAp0IFPPhh1vObxP/b6oYFWG4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-HmKMxI94j0cLLAjmUJQhymop9qiH71Rm8dnVVs2VDF8="; + cargoHash = "sha256-veE992wYv8SwAbvaqe3nVymxTbaMYEDWtLnisnyNOn4="; checkFlags = [ # this integration test depends on a running kubernetes cluster "--skip=k8s::tests::test_get_pod_list" diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix index f2c58300c055..361bdb298424 100644 --- a/pkgs/by-name/kn/knot-dns/package.nix +++ b/pkgs/by-name/kn/knot-dns/package.nix @@ -101,6 +101,8 @@ stdenv.mkDerivation rec { "-DNDEBUG" ]; + __darwinAllowLocalNetworking = true; + doCheck = true; checkFlags = [ "V=1" ]; # verbose output in case some test fails doInstallCheck = true; diff --git a/pkgs/by-name/kn/knowsmore/package.nix b/pkgs/by-name/kn/knowsmore/package.nix index cba831dbe077..98e2ada7938d 100644 --- a/pkgs/by-name/kn/knowsmore/package.nix +++ b/pkgs/by-name/kn/knowsmore/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "knowsmore"; - version = "0.1.43"; + version = "0.1.44"; pyproject = true; src = fetchFromGitHub { owner = "helviojunior"; repo = "knowsmore"; tag = "v${version}"; - hash = "sha256-rLESaedhEHTMYVbITr3vjyE6urhwl/g1/iTMZ4ruE1c="; + hash = "sha256-m9rleUMQdBrgmeLcoFGIWRm4PKiwiEXONnIfFDxOrHs="; }; pythonRelaxDeps = [ @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool for pentesting Microsoft Active Directory"; homepage = "https://github.com/helviojunior/knowsmore"; - changelog = "https://github.com/helviojunior/knowsmore/releases/tag/v${version}"; + changelog = "https://github.com/helviojunior/knowsmore/releases/tag/${src.tag}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; mainProgram = "knowsmore"; diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index 84abcc2a04bd..70824ce6352c 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -5,7 +5,6 @@ pkg-config, openssl, rustPlatform, - darwin, testers, komac, dbus, @@ -37,17 +36,12 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellFiles ]; - buildInputs = - [ - dbus - openssl - zstd - bzip2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + dbus + openssl + zstd + bzip2 + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/ko/komodo/package.nix b/pkgs/by-name/ko/komodo/package.nix index de7228665c18..c206ce02cc83 100644 --- a/pkgs/by-name/ko/komodo/package.nix +++ b/pkgs/by-name/ko/komodo/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "komodo"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "moghtech"; repo = "komodo"; tag = "v${version}"; - hash = "sha256-8RY7g7dCjY+vt4x5+dcRhjcFPDhK8ZLMksPloWWharc="; + hash = "sha256-fYuRvaWhNjNzmMFE7Y1QB6y4rxYIbF6p5BRpu6bzrfY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-r8p/kd3W7+zlrt2NsdAIOg9J4OU9QDTZBOWfCLV5+ys="; + cargoHash = "sha256-NGAyyLAK9tI2GrV0cOmPn6CVBSOcf1JFg00eBOYdR38="; # disable for check. document generation is fail # > error: doctest failed, to rerun pass `-p komodo_client --doc` diff --git a/pkgs/by-name/ko/kord/package.nix b/pkgs/by-name/ko/kord/package.nix index d1b830abf4aa..b25304679cbf 100644 --- a/pkgs/by-name/ko/kord/package.nix +++ b/pkgs/by-name/ko/kord/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - darwin, fetchFromGitHub, fetchpatch, rustPlatform, @@ -41,9 +40,7 @@ rustPlatform.buildRustPackage rec { lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; meta = with lib; { description = "Music theory binary and library for Rust"; diff --git a/pkgs/by-name/ko/kore/package.nix b/pkgs/by-name/ko/kore/package.nix index 34b5612d9b1f..4f95c0d3382c 100644 --- a/pkgs/by-name/ko/kore/package.nix +++ b/pkgs/by-name/ko/kore/package.nix @@ -2,15 +2,15 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, openssl, curl, - postgresql_16, + libpq, yajl, }: stdenv.mkDerivation rec { pname = "kore"; - # TODO: Check on next update whether postgresql 17 is supported. version = "4.2.3"; src = fetchFromGitHub { @@ -20,13 +20,28 @@ stdenv.mkDerivation rec { sha256 = "sha256-p0M2P02xwww5EnT28VnEtj5b+/jkPW3YkJMuK79vp4k="; }; + patches = [ + (fetchpatch { + url = "https://github.com/jorisvink/kore/commit/978cb0ab79c9c939c35996f34f7d835f9c671831.patch"; + hash = "sha256-uHTWiliM4m2i9/6GQQfnAo31XBXd/2+fzysPeNo2dQ0="; + }) + (fetchpatch { + url = "https://github.com/jorisvink/kore/commit/6122affe22bf676eed0f544e421c53699aa7a2e2.patch"; + hash = "sha256-xaiUOjBJPEgEwwuseXe6VbOTkOCKdQ5tuwDdL7DojHM="; + }) + ]; + buildInputs = [ openssl curl - postgresql_16 + libpq yajl ]; + nativeBuildInputs = [ + libpq.pg_config + ]; + makeFlags = [ "PREFIX=${placeholder "out"}" "ACME=1" diff --git a/pkgs/by-name/ko/koto-ls/package.nix b/pkgs/by-name/ko/koto-ls/package.nix index 4125658fe209..63d1c16bbe2c 100644 --- a/pkgs/by-name/ko/koto-ls/package.nix +++ b/pkgs/by-name/ko/koto-ls/package.nix @@ -7,24 +7,24 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "koto-ls"; - version = "0.15.0"; + version = "0.15.3"; src = fetchFromGitHub { owner = "koto-lang"; repo = "koto-ls"; tag = "v${finalAttrs.version}"; - hash = "sha256-6a8xckgpz2/Eb0mQ3ZUL7ywmHA69RMXar/55LUu1UWk="; + hash = "sha256-4s+zWiI6Yxv1TB0drds27txnL0kE6RoqjRI36Clls6Y="; }; useFetchCargoVendor = true; - cargoHash = "sha256-sDgLvZcLW2lC0fCMOdSX2OvaqOG1GMfQiwAPit6L2/g="; + cargoHash = "sha256-ewBAixbksI9ora5hBZR12lzxCPzxM2Cp6GvQz6hGCSY="; passthru.updateScript = nix-update-script { }; meta = { description = "Language server for Koto"; homepage = "https://github.com/koto-lang/koto-ls"; - changelog = "https://github.com/koto-lang/koto-ls/releases/tag/${finalAttrs.src.tag}"; + changelog = "https://github.com/koto-lang/koto-ls/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ defelo ]; mainProgram = "koto-ls"; diff --git a/pkgs/by-name/ko/koto/package.nix b/pkgs/by-name/ko/koto/package.nix index c86b0b9d1cc5..3d82d8b3682b 100644 --- a/pkgs/by-name/ko/koto/package.nix +++ b/pkgs/by-name/ko/koto/package.nix @@ -9,22 +9,26 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "koto"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "koto-lang"; repo = "koto"; tag = "v${finalAttrs.version}"; - hash = "sha256-T8SjNeoTANAcT+uAdgzBRMK0LbC038cpKFoCFHgsp8k="; + hash = "sha256-sFADZj0mBe8TQ2x6NeXLqvvXK13WhVGD2anGWoWrSZw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-kIjDY27ot1dN3L8TKaBEQWDzo7+QIFvhdmi1YN9TofI="; + cargoHash = "sha256-Ok4rgqiQ7N5knXdb0Mfn3fYPPLXoRtOZVv8RvWR2h3k="; postPatch = '' - ${lib.getExe' yq "tomlq"} -ti 'del(.bench)' crates/koto/Cargo.toml + tomlq -ti 'del(.bench)' crates/koto/Cargo.toml ''; + nativeBuildInputs = [ + yq # for `tomlq` + ]; + cargoBuildFlags = [ "--package=koto_cli" ]; nativeInstallCheckInputs = [ versionCheckHook ]; @@ -36,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Simple, expressive, embeddable programming language"; homepage = "https://github.com/koto-lang/koto"; - changelog = "https://github.com/koto-lang/koto/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + changelog = "https://github.com/koto-lang/koto/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ defelo ]; mainProgram = "koto"; diff --git a/pkgs/by-name/kr/krep/package.nix b/pkgs/by-name/kr/krep/package.nix index 93a9c2b483c5..86281d0bc725 100644 --- a/pkgs/by-name/kr/krep/package.nix +++ b/pkgs/by-name/kr/krep/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; doInstallCheck = true; - nativeInstallCheck = [ versionCheckHook ]; + nativeInstallCheckInputs = [ versionCheckHook ]; meta = { description = "Blazingly fast string search utility designed for performance-critical applications"; diff --git a/pkgs/by-name/kr/krillinai/package.nix b/pkgs/by-name/kr/krillinai/package.nix index 901fea10e0e8..36da42a9b2a7 100644 --- a/pkgs/by-name/kr/krillinai/package.nix +++ b/pkgs/by-name/kr/krillinai/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "krillinai"; - version = "1.1.0"; + version = "1.1.3"; src = fetchFromGitHub { owner = "krillinai"; repo = "KrillinAI"; tag = "v${finalAttrs.version}"; - hash = "sha256-AAlefejME+XLERcDJDeVgzySVX+KGrCMt7PJyWaxnoM="; + hash = "sha256-hEKjqQcHnrxY266EP5uoLMzw6csi2bS5Q+ghGb6TJ4c="; }; vendorHash = "sha256-mpvypCZmvVVljftGpcV1aea3s7Xmhr0jLfKZIZ0nkX8="; diff --git a/pkgs/by-name/ks/kshutdown/package.nix b/pkgs/by-name/ks/kshutdown/package.nix index 7ce890468b6b..405134f87486 100644 --- a/pkgs/by-name/ks/kshutdown/package.nix +++ b/pkgs/by-name/ks/kshutdown/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kshutdown"; - version = "5.92-beta"; + version = "6.0"; src = fetchurl { url = "mirror://sourceforge/project/kshutdown/KShutdown/${finalAttrs.version}/kshutdown-source-${finalAttrs.version}.zip"; - hash = "sha256-EYgb2jeUoLNSPFIzlicnrmsccGc1nvoE5iDVt9x83ns="; + hash = "sha256-GXs0Cb1gtlPy8fxy3CJ10t97BENMWFsRJHij+104BLA="; name = "kshutdown-source-${finalAttrs.version}.zip"; }; diff --git a/pkgs/by-name/kt/kty/package.nix b/pkgs/by-name/kt/kty/package.nix index cd197e43bec0..0c1516e33c71 100644 --- a/pkgs/by-name/kt/kty/package.nix +++ b/pkgs/by-name/kt/kty/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,16 +25,9 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; }; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk; - [ - frameworks.SystemConfiguration - ] - ); + buildInputs = [ + openssl + ]; useFetchCargoVendor = true; cargoHash = "sha256-nJ+nof2YhyLrNuLVy69kYj5tw+aG4IJm6nVxHkczbko="; diff --git a/pkgs/by-name/ku/kubectl-explore/package.nix b/pkgs/by-name/ku/kubectl-explore/package.nix index 0d524a891b74..3607a5c4dd32 100644 --- a/pkgs/by-name/ku/kubectl-explore/package.nix +++ b/pkgs/by-name/ku/kubectl-explore/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubectl-explore"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "keisku"; repo = "kubectl-explore"; rev = "v${version}"; - hash = "sha256-RCLOqe4Ptac2YVDjWYG5H5geUMUsmh6klQfk92XvjI4="; + hash = "sha256-D5K1jGLoEHQEacxNhxdxDs9A9ir7qs7y1pNuBU2r//Y="; }; - vendorHash = "sha256-7KTs41zPf07FdUibsq57vJ2fkqOaVeBR6iSTJm5Fth0="; + vendorHash = "sha256-vCL+gVf0BCqsdRU2xk1Xs3FYcKYB1z2wLpZ3TvYmJdc="; doCheck = false; meta = with lib; { diff --git a/pkgs/by-name/ku/kubectl-rook-ceph/package.nix b/pkgs/by-name/ku/kubectl-rook-ceph/package.nix new file mode 100644 index 000000000000..61510ef99059 --- /dev/null +++ b/pkgs/by-name/ku/kubectl-rook-ceph/package.nix @@ -0,0 +1,52 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "kubectl-rook-ceph"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "rook"; + repo = "kubectl-rook-ceph"; + tag = "v${finalAttrs.version}"; + hash = "sha256-stWuRej3ogGETLzVabMRfakoK358lJbK56/hjBh2k2M="; + }; + + vendorHash = "sha256-fB3S946nv1uH9blek6w2EmmYYcdnBcEbmYELfPH9A04="; + + postInstall = '' + mv $out/bin/cmd $out/bin/kubectl-rook-ceph + ''; + # FIXME: uncomment once https://github.com/rook/kubectl-rook-ceph/issues/353 has been resolved + # nativeBuildInputs = [ installShellFiles ]; + # postInstall = + # '' + # ln -s $out/bin/cmd $out/bin/kubectl-rook-ceph + # '' + # + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + # let + # emulator = stdenv.hostPlatform.emulator buildPackages; + # in + # '' + # installShellCompletion --cmd kubectl-rook-ceph \ + # --bash <(${emulator} $out/bin/kubectl-rook-ceph completion bash) \ + # --fish <(${emulator} $out/bin/kubectl-rook-ceph completion fish) \ + # --zsh <(${emulator} $out/bin/kubectl-rook-ceph completion zsh) + # '' + # ); + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Krew plugin to run kubectl commands with rook-ceph"; + mainProgram = "kubectl-rook-ceph"; + homepage = "https://github.com/rook/kubectl-rook-ceph"; + changelog = "https://github.com/rook/kubectl-rook-ceph/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ vinylen ]; + }; +}) diff --git a/pkgs/by-name/ku/kubeone/package.nix b/pkgs/by-name/ku/kubeone/package.nix index 8b4f4e9c1b9e..82c9d1841aed 100644 --- a/pkgs/by-name/ku/kubeone/package.nix +++ b/pkgs/by-name/ku/kubeone/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.9.2"; + version = "1.10.0"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-pMY86Ucp5nuH63YgAh60l3WZYDPvM8LcTaV9QS2BzAA="; + hash = "sha256-lBeIhsPiEHGSvEhMNjSr5bv/jp2xbbd3wIgaaRARiI8="; }; - vendorHash = "sha256-dvsq2idsLmo1Tc8kfg3pJKNIMosrAMXN1fxvayS7glQ="; + vendorHash = "sha256-Ltrs86I5CAjx21BZZrG+UD5/YdLbaFwJqRQLvGwOA9E="; ldflags = [ "-s" diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix index 16d3029eccd8..d271b1c88329 100644 --- a/pkgs/by-name/ku/kubetui/package.nix +++ b/pkgs/by-name/ku/kubetui/package.nix @@ -2,8 +2,6 @@ rustPlatform, lib, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -21,13 +19,6 @@ rustPlatform.buildRustPackage rec { "--skip=workers::kube::store::tests::kubeconfigからstateを生成" ]; - buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) ( - with darwin.apple_sdk; - [ - frameworks.CoreGraphics - frameworks.AppKit - ] - ); useFetchCargoVendor = true; cargoHash = "sha256-fMrlZMe2uD+ImM6zPXzo/+/Eto2MeIyscYfU8msLJFw="; diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix index 52ae0876068f..2bd3f32dc84b 100644 --- a/pkgs/by-name/ku/kubevpn/package.nix +++ b/pkgs/by-name/ku/kubevpn/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.6.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - hash = "sha256-P01hjVAA3h/TBPl8q9KuZoE5xWAhmJ5E2nFSuvfWIIg="; + hash = "sha256-Og84vFDPGpvQwmS3xL3HBxk/vSnvZbbLvDEyvMbj+GU="; }; vendorHash = null; diff --git a/pkgs/by-name/la/lacus/package.nix b/pkgs/by-name/la/lacus/package.nix index b62de38ac785..b989d86c1d26 100644 --- a/pkgs/by-name/la/lacus/package.nix +++ b/pkgs/by-name/la/lacus/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "lacus"; - version = "1.13.0"; + version = "1.13.1"; pyproject = true; src = fetchFromGitHub { owner = "ail-project"; repo = "lacus"; tag = "v${version}"; - hash = "sha256-5hADBSvbdazCMAbPya5H2iOl/sQjg6ixv7crJ2FlFpk="; + hash = "sha256-M9ZRlvQvDV5eiWOHh3LgezIN5gUgJ6w24OEo4RArip8="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/la/lavat/package.nix b/pkgs/by-name/la/lavat/package.nix index 12beae650e52..8cd735a692c5 100644 --- a/pkgs/by-name/la/lavat/package.nix +++ b/pkgs/by-name/la/lavat/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "2.1.0"; + version = "2.2.0"; in stdenv.mkDerivation { pname = "lavat"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "AngelJumbo"; repo = "lavat"; rev = "v${version}"; - hash = "sha256-wGtuYgZS03gXYgdNdugGu/UlROQTrQ3C1inJ/aTUBKk="; + hash = "sha256-SNRhel2RmaAPqoYpcq7F9e/FcbCJ0E3VJN/G9Ya4TeY="; }; installPhase = '' diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index 21dfd97f817b..6eef23e5b527 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -4,16 +4,17 @@ fetchFromGitHub, lazygit, testers, + nix-update-script, }: buildGoModule rec { pname = "lazygit"; - version = "0.48.0"; + version = "0.49.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; tag = "v${version}"; - hash = "sha256-L3OcCkoSJZ6skzcjP2E3BrQ39cXyxcuHGthj8RHIGeQ="; + hash = "sha256-hNEznDz+DHalKgmz1fXFivf9T1YJ/jfwcD4baTUO4Cw="; }; vendorHash = null; @@ -24,7 +25,16 @@ buildGoModule rec { "-X main.buildSource=nix" ]; - passthru.tests.version = testers.testVersion { package = lazygit; }; + passthru = { + tests.version = testers.testVersion { package = lazygit; }; + + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^v([0-9.]+)$" + ]; + }; + }; meta = { description = "Simple terminal UI for git commands"; diff --git a/pkgs/by-name/la/lazymc/package.nix b/pkgs/by-name/la/lazymc/package.nix index d598a4ca7c07..85ef9ddf9806 100644 --- a/pkgs/by-name/la/lazymc/package.nix +++ b/pkgs/by-name/la/lazymc/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, nix-update-script, }: @@ -21,10 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-jqqqWZKO1HgwxLBGMz9rlFQ5xmZTycfUZjqHf+uVTBQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index 9ca3eb727e77..82dabbcd3fff 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -26,9 +26,7 @@ buildGoModule rec { "-X main.version=${version}" ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ]; passthru.tests.version = testers.testVersion { package = lazysql; diff --git a/pkgs/by-name/ld/ldc/package.nix b/pkgs/by-name/ld/ldc/package.nix index 95b6ffa898a0..03f87a50d91c 100644 --- a/pkgs/by-name/ld/ldc/package.nix +++ b/pkgs/by-name/ld/ldc/package.nix @@ -16,7 +16,6 @@ lit, gdb, unzip, - darwin, ldcBootstrap ? callPackage ./bootstrap.nix { }, }: @@ -77,9 +76,6 @@ stdenv.mkDerivation (finalAttrs: { ninja unzip ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 gdb diff --git a/pkgs/by-name/le/leaf/package.nix b/pkgs/by-name/le/leaf/package.nix index 31cac3531b68..12181d2036ac 100644 --- a/pkgs/by-name/le/leaf/package.nix +++ b/pkgs/by-name/le/leaf/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,11 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-RQ9fQfYfpsFAA5CzR3ICLIEYb00qzUsWAQKSrK/488g="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - meta = with lib; { description = "Simple system fetch written in rust"; homepage = "https://github.com/IogaMaster/leaf"; diff --git a/pkgs/by-name/le/ledfx/package.nix b/pkgs/by-name/le/ledfx/package.nix index acb5f4e1923c..8dec6f12eb2d 100644 --- a/pkgs/by-name/le/ledfx/package.nix +++ b/pkgs/by-name/le/ledfx/package.nix @@ -4,7 +4,7 @@ python3, }: -python3.pkgs.buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "ledfx"; version = "2.0.108"; pyproject = true; diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix index 90d47c53c371..0ef1ead1cd47 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -8,11 +8,11 @@ let pname = "ledger-live-desktop"; - version = "2.107.0"; + version = "2.109.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-PtoazbAwwG856M2HoPjN6yuTHlSiIJs5PziDrkLAEZE="; + hash = "sha256-wqY5f+A4j+KY99LulL8YS1eACvEsTSfMGV7Be6yOMqM="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/le/leetcode-cli/package.nix b/pkgs/by-name/le/leetcode-cli/package.nix index 25f05d80fb52..df6619838059 100644 --- a/pkgs/by-name/le/leetcode-cli/package.nix +++ b/pkgs/by-name/le/leetcode-cli/package.nix @@ -8,7 +8,6 @@ dbus, sqlite, stdenv, - darwin, testers, leetcode-cli, }: @@ -30,16 +29,11 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = - [ - openssl - dbus - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + dbus + sqlite + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd leetcode \ diff --git a/pkgs/by-name/le/legba/package.nix b/pkgs/by-name/le/legba/package.nix index 99e1862dd5f9..f6802c334951 100644 --- a/pkgs/by-name/le/legba/package.nix +++ b/pkgs/by-name/le/legba/package.nix @@ -6,8 +6,6 @@ pkg-config, openssl, samba, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,14 +26,10 @@ rustPlatform.buildRustPackage rec { cmake pkg-config ]; - buildInputs = - [ - openssl.dev - samba - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl.dev + samba + ]; # Paho C test fails due to permission issue doCheck = false; diff --git a/pkgs/by-name/le/lemminx/package.nix b/pkgs/by-name/le/lemminx/package.nix index 3ad399a88725..74ec6ee81028 100644 --- a/pkgs/by-name/le/lemminx/package.nix +++ b/pkgs/by-name/le/lemminx/package.nix @@ -25,13 +25,13 @@ let in maven.buildMavenPackage rec { pname = "lemminx"; - version = "0.30.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "eclipse"; repo = "lemminx"; rev = version; - hash = "sha256-xGC3ZGQ1dA0485/IPHsmX2NO1QOPp/nHMLBZvcC4Om8="; + hash = "sha256-DkJaSEWmQV1vkC+knJNIDzVPyAYtf2lFZUpGhDTJXLE="; # Lemminx reads this git information at runtime from a git.properties # file on the classpath leaveDotGit = true; diff --git a/pkgs/by-name/le/lenmus/package.nix b/pkgs/by-name/le/lenmus/package.nix index 4a7fbb5409db..5b01f4f6aef6 100644 --- a/pkgs/by-name/le/lenmus/package.nix +++ b/pkgs/by-name/le/lenmus/package.nix @@ -16,14 +16,10 @@ wxsqlite3, fluidsynth, fontconfig, - darwin, soundfont-fluid, openlilylib-fonts, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation (finalAttrs: { pname = "lenmus"; version = "6.0.1"; @@ -54,23 +50,19 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ]; - buildInputs = - [ - boost - portmidi - sqlite - freetype - libpng - pngpp - zlib - wxGTK32 - wxsqlite3 - fluidsynth - fontconfig - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ]; + buildInputs = [ + boost + portmidi + sqlite + freetype + libpng + pngpp + zlib + wxGTK32 + wxsqlite3 + fluidsynth + fontconfig + ]; preConfigure = '' mkdir res/fonts diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix index 085771ab4adb..eb130aeb23f9 100644 --- a/pkgs/by-name/le/level-zero/package.nix +++ b/pkgs/by-name/le/level-zero/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.20.2"; + version = "1.21.9"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; tag = "v${version}"; - hash = "sha256-IqnEjlKBB3nx2rOTBG+rrJ078z8+kkg52hFV2+5lJV0="; + hash = "sha256-I9jCS4ZDEfOH/2kgIgeNne96Z5YZdzsmUGXza8PmXZI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libaribcaption/package.nix b/pkgs/by-name/li/libaribcaption/package.nix index 353f31c0e128..51d1da2f66be 100644 --- a/pkgs/by-name/li/libaribcaption/package.nix +++ b/pkgs/by-name/li/libaribcaption/package.nix @@ -7,10 +7,6 @@ fontconfig, freetype, - ApplicationServices, - CoreFoundation, - CoreGraphics, - CoreText, }: stdenv.mkDerivation rec { @@ -28,17 +24,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; - buildInputs = - lib.optionals (!stdenv.hostPlatform.isDarwin) [ - fontconfig - freetype - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - CoreFoundation - CoreGraphics - CoreText - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + fontconfig + freetype + ]; meta = with lib; { description = "Portable ARIB STD-B24 Caption Decoder/Renderer"; diff --git a/pkgs/by-name/li/libass/package.nix b/pkgs/by-name/li/libass/package.nix index ba3fa9a74633..68a443b16e66 100644 --- a/pkgs/by-name/li/libass/package.nix +++ b/pkgs/by-name/li/libass/package.nix @@ -11,7 +11,6 @@ fontconfig ? null, # fontconfig support largeTilesSupport ? false, # Use larger tiles in the rasterizer libiconv, - darwin, }: assert fontconfigSupport -> fontconfig != null; @@ -49,9 +48,6 @@ stdenv.mkDerivation rec { ++ lib.optional fontconfigSupport fontconfig ++ lib.optional stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.ApplicationServices - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreText ]; meta = with lib; { diff --git a/pkgs/by-name/li/libcdio/package.nix b/pkgs/by-name/li/libcdio/package.nix new file mode 100644 index 000000000000..73f1f6de7667 --- /dev/null +++ b/pkgs/by-name/li/libcdio/package.nix @@ -0,0 +1,94 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + autoreconfHook, + testers, + texinfo, + libcddb, + pkg-config, + ncurses, + help2man, + libiconv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libcdio"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "libcdio"; + repo = "libcdio"; + tag = finalAttrs.version; + hash = "sha256-izjZk2kz9PkLm9+INUdl1e7jMz3nUsQKdplKI9Io+CM="; + }; + + env = lib.optionalAttrs stdenv.is32bit { + NIX_CFLAGS_COMPILE = "-D_LARGEFILE64_SOURCE"; + }; + + postPatch = '' + patchShebangs . + echo " + @set UPDATED 1 January 1970 + @set UPDATED-MONTH January 1970 + @set EDITION ${finalAttrs.version} + @set VERSION ${finalAttrs.version} + " > doc/version.texi + ''; + + configureFlags = [ + (lib.enableFeature true "maintainer-mode") + ]; + + nativeBuildInputs = [ + pkg-config + help2man + autoreconfHook + texinfo + ]; + + buildInputs = [ + libcddb + libiconv + ncurses + ]; + + enableParallelBuilding = true; + + doCheck = !stdenv.hostPlatform.isDarwin; + + outputs = [ + "out" + "lib" + "dev" + "info" + "man" + ]; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Library for OS-independent CD-ROM and CD image access"; + longDescription = '' + GNU libcdio is a library for OS-independent CD-ROM and + CD image access. It includes a library for working with + ISO-9660 filesystems (libiso9660), as well as utility + programs such as an audio CD player and an extractor. + ''; + homepage = "https://www.gnu.org/software/libcdio/"; + license = lib.licenses.gpl2Plus; + pkgConfigModules = [ + "libcdio" + "libcdio++" + "libiso9660" + "libiso9660++" + "libudf" + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/li/libclipboard/package.nix b/pkgs/by-name/li/libclipboard/package.nix index e0eb69704199..122cbb651ab9 100644 --- a/pkgs/by-name/li/libclipboard/package.nix +++ b/pkgs/by-name/li/libclipboard/package.nix @@ -6,7 +6,6 @@ libxcb, libXau, libXdmcp, - darwin, lib, }: @@ -25,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { libxcb libXau libXdmcp - ] ++ lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + ]; nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index c8e922edf339..e4bde0ff3063 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -15,7 +15,6 @@ sqlcipher, sqlite, fixDarwinDylibNames, - darwin, libiconv, }: @@ -59,9 +58,6 @@ stdenv.mkDerivation rec { sqlite ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration libiconv ]; diff --git a/pkgs/by-name/li/libdiscid/package.nix b/pkgs/by-name/li/libdiscid/package.nix index e863863fe6f1..3be92789614b 100644 --- a/pkgs/by-name/li/libdiscid/package.nix +++ b/pkgs/by-name/li/libdiscid/package.nix @@ -4,7 +4,6 @@ fetchurl, cmake, pkg-config, - darwin, }: stdenv.mkDerivation rec { @@ -16,8 +15,6 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; - src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/${pname}/${pname}-${version}.tar.gz"; sha256 = "sha256-3V6PHJrq1ELiO3SanMkzY3LmLoitcHmitiiVsDkMsoI="; diff --git a/pkgs/development/libraries/libepoxy/libgl-path.patch b/pkgs/by-name/li/libepoxy/libgl-path.patch similarity index 100% rename from pkgs/development/libraries/libepoxy/libgl-path.patch rename to pkgs/by-name/li/libepoxy/libgl-path.patch diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/by-name/li/libepoxy/package.nix similarity index 100% rename from pkgs/development/libraries/libepoxy/default.nix rename to pkgs/by-name/li/libepoxy/package.nix diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/by-name/li/libfakeXinerama/package.nix similarity index 88% rename from pkgs/tools/X11/xpra/libfakeXinerama.nix rename to pkgs/by-name/li/libfakeXinerama/package.nix index 2b533c1aacca..51f16727c4ec 100644 --- a/pkgs/tools/X11/xpra/libfakeXinerama.nix +++ b/pkgs/by-name/li/libfakeXinerama/package.nix @@ -6,12 +6,12 @@ libXinerama, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libfakeXinerama"; version = "0.1.0"; src = fetchurl { - url = "https://www.xpra.org/src/${pname}-${version}.tar.bz2"; + url = "https://www.xpra.org/src/libfakeXinerama-${finalAttrs.version}.tar.bz2"; sha256 = "0gxb8jska2anbb3c1m8asbglgnwylgdr44x9lr8yh91hjxsqadkx"; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.nickcao ]; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/by-name/li/libfreefare/package.nix b/pkgs/by-name/li/libfreefare/package.nix index 8aa06f577a95..247fa1607940 100644 --- a/pkgs/by-name/li/libfreefare/package.nix +++ b/pkgs/by-name/li/libfreefare/package.nix @@ -6,7 +6,6 @@ pkg-config, libnfc, openssl, - darwin, }: stdenv.mkDerivation { @@ -22,15 +21,10 @@ stdenv.mkDerivation { autoreconfHook pkg-config ]; - buildInputs = - [ - libnfc - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc - darwin.apple_sdk - ]; + buildInputs = [ + libnfc + openssl + ]; env = { NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/by-name/li/libhttpseverywhere/package.nix b/pkgs/by-name/li/libhttpseverywhere/package.nix deleted file mode 100644 index c24eb6ab7780..000000000000 --- a/pkgs/by-name/li/libhttpseverywhere/package.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - meson, - ninja, - makeFontsConf, - vala, - fetchpatch, - gnome, - libgee, - glib, - json-glib, - libarchive, - libsoup_2_4, - gobject-introspection, -}: - -let - pname = "libhttpseverywhere"; - version = "0.8.3"; -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w"; - }; - - nativeBuildInputs = [ - vala - gobject-introspection - meson - ninja - pkg-config - ]; - buildInputs = [ - glib - libgee - json-glib - libsoup_2_4 - libarchive - ]; - - patches = [ - # Fixes build with vala >=0.42 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/commit/6da08ef1ade9ea267cecf14dd5cb2c3e6e5e50cb.patch"; - sha256 = "1nwjlh8iqgjayccwdh0fbpq2g1h8bg1k1g9i324f2bhhvyhmpq8f"; - }) - # fix build with meson 0.60 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/-/commit/4c38b2ca25802c464f3204a62815201d8cf549fd.patch"; - sha256 = "sha256-1+fmR0bpvJ9ISN2Hr+BTIQz+Bf6VfY1RdVZ/OohUlWU="; - }) - ]; - - mesonFlags = [ "-Denable_valadoc=true" ]; - - doCheck = true; - - checkPhase = "(cd test && ./httpseverywhere_test)"; - - FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; - - outputs = [ - "out" - "devdoc" - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Library to use HTTPSEverywhere in desktop applications"; - homepage = "https://gitlab.gnome.org/GNOME/libhttpseverywhere"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ sternenseemann ] ++ teams.gnome.members; - }; -} diff --git a/pkgs/by-name/li/libhv/package.nix b/pkgs/by-name/li/libhv/package.nix index 4eb104dbce54..c7fabd5eb5c6 100644 --- a/pkgs/by-name/li/libhv/package.nix +++ b/pkgs/by-name/li/libhv/package.nix @@ -5,7 +5,6 @@ cmake, curl, openssl, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -24,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + ]; cmakeFlags = [ "-DENABLE_UDS=ON" diff --git a/pkgs/by-name/li/libndctl/musl-compat.patch b/pkgs/by-name/li/libndctl/musl-compat.patch new file mode 100644 index 000000000000..4173363b18b6 --- /dev/null +++ b/pkgs/by-name/li/libndctl/musl-compat.patch @@ -0,0 +1,22 @@ +diff --git a/daxctl/device.c b/daxctl/device.c +index e3993b1..0b2f20d 100644 +--- a/daxctl/device.c ++++ b/daxctl/device.c +@@ -23,6 +23,8 @@ + #include "filter.h" + #include "json.h" + ++#include ++ + static struct { + const char *dev; + const char *mode; +@@ -366,7 +368,7 @@ static const char *parse_device_options(int argc, const char **argv, + + argc = parse_options(argc, argv, options, u, 0); + if (argc > 0) +- device = basename(argv[0]); ++ device = basename(strdup(argv[0])); + + /* Handle action-agnostic non-option arguments */ + if (argc == 0 && diff --git a/pkgs/by-name/li/libndctl/package.nix b/pkgs/by-name/li/libndctl/package.nix index d2ccec80a570..61d0704897b9 100644 --- a/pkgs/by-name/li/libndctl/package.nix +++ b/pkgs/by-name/li/libndctl/package.nix @@ -25,6 +25,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-gG1Rz5AtDLzikGFr8A3l25ypd+VoLw2oWjszy9ogDLk="; }; + patches = lib.optionals (!stdenv.hostPlatform.isGnu) [ + # Use POSIX basename on non-glib. + # Remove when https://github.com/pmem/ndctl/pull/263 + # or equivalent fix is merged and released. + ./musl-compat.patch + ]; + outputs = [ "out" "man" diff --git a/pkgs/by-name/li/libofa/package.nix b/pkgs/by-name/li/libofa/package.nix index e1176a1ff2c6..242eacf9bd71 100644 --- a/pkgs/by-name/li/libofa/package.nix +++ b/pkgs/by-name/li/libofa/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchzip, expat, curl, fftw, @@ -17,11 +18,22 @@ stdenv.mkDerivation rec { sha256 = "184ham039l7lwhfgg0xr2vch2xnw1lwh7sid432mh879adhlc5h2"; }; - patches = fetchurl { + debian_patches = fetchzip { url = "mirror://debian/pool/main/libo/libofa/libofa_${version}-${deb_patch}.debian.tar.gz"; - sha256 = "1rfkyz13cm8izm90c1xflp4rvsa24aqs6qpbbbqqcbmvzsj6j9yn"; + hash = "sha256-tENhXSRcUP1PKm35IJyLUEEROze8UzxJzRx3VNAqo40="; }; + patches = [ + "${debian_patches}/patches/01_gcc41.diff" + "${debian_patches}/patches/02_example-open.diff" + "${debian_patches}/patches/03_example-size_type.diff" + "${debian_patches}/patches/04_libofa.pc-deps.diff" + "${debian_patches}/patches/05_gcc43.diff" + "${debian_patches}/patches/06_gcc44.diff" + "${debian_patches}/patches/fix_ftbfs.diff" + "${debian_patches}/patches/fix-ftbfs-gcc4.7.diff" + ]; + outputs = [ "out" "dev" diff --git a/pkgs/by-name/li/libproxy/package.nix b/pkgs/by-name/li/libproxy/package.nix index 67ccc456dc74..191a7d484d69 100644 --- a/pkgs/by-name/li/libproxy/package.nix +++ b/pkgs/by-name/li/libproxy/package.nix @@ -2,7 +2,6 @@ lib, _experimental-update-script-combinators, curl, - darwin, duktape, fetchFromGitHub, gi-docgen, @@ -88,17 +87,10 @@ stdenv.mkDerivation (finalAttrs: { curl duktape ] - ++ ( - if stdenv.hostPlatform.isDarwin then - (with darwin.apple_sdk.frameworks; [ - Foundation - ]) - else - [ - glib - gsettings-desktop-schemas - ] - ); + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + glib + gsettings-desktop-schemas + ]; mesonFlags = [ diff --git a/pkgs/by-name/li/libqmi/build_doc_deps_by_default.patch b/pkgs/by-name/li/libqmi/build_doc_deps_by_default.patch deleted file mode 100644 index f9ffbb589bf7..000000000000 --- a/pkgs/by-name/li/libqmi/build_doc_deps_by_default.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/docs/reference/libqmi-glib/meson.build b/docs/reference/libqmi-glib/meson.build -index 2f5cfc3..14e1aea 100644 ---- a/docs/reference/libqmi-glib/meson.build -+++ b/docs/reference/libqmi-glib/meson.build -@@ -57,6 +57,7 @@ sections_txt = custom_target( - capture: true, - command: [find_program('cat'), '@INPUT@'] + gen_sections, - depends: gen_sections_deps, -+ build_by_default: true, - ) - - version_xml = configure_file( diff --git a/pkgs/by-name/li/libqmi/package.nix b/pkgs/by-name/li/libqmi/package.nix index daa61c7d3a1e..d26536cf25a5 100644 --- a/pkgs/by-name/li/libqmi/package.nix +++ b/pkgs/by-name/li/libqmi/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.34.0"; + version = "1.36.0"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "mobile-broadband"; repo = "libqmi"; rev = version; - hash = "sha256-l9ev9ZOWicVNZ/Wj//KNd3NHcefIrLVriqJhEpwWvtQ="; + hash = "sha256-cGNnw0vO/Hr9o/eIf6lLTsoGiEkTvZiArgO7tAc208U="; }; nativeBuildInputs = @@ -88,10 +88,6 @@ stdenv.mkDerivation rec { ]; doCheck = true; - patches = [ - # https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/124 - ./build_doc_deps_by_default.patch - ]; postPatch = '' patchShebangs \ diff --git a/pkgs/by-name/li/libremidi/package.nix b/pkgs/by-name/li/libremidi/package.nix index a5a16f53e338..4490619f1f71 100644 --- a/pkgs/by-name/li/libremidi/package.nix +++ b/pkgs/by-name/li/libremidi/package.nix @@ -2,19 +2,10 @@ lib, alsa-lib, cmake, - darwin, fetchFromGitHub, stdenv, }: -let - inherit (darwin.apple_sdk.frameworks) - CoreAudio - CoreFoundation - CoreMIDI - CoreServices - ; -in stdenv.mkDerivation (finalAttrs: { pname = "libremidi"; version = "4.5.0"; @@ -30,16 +21,9 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreAudio - CoreFoundation - CoreMIDI - CoreServices - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; # Bug: set this as true breaks obs-studio-plugins.advanced-scene-switcher strictDeps = false; diff --git a/pkgs/by-name/li/libretls/package.nix b/pkgs/by-name/li/libretls/package.nix new file mode 100644 index 000000000000..83458085b9e6 --- /dev/null +++ b/pkgs/by-name/li/libretls/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchgit, + autoreconfHook, + libtool, + openssl, + pkg-config, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libretls"; + version = "3.8.1"; + + src = fetchgit { + url = "https://git.causal.agency/libretls"; + tag = finalAttrs.version; + hash = "sha256-cFu9v8vOkfvIj/OfD0Er3n+gbH1h1CHOHA6a0pJuwXY="; + }; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + libtool + ]; + + autoreconfFlags = [ + "--force" + "--install" + ]; + + buildInputs = [ openssl ]; + + strictDeps = true; + + meta = { + description = "Libtls for OpenSSL"; + homepage = "https://git.causal.agency/libretls/about/"; + changelog = "https://git.causal.agency/libretls/tag/?h=${finalAttrs.version}"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ mtrsk ]; + }; +}) diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix index adbc3ca89e7b..7546283c2732 100644 --- a/pkgs/by-name/li/libretro-shaders-slang/package.nix +++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "libretro-shaders-slang"; - version = "0-unstable-2025-03-13"; + version = "0-unstable-2025-04-14"; src = fetchFromGitHub { owner = "libretro"; repo = "slang-shaders"; - rev = "25311dc03332d9ef2dff8d9d06c611d828028fac"; - hash = "sha256-nmDjjQgxpZcddOHlBAE9CKdR95u+6lEYXcmIwH9RHXo="; + rev = "cacb61c9a3022c84057331063e31304933b61bdf"; + hash = "sha256-dpqru8Qu1xZkHNKv6oF/T61/k6X2CWljUSVeJqxMvso="; }; dontConfigure = true; diff --git a/pkgs/by-name/li/libseccomp/package.nix b/pkgs/by-name/li/libseccomp/package.nix index edc8f5a17666..f3721858b2da 100644 --- a/pkgs/by-name/li/libseccomp/package.nix +++ b/pkgs/by-name/li/libseccomp/package.nix @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; badPlatforms = [ "alpha-linux" - "loongarch64-linux" "m68k-linux" "microblaze-linux" "microblazeel-linux" diff --git a/pkgs/by-name/li/libselinux/package.nix b/pkgs/by-name/li/libselinux/package.nix index c4d5b7addae8..45eb612e203e 100644 --- a/pkgs/by-name/li/libselinux/package.nix +++ b/pkgs/by-name/li/libselinux/package.nix @@ -15,112 +15,118 @@ assert enablePython -> swig != null && python3 != null; -stdenv.mkDerivation ( - rec { - pname = "libselinux"; - version = "3.8"; - inherit (libsepol) se_url; +stdenv.mkDerivation (finalAttrs: { + pname = "libselinux"; + version = "3.8.1"; + inherit (libsepol) se_url; - outputs = [ - "bin" - "out" - "dev" - "man" - ] ++ lib.optional enablePython "py"; + outputs = [ + "bin" + "out" + "dev" + "man" + ] ++ lib.optional enablePython "py"; - src = fetchurl { - url = "${se_url}/${version}/libselinux-${version}.tar.gz"; - hash = "sha256-DDdWvKBHyScCgdfE3N7NAAty44oYPJMGYeupaQg5tUE="; - }; + src = fetchurl { + url = "${finalAttrs.se_url}/${finalAttrs.version}/libselinux-${finalAttrs.version}.tar.gz"; + hash = "sha256-7C0nifkxFS0hwdsetLwgLOTszt402b6eNg47RSQ87iw="; + }; - patches = [ - # Make it possible to disable shared builds (for pkgsStatic). - # - # We can't use fetchpatch because it processes includes/excludes - # /after/ stripping the prefix, which wouldn't work here because - # there would be no way to distinguish between - # e.g. libselinux/src/Makefile and libsepol/src/Makefile. - # - # This is a static email, so we shouldn't have to worry about - # normalizing the patch. - (fetchurl { - url = "https://lore.kernel.org/selinux/20250211211651.1297357-3-hi@alyssa.is/raw"; - hash = "sha256-a0wTSItj5vs8GhIkfD1OPSjGmAJlK1orptSE7T3Hx20="; - postFetch = '' - mv "$out" $TMPDIR/patch - ${buildPackages.patchutils_0_3_3}/bin/filterdiff \ - -i 'a/libselinux/*' --strip 1 <$TMPDIR/patch >"$out" - ''; - }) + patches = [ + # Make it possible to disable shared builds (for pkgsStatic). + # + # We can't use fetchpatch because it processes includes/excludes + # /after/ stripping the prefix, which wouldn't work here because + # there would be no way to distinguish between + # e.g. libselinux/src/Makefile and libsepol/src/Makefile. + # + # This is a static email, so we shouldn't have to worry about + # normalizing the patch. + (fetchurl { + url = "https://lore.kernel.org/selinux/20250211211651.1297357-3-hi@alyssa.is/raw"; + hash = "sha256-a0wTSItj5vs8GhIkfD1OPSjGmAJlK1orptSE7T3Hx20="; + postFetch = '' + mv "$out" $TMPDIR/patch + ${buildPackages.patchutils_0_3_3}/bin/filterdiff \ + -i 'a/libselinux/*' --strip 1 <$TMPDIR/patch >"$out" + ''; + }) - (fetchurl { - url = "https://git.yoctoproject.org/meta-selinux/plain/recipes-security/selinux/libselinux/0003-libselinux-restore-drop-the-obsolete-LSF-transitiona.patch?id=62b9c816a5000dc01b28e78213bde26b58cbca9d"; - hash = "sha256-RiEUibLVzfiRU6N/J187Cs1iPAih87gCZrlyRVI2abU="; - }) + (fetchurl { + url = "https://git.yoctoproject.org/meta-selinux/plain/recipes-security/selinux/libselinux/0003-libselinux-restore-drop-the-obsolete-LSF-transitiona.patch?id=62b9c816a5000dc01b28e78213bde26b58cbca9d"; + hash = "sha256-RiEUibLVzfiRU6N/J187Cs1iPAih87gCZrlyRVI2abU="; + }) + ]; + + nativeBuildInputs = + [ + pkg-config + python3 + ] + ++ lib.optionals enablePython [ + python3Packages.pip + python3Packages.setuptools + python3Packages.wheel + swig ]; + buildInputs = [ + libsepol + pcre2 + fts + ] ++ lib.optionals enablePython [ python3 ]; - nativeBuildInputs = - [ - pkg-config - python3 - ] - ++ lib.optionals enablePython [ - python3Packages.pip - python3Packages.setuptools - python3Packages.wheel - swig - ]; - buildInputs = [ - libsepol - pcre2 - fts - ] ++ lib.optionals enablePython [ python3 ]; + # drop fortify here since package uses it by default, leading to compile error: + # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] + hardeningDisable = [ "fortify" ]; - # drop fortify here since package uses it by default, leading to compile error: - # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] - hardeningDisable = [ "fortify" ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error -D_FILE_OFFSET_BITS=64"; - - makeFlags = - [ - "PREFIX=$(out)" - "INCDIR=$(dev)/include/selinux" - "INCLUDEDIR=$(dev)/include" - "MAN3DIR=$(man)/share/man/man3" - "MAN5DIR=$(man)/share/man/man5" - "MAN8DIR=$(man)/share/man/man8" - "SBINDIR=$(bin)/sbin" - "SHLIBDIR=$(out)/lib" - - "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" - "ARCH=${stdenv.hostPlatform.linuxArch}" - ] - ++ lib.optionals (fts != null) [ - "FTS_LDLIBS=-lfts" - ] - ++ lib.optionals stdenv.hostPlatform.isStatic [ - "DISABLE_SHARED=y" - ] - ++ lib.optionals enablePython [ - "PYTHON=${python3.pythonOnBuildForHost.interpreter}" - "PYTHONLIBDIR=$(py)/${python3.sitePackages}" - "PYTHON_SETUP_ARGS=--no-build-isolation" - ]; - - preInstall = lib.optionalString enablePython '' - mkdir -p $py/${python3.sitePackages}/selinux - ''; - - installTargets = [ "install" ] ++ lib.optional enablePython "install-pywrap"; - - meta = removeAttrs libsepol.meta [ "outputsToInstall" ] // { - description = "SELinux core library"; - }; - } - // - lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") + env = + { + NIX_CFLAGS_COMPILE = "-Wno-error -D_FILE_OFFSET_BITS=64"; + } + // lib.optionalAttrs + (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") { NIX_LDFLAGS = "--undefined-version"; - } -) + }; + + makeFlags = + [ + "PREFIX=$(out)" + "INCDIR=$(dev)/include/selinux" + "INCLUDEDIR=$(dev)/include" + "MAN3DIR=$(man)/share/man/man3" + "MAN5DIR=$(man)/share/man/man5" + "MAN8DIR=$(man)/share/man/man8" + "SBINDIR=$(bin)/sbin" + "SHLIBDIR=$(out)/lib" + + "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" + "ARCH=${stdenv.hostPlatform.linuxArch}" + ] + ++ lib.optionals (fts != null) [ + "FTS_LDLIBS=-lfts" + ] + ++ lib.optionals stdenv.hostPlatform.isStatic [ + "DISABLE_SHARED=y" + ] + ++ lib.optionals enablePython [ + "PYTHON=${python3.pythonOnBuildForHost.interpreter}" + "PYTHONLIBDIR=$(py)/${python3.sitePackages}" + "PYTHON_SETUP_ARGS=--no-build-isolation" + ]; + + preInstall = lib.optionalString enablePython '' + mkdir -p $py/${python3.sitePackages}/selinux + ''; + + installTargets = [ "install" ] ++ lib.optional enablePython "install-pywrap"; + + preFixup = lib.optionalString enablePython '' + mv $out/${python3.sitePackages}/selinux/* $py/${python3.sitePackages}/selinux/ + rm -rf $out/lib/python* + ''; + + meta = removeAttrs libsepol.meta [ "outputsToInstall" ] // { + description = "SELinux core library"; + }; +}) diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/by-name/li/libsemanage/package.nix similarity index 86% rename from pkgs/os-specific/linux/libsemanage/default.nix rename to pkgs/by-name/li/libsemanage/package.nix index eae78b62785d..277d7d5238b3 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/by-name/li/libsemanage/package.nix @@ -11,7 +11,7 @@ audit, enablePython ? true, swig ? null, - python ? null, + python3 ? null, }: stdenv.mkDerivation rec { @@ -32,17 +32,23 @@ stdenv.mkDerivation rec { strictDeps = true; - nativeBuildInputs = [ - bison - flex - pkg-config - ] ++ lib.optional enablePython swig; + nativeBuildInputs = + [ + bison + flex + pkg-config + ] + ++ lib.optionals enablePython [ + python3 + swig + ]; + buildInputs = [ libsepol libselinux bzip2 audit - ] ++ lib.optional enablePython python; + ] ++ lib.optional enablePython python3; makeFlags = [ "PREFIX=$(out)" @@ -51,7 +57,7 @@ stdenv.mkDerivation rec { "MAN5DIR=$(man)/share/man/man5" "PYTHON=python" "PYPREFIX=python" - "PYTHONLIBDIR=$(py)/${python.sitePackages}" + "PYTHONLIBDIR=$(py)/${python3.sitePackages}" "DEFAULT_SEMANAGE_CONF_LOCATION=$(out)/etc/selinux/semanage.conf" ]; diff --git a/pkgs/by-name/li/libsepol/package.nix b/pkgs/by-name/li/libsepol/package.nix index ea4a5e45838a..f04de97e9949 100644 --- a/pkgs/by-name/li/libsepol/package.nix +++ b/pkgs/by-name/li/libsepol/package.nix @@ -49,7 +49,10 @@ stdenv.mkDerivation rec { description = "SELinux binary policy manipulation library"; homepage = "http://userspace.selinuxproject.org"; platforms = platforms.linux; - maintainers = with maintainers; [ RossComputerGuy ]; + maintainers = with maintainers; [ + RossComputerGuy + numinit + ]; license = lib.licenses.gpl2Plus; pkgConfigModules = [ "libselinux" ]; }; diff --git a/pkgs/by-name/li/libserialport/package.nix b/pkgs/by-name/li/libserialport/package.nix index 084b9c812648..db6bdd650e7c 100644 --- a/pkgs/by-name/li/libserialport/package.nix +++ b/pkgs/by-name/li/libserialport/package.nix @@ -4,7 +4,6 @@ fetchurl, pkg-config, udev, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -17,9 +16,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = - lib.optional stdenv.hostPlatform.isLinux udev - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; + buildInputs = lib.optional stdenv.hostPlatform.isLinux udev; meta = { description = "Cross-platform shared library for serial port access"; diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix index a418c784a5bf..714ffd844115 100644 --- a/pkgs/by-name/li/libsidplayfp/package.nix +++ b/pkgs/by-name/li/libsidplayfp/package.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-VBzobT/UT1YFLYWfJ5XFND+p6fClf/qZVb4eEVpdTqg="; + hash = "sha256-uKChHjC5kzctFEEYP6YUp0sr7s9YULn9nfu87wsjxUQ="; }; outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ]; diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix index c474a86bfdfe..3cf2722f216a 100644 --- a/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/pkgs/by-name/li/libsignal-ffi/package.nix @@ -7,7 +7,6 @@ xcodebuild, protobuf, boringssl, - darwin, }: let # boring-sys expects the static libraries in build/ instead of lib/ @@ -22,18 +21,16 @@ rustPlatform.buildRustPackage rec { pname = "libsignal-ffi"; # must match the version used in mautrix-signal # see https://github.com/mautrix/signal/issues/401 - version = "0.67.4"; + version = "0.70.0"; src = fetchFromGitHub { fetchSubmodules = true; owner = "signalapp"; repo = "libsignal"; tag = "v${version}"; - hash = "sha256-s7vTzAOWKvGCkrWcxDcKptsmxvW5VxrF5X9Vfkjj1jA="; + hash = "sha256-6CBhLvD0UflLzJHAMB21wSH8MWTUNx0uPdqOUo/Eq44="; }; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - nativeBuildInputs = [ protobuf rustPlatform.bindgenHook @@ -43,7 +40,7 @@ rustPlatform.buildRustPackage rec { env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++"; useFetchCargoVendor = true; - cargoHash = "sha256-wxBbq4WtqzHbdro+tm2hU6JVwTgC2X/Cx9po+ndgECg="; + cargoHash = "sha256-4bSPPf16nUQTl6INa3mLhPIe8iiFfpPw1E5fpNvnKqs="; cargoBuildFlags = [ "-p" @@ -54,6 +51,6 @@ rustPlatform.buildRustPackage rec { description = "C ABI library which exposes Signal protocol logic"; homepage = "https://github.com/signalapp/libsignal"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ niklaskorz ]; + maintainers = with maintainers; [ alyaeanyx ]; }; } diff --git a/pkgs/by-name/li/libsolv/package.nix b/pkgs/by-name/li/libsolv/package.nix index d332ebfc0358..92f47717e36e 100644 --- a/pkgs/by-name/li/libsolv/package.nix +++ b/pkgs/by-name/li/libsolv/package.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/openSUSE/libsolv"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/li/libtiger/package.nix b/pkgs/by-name/li/libtiger/package.nix index 09211b89c89b..3a1d5b6d13fc 100644 --- a/pkgs/by-name/li/libtiger/package.nix +++ b/pkgs/by-name/li/libtiger/package.nix @@ -7,7 +7,6 @@ libkate, pango, cairo, - darwin, }: stdenv.mkDerivation rec { @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { libkate pango cairo - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.ApplicationServices; + ]; meta = { homepage = "https://code.google.com/archive/p/libtiger/"; diff --git a/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix index 9d3c64255893..3521249a6766 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix @@ -10,7 +10,6 @@ python311, libiconv, ncurses, - darwin, boost-build, }: @@ -63,7 +62,7 @@ stdenv.mkDerivation { python311 libiconv ncurses - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; preAutoreconf = '' mkdir -p build-aux diff --git a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix index b544b1c6f77e..2c7c53c46353 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix @@ -8,7 +8,6 @@ openssl, python3, ncurses, - darwin, }: let @@ -41,7 +40,7 @@ stdenv.mkDerivation { zlib python3 ncurses - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; patches = [ # provide distutils alternative for python 3.12 diff --git a/pkgs/by-name/li/libui-ng/package.nix b/pkgs/by-name/li/libui-ng/package.nix index 94977b420556..54312f6918fd 100644 --- a/pkgs/by-name/li/libui-ng/package.nix +++ b/pkgs/by-name/li/libui-ng/package.nix @@ -2,7 +2,6 @@ lib, stdenv, cmocka, - darwin, fetchFromGitHub, gtk3, meson, @@ -33,19 +32,9 @@ stdenv.mkDerivation { pkg-config ]; - buildInputs = - if stdenv.hostPlatform.isDarwin then - [ - darwin.libobjc - darwin.apple_sdk_11_0.Libsystem - darwin.apple_sdk_11_0.frameworks.Cocoa - darwin.apple_sdk_11_0.frameworks.AppKit - darwin.apple_sdk_11_0.frameworks.CoreFoundation - ] - else - [ - gtk3 - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + gtk3 + ]; mesonFlags = [ (lib.mesonBool "examples" (!stdenv.hostPlatform.isDarwin)) diff --git a/pkgs/by-name/li/liburcu/package.nix b/pkgs/by-name/li/liburcu/package.nix index c3e78a6fbb1a..ad7a5d83ce24 100644 --- a/pkgs/by-name/li/liburcu/package.nix +++ b/pkgs/by-name/li/liburcu/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "0.15.1"; + version = "0.15.2"; pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - hash = "sha256-mNZswS8sWIGHm5dvDFXRDTEUAVE74lTjvSjPOBH7UMg="; + hash = "sha256-WfNvK4vaG3Ygp+ztJjTybFSURIGKgxMCWjuwnAdmph0="; }; outputs = [ diff --git a/pkgs/by-name/li/libusbsio/package.nix b/pkgs/by-name/li/libusbsio/package.nix index 24a41781d447..d1b762b4e014 100644 --- a/pkgs/by-name/li/libusbsio/package.nix +++ b/pkgs/by-name/li/libusbsio/package.nix @@ -6,7 +6,6 @@ fixDarwinDylibNames, libusb1, systemdMinimal, - darwin, }: stdenv.mkDerivation rec { @@ -39,14 +38,7 @@ stdenv.mkDerivation rec { [ libusb1 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreFoundation - IOKit - ] - ) + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemdMinimal # libudev ]; diff --git a/pkgs/by-name/li/libvmi/package.nix b/pkgs/by-name/li/libvmi/package.nix index 8a0ed3339a74..56f5baf3c663 100644 --- a/pkgs/by-name/li/libvmi/package.nix +++ b/pkgs/by-name/li/libvmi/package.nix @@ -24,14 +24,14 @@ let pname = "libvmi"; - version = "0.14.0-unstable-2025-02-27"; + version = "0.14.0-unstable-2025-04-09"; libVersion = "0.0.15"; src = fetchFromGitHub { owner = "libvmi"; repo = "libvmi"; - rev = "f02aeb751fd27bd4ae753dcd5904a4ef3232821e"; - hash = "sha256-h5kevP8B1iKJBZMaEaxkrAIgnUy7yOCnN3G3oYf/eNo="; + rev = "872ccc6efac607b83b603fef691c3641656fed34"; + hash = "sha256-8rqcDU4y86Uq6I7LOOMhMYWLEt7TxvzHilddUoutMOw="; }; in diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix index ca097a219486..93215e51fb84 100644 --- a/pkgs/by-name/li/libyang/package.nix +++ b/pkgs/by-name/li/libyang/package.nix @@ -25,12 +25,17 @@ stdenv.mkDerivation rec { hash = "sha256-5oJV8gr2rwvSdpX5w3gmIw/LTrWtXVnl6oLr/soNTDk="; }; + outputs = [ + "out" + "dev" + ]; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ + propagatedBuildInputs = [ pcre2 ]; diff --git a/pkgs/by-name/li/libzapojit/package.nix b/pkgs/by-name/li/libzapojit/package.nix deleted file mode 100644 index ace4b1bbf65f..000000000000 --- a/pkgs/by-name/li/libzapojit/package.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - glib, - intltool, - json-glib, - librest, - libsoup_2_4, - gnome, - gnome-online-accounts, - gobject-introspection, -}: - -stdenv.mkDerivation rec { - pname = "libzapojit"; - version = "0.0.3"; - - outputs = [ - "out" - "dev" - ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; - }; - - nativeBuildInputs = [ - pkg-config - intltool - gobject-introspection - ]; - propagatedBuildInputs = [ - glib - json-glib - librest - libsoup_2_4 - gnome-online-accounts - ]; # zapojit-0.0.pc - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; - homepage = "https://gitlab.gnome.org/Archive/libzapojit"; - license = licenses.lgpl21Plus; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/li/libzim/package.nix b/pkgs/by-name/li/libzim/package.nix index 4e2981096b21..c6a208815cfd 100644 --- a/pkgs/by-name/li/libzim/package.nix +++ b/pkgs/by-name/li/libzim/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libzim"; - version = "9.2.3"; + version = "9.3.0"; src = fetchFromGitHub { owner = "openzim"; repo = "libzim"; tag = version; - hash = "sha256-z22+cDlFQtLMLFh5+7Nt9LsGFyBPi3HeZhYb0LK86Oc="; + hash = "sha256-DZiFeZ2ry3JpXDs3mvf0q7diwhkjQ2730KQkDQPbgcY="; }; patches = [ diff --git a/pkgs/by-name/li/licensure/package.nix b/pkgs/by-name/li/licensure/package.nix index a5a4ac228048..01d404151dbb 100644 --- a/pkgs/by-name/li/licensure/package.nix +++ b/pkgs/by-name/li/licensure/package.nix @@ -1,13 +1,11 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, git, gitls, - darwin, }: rustPlatform.buildRustPackage rec { pname = "licensure"; @@ -23,15 +21,11 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-b3Vb8beULbLQuBORcE5nWuHkqDmalexJick9Ct5+iUM="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - git - gitls - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + git + gitls + ]; checkFlags = [ # Checking for files in the git repo (git ls-files), diff --git a/pkgs/by-name/li/linalg/package.nix b/pkgs/by-name/li/linalg/package.nix new file mode 100644 index 000000000000..7daf050b5fe0 --- /dev/null +++ b/pkgs/by-name/li/linalg/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "lialg"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "sgorsten"; + repo = "linalg"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2I+sJca0tf/CcuoqaldfwPVRrzNriTXO60oHxsFQSnE="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 linalg.h -t $out/include + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Single-header, public domain, short vector math library for C++"; + homepage = "https://github.com/sgorsten/linalg"; + license = lib.licenses.publicDomain; + maintainers = [ lib.maintainers.eymeric ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/li/linux-pam/package.nix b/pkgs/by-name/li/linux-pam/package.nix index a1a515097307..03bbf3299520 100644 --- a/pkgs/by-name/li/linux-pam/package.nix +++ b/pkgs/by-name/li/linux-pam/package.nix @@ -4,7 +4,6 @@ buildPackages, fetchurl, flex, - cracklib, db4, gettext, audit, @@ -51,7 +50,6 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.buildPlatform.isDarwin gettext; buildInputs = [ - cracklib db4 libxcrypt ] ++ lib.optional stdenv.buildPlatform.isLinux audit; diff --git a/pkgs/by-name/li/litebrowser/package.nix b/pkgs/by-name/li/litebrowser/package.nix index 1dcaf8b4c436..94c822321427 100644 --- a/pkgs/by-name/li/litebrowser/package.nix +++ b/pkgs/by-name/li/litebrowser/package.nix @@ -7,7 +7,6 @@ gtk3, gtkmm3, curl, - poco, gumbo, # litehtml dependency }: @@ -32,7 +31,6 @@ stdenv.mkDerivation { gtk3 gtkmm3 curl - poco gumbo ]; diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix index 4cbb41fec40d..e60b13570f91 100644 --- a/pkgs/by-name/li/litmusctl/package.nix +++ b/pkgs/by-name/li/litmusctl/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "litmusctl"; - version = "1.14.0"; + version = "1.15.0"; nativeBuildInputs = [ installShellFiles @@ -22,7 +22,7 @@ buildGoModule rec { owner = "litmuschaos"; repo = "litmusctl"; rev = "${version}"; - hash = "sha256-Saj5sx5YkcKsnMrnIzPcLok+mgEZSh9p8rnfQbJhAeU="; + hash = "sha256-SNqxfoYABKV4MheyP5G9nkRca/1+ozOPEvZAUtGdxh0="; }; vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0="; diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix index 66ede7d221c3..0257a426b04f 100644 --- a/pkgs/by-name/li/live-server/package.nix +++ b/pkgs/by-name/li/live-server/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, openssl, pkg-config, }: @@ -24,15 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; meta = with lib; { description = "Local network server with live reload feature for static pages"; diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix index 5896c4336bcc..0323e2b709d0 100644 --- a/pkgs/by-name/ll/lla/package.nix +++ b/pkgs/by-name/ll/lla/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchFromGitHub, makeBinaryWrapper, + installShellFiles, versionCheckHook, nix-update-script, }: @@ -20,13 +21,22 @@ rustPlatform.buildRustPackage { hash = "sha256-/6p23JW3ZaSuDf34IWcTggR92/zUTMRerQ32bTsRujo="; }; - nativeBuildInputs = [ makeBinaryWrapper ]; + nativeBuildInputs = [ + makeBinaryWrapper + installShellFiles + ]; useFetchCargoVendor = true; cargoHash = "sha256-aX8nm/V0ug2g40QeFU9AWxjuFAnW+gYTR8RC5CV7wRQ="; cargoBuildFlags = [ "--workspace" ]; + # TODO: Upstream also provides Elvish and PowerShell completions, + # but `installShellCompletion` only has support for Bash, Zsh and Fish at the moment. + postInstall = '' + installShellCompletion completions/{_lla,lla{.bash,.fish}} + ''; + postFixup = '' wrapProgram $out/bin/lla \ --add-flags "--plugins-dir $out/lib" diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 148940f511b1..ee9c8d85f47e 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -2,7 +2,6 @@ lib, autoAddDriverRunpath, cmake, - darwin, fetchFromGitHub, nix-update-script, stdenv, @@ -50,15 +49,6 @@ let optionalString ; - darwinBuildInputs = - with darwin.apple_sdk.frameworks; - [ - Accelerate - CoreVideo - CoreGraphics - ] - ++ optionals metalSupport [ MetalKit ]; - cudaBuildInputs = with cudaPackages; [ cuda_cccl # @@ -82,13 +72,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "5060"; + version = "5141"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-hReqnwPyzKXR+Nwl4auDCCQqLLNCpM0zILqjs+TB9uk="; + hash = "sha256-qHjHsc2v4LB+GVYni97d3KVo5uJqpF7RQqG2rWXwpHY="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT @@ -126,8 +116,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ]; buildInputs = - optionals effectiveStdenv.hostPlatform.isDarwin darwinBuildInputs - ++ optionals cudaSupport cudaBuildInputs + optionals cudaSupport cudaBuildInputs ++ optionals openclSupport [ clblast ] ++ optionals rocmSupport rocmBuildInputs ++ optionals blasSupport [ blas ] diff --git a/pkgs/by-name/ll/llpp/package.nix b/pkgs/by-name/ll/llpp/package.nix index 686831fd92dc..12d0e5d54c90 100644 --- a/pkgs/by-name/ll/llpp/package.nix +++ b/pkgs/by-name/ll/llpp/package.nix @@ -20,7 +20,6 @@ xclip, inotify-tools, procps, - darwin, }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; @@ -63,10 +62,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.OpenGL - darwin.apple_sdk.frameworks.Cocoa ]; dontStrip = true; diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index c41d543c446a..ba5eb9c4d2b0 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -2,13 +2,18 @@ lib, stdenv, callPackage, - version ? "0.3.14", - rev ? "3", ... }@args: let pname = "lmstudio"; - packageVersion = "${version}-${rev}"; # Combine version and rev + + version_aarch64-darwin = "0.3.14-5"; + hash_aarch64-darwin = "sha256-8OTfjEZ27ubRFvRQ84em2Gz3mS9w3oev41Qg6MMNjNU="; + version_x86_64-linux = "0.3.14-5"; + hash_x86_64-linux = "sha256-WrO95ez81/A0U1Tt1Oi2PyUp6nvsmQMzK0VUVH1TYbg="; + + passthru.updateScript = ./update.sh; + meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; homepage = "https://lmstudio.ai/"; @@ -26,18 +31,18 @@ in if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname meta; - version = packageVersion; + version = version_aarch64-darwin; url = args.url - or "https://installers.lmstudio.ai/darwin/arm64/${version}-${rev}/LM-Studio-${version}-${rev}-arm64.dmg"; - hash = args.hash or "sha256-doAhCbWFwDWlBQ+4YfJz6p7I4NZJxIOtdLYTr3mOGds="; + or "https://installers.lmstudio.ai/darwin/arm64/${version_aarch64-darwin}/LM-Studio-${version_aarch64-darwin}-arm64.dmg"; + hash = args.hash or hash_aarch64-darwin; } else callPackage ./linux.nix { inherit pname meta; - version = packageVersion; + version = version_x86_64-linux; url = args.url - or "https://installers.lmstudio.ai/linux/x64/${version}-${rev}/LM-Studio-${version}-${rev}-x64.AppImage"; - hash = args.hash or "sha256-IIJMk0cfLQdrx0nTSbpsbqOvD+f/qrH+rGdYN4mygaw="; + or "https://installers.lmstudio.ai/linux/x64/${version_x86_64-linux}/LM-Studio-${version_x86_64-linux}-x64.AppImage"; + hash = args.hash or hash_x86_64-linux; } diff --git a/pkgs/by-name/lm/lmstudio/update.sh b/pkgs/by-name/lm/lmstudio/update.sh new file mode 100755 index 000000000000..efbaf5a7d8d2 --- /dev/null +++ b/pkgs/by-name/lm/lmstudio/update.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts + +set -euo pipefail + +packages="$(curl -s -L "https://lmstudio.ai/" | grep -oE 'https://installers.lmstudio.ai[^"\]*' | sort -u | grep -v \\.exe)" +for system in "aarch64-darwin darwin/arm64" "x86_64-linux linux/x64"; do + set -- ${system} + + arch="${1}" + url=$(echo "${packages}" | grep "${2}") + version="$(echo "${url}" | cut -d/ -f6)" + hash=$(nix hash convert --hash-algo sha256 "$(nix-prefetch-url "${url}")") + + update-source-version lmstudio "${version}" "${hash}" --system="${arch}" --version-key="version_${arch}" +done diff --git a/pkgs/by-name/lo/loadwatch/package.nix b/pkgs/by-name/lo/loadwatch/package.nix index 95990bc5190d..d3db7c30cd5b 100644 --- a/pkgs/by-name/lo/loadwatch/package.nix +++ b/pkgs/by-name/lo/loadwatch/package.nix @@ -1,28 +1,26 @@ { lib, stdenv, - fetchgit, + fetchFromSourcehut, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "loadwatch"; - version = "1.1-1-g6d2544c"; + version = "1.1-4-g868bd29"; - src = fetchgit { - url = "git://woffs.de/git/fd/loadwatch.git"; - sha256 = "1bhw5ywvhyb6snidsnllfpdi1migy73wg2gchhsfbcpm8aaz9c9b"; - rev = "6d2544c0caaa8a64bbafc3f851e06b8056c30e6e"; + src = fetchFromSourcehut { + owner = "~woffs"; + repo = "loadwatch"; + hash = "sha256-/4kfGdpYJWQyb7mRaVUpyQQC5VP96bDsBDfM3XhcJXw="; + rev = finalAttrs.version; }; - installPhase = '' - mkdir -p $out/bin - install loadwatch lw-ctl $out/bin - ''; + makeFlags = [ "bindir=$(out)/bin" ]; - meta = with lib; { + meta = { description = "Run a program using only idle cycles"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ woffs ]; - platforms = platforms.all; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ woffs ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/lo/loco/package.nix b/pkgs/by-name/lo/loco/package.nix index 26d3a3a6ff9e..158145b80a3b 100644 --- a/pkgs/by-name/lo/loco/package.nix +++ b/pkgs/by-name/lo/loco/package.nix @@ -2,22 +2,27 @@ lib, rustPlatform, fetchCrate, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "loco"; - version = "0.14.0"; + version = "0.15.0"; src = fetchCrate { inherit pname version; - hash = "sha256-d13BuDPXZJ2cOgaNhX95Us+T4SoJZJAyCugSySHh7U8="; + hash = "sha256-sTPFDdiYmw+ODAcuBh4XXpSXVZbbYxfjr+WiTGit18E="; }; useFetchCargoVendor = true; - cargoHash = "sha256-g7zfPO0/8a9PPdd8CPDWRUTWdQ29tFZ3uOSux8hcExo="; + cargoHash = "sha256-EsNFdk7bLRzyfncDRxqS0CQGdtPFdRRSlpTTxbQ8csI="; #Skip trycmd integration tests checkFlags = [ "--skip=cli_tests" ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Loco CLI is a powerful command-line tool designed to streamline the process of generating Loco websites"; homepage = "https://loco.rs"; diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index d43156a5b75a..dccb3963563e 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -209,8 +209,9 @@ stdenv.mkDerivation (finalAttrs: { npm rebuild --verbose # remove most references to electron.headers - # TODO: track down the remaining references - find node_modules -type f \( -name "*.target.mk" -o -name "config.gypi" -o -name "Makefile" \) -delete + shopt -s globstar + rm -r node_modules/**/{*.target.mk,config.gypi,Makefile,Release/.deps} + shopt -u globstar popd diff --git a/pkgs/by-name/lo/lokalise2-cli/package.nix b/pkgs/by-name/lo/lokalise2-cli/package.nix index 32cfb4202228..20bb285a13ad 100644 --- a/pkgs/by-name/lo/lokalise2-cli/package.nix +++ b/pkgs/by-name/lo/lokalise2-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "lokalise2-cli"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${version}"; - sha256 = "sha256-R8vzHuWkNznq/eeXUVHm9SJJmRV2B2WXKQFEHil+HiY="; + sha256 = "sha256-9d5rlVyGPLNzlKzGq/XJleiKvLtkE0AttIiH6NYUwFo="; }; vendorHash = "sha256-thD8NtG9uVI4KwNQiNsVCUdyUcgAmnr+szsUQ2Ika1c="; diff --git a/pkgs/by-name/lo/lon/package.nix b/pkgs/by-name/lo/lon/package.nix index 9fa33e864e1f..9e99925cb537 100644 --- a/pkgs/by-name/lo/lon/package.nix +++ b/pkgs/by-name/lo/lon/package.nix @@ -6,24 +6,28 @@ rustPlatform.buildRustPackage rec { pname = "lon"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "nikstur"; repo = "lon"; tag = version; - hash = "sha256-VGvK0ahBl440NMs03WqmP7T4a1DP13yfX47YI84rlGU="; + hash = "sha256-LtZhEfdO/kTbeDG/lhiH+9QPw3kgov72Xn1NelgNsE0="; }; sourceRoot = "source/rust/lon"; useFetchCargoVendor = true; - cargoHash = "sha256-YzQ6A1dH2D56/3inAmsE6G5rCnpWhDawxk6+FMWfhkc="; + cargoHash = "sha256-cr1+WBlq/uuOVDIbgN5UhsQ0ISLDYOxyGRnQ6ntEH5w="; meta = { description = "Lock & update Nix dependencies"; homepage = "https://github.com/nikstur/lon"; - maintainers = with lib.maintainers; [ ma27 ]; + changelog = "https://github.com/nikstur/lon/blob/${version}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ + ma27 + nikstur + ]; license = lib.licenses.mit; mainProgram = "lon"; }; diff --git a/pkgs/by-name/lo/loudmouth/package.nix b/pkgs/by-name/lo/loudmouth/package.nix index 600082edef21..6ce497ea5a59 100644 --- a/pkgs/by-name/lo/loudmouth/package.nix +++ b/pkgs/by-name/lo/loudmouth/package.nix @@ -7,7 +7,6 @@ glib, pkg-config, zlib, - darwin, }: stdenv.mkDerivation rec { @@ -30,14 +29,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - lib.optionals - (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") - [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Foundation - ]; - meta = with lib; { description = "Lightweight C library for the Jabber protocol"; platforms = platforms.all; diff --git a/pkgs/by-name/lo/lowfi/package.nix b/pkgs/by-name/lo/lowfi/package.nix index 8ff50bc7d6b3..c5f21c02f946 100644 --- a/pkgs/by-name/lo/lowfi/package.nix +++ b/pkgs/by-name/lo/lowfi/package.nix @@ -5,7 +5,6 @@ pkg-config, openssl, stdenv, - darwin, alsa-lib, }: diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix index 1bf3282df317..12c94f8cce5f 100644 --- a/pkgs/by-name/lr/lrcget/package.nix +++ b/pkgs/by-name/lr/lrcget/package.nix @@ -13,7 +13,6 @@ copyDesktopItems, makeDesktopItem, alsa-lib, - darwin, nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -75,10 +74,6 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ webkitgtk_4_1 alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreAudio - darwin.apple_sdk.frameworks.WebKit ]; # Disable checkPhase, since the project doesn't contain tests diff --git a/pkgs/by-name/ls/lsp-ai/package.nix b/pkgs/by-name/ls/lsp-ai/package.nix index 5324d1e13240..9c19652d5323 100644 --- a/pkgs/by-name/ls/lsp-ai/package.nix +++ b/pkgs/by-name/ls/lsp-ai/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, pkg-config, cmake, openssl, @@ -58,15 +56,10 @@ rustPlatform.buildRustPackage rec { perl ]; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ + openssl + zlib + ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; diff --git a/pkgs/by-name/lt/ltris/package.nix b/pkgs/by-name/lt/ltris/package.nix index 8e0f4ba3cd5f..3c31f4ecc819 100644 --- a/pkgs/by-name/lt/ltris/package.nix +++ b/pkgs/by-name/lt/ltris/package.nix @@ -1,24 +1,28 @@ { lib, - SDL, - SDL_mixer, + sdl2-compat, + SDL2_mixer, + SDL2_image, + SDL2_ttf, directoryListingUpdater, fetchurl, stdenv, }: stdenv.mkDerivation (finalAttrs: { - pname = "lgames-ltris"; - version = "1.2.8"; + pname = "ltris"; + version = "2.0.3"; src = fetchurl { - url = "mirror://sourceforge/lgames/ltris-${finalAttrs.version}.tar.gz"; - hash = "sha256-2e5haaU2pqkBk82qiF/3HQgSBVPHP09UwW+TQqpGUqA="; + url = "mirror://sourceforge/lgames/ltris2-${finalAttrs.version}.tar.gz"; + hash = "sha256-+w8WTASYj/AWcBg9W3dmZ0cyCmlZNhDZ0l/WwhRfJRk="; }; buildInputs = [ - SDL - SDL_mixer + sdl2-compat + SDL2_mixer + SDL2_image + SDL2_ttf ]; hardeningDisable = [ "format" ]; @@ -32,10 +36,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://lgames.sourceforge.io/LTris/"; description = "Tetris clone from the LGames series"; - license = with lib.licenses; [ gpl2Plus ]; - mainProgram = "ltris"; - maintainers = with lib.maintainers; [ ]; - inherit (SDL.meta) platforms; + license = with lib.licenses; [ gpl3Plus ]; + mainProgram = "ltris2"; + maintainers = with lib.maintainers; [ marcin-serwin ]; + platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/development/tools/misc/lttng-ust/generic.nix b/pkgs/by-name/lt/lttng-ust/package.nix similarity index 92% rename from pkgs/development/tools/misc/lttng-ust/generic.nix rename to pkgs/by-name/lt/lttng-ust/package.nix index 6125bfb7dbbe..4b5cb17a9c7f 100644 --- a/pkgs/development/tools/misc/lttng-ust/generic.nix +++ b/pkgs/by-name/lt/lttng-ust/package.nix @@ -1,5 +1,3 @@ -{ version, sha256 }: - { lib, stdenv, @@ -23,11 +21,11 @@ stdenv.mkDerivation rec { pname = "lttng-ust"; - inherit version; + version = "2.13.8"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2"; - inherit sha256; + sha256 = "sha256-1O+Y2rmjetT1JMyv39UK9PJmA5tSjdWvq8545JAk2Tc="; }; outputs = [ diff --git a/pkgs/by-name/lt/lttng-ust_2_12/package.nix b/pkgs/by-name/lt/lttng-ust_2_12/package.nix new file mode 100644 index 000000000000..9a2b2579911b --- /dev/null +++ b/pkgs/by-name/lt/lttng-ust_2_12/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + liburcu, + numactl, + python3, +}: + +# NOTE: +# ./configure ... +# [...] +# LTTng-UST will be built with the following options: +# +# Java support (JNI): Disabled +# sdt.h integration: Disabled +# [...] +# +# Debian builds with std.h (systemtap). + +stdenv.mkDerivation rec { + pname = "lttng-ust"; + version = "2.12.2"; + + src = fetchurl { + url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2"; + sha256 = "sha256-vNDwZLbKiMcthOdg6sNHKuXIKEEcY0Q1kivun841n8c="; + }; + + outputs = [ + "bin" + "out" + "dev" + "devdoc" + ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + numactl + python3 + ]; + + preConfigure = '' + patchShebangs . + ''; + + hardeningDisable = [ "trivialautovarinit" ]; + + configureFlags = [ "--disable-examples" ]; + + propagatedBuildInputs = [ liburcu ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "LTTng Userspace Tracer libraries"; + mainProgram = "lttng-gen-tp"; + homepage = "https://lttng.org/"; + license = with licenses; [ + lgpl21Only + gpl2Only + mit + ]; + platforms = lib.intersectLists platforms.linux liburcu.meta.platforms; + maintainers = [ maintainers.bjornfor ]; + }; + +} diff --git a/pkgs/by-name/lu/luakit/package.nix b/pkgs/by-name/lu/luakit/package.nix index 7222f712b1dd..49b42cfd826a 100644 --- a/pkgs/by-name/lu/luakit/package.nix +++ b/pkgs/by-name/lu/luakit/package.nix @@ -10,22 +10,21 @@ pkg-config, sqlite, stdenv, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, }: - let inherit (luajitPackages) luafilesystem; in stdenv.mkDerivation (finalAttrs: { pname = "luakit"; - version = "2.3.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "luakit"; repo = "luakit"; rev = finalAttrs.version; - hash = "sha256-DtoixcLq+ddbacTAo+Qq6q4k1i6thirACw1zqUeOxXo="; + hash = "sha256-6OPcGwWQyP+xWVKGjwEfE8Xnf1gcwwbO+FbvA1x0c8M="; }; nativeBuildInputs = [ @@ -41,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 luafilesystem sqlite - webkitgtk_4_0 + webkitgtk_4_1 ] ++ (with gst_all_1; [ gst-libav @@ -65,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "DEVELOPMENT_PATHS=0" "USE_LUAJIT=1" + "LUA_BIN_NAME=luajit" "INSTALLDIR=${placeholder "out"}" "PREFIX=${placeholder "out"}" "USE_GTK3=1" @@ -95,7 +95,9 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl3Only; mainProgram = "luakit"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ + griffi-gh + ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix index ee275ba8ad1b..ba6f24bbf5bf 100644 --- a/pkgs/by-name/lu/luanti/package.nix +++ b/pkgs/by-name/lu/luanti/package.nix @@ -31,7 +31,6 @@ libiconv, ninja, prometheus-cpp, - darwin, buildClient ? true, buildServer ? true, SDL2, @@ -109,11 +108,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.OpenGL - darwin.apple_sdk.frameworks.OpenAL - darwin.apple_sdk.frameworks.Carbon - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Kernel ] ++ lib.optionals buildClient [ libpng diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index 62c7ca64567d..0543c2efcbfa 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.667"; + version = "0.670"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; rev = version; - hash = "sha256-AEPUdqQ+uIWxSTOwwbZ8tWSz3VKKHa1D08o6oeEREkg="; + hash = "sha256-3iRQJ3v8MyW9LZiaEAkRFubFBdPxg7EEzXYqzbKspFY="; }; nativeBuildInputs = [ cmake ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/luau-lang/luau/releases/tag/${version}"; license = licenses.mit; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ prince213 ]; mainProgram = "luau"; }; } diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix index eeefc8acc1f7..fa5a42cbe05f 100644 --- a/pkgs/by-name/lu/ludusavi/package.nix +++ b/pkgs/by-name/lu/ludusavi/package.nix @@ -32,17 +32,17 @@ rustPlatform.buildRustPackage rec { pname = "ludusavi"; - version = "0.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "mtkennerly"; repo = "ludusavi"; rev = "v${version}"; - hash = "sha256-+6/hpOFyAdYxh+HkOlc85utqIY4s4gyZoVQxin9hbkU="; + hash = "sha256-IApPudo8oD6YkYJkGpowqpaqrsl2/Q2VFyYfYQI3mN0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-9ki6/KDoa1yLg7mZS7tB7ZjjiZIWOne4Ol7fIK4YPSo="; + cargoHash = "sha256-ixxUz+XJPzPu51sxHpXs92Tis2gj9SElqYtNiN+n2EY="; dontWrapGApps = true; diff --git a/pkgs/by-name/lu/lunacy/package.nix b/pkgs/by-name/lu/lunacy/package.nix index 45ec1adafefe..bb9af37c2fff 100644 --- a/pkgs/by-name/lu/lunacy/package.nix +++ b/pkgs/by-name/lu/lunacy/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lunacy"; - version = "11.2.1"; + version = "11.3"; src = fetchurl { url = "https://lcdn.icons8.com/setup/Lunacy_${finalAttrs.version}.deb"; - hash = "sha256-h2Fs14dcVG7nM0ubMc75+AI/iW/P4bzdd+lfFRrO4TI="; + hash = "sha256-/j+OibzgoyB8MxpM2eSSTkMQhOImbkLqwUOk1lr55Rg="; }; buildInputs = [ diff --git a/pkgs/by-name/lu/lunatic/package.nix b/pkgs/by-name/lu/lunatic/package.nix index ac508ee88afc..126041146bd0 100644 --- a/pkgs/by-name/lu/lunatic/package.nix +++ b/pkgs/by-name/lu/lunatic/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; checkFlags = [ # requires simd support which is not always available on hydra diff --git a/pkgs/by-name/lu/lutgen/package.nix b/pkgs/by-name/lu/lutgen/package.nix index 4d096143fbfc..011a65ce898f 100644 --- a/pkgs/by-name/lu/lutgen/package.nix +++ b/pkgs/by-name/lu/lutgen/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "lutgen"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "ozwaldorf"; repo = "lutgen-rs"; rev = "v${version}"; - hash = "sha256-jmMVeDDVb/TuxulDYj+8y4Kl42EJTAWb3tAsanfWduE="; + hash = "sha256-VE4R0rdQbZ7cyCPRtWWARUAnlR/KWGFUoJSJ4lySwzY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-BEh8Wl0X1wv53w/Zu0PHwh8oGtCvIJe60aVqLbiH1Hs="; + cargoHash = "sha256-H913/EjCh14AcCIj/Em6neP5F6i88rSVbPMmnS3po/I="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/display-managers/ly/deps.nix b/pkgs/by-name/ly/ly/deps.nix similarity index 100% rename from pkgs/applications/display-managers/ly/deps.nix rename to pkgs/by-name/ly/ly/deps.nix diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/by-name/ly/ly/package.nix similarity index 100% rename from pkgs/applications/display-managers/ly/default.nix rename to pkgs/by-name/ly/ly/package.nix diff --git a/pkgs/by-name/ly/lyto/package.nix b/pkgs/by-name/ly/lyto/package.nix new file mode 100644 index 000000000000..387032f53e4c --- /dev/null +++ b/pkgs/by-name/ly/lyto/package.nix @@ -0,0 +1,42 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "lyto"; + version = "0.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "eeriemyxi"; + repo = "lyto"; + tag = "v${version}"; + hash = "sha256-XCAM7vo4EcbIxFddggeqABru4epE2jW2YpF++I0mpdU="; + }; + + build-system = [ + python3.pkgs.hatchling + ]; + + dependencies = with python3.pkgs; [ + qrcode + rich + sixel + zeroconf + ]; + + pythonImportsCheck = [ + "lyto" + ]; + + meta = { + description = "Automatic wireless ADB connection using QR codes"; + homepage = "https://github.com/eeriemyxi/lyto"; + changelog = "https://github.com/eeriemyxi/lyto/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ atemu ]; + mainProgram = "lyto"; + }; +} diff --git a/pkgs/by-name/m1/m1ddc/package.nix b/pkgs/by-name/m1/m1ddc/package.nix index cd69a7072e3b..51a2113fa17a 100644 --- a/pkgs/by-name/m1/m1ddc/package.nix +++ b/pkgs/by-name/m1/m1ddc/package.nix @@ -1,6 +1,5 @@ { stdenv, - darwin, fetchFromGitHub, lib, }: @@ -21,11 +20,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail kIOMainPortDefault kIOMasterPortDefault ''; - buildInputs = with darwin.apple_sdk_11_0.frameworks; [ - CoreDisplay - Foundation - ]; - installPhase = '' runHook preInstall mkdir -p $out/bin diff --git a/pkgs/by-name/ma/maa-assistant-arknights/package.nix b/pkgs/by-name/ma/maa-assistant-arknights/package.nix index 32d43f3d05b1..947626dd46a9 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/package.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/package.nix @@ -3,7 +3,6 @@ config, callPackage, stdenv, - overrideSDK, fetchFromGitHub, asio, cmake, @@ -19,72 +18,70 @@ let fastdeploy = callPackage ./fastdeploy-ppocr.nix { }; sources = lib.importJSON ./pin.json; in -# https://github.com/NixOS/nixpkgs/issues/314160 -(if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv).mkDerivation - (finalAttr: { - pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta"; - version = if isBeta then sources.beta.version else sources.stable.version; +stdenv.mkDerivation (finalAttr: { + pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta"; + version = if isBeta then sources.beta.version else sources.stable.version; - src = fetchFromGitHub { - owner = "MaaAssistantArknights"; - repo = "MaaAssistantArknights"; - rev = "v${finalAttr.version}"; - hash = if isBeta then sources.beta.hash else sources.stable.hash; - }; + src = fetchFromGitHub { + owner = "MaaAssistantArknights"; + repo = "MaaAssistantArknights"; + rev = "v${finalAttr.version}"; + hash = if isBeta then sources.beta.hash else sources.stable.hash; + }; - nativeBuildInputs = [ - asio - cmake - fastdeploy.cmake - ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + nativeBuildInputs = [ + asio + cmake + fastdeploy.cmake + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; - buildInputs = + buildInputs = + [ + fastdeploy + libcpr + onnxruntime + opencv + ] + ++ lib.optionals cudaSupport ( + with cudaPackages; [ - fastdeploy - libcpr - onnxruntime - opencv + cuda_cccl # cub/cub.cuh + libcublas # cublas_v2.h + libcurand # curand.h + libcusparse # cusparse.h + libcufft # cufft.h + cudnn # cudnn.h + cuda_cudart ] - ++ lib.optionals cudaSupport ( - with cudaPackages; - [ - cuda_cccl # cub/cub.cuh - libcublas # cublas_v2.h - libcurand # curand.h - libcusparse # cusparse.h - libcufft # cufft.h - cudnn # cudnn.h - cuda_cudart - ] - ); + ); - cmakeBuildType = "None"; + cmakeBuildType = "None"; - cmakeFlags = [ - (lib.cmakeBool "BUILD_SHARED_LIBS" true) - (lib.cmakeBool "INSTALL_FLATTEN" false) - (lib.cmakeBool "INSTALL_PYTHON" true) - (lib.cmakeBool "INSTALL_RESOURCE" true) - (lib.cmakeBool "USE_MAADEPS" false) - (lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}") - ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + (lib.cmakeBool "INSTALL_FLATTEN" false) + (lib.cmakeBool "INSTALL_PYTHON" true) + (lib.cmakeBool "INSTALL_RESOURCE" true) + (lib.cmakeBool "USE_MAADEPS" false) + (lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}") + ]; - passthru.updateScript = ./update.sh; + passthru.updateScript = ./update.sh; - postPatch = '' - cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/ - ''; + postPatch = '' + cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/ + ''; - postInstall = '' - mkdir -p $out/share/${finalAttr.pname} - mv $out/{Python,resource} $out/share/${finalAttr.pname} - ''; + postInstall = '' + mkdir -p $out/share/${finalAttr.pname} + mv $out/{Python,resource} $out/share/${finalAttr.pname} + ''; - meta = with lib; { - description = "Arknights assistant"; - homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ Cryolitia ]; - platforms = platforms.linux ++ platforms.darwin; - }; - }) + meta = with lib; { + description = "Arknights assistant"; + homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ Cryolitia ]; + platforms = platforms.linux ++ platforms.darwin; + }; +}) diff --git a/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/pkgs/by-name/ma/maa-assistant-arknights/pin.json index 37f6fddacbd8..ea4a9001efe2 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/pin.json +++ b/pkgs/by-name/ma/maa-assistant-arknights/pin.json @@ -1,10 +1,10 @@ { "stable": { - "version": "5.14.1", - "hash": "sha256-kKupLW0T6XUpmmjlQ4rTBn/bchzkOzvM5qg6PmLSAPk=" + "version": "5.15.1", + "hash": "sha256-nN5bOoLtj5zL5dXZkA/P3sDxZwu/LKfXnMnCxtKJbC0=" }, "beta": { - "version": "5.14.1", - "hash": "sha256-kKupLW0T6XUpmmjlQ4rTBn/bchzkOzvM5qg6PmLSAPk=" + "version": "5.15.1", + "hash": "sha256-nN5bOoLtj5zL5dXZkA/P3sDxZwu/LKfXnMnCxtKJbC0=" } } diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index bf74f70ffd5a..f8e2a2c382a4 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -7,7 +7,6 @@ makeWrapper, pkg-config, openssl, - darwin, maa-assistant-arknights, android-tools, git, @@ -30,15 +29,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; # https://github.com/MaaAssistantArknights/maa-cli/pull/126 buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/ma/macchina/package.nix b/pkgs/by-name/ma/macchina/package.nix index bf3e0b657d72..03d34ca4257f 100644 --- a/pkgs/by-name/ma/macchina/package.nix +++ b/pkgs/by-name/ma/macchina/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,11 +23,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.DisplayServices - ]; - postInstall = '' installManPage doc/macchina.{1,7} ''; diff --git a/pkgs/by-name/ma/macos-defaults/package.nix b/pkgs/by-name/ma/macos-defaults/package.nix new file mode 100644 index 000000000000..00f13bfcbb21 --- /dev/null +++ b/pkgs/by-name/ma/macos-defaults/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "macos-defaults"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "dsully"; + repo = "macos-defaults"; + tag = finalAttrs.version; + hash = "sha256-dSZjMuw7ott0dgiYo0rqekEvScmrX6iG7xHaPAgo1/E="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-xSg6WAkFPS8B1G4WqMW77egCMmOEo3rK2EKcrDYaBjA="; + + checkFlags = [ + # accesses home dir + "--skip=defaults::tests::plist_path_tests" + # accesses system_profiler + "--skip=defaults::tests::test_get_hardware_uuid" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool for managing macOS defaults declaratively via YAML files"; + homepage = "https://github.com/dsully/macos-defaults"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ josh ]; + mainProgram = "macos-defaults"; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/ma/macos-instantview/package.nix b/pkgs/by-name/ma/macos-instantview/package.nix new file mode 100644 index 000000000000..94a8178cb23c --- /dev/null +++ b/pkgs/by-name/ma/macos-instantview/package.nix @@ -0,0 +1,44 @@ +{ + stdenvNoCC, + fetchurl, + lib, + _7zz, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "instantview"; + version = "3.22R0002"; + + src = fetchurl { + url = "https://www.siliconmotion.com/downloads/macOS_InstantView_V${finalAttrs.version}.dmg"; + hash = "sha256-PdgX9zCrVYtNbuOCYKVo9cegCG/VY7QXetivVsUltbg="; + }; + + nativeBuildInputs = [ _7zz ]; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p "$out/Applications" + + # Extract the DMG using 7zip + 7zz x "$src" -oextracted -y + + # Move the extracted contents to $out + cp -r extracted/* "$out/Applications/" + + runHook postInstall + ''; + + meta = { + platforms = lib.platforms.darwin; + description = "USB Docking Station plugin-and-display support with SM76x driver"; + homepage = "https://www.siliconmotion.com/events/instantview/"; + license = lib.licenses.unfree; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + maintainers = with lib.maintainers; [ aspauldingcode ]; + }; +}) diff --git a/pkgs/by-name/ma/maeparser/package.nix b/pkgs/by-name/ma/maeparser/package.nix index 96d696917834..715baa4b184f 100644 --- a/pkgs/by-name/ma/maeparser/package.nix +++ b/pkgs/by-name/ma/maeparser/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "maeparser"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "schrodinger"; repo = "maeparser"; rev = "v${version}"; - sha256 = "sha256-+eCTOU0rqFQC87wcxgINGLsULfbIr/wKxQTkRR59JVc="; + sha256 = "sha256-LTE1YGw6DiWnpUGB9x3vFVArcYd8zO49b4tqpqK30eA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index 21d545518bfb..ef663c369c3d 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "mago"; - version = "0.22.2"; + version = "0.23.0"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = version; - hash = "sha256-78lnNbUKjQYS2BSRGiGmFfnu85Mz+xAwaDG5pVCBqkQ="; + hash = "sha256-Kdktcq3czn6YdGKoTB7AjCtfDkNTHhee/kVhMzxsuD8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-lwL+5HuT6xiiittGlRDaFWfS9qum4xHginHT/TUMcco="; + cargoHash = "sha256-V7x0n+JcXiSGg8sJBKnsB5/KnfJSadYH0i/dNouhoHc="; env = { # Get openssl-sys to use pkg-config diff --git a/pkgs/by-name/ma/mailhog/0001-Add-go.mod-go.sum.patch b/pkgs/by-name/ma/mailhog/0001-Add-go.mod-go.sum.patch index 9e38d103fbfd..c92fd5067b55 100644 --- a/pkgs/by-name/ma/mailhog/0001-Add-go.mod-go.sum.patch +++ b/pkgs/by-name/ma/mailhog/0001-Add-go.mod-go.sum.patch @@ -1,24 +1,24 @@ -From ba00547a25bfea641d0c8a5dba42a6ace990767b Mon Sep 17 00:00:00 2001 +From 0ffd4dcbc7df1510213ec8f2c20b94fb016d390e Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> -Date: Mon, 4 Nov 2024 11:04:05 +0800 -Subject: [PATCH] Add go.mod & go.sum +Date: Thu, 17 Apr 2025 20:52:12 +0800 +Subject: [PATCH] Update go.mod & go.sum --- - go.mod | 36 ++++++++++++++++++++++++++++ - go.sum | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 112 insertions(+) + go.mod | 37 +++++++++++++++++++++++++++ + go.sum | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 117 insertions(+) create mode 100644 go.mod create mode 100644 go.sum diff --git a/go.mod b/go.mod new file mode 100644 -index 0000000..b09f764 +index 0000000..594f99f --- /dev/null +++ b/go.mod -@@ -0,0 +1,36 @@ +@@ -0,0 +1,37 @@ +module github.com/mailhog/MailHog + -+go 1.23.2 ++go 1.24.1 + +require ( + github.com/gorilla/pat v1.0.2 @@ -27,8 +27,8 @@ index 0000000..b09f764 + github.com/mailhog/MailHog-Server v1.0.1 + github.com/mailhog/MailHog-UI v1.0.1 + github.com/mailhog/http v1.0.1 -+ github.com/mailhog/mhsendmail v0.2.0 -+ golang.org/x/crypto v0.28.0 ++ github.com/mailhog/mhsendmail v0.2.1-0.20170416184902-9e70164f299c ++ golang.org/x/crypto v0.37.0 +) + +require ( @@ -45,19 +45,20 @@ index 0000000..b09f764 + github.com/ogier/pflag v0.0.1 // indirect + github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect + github.com/smartystreets/goconvey v1.8.1 // indirect -+ github.com/stretchr/testify v1.9.0 // indirect ++ github.com/spf13/pflag v1.0.6 // indirect ++ github.com/stretchr/testify v1.10.0 // indirect + github.com/t-k/fluent-logger-golang v1.0.0 // indirect -+ github.com/tinylib/msgp v1.2.4 // indirect ++ github.com/tinylib/msgp v1.2.5 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect + gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 -index 0000000..9089971 +index 0000000..87a8922 --- /dev/null +++ b/go.sum -@@ -0,0 +1,76 @@ +@@ -0,0 +1,80 @@ +github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= +github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -100,6 +101,8 @@ index 0000000..9089971 +github.com/mailhog/http v1.0.1/go.mod h1:91oqUCI9ZoSDY2cTj4pWDJVBHCK1U762V2a4if4KlOw= +github.com/mailhog/mhsendmail v0.2.0 h1:C5HUC4obHfXIkttLfGBUopYbsJmh+bnExGWHBpWQ8IA= +github.com/mailhog/mhsendmail v0.2.0/go.mod h1:B0778+OoPEc5aEFqatEnSO4ZWl9FCTxvaY+c7OOQadM= ++github.com/mailhog/mhsendmail v0.2.1-0.20170416184902-9e70164f299c h1:Tci7WxOyjr3Vs+oCoMT4F4LMNsaxh4eJzq9CKivNRuo= ++github.com/mailhog/mhsendmail v0.2.1-0.20170416184902-9e70164f299c/go.mod h1:B0778+OoPEc5aEFqatEnSO4ZWl9FCTxvaY+c7OOQadM= +github.com/mailhog/smtp v1.0.1 h1:igL3N/L+pWuGCqUaje21HX3VIVnqHoVlqWO0t+wJEYE= +github.com/mailhog/smtp v1.0.1/go.mod h1:GMrAdv1hXro38xj5dsWPAk5ZiXJHFx9t7W9Yqsk0XUM= +github.com/mailhog/storage v1.0.1 h1:uut2nlG5hIxbsl6f8DGznPAHwQLf3/7Na2t4gmrIais= @@ -117,14 +120,16 @@ index 0000000..9089971 +github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec= +github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY= +github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60= -+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= ++github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= ++github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= ++github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= ++github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/t-k/fluent-logger-golang v1.0.0 h1:4IQzY+/l66Zkkhk9eB3LwF9vPkgKHJ1rpYdrRiap0EI= +github.com/t-k/fluent-logger-golang v1.0.0/go.mod h1:6vC3Vzp9Kva0l5J9+YDY5/ROePwkAqwLK+KneCjSm4w= -+github.com/tinylib/msgp v1.2.4 h1:yLFeUGostXXSGW5vxfT5dXG/qzkn4schv2I7at5+hVU= -+github.com/tinylib/msgp v1.2.4/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0= -+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= -+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= ++github.com/tinylib/msgp v1.2.5 h1:WeQg1whrXRFiZusidTQqzETkRpGjFjcIhW6uqWH09po= ++github.com/tinylib/msgp v1.2.5/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0= ++golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE= ++golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -135,5 +140,5 @@ index 0000000..9089971 +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -- -2.46.1 +2.48.1 diff --git a/pkgs/by-name/ma/mailhog/package.nix b/pkgs/by-name/ma/mailhog/package.nix index 8d73256cf5ae..26bfa337c934 100644 --- a/pkgs/by-name/ma/mailhog/package.nix +++ b/pkgs/by-name/ma/mailhog/package.nix @@ -17,11 +17,11 @@ buildGoModule rec { }; patches = [ - # Generate by go mod init github.com/mailhog/MailHog && go mod tidy + # Generate by go mod init github.com/mailhog/MailHog && go mod tidy && go get github.com/mailhog/mhsendmail@9e70164f299c9e06af61402e636f5bbdf03e7dbb ./0001-Add-go.mod-go.sum.patch ]; - vendorHash = "sha256-yYMgNpthBwmDeD4pgnVj88OJWiPNWuwzxDzC6eejabU="; + vendorHash = "sha256-YfqC8MEdiLcucOaXOsLI9H4NDQ/4T0newb6q7v0uDbw="; deleteVendor = true; diff --git a/pkgs/by-name/ma/man-db/package.nix b/pkgs/by-name/ma/man-db/package.nix index d8d645113287..7481da85d1e9 100644 --- a/pkgs/by-name/ma/man-db/package.nix +++ b/pkgs/by-name/ma/man-db/package.nix @@ -1,6 +1,6 @@ { buildPackages, - db, + gdbm, fetchurl, groff, gzip, @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libpipeline - db + gdbm groff libiconv' ]; # (Yes, 'groff' is both native and build input) diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix index 6208970a8abd..9e7fe1639c21 100644 --- a/pkgs/by-name/ma/mangayomi/package.nix +++ b/pkgs/by-name/ma/mangayomi/package.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - flutter327, + flutter329, webkitgtk_4_1, mpv, rustPlatform, @@ -13,13 +13,13 @@ let pname = "mangayomi"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "kodjodevf"; repo = "mangayomi"; tag = "v${version}"; - hash = "sha256-xF3qvmEGctYXE7HWka89G4W6ytMTVGw75o26h/Ql0Aw="; + hash = "sha256-kvwssyVjce9VipANRED5k3a2pdJRAhio6GtM7+5nd38="; }; metaCommon = { @@ -38,14 +38,14 @@ let useFetchCargoVendor = true; - cargoHash = "sha256-WkWNgjTA50cOztuF9ZN6v8l38kldarqUOMXNFJDI0Ds="; + cargoHash = "sha256-vGu5e5M6CFpaLodEpt8v8DGhu2S5h/E4vvqSNOKkWns="; passthru.libraryPath = "lib/librust_lib_mangayomi.so"; meta = metaCommon; }; in -flutter327.buildFlutterApplication { +flutter329.buildFlutterApplication { inherit pname version src; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -74,18 +74,11 @@ flutter327.buildFlutterApplication { }; }; - gitHashes = - let - media_kit-hash = "sha256-bRwDrK6YdQGuXnxyIaNtvRoubl3i42ksaDsggAwgB80="; - in - { - desktop_webview_window = "sha256-wRxQPlJZZe4t2C6+G5dMx3+w8scxWENLwII08dlZ4IA="; - flutter_qjs = "sha256-m+Z0bCswylfd1E2Y6X6bdPivkSlXUxO4J0Icbco+/0A="; - media_kit_libs_windows_video = media_kit-hash; - media_kit_video = media_kit-hash; - media_kit = media_kit-hash; - flutter_web_auth_2 = "sha256-3aci73SP8eXg6++IQTQoyS+erUUuSiuXymvR32sxHFw="; - }; + gitHashes = { + desktop_webview_window = "sha256-wRxQPlJZZe4t2C6+G5dMx3+w8scxWENLwII08dlZ4IA="; + flutter_qjs = "sha256-m+Z0bCswylfd1E2Y6X6bdPivkSlXUxO4J0Icbco+/0A="; + flutter_web_auth_2 = "sha256-3aci73SP8eXg6++IQTQoyS+erUUuSiuXymvR32sxHFw="; + }; nativeBuildInputs = [ copyDesktopItems ]; diff --git a/pkgs/by-name/ma/mangayomi/pubspec.lock.json b/pkgs/by-name/ma/mangayomi/pubspec.lock.json index ae97fa265276..d508932aec8b 100644 --- a/pkgs/by-name/ma/mangayomi/pubspec.lock.json +++ b/pkgs/by-name/ma/mangayomi/pubspec.lock.json @@ -27,7 +27,7 @@ "version": "6.11.0" }, "analyzer_plugin": { - "dependency": "transitive", + "dependency": "direct overridden", "description": { "name": "analyzer_plugin", "sha256": "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161", @@ -90,31 +90,31 @@ "dependency": "direct main", "description": { "name": "archive", - "sha256": "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a", + "sha256": "7dcbd0f87fe5f61cb28da39a1a8b70dbc106e2fe0516f7836eb7bb2948481a12", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.0.5" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.0" + "version": "2.7.0" }, "asn1lib": { "dependency": "transitive", "description": { "name": "asn1lib", - "sha256": "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5", + "sha256": "e02d018628c870ef2d7f03e33f9ad179d89ff6ec52ca6c56bcb80bcef979867f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.8" + "version": "1.6.2" }, "async": { "dependency": "transitive", @@ -130,11 +130,11 @@ "dependency": "transitive", "description": { "name": "audio_session", - "sha256": "b2a26ba8b7efa1790d6460e82971fde3e398cfbe2295df9dea22f3499d2c12a7", + "sha256": "2b7fff16a552486d078bfc09a8cde19f426dc6d6329262b684182597bec5b1ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.23" + "version": "0.1.25" }, "boolean_selector": { "dependency": "transitive", @@ -190,31 +190,31 @@ "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948", + "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.3" + "version": "4.0.4" }, "build_resolvers": { "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e", + "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.3" + "version": "2.4.4" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573", + "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.14" + "version": "2.4.15" }, "build_runner_core": { "dependency": "transitive", @@ -240,11 +240,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", + "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.3" + "version": "8.9.5" }, "cached_network_image": { "dependency": "transitive", @@ -280,11 +280,11 @@ "dependency": "transitive", "description": { "name": "change_case", - "sha256": "99cfdf2018c627c8a3af5a23ea4c414eb69c75c31322d23b9660ebc3cf30b514", + "sha256": "e41ef3df58521194ef8d7649928954805aeb08061917cf658322305e61568003", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.2.0" }, "characters": { "dependency": "transitive", @@ -310,11 +310,11 @@ "dependency": "transitive", "description": { "name": "chewie", - "sha256": "28d77bb89787b41430202fee9509289d75f3aa7fac408be1c0a74cb487e3bdba", + "sha256": "df6711bc3ba165ad19cb496e350250be5673327f79c61c9cc8a15088ed8007ed", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.11.1" }, "cli_util": { "dependency": "transitive", @@ -347,7 +347,7 @@ "version": "4.10.1" }, "collection": { - "dependency": "direct overridden", + "dependency": "transitive", "description": { "name": "collection", "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", @@ -430,21 +430,21 @@ "dependency": "transitive", "description": { "name": "custom_lint_core", - "sha256": "02450c3e45e2a6e8b26c4d16687596ab3c4644dd5792e3313aa9ceba5a49b7f5", + "sha256": "31110af3dde9d29fb10828ca33f1dce24d2798477b167675543ce3d208dee8be", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.0" + "version": "0.7.5" }, "custom_lint_visitor": { "dependency": "transitive", "description": { "name": "custom_lint_visitor", - "sha256": "bfe9b7a09c4775a587b58d10ebb871d4fe618237639b1e84d5ec62d7dfef25f9", + "sha256": "36282d85714af494ee2d7da8c8913630aa6694da99f104fb2ed4afcf8fc857d8", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0+6.11.0" + "version": "1.0.0+7.3.0" }, "dart_eval": { "dependency": "direct main", @@ -460,11 +460,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", + "sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.7" + "version": "2.3.8" }, "dartx": { "dependency": "transitive", @@ -480,11 +480,11 @@ "dependency": "transitive", "description": { "name": "dbus", - "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.10" + "version": "0.7.11" }, "desktop_webview_window": { "dependency": "direct main", @@ -497,6 +497,26 @@ "source": "git", "version": "0.2.4" }, + "device_info_plus": { + "dependency": "direct main", + "description": { + "name": "device_info_plus", + "sha256": "306b78788d1bb569edb7c55d622953c2414ca12445b41c9117963e03afc5c513", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.3.3" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.2" + }, "directed_graph": { "dependency": "transitive", "description": { @@ -571,11 +591,11 @@ "dependency": "transitive", "description": { "name": "extended_image_library", - "sha256": "9a94ec9314aa206cfa35f16145c3cd6e2c924badcc670eaaca8a3a8063a68cd7", + "sha256": "e61dafd94400fff6ef7ed1523d445ff3af137f198f3228e4a3107bc5b4bec5d1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.5" + "version": "4.0.6" }, "fake_async": { "dependency": "transitive", @@ -591,21 +611,21 @@ "dependency": "direct main", "description": { "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "ffigen": { "dependency": "direct main", "description": { "name": "ffigen", - "sha256": "e0bdaa4ff30106aab68e7fa19311df4ced2035dc07be30f2e112855e8dcd3259", + "sha256": "2119b4fe3aad0db94dc9531b90283c4640a6231070e613c400b426a4da08c704", "url": "https://pub.dev" }, "source": "hosted", - "version": "16.0.0" + "version": "16.1.0" }, "file": { "dependency": "transitive", @@ -641,21 +661,21 @@ "dependency": "direct main", "description": { "name": "flex_color_scheme", - "sha256": "09bea5d776f694c5a67f2229f2aa500cc7cce369322dc6500ab01cf9ad1b4e1a", + "sha256": "3344f8f6536c6ce0473b98e9f084ef80ca89024ad3b454f9c32cf840206f4387", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.0" + "version": "8.2.0" }, "flex_seed_scheme": { "dependency": "transitive", "description": { "name": "flex_seed_scheme", - "sha256": "d3ba3c5c92d2d79d45e94b4c6c71d01fac3c15017da1545880c53864da5dfeb0", + "sha256": "b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.5.0" + "version": "3.5.1" }, "flutter": { "dependency": "direct main", @@ -663,6 +683,16 @@ "source": "sdk", "version": "0.0.0" }, + "flutter_app_installer": { + "dependency": "direct main", + "description": { + "name": "flutter_app_installer", + "sha256": "b71f7c3f6c5712b6f9bdcde798bbb8a0c4047cab47c4364f7252de8c95d67358", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, "flutter_cache_manager": { "dependency": "transitive", "description": { @@ -783,11 +813,11 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", + "sha256": "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.24" + "version": "2.0.27" }, "flutter_qjs": { "dependency": "direct main", @@ -814,21 +844,21 @@ "dependency": "direct main", "description": { "name": "flutter_rust_bridge", - "sha256": "35c257fc7f98e34c1314d6c145e5ed54e7c94e8a9f469947e31c9298177d546f", + "sha256": "5a5c7a5deeef2cc2ffe6076a33b0429f4a20ceac22a397297aed2b1eb067e611", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.7.0" + "version": "2.9.0" }, "flutter_svg": { "dependency": "transitive", "description": { "name": "flutter_svg", - "sha256": "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123", + "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.16" + "version": "2.0.17" }, "flutter_test": { "dependency": "direct dev", @@ -987,21 +1017,21 @@ "dependency": "transitive", "description": { "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "go_router": { "dependency": "direct main", "description": { "name": "go_router", - "sha256": "7c2d40b59890a929824f30d442e810116caf5088482629c894b9e4478c67472d", + "sha256": "f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.6.3" + "version": "14.8.1" }, "google_fonts": { "dependency": "direct main", @@ -1057,11 +1087,11 @@ "dependency": "direct main", "description": { "name": "http", - "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.3.0" }, "http_client_helper": { "dependency": "transitive", @@ -1107,11 +1137,11 @@ "dependency": "transitive", "description": { "name": "image", - "sha256": "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6", + "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.2" + "version": "4.5.4" }, "infinite_listview": { "dependency": "transitive", @@ -1214,14 +1244,14 @@ "version": "4.1.5+1" }, "js": { - "dependency": "direct overridden", + "dependency": "transitive", "description": { "name": "js", - "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.6.7" }, "js_packer": { "dependency": "direct main", @@ -1247,11 +1277,11 @@ "dependency": "direct main", "description": { "name": "json_path", - "sha256": "7a06bbb1cfad390b20fb7a2ca5e67d9ba59633879c6d71142b80fbf61c3b66f6", + "sha256": "a3a06eb005f2e93d0df7f263cdf76bbd02c7602f5c4bed9be94fcca4c36be03e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.4" + "version": "0.7.5" }, "json_view": { "dependency": "direct main", @@ -1267,31 +1297,31 @@ "dependency": "transitive", "description": { "name": "just_audio", - "sha256": "a49e7120b95600bd357f37a2bb04cd1e88252f7cdea8f3368803779b925b1049", + "sha256": "f978d5b4ccea08f267dae0232ec5405c1b05d3f3cd63f82097ea46c015d5c09e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.42" + "version": "0.9.46" }, "just_audio_platform_interface": { "dependency": "transitive", "description": { "name": "just_audio_platform_interface", - "sha256": "0243828cce503c8366cc2090cefb2b3c871aa8ed2f520670d76fd47aa1ab2790", + "sha256": "271b93b484c6f494ecd72a107fffbdb26b425f170c665b9777a0a24a726f2f24", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.3.0" + "version": "4.4.0" }, "just_audio_web": { "dependency": "transitive", "description": { "name": "just_audio_web", - "sha256": "9a98035b8b24b40749507687520ec5ab404e291d2b0937823ff45d92cb18d448", + "sha256": "58915be64509a7683c44bf11cd1a23c15a48de104927bee116e3c63c8eeea0d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.13" + "version": "0.4.14" }, "lazy_memo": { "dependency": "transitive", @@ -1396,23 +1426,22 @@ "media_kit": { "dependency": "direct main", "description": { - "path": "media_kit", - "ref": "652c49e02701bb6bb80953a6fdf650a5c8f002f9", - "resolved-ref": "652c49e02701bb6bb80953a6fdf650a5c8f002f9", - "url": "https://github.com/media-kit/media-kit.git" + "name": "media_kit", + "sha256": "48c10c3785df5d88f0eef970743f8c99b2e5da2b34b9d8f9876e598f62d9e776", + "url": "https://pub.dev" }, - "source": "git", - "version": "1.1.11" + "source": "hosted", + "version": "1.2.0" }, "media_kit_libs_android_video": { "dependency": "transitive", "description": { "name": "media_kit_libs_android_video", - "sha256": "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c", + "sha256": "adff9b571b8ead0867f9f91070f8df39562078c0eb3371d88b9029a2d547d7b7", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.6" + "version": "1.3.7" }, "media_kit_libs_ios_video": { "dependency": "transitive", @@ -1428,11 +1457,11 @@ "dependency": "transitive", "description": { "name": "media_kit_libs_linux", - "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310", + "sha256": "2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.3" + "version": "1.2.1" }, "media_kit_libs_macos_video": { "dependency": "transitive", @@ -1448,46 +1477,34 @@ "dependency": "direct main", "description": { "name": "media_kit_libs_video", - "sha256": "20bb4aefa8fece282b59580e1cd8528117297083a6640c98c2e98cfc96b93288", + "sha256": "958cc55e7065d9d01f52a2842dab2a0812a92add18489f1006d864fb5e42a3ef", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.5" + "version": "1.0.6" }, "media_kit_libs_windows_video": { - "dependency": "direct overridden", - "description": { - "path": "libs/windows/media_kit_libs_windows_video", - "ref": "652c49e02701bb6bb80953a6fdf650a5c8f002f9", - "resolved-ref": "652c49e02701bb6bb80953a6fdf650a5c8f002f9", - "url": "https://github.com/media-kit/media-kit.git" - }, - "source": "git", - "version": "1.0.10" - }, - "media_kit_native_event_loop": { "dependency": "transitive", "description": { - "name": "media_kit_native_event_loop", - "sha256": "7d82e3b3e9ded5c35c3146c5ba1da3118d1dd8ac3435bac7f29f458181471b40", + "name": "media_kit_libs_windows_video", + "sha256": "dff76da2778729ab650229e6b4ec6ec111eb5151431002cbd7ea304ff1f112ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.9" + "version": "1.0.11" }, "media_kit_video": { "dependency": "direct main", "description": { - "path": "media_kit_video", - "ref": "652c49e02701bb6bb80953a6fdf650a5c8f002f9", - "resolved-ref": "652c49e02701bb6bb80953a6fdf650a5c8f002f9", - "url": "https://github.com/media-kit/media-kit.git" + "name": "media_kit_video", + "sha256": "a656a9463298c1adc64c57f2d012874f7f2900f0c614d9545a3e7b8bb9e2137b", + "url": "https://pub.dev" }, - "source": "git", - "version": "1.2.5" + "source": "hosted", + "version": "1.3.0" }, "meta": { - "dependency": "direct overridden", + "dependency": "transitive", "description": { "name": "meta", "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", @@ -1550,31 +1567,31 @@ "dependency": "transitive", "description": { "name": "package_config", - "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.2.0" }, "package_info_plus": { "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d", + "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.2" + "version": "8.3.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b", + "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.2" + "version": "3.2.0" }, "path": { "dependency": "direct main", @@ -1610,11 +1627,11 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", + "sha256": "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.15" + "version": "2.2.16" }, "path_provider_foundation": { "dependency": "transitive", @@ -1660,31 +1677,31 @@ "dependency": "direct main", "description": { "name": "permission_handler", - "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.3.1" + "version": "11.4.0" }, "permission_handler_android": { "dependency": "transitive", "description": { "name": "permission_handler_android", - "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", + "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.13" + "version": "12.1.0" }, "permission_handler_apple": { "dependency": "transitive", "description": { "name": "permission_handler_apple", - "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0", + "sha256": "f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.4.5" + "version": "9.4.6" }, "permission_handler_html": { "dependency": "transitive", @@ -1700,11 +1717,11 @@ "dependency": "transitive", "description": { "name": "permission_handler_platform_interface", - "sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9", + "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.3" + "version": "4.3.0" }, "permission_handler_windows": { "dependency": "transitive", @@ -1720,11 +1737,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "photo_view": { "dependency": "direct main", @@ -1786,15 +1803,35 @@ "source": "hosted", "version": "6.0.1" }, + "protobuf": { + "dependency": "direct main", + "description": { + "name": "protobuf", + "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "protoc_plugin": { + "dependency": "direct dev", + "description": { + "name": "protoc_plugin", + "sha256": "fb0554851c9eca30bd18405fbbfe81e39166d4a2f0e5b770606fd69da3da0b2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "21.1.2" + }, "provider": { "dependency": "transitive", "description": { "name": "provider", - "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.2" + "version": "6.1.4" }, "pseudom": { "dependency": "direct main", @@ -1810,11 +1847,11 @@ "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.2.0" }, "pubspec_parse": { "dependency": "transitive", @@ -1949,21 +1986,21 @@ "dependency": "direct main", "description": { "name": "screen_brightness", - "sha256": "99b898dae860ebe55fc872d8e300c6eafff3ee4ccb09301b90adb3f241f29874", + "sha256": "eca7bd9d2c3c688bcad14855361cab7097839400b6b4a56f62b7ae511c709958", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "screen_brightness_android": { "dependency": "transitive", "description": { "name": "screen_brightness_android", - "sha256": "ff9141bed547db02233e7dd88f990ab01973a0c8a8c04ddb855c7b072f33409a", + "sha256": "6ba1b5812f66c64e9e4892be2d36ecd34210f4e0da8bdec6a2ea34f1aa42683e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "screen_brightness_ios": { "dependency": "transitive", @@ -2069,11 +2106,11 @@ "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400", + "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.3" + "version": "10.1.4" }, "share_plus_platform_interface": { "dependency": "transitive", @@ -2099,11 +2136,11 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "3.0.0" }, "sky_engine": { "dependency": "transitive", @@ -2145,41 +2182,41 @@ "dependency": "transitive", "description": { "name": "sqflite", - "sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb", + "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "sqflite_android": { "dependency": "transitive", "description": { "name": "sqflite_android", - "sha256": "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3", + "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709", + "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4+6" + "version": "2.5.5" }, "sqflite_darwin": { "dependency": "transitive", "description": { "name": "sqflite_darwin", - "sha256": "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c", + "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1+1" + "version": "2.4.2" }, "sqflite_platform_interface": { "dependency": "transitive", @@ -2255,11 +2292,11 @@ "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", + "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0+3" + "version": "3.3.1" }, "term_glyph": { "dependency": "transitive", @@ -2345,11 +2382,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "sha256": "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.14" + "version": "6.3.15" }, "url_launcher_ios": { "dependency": "transitive", @@ -2395,21 +2432,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.4.0" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.3" + "version": "3.1.4" }, "uuid": { "dependency": "transitive", @@ -2425,11 +2462,11 @@ "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7", + "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.15" + "version": "1.1.18" }, "vector_graphics_codec": { "dependency": "transitive", @@ -2465,51 +2502,51 @@ "dependency": "transitive", "description": { "name": "video_player", - "sha256": "4a8c3492d734f7c39c2588a3206707a05ee80cef52e8c7f3b2078d430c84bc17", + "sha256": "7d78f0cfaddc8c19d4cb2d3bebe1bfef11f2103b0a03e5398b303a1bf65eeb14", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.9.2" + "version": "2.9.5" }, "video_player_android": { "dependency": "transitive", "description": { "name": "video_player_android", - "sha256": "7018dbcb395e2bca0b9a898e73989e67c0c4a5db269528e1b036ca38bcca0d0b", + "sha256": "ae7d4f1b41e3ac6d24dd9b9d5d6831b52d74a61bdd90a7a6262a33d8bb97c29a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.7.17" + "version": "2.8.2" }, "video_player_avfoundation": { "dependency": "transitive", "description": { "name": "video_player_avfoundation", - "sha256": "33224c19775fd244be2d6e3dbd8e1826ab162877bd61123bf71890772119a2b7", + "sha256": "84b4752745eeccb6e75865c9aab39b3d28eb27ba5726d352d45db8297fbd75bc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.5" + "version": "2.7.0" }, "video_player_platform_interface": { "dependency": "transitive", "description": { "name": "video_player_platform_interface", - "sha256": "229d7642ccd9f3dc4aba169609dd6b5f3f443bb4cc15b82f7785fcada5af9bbb", + "sha256": "df534476c341ab2c6a835078066fc681b8265048addd853a1e3c78740316a844", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.3" + "version": "6.3.0" }, "video_player_web": { "dependency": "transitive", "description": { "name": "video_player_web", - "sha256": "881b375a934d8ebf868c7fb1423b2bfaa393a0a265fa3f733079a86536064a10", + "sha256": "3ef40ea6d72434edbfdba4624b90fd3a80a0740d260667d91e7ecd2d79e13476", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.3.4" }, "vm_service": { "dependency": "transitive", @@ -2525,21 +2562,21 @@ "dependency": "transitive", "description": { "name": "volume_controller", - "sha256": "c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e", + "sha256": "e82fd689bb8e1fe8e64be3fa5946ff8699058f8cf9f4c1679acdba20cda7f5bd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.8" + "version": "3.3.3" }, "wakelock_plus": { "dependency": "transitive", "description": { "name": "wakelock_plus", - "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e", + "sha256": "b90fbcc8d7bdf3b883ea9706d9d76b9978cb1dfa4351fcc8014d6ec31a493354", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.10" + "version": "1.2.11" }, "wakelock_plus_platform_interface": { "dependency": "transitive", @@ -2565,11 +2602,11 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web_socket": { "dependency": "transitive", @@ -2585,11 +2622,11 @@ "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "webview_flutter": { "dependency": "transitive", @@ -2605,11 +2642,11 @@ "dependency": "transitive", "description": { "name": "webview_flutter_android", - "sha256": "3d535126f7244871542b2f0b0fcf94629c9a14883250461f9abe1a6644c1c379", + "sha256": "e09150b28a07933839adef0e4a088bb43e8c8d9e6b93025b01882d4067a58ab0", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.0" + "version": "4.3.4" }, "webview_flutter_platform_interface": { "dependency": "transitive", @@ -2625,21 +2662,31 @@ "dependency": "transitive", "description": { "name": "webview_flutter_wkwebview", - "sha256": "b7e92f129482460951d96ef9a46b49db34bd2e1621685de26e9eaafd9674e7eb", + "sha256": "c14455137ce60a68e1ccaf4e8f2dae8cebcb3465ddaa2fcfb57584fb7c5afe4d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.16.3" + "version": "3.18.5" }, "win32": { "dependency": "direct main", "description": { "name": "win32", - "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e", + "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.10.1" + "version": "5.12.0" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" }, "window_manager": { "dependency": "direct main", @@ -2733,7 +2780,7 @@ } }, "sdks": { - "dart": ">=3.7.0 <4.0.0", - "flutter": ">=3.27.0" + "dart": ">=3.7.2 <4.0.0", + "flutter": ">=3.29.0" } } diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix index 8c81b04f3b8b..1ee722e858b1 100644 --- a/pkgs/by-name/ma/mapproxy/package.nix +++ b/pkgs/by-name/ma/mapproxy/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "mapproxy"; - version = "4.0.1"; + version = "4.0.2"; disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mapproxy"; repo = "mapproxy"; tag = version; - hash = "sha256-bqM25exBPUB7hFtseWMw4Q1W6IeHLx+JrplOkZVEIl0="; + hash = "sha256-2c9tYra6EM1eL+bk1Kg+HVy6oXRKWTJz4ZnZA7hX2HA="; }; prePatch = '' diff --git a/pkgs/by-name/ma/markdown-code-runner/package.nix b/pkgs/by-name/ma/markdown-code-runner/package.nix new file mode 100644 index 000000000000..94615392a96c --- /dev/null +++ b/pkgs/by-name/ma/markdown-code-runner/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage { + pname = "markdown-code-runner"; + version = "0-unstable-2025-04-18"; + + src = fetchFromGitHub { + owner = "drupol"; + repo = "markdown-code-runner"; + rev = "9907df63574d714abcd78f9dfdf4bdda73ff30d6"; + hash = "sha256-Bn+IsZzV07bm5TNRX3+OOuxi3kj7d73gYPzcdIxWMi8="; + }; + + cargoHash = "sha256-HOJCnuzd6i4v1SpR4jstlpNkvSgH/4kvvE6Lsr4cgbI="; + + dontUseCargoParallelTests = true; + + meta = { + description = "A configurable Markdown code runner that executes and optionally replaces code blocks using external commands"; + longDescription = '' + markdown-code-runner is a command-line tool that scans Markdown files for fenced code blocks, + executes them using per-language configuration, and optionally replaces the block content + with the command output. + + It is useful for documentation that stays in sync with linters, formatters, or scripts. + The tool supports placeholder substitution, configurable replace/check modes, and CI-friendly validation. + ''; + homepage = "https://github.com/drupol/markdown-code-runner"; + license = lib.licenses.eupl12; + mainProgram = "mdcr"; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/ma/markets/package.nix b/pkgs/by-name/ma/markets/package.nix deleted file mode 100644 index b06f5fa4fd32..000000000000 --- a/pkgs/by-name/ma/markets/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - desktop-file-utils, - glib, - gtk3, - meson, - ninja, - pkg-config, - python3, - vala, - wrapGAppsHook3, - glib-networking, - gobject-introspection, - json-glib, - libgee, - libhandy, - libsoup_2_4, -}: - -stdenv.mkDerivation rec { - pname = "markets"; - version = "0.5.4"; - - src = fetchFromGitHub { - owner = "bitstower"; - repo = "markets"; - rev = version; - sha256 = "sha256-/g/r/1i69PmPND40zIID3Nun0I4ZFT1EFoNf1qprBjI="; - }; - - nativeBuildInputs = [ - desktop-file-utils - glib - gtk3 - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook3 - gobject-introspection - ]; - buildInputs = [ - glib - glib-networking - gtk3 - json-glib - libgee - libhandy - libsoup_2_4 - ]; - - postPatch = '' - patchShebangs build-aux/meson/postinstall.py - ''; - - postInstall = '' - ln -s bitstower-markets $out/bin/markets - ''; - - meta = with lib; { - homepage = "https://github.com/bitstower/markets"; - description = "Stock, currency and cryptocurrency tracker"; - maintainers = with maintainers; [ qyliss ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/ma/markuplinkchecker/package.nix b/pkgs/by-name/ma/markuplinkchecker/package.nix index baabb4624d87..5155985b1f98 100644 --- a/pkgs/by-name/ma/markuplinkchecker/package.nix +++ b/pkgs/by-name/ma/markuplinkchecker/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: let version = "0.21.0"; @@ -26,15 +24,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix index db4fa214b380..8a4b63648e42 100644 --- a/pkgs/by-name/ma/mas/package.nix +++ b/pkgs/by-name/ma/mas/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "mas"; - version = "1.9.0"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/mas-cli/mas/releases/download/v${version}/mas-${version}.pkg"; - hash = "sha256-MiSrCHLby3diTAzDPCYX1ZwdmzcHwOx/UJuWrlRJe54="; + hash = "sha256-pT8W/ZdNP7Fv5nyTX9vKbTa2jIk3THN1HVCmuEIibfc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/matcha-gtk-theme/package.nix b/pkgs/by-name/ma/matcha-gtk-theme/package.nix index 74d5dde06f25..61b923022bb7 100644 --- a/pkgs/by-name/ma/matcha-gtk-theme/package.nix +++ b/pkgs/by-name/ma/matcha-gtk-theme/package.nix @@ -24,13 +24,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] col stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-05-01"; + version = "2025-04-11"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "trQwRZ/JKIS8TcRIg0eL5GmB/yymDwqqNued0ddRuqU="; + sha256 = "sha256-vPAGEa3anWAynEg2AYme4qpHJdLDKk2CmL5iQ1mBYgM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix index ac0cc2633fc8..b9ec1e89bcd1 100644 --- a/pkgs/by-name/ma/matomo/package.nix +++ b/pkgs/by-name/ma/matomo/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "matomo"; - version = "5.2.2"; + version = "5.3.1"; src = fetchurl { url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz"; - hash = "sha256-ZEwz/KKZZwTFsKfwR0iKZM1ta4CUXJsWgBXika+pjb0="; + hash = "sha256-ynG5M21YQzGhII19kmJv0y5L3HIoEdf30dZA+nScuYA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix index 6283e5b2ad86..e1299887cea5 100644 --- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -7,16 +7,16 @@ buildGo124Module rec { pname = "matrix-alertmanager-receiver"; - version = "2025.3.26"; + version = "2025.4.16"; src = fetchFromGitHub { owner = "metio"; repo = "matrix-alertmanager-receiver"; tag = version; - hash = "sha256-IIuYsuNEQheMZmhU06kkz9wP75s53Nl/nGDqdlebnL8="; + hash = "sha256-QxBe9WkUg6TTAgxC29kLyQzJSR6m0to0ayH+0vT9pgQ="; }; - vendorHash = "sha256-aMk82HLfuIP+HEFinVUf4WXZC3y6RAUhf/e+ZwXD46k="; + vendorHash = "sha256-okaNjcA1fFChqaCooviPDW2VZTae9pUEGKNOTUxSSQ0="; ldflags = [ "-s" diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index b88b92d78f90..ad5639754927 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -10,7 +10,6 @@ sqlite, zstd, stdenv, - darwin, open-policy-agent, cctools, }: @@ -46,16 +45,10 @@ rustPlatform.buildRustPackage rec { (python3.withPackages (ps: [ ps.setuptools ])) # Used by gyp ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools; # libtool used by gyp; - buildInputs = - [ - sqlite - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.frameworks.SystemConfiguration - ]; + buildInputs = [ + sqlite + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/ma/matrix-commander-rs/package.nix b/pkgs/by-name/ma/matrix-commander-rs/package.nix index 1248862513b4..b5782bd57d1b 100644 --- a/pkgs/by-name/ma/matrix-commander-rs/package.nix +++ b/pkgs/by-name/ma/matrix-commander-rs/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, openssl, pkg-config, @@ -28,12 +26,7 @@ rustPlatform.buildRustPackage rec { perl ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; meta = { description = "CLI-based Matrix client app for sending and receiving"; diff --git a/pkgs/by-name/ma/matrix-conduit/package.nix b/pkgs/by-name/ma/matrix-conduit/package.nix index 6dcea572c57f..16d1ad758aa3 100644 --- a/pkgs/by-name/ma/matrix-conduit/package.nix +++ b/pkgs/by-name/ma/matrix-conduit/package.nix @@ -5,7 +5,6 @@ pkg-config, sqlite, stdenv, - darwin, nixosTests, rocksdb, rust-jemalloc-sys, @@ -36,15 +35,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - sqlite - rust-jemalloc-sys - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + sqlite + rust-jemalloc-sys + ]; env = { ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; diff --git a/pkgs/by-name/ma/matrix-media-repo/package.nix b/pkgs/by-name/ma/matrix-media-repo/package.nix index f15eb89e33e8..5a4b057357cc 100644 --- a/pkgs/by-name/ma/matrix-media-repo/package.nix +++ b/pkgs/by-name/ma/matrix-media-repo/package.nix @@ -8,16 +8,16 @@ }: let pname = "matrix-media-repo"; - version = "1.3.7"; + version = "1.3.8"; src = fetchFromGitHub { owner = "t2bot"; repo = "matrix-media-repo"; rev = "v${version}"; - hash = "sha256-trVn+Mn98aJLQCpQX1+qps/uuA5+8zeDoM94eauxHO8="; + hash = "sha256-KP1ZyHqeATxk1PCLuM6lPk+GB4Rd0f7ppKVETIURx28="; }; - vendorHash = "sha256-fKDdL7C3L33caoXxlutzoND2izB5GH+5qTeojTskIUg="; + vendorHash = "sha256-+sHy4Lgufs5jdN/V9W06U4dOZrsPiX87zmR1UwGHhQg="; asset-compiler = buildGoModule { pname = "${pname}-compile_assets"; diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/default.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/default.nix index 1f35ae050241..6736dbd6f313 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/default.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/default.nix @@ -7,4 +7,5 @@ matrix-synapse-pam = callPackage ./pam.nix { }; matrix-synapse-s3-storage-provider = callPackage ./s3-storage-provider.nix { }; matrix-synapse-shared-secret-auth = callPackage ./shared-secret-auth.nix { }; + synapse-http-antispam = callPackage ./synapse-http-antispam.nix { }; } diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix new file mode 100644 index 000000000000..f09938a98ec7 --- /dev/null +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/synapse-http-antispam.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + matrix-synapse-unwrapped, + nix-update-script, + twisted, +}: + +buildPythonPackage rec { + pname = "synapse-http-antispam"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "maunium"; + repo = "synapse-http-antispam"; + tag = "v${version}"; + hash = "sha256-wWm23+3o+/nx3xGkyShJm28mDPTbOhPbKgW3WfuB0Ng="; + }; + + build-system = [ hatchling ]; + + pythonImportsCheck = [ "synapse_http_antispam" ]; + + buildInputs = [ matrix-synapse-unwrapped ]; + dependencies = [ twisted ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Synapse module that forwards spam checking to an HTTP server"; + homepage = "https://github.com/maunium/synapse-http-antispam"; + changelog = "https://github.com/maunium/synapse-http-antispam/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sumnerevans ]; + }; +} diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix index ad141c593e89..8c9db044107b 100644 --- a/pkgs/by-name/ma/mattermost-desktop/package.nix +++ b/pkgs/by-name/ma/mattermost-desktop/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, buildNpmPackage, - electron_33, + electron_34, makeWrapper, testers, mattermost-desktop, @@ -10,21 +10,21 @@ }: let - electron = electron_33; + electron = electron_34; in buildNpmPackage rec { pname = "mattermost-desktop"; - version = "5.10.2"; + version = "5.11.2"; src = fetchFromGitHub { owner = "mattermost"; repo = "desktop"; tag = "v${version}"; - hash = "sha256-LHjVmrsOdk8vfsqvNEWkzpusm6jbz3SOb3bEaIb7rb4="; + hash = "sha256-03874pV7/GqydMdaSlh3N17LsbHppfPdYJ8nGdbvvbk="; }; - npmDepsHash = "sha256-LAbqsMdMmmHGgvg2ilz6neQxMOK3jtCKt8K0M8BWifs="; + npmDepsHash = "sha256-v6XEJJ9kozkY7HSLNJtM+86+36G7wt8xIFwCyO7x11Y="; npmBuildScript = "build-prod"; makeCacheWritable = true; diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index 408848d22ca8..11f0f59a87c9 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -19,8 +19,8 @@ # # Ensure you also check ../mattermostLatest/package.nix. regex = "^v(10\\.5\\.[0-9]+)$"; - version = "10.5.2"; - srcHash = "sha256-wC8tkplOntZpucCe2QPmnlrecwcqkzyEiTni8lO0p1I="; + version = "10.5.3"; + srcHash = "sha256-/279OXGbznXSGD1UTozYf15Ezw88mNyosfDtr9pvbiY="; vendorHash = "sha256-7jghoXFKA+WZ/ywOT0wWDMTfqAcBqp5gswOvpB7weL0="; npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0="; lockfileOverlay = '' diff --git a/pkgs/by-name/ma/mattermost/tests.nix b/pkgs/by-name/ma/mattermost/tests.nix index 60cf915ad92f..84452edb54ba 100644 --- a/pkgs/by-name/ma/mattermost/tests.nix +++ b/pkgs/by-name/ma/mattermost/tests.nix @@ -39,9 +39,10 @@ mattermost.overrideAttrs ( + '' # Just echo install/get/mod commands in the Makefile, since the dependencies are locked. substituteInPlace server/Makefile \ - --replace-warn '$(GO) install' '@echo $(GO) install' \ - --replace-warn '$(GO) get' '@echo $(GO) get' \ - --replace-warn '$(GO) get' '@echo $(GO) mod' + --replace-warn '$(GO) install' 'echo $(GO) install' \ + --replace-warn '$(GOBIN)/go$$version download' 'echo $(GOBIN)/go$$version download' \ + --replace-warn '$(GO) get' 'echo $(GO) get' \ + --replace-warn '$(GO) get' 'echo $(GO) mod' # mmctl tests shell out by writing a bash script to a tempfile substituteInPlace server/cmd/mmctl/commands/config_e2e_test.go \ --replace-fail '#!/bin/bash' '#!${runtimeShell}' @@ -142,6 +143,9 @@ mattermost.overrideAttrs ( # Appear to be broken. "TestSessionStore/MySQL/SessionGetWithDeviceId" "TestSessionStore/MySQL/GetMobileSessionMetadata" + "TestSessionStore/MySQL/GetSessionsWithActiveDeviceIds" + "TestUpdateTeam" + "TestSyncSyncableRoles" ] ++ optionals (!stdenv.hostPlatform.isx86_64) [ # aarch64: invalid operating system or processor architecture diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix index cdd22ef281e7..42ae07ad0b6c 100644 --- a/pkgs/by-name/ma/mattermostLatest/package.nix +++ b/pkgs/by-name/ma/mattermostLatest/package.nix @@ -11,10 +11,10 @@ mattermost.override { # and make sure the version regex is up to date here. # Ensure you also check ../mattermost/package.nix for ESR releases. regex = "^v(10\\.[0-9]+\\.[0-9]+)$"; - version = "10.6.1"; - srcHash = "sha256-xCrjJc6JCZXnCZ5lJ3o1bRbt7sxlEmcWeiw2cKmyWG0="; - vendorHash = "sha256-wj+bAQNJSs9m2SSfl+Ipm965iAhKQ2v1iMjH7I79qf4="; - npmDepsHash = "sha256-MdLfjLmizFbLfSqOdAZ+euXomB2ZPjZOqspQYnyHcuk="; + version = "10.7.0"; + srcHash = "sha256-T8lLF5AsJYALVijXOUxkSACa6h8W4HcqoML2+BPsEsY="; + vendorHash = "sha256-B2vfHszOVKbkN7h0tQGeGzLdeuxQDgaFv9QWkQgGCWs="; + npmDepsHash = "sha256-ZMgsfdmGtU3PgdmiY0xMCHh8dAOAmEFNbKcxXKO7CJc="; lockfileOverlay = '' unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react") ''; diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 0e846eacf47a..c9f694e68cf9 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, rustPlatform, - darwin, + fetchpatch, libiconv, testers, nix-update-script, @@ -25,8 +25,17 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-7YPUTTRo9+aBmVXLq5NfU+t5VPxfEQc4+rdQnPN+AZ0="; + patches = [ + # Sorts RECORD file in wheel archives to make them deterministic. See: https://github.com/NixOS/nixpkgs/issues/384708 + # Remove on next bump https://github.com/PyO3/maturin/pull/2550 + (fetchpatch { + name = "wheel-deterministic-record.patch"; + url = "https://github.com/PyO3/maturin/commit/bade37e108514f4288c1dd6457119a257bf95db4.patch"; + hash = "sha256-jcZ/NMHKFYQuOfR+fu5UPykEljUq3l/+ZAx0Tlyu3Zw="; + }) + ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security libiconv ]; diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix index 5f32a8660522..faaf17d75f11 100644 --- a/pkgs/by-name/ma/mautrix-signal/package.nix +++ b/pkgs/by-name/ma/mautrix-signal/package.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "mautrix-signal"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; tag = "v${version}"; - hash = "sha256-w27e+gOnKsjYVSDAk8Wp7fx32igSg3sKqYyM6yUX088="; + hash = "sha256-iCcY5PljWwkliukfMgpTgJNtnJ/xDD3Fl3JlDRgRlpk="; }; buildInputs = @@ -41,7 +41,7 @@ buildGoModule rec { CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ]; - vendorHash = "sha256-UXloMc9XaJe096zwdHup2DiIoXqimNjSgQRuVXbV080="; + vendorHash = "sha256-uT2CdWETbgm0n2WAcK/FCXKIzbGGjPGO3WzoorbCidA="; doCheck = true; preCheck = @@ -67,7 +67,7 @@ buildGoModule rec { description = "Matrix-Signal puppeting bridge"; license = licenses.agpl3Plus; maintainers = with maintainers; [ - niklaskorz + alyaeanyx ma27 ]; mainProgram = "mautrix-signal"; diff --git a/pkgs/by-name/ma/mautrix-whatsapp/package.nix b/pkgs/by-name/ma/mautrix-whatsapp/package.nix index 12438c912bc9..9cfa1eebe5ec 100644 --- a/pkgs/by-name/ma/mautrix-whatsapp/package.nix +++ b/pkgs/by-name/ma/mautrix-whatsapp/package.nix @@ -14,19 +14,19 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.11.4"; + version = "0.12.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-6Fnkw/lf64T0EXpWvSSnIRBuHJVt01Ft8Ks43/jvtZ0="; + hash = "sha256-V4waFxYmWHBV5H0R3H//hB6pXhYPgRCWkkBwf3EC5bQ="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-zMS6zZvJQAcnoklCi5qoM+aMMCSaeTQmQBxawgC67P8="; + vendorHash = "sha256-CZg0POONweix6CXPnXDprCF7F8BN06awtNCVdJMoPnU="; doCheck = false; diff --git a/pkgs/by-name/mc/mchprs/package.nix b/pkgs/by-name/mc/mchprs/package.nix index c3a38d74b0cd..d562355d6c00 100644 --- a/pkgs/by-name/mc/mchprs/package.nix +++ b/pkgs/by-name/mc/mchprs/package.nix @@ -6,8 +6,6 @@ openssl, sqlite, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,17 +27,11 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - [ - openssl - sqlite - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + sqlite + zlib + ]; meta = with lib; { mainProgram = "mchprs"; diff --git a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix index 81352635f66d..d0c0241be79d 100644 --- a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix +++ b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix @@ -3,6 +3,7 @@ stdenv, mcpelauncher-client, fetchFromGitHub, + fetchpatch, cmake, pkg-config, zlib, @@ -27,6 +28,16 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./dont_download_glfw_ui.patch + # Qt 6.9 no longer implicitly converts non-char types (such as booleans) to + # construct a QChar. This leads to a build failure with Qt 6.9. Upstream + # has merged a patch, but has not yet formalized it through a release, so + # we must fetch it manually. Remove this fetch on the next point release. + (fetchpatch { + url = "https://github.com/minecraft-linux/mcpelauncher-ui-qt/commit/0526b1fd6234d84f63b216bf0797463f41d2bea0.diff"; + hash = "sha256-vL5iqbs50qVh4BKDxTOpCwFQWO2gLeqrVLfnpeB6Yp8="; + stripLen = 1; + extraPrefix = "mcpelauncher-ui-qt/"; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/mc/mcrypt/malloc_to_stdlib.patch b/pkgs/by-name/mc/mcrypt/malloc_to_stdlib.patch old mode 100755 new mode 100644 diff --git a/pkgs/by-name/mc/mcumgr-client/package.nix b/pkgs/by-name/mc/mcumgr-client/package.nix index 21b12fc2501b..a69f81120099 100644 --- a/pkgs/by-name/mc/mcumgr-client/package.nix +++ b/pkgs/by-name/mc/mcumgr-client/package.nix @@ -6,7 +6,6 @@ pkg-config, udev, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,9 +26,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ udev ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ udev ]; meta = with lib; { description = "Client for mcumgr commands"; diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix index 5956ad70637a..abbb890aa74a 100644 --- a/pkgs/by-name/md/md-tui/package.nix +++ b/pkgs/by-name/md/md-tui/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, pkg-config, - stdenv, - darwin, nix-update-script, }: @@ -24,12 +22,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - ]; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/md/mdbook-d2/package.nix b/pkgs/by-name/md/mdbook-d2/package.nix index 2a0d2922dfa0..f1a888e02180 100644 --- a/pkgs/by-name/md/mdbook-d2/package.nix +++ b/pkgs/by-name/md/mdbook-d2/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -21,11 +19,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-emfO7D7JU/fQYdnaK7eWR8tCPx3ffvU/pTutSURZMBQ="; doCheck = false; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - ]; - meta = with lib; { description = "D2 diagram generator plugin for MdBook"; mainProgram = "mdbook-d2"; diff --git a/pkgs/by-name/md/mdbook-emojicodes/package.nix b/pkgs/by-name/md/mdbook-emojicodes/package.nix index 430e3f32f30a..5de989c1176a 100644 --- a/pkgs/by-name/md/mdbook-emojicodes/package.nix +++ b/pkgs/by-name/md/mdbook-emojicodes/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-+VVkrXvsqtizeVhfuO0U8ADfSkmovpT7DVwrz7QljU0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - ]; - meta = with lib; { description = "MDBook preprocessor for converting emojicodes (e.g. `: cat :`) into emojis 🐱"; mainProgram = "mdbook-emojicodes"; diff --git a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix index fd18fe07fc96..a97b80644f49 100644 --- a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix +++ b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Render Kroki diagrams from files or code blocks in mdbook"; diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix index 2840a37eb50b..57ad9750434f 100644 --- a/pkgs/by-name/md/mdbook/package.nix +++ b/pkgs/by-name/md/mdbook/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, nix, rustPlatform, - darwin, - CoreServices ? darwin.apple_sdk.frameworks.CoreServices, installShellFiles, }: let @@ -27,8 +25,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd mdbook \ --bash <($out/bin/mdbook completions bash) \ diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index 18850c1bcdbb..dcd1b8e261fa 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -1,7 +1,6 @@ { aria2, cmake, - # https://github.com/mhogomchungu/media-downloader?tab=readme-ov-file#extensions extraPackages ? [ aria2 ffmpeg @@ -10,8 +9,8 @@ fetchFromGitHub, ffmpeg, lib, - libsForQt5, python3, + qt6, stdenv, }: @@ -28,10 +27,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - libsForQt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; - buildInputs = [ libsForQt5.qtbase ]; + buildInputs = [ + qt6.qtbase + qt6.qtwayland + ]; qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath extraPackages}" ]; diff --git a/pkgs/by-name/me/mediawriter/package.nix b/pkgs/by-name/me/mediawriter/package.nix index 5c41866441bf..b9010986ca08 100644 --- a/pkgs/by-name/me/mediawriter/package.nix +++ b/pkgs/by-name/me/mediawriter/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mediawriter"; - version = "5.2.3"; + version = "5.2.4"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "MediaWriter"; tag = version; - hash = "sha256-f8AHmRO0PbF4WZPUxrBy5cVb3Pj/PSAgBqpm5Kt/2o0="; + hash = "sha256-UNbsq5V03QiSUIDuGcUxgf7+B8BWPkqgE1By/9huQOo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix index 2504292861c9..bd7353cdcb1d 100644 --- a/pkgs/by-name/me/melange/package.nix +++ b/pkgs/by-name/me/melange/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "melange"; - version = "0.23.4"; + version = "0.23.6"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-3/iENeBC2kaHu3G5eWiRJgj/NbjOfj4/1LjrXQYedVo="; + hash = "sha256-ahvYLj80fT93F2w22W7oD45mt3NAVpAhqKxqj4Hb1wY="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -26,7 +26,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-PMuavQeRs1t4Ianv5gSp/mtrzW0gIzFzIVUWHbIc9rU="; + vendorHash = "sha256-hmbdq4h1+8rIn8rbG0ZYNaimSiFROk3rTX1VhPPE200="; subPackages = [ "." ]; diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix index 321fa21b8b04..224cea987cb9 100644 --- a/pkgs/by-name/me/meli/package.nix +++ b/pkgs/by-name/me/meli/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { pname = "meli"; - version = "0.8.10"; + version = "0.8.11"; src = fetchzip { urls = [ @@ -33,11 +33,11 @@ rustPlatform.buildRustPackage rec { "https://codeberg.org/meli/meli/archive/v${version}.tar.gz" "https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz" ]; - hash = "sha256-MGnCX/6pnKNxDEqCcVWTl/fteMypk+N2PrJYRMP0sL0="; + hash = "sha256-q3vnvH0GWnrfYnk2WBRLTDInJ/wazI4JtkEMwiWanfI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-OyOLAw3HzXY85Jwolh4Wqjmm6au6wRwGq5WkicOt5eg="; + cargoHash = "sha256-OAytdJgIiaS0xsHWOgNW2dkRQEyU9xcyaJtxClWzfjQ="; # Needed to get openssl-sys to use pkg-config OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/me/mesen/deps.json b/pkgs/by-name/me/mesen/deps.json index 8b2284636873..ed1b21d2485e 100644 --- a/pkgs/by-name/me/mesen/deps.json +++ b/pkgs/by-name/me/mesen/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Avalonia", - "version": "11.2.0", - "hash": "sha256-kG3tnsLdodlvIjYd5feBZ0quGd2FsvV8FIy7uD5UZ5Q=" + "version": "11.2.4", + "hash": "sha256-CcdWUxqd43A4KeY1K4T5M6R1M0zuwdwyd5Qh/BAlNT4=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -16,18 +16,18 @@ }, { "pname": "Avalonia.BuildServices", - "version": "0.0.29", - "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + "version": "0.0.31", + "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.0", - "hash": "sha256-x6IdcSo3e2Pq/En9/N80HpPblEXSAv51VRlBrF8wlVM=" + "version": "11.2.3", + "hash": "sha256-z3ZHxVSOoOjqq+5G71jnGN1Y0i3YpAkox7cj3lNr6kg=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.0", - "hash": "sha256-pd/cD82onMZ0iMLl9TOCl35PEvAPbyX2lUj49lrBpOA=" + "version": "11.2.3", + "hash": "sha256-jIJvuYN0iym/WeOC0C7z5xj5kCZSXGoeLQ/q5qQfewM=" }, { "pname": "Avalonia.Controls.ProportionalStackPanel", @@ -46,18 +46,18 @@ }, { "pname": "Avalonia.Desktop", - "version": "11.2.0", - "hash": "sha256-+5ISi6WXe8AIjClVo3UqZHgzZpFbMgFk13YvHHhx9MM=" + "version": "11.2.4", + "hash": "sha256-WKTOx7RNSb0fOMg5Za4j+u9DwKXDqVzHwQCEXSm7TFo=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.2.0", - "hash": "sha256-k60HGDKnsXiDOnxSH+Hx2ihyqmxSSeWIBJx2XD1ELW0=" + "version": "11.2.3", + "hash": "sha256-DIGkaBff+C3BLwedw5xteR5lfzb6ecxiLt12eJVgLQc=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.0", - "hash": "sha256-u4CQvG6EdsyaHSWa+Y704sDiWZlqbArB0g4gcoCFwQo=" + "version": "11.2.4", + "hash": "sha256-lw8YFXR/pn0awFvFW+OhjZ2LbHonL6zwqLIz+pQp+Sk=" }, { "pname": "Avalonia.MarkupExtension", @@ -66,43 +66,48 @@ }, { "pname": "Avalonia.Native", - "version": "11.2.0", - "hash": "sha256-fMikurP2RAnOahZkORxuGOKGn5iQ0saZCEYsvoFiFQI=" + "version": "11.2.4", + "hash": "sha256-MvxivGjYerXcr70JpWe9CCXO6MU9QQgCkmZfjZCFdJM=" }, { "pname": "Avalonia.ReactiveUI", - "version": "11.2.0", - "hash": "sha256-6GXX1ZA6gS9CpkQnGepx1PFNoKiwcHQyLSK5qOGmjYo=" + "version": "11.2.3", + "hash": "sha256-NqRetBiFg5gNCS8C0J1JJJsZ4sz+w+GoEegGFddBGDg=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.0", - "hash": "sha256-QwYY3bpShJ1ayHUx+mjnwaEhCPDzTk+YeasCifAtGzM=" + "version": "11.2.3", + "hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.2.4", + "hash": "sha256-mKQVqtzxnZu6p64ZxIHXKSIw3AxAFjhmrxCc5/1VXfc=" }, { "pname": "Avalonia.Skia", - "version": "11.2.0", - "hash": "sha256-rNR+l+vLtlzTU+F51FpOi4Ujy7nR5+lbTc3NQte8s/o=" + "version": "11.2.4", + "hash": "sha256-82UQGuCl5hN5kdA3Uz7hptpNnG1EPlSB6k/a6XPSuXI=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.2.0", - "hash": "sha256-Ate6KC61pwXmTAk5h1uh7rjwAViuiO/qgAVMl3F1BA8=" + "version": "11.2.4", + "hash": "sha256-CPun/JWFCVoGxgMA510/gMP2ZB9aZJ9Bk8yuNjwo738=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.2.0", - "hash": "sha256-l88ZX50Nao8wjtRnyZxNFFgRpJ/yxxNki6NY48dyTUg=" + "version": "11.2.3", + "hash": "sha256-UF15yTDzHmqd33siH3TJxmxaonA51dzga+hmCUahn1k=" }, { "pname": "Avalonia.Win32", - "version": "11.2.0", - "hash": "sha256-A9PB6Bt61jLdQlMOkchWy/3BwROgxS9BP8FObs/KFiU=" + "version": "11.2.4", + "hash": "sha256-LJSKiLbdof8qouQhN7pY1RkMOb09IiAu/nrJFR2OybY=" }, { "pname": "Avalonia.X11", - "version": "11.2.0", - "hash": "sha256-EP9cCqriEh8d+Wwyv27QGK/CY6w2LcCjtcIv79PZqkM=" + "version": "11.2.4", + "hash": "sha256-qty8D2/HlZz/7MiEhuagjlKlooDoW3fow5yJY5oX4Uk=" }, { "pname": "CommunityToolkit.Mvvm", @@ -156,28 +161,28 @@ }, { "pname": "HarfBuzzSharp", - "version": "7.3.0.2", - "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8=" + "version": "7.3.0.3", + "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "7.3.0.2", - "hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU=" + "version": "7.3.0.3", + "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "7.3.0.2", - "hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08=" + "version": "7.3.0.3", + "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", - "version": "7.3.0.3-preview.2.2", - "hash": "sha256-1NlcTnXrWUYZ2r2/N3SPxNIjNcyIpiiv3g7h8XxpNkM=" + "version": "7.3.0.3", + "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "7.3.0.2", - "hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo=" + "version": "7.3.0.3", + "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" }, { "pname": "MicroCom.Runtime", @@ -201,28 +206,28 @@ }, { "pname": "SkiaSharp", - "version": "2.88.8", - "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=" + "version": "2.88.9", + "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" }, { "pname": "SkiaSharp.NativeAssets.Linux", - "version": "2.88.8", - "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y=" + "version": "2.88.9", + "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.8", - "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI=" + "version": "2.88.9", + "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", - "version": "2.88.8", - "hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w=" + "version": "2.88.9", + "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.8", - "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM=" + "version": "2.88.9", + "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, { "pname": "Splat", diff --git a/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch b/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch deleted file mode 100644 index 1c194a4a3084..000000000000 --- a/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/UI/UI.csproj b/UI/UI.csproj -index 2a0eb78..74751bc 100644 ---- a/UI/UI.csproj -+++ b/UI/UI.csproj -@@ -90,11 +90,6 @@ - - - -- -- -- https://nuget-feed-nightly.avaloniaui.net/v3/index.json;https://api.nuget.org/v3/index.json -- -- - - - diff --git a/pkgs/by-name/me/mesen/dont-use-nightly-avalonia.patch b/pkgs/by-name/me/mesen/dont-use-nightly-avalonia.patch new file mode 100644 index 000000000000..b21e6b7d0306 --- /dev/null +++ b/pkgs/by-name/me/mesen/dont-use-nightly-avalonia.patch @@ -0,0 +1,33 @@ +diff --git a/UI/UI.csproj b/UI/UI.csproj +index 7721884..3011ae8 100644 +--- a/UI/UI.csproj ++++ b/UI/UI.csproj +@@ -90,11 +90,6 @@ + + + +- +- +- https://nuget-feed-nightly.avaloniaui.net/v3/index.json;https://api.nuget.org/v3/index.json +- +- + + + +@@ -105,13 +100,13 @@ + + + +- ++ + +- ++ + + + +- ++ + + + diff --git a/pkgs/by-name/me/mesen/dont-zip-libraries.patch b/pkgs/by-name/me/mesen/dont-zip-libraries.patch index 6aeed6c3e757..9e78203b5af6 100644 --- a/pkgs/by-name/me/mesen/dont-zip-libraries.patch +++ b/pkgs/by-name/me/mesen/dont-zip-libraries.patch @@ -1,17 +1,17 @@ diff --git a/UI/Config/ConfigManager.cs b/UI/Config/ConfigManager.cs -index 56c1ff1..ed5fe8a 100644 +index c3249cf..96c6ae0 100644 --- a/UI/Config/ConfigManager.cs +++ b/UI/Config/ConfigManager.cs @@ -51,7 +51,6 @@ namespace Mesen.Config } else { homeFolder = DefaultDocumentsFolder; } -- Program.ExtractNativeDependencies(homeFolder); +- DependencyHelper.ExtractNativeDependencies(homeFolder); _homeFolder = homeFolder; Config.Save(); } diff --git a/UI/Program.cs b/UI/Program.cs -index dfc4ba3..632cef2 100644 +index dc923ab..ae7a1cc 100644 --- a/UI/Program.cs +++ b/UI/Program.cs @@ -54,8 +54,6 @@ namespace Mesen @@ -19,7 +19,7 @@ index dfc4ba3..632cef2 100644 if(!File.Exists(ConfigManager.GetConfigFile())) { - //Could not find configuration file, show wizard -- ExtractNativeDependencies(ConfigManager.HomeFolder); +- DependencyHelper.ExtractNativeDependencies(ConfigManager.HomeFolder); App.ShowConfigWindow = true; BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, ShutdownMode.OnMainWindowClose); if(File.Exists(ConfigManager.GetConfigFile())) { @@ -28,12 +28,12 @@ index dfc4ba3..632cef2 100644 Task.Run(() => ConfigManager.LoadConfig()); - //Extract core dll & other native dependencies -- ExtractNativeDependencies(ConfigManager.HomeFolder); +- DependencyHelper.ExtractNativeDependencies(ConfigManager.HomeFolder); - if(CommandLineHelper.IsTestRunner(args)) { return TestRunner.Run(args); } -@@ -147,7 +142,7 @@ namespace Mesen +@@ -105,7 +100,7 @@ namespace Mesen libraryName = libraryName + ".dylib"; } } @@ -43,10 +43,10 @@ index dfc4ba3..632cef2 100644 return IntPtr.Zero; } diff --git a/UI/UI.csproj b/UI/UI.csproj -index 053d495..2a0eb78 100644 +index 67fe57d..65762d3 100644 --- a/UI/UI.csproj +++ b/UI/UI.csproj -@@ -634,7 +634,6 @@ +@@ -637,7 +637,6 @@ @@ -54,7 +54,7 @@ index 053d495..2a0eb78 100644 -@@ -644,16 +643,5 @@ +@@ -647,16 +646,4 @@ @@ -62,13 +62,12 @@ index 053d495..2a0eb78 100644 - - - -- +- - - - - - - - +- - diff --git a/pkgs/by-name/me/mesen/package.nix b/pkgs/by-name/me/mesen/package.nix index 43957a1c7004..34b5b1108727 100644 --- a/pkgs/by-name/me/mesen/package.nix +++ b/pkgs/by-name/me/mesen/package.nix @@ -6,24 +6,24 @@ fetchFromGitHub, wrapGAppsHook3, gtk3, + libX11, SDL2, }: buildDotnetModule rec { pname = "mesen"; - version = "2.0.0-unstable-2024-12-25"; + version = "2.0.0-unstable-2025-04-01"; src = fetchFromGitHub { owner = "SourMesen"; repo = "Mesen2"; - rev = "6820db37933002089a04d356d8469481e915a359"; - hash = "sha256-TzGMZr351XvVj/wARWJxRisRb5JlkyzdjCVYbwydBVE="; + rev = "0dfdbbdd9b5bc4c5d501ea691116019266651aff"; + hash = "sha256-+Jzw1tfdiX2EmQIoPuMtLmJrv9nx/XqfyLEBW+AXj1I="; }; patches = [ - # the nightly avalonia repository url is still queried, which errors out - # even if we don't actually need any nightly versions - ./dont-use-alternative-restore-sources.patch + # patch out the usage of nightly avalonia builds, since we can't use alternative restore sources + ./dont-use-nightly-avalonia.patch # upstream has a weird library loading mechanism, which we override with a more sane alternative ./dont-zip-libraries.patch ]; @@ -60,7 +60,7 @@ buildDotnetModule rec { nativeBuildInputs = [ SDL2 ]; - buildInputs = [ SDL2 ]; + buildInputs = [ SDL2 ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ libX11 ]; makeFlags = [ "core" ]; diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index bdefa68e0390..ea9e4e002d69 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -15,13 +15,13 @@ python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.7.0"; + version = "1.7.2"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; tag = version; - hash = "sha256-nvaq+9evQSj/ahK68nj8FckG4nA1gs2DqcZxFEFH1iU="; + hash = "sha256-On67RM3u1/XhdwgtAHve1GAJwKGCnk8IOCjNZcyDfyg="; }; patches = [ diff --git a/pkgs/by-name/me/metadata-cleaner/package.nix b/pkgs/by-name/me/metadata-cleaner/package.nix index 1f42f6b474f3..686ec13faded 100644 --- a/pkgs/by-name/me/metadata-cleaner/package.nix +++ b/pkgs/by-name/me/metadata-cleaner/package.nix @@ -21,13 +21,12 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; version = "2.5.6"; - - format = "other"; + pyproject = false; src = fetchFromGitLab { owner = "rmnvgr"; repo = "metadata-cleaner"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-J+nwgLbAFoh1gq3J4cqQEShZJCSZesyCjT9DfkCWIHs="; }; @@ -61,15 +60,15 @@ python3.pkgs.buildPythonApplication rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Python GTK application to view and clean metadata in files, using mat2"; mainProgram = "metadata-cleaner"; homepage = "https://gitlab.com/rmnvgr/metadata-cleaner"; - changelog = "https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ + changelog = "https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ gpl3Plus cc-by-sa-40 ]; - maintainers = with maintainers; [ dotlambda ] ++ lib.teams.gnome-circle.members; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/by-name/me/metronome/package.nix b/pkgs/by-name/me/metronome/package.nix index c2010ce3a10b..b9f4dee6a2ee 100644 --- a/pkgs/by-name/me/metronome/package.nix +++ b/pkgs/by-name/me/metronome/package.nix @@ -12,7 +12,6 @@ desktop-file-utils, libadwaita, gst_all_1, - darwin, }: stdenv.mkDerivation rec { @@ -44,16 +43,12 @@ stdenv.mkDerivation rec { desktop-file-utils ]; - buildInputs = - [ - libadwaita - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-bad - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + libadwaita + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + ]; # Workaround for the gettext-sys issue # https://github.com/Koka/gettext-rs/issues/114 diff --git a/pkgs/by-name/mi/micro-httpd/package.nix b/pkgs/by-name/mi/micro-httpd/package.nix index 8a47f8eff38e..918d29d45514 100644 --- a/pkgs/by-name/mi/micro-httpd/package.nix +++ b/pkgs/by-name/mi/micro-httpd/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { description = "Really small HTTP server"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; mainProgram = "micro_httpd"; }; } diff --git a/pkgs/by-name/mi/microbin/package.nix b/pkgs/by-name/mi/microbin/package.nix index 2f5d08158f94..dc44e039ccd7 100644 --- a/pkgs/by-name/mi/microbin/package.nix +++ b/pkgs/by-name/mi/microbin/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchFromGitHub, fetchpatch, lib, @@ -7,7 +6,6 @@ openssl, pkg-config, rustPlatform, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -66,14 +64,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - oniguruma - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + oniguruma + openssl + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index fbf1289361b7..995138f08608 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "microfetch"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "NotAShelf"; repo = "microfetch"; tag = "v${version}"; - hash = "sha256-qpwzuzEqXsGO4y3ClaY25Q4rFm2RyPl/X3yNcQz3R4E="; + hash = "sha256-iNx1/My72i+Ni/WVqF2HFgLjqH6W6WPupdOkH6UQH9E="; }; useFetchCargoVendor = true; diff --git a/pkgs/by-name/mi/micropython/package.nix b/pkgs/by-name/mi/micropython/package.nix index 3a6ca7e7bf40..15b39dc7e192 100644 --- a/pkgs/by-name/mi/micropython/package.nix +++ b/pkgs/by-name/mi/micropython/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "micropython"; - version = "1.24.1"; + version = "1.25.0"; src = fetchFromGitHub { owner = "micropython"; repo = "micropython"; rev = "v${version}"; - hash = "sha256-Hn5TtLBKK9kn9x3U2ZcU9O2CS272rcDD0HA+Xva3G4w="; + hash = "sha256-yH5omiYs07ZKECI+DAnpYq4T+r2O/RuGdtN+dhYxePc="; fetchSubmodules = true; # remove unused libraries from rp2 port's SDK. we leave this and the other diff --git a/pkgs/by-name/mi/microserver/package.nix b/pkgs/by-name/mi/microserver/package.nix index 84f46fd49e25..af9f172fa69c 100644 --- a/pkgs/by-name/mi/microserver/package.nix +++ b/pkgs/by-name/mi/microserver/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-IPJJ9kv7gf5l7Y2JLCLjkNFao42h/VmkTd3LF5BCMLU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; [ Security ] - ); - meta = with lib; { homepage = "https://github.com/robertohuertasm/microserver"; description = "Simple ad-hoc server with SPA support"; diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 3026e499b6d7..90f56e00408d 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -174,11 +174,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "134.0.3124.95"; + version = "135.0.3179.54"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-vgTJl9BmMdm4Aw1FCpIfqzfmgsLuY61G/RSkA66kPhI="; + hash = "sha256-AppUIXOFouGRxMM6ioZq0cglKkNh811n+36z5yvVAuc="; }; # With strictDeps on, some shebangs were not being patched correctly diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix index 393045e5ff2b..716c85a71644 100644 --- a/pkgs/by-name/mi/mieru/package.nix +++ b/pkgs/by-name/mi/mieru/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mieru"; - version = "3.13.1"; + version = "3.14.0"; src = fetchFromGitHub { owner = "enfein"; repo = "mieru"; rev = "v${version}"; - hash = "sha256-jZvF0vagzQRhw2vPhY61/ayki/gneG66e2MPBaqwlyk="; + hash = "sha256-kQ8VwUYfNnnBPJTLsN2/VZyHZ4KReD7yJiL3ukA96o0="; }; vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM="; diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index 760dd240bcf3..faee35475e39 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.19.4"; + version = "1.19.5"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-A/+BUnW7ge4y99W2rAUBAAqxO1L0M9oO0WSnLN1NnXQ="; + hash = "sha256-eINcvVnWMDbviqNpD+SmtDYVQjLZgjaAdX9NrRAf0Ww="; }; - vendorHash = "sha256-VBDVtzI3GwxviLaAVUboHTtHaMQviiCUnB7ncgri+xc="; + vendorHash = "sha256-xGaJ9iAP6Q8L6oC6LqEwi69Bd7H+bjSykGXckkZL92k="; excludedPackages = [ "./test" ]; diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix index 5892858a7230..c4b335ba16c0 100644 --- a/pkgs/by-name/mi/mimir/package.nix +++ b/pkgs/by-name/mi/mimir/package.nix @@ -30,7 +30,7 @@ buildGoModule rec { "delete-objects" "list-deduplicated-blocks" "listblocks" - "markblocks" + "mark-blocks" "undelete-blocks" ]); @@ -51,7 +51,6 @@ buildGoModule rec { t = "github.com/grafana/mimir/pkg/util/version"; in [ - ''-extldflags "-static"'' "-s" "-w" "-X ${t}.Version=${version}" diff --git a/pkgs/by-name/mi/min-ed-launcher/deps.json b/pkgs/by-name/mi/min-ed-launcher/deps.json new file mode 100644 index 000000000000..a12052661d25 --- /dev/null +++ b/pkgs/by-name/mi/min-ed-launcher/deps.json @@ -0,0 +1,257 @@ +[ + { + "pname": "Expecto", + "version": "10.2.1", + "hash": "sha256-DgwHFsPMySlnMag4kPTviTwrNOD7uPnnJLi9DCZif5s=" + }, + { + "pname": "Expecto.FsCheck", + "version": "10.2.1", + "hash": "sha256-+IDkxZKfEir5/TJrwxMFC4H6voWbSmCsvZUrjxcbc50=" + }, + { + "pname": "FsCheck", + "version": "2.16.5", + "hash": "sha256-+UXoE+QGCDN1LM+XgseKJ7c5Lj/Cblo3izmo7GtIE0A=" + }, + { + "pname": "FsConfig", + "version": "4.1.0", + "hash": "sha256-daaTrzhZjnJLDL49vOCkeXX6W5PWaLj5aqHuaYgiS1s=" + }, + { + "pname": "FSharp.Core", + "version": "8.0.200", + "hash": "sha256-wjYiedFiqOTKaM4mF6uT9kc/yKDJ78mqfw9qLoBFHOw=" + }, + { + "pname": "FSharp.Data", + "version": "6.4.0", + "hash": "sha256-8/iQA6anTybzseyvsvFV33jVVwrnYiKG1iqgwkqNeRc=" + }, + { + "pname": "FSharp.Data.Csv.Core", + "version": "6.4.0", + "hash": "sha256-jcw/6uDN0he/PhhopEvTydy2X13Xt3g3kKuVdt+8+oY=" + }, + { + "pname": "FSharp.Data.Html.Core", + "version": "6.4.0", + "hash": "sha256-HeljybTU019Z7HxFoErPM/HIAm32pJiKQM+kSyt63xw=" + }, + { + "pname": "FSharp.Data.Http", + "version": "6.4.0", + "hash": "sha256-Zn4dZCb46vr8LYR5donzeistFPSO8YYiXUU3Iqo+vKg=" + }, + { + "pname": "FSharp.Data.Json.Core", + "version": "6.4.0", + "hash": "sha256-dVhcVzUi//PFFFIML/5SWKrileeQ6IOd1VlGyEptaw0=" + }, + { + "pname": "FSharp.Data.Runtime.Utilities", + "version": "6.4.0", + "hash": "sha256-nD4U7mwZtFEUcD9XvPxhpot8FNl2YyhiLpjpjmFNAO0=" + }, + { + "pname": "FSharp.Data.WorldBank.Core", + "version": "6.4.0", + "hash": "sha256-ea2CZyHisqa1MnF70TBKfcMl6+W90MnLJ5Ctgjfk9SM=" + }, + { + "pname": "FSharp.Data.Xml.Core", + "version": "6.4.0", + "hash": "sha256-6eZWKdNjKMqufyOYolTximIS41gipBUNMKNn3HEiYw0=" + }, + { + "pname": "FSharpx.Collections", + "version": "3.1.0", + "hash": "sha256-CmDCfx19VNthqZHphYywOK0attxyJjOhu2srNKSky10=" + }, + { + "pname": "FsToolkit.ErrorHandling", + "version": "4.15.2", + "hash": "sha256-fzsnH7178Gr0pnFoXkJvqRc2s5c+MXuRKQHBifIhmQk=" + }, + { + "pname": "FsToolkit.ErrorHandling.TaskResult", + "version": "4.15.2", + "hash": "sha256-I/3BXTQQzVSlldcfaVZ849/PirOcozM5GLCmfL2qHWg=" + }, + { + "pname": "Microsoft.CodeCoverage", + "version": "17.9.0", + "hash": "sha256-OaGa4+jRPHs+T+p/oekm2Miluqfd2IX8Rt+BmUx8kr4=" + }, + { + "pname": "Microsoft.Extensions.Configuration", + "version": "8.0.0", + "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "8.0.0", + "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "8.0.1", + "hash": "sha256-KYPQYYspiBGiez7JshmEjy4kFt7ASzVxQeVsygIEvHA=" + }, + { + "pname": "Microsoft.Extensions.Configuration.FileExtensions", + "version": "8.0.0", + "hash": "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Json", + "version": "8.0.0", + "hash": "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg=" + }, + { + "pname": "Microsoft.Extensions.FileProviders.Abstractions", + "version": "8.0.0", + "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU=" + }, + { + "pname": "Microsoft.Extensions.FileProviders.Physical", + "version": "8.0.0", + "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc=" + }, + { + "pname": "Microsoft.Extensions.FileSystemGlobbing", + "version": "8.0.0", + "hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "8.0.0", + "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" + }, + { + "pname": "Microsoft.Extensions.TimeProvider.Testing", + "version": "8.5.0", + "hash": "sha256-ZGXrOV/qJVfjwrJsv3jtC80IVQyH3OLOw70gCIn6uIM=" + }, + { + "pname": "Microsoft.NET.Test.Sdk", + "version": "17.9.0", + "hash": "sha256-q/1AJ7eNlk02wvN76qvjl2xBx5iJ+h5ssiE/4akLmtI=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "5.0.0", + "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.9.0", + "hash": "sha256-iiXUFzpvT8OWdzMj9FGJDqanwHx40s1TXVY9l3ii+s0=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "17.9.0", + "hash": "sha256-1BZIY1z+C9TROgdTV/tq4zsPy7Q71GQksr/LoMKAzqU=" + }, + { + "pname": "Microsoft.Win32.Registry", + "version": "5.0.0", + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" + }, + { + "pname": "Mono.Cecil", + "version": "0.11.4", + "hash": "sha256-HrnRgFsOzfqAWw0fUxi/vkzZd8dMn5zueUeLQWA9qvs=" + }, + { + "pname": "Mono.Posix.NETStandard", + "version": "5.20.1-preview", + "hash": "sha256-gLtcH308/VVYgZcrJtvXDkBIMIQjK8w35AcmuxYYTvM=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.1", + "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" + }, + { + "pname": "Serilog", + "version": "3.1.1", + "hash": "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI=" + }, + { + "pname": "Serilog.Sinks.Console", + "version": "5.0.1", + "hash": "sha256-aveoZM25ykc2haBHCXWD09jxZ2t2tYIGmaNTaO2V0jI=" + }, + { + "pname": "Serilog.Sinks.File", + "version": "5.0.0", + "hash": "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ=" + }, + { + "pname": "Serilog.Sinks.File.Header", + "version": "1.0.2", + "hash": "sha256-2igOXIHtojhhNlg/C5OhPwmVUoE5MpmgApi8dFmutx4=" + }, + { + "pname": "System.Collections.Immutable", + "version": "6.0.0", + "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "1.6.0", + "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Security.AccessControl", + "version": "5.0.0", + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "8.0.0", + "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs=" + }, + { + "pname": "System.Security.Permissions", + "version": "8.0.0", + "hash": "sha256-+YUPY+3HnTmfPLZzr+5qEk0RqalCbFZBgLXee1yCH1M=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "5.0.0", + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "8.0.0", + "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE=" + }, + { + "pname": "System.Text.Json", + "version": "8.0.0", + "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow=" + }, + { + "pname": "System.Windows.Extensions", + "version": "8.0.0", + "hash": "sha256-aHkz7LtmUDDRS7swQM0i6dDVUytRCMYeA2CfaeVA2Y0=" + }, + { + "pname": "TypeShape", + "version": "10.0.0", + "hash": "sha256-esJFuRvxuLXwBgi/7FjEVm1ATCGXU/yB2RtgN4ilZtg=" + }, + { + "pname": "YoloDev.Expecto.TestSdk", + "version": "0.14.3", + "hash": "sha256-3FIZM+GYsBsFGhLsasF7Ia9nXHSpqooQNe5H7ANy334=" + } +] diff --git a/pkgs/by-name/mi/min-ed-launcher/package.nix b/pkgs/by-name/mi/min-ed-launcher/package.nix new file mode 100644 index 000000000000..a43c5532eb6d --- /dev/null +++ b/pkgs/by-name/mi/min-ed-launcher/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildDotnetModule, + fetchFromGitHub, + git, +}: +buildDotnetModule rec { + pname = "min-ed-launcher"; + version = "0.11.3"; + + src = fetchFromGitHub { + owner = "rfvgyhn"; + repo = "min-ed-launcher"; + tag = "v${version}"; + hash = "sha256-HJIvbuTsCG51PPVieJbXGyAviqgM9/WPz0+0VhIWz9k="; + + leaveDotGit = true; # During build the current commit is appended to the version + }; + + projectFile = "MinEdLauncher.sln"; + nugetDeps = ./deps.json; + buildInputs = [ + git # During build the current commit is appended to the version + ]; + + executables = [ "MinEdLauncher" ]; + + meta = { + homepage = "https://github.com/rfvgyhn/min-ed-launcher"; + description = "Minimal Elite Dangerous Launcher"; + license = lib.licenses.mit; + platforms = lib.platforms.x86_64; + mainProgram = "MinEdLauncher"; + maintainers = with lib.maintainers; [ jiriks74 ]; + }; +} diff --git a/pkgs/by-name/mi/minify/package.nix b/pkgs/by-name/mi/minify/package.nix index 1742f171ecba..2ade8acd9428 100644 --- a/pkgs/by-name/mi/minify/package.nix +++ b/pkgs/by-name/mi/minify/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "minify"; - version = "2.22.4"; + version = "2.23.1"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - hash = "sha256-sN3gGxUOWNFBB+iz6i+a0SP8my+IdbMXAVd/bWzzKms="; + hash = "sha256-v0KLQlf2WhI18uanVtvWfX6/7s9ZtfPM5AGyEIHZf54="; }; - vendorHash = "sha256-PxmtYVMkZcJvaM9CYSy5OSUkpyhL1VLwkXoY7uIe7Q8="; + vendorHash = "sha256-Btc5d/wwDmjhyDZwAIHDSbXuh8xqq/nIjTAkPsdeHU4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/mi/minimap2/package.nix b/pkgs/by-name/mi/minimap2/package.nix index 8808db4374f7..1d5c8aa0513a 100644 --- a/pkgs/by-name/mi/minimap2/package.nix +++ b/pkgs/by-name/mi/minimap2/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "minimap2"; - version = "2.28"; + version = "2.29"; src = fetchFromGitHub { repo = "minimap2"; owner = "lh3"; rev = "v${version}"; - sha256 = "sha256-cBl2BKgPCP/xHZW6fTH51cY9/lV/1HVLsN7a1R1Blv4="; + sha256 = "sha256-AIcxlEDHZOZgUOUZLRwmm5yuuzKHNz21rrSXAWGJEHk="; }; buildInputs = [ zlib ]; diff --git a/pkgs/by-name/mi/minio-client/package.nix b/pkgs/by-name/mi/minio-client/package.nix index 68d6a1c6ba18..07c818eafdfe 100644 --- a/pkgs/by-name/mi/minio-client/package.nix +++ b/pkgs/by-name/mi/minio-client/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2025-03-12T17-29-24Z"; + version = "2025-04-08T15-39-49Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-8n/qjM+FBrjbSLcd9iVioh3iEAkMNrIo5fG/ZQkAmBo="; + sha256 = "sha256-H/iIlzdOLcE2xn96FuyyFcXC0is94MUYbfjA5b/hEqg="; }; - vendorHash = "sha256-P7W8xgHc+2ksZnY0iuuPKjwsxSqjhPdiUfNMe18ldL0="; + vendorHash = "sha256-0Lfjhd4DlIpnbMp/4gObgeO9L1QC03FhJbFDLXW6UOQ="; subPackages = [ "." ]; diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix index 82c3baa2e8f3..45c438eb41da 100644 --- a/pkgs/by-name/mi/minio-warp/package.nix +++ b/pkgs/by-name/mi/minio-warp/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "minio-warp"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "minio"; repo = "warp"; rev = "v${version}"; - hash = "sha256-zRRvY/PpLSY8cx3vqcAGfVK7FJKzFnxtghhIwrlUh+Y="; + hash = "sha256-loyEGnJ6ExWMUyArNNpQGzpagFgwlNzaNBO8EPXkMws="; }; - vendorHash = "sha256-Qyb8ivuZplbOIxoS2cC+2FSZbW7CnChv1jaIKkCzgN4="; + vendorHash = "sha256-/+vKs5NzzyP9Ihz+zbxGf/OEHD0kaf0wZzE0Sg++3bE="; # See .goreleaser.yml ldflags = [ diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index d85fd90783b0..36b2f3f5e609 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, installShellFiles, stdenv, - darwin, curl, }: @@ -26,11 +25,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - nativeCheckInputs = [ curl ]; diff --git a/pkgs/by-name/mi/miraclecast/package.nix b/pkgs/by-name/mi/miraclecast/package.nix index 74a3aff23ecb..681a38624963 100644 --- a/pkgs/by-name/mi/miraclecast/package.nix +++ b/pkgs/by-name/mi/miraclecast/package.nix @@ -1,30 +1,46 @@ { lib, - stdenv, fetchFromGitHub, + glib, + gst_all_1, + iproute2, + libtool, + makeBinaryWrapper, meson, + miraclecast, ninja, pkg-config, - glib, readline, - pcre, - systemd, + stdenv, + systemdLibs, + testers, udev, - iproute2, + wpa_supplicant, + relyUdev ? true, }: +let + gstreamerPluginPaths = lib.concatMapStrings (pth: pth + "/lib/gstreamer-1.0:") [ + (lib.getLib gst_all_1.gstreamer) + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + ]; +in stdenv.mkDerivation { pname = "miraclecast"; - version = "1.0-20231112"; + version = "1.0-unstable-2024-07-13"; src = fetchFromGitHub { owner = "albfan"; repo = "miraclecast"; - rev = "af6ab257eae83bb0270a776a8fe00c0148bc53c4"; - hash = "sha256-3ZIAvA3w/ZhoJtVmUD444nch0PGD58PdBRke7zd9IuQ="; + rev = "937747fd4de64a33bccf5adb73924c435ceb821b"; + hash = "sha256-y37+AOz8xYjtDk9ITxMB7UeWeMpDH+b6HQBczv+x5zo="; }; nativeBuildInputs = [ + makeBinaryWrapper meson ninja pkg-config @@ -32,24 +48,44 @@ stdenv.mkDerivation { buildInputs = [ glib - pcre - readline - systemd - udev + gst_all_1.gstreamer iproute2 + libtool + readline + systemdLibs + udev + wpa_supplicant ]; - mesonFlags = [ - "-Drely-udev=true" - "-Dbuild-tests=true" - "-Dip-binary=${iproute2}/bin/ip" - ]; + mesonFlags = + [ + "-Dbuild-tests=true" + "-Dip-binary=${iproute2}/bin/ip" + ] + ++ lib.optionals relyUdev [ + "-Drely-udev=true" + ]; + + postPatch = '' + substituteInPlace res/miracle-gst \ + --replace-fail "/usr/bin/gst-launch-1.0" "${gst_all_1.gstreamer}/bin/gst-launch-1.0" + ''; + + postInstall = '' + wrapProgram $out/bin/miracle-gst --set GST_PLUGIN_SYSTEM_PATH_1_0 ${gstreamerPluginPaths} + ''; + + passthru.tests.version = testers.testVersion { + package = miraclecast; + command = "miracled --version"; + version = "Miraclecast 1"; + }; meta = with lib; { - description = "Connect external monitors via Wi-Fi"; + description = "Connect external monitors to your system via Wifi-Display specification also known as Miracast"; homepage = "https://github.com/albfan/miraclecast"; license = licenses.lgpl21Plus; - maintainers = [ ]; + maintainers = [ maintainers.wizardlink ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index 1bc25833f15a..fbd13a1002d8 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.13.7"; + version = "1.14.2"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; tag = "v${version}"; - hash = "sha256-6WFtXIqnn2ayfXkGMIxGDlYpE3UbHRuAU8qHGk9SCU4="; + hash = "sha256-7ObDlO/jHUMJdEIFwsFrdSyrbs6I6koNJxQyH6FbhZc="; }; - vendorHash = "sha256-fEmf+d9oBXz7KymNVmC+CM7OyPD9QV1uN4ReTNhei7A="; + vendorHash = "sha256-gxURT2S1m7J3bZ0VIYxFFsbxU3za2BgJ/6TONoPGzAw="; ldflags = [ "-s" diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index 7e1498c91c1d..d13d828977ef 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -4,7 +4,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, coreutils, bash, direnv, @@ -12,8 +11,6 @@ pkg-config, openssl, cacert, - Security, - SystemConfiguration, usage, mise, testers, @@ -40,12 +37,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; + buildInputs = [ openssl ]; postPatch = '' patchShebangs --build \ diff --git a/pkgs/by-name/mk/mkalias/package.nix b/pkgs/by-name/mk/mkalias/package.nix index 38f326992f67..a9c57605e1de 100644 --- a/pkgs/by-name/mk/mkalias/package.nix +++ b/pkgs/by-name/mk/mkalias/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, cmake, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -21,10 +20,6 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; - buildInputs = [ - darwin.apple_sdk.frameworks.Foundation - ]; - cmakeFlags = [ "-DMKALIAS_VERSION=${finalAttrs.version}" ]; diff --git a/pkgs/by-name/mm/mmh/package.nix b/pkgs/by-name/mm/mmh/package.nix index 7f9e04b2de40..2dbcea7045ce 100644 --- a/pkgs/by-name/mm/mmh/package.nix +++ b/pkgs/by-name/mm/mmh/package.nix @@ -7,21 +7,21 @@ flex, }: let - rev = "b17ea39dc17e5514f33b3f5c34ede92bd16e208c"; + rev = "7e93dee44df1a7e8f551a2e408a600b2e90a0974"; in stdenv.mkDerivation { pname = "mmh"; - version = "unstable-2020-08-21"; + version = "unstable-2023-09-24"; src = fetchurl { url = "http://git.marmaro.de/?p=mmh;a=snapshot;h=${rev};sf=tgz"; name = "mmh-${rev}.tgz"; - sha256 = "1bqfxafw4l2y46pnsxgy4ji1xlyifzw01k1ykbsjj9p61q3nv6l6"; + hash = "sha256-t2Qnwtkli+/MDk6uaikS2SIP9LucK64os8kGcn2ytRU="; }; postPatch = '' substituteInPlace sbr/Makefile.in \ - --replace "ar " "${stdenv.cc.targetPrefix}ar " + --replace-fail "ar " "${stdenv.cc.targetPrefix}ar " ''; buildInputs = [ ncurses ]; @@ -30,12 +30,18 @@ stdenv.mkDerivation { flex ]; - meta = with lib; { + # mhl.c:1031:58: error: pointer type mismatch in conditional expression [] + # 1031 | putstr((c1->c_flags & RTRIM) ? rtrim(cp) : cp); + NIX_CFLAGS_COMPILE = [ " -Wno-error=incompatible-pointer-types" ]; + + enableParallelBuilding = true; + + meta = { description = "Set of electronic mail handling programs"; homepage = "http://marmaro.de/prog/mmh"; - license = licenses.bsd3; - platforms = platforms.unix; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; - maintainers = with maintainers; [ kaction ]; + maintainers = with lib.maintainers; [ kaction ]; }; } diff --git a/pkgs/by-name/mo/modelscan/package.nix b/pkgs/by-name/mo/modelscan/package.nix index eb746ead7b83..1a7b96927377 100644 --- a/pkgs/by-name/mo/modelscan/package.nix +++ b/pkgs/by-name/mo/modelscan/package.nix @@ -16,6 +16,8 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-8VupkPiHebVtOqMdtkBflAI1zPRdDSvHCEq3ghjASaE="; }; + pythonRelaxDeps = [ "rich" ]; + build-system = with python3.pkgs; [ poetry-core poetry-dynamic-versioning diff --git a/pkgs/by-name/mo/mollysocket/package.nix b/pkgs/by-name/mo/mollysocket/package.nix index aede71ab8bc2..1f3b5add9fed 100644 --- a/pkgs/by-name/mo/mollysocket/package.nix +++ b/pkgs/by-name/mo/mollysocket/package.nix @@ -5,8 +5,6 @@ pkg-config, openssl, sqlite, - stdenv, - darwin, nixosTests, }: @@ -28,14 +26,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + sqlite + ]; checkFlags = [ # tests interact with Signal servers diff --git a/pkgs/by-name/mo/moltenvk/package.nix b/pkgs/by-name/mo/moltenvk/package.nix index d758e2915773..6651f2298a2d 100644 --- a/pkgs/by-name/mo/moltenvk/package.nix +++ b/pkgs/by-name/mo/moltenvk/package.nix @@ -6,7 +6,6 @@ gitUpdater, apple-sdk_15, cereal, - libcxx, glslang, spirv-cross, spirv-headers, @@ -103,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString ( [ - "-isystem ${lib.getDev libcxx}/include/c++/v1" + "-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1" "-I${lib.getDev spirv-cross}/include/spirv_cross" "-I${lib.getDev spirv-headers}/include/spirv/unified1" diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix index 9930e8fca566..989de9580709 100644 --- a/pkgs/by-name/mo/monado/package.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -11,7 +11,6 @@ doxygen, eigen, elfutils, - fetchpatch2, glslang, gst-plugins-base, gstreamer, @@ -66,14 +65,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "monado"; - version = "24.0.0"; + version = "25.0.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "monado"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-lFy0VvaLD4Oyu2TZJnaIWjuaJUZjGGDJS0VsRfIUpcc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-VxTxvw+ftqlh3qF5qWxpK1OJsRowkRXu0xEH2bDckUA="; }; nativeBuildInputs = [ @@ -138,16 +137,6 @@ stdenv.mkDerivation (finalAttrs: { tracy ]; - patches = [ - # Remove this patch on the next update - # https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2338 - (fetchpatch2 { - name = "improve-reproducibility.patch"; - url = "https://gitlab.freedesktop.org/monado/monado/-/commit/9819fb6dd61d2af5b2d993ed37b976760002b055.patch"; - hash = "sha256-qpTF1Q64jl8ZnJzMtflrpHLahCqfde2DXA9/Avlc18I="; - }) - ]; - cmakeFlags = [ (lib.cmakeBool "XRT_FEATURE_SERVICE" serviceSupport) (lib.cmakeBool "XRT_HAVE_TRACY" tracingSupport) diff --git a/pkgs/by-name/mo/monit/package.nix b/pkgs/by-name/mo/monit/package.nix index d8425acd501a..f46b42511b9e 100644 --- a/pkgs/by-name/mo/monit/package.nix +++ b/pkgs/by-name/mo/monit/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - darwin, bison, flex, zlib, @@ -15,22 +14,17 @@ stdenv.mkDerivation rec { pname = "monit"; - version = "5.34.4"; + version = "5.35.0"; src = fetchurl { url = "https://mmonit.com/monit/dist/monit-${version}.tar.gz"; - sha256 = "sha256-72B8+qv9N2fUC5ueMgMvdIvuvE1oaDH2ER4OaPvRtGk="; + sha256 = "sha256-l2DDqihhH8FDhmZUCs4A1XKk8pdCo6VG1lYodEr19HQ="; }; - nativeBuildInputs = - [ - bison - flex - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.DiskArbitration - darwin.apple_sdk.frameworks.System - ]; + nativeBuildInputs = [ + bison + flex + ]; buildInputs = [ diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index 9b6dfc19cde8..bfa87faf91f7 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "11.05"; + version = "11.08"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-CHOkP5L5FITV2ZpeYjSL9r8K6eeG/p4ZBrUztRvnIU4="; + hash = "sha256-iy/WFFRv3/ZJoGCAKH2+rYnyIdvaO+kgxaH/XeKWtbs="; stripRoot = false; }; diff --git a/pkgs/by-name/mo/moonfire-nvr/package.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix index 0d9e3bc642dd..2923cf1db51c 100644 --- a/pkgs/by-name/mo/moonfire-nvr/package.nix +++ b/pkgs/by-name/mo/moonfire-nvr/package.nix @@ -8,7 +8,6 @@ sqlite, testers, moonfire-nvr, - darwin, nodejs, pnpm_9, }: @@ -59,17 +58,10 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - ncurses - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - ] - ); + buildInputs = [ + ncurses + sqlite + ]; postInstall = '' mkdir -p $out/lib/ui diff --git a/pkgs/by-name/mo/moonlight/disable_updates.patch b/pkgs/by-name/mo/moonlight/disable_updates.patch new file mode 100644 index 000000000000..10a76daad274 --- /dev/null +++ b/pkgs/by-name/mo/moonlight/disable_updates.patch @@ -0,0 +1,78 @@ +diff --git a/packages/core-extensions/src/moonbase/host.ts b/packages/core-extensions/src/moonbase/host.ts +index 8903f41..e5c8709 100644 +--- a/packages/core-extensions/src/moonbase/host.ts ++++ b/packages/core-extensions/src/moonbase/host.ts +@@ -79,22 +79,9 @@ electron.app.whenReady().then(() => { + + if (!entries.find((e) => e.label === "moonlight")) { + const options: Electron.MenuItemConstructorOptions[] = [ +- { label: "Update and restart", click: updateAndRestart }, + { label: "Reset config", click: resetConfig } + ]; + +- if (moonlightHost.branch !== MoonlightBranch.DEV) { +- options.push({ +- label: "Switch branch", +- submenu: [MoonlightBranch.STABLE, MoonlightBranch.NIGHTLY].map((branch) => ({ +- label: branch, +- type: "radio", +- checked: moonlightHost.branch === branch, +- click: () => changeBranch(branch) +- })) +- }); +- } +- + options.push({ label: "About", click: showAbout }); + + entries.splice(i + 1, 0, { +diff --git a/packages/core-extensions/src/moonbase/native.ts b/packages/core-extensions/src/moonbase/native.ts +index c6e068f..0adc765 100644 +--- a/packages/core-extensions/src/moonbase/native.ts ++++ b/packages/core-extensions/src/moonbase/native.ts +@@ -39,24 +39,7 @@ export default function getNatives(): MoonbaseNatives { + + return { + async checkForMoonlightUpdate() { +- try { +- if (moonlightGlobal.branch === MoonlightBranch.STABLE) { +- const json = await getStableRelease(); +- return json.name !== moonlightGlobal.version ? json.name : null; +- } else if (moonlightGlobal.branch === MoonlightBranch.NIGHTLY) { +- const req = await fetch(nightlyRefUrl, { +- cache: "no-store", +- headers: sharedHeaders +- }); +- const ref = (await req.text()).split("\n")[0]; +- return ref !== moonlightGlobal.version ? ref : null; +- } +- +- return null; +- } catch (e) { +- logger.error("Error checking for moonlight update", e); +- return null; +- } ++ return null; + }, + + async updateMoonlight(overrideBranch?: MoonlightBranch) { +diff --git a/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx b/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx +index 302c610..2db7ecd 100644 +--- a/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx ++++ b/packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx +@@ -108,16 +108,6 @@ function ArrayFormItem({ config }: { config: "repositories" | "devSearchPaths" } + export default function ConfigPage() { + return ( + <> +- ("moonbase", "updateChecking", true) ?? true} +- onChange={(value: boolean) => { +- MoonbaseSettingsStore.setExtensionConfig("moonbase", "updateChecking", value); +- }} +- note="Checks for updates to moonlight" +- > +- Automatic update checking +- + + A list of remote repositories to display extensions from + diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix index 1a08a488d80d..290b5baba453 100644 --- a/pkgs/by-name/mo/moonlight/package.nix +++ b/pkgs/by-name/mo/moonlight/package.nix @@ -1,34 +1,46 @@ { lib, stdenv, - nodejs, - pnpm_9, + pnpm_10, + nodejs_22, fetchFromGitHub, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "moonlight"; - version = "1.3.9"; + version = "1.3.14"; src = fetchFromGitHub { owner = "moonlight-mod"; repo = "moonlight"; tag = "v${finalAttrs.version}"; - hash = "sha256-WhPQ7JYfE8RBhDknBunKdW1VBxrklb3UGnMgk5LFVFA="; + hash = "sha256-FmQS8DqjgOyfEth8tpUlJoduo6rAv28PwLGv90J3rcM="; }; nativeBuildInputs = [ - nodejs - pnpm_9.configHook + nodejs_22 + pnpm_10.configHook ]; - pnpmDeps = pnpm_9.fetchDeps { + pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-KZFHcW/OVjTDXZltxPYGuO+NWjuD5o6HE/E9JQZmrG8="; + buildInputs = [ nodejs_22 ]; + + hash = "sha256-I+zRCUqJabpGJRFBGW0NrM9xzyzeCjioF54zlCpynBU="; }; + env = { + NODE_ENV = "production"; + MOONLIGHT_BRANCH = "stable"; + MOONLIGHT_VERSION = "v${finalAttrs.version}"; + }; + + patches = [ + ./disable_updates.patch + ]; + buildPhase = '' runHook preBuild @@ -55,7 +67,8 @@ stdenv.mkDerivation (finalAttrs: { All core code is original or used with permission from their respective authors where not copyleft. ''; homepage = "https://moonlight-mod.github.io"; - changelog = "https://github.com/moonlight-mod/moonlight/blob/main/CHANGELOG.md"; + downloadPage = "https://moonlight-mod.github.io/using/install/#nix"; + changelog = "https://raw.githubusercontent.com/moonlight-mod/moonlight/refs/tags/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.lgpl3; maintainers = with maintainers; [ diff --git a/pkgs/by-name/mo/morgen/package.nix b/pkgs/by-name/mo/morgen/package.nix index 048c9ed7710e..62484fc5d0a0 100644 --- a/pkgs/by-name/mo/morgen/package.nix +++ b/pkgs/by-name/mo/morgen/package.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.6.11"; + version = "3.6.12"; src = fetchurl { name = "morgen-${version}.deb"; url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-vn3V7TXWMPesZt+65FAeNzUo8n4P9XfSIFnCDvLaZOI="; + hash = "sha256-1shqINMYy+yoMsI99+tvJcqWs8dScmmV7X9QTYZ9EfA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/mosdepth/package.nix b/pkgs/by-name/mo/mosdepth/package.nix index befa0db0636f..cd110fdec8cd 100644 --- a/pkgs/by-name/mo/mosdepth/package.nix +++ b/pkgs/by-name/mo/mosdepth/package.nix @@ -2,7 +2,6 @@ lib, buildNimPackage, fetchFromGitHub, - pcre, versionCheckHook, }: @@ -21,7 +20,6 @@ buildNimPackage (finalAttrs: { lockFile = ./lock.json; - buildInputs = [ pcre ]; nativeBuildInputs = [ versionCheckHook ]; nimFlags = [ ''--passC:"-Wno-incompatible-pointer-types"'' ]; diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix index d39b685ac140..0d18d51179e7 100644 --- a/pkgs/by-name/mo/mountpoint-s3/package.nix +++ b/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -9,18 +9,18 @@ rustPlatform.buildRustPackage rec { pname = "mountpoint-s3"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "awslabs"; repo = "mountpoint-s3"; rev = "v${version}"; - hash = "sha256-/a9chdeijaGKJ3nDDYYZLdS9JrZiAjC8QFQ6bjdLWT8="; + hash = "sha256-5zib6F+OtOqxJei4+HzzEEMvjOoltdcPfIc6kzUJYgw="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-qFPvNCRF3eUprj2/88RF+H5O3Kz9QF9SQqPfXb9Yogo="; + cargoHash = "sha256-3wEmtBEYvvHZ0Tde+o//YW8J20o6t/v8C0vq/CICHD0="; # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 diff --git a/pkgs/by-name/mo/movine/package.nix b/pkgs/by-name/mo/movine/package.nix index 34f8a00ce89c..0539ec1e8bf5 100644 --- a/pkgs/by-name/mo/movine/package.nix +++ b/pkgs/by-name/mo/movine/package.nix @@ -4,8 +4,6 @@ fetchCrate, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,13 +22,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Migration manager written in Rust, that attempts to be smart yet minimal"; diff --git a/pkgs/by-name/mo/movit/package.nix b/pkgs/by-name/mo/movit/package.nix index ebda6555cd13..b4575cb3f5ca 100644 --- a/pkgs/by-name/mo/movit/package.nix +++ b/pkgs/by-name/mo/movit/package.nix @@ -6,7 +6,6 @@ SDL2, fftw, gtest, - darwin, eigen, libepoxy, libGL, @@ -33,18 +32,13 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = - [ - SDL2 - fftw - gtest - libGL - libX11 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.OpenGL - darwin.libobjc - ]; + buildInputs = [ + SDL2 + fftw + gtest + libGL + libX11 + ]; propagatedBuildInputs = [ eigen diff --git a/pkgs/by-name/mp/mpack/package.nix b/pkgs/by-name/mp/mpack/package.nix index 5fc18538ed0c..567fb303f7ce 100644 --- a/pkgs/by-name/mp/mpack/package.nix +++ b/pkgs/by-name/mp/mpack/package.nix @@ -94,7 +94,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utilities for encoding and decoding binary files in MIME"; license = licenses.free; - platforms = platforms.linux; maintainers = with maintainers; [ tomodachi94 ]; }; } diff --git a/pkgs/by-name/mp/mpd-discord-rpc/package.nix b/pkgs/by-name/mp/mpd-discord-rpc/package.nix index 589e27d4f32b..51578dd19063 100644 --- a/pkgs/by-name/mp/mpd-discord-rpc/package.nix +++ b/pkgs/by-name/mp/mpd-discord-rpc/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Rust application which displays your currently playing song / album / artist from MPD in Discord using Rich Presence"; diff --git a/pkgs/by-name/mp/mpfr/package.nix b/pkgs/by-name/mp/mpfr/package.nix index 79de1ab9de90..9874292c6f8a 100644 --- a/pkgs/by-name/mp/mpfr/package.nix +++ b/pkgs/by-name/mp/mpfr/package.nix @@ -13,7 +13,7 @@ # files. stdenv.mkDerivation rec { - version = "4.2.1"; + version = "4.2.2"; pname = "mpfr"; src = fetchurl { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "https://www.mpfr.org/${pname}-${version}/${pname}-${version}.tar.xz" "mirror://gnu/mpfr/${pname}-${version}.tar.xz" ]; - hash = "sha256-J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I="; + hash = "sha256-tnugOD736KhWNzTi6InvXsPDuJigHQD6CmhprYHGzgE="; }; outputs = [ diff --git a/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh b/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh index 6adad2b44076..be2203951c0f 100644 --- a/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh +++ b/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh @@ -55,19 +55,21 @@ setupMpiCheck() { # The solution is to use a preset cpu topology file and disable ucx model. # Disable sysfs cpu topology directory discovery. - export PRTE_MCA_hwloc_use_topo_file="@topology@" + export HWLOC_XMLFILE="@topology@" # Use the network model ob1 instead of ucx. export OMPI_MCA_pml=ob1 ;; MPICH) # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo + export HYDRA_IFACE="@iface@" # Disable sysfs cpu topology directory discovery. export HWLOC_XMLFILE="@topology@" ;; MVAPICH) # Disable CPU pinning export MV2_ENABLE_AFFINITY=0 + # Disable sysfs cpu topology directory discovery. + export HWLOC_XMLFILE="@topology@" ;; esac diff --git a/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix index a49e8e338bea..c771e87376fa 100644 --- a/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix +++ b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix @@ -1,9 +1,14 @@ -{ callPackage, makeSetupHook }: +{ + callPackage, + makeSetupHook, + stdenv, +}: makeSetupHook { name = "mpi-checkPhase-hook"; substitutions = { + iface = if stdenv.hostPlatform.isDarwin then "lo0" else "lo"; topology = ./topology.xml; }; } ./mpi-check-hook.sh diff --git a/pkgs/by-name/mp/mpris-notifier/package.nix b/pkgs/by-name/mp/mpris-notifier/package.nix index 6e52b2ecaa37..0bb272ac6609 100644 --- a/pkgs/by-name/mp/mpris-notifier/package.nix +++ b/pkgs/by-name/mp/mpris-notifier/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-5LDhxciLpDYd4isUQNx8LF3y7m6cfcuIF2atHj/kayg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Dependency-light, highly-customizable, XDG desktop notification generator for MPRIS status changes"; homepage = "https://github.com/l1na-forever/mpris-notifier"; diff --git a/pkgs/by-name/mq/mqttui/package.nix b/pkgs/by-name/mq/mqttui/package.nix index 01d4cddc5bbc..8a0f001b1788 100644 --- a/pkgs/by-name/mq/mqttui/package.nix +++ b/pkgs/by-name/mq/mqttui/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-gk5nA6np7dK4+j26aySNWfMZ9t/+7nZRaPsnhlDEnes="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; - meta = { description = "Terminal client for MQTT"; homepage = "https://github.com/EdJoPaTo/mqttui"; diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.json b/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.json new file mode 100644 index 000000000000..b15409a33258 --- /dev/null +++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.json @@ -0,0 +1,327 @@ +[ + { + "pname": "AutomaticGraphLayout", + "version": "1.1.12", + "hash": "sha256-Fe4pGr+Ln1FfgHD3Odq2WOTrhi2nD/jjnh2cKLC2pwo=" + }, + { + "pname": "AutomaticGraphLayout.Drawing", + "version": "1.1.12", + "hash": "sha256-KPyc4JxcQkGTeb5tceB3zRN8FqTj7jzimb97NOhZPl0=" + }, + { + "pname": "Avalonia", + "version": "11.0.0", + "hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E=" + }, + { + "pname": "Avalonia", + "version": "11.1.3", + "hash": "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0=" + }, + { + "pname": "Avalonia.Angle.Windows.Natives", + "version": "2.1.22045.20230930", + "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" + }, + { + "pname": "Avalonia.AvaloniaEdit", + "version": "11.1.0", + "hash": "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "0.0.28", + "hash": "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "0.0.29", + "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + }, + { + "pname": "Avalonia.Controls.ColorPicker", + "version": "11.1.3", + "hash": "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU=" + }, + { + "pname": "Avalonia.Controls.DataGrid", + "version": "11.1.3", + "hash": "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc=" + }, + { + "pname": "Avalonia.Desktop", + "version": "11.1.3", + "hash": "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w=" + }, + { + "pname": "Avalonia.Diagnostics", + "version": "11.1.3", + "hash": "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo=" + }, + { + "pname": "Avalonia.FreeDesktop", + "version": "11.1.3", + "hash": "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI=" + }, + { + "pname": "Avalonia.Native", + "version": "11.1.3", + "hash": "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.0.0", + "hash": "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.1.3", + "hash": "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk=" + }, + { + "pname": "Avalonia.Skia", + "version": "11.1.3", + "hash": "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM=" + }, + { + "pname": "Avalonia.Themes.Fluent", + "version": "11.1.3", + "hash": "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8=" + }, + { + "pname": "Avalonia.Themes.Simple", + "version": "11.1.3", + "hash": "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM=" + }, + { + "pname": "Avalonia.Win32", + "version": "11.1.3", + "hash": "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc=" + }, + { + "pname": "Avalonia.X11", + "version": "11.1.3", + "hash": "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw=" + }, + { + "pname": "DotUtils.StreamUtils.Sources", + "version": "0.0.8", + "hash": "sha256-KL5PkSsuZ9uPgtzK7rB0W6XGTcJQGqHoZqMLhpFR7tw=" + }, + { + "pname": "GuiLabs.Language.Xml", + "version": "1.2.93", + "hash": "sha256-4fvD+8QBxEpVqcQtZ+gE8GhY7Iaay4aFr5HWQ9LGeqk=" + }, + { + "pname": "HarfBuzzSharp", + "version": "7.3.0.2", + "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Linux", + "version": "7.3.0.2", + "hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.macOS", + "version": "7.3.0.2", + "hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", + "version": "7.3.0.2", + "hash": "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Win32", + "version": "7.3.0.2", + "hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo=" + }, + { + "pname": "MicroCom.Runtime", + "version": "0.11.0", + "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" + }, + { + "pname": "Microsoft.Build.Framework", + "version": "17.5.0", + "hash": "sha256-FVomTQ8rZ5Ga09piFxSDFQ+b3gpC2ddZd+pQBSn5Csw=" + }, + { + "pname": "Microsoft.Build.Tasks.Git", + "version": "8.0.0", + "hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA=" + }, + { + "pname": "Microsoft.Build.Utilities.Core", + "version": "17.5.0", + "hash": "sha256-W4bN0E9/DgEw0fxopXUhMK9tuGGwm0NYK3APytAzNRI=" + }, + { + "pname": "Microsoft.NET.StringTools", + "version": "17.5.0", + "hash": "sha256-9eoXaPQvt6YAeb+cK5/ekh3YFfjymZCzJAxsDsIPlMQ=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.SourceLink.Common", + "version": "8.0.0", + "hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc=" + }, + { + "pname": "Microsoft.SourceLink.GitHub", + "version": "8.0.0", + "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=" + }, + { + "pname": "Microsoft.Win32.Registry", + "version": "5.0.0", + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" + }, + { + "pname": "Microsoft.Win32.SystemEvents", + "version": "6.0.0", + "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" + }, + { + "pname": "Nerdbank.GitVersioning", + "version": "3.6.141", + "hash": "sha256-i1pBJ12vlPmde6qSQK4PG2QLSpjaUCoY+odTi24R5XI=" + }, + { + "pname": "NETStandard.Library", + "version": "2.0.3", + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" + }, + { + "pname": "Nullable", + "version": "1.3.1", + "hash": "sha256-5x5+l+7YhKjlBR9GEFKrZ8uewyB7eNxMAREwITDJmUM=" + }, + { + "pname": "SkiaSharp", + "version": "2.88.8", + "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=" + }, + { + "pname": "SkiaSharp.NativeAssets.Linux", + "version": "2.88.8", + "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y=" + }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "2.88.8", + "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI=" + }, + { + "pname": "SkiaSharp.NativeAssets.WebAssembly", + "version": "2.88.8", + "hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w=" + }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "2.88.8", + "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM=" + }, + { + "pname": "System.Buffers", + "version": "4.5.1", + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" + }, + { + "pname": "System.Buffers", + "version": "4.6.0", + "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc=" + }, + { + "pname": "System.Collections.Immutable", + "version": "8.0.0", + "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" + }, + { + "pname": "System.ComponentModel.Annotations", + "version": "4.5.0", + "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" + }, + { + "pname": "System.Configuration.ConfigurationManager", + "version": "6.0.0", + "hash": "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms=" + }, + { + "pname": "System.Drawing.Common", + "version": "6.0.0", + "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" + }, + { + "pname": "System.IO.Pipelines", + "version": "6.0.0", + "hash": "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA=" + }, + { + "pname": "System.Memory", + "version": "4.6.0", + "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.5.0", + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.6.0", + "hash": "sha256-fKS3uWQ2HmR69vNhDHqPLYNOt3qpjiWQOXZDHvRE1HU=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.1.0", + "hash": "sha256-NyqqpRcHumzSxpsgRDguD5SGwdUNHBbo0OOdzLTIzCU=" + }, + { + "pname": "System.Security.AccessControl", + "version": "5.0.0", + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" + }, + { + "pname": "System.Security.AccessControl", + "version": "6.0.0", + "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "6.0.0", + "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY=" + }, + { + "pname": "System.Security.Permissions", + "version": "6.0.0", + "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "5.0.0", + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" + }, + { + "pname": "System.Text.Encoding.CodePages", + "version": "6.0.0", + "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4=" + }, + { + "pname": "System.Windows.Extensions", + "version": "6.0.0", + "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM=" + }, + { + "pname": "Tmds.DBus.Protocol", + "version": "0.16.0", + "hash": "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98=" + } +] diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.nix deleted file mode 100644 index 34286768531c..000000000000 --- a/pkgs/by-name/ms/msbuild-structured-log-viewer/deps.nix +++ /dev/null @@ -1,332 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! -# TODO: This format file is obsolete, consider migrating to JSON. - -{ fetchNuGet }: -[ - (fetchNuGet { - pname = "AutomaticGraphLayout"; - version = "1.1.12"; - hash = "sha256-Fe4pGr+Ln1FfgHD3Odq2WOTrhi2nD/jjnh2cKLC2pwo="; - }) - (fetchNuGet { - pname = "AutomaticGraphLayout.Drawing"; - version = "1.1.12"; - hash = "sha256-KPyc4JxcQkGTeb5tceB3zRN8FqTj7jzimb97NOhZPl0="; - }) - (fetchNuGet { - pname = "Avalonia"; - version = "11.0.0"; - hash = "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="; - }) - (fetchNuGet { - pname = "Avalonia"; - version = "11.1.3"; - hash = "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0="; - }) - (fetchNuGet { - pname = "Avalonia.Angle.Windows.Natives"; - version = "2.1.22045.20230930"; - hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="; - }) - (fetchNuGet { - pname = "Avalonia.AvaloniaEdit"; - version = "11.1.0"; - hash = "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8="; - }) - (fetchNuGet { - pname = "Avalonia.BuildServices"; - version = "0.0.28"; - hash = "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="; - }) - (fetchNuGet { - pname = "Avalonia.BuildServices"; - version = "0.0.29"; - hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; - }) - (fetchNuGet { - pname = "Avalonia.Controls.ColorPicker"; - version = "11.1.3"; - hash = "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU="; - }) - (fetchNuGet { - pname = "Avalonia.Controls.DataGrid"; - version = "11.1.3"; - hash = "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc="; - }) - (fetchNuGet { - pname = "Avalonia.Desktop"; - version = "11.1.3"; - hash = "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w="; - }) - (fetchNuGet { - pname = "Avalonia.Diagnostics"; - version = "11.1.3"; - hash = "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo="; - }) - (fetchNuGet { - pname = "Avalonia.FreeDesktop"; - version = "11.1.3"; - hash = "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI="; - }) - (fetchNuGet { - pname = "Avalonia.Native"; - version = "11.1.3"; - hash = "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs="; - }) - (fetchNuGet { - pname = "Avalonia.Remote.Protocol"; - version = "11.0.0"; - hash = "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="; - }) - (fetchNuGet { - pname = "Avalonia.Remote.Protocol"; - version = "11.1.3"; - hash = "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk="; - }) - (fetchNuGet { - pname = "Avalonia.Skia"; - version = "11.1.3"; - hash = "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM="; - }) - (fetchNuGet { - pname = "Avalonia.Themes.Fluent"; - version = "11.1.3"; - hash = "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8="; - }) - (fetchNuGet { - pname = "Avalonia.Themes.Simple"; - version = "11.1.3"; - hash = "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM="; - }) - (fetchNuGet { - pname = "Avalonia.Win32"; - version = "11.1.3"; - hash = "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc="; - }) - (fetchNuGet { - pname = "Avalonia.X11"; - version = "11.1.3"; - hash = "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw="; - }) - (fetchNuGet { - pname = "DotUtils.StreamUtils.Sources"; - version = "0.0.8"; - hash = "sha256-KL5PkSsuZ9uPgtzK7rB0W6XGTcJQGqHoZqMLhpFR7tw="; - }) - (fetchNuGet { - pname = "GuiLabs.Language.Xml"; - version = "1.2.93"; - hash = "sha256-4fvD+8QBxEpVqcQtZ+gE8GhY7Iaay4aFr5HWQ9LGeqk="; - }) - (fetchNuGet { - pname = "HarfBuzzSharp"; - version = "7.3.0.2"; - hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="; - }) - (fetchNuGet { - pname = "HarfBuzzSharp.NativeAssets.Linux"; - version = "7.3.0.2"; - hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="; - }) - (fetchNuGet { - pname = "HarfBuzzSharp.NativeAssets.macOS"; - version = "7.3.0.2"; - hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="; - }) - (fetchNuGet { - pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; - version = "7.3.0.2"; - hash = "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c="; - }) - (fetchNuGet { - pname = "HarfBuzzSharp.NativeAssets.Win32"; - version = "7.3.0.2"; - hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="; - }) - (fetchNuGet { - pname = "MicroCom.Runtime"; - version = "0.11.0"; - hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; - }) - (fetchNuGet { - pname = "Microsoft.Build.Framework"; - version = "17.5.0"; - hash = "sha256-FVomTQ8rZ5Ga09piFxSDFQ+b3gpC2ddZd+pQBSn5Csw="; - }) - (fetchNuGet { - pname = "Microsoft.Build.Tasks.Git"; - version = "8.0.0"; - hash = "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA="; - }) - (fetchNuGet { - pname = "Microsoft.Build.Utilities.Core"; - version = "17.5.0"; - hash = "sha256-W4bN0E9/DgEw0fxopXUhMK9tuGGwm0NYK3APytAzNRI="; - }) - (fetchNuGet { - pname = "Microsoft.NET.StringTools"; - version = "17.5.0"; - hash = "sha256-9eoXaPQvt6YAeb+cK5/ekh3YFfjymZCzJAxsDsIPlMQ="; - }) - (fetchNuGet { - pname = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; - }) - (fetchNuGet { - pname = "Microsoft.SourceLink.Common"; - version = "8.0.0"; - hash = "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="; - }) - (fetchNuGet { - pname = "Microsoft.SourceLink.GitHub"; - version = "8.0.0"; - hash = "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="; - }) - (fetchNuGet { - pname = "Microsoft.Win32.Registry"; - version = "5.0.0"; - hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; - }) - (fetchNuGet { - pname = "Microsoft.Win32.SystemEvents"; - version = "6.0.0"; - hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; - }) - (fetchNuGet { - pname = "Nerdbank.GitVersioning"; - version = "3.6.141"; - hash = "sha256-i1pBJ12vlPmde6qSQK4PG2QLSpjaUCoY+odTi24R5XI="; - }) - (fetchNuGet { - pname = "NETStandard.Library"; - version = "2.0.3"; - hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; - }) - (fetchNuGet { - pname = "Nullable"; - version = "1.3.1"; - hash = "sha256-5x5+l+7YhKjlBR9GEFKrZ8uewyB7eNxMAREwITDJmUM="; - }) - (fetchNuGet { - pname = "SkiaSharp"; - version = "2.88.8"; - hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="; - }) - (fetchNuGet { - pname = "SkiaSharp.NativeAssets.Linux"; - version = "2.88.8"; - hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="; - }) - (fetchNuGet { - pname = "SkiaSharp.NativeAssets.macOS"; - version = "2.88.8"; - hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="; - }) - (fetchNuGet { - pname = "SkiaSharp.NativeAssets.WebAssembly"; - version = "2.88.8"; - hash = "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="; - }) - (fetchNuGet { - pname = "SkiaSharp.NativeAssets.Win32"; - version = "2.88.8"; - hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="; - }) - (fetchNuGet { - pname = "System.Buffers"; - version = "4.5.1"; - hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; - }) - (fetchNuGet { - pname = "System.Buffers"; - version = "4.6.0"; - hash = "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="; - }) - (fetchNuGet { - pname = "System.Collections.Immutable"; - version = "8.0.0"; - hash = "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="; - }) - (fetchNuGet { - pname = "System.ComponentModel.Annotations"; - version = "4.5.0"; - hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; - }) - (fetchNuGet { - pname = "System.Configuration.ConfigurationManager"; - version = "6.0.0"; - hash = "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="; - }) - (fetchNuGet { - pname = "System.Drawing.Common"; - version = "6.0.0"; - hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; - }) - (fetchNuGet { - pname = "System.IO.Pipelines"; - version = "6.0.0"; - hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; - }) - (fetchNuGet { - pname = "System.Memory"; - version = "4.6.0"; - hash = "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo="; - }) - (fetchNuGet { - pname = "System.Numerics.Vectors"; - version = "4.5.0"; - hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; - }) - (fetchNuGet { - pname = "System.Numerics.Vectors"; - version = "4.6.0"; - hash = "sha256-fKS3uWQ2HmR69vNhDHqPLYNOt3qpjiWQOXZDHvRE1HU="; - }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "6.1.0"; - hash = "sha256-NyqqpRcHumzSxpsgRDguD5SGwdUNHBbo0OOdzLTIzCU="; - }) - (fetchNuGet { - pname = "System.Security.AccessControl"; - version = "5.0.0"; - hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; - }) - (fetchNuGet { - pname = "System.Security.AccessControl"; - version = "6.0.0"; - hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; - }) - (fetchNuGet { - pname = "System.Security.Cryptography.ProtectedData"; - version = "6.0.0"; - hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="; - }) - (fetchNuGet { - pname = "System.Security.Permissions"; - version = "6.0.0"; - hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="; - }) - (fetchNuGet { - pname = "System.Security.Principal.Windows"; - version = "5.0.0"; - hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; - }) - (fetchNuGet { - pname = "System.Text.Encoding.CodePages"; - version = "6.0.0"; - hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; - }) - (fetchNuGet { - pname = "System.Windows.Extensions"; - version = "6.0.0"; - hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; - }) - (fetchNuGet { - pname = "Tmds.DBus.Protocol"; - version = "0.16.0"; - hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98="; - }) -] diff --git a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix index a73e70468cd7..8f81ae770063 100644 --- a/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix +++ b/pkgs/by-name/ms/msbuild-structured-log-viewer/package.nix @@ -27,7 +27,7 @@ buildDotnetModule (finalAttrs: rec { dotnet-runtime = dotnetCorePackages.runtime_8_0; projectFile = [ "src/StructuredLogViewer.Avalonia/StructuredLogViewer.Avalonia.csproj" ]; - nugetDeps = ./deps.nix; + nugetDeps = ./deps.json; # HACK: Clear out RuntimeIdentifiers that's set in StructuredLogViewer.Avalonia.csproj, otherwise our --runtime has no effect dotnetFlags = [ "-p:RuntimeIdentifiers=" ]; diff --git a/pkgs/by-name/ms/mscp/package.nix b/pkgs/by-name/ms/mscp/package.nix index f95b0a249d5f..978ea0c53a53 100644 --- a/pkgs/by-name/ms/mscp/package.nix +++ b/pkgs/by-name/ms/mscp/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mscp"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "upa"; repo = "mscp"; rev = "v${finalAttrs.version}"; - hash = "sha256-TWwvPLqGLhh/IE+hIz/jwaGLBoASs78Iqai1TxN7Wps="; + hash = "sha256-5lX0b3JfjmQh/HlESRMNxqCe2qFRAEZoazysoy252dY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ms/mslicer/package.nix b/pkgs/by-name/ms/mslicer/package.nix new file mode 100644 index 000000000000..9f288a65925f --- /dev/null +++ b/pkgs/by-name/ms/mslicer/package.nix @@ -0,0 +1,55 @@ +{ + fetchFromGitHub, + lib, + libglvnd, + libxkbcommon, + nix-update-script, + rustPlatform, + vulkan-loader, + wayland, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "mslicer"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "connorslade"; + repo = "mslicer"; + rev = finalAttrs.version; + hash = "sha256-VgbHFUQpxlQcYh3TNyw1IX7vyaWrHRxl4Oe5jake9Qg="; + }; + + cargoHash = "sha256-Bs/mQTMEQxRvKK9ibIAf4KLv9jzGv3hnduXFYEdjljc="; + + buildInputs = [ + libglvnd + libxkbcommon + vulkan-loader + wayland + ]; + + # Force linking to libEGL, which is always dlopen()ed, and to + # libwayland-client & libxkbcommon, which is dlopen()ed based on the + # winit backend. + NIX_LDFLAGS = [ + "--no-as-needed" + "-lEGL" + "-lvulkan" + "-lwayland-client" + "-lxkbcommon" + ]; + + strictDeps = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Experimental open source slicer for masked stereolithography (resin) printers"; + homepage = "https://connorcode.com/projects/mslicer"; + changelog = "https://github.com/connorslade/mslicer/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ colinsane ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/mu/muffon/package.nix b/pkgs/by-name/mu/muffon/package.nix index 5546b291ec43..70030c4925e8 100644 --- a/pkgs/by-name/mu/muffon/package.nix +++ b/pkgs/by-name/mu/muffon/package.nix @@ -7,10 +7,10 @@ let pname = "muffon"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { url = "https://github.com/staniel359/muffon/releases/download/v${version}/muffon-${version}-linux-x86_64.AppImage"; - hash = "sha256-GT91MLjBWsbk9P5fsIxlYUNziAPsdvMSPq9bLL3rKDw="; + hash = "sha256-VzT/jlNmUYFmUUqi8EzE4ilawezqhSgXHz32+S3FMTo="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; in diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index 7e7298dbaefe..c5e1089db53a 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -97,7 +97,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "14.0.9"; + version = "14.5"; sources = { x86_64-linux = fetchurl { @@ -109,7 +109,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-5mVplSTqXVTL+QSJg0hthKUL/JiwX3A3DC869HRzQ7M="; + hash = "sha256-uqwsDXbS8tfG/bgTQKvdiaPzchVhssoQccQStncNWOk="; }; }; @@ -249,7 +249,7 @@ stdenv.mkDerivation rec { # FONTCONFIG_FILE is required to make fontconfig read the MB # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 # indicates the system fonts.conf being used instead. - FONTCONFIG_FILE=$MB_IN_STORE/fontconfig/fonts.conf + FONTCONFIG_FILE=$MB_IN_STORE/fonts/fonts.conf substituteInPlace "$FONTCONFIG_FILE" \ --replace-fail 'fonts' "$MB_IN_STORE/fonts" diff --git a/pkgs/by-name/mu/multipass/multipassd.nix b/pkgs/by-name/mu/multipass/multipassd.nix index e328ca783914..2cc6f9b6fb06 100644 --- a/pkgs/by-name/mu/multipass/multipassd.nix +++ b/pkgs/by-name/mu/multipass/multipassd.nix @@ -24,7 +24,6 @@ qt6, slang, stdenv, - utf8proc, xterm, }: @@ -121,7 +120,6 @@ stdenv.mkDerivation { protobuf qt6.qtbase qt6.qtwayland - utf8proc ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix index 1e5957775ee7..afbdceac9b46 100644 --- a/pkgs/by-name/mu/muon/package.nix +++ b/pkgs/by-name/mu/muon/package.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "muon" + lib.optionalString embedSamurai "-embedded-samurai"; - version = "0.2.0"; + version = "0.4.0"; src = fetchFromSourcehut { name = "muon-src"; owner = "~lattis"; repo = "muon"; rev = finalAttrs.version; - hash = "sha256-ZHWyUV/BqM3ihauXDqDVkZURDDbBiRcEzptyGQmw94I="; + hash = "sha256-xTdyqK8t741raMhjjJBMbWnAorLMMdZ02TeMXK7O+Yw="; }; outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ]; @@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkgconf - samurai ] + ++ lib.optionals (!embedSamurai) [ samurai ] ++ lib.optionals buildDocs [ (python3.withPackages (ps: [ ps.pyyaml ])) scdoc @@ -43,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: { curl libarchive libpkgconf - samurai zlib ]; @@ -54,20 +53,25 @@ stdenv.mkDerivation (finalAttrs: { # URLs manually extracted from subprojects directory meson-docs-wrap = fetchurl { name = "meson-docs-wrap"; - url = "https://mochiro.moe/wrap/meson-docs-1.0.1-19-gdd8d4ee22.tar.gz"; - hash = "sha256-jHSPdLFR5jUeds4e+hLZ6JOblor5iuCV5cIwoc4K9gI="; + url = "https://github.com/muon-build/meson-docs/archive/5bc0b250984722389419dccb529124aed7615583.tar.gz"; + hash = "sha256-5MmmiZfadCuUJ2jy5Rxubwf4twX0jcpr+TPj5ssdSbM="; }; - samurai-wrap = fetchurl { - name = "samurai-wrap"; - url = "https://mochiro.moe/wrap/samurai-1.2-32-g81cef5d.tar.gz"; - hash = "sha256-aPMAtScqweGljvOLaTuR6B0A0GQQQrVbRviXY4dpCoc="; + meson-tests-wrap = fetchurl { + name = "meson-tests-wrap"; + url = "https://github.com/muon-build/meson-tests/archive/591b5a053f9aa15245ccbd1d334cf3f8031b1035.tar.gz"; + hash = "sha256-6GXfcheZyB/S/xl/j7pj5EAWtsmx4N0fVhLPMJ2wC/w="; }; in '' - pushd $sourceRoot/subprojects - ${lib.optionalString buildDocs "tar xvf ${meson-docs-wrap}"} - ${lib.optionalString embedSamurai "tar xvf ${samurai-wrap}"} + mkdir -p $sourceRoot/subprojects/meson-docs + pushd $sourceRoot/subprojects/meson-docs + ${lib.optionalString buildDocs "tar xvf ${meson-docs-wrap} --strip-components=1"} + popd + + mkdir -p $sourceRoot/subprojects/meson-tests + pushd $sourceRoot/subprojects/meson-tests + tar xvf ${meson-tests-wrap} --strip-components=1 popd ''; @@ -99,13 +103,15 @@ stdenv.mkDerivation (finalAttrs: { '' runHook preBuild - ./bootstrap.sh stage-1 + ${ + lib.optionalString (!embedSamurai) "CFLAGS=\"$CFLAGS -DBOOTSTRAP_NO_SAMU\"" + } ./bootstrap.sh stage-1 - ./stage-1/muon setup ${cmdlineForMuon} stage-2 - samu ${cmdlineForSamu} -C stage-2 + ./stage-1/muon-bootstrap setup ${cmdlineForMuon} stage-2 + ${lib.optionalString embedSamurai "./stage-1/muon-bootstrap"} samu ${cmdlineForSamu} -C stage-2 - stage-2/muon setup -Dprefix=$out ${cmdlineForMuon} stage-3 - samu ${cmdlineForSamu} -C stage-3 + ./stage-2/muon setup -Dprefix=$out ${cmdlineForMuon} stage-3 + ${lib.optionalString embedSamurai "./stage-2/muon"} samu ${cmdlineForSamu} -C stage-3 runHook postBuild ''; diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index 79fc67987ca6..50344eb22589 100644 --- a/pkgs/by-name/mu/mupdf/package.nix +++ b/pkgs/by-name/mu/mupdf/package.nix @@ -14,7 +14,6 @@ openjpeg, jbig2dec, libjpeg, - darwin, gumbo, enableX11 ? (!stdenv.hostPlatform.isDarwin), libX11, @@ -142,19 +141,10 @@ stdenv.mkDerivation rec { curl openssl ] - ++ lib.optionals enableGL ( - if stdenv.hostPlatform.isDarwin then - with darwin.apple_sdk.frameworks; - [ - GLUT - OpenGL - ] - else - [ - freeglut-mupdf - libGLU - ] - ) + ++ lib.optionals (enableGL && !stdenv.hostPlatform.isDarwin) [ + freeglut-mupdf + libGLU + ] ++ lib.optionals enableOcr [ leptonica tesseract diff --git a/pkgs/by-name/mu/music-player/package.nix b/pkgs/by-name/mu/music-player/package.nix index 74b80a8b36cb..da3a462c2790 100644 --- a/pkgs/by-name/mu/music-player/package.nix +++ b/pkgs/by-name/mu/music-player/package.nix @@ -2,7 +2,6 @@ lib, stdenv, alsa-lib, - darwin, fetchFromGitHub, pkg-config, protobuf, @@ -32,13 +31,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AudioUnit - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; meta = { description = "Extensible music player daemon written in Rust"; diff --git a/pkgs/by-name/mu/musikcube/package.nix b/pkgs/by-name/mu/musikcube/package.nix index 8c59e9833985..fa94ea6ff806 100644 --- a/pkgs/by-name/mu/musikcube/package.nix +++ b/pkgs/by-name/mu/musikcube/package.nix @@ -26,8 +26,6 @@ sndio, systemd, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, - # Darwin Dependencies - darwin, coreaudioSupport ? stdenv.hostPlatform.isDarwin, }: @@ -76,14 +74,6 @@ stdenv.mkDerivation (finalAttrs: { alsa-lib pulseaudio ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - SystemConfiguration - ] - ) - ++ lib.optionals coreaudioSupport (with darwin.apple_sdk.frameworks; [ CoreAudio ]) ++ lib.optionals sndioSupport [ sndio ] ++ lib.optionals pipewireSupport [ pipewire ]; diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix index 7e347bafcab7..473580df7738 100644 --- a/pkgs/by-name/mv/mvnd/package.nix +++ b/pkgs/by-name/mv/mvnd/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchFromGitHub, graalvmPackages, installShellFiles, @@ -40,7 +39,7 @@ maven.buildMavenPackage rec { graalvmPackages.graalvm-ce installShellFiles makeWrapper - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; + ]; mvnDepsParameters = mvnParameters; mvnParameters = lib.concatStringsSep " " [ diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix index f947e2c1f7ad..fb8ac6f7730a 100644 --- a/pkgs/by-name/my/mycelium/package.nix +++ b/pkgs/by-name/my/mycelium/package.nix @@ -2,9 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, openssl, - darwin, nixosTests, nix-update-script, versionCheckHook, @@ -27,10 +25,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-63AB63vmxXi6ugLCAOKI1eJcOB8XHWEiCc5yoIEqd+w="; nativeBuildInputs = [ versionCheckHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; doInstallCheck = true; diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 439e618e584a..16bc3620f3e0 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "myks"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${version}"; - hash = "sha256-B2arJ7m7q/vf1YcaYquhkBU3anekZAwRd1ZIvwvYnmM="; + hash = "sha256-bjry2szn4bOGsIeJl221T+6aV+MW9yXQcLBS3sJcswQ="; }; - vendorHash = "sha256-/LpBb0wbK7OP8HmL2/uMVeilIs4P51Pf+sg23zbPqtI="; + vendorHash = "sha256-kUOjbBosj2u25n/fGoC0DpAYkWIgoxIfkXJlNpRALfw="; subPackages = "."; diff --git a/pkgs/tools/games/mymcplus/default.nix b/pkgs/by-name/my/mymcplus/package.nix similarity index 100% rename from pkgs/tools/games/mymcplus/default.nix rename to pkgs/by-name/my/mymcplus/package.nix diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix index 3d716c572134..a6c8196d8f16 100644 --- a/pkgs/by-name/my/mympd/package.nix +++ b/pkgs/by-name/my/mympd/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "20.1.2"; + version = "20.1.3"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-u4Ne32gKkA1bFOIaa3uFEMxjhERXTVpqnnCBXQktDAs="; + sha256 = "sha256-CLhlGwr7W3GW8V+wqMXHfKbU2dmMWlgEmo4QohcPAwo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix index bdddda7e3124..d0e39e5dccea 100644 --- a/pkgs/by-name/my/mysql84/package.nix +++ b/pkgs/by-name/my/mysql84/package.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.4.4"; + version = "8.4.5"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-+ykO90iJRDQIUknDG8pSrHGFMSREarIYuzvFAr8AgqU="; + hash = "sha256-U2OVkqcgpxn9+t8skhuUfqyGwG4zMgLkdmeFKleBvRo="; }; nativeBuildInputs = [ @@ -72,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools - darwin.apple_sdk.frameworks.CoreServices darwin.developer_cmds darwin.DarwinTools ]; diff --git a/pkgs/by-name/na/naps2/deps.json b/pkgs/by-name/na/naps2/deps.json index a3cda59b5a45..27042ebac4a3 100644 --- a/pkgs/by-name/na/naps2/deps.json +++ b/pkgs/by-name/na/naps2/deps.json @@ -2,876 +2,711 @@ { "pname": "AtkSharp", "version": "3.24.24.95", - "sha256": "0x4nr8rx50h87n6ijv5a4vkavs2x61bsrkxvam27h178finmc1rn" + "hash": "sha256-NgdWbXToBHhEVbvPrFcwXeit5iaqbBmNPQiC0jPKlnQ=" }, { "pname": "Autofac", "version": "8.0.0", - "sha256": "0w3y76vik6rfr9am649v4w6dyyp5s25244q3il2x8si11xgl6y7d" + "hash": "sha256-7XhDXw8hatQFjQMTIorQ5XrfDCc7EVNVyi6bGbc5fnA=" }, { "pname": "Ben.Demystifier", "version": "0.4.1", - "sha256": "1szlrhvwpwkjhpgvjlrpjg714bz1yhyljs72pxni3li4mgnklk1f" + "hash": "sha256-Lkw67ask0hFtv+JoST304S8SzpM3U7nfhXLyyzfM9Os=" }, { "pname": "CairoSharp", "version": "3.24.24.95", - "sha256": "05fq8jdlxzrrw7gh0i3w272q34wzmb3bizcghjnf9mlh1jcn1iy9" + "hash": "sha256-ycdgmQyQ1uSshI/9uMaqn5OBxRF8RADf4Tn/TptE2BU=" }, { "pname": "CommandLineParser", "version": "2.9.1", - "sha256": "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582" + "hash": "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo=" }, { "pname": "EmbedIO", "version": "3.5.2", - "sha256": "13saxicm07nkppzfxb60cpm1501n4ixaqhkvvqqfaqgifma9z8bv" + "hash": "sha256-e6GfVHXxYeUw3ntCrHokNoAS6mXArO7+vdMeUFnsSo8=" }, { "pname": "Eto.Forms", "version": "2.8.3", - "sha256": "00v2ffi9sl8cjllrz8rw3a5s5cgm9bfh45852znwz18zp06rh5bg" + "hash": "sha256-bxWYDbgfhc/tFwUVAt1K9bGiixo8o58plQxRnaJzYgM=" }, { "pname": "Eto.Platform.Gtk", "version": "2.8.3", - "sha256": "0av22hyx6xf6cnm89a4jvpnm80h1p6a6301r4n2906ihai9k3gsk" + "hash": "sha256-U78xU1QwGpCEJTmAYZS5AQJU7d2SqISqZcZ10z0UYis=" }, { "pname": "GdkSharp", "version": "3.24.24.95", - "sha256": "1wp2kgng0pwg8q5bl1zz4lzzj603qcjljql61h83bxa60q7c121m" + "hash": "sha256-NYjADgZG9TUQDIZiSSXDAxj5PyX/B7oKRo9f8Oyb4vI=" }, { "pname": "GioSharp", "version": "3.24.24.95", - "sha256": "121xb98hg955vwxfv1r5idr5a2zv09xpcmqckm7hhgprlzhz2cg5" + "hash": "sha256-5THx4af5PghPnQxXdnsC+wtVcoslh+0636WkB1FaPYg=" }, { "pname": "GLibSharp", "version": "3.24.24.95", - "sha256": "1l5nbg0qwjp55wfj06vnk5q5r5cnq5h064qp4k5xf8qlma8d346n" + "hash": "sha256-1pDRkKoUI9fLJBcTA2DBlpVccJl2GyAdL+VKjsFbttA=" }, { "pname": "Google.Protobuf", "version": "3.25.1", - "sha256": "0zcw9vmv2bdai3zaip86s37lj3r5z4zvcs9mf5a9nih0hy4gzwsi" + "hash": "sha256-UfP/iIcARptUcTVptj/5JQ9Jz9AG3aj+iKotsetOnH0=" }, { "pname": "Grpc.Core.Api", "version": "2.59.0", - "sha256": "0pajrxg0dsfnyxwrd2li5nrabz0r3b3bql776l44hn5rg1s1287k" + "hash": "sha256-8yARdHi5WEgINedQvMYaGfylsi2RipZ599bpBl7PUl0=" }, { "pname": "Grpc.Tools", - "version": "2.62.0", - "sha256": "1x6ydsvjckxdpnrl07h307wql5gghlb4fasf591ppr16kv5igdfp" + "version": "2.65.0", + "hash": "sha256-Nzpq4DIBnhZ7kX+/bwqUSMDa5NJB52iKuXARYnM5yZw=" }, { "pname": "GrpcDotNetNamedPipes", "version": "3.0.0", - "sha256": "1sndscz12dldjfvifp04ml56fkbl1vwb9llzq0h58hwri35nnbv7" + "hash": "sha256-Zy9ry4iZQ1QgwJ/StPgOdE1nCq0EXBe3k402ET7Tzeo=" }, { "pname": "GtkSharp", "version": "3.24.24.95", - "sha256": "0y20zn8wv72dg2bc7f95l8iz8z51ap08q5gnv6f2xnhz8zjf86xh" + "hash": "sha256-sBvk5Ecf2i6c2fYVjMBVoXz0I6IlucOWeE2czZH9QHg=" }, { "pname": "IsExternalInit", "version": "1.0.3", - "sha256": "01flcxs8m7m916s5rx5iyvzh6fjdl1dvcyzl9cpzn0d17yp8dz2i" + "hash": "sha256-UfyGrj+hAfsvS/R7tlugTToD//ax9Fy0CameinRn1AU=" }, { "pname": "Makaretu.Dns", "version": "2.0.1", - "sha256": "1l6ajfdcvqpz078wl6nm44bnhd8h47nssb5qgp5al9zqic50mqnd" - }, - { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "7.0.0", - "sha256": "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm" + "hash": "sha256-zeIKCov4J6rKfbgsre0hEDVoFyHVGsrRAf/izZqTytA=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "8.0.0", - "sha256": "0z4jq5prnxyb4p3163yxx35znpd2msjd8hw8ysmv4ah90f5sd9gm" - }, - { - "pname": "Microsoft.Extensions.Configuration", - "version": "2.1.0", - "sha256": "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2" - }, - { - "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "2.1.0", - "sha256": "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd" + "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", "version": "8.0.0", - "sha256": "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71" - }, - { - "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "2.1.0", - "sha256": "0x1888w5ypavvszfmpja9krgc64527prs75vm8xbf9fv3rgsplql" + "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" }, { "pname": "Microsoft.Extensions.DependencyInjection", "version": "8.0.0", - "sha256": "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "2.1.0", - "sha256": "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s" + "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "8.0.0", - "sha256": "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg" + "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "8.0.1", - "sha256": "1wyhpamm1nqjfi3r463dhxljdlr6rm2ax4fvbgq2s0j3jhpdhd4p" - }, - { - "pname": "Microsoft.Extensions.Logging", - "version": "2.1.0", - "sha256": "0dii8i7s6libfnspz2xb96ayagb4rwqj2kmr162vndivr9rmbm06" + "hash": "sha256-lzTYLpRDAi3wW9uRrkTNJtMmaYdtGJJHdBLbUKu60PM=" }, { "pname": "Microsoft.Extensions.Logging", "version": "8.0.0", - "sha256": "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i" - }, - { - "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "2.1.0", - "sha256": "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj" + "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "8.0.0", - "sha256": "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6" + "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "8.0.1", - "sha256": "0i9pgmk60b8xlws3q9z890gim1xjq42dhyh6dj4xvbycmgg1x1sd" - }, - { - "pname": "Microsoft.Extensions.Options", - "version": "2.1.0", - "sha256": "0w9644sryd1c6r3n4lq2cgd5pn6jl3k5m38a05m7vjffa4m2spd2" + "hash": "sha256-TYce3qvMr92JbAZ62ATBsocaH0joJzw0px0tYGZ9N0U=" }, { "pname": "Microsoft.Extensions.Options", "version": "8.0.0", - "sha256": "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz" - }, - { - "pname": "Microsoft.Extensions.Primitives", - "version": "2.1.0", - "sha256": "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb" + "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw=" }, { "pname": "Microsoft.Extensions.Primitives", "version": "8.0.0", - "sha256": "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm" + "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" }, { "pname": "Microsoft.NETCore.App", "version": "2.1.30", - "sha256": "10brwj7csacwa4ra37pjb2bqwg961lxi576330xlhhwqixkjkrqf" + "hash": "sha256-DucpZ4+YQ0g7GMOcEjsNJj2Ol1jynqEyUZwpzY7keYE=" }, { "pname": "Microsoft.NETCore.DotNetAppHost", "version": "2.1.30", - "sha256": "0rabvmid1n604pk9rndlq62zqhq77p7cznmq9bzr7hshvr2rszab" + "hash": "sha256-S32dRd5Qw5P/Srjaz849B0P8hcG02ZzmJcDY0GLdS2U=" }, { "pname": "Microsoft.NETCore.DotNetHostPolicy", "version": "2.1.30", - "sha256": "1zk6ajalssvpm2yv4ri3g6hbxjaj1ns0y4w3g98wss54k7v44vpw" + "hash": "sha256-/G5C9pmkaM1ReoMTD7QNUsm+oHkjZrK9qHdrTZVUZv4=" }, { "pname": "Microsoft.NETCore.DotNetHostResolver", "version": "2.1.30", - "sha256": "0k3k6ldi5lj9ab9bdnhzfiykr6ipwz17d9g952bcanhvmk57l376" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" + "hash": "sha256-5gx6yqwbWsWWKOmldsLnN5o8fXQf2rbSUknSEhs1c0w=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.1", - "sha256": "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj" + "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "2.1.14", - "sha256": "0mbmcgsky65y0xai4xjfnhm07kn856y9kpn6hnm1b5m3mdsf8dkq" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "5.0.0", - "sha256": "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc" + "hash": "sha256-eDbkdKujlhWqhcbembwpyM4DKrROdhJVB74YP/VjdVU=" }, { "pname": "Microsoft.NETCore.Targets", "version": "1.1.0", - "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh" + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, { "pname": "Microsoft.NETCore.Targets", "version": "2.0.0", - "sha256": "0nsrrhafvxqdx8gmlgsz612bmlll2w3l2qn2ygdzr92rp1nqyka2" - }, - { - "pname": "Microsoft.NETFramework.ReferenceAssemblies", - "version": "1.0.3", - "sha256": "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl" - }, - { - "pname": "Microsoft.NETFramework.ReferenceAssemblies.net462", - "version": "1.0.3", - "sha256": "08bfss2p262d8zj41xqndv0qgvz9lq636k2xhl80jl23ay22lsgf" + "hash": "sha256-Qk2PbbhZpPzb88JiQQcXlNK6RDBfP1of6g337RTMWVs=" }, { "pname": "Microsoft.Win32.Primitives", "version": "4.3.0", - "sha256": "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq" - }, - { - "pname": "Microsoft.Win32.Registry", - "version": "5.0.0", - "sha256": "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n" + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" }, { "pname": "MimeKitLite", - "version": "4.4.0", - "sha256": "1am381zbh89qa520pllsa92by92lg6wn0zxhqa26z7mlh6jwc8nz" + "version": "4.7.1", + "hash": "sha256-vxCSs9w+xQDsUM8OiyCg6VmBi2twmqsD2BTJ1ESHLo8=" }, { "pname": "NAPS2.Mdns", "version": "1.0.1", - "sha256": "0xi46brppcjm8mrabnffahkmkcakhw94cnq1w2yk8y2hyq9qb4ms" + "hash": "sha256-upKFE/ZQeDS94AFbRhKHU7FZJ1TO2aVyRVWye/MyJHY=" }, { "pname": "NAPS2.NTwain", "version": "1.0.0", - "sha256": "088dw31h7rlgr0s05snm382wz65wi46yaizjnjpd0wzw2mb58yld" + "hash": "sha256-jXpUVhX8c9CutPJH5Q2JvJjPBRrV6gI0yI/mA8PgDSE=" }, { "pname": "NAPS2.Pdfium.Binaries", "version": "1.1.0", - "sha256": "0rnqkk6y047p6a6li2dr2cygkhjn3d2a13yn3rck5gf854k3q3ws" + "hash": "sha256-mg88JinIvTJZHtaPoEQbVsL5PBO5iUiNMvcQ4M2c2GY=" }, { "pname": "NAPS2.PdfSharp", "version": "1.0.1", - "sha256": "0x51whjhlqd5r0f1s5hjx41zzwwcwcdl19q6iz6k7fwx81746w0w" + "hash": "sha256-HHBDTkCduzPNjwanQBvjjPP/A+kSFh0cyKVhCiXkoXQ=" }, { "pname": "NAPS2.Tesseract.Binaries", "version": "1.2.0", - "sha256": "0m1aksfjg4vfl2llvhd2in0a5i4wa72nmfw2h78y4wwxmjplbfz2" + "hash": "sha256-4rtFr6ydc+LRgYK7asVRnMSigI2iwU2poG6TJ52eKlQ=" }, { "pname": "NAPS2.Wia", "version": "2.0.3", - "sha256": "0xszkccb8fy2x60nkblpda78wx2d86fn8y49j94qmvz4rp2nw98i" + "hash": "sha256-ESVuxc3k74pJkol4ZJ1BTXSOjmqXrmmB6cI7tBibX3c=" }, { "pname": "NETStandard.Library", "version": "2.0.3", - "sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y" + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" }, { "pname": "Newtonsoft.Json", "version": "13.0.3", - "sha256": "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7" + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" }, { "pname": "NLog", - "version": "5.2.8", - "sha256": "1z3h20m5rjnizm1jbf5j0vpdc1f373rzzkg6478p1lxv5j385c12" + "version": "5.3.2", + "hash": "sha256-b/y/IFUSe7qsSeJ8JVB0VFmJlkviFb8h934ktnn9Fgc=" }, { "pname": "NLog.Extensions.Logging", - "version": "5.3.8", - "sha256": "1qnz91099f51vk7f5g2ig0041maw5hcbyqllxvj5zj7zkp0qw9b8" + "version": "5.3.11", + "hash": "sha256-DP3R51h+9kk06N63U+1C4/JCZTFiADeYTROToAA2R0g=" }, { "pname": "PangoSharp", "version": "3.24.24.95", - "sha256": "0548jrkgzia899va9smhh7if49nk6avbswb68xmc52k37lins6b2" + "hash": "sha256-YhltIz1jisJqR2ZxvbYy0ybi4oGw6qR2SkjF/2aWiBQ=" }, { "pname": "Polyfill", - "version": "4.2.0", - "sha256": "0h25jszwrkmxlklcr6mjjmz71rn6q36pqb5jx36l94lrccy2k0a8" + "version": "4.9.0", + "hash": "sha256-oTnmSAwMbxPFhzqBBrcSej0Nd3BKSX1kh0iwih2Iquo=" }, { "pname": "runtime.any.System.Collections", "version": "4.3.0", - "sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0" + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" }, { "pname": "runtime.any.System.Diagnostics.Tracing", "version": "4.3.0", - "sha256": "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn" + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" }, { "pname": "runtime.any.System.Globalization", "version": "4.3.0", - "sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x" + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" }, { "pname": "runtime.any.System.Globalization.Calendars", "version": "4.3.0", - "sha256": "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201" + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" }, { "pname": "runtime.any.System.IO", "version": "4.3.0", - "sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x" + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" }, { "pname": "runtime.any.System.Reflection", "version": "4.3.0", - "sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly" + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" }, { "pname": "runtime.any.System.Reflection.Primitives", "version": "4.3.0", - "sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf" + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" }, { "pname": "runtime.any.System.Resources.ResourceManager", "version": "4.3.0", - "sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl" + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" }, { "pname": "runtime.any.System.Runtime", "version": "4.3.0", - "sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b" + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" }, { "pname": "runtime.any.System.Runtime.Handles", "version": "4.3.0", - "sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x" + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" }, { "pname": "runtime.any.System.Runtime.InteropServices", "version": "4.3.0", - "sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19" + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" }, { "pname": "runtime.any.System.Text.Encoding", "version": "4.3.0", - "sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3" + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" }, { "pname": "runtime.any.System.Text.Encoding.Extensions", "version": "4.3.0", - "sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8" + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" }, { "pname": "runtime.any.System.Threading.Tasks", "version": "4.3.0", - "sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va" + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" }, { "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i" + "hash": "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c=" }, { "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r" + "hash": "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg=" }, { "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3" + "hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA=" }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.App", "version": "2.1.30", - "sha256": "039r4c42mz8fg8nqn8p3v0dxnjv681xlllhrc4l91rbbwv04li6j" + "hash": "sha256-0kRKwOZr5ZAoYRlSSntAZkvbG9jjIosteg79KggjOQ0=" }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost", "version": "2.1.30", - "sha256": "00pm387jvv574jsdd1261mbvxd7lbjbsfx3wq0z0iqjhr31pgmw1" + "hash": "sha256-gdd3w8hQ4gg+wHx0p5dc9LS+Vw1GhNa0JKfsLQ8a9QI=" }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy", "version": "2.1.30", - "sha256": "1gjjs4xvg9x48lg00ys6r5vc00s973aknpqp0ffa946s8m8xhlfw" + "hash": "sha256-3FHYUUXakKScAxdfO9U4SQPAdslGewAeRaSntzvRUr4=" }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver", "version": "2.1.30", - "sha256": "0jyzw9wr9sgllgj08vdf716p27s13ad46nah2q1qmfa05cgdbikb" + "hash": "sha256-a8bVHitAuYoDFlBZQ5oaQR9xTTiubQTko/TplHni30s=" }, { "pname": "runtime.linux-x64.Microsoft.NETCore.App", "version": "2.1.30", - "sha256": "1wy9kagwj6avvhpp4lrlxw5sqgh4zlmii9wvf474fx999szi5bqb" + "hash": "sha256-C68Sv04pdUcOcZunGCv9BD6sC+80U3Iv3FsZyZ+ayfM=" }, { "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost", "version": "2.1.30", - "sha256": "0mrlvhm6yb3x40pfm4smi67p6wm3hi71jdnawqkqy73g203rjmgx" + "hash": "sha256-/VWZBxBvHI8n5so2GU6Eo3Jzj4lVk+ouIH0sbyrcNFc=" }, { "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy", "version": "2.1.30", - "sha256": "1zv9i8wqpsdr2vx35i3qzad1yvz00l6i9f00fclw02v2p92jz9c1" + "hash": "sha256-gaUvRbpiC8ApcwC4FA0F4G8fmvp4xDL6FrnpizmKaf8=" }, { "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver", "version": "2.1.30", - "sha256": "1s6zx2hpg60pscvz8yfdkxpdg1lhs534x5mz3yryxa91nfzhxv95" + "hash": "sha256-Je0Ov7Mhqe6zH7+WTkbRkIbXbp/NefQ30xeYd6Ho3+g=" }, { "pname": "runtime.native.System", "version": "4.3.0", - "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4" + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" }, { "pname": "runtime.native.System.Net.Http", "version": "4.3.0", - "sha256": "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk" + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" }, { "pname": "runtime.native.System.Security.Cryptography.Apple", "version": "4.3.0", - "sha256": "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q" + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" }, { "pname": "runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6" + "hash": "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8=" }, { "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438" + "hash": "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ=" }, { "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj" + "hash": "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY=" }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", "version": "4.3.0", - "sha256": "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi" + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6" + "hash": "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U=" }, { "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1" + "hash": "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI=" }, { "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi" + "hash": "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU=" }, { "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w" + "hash": "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA=" }, { "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.2", - "sha256": "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c" + "hash": "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q=" }, { "pname": "runtime.unix.Microsoft.Win32.Primitives", "version": "4.3.0", - "sha256": "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id" + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" }, { "pname": "runtime.unix.System.Diagnostics.Debug", "version": "4.3.0", - "sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5" + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" }, { "pname": "runtime.unix.System.IO.FileSystem", "version": "4.3.0", - "sha256": "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix" + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" }, { "pname": "runtime.unix.System.Net.Primitives", "version": "4.3.0", - "sha256": "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4" + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" }, { "pname": "runtime.unix.System.Private.Uri", "version": "4.3.0", - "sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk" + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" }, { "pname": "runtime.unix.System.Runtime.Extensions", "version": "4.3.0", - "sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p" + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" }, { "pname": "SharpZipLib", "version": "1.4.2", - "sha256": "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y" + "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY=" }, { "pname": "SimpleBase", "version": "1.3.1", - "sha256": "0mjvqbn3b6ai7nhzs5mssy2imn9lw10z4sj8nhgiapyqy9qlim0n" + "hash": "sha256-FtRIcfLYXxUftEhq8kHgNNkahde6Fv2hPVGZNezCW1Y=" }, { "pname": "SixLabors.Fonts", "version": "1.0.1", - "sha256": "08ljgagwm8aha9p4plqdnf507gcisajd9frcbvaykikrsrzpm33y" + "hash": "sha256-fox6f9Z5xunVXiy71KTSkb0DirMN00tuUlChyp96kiI=" }, { "pname": "StandardSocketsHttpHandler", "version": "2.2.0.8", - "sha256": "18h3rzh9pp3b6mjx1m4jvwwhv5abjqsd1nnbibc0gbkvbcrb16ni" + "hash": "sha256-0ZqwMlt7rgfYisva0DSWS5UNOd+S1NBlNWvcm+DPA6I=" }, { "pname": "System.Buffers", "version": "4.3.0", - "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy" - }, - { - "pname": "System.Buffers", - "version": "4.4.0", - "sha256": "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19" - }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3" + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" }, { "pname": "System.Collections", "version": "4.3.0", - "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9" + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" }, { "pname": "System.Collections.Concurrent", "version": "4.3.0", - "sha256": "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8" - }, - { - "pname": "System.Collections.Immutable", - "version": "5.0.0", - "sha256": "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r" + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" }, { "pname": "System.Collections.Immutable", "version": "8.0.0", - "sha256": "0z53a42zjd59zdkszcm7pvij4ri5xbb8jly9hzaad9khlf69bcqp" - }, - { - "pname": "System.ComponentModel.Annotations", - "version": "5.0.0", - "sha256": "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j" + "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" }, { "pname": "System.Diagnostics.Debug", "version": "4.3.0", - "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y" + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "4.3.0", - "sha256": "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq" + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "7.0.2", - "sha256": "1h97ikph775gya93qsjjaka87qcygbyh1064rh1hnfcnp5xv0ipi" + "hash": "sha256-8Uawe7mWOQsDzMSAAP16nuGD1FRSajyS8q+cA++MJ8E=" }, { "pname": "System.Diagnostics.Tracing", "version": "4.3.0", - "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4" + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" }, { "pname": "System.Globalization", "version": "4.3.0", - "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki" + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" }, { "pname": "System.Globalization.Calendars", "version": "4.3.0", - "sha256": "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq" + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" }, { "pname": "System.Globalization.Extensions", "version": "4.3.0", - "sha256": "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls" + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" }, { "pname": "System.IO", "version": "4.3.0", - "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f" + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" }, { "pname": "System.IO.FileSystem", "version": "4.3.0", - "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw" + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" }, { "pname": "System.IO.FileSystem.Primitives", "version": "4.3.0", - "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c" + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" }, { "pname": "System.Linq", "version": "4.3.0", - "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7" - }, - { - "pname": "System.Memory", - "version": "4.5.0", - "sha256": "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30" - }, - { - "pname": "System.Memory", - "version": "4.5.1", - "sha256": "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c" - }, - { - "pname": "System.Memory", - "version": "4.5.4", - "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y" + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" }, { "pname": "System.Memory", "version": "4.5.5", - "sha256": "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h" + "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" }, { "pname": "System.Net.Http", "version": "4.3.4", - "sha256": "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl" + "hash": "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00=" }, { "pname": "System.Net.Primitives", "version": "4.3.0", - "sha256": "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii" - }, - { - "pname": "System.Numerics.Vectors", - "version": "4.4.0", - "sha256": "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba" - }, - { - "pname": "System.Numerics.Vectors", - "version": "4.5.0", - "sha256": "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59" + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" }, { "pname": "System.Private.Uri", "version": "4.3.0", - "sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx" + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" }, { "pname": "System.Reflection", "version": "4.3.0", - "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m" + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, { "pname": "System.Reflection.Metadata", "version": "5.0.0", - "sha256": "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss" + "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8=" }, { "pname": "System.Reflection.Primitives", "version": "4.3.0", - "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276" + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" }, { "pname": "System.Resources.Extensions", "version": "8.0.0", - "sha256": "0chqkw486pb5dg9nlj5352lsz1206xyf953nd98dglia3isxklg5" + "hash": "sha256-5dHZdRwq0tdQanaU5Hw3QISvqSijSGrTa2VdgwifGDI=" }, { "pname": "System.Resources.ResourceManager", "version": "4.3.0", - "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49" + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" }, { "pname": "System.Runtime", "version": "4.3.0", - "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.0", - "sha256": "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.2", - "sha256": "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.3", - "sha256": "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.7.0", - "sha256": "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc" + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" }, { "pname": "System.Runtime.Extensions", "version": "4.3.0", - "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60" + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" }, { "pname": "System.Runtime.Handles", "version": "4.3.0", - "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8" + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" }, { "pname": "System.Runtime.InteropServices", "version": "4.3.0", - "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j" + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" }, { "pname": "System.Runtime.Numerics", "version": "4.3.0", - "sha256": "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z" - }, - { - "pname": "System.Security.AccessControl", - "version": "5.0.0", - "sha256": "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r" + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" }, { "pname": "System.Security.Cryptography.Algorithms", "version": "4.3.0", - "sha256": "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml" + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" }, { "pname": "System.Security.Cryptography.Cng", "version": "4.3.0", - "sha256": "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv" + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" }, { "pname": "System.Security.Cryptography.Csp", "version": "4.3.0", - "sha256": "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1" + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" }, { "pname": "System.Security.Cryptography.Encoding", "version": "4.3.0", - "sha256": "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32" + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" }, { "pname": "System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc" + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" }, { "pname": "System.Security.Cryptography.Primitives", "version": "4.3.0", - "sha256": "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby" + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" }, { "pname": "System.Security.Cryptography.ProtectedData", "version": "8.0.0", - "sha256": "1ysjx3b5ips41s32zacf4vs7ig41906mxrsbmykdzi0hvdmjkgbx" + "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs=" }, { "pname": "System.Security.Cryptography.X509Certificates", "version": "4.3.0", - "sha256": "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8" + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" }, { "pname": "System.Text.Encoding", "version": "4.3.0", - "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr" - }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "8.0.0", - "sha256": "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y" + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" }, { "pname": "System.Text.Encoding.Extensions", "version": "4.3.0", - "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy" + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" }, { "pname": "System.Threading", "version": "4.3.0", - "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34" + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" }, { "pname": "System.Threading.Tasks", "version": "4.3.0", - "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7" + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, { "pname": "System.Threading.Tasks.Dataflow", - "version": "8.0.0", - "sha256": "02mmqnbd7ybin1yiffrq3ph71rsbrnf6r6m01j98ynydqfscz9s3" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.2", - "sha256": "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "sha256": "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153" + "version": "8.0.1", + "hash": "sha256-hgCfF91BDd/eOtLEd5jhjzgJdvwmVv4/b42fXRr3nvo=" }, { "pname": "System.ValueTuple", "version": "4.5.0", - "sha256": "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy" + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" }, { "pname": "Unosquare.Swan.Lite", "version": "3.1.0", - "sha256": "0yjbchc2rhgssfvb1qxg3kq3lzyx089r3rngpcjgrkw85bf0vgrw" + "hash": "sha256-PL8N3CqIz/wku8/mkRMC3X868Byv47C20/rBLBhkS3o=" }, { "pname": "ZXing.Net", "version": "0.16.9", - "sha256": "0bpki21p2wjjjviayhza0gam7s9lm7qj6g8hdcp2csd0mv54l980" + "hash": "sha256-ACVKyq6gaSYuaxA9I/GpNOlT1QPqQ6/illJycYOI8y4=" } ] diff --git a/pkgs/by-name/na/naps2/package.nix b/pkgs/by-name/na/naps2/package.nix index 591aafe787e6..d77a05a479ac 100644 --- a/pkgs/by-name/na/naps2/package.nix +++ b/pkgs/by-name/na/naps2/package.nix @@ -4,6 +4,7 @@ buildDotnetModule, dotnetCorePackages, fetchFromGitHub, + wrapGAppsHook3, gtk3, gdk-pixbuf, glib, @@ -13,34 +14,35 @@ buildDotnetModule rec { pname = "naps2"; - version = "7.4.3"; + version = "7.5.3"; src = fetchFromGitHub { owner = "cyanfish"; repo = "naps2"; - rev = "v${version}"; - hash = "sha256-/qSfxGHcCSoNp516LFYWgEL4csf8EKgtSffBt1C02uE="; + tag = "v${version}"; + hash = "sha256-vX+ZyCQsYqJjgYaufWJRnzX8retiFK5QHSP40bbBaCc="; }; projectFile = "NAPS2.App.Gtk/NAPS2.App.Gtk.csproj"; nugetDeps = ./deps.json; + postPatch = '' + substituteInPlace NAPS2.Images.Gtk/NAPS2.Images.Gtk.csproj \ + --replace-fail TargetFramework TargetFrameworks \ + ''; + + dotnetFlags = [ + "-p:TargetFrameworks=net8" + "-p:EnablePreviewFeatures=true" + ]; + executables = [ "naps2" ]; - dotnet-sdk = - with dotnetCorePackages; - sdk_8_0 - // { - inherit - (combinePackages [ - sdk_8_0 - sdk_6_0-bin - ]) - packages - targetPackages - ; - }; + dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; + + nativeBuildInputs = [ wrapGAppsHook3 ]; + selfContainedBuild = true; runtimeDeps = [ gtk3 @@ -68,7 +70,6 @@ buildDotnetModule rec { maintainers = with lib.maintainers; [ eliandoran ]; platforms = lib.platforms.linux; mainProgram = "naps2"; - broken = stdenv.hostPlatform.isAarch64; # Google.Protobuf.Tools dependency fails to build. }; } diff --git a/pkgs/by-name/na/narrowlink/package.nix b/pkgs/by-name/na/narrowlink/package.nix index 66168b2e7cd8..c67aaa36d62d 100644 --- a/pkgs/by-name/na/narrowlink/package.nix +++ b/pkgs/by-name/na/narrowlink/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,11 +22,6 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.Security - ]; - meta = { description = "Self-hosted solution to enable secure connectivity between devices across restricted networks like NAT or firewalls"; homepage = "https://github.com/narrowlink/narrowlink"; diff --git a/pkgs/by-name/na/nats-server/package.nix b/pkgs/by-name/na/nats-server/package.nix index 0531e6a0a795..7ad9eb5a8d5b 100644 --- a/pkgs/by-name/na/nats-server/package.nix +++ b/pkgs/by-name/na/nats-server/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "nats-server"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-9t5DOLZU2VcEBggirf+aLzwzsDBB+uGGXlBkIKP3HkE="; + hash = "sha256-KzZYaxpfTUgOHeuG9mddbmab5jDbEjxkB8IGLKr4W1Q="; }; vendorHash = "sha256-CvxAP35/hinewnNhrW9urI0J3DI5QfZybbyRbz9Ol4s="; diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix index 6b5455b2e2ba..ad70f417c4ef 100644 --- a/pkgs/by-name/nb/nb/package.nix +++ b/pkgs/by-name/nb/nb/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "nb"; - version = "7.16.1"; + version = "7.17.0"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; rev = version; - hash = "sha256-RX3DEjk+/tivTyv0+j3lZAKYgca4Zq9zQ+P1a/RXj2I="; + hash = "sha256-gUI7hAZabYPHkSwGtFZxEoi5Hw76fOLYbMZQIvsnSas="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/nb/nbtscanner/package.nix b/pkgs/by-name/nb/nbtscanner/package.nix index 31efe5a446b5..7700a16fe628 100644 --- a/pkgs/by-name/nb/nbtscanner/package.nix +++ b/pkgs/by-name/nb/nbtscanner/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, versionCheckHook, @@ -31,8 +29,6 @@ rustPlatform.buildRustPackage rec { --replace-fail '.version("0.1")' '.version("${version}")' ''; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix index 4ab6257c3f7a..ba46eeda5f8d 100644 --- a/pkgs/by-name/nc/nchat/package.nix +++ b/pkgs/by-name/nc/nchat/package.nix @@ -11,7 +11,6 @@ cmake, gperf, stdenv, - darwin, }: let @@ -75,23 +74,14 @@ stdenv.mkDerivation rec { libcgowm ]; - buildInputs = - [ - file # for libmagic - ncurses - openssl - readline - sqlite - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - Cocoa - Foundation - ] - ); + buildInputs = [ + file # for libmagic + ncurses + openssl + readline + sqlite + zlib + ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix index 49cffba090e0..e338cc02af71 100644 --- a/pkgs/by-name/ne/necesse-server/package.nix +++ b/pkgs/by-name/ne/necesse-server/package.nix @@ -6,7 +6,7 @@ }: let - version = "0.31.1-17664948"; + version = "0.32.1-18110069"; urlVersion = lib.replaceStrings [ "." ] [ "-" ] version; in @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation { src = fetchzip { url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip"; - hash = "sha256-H7/fc3zkuEMuv9Uq00TLSLF4rT8+UWsofnuCFrmUtjU="; + hash = "sha256-qeFr4dl4MD2rMVD+PIu/3zcRvCWOT1Bj8JB0FWXP1Yw="; }; # removing packaged jre since we use our own @@ -39,6 +39,8 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = { homepage = "https://necessegame.com/server/"; description = "Dedicated server for Necesse"; diff --git a/pkgs/by-name/ne/necesse-server/update.sh b/pkgs/by-name/ne/necesse-server/update.sh new file mode 100755 index 000000000000..19c409d3700a --- /dev/null +++ b/pkgs/by-name/ne/necesse-server/update.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl pup common-updater-scripts + +set -eu -o pipefail + +version=$( + curl -s http://www.necessegame.com/server \ + | pup 'a[href*="linux64"] text{}' \ + | awk -F'[v ]' '/Linux64/ {print $4"-"$6}' \ + | sort -Vu \ + | tail -n1 +) + +[[ $version =~ ^[0-9]+\.[0-9]+\.[0-9]+\-[0-9]+$ ]] \ + && update-source-version necesse-server "$version" diff --git a/pkgs/by-name/ne/neko/package.nix b/pkgs/by-name/ne/neko/package.nix index 22dc97f7d1d6..ee69504c27fe 100644 --- a/pkgs/by-name/ne/neko/package.nix +++ b/pkgs/by-name/ne/neko/package.nix @@ -45,25 +45,19 @@ stdenv.mkDerivation rec { pkg-config git ]; - buildInputs = - [ - boehmgc - zlib - sqlite - pcre - apacheHttpd - apr - aprutil - libmysqlclient - mbedtls_2 - openssl - libpthreadstubs - ] - ++ lib.optional stdenv.hostPlatform.isLinux gtk2 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - pkgs.darwin.apple_sdk.frameworks.Security - pkgs.darwin.apple_sdk.frameworks.Carbon - ]; + buildInputs = [ + boehmgc + zlib + sqlite + pcre + apacheHttpd + apr + aprutil + libmysqlclient + mbedtls_2 + openssl + libpthreadstubs + ] ++ lib.optional stdenv.hostPlatform.isLinux gtk2; cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ]; env = lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; diff --git a/pkgs/by-name/ne/neocmakelsp/package.nix b/pkgs/by-name/ne/neocmakelsp/package.nix index b521d70158c0..acc7e002372f 100644 --- a/pkgs/by-name/ne/neocmakelsp/package.nix +++ b/pkgs/by-name/ne/neocmakelsp/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.8.21"; + version = "0.8.22"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-iVetPUg/eX8o2BB1y9dlijbhZUyDNMHaLrqcqTbvpQk="; + hash = "sha256-AFnGMKcPAn1rFfFDZWvg/iIhKHGKgCLA3bueP5k9oY4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Mswh/wuowrWORj16Mvg4kIueW72bEFw3Ax2RBMtATqY="; + cargoHash = "sha256-XsRtkQpNfXCZxEbgkQo11lQM78E6+8PJWc+5FBXM2Ro="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ne/neohtop/package.nix b/pkgs/by-name/ne/neohtop/package.nix index 14a83ec87048..4ed54a841699 100644 --- a/pkgs/by-name/ne/neohtop/package.nix +++ b/pkgs/by-name/ne/neohtop/package.nix @@ -11,7 +11,6 @@ fetchFromGitHub, glib, gtk3, - libsoup_2_4, openssl, nix-update-script, }: @@ -51,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: { glib gtk3 openssl - libsoup_2_4 webkitgtk_4_1 ]; diff --git a/pkgs/by-name/ne/nest-cli/package.nix b/pkgs/by-name/ne/nest-cli/package.nix index 76c5f37fb143..3a8feae70c07 100644 --- a/pkgs/by-name/ne/nest-cli/package.nix +++ b/pkgs/by-name/ne/nest-cli/package.nix @@ -1,10 +1,8 @@ { buildNpmPackage, - darwin, fetchFromGitHub, lib, python3, - stdenv, }: buildNpmPackage rec { @@ -28,10 +26,6 @@ buildNpmPackage rec { python3 ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - meta = with lib; { description = "CLI tool for Nest applications"; homepage = "https://nestjs.com"; diff --git a/pkgs/by-name/ne/nesting/package.nix b/pkgs/by-name/ne/nesting/package.nix index 1fbc3af9007b..928fec3c059d 100644 --- a/pkgs/by-name/ne/nesting/package.nix +++ b/pkgs/by-name/ne/nesting/package.nix @@ -9,33 +9,34 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "nesting"; version = "0.3.0"; src = fetchFromGitLab { - group = "gitlab-org"; - owner = "fleeting"; + owner = "gitlab-org/fleeting"; repo = "nesting"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ejoLld1TmwaqTlSyuzyEVEqLyEehu6g7yc0H0Cvkqp4="; }; vendorHash = "sha256-CyXlK/0VWMFlwSfisoaNCRdknasp8faN/K/zdyRhAQQ="; - subPackages = [ "cmd/nesting" ]; - - # See https://gitlab.com/gitlab-org/fleeting/nesting/-/blob/v0.3.0/Makefile?ref_type=tags#L22-24. - # - # Needed for "nesting version" to not show "dev". - ldflags = [ - "-X gitlab.com/gitlab-org/fleeting/nesting.NAME=nesting" - "-X gitlab.com/gitlab-org/fleeting/nesting.VERSION=v${version}" - "-X gitlab.com/gitlab-org/fleeting/nesting.REVISION=${src.rev}" - ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]; + # Needed for "nesting version" to not show "dev". + # + # https://gitlab.com/gitlab-org/fleeting/nesting/-/blob/v0.3.0/Makefile?ref_type=tags#L22-24 + ldflags = + let + ldflagsPackageVariablePrefix = "gitlab.com/gitlab-org/fleeting/nesting"; + in + [ + "-X ${ldflagsPackageVariablePrefix}.NAME=nesting" + "-X ${ldflagsPackageVariablePrefix}.VERSION=${finalAttrs.version}" + "-X ${ldflagsPackageVariablePrefix}.REFERENCE=v${finalAttrs.version}" + ]; + doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; @@ -57,4 +58,4 @@ buildGoModule rec { "x86_64-darwin" ]; }; -} +}) diff --git a/pkgs/by-name/ne/net-snmp/package.nix b/pkgs/by-name/ne/net-snmp/package.nix index a8c268e2abb9..c1ad4ea5d064 100644 --- a/pkgs/by-name/ne/net-snmp/package.nix +++ b/pkgs/by-name/ne/net-snmp/package.nix @@ -9,7 +9,6 @@ nettools, autoreconfHook, withPerlTools ? false, - darwin, }: let @@ -84,15 +83,7 @@ stdenv.mkDerivation rec { file autoreconfHook ]; - buildInputs = - [ openssl ] - ++ lib.optional withPerlTools perlWithPkgs - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.ApplicationServices - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.DiskArbitration - ]; + buildInputs = [ openssl ] ++ lib.optional withPerlTools perlWithPkgs; enableParallelBuilding = true; # Missing dependencies during relinking: diff --git a/pkgs/by-name/ne/netbox2netshot/package.nix b/pkgs/by-name/ne/netbox2netshot/package.nix index 96d1bbb78e00..c6191cd6bdfa 100644 --- a/pkgs/by-name/ne/netbox2netshot/package.nix +++ b/pkgs/by-name/ne/netbox2netshot/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Inventory synchronization tool between Netbox and Netshot"; diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix index 8a54783f91f6..fd45a8ee81cd 100644 --- a/pkgs/by-name/ne/neverest/package.nix +++ b/pkgs/by-name/ne/neverest/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, stdenv, pkg-config, - darwin, installShellFiles, installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, @@ -36,17 +35,7 @@ rustPlatform.buildRustPackage rec { pkg-config ] ++ lib.optional (installManPages || installShellCompletions) installShellFiles; - buildInputs = - [ ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - Cocoa - Security - ] - ) - ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch; + buildInputs = lib.optional (builtins.elem "notmuch" buildFeatures) notmuch; # TODO: unit tests temporarily broken, remove this line for the next # beta.2 release diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix index 96c63f9951a9..8e9d82719ffd 100644 --- a/pkgs/by-name/ne/newsboat/package.nix +++ b/pkgs/by-name/ne/newsboat/package.nix @@ -11,7 +11,6 @@ libxml2, json_c, ncurses, - darwin, asciidoctor, libiconv, makeWrapper, @@ -59,15 +58,10 @@ rustPlatform.buildRustPackage (finalAttrs: { json_c ncurses ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - Foundation - libiconv - gettext - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + gettext + ]; postBuild = '' make -j $NIX_BUILD_CORES prefix="$out" diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix index 2c89c3e550e3..26f7cf614a6f 100644 --- a/pkgs/by-name/ne/newsflash/package.nix +++ b/pkgs/by-name/ne/newsflash/package.nix @@ -12,7 +12,7 @@ rustc, wrapGAppsHook4, gdk-pixbuf, - clapper, + clapper-unwrapped, gtk4, libadwaita, libxml2, @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ - clapper + clapper-unwrapped gtk4 libadwaita libxml2 diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix index d08b3773c9af..b0c6d9655fc8 100644 --- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix +++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nextcloud-talk-desktop"; - version = "1.1.5"; + version = "1.1.6"; # Building from source would require building also building Server and Talk components # See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites src = fetchzip { url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64.zip"; - hash = "sha256-KI6EJxsiIPjk+SBdqAwQNpaMZgVQSra/tqCGufQYSPs="; + hash = "sha256-+bKE9taQxOrxB9tBP3PReyZlict6/gEX5uWbuzGIa8k="; stripRoot = false; }; diff --git a/pkgs/applications/science/misc/nextinspace/default.nix b/pkgs/by-name/ne/nextinspace/package.nix similarity index 100% rename from pkgs/applications/science/misc/nextinspace/default.nix rename to pkgs/by-name/ne/nextinspace/package.nix diff --git a/pkgs/by-name/ne/nextpnr/package.nix b/pkgs/by-name/ne/nextpnr/package.nix index a9399bb9bfbc..30d0fb69093c 100644 --- a/pkgs/by-name/ne/nextpnr/package.nix +++ b/pkgs/by-name/ne/nextpnr/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, boost, python3, @@ -15,7 +14,6 @@ enableGui ? false, wrapQtAppsHook ? null, qtbase ? null, - OpenGL ? null, }: let @@ -25,42 +23,33 @@ let }; pname = "nextpnr"; - version = "0.7"; + version = "0.8"; - main_src = fetchFromGitHub { - owner = "YosysHQ"; - repo = "nextpnr"; - rev = "${pname}-${version}"; - hash = "sha256-YIAQcCg9RjvCys1bQ3x+sTgTmnmEeXVbt9Lr6wtg1pA="; - name = "nextpnr"; + prjxray_src = fetchFromGitHub { + owner = "f4pga"; + repo = "prjxray"; + rev = "faf9c774a340e39cf6802d009996ed6016e63521"; + hash = "sha256-BEv7vJoOHWHZoc9EXbesfwFFClkuiSpVwHUrj4ahUcA="; }; - test_src = fetchFromGitHub { - owner = "YosysHQ"; - repo = "nextpnr-tests"; - rev = "00c55a9eb9ea2e062b51fe0d64741412b185d95d"; - hash = "sha256-83suMftMtnaRFq3T2/I7Uahb11WZlXhwYt6Q/rqi2Yo="; - name = "nextpnr-tests"; + prjbeyond_src = fetchFromGitHub { + owner = "YosysHQ-GmbH"; + repo = "prjbeyond-db"; + rev = "06d3b424dd0e52d678087c891c022544238fb9e3"; + hash = "sha256-nmyFFUO+/J2lb+lPATEjdYq0d21P1fN3N94JXR8brZ0="; }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { inherit pname version; - srcs = [ - main_src - test_src - ]; - - sourceRoot = main_src.name; - - patches = [ - (fetchpatch { - name = "boost-1_85-fixes.patch"; - url = "https://github.com/YosysHQ/nextpnr/commit/f085950383155a745cf2e3c0f28c468d01ff5fd7.patch"; - hash = "sha256-ihN3S4eeBQSrKbHrGinE/SlIY3QDytYCaO9Mtu36n6c="; - }) - ]; + src = fetchFromGitHub { + owner = "YosysHQ"; + repo = "nextpnr"; + tag = "${pname}-${version}"; + hash = "sha256-lconcmLACxWxC41fTIkUaGbfp79G98YdHA4mRJ9Qo1w="; + fetchSubmodules = true; + }; nativeBuildInputs = [ cmake @@ -79,35 +68,30 @@ stdenv.mkDerivation { let # the specified version must always start with "nextpnr-", so add it if # missing (e.g. if the user overrides with a git hash) - rev = main_src.rev; + rev = src.rev; version = if (lib.hasPrefix "nextpnr-" rev) then rev else "nextpnr-${rev}"; in [ "-DCURRENT_GIT_VERSION=${version}" - "-DARCH=generic;ice40;ecp5;gowin;himbaechel" + "-DARCH=generic;ice40;ecp5;himbaechel" "-DBUILD_TESTS=ON" "-DICESTORM_INSTALL_PREFIX=${icestorm}" "-DTRELLIS_INSTALL_PREFIX=${trellis}" "-DTRELLIS_LIBDIR=${trellis}/lib/trellis" "-DGOWIN_BBA_EXECUTABLE=${python3Packages.apycula}/bin/gowin_bba" "-DUSE_OPENMP=ON" - # warning: high RAM usage - "-DSERIALIZE_CHIPDBS=OFF" + "-DHIMBAECHEL_UARCH=all" "-DHIMBAECHEL_GOWIN_DEVICES=all" + "-DHIMBAECHEL_PRJXRAY_DB=${prjxray_src}" + "-DHIMBAECHEL_PRJBEYOND_DB=${prjbeyond_src}" ] - ++ (lib.optional enableGui "-DBUILD_GUI=ON") - ++ (lib.optional ( - enableGui && stdenv.hostPlatform.isDarwin - ) "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"); + ++ (lib.optional enableGui "-DBUILD_GUI=ON"); postPatch = '' - # use PyPy for icestorm if enabled - substituteInPlace ./ice40/CMakeLists.txt \ - --replace ''\'''${PYTHON_EXECUTABLE}' '${icestorm.pythonInterp}' - ''; - - preBuild = '' - ln -s ../${test_src.name} tests + # Don't use #embed macro for chipdb binary embeddings - otherwise getting spurious type narrowing errors. + # Maybe related to: https://github.com/llvm/llvm-project/issues/119256 + substituteInPlace CMakeLists.txt \ + --replace-fail "check_cxx_compiler_hash_embed(HAS_HASH_EMBED CXX_FLAGS_HASH_EMBED)" "" ''; doCheck = true; @@ -116,17 +100,16 @@ stdenv.mkDerivation { wrapQtApp $out/bin/nextpnr-generic wrapQtApp $out/bin/nextpnr-ice40 wrapQtApp $out/bin/nextpnr-ecp5 - wrapQtApp $out/bin/nextpnr-gowin wrapQtApp $out/bin/nextpnr-himbaechel ''; strictDeps = true; - meta = with lib; { + meta = { description = "Place and route tool for FPGAs"; homepage = "https://github.com/yosyshq/nextpnr"; - license = licenses.isc; - platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice ]; + license = lib.licenses.isc; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/by-name/ne/nexttrace/package.nix b/pkgs/by-name/ne/nexttrace/package.nix index ca14a95e5dce..aeef9b924313 100644 --- a/pkgs/by-name/ne/nexttrace/package.nix +++ b/pkgs/by-name/ne/nexttrace/package.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "nexttrace"; - version = "1.3.5"; + version = "1.3.7"; src = fetchFromGitHub { owner = "nxtrace"; repo = "NTrace-core"; rev = "v${version}"; - sha256 = "sha256-32QFgmvXQ+8ix1N9I6pJaIJGWOT67/FG0VVEhftwQQw="; + sha256 = "sha256-UmViXxyOvzs2ifG7y+OA+/BjzbF6YIc6sjDUN+ttS8w="; }; - vendorHash = "sha256-WRH9doQavcdH1sd2fS8QoFSmlirBMZgSzB/sj1q6cUQ="; + vendorHash = "sha256-rSCg6TeCVdYldghmFCXtv2R9mQ97b3DogZhFcSTzt4o="; doCheck = false; # Tests require a network connection. diff --git a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json index 31048724c393..1fe63e47f65c 100644 --- a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json +++ b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json @@ -384,6 +384,36 @@ "node": ">=6.9.0" } }, + "node_modules/@biomejs/js-api": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@biomejs/js-api/-/js-api-0.7.1.tgz", + "integrity": "sha512-VFdgFFZWcyCQxZcAasyv8Enpexn4CblMdWmr6izLYHTLcbd+z9x/LuKU71qnmClABfnYqZjiY7c8DKTVri3Ajw==", + "dev": true, + "license": "MIT OR Apache-2.0", + "peerDependencies": { + "@biomejs/wasm-bundler": "^1.9.2", + "@biomejs/wasm-nodejs": "^1.9.2", + "@biomejs/wasm-web": "^1.9.2" + }, + "peerDependenciesMeta": { + "@biomejs/wasm-bundler": { + "optional": true + }, + "@biomejs/wasm-nodejs": { + "optional": true + }, + "@biomejs/wasm-web": { + "optional": true + } + } + }, + "node_modules/@biomejs/wasm-nodejs": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/wasm-nodejs/-/wasm-nodejs-1.9.4.tgz", + "integrity": "sha512-ZqNlhKcZW6MW1LxWIOfh9YVrBykvzyFad3bOh6JJFraDnNa3NXboRDiaI8dmrbb0ZHXCU1Tsq6WQsKV2Vpp5dw==", + "dev": true, + "license": "MIT OR Apache-2.0" + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.25.2", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz", @@ -810,9 +840,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz", - "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.6.1.tgz", + "integrity": "sha512-KTsJMmobmbrFLe3LDh0PC2FXpcSYJt/MLjlkh/9LEnmKYLSYmT/0EW9JWANjeoemiuZrmogti0tW5Ch+qNUYDw==", "dev": true, "license": "MIT", "dependencies": { @@ -852,9 +882,9 @@ } }, "node_modules/@eslint/config-array": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz", - "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==", + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz", + "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -877,9 +907,9 @@ } }, "node_modules/@eslint/core": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz", - "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz", + "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -927,9 +957,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.23.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.23.0.tgz", - "integrity": "sha512-35MJ8vCPU0ZMxo7zfev2pypqTwWTofFZO6m4KAtdoFhRpLJUpHTZZ+KB3C7Hb1d7bULYwO4lJXGCi5Se+8OMbw==", + "version": "9.25.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.25.1.tgz", + "integrity": "sha512-dEIwmjntEx8u3Uvv+kr3PDeeArL8Hw07H9kyYxCjnM9pBjfEhk6uLXSchxxzgiwtRhhzVzqmUSDFBOi1TuZ7qg==", "dev": true, "license": "MIT", "engines": { @@ -960,19 +990,6 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz", - "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@types/json-schema": "^7.0.15" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, "node_modules/@exodus/schemasafe": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.3.0.tgz", @@ -1204,29 +1221,29 @@ } }, "node_modules/@radix-ui/number": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.0.tgz", - "integrity": "sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.1.tgz", + "integrity": "sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==", "license": "MIT" }, "node_modules/@radix-ui/primitive": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.1.tgz", - "integrity": "sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.2.tgz", + "integrity": "sha512-XnbHrrprsNqZKQhStrSwgRUQzoCI1glLzdw79xiZPoofhGICeZRSQ3dIxAKH1gb3OHfNf4d6f+vAv3kil2eggA==", "license": "MIT" }, "node_modules/@radix-ui/react-alert-dialog": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.6.tgz", - "integrity": "sha512-p4XnPqgej8sZAAReCAKgz1REYZEBLR8hU9Pg27wFnCWIMc8g1ccCs0FjBcy05V15VTu8pAePw/VDYeOm/uZ6yQ==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.10.tgz", + "integrity": "sha512-EJ+FGNgLiOw33YOipPZ4/fZC2x1zKELDBjdJJleYsM6kJCBp3lvAPuXeUoYEHXNvv9iWl5VRU3IT7d/f4A5C7g==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-dialog": "1.1.6", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-slot": "1.1.2" + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-dialog": "1.1.10", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-slot": "1.2.0" }, "peerDependencies": { "@types/react": "*", @@ -1244,12 +1261,12 @@ } }, "node_modules/@radix-ui/react-arrow": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.2.tgz", - "integrity": "sha512-G+KcpzXHq24iH0uGG/pF8LyzpFJYGD4RfLjCIBfGdSLXvjLHST31RUiRVrupIBMvIppMgSzQ6l66iAxl03tdlg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.4.tgz", + "integrity": "sha512-qz+fxrqgNxG0dYew5l7qR3c7wdgRu1XVUHGnGYX7rg5HM4p9SWaRmJwfgR3J0SgyUKayLmzQIun+N6rWRgiRKw==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.0.2" + "@radix-ui/react-primitive": "2.1.0" }, "peerDependencies": { "@types/react": "*", @@ -1267,15 +1284,16 @@ } }, "node_modules/@radix-ui/react-avatar": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.1.3.tgz", - "integrity": "sha512-Paen00T4P8L8gd9bNsRMw7Cbaz85oxiv+hzomsRZgFm2byltPFDtfcoqlWJ8GyZlIBWgLssJlzLCnKU0G0302g==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.1.6.tgz", + "integrity": "sha512-YDduxvqNMHzTQWNqja7Z/XTyFc8UOP98/ePjJTFa1vqILPlTPcQaVa1YyQMiQl4SFQPA9Y/zj1dHBgMlE5G/ow==", "license": "MIT", "dependencies": { - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-layout-effect": "1.1.0" + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/react-use-is-hydrated": "0.0.0", + "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1293,19 +1311,19 @@ } }, "node_modules/@radix-ui/react-checkbox": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.4.tgz", - "integrity": "sha512-wP0CPAHq+P5I4INKe3hJrIa1WoNqqrejzW+zoU0rOvo1b9gDEJJFl2rYfO1PYJUQCc2H1WZxIJmyv9BS8i5fLw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.2.2.tgz", + "integrity": "sha512-pMxzQLK+m/tkDRXJg7VUjRx6ozsBdzNLOV4vexfVBU57qT2Gvf4cw2gKKhOohJxjadQ+WcUXCKosTIxcZzi03A==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-controllable-state": "1.1.0", - "@radix-ui/react-use-previous": "1.1.0", - "@radix-ui/react-use-size": "1.1.0" + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-presence": "1.1.3", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-controllable-state": "1.2.2", + "@radix-ui/react-use-previous": "1.1.1", + "@radix-ui/react-use-size": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1323,15 +1341,15 @@ } }, "node_modules/@radix-ui/react-collection": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.2.tgz", - "integrity": "sha512-9z54IEKRxIa9VityapoEYMuByaG42iSy1ZXlY2KcuLSEtq8x4987/N6m15ppoMffgZX72gER2uHe1D9Y6Unlcw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.4.tgz", + "integrity": "sha512-cv4vSf7HttqXilDnAnvINd53OTl1/bjUYVZrkFnA7nwmY9Ob2POUy0WY0sfqBAe1s5FyKsyceQlqiEGPYNTadg==", "license": "MIT", "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-slot": "1.1.2" + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-slot": "1.2.0" }, "peerDependencies": { "@types/react": "*", @@ -1349,9 +1367,9 @@ } }, "node_modules/@radix-ui/react-compose-refs": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.1.tgz", - "integrity": "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz", + "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -1364,9 +1382,9 @@ } }, "node_modules/@radix-ui/react-context": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.1.tgz", - "integrity": "sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.2.tgz", + "integrity": "sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -1379,23 +1397,23 @@ } }, "node_modules/@radix-ui/react-dialog": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.6.tgz", - "integrity": "sha512-/IVhJV5AceX620DUJ4uYVMymzsipdKBzo3edo+omeskCKGm9FRHM0ebIdbPnlQVJqyuHbuBltQUOG2mOTq2IYw==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.10.tgz", + "integrity": "sha512-m6pZb0gEM5uHPSb+i2nKKGQi/HMSVjARMsLMWQfKDP+eJ6B+uqryHnXhpnohTWElw+vEcMk/o4wJODtdRKHwqg==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-dismissable-layer": "1.1.5", - "@radix-ui/react-focus-guards": "1.1.1", - "@radix-ui/react-focus-scope": "1.1.2", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-portal": "1.1.4", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-slot": "1.1.2", - "@radix-ui/react-use-controllable-state": "1.1.0", + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-dismissable-layer": "1.1.7", + "@radix-ui/react-focus-guards": "1.1.2", + "@radix-ui/react-focus-scope": "1.1.4", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-portal": "1.1.6", + "@radix-ui/react-presence": "1.1.3", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-slot": "1.2.0", + "@radix-ui/react-use-controllable-state": "1.2.2", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.6.3" }, @@ -1415,9 +1433,9 @@ } }, "node_modules/@radix-ui/react-direction": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.0.tgz", - "integrity": "sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.1.tgz", + "integrity": "sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -1430,16 +1448,16 @@ } }, "node_modules/@radix-ui/react-dismissable-layer": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz", - "integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.7.tgz", + "integrity": "sha512-j5+WBUdhccJsmH5/H0K6RncjDtoALSEr6jbkaZu+bjw6hOPOhHycr6vEUujl+HBK8kjUfWcoCJXxP6e4lUlMZw==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-escape-keydown": "1.1.0" + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/react-use-escape-keydown": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1457,18 +1475,18 @@ } }, "node_modules/@radix-ui/react-dropdown-menu": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.6.tgz", - "integrity": "sha512-no3X7V5fD487wab/ZYSHXq3H37u4NVeLDKI/Ks724X/eEFSSEFYZxWgsIlr1UBeEyDaM29HM5x9p1Nv8DuTYPA==", + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.11.tgz", + "integrity": "sha512-wbPE3cFBfLl+S+LCxChWQGX0k14zUxgvep1HEnLhJ9mNhjyO3ETzRviAeKZ3XomT/iVRRZAWFsnFZ3N0wI8OmA==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-menu": "2.1.6", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-controllable-state": "1.1.0" + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-menu": "2.1.11", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-controllable-state": "1.2.2" }, "peerDependencies": { "@types/react": "*", @@ -1486,9 +1504,9 @@ } }, "node_modules/@radix-ui/react-focus-guards": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz", - "integrity": "sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.2.tgz", + "integrity": "sha512-fyjAACV62oPV925xFCrH8DR5xWhg9KYtJT4s3u54jxp+L/hbpTY2kIeEFFbFe+a/HCE94zGQMZLIpVTPVZDhaA==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -1501,14 +1519,14 @@ } }, "node_modules/@radix-ui/react-focus-scope": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.2.tgz", - "integrity": "sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.4.tgz", + "integrity": "sha512-r2annK27lIW5w9Ho5NyQgqs0MmgZSTIKXWpVCJaLC1q2kZrZkcqnmHkCHMEmv8XLvsLlurKMPT+kbKkRkm/xVA==", "license": "MIT", "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0" + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-callback-ref": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1526,12 +1544,12 @@ } }, "node_modules/@radix-ui/react-id": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.0.tgz", - "integrity": "sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.1.tgz", + "integrity": "sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==", "license": "MIT", "dependencies": { - "@radix-ui/react-use-layout-effect": "1.1.0" + "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1544,12 +1562,12 @@ } }, "node_modules/@radix-ui/react-label": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.2.tgz", - "integrity": "sha512-zo1uGMTaNlHehDyFQcDZXRJhUPDuukcnHz0/jnrup0JA6qL+AFpAnty+7VKa9esuU5xTblAZzTGYJKSKaBxBhw==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.4.tgz", + "integrity": "sha512-wy3dqizZnZVV4ja0FNnUhIWNwWdoldXrneEyUcVtLYDAt8ovGS4ridtMAOGgXBBIfggL4BOveVWsjXDORdGEQg==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.0.2" + "@radix-ui/react-primitive": "2.1.0" }, "peerDependencies": { "@types/react": "*", @@ -1567,27 +1585,27 @@ } }, "node_modules/@radix-ui/react-menu": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.6.tgz", - "integrity": "sha512-tBBb5CXDJW3t2mo9WlO7r6GTmWV0F0uzHZVFmlRmYpiSK1CDU5IKojP1pm7oknpBOrFZx/YgBRW9oorPO2S/Lg==", + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.11.tgz", + "integrity": "sha512-sbFI4Qaw02J0ogmR9tOMsSqsdrGNpUanlPYAqTE2JJafow8ecHtykg4fSTjNHBdDl4deiKMK+RhTEwyVhP7UDA==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collection": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-dismissable-layer": "1.1.5", - "@radix-ui/react-focus-guards": "1.1.1", - "@radix-ui/react-focus-scope": "1.1.2", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-popper": "1.2.2", - "@radix-ui/react-portal": "1.1.4", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-roving-focus": "1.1.2", - "@radix-ui/react-slot": "1.1.2", - "@radix-ui/react-use-callback-ref": "1.1.0", + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-collection": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-direction": "1.1.1", + "@radix-ui/react-dismissable-layer": "1.1.7", + "@radix-ui/react-focus-guards": "1.1.2", + "@radix-ui/react-focus-scope": "1.1.4", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-popper": "1.2.4", + "@radix-ui/react-portal": "1.1.6", + "@radix-ui/react-presence": "1.1.3", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-roving-focus": "1.1.7", + "@radix-ui/react-slot": "1.2.0", + "@radix-ui/react-use-callback-ref": "1.1.1", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.6.3" }, @@ -1607,25 +1625,25 @@ } }, "node_modules/@radix-ui/react-navigation-menu": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.5.tgz", - "integrity": "sha512-myMHHQUZ3ZLTi8W381/Vu43Ia0NqakkQZ2vzynMmTUtQQ9kNkjzhOwkZC9TAM5R07OZUVIQyHC06f/9JZJpvvA==", + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.9.tgz", + "integrity": "sha512-Z7lefjA5VAmEB5ZClxeHGWGQAqhGWgEc6u0MYviUmIVrgGCVLv5mv/jsfUY3tJWI71cVhpQ7dnf/Q6RtM3ylVA==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collection": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-dismissable-layer": "1.1.5", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-controllable-state": "1.1.0", - "@radix-ui/react-use-layout-effect": "1.1.0", - "@radix-ui/react-use-previous": "1.1.0", - "@radix-ui/react-visually-hidden": "1.1.2" + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-collection": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-direction": "1.1.1", + "@radix-ui/react-dismissable-layer": "1.1.7", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-presence": "1.1.3", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/react-use-controllable-state": "1.2.2", + "@radix-ui/react-use-layout-effect": "1.1.1", + "@radix-ui/react-use-previous": "1.1.1", + "@radix-ui/react-visually-hidden": "1.2.0" }, "peerDependencies": { "@types/react": "*", @@ -1643,24 +1661,24 @@ } }, "node_modules/@radix-ui/react-popover": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.6.tgz", - "integrity": "sha512-NQouW0x4/GnkFJ/pRqsIS3rM/k97VzKnVb2jB7Gq7VEGPy5g7uNV1ykySFt7eWSp3i2uSGFwaJcvIRJBAHmmFg==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.10.tgz", + "integrity": "sha512-IZN7b3sXqajiPsOzKuNJBSP9obF4MX5/5UhTgWNofw4r1H+eATWb0SyMlaxPD/kzA4vadFgy1s7Z1AEJ6WMyHQ==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-dismissable-layer": "1.1.5", - "@radix-ui/react-focus-guards": "1.1.1", - "@radix-ui/react-focus-scope": "1.1.2", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-popper": "1.2.2", - "@radix-ui/react-portal": "1.1.4", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-slot": "1.1.2", - "@radix-ui/react-use-controllable-state": "1.1.0", + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-dismissable-layer": "1.1.7", + "@radix-ui/react-focus-guards": "1.1.2", + "@radix-ui/react-focus-scope": "1.1.4", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-popper": "1.2.4", + "@radix-ui/react-portal": "1.1.6", + "@radix-ui/react-presence": "1.1.3", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-slot": "1.2.0", + "@radix-ui/react-use-controllable-state": "1.2.2", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.6.3" }, @@ -1680,21 +1698,21 @@ } }, "node_modules/@radix-ui/react-popper": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.2.tgz", - "integrity": "sha512-Rvqc3nOpwseCyj/rgjlJDYAgyfw7OC1tTkKn2ivhaMGcYt8FSBlahHOZak2i3QwkRXUXgGgzeEe2RuqeEHuHgA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.4.tgz", + "integrity": "sha512-3p2Rgm/a1cK0r/UVkx5F/K9v/EplfjAeIFCGOPYPO4lZ0jtg4iSQXt/YGTSLWaf4x7NG6Z4+uKFcylcTZjeqDA==", "license": "MIT", "dependencies": { "@floating-ui/react-dom": "^2.0.0", - "@radix-ui/react-arrow": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-layout-effect": "1.1.0", - "@radix-ui/react-use-rect": "1.1.0", - "@radix-ui/react-use-size": "1.1.0", - "@radix-ui/rect": "1.1.0" + "@radix-ui/react-arrow": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/react-use-layout-effect": "1.1.1", + "@radix-ui/react-use-rect": "1.1.1", + "@radix-ui/react-use-size": "1.1.1", + "@radix-ui/rect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1712,13 +1730,13 @@ } }, "node_modules/@radix-ui/react-portal": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz", - "integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.6.tgz", + "integrity": "sha512-XmsIl2z1n/TsYFLIdYam2rmFwf9OC/Sh2avkbmVMDuBZIe7hSpM0cYnWPAo7nHOVx8zTuwDZGByfcqLdnzp3Vw==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-layout-effect": "1.1.0" + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1736,13 +1754,13 @@ } }, "node_modules/@radix-ui/react-presence": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.2.tgz", - "integrity": "sha512-18TFr80t5EVgL9x1SwF/YGtfG+l0BS0PRAlCWBDoBEiDQjeKgnNZRVJp/oVBl24sr3Gbfwc/Qpj4OcWTQMsAEg==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.3.tgz", + "integrity": "sha512-IrVLIhskYhH3nLvtcBLQFZr61tBG7wx7O3kEmdzcYwRGAEBmBicGGL7ATzNgruYJ3xBTbuzEEq9OXJM3PAX3tA==", "license": "MIT", "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-use-layout-effect": "1.1.0" + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1760,12 +1778,12 @@ } }, "node_modules/@radix-ui/react-primitive": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.2.tgz", - "integrity": "sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.0.tgz", + "integrity": "sha512-/J/FhLdK0zVcILOwt5g+dH4KnkonCtkVJsa2G6JmvbbtZfBEI1gMsO3QMjseL4F/SwfAMt1Vc/0XKYKq+xJ1sw==", "license": "MIT", "dependencies": { - "@radix-ui/react-slot": "1.1.2" + "@radix-ui/react-slot": "1.2.0" }, "peerDependencies": { "@types/react": "*", @@ -1783,20 +1801,20 @@ } }, "node_modules/@radix-ui/react-roving-focus": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.2.tgz", - "integrity": "sha512-zgMQWkNO169GtGqRvYrzb0Zf8NhMHS2DuEB/TiEmVnpr5OqPU3i8lfbxaAmC2J/KYuIQxyoQQ6DxepyXp61/xw==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.7.tgz", + "integrity": "sha512-C6oAg451/fQT3EGbWHbCQjYTtbyjNO1uzQgMzwyivcHT3GKNEmu1q3UuREhN+HzHAVtv3ivMVK08QlC+PkYw9Q==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collection": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-controllable-state": "1.1.0" + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-collection": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-direction": "1.1.1", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/react-use-controllable-state": "1.2.2" }, "peerDependencies": { "@types/react": "*", @@ -1814,20 +1832,20 @@ } }, "node_modules/@radix-ui/react-scroll-area": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.3.tgz", - "integrity": "sha512-l7+NNBfBYYJa9tNqVcP2AGvxdE3lmE6kFTBXdvHgUaZuy+4wGCL1Cl2AfaR7RKyimj7lZURGLwFO59k4eBnDJQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.5.tgz", + "integrity": "sha512-VyLjxI8/gXYn+Wij1FLpXjZp6Z/uNklUFQQ75tOpJNESeNaZ2kCRfjiEDmHgWmLeUPeJGwrqbgRmcdFjtYEkMA==", "license": "MIT", "dependencies": { - "@radix-ui/number": "1.1.0", - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-layout-effect": "1.1.0" + "@radix-ui/number": "1.1.1", + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-direction": "1.1.1", + "@radix-ui/react-presence": "1.1.3", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1845,30 +1863,30 @@ } }, "node_modules/@radix-ui/react-select": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.1.6.tgz", - "integrity": "sha512-T6ajELxRvTuAMWH0YmRJ1qez+x4/7Nq7QIx7zJ0VK3qaEWdnWpNbEDnmWldG1zBDwqrLy5aLMUWcoGirVj5kMg==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.2.2.tgz", + "integrity": "sha512-HjkVHtBkuq+r3zUAZ/CvNWUGKPfuicGDbgtZgiQuFmNcV5F+Tgy24ep2nsAW2nFgvhGPJVqeBZa6KyVN0EyrBA==", "license": "MIT", "dependencies": { - "@radix-ui/number": "1.1.0", - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collection": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-dismissable-layer": "1.1.5", - "@radix-ui/react-focus-guards": "1.1.1", - "@radix-ui/react-focus-scope": "1.1.2", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-popper": "1.2.2", - "@radix-ui/react-portal": "1.1.4", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-slot": "1.1.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-controllable-state": "1.1.0", - "@radix-ui/react-use-layout-effect": "1.1.0", - "@radix-ui/react-use-previous": "1.1.0", - "@radix-ui/react-visually-hidden": "1.1.2", + "@radix-ui/number": "1.1.1", + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-collection": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-direction": "1.1.1", + "@radix-ui/react-dismissable-layer": "1.1.7", + "@radix-ui/react-focus-guards": "1.1.2", + "@radix-ui/react-focus-scope": "1.1.4", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-popper": "1.2.4", + "@radix-ui/react-portal": "1.1.6", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-slot": "1.2.0", + "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/react-use-controllable-state": "1.2.2", + "@radix-ui/react-use-layout-effect": "1.1.1", + "@radix-ui/react-use-previous": "1.1.1", + "@radix-ui/react-visually-hidden": "1.2.0", "aria-hidden": "^1.2.4", "react-remove-scroll": "^2.6.3" }, @@ -1888,12 +1906,12 @@ } }, "node_modules/@radix-ui/react-separator": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.2.tgz", - "integrity": "sha512-oZfHcaAp2Y6KFBX6I5P1u7CQoy4lheCGiYj+pGFrHy8E/VNRb5E39TkTr3JrV520csPBTZjkuKFdEsjS5EUNKQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.4.tgz", + "integrity": "sha512-2fTm6PSiUm8YPq9W0E4reYuv01EE3aFSzt8edBiXqPHshF8N9+Kymt/k0/R+F3dkY5lQyB/zPtrP82phskLi7w==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.0.2" + "@radix-ui/react-primitive": "2.1.0" }, "peerDependencies": { "@types/react": "*", @@ -1911,12 +1929,12 @@ } }, "node_modules/@radix-ui/react-slot": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.2.tgz", - "integrity": "sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.0.tgz", + "integrity": "sha512-ujc+V6r0HNDviYqIK3rW4ffgYiZ8g5DEHrGJVk4x7kTlLXRDILnKX9vAUYeIsLOoDpDJ0ujpqMkjH4w2ofuo6w==", "license": "MIT", "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1" + "@radix-ui/react-compose-refs": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -1929,19 +1947,19 @@ } }, "node_modules/@radix-ui/react-tabs": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.3.tgz", - "integrity": "sha512-9mFyI30cuRDImbmFF6O2KUJdgEOsGh9Vmx9x/Dh9tOhL7BngmQPQfwW4aejKm5OHpfWIdmeV6ySyuxoOGjtNng==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.8.tgz", + "integrity": "sha512-4iUaN9SYtG+/E+hJ7jRks/Nv90f+uAsRHbLYA6BcA9EsR6GNWgsvtS4iwU2SP0tOZfDGAyqIT0yz7ckgohEIFA==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-roving-focus": "1.1.2", - "@radix-ui/react-use-controllable-state": "1.1.0" + "@radix-ui/primitive": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-direction": "1.1.1", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-presence": "1.1.3", + "@radix-ui/react-primitive": "2.1.0", + "@radix-ui/react-roving-focus": "1.1.7", + "@radix-ui/react-use-controllable-state": "1.2.2" }, "peerDependencies": { "@types/react": "*", @@ -1959,9 +1977,9 @@ } }, "node_modules/@radix-ui/react-use-callback-ref": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz", - "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz", + "integrity": "sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -1974,12 +1992,31 @@ } }, "node_modules/@radix-ui/react-use-controllable-state": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz", - "integrity": "sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.2.tgz", + "integrity": "sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==", "license": "MIT", "dependencies": { - "@radix-ui/react-use-callback-ref": "1.1.0" + "@radix-ui/react-use-effect-event": "0.0.2", + "@radix-ui/react-use-layout-effect": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-effect-event": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.2.tgz", + "integrity": "sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -1992,12 +2029,30 @@ } }, "node_modules/@radix-ui/react-use-escape-keydown": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz", - "integrity": "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.1.tgz", + "integrity": "sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==", "license": "MIT", "dependencies": { - "@radix-ui/react-use-callback-ref": "1.1.0" + "@radix-ui/react-use-callback-ref": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-is-hydrated": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-is-hydrated/-/react-use-is-hydrated-0.0.0.tgz", + "integrity": "sha512-23RkSm7jSZ8+rtfdSJTi/2D+p9soPbtnoG/tPf08egYCDr6p8X83hrcmW77p7MJ8kJYWNXwruuPTPp1TwIIH4g==", + "license": "MIT", + "dependencies": { + "use-sync-external-store": "^1.4.0" }, "peerDependencies": { "@types/react": "*", @@ -2010,9 +2065,9 @@ } }, "node_modules/@radix-ui/react-use-layout-effect": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz", - "integrity": "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz", + "integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -2025,9 +2080,9 @@ } }, "node_modules/@radix-ui/react-use-previous": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.0.tgz", - "integrity": "sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.1.tgz", + "integrity": "sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -2040,12 +2095,12 @@ } }, "node_modules/@radix-ui/react-use-rect": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.0.tgz", - "integrity": "sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.1.tgz", + "integrity": "sha512-QTYuDesS0VtuHNNvMh+CjlKJ4LJickCMUAqjlE3+j8w+RlRpwyX3apEQKGFzbZGdo7XNG1tXa+bQqIE7HIXT2w==", "license": "MIT", "dependencies": { - "@radix-ui/rect": "1.1.0" + "@radix-ui/rect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -2058,12 +2113,12 @@ } }, "node_modules/@radix-ui/react-use-size": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.0.tgz", - "integrity": "sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.1.tgz", + "integrity": "sha512-ewrXRDTAqAXlkl6t/fkXWNAhFX9I+CkKlw6zjEwk86RSPKwZr3xpBRso655aqYafwtnbpHLj6toFzmd6xdVptQ==", "license": "MIT", "dependencies": { - "@radix-ui/react-use-layout-effect": "1.1.0" + "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -2076,12 +2131,12 @@ } }, "node_modules/@radix-ui/react-visually-hidden": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.2.tgz", - "integrity": "sha512-1SzA4ns2M1aRlvxErqhLHsBHoS5eI5UUcI2awAMgGUp4LoaoWOKYmvqDY2s/tltuPkh3Yk77YF/r3IRj+Amx4Q==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.0.tgz", + "integrity": "sha512-rQj0aAWOpCdCMRbI6pLQm8r7S2BM3YhTa0SzOYD55k+hJA8oo9J+H+9wLM9oMlZWOX/wJWPTzfDfmZkf7LvCfg==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.0.2" + "@radix-ui/react-primitive": "2.1.0" }, "peerDependencies": { "@types/react": "*", @@ -2099,15 +2154,15 @@ } }, "node_modules/@radix-ui/rect": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.0.tgz", - "integrity": "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.1.tgz", + "integrity": "sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==", "license": "MIT" }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.39.0.tgz", - "integrity": "sha512-lGVys55Qb00Wvh8DMAocp5kIcaNzEFTmGhfFd88LfaogYTRKrdxgtlO5H6S49v2Nd8R2C6wLOal0qv6/kCkOwA==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.0.tgz", + "integrity": "sha512-+Fbls/diZ0RDerhE8kyC6hjADCXA1K4yVNlH0EYfd2XjyH0UGgzaQ8MlT0pCXAThfxv3QUAczHaL+qSv1E4/Cg==", "cpu": [ "arm" ], @@ -2119,9 +2174,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.39.0.tgz", - "integrity": "sha512-It9+M1zE31KWfqh/0cJLrrsCPiF72PoJjIChLX+rEcujVRCb4NLQ5QzFkzIZW8Kn8FTbvGQBY5TkKBau3S8cCQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.0.tgz", + "integrity": "sha512-PPA6aEEsTPRz+/4xxAmaoWDqh67N7wFbgFUJGMnanCFs0TV99M0M8QhhaSCks+n6EbQoFvLQgYOGXxlMGQe/6w==", "cpu": [ "arm64" ], @@ -2133,9 +2188,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.39.0.tgz", - "integrity": "sha512-lXQnhpFDOKDXiGxsU9/l8UEGGM65comrQuZ+lDcGUx+9YQ9dKpF3rSEGepyeR5AHZ0b5RgiligsBhWZfSSQh8Q==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.0.tgz", + "integrity": "sha512-GwYOcOakYHdfnjjKwqpTGgn5a6cUX7+Ra2HeNj/GdXvO2VJOOXCiYYlRFU4CubFM67EhbmzLOmACKEfvp3J1kQ==", "cpu": [ "arm64" ], @@ -2147,9 +2202,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.39.0.tgz", - "integrity": "sha512-mKXpNZLvtEbgu6WCkNij7CGycdw9cJi2k9v0noMb++Vab12GZjFgUXD69ilAbBh034Zwn95c2PNSz9xM7KYEAQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.0.tgz", + "integrity": "sha512-CoLEGJ+2eheqD9KBSxmma6ld01czS52Iw0e2qMZNpPDlf7Z9mj8xmMemxEucinev4LgHalDPczMyxzbq+Q+EtA==", "cpu": [ "x64" ], @@ -2161,9 +2216,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.39.0.tgz", - "integrity": "sha512-jivRRlh2Lod/KvDZx2zUR+I4iBfHcu2V/BA2vasUtdtTN2Uk3jfcZczLa81ESHZHPHy4ih3T/W5rPFZ/hX7RtQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.0.tgz", + "integrity": "sha512-r7yGiS4HN/kibvESzmrOB/PxKMhPTlz+FcGvoUIKYoTyGd5toHp48g1uZy1o1xQvybwwpqpe010JrcGG2s5nkg==", "cpu": [ "arm64" ], @@ -2175,9 +2230,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.39.0.tgz", - "integrity": "sha512-8RXIWvYIRK9nO+bhVz8DwLBepcptw633gv/QT4015CpJ0Ht8punmoHU/DuEd3iw9Hr8UwUV+t+VNNuZIWYeY7Q==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.0.tgz", + "integrity": "sha512-mVDxzlf0oLzV3oZOr0SMJ0lSDd3xC4CmnWJ8Val8isp9jRGl5Dq//LLDSPFrasS7pSm6m5xAcKaw3sHXhBjoRw==", "cpu": [ "x64" ], @@ -2189,9 +2244,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.39.0.tgz", - "integrity": "sha512-mz5POx5Zu58f2xAG5RaRRhp3IZDK7zXGk5sdEDj4o96HeaXhlUwmLFzNlc4hCQi5sGdR12VDgEUqVSHer0lI9g==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.0.tgz", + "integrity": "sha512-y/qUMOpJxBMy8xCXD++jeu8t7kzjlOCkoxxajL58G62PJGBZVl/Gwpm7JK9+YvlB701rcQTzjUZ1JgUoPTnoQA==", "cpu": [ "arm" ], @@ -2203,9 +2258,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.39.0.tgz", - "integrity": "sha512-+YDwhM6gUAyakl0CD+bMFpdmwIoRDzZYaTWV3SDRBGkMU/VpIBYXXEvkEcTagw/7VVkL2vA29zU4UVy1mP0/Yw==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.0.tgz", + "integrity": "sha512-GoCsPibtVdJFPv/BOIvBKO/XmwZLwaNWdyD8TKlXuqp0veo2sHE+A/vpMQ5iSArRUz/uaoj4h5S6Pn0+PdhRjg==", "cpu": [ "arm" ], @@ -2217,9 +2272,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.39.0.tgz", - "integrity": "sha512-EKf7iF7aK36eEChvlgxGnk7pdJfzfQbNvGV/+l98iiMwU23MwvmV0Ty3pJ0p5WQfm3JRHOytSIqD9LB7Bq7xdQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.0.tgz", + "integrity": "sha512-L5ZLphTjjAD9leJzSLI7rr8fNqJMlGDKlazW2tX4IUF9P7R5TMQPElpH82Q7eNIDQnQlAyiNVfRPfP2vM5Avvg==", "cpu": [ "arm64" ], @@ -2231,9 +2286,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.39.0.tgz", - "integrity": "sha512-vYanR6MtqC7Z2SNr8gzVnzUul09Wi1kZqJaek3KcIlI/wq5Xtq4ZPIZ0Mr/st/sv/NnaPwy/D4yXg5x0B3aUUA==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.0.tgz", + "integrity": "sha512-ATZvCRGCDtv1Y4gpDIXsS+wfFeFuLwVxyUBSLawjgXK2tRE6fnsQEkE4csQQYWlBlsFztRzCnBvWVfcae/1qxQ==", "cpu": [ "arm64" ], @@ -2245,9 +2300,9 @@ ] }, "node_modules/@rollup/rollup-linux-loongarch64-gnu": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.39.0.tgz", - "integrity": "sha512-NMRUT40+h0FBa5fb+cpxtZoGAggRem16ocVKIv5gDB5uLDgBIwrIsXlGqYbLwW8YyO3WVTk1FkFDjMETYlDqiw==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.0.tgz", + "integrity": "sha512-wG9e2XtIhd++QugU5MD9i7OnpaVb08ji3P1y/hNbxrQ3sYEelKJOq1UJ5dXczeo6Hj2rfDEL5GdtkMSVLa/AOg==", "cpu": [ "loong64" ], @@ -2259,9 +2314,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.39.0.tgz", - "integrity": "sha512-0pCNnmxgduJ3YRt+D+kJ6Ai/r+TaePu9ZLENl+ZDV/CdVczXl95CbIiwwswu4L+K7uOIGf6tMo2vm8uadRaICQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.0.tgz", + "integrity": "sha512-vgXfWmj0f3jAUvC7TZSU/m/cOE558ILWDzS7jBhiCAFpY2WEBn5jqgbqvmzlMjtp8KlLcBlXVD2mkTSEQE6Ixw==", "cpu": [ "ppc64" ], @@ -2273,9 +2328,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.39.0.tgz", - "integrity": "sha512-t7j5Zhr7S4bBtksT73bO6c3Qa2AV/HqiGlj9+KB3gNF5upcVkx+HLgxTm8DK4OkzsOYqbdqbLKwvGMhylJCPhQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.0.tgz", + "integrity": "sha512-uJkYTugqtPZBS3Z136arevt/FsKTF/J9dEMTX/cwR7lsAW4bShzI2R0pJVw+hcBTWF4dxVckYh72Hk3/hWNKvA==", "cpu": [ "riscv64" ], @@ -2287,9 +2342,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.39.0.tgz", - "integrity": "sha512-m6cwI86IvQ7M93MQ2RF5SP8tUjD39Y7rjb1qjHgYh28uAPVU8+k/xYWvxRO3/tBN2pZkSMa5RjnPuUIbrwVxeA==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.0.tgz", + "integrity": "sha512-rKmSj6EXQRnhSkE22+WvrqOqRtk733x3p5sWpZilhmjnkHkpeCgWsFFo0dGnUGeA+OZjRl3+VYq+HyCOEuwcxQ==", "cpu": [ "riscv64" ], @@ -2301,9 +2356,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.39.0.tgz", - "integrity": "sha512-iRDJd2ebMunnk2rsSBYlsptCyuINvxUfGwOUldjv5M4tpa93K8tFMeYGpNk2+Nxl+OBJnBzy2/JCscGeO507kA==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.0.tgz", + "integrity": "sha512-SpnYlAfKPOoVsQqmTFJ0usx0z84bzGOS9anAC0AZ3rdSo3snecihbhFTlJZ8XMwzqAcodjFU4+/SM311dqE5Sw==", "cpu": [ "s390x" ], @@ -2315,9 +2370,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.39.0.tgz", - "integrity": "sha512-t9jqYw27R6Lx0XKfEFe5vUeEJ5pF3SGIM6gTfONSMb7DuG6z6wfj2yjcoZxHg129veTqU7+wOhY6GX8wmf90dA==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.0.tgz", + "integrity": "sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==", "cpu": [ "x64" ], @@ -2329,9 +2384,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.39.0.tgz", - "integrity": "sha512-ThFdkrFDP55AIsIZDKSBWEt/JcWlCzydbZHinZ0F/r1h83qbGeenCt/G/wG2O0reuENDD2tawfAj2s8VK7Bugg==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.0.tgz", + "integrity": "sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==", "cpu": [ "x64" ], @@ -2343,9 +2398,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.39.0.tgz", - "integrity": "sha512-jDrLm6yUtbOg2TYB3sBF3acUnAwsIksEYjLeHL+TJv9jg+TmTwdyjnDex27jqEMakNKf3RwwPahDIt7QXCSqRQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.0.tgz", + "integrity": "sha512-UtZQQI5k/b8d7d3i9AZmA/t+Q4tk3hOC0tMOMSq2GlMYOfxbesxG4mJSeDp0EHs30N9bsfwUvs3zF4v/RzOeTQ==", "cpu": [ "arm64" ], @@ -2357,9 +2412,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.39.0.tgz", - "integrity": "sha512-6w9uMuza+LbLCVoNKL5FSLE7yvYkq9laSd09bwS0tMjkwXrmib/4KmoJcrKhLWHvw19mwU+33ndC69T7weNNjQ==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.0.tgz", + "integrity": "sha512-+m03kvI2f5syIqHXCZLPVYplP8pQch9JHyXKZ3AGMKlg8dCyr2PKHjwRLiW53LTrN/Nc3EqHOKxUxzoSPdKddA==", "cpu": [ "ia32" ], @@ -2371,9 +2426,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.39.0.tgz", - "integrity": "sha512-yAkUOkIKZlK5dl7u6dg897doBgLXmUHhIINM2c+sND3DZwnrdQkkSiDh7N75Ll4mM4dxSkYfXqU9fW3lLkMFug==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.0.tgz", + "integrity": "sha512-lpPE1cLfP5oPzVjKMx10pgBmKELQnFJXHgvtHCtuJWOv8MxqdEIMNtgHgBFf7Ea2/7EuVwa9fodWUfXAlXZLZQ==", "cpu": [ "x64" ], @@ -2385,12 +2440,12 @@ ] }, "node_modules/@tanstack/react-table": { - "version": "8.21.2", - "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.2.tgz", - "integrity": "sha512-11tNlEDTdIhMJba2RBH+ecJ9l1zgS2kjmexDPAraulc8jeNA4xocSNeyzextT0XJyASil4XsCYlJmf5jEWAtYg==", + "version": "8.21.3", + "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.3.tgz", + "integrity": "sha512-5nNMTSETP4ykGegmVkhjcS8tTLW6Vl4axfEGQN3v0zdHYbK4UfoqfPChclTrJ4EoK9QynqAu9oUf8VEmrpZ5Ww==", "license": "MIT", "dependencies": { - "@tanstack/table-core": "8.21.2" + "@tanstack/table-core": "8.21.3" }, "engines": { "node": ">=12" @@ -2405,9 +2460,9 @@ } }, "node_modules/@tanstack/table-core": { - "version": "8.21.2", - "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.2.tgz", - "integrity": "sha512-uvXk/U4cBiFMxt+p9/G7yUWI/UbHYbyghLCjlpWZ3mLeIZiUBSKcUnw9UnKkdRz7Z/N4UBuFLWQdJCjUe7HjvA==", + "version": "8.21.3", + "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.3.tgz", + "integrity": "sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg==", "license": "MIT", "engines": { "node": ">=12" @@ -2466,9 +2521,9 @@ } }, "node_modules/@types/babel__generator": { - "version": "7.6.8", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", - "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", + "version": "7.27.0", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz", + "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==", "dev": true, "license": "MIT", "dependencies": { @@ -2496,12 +2551,6 @@ "@babel/types": "^7.20.7" } }, - "node_modules/@types/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", - "license": "MIT" - }, "node_modules/@types/estree": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", @@ -2517,15 +2566,15 @@ "license": "MIT" }, "node_modules/@types/luxon": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.6.0.tgz", - "integrity": "sha512-RtEj20xRyG7cRp142MkQpV3GRF8Wo2MtDkKLz65MQs7rM1Lh8bz+HtfPXCCJEYpnDFu6VwAq/Iv2Ikyp9Jw/hw==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.6.2.tgz", + "integrity": "sha512-R/BdP7OxEMc44l2Ex5lSXHoIXTB2JLNa3y2QISIbr58U/YcsffyQrYW//hZSdrfxrjRZj3GcUoxMPGdO8gSYuw==", "license": "MIT" }, "node_modules/@types/node": { - "version": "22.14.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.0.tgz", - "integrity": "sha512-Kmpl+z84ILoG+3T/zQFyAJsU6EPTmOCj8/2+83fSN6djd6I4o7uOuGIH6vq3PrjY5BGitSbFuMN18j3iknubbA==", + "version": "22.14.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz", + "integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==", "dev": true, "license": "MIT", "dependencies": { @@ -2568,17 +2617,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.29.0.tgz", - "integrity": "sha512-PAIpk/U7NIS6H7TEtN45SPGLQaHNgB7wSjsQV/8+KYokAb2T/gloOA/Bee2yd4/yKVhPKe5LlaUGhAZk5zmSaQ==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.31.0.tgz", + "integrity": "sha512-evaQJZ/J/S4wisevDvC1KFZkPzRetH8kYZbkgcTRyql3mcKsf+ZFDV1BVWUGTCAW5pQHoqn5gK5b8kn7ou9aFQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.29.0", - "@typescript-eslint/type-utils": "8.29.0", - "@typescript-eslint/utils": "8.29.0", - "@typescript-eslint/visitor-keys": "8.29.0", + "@typescript-eslint/scope-manager": "8.31.0", + "@typescript-eslint/type-utils": "8.31.0", + "@typescript-eslint/utils": "8.31.0", + "@typescript-eslint/visitor-keys": "8.31.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -2598,16 +2647,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.29.0.tgz", - "integrity": "sha512-8C0+jlNJOwQso2GapCVWWfW/rzaq7Lbme+vGUFKE31djwNncIpgXD7Cd4weEsDdkoZDjH0lwwr3QDQFuyrMg9g==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.31.0.tgz", + "integrity": "sha512-67kYYShjBR0jNI5vsf/c3WG4u+zDnCTHTPqVMQguffaWWFs7artgwKmfwdifl+r6XyM5LYLas/dInj2T0SgJyw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.29.0", - "@typescript-eslint/types": "8.29.0", - "@typescript-eslint/typescript-estree": "8.29.0", - "@typescript-eslint/visitor-keys": "8.29.0", + "@typescript-eslint/scope-manager": "8.31.0", + "@typescript-eslint/types": "8.31.0", + "@typescript-eslint/typescript-estree": "8.31.0", + "@typescript-eslint/visitor-keys": "8.31.0", "debug": "^4.3.4" }, "engines": { @@ -2623,14 +2672,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.29.0.tgz", - "integrity": "sha512-aO1PVsq7Gm+tcghabUpzEnVSFMCU4/nYIgC2GOatJcllvWfnhrgW0ZEbnTxm36QsikmCN1K/6ZgM7fok2I7xNw==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.31.0.tgz", + "integrity": "sha512-knO8UyF78Nt8O/B64i7TlGXod69ko7z6vJD9uhSlm0qkAbGeRUSudcm0+K/4CrRjrpiHfBCjMWlc08Vav1xwcw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.29.0", - "@typescript-eslint/visitor-keys": "8.29.0" + "@typescript-eslint/types": "8.31.0", + "@typescript-eslint/visitor-keys": "8.31.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2641,14 +2690,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.29.0.tgz", - "integrity": "sha512-ahaWQ42JAOx+NKEf5++WC/ua17q5l+j1GFrbbpVKzFL/tKVc0aYY8rVSYUpUvt2hUP1YBr7mwXzx+E/DfUWI9Q==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.31.0.tgz", + "integrity": "sha512-DJ1N1GdjI7IS7uRlzJuEDCgDQix3ZVYVtgeWEyhyn4iaoitpMBX6Ndd488mXSx0xah/cONAkEaYyylDyAeHMHg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.29.0", - "@typescript-eslint/utils": "8.29.0", + "@typescript-eslint/typescript-estree": "8.31.0", + "@typescript-eslint/utils": "8.31.0", "debug": "^4.3.4", "ts-api-utils": "^2.0.1" }, @@ -2665,9 +2714,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.29.0.tgz", - "integrity": "sha512-wcJL/+cOXV+RE3gjCyl/V2G877+2faqvlgtso/ZRbTCnZazh0gXhe+7gbAnfubzN2bNsBtZjDvlh7ero8uIbzg==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.31.0.tgz", + "integrity": "sha512-Ch8oSjVyYyJxPQk8pMiP2FFGYatqXQfQIaMp+TpuuLlDachRWpUAeEu1u9B/v/8LToehUIWyiKcA/w5hUFRKuQ==", "dev": true, "license": "MIT", "engines": { @@ -2679,14 +2728,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.29.0.tgz", - "integrity": "sha512-yOfen3jE9ISZR/hHpU/bmNvTtBW1NjRbkSFdZOksL1N+ybPEE7UVGMwqvS6CP022Rp00Sb0tdiIkhSCe6NI8ow==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.31.0.tgz", + "integrity": "sha512-xLmgn4Yl46xi6aDSZ9KkyfhhtnYI15/CvHbpOy/eR5NWhK/BK8wc709KKwhAR0m4ZKRP7h07bm4BWUYOCuRpQQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.29.0", - "@typescript-eslint/visitor-keys": "8.29.0", + "@typescript-eslint/types": "8.31.0", + "@typescript-eslint/visitor-keys": "8.31.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -2745,16 +2794,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.29.0.tgz", - "integrity": "sha512-gX/A0Mz9Bskm8avSWFcK0gP7cZpbY4AIo6B0hWYFCaIsz750oaiWR4Jr2CI+PQhfW1CpcQr9OlfPS+kMFegjXA==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.31.0.tgz", + "integrity": "sha512-qi6uPLt9cjTFxAb1zGNgTob4x9ur7xC6mHQJ8GwEzGMGE9tYniublmJaowOJ9V2jUzxrltTPfdG2nKlWsq0+Ww==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.29.0", - "@typescript-eslint/types": "8.29.0", - "@typescript-eslint/typescript-estree": "8.29.0" + "@typescript-eslint/scope-manager": "8.31.0", + "@typescript-eslint/types": "8.31.0", + "@typescript-eslint/typescript-estree": "8.31.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2769,13 +2818,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.29.0.tgz", - "integrity": "sha512-Sne/pVz8ryR03NFK21VpN88dZ2FdQXOlq3VIklbrTYEt8yXtRFr9tvUhqvCeKjqYk5FSim37sHbooT6vzBTZcg==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.31.0.tgz", + "integrity": "sha512-QcGHmlRHWOl93o64ZUMNewCdwKGU6WItOU52H0djgNmn1EOrhVudrDzXz4OycCRSCPwFCDrE2iIt5vmuUdHxuQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.29.0", + "@typescript-eslint/types": "8.31.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -2787,17 +2836,17 @@ } }, "node_modules/@vitejs/plugin-react": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.4.tgz", - "integrity": "sha512-SCCPBJtYLdE8PX/7ZQAs1QAZ8Jqwih+0VBLum1EGqmCCQal+MIUqLCzj3ZUy8ufbC0cAM4LRlSTm7IQJwWT4ug==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.4.1.tgz", + "integrity": "sha512-IpEm5ZmeXAP/osiBXVVP5KjFMzbWOonMs0NaQQl+xYnUAcq4oHUBsF2+p4MgKWG4YMmFYJU8A6sxRPuowllm6w==", "dev": true, "license": "MIT", "dependencies": { - "@babel/core": "^7.26.0", + "@babel/core": "^7.26.10", "@babel/plugin-transform-react-jsx-self": "^7.25.9", "@babel/plugin-transform-react-jsx-source": "^7.25.9", "@types/babel__core": "^7.20.5", - "react-refresh": "^0.14.2" + "react-refresh": "^0.17.0" }, "engines": { "node": "^14.18.0 || >=16.0.0" @@ -3053,6 +3102,35 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, + "node_modules/c12": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/c12/-/c12-3.0.3.tgz", + "integrity": "sha512-uC3MacKBb0Z15o5QWCHvHWj5Zv34pGQj9P+iXKSpTuSGFS0KKhUWf4t9AJ+gWjYOdmWCPEGpEzm8sS0iqbpo1w==", + "dev": true, + "license": "MIT", + "dependencies": { + "chokidar": "^4.0.3", + "confbox": "^0.2.2", + "defu": "^6.1.4", + "dotenv": "^16.4.7", + "exsolve": "^1.0.4", + "giget": "^2.0.0", + "jiti": "^2.4.2", + "ohash": "^2.0.11", + "pathe": "^2.0.3", + "perfect-debounce": "^1.0.0", + "pkg-types": "^2.1.0", + "rc9": "^2.1.2" + }, + "peerDependencies": { + "magicast": "^0.3.5" + }, + "peerDependenciesMeta": { + "magicast": { + "optional": true + } + } + }, "node_modules/call-me-maybe": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz", @@ -3080,9 +3158,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001707", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz", - "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==", + "version": "1.0.30001715", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz", + "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==", "dev": true, "funding": [ { @@ -3118,39 +3196,19 @@ } }, "node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "dev": true, "license": "MIT", "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" + "readdirp": "^4.0.1" }, "engines": { - "node": ">= 8.10.0" + "node": ">= 14.16.0" }, "funding": { "url": "https://paulmillr.com/funding/" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/chokidar/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" } }, "node_modules/citty": { @@ -3312,6 +3370,13 @@ "dev": true, "license": "MIT" }, + "node_modules/confbox": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.2.tgz", + "integrity": "sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==", + "dev": true, + "license": "MIT" + }, "node_modules/consola": { "version": "3.4.2", "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz", @@ -3347,33 +3412,6 @@ "toggle-selection": "^1.0.6" } }, - "node_modules/cosmiconfig": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", - "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", - "dev": true, - "license": "MIT", - "dependencies": { - "env-paths": "^2.2.1", - "import-fresh": "^3.3.0", - "js-yaml": "^4.1.0", - "parse-json": "^5.2.0" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/d-fischer" - }, - "peerDependencies": { - "typescript": ">=4.9.5" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -3431,6 +3469,13 @@ "dev": true, "license": "MIT" }, + "node_modules/defu": { + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz", + "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==", + "dev": true, + "license": "MIT" + }, "node_modules/dequal": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", @@ -3440,6 +3485,13 @@ "node": ">=6" } }, + "node_modules/destr": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/destr/-/destr-2.0.5.tgz", + "integrity": "sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==", + "dev": true, + "license": "MIT" + }, "node_modules/detect-node-es": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz", @@ -3458,6 +3510,19 @@ "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", "license": "MIT" }, + "node_modules/dotenv": { + "version": "16.5.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz", + "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -3465,9 +3530,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.129", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.129.tgz", - "integrity": "sha512-JlXUemX4s0+9f8mLqib/bHH8gOHf5elKS6KeWG3sk3xozb/JTq/RLXIv8OKUWiK4Ah00Wm88EFj5PYkFr4RUPA==", + "version": "1.5.140", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.140.tgz", + "integrity": "sha512-o82Rj+ONp4Ip7Cl1r7lrqx/pXhbp/lh9DpKcMNscFJdh8ebyRofnc7Sh01B4jx403RI0oqTBvlZ7OBIZLMr2+Q==", "dev": true, "license": "ISC" }, @@ -3477,26 +3542,6 @@ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "license": "MIT" }, - "node_modules/env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-arrayish": "^0.2.1" - } - }, "node_modules/es6-promise": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", @@ -3569,20 +3614,20 @@ } }, "node_modules/eslint": { - "version": "9.23.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.23.0.tgz", - "integrity": "sha512-jV7AbNoFPAY1EkFYpLq5bslU9NLNO8xnEeQXwErNibVryjk67wHVmddTBilc5srIttJDBrB0eMHKZBFbSIABCw==", + "version": "9.25.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.25.1.tgz", + "integrity": "sha512-E6Mtz9oGQWDCpV12319d59n4tx9zOTXSTmc8BLVxBx+G/0RdM5MvEEJLU9c0+aleoePYYgVTOsRblx433qmhWQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.19.2", - "@eslint/config-helpers": "^0.2.0", - "@eslint/core": "^0.12.0", + "@eslint/config-array": "^0.20.0", + "@eslint/config-helpers": "^0.2.1", + "@eslint/core": "^0.13.0", "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.23.0", - "@eslint/plugin-kit": "^0.2.7", + "@eslint/js": "9.25.1", + "@eslint/plugin-kit": "^0.2.8", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", @@ -3643,9 +3688,9 @@ } }, "node_modules/eslint-plugin-react-refresh": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.19.tgz", - "integrity": "sha512-eyy8pcr/YxSYjBoqIFSrlbn9i/xvxUFa8CjzAYo9cFjgGXqq1hyjihcpZvxRLalpaWmueWR81xn7vuKmAFijDQ==", + "version": "0.4.20", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.20.tgz", + "integrity": "sha512-XpbHQ2q5gUF8BGOX4dHe+71qoirYMhApEPZ7sfhF/dNnOF1UXnCMGZf79SFTBO7Bz5YEIT4TMieSlJBWhP9WBA==", "dev": true, "license": "MIT", "peerDependencies": { @@ -3759,6 +3804,13 @@ "url": "https://github.com/eta-dev/eta?sponsor=1" } }, + "node_modules/exsolve": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.5.tgz", + "integrity": "sha512-pz5dvkYYKQ1AHVrgOzBKWeP4u4FRb3a6DNK2ucr0OoNwYIU4QWsJ+NM36LLzORT+z845MzKHHhpXiUF5nvQoJg==", + "dev": true, + "license": "MIT" + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -3996,6 +4048,24 @@ "node": ">=6" } }, + "node_modules/giget": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/giget/-/giget-2.0.0.tgz", + "integrity": "sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "citty": "^0.1.6", + "consola": "^3.4.0", + "defu": "^6.1.4", + "node-fetch-native": "^1.6.6", + "nypm": "^0.6.0", + "pathe": "^2.0.3" + }, + "bin": { + "giget": "dist/cli.mjs" + } + }, "node_modules/glob": { "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", @@ -4142,9 +4212,9 @@ } }, "node_modules/i18next-browser-languagedetector": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.0.4.tgz", - "integrity": "sha512-f3frU3pIxD50/Tz20zx9TD9HobKYg47fmAETb117GKGPrhwcSSPJDoCposXlVycVebQ9GQohC3Efbpq7/nnJ5w==", + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.0.5.tgz", + "integrity": "sha512-OstebRKqKiQw8xEvQF5aRyUujsCatanj7Q9eo5iiH2gJpoXGZ7483ol3sVBwfqbobTQPNH1J+NAyJ1aCQoEC+w==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.23.2" @@ -4187,13 +4257,6 @@ "node": ">=0.8.19" } }, - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true, - "license": "MIT" - }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -4288,18 +4351,19 @@ "license": "MIT" }, "node_modules/jiti": { - "version": "1.21.7", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz", - "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz", + "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==", + "dev": true, "license": "MIT", "bin": { - "jiti": "bin/jiti.js" + "jiti": "lib/jiti-cli.mjs" } }, "node_modules/jotai": { - "version": "2.12.2", - "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.12.2.tgz", - "integrity": "sha512-oN8715y7MkjXlSrpyjlR887TOuc/NLZMs9gvgtfWH/JP47ChwO0lR2ijSwBvPMYyXRAPT+liIAhuBavluKGgtA==", + "version": "2.12.3", + "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.12.3.tgz", + "integrity": "sha512-DpoddSkmPGXMFtdfnoIHfueFeGP643nqYUWC6REjUcME+PG2UkAtYnLbffRDw3OURI9ZUTcRWkRGLsOvxuWMCg==", "license": "MIT", "peer": true, "engines": { @@ -4365,13 +4429,6 @@ "dev": true, "license": "MIT" }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, - "license": "MIT" - }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -4643,6 +4700,13 @@ "node": "4.x || >=6.0.0" } }, + "node_modules/node-fetch-native": { + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.6.tgz", + "integrity": "sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==", + "dev": true, + "license": "MIT" + }, "node_modules/node-readfiles": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/node-readfiles/-/node-readfiles-0.2.0.tgz", @@ -4679,6 +4743,26 @@ "node": ">=0.10.0" } }, + "node_modules/nypm": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.0.tgz", + "integrity": "sha512-mn8wBFV9G9+UFHIrq+pZ2r2zL4aPau/by3kJb3cM7+5tQHMt6HGQB8FDIeKFYp8o0D2pnH6nVsO88N4AmUxIWg==", + "dev": true, + "license": "MIT", + "dependencies": { + "citty": "^0.1.6", + "consola": "^3.4.0", + "pathe": "^2.0.3", + "pkg-types": "^2.0.0", + "tinyexec": "^0.3.2" + }, + "bin": { + "nypm": "dist/cli.mjs" + }, + "engines": { + "node": "^14.16.0 || >=16.10.0" + } + }, "node_modules/oas-kit-common": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/oas-kit-common/-/oas-kit-common-1.0.8.tgz", @@ -4802,6 +4886,13 @@ "node": ">= 6" } }, + "node_modules/ohash": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/ohash/-/ohash-2.0.11.tgz", + "integrity": "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==", + "dev": true, + "license": "MIT" + }, "node_modules/optionator": { "version": "0.9.4", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", @@ -4871,25 +4962,6 @@ "node": ">=6" } }, - "node_modules/parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -4937,6 +5009,20 @@ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "license": "ISC" }, + "node_modules/pathe": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", + "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==", + "dev": true, + "license": "MIT" + }, + "node_modules/perfect-debounce": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz", + "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==", + "dev": true, + "license": "MIT" + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -4973,6 +5059,18 @@ "node": ">= 6" } }, + "node_modules/pkg-types": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.1.0.tgz", + "integrity": "sha512-wmJwA+8ihJixSoHKxZJRBQG1oY8Yr9pGLzRmSsNms0iNWyHHAlZCa7mmKiFR10YPZuz/2k169JiS/inOjBCZ2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "confbox": "^0.2.1", + "exsolve": "^1.0.1", + "pathe": "^2.0.3" + } + }, "node_modules/postcss": { "version": "8.5.3", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz", @@ -5131,6 +5229,7 @@ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz", "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==", "license": "MIT", + "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -5249,6 +5348,17 @@ ], "license": "MIT" }, + "node_modules/rc9": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/rc9/-/rc9-2.1.2.tgz", + "integrity": "sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg==", + "dev": true, + "license": "MIT", + "dependencies": { + "defu": "^6.1.4", + "destr": "^2.0.3" + } + }, "node_modules/react": { "version": "19.1.0", "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz", @@ -5271,9 +5381,9 @@ } }, "node_modules/react-hook-form": { - "version": "7.55.0", - "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.55.0.tgz", - "integrity": "sha512-XRnjsH3GVMQz1moZTW53MxfoWN7aDpUg/GpVNc4A3eXRVNdGXfbzJ4vM4aLQ8g6XCUh1nIbx70aaNCl7kxnjog==", + "version": "7.56.0", + "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.56.0.tgz", + "integrity": "sha512-U2QQgx5z2Y8Z0qlXv3W19hWHJgfKdWMz0O/osuY+o+CYq568V2R/JhzC6OAXfR8k24rIN0Muan2Qliaq9eKs/g==", "license": "MIT", "engines": { "node": ">=18.0.0" @@ -5309,9 +5419,9 @@ } }, "node_modules/react-refresh": { - "version": "0.14.2", - "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz", - "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz", + "integrity": "sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==", "dev": true, "license": "MIT", "engines": { @@ -5366,12 +5476,11 @@ } }, "node_modules/react-router": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.4.1.tgz", - "integrity": "sha512-Vmizn9ZNzxfh3cumddqv3kLOKvc7AskUT0dC1prTabhiEi0U4A33LmkDOJ79tXaeSqCqMBXBU/ySX88W85+EUg==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.5.1.tgz", + "integrity": "sha512-/jjU3fcYNd2bwz9Q0xt5TwyiyoO8XjSEFXJY4O/lMAlkGTHWuHRAbR9Etik+lSDqMC7A7mz3UlXzgYT6Vl58sA==", "license": "MIT", "dependencies": { - "@types/cookie": "^0.6.0", "cookie": "^1.0.1", "set-cookie-parser": "^2.6.0", "turbo-stream": "2.4.0" @@ -5390,12 +5499,12 @@ } }, "node_modules/react-router-dom": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.4.1.tgz", - "integrity": "sha512-L3/4tig0Lvs6m6THK0HRV4eHUdpx0dlJasgCxXKnavwhh4tKYgpuZk75HRYNoRKDyDWi9QgzGXsQ1oQSBlWpAA==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.5.1.tgz", + "integrity": "sha512-5DPSPc7ENrt2tlKPq0FtpG80ZbqA9aIKEyqX6hSNJDlol/tr6iqCK4crqdsusmOSSotq6zDsn0y3urX9TuTNmA==", "license": "MIT", "dependencies": { - "react-router": "7.4.1" + "react-router": "7.5.1" }, "engines": { "node": ">=20.0.0" @@ -5447,15 +5556,17 @@ } }, "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", + "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "dev": true, "license": "MIT", - "dependencies": { - "picomatch": "^2.2.1" - }, "engines": { - "node": ">=8.10.0" + "node": ">= 14.18.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" } }, "node_modules/reftools": { @@ -5525,9 +5636,9 @@ } }, "node_modules/rollup": { - "version": "4.39.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.39.0.tgz", - "integrity": "sha512-thI8kNc02yNvnmJp8dr3fNWJ9tCONDhp6TV35X6HkKGGs9E6q7YWCHbe5vKiTa7TAiNcFEmXKj3X/pG2b3ci0g==", + "version": "4.40.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.0.tgz", + "integrity": "sha512-Noe455xmA96nnqH5piFtLobsGbCij7Tu+tb3c1vYjNbTkfzGqXqQXG3wJaYXkRZuQ0vEYN4bhwg7QnIrqB5B+w==", "dev": true, "license": "MIT", "dependencies": { @@ -5541,26 +5652,26 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.39.0", - "@rollup/rollup-android-arm64": "4.39.0", - "@rollup/rollup-darwin-arm64": "4.39.0", - "@rollup/rollup-darwin-x64": "4.39.0", - "@rollup/rollup-freebsd-arm64": "4.39.0", - "@rollup/rollup-freebsd-x64": "4.39.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.39.0", - "@rollup/rollup-linux-arm-musleabihf": "4.39.0", - "@rollup/rollup-linux-arm64-gnu": "4.39.0", - "@rollup/rollup-linux-arm64-musl": "4.39.0", - "@rollup/rollup-linux-loongarch64-gnu": "4.39.0", - "@rollup/rollup-linux-powerpc64le-gnu": "4.39.0", - "@rollup/rollup-linux-riscv64-gnu": "4.39.0", - "@rollup/rollup-linux-riscv64-musl": "4.39.0", - "@rollup/rollup-linux-s390x-gnu": "4.39.0", - "@rollup/rollup-linux-x64-gnu": "4.39.0", - "@rollup/rollup-linux-x64-musl": "4.39.0", - "@rollup/rollup-win32-arm64-msvc": "4.39.0", - "@rollup/rollup-win32-ia32-msvc": "4.39.0", - "@rollup/rollup-win32-x64-msvc": "4.39.0", + "@rollup/rollup-android-arm-eabi": "4.40.0", + "@rollup/rollup-android-arm64": "4.40.0", + "@rollup/rollup-darwin-arm64": "4.40.0", + "@rollup/rollup-darwin-x64": "4.40.0", + "@rollup/rollup-freebsd-arm64": "4.40.0", + "@rollup/rollup-freebsd-x64": "4.40.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.40.0", + "@rollup/rollup-linux-arm-musleabihf": "4.40.0", + "@rollup/rollup-linux-arm64-gnu": "4.40.0", + "@rollup/rollup-linux-arm64-musl": "4.40.0", + "@rollup/rollup-linux-loongarch64-gnu": "4.40.0", + "@rollup/rollup-linux-powerpc64le-gnu": "4.40.0", + "@rollup/rollup-linux-riscv64-gnu": "4.40.0", + "@rollup/rollup-linux-riscv64-musl": "4.40.0", + "@rollup/rollup-linux-s390x-gnu": "4.40.0", + "@rollup/rollup-linux-x64-gnu": "4.40.0", + "@rollup/rollup-linux-x64-musl": "4.40.0", + "@rollup/rollup-win32-arm64-msvc": "4.40.0", + "@rollup/rollup-win32-ia32-msvc": "4.40.0", + "@rollup/rollup-win32-x64-msvc": "4.40.0", "fsevents": "~2.3.2" } }, @@ -5885,24 +5996,25 @@ "license": "ISC" }, "node_modules/swagger-typescript-api": { - "version": "13.0.28", - "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.0.28.tgz", - "integrity": "sha512-8IwPD6nCFDTtzSl8rS7xlAx0NGMpBUlFfccJwgMV7t8d/nKw1yQWPVdC7h94XDsDPrLFvICd5xAJJm2TK2Pcpw==", + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.1.1.tgz", + "integrity": "sha512-Slwbvz1cAno7TjujKfKIvGK5R72BlpQhnVUUtK/TcQjx/pMIiGVCaLaJWOux0mye7LEABABAhUwArFEAusuAcQ==", "dev": true, "license": "MIT", "dependencies": { + "@biomejs/js-api": "^0.7.1", + "@biomejs/wasm-nodejs": "^1.9.4", "@types/swagger-schema-official": "^2.0.25", + "c12": "^3.0.3", "citty": "^0.1.6", "consola": "^3.4.2", - "cosmiconfig": "^9.0.0", "eta": "^2.2.0", "js-yaml": "^4.1.0", "lodash": "^4.17.21", "nanoid": "^5.1.5", - "prettier": "~3.5.3", "swagger-schema-official": "2.0.0-bab6bed", "swagger2openapi": "^7.0.8", - "typescript": "~5.8.2" + "typescript": "~5.8.3" }, "bin": { "sta": "dist/cli.js", @@ -5932,9 +6044,9 @@ } }, "node_modules/swagger-typescript-api/node_modules/typescript": { - "version": "5.8.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz", - "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", + "version": "5.8.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", + "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", "dev": true, "license": "Apache-2.0", "bin": { @@ -6052,6 +6164,63 @@ "tailwindcss": ">=3.0.0 || insiders" } }, + "node_modules/tailwindcss/node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/tailwindcss/node_modules/chokidar/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/tailwindcss/node_modules/jiti": { + "version": "1.21.7", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz", + "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==", + "license": "MIT", + "bin": { + "jiti": "bin/jiti.js" + } + }, + "node_modules/tailwindcss/node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, "node_modules/thenify": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", @@ -6073,6 +6242,58 @@ "node": ">=0.8" } }, + "node_modules/tinyexec": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz", + "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==", + "dev": true, + "license": "MIT" + }, + "node_modules/tinyglobby": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz", + "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==", + "dev": true, + "license": "MIT", + "dependencies": { + "fdir": "^6.4.4", + "picomatch": "^4.0.2" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, + "node_modules/tinyglobby/node_modules/fdir": { + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", + "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, + "node_modules/tinyglobby/node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -6157,15 +6378,15 @@ } }, "node_modules/typescript-eslint": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.29.0.tgz", - "integrity": "sha512-ep9rVd9B4kQsZ7ZnWCVxUE/xDLUUUsRzE0poAeNu+4CkFErLfuvPt/qtm2EpnSyfvsR0S6QzDFSrPCFBwf64fg==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.31.0.tgz", + "integrity": "sha512-u+93F0sB0An8WEAPtwxVhFby573E8ckdjwUUQUj9QA4v8JAvgtoDdIyYR3XFwFHq2W1KJ1AurwJCO+w+Y1ixyQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.29.0", - "@typescript-eslint/parser": "8.29.0", - "@typescript-eslint/utils": "8.29.0" + "@typescript-eslint/eslint-plugin": "8.31.0", + "@typescript-eslint/parser": "8.31.0", + "@typescript-eslint/utils": "8.31.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -6299,15 +6520,18 @@ } }, "node_modules/vite": { - "version": "6.2.4", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.4.tgz", - "integrity": "sha512-veHMSew8CcRzhL5o8ONjy8gkfmFJAd5Ac16oxBUjlwgX3Gq2Wqr+qNC3TjPIpy7TPV/KporLga5GT9HqdrCizw==", + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.2.tgz", + "integrity": "sha512-ZSvGOXKGceizRQIZSz7TGJ0pS3QLlVY/9hwxVh17W3re67je1RKYzFHivZ/t0tubU78Vkyb9WnHPENSBCzbckg==", "dev": true, "license": "MIT", "dependencies": { "esbuild": "^0.25.0", + "fdir": "^6.4.3", + "picomatch": "^4.0.2", "postcss": "^8.5.3", - "rollup": "^4.30.1" + "rollup": "^4.34.9", + "tinyglobby": "^0.2.12" }, "bin": { "vite": "bin/vite.js" @@ -6370,6 +6594,34 @@ } } }, + "node_modules/vite/node_modules/fdir": { + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", + "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, + "node_modules/vite/node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/void-elements": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz", @@ -6627,9 +6879,9 @@ } }, "node_modules/zod": { - "version": "3.24.2", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.2.tgz", - "integrity": "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==", + "version": "3.24.3", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.3.tgz", + "integrity": "sha512-HhY1oqzWCQWuUqvBFnsyrtZRhyPeR7SUGv+C4+MsisMuVfSPx8HpwWqH8tRahSlt6M3PiFAcoeFhZAqIXTxoSg==", "license": "MIT", "funding": { "url": "https://github.com/sponsors/colinhacks" diff --git a/pkgs/by-name/ne/nezha-theme-admin/package.nix b/pkgs/by-name/ne/nezha-theme-admin/package.nix index 759235b00d46..c2abd6506922 100644 --- a/pkgs/by-name/ne/nezha-theme-admin/package.nix +++ b/pkgs/by-name/ne/nezha-theme-admin/package.nix @@ -7,13 +7,13 @@ buildNpmPackage rec { pname = "nezha-theme-admin"; - version = "1.10.4"; + version = "1.12.0"; src = fetchFromGitHub { owner = "nezhahq"; repo = "admin-frontend"; tag = "v${version}"; - hash = "sha256-TT/WCeHYi/Q5zpB8DCdJdAv8sJsm4J7q596qOqbCH4E="; + hash = "sha256-M1iJmSskXk0Qhr+p9yradZE4Xnf88F28NBUfJw4Wr34="; }; # TODO: Switch to the bun build function once available in nixpkgs @@ -21,7 +21,7 @@ buildNpmPackage rec { cp ${./package-lock.json} package-lock.json ''; - npmDepsHash = "sha256-vkToSpCqsXrbjMxmnlyBGeiWTQaQC04XBnCRtn9lEQU="; + npmDepsHash = "sha256-y0MnD6ymU4YDpNkTrEKMROHwllSVRm1LQeG0v3IPa0Y="; npmPackFlags = [ "--ignore-scripts" ]; diff --git a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix index f0e68a0383a5..bdbeba1066d4 100644 --- a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix +++ b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "nezha-theme-nazhua"; - version = "0.6.4"; + version = "0.6.6"; src = fetchFromGitHub { owner = "hi2shark"; repo = "nazhua"; tag = "v${finalAttrs.version}"; - hash = "sha256-9mBM8M9pPZMMyFcf4JOyY5rnhpiNEy8ZDDnEoopjcbg="; + hash = "sha256-Flx0yHhYGDM9qPIsE1ZfjdmuWXbDTodnaiVK7Hee3Z4="; }; yarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix index 205daad58fae..cd1a3ec815d3 100644 --- a/pkgs/by-name/ne/nezha/package.nix +++ b/pkgs/by-name/ne/nezha/package.nix @@ -14,7 +14,7 @@ let pname = "nezha"; - version = "1.10.8"; + version = "1.12.0"; frontendName = lib.removePrefix "nezha-theme-"; @@ -58,7 +58,7 @@ buildGo124Module { owner = "nezhahq"; repo = "nezha"; tag = "v${version}"; - hash = "sha256-uYZclZPvjiOpCVpxkyU6BjdxBmdryBzoGkTctsRuapY="; + hash = "sha256-ajjAsoR+1HRHfIjyqlJFHtn1nzDAdbP5TzKOqnHlAXw="; }; proxyVendor = true; @@ -97,7 +97,7 @@ buildGo124Module { GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d . -g ./cmd/dashboard/main.go -o ./cmd/dashboard/docs --parseGoList=false ''; - vendorHash = "sha256-ftVcbO1QYIEYUwPqxAHE/7TNBwzgN5BNyu5+rTnOgIs="; + vendorHash = "sha256-8pOeMUiBEUbB7D3MnlpOTdanktR8XdXm3YB53XMCDWQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/ng/nginx-language-server/package.nix b/pkgs/by-name/ng/nginx-language-server/package.nix index d9e19b79f7b6..cb7aee0da561 100644 --- a/pkgs/by-name/ng/nginx-language-server/package.nix +++ b/pkgs/by-name/ng/nginx-language-server/package.nix @@ -1,22 +1,24 @@ { lib, - python3, + python3Packages, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "nginx-language-server"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "pappasam"; repo = "nginx-language-server"; tag = "v${version}"; - hash = "sha256-AXWrNt4f3jkAbidE1goDgFicu4sSBv08f/Igyh2bRII="; + hash = "sha256-v9+Y8NBvN8HvTdNrK9D9YQuqDB3olIu5LfYapjlVlAM="; }; - build-system = with python3.pkgs; [ + build-system = with python3Packages; [ poetry-core ]; @@ -24,21 +26,31 @@ python3.pkgs.buildPythonApplication rec { "pydantic" ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ crossplane lsprotocol pydantic pygls + typing-extensions ]; pythonImportsCheck = [ "nginx_language_server" ]; - meta = with lib; { + nativeCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Language server for nginx.conf"; homepage = "https://github.com/pappasam/nginx-language-server"; changelog = "https://github.com/pappasam/nginx-language-server/blob/${src.rev}/CHANGELOG.md"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "nginx-language-server"; }; } diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index aeef324f1a0b..c4f36998123f 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -4,27 +4,26 @@ rustPlatform, installShellFiles, makeBinaryWrapper, - darwin, fetchFromGitHub, nix-update-script, nvd, nix-output-monitor, + buildPackages, }: let - version = "3.6.0"; runtimeDeps = [ nvd nix-output-monitor ]; in -rustPlatform.buildRustPackage { - inherit version; +rustPlatform.buildRustPackage (finalAttrs: { pname = "nh"; + version = "3.6.0"; src = fetchFromGitHub { - owner = "viperML"; + owner = "nix-community"; repo = "nh"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-k8rz5RF1qi7RXzQYWGbw5pJRNRFIdX85SIYN+IHiVL4="; }; @@ -35,18 +34,19 @@ rustPlatform.buildRustPackage { makeBinaryWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + preFixup = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + mkdir completions + ${emulator} $out/bin/nh completions --shell bash > completions/nh.bash + ${emulator} $out/bin/nh completions --shell zsh > completions/nh.zsh + ${emulator} $out/bin/nh completions --shell fish > completions/nh.fish - preFixup = '' - mkdir completions - $out/bin/nh completions --shell bash > completions/nh.bash - $out/bin/nh completions --shell zsh > completions/nh.zsh - $out/bin/nh completions --shell fish > completions/nh.fish - - installShellCompletion completions/* - ''; + installShellCompletion completions/* + '' + ); postFixup = '' wrapProgram $out/bin/nh \ @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage { meta = { description = "Yet another nix cli helper"; - homepage = "https://github.com/viperML/nh"; + homepage = "https://github.com/nix-community/nh"; license = lib.licenses.eupl12; mainProgram = "nh"; maintainers = with lib.maintainers; [ @@ -68,4 +68,4 @@ rustPlatform.buildRustPackage { viperML ]; }; -} +}) diff --git a/pkgs/games/nile/default.nix b/pkgs/by-name/ni/nile/package.nix similarity index 80% rename from pkgs/games/nile/default.nix rename to pkgs/by-name/ni/nile/package.nix index aa24289ba070..9362ace93a0d 100644 --- a/pkgs/games/nile/default.nix +++ b/pkgs/by-name/ni/nile/package.nix @@ -1,22 +1,14 @@ { lib, gitUpdater, - buildPythonApplication, + python3Packages, fetchFromGitHub, - pythonOlder, - setuptools, - requests, - protobuf, - pycryptodome, - zstandard, - json5, - platformdirs, }: let version = "1.1.2"; in -buildPythonApplication { +python3Packages.buildPythonApplication { pname = "nile"; inherit version; format = "pyproject"; @@ -28,9 +20,9 @@ buildPythonApplication { hash = "sha256-/C4b8wPKWHGgiheuAN7AvU+KcD5aj5i6KzgFSdTIkNI="; }; - disabled = pythonOlder "3.8"; + disabled = python3Packages.pythonOlder "3.8"; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ setuptools requests protobuf diff --git a/pkgs/by-name/ni/nim-2_2/package.nix b/pkgs/by-name/ni/nim-2_2/package.nix index f97506eb624a..0253925887ce 100644 --- a/pkgs/by-name/ni/nim-2_2/package.nix +++ b/pkgs/by-name/ni/nim-2_2/package.nix @@ -28,7 +28,6 @@ let # Needed for any nim package that uses the standard library's # 'std/sysrand' module. - depsTargetTargetPropagated = lib.optional stdenv.hostPlatform.isDarwin Security; inherit patches; diff --git a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix index ab8d1dc8120a..168dacbff336 100644 --- a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix +++ b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix @@ -7,10 +7,10 @@ nim-unwrapped-2_2.overrideAttrs ( finalAttrs: previousAttrs: { - version = "2.0.12"; + version = "2.0.16"; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-xIh5ScXrjX+an1bwrrK/IUD6vwruDwWAoxnioJgVczo="; + hash = "sha256-sucMbAEbVQcJMJCoiH+iUncyCP0EfuOPhWLiVp5cN4o="; }; patches = lib.lists.unique ( builtins.filter ( diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix index 0ecdbe92b511..5c2504413a03 100644 --- a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix +++ b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix @@ -85,12 +85,12 @@ in stdenv.mkDerivation (finalAttrs: { pname = "nim-unwrapped"; - version = "2.2.2"; + version = "2.2.4"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-f8ybh6ycC6Wkif3Cbi2EgM6Wo8piIQDWJn75ITX9ih8="; + hash = "sha256-+CtBl1D8zlYfP4l6BIaxgBhoRddvtdmfJIzhZhCBicc="; }; buildInputs = [ @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { pcre readline sqlite - ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + ]; patches = [ ./NIM_CONFIG_DIR.patch diff --git a/pkgs/applications/misc/nimbo/default.nix b/pkgs/by-name/ni/nimbo/package.nix similarity index 100% rename from pkgs/applications/misc/nimbo/default.nix rename to pkgs/by-name/ni/nimbo/package.nix diff --git a/pkgs/by-name/ni/nitter/package.nix b/pkgs/by-name/ni/nitter/package.nix index bdd7d3293f82..4bb3eb86d7ea 100644 --- a/pkgs/by-name/ni/nitter/package.nix +++ b/pkgs/by-name/ni/nitter/package.nix @@ -10,13 +10,13 @@ buildNimPackage ( finalAttrs: prevAttrs: { pname = "nitter"; - version = "0-unstable-2025-04-05"; + version = "0-unstable-2025-04-15"; src = fetchFromGitHub { owner = "zedeus"; repo = "nitter"; - rev = "83b0f8b55ae7bfb8a19a0bf14de52f30d06b8db6"; - hash = "sha256-2QIcAhzYrIo1q80959980H+hzLYtPHAOy0+CItDZ1d4="; + rev = "94c83f38114abaef10c36903fbcd59d78db7a578"; + hash = "sha256-J5w16EpQf98fozSfci7xua9AeULB0JZNbOsCzMGrnJg="; }; lockFile = ./lock.json; diff --git a/pkgs/by-name/ni/nix-btm/package.nix b/pkgs/by-name/ni/nix-btm/package.nix index 742da2fb0a68..c14740055ad0 100644 --- a/pkgs/by-name/ni/nix-btm/package.nix +++ b/pkgs/by-name/ni/nix-btm/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchCrate, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,14 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-zMQw3Q9t6JSMDt7xHMGTgAu9LW6MhG+Rrjpp5IEs/qQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - SystemConfiguration - ] - ); - meta = with lib; { description = "Rust tool to monitor Nix processes"; homepage = "https://github.com/DieracDelta/nix-btm"; diff --git a/pkgs/by-name/ni/nix-health/package.nix b/pkgs/by-name/ni/nix-health/package.nix index ab6cf7acfec3..5ca8e3ca2b9d 100644 --- a/pkgs/by-name/ni/nix-health/package.nix +++ b/pkgs/by-name/ni/nix-health/package.nix @@ -1,12 +1,10 @@ { lib, - stdenv, rustPlatform, fetchCrate, libiconv, openssl, pkg-config, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,20 +21,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-3DE/NwPdi//7xaoV2SVgF5l3ndrEYraoyg5NLJzvzBI="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libiconv - openssl - ] - # Use a newer SDK for CoreFoundation, because the sysinfo crate requires - # it, https://github.com/GuillaumeGomez/sysinfo/issues/915 - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - IOKit - CoreFoundation - ] - ); + buildInputs = [ + libiconv + openssl + ]; meta = with lib; { description = "Check the health of your Nix setup"; diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix index b7b517f1976b..c53db6681ff0 100644 --- a/pkgs/by-name/ni/nix-ld/package.nix +++ b/pkgs/by-name/ni/nix-ld/package.nix @@ -8,19 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "nix-ld"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { - owner = "mic92"; + owner = "nix-community"; repo = "nix-ld"; rev = version; - hash = "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw="; + hash = "sha256-ULoitJD5bMu0pFvh35cY5EEYywxj4e2fYOpqZwKB1lk="; }; - patches = [ ./rust-1.83.patch ]; - useFetchCargoVendor = true; - cargoHash = "sha256-2CFdUZbKFl7cf6dik6XextuGG2vLM9oNS8rIyzLnfM4="; + cargoHash = "sha256-cDbszVjZcomag0HZvXM+17SjDiGS07iPj78zgsXstHc="; hardeningDisable = [ "stackprotector" ]; @@ -47,11 +45,11 @@ rustPlatform.buildRustPackage rec { passthru.tests = nixosTests.nix-ld; - meta = with lib; { + meta = { description = "Run unpatched dynamic binaries on NixOS"; - homepage = "https://github.com/Mic92/nix-ld"; - license = licenses.mit; - maintainers = with maintainers; [ mic92 ]; - platforms = platforms.linux; + homepage = "https://github.com/nix-community/nix-ld"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mic92 ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ni/nix-ld/rust-1.83.patch b/pkgs/by-name/ni/nix-ld/rust-1.83.patch deleted file mode 100644 index 8ff1fb7d9ce7..000000000000 --- a/pkgs/by-name/ni/nix-ld/rust-1.83.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/src/arch.rs -+++ b/src/arch.rs -@@ -142,7 +142,7 @@ cfg_match! { - - #[naked] - unsafe extern "C" fn entry_trampoline() -> ! { -- core::arch::asm!( -+ core::arch::naked_asm!( - "lea r10, [rip + {context}]", - "mov r11, [r10 + {size} * 1]", // .env_entry - "test r11, r11", -@@ -153,7 +153,6 @@ cfg_match! { - "jmp [rip + {context}]", - context = sym TRAMPOLINE_CONTEXT, - size = const core::mem::size_of::<*const u8>(), -- options(noreturn), - ) - } - } -@@ -162,7 +161,7 @@ cfg_match! { - - #[naked] - unsafe extern "C" fn entry_trampoline() -> ! { -- core::arch::asm!( -+ core::arch::naked_asm!( - "adrp x8, {context}", - "ldr x9, [x8, {env_entry_off}]", // .env_entry - "cbz x9, 2f", -@@ -174,7 +173,6 @@ cfg_match! { - context = sym TRAMPOLINE_CONTEXT, - env_entry_off = const TrampolineContext::ENV_ENTRY_OFFSET, - env_string_off = const TrampolineContext::ENV_STRING_OFFSET, -- options(noreturn), - ) - } - } diff --git a/pkgs/by-name/ni/nix-output-monitor/package.nix b/pkgs/by-name/ni/nix-output-monitor/package.nix index 03b0e0b78a0c..c50be7ede2a1 100644 --- a/pkgs/by-name/ni/nix-output-monitor/package.nix +++ b/pkgs/by-name/ni/nix-output-monitor/package.nix @@ -12,7 +12,7 @@ let # nom has unit-tests and golden-tests # golden-tests call nix and thus can’t be run in a nix build. - testTarget = "unit-tests"; + testTargets = [ "unit-tests" ]; buildTools = [ installShellFiles ]; postInstall = '' diff --git a/pkgs/by-name/ni/nix-search-tv/package.nix b/pkgs/by-name/ni/nix-search-tv/package.nix index 12e2fafd6431..8b4863e34fae 100644 --- a/pkgs/by-name/ni/nix-search-tv/package.nix +++ b/pkgs/by-name/ni/nix-search-tv/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "nix-search-tv"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "3timeslazy"; repo = "nix-search-tv"; tag = "v${finalAttrs.version}"; - hash = "sha256-9tOrEcSZ6chVKq82zCoFCy3as71p5k7poXXFO/mXhw0="; + hash = "sha256-AgFedZzkNuTXJFzIs+U2m0nELjFUwESYUbUCSmh0G3Q="; }; - vendorHash = "sha256-hgZWppiy+P3BfoKOMClzCot1shKcGTZnsMCJ/ItxckE="; + vendorHash = "sha256-hBkro++bjYGrhnq8rmSuKTgnkicagOHTkfRYluSBUX8="; subPackages = [ "cmd/nix-search-tv" ]; @@ -30,7 +30,7 @@ buildGoModule (finalAttrs: { }; meta = { - description = "Nixpkgs channel for television"; + description = "Fuzzy search for Nix packages"; homepage = "https://github.com/3timeslazy/nix-search-tv"; changelog = "https://github.com/3timeslazy/nix-search-tv/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; diff --git a/pkgs/by-name/ni/nix-weather/package.nix b/pkgs/by-name/ni/nix-weather/package.nix index 961ea4afe735..fa4ad7a7a722 100644 --- a/pkgs/by-name/ni/nix-weather/package.nix +++ b/pkgs/by-name/ni/nix-weather/package.nix @@ -5,7 +5,6 @@ rustPlatform, pkg-config, openssl, - darwin, libiconv, installShellFiles, nix-update-script, @@ -36,8 +35,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration ]; outputs = [ diff --git a/pkgs/by-name/ni/nix-web/package.nix b/pkgs/by-name/ni/nix-web/package.nix index 2511a260b279..9149274b37d3 100644 --- a/pkgs/by-name/ni/nix-web/package.nix +++ b/pkgs/by-name/ni/nix-web/package.nix @@ -7,7 +7,6 @@ openssl, nixVersions, nixPackage ? nixVersions.stable, - darwin, }: let @@ -31,15 +30,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-PfbDod1vQDnWqbhRgXbOvidxGWIXIe7XIgqiLVbovh0="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - lib.optional (!stdenv.hostPlatform.isDarwin) openssl - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) openssl; postPatch = '' substituteInPlace nix-web/nix-web.service \ diff --git a/pkgs/by-name/ni/nixci/package.nix b/pkgs/by-name/ni/nixci/package.nix index 458a03ade240..267107cbdb46 100644 --- a/pkgs/by-name/ni/nixci/package.nix +++ b/pkgs/by-name/ni/nixci/package.nix @@ -5,9 +5,6 @@ fetchFromGitHub, openssl, pkg-config, - Security, - SystemConfiguration, - IOKit, installShellFiles, nix, }: @@ -32,15 +29,9 @@ rustPlatform.buildRustPackage rec { nix ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - Security - SystemConfiguration - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + ]; postInstall = '' installShellCompletion --cmd nixci \ diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix index 8e895030339f..9f6077c56768 100644 --- a/pkgs/by-name/ni/nixdoc/package.nix +++ b/pkgs/by-name/ni/nixdoc/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Aw794yhIET8/pnlQiK2xKVbYC/Kd5MExvFTwkv4LLTc="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ]; - meta = with lib; { description = "Generate documentation for Nix functions"; mainProgram = "nixdoc"; diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix index 4a80fd1b9c9c..2077e794025b 100644 --- a/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -31,12 +31,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nixos-anywhere"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-anywhere"; rev = finalAttrs.version; - hash = "sha256-7kHxBQuzb7gcHzVmLGljJ4kF6BDDSYVCIxYFDmYPnAo="; + hash = "sha256-DGJ52K2cN3MRUlI/knH0tipGja0Agfk+QVfIQL1gWT4="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/by-name/ni/nixtract/package.nix b/pkgs/by-name/ni/nixtract/package.nix index 13139e54b6db..71bc900fed88 100644 --- a/pkgs/by-name/ni/nixtract/package.nix +++ b/pkgs/by-name/ni/nixtract/package.nix @@ -6,7 +6,6 @@ openssl, stdenv, libiconv, - darwin, nix, testers, nixtract, @@ -32,7 +31,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeCheckInputs = [ nix ]; diff --git a/pkgs/by-name/nk/nkeys/package.nix b/pkgs/by-name/nk/nkeys/package.nix index 1272455703ea..9fa508349456 100644 --- a/pkgs/by-name/nk/nkeys/package.nix +++ b/pkgs/by-name/nk/nkeys/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nkeys"; - version = "0.4.10"; + version = "0.4.11"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; tag = "v${version}"; - hash = "sha256-vSjIqeGWS9sDGyrPD11u4ngiZrW6gZfYd08kKXUDXdU="; + hash = "sha256-dSkIT+KW+hT/Rk3NSkrb5ABLLiGGz2dppr9rwhjLOnM="; }; - vendorHash = "sha256-TtplWIDLUsFXhT5OQVhW3KTfxh1MVY8Hssejy8GBYVQ="; + vendorHash = "sha256-89DGLTkt9c8jJhAX3Uo8BBtLcBbnYE0q4mCqq/RGXM4="; meta = with lib; { description = "Public-key signature system for NATS"; diff --git a/pkgs/by-name/no/node-gyp/package-lock.json b/pkgs/by-name/no/node-gyp/package-lock.json index 914eb940dbed..18c4c6678063 100644 --- a/pkgs/by-name/no/node-gyp/package-lock.json +++ b/pkgs/by-name/no/node-gyp/package-lock.json @@ -1,23 +1,23 @@ { "name": "node-gyp", - "version": "11.1.0", + "version": "11.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "node-gyp", - "version": "11.1.0", + "version": "11.2.0", "license": "MIT", "dependencies": { "env-paths": "^2.2.0", "exponential-backoff": "^3.1.1", - "glob": "^10.3.10", "graceful-fs": "^4.2.6", "make-fetch-happen": "^14.0.3", "nopt": "^8.0.0", "proc-log": "^5.0.0", "semver": "^7.3.5", "tar": "^7.4.3", + "tinyglobby": "^0.2.12", "which": "^5.0.0" }, "bin": { @@ -37,9 +37,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", - "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz", + "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==", "dev": true, "license": "MIT", "dependencies": { @@ -93,10 +93,20 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@eslint/config-helpers": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.1.tgz", + "integrity": "sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@eslint/core": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.11.0.tgz", - "integrity": "sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz", + "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -107,9 +117,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", - "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", + "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", "dev": true, "license": "MIT", "dependencies": { @@ -131,9 +141,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.20.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.20.0.tgz", - "integrity": "sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ==", + "version": "9.23.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.23.0.tgz", + "integrity": "sha512-35MJ8vCPU0ZMxo7zfev2pypqTwWTofFZO6m4KAtdoFhRpLJUpHTZZ+KB3C7Hb1d7bULYwO4lJXGCi5Se+8OMbw==", "dev": true, "license": "MIT", "engines": { @@ -151,13 +161,13 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz", - "integrity": "sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==", + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz", + "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.10.0", + "@eslint/core": "^0.13.0", "levn": "^0.4.1" }, "engines": { @@ -165,9 +175,9 @@ } }, "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz", - "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz", + "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -241,9 +251,9 @@ } }, "node_modules/@humanwhocodes/retry": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", - "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz", + "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -393,9 +403,9 @@ } }, "node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "dev": true, "license": "MIT" }, @@ -407,17 +417,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.24.0.tgz", - "integrity": "sha512-aFcXEJJCI4gUdXgoo/j9udUYIHgF23MFkg09LFz2dzEmU0+1Plk4rQWv/IYKvPHAtlkkGoB3m5e6oUp+JPsNaQ==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.29.0.tgz", + "integrity": "sha512-PAIpk/U7NIS6H7TEtN45SPGLQaHNgB7wSjsQV/8+KYokAb2T/gloOA/Bee2yd4/yKVhPKe5LlaUGhAZk5zmSaQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.24.0", - "@typescript-eslint/type-utils": "8.24.0", - "@typescript-eslint/utils": "8.24.0", - "@typescript-eslint/visitor-keys": "8.24.0", + "@typescript-eslint/scope-manager": "8.29.0", + "@typescript-eslint/type-utils": "8.29.0", + "@typescript-eslint/utils": "8.29.0", + "@typescript-eslint/visitor-keys": "8.29.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -433,20 +443,20 @@ "peerDependencies": { "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.24.0.tgz", - "integrity": "sha512-MFDaO9CYiard9j9VepMNa9MTcqVvSny2N4hkY6roquzj8pdCBRENhErrteaQuu7Yjn1ppk0v1/ZF9CG3KIlrTA==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.29.0.tgz", + "integrity": "sha512-8C0+jlNJOwQso2GapCVWWfW/rzaq7Lbme+vGUFKE31djwNncIpgXD7Cd4weEsDdkoZDjH0lwwr3QDQFuyrMg9g==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.24.0", - "@typescript-eslint/types": "8.24.0", - "@typescript-eslint/typescript-estree": "8.24.0", - "@typescript-eslint/visitor-keys": "8.24.0", + "@typescript-eslint/scope-manager": "8.29.0", + "@typescript-eslint/types": "8.29.0", + "@typescript-eslint/typescript-estree": "8.29.0", + "@typescript-eslint/visitor-keys": "8.29.0", "debug": "^4.3.4" }, "engines": { @@ -458,18 +468,18 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.24.0.tgz", - "integrity": "sha512-HZIX0UByphEtdVBKaQBgTDdn9z16l4aTUz8e8zPQnyxwHBtf5vtl1L+OhH+m1FGV9DrRmoDuYKqzVrvWDcDozw==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.29.0.tgz", + "integrity": "sha512-aO1PVsq7Gm+tcghabUpzEnVSFMCU4/nYIgC2GOatJcllvWfnhrgW0ZEbnTxm36QsikmCN1K/6ZgM7fok2I7xNw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.24.0", - "@typescript-eslint/visitor-keys": "8.24.0" + "@typescript-eslint/types": "8.29.0", + "@typescript-eslint/visitor-keys": "8.29.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -480,14 +490,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.24.0.tgz", - "integrity": "sha512-8fitJudrnY8aq0F1wMiPM1UUgiXQRJ5i8tFjq9kGfRajU+dbPyOuHbl0qRopLEidy0MwqgTHDt6CnSeXanNIwA==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.29.0.tgz", + "integrity": "sha512-ahaWQ42JAOx+NKEf5++WC/ua17q5l+j1GFrbbpVKzFL/tKVc0aYY8rVSYUpUvt2hUP1YBr7mwXzx+E/DfUWI9Q==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.24.0", - "@typescript-eslint/utils": "8.24.0", + "@typescript-eslint/typescript-estree": "8.29.0", + "@typescript-eslint/utils": "8.29.0", "debug": "^4.3.4", "ts-api-utils": "^2.0.1" }, @@ -500,13 +510,13 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/types": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.24.0.tgz", - "integrity": "sha512-VacJCBTyje7HGAw7xp11q439A+zeGG0p0/p2zsZwpnMzjPB5WteaWqt4g2iysgGFafrqvyLWqq6ZPZAOCoefCw==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.29.0.tgz", + "integrity": "sha512-wcJL/+cOXV+RE3gjCyl/V2G877+2faqvlgtso/ZRbTCnZazh0gXhe+7gbAnfubzN2bNsBtZjDvlh7ero8uIbzg==", "dev": true, "license": "MIT", "engines": { @@ -518,14 +528,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.24.0.tgz", - "integrity": "sha512-ITjYcP0+8kbsvT9bysygfIfb+hBj6koDsu37JZG7xrCiy3fPJyNmfVtaGsgTUSEuTzcvME5YI5uyL5LD1EV5ZQ==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.29.0.tgz", + "integrity": "sha512-yOfen3jE9ISZR/hHpU/bmNvTtBW1NjRbkSFdZOksL1N+ybPEE7UVGMwqvS6CP022Rp00Sb0tdiIkhSCe6NI8ow==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.24.0", - "@typescript-eslint/visitor-keys": "8.24.0", + "@typescript-eslint/types": "8.29.0", + "@typescript-eslint/visitor-keys": "8.29.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -541,7 +551,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { @@ -571,16 +581,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.24.0.tgz", - "integrity": "sha512-07rLuUBElvvEb1ICnafYWr4hk8/U7X9RDCOqd9JcAMtjh/9oRmcfN4yGzbPVirgMR0+HLVHehmu19CWeh7fsmQ==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.29.0.tgz", + "integrity": "sha512-gX/A0Mz9Bskm8avSWFcK0gP7cZpbY4AIo6B0hWYFCaIsz750oaiWR4Jr2CI+PQhfW1CpcQr9OlfPS+kMFegjXA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.24.0", - "@typescript-eslint/types": "8.24.0", - "@typescript-eslint/typescript-estree": "8.24.0" + "@typescript-eslint/scope-manager": "8.29.0", + "@typescript-eslint/types": "8.29.0", + "@typescript-eslint/typescript-estree": "8.29.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -591,17 +601,17 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.24.0.tgz", - "integrity": "sha512-kArLq83QxGLbuHrTMoOEWO+l2MwsNS2TGISEdx8xgqpkbytB07XmlQyQdNDrCc1ecSqx0cnmhGvpX+VBwqqSkg==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.29.0.tgz", + "integrity": "sha512-Sne/pVz8ryR03NFK21VpN88dZ2FdQXOlq3VIklbrTYEt8yXtRFr9tvUhqvCeKjqYk5FSim37sHbooT6vzBTZcg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.24.0", + "@typescript-eslint/types": "8.29.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -622,9 +632,9 @@ } }, "node_modules/acorn": { - "version": "8.14.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", - "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", + "version": "8.14.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", + "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", "dev": true, "license": "MIT", "bin": { @@ -993,9 +1003,9 @@ } }, "node_modules/call-bind-apply-helpers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", - "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1007,14 +1017,14 @@ } }, "node_modules/call-bound": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", - "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", "dev": true, "license": "MIT", "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "get-intrinsic": "^1.2.6" + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" }, "engines": { "node": ">= 0.4" @@ -1634,13 +1644,16 @@ } }, "node_modules/es-shim-unscopables": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", - "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz", + "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==", "dev": true, "license": "MIT", "dependencies": { - "hasown": "^2.0.0" + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/es-to-primitive": { @@ -1685,22 +1698,23 @@ } }, "node_modules/eslint": { - "version": "9.20.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.20.0.tgz", - "integrity": "sha512-aL4F8167Hg4IvsW89ejnpTwx+B/UQRzJPGgbIOl+4XqffWsahVVsLEWoZvnrVuwpWmnRd7XeXmQI1zlKcFDteA==", + "version": "9.23.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.23.0.tgz", + "integrity": "sha512-jV7AbNoFPAY1EkFYpLq5bslU9NLNO8xnEeQXwErNibVryjk67wHVmddTBilc5srIttJDBrB0eMHKZBFbSIABCw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.19.0", - "@eslint/core": "^0.11.0", - "@eslint/eslintrc": "^3.2.0", - "@eslint/js": "9.20.0", - "@eslint/plugin-kit": "^0.2.5", + "@eslint/config-array": "^0.19.2", + "@eslint/config-helpers": "^0.2.0", + "@eslint/core": "^0.12.0", + "@eslint/eslintrc": "^3.3.1", + "@eslint/js": "9.23.0", + "@eslint/plugin-kit": "^0.2.7", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.4.1", + "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", @@ -1708,7 +1722,7 @@ "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.2.0", + "eslint-scope": "^8.3.0", "eslint-visitor-keys": "^4.2.0", "espree": "^10.3.0", "esquery": "^1.5.0", @@ -1783,13 +1797,13 @@ } }, "node_modules/eslint-plugin-n": { - "version": "17.15.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.15.1.tgz", - "integrity": "sha512-KFw7x02hZZkBdbZEFQduRGH4VkIH4MW97ClsbAM4Y4E6KguBJWGfWG1P4HEIpZk2bkoWf0bojpnjNAhYQP8beA==", + "version": "17.17.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.17.0.tgz", + "integrity": "sha512-2VvPK7Mo73z1rDFb6pTvkH6kFibAmnTubFq5l83vePxu0WiY1s0LOtj2WHb6Sa40R3w4mnh8GFYbHBQyMlotKw==", "dev": true, "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.4.1", + "@eslint-community/eslint-utils": "^4.5.0", "enhanced-resolve": "^5.17.1", "eslint-plugin-es-x": "^7.8.0", "get-tsconfig": "^4.8.1", @@ -1819,9 +1833,9 @@ } }, "node_modules/eslint-plugin-n/node_modules/globals": { - "version": "15.14.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz", - "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==", + "version": "15.15.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz", + "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==", "dev": true, "license": "MIT", "engines": { @@ -1910,9 +1924,9 @@ } }, "node_modules/eslint-scope": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", - "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz", + "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -2061,9 +2075,9 @@ "license": "MIT" }, "node_modules/fastq": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz", - "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", + "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", "dev": true, "license": "ISC", "dependencies": { @@ -2145,9 +2159,9 @@ } }, "node_modules/flatted": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz", - "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", "dev": true, "license": "ISC" }, @@ -2168,12 +2182,12 @@ } }, "node_modules/foreground-child": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", - "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", + "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", "license": "ISC", "dependencies": { - "cross-spawn": "^7.0.0", + "cross-spawn": "^7.0.6", "signal-exit": "^4.0.1" }, "engines": { @@ -2262,18 +2276,18 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", - "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", "dev": true, "license": "MIT", "dependencies": { - "call-bind-apply-helpers": "^1.0.1", + "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", + "es-object-atoms": "^1.1.1", "function-bind": "^1.1.2", - "get-proto": "^1.0.0", + "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", @@ -3366,9 +3380,9 @@ } }, "node_modules/minipass-fetch": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.0.tgz", - "integrity": "sha512-2v6aXUXwLP1Epd/gc32HAMIWoczx+fZwEPRHm/VwtrJzRGwR1qGZXEYV3Zp8ZjjbwaZhMrM6uHV4KVkk+XCc2w==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.1.tgz", + "integrity": "sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==", "license": "MIT", "dependencies": { "minipass": "^7.0.3", @@ -3473,13 +3487,12 @@ "license": "ISC" }, "node_modules/minizlib": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz", - "integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz", + "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==", "license": "MIT", "dependencies": { - "minipass": "^7.0.4", - "rimraf": "^5.0.5" + "minipass": "^7.1.2" }, "engines": { "node": ">= 18" @@ -3582,9 +3595,9 @@ "license": "MIT" }, "node_modules/nan": { - "version": "2.22.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", - "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", + "version": "2.22.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz", + "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==", "dev": true, "license": "MIT" }, @@ -3632,9 +3645,9 @@ } }, "node_modules/neostandard/node_modules/globals": { - "version": "15.14.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz", - "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==", + "version": "15.15.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz", + "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==", "dev": true, "license": "MIT", "engines": { @@ -3724,15 +3737,16 @@ } }, "node_modules/object.entries": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", - "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz", + "integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==", "dev": true, "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", "define-properties": "^1.2.1", - "es-object-atoms": "^1.0.0" + "es-object-atoms": "^1.1.1" }, "engines": { "node": ">= 0.4" @@ -4167,9 +4181,9 @@ } }, "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", "dev": true, "license": "MIT", "engines": { @@ -4177,21 +4191,6 @@ "node": ">=0.10.0" } }, - "node_modules/rimraf": { - "version": "5.0.10", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz", - "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==", - "license": "ISC", - "dependencies": { - "glob": "^10.3.7" - }, - "bin": { - "rimraf": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -4795,6 +4794,48 @@ "node": ">=18" } }, + "node_modules/tinyglobby": { + "version": "0.2.12", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz", + "integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==", + "license": "MIT", + "dependencies": { + "fdir": "^6.4.3", + "picomatch": "^4.0.2" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, + "node_modules/tinyglobby/node_modules/fdir": { + "version": "6.4.3", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz", + "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==", + "license": "MIT", + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, + "node_modules/tinyglobby/node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -4809,9 +4850,9 @@ } }, "node_modules/ts-api-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz", - "integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", + "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", "dev": true, "license": "MIT", "engines": { @@ -4913,9 +4954,9 @@ } }, "node_modules/typescript": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz", - "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==", + "version": "5.8.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz", + "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", "dev": true, "license": "Apache-2.0", "peer": true, @@ -4928,15 +4969,15 @@ } }, "node_modules/typescript-eslint": { - "version": "8.24.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.24.0.tgz", - "integrity": "sha512-/lmv4366en/qbB32Vz5+kCNZEMf6xYHwh1z48suBwZvAtnXKbP+YhGe8OLE2BqC67LMqKkCNLtjejdwsdW6uOQ==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.29.0.tgz", + "integrity": "sha512-ep9rVd9B4kQsZ7ZnWCVxUE/xDLUUUsRzE0poAeNu+4CkFErLfuvPt/qtm2EpnSyfvsR0S6QzDFSrPCFBwf64fg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.24.0", - "@typescript-eslint/parser": "8.24.0", - "@typescript-eslint/utils": "8.24.0" + "@typescript-eslint/eslint-plugin": "8.29.0", + "@typescript-eslint/parser": "8.29.0", + "@typescript-eslint/utils": "8.29.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -4947,7 +4988,7 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <5.8.0" + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/unbox-primitive": { @@ -5086,16 +5127,17 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.18", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz", - "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==", + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", + "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", "dev": true, "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.8", - "call-bound": "^1.0.3", - "for-each": "^0.3.3", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-tostringtag": "^1.0.2" }, diff --git a/pkgs/by-name/no/node-gyp/package.nix b/pkgs/by-name/no/node-gyp/package.nix index 9e67225be1ab..65de35eac04c 100644 --- a/pkgs/by-name/no/node-gyp/package.nix +++ b/pkgs/by-name/no/node-gyp/package.nix @@ -8,16 +8,16 @@ (buildNpmPackage.override { inherit nodejs; }) rec { pname = "node-gyp"; - version = "11.1.0"; + version = "11.2.0"; src = fetchFromGitHub { owner = "nodejs"; repo = "node-gyp"; tag = "v${version}"; - hash = "sha256-KbV0lhBICx9oRWA8Gq/ex2cfeHbZSQq8JCjwCCIcrYk="; + hash = "sha256-NOVswjTByrQ+2z4H9wYd4YIWKhWIdgxpz2pE0dOK6qc="; }; - npmDepsHash = "sha256-TQKSR0h/RH4/P+HENT+mwb0AFWkBo7SUh51yfCq/jVk="; + npmDepsHash = "sha256-emCYKqe6Bn1hmUq9jPDo5Nu9n43s4kb0E8lQndVtmlQ="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/no/nodehun/package.nix b/pkgs/by-name/no/nodehun/package.nix index 36426f03ea83..d903cf04e92d 100644 --- a/pkgs/by-name/no/nodehun/package.nix +++ b/pkgs/by-name/no/nodehun/package.nix @@ -1,7 +1,6 @@ { buildNpmPackage, cctools, - darwin, fetchFromGitHub, lib, node-gyp, @@ -30,10 +29,6 @@ buildNpmPackage { ]; npmDepsHash = "sha256-mV6rWNf2p2w4H0ESUT0/Ybtx9YEdvO5l2gCvlWFXK+U="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; nativeBuildInputs = [ node-gyp python3 diff --git a/pkgs/by-name/no/nomad-pack/package.nix b/pkgs/by-name/no/nomad-pack/package.nix index 0e5e0c6154dc..b2747e93fc6c 100644 --- a/pkgs/by-name/no/nomad-pack/package.nix +++ b/pkgs/by-name/no/nomad-pack/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nomad-pack"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "nomad-pack"; rev = "v${version}"; - sha256 = "sha256-dw6sueC1qibJYc6sbZX8HJlEf9R6O8dlE1aobw70UHw="; + sha256 = "sha256-QtpTnChLB9OfzLSJXr19geHzxmOeL5DQ0G4fgcqCdbc="; }; - vendorHash = "sha256-BKYJ9FZXKpFwK3+mrZAXRkfitSY9jeOLLeC0BOsKc/A="; + vendorHash = "sha256-lygNUHerj9bMJk2+PTUeAJIdTPK9nUYXaByZpzh7uLY="; # skip running go tests as they require network access doCheck = false; diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix index 29d8664ea2ce..c4c17deb190e 100644 --- a/pkgs/by-name/no/normcap/package.nix +++ b/pkgs/by-name/no/normcap/package.nix @@ -47,6 +47,7 @@ ps.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "jeepney" "shiboken6" ]; diff --git a/pkgs/by-name/no/nostr-rs-relay/package.nix b/pkgs/by-name/no/nostr-rs-relay/package.nix index 485cced95575..f73007bf9a08 100644 --- a/pkgs/by-name/no/nostr-rs-relay/package.nix +++ b/pkgs/by-name/no/nostr-rs-relay/package.nix @@ -6,7 +6,6 @@ openssl, pkg-config, libiconv, - darwin, protobuf, }: @@ -27,8 +26,6 @@ rustPlatform.buildRustPackage rec { [ openssl.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/nostui/package.nix b/pkgs/by-name/no/nostui/package.nix index 6c32f8c19c94..97413ca90f7c 100644 --- a/pkgs/by-name/no/nostui/package.nix +++ b/pkgs/by-name/no/nostui/package.nix @@ -2,8 +2,6 @@ lib, fetchFromGitHub, rustPlatform, - darwin, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -17,10 +15,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RCD11KdzM66Mkydc51r6fG+q8bmKl5eZma58YoARwPo="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk; [ frameworks.SystemConfiguration ] - ); - GIT_HASH = "000000000000000000000000000000000000000000000000000"; checkFlags = [ diff --git a/pkgs/by-name/no/notes/package.nix b/pkgs/by-name/no/notes/package.nix index af926182fa91..2a5317c2f459 100644 --- a/pkgs/by-name/no/notes/package.nix +++ b/pkgs/by-name/no/notes/package.nix @@ -4,13 +4,8 @@ fetchFromGitHub, cmake, qt6, - darwin, - overrideSDK, }: -let - stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; -in -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "notes"; version = "2.3.1"; @@ -29,14 +24,10 @@ stdenv'.mkDerivation (finalAttrs: { qt6.wrapQtAppsHook ]; - buildInputs = - [ - qt6.qtbase - qt6.qtdeclarative - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa - ]; + buildInputs = [ + qt6.qtbase + qt6.qtdeclarative + ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications diff --git a/pkgs/by-name/no/novops/package.nix b/pkgs/by-name/no/novops/package.nix index 3c9db899f070..8898152794e1 100644 --- a/pkgs/by-name/no/novops/package.nix +++ b/pkgs/by-name/no/novops/package.nix @@ -7,7 +7,6 @@ stdenv, installShellFiles, libiconv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,7 +29,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optional stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/nowplaying-cli/package.nix b/pkgs/by-name/no/nowplaying-cli/package.nix index f959cfd02c6f..61f46f60930c 100644 --- a/pkgs/by-name/no/nowplaying-cli/package.nix +++ b/pkgs/by-name/no/nowplaying-cli/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -16,12 +15,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FkyrtgsGzpK2rLNr+oxfPUbX43TVXYeiBg7CN1JUg8Y="; }; - buildInputs = [ - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Cocoa - ]; - installPhase = '' runHook preInstall diff --git a/pkgs/by-name/np/npins/package.nix b/pkgs/by-name/np/npins/package.nix index 4b9269f11d14..db9340044293 100644 --- a/pkgs/by-name/np/npins/package.nix +++ b/pkgs/by-name/np/npins/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, makeWrapper, - stdenv, - darwin, # runtime dependencies nix, # for nix-prefetch-url @@ -33,13 +31,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-HnX7dkWLxa3DARXG8y9OVBRwvwgxwRIs4mWK3VNblG0="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); nativeBuildInputs = [ makeWrapper ]; # (Almost) all tests require internet diff --git a/pkgs/by-name/ns/nsc/package.nix b/pkgs/by-name/ns/nsc/package.nix index c699118ca75e..3c8fe2fc3d2a 100644 --- a/pkgs/by-name/ns/nsc/package.nix +++ b/pkgs/by-name/ns/nsc/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "nsc"; - version = "2.10.2"; + version = "2.11.0"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-F/9yAF1vXG4eWMmS6l/qWqlEV8YkS7nihHN2vK3JFbE="; + hash = "sha256-/xfNl91cb82kV2IC/m56p94nb3WLDPU5O+1H+sTZnW4="; }; ldflags = [ @@ -24,7 +24,7 @@ buildGoModule rec { "-X main.builtBy=nixpkgs" ]; - vendorHash = "sha256-MxkpK3CgQ+eoxGfLRqE3kudyZounDD0+cmzOoiPf1wc="; + vendorHash = "sha256-Ms+chBbQCo3TGWPgIy4OSXNpxO5jpm1zxEe9upiPmnY="; nativeBuildInputs = [ installShellFiles ]; @@ -47,7 +47,7 @@ buildGoModule rec { # the test strips table formatting from the command output in a naive way # that removes all the table characters, including '-'. # The nix build directory looks something like: - # /private/tmp/nix-build-nsc-2.10.2.drv-0/nsc_test2000598938/keys + # /private/tmp/nix-build-nsc-2.11.0.drv-0/nsc_test2000598938/keys # Then the `-` are removed from the path unintentionally and the test fails. # This should be fixed upstream to avoid mangling the path when # removing the table decorations from the command output. diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index 78018aa4dcc7..ba5531df44c2 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "0-unstable-2025-04-07"; + version = "0-unstable-2025-04-14"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "b7869a8f337dc64f4d1dbf8f2c7a5833bc3abfbf"; - hash = "sha256-IoyClULiILl5wPwyf7zzTK5Rb0yEbkVpFRtUSHksrjc="; + rev = "c639113adebdf05f25e0e33b833798a6b0c624d4"; + hash = "sha256-aeYe642070aAvhIES9apQAC/vyj7pnXiQbn7QTYVVlQ="; }; installPhase = '' diff --git a/pkgs/by-name/nu/nurl/package.nix b/pkgs/by-name/nu/nurl/package.nix index 0946695d21ad..4da4d7f0e896 100644 --- a/pkgs/by-name/nu/nurl/package.nix +++ b/pkgs/by-name/nu/nurl/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, installShellFiles, makeBinaryWrapper, - stdenv, - darwin, gitMinimal, mercurial, nixForLinking, @@ -30,10 +28,6 @@ rustPlatform.buildRustPackage rec { makeBinaryWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - # tests require internet access doCheck = false; diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix index 0998757de52a..f7e2841d0e13 100644 --- a/pkgs/by-name/nv/nvc/package.nix +++ b/pkgs/by-name/nv/nvc/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.15.2"; + version = "1.16.0"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-GMgGnsEKItVgQLwk6gY8pU6lIGoGGWPGhkBJwmVRy+Q="; + hash = "sha256-RI86VdWuPTcjkQstwDBN/rDLv/Imy9kYH/nIJSGuIcI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix index aa4f28e72e83..b687027940ae 100644 --- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix @@ -1,7 +1,7 @@ { lib, glibc, - fetchFromGitLab, + fetchFromGitHub, makeWrapper, buildGoModule, formats, @@ -26,14 +26,14 @@ let cliVersionPackage = "github.com/NVIDIA/nvidia-container-toolkit/internal/info"; in buildGoModule rec { - pname = "container-toolkit/container-toolkit"; - version = "1.15.0-rc.3"; + pname = "nvidia-container-toolkit"; + version = "1.17.5"; - src = fetchFromGitLab { - owner = "nvidia"; + src = fetchFromGitHub { + owner = "NVIDIA"; repo = pname; rev = "v${version}"; - hash = "sha256-IH2OjaLbcKSGG44aggolAOuJkjk+GaXnnTbrXfZ0lVo="; + hash = "sha256-vEo8agJ3jTaBokBjdGcO2naE457y8KPUAedC8vtwD1Y="; }; @@ -51,23 +51,22 @@ buildGoModule rec { ]; postPatch = '' - # Replace the default hookDefaultFilePath to the $out path and override - # default ldconfig locations to the one in nixpkgs. - substituteInPlace internal/config/config.go \ - --replace '/usr/bin/nvidia-container-runtime-hook' "$out/bin/nvidia-container-runtime-hook" \ - --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' - - substituteInPlace internal/config/config_test.go \ + --replace '/usr/bin/nvidia-container-runtime-hook' "$tools/bin/nvidia-container-runtime-hook" \ --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' substituteInPlace tools/container/toolkit/toolkit.go \ --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' - - substituteInPlace cmd/nvidia-ctk/hook/update-ldcache/update-ldcache.go \ - --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' ''; + subPackages = [ + "cmd/nvidia-cdi-hook" + "cmd/nvidia-container-runtime.cdi" + "cmd/nvidia-container-runtime-hook" + "cmd/nvidia-container-runtime.legacy" + "cmd/nvidia-ctk" + ]; + # Based on upstream's Makefile: # https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/03cbf9c6cd26c75afef8a2dd68e0306aace80401/Makefile#L64 ldflags = [ @@ -104,7 +103,7 @@ buildGoModule rec { --prefix PATH : ${libnvidia-container}/bin mkdir -p $tools/bin - mv $out/bin/{containerd,crio,docker,nvidia-toolkit,toolkit} $tools/bin + mv $out/bin/{nvidia-cdi-hook,nvidia-container-runtime.cdi,nvidia-container-runtime-hook,nvidia-container-runtime.legacy} $tools/bin '' + lib.optionalString (configTemplate != null || configTemplatePath != null) '' mkdir -p $out/etc/nvidia-container-runtime diff --git a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix index 3cf0161f6354..90eaa3c6b0fc 100644 --- a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix +++ b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-dock-hyprland"; tag = "v${version}"; - hash = "sha256-mkwUDPBMpFxr+W5bRSQFevYVhZ949intKRU+KNo0/Gc="; + hash = "sha256-zpQou/ABWIYg5QRynfrzPI3YOuNzpU5wHYZwutXwFc0="; }; - vendorHash = "sha256-6qgUvTByq4mkJoG38pI8eVe5o0pVI9O+/y/ZTDS5hw8="; + vendorHash = "sha256-ZR/vF7ogOEhyKQr35ew3OmYLVeudt51W8b734SZXvC0="; ldflags = [ "-s" diff --git a/pkgs/by-name/oa/oama/0001-Downgrade-cabal-version-for-ghc-9.6-compat.patch b/pkgs/by-name/oa/oama/0001-Downgrade-cabal-version-for-ghc-9.6-compat.patch new file mode 100644 index 000000000000..1e2a4150f0ab --- /dev/null +++ b/pkgs/by-name/oa/oama/0001-Downgrade-cabal-version-for-ghc-9.6-compat.patch @@ -0,0 +1,22 @@ +From d6d43789bf5af99c9c18f4c88e6a6751bdcacbce Mon Sep 17 00:00:00 2001 +From: Nick Hu +Date: Wed, 16 Apr 2025 15:18:02 +0100 +Subject: [PATCH] Downgrade cabal-version for ghc 9.6 compat + +--- + oama.cabal | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/oama.cabal b/oama.cabal +index 658c051..4d0c428 100644 +--- a/oama.cabal ++++ b/oama.cabal +@@ -1,4 +1,4 @@ +-cabal-version: 3.12 ++cabal-version: 3.8 + name: oama + version: 0.19.0 + license: BSD-3-Clause +-- +2.48.1 + diff --git a/pkgs/by-name/oa/oama/generated-package.nix b/pkgs/by-name/oa/oama/generated-package.nix index f024cc98466d..3385f05bf7a6 100644 --- a/pkgs/by-name/oa/oama/generated-package.nix +++ b/pkgs/by-name/oa/oama/generated-package.nix @@ -10,6 +10,7 @@ fetchgit, hsyslog, http-conduit, + http-types, lib, mtl, network, @@ -30,11 +31,11 @@ }: mkDerivation { pname = "oama"; - version = "0.14"; + version = "0.19.0"; src = fetchgit { url = "https://github.com/pdobsan/oama.git"; - sha256 = "1hdhkc6hh4nvx31vkaii7hd2rxlwqrsvr6i1i0a9r1xlda05ffq0"; - rev = "4e1ffd3001034771d284678f0160060c1871707c"; + sha256 = "1nrgpnh76fcmkdw1j3ha5cam7bnxkgfns2plj8609qv0v0swmj4s"; + rev = "3eef17b7e290dfced252375a13bc8dd46849adf0"; fetchSubmodules = true; }; isLibrary = true; @@ -47,6 +48,7 @@ mkDerivation { directory hsyslog http-conduit + http-types mtl network network-uri @@ -72,6 +74,7 @@ mkDerivation { directory hsyslog http-conduit + http-types mtl network network-uri diff --git a/pkgs/by-name/oa/oama/package.nix b/pkgs/by-name/oa/oama/package.nix index 73a275f431e0..0e4f99ad3d1e 100644 --- a/pkgs/by-name/oa/oama/package.nix +++ b/pkgs/by-name/oa/oama/package.nix @@ -8,6 +8,7 @@ let inherit (haskell.lib.compose) overrideCabal justStaticExecutables; overrides = { + patches = [ ./0001-Downgrade-cabal-version-for-ghc-9.6-compat.patch ]; description = "OAuth credential MAnager"; homepage = "https://github.com/pdobsan/oama"; maintainers = with lib.maintainers; [ aidalgol ]; diff --git a/pkgs/by-name/oa/oama/update.sh b/pkgs/by-name/oa/oama/update.sh index 60d1c74cbca1..45af4b99fe59 100755 --- a/pkgs/by-name/oa/oama/update.sh +++ b/pkgs/by-name/oa/oama/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p cabal2nix curl jq nixfmt-rfc-style +#!nix-shell -i bash -p haskell.packages.ghc910.cabal2nix nix-prefetch-git curl jq nixfmt-rfc-style set -euo pipefail diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix index 4622f8a6b976..d0900d1dc47e 100644 --- a/pkgs/by-name/oc/oci-cli/package.nix +++ b/pkgs/by-name/oc/oci-cli/package.nix @@ -25,14 +25,14 @@ in py.pkgs.buildPythonApplication rec { pname = "oci-cli"; - version = "3.54.0"; + version = "3.54.2"; format = "setuptools"; src = fetchFromGitHub { owner = "oracle"; repo = pname; tag = "v${version}"; - hash = "sha256-UzjXnjYTXdTJAl9MRPJEjQ10EM4U5gDtK0na5fnxp6A="; + hash = "sha256-7EYrTcmUGF/Gjs2SSHWWf2VP4m/qIyxOvGVYOJ41joU="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix index 332329aac083..3c59d77be355 100644 --- a/pkgs/by-name/oc/oculante/package.nix +++ b/pkgs/by-name/oc/oculante/package.nix @@ -16,7 +16,6 @@ wayland, stdenv, gtk3, - darwin, perl, wrapGAppsHook3, }: @@ -57,9 +56,6 @@ rustPlatform.buildRustPackage rec { gtk3 libxkbcommon wayland - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc ]; checkFlags = [ diff --git a/pkgs/by-name/od/ode/package.nix b/pkgs/by-name/od/ode/package.nix index cdef316b45a2..b41cb0e48b31 100644 --- a/pkgs/by-name/od/ode/package.nix +++ b/pkgs/by-name/od/ode/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -14,11 +13,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-yRooxv8mUChHhKeccmo4DWr+yH7PejXDKmvgxbdFE+g="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.GLUT - ]; - env.CXXFLAGS = lib.optionalString stdenv.cc.isClang (toString [ "-std=c++14" "-Wno-error=c++11-narrowing" diff --git a/pkgs/by-name/od/odin/darwin-remove-impure-links.patch b/pkgs/by-name/od/odin/darwin-remove-impure-links.patch new file mode 100644 index 000000000000..eb7fa04c415a --- /dev/null +++ b/pkgs/by-name/od/odin/darwin-remove-impure-links.patch @@ -0,0 +1,23 @@ +diff --git a/src/linker.cpp b/src/linker.cpp +index ec165ef7d..91a28b8fc 100644 +--- a/src/linker.cpp ++++ b/src/linker.cpp +@@ -769,18 +769,6 @@ try_cross_linking:; + gbString platform_lib_str = gb_string_make(heap_allocator(), ""); + defer (gb_string_free(platform_lib_str)); + if (build_context.metrics.os == TargetOs_darwin) { +- platform_lib_str = gb_string_appendc(platform_lib_str, "-Wl,-syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -L/usr/local/lib "); +- +- // Homebrew's default library path, checking if it exists to avoid linking warnings. +- if (gb_file_exists("/opt/homebrew/lib")) { +- platform_lib_str = gb_string_appendc(platform_lib_str, "-L/opt/homebrew/lib "); +- } +- +- // MacPort's default library path, checking if it exists to avoid linking warnings. +- if (gb_file_exists("/opt/local/lib")) { +- platform_lib_str = gb_string_appendc(platform_lib_str, "-L/opt/local/lib "); +- } +- + // Only specify this flag if the user has given a minimum version to target. + // This will cause warnings to show up for mismatched libraries. + if (build_context.minimum_os_version_string_given) { diff --git a/pkgs/by-name/od/odin/package.nix b/pkgs/by-name/od/odin/package.nix index 8b8ce9205098..c30f50c52bda 100644 --- a/pkgs/by-name/od/odin/package.nix +++ b/pkgs/by-name/od/odin/package.nix @@ -1,12 +1,9 @@ { fetchFromGitHub, lib, - libiconv, llvmPackages, - MacOSX-SDK, makeBinaryWrapper, nix-update-script, - Security, which, }: @@ -24,16 +21,9 @@ stdenv.mkDerivation { hash = "sha256-GXea4+OIFyAhTqmDh2q+ewTUqI92ikOsa2s83UH2r58="; }; - postPatch = - lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace src/linker.cpp \ - --replace-fail '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk' ${MacOSX-SDK} - '' - + '' - substituteInPlace build_odin.sh \ - --replace-fail '-framework System' '-lSystem' - patchShebangs build_odin.sh - ''; + patches = [ + ./darwin-remove-impure-links.patch + ]; LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; @@ -46,11 +36,6 @@ stdenv.mkDerivation { which ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - Security - ]; - installPhase = '' runHook preInstall diff --git a/pkgs/by-name/of/offat/package.nix b/pkgs/by-name/of/offat/package.nix index af338a75adb4..2f784f559e62 100644 --- a/pkgs/by-name/of/offat/package.nix +++ b/pkgs/by-name/of/offat/package.nix @@ -19,6 +19,7 @@ python3.pkgs.buildPythonApplication rec { sourceRoot = "${src.name}/src"; pythonRelaxDeps = [ + "rich" "setuptools" "tenacity" ]; diff --git a/pkgs/by-name/og/ogen/package.nix b/pkgs/by-name/og/ogen/package.nix index 4841ecb7cb05..6475d761d42d 100644 --- a/pkgs/by-name/og/ogen/package.nix +++ b/pkgs/by-name/og/ogen/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ogen"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "ogen-go"; repo = "ogen"; tag = "v${version}"; - hash = "sha256-A4ZtwsDBLGEGxQhGhRSAd+dSt6PRu6sPE4ZF83IWHXM="; + hash = "sha256-fw5nDFBlCX1HPHs9m5uJSkcfi/yUt6BN5W+igLTVepA="; }; - vendorHash = "sha256-VpJR/VC7Gtqg2jEMqDArtRV+3Cf6/J6numUuTrmmnwQ="; + vendorHash = "sha256-6YZudsilVd4KlDGjINT9dradgkiyTPh0uJxDNMq75EY="; patches = [ ./modify-version-handling.patch ]; diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix index 7ba4aa030a47..20cadb0eff29 100644 --- a/pkgs/by-name/oh/oha/package.nix +++ b/pkgs/by-name/oh/oha/package.nix @@ -5,7 +5,6 @@ stdenv, pkg-config, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +25,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + ]; # tests don't work inside the sandbox doCheck = false; diff --git a/pkgs/by-name/oi/oink/package.nix b/pkgs/by-name/oi/oink/package.nix index aac1061ba60e..9ececc3a3c95 100644 --- a/pkgs/by-name/oi/oink/package.nix +++ b/pkgs/by-name/oi/oink/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oink"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "rlado"; repo = "oink"; rev = "v${version}"; - hash = "sha256-MBNEMIrpJdXzMjmNwmKXTIzPNNGalElhIxmMU4y6zXo="; + hash = "sha256-e8FtjORTTIDnDANk8sWH8kmS35wyndDd6F7Vhepskb8="; }; vendorHash = null; diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index 487b28c0d990..9fe02312a2e4 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -7,18 +7,18 @@ okteto, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "okteto"; - version = "3.4.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; - rev = version; - hash = "sha256-vi2ow95a3btiR4yINunEa56SUGWlbgNdMdS/T747a+U="; + rev = finalAttrs.version; + hash = "sha256-EPo8pSGh6NHeVrVwHkLUfmpB/O4aqtlC7SrPKnMz05Q="; }; - vendorHash = "sha256-tlZr1IOGOSbahd0Wh3yozbBrVL3RAWQLKNv/3XlMKqM="; + vendorHash = "sha256-1psVUpfRRg+86gniVg1i7RsgmEO12o0pCIQZ0roDDFc="; postPatch = '' # Disable some tests that need file system & network access. @@ -36,7 +36,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/okteto/okteto/pkg/config.VersionString=${version}" + "-X github.com/okteto/okteto/pkg/config.VersionString=${finalAttrs.version}" ]; tags = [ @@ -61,6 +61,7 @@ buildGoModule rec { "Test_translateJobWithoutVolumes" "Test_translateJobWithVolumes" "Test_translateService" + "TestProtobufTranslator_Translate_Success" ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; @@ -84,4 +85,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ aaronjheng ]; mainProgram = "okteto"; }; -} +}) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 005c476e3107..c743a1a0a5c1 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -17,9 +17,7 @@ rocmGpuTargets ? rocmPackages.clr.gpuTargets or [ ], cudaPackages, cudaArches ? cudaPackages.cudaFlags.realArches or [ ], - darwin, autoAddDriverRunpath, - versionCheckHook, # passthru nixosTests, @@ -41,20 +39,6 @@ assert builtins.elem acceleration [ ]; let - pname = "ollama"; - # don't forget to invalidate all hashes each update - version = "0.6.5"; - - src = fetchFromGitHub { - owner = "ollama"; - repo = "ollama"; - tag = "v${version}"; - hash = "sha256-l+JYQjl6A0fKONxtgCtc0ztT18rmArGKcO2o+p4H95M="; - fetchSubmodules = true; - }; - - vendorHash = "sha256-4wYgtdCHvz+ENNMiHptu6ulPJAznkWetQcdba3IEB6s="; - validateFallback = lib.warnIf (config.rocmSupport && config.cudaSupport) (lib.concatStrings [ "both `nixpkgs.config.rocmSupport` and `nixpkgs.config.cudaSupport` are enabled, " "but they are mutually exclusive; falling back to cpu" @@ -104,13 +88,6 @@ let cudaPath = lib.removeSuffix "-${cudaMajorVersion}" cudaToolkit; - metalFrameworks = with darwin.apple_sdk_11_0.frameworks; [ - Accelerate - Metal - MetalKit - MetalPerformanceShaders - ]; - wrapperOptions = [ # ollama embeds llama-cpp binaries which actually run the ai models @@ -137,13 +114,20 @@ let buildGoModule; inherit (lib) licenses platforms maintainers; in -goBuild { - inherit - pname - version - src - vendorHash - ; +goBuild (finalAttrs: { + pname = "ollama"; + # don't forget to invalidate all hashes each update + version = "0.6.5"; + + src = fetchFromGitHub { + owner = "ollama"; + repo = "ollama"; + tag = "v${finalAttrs.version}"; + hash = "sha256-l+JYQjl6A0fKONxtgCtc0ztT18rmArGKcO2o+p4H95M="; + fetchSubmodules = true; + }; + + vendorHash = "sha256-4wYgtdCHvz+ENNMiHptu6ulPJAznkWetQcdba3IEB6s="; env = lib.optionalAttrs enableRocm { @@ -174,18 +158,16 @@ goBuild { ++ lib.optionals (enableRocm || enableCuda) [ makeWrapper autoAddDriverRunpath - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin metalFrameworks; + ]; buildInputs = lib.optionals enableRocm (rocmLibs ++ [ libdrm ]) - ++ lib.optionals enableCuda cudaLibs - ++ lib.optionals stdenv.hostPlatform.isDarwin metalFrameworks; + ++ lib.optionals enableCuda cudaLibs; # replace inaccurate version number with actual release version postPatch = '' substituteInPlace version/version.go \ - --replace-fail 0.0.0 '${version}' + --replace-fail 0.0.0 '${finalAttrs.version}' ''; overrideModAttrs = ( @@ -241,22 +223,18 @@ goBuild { ldflags = [ "-s" "-w" - "-X=github.com/ollama/ollama/version.Version=${version}" + "-X=github.com/ollama/ollama/version.Version=${finalAttrs.version}" "-X=github.com/ollama/ollama/server.mode=release" ]; __darwinAllowLocalNetworking = true; - nativeInstallCheck = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - doInstallCheck = true; - passthru = { tests = { inherit ollama; version = testers.testVersion { - inherit version; + inherit (finalAttrs) version; package = ollama; }; } @@ -274,7 +252,7 @@ goBuild { + lib.optionalString rocmRequested ", using ROCm for AMD GPU acceleration" + lib.optionalString cudaRequested ", using CUDA for NVIDIA GPU acceleration"; homepage = "https://github.com/ollama/ollama"; - changelog = "https://github.com/ollama/ollama/releases/tag/v${version}"; + changelog = "https://github.com/ollama/ollama/releases/tag/v${finalAttrs.version}"; license = licenses.mit; platforms = if (rocmRequested || cudaRequested) then platforms.linux else platforms.unix; mainProgram = "ollama"; @@ -286,4 +264,4 @@ goBuild { roydubnium ]; }; -} +}) diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index 99a76e17febf..718ee0ef7a94 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "omnictl"; - version = "0.48.0"; + version = "0.48.3"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-/+ayHgqXnzA72ms0Z023Vw16rqDE5Eyu/RIPE2AOOG4="; + hash = "sha256-D5CiIC9JVF3fhS0MplWekliOdGAblFzJPafrlYDq1Js="; }; - vendorHash = "sha256-hHQV28OpZJWgulHXFRb2n9CVxVo958y5FUoxsafzFw8="; + vendorHash = "sha256-LMDIpgtMbwr/cpVoAAnr56c/G81ocuOQCJDI+S0z1XU="; ldflags = [ "-s" diff --git a/pkgs/by-name/oo/ooniprobe-cli/package.nix b/pkgs/by-name/oo/ooniprobe-cli/package.nix index 9c14e54425d8..9cb0b79de641 100644 --- a/pkgs/by-name/oo/ooniprobe-cli/package.nix +++ b/pkgs/by-name/oo/ooniprobe-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.24.0"; + version = "3.25.0"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; - rev = "v${version}"; - hash = "sha256-jg09yIX3jHMp0PwSwy2RMwYhZm0haJFTmpwcyTc5I0A="; + tag = "v${version}"; + hash = "sha256-6BZ1ZhlskvP1eYS/yMaPgR0gbAUDJS0rS3KId+Lq450="; }; - vendorHash = "sha256-QH5PyCvfJWWDhjH6Jo8O3wBq3MwfpHWKSuYMmpaqjWk="; + vendorHash = "sha256-WPfeelgKGY0zTfP19+x8PLBrCFpla2uJFstXxJM966o="; subPackages = [ "cmd/ooniprobe" ]; @@ -25,7 +25,7 @@ buildGoModule rec { ]; meta = with lib; { - changelog = "https://github.com/ooni/probe-cli/releases/tag/${src.rev}"; + changelog = "https://github.com/ooni/probe-cli/releases/tag/${src.tag}"; description = "Open Observatory of Network Interference command line network probe"; homepage = "https://ooni.org/install/cli"; license = licenses.gpl3Plus; diff --git a/pkgs/by-name/op/opcua-commander/package.nix b/pkgs/by-name/op/opcua-commander/package.nix index ac137b7fe184..79af40699445 100644 --- a/pkgs/by-name/op/opcua-commander/package.nix +++ b/pkgs/by-name/op/opcua-commander/package.nix @@ -10,16 +10,16 @@ }: buildNpmPackage rec { pname = "opcua-commander"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "node-opcua"; repo = "opcua-commander"; rev = version; - hash = "sha256-7KYwIdrhlvGR9RHZBfMFOcBa+opwx7Q/crCdvwZD6Y8="; + hash = "sha256-qoBpYN0EiXiuhH+hXjVPK2ET8Psjz52rocohU8ccVIg="; }; - npmDepsHash = "sha256-g4WFLh+UnziQR2NZ4eL84Vrk+Mz99kFQiBkdGmBEMHE="; + npmDepsHash = "sha256-HB4boWgZWoG+ib+cCoQbUmrrV5rECR3dMwj2lCyJjT0="; nativeBuildInputs = [ esbuild typescript diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix index c076679fef2a..9588f7ee91ea 100644 --- a/pkgs/by-name/op/open-policy-agent/package.nix +++ b/pkgs/by-name/op/open-policy-agent/package.nix @@ -12,14 +12,14 @@ assert enableWasmEval && stdenv.hostPlatform.isDarwin -> builtins.throw "building with wasm on darwin is failing in nixpkgs"; -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "open-policy-agent"; version = "1.3.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wWxWpJSDOaZLJ7ULdAzPFJ9YNXX3FyQRod2roaLsuis="; }; @@ -32,7 +32,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/open-policy-agent/opa/version.Version=${version}" + "-X github.com/open-policy-agent/opa/version.Version=${finalAttrs.version}" ]; tags = lib.optional enableWasmEval ( @@ -43,22 +43,37 @@ buildGoModule rec { ) "opa_wasm" ); - checkFlags = lib.optionals (!enableWasmEval) [ - "-skip=TestRegoTargetWasmAndTargetPluginDisablesIndexingTopdownStages" - ]; + checkFlags = + let + skippedTests = + [ + # Skip tests that require network, not available in the nix sandbox + "TestInterQueryCache_ClientError" + "TestIntraQueryCache_ClientError" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Skip tests that require network, not available in the darwin sandbox + "TestHTTPSClient" + "TestHTTPSNoClientCerts" + ] + ++ lib.optionals (!enableWasmEval) [ + "TestRegoTargetWasmAndTargetPluginDisablesIndexingTopdownStages" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; preCheck = + # Feed in all but the e2e tests for testing + # This is because subPackages above limits what is built to just what we + # want but also limits the tests + # Also avoid wasm tests on darwin due to wasmtime-go build issues '' - # Feed in all but the e2e tests for testing - # This is because subPackages above limits what is built to just what we - # want but also limits the tests - # Also avoid wasm tests on darwin due to wasmtime-go build issues getGoDirs() { go list ./... | grep -v -e e2e ${lib.optionalString stdenv.hostPlatform.isDarwin "-e wasm"} } '' + # remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra + lib.optionalString stdenv.hostPlatform.isDarwin '' - # remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra rm v1/server/server_test.go ''; @@ -74,7 +89,7 @@ buildGoModule rec { runHook preInstallCheck $out/bin/opa --help - $out/bin/opa version | grep "Version: ${version}" + $out/bin/opa version | grep "Version: ${finalAttrs.version}" ${lib.optionalString enableWasmEval '' # If wasm is enabled verify it works @@ -84,10 +99,13 @@ buildGoModule rec { runHook postInstallCheck ''; - meta = with lib; { + # Required for tests that need networking + __darwinAllowLocalNetworking = true; + + meta = { mainProgram = "opa"; homepage = "https://www.openpolicyagent.org"; - changelog = "https://github.com/open-policy-agent/opa/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/open-policy-agent/opa/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "General-purpose policy engine"; longDescription = '' The Open Policy Agent (OPA, pronounced "oh-pa") is an open source, general-purpose policy engine that unifies @@ -95,10 +113,10 @@ buildGoModule rec { as code and simple APIs to offload policy decision-making from your software. You can use OPA to enforce policies in microservices, Kubernetes, CI/CD pipelines, API gateways, and more. ''; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ lewo jk ]; }; -} +}) diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix index 7ae098af1898..eb59f6b8e6d3 100644 --- a/pkgs/by-name/op/open-scq30/package.nix +++ b/pkgs/by-name/op/open-scq30/package.nix @@ -12,8 +12,6 @@ gtk4, libadwaita, pango, - stdenv, - darwin, cargo-make, }: @@ -35,22 +33,15 @@ rustPlatform.buildRustPackage rec { cargo-make ]; - buildInputs = - [ - cairo - dbus - gdk-pixbuf - glib - gtk4 - libadwaita - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreBluetooth - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + cairo + dbus + gdk-pixbuf + glib + gtk4 + libadwaita + pango + ]; useFetchCargoVendor = true; cargoHash = "sha256-3K+/CpTGWSjCRa2vOEcDvLIiZMdntugIqnzkXF4wkng="; diff --git a/pkgs/by-name/op/open-timeline-io/package.nix b/pkgs/by-name/op/open-timeline-io/package.nix new file mode 100644 index 000000000000..a944810fd890 --- /dev/null +++ b/pkgs/by-name/op/open-timeline-io/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + imath, + rapidjson, +}: + +stdenv.mkDerivation rec { + pname = "open-timeline-io"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "AcademySoftwareFoundation"; + repo = "OpenTimelineIO"; + rev = "v${version}"; + hash = "sha256-53KXjbhHxuEtu6iRGWrirvFamuZ/WbOTcKCfs1iqKmM="; + }; + + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + imath + ]; + + buildInputs = [ + rapidjson + ]; + + cmakeFlags = [ + "-DOTIO_DEPENDENCIES_INSTALL=0" + "-DOTIO_FIND_IMATH=1" + ]; + + meta = { + description = "Open Source API and interchange format for editorial timeline information"; + homepage = "https://github.com/AcademySoftwareFoundation/OpenTimelineIO"; + license = lib.licenses.asl20; + maintainers = [ ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 741a5e5ad29d..2979f34cc6a4 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -30,7 +30,7 @@ let url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2"; }; - npmDepsHash = "sha256-C7YuXxCrnJ+8L7JNh6TA8xi0G3y1FwFb9DQwhS+igME="; + npmDepsHash = "sha256-MIjQ5Lbtv6kFHUyuc12JTItUPxIHoo65iUlSjBxw9Z8="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. diff --git a/pkgs/by-name/op/openboardview/package.nix b/pkgs/by-name/op/openboardview/package.nix index c68764ee1f6a..71f71e966e61 100644 --- a/pkgs/by-name/op/openboardview/package.nix +++ b/pkgs/by-name/op/openboardview/package.nix @@ -11,12 +11,8 @@ fontconfig, gtk3, wrapGAppsHook3, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation rec { pname = "openboardview"; version = "9.95.0"; @@ -44,15 +40,11 @@ stdenv.mkDerivation rec { python3 wrapGAppsHook3 ]; - buildInputs = - [ - SDL2 - fontconfig - gtk3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ]; + buildInputs = [ + SDL2 + fontconfig + gtk3 + ]; postPatch = '' substituteInPlace src/openboardview/CMakeLists.txt \ diff --git a/pkgs/by-name/op/opencascade-occt/package.nix b/pkgs/by-name/op/opencascade-occt/package.nix index 293eac8660b2..6295a0c98e38 100644 --- a/pkgs/by-name/op/opencascade-occt/package.nix +++ b/pkgs/by-name/op/opencascade-occt/package.nix @@ -13,7 +13,6 @@ libXext, libXmu, libXi, - darwin, }: stdenv.mkDerivation rec { @@ -50,7 +49,7 @@ stdenv.mkDerivation rec { libXmu libXi rapidjson - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ]; NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; cmakeFlags = [ "-DUSE_RAPIDJSON=ON" ]; diff --git a/pkgs/by-name/op/openctm/package.nix b/pkgs/by-name/op/openctm/package.nix index bb6bd763ea1d..84c4f11dfdea 100644 --- a/pkgs/by-name/op/openctm/package.nix +++ b/pkgs/by-name/op/openctm/package.nix @@ -6,7 +6,6 @@ libglut, gtk2, libGLU, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -27,13 +26,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libglut - libGLU - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk2 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + buildInputs = [ + libglut + libGLU + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk2 ]; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/op/opendbx/package.nix b/pkgs/by-name/op/opendbx/package.nix index 0e6db1ef2ec4..4b46e91ae277 100644 --- a/pkgs/by-name/op/opendbx/package.nix +++ b/pkgs/by-name/op/opendbx/package.nix @@ -27,6 +27,13 @@ stdenv.mkDerivation rec { configureFlagsArray=(--with-backends="mysql pgsql sqlite3") ''; + configureFlags = [ + # detection fails when cross-compiling + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + "ac_cv_func_strtod=yes" + ]; + buildInputs = [ readline libmysqlclient diff --git a/pkgs/by-name/op/opengrok/package.nix b/pkgs/by-name/op/opengrok/package.nix index 69efb208b6bf..42ba35995c16 100644 --- a/pkgs/by-name/op/opengrok/package.nix +++ b/pkgs/by-name/op/opengrok/package.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.13.27"; + version = "1.13.28"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-Qr30+paSn3I3+tWpzALTIXP8kxireL96rKopDDj/qnM="; + hash = "sha256-WomA61x6/IeEZdsQJwIzmaPZdYttGLJ+Yw36gOnAUK4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix index b15816eefc19..5cef5dbb3826 100644 --- a/pkgs/by-name/op/openimagedenoise/package.nix +++ b/pkgs/by-name/op/openimagedenoise/package.nix @@ -3,7 +3,6 @@ config, cudaPackages, cudaSupport ? config.cudaSupport, - darwin, fetchzip, ispc, lib, @@ -42,14 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ tbb ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - Accelerate - MetalKit - MetalPerformanceShadersGraph - ] - ) + ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart cudaPackages.cuda_cccl diff --git a/pkgs/by-name/op/openmolcas/nevpt2.patch b/pkgs/by-name/op/openmolcas/nevpt2.patch new file mode 100644 index 000000000000..0033a17af196 --- /dev/null +++ b/pkgs/by-name/op/openmolcas/nevpt2.patch @@ -0,0 +1,22 @@ +diff --git a/src/gctime.c b/src/gctime.c +index 34fcb6f..832459c 100644 +--- a/src/gctime.c ++++ b/src/gctime.c +@@ -1,14 +1,15 @@ ++#include + typedef long f77_int; /* Fortran integer type */ + typedef char * f77_char; /* Fortran character argument */ + #define CH_F2C(X) ((char *) (X)) /* How to get char ptr from F77 argument */ +-gctime (fstr, lstr) f77_char *fstr; int lstr; { ++int gctime (fstr, lstr) f77_char *fstr; int lstr; { + long time(), t; + char *ctime(); + t = time ( (long *) 0); + strcpy(CH_F2C(fstr),ctime(&t)); + return (0); + } +-gctime_(fstr, lstr) f77_char *fstr; int lstr; { ++int gctime_(fstr, lstr) f77_char *fstr; int lstr; { + long time(), t; + char *ctime(); + t = time ( (long *) 0); diff --git a/pkgs/by-name/op/openmolcas/openblasPath.patch b/pkgs/by-name/op/openmolcas/openblasPath.patch deleted file mode 100644 index e47adcc3e9a3..000000000000 --- a/pkgs/by-name/op/openmolcas/openblasPath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 276ae4e2..db13e6e3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1507,7 +1507,6 @@ if (LINALG STREQUAL "OpenBLAS") - NAMES openblas - PATHS ${OPENBLASROOT} - PATH_SUFFIXES lib -- NO_DEFAULT_PATH - ) - - if (NOT LIBOPENBLAS) diff --git a/pkgs/by-name/op/openmolcas/package.nix b/pkgs/by-name/op/openmolcas/package.nix index 35d244cec9a0..87e27a8a390a 100644 --- a/pkgs/by-name/op/openmolcas/package.nix +++ b/pkgs/by-name/op/openmolcas/package.nix @@ -7,6 +7,7 @@ gfortran, perl, blas-ilp64, + lapack-ilp64, hdf5-cpp, python3, texliveMinimal, @@ -16,7 +17,7 @@ gsl, boost, autoPatchelfHook, - enableQcmaquis ? false, + enableQcmaquis ? true, # Note that the CASPT2 module is broken with MPI # See https://gitlab.com/Molcas/OpenMolcas/-/issues/169 enableMpi ? false, @@ -25,11 +26,7 @@ }: assert blas-ilp64.isILP64; -assert lib.elem blas-ilp64.passthru.implementation [ - "openblas" - "mkl" -]; -assert enableQcmaquis -> lib.elem blas-ilp64.passthru.implementation "mkl"; +assert lapack-ilp64.isILP64; let python = python3.withPackages ( @@ -46,30 +43,43 @@ let rev = "release-3.1.4"; # Must match tag in cmake/custom/qcmaquis.cmake hash = "sha256-vhC5k+91IPFxdCi5oYt1NtF9W08RxonJjPpA0ls4I+o="; }; - nevtp2Src = fetchFromGitHub { - owner = "qcscine"; - repo = "nevpt2"; - rev = "e1484fd"; # Must match tag in cmake/custom/nevpt2.cmake - hash = "sha256-Vl+FhwhJBbD/7U2CwsYE9BClSQYLJ8DKXV9EXxQUmz0="; + + # NEVPT2 sources must be patched to be valid C code in gctime.c + nevpt2Src = stdenv.mkDerivation { + pname = "nevpt2-src"; + version = "unstable"; + phases = [ + "unpackPhase" + "patchPhase" + "installPhase" + ]; + src = fetchFromGitHub { + owner = "qcscine"; + repo = "nevpt2"; + rev = "e1484fd"; # Must match tag in cmake/custom/nevpt2.cmake + hash = "sha256-Vl+FhwhJBbD/7U2CwsYE9BClSQYLJ8DKXV9EXxQUmz0="; + }; + patches = [ ./nevpt2.patch ]; + installPhase = '' + mkdir $out + cp -r * $out/. + ''; }; in stdenv.mkDerivation rec { pname = "openmolcas"; - version = "24.10"; + version = "25.02"; src = fetchFromGitLab { owner = "Molcas"; repo = "OpenMolcas"; rev = "v${version}"; - hash = "sha256-LXxr/xqBHG7a0rOBrb8IMZ4IjZak3NsBw40Qf+z1fic="; + hash = "sha256-Ty7C7zj1lQixuUzeKLcwQCmcPexZXtIGDzp1wUMKDi0="; }; patches = [ - # Required to handle openblas multiple outputs - ./openblasPath.patch - - # Required for a local QCMaquis build + # Required for a local QCMaquis build. Also sanitises QCMaquis BLAS/LAPACK handling ./qcmaquis.patch ]; @@ -83,7 +93,7 @@ stdenv.mkDerivation rec { --subst-var-by "qcmaquis_src_url" "file://${qcmaquisSrc}" substituteInPlace cmake/custom/nevpt2.cmake \ - --subst-var-by "nevpt2_src_url" "file://${nevtp2Src}" + --subst-var-by "nevpt2_src_url" "file://${nevpt2Src}" ''; nativeBuildInputs = [ @@ -97,13 +107,14 @@ stdenv.mkDerivation rec { buildInputs = [ - blas-ilp64.passthru.provider hdf5-cpp python armadillo libxc gsl.dev boost + blas-ilp64 + lapack-ilp64 ] ++ lib.optionals enableMpi [ mpi @@ -112,38 +123,31 @@ stdenv.mkDerivation rec { passthru = lib.optionalAttrs enableMpi { inherit mpi; }; - cmakeFlags = - [ - "-DOPENMP=ON" - "-DTOOLS=ON" - "-DHDF5=ON" - "-DFDE=ON" - "-DEXTERNAL_LIBXC=${lib.getDev libxc}" - (lib.strings.cmakeBool "DMRG" enableQcmaquis) - (lib.strings.cmakeBool "NEVPT2" enableQcmaquis) - "-DCMAKE_SKIP_BUILD_RPATH=ON" - (lib.strings.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic) - (lib.strings.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) - ] - ++ lib.optionals (blas-ilp64.passthru.implementation == "openblas") [ - "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}" - "-DLINALG=OpenBLAS" - ] - ++ lib.optionals (blas-ilp64.passthru.implementation == "mkl") [ - "-DMKLROOT=${blas-ilp64.passthru.provider}" - "-DLINALG=MKL" - ] - ++ lib.optionals enableMpi [ - "-DGA=ON" - "-DMPI=ON" - ]; - - preConfigure = lib.optionalString enableMpi '' - export GAROOT=${globalarrays}; - ''; + preConfigure = + '' + cmakeFlagsArray+=( + "-DOPENMP=ON" + "-DTOOLS=ON" + "-DHDF5=ON" + "-DFDE=ON" + "-DEXTERNAL_LIBXC=${lib.getDev libxc}" + ${lib.strings.cmakeBool "DMRG" enableQcmaquis} + ${lib.strings.cmakeBool "NEVPT2" enableQcmaquis} + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ${lib.strings.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic} + ${lib.strings.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)} + "-DLINALG=Manual" + "-DLINALG_LIBRARIES=-lblas -llapack" + ${lib.strings.cmakeBool "DGA" enableMpi} + ${lib.strings.cmakeBool "MPI" enableMpi} + ) + '' + + lib.optionalString enableMpi '' + export GAROOT=${globalarrays}; + ''; + # The Makefile will install pymolcas during the build grrr. postConfigure = '' - # The Makefile will install pymolcas during the build grrr. mkdir -p $out/bin export PATH=$PATH:$out/bin ''; @@ -158,8 +162,8 @@ stdenv.mkDerivation rec { # removed by autopatchelf noAuditTmpdir = true; + # Wrong store path in shebang (bare Python, no Python pkgs), force manual re-patching postFixup = '' - # Wrong store path in shebang (bare Python, no Python pkgs), force manual re-patching for exe in $(find $out/bin/ -type f -name "*.py"); do sed -i "1s:.*:#!${python}/bin/python:" "$exe" done diff --git a/pkgs/by-name/op/openmolcas/qcmaquis.patch b/pkgs/by-name/op/openmolcas/qcmaquis.patch index c388f699a1cc..c4b5261a6cf6 100644 --- a/pkgs/by-name/op/openmolcas/qcmaquis.patch +++ b/pkgs/by-name/op/openmolcas/qcmaquis.patch @@ -45,3 +45,58 @@ index 5fd1ef207..8d2957c6e 100644 SOURCE_SUBDIR dmrg CMAKE_ARGS ${EP_CMAKE_ARGS} CMAKE_CACHE_ARGS ${EP_CMAKE_CACHE_ARGS} +diff --git a/cmake/custom/qcmaquis.cmake b/cmake/custom/qcmaquis.cmake +index 5fd1ef207..4291ec3d7 100644 +--- a/cmake/custom/qcmaquis.cmake ++++ b/cmake/custom/qcmaquis.cmake +@@ -94,47 +94,9 @@ if (NOT MAQUIS_DMRG_FOUND) # Does the opposite work? + ) + endif (BOOST_ROOT) + +- if (LINALG STREQUAL "Manual") +- target_files (LINALG_LIBRARIES_FILES ${LINALG_LIBRARIES}) +- list (APPEND LINALG_LIBRARIES_FILES ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES}) +- string (REPLACE ";" '\' LINALG_LIBRARIES_FILES "${LINALG_LIBRARIES_FILES}") +- list (APPEND QCMaquisCMakeArgs +- "-DBLAS_LAPACK_SELECTOR=manual" +- "-DMAQUISLapack_LIBRARIES=${LINALG_LIBRARIES_FILES}" +- ) +- elseif (LINALG STREQUAL "MKL") +- list (APPEND QCMaquisCMakeArgs +- "-DBLAS_LAPACK_SELECTOR=mkl_sequential" +- ) +- elseif (LINALG STREQUAL "OpenBLAS") +- list (APPEND QCMaquisCMakeArgs +- "-DBLAS_LAPACK_SELECTOR=openblas" +- "-DOPENBLASROOT=${OPENBLASROOT}" +- ) +- elseif (LINALG STREQUAL "Accelerate") +- list (APPEND QCMaquisCMakeArgs +- "-DBLAS_LAPACK_SELECTOR:STRING=veclib" +- ) +- elseif (LINALG STREQUAL "Internal") +- +- # To link QCMaquis with Fortran static libraries, we +- # need to add -lgfortran for gfortran +- # It seems that ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES} +- # is not suited for this because it contains also other unnecessary libraries +- +- # for some reason, the list does not work if the generator expression -lgfortran is not first +- # but for correct linking it needs to be last AND with a prepended "-l" +- if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") +- set (Fortran_RUNTIME_LIBRARY "gfortran") +- endif () +- +- list (APPEND QCMaquisCMakeArgs +- "-DBLAS_LAPACK_SELECTOR=manual" +- "-DMAQUISLapack_LIBRARIES=$<$:${Fortran_RUNTIME_LIBRARY}\ >$\ $\ $\ -l$<$:${Fortran_RUNTIME_LIBRARY}>" +- ) +- else () +- message (FATAL_ERROR "LINALG=${LINALG} is not supported by QCMaquis") +- endif () ++ list (APPEND QCMaquisCMakeArgs ++ "-DBLAS_LAPACK_SELECTOR=auto" ++ ) + + # Enabling source changes to keep ExternalProject happy + set (CMAKE_DISABLE_SOURCE_CHANGES OFF diff --git a/pkgs/by-name/op/openpgp-ca/package.nix b/pkgs/by-name/op/openpgp-ca/package.nix index 7b5e0bffc3d2..55195c940688 100644 --- a/pkgs/by-name/op/openpgp-ca/package.nix +++ b/pkgs/by-name/op/openpgp-ca/package.nix @@ -1,8 +1,6 @@ { - stdenv, fetchFromGitLab, lib, - darwin, nettle, nix-update-script, rustPlatform, @@ -36,21 +34,12 @@ rustPlatform.buildRustPackage rec { gnupg ]; - buildInputs = - [ - openssl - sqlite - pcsclite - nettle - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - PCSC - Security - SystemConfiguration - ] - ); + buildInputs = [ + openssl + sqlite + pcsclite + nettle + ]; # Most tests rely on gnupg being able to write to /run/user # gnupg refuses to respect the XDG_RUNTIME_DIR variable, so we skip the tests diff --git a/pkgs/by-name/op/opensaml-cpp/package.nix b/pkgs/by-name/op/opensaml-cpp/package.nix index 9eac6e3074da..6bbe4f57d718 100644 --- a/pkgs/by-name/op/opensaml-cpp/package.nix +++ b/pkgs/by-name/op/opensaml-cpp/package.nix @@ -4,7 +4,6 @@ fetchgit, autoreconfHook, pkg-config, - darwin, boost, openssl, log4shib, @@ -24,23 +23,15 @@ stdenv.mkDerivation rec { sha256 = "0ms3sqmwqkrqb92d7jy2hqwnz5yd7cbrz73n321jik0jilrwl5w8"; }; - buildInputs = - [ - boost - openssl - log4shib - xercesc - xml-security-c - xml-tooling-c - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ + boost + openssl + log4shib + xercesc + xml-security-c + xml-tooling-c + zlib + ]; nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/by-name/op/opensc/package.nix b/pkgs/by-name/op/opensc/package.nix index 4714e994308a..8c642beb23da 100644 --- a/pkgs/by-name/op/opensc/package.nix +++ b/pkgs/by-name/op/opensc/package.nix @@ -14,9 +14,7 @@ docbook_xsl, libxslt, docbook_xml_dtd_412, - darwin, nix-update-script, - withApplePCSC ? stdenv.hostPlatform.isDarwin, }: stdenv.mkDerivation rec { @@ -35,46 +33,33 @@ stdenv.mkDerivation rec { autoreconfHook libxslt # xsltproc ]; - buildInputs = - [ - zlib - readline - openssl - libassuan - libXt - libiconv - docbook_xml_dtd_412 - ] - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Carbon - ++ (if withApplePCSC then [ darwin.apple_sdk.frameworks.PCSC ] else [ pcsclite ]); + buildInputs = [ + zlib + readline + openssl + libassuan + libXt + libiconv + docbook_xml_dtd_412 + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) pcsclite; env.NIX_CFLAGS_COMPILE = "-Wno-error"; - configureFlags = [ - "--enable-zlib" - "--enable-readline" - "--enable-openssl" - "--enable-pcsc" - "--enable-sm" - "--enable-man" - "--enable-doc" - "--localstatedir=/var" - "--sysconfdir=/etc" - "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook" - "--with-pcsc-provider=${ - if withApplePCSC then - "${darwin.apple_sdk.frameworks.PCSC}/Library/Frameworks/PCSC.framework/PCSC" - else - "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" - }" - ]; - - PCSC_CFLAGS = lib.concatStringsSep " " ( - lib.optionals withApplePCSC [ - "-I${darwin.apple_sdk.frameworks.PCSC}/Library/Frameworks/PCSC.framework/Headers" - "-I${lib.getDev pcsclite}/include/PCSC" + configureFlags = + [ + "--enable-zlib" + "--enable-readline" + "--enable-openssl" + "--enable-pcsc" + "--enable-sm" + "--enable-man" + "--enable-doc" + "--localstatedir=/var" + "--sysconfdir=/etc" + "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook" ] - ); + ++ lib.optional (!stdenv.hostPlatform.isDarwin) + "--with-pcsc-provider=${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}"; installFlags = [ "sysconfdir=$(out)/etc" diff --git a/pkgs/by-name/op/opensubdiv/package.nix b/pkgs/by-name/op/opensubdiv/package.nix index 588993c98e37..8d42b97d3640 100644 --- a/pkgs/by-name/op/opensubdiv/package.nix +++ b/pkgs/by-name/op/opensubdiv/package.nix @@ -14,7 +14,6 @@ cudaSupport ? config.cudaSupport, cudaPackages, openclSupport ? !cudaSupport, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -57,18 +56,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXi ] ++ lib.optionals (openclSupport && stdenv.hostPlatform.isLinux) [ ocl-icd ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - OpenCL - Cocoa - CoreVideo - IOKit - AppKit - AGL - MetalKit - ] - ) + ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]; diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/by-name/op/opentimestamps-client/package.nix similarity index 100% rename from pkgs/tools/misc/opentimestamps-client/default.nix rename to pkgs/by-name/op/opentimestamps-client/package.nix diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix index f6c984e4b9df..c93d0ba40100 100644 --- a/pkgs/by-name/op/openturns/package.nix +++ b/pkgs/by-name/op/openturns/package.nix @@ -4,7 +4,6 @@ ceres-solver, cmake, cminpack, - darwin, dlib, fetchFromGitHub, hdf5, @@ -24,9 +23,6 @@ enablePython ? false, }: -let - inherit (darwin.apple_sdk.frameworks) Accelerate; -in stdenv.mkDerivation (finalAttrs: { pname = "openturns"; version = "1.24"; @@ -64,9 +60,6 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.matplotlib python3Packages.psutil python3Packages.python - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Accelerate ]; cmakeFlags = [ diff --git a/pkgs/by-name/op/openvr/package.nix b/pkgs/by-name/op/openvr/package.nix index 501a74ec098f..fa65d10af9e3 100644 --- a/pkgs/by-name/op/openvr/package.nix +++ b/pkgs/by-name/op/openvr/package.nix @@ -1,9 +1,7 @@ { - AppKit, cmake, fetchFromGitHub, fetchpatch2, - Foundation, jsoncpp, lib, libGL, @@ -48,15 +46,10 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; - buildInputs = - [ - jsoncpp - libGL - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - Foundation - ]; + buildInputs = [ + jsoncpp + libGL + ]; cmakeFlags = [ "-DUSE_SYSTEM_JSONCPP=ON" diff --git a/pkgs/by-name/op/opkssh/package.nix b/pkgs/by-name/op/opkssh/package.nix index 5b675880a748..ae866f2ed639 100644 --- a/pkgs/by-name/op/opkssh/package.nix +++ b/pkgs/by-name/op/opkssh/package.nix @@ -8,18 +8,18 @@ buildGoModule (finalAttrs: { pname = "opkssh"; - version = "0.3.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "openpubkey"; repo = "opkssh"; tag = "v${finalAttrs.version}"; - hash = "sha256-RtTo/wj4v+jtJ4xZJD0YunKtxT7zZ1esgJOSEtxnLOg="; + hash = "sha256-93GtevOnJD7CJlKTR9IMlrausBA0ipveunOUZbowRDQ="; }; ldflags = [ "-X main.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-MK7lEBKMVZv4jbYY2Vf0zYjw7YV+13tB0HkO3tCqzEI="; + vendorHash = "sha256-CQYeRN//mEA5vUj9rtIxZQSE3t3sl/kY6F3ICEIrZao="; nativeInstallCheckInputs = [ versionCheckHook @@ -31,9 +31,12 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/openpubkey/opkssh"; - description = "Integrating SSO with SSH - short-lived SSH keys with an OpenID provider"; + description = "Enables SSH to be used with OpenID Connect"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.johnrichardrinehart ]; + maintainers = with lib.maintainers; [ + johnrichardrinehart + sarcasticadmin + ]; mainProgram = "opkssh"; }; }) diff --git a/pkgs/by-name/or/oranda/package.nix b/pkgs/by-name/or/oranda/package.nix index 5cf56cc1bf9c..482bd1c767f3 100644 --- a/pkgs/by-name/or/oranda/package.nix +++ b/pkgs/by-name/or/oranda/package.nix @@ -6,7 +6,6 @@ tailwindcss, oniguruma, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,14 +27,9 @@ rustPlatform.buildRustPackage rec { tailwindcss ]; - buildInputs = - [ - oniguruma - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + oniguruma + ]; # requires internet access checkFlags = [ diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix index 6f03e4c6c1cc..29f9deb8bca1 100644 --- a/pkgs/by-name/or/ord/package.nix +++ b/pkgs/by-name/or/ord/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; dontUseCargoParallelTests = true; diff --git a/pkgs/by-name/or/orogene/package.nix b/pkgs/by-name/or/orogene/package.nix index 510b0c67dcae..778111e1a2cf 100644 --- a/pkgs/by-name/or/orogene/package.nix +++ b/pkgs/by-name/or/orogene/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,13 +25,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; preCheck = '' export CI=true diff --git a/pkgs/by-name/or/orthanc-framework/package.nix b/pkgs/by-name/or/orthanc-framework/package.nix index 037044b68a6f..e19bd8331e79 100644 --- a/pkgs/by-name/or/orthanc-framework/package.nix +++ b/pkgs/by-name/or/orthanc-framework/package.nix @@ -18,10 +18,6 @@ stdenv.mkDerivation (finalAttrs: { ; sourceRoot = "${finalAttrs.src.name}/OrthancFramework/SharedLibrary"; - outputs = [ - "out" - "dev" - ]; buildInputs = orthanc.buildInputs ++ [ icu diff --git a/pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch b/pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch deleted file mode 100644 index 87c92ed94d1b..000000000000 --- a/pkgs/by-name/or/orthanc-plugin-dicomweb/fix-orthanc-framework-headers-detection.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -r ad41d16f36b1 Resources/Orthanc/CMake/DownloadOrthancFramework.cmake ---- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Fri Jan 17 12:24:54 2025 +0100 -+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Thu Mar 20 17:45:59 2025 +0100 -@@ -552,9 +552,10 @@ - set(ORTHANC_FRAMEWORK_INCLUDE_DIR ${ORTHANC_FRAMEWORK_ROOT}) - else() - find_path(ORTHANC_FRAMEWORK_INCLUDE_DIR OrthancFramework.h -- /usr/include/orthanc-framework -- /usr/local/include/orthanc-framework -+ /usr/ -+ /usr/local/ - ${ORTHANC_FRAMEWORK_ROOT} -+ PATH_SUFFIXES include include/orthanc-framework - ) - endif() - diff --git a/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix index 160d7bb47949..40e0cdf16ce1 100644 --- a/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix +++ b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix @@ -13,7 +13,6 @@ pugixml, libuuid, zlib, - pkg-config, }: let @@ -48,11 +47,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ee271Fcu8yi1gZpTWrCuqhsBdFcPR/JK/fsnJg8PwIc="; }; - patches = [ - # Fix Orthanc Framework headers files detection - ./fix-orthanc-framework-headers-detection.patch - ]; - postPatch = '' mkdir -p ThirdPartyDownloads ln -s ${bootstrap} ThirdPartyDownloads/bootstrap-5.3.3.zip @@ -92,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_BUILD_TYPE=Release" "-DSTATIC_BUILD=OFF" "-DORTHANC_FRAMEWORK_SOURCE=system" + "-DORTHANC_FRAMEWORK_ROOT=${orthanc.framework}/include/orthanc-framework" ]; meta = { diff --git a/pkgs/by-name/os/osm2pgsql/package.nix b/pkgs/by-name/os/osm2pgsql/package.nix index ddf69d31d81c..b6db9594c541 100644 --- a/pkgs/by-name/os/osm2pgsql/package.nix +++ b/pkgs/by-name/os/osm2pgsql/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "osm2pgsql-dev"; repo = "osm2pgsql"; rev = finalAttrs.version; - hash = "sha256-YKlw/YIRogu0AbkRA3kZ4j4tbbVYbgVcLVYifYarmjE="; + hash = "sha256-5rENMcYCfHUdb4QsyOnnGe/qCbdYLoXI15e7OqJXit4="; }; postPatch = '' diff --git a/pkgs/by-name/os/ossia-score/package.nix b/pkgs/by-name/os/ossia-score/package.nix index 59591c867175..98e4649d3ec2 100644 --- a/pkgs/by-name/os/ossia-score/package.nix +++ b/pkgs/by-name/os/ossia-score/package.nix @@ -44,13 +44,13 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "ossia-score"; - version = "3.4.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "ossia"; repo = "score"; rev = "v${finalAttrs.version}"; - hash = "sha256-PpIGlw3MmJYiLaKX+oHM7QUjlk6Bw/W2GwdkLgPK1Hg="; + hash = "sha256-7gZTUdOVfMlNDuvLrt8twbHCBOz9hoZQaQdWdDF6qMg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix index 86bcedcd8731..b9cfa532807c 100644 --- a/pkgs/by-name/os/ostree/package.nix +++ b/pkgs/by-name/os/ostree/package.nix @@ -181,6 +181,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://ostreedev.github.io/ostree/"; license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix index a33bd35bcee2..64cadde4d1e0 100644 --- a/pkgs/by-name/os/osu-lazer-bin/package.nix +++ b/pkgs/by-name/os/osu-lazer-bin/package.nix @@ -10,23 +10,23 @@ let pname = "osu-lazer-bin"; - version = "2025.321.0"; + version = "2025.420.0"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-oc5IbLhOGn7nug47YHpEqTkQoGWQXrVS77xQMW9khqw="; + hash = "sha256-rFPh1mziEcbqBhxRAoV2qHKNQeWjWIrprx6tXnLoGLs="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-c1EHrkLbxYUwwgMdgGTHHkop6STFLVH8vRQ41MzGeeI="; + hash = "sha256-PlyJkN9ALSE8s2gPVkMXoZd+1FKqqFxIFPLkJkXwk0k="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-mNxoEx/wgJ1OUm7y9JLd5vHSwfcB49QjKDVQWZaMDJQ="; + hash = "sha256-yrVFep119E2PkRsyB0UPhZnjR7jXuhd9CktIgL98om4="; }; } .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported."); diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json index 2cc851c8fbb5..18dd9bca29e3 100644 --- a/pkgs/by-name/os/osu-lazer/deps.json +++ b/pkgs/by-name/os/osu-lazer/deps.json @@ -651,8 +651,8 @@ }, { "pname": "ppy.osu.Framework", - "version": "2025.321.0", - "hash": "sha256-+TD1TcZfAzFMlVsT19hCfhoMfU4MQcL8K18N/wHZhns=" + "version": "2025.419.0", + "hash": "sha256-fsuEdzD4pzBID7I7DNAYs4JGrCkm/ALtZkEu5/QgKVQ=" }, { "pname": "ppy.osu.Framework.NativeLibs", diff --git a/pkgs/by-name/os/osu-lazer/osu.runtimeconfig.json b/pkgs/by-name/os/osu-lazer/osu.runtimeconfig.json deleted file mode 100644 index 170449ccbc02..000000000000 --- a/pkgs/by-name/os/osu-lazer/osu.runtimeconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "runtimeOptions": { - "tfm": "net8.0", - "framework": { - "name": "Microsoft.NETCore.App", - "version": "8.0.0" - } - } -} diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix index 69841a20bdd6..e4ca7f559171 100644 --- a/pkgs/by-name/os/osu-lazer/package.nix +++ b/pkgs/by-name/os/osu-lazer/package.nix @@ -16,18 +16,19 @@ xorg, udev, vulkan-loader, + nix-update-script, nativeWayland ? false, }: buildDotnetModule rec { pname = "osu-lazer"; - version = "2025.321.0"; + version = "2025.420.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; tag = version; - hash = "sha256-37foEm4MO8kuir72qARQ7LKiICRiRq1vorABh3OaL3g="; + hash = "sha256-yDWU4mQYR6a9eKTEEsxZ2UASvMuQzWi+HZbDmanhalA="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; @@ -78,7 +79,6 @@ buildDotnetModule rec { done ln -sft $out/lib/${pname} ${SDL2}/lib/libSDL2${stdenvNoCC.hostPlatform.extensions.sharedLibrary} - cp -f ${./osu.runtimeconfig.json} "$out/lib/${pname}/osu!.runtimeconfig.json" runHook postFixup ''; @@ -95,7 +95,7 @@ buildDotnetModule rec { }) ]; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { }; meta = { description = "Rhythm is just a *click* away (no score submission or multiplayer, see osu-lazer-bin)"; diff --git a/pkgs/by-name/os/osu-lazer/update.sh b/pkgs/by-name/os/osu-lazer/update.sh deleted file mode 100755 index 194b644e7777..000000000000 --- a/pkgs/by-name/os/osu-lazer/update.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts -set -eo pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" - -new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases?per_page=1" | jq -r '.[0].name')" -old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)" -if [[ "$new_version" == "$old_version" ]]; then - echo "Up to date" - exit 0 -fi - -cd ../../../.. - -if [[ "$1" != "--deps-only" ]]; then - update-source-version osu-lazer "$new_version" -fi - -$(nix-build . -A osu-lazer.fetch-deps --no-out-link) diff --git a/pkgs/by-name/os/osxsnarf/package.nix b/pkgs/by-name/os/osxsnarf/package.nix index aa4f22baa43e..d57c7523b53d 100644 --- a/pkgs/by-name/os/osxsnarf/package.nix +++ b/pkgs/by-name/os/osxsnarf/package.nix @@ -3,7 +3,6 @@ lib, fetchFromGitHub, plan9port, - darwin, ... }: @@ -20,7 +19,6 @@ stdenv.mkDerivation rec { buildInputs = [ plan9port - darwin.apple_sdk.frameworks.Carbon ]; makeFlags = [ "prefix=${placeholder "out"}" ]; diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index f9e678ccc439..b6dd44bef0fd 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -1,19 +1,22 @@ { lib, + stdenv, python3Packages, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "oterm"; - version = "0.9.3"; + version = "0.11.1"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; tag = version; - hash = "sha256-2zzDVUZc+H2tBO5scRUjwz859uaQIbpvCaC0bm4B7NM="; + hash = "sha256-b/+siNzmM6RUJ3jv/2dNJJFueejChKde0D5r8J0lTqM="; }; pythonRelaxDeps = [ @@ -23,6 +26,7 @@ python3Packages.buildPythonApplication rec { "ollama" "packaging" "pillow" + "pydantic" "textual" "typer" ]; @@ -43,14 +47,24 @@ python3Packages.buildPythonApplication rec { python-dotenv rich-pixels textual + textual-image textualeffects typer ]; pythonImportsCheck = [ "oterm" ]; - # Tests require a HTTP connection to ollama - doCheck = false; + # Python tests require a HTTP connection to ollama + + # Fails on darwin with: PermissionError: [Errno 1] Operation not permitted: '/var/empty/Library' + nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + passthru = { + updateScript = nix-update-script { }; + }; meta = { description = "Text-based terminal client for Ollama"; diff --git a/pkgs/by-name/ot/otf2/package.nix b/pkgs/by-name/ot/otf2/package.nix index 385501c529f5..12593de5b110 100644 --- a/pkgs/by-name/ot/otf2/package.nix +++ b/pkgs/by-name/ot/otf2/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchurl, + buildPackages, + which, versionCheckHook, }: @@ -9,18 +11,48 @@ stdenv.mkDerivation (finalAttrs: { pname = "otf2"; version = "3.1.1"; + outputs = [ + "out" + "lib" + "doc" + ]; + src = fetchurl { url = "http://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/otf2-${finalAttrs.version}/otf2-${finalAttrs.version}.tar.gz"; hash = "sha256-Wk4BOlGsTteU/jXFW3AM1yA0b9p/M+yEx2uGpfuICm4="; }; - configureFlags = [ - "--enable-backend-test-runs" + postPatch = '' + substituteInPlace build-config/common/platforms/platform-backend-user-provided \ + --replace-fail 'CC=' 'CC=${stdenv.cc.targetPrefix}cc' \ + --replace-fail 'CXX=' 'CXX=${stdenv.cc.targetPrefix}c++' + substituteInPlace build-config/common/platforms/platform-frontend-user-provided \ + --replace-fail 'CC_FOR_BUILD=' 'CC_FOR_BUILD=${buildPackages.stdenv.cc.targetPrefix}cc' \ + --replace-fail 'CXX_FOR_BUILD=' 'CXX_FOR_BUILD=${buildPackages.stdenv.cc.targetPrefix}c++' + ''; + + strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + configureFlags = + [ + (lib.enableFeature finalAttrs.finalPackage.doCheck "backend-test-runs") + (lib.withFeature true "custom-compilers") + ] + ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [ + "ac_scorep_cross_compiling=yes" + ]; + + nativeBuildInputs = [ + which # used in configure script ]; + enableParallelBuilding = true; + nativeInstallCheckInputs = [ versionCheckHook ]; doCheck = true; + enableParallelChecking = true; doInstallCheck = true; versionCheckProgram = [ "${placeholder "out"}/bin/otf2-config" ]; diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix index 86267edd9f50..9044782ea4d4 100644 --- a/pkgs/by-name/ou/ouch/package.nix +++ b/pkgs/by-name/ou/ouch/package.nix @@ -5,32 +5,40 @@ installShellFiles, pkg-config, bzip2, + bzip3, xz, + git, zlib, zstd, }: rustPlatform.buildRustPackage rec { pname = "ouch"; - version = "0.5.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "ouch-org"; repo = "ouch"; rev = version; - hash = "sha256-WO1fetu39fcLGcrbzFh+toHpnyxWuDVHtmjuH203hzQ="; + hash = "sha256-vNeOJOyQsjDUzScA1a/W+SI1Z67HTLiHjwWZZpr1Paw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LBigtb8kYAgPb4X+L0a/mzPLPEUk5aEHigZuI4Y8N+k="; + cargoHash = "sha256-mMoYJ3dLpb1Y3Ocdyxg1brE7xYeZBbtUg0J/2HTK0hE="; nativeBuildInputs = [ installShellFiles pkg-config + rustPlatform.bindgenHook + ]; + + nativeCheckInputs = [ + git ]; buildInputs = [ bzip2 + bzip3 xz zlib zstd @@ -38,11 +46,6 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "zstd/pkg-config" ]; - preCheck = '' - substituteInPlace tests/ui.rs \ - --replace 'format!(r"/private{path}")' 'path.to_string()' - ''; - postInstall = '' installManPage artifacts/*.1 installShellCompletion artifacts/ouch.{bash,fish} --zsh artifacts/_ouch @@ -58,6 +61,7 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ figsoda psibi + krovuxdev ]; mainProgram = "ouch"; }; diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix index 10156450bec7..2b1654b1d73a 100644 --- a/pkgs/by-name/ov/ovftool/package.nix +++ b/pkgs/by-name/ov/ovftool/package.nix @@ -72,7 +72,6 @@ stdenv.mkDerivation { glibc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.Libsystem libxml2 ]; @@ -186,7 +185,6 @@ stdenv.mkDerivation { done # Patches for ovftool binary - change_args+=(-change /usr/lib/libSystem.B.dylib ${darwin.Libsystem}/lib/libSystem.B.dylib) change_args+=(-change /usr/lib/libc++.1.dylib ${stdenv.cc.libcxx}/lib/libc++.1.dylib) change_args+=(-change /usr/lib/libiconv.2.dylib ${libiconv}/lib/libiconv.2.dylib) change_args+=(-change /usr/lib/libxml2.2.dylib ${libxml2}/lib/libxml2.2.dylib) @@ -201,7 +199,7 @@ stdenv.mkDerivation { install_name_tool "''${change_args[@]}" "$out/libexec/ovftool" # Additional patches for ovftool dylibs - change_args+=(-change /usr/lib/libresolv.9.dylib ${darwin.Libsystem}/lib/libresolv.9.dylib) + change_args+=(-change /usr/lib/libresolv.9.dylib ${lib.getLib darwin.libresolv}/lib/libresolv.9.dylib) change_args+=(-change @loader_path/libcares.2.dylib ${c-ares}/lib/libcares.2.dylib) change_args+=(-change @loader_path/libexpat.dylib ${expat}/lib/libexpat.dylib) change_args+=(-change @loader_path/libicudata.60.2.dylib ${icu60}/lib/libicudata.60.2.dylib) diff --git a/pkgs/by-name/ow/owl-compositor/package.nix b/pkgs/by-name/ow/owl-compositor/package.nix index 6a25f6a56879..95e664b19889 100644 --- a/pkgs/by-name/ow/owl-compositor/package.nix +++ b/pkgs/by-name/ow/owl-compositor/package.nix @@ -54,9 +54,6 @@ stdenv.mkDerivation { libxkbcommon wayland ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gnustep-back ]; diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix index 75e98dd7d0e9..082265addff8 100644 --- a/pkgs/by-name/ow/owmods-cli/package.nix +++ b/pkgs/by-name/ow/owmods-cli/package.nix @@ -12,7 +12,6 @@ mono, wrapWithMono ? true, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -41,10 +40,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { diff --git a/pkgs/by-name/ox/oxide-rs/package.nix b/pkgs/by-name/ox/oxide-rs/package.nix index fc18cc37c64a..3176d0ffcdd1 100644 --- a/pkgs/by-name/ox/oxide-rs/package.nix +++ b/pkgs/by-name/ox/oxide-rs/package.nix @@ -7,8 +7,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -47,17 +45,12 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - curl - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + curl + libgit2 + openssl + zlib + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/ox/oxker/package.nix b/pkgs/by-name/ox/oxker/package.nix index 10ddd96d4f2d..b568754d11b1 100644 --- a/pkgs/by-name/ox/oxker/package.nix +++ b/pkgs/by-name/ox/oxker/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.9.0"; + version = "0.10.2"; src = fetchCrate { inherit pname version; - hash = "sha256-XY3LwDagxSi1yeAfqhnbtNRBqJxp0BkhaYZM/T59tGw="; + hash = "sha256-szsC6EniAmcjZaSunvNY0fP3tx0hEbP6oUO0NNbjgTY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Z14XLNvu7lcTD5DjaN7+raswnw7A+jyA/ZjFq6b3Vqk="; + cargoHash = "sha256-77oMoKzhe+vrdAwn85A6tj35EOz/ylZh5imdmRjkR3k="; meta = with lib; { description = "Simple tui to view & control docker containers"; diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index 03798b666fc7..65a572e6d96a 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, rust-jemalloc-sys, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -21,13 +19,9 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-/OLcyHTTevqpkrHY3Ueo38xtIjhjE4quqPTEZfPEcaY="; - buildInputs = - [ - rust-jemalloc-sys - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + rust-jemalloc-sys + ]; env.OXC_VERSION = version; diff --git a/pkgs/by-name/p2/p2pool/package.nix b/pkgs/by-name/p2/p2pool/package.nix index 16fb274d0130..d004151ec79c 100644 --- a/pkgs/by-name/p2/p2pool/package.nix +++ b/pkgs/by-name/p2/p2pool/package.nix @@ -12,12 +12,8 @@ openssl, pkg-config, zeromq, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) Foundation; -in stdenv.mkDerivation rec { pname = "p2pool"; version = "4.4"; @@ -42,7 +38,7 @@ stdenv.mkDerivation rec { hwloc openssl curl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; + ]; cmakeFlags = [ "-DWITH_LTO=OFF" ]; diff --git a/pkgs/by-name/pa/pam_rssh/package.nix b/pkgs/by-name/pa/pam_rssh/package.nix index a3168a587419..cc95d3acc04a 100644 --- a/pkgs/by-name/pa/pam_rssh/package.nix +++ b/pkgs/by-name/pa/pam_rssh/package.nix @@ -40,9 +40,11 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # Fails because it tries finding authorized_keys in /home/$USER. "--skip=tests::parse_user_authorized_keys" + # Skip unsupported DSA keys since OpenSSH v10. + "--skip=sign_verify::test_dsa_sign_verify" ]; - nativeCheckInputs = [ (openssh.override { dsaKeysSupport = true; }) ]; + nativeCheckInputs = [ openssh ]; env.USER = "nixbld"; @@ -55,7 +57,6 @@ rustPlatform.buildRustPackage rec { ssh-keygen -q -N "" -t ecdsa -b 256 -f $HOME/.ssh/id_ecdsa256 ssh-keygen -q -N "" -t ed25519 -f $HOME/.ssh/id_ed25519 ssh-keygen -q -N "" -t rsa -f $HOME/.ssh/id_rsa - ssh-keygen -q -N "" -t dsa -f $HOME/.ssh/id_dsa export SSH_AUTH_SOCK=$HOME/ssh-agent.sock eval $(ssh-agent -a $SSH_AUTH_SOCK) ssh-add $HOME/.ssh/id_ecdsa521 @@ -63,7 +64,6 @@ rustPlatform.buildRustPackage rec { ssh-add $HOME/.ssh/id_ecdsa256 ssh-add $HOME/.ssh/id_ed25519 ssh-add $HOME/.ssh/id_rsa - ssh-add $HOME/.ssh/id_dsa ''; meta = with lib; { diff --git a/pkgs/by-name/pa/panamax/package.nix b/pkgs/by-name/pa/panamax/package.nix index 7834c46fc2e7..c8c579a074d7 100644 --- a/pkgs/by-name/pa/panamax/package.nix +++ b/pkgs/by-name/pa/panamax/package.nix @@ -6,8 +6,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,16 +22,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; meta = with lib; { description = "Mirror rustup and crates.io repositories for offline Rust and cargo usage"; diff --git a/pkgs/by-name/pa/pandoc/package.nix b/pkgs/by-name/pa/pandoc/package.nix index 422ebdbbf695..3fd7ed8e9150 100644 --- a/pkgs/by-name/pa/pandoc/package.nix +++ b/pkgs/by-name/pa/pandoc/package.nix @@ -41,9 +41,6 @@ in remove-references-to \ -t ${pandoc-cli.scope.pandoc} \ $out/bin/pandoc - '' - # https://github.com/jgm/typst-hs/commit/9707b74ce60d71c2ba0f35249ffbd01dea197a6e - + lib.optionalString (lib.versionAtLeast pandoc-cli.scope.typst.version "0.6.1") '' remove-references-to \ -t ${pandoc-cli.scope.typst} \ $out/bin/pandoc diff --git a/pkgs/by-name/pa/panotools/package.nix b/pkgs/by-name/pa/panotools/package.nix index 1616159e31c1..f9af218e70ed 100644 --- a/pkgs/by-name/pa/panotools/package.nix +++ b/pkgs/by-name/pa/panotools/package.nix @@ -7,7 +7,6 @@ libpng, libtiff, perl, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -26,15 +25,11 @@ stdenv.mkDerivation (finalAttrs: { perl ]; - buildInputs = - [ - libjpeg - libpng - libtiff - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Carbon - ]; + buildInputs = [ + libjpeg + libpng + libtiff + ]; meta = { description = "Free software suite for authoring and displaying virtual reality panoramas"; diff --git a/pkgs/by-name/pa/paper-plane/package.nix b/pkgs/by-name/pa/paper-plane/package.nix index b2f852a4709a..065a5354c571 100644 --- a/pkgs/by-name/pa/paper-plane/package.nix +++ b/pkgs/by-name/pa/paper-plane/package.nix @@ -17,7 +17,6 @@ libxml2, libshumate, gst_all_1, - darwin, buildPackages, }: @@ -90,20 +89,16 @@ stdenv.mkDerivation { libxml2.bin ]; - buildInputs = - [ - libshumate - libadwaita-paperplane - tdlib-paperplane - rlottie-paperplane - gst_all_1.gstreamer - gst_all_1.gst-libav - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + libshumate + libadwaita-paperplane + tdlib-paperplane + rlottie-paperplane + gst_all_1.gstreamer + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + ]; mesonFlags = [ # The API ID and hash provided here are for use with Paper Plane only. diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 7cd092dadee2..6a89d3bccc28 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -8,7 +8,6 @@ gettext, python3, giflib, - darwin, ghostscript_headless, imagemagickBig, jbig2enc, @@ -27,29 +26,20 @@ xorg, }: let - version = "2.15.1"; + version = "2.15.2"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; tag = "v${version}"; - hash = "sha256-vICkRfVxzQlqhSBCieVNSGeXb6FCOx0qOnInKMy6Lhg="; + hash = "sha256-3IGXjMVMSbpcdwEvJcMbFuQI9GYy1TY9NWAvum14UK4="; }; - # subpath installation is broken with uvicorn >= 0.26 - # https://github.com/NixOS/nixpkgs/issues/298719 - # https://github.com/paperless-ngx/paperless-ngx/issues/5494 python = python3.override { self = python; packageOverrides = final: prev: { django = prev.django_5; - django-extensions = prev.django-extensions.overridePythonAttrs (_: { - # fails with: TypeError: 'class Meta' got invalid attribute(s): index_together - # probably because of django_5 but it is the latest version available and used like that in paperless-ngx - doCheck = false; - }); - # tesseract5 may be overwritten in the paperless module and we need to propagate that to make the closure reduction effective ocrmypdf = prev.ocrmypdf.override { tesseract = tesseract5; }; }; @@ -100,7 +90,6 @@ let ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ giflib - darwin.apple_sdk.frameworks.CoreText ]; CYPRESS_INSTALL_BINARY = "0"; @@ -160,8 +149,13 @@ python.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "celery" "django-allauth" + "django-extensions" "drf-spectacular-sidecar" + "filelock" + "python-dotenv" + "rapidfuzz" # TODO: https://github.com/NixOS/nixpkgs/pull/373099 "zxing-cpp" ]; diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index dfd126181208..91519bace881 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -15,7 +15,6 @@ itstool, poppler, nautilus, - darwin, djvulibre, libspectre, libarchive, @@ -100,9 +99,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals supportNautilus [ nautilus - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation ]; mesonFlags = diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix index 8de28d987633..f7ae30e2876a 100644 --- a/pkgs/by-name/pa/parca-agent/package.nix +++ b/pkgs/by-name/pa/parca-agent/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "parca-agent"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "parca-dev"; repo = "parca-agent"; tag = "v${version}"; - hash = "sha256-U9Yomvw4bqKrrd9kMHmjV6kt7gLdkFHI+0iCJ0IRJSw="; + hash = "sha256-GaJeVfpyh61zro/WQgTxPisT/lZPx+BNekpFY6UXcAA="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-hG6dM94gidbDNPY7I8gh1Nt8F3oQelzNIyfDsuNe5y8="; + vendorHash = "sha256-5vjG0RAoqE69v8uooRxRD87clkX7dMZCP3W42/2+OSk="; buildInputs = [ stdenv.cc.libc.static diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix index 25728d4e32a3..65101cc442fd 100644 --- a/pkgs/by-name/pa/paretosecurity/package.nix +++ b/pkgs/by-name/pa/paretosecurity/package.nix @@ -5,49 +5,57 @@ testers, paretosecurity, nixosTests, + pkg-config, + gtk3, + webkitgtk_4_1, }: -buildGoModule rec { +buildGoModule (finalAttrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + gtk3 + webkitgtk_4_1 + ]; pname = "paretosecurity"; - version = "0.1.3"; + version = "0.1.9"; src = fetchFromGitHub { owner = "ParetoSecurity"; repo = "agent"; - rev = version; - hash = "sha256-ovyfHqLCf5U3UR1HfoA+UQhqLZ6IaILcpqptPRQsb60="; + rev = finalAttrs.version; + hash = "sha256-KJs4xC3EtGG4116UE+oIEwAMcuDWIm9gqgZY+Bv14ac="; }; - vendorHash = "sha256-7mKAFkKGpBOjXc3J/sfF3k3pJF53tFybXZgbfJInuSY="; + vendorHash = "sha256-3plpvwLe32AsGuVzdM2fSmTPkKwRFmhi651NEIRdOxw="; proxyVendor = true; ldflags = [ "-s" - "-X=github.com/ParetoSecurity/agent/shared.Version=${version}" - "-X=github.com/ParetoSecurity/agent/shared.Commit=${src.rev}" + "-X=github.com/ParetoSecurity/agent/shared.Version=${finalAttrs.version}" + "-X=github.com/ParetoSecurity/agent/shared.Commit=${finalAttrs.src.rev}" "-X=github.com/ParetoSecurity/agent/shared.Date=1970-01-01T00:00:00Z" ]; postInstall = '' # Install global systemd files - install -Dm400 ${src}/apt/paretosecurity.socket $out/lib/systemd/system/paretosecurity.socket - install -Dm400 ${src}/apt/paretosecurity.service $out/lib/systemd/system/paretosecurity.service + install -Dm400 ${finalAttrs.src}/apt/paretosecurity.socket $out/lib/systemd/system/paretosecurity.socket + install -Dm400 ${finalAttrs.src}/apt/paretosecurity.service $out/lib/systemd/system/paretosecurity.service substituteInPlace $out/lib/systemd/system/paretosecurity.service \ --replace-fail "/usr/bin/paretosecurity" "$out/bin/paretosecurity" # Install user systemd files - install -Dm444 ${src}/apt/paretosecurity-user.timer $out/lib/systemd/user/paretosecurity-user.timer - install -Dm444 ${src}/apt/paretosecurity-user.service $out/lib/systemd/user/paretosecurity-user.service + install -Dm444 ${finalAttrs.src}/apt/paretosecurity-user.timer $out/lib/systemd/user/paretosecurity-user.timer + install -Dm444 ${finalAttrs.src}/apt/paretosecurity-user.service $out/lib/systemd/user/paretosecurity-user.service substituteInPlace $out/lib/systemd/user/paretosecurity-user.service \ --replace-fail "/usr/bin/paretosecurity" "$out/bin/paretosecurity" - install -Dm444 ${src}/apt/paretosecurity-trayicon.service $out/lib/systemd/user/paretosecurity-trayicon.service + install -Dm444 ${finalAttrs.src}/apt/paretosecurity-trayicon.service $out/lib/systemd/user/paretosecurity-trayicon.service substituteInPlace $out/lib/systemd/user/paretosecurity-trayicon.service \ --replace-fail "/usr/bin/paretosecurity" "$out/bin/paretosecurity" ''; passthru.tests = { version = testers.testVersion { - version = "${version}"; + inherit (finalAttrs) version; package = paretosecurity; }; integration_test = nixosTests.paretosecurity; @@ -80,4 +88,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ zupo ]; mainProgram = "paretosecurity"; }; -} +}) diff --git a/pkgs/by-name/pa/partio/package.nix b/pkgs/by-name/pa/partio/package.nix index 771169e90c28..9c2cc4c91f7e 100644 --- a/pkgs/by-name/pa/partio/package.nix +++ b/pkgs/by-name/pa/partio/package.nix @@ -12,7 +12,6 @@ doxygen, xorg, python3, - darwin, }: stdenv.mkDerivation rec { @@ -46,10 +45,6 @@ stdenv.mkDerivation rec { xorg.libXi xorg.libXmu ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.GLUT - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libglut libGLU diff --git a/pkgs/by-name/pa/passes/package.nix b/pkgs/by-name/pa/passes/package.nix index c856dd3d6e71..5d0e37b8d651 100644 --- a/pkgs/by-name/pa/passes/package.nix +++ b/pkgs/by-name/pa/passes/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/model/meson.build \ - --replace-fail /app/lib ${zint}/lib + --replace-fail /app/lib ${lib.getLib zint}/lib ''; strictDeps = true; diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix index 714c3140070a..ec1bbb709264 100644 --- a/pkgs/by-name/pa/patch2pr/package.nix +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "patch2pr"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "bluekeyes"; repo = "patch2pr"; rev = "v${version}"; - hash = "sha256-RQg7Fo8Z0P+z6Fv6YTv/IpEErP6ncxylvBaeargTrIQ="; + hash = "sha256-5Xb/M7M8PAVXMyr7dwpoT0H4BV7o6okPQQw2e273ogQ="; }; - vendorHash = "sha256-VzskPOd1nlrkiwGsS5OoXP0v8LQbqS+NumV2WoahFvY="; + vendorHash = "sha256-B/Xw8rR+cldLKHr5N6ifBRHWAzJLayiejLi/winPjKg="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/pa/patchcil/deps.json b/pkgs/by-name/pa/patchcil/deps.json new file mode 100644 index 000000000000..175fd1c3cb4d --- /dev/null +++ b/pkgs/by-name/pa/patchcil/deps.json @@ -0,0 +1,32 @@ +[ + { + "pname": "AsmResolver", + "version": "6.0.0-beta.1", + "hash": "sha256-ZW61z6Qmztdy2NaiqxvNcP5RWBIiIO6CWNnqYq0MwoA=" + }, + { + "pname": "AsmResolver.DotNet", + "version": "6.0.0-beta.1", + "hash": "sha256-VoTiIr2/r2my6sg2AOEeiqz9vZhWtq5mGaW2Hx90Uo4=" + }, + { + "pname": "AsmResolver.PE", + "version": "6.0.0-beta.1", + "hash": "sha256-tTU/flTxRJaC4gkmI/gctqIriGIMntkgTs51TqzcQlg=" + }, + { + "pname": "AsmResolver.PE.File", + "version": "6.0.0-beta.1", + "hash": "sha256-hPuFrpcm2VMiYEirsL4kYmAhOzjwjNXUklIfYJEonLo=" + }, + { + "pname": "DotNet.Glob", + "version": "3.1.3", + "hash": "sha256-5uGSaGY1IqDjq4RCDLPJm0Lg9oyWmyR96OiNeGqSj84=" + }, + { + "pname": "System.CommandLine", + "version": "2.0.0-beta4.22272.1", + "hash": "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc=" + } +] diff --git a/pkgs/by-name/pa/patchcil/package.nix b/pkgs/by-name/pa/patchcil/package.nix new file mode 100644 index 000000000000..d0bdfb97c7b2 --- /dev/null +++ b/pkgs/by-name/pa/patchcil/package.nix @@ -0,0 +1,76 @@ +{ + lib, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + stdenv, + nix-update-script, + aot ? dotnetCorePackages.sdk_9_0.hasILCompiler && !stdenv.hostPlatform.isDarwin, +}: + +buildDotnetModule rec { + pname = "patchcil"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "GGG-KILLER"; + repo = "patchcil"; + tag = "v${version}"; + hash = "sha256-jqVXKp5ShWkIMAgmcwu9/QHy+Ey9d1Piv62wsO0Xm44="; + }; + + nativeBuildInputs = lib.optional aot stdenv.cc; + + projectFile = "src/PatchCil.csproj"; + nugetDeps = ./deps.json; + + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = if aot then null else dotnetCorePackages.runtime_9_0; + + selfContainedBuild = aot; + dotnetFlags = lib.optionals (!aot) [ + # Disable AOT + "-p:PublishAot=false" + "-p:InvariantGlobalization=false" + "-p:EventSourceSupport=true" + "-p:HttpActivityPropagationSupport=true" + "-p:MetadataUpdaterSupport=true" + "-p:MetricsSupport=true" + "-p:UseNativeHttpHandler=false" + "-p:XmlResolverIsNetworkingEnabledByDefault=true" + "-p:EnableGeneratedComInterfaceComImportInterop=true" + "-p:_ComObjectDescriptorSupport=true" + "-p:_DataSetXmlSerializationSupport=true" + "-p:_DefaultValueAttributeSupport=true" + "-p:_DesignerHostSupport=true" + "-p:_EnableConsumingManagedCodeFromNativeHosting=true" + "-p:_UseManagedNtlm=true" + ]; + + preFixup = lib.optionalString aot '' + # Remove debug symbols as they shouldn't have anything in them. + rm $out/lib/patchcil/patchcil.dbg + ''; + + executables = [ "patchcil" ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "A small utility to modify the library paths from PInvoke in .NET assemblies."; + homepage = "https://github.com/GGG-KILLER/patchcil"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ggg ]; + mainProgram = "patchcil"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + "x86_64-windows" + "i686-windows" + ]; + }; +} diff --git a/pkgs/by-name/pa/paxtest/package.nix b/pkgs/by-name/pa/paxtest/package.nix index 149c334e891b..85aefd59fa36 100644 --- a/pkgs/by-name/pa/paxtest/package.nix +++ b/pkgs/by-name/pa/paxtest/package.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ - copumpkin joachifm ]; }; diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix index b88de6830945..06a7ef07bc03 100644 --- a/pkgs/by-name/pa/pay-respects/package.nix +++ b/pkgs/by-name/pa/pay-respects/package.nix @@ -2,33 +2,21 @@ lib, fetchFromGitea, rustPlatform, - pkg-config, - openssl, - curl, }: rustPlatform.buildRustPackage rec { pname = "pay-respects"; - version = "0.7.0"; + version = "0.7.5"; src = fetchFromGitea { domain = "codeberg.org"; owner = "iff"; repo = "pay-respects"; rev = "v${version}"; - hash = "sha256-xuZkZXVEXSmRGp1huVpqvjrP5kllq3fGg1Mg7wuyE3E="; + hash = "sha256-NmFuu6uS8maAoN9U2ZdEyeJeozR3ubhoMrhvWKDxbMI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-aocFplTvjc3zV6NL6UKzdfdx5ry+jhvi4azceC0KSKA="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - curl - ]; + cargoHash = "sha256-xqq4PXvon6edjJ4VhrhXD8QtDGWlMeJnl8mnH8rdIvU="; meta = { description = "Terminal command correction, alternative to `thefuck`, written in Rust"; diff --git a/pkgs/by-name/pa/pazi/package.nix b/pkgs/by-name/pa/pazi/package.nix index 560f1e7c7a10..59aad8623053 100644 --- a/pkgs/by-name/pa/pazi/package.nix +++ b/pkgs/by-name/pa/pazi/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, installShellFiles, }: @@ -20,8 +18,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - useFetchCargoVendor = true; cargoHash = "sha256-/r/nRQ/7KyUmJK19F557AcxXEXa85E/CE6+YFU6DdR4="; diff --git a/pkgs/by-name/pb/pbpctrl/package.nix b/pkgs/by-name/pb/pbpctrl/package.nix index 715ba55bde98..8243e5b02331 100644 --- a/pkgs/by-name/pb/pbpctrl/package.nix +++ b/pkgs/by-name/pb/pbpctrl/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "pbpctrl"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "qzed"; repo = "pbpctrl"; rev = "v${version}"; - hash = "sha256-u5I3Hs00JDPRBwThYTEmNiZj/zPVfHyyrt4E68d13do="; + hash = "sha256-XSRJytPrRKKWhFTBQd3Kd1R3amdecGNTmJS4PmFL6kg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-0kh9bwiTVWuDviDw6IY5EGj+2k2WsyCCeo+r7CdBftE="; + cargoHash = "sha256-eDR/Z4v8G7/XPzWjJdZ5Fg2qULdn/SuNmvE/GVqSVJ8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pc/pcm/package.nix b/pkgs/by-name/pc/pcm/package.nix index 1e2f7cd370ce..ebad295b48c6 100644 --- a/pkgs/by-name/pc/pcm/package.nix +++ b/pkgs/by-name/pc/pcm/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "202502"; src = fetchFromGitHub { - owner = "opcm"; + owner = "intel"; repo = "pcm"; rev = version; hash = "sha256-U6V3LX+JlVL9MRFBP3xpYwPQ6Y7pnJ4F/7dpKG3Eyuw="; diff --git a/pkgs/by-name/pd/pdf4qt/package.nix b/pkgs/by-name/pd/pdf4qt/package.nix index e12839032fbc..6e64e55eabcd 100644 --- a/pkgs/by-name/pd/pdf4qt/package.nix +++ b/pkgs/by-name/pd/pdf4qt/package.nix @@ -30,6 +30,19 @@ stdenv.mkDerivation (finalAttrs: { ./find_lcms2_path.patch ]; + # make calls to QString::arg compatible with Qt 6.9 + # see https://doc-snapshots.qt.io/qt6-6.9/whatsnew69.html#new-features-in-qt-6-9 + postPatch = '' + substituteInPlace Pdf4QtLibCore/sources/pdf{documentsanitizer,optimizer}.cpp \ + --replace-fail \ + '.arg(counter)' \ + '.arg(counter)' + substituteInPlace Pdf4QtLibCore/sources/pdfoptimizer.cpp \ + --replace-fail \ + '.arg(bytesSaved)' \ + '.arg(bytesSaved)' + ''; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix index 438d0a12e976..13b9f144b950 100644 --- a/pkgs/by-name/pd/pdfcpu/package.nix +++ b/pkgs/by-name/pd/pdfcpu/package.nix @@ -1,18 +1,20 @@ { lib, buildGoModule, + stdenv, fetchFromGitHub, + writableTmpDirAsHomeHook, }: buildGoModule rec { pname = "pdfcpu"; - version = "0.9.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - hash = "sha256-PJTEaWU/erqVJakvxfB0aYRsi/tcGxYYZjCdEvThmzM="; + hash = "sha256-IODE6/TIXZZC5Z8guFK24iiHTwj84fcf9RiAyFkX2F8="; # Apparently upstream requires that the compiled executable will know the # commit hash and the date of the commit. This information is also presented # in the output of `pdfcpu version` which we use as a sanity check in the @@ -35,7 +37,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-x5EXv2LkJg2LAdml+1I4MzgTvNo6Gl+6e6UHVQ+Z9rU="; + vendorHash = "sha256-27YTR/vYuNggjUIbpKs3/yEJheUXMaLZk8quGPwgNNk="; ldflags = [ "-s" @@ -52,12 +54,24 @@ buildGoModule rec { # No tests doCheck = false; doInstallCheck = true; + installCheckInputs = [ + writableTmpDirAsHomeHook + ]; + # NOTE: Can't use `versionCheckHook` since a writeable $HOME is required and + # `versionCheckHook` uses --ignore-environment installCheckPhase = '' - export HOME=$(mktemp -d) echo checking the version print of pdfcpu - $out/bin/pdfcpu version | grep ${version} - $out/bin/pdfcpu version | grep $(cat COMMIT | cut -c1-8) - $out/bin/pdfcpu version | grep $(cat SOURCE_DATE) + mkdir -p $HOME/"${ + if stdenv.hostPlatform.isDarwin then "Library/Application Support" else ".config" + }"/pdfcpu + versionOutput="$($out/bin/pdfcpu version)" + for part in ${version} $(cat COMMIT | cut -c1-8) $(cat SOURCE_DATE); do + if [[ ! "$versionOutput" =~ "$part" ]]; then + echo version output did not contain expected part $part . Output was: + echo "$versionOutput" + exit 3 + fi + done ''; subPackages = [ "cmd/pdfcpu" ]; diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index ebedb85b3f3f..fdcaae9e1c2d 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -19,12 +19,6 @@ let hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8="; }; }); - # pdm requires hishel and subsequentially pytest-regressions -> matplotlib -> ghostscript -> jbig2dec which is AGPL only - matplotlib = super.matplotlib.override ({ enableGhostscript = false; }); - # avoid many extra dependencies - moto = super.moto.overridePythonAttrs (old: rec { - doCheck = false; - }); }; }; in diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix index 904dad57b84f..edf1c67f6b08 100644 --- a/pkgs/by-name/pe/peergos/package.nix +++ b/pkgs/by-name/pe/peergos/package.nix @@ -41,12 +41,12 @@ let in stdenv.mkDerivation rec { pname = "peergos"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Peergos"; repo = "web-ui"; rev = "v${version}"; - hash = "sha256-TSvhp/9nneXGADiDPgGvA78emVcQG0UzHsFfVS9k7mo="; + hash = "sha256-te+m4S3mhYEocLd9NjQNFA8vbMf470V1dlPqCr0KLV4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix index 0f99e03bab15..c80bc03c2ef6 100644 --- a/pkgs/by-name/pe/peertube/package.nix +++ b/pkgs/by-name/pe/peertube/package.nix @@ -10,7 +10,7 @@ fixup-yarn-lock, jq, fd, - nodejs_18, + nodejs_20, which, yarn, }: @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { fd ]; - buildInputs = [ nodejs_18 ]; + buildInputs = [ nodejs_20 ]; buildPhase = '' # Build node modules diff --git a/pkgs/by-name/pe/penpot-desktop/package.nix b/pkgs/by-name/pe/penpot-desktop/package.nix index 91efa18e6afb..be49f4acccd1 100644 --- a/pkgs/by-name/pe/penpot-desktop/package.nix +++ b/pkgs/by-name/pe/penpot-desktop/package.nix @@ -2,7 +2,7 @@ lib, buildNpmPackage, copyDesktopItems, - electron, + electron_35, fetchFromGitHub, jq, makeDesktopItem, @@ -15,16 +15,17 @@ let description = "Unofficial desktop application for the open-source design tool, Penpot"; icon = "penpot"; nodejs = nodejs_22; + electron = electron_35; in buildNpmPackage rec { pname = "penpot-desktop"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "author-more"; repo = "penpot-desktop"; tag = "v${version}"; - hash = "sha256-33LAhR0L7pAnS27dz5DuqgfUllyAFA9JVZRmrHoajE4="; + hash = "sha256-ga37rZ70Xfll3y58uKC4d57NJOxQzQZZps/j/baxkPk="; }; makeCacheWritable = true; @@ -32,7 +33,7 @@ buildNpmPackage rec { "--engine-strict" "--legacy-peer-deps" ]; - npmDepsHash = "sha256-BR51Oi9Ffxy7d0fBkSQ6Iz/PVi+ghIaLqzm3Loq6aDo="; + npmDepsHash = "sha256-E8b/L5g+Xt/N3ddOPgm7xkbb5jQtL5ceFtJW6DQN4nA="; # Do not run the default build script as it leads to errors caused by the electron-builder configuration dontNpmBuild = true; diff --git a/pkgs/by-name/pe/pest-ide-tools/package.nix b/pkgs/by-name/pe/pest-ide-tools/package.nix index a06b35650757..933156c3e5d6 100644 --- a/pkgs/by-name/pe/pest-ide-tools/package.nix +++ b/pkgs/by-name/pe/pest-ide-tools/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, nix-update-script, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,9 +17,6 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "sha256-12/FndzUbUlgcYcwMT1OfamSKgy2q+CvtGyx5YY4IFQ="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pe/pet/package.nix b/pkgs/by-name/pe/pet/package.nix index f702dda7b191..8686474eea0c 100644 --- a/pkgs/by-name/pe/pet/package.nix +++ b/pkgs/by-name/pe/pet/package.nix @@ -1,8 +1,10 @@ { + lib, + stdenv, buildGoModule, fetchFromGitHub, installShellFiles, - lib, + writableTmpDirAsHomeHook, }: buildGoModule rec { @@ -30,11 +32,14 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles + writableTmpDirAsHomeHook ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd pet \ - --zsh ./misc/completions/zsh/_pet + --bash <($out/bin/pet completion bash) \ + --fish <($out/bin/pet completion fish) \ + --zsh $src/misc/completions/zsh/_pet ''; meta = with lib; { diff --git a/pkgs/by-name/pe/petidomo/package.nix b/pkgs/by-name/pe/petidomo/package.nix index d9047bf4e62b..f277e5e3dfbd 100644 --- a/pkgs/by-name/pe/petidomo/package.nix +++ b/pkgs/by-name/pe/petidomo/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; doInstallCheck = true; - nativeInstallCheck = [ versionCheckHook ]; + nativeInstallCheckInputs = [ versionCheckHook ]; meta = { homepage = "https://petidomo.sourceforge.net/"; diff --git a/pkgs/by-name/pf/pfetch-rs/package.nix b/pkgs/by-name/pf/pfetch-rs/package.nix index 33ffa99ff901..b01632e6a4fb 100644 --- a/pkgs/by-name/pf/pfetch-rs/package.nix +++ b/pkgs/by-name/pf/pfetch-rs/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,11 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-36MjBzSzEOVaSnd6dTqYnV+Pi+5EDoUskkYsvYMGrgg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.DisplayServices - ]; - meta = with lib; { description = "Rewrite of the pfetch system information tool in Rust"; homepage = "https://github.com/Gobidev/pfetch-rs"; diff --git a/pkgs/by-name/pg/pg_checksums/package.nix b/pkgs/by-name/pg/pg_checksums/package.nix index 19806488fa7f..35cfe1463b83 100644 --- a/pkgs/by-name/pg/pg_checksums/package.nix +++ b/pkgs/by-name/pg/pg_checksums/package.nix @@ -1,13 +1,13 @@ { lib, - stdenv, + clangStdenv, fetchFromGitHub, libxslt, docbook_xsl, postgresql, }: -stdenv.mkDerivation rec { +clangStdenv.mkDerivation rec { pname = "pg_checksums"; version = "1.2"; diff --git a/pkgs/by-name/pg/pgbackrest/package.nix b/pkgs/by-name/pg/pgbackrest/package.nix index 49a072154414..b6b3567a5231 100644 --- a/pkgs/by-name/pg/pgbackrest/package.nix +++ b/pkgs/by-name/pg/pgbackrest/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "pgbackrest"; - version = "2.54.2"; + version = "2.55.0"; src = fetchFromGitHub { owner = "pgbackrest"; repo = "pgbackrest"; rev = "release/${version}"; - sha256 = "sha256-Q0WZLbtn+qJLs2jop5S92NFC6QBtCQnU3AEEcm6MSVI="; + sha256 = "sha256-w4jgIyZPglmI0yj8eyoIvFgNX7izpo3lBixuv7qSAxM="; }; strictDeps = true; diff --git a/pkgs/by-name/pg/pgbouncer/package.nix b/pkgs/by-name/pg/pgbouncer/package.nix index 90ae5b91d429..af6b31cd406d 100644 --- a/pkgs/by-name/pg/pgbouncer/package.nix +++ b/pkgs/by-name/pg/pgbouncer/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://www.pgbouncer.org/downloads/files/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-52rflBoxkaQW4iPAss2/cxWe74CioyMUr2+9guQaHUE="; + hash = "sha256-2nKjq6EwcodtBVo+WN1Kukpd5O1hSOcwMxhSRVmP0+A="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/pg/pgcat/package.nix b/pkgs/by-name/pg/pgcat/package.nix index 159acd4ca1e7..e0e8945250a8 100644 --- a/pkgs/by-name/pg/pgcat/package.nix +++ b/pkgs/by-name/pg/pgcat/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, nix-update-script, testers, pgcat, @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-6x/IPFncfOPxautW7gVUh5LG0hK4h6T4QL7B82Moi6o="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - checkFlags = [ # requires network access "--skip=dns_cache" diff --git a/pkgs/by-name/pg/pgcopydb/package.nix b/pkgs/by-name/pg/pgcopydb/package.nix index 5e9ca01c8e8f..86a346c55fdd 100644 --- a/pkgs/by-name/pg/pgcopydb/package.nix +++ b/pkgs/by-name/pg/pgcopydb/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + clangStdenv, fetchFromGitHub, libkrb5, openssl, @@ -13,7 +13,7 @@ zlib, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "pgcopydb"; version = "0.15"; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { sqlite zlib ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ + ++ lib.optionals clangStdenv.hostPlatform.isLinux [ pam ]; diff --git a/pkgs/by-name/pg/pgrok/package.nix b/pkgs/by-name/pg/pgrok/package.nix index dd3c674b7416..107c0c2fb3df 100644 --- a/pkgs/by-name/pg/pgrok/package.nix +++ b/pkgs/by-name/pg/pgrok/package.nix @@ -9,12 +9,12 @@ let pname = "pgrok"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "pgrok"; repo = "pgrok"; tag = "v${version}"; - hash = "sha256-1T3PUMgtEfjbCFmUKwKVofHPCCE0Hw1F18iC0mfh4KQ="; + hash = "sha256-eDtYnsHZpdIGcgRGHTptlfVf//bxup6ZDWvVkBJdBbE="; }; in @@ -33,10 +33,10 @@ buildGoModule { env.pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-xObDEkNGMXcUqX9thAJoE45yzd7f15k2odDWv9X3RRE="; + hash = "sha256-o6wxO8EGRmhcYggJnfxDkH+nbt+isc8bfHji8Hu9YKg="; }; - vendorHash = "sha256-1s8PPP/Q5bSJleCPZ6P4BwLEan/lelohRKX/0RStdvY="; + vendorHash = "sha256-nIxsG1O5RG+PDSWBcUWpk+4aFq2cYaxpkgOoDqLjY90="; ldflags = [ "-s" diff --git a/pkgs/by-name/pg/pgroll/package.nix b/pkgs/by-name/pg/pgroll/package.nix index 348e0595f19d..f9054bf62240 100644 --- a/pkgs/by-name/pg/pgroll/package.nix +++ b/pkgs/by-name/pg/pgroll/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "pgroll"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "xataio"; repo = "pgroll"; tag = "v${version}"; - hash = "sha256-XjjoyJZVy/Zjac35enaBRCWU92YA9xFzFRhlsR8G9Bg="; + hash = "sha256-3ZA3qLAwwu0sT9R6R26GB/FF6vLxbofO5HUfPSBLcrg="; }; proxyVendor = true; diff --git a/pkgs/by-name/ph/phase-cli/package.nix b/pkgs/by-name/ph/phase-cli/package.nix index 9ece0541fda7..3bcbcbff9ddc 100644 --- a/pkgs/by-name/ph/phase-cli/package.nix +++ b/pkgs/by-name/ph/phase-cli/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "phase-cli"; - version = "1.19.0"; + version = "1.19.1"; pyproject = true; src = fetchFromGitHub { owner = "phasehq"; repo = "cli"; tag = "v${version}"; - hash = "sha256-E5vSF8/DLUH2zfGwbQ3XqELTSP4XR3cqfcMM8hMaOf4="; + hash = "sha256-2FVnOQ6A7PopqE9KRlZP1QhGP6Ia5kGPDvguOI45aPI="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index f1bfef2201b5..573c25f30160 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -8,16 +8,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpactor"; - version = "2025.03.28.0"; + version = "2025.04.17.0"; src = fetchFromGitHub { owner = "phpactor"; repo = "phpactor"; rev = finalAttrs.version; - hash = "sha256-K3phBiu2D3DbOm7mApqqSNnVCsfYRQtN/o3bCVubN9I="; + hash = "sha256-HJH+31qAE4shamRl1/+TRtje0ZzOtPV7l++NIaacmxE="; }; - vendorHash = "sha256-7wFlS+a97tdhfxfc/IElzOVH25MAgf42UZBC1giBAls="; + vendorHash = "sha256-qdR8/ME9H7gusALjXXbKl8hj20N704Nw1tC3V9xTcEY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pi/pico-sdk/package.nix b/pkgs/by-name/pi/pico-sdk/package.nix index 109f11ea04bf..0835ad2111ca 100644 --- a/pkgs/by-name/pi/pico-sdk/package.nix +++ b/pkgs/by-name/pi/pico-sdk/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pico-sdk"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "raspberrypi"; @@ -26,9 +26,9 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = withSubmodules; hash = if withSubmodules then - "sha256-nLn6H/P79Jbk3/TIowH2WqmHFCXKEy7lgs7ZqhqJwDM=" + "sha256-8ru1uGjs11S2yQ+aRAvzU53K8mreZ+CC3H+ijfctuqg=" else - "sha256-QKc16Wnx2AvpM0/bklY8CnbsShVR1r5ejtRlvE8f8mM="; + "sha256-epO7yw6/21/ess3vMCkXvXEqAn6/4613zmH/hbaBbUw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/pi/picocom/package.nix b/pkgs/by-name/pi/picocom/package.nix index 4a549e27921c..bca2dbd1f25d 100644 --- a/pkgs/by-name/pi/picocom/package.nix +++ b/pkgs/by-name/pi/picocom/package.nix @@ -7,7 +7,6 @@ go-md2man, installShellFiles, linenoise, - darwin, lrzsz, }: @@ -35,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ linenoise - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + ]; makeFlags = [ "HISTFILE=.cache/picocom_history" diff --git a/pkgs/by-name/pi/pict-rs/package.nix b/pkgs/by-name/pi/pict-rs/package.nix index b36051cd5e42..c57f590b7e6f 100644 --- a/pkgs/by-name/pi/pict-rs/package.nix +++ b/pkgs/by-name/pi/pict-rs/package.nix @@ -5,7 +5,6 @@ rustPlatform, makeWrapper, protobuf, - darwin, imagemagick, ffmpeg, exiftool, @@ -32,7 +31,6 @@ rustPlatform.buildRustPackage rec { PROTOC_INCLUDE = "${protobuf}/include"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; postInstall = '' wrapProgram "$out/bin/pict-rs" \ diff --git a/pkgs/by-name/pi/pies/package.nix b/pkgs/by-name/pi/pies/package.nix index 4d9e858669be..e5499a017637 100644 --- a/pkgs/by-name/pi/pies/package.nix +++ b/pkgs/by-name/pi/pies/package.nix @@ -1,30 +1,40 @@ { - fetchurl, lib, stdenv, + fetchurl, libxcrypt, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pies"; - version = "1.3"; + version = "1.8"; src = fetchurl { - url = "mirror://gnu/pies/${pname}-${version}.tar.bz2"; - sha256 = "12r7rjjyibjdj08dvwbp0iflfpzl4s0zhn6cr6zj3hwf9gbzgl1g"; + url = "mirror://gnu/pies/pies-${finalAttrs.version}.tar.bz2"; + hash = "sha256-ZSi00WmC6il4+aSohqFKrKjtp6xFXYE7IIRGVwFmHWw="; }; buildInputs = [ libxcrypt ]; + patches = [ ./stdlib.patch ]; + + postPatch = '' + substituteInPlace configure \ + --replace-fail "gl_cv_func_memchr_works=\"guessing no\"" "gl_cv_func_memchr_works=yes" + ''; + configureFlags = [ "--sysconfdir=/etc" ]; hardeningDisable = [ "format" ]; doCheck = true; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + meta = { description = "Program invocation and execution supervisor"; - longDescription = '' The name Pies (pronounced "p-yes") stands for Program Invocation and Execution Supervisor. This utility starts and controls execution of @@ -45,12 +55,10 @@ stdenv.mkDerivation rec { Jabberd or MeTA1 (and it offers much more control over them than the native utilities). Finally, it can replace the inetd utility! ''; - - license = lib.licenses.gpl3Plus; - homepage = "https://www.gnu.org/software/pies/"; - + license = lib.licenses.gpl3Plus; platforms = lib.platforms.gnu ++ lib.platforms.linux; + broken = stdenv.hostPlatform.system == "aarch64-linux"; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/pi/pies/stdlib.patch b/pkgs/by-name/pi/pies/stdlib.patch new file mode 100644 index 000000000000..13af5cdc8522 --- /dev/null +++ b/pkgs/by-name/pi/pies/stdlib.patch @@ -0,0 +1,24 @@ +diff --git a/src/pies.c b/src/pies.c +index 9355d50..9fe6109 100644 +--- a/src/pies.c ++++ b/src/pies.c +@@ -19,6 +19,7 @@ + #include + #include "meta1parse.h" + #include "grecsasrt.h" ++#include + + int preprocess_only; /* Preprocess config, do nothing more */ + int lint_mode; /* Test configuration syntax and exit */ +diff --git a/src/piesctl.c b/src/piesctl.c +index a0ac967..fd6c3e2 100644 +--- a/src/piesctl.c ++++ b/src/piesctl.c +@@ -14,6 +14,7 @@ + You should have received a copy of the GNU General Public License + along with GNU Pies. If not, see . */ + ++#include + #include + #include + #include diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix index 6e2e45eac3b0..8f7cbd50042d 100644 --- a/pkgs/by-name/pi/pijul/package.nix +++ b/pkgs/by-name/pi/pijul/package.nix @@ -8,7 +8,6 @@ libsodium, openssl, xxHash, - darwin, gitImportSupport ? true, libgit2 ? null, }: @@ -30,21 +29,11 @@ rustPlatform.buildRustPackage rec { installShellFiles pkg-config ]; - buildInputs = - [ - openssl - libsodium - xxHash - ] - ++ (lib.optionals gitImportSupport [ libgit2 ]) - ++ (lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - Security - SystemConfiguration - ] - )); + buildInputs = [ + openssl + libsodium + xxHash + ] ++ (lib.optionals gitImportSupport [ libgit2 ]); buildFeatures = lib.optional gitImportSupport "git"; diff --git a/pkgs/by-name/pi/pilot-link/package.nix b/pkgs/by-name/pi/pilot-link/package.nix index e8eef25e3652..6afc7c1cfee5 100644 --- a/pkgs/by-name/pi/pilot-link/package.nix +++ b/pkgs/by-name/pi/pilot-link/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, autoreconfHook, pkg-config, - darwin, popt, bluezSupport ? stdenv.hostPlatform.isLinux, bluez, @@ -47,8 +46,7 @@ stdenv.mkDerivation { ++ lib.optionals bluezSupport [ bluez ] ++ lib.optionals enableLibpng [ libpng ] ++ lib.optionals enableLibusb [ libusb-compat-0_1 ] - ++ lib.optionals readlineSupport [ readline ] - ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); + ++ lib.optionals readlineSupport [ readline ]; configureFlags = [ "--with-libiconv" ] diff --git a/pkgs/tools/networking/pingu/default.nix b/pkgs/by-name/pi/pingu/package.nix similarity index 100% rename from pkgs/tools/networking/pingu/default.nix rename to pkgs/by-name/pi/pingu/package.nix diff --git a/pkgs/by-name/pi/pinta/deps.json b/pkgs/by-name/pi/pinta/deps.json index 7299114be0cb..c3f40bcc9293 100644 --- a/pkgs/by-name/pi/pinta/deps.json +++ b/pkgs/by-name/pi/pinta/deps.json @@ -1,58 +1,553 @@ [ { - "pname": "AtkSharp", - "version": "3.24.24.38", - "hash": "sha256-J9/+MU+zky18Lk3gfTCox6Jtm1SyjQQAK0vCb5Ecu4k=" + "pname": "GirCore.Adw-1", + "version": "0.6.3", + "hash": "sha256-wV4zTybD7yJldzQORBK2iI/77Fv3C9kjZvtj/S6v48k=" }, { - "pname": "CairoSharp", - "version": "3.24.24.38", - "hash": "sha256-DeXSAuSiGc7SzHb3HsUkLDLe5HZVpRn7VQFNhAAvflg=" + "pname": "GirCore.Cairo-1.0", + "version": "0.6.3", + "hash": "sha256-IJLzVmWkuCzdyiIqlzXyl8/ZDC6hmnh/bf4+i2HOpLw=" }, { - "pname": "GdkSharp", - "version": "3.24.24.38", - "hash": "sha256-JpggYCsUlrGZ1CKjCZMawiCjJDWQQc45YdYuA8L7rzA=" + "pname": "GirCore.FreeType2-2.0", + "version": "0.6.3", + "hash": "sha256-CsH4zQkZukyVw653sphDf5eveuvzY3HVphoO6fvjZiA=" }, { - "pname": "GioSharp", - "version": "3.24.24.38", - "hash": "sha256-RLd7hlelMgp9Eqga+0YxZVHN6GtbCe6IcHct2bPKcaw=" + "pname": "GirCore.Gdk-4.0", + "version": "0.6.3", + "hash": "sha256-3R7ikDBuQJ1iaVb8yuewdLggZ1IVecLuhmjaw1Hzm0s=" }, { - "pname": "GLibSharp", - "version": "3.24.24.38", - "hash": "sha256-df/8vV4OeQ2v8k7HPNrKcoEQdfPUWrHmM2S1F3DrEag=" + "pname": "GirCore.GdkPixbuf-2.0", + "version": "0.6.3", + "hash": "sha256-HZr3YmNLumXTGIN2CvxYZS9mHzvOvpMhUVJ1/DJlWN4=" }, { - "pname": "GtkSharp", - "version": "3.24.24.38", - "hash": "sha256-Uvx7/ylLL4HROPWifMZnOYD9fe0qxlc8QsCayN5TyDI=" + "pname": "GirCore.Gio-2.0", + "version": "0.6.3", + "hash": "sha256-pYc13vCSAH9Or7plQYffBzB/9b83oPNRBf5+HDeT/7w=" }, { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "6.0.0", - "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" + "pname": "GirCore.GLib-2.0", + "version": "0.6.3", + "hash": "sha256-Lsl44qroh+ENO7yBFoySrNgxs8FBeT0nH6PKJ5u+LAI=" + }, + { + "pname": "GirCore.GObject-2.0", + "version": "0.6.3", + "hash": "sha256-+gerXQbv8HNcFjA76AvtzAG3d+CRb7pPYDaAL+iUPz4=" + }, + { + "pname": "GirCore.GObject-2.0.Integration", + "version": "0.6.3", + "hash": "sha256-ujkhIzrqeKOcwdwjgzMh3eTcZ2N5PfgvItfyNj7Kc3s=" + }, + { + "pname": "GirCore.Graphene-1.0", + "version": "0.6.3", + "hash": "sha256-+pDFEj94WNbXD7Fso1xuxkkETjej/O/d1JNW8eV6UPA=" + }, + { + "pname": "GirCore.Gsk-4.0", + "version": "0.6.3", + "hash": "sha256-vV66rP1vVloB+DA1xPL2iSrJwEmdUDdl209RcRpNP9Q=" + }, + { + "pname": "GirCore.Gtk-4.0", + "version": "0.6.3", + "hash": "sha256-unQkwxnaoIihD+FWKnJgJNAR4i99qcTcN78SG8WhrZk=" + }, + { + "pname": "GirCore.HarfBuzz-0.0", + "version": "0.6.3", + "hash": "sha256-8I7+SMTeXBNe6Q/rE7R6WiAYRPuLjfSeDjwllP/n9tM=" + }, + { + "pname": "GirCore.Pango-1.0", + "version": "0.6.3", + "hash": "sha256-4qPtnqcd1gjt/bz6vyq7L4iA8TyDYTlqkkDD6H150Hs=" + }, + { + "pname": "GirCore.PangoCairo-1.0", + "version": "0.6.3", + "hash": "sha256-O8SVg5F8OBazisAwxDB66zlup2hB6hvmO7ubdpSJXpI=" + }, + { + "pname": "Microsoft.CodeAnalysis.Analyzers", + "version": "3.3.4", + "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" + }, + { + "pname": "Microsoft.CodeAnalysis.Common", + "version": "4.8.0", + "hash": "sha256-3IEinVTZq6/aajMVA8XTRO3LTIEt0PuhGyITGJLtqz4=" + }, + { + "pname": "Microsoft.CodeAnalysis.CSharp", + "version": "4.8.0", + "hash": "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.0.1", + "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.1", + "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.0.1", + "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" + }, + { + "pname": "Mono.Addins", + "version": "1.4.2-alpha.4", + "hash": "sha256-RZk63v41ByKGmv0wT57MfX77+ao8KcWEWtkWogucHYM=" + }, + { + "pname": "Mono.Addins.CecilReflector", + "version": "1.4.2-alpha.4", + "hash": "sha256-VPVhTWLKJDhOThuu3Z0Yv1DlOFXp+H7olqwY/YpZE2Q=" + }, + { + "pname": "Mono.Addins.Setup", + "version": "1.4.2-alpha.4", + "hash": "sha256-oPpISiP20NQLlBjkG9fyH0qdgDwl6vxaaykTxVgG9rY=" + }, + { + "pname": "Mono.Cecil", + "version": "0.10.1", + "hash": "sha256-JlELZujFtdTky8wt4k5lmLbY+hxLSzbAWJN0AHq41/4=" }, { "pname": "NGettext", "version": "0.6.7", "hash": "sha256-fmIODwPZkNJsnoNJG+EL1J5mpbuxYI4BsrgD1B4N2NI=" }, - { - "pname": "PangoSharp", - "version": "3.24.24.38", - "hash": "sha256-dq1c/G05iCmWmWZxwLV0e8qvQMS0620Bd0MSz4hEqjI=" - }, { "pname": "ParagonClipper", "version": "6.4.2", "hash": "sha256-jCT6rkghEqMuGwiVeiIAspHW+kuiB2jRl9ireBwhVV0=" }, + { + "pname": "runtime.any.System.Collections", + "version": "4.3.0", + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" + }, + { + "pname": "runtime.any.System.Globalization", + "version": "4.3.0", + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" + }, + { + "pname": "runtime.any.System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" + }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" + }, + { + "pname": "runtime.any.System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" + }, + { + "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c=" + }, + { + "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" + }, + { + "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg=" + }, + { + "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" + }, + { + "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.native.System.Net.Http", + "version": "4.3.0", + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" + }, + { + "pname": "runtime.native.System.Security.Cryptography", + "version": "4.0.0", + "hash": "sha256-6Q8eYzC32BbGIiTHoQaE6B3cD81vYQcH5SCswYRSp0w=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8=" + }, + { + "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" + }, + { + "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ=" + }, + { + "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" + }, + { + "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U=" + }, + { + "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" + }, + { + "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI=" + }, + { + "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" + }, + { + "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU=" + }, + { + "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" + }, + { + "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA=" + }, + { + "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" + }, + { + "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", + "version": "4.3.2", + "hash": "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q=" + }, + { + "pname": "runtime.unix.Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" + }, + { + "pname": "runtime.unix.System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" + }, + { + "pname": "runtime.unix.System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" + }, + { + "pname": "runtime.unix.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "runtime.unix.System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" + }, { "pname": "SharpZipLib", - "version": "1.4.1", - "hash": "sha256-ZsmWYdcr73k6Vd9HK1sKBrit6LLiSr+haH8l9h+UAbY=" + "version": "1.3.3", + "hash": "sha256-HWEQTKh9Ktwg/zIl079dAiH+ob2ShWFAqLgG6XgIMr4=" + }, + { + "pname": "System.Buffers", + "version": "4.3.0", + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" + }, + { + "pname": "System.Collections", + "version": "4.0.11", + "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0=" + }, + { + "pname": "System.Collections", + "version": "4.3.0", + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" + }, + { + "pname": "System.Collections.Concurrent", + "version": "4.0.12", + "hash": "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8=" + }, + { + "pname": "System.Collections.Concurrent", + "version": "4.3.0", + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" + }, + { + "pname": "System.Collections.Immutable", + "version": "6.0.0", + "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs=" + }, + { + "pname": "System.Collections.Immutable", + "version": "7.0.0", + "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" + }, + { + "pname": "System.Collections.NonGeneric", + "version": "4.3.0", + "hash": "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8=" + }, + { + "pname": "System.Collections.Specialized", + "version": "4.3.0", + "hash": "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk=" + }, + { + "pname": "System.CommandLine", + "version": "2.0.0-beta4.22272.1", + "hash": "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.0.11", + "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4=" + }, + { + "pname": "System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.3.0", + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" + }, + { + "pname": "System.Diagnostics.Tracing", + "version": "4.1.0", + "hash": "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ=" + }, + { + "pname": "System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" + }, + { + "pname": "System.Globalization", + "version": "4.0.11", + "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw=" + }, + { + "pname": "System.Globalization", + "version": "4.3.0", + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" + }, + { + "pname": "System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" + }, + { + "pname": "System.Globalization.Extensions", + "version": "4.3.0", + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" + }, + { + "pname": "System.IO", + "version": "4.1.0", + "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw=" + }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, + { + "pname": "System.IO.FileSystem", + "version": "4.0.1", + "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" + }, + { + "pname": "System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.0.1", + "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" + }, + { + "pname": "System.IO.FileSystem.Primitives", + "version": "4.3.0", + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" + }, + { + "pname": "System.Linq", + "version": "4.1.0", + "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794=" + }, + { + "pname": "System.Linq", + "version": "4.3.0", + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" + }, + { + "pname": "System.Net.Http", + "version": "4.3.4", + "hash": "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + }, + { + "pname": "System.Reflection", + "version": "4.1.0", + "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs=" + }, + { + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, { "pname": "System.Reflection.Emit", @@ -60,13 +555,178 @@ "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg=" }, { - "pname": "System.Security.Principal.Windows", - "version": "4.7.0", - "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg=" + "pname": "System.Reflection.Metadata", + "version": "7.0.0", + "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.0.1", + "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.0.1", + "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw=" + }, + { + "pname": "System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" + }, + { + "pname": "System.Runtime", + "version": "4.1.0", + "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.1.0", + "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc=" + }, + { + "pname": "System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.0.1", + "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" + }, + { + "pname": "System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.1.0", + "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" + }, + { + "pname": "System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" + }, + { + "pname": "System.Runtime.Numerics", + "version": "4.0.1", + "hash": "sha256-1pJt5ZGxLPTX1mjOi8qZPXyyOMkYV0NstoUCv91HYPg=" + }, + { + "pname": "System.Runtime.Numerics", + "version": "4.3.0", + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.2.0", + "hash": "sha256-BelNIpEyToEp/VYKnje/q1P7KNEpQNtOzGPU18pLGpE=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.3.0", + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.3.0", + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.0.0", + "hash": "sha256-WHyR6vVK3zaT4De7jgQFUar1P5fiX9ECwiVkJDFFm7M=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.3.0", + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.0.0", + "hash": "sha256-ZO7ha39J5uHkIF2RoEKv/bW/bLbVvYMO4+rWyYsKHik=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.3.0", + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" + }, + { + "pname": "System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" + }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.0.0", + "hash": "sha256-sEdPftfTxQd/8DpdpqUZC2XWC0SjVCPqAkEleLl17EQ=" + }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.3.0", + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Security.Cryptography.X509Certificates", + "version": "4.3.0", + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.0.11", + "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" + }, + { + "pname": "System.Threading", + "version": "4.0.11", + "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac=" + }, + { + "pname": "System.Threading", + "version": "4.3.0", + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.0.11", + "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, { "pname": "Tmds.DBus", - "version": "0.11.0", - "hash": "sha256-xNArjhSaEZcRiRB+mb9ZwUPQUqbLjRYt4JV2WUtM+hg=" + "version": "0.21.2", + "hash": "sha256-1rxUexOuj0raH8FvvUKeGdcWr3u8KmuAySe/4isy6S0=" } ] diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix index e3704ef9ea77..e04cfa245bb5 100644 --- a/pkgs/by-name/pi/pinta/package.nix +++ b/pkgs/by-name/pi/pinta/package.nix @@ -4,26 +4,38 @@ dotnetCorePackages, fetchFromGitHub, glibcLocales, - gtk3, + gtk4, intltool, - wrapGAppsHook3, + libadwaita, + wrapGAppsHook4, }: buildDotnetModule rec { pname = "Pinta"; - version = "2.1.2"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "PintaProject"; + repo = "Pinta"; + rev = version; + hash = "sha256-87uzUIgivBI2W+vJV/LflxJoUPJCW5SlodwcC1pSOUk="; + }; nativeBuildInputs = [ intltool - wrapGAppsHook3 + wrapGAppsHook4 ]; + runtimeDeps = [ + gtk4 + libadwaita + ]; + + buildInputs = runtimeDeps; + dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; - runtimeDeps = [ gtk3 ]; - buildInputs = runtimeDeps; - # How-to update deps: # $ nix-build -A pinta.fetch-deps # $ ./result @@ -32,13 +44,6 @@ buildDotnetModule rec { projectFile = "Pinta"; - src = fetchFromGitHub { - owner = "PintaProject"; - repo = "Pinta"; - rev = version; - hash = "sha256-/GMYF7G469oX5W1zjv5A9a6tcLX+4g6Sf9cDqxSjgWg="; - }; - # https://github.com/NixOS/nixpkgs/issues/38991 # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) env.LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; diff --git a/pkgs/by-name/pi/pipeline/package.nix b/pkgs/by-name/pi/pipeline/package.nix index d86d5ee726f5..350a2157def2 100644 --- a/pkgs/by-name/pi/pipeline/package.nix +++ b/pkgs/by-name/pi/pipeline/package.nix @@ -17,7 +17,7 @@ desktop-file-utils, blueprint-compiler, sqlite, - clapper, + clapper-unwrapped, gettext, gst_all_1, gtuber, @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { libadwaita openssl sqlite - clapper + clapper-unwrapped gst_all_1.gstreamer gst_all_1.gst-libav diff --git a/pkgs/by-name/pi/piv-agent/package.nix b/pkgs/by-name/pi/piv-agent/package.nix index 227ff18f4b64..ff4a1b734a85 100644 --- a/pkgs/by-name/pi/piv-agent/package.nix +++ b/pkgs/by-name/pi/piv-agent/package.nix @@ -2,7 +2,6 @@ lib, stdenv, buildGoModule, - darwin, fetchFromGitHub, pcsclite, pkg-config, @@ -32,8 +31,7 @@ buildGoModule rec { nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = - if stdenv.hostPlatform.isDarwin then [ darwin.apple_sdk.frameworks.PCSC ] else [ pcsclite ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ pcsclite ]; meta = with lib; { description = "SSH and GPG agent which you can use with your PIV hardware security device (e.g. a Yubikey)"; diff --git a/pkgs/by-name/pi/pixelflasher/package.nix b/pkgs/by-name/pi/pixelflasher/package.nix index e9adadbc9728..5b20e7213998 100644 --- a/pkgs/by-name/pi/pixelflasher/package.nix +++ b/pkgs/by-name/pi/pixelflasher/package.nix @@ -10,14 +10,14 @@ }: python3Packages.buildPythonApplication rec { pname = "pixelflasher"; - version = "7.11.3.0"; + version = "7.11.4.0"; format = "other"; src = fetchFromGitHub { owner = "badabing2005"; repo = "PixelFlasher"; tag = "v${version}"; - hash = "sha256-8ZtzOUoD2f25oYFQ+Q3uwG1w1o768361efh3K8L4ZGM="; + hash = "sha256-TFvMxYGiRNpuwQyDmSqnksQ31azucZzXq9mZHvl/C4U="; }; desktopItems = [ diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index 4c8235536002..8dc3db270ec6 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi"; - version = "0.44.0"; + version = "0.45.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; tag = "v${finalAttrs.version}"; - hash = "sha256-IHI4T2QKCvnyn6RgtJ9ZIF6mcUXUAguk05kfWURO+ds="; + hash = "sha256-nOSwGR0V6dOaF5pCmYch6EJN87XCs0atSaWshH6Pwqs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-TB3gOeYPLIyUWPhyAGM9rhFOZXWEUHn6mXoyL9D8hxc="; + cargoHash = "sha256-vSyo7j+HCWUgXxPAxOGiOGQQwVhHOWJhGyM92KDIeC4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pi/pixiecore/package.nix b/pkgs/by-name/pi/pixiecore/package.nix index f449bdb8d276..80d1a95bc6cd 100644 --- a/pkgs/by-name/pi/pixiecore/package.nix +++ b/pkgs/by-name/pi/pixiecore/package.nix @@ -2,31 +2,70 @@ lib, buildGoModule, fetchFromGitHub, + xz, + ipxe, + stdenv, + perl, + go-bindata, + fetchpatch, }: +let + rebuildIpxe = stdenv.system == "x86_64-linux"; +in buildGoModule rec { pname = "pixiecore"; - version = "2020-03-25"; - rev = "68743c67a60c18c06cd21fd75143e3e069ca3cfc"; + version = "0-unstable-2024-05-31"; + rev = "2ed7bd30206a51bae786b02d9a5b8156fdcc8870"; src = fetchFromGitHub { owner = "danderson"; repo = "netboot"; inherit rev; - hash = "sha256-SoD871PaL5/oabKeHFE2TLTTj/CFS4dfggjMN3qlupE="; + hash = "sha256-pG4nzzJRWI1rAHS5kBcefNi0ee0/a3jwE+RmR4Dj8jo="; }; - vendorHash = "sha256-hytMhf7fz4XiRJH7MnGLmNH+iIzPDz9/rRJBPp2pwyI="; + vendorHash = "sha256-3cVGDAZWhmZ1byvjoRodSWMNHCpNujDOAVQKHNntHR8="; + + patches = [ + # part of https://github.com/danderson/netboot/pull/144 + # Also backed up in https://github.com/danderson/netboot/compare/main...Mic92:netboot:upgrade-go-mod-117?expand=1 + (fetchpatch { + url = "https://github.com/danderson/netboot/commit/c999a6ca573c973e760c8df531b4c970c21f3d05.patch"; + sha256 = "sha256-pRWcBz24cqqajLvJffugB/T6lKGVtvOG4ch3vyzDDQQ="; + }) + ]; doCheck = false; + # De-vendor ipxe, only on x86_64-linux for now. + # In future we can do this also for more systems, if we do cross-compilation. + buildInputs = lib.optionals rebuildIpxe [ xz ]; + nativeBuildInputs = lib.optionals rebuildIpxe [ + perl + go-bindata + ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error" ]; + preBuild = lib.optionalString rebuildIpxe '' + # don't run in our go-modules phase but only in the normal build phase + if echo $NIX_CFLAGS_COMPILE | grep -q xz; then + rm -rf ./third_party/ipxe + cp -r ${ipxe.src} ./third_party/ipxe + chmod -R u+w ./third_party/ipxe + make update-ipxe -j$NIX_BUILD_CORES + fi + ''; + subPackages = [ "cmd/pixiecore" ]; meta = { description = "Tool to manage network booting of machines"; homepage = "https://github.com/danderson/netboot/tree/master/pixiecore"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ bbigras ]; + maintainers = with lib.maintainers; [ + bbigras + mic92 + ]; mainProgram = "pixiecore"; }; } diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix index 3ddc577400bb..60d6d1174605 100644 --- a/pkgs/by-name/pk/pkarr/package.nix +++ b/pkgs/by-name/pk/pkarr/package.nix @@ -1,9 +1,7 @@ { lib, fetchFromGitHub, - darwin, rustPlatform, - stdenv, }: rustPlatform.buildRustPackage rec { pname = "pkarr"; @@ -19,14 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-y20vVO714WPcB2aYzo0LBuJhy224bsHA7O9Dj00ViWE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); - meta = { description = "Public Key Addressable Resource Records (sovereign TLDs) "; homepage = "https://github.com/pubky/pkarr"; diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index 692c399a5855..e50a9be6bd0a 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "pkgsite"; - version = "0-unstable-2025-04-01"; + version = "0-unstable-2025-04-16"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "e806f9c8871f0247a0989e5124d82e7d841bce91"; - hash = "sha256-J8v0P+KIhh07c0G+XN5aWuVp2btaJel2T+U6g/D/2sM="; + rev = "0a075a2cae6ac8ff829d0d7c7841d064d6833167"; + hash = "sha256-kYmxR6ZzlHDBeAYFDlUN5EcgRDpB/S00Xx3N1MbKsIk="; }; - vendorHash = "sha256-M4cbpMZ/ujnMUoGp//KpBM2oEl/RCOfI1IcmoGMw+fw="; + vendorHash = "sha256-JoPuNktN4OsdNJ0e8BRuuD0CKuWiFsAcLAS5h9rH/Z0="; subPackages = [ "cmd/pkgsite" ]; diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix index c656b6c5f7fd..8cc8d19d4234 100644 --- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix +++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "plasma-panel-colorizer"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-colorizer"; tag = "v${finalAttrs.version}"; - hash = "sha256-SQ2jf0YWmDN0Yce2lmTpD11zLdUz2otm98TO/agaY28="; + hash = "sha256-5pPmXuP/7weG2EtBLnhSKHkycJw3VdAi05lRgut8Agg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/plink-ng/package.nix b/pkgs/by-name/pl/plink-ng/package.nix index 74b04c56ecce..ea697c070e4e 100644 --- a/pkgs/by-name/pl/plink-ng/package.nix +++ b/pkgs/by-name/pl/plink-ng/package.nix @@ -5,7 +5,6 @@ zlib, blas, lapack, - darwin, }: stdenv.mkDerivation rec { @@ -20,16 +19,13 @@ stdenv.mkDerivation rec { }; buildInputs = - [ zlib ] - ++ ( - if stdenv.hostPlatform.isDarwin then - [ darwin.apple_sdk.frameworks.Accelerate ] - else - [ - blas - lapack - ] - ); + [ + zlib + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + blas + lapack + ]; preBuild = '' sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h diff --git a/pkgs/by-name/pl/ploticus/fix-zlib-file-type.patch b/pkgs/by-name/pl/ploticus/fix-zlib-file-type.patch new file mode 100644 index 000000000000..15a4d3e83c29 --- /dev/null +++ b/pkgs/by-name/pl/ploticus/fix-zlib-file-type.patch @@ -0,0 +1,28 @@ +Index: src/svg.c +=================================================================== +--- a/src/svg.c ++++ b/src/svg.c +@@ -676,9 +676,9 @@ + double x1, y1, x2, y2; + { + char *buf; + #ifdef WZ +- FILE *outfp; ++ gzFile outfp; + #endif + + if (svg_style_in_prog) fprintf( svg_fp, ""); + fprintf( svg_fp, "\n" ); /* close default style */ +@@ -731,10 +731,10 @@ + svg_fp = fopen( svg_tmpfilename, "r" ); + if( svg_fp == NULL ) return( Eerr( 2487, "cannot reopen temp file", svg_tmpfilename ) ); + #ifdef WZ + if( svg_compress ) { +- if( svg_stdout ) outfp = (FILE *) gzdopen( 1, svg_compressmode ); /* stdout = 1 */ +- else outfp = (FILE *) gzopen( svg_filename, svg_compressmode ); ++ if( svg_stdout ) outfp = gzdopen( 1, svg_compressmode ); /* stdout = 1 */ ++ else outfp = gzopen( svg_filename, svg_compressmode ); + if( outfp == NULL ) return( Eerr( 2488, "cannot open output file", svg_filename ) ); + } + #endif + buf = svg_style; /* reuse */ diff --git a/pkgs/by-name/pl/ploticus/package.nix b/pkgs/by-name/pl/ploticus/package.nix index 63f2409da4b8..ecb3e6861fa2 100644 --- a/pkgs/by-name/pl/ploticus/package.nix +++ b/pkgs/by-name/pl/ploticus/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { url = "mirror://sourceforge/ploticus/ploticus/${finalAttrs.version}/ploticus${ lib.replaceStrings [ "." ] [ "" ] finalAttrs.version }_src.tar.gz"; - sha256 = "PynkufQFIDqT7+yQDlgW2eG0OBghiB4kHAjKt91m4LA="; + hash = "sha256-PynkufQFIDqT7+yQDlgW2eG0OBghiB4kHAjKt91m4LA="; }; patches = [ @@ -33,6 +33,11 @@ stdenv.mkDerivation (finalAttrs: { # This is required for non-ASCII fonts to work: # https://ploticus.sourceforge.net/doc/fonts.html ./use-gd-package.patch + + # svg.c:752:26: error: passing argument 1 of 'gzclose' from incompatible pointer type [] + # 752 | gzclose( outfp ); + # note: expected 'gzFile' {aka 'struct gzFile_s *'} but argument is of type 'FILE *' + ./fix-zlib-file-type.patch ]; buildInputs = [ @@ -56,6 +61,8 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "CC:=$(CC)" ]; + enableParallelBuilding = true; + preInstall = '' mkdir -p "$out/bin" ''; @@ -84,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { ''; }; - meta = with lib; { + meta = { description = "Non-interactive software package for producing plots and charts"; longDescription = '' Ploticus is a free, GPL'd, non-interactive @@ -94,9 +101,9 @@ stdenv.mkDerivation (finalAttrs: { statistical capabilities. It allows significant user control over colors, styles, options and details. ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ pSub ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ pSub ]; homepage = "https://ploticus.sourceforge.net/"; - platforms = with platforms; linux ++ darwin; + platforms = with lib.platforms; linux ++ darwin; }; }) diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix index 31782dafb32e..d8ddb64c2f8d 100644 --- a/pkgs/by-name/pl/pluto/package.nix +++ b/pkgs/by-name/pl/pluto/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pluto"; - version = "5.21.3"; + version = "5.21.4"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - hash = "sha256-/gq6BdlNG9vUazVt7Ucvv2679BytUEZrx6u8znnsxG4="; + hash = "sha256-tUMQ9d5q4dK63In8uj4+gdrADMMrQLW37UipnSw7hnA="; }; vendorHash = "sha256-PABCma+pfguDHxRhvQYCHcjr7Epy2AteC+QiXbAx04k="; diff --git a/pkgs/by-name/pl/plutovg/package.nix b/pkgs/by-name/pl/plutovg/package.nix new file mode 100644 index 000000000000..88b1d186081a --- /dev/null +++ b/pkgs/by-name/pl/plutovg/package.nix @@ -0,0 +1,29 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "plutovg"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "sammycage"; + repo = "plutovg"; + tag = "v${finalAttrs.version}"; + hash = "sha256-xNWwACKGU5UIJviVZ3wU4GMuRxKn/rR8jBsZQpZiFZ8="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + homepage = "https://github.com/sammycage/plutovg/"; + changelog = "https://github.com/sammycage/plutovg/releases/tag/v${finalAttrs.version}"; + description = "Tiny 2D vector graphics library in C"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.eymeric ]; + }; +}) diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix index f04a8d97598f..d060c3fe5a12 100644 --- a/pkgs/by-name/pm/pmtiles/package.nix +++ b/pkgs/by-name/pm/pmtiles/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "pmtiles"; - version = "1.27.1"; + version = "1.27.2"; src = fetchFromGitHub { owner = "protomaps"; repo = "go-pmtiles"; tag = "v${version}"; - hash = "sha256-SQzCNgRDu5elkCH0fTDL3w23Z6G2P1IuxSWwZYxQwVo="; + hash = "sha256-yOQrwJZUUdknEB+/I/BeQjtQvQ9HoKOJOYL4TM4vpc8="; }; vendorHash = "sha256-kfEzpaFMf0W8Ygtl40LBy3AZQSL+9Uo+n2x9OTOavqk="; diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix index 0fd97ab64c86..f5cafcae0af3 100644 --- a/pkgs/by-name/po/pocket-id/package.nix +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -3,7 +3,6 @@ fetchFromGitHub, buildGoModule, buildNpmPackage, - fetchurl, makeWrapper, nodejs, stdenvNoCC, @@ -11,35 +10,37 @@ nix-update-script, }: -let - version = "0.45.0"; +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "pocket-id"; + version = "0.48.0"; + src = fetchFromGitHub { owner = "pocket-id"; repo = "pocket-id"; - tag = "v${version}"; - hash = "sha256-x5Y3ArkIPxiE6avk9DNyFdfkc/pY6h3JH3PZCS8U/GM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ax5E3e3GUrQLVsQREUhjmORjXQgKrEBVa9ySJr5ZLUY="; }; backend = buildGoModule { pname = "pocket-id-backend"; - inherit version src; + inherit (finalAttrs) version src; - sourceRoot = "${src.name}/backend"; + sourceRoot = "${finalAttrs.src.name}/backend"; - vendorHash = "sha256-mqpBP+A2X5ome1Ppg/Kki0C+A77jFtWzUjI/RN+ZCzg="; + vendorHash = "sha256-0LAlltXd7YNQu7ymdjUSy75hMBz6MpvmUtgct43BU7M="; preFixup = '' mv $out/bin/cmd $out/bin/pocket-id-backend ''; }; - frontend = buildNpmPackage (finalAttrs: { + frontend = buildNpmPackage { pname = "pocket-id-frontend"; - inherit version src; + inherit (finalAttrs) version src; - sourceRoot = "${src.name}/frontend"; + sourceRoot = "${finalAttrs.src.name}/frontend"; - npmDepsHash = "sha256-cpmZzlz+wusfRLN4iIGdk+I4SWrX/gk2fbhg+Gg3paw="; + npmDepsHash = "sha256-CKxa0uL7pBQJiA2LPDA/HQvRk8sjphZ9nur8jb7BnU8="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = [ @@ -53,7 +54,7 @@ let # it still needs a few packages from node_modules, try to strip that npm prune --omit=dev --omit=optional $npmFlags # larger seemingly unused packages - rm -r node_modules/{lucide-svelte,bits-ui,jiti,@swc,.bin} + rm -r node_modules/{lucide-svelte,jiti,@swc,.bin} # unused file types for pattern in '*.map' '*.map.js' '*.ts'; do find . -type f -name "$pattern" -exec rm {} + @@ -67,17 +68,7 @@ let runHook postInstall ''; - }); - -in -stdenvNoCC.mkDerivation rec { - pname = "pocket-id"; - inherit - version - src - backend - frontend - ; + }; dontUnpack = true; @@ -85,8 +76,8 @@ stdenvNoCC.mkDerivation rec { runHook preInstall mkdir -p $out/bin - ln -s ${backend}/bin/pocket-id-backend $out/bin/pocket-id-backend - ln -s ${frontend}/bin/pocket-id-frontend $out/bin/pocket-id-frontend + ln -s ${finalAttrs.backend}/bin/pocket-id-backend $out/bin/pocket-id-backend + ln -s ${finalAttrs.frontend}/bin/pocket-id-frontend $out/bin/pocket-id-frontend runHook postInstall ''; @@ -108,12 +99,13 @@ stdenvNoCC.mkDerivation rec { meta = { description = "OIDC provider with passkeys support"; homepage = "https://pocket-id.org"; - changelog = "https://github.com/pocket-id/pocket-id/releases/tag/v${version}"; + changelog = "https://github.com/pocket-id/pocket-id/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ gepbird + marcusramberg ymstnt ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/po/pocl/package.nix b/pkgs/by-name/po/pocl/package.nix index 4f1d93a72eb8..4075762f19e5 100644 --- a/pkgs/by-name/po/pocl/package.nix +++ b/pkgs/by-name/po/pocl/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - nix-update-script, cmake, pkg-config, hwloc, @@ -11,28 +10,34 @@ spirv-llvm-translator, spirv-tools, lttng-ust, + opencl-headers, ocl-icd, python3, runCommand, makeWrapper, + writableTmpDirAsHomeHook, }: let clang = llvmPackages.clangUseLLVM; # Workaround to make sure libclang finds libgcc.a and libgcc_s.so when # invoked from within libpocl - clangWrapped = runCommand "clang-pocl" { nativeBuildInputs = [ makeWrapper ]; } '' - mkdir -p $out/bin - cp -r ${clang}/bin/* $out/bin/ - LIBGCC_DIR=$(dirname $(find ${stdenv.cc.cc}/lib/ -name libgcc.a)) - for F in ${clang}/bin/ld*; do - BASENAME=$(basename "$F") - rm -f $out/bin/$BASENAME - makeWrapper ${clang}/bin/$BASENAME $out/bin/$BASENAME \ - --add-flags "-L$LIBGCC_DIR" \ - --add-flags "-L${lib.getLib stdenv.cc.cc}/lib" - done - ''; + clangWrapped = + if stdenv.hostPlatform.isDarwin then + clang + else + runCommand "clang-pocl" { nativeBuildInputs = [ makeWrapper ]; } '' + mkdir -p $out/bin + cp -r ${clang}/bin/* $out/bin/ + LIBGCC_DIR=$(dirname $(find ${stdenv.cc.cc}/lib/ -name libgcc.a)) + for F in ${clang}/bin/ld*; do + BASENAME=$(basename "$F") + rm -f $out/bin/$BASENAME + makeWrapper ${clang}/bin/$BASENAME $out/bin/$BASENAME \ + --add-flags "-L$LIBGCC_DIR" \ + --add-flags "-L${lib.getLib stdenv.cc.cc}/lib" + done + ''; in stdenv.mkDerivation (finalAttrs: { pname = "pocl"; @@ -45,18 +50,31 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-d/BD8YkdMYtu6yFlGNXrsz7PVIrzBvvYLU1JRv7ZJmc="; }; - cmakeFlags = [ - "-DKERNELLIB_HOST_CPU_VARIANTS=distro" - # avoid the runtime linker pulling in a different llvm e.g. from graphics drivers - "-DSTATIC_LLVM=ON" - "-DENABLE_POCL_BUILDING=OFF" - "-DPOCL_ICD_ABSOLUTE_PATH=ON" - "-DENABLE_ICD=ON" - "-DCLANG=${clangWrapped}/bin/clang" - "-DCLANGXX=${clangWrapped}/bin/clang++" - "-DENABLE_REMOTE_CLIENT=ON" - "-DENABLE_REMOTE_SERVER=ON" - ]; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace pocld/shared_cl_context.cc --replace-fail \ + "Dev.getInfo()" \ + "static_cast(Dev.getInfo())" + ''; + + cmakeFlags = + [ + # avoid the runtime linker pulling in a different llvm e.g. from graphics drivers + (lib.cmakeBool "STATIC_LLVM" true) + (lib.cmakeBool "ENABLE_POCL_BUILDING" false) + (lib.cmakeBool "POCL_ICD_ABSOLUTE_PATH" true) + (lib.cmakeBool "ENABLE_ICD" true) + (lib.cmakeBool "ENABLE_REMOTE_CLIENT" true) + (lib.cmakeBool "ENABLE_REMOTE_SERVER" true) + (lib.cmakeFeature "CLANG" "${clangWrapped}/bin/clang") + (lib.cmakeFeature "CLANGXX" "${clangWrapped}/bin/clang++") + ] + # Only x86_64 supports "distro" which allows runtime detection of SSE/AVX + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + (lib.cmakeFeature "KERNELLIB_HOST_CPU_VARIANTS" "distro") + ] + ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ + (lib.cmakeFeature "LLC_HOST_CPU" "generic") + ]; nativeBuildInputs = [ cmake @@ -65,21 +83,40 @@ stdenv.mkDerivation (finalAttrs: { python3 ]; - buildInputs = [ - hwloc - libxml2 - llvmPackages.llvm - llvmPackages.libclang - lttng-ust - ocl-icd - spirv-tools - spirv-llvm-translator + buildInputs = + [ + hwloc + libxml2 + llvmPackages.llvm + llvmPackages.libclang + opencl-headers + ocl-icd + spirv-tools + spirv-llvm-translator + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + lttng-ust + ]; + + nativeInstallCheckInputs = [ + writableTmpDirAsHomeHook ]; - passthru.updateScript = nix-update-script { }; + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + export OCL_ICD_VENDORS=$out/etc/OpenCL/vendors + $out/bin/poclcc -o poclcc.cl.pocl $src/examples/poclcc/poclcc.cl + + runHook postInstallCheck + ''; + + setupHook = ./setup-hook.sh; meta = { - description = "A portable open source (MIT-licensed) implementation of the OpenCL standard"; + description = "portable open source (MIT-licensed) implementation of the OpenCL standard"; homepage = "http://portablecl.org"; changelog = "https://github.com/pocl/pocl/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; diff --git a/pkgs/by-name/po/pocl/setup-hook.sh b/pkgs/by-name/po/pocl/setup-hook.sh new file mode 100644 index 000000000000..986297516b75 --- /dev/null +++ b/pkgs/by-name/po/pocl/setup-hook.sh @@ -0,0 +1,6 @@ +preCheckHooks+=('setupPoclCheck') +preInstallCheckHooks+=('setupPoclCheck') + +setupPoclCheck () { + export OCL_ICD_VENDORS="@out@/etc/OpenCL/vendors" +} diff --git a/pkgs/by-name/po/poco/package.nix b/pkgs/by-name/po/poco/package.nix index e473a6ceae42..2117341d5232 100644 --- a/pkgs/by-name/po/poco/package.nix +++ b/pkgs/by-name/po/poco/package.nix @@ -7,11 +7,11 @@ pkg-config, zlib, pcre2, + utf8proc, expat, sqlite, openssl, unixODBC, - utf8proc, libmysqlclient, }: @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { buildInputs = [ unixODBC - utf8proc libmysqlclient ]; propagatedBuildInputs = [ zlib pcre2 + utf8proc expat sqlite openssl diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix index 86cc739b91b2..9b40aa1a8fab 100644 --- a/pkgs/by-name/po/podman-desktop/package.nix +++ b/pkgs/by-name/po/podman-desktop/package.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "podman-desktop"; - version = "1.17.2"; + version = "1.18.0"; passthru.updateScript = nix-update-script { }; @@ -25,12 +25,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "containers"; repo = "podman-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-AbOR+iCV11OVEzNGRjyJ9+BAMuWkywMNR6dPiLe0quI="; + hash = "sha256-u3Irn+hSyTNTLl8QenMZbISE5aFhb58mOSOooVoijKw="; }; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-BLzNETlvLqXAzPhTXOIQmwHhXudMxoNQ8WOlpsaKo6I="; + hash = "sha256-2k0BbE9FkWEErsTuCECjy+iI3u1Biv1MF9hI7Oq3Aus="; }; patches = [ diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix index d424b8f126ac..c61c6579140b 100644 --- a/pkgs/by-name/po/polarity/package.nix +++ b/pkgs/by-name/po/polarity/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "polarity"; - version = "latest-unstable-2025-04-06"; + version = "latest-unstable-2025-04-14"; src = fetchFromGitHub { owner = "polarity-lang"; repo = "polarity"; - rev = "3d661ea0485a83b0c1065595839cb2d9d594e4e8"; - hash = "sha256-4NeDOGzCq211SVVtfISq/Z901Et1zYhMQ/t7eNEBW9Y="; + rev = "9ee17a9a167efdd660c4806e2d3cd5bc2b3177e1"; + hash = "sha256-9MsPMQnqzePhxF9f9DgmZ9aq8TzLYi3jZA9HF2McVss="; }; useFetchCargoVendor = true; - cargoHash = "sha256-S0d64jFKiyGVIFH8HhT4mzBEVUPDIMevvClTeqy0/28="; + cargoHash = "sha256-23qr4bEAsN75ONnNmym9eWH38fRoMmP1EkmOaka73Ko="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch b/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch index cd1f3fb7421c..fd7fa5672975 100644 --- a/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch +++ b/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch @@ -1,14 +1,14 @@ -From 54e426127a35ea6c88bf0ba882f97f0712533ef5 Mon Sep 17 00:00:00 2001 +From dfb6e2797e7c9166c8dd3dc0d87a4d91474244c7 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sun, 26 May 2024 12:17:01 -0500 Subject: [PATCH] envoy: allow specification of external binary --- - pkg/envoy/envoy.go | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) + pkg/envoy/envoy.go | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkg/envoy/envoy.go b/pkg/envoy/envoy.go -index 66cf71ae..8d81090e 100644 +index 8224f364..bb8b6506 100644 --- a/pkg/envoy/envoy.go +++ b/pkg/envoy/envoy.go @@ -8,9 +8,9 @@ import ( @@ -22,7 +22,7 @@ index 66cf71ae..8d81090e 100644 "path/filepath" "regexp" "strconv" -@@ -34,8 +34,12 @@ import ( +@@ -35,8 +35,17 @@ import ( const ( configFileName = "envoy-config.yaml" @@ -32,20 +32,22 @@ index 66cf71ae..8d81090e 100644 +var OverrideEnvoyPath = "" + - type serverOptions struct { - services string - logLevel config.LogLevel -@@ -59,17 +63,16 @@ type Server struct { - - // NewServer creates a new server with traffic routed by envoy. - func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Builder) (*Server, error) { -- if err := preserveRlimitNofile(); err != nil { -- log.Ctx(ctx).Debug().Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy") -- } -+ envoyPath := OverrideEnvoyPath -+ wd := filepath.Join(os.TempDir(), workingDirectoryName) ++type serverOptions struct { ++ services string ++ logLevel config.LogLevel ++} ++ + // A Server is a pomerium proxy implemented via envoy. + type Server struct { + ServerOptions +@@ -94,14 +103,17 @@ func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Buil + log.Ctx(ctx).Debug().Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy") + } - envoyPath, err := Extract() ++ envoyPath := OverrideEnvoyPath ++ wd := filepath.Join(os.TempDir(), workingDirectoryName) ++ + err := os.MkdirAll(wd, embeddedEnvoyPermissions) if err != nil { - return nil, fmt.Errorf("extracting envoy: %w", err) @@ -53,11 +55,12 @@ index 66cf71ae..8d81090e 100644 } srv := &Server{ -- wd: path.Dir(envoyPath), -+ wd: wd, - builder: builder, - grpcPort: src.GetConfig().GRPCPort, - httpPort: src.GetConfig().HTTPPort, + ServerOptions: options, +- wd: path.Dir(envoyPath), ++ wd: wd, + builder: builder, + grpcPort: src.GetConfig().GRPCPort, + httpPort: src.GetConfig().HTTPPort, -- -2.47.0 +2.48.1 diff --git a/pkgs/by-name/po/pomerium/package.json b/pkgs/by-name/po/pomerium/package.json index 59e65c4fcbaa..eb48ee5cab7b 100644 --- a/pkgs/by-name/po/pomerium/package.json +++ b/pkgs/by-name/po/pomerium/package.json @@ -43,7 +43,7 @@ "@types/react-dom": "^17.0.11", "@typescript-eslint/eslint-plugin": "^5.10.2", "@typescript-eslint/parser": "^5.59.11", - "esbuild": "^0.21.1", + "esbuild": "^0.25.0", "eslint": "7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-react": "^7.28.0", diff --git a/pkgs/by-name/po/pomerium/package.nix b/pkgs/by-name/po/pomerium/package.nix index b19b8c130e3d..fdbd37352301 100644 --- a/pkgs/by-name/po/pomerium/package.nix +++ b/pkgs/by-name/po/pomerium/package.nix @@ -19,15 +19,15 @@ let in buildGo123Module rec { pname = "pomerium"; - version = "0.28.0"; + version = "0.29.2"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256-Uj/mVklFRaoDNQjCFS5NW/AhSU+7V1XxPiZBAUuly7s="; + hash = "sha256-FortINGa0JNUxVeGiJ6i+cbmapMZeCXPY9hWox+Y49o="; }; - vendorHash = "sha256-s6EZUZoGNBpy5RaLAPiCCCVFli+YzZ0PHJ/aH3s4APA="; + vendorHash = "sha256-K9LcGvANajoVKEDIswahD0mT5845qGZzafmWMKkVn8Q="; ui = mkYarnPackage { inherit version; diff --git a/pkgs/by-name/po/pomerium/yarn-hash b/pkgs/by-name/po/pomerium/yarn-hash index 6f871e034fe3..164160128670 100644 --- a/pkgs/by-name/po/pomerium/yarn-hash +++ b/pkgs/by-name/po/pomerium/yarn-hash @@ -1 +1 @@ -0bdrczn8mj5iidmba7xzkcyvsnwmbvcvrc1vgks2x4pxqbfyxaiv +1fqb1bcsg0k6xazr6v19jav11fl99mm3p9w53hl5xflb974m2lg0 diff --git a/pkgs/by-name/po/porsmo/package.nix b/pkgs/by-name/po/porsmo/package.nix index 21dba217b326..4ae2993d59d1 100644 --- a/pkgs/by-name/po/porsmo/package.nix +++ b/pkgs/by-name/po/porsmo/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, alsa-lib, - stdenv, - darwin, testers, porsmo, }: @@ -29,14 +27,9 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - [ - alsa-lib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreAudio - darwin.apple_sdk.frameworks.CoreFoundation - ]; + buildInputs = [ + alsa-lib + ]; passthru.tests.version = testers.testVersion { package = porsmo; diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 101d3693c129..84ef7d688710 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -33,11 +33,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "PortfolioPerformance"; - version = "0.74.2"; + version = "0.75.1"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-RPoEby12DiJwdM2ejVfOQyrJjy/qgQ9BbqYyaV9KMD0="; + hash = "sha256-TIkEv8YEKgvi2DQ7vc90ZjyvVNOiMQvBhb8rqPT2Xl0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/portunus/package.nix b/pkgs/by-name/po/portunus/package.nix index 96408db6f66d..e09bf265b52f 100644 --- a/pkgs/by-name/po/portunus/package.nix +++ b/pkgs/by-name/po/portunus/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "portunus"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "majewsky"; repo = "portunus"; rev = "v${version}"; - sha256 = "sha256-+pMMIutj+OWKZmOYH5NuA4a7aS5CD+33vAEC9bJmyfM="; + sha256 = "sha256-nLFwfH1K6vsgNATwAxyq/q6HTtfLK8gsQhei7eJ86Kc="; }; buildInputs = [ libxcrypt ]; diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix index e06e1c8e3f96..86d3647a9cbd 100644 --- a/pkgs/by-name/po/positron-bin/package.nix +++ b/pkgs/by-name/po/positron-bin/package.nix @@ -22,7 +22,7 @@ }: let pname = "positron-bin"; - version = "2025.02.0-171"; + version = "2025.04.0-64"; in stdenv.mkDerivation { inherit version pname; @@ -30,13 +30,13 @@ stdenv.mkDerivation { src = if stdenv.hostPlatform.isDarwin then fetchurl { - url = "https://github.com/posit-dev/positron/releases/download/${version}/Positron-${version}.dmg"; - hash = "sha256-b5o1+UXt5JAuHkm1K1jrMLV+7PHfKJTOff4aTk8xm2I="; + url = "https://cdn.posit.co/positron/dailies/mac/universal/Positron-${version}.dmg"; + hash = "sha256-MmLc2YFmWIcmsRp4swKYJdQHAWfSIsW23D5ZLfyb4b4="; } else fetchurl { - url = "https://github.com/posit-dev/positron/releases/download/${version}/Positron-${version}-x64.deb"; - hash = "sha256-TjQc/Y4Sa2MlLslbygYVFbIk3raArMvYstSiSEYzfo0="; + url = "https://cdn.posit.co/positron/dailies/deb/x86_64/Positron-${version}-x64.deb"; + hash = "sha256-d1HjnMGpKg68EW0wXWvgXL0VEepn1vFJWuAN0HD2IPs="; }; buildInputs = @@ -85,7 +85,8 @@ stdenv.mkDerivation { # Positron will use the system version of BLAS if we don't provide the nix version. wrapProgram "$out/Applications/Positron.app/Contents/Resources/app/bin/code" \ - --prefix DYLD_INSERT_LIBRARIES : "${lib.makeLibraryPath [ blas ]}/libblas.dylib" + --prefix DYLD_INSERT_LIBRARIES : "${lib.makeLibraryPath [ blas ]}/libblas.dylib" \ + --add-flags "--disable-updates" ln -s "$out/Applications/Positron.app/Contents/Resources/app/bin/code" "$out/bin/positron" runHook postInstall @@ -112,7 +113,9 @@ stdenv.mkDerivation { # Fix libGL.so not found errors. wrapProgram "$out/share/positron/positron" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libglvnd ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libglvnd ]}" \ + --add-flags "--disable-updates" + mkdir -p "$out/bin" ln -s "$out/share/positron/positron" "$out/bin/positron" diff --git a/pkgs/by-name/po/positron-bin/update.sh b/pkgs/by-name/po/positron-bin/update.sh index a024b382ec96..3e3966a356e9 100755 --- a/pkgs/by-name/po/positron-bin/update.sh +++ b/pkgs/by-name/po/positron-bin/update.sh @@ -18,22 +18,22 @@ fi # Update Darwin hash. current_hash=$(nix store prefetch-file --json --hash-type sha256 \ - "https://github.com/posit-dev/positron/releases/download/${current_version}/Positron-${current_version}.dmg" \ + "https://cdn.posit.co/positron/dailies/mac/universal/Positron-${current_version}.dmg" \ | jq -r .hash) new_hash=$(nix store prefetch-file --json --hash-type sha256 \ - "https://github.com/posit-dev/positron/releases/download/${new_version}/Positron-${new_version}.dmg" \ + "https://cdn.posit.co/positron/dailies/mac/universal/Positron-${new_version}.dmg" \ | jq -r .hash) sed -i "s|$current_hash|$new_hash|g" $positron_nix # Update Linux hash. current_hash=$(nix store prefetch-file --json --hash-type sha256 \ - "https://github.com/posit-dev/positron/releases/download/${current_version}/Positron-${current_version}-x64.deb" \ + "https://cdn.posit.co/positron/dailies/deb/x86_64/Positron-${current_version}-x64.deb" \ | jq -r .hash) new_hash=$(nix store prefetch-file --json --hash-type sha256 \ - "https://github.com/posit-dev/positron/releases/download/${new_version}/Positron-${new_version}-x64.deb" \ + "https://cdn.posit.co/positron/dailies/deb/x86_64/Positron-${new_version}-x64.deb" \ | jq -r .hash) sed -i "s|$current_hash|$new_hash|g" $positron_nix diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix new file mode 100644 index 000000000000..26d58f9e297a --- /dev/null +++ b/pkgs/by-name/po/postfix-tlspol/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "postfix-tlspol"; + version = "1.8.8"; + + src = fetchFromGitHub { + owner = "Zuplu"; + repo = "postfix-tlspol"; + tag = "v${version}"; + hash = "sha256-XEQ2SOITUPmqI/+R7/O9ST5m5lHJT5fcBoBQk7GoOZM="; + }; + + vendorHash = null; + + # don't run tests, they perform checks via the network + doCheck = false; + + ldflags = [ "-X main.Version=${version}" ]; + + meta = { + description = "Lightweight MTA-STS + DANE/TLSA resolver and TLS policy server for Postfix, prioritizing DANE."; + homepage = "https://github.com/Zuplu/postfix-tlspol"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ valodim ]; + }; +} diff --git a/pkgs/by-name/po/postgres-lsp/package.nix b/pkgs/by-name/po/postgres-lsp/package.nix index 538ba40addef..be8814b96a81 100644 --- a/pkgs/by-name/po/postgres-lsp/package.nix +++ b/pkgs/by-name/po/postgres-lsp/package.nix @@ -2,39 +2,46 @@ lib, rustPlatform, fetchFromGitHub, - protobuf, }: - -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "postgres-lsp"; - version = "0-unstable-2024-03-24"; + version = "0.5.0"; src = fetchFromGitHub { - owner = "supabase"; - repo = "postgres_lsp"; - rev = "43ca9b675cb152ca7f38cfa6aff6dd2131dfa9a2"; - hash = "sha256-n7Qbt9fGzC0CcleAtTWDInPz4oaPjI+pvIPrR5EYJ9U="; + owner = "supabase-community"; + repo = "postgres-language-server"; + tag = finalAttrs.version; + hash = "sha256-JRCuqJvC+OBdYe2JORwOfghr7smVLsROwrhk5H+SSkc="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-9T3bm/TSjnFeF8iE4338I44espnFq6l36yOq8YFPaPQ="; + cargoHash = "sha256-lUZpjX3HljOXi0Wt2xZCUru8uinWlngLEs5wlqfFiJA="; nativeBuildInputs = [ - protobuf rustPlatform.bindgenHook ]; - cargoBuildFlags = [ "-p=postgres_lsp" ]; - cargoTestFlags = cargoBuildFlags; + env = { + SQLX_OFFLINE = 1; - RUSTC_BOOTSTRAP = 1; # We need rust unstable features - - meta = with lib; { - description = "Language Server for Postgres"; - homepage = "https://github.com/supabase/postgres_lsp"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - mainProgram = "postgres_lsp"; + # As specified in the upstream: https://github.com/supabase-community/postgres-language-server/blob/main/.github/workflows/release.yml + RUSTFLAGS = "-C strip=symbols -C codegen-units=1"; + PGT_VERSION = finalAttrs.version; }; -} + + cargoBuildFlags = [ "-p=pgt_cli" ]; + cargoTestFlags = finalAttrs.cargoBuildFlags; + checkFlags = [ + # Tries to write to the file system relatively to the current path + "--skip=syntax_error" + ]; + + meta = { + description = "Tools and language server for Postgres"; + homepage = "https://pgtools.dev"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; + mainProgram = "postgrestools"; + }; +}) diff --git a/pkgs/by-name/po/posting/package.nix b/pkgs/by-name/po/posting/package.nix index a46a63d7044e..283a39d8c33f 100644 --- a/pkgs/by-name/po/posting/package.nix +++ b/pkgs/by-name/po/posting/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication rec { pname = "posting"; - version = "2.5.4"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "darrenburns"; repo = "posting"; tag = version; - hash = "sha256-6nFQSGCdmR4qZuleiY0xh76WgBIjs9OZtfpc16b4iws="; + hash = "sha256-CEfApa1TfBovmGMSxqtHZC9aSSEGYTyVXGpRGxLI7Vo="; }; pythonRelaxDeps = true; @@ -23,7 +23,9 @@ python3Packages.buildPythonApplication rec { ]; # Required for x resources themes - buildInputs = [ xorg.xrdb ]; + buildInputs = [ + xorg.xrdb + ]; dependencies = with python3Packages; @@ -41,6 +43,8 @@ python3Packages.buildPythonApplication rec { textual-autocomplete textual openapi-pydantic + tree-sitter-json + tree-sitter-html ] ++ httpx.optional-dependencies.brotli ++ textual.optional-dependencies.syntax; diff --git a/pkgs/by-name/po/powerpipe/package.nix b/pkgs/by-name/po/powerpipe/package.nix index 1834b3973282..8bb44837f8e8 100644 --- a/pkgs/by-name/po/powerpipe/package.nix +++ b/pkgs/by-name/po/powerpipe/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "powerpipe"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "turbot"; repo = "powerpipe"; tag = "v${version}"; - hash = "sha256-nYlhB6EeT98FF/FuYsJXgGfe7+naKwhTmOPy1lX90XQ="; + hash = "sha256-S4NxKxro0K7uplB47CFO0Pm2qz7VvgqHbKxh/6Nd9P4="; }; vendorHash = "sha256-5+IapEYAL4p5jhGhqNw00s42e3dE0cXRDVawq8Fqb08="; diff --git a/pkgs/by-name/po/powershell/package.nix b/pkgs/by-name/po/powershell/package.nix index 8d1366db9651..ef70622303d3 100644 --- a/pkgs/by-name/po/powershell/package.nix +++ b/pkgs/by-name/po/powershell/package.nix @@ -10,7 +10,6 @@ libuuid, libunwind, openssl, - darwin, lttng-ust, pam, testers, @@ -59,9 +58,6 @@ stdenv.mkDerivation rec { libunwind openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.Libsystem - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lttng-ust pam diff --git a/pkgs/by-name/pq/pq-cli/package.nix b/pkgs/by-name/pq/pq-cli/package.nix index e28c93026d70..225ee762b0d7 100644 --- a/pkgs/by-name/pq/pq-cli/package.nix +++ b/pkgs/by-name/pq/pq-cli/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "pq-cli"; - version = "1.0.2-unstable-2025-04-04"; + version = "1.0.2-unstable-2025-04-10"; pyproject = true; src = fetchFromGitHub { owner = "rr-"; repo = "pq-cli"; - rev = "e6d18352c5874364a7bbb65ad41a198838d907ed"; - hash = "sha256-gT9vxz4oAtoatG8dUDJbr60yyKhglFrxNe1SQMKilb8="; + rev = "7790e52a6d3c0f6fbaf45f581f0fb98f78247af6"; + hash = "sha256-lRvjSOhEAur8dhrtpGb89BMD3o6/E1aJjyp+G4xZDnQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index cb6a67f343f2..d417a13e161e 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -25,16 +25,6 @@ let }; }); - geoip2 = super.geoip2.overridePythonAttrs rec { - version = "5.0.1"; - - src = fetchPypi { - pname = "geoip2"; - inherit version; - hash = "sha256-kK+LbTaH877yUfJwitAXsw1ifRFEwAQOq8TJAXqAfYY="; - }; - }; - stripe = super.stripe.overridePythonAttrs rec { version = "7.9.0"; @@ -46,8 +36,6 @@ let }; pretix-plugin-build = self.callPackage ./plugin-build.nix { }; - - sentry-sdk = super.sentry-sdk_2; }; }; diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/by-name/pr/primus/package.nix similarity index 85% rename from pkgs/tools/X11/primus/default.nix rename to pkgs/by-name/pr/primus/package.nix index 1f4964e3aa3a..cb1a886ea962 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/by-name/pr/primus/package.nix @@ -5,19 +5,20 @@ # Other distributions do the same. { stdenv, - stdenv_i686, + pkgsi686Linux, lib, primusLib, writeScriptBin, runtimeShell, - primusLib_i686 ? null, + primusLib_i686 ? + if stdenv.hostPlatform.system == "x86_64-linux" then pkgsi686Linux.primusLib else null, useNvidia ? true, }: let # We override stdenv in case we need different ABI for libGL primusLib_ = primusLib.override { inherit stdenv; }; - primusLib_i686_ = primusLib_i686.override { stdenv = stdenv_i686; }; + primusLib_i686_ = primusLib_i686.override { stdenv = pkgsi686Linux.stdenv; }; primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; }; primus_i686 = diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/by-name/pr/primusLib/package.nix similarity index 87% rename from pkgs/tools/X11/primus/lib.nix rename to pkgs/by-name/pr/primusLib/package.nix index 1beecf73015e..dfe3c58ce1fa 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/by-name/pr/primusLib/package.nix @@ -5,7 +5,8 @@ fetchpatch, libX11, libGL, - nvidia_x11 ? null, + linuxPackages, + nvidia_x11 ? linuxPackages.nvidia_x11.override { libsOnly = true; }, libglvnd, }: @@ -55,14 +56,14 @@ stdenv.mkDerivation { passthru.glvnd = if nvidia_x11 != null && nvidia_x11.useGLVND then nvidia_x11 else null; - meta = with lib; { + meta = { description = "Low-overhead client-side GPU offloading"; homepage = "https://github.com/amonakov/primus"; platforms = [ "i686-linux" "x86_64-linux" ]; - license = licenses.bsd2; - maintainers = with maintainers; [ abbradar ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ abbradar ]; }; } diff --git a/pkgs/by-name/pr/prisma-engines/package.nix b/pkgs/by-name/pr/prisma-engines/package.nix index d7156eaa6ba9..407e53dc3ae2 100644 --- a/pkgs/by-name/pr/prisma-engines/package.nix +++ b/pkgs/by-name/pr/prisma-engines/package.nix @@ -13,17 +13,17 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "6.3.0"; + version = "6.6.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - hash = "sha256-gQLDskabTaNk19BJi9Kv4TiEfVck2QZ7xdhopt5KH6M="; + hash = "sha256-moonBNNGWECGPvhyyeHKKAQRXj5lNP0k99JB+1POMUE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-GLOGivOH8psE5/M5kYakh9Cab4Xe5Q8isY1c6YDyAB8="; + cargoHash = "sha256-BiSo3BgVxiPAfSIPUv0SqH+XgU1Vh4wws0set4cLzDU="; # Use system openssl. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix index 5240f890a1a7..c8870307f989 100644 --- a/pkgs/by-name/pr/prisma/package.nix +++ b/pkgs/by-name/pr/prisma/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "prisma"; - version = "6.3.0"; + version = "6.6.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma"; rev = finalAttrs.version; - hash = "sha256-Buu+E0xxjcrPOyEHkQTp7IVS9kymmR1PTegeOXxb2PA="; + hash = "sha256-AywqYcXzTWaedfHEH2LIaJUv80KFvd7sdADkivLRf5Y="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-rAEUkk3uWVuUDrSRz6d2Ewr3vi4rzYmO0yLTCl21qZ4="; + hash = "sha256-Uc4/iePIaHHXBrl66oRwXS9YDbQ5kTpKXa6q9EztbsA="; }; patchPhase = '' diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index 3e6f66e430a6..d05ab5abcb56 100644 --- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -5,7 +5,7 @@ cmake, cmark, extra-cmake-modules, - fetchpatch, + fetchpatch2, gamemode, ghc_filesystem, jdk17, @@ -45,6 +45,16 @@ stdenv.mkDerivation (finalAttrs: { ln -s ${libnbtplusplus} source/libraries/libnbtplusplus ''; + patches = [ + # https://github.com/PrismLauncher/PrismLauncher/pull/3622 + # https://github.com/NixOS/nixpkgs/issues/400119 + (fetchpatch2 { + name = "fix-qt6.9-compatibility.patch"; + url = "https://github.com/PrismLauncher/PrismLauncher/commit/8bb9b168fb996df9209e1e34be854235eda3d42a.diff"; + hash = "sha256-hOqWBrUrVUhMir2cfc10gu1i8prdNxefTyr7lH6KA2c="; + }) + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/by-name/pr/process-viewer/package.nix b/pkgs/by-name/pr/process-viewer/package.nix index 4dce0784aca0..06fdc363d711 100644 --- a/pkgs/by-name/pr/process-viewer/package.nix +++ b/pkgs/by-name/pr/process-viewer/package.nix @@ -4,8 +4,6 @@ fetchCrate, pkg-config, gtk4, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -22,11 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ gtk4 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Foundation - ]; + buildInputs = [ gtk4 ]; postInstall = '' install -Dm644 assets/fr.guillaume_gomez.ProcessViewer.desktop -t $out/share/applications diff --git a/pkgs/by-name/pr/procmail/package.nix b/pkgs/by-name/pr/procmail/package.nix index f5e2f75bbacd..47f77406421d 100644 --- a/pkgs/by-name/pr/procmail/package.nix +++ b/pkgs/by-name/pr/procmail/package.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { }; patches = [ + # Avoid benchmarking the build machine to determine compilation results + # https://build.opensuse.org/projects/server:mail/packages/procmail/files/reproducible.patch?expand=1 + ./reproducible.patch # Fix clang-16 and gcc-14 build failures: # https://github.com/BuGlessRB/procmail/pull/7 (fetchpatch { diff --git a/pkgs/by-name/pr/procmail/reproducible.patch b/pkgs/by-name/pr/procmail/reproducible.patch new file mode 100644 index 000000000000..7098b1789fb1 --- /dev/null +++ b/pkgs/by-name/pr/procmail/reproducible.patch @@ -0,0 +1,40 @@ +https://bugzilla.opensuse.org/show_bug.cgi?id=1041534 + +Avoid benchmarking the build machine +to determine compilation results + +Index: procmail-3.24/src/autoconf +=================================================================== +--- procmail-3.24.orig/src/autoconf ++++ procmail-3.24/src/autoconf +@@ -951,6 +951,7 @@ void*realloc(),*malloc(); + #endif + int main() + { char*p=malloc(1),*q=0; ++#if 0 + size_t len,last,max=BLKSIZ*64; /* 1M on non-SMALLHEAP systems */ + int count=0; + for(last=len=INITIAL;len<=max+INITIAL;len+=BLKSIZ) +@@ -968,6 +969,7 @@ int main() + { puts("#define INEFFICIENTrealloc"); + exit(1); + } ++#endif + exit(0); + } + HERE +@@ -1248,10 +1250,9 @@ int main(argc,argv)int argc;const char*a + if(!iter) + iter=1; + printf("\ +-/* Your system's strstr() is %.2f times %sER than my C-routine */\n", +- syscnt>=iter?(double)syscnt/iter:(double)iter/syscnt, +- syscnt>=iter?"SLOW":"FAST"); +- if(syscnt>iter+iter/16) /* if at least 1.0625 times slower */ ++/* Your system's strstr() is %sER than my C-routine */\n", ++ "FAST"); ++ if(0) /* always use system strstr to have reproducible binaries */ + printf("\ + #define SLOWstrstr\t\t\t /* using my substitute instead */\n"); + } + diff --git a/pkgs/by-name/pr/projectable/package.nix b/pkgs/by-name/pr/projectable/package.nix index 5b27b6ffe9ce..657d2616f4b7 100644 --- a/pkgs/by-name/pr/projectable/package.nix +++ b/pkgs/by-name/pr/projectable/package.nix @@ -6,8 +6,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,15 +26,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; env = { LIBGIT2_NO_VENDOR = 1; diff --git a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix index 46069bd5468e..e60e4f3d062f 100644 --- a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix @@ -5,17 +5,17 @@ }: let - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "tynany"; repo = "frr_exporter"; rev = "v${version}"; - hash = "sha256-J847Y2ZxD0JLEv7hYS5EsNBA6052PXO6VVoavFrWVUU="; + hash = "sha256-lGS3/lKtNRmG8zM2V1I9vXhMXoqjMHchHZdag0qECR4="; }; in buildGoModule { pname = "prometheus-frr-exporter"; - vendorHash = "sha256-A2lLW19+wtHcNC8Du8HRORVp/JHGjWbEgoadlNmgm80="; + vendorHash = "sha256-T7zurp9Eh1OFuCwyYm3F+cfLi4xdXZyhme9++jxsrzQ="; inherit src version; ldflags = [ diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index 3d805a9bd28a..d36c608385af 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, buildGoModule, fetchFromGitHub, nixosTests, - darwin, }: buildGoModule rec { @@ -24,14 +22,6 @@ buildGoModule rec { # FIXME: tests fail due to read-only nix store doCheck = false; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - IOKit - ] - ); - excludedPackages = [ "docs/node-mixin" ]; ldflags = [ diff --git a/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix b/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix index 94ee81b1b357..842872c65dbe 100644 --- a/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-nvidia-gpu-exporter/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "prometheus-nvidia-gpu-exporter"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "utkuozdemir"; repo = "nvidia_gpu_exporter"; rev = "v${version}"; - hash = "sha256-nBNQqnXomQpEgspC9kmI574Onhkcg7UCXIf7O7XiiH0="; + hash = "sha256-rZwasPgkplX77y05huyNIdqbpJtLtapYsia5RfTmUEI="; }; - vendorHash = "sha256-ZzZ7MJUxXL+rX7SAHHT+KMHDkCDi5qTeAIkg4bAtMio="; + vendorHash = "sha256-ev7k4dSu0ymg2Tn28oTVgEDSyUpaK0POg91ikC9G7Gs="; ldflags = [ "-s" diff --git a/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix b/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix index 7955ff2ca6f9..6a3547a37f91 100644 --- a/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "smartctl_exporter"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = pname; tag = "v${version}"; - hash = "sha256-0WppsqDl4nKa6s/dyX9zsUzoqAgStDSBWMM0eolTPdk="; + hash = "sha256-9woQgqkPYKMu8p35aeSv3ua1l35BuMzFT4oCVpmyG2E="; }; - vendorHash = "sha256-Sy/lm55NAhYDdVLli5yQpoRVieJU8RJDRFzd4Len6eg="; + vendorHash = "sha256-bDO7EgCjmObNaYHllczDKuFyKTKH0iCFDSLke6VMsHI="; postPatch = '' substituteInPlace main.go README.md \ diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index 0908777635bb..ba292c344d7e 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -32,10 +32,10 @@ }: let - version = "3.1.0"; + version = "3.3.0"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-05DaaDIFtADnkLFqdHe5eUvo6LRz6BduMvGVmzOeurM="; + hash = "sha256-hF8eLIaef4Z5ZGyjqX1Wyd/DD4Bk571ODQ11b+nHTTA="; }; in buildGoModule rec { @@ -52,10 +52,10 @@ buildGoModule rec { owner = "prometheus"; repo = "prometheus"; tag = "v${version}"; - hash = "sha256-Q3f0L6cRVQRL1AHgUI3VNbMG9eTfcApbXfSjOTHr7Go="; + hash = "sha256-WZR6c7uN8I+egoqABaWay0MfA3tv3O74jlrkC/1zt10="; }; - vendorHash = "sha256-vQwBnSxoyIYTeWLk3GD9pKDuUjjsMfwPptgyVnzcTok="; + vendorHash = "sha256-xBopACaDrtGveVoza/WIge9m5bBAxnZC+qtsuAF20J4="; excludedPackages = [ "documentation/prometheus-mixin" diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index c073a3a72c00..d7d23d039b38 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, rustPlatform, - darwin, libiconv, makeBinaryWrapper, pkg-config, @@ -11,20 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.47.9"; + version = "0.47.11"; src = fetchFromGitHub { owner = "moonrepo"; repo = "proto"; rev = "v${version}"; - hash = "sha256-cyRChMYYkqsTto91jZLxSrAbuYEeDcm3iXjLc23UqBI="; + hash = "sha256-2Lyd2wa47VhBz4HHHw2qG2RgUlPDWZPvVTIPAknaIVE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-aknPt5hDzuWKp91VurQ5I9izNDvbVNCHzlD6mLn7y+8="; + cargoHash = "sha256-3zN7t3yplRm4/P0m316uSooDftgJicvWIvz34jzOmBY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration libiconv ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/protobufc/package.nix b/pkgs/by-name/pr/protobufc/package.nix index 7273982206f5..8531f723018e 100644 --- a/pkgs/by-name/pr/protobufc/package.nix +++ b/pkgs/by-name/pr/protobufc/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "protobuf-c"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "protobuf-c"; repo = "protobuf-c"; tag = "v${version}"; - hash = "sha256-usfONVSq0/V9GRrBx9RwO/hCrVJ8d17mvAgTKpKUssQ="; + hash = "sha256-bpxk2o5rYLFkx532A3PYyhh2MwVH2Dqf3p/bnNpQV7s="; }; outputs = [ diff --git a/pkgs/by-name/pr/protols/package.nix b/pkgs/by-name/pr/protols/package.nix index 82713b176a63..e170726270ee 100644 --- a/pkgs/by-name/pr/protols/package.nix +++ b/pkgs/by-name/pr/protols/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "protols"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "coder3101"; repo = "protols"; tag = version; - hash = "sha256-SW7Ef4HRuv1z2QwHqj+S9MO9t4Pi+uDRYFPxb82y4Nc="; + hash = "sha256-APGjh6+dNubxiyS5BI6pMXMBQ50ij6NnxSWZlbJ7FWk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bl9N6Kv01QSZAr7BXLNJ2owcwtxP+vhTXUWLAud2npA="; + cargoHash = "sha256-L9nOVgfLoZDqKWsLBG9ph0TmlPej13S3KmgbLcumw8I="; meta = { description = "Protocol Buffers language server written in Rust"; diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index 78b3f2f62bb5..b719eb868920 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.30.1"; + version = "1.31.1"; src = fetchurl { url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb"; - hash = "sha256-0IEQAzK3Pu195kjpo9l2HdLUCySR0HKSl1M8Z9URgJA="; + hash = "sha256-OYd26KTq2uoZzqyb2ntk3bS5cKcJJ7od0VIHfSK8lqs="; }; dontConfigure = true; diff --git a/pkgs/by-name/pr/prowlarr/package.nix b/pkgs/by-name/pr/prowlarr/package.nix index 6fc633cee1f5..dbb681dabf42 100644 --- a/pkgs/by-name/pr/prowlarr/package.nix +++ b/pkgs/by-name/pr/prowlarr/package.nix @@ -37,16 +37,16 @@ let hash = { - aarch64-darwin = "sha256-5wuBChkTOljCPPRsQw6KRKbpqjW5GwJWWw8EBDVsIw0="; - aarch64-linux = "sha256-4bqK+fEkYk9LK3suWgqoSzf9vKtPpbYGuEL62M/KHR4="; - x86_64-darwin = "sha256-azG6bG7zwzZ/VU5TfjS7w3OecRb4ovgAbjlAcIyGBCM="; - x86_64-linux = "sha256-bHdI+eVBQAPQAceP2zDnxj9uh/z5aA84W1leFO5Fw0w="; + aarch64-darwin = "sha256-glN+QlawtpG9aZ2ROCRkDjNCLTLh8IUWs695XShDhzI="; + aarch64-linux = "sha256-oyeZrUC2l5O62fknNBdfwEH3p2tFXX8fFrEaA7vWoRg="; + x86_64-darwin = "sha256-58io1d+mKcXvcoMQzGBIOQg2b6ehLQS2G6r0RnR+blw="; + x86_64-linux = "sha256-8owcCOPSKfZrAxeuGT8dZnmnbAtQiyv12K9Yr0KJhQE="; } .${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.32.2.4987"; + version = "1.33.3.5008"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index 487d388bbc9f..9677e9f0ce03 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -21,14 +21,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "prowler"; - version = "5.4.4"; + version = "5.5.1"; pyproject = true; src = fetchFromGitHub { owner = "prowler-cloud"; repo = "prowler"; tag = version; - hash = "sha256-OuPhP4PMBqs3dAwY/Ln0Z4hwO3lPaJm4eYcl7AHy9vM="; + hash = "sha256-SljpmFZNfenLB+meJHjnGsnDCRBi+60/IMlJLWtBw7Q="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/pr/prr/package.nix b/pkgs/by-name/pr/prr/package.nix index 4715f0cf80ca..d16e452b3a9c 100644 --- a/pkgs/by-name/pr/prr/package.nix +++ b/pkgs/by-name/pr/prr/package.nix @@ -2,10 +2,8 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, openssl, pkg-config, - darwin, }: rustPlatform.buildRustPackage rec { @@ -22,12 +20,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-VIJFr1HpXMC2DXt79Yb1DuLYSbo9g6zsXaNDTXjtlR4="; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ps/ps3-disc-dumper/deps.json b/pkgs/by-name/ps/ps3-disc-dumper/deps.json index 27ac4d95fd0a..18356a70dd57 100644 --- a/pkgs/by-name/ps/ps3-disc-dumper/deps.json +++ b/pkgs/by-name/ps/ps3-disc-dumper/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Avalonia", - "version": "11.2.3", - "hash": "sha256-NUoyXJkIsgbkcKFVb10VRafM4ViHs801c/7vhu3ssUY=" + "version": "11.2.7", + "hash": "sha256-WXMsXV1xRvgDcLcEvxUCK9hOXOhYKzizOuJw0fyDz6U=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -11,58 +11,53 @@ }, { "pname": "Avalonia.BuildServices", - "version": "0.0.29", - "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + "version": "0.0.31", + "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" }, { "pname": "Avalonia.Desktop", - "version": "11.2.3", - "hash": "sha256-srtZi+kDbhRtMl33l91zssBWETU5oHodKbbWyfEsb/I=" + "version": "11.2.7", + "hash": "sha256-j9o9OuaNhOKrkUfY5I2kp8N+aDP/xcTD2Es48o64INs=" }, { "pname": "Avalonia.Fonts.Inter", - "version": "11.2.3", - "hash": "sha256-ySsCXVpjqjCX/uYkwluSfrAoBtuq9k7fC1bFjxKC9/Q=" + "version": "11.2.7", + "hash": "sha256-HJPHFEHUmvuAl4oeC0U+RGKt55qg7wdYooFVZm/rmTc=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.3", - "hash": "sha256-3sNemBmZE06w2ul87T5HrEeHUxXMOa9MfQhpI4AoxDY=" + "version": "11.2.7", + "hash": "sha256-on2Fwm37hV2duC2kYbDfIo5SdBqJM61YSI7wtQrmFvM=" }, { "pname": "Avalonia.Native", - "version": "11.2.3", - "hash": "sha256-2Gp98NGWcrILqF+P5PDMPRdsMby/lZiT3eWAUskFim8=" - }, - { - "pname": "Avalonia.ReactiveUI", - "version": "11.2.3", - "hash": "sha256-NqRetBiFg5gNCS8C0J1JJJsZ4sz+w+GoEegGFddBGDg=" + "version": "11.2.7", + "hash": "sha256-82QIEiB50Quk4paFWpkMArKf7TBtgy4BhywS57tUB7c=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.3", - "hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw=" + "version": "11.2.7", + "hash": "sha256-Kry9PxzsqZeQKEFOFWme2m2O+aVYuC4ixJ12n9TmOzA=" }, { "pname": "Avalonia.Skia", - "version": "11.2.3", - "hash": "sha256-QBp8wTA92hGwbmNSVL4gsjrqA9CfwDPgdTiOEqcogGA=" + "version": "11.2.7", + "hash": "sha256-RUb31FfQJKWWv1vYlfcly4s0mfips7/6YVu1M9PSFdk=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.2.3", - "hash": "sha256-DRl+267mUtJDUJpreUj6BxDLGGYGkEEo5vDGtGguoC8=" + "version": "11.2.7", + "hash": "sha256-QL2i0X/E2cz2xeUfQb2ISifg5a4c0sXDVbBhq9DVq2c=" }, { "pname": "Avalonia.Win32", - "version": "11.2.3", - "hash": "sha256-xKFKObvqdJaQjphEktRJvzmAoDEsKg3WqlEG31V3qLE=" + "version": "11.2.7", + "hash": "sha256-pOBcMcGE3XFrdikgh4XwVB8WbK+1rgNUbOpjJ11sVGc=" }, { "pname": "Avalonia.X11", - "version": "11.2.3", - "hash": "sha256-SD4dmpKx4l8YOyUnrA0fnf2Bb+tHSNyARh7GAtHyg60=" + "version": "11.2.7", + "hash": "sha256-5yadbNSkrHrjFBrEY3uCjF9yERZqK5peh7PIAx9E3HU=" }, { "pname": "CommunityToolkit.Mvvm", @@ -94,11 +89,6 @@ "version": "0.16.13", "hash": "sha256-zEtRSgTtH3xXbhUH7XaKUilhYOyur3xiIDKLTi7pk2A=" }, - { - "pname": "DynamicData", - "version": "8.4.1", - "hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4=" - }, { "pname": "HarfBuzzSharp", "version": "7.3.0.3", @@ -154,11 +144,6 @@ "version": "1.0.2", "hash": "sha256-ZUj6YFSMZp5CZtXiamw49eZmbp1iYBuNsIKNnjxcRzA=" }, - { - "pname": "ReactiveUI", - "version": "20.1.1", - "hash": "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE=" - }, { "pname": "SkiaSharp", "version": "2.88.9", @@ -184,25 +169,15 @@ "version": "2.88.9", "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, - { - "pname": "Splat", - "version": "15.1.1", - "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg=" - }, { "pname": "System.CodeDom", - "version": "9.0.1", - "hash": "sha256-AhoLbz7WIP5tV7dExnYxRgFGl4NgSXA3R7h2SzaW0Wc=" - }, - { - "pname": "System.ComponentModel.Annotations", - "version": "5.0.0", - "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" + "version": "9.0.4", + "hash": "sha256-X8IDHw/ssp0vgPSnyM/tmDTb3poH6GLe+gZ4MR9qfho=" }, { "pname": "System.IO.Hashing", - "version": "9.0.1", - "hash": "sha256-IJru9BdFNsNs7FbG+F9djJdkkWdpoz2IxQ+GgvKvUOs=" + "version": "9.0.4", + "hash": "sha256-rbcQzEncB3VuUZIcsE1tq30suf5rvRE4HkE+0lR/skU=" }, { "pname": "System.IO.Pipelines", @@ -211,24 +186,14 @@ }, { "pname": "System.Management", - "version": "9.0.1", - "hash": "sha256-dHSBGiI5OWxNQF/7ZrcVDRybYwdDOMyIUNDSGh0Gpz0=" + "version": "9.0.4", + "hash": "sha256-+sW/NQELaBGjUfzndaNLPHKKQVdI1yOJMaqF4tV2SVY=" }, { "pname": "System.Memory", "version": "4.5.5", "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=" }, - { - "pname": "System.Reactive", - "version": "6.0.0", - "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" - }, - { - "pname": "System.Reactive", - "version": "6.0.1", - "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" - }, { "pname": "System.Security.AccessControl", "version": "5.0.0", diff --git a/pkgs/by-name/ps/ps3-disc-dumper/package.nix b/pkgs/by-name/ps/ps3-disc-dumper/package.nix index 59553b16acda..c3f0a571b961 100644 --- a/pkgs/by-name/ps/ps3-disc-dumper/package.nix +++ b/pkgs/by-name/ps/ps3-disc-dumper/package.nix @@ -10,13 +10,13 @@ buildDotnetModule rec { pname = "ps3-disc-dumper"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "13xforever"; repo = "ps3-disc-dumper"; tag = "v${version}"; - hash = "sha256-FtKFX7w60lAt7aMg/KNumFGESluYZf1/vzjdkLctkqs="; + hash = "sha256-kSbSt8LObcN+cVJH1OgrLQsN0+bmT0FRquW54L4a/Wo="; }; dotnet-sdk = dotnetCorePackages.sdk_9_0; diff --git a/pkgs/by-name/ps/psc-package/package.nix b/pkgs/by-name/ps/psc-package/package.nix index dcdceee7cd93..0b69b4db9bd0 100644 --- a/pkgs/by-name/ps/psc-package/package.nix +++ b/pkgs/by-name/ps/psc-package/package.nix @@ -6,7 +6,6 @@ gmp, zlib, libiconv, - darwin, installShellFiles, }: @@ -52,7 +51,6 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool \ - -change /usr/lib/libSystem.B.dylib ${darwin.Libsystem}/lib/libSystem.B.dylib \ -change /usr/lib/libiconv.2.dylib ${libiconv}/libiconv.2.dylib \ $PSC_PACKAGE '' diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index bf234bc22bda..174a3b39f63a 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.239.0"; + version = "0.241.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-y7SIZ/upQrzHQbncEyJM5OrJDXDuh7It3lOWSn3Y7hI="; + sha256 = "sha256-he9LLC8ijbgfmTDVURKZhU5RyOJC8U4vjPQBNNtC9WI="; }; - vendorHash = "sha256-qcv5pFCibYSJvekSmj4iLeQWunW9+U/mbzbaGTp1sso="; + vendorHash = "sha256-Gt2dDgIAn7Hjlb2VI5VBKP7IfzkMZvCyLmOYYBtLx3o="; ldflags = [ "-s" diff --git a/pkgs/by-name/ps/psst/package.nix b/pkgs/by-name/ps/psst/package.nix index ebc533b9bbe7..7e4b008f94bf 100644 --- a/pkgs/by-name/ps/psst/package.nix +++ b/pkgs/by-name/ps/psst/package.nix @@ -33,17 +33,17 @@ let in rustPlatform.buildRustPackage { pname = "psst"; - version = "0-unstable-2025-02-22"; + version = "0-unstable-2025-04-18"; src = fetchFromGitHub { owner = "jpochyla"; repo = "psst"; - rev = "dd47c302147677433d70b398b1bcd7f1ade87638"; - hash = "sha256-EMjY8Tu+ssO30dD2qsvi3FAkt/UlXwM/ss2/FcyNNgI="; + rev = "062ed4bca8119ec77a8e50e5d6b71281356f2642"; + hash = "sha256-xYGGfbuxKb42kGOSbGsQCs6SNPreW4k6/SfpVXx8t5E="; }; useFetchCargoVendor = true; - cargoHash = "sha256-0UllCmIe6oEl2Ecl4nqSk9ODdgso5ucX8T5nG3dVwbE="; + cargoHash = "sha256-gt2EDrZ+XXig5JUsmQksSLaFd7UArnttOT4UiTVASXw="; # specify the subdirectory of the binary crate to build from the workspace buildAndTestSubdir = "psst-gui"; diff --git a/pkgs/by-name/ps/pstoedit/package.nix b/pkgs/by-name/ps/pstoedit/package.nix index af1916667b2d..3a09cd624692 100644 --- a/pkgs/by-name/ps/pstoedit/package.nix +++ b/pkgs/by-name/ps/pstoedit/package.nix @@ -2,7 +2,6 @@ stdenv, fetchurl, pkg-config, - darwin, lib, zlib, ghostscript, @@ -42,13 +41,9 @@ stdenv.mkDerivation rec { libjpeg libwebp ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - libiconv - ApplicationServices - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; # '@LIBPNG_LDFLAGS@' is no longer substituted by autoconf (the code is commented out) # so we need to remove it from the pkg-config file as well diff --git a/pkgs/by-name/pt/ptcollab/package.nix b/pkgs/by-name/pt/ptcollab/package.nix index 67eeddb61681..372da09be9db 100644 --- a/pkgs/by-name/pt/ptcollab/package.nix +++ b/pkgs/by-name/pt/ptcollab/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ptcollab"; - version = "0.6.4.8"; + version = "0.6.4.9"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${finalAttrs.version}"; - hash = "sha256-9u2K79QJRfYKL66e1lsRrQMEqmKTWbK+ucal3/u4rP4="; + hash = "sha256-1fVhimwBAYtC+HnuxA7ywfEnVlqHnlzwfKT9+H/ZG0k="; }; nativeBuildInputs = diff --git a/pkgs/by-name/pu/puffin/package.nix b/pkgs/by-name/pu/puffin/package.nix index ac3959e111c4..07205ed25b61 100644 --- a/pkgs/by-name/pu/puffin/package.nix +++ b/pkgs/by-name/pu/puffin/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "puffin"; - version = "2.1.1"; + version = "2.1.3"; src = fetchFromGitHub { owner = "siddhantac"; repo = pname; rev = "v${version}"; - hash = "sha256-5lglIiVOsxnMbeR/E3O5TaMtoR5DJACWjStE4d7hDao="; + hash = "sha256-1qF5KOu2Se49Dw8QrSeUYIx9Yf0MCY/nbLu9IFnHxpA="; }; vendorHash = "sha256-ZxAqR3D5VUtbntktrpnywPG3m9rq1utO4fdum0Qe6TU="; diff --git a/pkgs/by-name/pu/pulsar/update.mjs b/pkgs/by-name/pu/pulsar/update.mjs index 4da49b268d9a..215092faab02 100755 --- a/pkgs/by-name/pu/pulsar/update.mjs +++ b/pkgs/by-name/pu/pulsar/update.mjs @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell /* -#!nix-shell -i node -p nodejs_18 +#!nix-shell -i node -p nodejs */ import { promises as fs } from 'node:fs'; diff --git a/pkgs/by-name/pu/pulumictl/package.nix b/pkgs/by-name/pu/pulumictl/package.nix index 110b623787bf..3f1c059d75d8 100644 --- a/pkgs/by-name/pu/pulumictl/package.nix +++ b/pkgs/by-name/pu/pulumictl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pulumictl"; - version = "0.0.48"; + version = "0.0.49"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumictl"; rev = "v${version}"; - sha256 = "sha256-rFVxfWeESWmqH0BhKY6BO5AxSPXVW8tOPGyUXB5Kc/E="; + sha256 = "sha256-VEfDKkavZWWxfE1J2Cy/lnPyHiOJWOtwwcYpeb1pkkM="; }; - vendorHash = "sha256-x5CBSzwOfX0BwwbAOuW1ibrLnnkVSNjqG0Sj2EcmRbM="; + vendorHash = "sha256-IqJdbeayUcTTEiPAar1goqubAjTavJNYOzCyKXGd0Q8="; ldflags = [ "-s" diff --git a/pkgs/by-name/pw/pwsafe/package.nix b/pkgs/by-name/pw/pwsafe/package.nix index 0ef4f94a3df1..49e631789eb4 100644 --- a/pkgs/by-name/pw/pwsafe/package.nix +++ b/pkgs/by-name/pw/pwsafe/package.nix @@ -20,13 +20,9 @@ curl, openssl, file, - darwin, gitUpdater, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation rec { pname = "pwsafe"; version = "1.20.0"; # do NOT update to 3.x Windows releases @@ -66,9 +62,6 @@ stdenv.mkDerivation rec { libuuid libyubikey yubikey-personalization - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa ]; cmakeFlags = diff --git a/pkgs/by-name/py/pychess/package.nix b/pkgs/by-name/py/pychess/package.nix index fdf109bb150a..c1e86e79b441 100644 --- a/pkgs/by-name/py/pychess/package.nix +++ b/pkgs/by-name/py/pychess/package.nix @@ -8,6 +8,7 @@ gtk3, gst_all_1, gtksourceview, + writableTmpDirAsHomeHook, }: python3Packages.buildPythonApplication rec { @@ -25,6 +26,7 @@ python3Packages.buildPythonApplication rec { pkg-config gobject-introspection wrapGAppsHook3 + writableTmpDirAsHomeHook ]; buildInputs = [ @@ -50,7 +52,6 @@ python3Packages.buildPythonApplication rec { ''; preBuild = '' - export HOME=$(mktemp -d) export PYTHONPATH=./lib:$PYTHONPATH python pgn2ecodb.py python create_theme_preview.py diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix index 5851bcd5475e..578ef30da73e 100644 --- a/pkgs/by-name/py/pyfa/package.nix +++ b/pkgs/by-name/py/pyfa/package.nix @@ -10,7 +10,7 @@ copyDesktopItems, }: let - version = "2.62.2"; + version = "2.62.3"; in python3Packages.buildPythonApplication rec { inherit version; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { owner = "pyfa-org"; repo = "Pyfa"; tag = "v${version}"; - hash = "sha256-7YFObKV4vXiTWgCfek7k4yVq7IG3JMtaB36Jhu7rGjk="; + hash = "sha256-PqiwZwok7Mv1M4txU3D5MZYu8WxDCetLmvTqZ30rypY="; }; desktopItems = [ diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 3a1b8c5da185..08ddc3341f28 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.4.4"; + version = "2.4.5"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; tag = version; - hash = "sha256-Vj4Gn9zV0opvLaaMGv8zdS4tYqek0z6ppAhY+nnY6FM="; + hash = "sha256-s93zuBS2jpGLTKKGvna1Zc+ph6A6kemgfkl8j7uSdKY="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 91077b29dbe7..ed278678450d 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -7,13 +7,13 @@ }: let - version = "1.1.397"; + version = "1.1.399"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; tag = version; - hash = "sha256-hae897LVowpgd3mWttBJAEuLiMPt0J4Z0WfMQ68RFZY="; + hash = "sha256-AEdzc0ZC40k+ZUOL6JmFTR2iFYUiQMKnilPFLKoBbDY="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -44,7 +44,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-sk66nzCyU2ZRhq65B4Z5dVwRz096Mdw14fWojIfIsnE="; + npmDepsHash = "sha256-idKRVd3xYreLQe5cc5jRYCB6BKsnrBbYs91FdnNE1KU="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -58,7 +58,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-UpDvOgR7j5Z6/ht/QFoGaUuf6TxMujAq76YmONDkOfU="; + npmDepsHash = "sha256-lgnTbvlwOcGr2E/X6pMebxwaIXo/Fqd8cjcSUmihKe4="; postPatch = '' chmod +w ../../ diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/by-name/py/pysolfc/package.nix similarity index 100% rename from pkgs/games/pysolfc/default.nix rename to pkgs/by-name/py/pysolfc/package.nix diff --git a/pkgs/games/pysolfc/pysolfc-datadir.patch b/pkgs/by-name/py/pysolfc/pysolfc-datadir.patch similarity index 100% rename from pkgs/games/pysolfc/pysolfc-datadir.patch rename to pkgs/by-name/py/pysolfc/pysolfc-datadir.patch diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix index 5bd8232868ec..e93f4c3ef4d1 100644 --- a/pkgs/by-name/py/pywal16/package.nix +++ b/pkgs/by-name/py/pywal16/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pywal16"; - version = "3.8.5"; + version = "3.8.6"; pyproject = true; src = fetchFromGitHub { owner = "eylles"; repo = "pywal16"; tag = version; - hash = "sha256-At8WgobO65SfFAVh37MGe34C0zyg3m6iJ9hxPkUMITg="; + hash = "sha256-aq9I9KJnzwFjfLZ2fzW80abJQ/oSX7FcmCXYi1JMY7Q="; }; build-system = [ python3.pkgs.setuptools ]; diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix index dc58f31322c4..b4cc6047b1b7 100644 --- a/pkgs/by-name/q2/q2pro/package.nix +++ b/pkgs/by-name/q2/q2pro/package.nix @@ -32,18 +32,18 @@ stdenv.mkDerivation (finalAttrs: rec { pname = "q2pro"; - version = "0-unstable-2025-04-03"; + version = "0-unstable-2025-04-18"; src = fetchFromGitHub { owner = "skullernet"; repo = "q2pro"; - rev = "0e00beedaa892fd5f6e50d33231978846ab2d5de"; - hash = "sha256-xw09M7EtXJ7i6myj/Em0Rtg5CmZtpbyRWmkPhCApu7I="; + rev = "1cc95be8bb967f4274e54a6d7251e4cd7f5ed9c1"; + hash = "sha256-7dsFzCnWiVNioyRIW0KjicfgGTxjozicUpDJG5jGvB0="; }; # build date and rev number is displayed in the game's console - revCount = "3749"; # git rev-list --count ${src.rev} - SOURCE_DATE_EPOCH = "1743706497"; # git show -s --format=%ct ${src.rev} + revCount = "3782"; # git rev-list --count ${src.rev} + SOURCE_DATE_EPOCH = "1744997502"; # git show -s --format=%ct ${src.rev} nativeBuildInputs = [ diff --git a/pkgs/by-name/qg/qgrep/package.nix b/pkgs/by-name/qg/qgrep/package.nix index dbcd06c4ce67..a6961947e75c 100644 --- a/pkgs/by-name/qg/qgrep/package.nix +++ b/pkgs/by-name/qg/qgrep/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, fetchpatch, - darwin, }: stdenv.mkDerivation rec { @@ -26,11 +25,6 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.CoreFoundation - ]; - env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=unused-command-line-argument" diff --git a/pkgs/by-name/qi/qidi-slicer-bin/package.nix b/pkgs/by-name/qi/qidi-slicer-bin/package.nix index 416f4e4b22e5..a27fd1940f90 100644 --- a/pkgs/by-name/qi/qidi-slicer-bin/package.nix +++ b/pkgs/by-name/qi/qidi-slicer-bin/package.nix @@ -3,15 +3,16 @@ fetchurl, webkitgtk_4_1, libsoup_3, + libpng, lib, }: let pname = "qidi-slicer"; - version = "1.2.1"; + version = "1.2.3"; src = fetchurl { - url = "https://github.com/QIDITECH/QIDISlicer/releases/download/V${version}/QIDISlicer_${version}_Linux_ubuntu_24.04.AppImage"; - hash = "sha256-sKdNAhnL2jk4UaSxFwKEFKGiC3kvpkyXRzbMXVAg7Kk="; + url = "https://github.com/QIDITECH/QIDISlicer/releases/download/V${version}/QIDISlicer_${version}_Linux_Ubuntu24.AppImage"; + hash = "sha256-76bdVQu+xCf6uCwkHcpLNNna5MgHm4vbuwMFoQ26N0Y="; }; appimageContents = appimageTools.extract { @@ -23,6 +24,7 @@ appimageTools.wrapType2 { extraPkgs = pkgs: [ webkitgtk_4_1 libsoup_3 + libpng ]; extraInstallCommands = '' diff --git a/pkgs/by-name/ql/qlog/package.nix b/pkgs/by-name/ql/qlog/package.nix new file mode 100644 index 000000000000..9a6121bdb15f --- /dev/null +++ b/pkgs/by-name/ql/qlog/package.nix @@ -0,0 +1,63 @@ +{ + fetchFromGitHub, + stdenv, + lib, + cups, + hamlib, + pkg-config, + qt6, + qt6Packages, +}: + +stdenv.mkDerivation rec { + pname = "qlog"; + version = "0.43.1"; + + src = fetchFromGitHub { + owner = "foldynl"; + repo = "QLog"; + tag = "v${version}"; + hash = "sha256-D3WtvSHDauo/9py9To2Kn+20vrSvgw+b1+H0inNnRJI="; + fetchSubmodules = true; + }; + + env.NIX_LDFLAGS = "-lhamlib"; + + buildInputs = + [ + hamlib + qt6.qtbase + qt6.qtcharts + qt6.qtserialport + qt6.qtwebchannel + qt6.qtwebengine + qt6Packages.qtkeychain + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cups + ]; + + nativeBuildInputs = [ + pkg-config + qt6.qmake + qt6.wrapQtAppsHook + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/{Applications,bin} + mv $out/{qlog.app,Applications} + ln -s $out/Applications/qlog.app/Contents/MacOS/qlog $out/bin/qlog + ''; + + meta = { + description = "Amateur radio logbook software"; + mainProgram = "qlog"; + license = with lib.licenses; [ gpl3Only ]; + homepage = "https://github.com/foldynl/QLog"; + maintainers = with lib.maintainers; [ + oliver-koss + mkg20001 + ]; + platforms = with lib.platforms; unix; + }; +} diff --git a/pkgs/by-name/qp/qpdf/package.nix b/pkgs/by-name/qp/qpdf/package.nix index 618e9741370b..857ea50290a1 100644 --- a/pkgs/by-name/qp/qpdf/package.nix +++ b/pkgs/by-name/qp/qpdf/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpdf"; - version = "11.10.0"; + version = "11.10.1"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${finalAttrs.version}"; - hash = "sha256-X5VF7kwnpNNWuQ7iA12qh6JwGU/40EKnGxWst0U+T8k="; + hash = "sha256-MkJpbAIoPZmsYupOjQKOwZomh/rUF+r/kKTdHfT5Dc8="; }; outputs = [ diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix index 18330dd65404..eea168fec2a9 100644 --- a/pkgs/by-name/qu/quill-log/package.nix +++ b/pkgs/by-name/qu/quill-log/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "quill-log"; - version = "9.0.1"; + version = "9.0.2"; src = fetchFromGitHub { owner = "odygrd"; repo = "quill"; rev = "v${version}"; - hash = "sha256-RPffzaFrkV7w40CAQLAXV47EyWv4M7pShaY7Phsmw1o="; + hash = "sha256-8BXdSITZKdJSstS4LbOCT9BedFHbmd/6bAPiQsCC+8Y="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/qu/quisk/package.nix b/pkgs/by-name/qu/quisk/package.nix index e9d10a52cfd8..69312e3b20a4 100644 --- a/pkgs/by-name/qu/quisk/package.nix +++ b/pkgs/by-name/qu/quisk/package.nix @@ -9,11 +9,11 @@ python3.pkgs.buildPythonApplication rec { pname = "quisk"; - version = "4.2.41"; + version = "4.2.42"; src = fetchPypi { inherit pname version; - hash = "sha256-du6VcKn5WvLnlUrW9tKWT7MlMIZ2bpkrsO4yHC8cM6Q="; + hash = "sha256-Di5B0irH6G8XQtwXVDk4FXwLRo5Nh+cyt9zsG7+dMkc="; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch b/pkgs/by-name/qu/qutebrowser/fix-restart.patch similarity index 100% rename from pkgs/applications/networking/browsers/qutebrowser/fix-restart.patch rename to pkgs/by-name/qu/qutebrowser/fix-restart.patch diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/by-name/qu/qutebrowser/package.nix similarity index 89% rename from pkgs/applications/networking/browsers/qutebrowser/default.nix rename to pkgs/by-name/qu/qutebrowser/package.nix index 66a2fc921c56..21b7878cb75b 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/by-name/qu/qutebrowser/package.nix @@ -4,7 +4,6 @@ fetchurl, fetchzip, python3, - wrapQtAppsHook, glib-networking, asciidoc, docbook_xml_dtd_45, @@ -14,9 +13,7 @@ withPdfReader ? true, pipewireSupport ? stdenv.hostPlatform.isLinux, pipewire, - qtwayland, - qtbase, - qtwebengine, + qt6Packages, enableWideVine ? false, widevine-cdm, # can cause issues on some graphics chips @@ -25,18 +22,18 @@ }: let - isQt6 = lib.versions.major qtbase.version == "6"; + isQt6 = lib.versions.major qt6Packages.qtbase.version == "6"; pdfjs = let - version = "4.2.67"; + version = "5.1.91"; in fetchzip { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip"; - hash = "sha256-7kfT3+ZwoGqZ5OwkO9h3DIuBFd0v8fRlcufxoBdcy8c="; + hash = "sha256-e1zBpH9F8TI4ET4FvkxJsoOYVKLWJBP2KaNNC2kpaVk="; stripRoot = false; }; - version = "3.4.0"; + version = "3.5.0"; in python3.pkgs.buildPythonApplication { @@ -46,7 +43,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; - hash = "sha256-gUEkwO0zdDDmE6HaNm1eOJBMsgSa+xUFlxRWylymIj4="; + hash = "sha256-+hQsjRwoJbBotxs2BKiy1oLi7YShTD5ott54RDMdgLs="; }; # Needs tox @@ -54,11 +51,11 @@ python3.pkgs.buildPythonApplication { buildInputs = [ - qtbase + qt6Packages.qtbase glib-networking ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland + qt6Packages.qtwayland ]; build-system = with python3.pkgs; [ @@ -66,7 +63,7 @@ python3.pkgs.buildPythonApplication { ]; nativeBuildInputs = [ - wrapQtAppsHook + qt6Packages.wrapQtAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl @@ -148,7 +145,7 @@ python3.pkgs.buildPythonApplication { --set-default QSG_RHI_BACKEND vulkan ''} ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''} - --set QTWEBENGINE_RESOURCES_PATH "${qtwebengine}/resources" + --set QTWEBENGINE_RESOURCES_PATH "${qt6Packages.qtwebengine}/resources" ) ''; @@ -158,7 +155,7 @@ python3.pkgs.buildPythonApplication { description = "Keyboard-focused browser with a minimal GUI"; license = licenses.gpl3Plus; mainProgram = "qutebrowser"; - platforms = if enableWideVine then [ "x86_64-linux" ] else qtwebengine.meta.platforms; + platforms = if enableWideVine then [ "x86_64-linux" ] else qt6Packages.qtwebengine.meta.platforms; maintainers = with maintainers; [ jagajaga rnhmjoj diff --git a/pkgs/by-name/r0/r0vm/package.nix b/pkgs/by-name/r0/r0vm/package.nix index 2620a8d0057d..1c7f55d5f828 100644 --- a/pkgs/by-name/r0/r0vm/package.nix +++ b/pkgs/by-name/r0/r0vm/package.nix @@ -1,13 +1,11 @@ { rustPlatform, - stdenv, fetchFromGitHub, fetchurl, pkg-config, perl, openssl, lib, - darwin, }: rustPlatform.buildRustPackage rec { pname = "r0vm"; @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { perl ]; - buildInputs = - [ - openssl.dev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl.dev + ]; doCheck = false; diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix index ce5073e41d83..8ff252ef6fdf 100644 --- a/pkgs/by-name/r2/r2modman/package.nix +++ b/pkgs/by-name/r2/r2modman/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "r2modman"; - version = "3.1.57"; + version = "3.1.58"; src = fetchFromGitHub { owner = "ebkr"; repo = "r2modmanPlus"; rev = "v${finalAttrs.version}"; - hash = "sha256-1b24tclqXGx85BGFYL9cbthLScVWau2OmRh9YElfCLs="; + hash = "sha256-ICLKkhgEi0ThWHLgm9fr0QXXtWMCAOJ6nkD66JR8XMo="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix index 5b4acfd1c8b8..262de4fba351 100644 --- a/pkgs/by-name/ra/radicle-httpd/package.nix +++ b/pkgs/by-name/ra/radicle-httpd/package.nix @@ -1,6 +1,5 @@ { asciidoctor, - darwin, fetchgit, git, installShellFiles, @@ -34,7 +33,6 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; nativeCheckInputs = [ git ]; - buildInputs = lib.optionals stdenv.buildPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; doCheck = stdenv.hostPlatform.isLinux; diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index b0a6bae693e1..a9bcb469f4f8 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -1,6 +1,5 @@ { asciidoctor, - darwin, fetchgit, git, installShellFiles, @@ -41,9 +40,6 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; nativeCheckInputs = [ git ]; - buildInputs = lib.optionals stdenv.buildPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; # tests regularly time out on aarch64 doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86; diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix index 1de79c3d1b7f..9c359fa71505 100644 --- a/pkgs/by-name/ra/rage/package.nix +++ b/pkgs/by-name/ra/rage/package.nix @@ -4,7 +4,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,10 +24,6 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; - # cargo test has an x86-only dependency doCheck = stdenv.hostPlatform.isx86; diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index 1fd672670492..f62f7f7bae42 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -1,15 +1,10 @@ { lib, - darwin, rustPlatform, fetchFromGitHub, pkg-config, openssl, - stdenv, }: -let - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; -in rustPlatform.buildRustPackage rec { pname = "railway"; version = "4.0.0"; @@ -26,13 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - SystemConfiguration - ]; + buildInputs = [ openssl ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ra/rain/package.nix b/pkgs/by-name/ra/rain/package.nix index eb1a8ec4d010..30a334aee635 100644 --- a/pkgs/by-name/ra/rain/package.nix +++ b/pkgs/by-name/ra/rain/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "rain"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0FjJXOmLHM0At0TJdcsYTafgDbw+C37BH11ft+UjEl0="; + sha256 = "sha256-Dsg8vUMs6aep4FfrulHdtH3H7fitWdzENfTPm+9z5m0="; }; - vendorHash = "sha256-A+fQCiA2jArnhxbKxNmRQB6wY5mcmrY+fMtZQX5aBmU="; + vendorHash = "sha256-5i6dAjgWclyEkRrDzrkiIRQKTeNz4GM1LU+2J3t/+Yc="; subPackages = [ "cmd/rain" ]; diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index 36338b43709f..4a9b130ce89a 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -1,11 +1,9 @@ { lib, - darwin, fetchFromGitHub, testers, nix-update-script, rustPlatform, - stdenv, rainfrog, }: let @@ -25,15 +23,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-C5Wn/Qe+VSCFEma7IAmxGK2t2xugWOt2BaF7izsCU+I="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreGraphics - SystemConfiguration - ] - ); - passthru = { tests.version = testers.testVersion { package = rainfrog; diff --git a/pkgs/by-name/ra/rapidsvn/package.nix b/pkgs/by-name/ra/rapidsvn/package.nix index e6d2b1f5ca8a..abbaeca4ef56 100644 --- a/pkgs/by-name/ra/rapidsvn/package.nix +++ b/pkgs/by-name/ra/rapidsvn/package.nix @@ -8,7 +8,6 @@ apr, aprutil, python3, - darwin, }: stdenv.mkDerivation { @@ -31,17 +30,13 @@ stdenv.mkDerivation { autoreconfHook ]; - buildInputs = - [ - wxGTK32 - subversion - apr - aprutil - python3 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; + buildInputs = [ + wxGTK32 + subversion + apr + aprutil + python3 + ]; configureFlags = [ "--with-svn-include=${subversion.dev}/include" diff --git a/pkgs/by-name/ra/rates/package.nix b/pkgs/by-name/ra/rates/package.nix index 314b69d7890e..9621e30adc04 100644 --- a/pkgs/by-name/ra/rates/package.nix +++ b/pkgs/by-name/ra/rates/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, versionCheckHook, @@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-qfuCA1kAEbYIYI274lNrEKZNhltQP71CwtsjBr0REJs="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index 7b9771af8229..53cf99ccb4cd 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rattler-build"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "rattler-build"; tag = "v${finalAttrs.version}"; - hash = "sha256-8U48Jow/6mOBTxRgMUtW6CaTkhwaAu8Hkad3WjRdkEM="; + hash = "sha256-NwsNCd6ueCtvJp04fJTsfoXtfUlgZou+zwDHrXeUlhk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-U9ebUV9Hkfu5clAffncMXBo/ujnVf80Qt6dOkzphWx4="; + cargoHash = "sha256-O0nTxgftGv70c8yv4qEG+fEZEXZ+H6fhUzd/p8CQMQ4="; doCheck = false; # test requires network access diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index 5790f8b8e5cd..d81453d25a56 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -12,19 +12,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.95.0"; + version = "1.96.0"; src = { aarch64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm"; - hash = "sha256-Fh0V/iZqryuqKs8D1V9isHJBh+WFHicrTMckKCh4pQE="; + hash = "sha256-GN9luYvWzUsLp6KzKV+Iwc2shxRHkOLSDq6ZJaKZ7vU="; }; x86_64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64"; - hash = "sha256-AD4iCBbNMU0Px/NieXvmG/Q3deJ6P/dcVgwFo0vNoOo="; + hash = "sha256-HGO6mZvnBk9R1IS8dNDGj3dwgSNJ+XPjAG4+gJ0KvY4="; }; } .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported."); diff --git a/pkgs/by-name/ra/raylib-games/package.nix b/pkgs/by-name/ra/raylib-games/package.nix index 8bc325841060..3ca74877fbb4 100644 --- a/pkgs/by-name/ra/raylib-games/package.nix +++ b/pkgs/by-name/ra/raylib-games/package.nix @@ -3,12 +3,8 @@ stdenv, fetchFromGitHub, raylib, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in stdenv.mkDerivation rec { pname = "raylib-games"; version = "2022-10-24"; @@ -20,7 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-N9ip8yFUqXmNMKcvQuOyxDI4yF/w1YaoIh0prvS4Xr4="; }; - buildInputs = [ raylib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; + buildInputs = [ raylib ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix index c98bde8caa05..f00054b24a7c 100644 --- a/pkgs/by-name/rc/rclip/package.nix +++ b/pkgs/by-name/rc/rclip/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication rec { pname = "rclip"; - version = "1.11.0"; + version = "2.0.5"; pyproject = true; src = fetchFromGitHub { owner = "yurijmikhalevich"; repo = "rclip"; tag = "v${version}"; - hash = "sha256-bu9kz0CCq78lp+d2uPoApzZnVybwyWD/fwgnXYG52dk="; + hash = "sha256-d/jEtcBvOiebdI4DgWNWtP8ZfOy2x7EaQt/6mo7o2Ok="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/rc/rclone-ui/package.nix b/pkgs/by-name/rc/rclone-ui/package.nix new file mode 100644 index 000000000000..0db1c5d2cb26 --- /dev/null +++ b/pkgs/by-name/rc/rclone-ui/package.nix @@ -0,0 +1,86 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + + cargo-tauri, + nodejs, + npmHooks, + fetchNpmDeps, + + pkg-config, + wrapGAppsHook3, + + openssl, + webkitgtk_4_1, + glib-networking, + libappindicator, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "rclone-ui"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "rclone-ui"; + repo = "rclone-ui"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KTi/vCHiZVRAmQAiVXSWHCTTv1NnsvM5UZg8cpuFbRQ="; + }; + + npmDeps = fetchNpmDeps { + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + inherit (finalAttrs) src; + forceGitDeps = true; + hash = "sha256-18QkqqYS1kGY701FbFBHLvr5WBkJzxFgR9VMnydeelY="; + }; + + cargoRoot = "src-tauri"; + buildAndTestSubdir = finalAttrs.cargoRoot; + useFetchCargoVendor = true; + cargoHash = "sha256-o21of2eS2KZtg1U1E6RwdaA8jGhEVzg7HkgOv1k5wxI="; + + # Disable tauri bundle updater, can be removed when #389107 is merged + patches = [ ./remove_updater.patch ]; + + postPatch = '' + substituteInPlace src-tauri/Cargo.toml \ + --replace-fail 'name = "app"' 'name = "${finalAttrs.pname}"' + ''; + + nativeBuildInputs = [ + npmHooks.npmConfigHook + nodejs + + cargo-tauri.hook + + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + openssl + webkitgtk_4_1 + glib-networking + libappindicator + ]; + + dontWrapGApps = true; + + postInstall = '' + wrapProgram $out/bin/rclone-ui \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libappindicator ]} + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cross-platform desktop GUI for rclone & S3"; + homepage = "https://github.com/rclone-ui/rclone-ui"; + changelog = "https://github.com/rclone-ui/rclone-ui/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "rclone-ui"; + }; +}) diff --git a/pkgs/by-name/rc/rclone-ui/remove_updater.patch b/pkgs/by-name/rc/rclone-ui/remove_updater.patch new file mode 100644 index 000000000000..398ba86b2bc8 --- /dev/null +++ b/pkgs/by-name/rc/rclone-ui/remove_updater.patch @@ -0,0 +1,32 @@ +diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs +index 001faa3..2d7ae0c 100644 +--- a/src-tauri/src/lib.rs ++++ b/src-tauri/src/lib.rs +@@ -82,7 +82,6 @@ pub fn run() { + let _guard = minidump::init(&client); + + let mut app = tauri::Builder::default() +- .plugin(tauri_plugin_updater::Builder::new().build()) + .plugin(tauri_plugin_os::init()) + .plugin(tauri_plugin_notification::init()) + .plugin(tauri_plugin_process::init()) +diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json +index 4f9df22..58d6c06 100644 +--- a/src-tauri/tauri.conf.json ++++ b/src-tauri/tauri.conf.json +@@ -86,14 +86,9 @@ + "installMode": "both" + }, + "signCommand": "trusted-signing-cli %1 -e https://eus.codesigning.azure.net -a sign-1 -c Sign1" +- }, +- "createUpdaterArtifacts": true ++ } + }, + "plugins": { +- "updater": { +- "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDIyNDFENEZGNjFDNTBGOEYKUldTUEQ4VmgvOVJCSWhVZmw0enhmcW1kWFk3TS9mMzBDRjVEZWdxKzQ5ZmRhTlYvT2gvdFNMbE8K", +- "endpoints": ["https://github.com/FTCHD/rclone-ui/releases/latest/download/latest.json"] +- }, + "fs": { + "requireLiteralLeadingDot": false + } diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index f6d630ae31af..47ebd121f996 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -17,13 +16,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gFkrUqG3GXPAg9Zqv7Wr3axQ30axYGXw8bo+P1kmSJM="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - IOKit - ] - ); - useFetchCargoVendor = true; cargoHash = "sha256-izJRaxJhLvk064JB3hlzN50V7ZWmv/X1pbL0lRCZV60="; diff --git a/pkgs/by-name/rd/rdkafka/package.nix b/pkgs/by-name/rd/rdkafka/package.nix index 104c967406ab..241d2f32297f 100644 --- a/pkgs/by-name/rd/rdkafka/package.nix +++ b/pkgs/by-name/rd/rdkafka/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rdkafka"; - version = "2.8.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "confluentinc"; repo = "librdkafka"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-OCCsxgEO8UvCcC0XwzqpqmaT8dV0Klrspp+2o1FbH2Y="; + sha256 = "sha256-u4+qskNw18TD59aiSTyv1XOYT2DI24uZnGEAzJ4YBJU="; }; outputs = [ diff --git a/pkgs/by-name/rd/rdma-core/package.nix b/pkgs/by-name/rd/rdma-core/package.nix index 13f277e64ffa..c557c5e5cc95 100644 --- a/pkgs/by-name/rd/rdma-core/package.nix +++ b/pkgs/by-name/rd/rdma-core/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rdma-core"; - version = "56.0"; + version = "56.1"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${finalAttrs.version}"; - hash = "sha256-nzd7BDP72o0TsSTrCGT6HOF7td+3ex4/c68GdjIA6Bc="; + hash = "sha256-sRQlynPZxlAe+G8ZMmq8TK3lHqucQxHzjBPIfFqVsZU="; }; strictDeps = true; diff --git a/pkgs/by-name/re/re-isearch/0001-fix-JsonHitTable-undefined-reference.patch b/pkgs/by-name/re/re-isearch/0001-fix-JsonHitTable-undefined-reference.patch new file mode 100644 index 000000000000..30b8696b70d8 --- /dev/null +++ b/pkgs/by-name/re/re-isearch/0001-fix-JsonHitTable-undefined-reference.patch @@ -0,0 +1,50 @@ +# fixes "undefined reference to `IDB::JsonHitTable(RESULT const&)" build failure + +--- + src/idb.cxx | 26 -------------------------- + 1 file changed, 26 deletions(-) + +diff --git a/src/idb.cxx b/src/idb.cxx +index 2469c06..753a9fb 100644 +--- a/src/idb.cxx ++++ b/src/idb.cxx +@@ -5486,37 +5486,11 @@ STRING IDB::XMLHitTable(const RESULT& Result) + } + #endif + +-#if 0 + STRING IDB::JsonHitTable(const RESULT& Result) + { +-#if 1 + message_log (LOG_FATAL, "JsonHitTable is not yet implemented"); + return NulString; +-#else +-/* +- +- Shopping +- +- +-is JSON +- +-{ +- "folders": { +- "folder":{ +- "@": { +- "id": "123", +- "private": "0", +- "archived": "0", +- "order": "1" +- }, +- "#": "Shopping" +- } +- } +-} +-*/ + } +-#endif +-#endif + + + PIRSET IDB::SearchSmart(QUERY *Query, const STRING& DefaultField) +-- +2.47.2 diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix index b026835b89cb..c6ba1b38f0c0 100644 --- a/pkgs/by-name/re/re-isearch/package.nix +++ b/pkgs/by-name/re/re-isearch/package.nix @@ -5,24 +5,30 @@ db, file, libnsl, + writableTmpDirAsHomeHook, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttr: { pname = "re-Isearch"; - version = "unstable-2022-03-24"; + version = "2.20220925.4.0a-unstable-2025-03-16"; src = fetchFromGitHub { owner = "re-Isearch"; repo = "re-Isearch"; - rev = "e5953ea6c84285283be3689df7065908369cdbaf"; - sha256 = "sha256-D0PDqlWzIOHqdS2MlNzR2T5cyhiLcFlf30v6eFokoRQ="; + rev = "56e0dfbe7468881b3958ca8e630f41a5354e9873"; + sha256 = "sha256-tI75D02/sFEkHDQX/BpDlu24WNP6Qh9G0MIfEvs8npM="; }; + # Upstream issue: https://github.com/re-Isearch/re-Isearch/issues/11 + patches = [ ./0001-fix-JsonHitTable-undefined-reference.patch ]; + postPatch = '' # Fix gcc-13 build due to missing include. sed -e '1i #include ' -i src/mmap.cxx ''; + nativeBuildInputs = [ writableTmpDirAsHomeHook ]; + buildinputs = [ db file # libmagic @@ -33,11 +39,11 @@ stdenv.mkDerivation { "CC=g++" "cc=gcc" "LD=g++" - "INSTALL=${placeholder "out"}/bin" ]; preBuild = '' cd build + make clean # clean up pre-built objects in the source makeFlagsArray+=( EXTRA_INC="-I${db.dev}/include -I${lib.getDev file}/include" LD_PATH="-L../lib -L${db.out}/lib -L${file}/lib -L${libnsl}/lib" @@ -47,14 +53,23 @@ stdenv.mkDerivation { preInstall = '' mkdir -p $out/{bin,lib} ''; - postInstall = '' + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib} + + cp ../bin/{Iindex,Isearch,Iutil,Idelete,zpresent,Iwatch,zipper} $out/bin cp ../lib/*.so $out/lib/ + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Novel multimodal search and retrieval engine"; - homepage = "https://github.com/re-Isearch/"; - license = licenses.asl20; - maintainers = [ maintainers.astro ]; + homepage = "https://nlnet.nl/project/Re-iSearch/"; + license = lib.licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = [ lib.maintainers.astro ] ++ lib.teams.ngi.members; }; -} +}) diff --git a/pkgs/by-name/re/re2/package.nix b/pkgs/by-name/re/re2/package.nix index 278d63702ed2..8781413e48ba 100644 --- a/pkgs/by-name/re/re2/package.nix +++ b/pkgs/by-name/re/re2/package.nix @@ -44,7 +44,10 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ abseil-cpp ] ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ icu ]; cmakeFlags = - [ (lib.cmakeBool "RE2_BUILD_TESTING" true) ] + [ + (lib.cmakeBool "RE2_BUILD_TESTING" true) + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--timeout;999999") + ] ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ (lib.cmakeBool "RE2_USE_ICU" true) (lib.cmakeBool "BUILD_SHARED_LIBS" true) diff --git a/pkgs/by-name/re/re2c/package.nix b/pkgs/by-name/re/re2c/package.nix index 02859a9bc813..bc7ee4beba24 100644 --- a/pkgs/by-name/re/re2c/package.nix +++ b/pkgs/by-name/re/re2c/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "re2c"; - version = "4.0.2"; + version = "4.1"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; rev = version; - sha256 = "sha256-hp9kwsoSRdel1z1+VWREPQdigI1rQ5GrM5/Z6wpnmE0="; + sha256 = "sha256-xB4oH0QS0VKTK2we+wdylS8VBijpp6tv7YV7fIX1s4A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/readarr/package.nix b/pkgs/by-name/re/readarr/package.nix index 33385bd93690..c283e9f398b5 100644 --- a/pkgs/by-name/re/readarr/package.nix +++ b/pkgs/by-name/re/readarr/package.nix @@ -24,15 +24,15 @@ let ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-bVPUN500vTUdWCz6U1oP0uqLW+LChbCKZMhnYInQ54I="; - arm64-linux_hash = "sha256-qYG1uFyn26J6ElTeeI8Ozf6kVhm6EZKKMJ+4UFRhlqQ="; - x64-osx_hash = "sha256-qQK9KDX8KFAIzCdSpc7SWggYZm9cD8bv80BTdmT2MqA="; + x64-linux_hash = "sha256-QHZ6pdeCIld5pkgK6ZBhxKho6kM/IBCx0BlxM1xiTXk="; + arm64-linux_hash = "sha256-FoRKTsuCCTS9Y56GR6xfvLrmLmqVIoEk8P7RGzE3NU0="; + x64-osx_hash = "sha256-Wj3JVkwJXrtgAGBYcv8e2kGzSGGzYeG9TL+Dtt/ulpI="; } ."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.4.13.2760"; + version = "0.4.14.2782"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index fdd7b9a06081..0ef4a4eca7a0 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.33"; + version = "0.9.36"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-amGOtA2dOFjECCI5IAb9qL98XAvd+QAW4QQD41F8BG4="; + hash = "sha256-r/mpqeHKo6oQqNCnFByxHZf7RSWD5esZbweAEuda9ME="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/re/realm/package.nix b/pkgs/by-name/re/realm/package.nix index b32356df4cb7..6edeccfdd07d 100644 --- a/pkgs/by-name/re/realm/package.nix +++ b/pkgs/by-name/re/realm/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, nix-update-script, nixosTests, }: @@ -22,10 +20,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Oe64l16uYdU6NvTl7XrEm6dAtRFngI9yHC4fe4hpTNA="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - env.RUSTC_BOOTSTRAP = 1; passthru = { diff --git a/pkgs/by-name/re/reason-shell/package.nix b/pkgs/by-name/re/reason-shell/package.nix index 9a3dc6692732..e3ce9f006665 100644 --- a/pkgs/by-name/re/reason-shell/package.nix +++ b/pkgs/by-name/re/reason-shell/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Shell for research papers"; diff --git a/pkgs/by-name/re/rebuilderd/package.nix b/pkgs/by-name/re/rebuilderd/package.nix index e8400ee8c1b9..31b05abbb910 100644 --- a/pkgs/by-name/re/rebuilderd/package.nix +++ b/pkgs/by-name/re/rebuilderd/package.nix @@ -12,7 +12,6 @@ xz, zstd, stdenv, - darwin, buildPackages, versionCheckHook, nixosTests, @@ -50,19 +49,14 @@ rustPlatform.buildRustPackage (finalAttrs: { scdoc ]; - buildInputs = - [ - bzip2 - openssl - shared-mime-info - sqlite - xz - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + shared-mime-info + sqlite + xz + zstd + ]; postInstall = let diff --git a/pkgs/by-name/re/reddit-tui/package.nix b/pkgs/by-name/re/reddit-tui/package.nix new file mode 100644 index 000000000000..810f998267af --- /dev/null +++ b/pkgs/by-name/re/reddit-tui/package.nix @@ -0,0 +1,34 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, + nix-update-script, + callPackage, +}: +buildGoModule (finalAttrs: { + pname = "reddit-tui"; + version = "0.3.4"; + src = fetchFromGitHub { + owner = "tonymajestro"; + repo = "reddit-tui"; + tag = "v${finalAttrs.version}"; + hash = "sha256-FlGprSbt1/jTRe2p/aXt5f5aZAxnQlb6M70wvUdE9qk="; + }; + vendorHash = "sha256-H2ukIIi30b8kGOjESXJGv/VW5pPgfxG2c3H6S4jRAA4="; + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/tonymajestro/reddit-tui/releases/tag/${finalAttrs.src.tag}"; + homepage = "https://github.com/tonymajestro/reddit-tui"; + description = "Terminal UI for reddit"; + longDescription = '' + Due to suspected throttling by reddit, it might be necessary to use a [redlib backend](https://github.com/redlib-org/redlib) to enable this package to work. + See [the Docs](https://github.com/tonymajestro/reddit-tui#configuration-files) on how to do that. + ''; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.LazilyStableProton ]; + mainProgram = "reddittui"; + }; +}) diff --git a/pkgs/by-name/re/redeclipse/package.nix b/pkgs/by-name/re/redeclipse/package.nix index 1bb741380b45..797c5a659ee7 100644 --- a/pkgs/by-name/re/redeclipse/package.nix +++ b/pkgs/by-name/re/redeclipse/package.nix @@ -7,6 +7,7 @@ pkg-config, freetype, zlib, + libGL, libX11, SDL2, SDL2_image, @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ + libGL libX11 freetype zlib diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix index 0bcfd5c58d5f..b5c569a9f01f 100644 --- a/pkgs/by-name/re/redlib/package.nix +++ b/pkgs/by-name/re/redlib/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, cacert, nixosTests, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { pname = "redlib"; @@ -21,10 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-1zPLnkNZvuZS5z9AEJvhyIv+8/y+YhqFcj5Mu7RSqnE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - postInstall = '' install -D contrib/redlib.service $out/lib/systemd/system/redlib.service substituteInPlace $out/lib/systemd/system/redlib.service \ diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix index 645589dd8abd..d03162ff835f 100644 --- a/pkgs/by-name/re/redocly/package.nix +++ b/pkgs/by-name/re/redocly/package.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "redocly"; - version = "1.34.0"; + version = "1.34.2"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-1iyE0LYbVEleCdSw6fWvIHqCkWMEZrjK6tum+qytcCY="; + hash = "sha256-on5FqAYy6Ap0e5R3u1Wx4j8ijepj3K8FSpts7nTsXRI="; }; - npmDepsHash = "sha256-TIsVjdohsmvAAn9xQeeD5pu4CjXtYlD7bmKeDp113Lc="; + npmDepsHash = "sha256-Duxdp8/HhoFwVRe9vLRsp08uTANGAY3u/lhgfHI2eag="; npmBuildScript = "prepare"; diff --git a/pkgs/by-name/re/redu/package.nix b/pkgs/by-name/re/redu/package.nix new file mode 100644 index 000000000000..5da1913d43a9 --- /dev/null +++ b/pkgs/by-name/re/redu/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + rustPlatform, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "redu"; + version = "0.2.12"; + + src = fetchFromGitHub { + owner = "drdo"; + repo = "redu"; + tag = "v${finalAttrs.version}"; + hash = "sha256-3DcBTpog5tWv2qdmhOlDLHFY77Cug6mCpDQEAtViw74="; + }; + + cargoHash = "sha256-Rp8y2tBnpzBVEoLP4fTMulIJpu1j2TpJNh5M9kjnuEo="; + + env.RUSTC_BOOTSTRAP = 1; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "ncdu for your restic repo"; + homepage = "https://github.com/drdo/redu"; + changelog = "https://github.com/drdo/redu/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ alexfmpe ]; + mainProgram = "redu"; + }; +}) diff --git a/pkgs/by-name/re/refinery-cli/package.nix b/pkgs/by-name/re/refinery-cli/package.nix index cedd6767ce95..56ceae80fe14 100644 --- a/pkgs/by-name/re/refinery-cli/package.nix +++ b/pkgs/by-name/re/refinery-cli/package.nix @@ -1,11 +1,9 @@ { fetchCrate, lib, - stdenv, openssl, pkg-config, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; meta = with lib; { description = "Run migrations for the Refinery ORM for Rust via the CLI"; diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index 3e5ad769353d..1ee71e17b23c 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2025.03.31.00"; + version = "2025.04.14.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; tag = "v${version}"; - hash = "sha256-ocnd/4bIZwrGik2r8HSeyPfLQycmJJrKikgLIZhsb6A="; + hash = "sha256-Htmc2z2umh9RKRvrOSGUXqk/Clzw+1+SB8EOGLJZKqM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-DguWlibOB8z0Blj5ZVFycyJrxJHK3uUROt8hGxacxOY="; + cargoHash = "sha256-i0TmB+JtJKCS/eQxOb5SIKi8jf1qqygndDdJOmGl66A="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index 31b81e647d12..b74644fd4b74 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "release-plz"; - version = "0.3.130"; + version = "0.3.132"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${version}"; - hash = "sha256-ulxKOlUn2FjdKOxBLHzRwaANijO4K2sgGZAUOPIqAl0="; + hash = "sha256-J2ViqVJEBGBiKfG9S7/p5RNjFNNp0A6b3Htv5c0On6M="; }; useFetchCargoVendor = true; - cargoHash = "sha256-pQErY/kUn9N+rVJZdHMCF74EKr9HOcHgqeBpKdmoHfQ="; + cargoHash = "sha256-z67GXNJ9QSRIafTCeVjr0T+EYdcT/Blr7pBGQJgobdc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index 08a9379b4cef..10f945281650 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.19.11"; + version = "1.19.15"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-rKvbh4TihITP+M4znObUU+80YfG9gookilLpIBUxt9U="; + hash = "sha256-gmhpxh/u5Ror3V2BMjAJzaWs66+nrsUiBXkVd5G8B/E="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/re/reshape/package.nix b/pkgs/by-name/re/reshape/package.nix index 6b44a65c5030..c9a5cef39e03 100644 --- a/pkgs/by-name/re/reshape/package.nix +++ b/pkgs/by-name/re/reshape/package.nix @@ -2,10 +2,8 @@ lib, rustPlatform, fetchCrate, - darwin, postgresqlTestHook, postgresql, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-lK54SEayI015f2AQ6h4zadgkECLp4jCeJO7enBG0LeM="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - nativeCheckInputs = [ postgresqlTestHook postgresql diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix index aa13875f26f8..8821a7d5c4d5 100644 --- a/pkgs/by-name/re/restate/package.nix +++ b/pkgs/by-name/re/restate/package.nix @@ -25,17 +25,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "restate"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "restatedev"; repo = "restate"; tag = "v${finalAttrs.version}"; - hash = "sha256-i/It8VWfkEO3MBQvBF9jDhL8s3BdJyg4+grdxO+GoQs="; + hash = "sha256-zAICgEwErB6lHC/AK/3WuhL5u+Y5l+DXd4H63OLBQl8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-TNjxRFEAFY/6ZYCzPD5NcqMEwyM6HZnkfrt/hZkIHMY="; + cargoHash = "sha256-NlT+j3OD52HgDMeWAm9MewPQaQ+xf0FIpsRd5rTTVdQ="; env = { PROTOC = lib.getExe protobuf; diff --git a/pkgs/by-name/re/restic-browser/package.nix b/pkgs/by-name/re/restic-browser/package.nix index 0333ab8f71b3..7cfba5fae808 100644 --- a/pkgs/by-name/re/restic-browser/package.nix +++ b/pkgs/by-name/re/restic-browser/package.nix @@ -11,7 +11,6 @@ wrapGAppsHook3, webkitgtk_4_0, dbus, - darwin, nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -46,17 +45,10 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook3 ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - webkitgtk_4_0 - dbus - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - WebKit - ] - ); + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + webkitgtk_4_0 + dbus + ]; cargoRoot = "src-tauri"; buildAndTestSubdir = cargoRoot; diff --git a/pkgs/by-name/re/restish/package.nix b/pkgs/by-name/re/restish/package.nix index 153e083f313c..4a849ef4ed27 100644 --- a/pkgs/by-name/re/restish/package.nix +++ b/pkgs/by-name/re/restish/package.nix @@ -2,7 +2,6 @@ lib, stdenv, buildGoModule, - darwin, fetchFromGitHub, restish, testers, @@ -22,18 +21,13 @@ buildGoModule rec { vendorHash = "sha256-qeArar0WnMACUnKBlC+PcFeJPzofwbK440A4M/rQ04U="; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Kernel - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXrandr - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXrandr + ]; ldflags = [ "-s" diff --git a/pkgs/by-name/re/revolver/package.nix b/pkgs/by-name/re/revolver/package.nix index 37eac352fd82..fd6c63266b38 100644 --- a/pkgs/by-name/re/revolver/package.nix +++ b/pkgs/by-name/re/revolver/package.nix @@ -5,7 +5,7 @@ zsh, installShellFiles, ncurses, - nix-update-script, + unstableGitUpdater, testers, runCommand, }: @@ -79,7 +79,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { version = "0.2.0"; }; }; - updateScript = nix-update-script { }; + updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; }; meta = { diff --git a/pkgs/by-name/re/rewrk/package.nix b/pkgs/by-name/re/rewrk/package.nix index 5e87c9104bea..86d3063460d5 100644 --- a/pkgs/by-name/re/rewrk/package.nix +++ b/pkgs/by-name/re/rewrk/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "More modern http framework benchmarker supporting HTTP/1 and HTTP/2 benchmarks"; homepage = "https://github.com/lnx-search/rewrk"; diff --git a/pkgs/by-name/ri/rich-cli/package.nix b/pkgs/by-name/ri/rich-cli/package.nix index 93b4f94c37c6..7b98a06d3f89 100644 --- a/pkgs/by-name/ri/rich-cli/package.nix +++ b/pkgs/by-name/ri/rich-cli/package.nix @@ -1,11 +1,13 @@ { lib, + python3Packages, fetchFromGitHub, fetchpatch, - python3, + versionCheckHook, + nix-update-script, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "rich-cli"; version = "1.8.0"; pyproject = true; @@ -32,17 +34,15 @@ python3.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "rich" "textual" ]; - build-system = with python3.pkgs; [ + build-system = with python3Packages; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ - ]; - - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ click requests rich @@ -50,15 +50,23 @@ python3.pkgs.buildPythonApplication rec { textual ]; - pythonImportsCheck = [ - "rich_cli" - ]; + pythonImportsCheck = [ "rich_cli" ]; - meta = with lib; { + nativeCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/rich"; + versionCheckProgramArg = "--version"; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Command Line Interface to Rich"; homepage = "https://github.com/Textualize/rich-cli"; changelog = "https://github.com/Textualize/rich-cli/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "rich"; }; diff --git a/pkgs/by-name/ri/riff/package.nix b/pkgs/by-name/ri/riff/package.nix index 944baa2255ca..63a7972968cb 100644 --- a/pkgs/by-name/ri/riff/package.nix +++ b/pkgs/by-name/ri/riff/package.nix @@ -5,8 +5,6 @@ makeWrapper, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,13 +26,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; postInstall = '' wrapProgram $out/bin/riff --set-default RIFF_DISABLE_TELEMETRY true diff --git a/pkgs/by-name/ri/ripunzip/package.nix b/pkgs/by-name/ri/ripunzip/package.nix index a92406128c93..7fabba7fa204 100644 --- a/pkgs/by-name/ri/ripunzip/package.nix +++ b/pkgs/by-name/ri/ripunzip/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, openssl, - darwin, pkg-config, testers, fetchzip, @@ -25,15 +23,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-lhStxg8H2T29eFYDFAZhFjOyH4hfRwEmcewm7Ec/oTw="; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; checkFlags = [ diff --git a/pkgs/by-name/rk/rkbin/package.nix b/pkgs/by-name/rk/rkbin/package.nix index f13113238467..b4481753bee0 100644 --- a/pkgs/by-name/rk/rkbin/package.nix +++ b/pkgs/by-name/rk/rkbin/package.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { passthru = { BL31_RK3568 = "${rkbin}/bin/rk35/rk3568_bl31_v1.44.elf"; BL31_RK3588 = "${rkbin}/bin/rk35/rk3588_bl31_v1.47.elf"; + TPL_RK3566 = "${rkbin}/bin/rk35/rk3566_ddr_1056MHz_v1.23.bin"; TPL_RK3568 = "${rkbin}/bin/rk35/rk3568_ddr_1056MHz_v1.23.bin"; TPL_RK3588 = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin"; }; diff --git a/pkgs/by-name/rk/rke/package.nix b/pkgs/by-name/rk/rke/package.nix index 0994d8527043..d5376c7263ab 100644 --- a/pkgs/by-name/rk/rke/package.nix +++ b/pkgs/by-name/rk/rke/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "rke"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-mTSeUFmkXI9yZ1yeBXzudf2BmLtdmoiTlB/wtn++NAo="; + hash = "sha256-/n6XGpwlGaaDDA5fJgCfDGr5GdaF3Qf5BS7fBdJmVYw="; }; - vendorHash = "sha256-5+BjXPh52RNoaU/ABpvgbAO+mKcW4Hg2SRxRhV9etIo="; + vendorHash = "sha256-OWC8OZhORHwntAR2YHd4KfQgB2Wtma6ayBWfY94uOA4="; subPackages = [ "." ]; diff --git a/pkgs/by-name/rk/rkflashtool/package.nix b/pkgs/by-name/rk/rkflashtool/package.nix index edece60a45b3..dabb652d8a9d 100644 --- a/pkgs/by-name/rk/rkflashtool/package.nix +++ b/pkgs/by-name/rk/rkflashtool/package.nix @@ -3,38 +3,31 @@ stdenv, fetchurl, libusb1, + pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rkflashtool"; - version = "5.1"; + version = "6.1"; src = fetchurl { - url = "mirror://sourceforge/rkflashtool/rkflashtool-${version}-src.tar.bz2"; - sha256 = "0dbp1crw7pjav9gffrnskhkf0gxlj4xgp65clqhvfmv32460xb9c"; - }; - - versionh = fetchurl { - url = "mirror://sourceforge/rkflashtool/version.h"; - sha256 = "1mkcy3yyfaddhzg524hjnhvmwdmdfzbavib8d9p5y38pcqy8xgdp"; + url = "mirror://sourceforge/rkflashtool/rkflashtool-${finalAttrs.version}-src.tar.bz2"; + hash = "sha256-K8DsWAyqeQsK7mNDiKkRCkKbr0uT/yxPzj2atYP1Ezk="; }; buildInputs = [ libusb1 ]; - - preBuild = '' - cp $versionh version.h - ''; + nativeBuildInputs = [ pkg-config ]; installPhase = '' mkdir -p $out/bin cp rkunpack rkcrc rkflashtool rkparameters rkparametersblock rkunsign rkmisc $out/bin ''; - meta = with lib; { + meta = { homepage = "https://sourceforge.net/projects/rkflashtool/"; description = "Tools for flashing Rockchip devices"; - platforms = platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; - license = licenses.bsd2; + license = lib.licenses.bsd2; }; -} +}) diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index 8d3323e33833..5802a9fc8be2 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2025-04-07"; + version = "0-unstable-2025-04-16"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "305c2e344fe3ed14d4166211e0d21728702d83bf"; - hash = "sha256-KLyjjHahEbM3lOTPLqgT75mhyVWEXJSugraH7kzQDV8="; + rev = "9f0947a0fc0408da9350b95eb95a6860f8018471"; + hash = "sha256-7CDAlttsebdDix4kKTrp3CKejWfodO2BkqcweHt1D8M="; }; dontConfigure = true; diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index 20181d00888f..7a8fcf29f44f 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -5,12 +5,8 @@ rustPlatform, pkg-config, openssl, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; -in rustPlatform.buildRustPackage rec { pname = "rojo"; version = "7.4.4"; @@ -30,14 +26,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - SystemConfiguration - ]; + buildInputs = [ + openssl + ]; # reqwest's native-tls-vendored feature flag uses vendored openssl. this disables that OPENSSL_NO_VENDOR = "1"; diff --git a/pkgs/by-name/ro/roon-server/package.nix b/pkgs/by-name/ro/roon-server/package.nix index b6c3eee521c1..af110e40e417 100644 --- a/pkgs/by-name/ro/roon-server/package.nix +++ b/pkgs/by-name/ro/roon-server/package.nix @@ -16,7 +16,7 @@ stdenv, }: let - version = "2.48.1517"; + version = "2.49.1525"; urlVersion = builtins.replaceStrings [ "." ] [ "0" ] version; in stdenv.mkDerivation { @@ -25,7 +25,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-2H8lQykhzbHcEW/+Rj+4eQdUMUugUeXivz+/+MEAYxk="; + hash = "sha256-DYxybP7luRmR4HL6QYBeWU4ZWqlHEO2EgLeqxmFD87A="; }; dontConfigure = true; diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index 8a4b957c48ec..48f7c810724e 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -199,15 +199,15 @@ }, { "pname": "Microsoft.DotNet.Arcade.Sdk", - "version": "9.0.0-beta.25161.4", - "hash": "sha256-NrQSPWnG7RlhNMyrqcz4sR0+WWpJpoTrrRtVLkIGFms=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25161.4/microsoft.dotnet.arcade.sdk.9.0.0-beta.25161.4.nupkg" + "version": "9.0.0-beta.25164.2", + "hash": "sha256-NZ3Isdg/TWeD5oqBtzwZ+k4ouuVAbSevKR1AbFXzxR8=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25164.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.25164.2.nupkg" }, { "pname": "Microsoft.DotNet.XliffTasks", - "version": "9.0.0-beta.25161.4", - "hash": "sha256-l4CTmNsxuFP3Bjs2mS1/zdmsb/ZvyHpddTX2HT+MVu4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25161.4/microsoft.dotnet.xlifftasks.9.0.0-beta.25161.4.nupkg" + "version": "9.0.0-beta.25164.2", + "hash": "sha256-1wCqxMI/Xn7HgxyaYP5LcLoXh8GGCM8aj6s8EQJzIyQ=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25164.2/microsoft.dotnet.xlifftasks.9.0.0-beta.25164.2.nupkg" }, { "pname": "Microsoft.Extensions.Configuration", @@ -415,9 +415,9 @@ }, { "pname": "Microsoft.VisualStudio.Telemetry", - "version": "17.14.2", - "hash": "sha256-MqIrtr0I5uC64ww7v7xD2nTOqsdAqX7C1nPNzfhTkWA=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.14.2/microsoft.visualstudio.telemetry.17.14.2.nupkg" + "version": "17.14.8", + "hash": "sha256-DBqhTILQhgFqeVVr1/ktcIAlM8KgdUuaKomONSwzQ1I=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.14.8/microsoft.visualstudio.telemetry.17.14.8.nupkg" }, { "pname": "Microsoft.VisualStudio.Threading", @@ -545,12 +545,6 @@ "hash": "sha256-ioasr71UIhDmeZ2Etw52lQ7QsioEd1pnbpVlEeCyUI4=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/powershell/7.0.0/powershell.7.0.0.nupkg" }, - { - "pname": "RichCodeNav.EnvVarDump", - "version": "0.1.1643-alpha", - "hash": "sha256-bwND+Na9iEnkEdeL1elY34+m4/F4BYATBHv/2BEw4d4=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/58ca65bb-e6c1-4210-88ac-fa55c1cd7877/nuget/v3/flat2/richcodenav.envvardump/0.1.1643-alpha/richcodenav.envvardump.0.1.1643-alpha.nupkg" - }, { "pname": "Roslyn.Diagnostics.Analyzers", "version": "3.11.0-beta1.24081.1", diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index ce314ce8ea8e..790be6a3697b 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -32,18 +32,18 @@ in buildDotnetModule rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.70.15"; + vsVersion = "2.74.24"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-vXRt/scWxekd8U04MGfD4W8aj05H0CqkbIYZy8+0OdU="; + hash = "sha256-Q5yt8eMUuLx+X7sNlc6uTlMsC20G0SXcn3RdsrSDapg="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "4.14.0-3.25164.3"; + version = "5.0.0-1.25204.1"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/ro/routinator/package.nix b/pkgs/by-name/ro/routinator/package.nix index c9e5437b32d2..b394ddc6d0e4 100644 --- a/pkgs/by-name/ro/routinator/package.nix +++ b/pkgs/by-name/ro/routinator/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, nixosTests, }: @@ -21,14 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-58EnGouq8iKkgsvyHqARoQ0u4QXjw0m6pv4Am4J9wlU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); - meta = with lib; { description = "RPKI Validator written in Rust"; homepage = "https://github.com/NLnetLabs/routinator"; diff --git a/pkgs/by-name/rp/rpm-ostree/package.nix b/pkgs/by-name/rp/rpm-ostree/package.nix index 592c12c19dc8..6296b13f56db 100644 --- a/pkgs/by-name/rp/rpm-ostree/package.nix +++ b/pkgs/by-name/rp/rpm-ostree/package.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { description = "Hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model"; homepage = "https://coreos.github.io/rpm-ostree/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "rpm-ostree"; }; diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix index c6245e9c1d42..af243166d8ef 100644 --- a/pkgs/by-name/rq/rq/package.nix +++ b/pkgs/by-name/rq/rq/package.nix @@ -2,17 +2,19 @@ lib, rustPlatform, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "rq"; version = "1.0.4"; src = fetchFromGitHub { owner = "dflemstr"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-QyYTbMXikLSe3eYJRUALQJxUJjA6VlvaLMwGrxIKfZI="; + repo = "rq"; + tag = "v${finalAttrs.version}"; + hash = "sha256-QyYTbMXikLSe3eYJRUALQJxUJjA6VlvaLMwGrxIKfZI="; }; useFetchCargoVendor = true; @@ -22,24 +24,34 @@ rustPlatform.buildRustPackage rec { # Remove #[deny(warnings)] which is equivalent to -Werror in C. # Prevents build failures when upgrading rustc, which may give more warnings. substituteInPlace src/lib.rs \ - --replace "#![deny(warnings)]" "" + --replace-fail "#![deny(warnings)]" "" # build script tries to get version information from git # this fixes the --version output rm build.rs ''; - VERGEN_SEMVER = version; + VERGEN_SEMVER = finalAttrs.version; - meta = with lib; { + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Tool for doing record analysis and transformation"; mainProgram = "rq"; homepage = "https://github.com/dflemstr/rq"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ aristid Br1ght0ne figsoda ]; }; -} +}) diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index 590547f8a84a..f9018bcefb3b 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "rqlite"; - version = "8.36.16"; + version = "8.36.17"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mMsQJETeDyENMkCOmKb6TxDp9lYHSQIjaJtbsYzTJMs="; + sha256 = "sha256-umgC4vj9VrY/ls35msmr9ZBdw6XVml8nMDoSzDx8BXw="; }; - vendorHash = "sha256-6Y15vVvu1KHWTJKDmDKjWt0Kolu6q0mmo94YAHMXs/E="; + vendorHash = "sha256-jvZ2ZRA/DkjDNnYauS9sJLE8KROS197kSeNVZ363Htk="; subPackages = [ "cmd/rqlite" diff --git a/pkgs/by-name/rq/rquickshare/fix-pnpm-outdated-lockfile.patch b/pkgs/by-name/rq/rquickshare/fix-pnpm-outdated-lockfile.patch new file mode 100644 index 000000000000..5c4ac4f418d6 --- /dev/null +++ b/pkgs/by-name/rq/rquickshare/fix-pnpm-outdated-lockfile.patch @@ -0,0 +1,35 @@ +diff --git a/app/legacy/pnpm-lock.yaml b/app/legacy/pnpm-lock.yaml +index ce6a292..76ba03e 100644 +--- a/app/legacy/pnpm-lock.yaml ++++ b/app/legacy/pnpm-lock.yaml +@@ -12,8 +12,8 @@ importers: + specifier: link:../../core_lib + version: link:../../core_lib + '@tauri-apps/api': +- specifier: 1.5.6 +- version: 1.5.6 ++ specifier: 1.6.0 ++ version: 1.6.0 + pinia: + specifier: ^2.2.1 + version: 2.2.1(typescript@5.6.0-dev.20240811)(vue@3.4.27(typescript@5.6.0-dev.20240811)) +@@ -500,10 +500,6 @@ packages: + peerDependencies: + tailwindcss: '>=3.0.0 || insiders' + +- '@tauri-apps/api@1.5.6': +- resolution: {integrity: sha512-LH5ToovAHnDVe5Qa9f/+jW28I6DeMhos8bNDtBOmmnaDpPmJmYLyHdeDblAWWWYc7KKRDg9/66vMuKyq0WIeFA==} +- engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} +- + '@tauri-apps/api@1.6.0': + resolution: {integrity: sha512-rqI++FWClU5I2UBp4HXFvl+sBWkdigBkxnpJDQUWttNyG7IZP4FwQGhTNL5EOw0vI8i6eSAJ5frLqO7n7jbJdg==} + engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} +@@ -2707,8 +2703,6 @@ snapshots: + postcss-selector-parser: 6.0.10 + tailwindcss: 3.4.9 + +- '@tauri-apps/api@1.5.6': {} +- + '@tauri-apps/api@1.6.0': {} + + '@tauri-apps/cli-darwin-arm64@1.5.14': diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix index 9a2102a9affb..f52cc543beb5 100644 --- a/pkgs/by-name/rq/rquickshare/package.nix +++ b/pkgs/by-name/rq/rquickshare/package.nix @@ -3,6 +3,7 @@ cargo-tauri, cargo-tauri_1, fetchFromGitHub, + applyPatches, glib-networking, libayatana-appindicator, libsoup_2_4, @@ -39,13 +40,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rquickshare" + (app-type-either "" "-legacy"); - version = "0.11.4"; + version = "0.11.5"; - src = fetchFromGitHub { - owner = "Martichou"; - repo = "rquickshare"; - tag = "v${version}"; - hash = "sha256-Gq78vxM9hJ+dAHM3RAKHtkFIsoV0XQN4vNbOO3amvTs="; + src = applyPatches { + src = fetchFromGitHub { + owner = "Martichou"; + repo = "rquickshare"; + tag = "v${version}"; + hash = "sha256-DZdzk0wqKhVa51PgQf8UsAY6EbGKvRIGru71Z8rvrwA="; + }; + patches = [ ./fix-pnpm-outdated-lockfile.patch ]; }; # from https://github.com/NixOS/nixpkgs/blob/04e40bca2a68d7ca85f1c47f00598abb062a8b12/pkgs/by-name/ca/cargo-tauri/test-app.nix#L23-L26 @@ -59,14 +63,14 @@ rustPlatform.buildRustPackage rec { inherit pname version src; sourceRoot = "${src.name}/app/${app-type}"; - hash = app-type-either "sha256-V46V/VPwCKEe3sAp8zK0UUU5YigqgYh1GIOorqIAiNE=" "sha256-sDHysaKMdNcbL1szww7/wg0bGHOnEKsKoySZJJCcPik="; + hash = app-type-either "sha256-V46V/VPwCKEe3sAp8zK0UUU5YigqgYh1GIOorqIAiNE=" "sha256-8QRigYNtxirXidFFnTzA6rP0+L64M/iakPqe2lZKegs="; }; useFetchCargoVendor = true; cargoRoot = "app/${app-type}/src-tauri"; buildAndTestSubdir = cargoRoot; cargoPatches = [ ./remove-duplicate-versions-of-sys-metrics.patch ]; - cargoHash = app-type-either "sha256-wraCzzC7YVCXEXBTd8c1cbtCdBunENpUMQ1vZGwfGMs=" "sha256-TBsHlFwbWWa2LEZdmDyz/9vWiFOXKX39PCsjW6OqEGY="; + cargoHash = app-type-either "sha256-XfN+/oC3lttDquLfoyJWBaFfdjW/wyODCIiZZksypLM=" "sha256-4vBHxuKg4P9H0FZYYNUT+AVj4Qvz99q7Bhd7x47UC2w="; nativeBuildInputs = [ proper-cargo-tauri.hook diff --git a/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch b/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch index af1f423857fd..2de75e9ca237 100644 --- a/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch +++ b/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch @@ -1,9 +1,9 @@ diff --git a/app/legacy/src-tauri/Cargo.lock b/app/legacy/src-tauri/Cargo.lock -index 1bba0ae..af24986 100644 +index 14872dc..341fcc8 100644 --- a/app/legacy/src-tauri/Cargo.lock +++ b/app/legacy/src-tauri/Cargo.lock -@@ -4138,7 +4138,7 @@ dependencies = [ - "rand 0.8.5", +@@ -4296,7 +4296,7 @@ dependencies = [ + "rand 0.9.0", "serde", "sha2", - "sys_metrics 0.2.7 (git+https://github.com/Martichou/sys_metrics)", @@ -11,7 +11,7 @@ index 1bba0ae..af24986 100644 "tokio", "tokio-util", "tracing-subscriber", -@@ -4158,7 +4158,7 @@ dependencies = [ +@@ -4316,7 +4316,7 @@ dependencies = [ "rqs_lib", "serde", "serde_json", @@ -20,10 +20,13 @@ index 1bba0ae..af24986 100644 "tauri", "tauri-build", "tauri-plugin-autostart", -@@ -4759,22 +4759,7 @@ dependencies = [ - [[package]] - name = "sys_metrics" - version = "0.2.7" +@@ -4920,21 +4920,6 @@ dependencies = [ + "libc", + ] + +-[[package]] +-name = "sys_metrics" +-version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b266b80f59f86e2e1e0a4938e316e32c3730d94a749f236305152279f77484" -dependencies = [ @@ -36,16 +39,11 @@ index 1bba0ae..af24986 100644 - "serde", -] - --[[package]] --name = "sys_metrics" --version = "0.2.7" --source = "git+https://github.com/Martichou/sys_metrics#c0f4ec7b9156d3ab83ee61276984c7fd4e632098" -+source = "git+https://github.com/Martichou/sys_metrics#e5b324a17d1724bd97923a173c3535cc06a44b0c" - dependencies = [ - "core-foundation-sys", - "glob", + [[package]] + name = "sys_metrics" + version = "0.2.7" diff --git a/app/legacy/src-tauri/Cargo.toml b/app/legacy/src-tauri/Cargo.toml -index b971c3d..44abf29 100644 +index fb735b2..cfd1349 100644 --- a/app/legacy/src-tauri/Cargo.toml +++ b/app/legacy/src-tauri/Cargo.toml @@ -20,7 +20,7 @@ notify-rust = "4.10" @@ -54,15 +52,15 @@ index b971c3d..44abf29 100644 serde_json = "1.0" -sys_metrics = "0.2" +sys_metrics = { git = "https://github.com/Martichou/sys_metrics" } - tauri = { version = "1.5", features = ["api-all", "reqwest-native-tls-vendored", "system-tray", "devtools"] } + tauri = { version = "1.8", features = ["api-all", "reqwest-native-tls-vendored", "devtools", "system-tray"] } tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" } diff --git a/app/main/src-tauri/Cargo.lock b/app/main/src-tauri/Cargo.lock -index bc4753a..ed4c7e8 100644 +index 5580ef5..4327d4c 100644 --- a/app/main/src-tauri/Cargo.lock +++ b/app/main/src-tauri/Cargo.lock -@@ -4182,7 +4182,7 @@ dependencies = [ - "rand 0.8.5", +@@ -4247,7 +4247,7 @@ dependencies = [ + "rand 0.9.0", "serde", "sha2", - "sys_metrics 0.2.7 (git+https://github.com/Martichou/sys_metrics)", @@ -70,7 +68,7 @@ index bc4753a..ed4c7e8 100644 "tokio", "tokio-util", "tracing-subscriber", -@@ -4202,7 +4202,7 @@ dependencies = [ +@@ -4267,7 +4267,7 @@ dependencies = [ "rqs_lib", "serde", "serde_json", @@ -79,7 +77,7 @@ index bc4753a..ed4c7e8 100644 "tauri", "tauri-build", "tauri-plugin-autostart", -@@ -4867,21 +4867,6 @@ dependencies = [ +@@ -4932,21 +4932,6 @@ dependencies = [ "syn 2.0.95", ] @@ -102,7 +100,7 @@ index bc4753a..ed4c7e8 100644 name = "sys_metrics" version = "0.2.7" diff --git a/app/main/src-tauri/Cargo.toml b/app/main/src-tauri/Cargo.toml -index 5653700..5120513 100644 +index 8864112..7707922 100644 --- a/app/main/src-tauri/Cargo.toml +++ b/app/main/src-tauri/Cargo.toml @@ -20,7 +20,7 @@ notify-rust = "4.10" diff --git a/pkgs/by-name/rr/rrdtool/package.nix b/pkgs/by-name/rr/rrdtool/package.nix index 1a66700b17d9..1aad60b8ec24 100644 --- a/pkgs/by-name/rr/rrdtool/package.nix +++ b/pkgs/by-name/rr/rrdtool/package.nix @@ -12,7 +12,6 @@ cairo, groff, tcl, - darwin, }: perl.pkgs.toPerlModule ( @@ -49,7 +48,6 @@ perl.pkgs.toPerlModule ( ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tcl - darwin.apple_sdk.frameworks.ApplicationServices ]; postInstall = '' diff --git a/pkgs/by-name/rt/rtaudio_6/package.nix b/pkgs/by-name/rt/rtaudio_6/package.nix index b57810ba7e15..b1da7ea2825a 100644 --- a/pkgs/by-name/rt/rtaudio_6/package.nix +++ b/pkgs/by-name/rt/rtaudio_6/package.nix @@ -13,7 +13,6 @@ jackSupport ? true, libjack2, coreaudioSupport ? stdenv.hostPlatform.isDarwin, - darwin, validatePkgConfig, }: @@ -45,9 +44,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals jackSupport [ libjack2 - ] - ++ lib.optionals coreaudioSupport [ - darwin.apple_sdk.frameworks.CoreAudio ]; cmakeFlags = [ diff --git a/pkgs/by-name/rt/rtz/package.nix b/pkgs/by-name/rt/rtz/package.nix index 51ed10eababb..3dd5f8d13335 100644 --- a/pkgs/by-name/rt/rtz/package.nix +++ b/pkgs/by-name/rt/rtz/package.nix @@ -6,8 +6,6 @@ bzip2, openssl, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,16 +26,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - bzip2 - openssl - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + zstd + ]; buildFeatures = [ "web" ]; diff --git a/pkgs/by-name/ru/rubberband/package.nix b/pkgs/by-name/ru/rubberband/package.nix index 684bb97a1709..f64817adec84 100644 --- a/pkgs/by-name/ru/rubberband/package.nix +++ b/pkgs/by-name/ru/rubberband/package.nix @@ -12,7 +12,6 @@ ladspaH, meson, ninja, - darwin, }: stdenv.mkDerivation rec { @@ -30,23 +29,14 @@ stdenv.mkDerivation rec { ninja jdk_headless ]; - buildInputs = - [ - libsamplerate - libsndfile - fftw - vamp-plugin-sdk - ladspaH - lv2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Accelerate - CoreGraphics - CoreVideo - ] - ); + buildInputs = [ + libsamplerate + libsndfile + fftw + vamp-plugin-sdk + ladspaH + lv2 + ]; makeFlags = [ "AR:=$(AR)" ]; # TODO: package boost-test, so we can run the test suite. (Currently it fails diff --git a/pkgs/by-name/ru/ruff-lsp/package.nix b/pkgs/by-name/ru/ruff-lsp/package.nix deleted file mode 100644 index 17640924a42f..000000000000 --- a/pkgs/by-name/ru/ruff-lsp/package.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - python3Packages, - fetchFromGitHub, - - # tests - versionCheckHook, - - # passthru - nix-update-script, -}: - -python3Packages.buildPythonApplication rec { - pname = "ruff-lsp"; - version = "0.0.62"; - pyproject = true; - - src = fetchFromGitHub { - owner = "astral-sh"; - repo = "ruff-lsp"; - tag = "v${version}"; - hash = "sha256-aYhNvT4rcaEzuqwql7TpFkCoyH77uSG7r6uY5aIzhrk="; - }; - - build-system = with python3Packages; [ hatchling ]; - - dependencies = with python3Packages; [ - lsprotocol - packaging - pygls - ruff - typing-extensions - ]; - - nativeCheckInputs = with python3Packages; [ - pytest-asyncio - pytestCheckHook - python-lsp-jsonrpc - ruff - versionCheckHook - ]; - versionCheckProgramArg = "--version"; - - makeWrapperArgs = [ - # prefer ruff from user's PATH, that's usually desired behavior - "--suffix PATH : ${lib.makeBinPath (with python3Packages; [ ruff ])}" - # Unset ambient PYTHONPATH in the wrapper, so ruff-lsp only ever runs with - # its own, isolated set of dependencies. This works because the correct - # PYTHONPATH is set in the Python script, which runs after the wrapper. - "--unset PYTHONPATH" - ]; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = { - changelog = "https://github.com/astral-sh/ruff-lsp/releases/tag/v${version}"; - description = "Language Server Protocol implementation for Ruff"; - homepage = "https://github.com/astral-sh/ruff-lsp"; - license = lib.licenses.mit; - mainProgram = "ruff-lsp"; - maintainers = with lib.maintainers; [ - figsoda - kalekseev - ]; - }; -} diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 781343510893..de384b3ad805 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -10,24 +10,23 @@ versionCheckHook, # passthru - ruff-lsp, nixosTests, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-7R913Dt395qsyJCp7eXGQ9BcAAvV7GrJqoZAsXn6CTs="; + hash = "sha256-Yi8eRA2xL+wumXXrq5c4NNtPORZ3BjEM5IowDEfsjwA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dA2OEogzEBTu2c5OVoxU4dj5TuMWpxmHk7r63lFsEjU="; + cargoHash = "sha256-rJNA6Lh3OnY60BZ8YnjP+7cSGftbCb69ISQyr7z523Q="; nativeBuildInputs = [ installShellFiles ]; @@ -70,13 +69,9 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; passthru = { - tests = - { - inherit ruff-lsp; - } - // lib.optionalAttrs stdenv.hostPlatform.isLinux { - nixos-test-driver-busybox = nixosTests.nixos-test-driver.busybox; - }; + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { + nixos-test-driver-busybox = nixosTests.nixos-test-driver.busybox; + }; updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 7330bb888093..051eb271e705 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -7,7 +7,6 @@ jre_minimal, pkg-config, wrapGAppsHook3, - darwin, alsa-lib, gtk3, openssl, @@ -56,16 +55,14 @@ rustPlatform.buildRustPackage (finalAttrs: { ] ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; - buildInputs = - lib.optionals stdenvNoCC.hostPlatform.isLinux [ - alsa-lib - gtk3 - openssl - wayland - vulkan-loader - udev - ] - ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [ + alsa-lib + gtk3 + openssl + wayland + vulkan-loader + udev + ]; postInstall = '' diff --git a/pkgs/by-name/ru/rune-languageserver/package.nix b/pkgs/by-name/ru/rune-languageserver/package.nix index 35316fdc68a6..750b5a897dd9 100644 --- a/pkgs/by-name/ru/rune-languageserver/package.nix +++ b/pkgs/by-name/ru/rune-languageserver/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,10 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-YviRACndc4r4ul72ZF3I/R/nEsIoML2Ek2xqUUE3FDQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - env = { RUNE_VERSION = version; }; diff --git a/pkgs/by-name/ru/rune/package.nix b/pkgs/by-name/ru/rune/package.nix index 8f962d69c6f5..61915b6e9801 100644 --- a/pkgs/by-name/ru/rune/package.nix +++ b/pkgs/by-name/ru/rune/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,11 +17,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-SgfgoMqr2Cc7+qhf9Ejl4Ect1JR9RqI9I0b+PrdvdOs="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - env = { RUNE_VERSION = version; }; diff --git a/pkgs/by-name/ru/runiq/package.nix b/pkgs/by-name/ru/runiq/package.nix index 198d3041a849..85cd0995f1f5 100644 --- a/pkgs/by-name/ru/runiq/package.nix +++ b/pkgs/by-name/ru/runiq/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage { @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage { ln -s ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "Efficient way to filter duplicate lines from input, à la uniq"; mainProgram = "runiq"; diff --git a/pkgs/by-name/ru/runit/package.nix b/pkgs/by-name/ru/runit/package.nix index 9e8a971f81a1..d3ac271a2a62 100644 --- a/pkgs/by-name/ru/runit/package.nix +++ b/pkgs/by-name/ru/runit/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - darwin, # Build runit-init as a static binary static ? false, @@ -30,12 +29,10 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = - lib.optionals static [ - stdenv.cc.libc - stdenv.cc.libc.static - ] - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.utmp; + buildInputs = lib.optionals static [ + stdenv.cc.libc + stdenv.cc.libc.static + ]; postPatch = '' diff --git a/pkgs/by-name/ru/ruri/package.nix b/pkgs/by-name/ru/ruri/package.nix new file mode 100644 index 000000000000..ed39092e3688 --- /dev/null +++ b/pkgs/by-name/ru/ruri/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libcap, + libseccomp, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ruri"; + version = "3.8"; + + src = fetchFromGitHub { + owner = "Moe-hacker"; + repo = "ruri"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = false; + sha256 = "sha256-gf+WJPGeLbMntBk8ryTSsV9L4J3N4Goh9eWBIBj5FA4="; + }; + + buildInputs = [ + libcap + libseccomp + ]; + + installPhase = '' + runHook preInstall + install -Dm755 ruri $out/bin/ruri + runHook postInstall + ''; + + meta = { + description = "Self-contained Linux container implementation"; + homepage = "https://wiki.crack.moe/ruri"; + downloadPage = "https://github.com/Moe-hacker/ruri"; + changelog = "https://github.com/Moe-hacker/ruri/releases/tag/v${finalAttrs.version}"; + mainProgram = "ruri"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.dabao1955 ]; + }; +}) diff --git a/pkgs/by-name/ru/rush/package.nix b/pkgs/by-name/ru/rush/package.nix index 3e94ac44c970..cca8e1429a14 100644 --- a/pkgs/by-name/ru/rush/package.nix +++ b/pkgs/by-name/ru/rush/package.nix @@ -4,6 +4,7 @@ stdenv, bash, perl, + nixosTests, }: stdenv.mkDerivation rec { @@ -61,5 +62,6 @@ stdenv.mkDerivation rec { passthru = { shellPath = "/bin/rush"; + tests = { inherit (nixosTests) rush; }; }; } diff --git a/pkgs/by-name/ru/russ/package.nix b/pkgs/by-name/ru/russ/package.nix index a90b0628dcac..73ba1fa99527 100644 --- a/pkgs/by-name/ru/russ/package.nix +++ b/pkgs/by-name/ru/russ/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage { @@ -23,14 +21,6 @@ rustPlatform.buildRustPackage { # tests are network based :( doCheck = false; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - AppKit - ] - ); - meta = { changelog = "https://github.com/ckampfe/russ/blob/master/CHANGELOG.md"; description = "TUI RSS reader with vim-like controls and a local-first, offline-first focus"; diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index be2f44777db8..1c298f6537f5 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -12,15 +12,15 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2025-04-07"; + version = "2025-04-14"; useFetchCargoVendor = true; - cargoHash = "sha256-sOuswCnF5y/L8x586PpcrLQj19+5x8COi9xBE2SRLYY="; + cargoHash = "sha256-6HKx3zm6RaixTiioij/PI2KvgWGhPFfVQsbECm4LtEc="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - hash = "sha256-3lJ0W+mzfuR5FZM7JS7EfCJ5wBhu44fRBFu2/gKORzc="; + hash = "sha256-NPUnfDAwLD69aKetxjC7lV5ysrvs1IKC0Sy4Zai10Mw="; }; cargoBuildFlags = [ diff --git a/pkgs/by-name/ru/rust-stakeholder/package.nix b/pkgs/by-name/ru/rust-stakeholder/package.nix index 1180b6cad19b..934e826bec1f 100644 --- a/pkgs/by-name/ru/rust-stakeholder/package.nix +++ b/pkgs/by-name/ru/rust-stakeholder/package.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, rustPlatform, - versionCheckHook, nix-update-script, }: rustPlatform.buildRustPackage { @@ -19,10 +18,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-NxO+7Wh8Ff6RPFtmbEa3EJszfDaZDXGWZDAoXPEAnpI="; - nativeInstallCheck = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - doInstallCheck = true; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/ru/rust-streamdeck/package.nix b/pkgs/by-name/ru/rust-streamdeck/package.nix new file mode 100644 index 000000000000..71e2937e4190 --- /dev/null +++ b/pkgs/by-name/ru/rust-streamdeck/package.nix @@ -0,0 +1,52 @@ +{ + rustPlatform, + fetchFromGitHub, + fetchpatch, + pkg-config, + lib, + udev, + nix-update-script, + versionCheckHook, +}: +rustPlatform.buildRustPackage rec { + pname = "rust-streamdeck"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "ryankurte"; + repo = "rust-streamdeck"; + tag = "v${version}"; + hash = "sha256-9FuTnRQHKYJzMqhhgyTVq2R+drn4HAr3GDNjQgc3r+w="; + }; + + cargoPatches = [ + (fetchpatch { + name = "add_cargo_lock.patch"; + url = "https://github.com/ryankurte/rust-streamdeck/commit/d8497c34898daebafca21885f464f241c29ff9d7.patch"; + hash = "sha256-cwt4nvtuME//t9KpHgIXHCwLQgpybs2CqV2jO02umfE="; + }) + ]; + + cargoHash = "sha256-OiXpG45jwWydbpRHnbIlECOaa75CzUOmdWxZ3WE5+hY="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ udev ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${builtins.placeholder "out"}/bin/${meta.mainProgram}"; + + postInstall = '' + install -Dm444 40-streamdeck.rules -t $out/lib/udev/rules.d/ + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "ibusb based driver for Elgato StreamDeck devices"; + homepage = "https://github.com/ryankurte/rust-streamdeck"; + license = lib.licenses.mpl20; + maintainers = [ lib.maintainers.gdifolco ]; + mainProgram = "streamdeck-cli"; + }; +} diff --git a/pkgs/by-name/ru/rust-traverse/package.nix b/pkgs/by-name/ru/rust-traverse/package.nix index a5d80ba81433..d969e4023c44 100644 --- a/pkgs/by-name/ru/rust-traverse/package.nix +++ b/pkgs/by-name/ru/rust-traverse/package.nix @@ -5,8 +5,6 @@ pkg-config, bzip2, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,14 +25,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - bzip2 - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Foundation - ]; + buildInputs = [ + bzip2 + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/ru/rustcat/package.nix b/pkgs/by-name/ru/rustcat/package.nix index 47c78d76b292..0d6d73f63266 100644 --- a/pkgs/by-name/ru/rustcat/package.nix +++ b/pkgs/by-name/ru/rustcat/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, versionCheckHook, @@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-76/JK9IKYD6mxMddUyTgKAw53GM4EUhC0NbKFKdg8CI="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/ru/rustdesk-server/package.nix b/pkgs/by-name/ru/rustdesk-server/package.nix index 9f15d8a80ba0..b561f3525b2d 100644 --- a/pkgs/by-name/ru/rustdesk-server/package.nix +++ b/pkgs/by-name/ru/rustdesk-server/package.nix @@ -1,11 +1,9 @@ { - stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, libsodium, - Security, sqlite, nix-update-script, testers, @@ -41,14 +39,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libsodium - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = [ + libsodium + sqlite + ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ru/rustdesk/package.nix b/pkgs/by-name/ru/rustdesk/package.nix index 67e4eaf6a680..d7da3b26e7d3 100644 --- a/pkgs/by-name/ru/rustdesk/package.nix +++ b/pkgs/by-name/ru/rustdesk/package.nix @@ -29,7 +29,6 @@ zlib, zstd, stdenv, - darwin, alsa-lib, makeDesktopItem, copyDesktopItems, @@ -144,19 +143,7 @@ rustPlatform.buildRustPackage (finalAttrs: { zlib zstd ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreAudio - CoreFoundation - CoreGraphics - Foundation - IOKit - Security - SystemConfiguration - ] - ) + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib xdotool diff --git a/pkgs/by-name/ru/rusti-cal/package.nix b/pkgs/by-name/ru/rusti-cal/package.nix index 96cbda420d44..a706c00408be 100644 --- a/pkgs/by-name/ru/rusti-cal/package.nix +++ b/pkgs/by-name/ru/rusti-cal/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-9nd8xm3jAFouRYKSFpx3vQQaI/2wQzTaaehXjqljIfw="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; - meta = with lib; { description = "Minimal command line calendar, similar to cal"; mainProgram = "rusti-cal"; diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix index 1b2b632438ab..ea400d9b6ce3 100644 --- a/pkgs/by-name/ru/rustic/package.nix +++ b/pkgs/by-name/ru/rustic/package.nix @@ -2,9 +2,6 @@ lib, fetchFromGitHub, rustPlatform, - stdenv, - Security, - SystemConfiguration, installShellFiles, nix-update-script, }: @@ -25,11 +22,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - SystemConfiguration - ]; - postInstall = '' for shell in {ba,fi,z}sh; do $out/bin/rustic completions $shell > rustic.$shell diff --git a/pkgs/by-name/ru/rustlings/package.nix b/pkgs/by-name/ru/rustlings/package.nix index 5c3f1549df0c..136cddb89013 100644 --- a/pkgs/by-name/ru/rustlings/package.nix +++ b/pkgs/by-name/ru/rustlings/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, rustPlatform, fetchFromGitHub, pkg-config, @@ -38,10 +36,6 @@ rustPlatform.buildRustPackage { makeWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; [ CoreServices ] - ); - postFixup = '' wrapProgram $out/bin/rustlings --suffix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/by-name/ru/rustls-ffi/package.nix b/pkgs/by-name/ru/rustls-ffi/package.nix index 61bbb514cc75..b0a1935d8803 100644 --- a/pkgs/by-name/ru/rustls-ffi/package.nix +++ b/pkgs/by-name/ru/rustls-ffi/package.nix @@ -8,7 +8,6 @@ validatePkgConfig, rust, libiconv, - darwin, curl, apacheHttpd, testers, @@ -33,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ru/rustmission/package.nix b/pkgs/by-name/ru/rustmission/package.nix index a87e24b16802..932876025231 100644 --- a/pkgs/by-name/ru/rustmission/package.nix +++ b/pkgs/by-name/ru/rustmission/package.nix @@ -4,8 +4,6 @@ rustPlatform, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,13 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; # There is no tests doCheck = false; diff --git a/pkgs/by-name/ru/rustus/package.nix b/pkgs/by-name/ru/rustus/package.nix index 2d6e9126502c..647f86a3d7c7 100644 --- a/pkgs/by-name/ru/rustus/package.nix +++ b/pkgs/by-name/ru/rustus/package.nix @@ -1,12 +1,10 @@ { - stdenv, lib, fetchFromGitHub, rustPlatform, nix-update-script, pkg-config, openssl, - darwin, rdkafka, }: @@ -36,14 +34,10 @@ rustPlatform.buildRustPackage { pkg-config ]; - buildInputs = - [ - openssl - rdkafka - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + rdkafka + ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ru/rustycli/package.nix b/pkgs/by-name/ru/rustycli/package.nix index 5e7c9d6a7e5f..337bd547c497 100644 --- a/pkgs/by-name/ru/rustycli/package.nix +++ b/pkgs/by-name/ru/rustycli/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,10 +16,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-QjkUiPwjG25NsvAXM3jqQVtJzYiXhzVqFaDN1b7DXDE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - # some examples fail to compile cargoTestFlags = [ "--tests" ]; diff --git a/pkgs/by-name/ru/rustypaste-cli/package.nix b/pkgs/by-name/ru/rustypaste-cli/package.nix index a19879a1d41c..6ed96164be17 100644 --- a/pkgs/by-name/ru/rustypaste-cli/package.nix +++ b/pkgs/by-name/ru/rustypaste-cli/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-R6mdHoARtnIRpN18KF1TVIgBzEtCinb0xfCM3nz2sxk="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "CLI tool for rustypaste"; homepage = "https://github.com/orhun/rustypaste-cli"; diff --git a/pkgs/by-name/ru/rustypaste/package.nix b/pkgs/by-name/ru/rustypaste/package.nix index 9548360b2f22..c97756291304 100644 --- a/pkgs/by-name/ru/rustypaste/package.nix +++ b/pkgs/by-name/ru/rustypaste/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-10tBbn4XtdUNhfzb+KpwFGZAc7YVIEQRaqNLzJC1GGI="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - dontUseCargoParallelTests = true; checkFlags = [ diff --git a/pkgs/by-name/ru/rustywind/package.nix b/pkgs/by-name/ru/rustywind/package.nix index b0b5bbf2b2e9..72e4d59d6ea7 100644 --- a/pkgs/by-name/ru/rustywind/package.nix +++ b/pkgs/by-name/ru/rustywind/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-jq8d+ndPOu07YO5PJ5YfWTeG70bZnr0i8vMwv7Dw5GY="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - meta = with lib; { description = "CLI for organizing Tailwind CSS classes"; mainProgram = "rustywind"; diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix index 68e8353bd1f8..a3f1951ef483 100644 --- a/pkgs/by-name/ry/ryubing/package.nix +++ b/pkgs/by-name/ry/ryubing/package.nix @@ -143,7 +143,7 @@ buildDotnetModule rec { maintainers = with maintainers; [ jk artemist - kekschen + willow ]; platforms = [ "x86_64-linux" diff --git a/pkgs/by-name/sa/sabnzbd/package.nix b/pkgs/by-name/sa/sabnzbd/package.nix index 0bc329d27f22..16705b2a20c4 100644 --- a/pkgs/by-name/sa/sabnzbd/package.nix +++ b/pkgs/by-name/sa/sabnzbd/package.nix @@ -72,14 +72,14 @@ let ]; in stdenv.mkDerivation rec { - version = "4.5.0"; + version = "4.5.1"; pname = "sabnzbd"; src = fetchFromGitHub { owner = "sabnzbd"; repo = "sabnzbd"; rev = version; - hash = "sha256-X/ovfhP6QZOmYEfX2YchGWjkLBYZXNFuefXQyzKIW5s="; + hash = "sha256-vundARltVyTX0rEdwQJnY8p1n9zBhFskJkyttWgEaZI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/sa/safecloset/package.nix b/pkgs/by-name/sa/safecloset/package.nix index 31756bdf7d66..db379c5c85e1 100644 --- a/pkgs/by-name/sa/safecloset/package.nix +++ b/pkgs/by-name/sa/safecloset/package.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, stdenv, - darwin, xorg, }: @@ -21,13 +20,9 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-/AnzUaya+dgckcilxj9ZZbDNqmfj1uTWkzhVphpZIsM="; - buildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libxcb - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + xorg.libxcb + ]; checkFlags = [ # skip flaky test diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 011c1929df58..9bd9fa33a41b 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -20,7 +20,6 @@ vigra, pdal, libpq, - darwin, unixODBC, poppler, hdf5, @@ -80,7 +79,6 @@ stdenv.mkDerivation rec { # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa unixODBC poppler netcdf diff --git a/pkgs/by-name/sa/sagoin/package.nix b/pkgs/by-name/sa/sagoin/package.nix index e7bfd4246292..8d2e0bb7b656 100644 --- a/pkgs/by-name/sa/sagoin/package.nix +++ b/pkgs/by-name/sa/sagoin/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchFromGitHub, installShellFiles, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - postInstall = '' installManPage artifacts/sagoin.1 installShellCompletion artifacts/sagoin.{bash,fish} --zsh artifacts/_sagoin diff --git a/pkgs/by-name/sa/sampler/package.nix b/pkgs/by-name/sa/sampler/package.nix index ec2e35728b1c..1f1f993d4915 100644 --- a/pkgs/by-name/sa/sampler/package.nix +++ b/pkgs/by-name/sa/sampler/package.nix @@ -3,7 +3,6 @@ buildGoModule, fetchFromGitHub, fetchpatch, - darwin, alsa-lib, stdenv, }: @@ -33,11 +32,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildInputs = - lib.optional stdenv.hostPlatform.isLinux alsa-lib - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.OpenAL - ]; + buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib; meta = with lib; { description = "Tool for shell commands execution, visualization and alerting"; diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix index b0fba4887cd4..1c6d2f8a4db3 100644 --- a/pkgs/by-name/sa/samply/package.nix +++ b/pkgs/by-name/sa/samply/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, versionCheckHook, nix-update-script, }: @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-mQykzO9Ldokd3PZ1fY4pK/GtLmYMVas2iHj1Pqi9WqQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; doInstallCheck = true; diff --git a/pkgs/by-name/sa/sane-airscan/package.nix b/pkgs/by-name/sa/sane-airscan/package.nix index 69738bf67f6b..fa89d36bd10e 100644 --- a/pkgs/by-name/sa/sane-airscan/package.nix +++ b/pkgs/by-name/sa/sane-airscan/package.nix @@ -15,7 +15,7 @@ }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.99.33"; + version = "0.99.34"; nativeBuildInputs = [ meson @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "sha256-qZ7j76cwJQxGXbgIkV2bYt7puG0lSEw/d6d3fw19TCk="; + sha256 = "sha256-4srMsZhco9YOukmguLQ5HvNeIz7wShmhWt7m5kP4iW8="; }; meta = with lib; { diff --git a/pkgs/by-name/sa/satisfactorymodmanager/add-generated-files.patch b/pkgs/by-name/sa/satisfactorymodmanager/add-generated-files.patch new file mode 100644 index 000000000000..0f707e92060e --- /dev/null +++ b/pkgs/by-name/sa/satisfactorymodmanager/add-generated-files.patch @@ -0,0 +1,9727 @@ +diff --git a/frontend/src/lib/generated/graphql/graphql.schema.urql.json b/frontend/src/lib/generated/graphql/graphql.schema.urql.json +new file mode 100644 +index 0000000..b8e497a +--- /dev/null ++++ b/frontend/src/lib/generated/graphql/graphql.schema.urql.json +@@ -0,0 +1,3576 @@ ++{ ++ "__schema": { ++ "queryType": { ++ "name": "Query", ++ "kind": "OBJECT" ++ }, ++ "mutationType": { ++ "name": "Mutation", ++ "kind": "OBJECT" ++ }, ++ "subscriptionType": null, ++ "types": [ ++ { ++ "kind": "OBJECT", ++ "name": "Announcement", ++ "fields": [ ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "importance", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "message", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "Compatibility", ++ "fields": [ ++ { ++ "name": "note", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "state", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "CompatibilityInfo", ++ "fields": [ ++ { ++ "name": "EA", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Compatibility", ++ "ofType": null ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "EXP", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Compatibility", ++ "ofType": null ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "CreateVersionResponse", ++ "fields": [ ++ { ++ "name": "auto_approved", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "version", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "GetGuides", ++ "fields": [ ++ { ++ "name": "count", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "guides", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Guide", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "GetMods", ++ "fields": [ ++ { ++ "name": "count", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mods", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "GetMyMods", ++ "fields": [ ++ { ++ "name": "count", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mods", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "GetMyVersions", ++ "fields": [ ++ { ++ "name": "count", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "versions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "GetSMLVersions", ++ "fields": [ ++ { ++ "name": "count", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "sml_versions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "SMLVersion", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "GetVersions", ++ "fields": [ ++ { ++ "name": "count", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "versions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "Group", ++ "fields": [ ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "name", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "Guide", ++ "fields": [ ++ { ++ "name": "created_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "guide", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "name", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "short_description", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "tags", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Tag", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "updated_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "user", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "User", ++ "ofType": null ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "user_id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "views", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "LatestVersions", ++ "fields": [ ++ { ++ "name": "alpha", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ }, ++ "args": [] ++ }, ++ { ++ "name": "beta", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ }, ++ "args": [] ++ }, ++ { ++ "name": "release", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "fields": [ ++ { ++ "name": "approved", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "authors", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "UserMod", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "compatibility", ++ "type": { ++ "kind": "OBJECT", ++ "name": "CompatibilityInfo", ++ "ofType": null ++ }, ++ "args": [] ++ }, ++ { ++ "name": "created_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "creator_id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "downloads", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "full_description", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "hidden", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "hotness", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "last_version_date", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "latestVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "LatestVersions", ++ "ofType": null ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "logo", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "logo_thumbhash", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mod_reference", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "name", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "popularity", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "short_description", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "source_url", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "tags", ++ "type": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Tag", ++ "ofType": null ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "toggle_explicit_content", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "toggle_network_use", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "updated_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "version", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "versions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "views", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "ModVersion", ++ "fields": [ ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mod_reference", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "versions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "Mutation", ++ "fields": [ ++ { ++ "name": "approveMod", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "approveVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "versionId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "createAnnouncement", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Announcement", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "announcement", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "createGuide", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Guide", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "guide", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "createMod", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "mod", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "createMultipleTags", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Tag", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [ ++ { ++ "name": "tagNames", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "createSatisfactoryVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "SatisfactoryVersion", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "input", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "createTag", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Tag", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "description", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "tagName", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "createVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "deleteAnnouncement", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "announcementId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "deleteGuide", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "guideId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "deleteMod", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "deleteSatisfactoryVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "deleteTag", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "tagID", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "deleteVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "versionId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "denyMod", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "denyVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "versionId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "discourseSSO", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [ ++ { ++ "name": "sig", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "sso", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "finalizeCreateVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "versionId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "logout", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "oAuthFacebook", ++ "type": { ++ "kind": "OBJECT", ++ "name": "UserSession", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "code", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "state", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "oAuthGithub", ++ "type": { ++ "kind": "OBJECT", ++ "name": "UserSession", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "code", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "state", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "oAuthGoogle", ++ "type": { ++ "kind": "OBJECT", ++ "name": "UserSession", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "code", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "state", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateAnnouncement", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Announcement", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "announcement", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "announcementId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateGuide", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Guide", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "guide", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "guideId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateMod", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "mod", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateModCompatibility", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "compatibility", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateMultipleModCompatibilities", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "compatibility", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "modIDs", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateSatisfactoryVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "SatisfactoryVersion", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "input", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateTag", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Tag", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "NewName", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "description", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "tagID", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateUser", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "User", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "input", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "userId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "updateVersion", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "versionId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "uploadVersionPart", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [ ++ { ++ "name": "file", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "part", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "versionId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "OAuthOptions", ++ "fields": [ ++ { ++ "name": "facebook", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "github", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "google", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "Query", ++ "fields": [ ++ { ++ "name": "checkVersionUploadState", ++ "type": { ++ "kind": "OBJECT", ++ "name": "CreateVersionResponse", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ }, ++ { ++ "name": "versionId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getAnnouncement", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Announcement", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "announcementId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getAnnouncements", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Announcement", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "getAnnouncementsByImportance", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Announcement", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [ ++ { ++ "name": "importance", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getGuide", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Guide", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "guideId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getGuides", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetGuides", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getMe", ++ "type": { ++ "kind": "OBJECT", ++ "name": "User", ++ "ofType": null ++ }, ++ "args": [] ++ }, ++ { ++ "name": "getMod", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "modId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getModAssetList", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ }, ++ "args": [ ++ { ++ "name": "modReference", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getModByIdOrReference", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "modIdOrReference", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getModByReference", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "modReference", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getMods", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetMods", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getMyMods", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetMyMods", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getMyUnapprovedMods", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetMyMods", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getMyUnapprovedVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetMyVersions", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getMyVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetMyVersions", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getOAuthOptions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "OAuthOptions", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "callback_url", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getSMLVersion", ++ "type": { ++ "kind": "OBJECT", ++ "name": "SMLVersion", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "smlVersionID", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getSMLVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetSMLVersions", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getSatisfactoryVersion", ++ "type": { ++ "kind": "OBJECT", ++ "name": "SatisfactoryVersion", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getSatisfactoryVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "SatisfactoryVersion", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "getTag", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Tag", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "tagID", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getTags", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Tag", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getUnapprovedMods", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetMods", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getUnapprovedVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetVersions", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getUser", ++ "type": { ++ "kind": "OBJECT", ++ "name": "User", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "userId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getUsers", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "User", ++ "ofType": null ++ } ++ } ++ }, ++ "args": [ ++ { ++ "name": "userIds", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getVersion", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ }, ++ "args": [ ++ { ++ "name": "versionId", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ ] ++ }, ++ { ++ "name": "getVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "GetVersions", ++ "ofType": null ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ ] ++ }, ++ { ++ "name": "resolveModVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "ModVersion", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [ ++ { ++ "name": "filter", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ } ++ } ++ } ++ } ++ ] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "SMLVersion", ++ "fields": [ ++ { ++ "name": "bootstrap_version", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "changelog", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "created_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "date", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "engine_version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "link", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "satisfactory_version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "stability", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "targets", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "SMLVersionTarget", ++ "ofType": null ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "updated_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "SMLVersionTarget", ++ "fields": [ ++ { ++ "name": "VersionID", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "link", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "targetName", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "SatisfactoryVersion", ++ "fields": [ ++ { ++ "name": "engine_version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "Tag", ++ "fields": [ ++ { ++ "name": "description", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "name", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "User", ++ "fields": [ ++ { ++ "name": "avatar", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "avatar_thumbhash", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "created_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "email", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "facebook_id", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "github_id", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "google_id", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "groups", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Group", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "guides", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Guide", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mods", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "UserMod", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "roles", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "UserRoles", ++ "ofType": null ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "username", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "UserMod", ++ "fields": [ ++ { ++ "name": "mod", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mod_id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "role", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "user", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "User", ++ "ofType": null ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "user_id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "UserRoles", ++ "fields": [ ++ { ++ "name": "approveMods", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "approveVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "deleteContent", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "editAnyModCompatibility", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "editBootstrapVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "editContent", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "editSatisfactoryVersions", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "editUsers", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "UserSession", ++ "fields": [ ++ { ++ "name": "token", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "Version", ++ "fields": [ ++ { ++ "name": "approved", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "changelog", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "created_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "dependencies", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "VersionDependency", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "downloads", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "game_version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "hash", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "link", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "metadata", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mod", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mod_id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "required_on_remote", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "size", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "sml_version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "stability", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "targets", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "VersionTarget", ++ "ofType": null ++ } ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "updated_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "version", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "virustotal_results", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "LIST", ++ "ofType": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "OBJECT", ++ "name": "VirustotalResult", ++ "ofType": null ++ } ++ } ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "VersionDependency", ++ "fields": [ ++ { ++ "name": "condition", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mod", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Mod", ++ "ofType": null ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mod_id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "mod_reference", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "optional", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "version", ++ "type": { ++ "kind": "OBJECT", ++ "name": "Version", ++ "ofType": null ++ }, ++ "args": [] ++ }, ++ { ++ "name": "version_id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "VersionTarget", ++ "fields": [ ++ { ++ "name": "VersionID", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "hash", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "link", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "size", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "targetName", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "OBJECT", ++ "name": "VirustotalResult", ++ "fields": [ ++ { ++ "name": "created_at", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "file_name", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "hash", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "id", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "safe", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ }, ++ { ++ "name": "updated_at", ++ "type": { ++ "kind": "SCALAR", ++ "name": "Any" ++ }, ++ "args": [] ++ }, ++ { ++ "name": "version_id", ++ "type": { ++ "kind": "NON_NULL", ++ "ofType": { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ }, ++ "args": [] ++ } ++ ], ++ "interfaces": [] ++ }, ++ { ++ "kind": "SCALAR", ++ "name": "Any" ++ } ++ ], ++ "directives": [] ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/graphql/graphql.ts b/frontend/src/lib/generated/graphql/graphql.ts +new file mode 100644 +index 0000000..93bc403 +--- /dev/null ++++ b/frontend/src/lib/generated/graphql/graphql.ts +@@ -0,0 +1,1007 @@ ++/* eslint-disable */ ++import type { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/core'; ++export type Maybe = T | null; ++export type InputMaybe = Maybe; ++export type Exact = { [K in keyof T]: T[K] }; ++export type MakeOptional = Omit & { [SubKey in K]?: Maybe }; ++export type MakeMaybe = Omit & { [SubKey in K]: Maybe }; ++export type MakeEmpty = { [_ in K]?: never }; ++export type Incremental = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never }; ++/** All built-in and custom scalars, mapped to their actual values */ ++export type Scalars = { ++ ID: { input: string; output: string; } ++ String: { input: string; output: string; } ++ Boolean: { input: boolean; output: boolean; } ++ Int: { input: number; output: number; } ++ Float: { input: number; output: number; } ++ AnnouncementID: { input: string; output: string; } ++ Date: { input: any; output: any; } ++ GuideID: { input: string; output: string; } ++ ModID: { input: string; output: string; } ++ ModReference: { input: string; output: string; } ++ SMLVersionID: { input: any; output: any; } ++ SatisfactoryVersionID: { input: any; output: any; } ++ TagID: { input: string; output: string; } ++ TagName: { input: any; output: any; } ++ Upload: { input: any; output: any; } ++ UserID: { input: string; output: string; } ++ VersionID: { input: string; output: string; } ++ VirustotalHash: { input: any; output: any; } ++ VirustotalID: { input: any; output: any; } ++}; ++ ++export type Announcement = { ++ __typename?: 'Announcement'; ++ id: Scalars['AnnouncementID']['output']; ++ importance: AnnouncementImportance; ++ message: Scalars['String']['output']; ++}; ++ ++export enum AnnouncementImportance { ++ Alert = 'Alert', ++ Fix = 'Fix', ++ Info = 'Info', ++ Warning = 'Warning' ++} ++ ++export type Compatibility = { ++ __typename?: 'Compatibility'; ++ note?: Maybe; ++ state: CompatibilityState; ++}; ++ ++export type CompatibilityInfo = { ++ __typename?: 'CompatibilityInfo'; ++ EA: Compatibility; ++ EXP: Compatibility; ++}; ++ ++export type CompatibilityInfoInput = { ++ EA: CompatibilityInput; ++ EXP: CompatibilityInput; ++}; ++ ++export type CompatibilityInput = { ++ note?: InputMaybe; ++ state: CompatibilityState; ++}; ++ ++export enum CompatibilityState { ++ Broken = 'Broken', ++ Damaged = 'Damaged', ++ Works = 'Works' ++} ++ ++export type CreateVersionResponse = { ++ __typename?: 'CreateVersionResponse'; ++ auto_approved: Scalars['Boolean']['output']; ++ version?: Maybe; ++}; ++ ++export type GetGuides = { ++ __typename?: 'GetGuides'; ++ count: Scalars['Int']['output']; ++ guides: Array; ++}; ++ ++export type GetMods = { ++ __typename?: 'GetMods'; ++ count: Scalars['Int']['output']; ++ mods: Array; ++}; ++ ++export type GetMyMods = { ++ __typename?: 'GetMyMods'; ++ count: Scalars['Int']['output']; ++ mods: Array; ++}; ++ ++export type GetMyVersions = { ++ __typename?: 'GetMyVersions'; ++ count: Scalars['Int']['output']; ++ versions: Array; ++}; ++ ++export type GetSmlVersions = { ++ __typename?: 'GetSMLVersions'; ++ count: Scalars['Int']['output']; ++ sml_versions: Array; ++}; ++ ++export type GetVersions = { ++ __typename?: 'GetVersions'; ++ count: Scalars['Int']['output']; ++ versions: Array; ++}; ++ ++export type Group = { ++ __typename?: 'Group'; ++ id: Scalars['String']['output']; ++ name: Scalars['String']['output']; ++}; ++ ++export type Guide = { ++ __typename?: 'Guide'; ++ created_at: Scalars['Date']['output']; ++ guide: Scalars['String']['output']; ++ id: Scalars['GuideID']['output']; ++ name: Scalars['String']['output']; ++ short_description: Scalars['String']['output']; ++ tags: Array; ++ updated_at: Scalars['Date']['output']; ++ user: User; ++ user_id: Scalars['UserID']['output']; ++ views: Scalars['Int']['output']; ++}; ++ ++export enum GuideFields { ++ CreatedAt = 'created_at', ++ Name = 'name', ++ UpdatedAt = 'updated_at', ++ Views = 'views' ++} ++ ++export type GuideFilter = { ++ ids?: InputMaybe>; ++ limit?: InputMaybe; ++ offset?: InputMaybe; ++ order?: InputMaybe; ++ order_by?: InputMaybe; ++ search?: InputMaybe; ++ tagIDs?: InputMaybe>; ++}; ++ ++export type LatestVersions = { ++ __typename?: 'LatestVersions'; ++ alpha?: Maybe; ++ beta?: Maybe; ++ release?: Maybe; ++}; ++ ++export type Mod = { ++ __typename?: 'Mod'; ++ approved: Scalars['Boolean']['output']; ++ authors: Array; ++ compatibility?: Maybe; ++ created_at: Scalars['Date']['output']; ++ creator_id: Scalars['UserID']['output']; ++ downloads: Scalars['Int']['output']; ++ full_description?: Maybe; ++ hidden: Scalars['Boolean']['output']; ++ hotness: Scalars['Int']['output']; ++ id: Scalars['ModID']['output']; ++ last_version_date?: Maybe; ++ latestVersions: LatestVersions; ++ logo?: Maybe; ++ logo_thumbhash?: Maybe; ++ mod_reference: Scalars['ModReference']['output']; ++ name: Scalars['String']['output']; ++ popularity: Scalars['Int']['output']; ++ short_description: Scalars['String']['output']; ++ source_url?: Maybe; ++ tags?: Maybe>; ++ toggle_explicit_content: Scalars['Boolean']['output']; ++ toggle_network_use: Scalars['Boolean']['output']; ++ updated_at: Scalars['Date']['output']; ++ version?: Maybe; ++ versions: Array; ++ views: Scalars['Int']['output']; ++}; ++ ++ ++export type ModVersionArgs = { ++ version: Scalars['String']['input']; ++}; ++ ++ ++export type ModVersionsArgs = { ++ filter?: InputMaybe; ++}; ++ ++export enum ModFields { ++ CreatedAt = 'created_at', ++ Downloads = 'downloads', ++ Hotness = 'hotness', ++ LastVersionDate = 'last_version_date', ++ Name = 'name', ++ Popularity = 'popularity', ++ Search = 'search', ++ UpdatedAt = 'updated_at', ++ Views = 'views' ++} ++ ++export type ModFilter = { ++ hidden?: InputMaybe; ++ ids?: InputMaybe>; ++ limit?: InputMaybe; ++ offset?: InputMaybe; ++ order?: InputMaybe; ++ order_by?: InputMaybe; ++ references?: InputMaybe>; ++ search?: InputMaybe; ++ tagIDs?: InputMaybe>; ++}; ++ ++export type ModVersion = { ++ __typename?: 'ModVersion'; ++ id: Scalars['ModID']['output']; ++ mod_reference: Scalars['ModReference']['output']; ++ versions: Array; ++}; ++ ++export type ModVersionConstraint = { ++ modIdOrReference: Scalars['String']['input']; ++ version: Scalars['String']['input']; ++}; ++ ++export type Mutation = { ++ __typename?: 'Mutation'; ++ approveMod: Scalars['Boolean']['output']; ++ approveVersion: Scalars['Boolean']['output']; ++ createAnnouncement?: Maybe; ++ createGuide?: Maybe; ++ createMod?: Maybe; ++ createMultipleTags: Array; ++ createSatisfactoryVersion: SatisfactoryVersion; ++ createTag?: Maybe; ++ createVersion: Scalars['VersionID']['output']; ++ deleteAnnouncement: Scalars['Boolean']['output']; ++ deleteGuide: Scalars['Boolean']['output']; ++ deleteMod: Scalars['Boolean']['output']; ++ deleteSatisfactoryVersion: Scalars['Boolean']['output']; ++ deleteTag: Scalars['Boolean']['output']; ++ deleteVersion: Scalars['Boolean']['output']; ++ denyMod: Scalars['Boolean']['output']; ++ denyVersion: Scalars['Boolean']['output']; ++ discourseSSO?: Maybe; ++ finalizeCreateVersion: Scalars['Boolean']['output']; ++ logout: Scalars['Boolean']['output']; ++ oAuthFacebook?: Maybe; ++ oAuthGithub?: Maybe; ++ oAuthGoogle?: Maybe; ++ updateAnnouncement: Announcement; ++ updateGuide: Guide; ++ updateMod: Mod; ++ updateModCompatibility: Scalars['Boolean']['output']; ++ updateMultipleModCompatibilities: Scalars['Boolean']['output']; ++ updateSatisfactoryVersion: SatisfactoryVersion; ++ updateTag: Tag; ++ updateUser: User; ++ updateVersion: Version; ++ uploadVersionPart: Scalars['Boolean']['output']; ++}; ++ ++ ++export type MutationApproveModArgs = { ++ modId: Scalars['ModID']['input']; ++}; ++ ++ ++export type MutationApproveVersionArgs = { ++ versionId: Scalars['VersionID']['input']; ++}; ++ ++ ++export type MutationCreateAnnouncementArgs = { ++ announcement: NewAnnouncement; ++}; ++ ++ ++export type MutationCreateGuideArgs = { ++ guide: NewGuide; ++}; ++ ++ ++export type MutationCreateModArgs = { ++ mod: NewMod; ++}; ++ ++ ++export type MutationCreateMultipleTagsArgs = { ++ tagNames: Array; ++}; ++ ++ ++export type MutationCreateSatisfactoryVersionArgs = { ++ input: NewSatisfactoryVersion; ++}; ++ ++ ++export type MutationCreateTagArgs = { ++ description: Scalars['String']['input']; ++ tagName: Scalars['TagName']['input']; ++}; ++ ++ ++export type MutationCreateVersionArgs = { ++ modId: Scalars['ModID']['input']; ++}; ++ ++ ++export type MutationDeleteAnnouncementArgs = { ++ announcementId: Scalars['AnnouncementID']['input']; ++}; ++ ++ ++export type MutationDeleteGuideArgs = { ++ guideId: Scalars['GuideID']['input']; ++}; ++ ++ ++export type MutationDeleteModArgs = { ++ modId: Scalars['ModID']['input']; ++}; ++ ++ ++export type MutationDeleteSatisfactoryVersionArgs = { ++ id: Scalars['SatisfactoryVersionID']['input']; ++}; ++ ++ ++export type MutationDeleteTagArgs = { ++ tagID: Scalars['TagID']['input']; ++}; ++ ++ ++export type MutationDeleteVersionArgs = { ++ versionId: Scalars['VersionID']['input']; ++}; ++ ++ ++export type MutationDenyModArgs = { ++ modId: Scalars['ModID']['input']; ++}; ++ ++ ++export type MutationDenyVersionArgs = { ++ versionId: Scalars['VersionID']['input']; ++}; ++ ++ ++export type MutationDiscourseSsoArgs = { ++ sig: Scalars['String']['input']; ++ sso: Scalars['String']['input']; ++}; ++ ++ ++export type MutationFinalizeCreateVersionArgs = { ++ modId: Scalars['ModID']['input']; ++ version: NewVersion; ++ versionId: Scalars['VersionID']['input']; ++}; ++ ++ ++export type MutationOAuthFacebookArgs = { ++ code: Scalars['String']['input']; ++ state: Scalars['String']['input']; ++}; ++ ++ ++export type MutationOAuthGithubArgs = { ++ code: Scalars['String']['input']; ++ state: Scalars['String']['input']; ++}; ++ ++ ++export type MutationOAuthGoogleArgs = { ++ code: Scalars['String']['input']; ++ state: Scalars['String']['input']; ++}; ++ ++ ++export type MutationUpdateAnnouncementArgs = { ++ announcement: UpdateAnnouncement; ++ announcementId: Scalars['AnnouncementID']['input']; ++}; ++ ++ ++export type MutationUpdateGuideArgs = { ++ guide: UpdateGuide; ++ guideId: Scalars['GuideID']['input']; ++}; ++ ++ ++export type MutationUpdateModArgs = { ++ mod: UpdateMod; ++ modId: Scalars['ModID']['input']; ++}; ++ ++ ++export type MutationUpdateModCompatibilityArgs = { ++ compatibility: CompatibilityInfoInput; ++ modId: Scalars['ModID']['input']; ++}; ++ ++ ++export type MutationUpdateMultipleModCompatibilitiesArgs = { ++ compatibility: CompatibilityInfoInput; ++ modIDs: Array; ++}; ++ ++ ++export type MutationUpdateSatisfactoryVersionArgs = { ++ id: Scalars['SatisfactoryVersionID']['input']; ++ input: UpdateSatisfactoryVersion; ++}; ++ ++ ++export type MutationUpdateTagArgs = { ++ NewName: Scalars['TagName']['input']; ++ description: Scalars['String']['input']; ++ tagID: Scalars['TagID']['input']; ++}; ++ ++ ++export type MutationUpdateUserArgs = { ++ input: UpdateUser; ++ userId: Scalars['UserID']['input']; ++}; ++ ++ ++export type MutationUpdateVersionArgs = { ++ version: UpdateVersion; ++ versionId: Scalars['VersionID']['input']; ++}; ++ ++ ++export type MutationUploadVersionPartArgs = { ++ file: Scalars['Upload']['input']; ++ modId: Scalars['ModID']['input']; ++ part: Scalars['Int']['input']; ++ versionId: Scalars['VersionID']['input']; ++}; ++ ++export type NewAnnouncement = { ++ importance: AnnouncementImportance; ++ message: Scalars['String']['input']; ++}; ++ ++export type NewGuide = { ++ guide: Scalars['String']['input']; ++ name: Scalars['String']['input']; ++ short_description: Scalars['String']['input']; ++ tagIDs?: InputMaybe>; ++}; ++ ++export type NewMod = { ++ full_description?: InputMaybe; ++ hidden?: InputMaybe; ++ logo?: InputMaybe; ++ mod_reference: Scalars['ModReference']['input']; ++ name: Scalars['String']['input']; ++ short_description: Scalars['String']['input']; ++ source_url?: InputMaybe; ++ tagIDs?: InputMaybe>; ++ toggle_explicit_content?: InputMaybe; ++ toggle_network_use?: InputMaybe; ++}; ++ ++export type NewSatisfactoryVersion = { ++ engine_version: Scalars['String']['input']; ++ version: Scalars['Int']['input']; ++}; ++ ++export type NewTag = { ++ description: Scalars['String']['input']; ++ name: Scalars['TagName']['input']; ++}; ++ ++export type NewVersion = { ++ changelog: Scalars['String']['input']; ++ stability: VersionStabilities; ++}; ++ ++export type OAuthOptions = { ++ __typename?: 'OAuthOptions'; ++ facebook: Scalars['String']['output']; ++ github: Scalars['String']['output']; ++ google: Scalars['String']['output']; ++}; ++ ++export enum Order { ++ Asc = 'asc', ++ Desc = 'desc' ++} ++ ++export type Query = { ++ __typename?: 'Query'; ++ checkVersionUploadState?: Maybe; ++ getAnnouncement?: Maybe; ++ getAnnouncements: Array; ++ getAnnouncementsByImportance: Array; ++ getGuide?: Maybe; ++ getGuides: GetGuides; ++ getMe?: Maybe; ++ getMod?: Maybe; ++ getModAssetList: Array; ++ getModByIdOrReference?: Maybe; ++ getModByReference?: Maybe; ++ getMods: GetMods; ++ getMyMods: GetMyMods; ++ getMyUnapprovedMods: GetMyMods; ++ getMyUnapprovedVersions: GetMyVersions; ++ getMyVersions: GetMyVersions; ++ getOAuthOptions: OAuthOptions; ++ /** @deprecated SML is now a mod */ ++ getSMLVersion?: Maybe; ++ /** @deprecated SML is now a mod */ ++ getSMLVersions: GetSmlVersions; ++ getSatisfactoryVersion?: Maybe; ++ getSatisfactoryVersions: Array; ++ getTag?: Maybe; ++ getTags: Array; ++ getUnapprovedMods: GetMods; ++ getUnapprovedVersions: GetVersions; ++ getUser?: Maybe; ++ getUsers: Array>; ++ getVersion?: Maybe; ++ getVersions: GetVersions; ++ resolveModVersions: Array; ++}; ++ ++ ++export type QueryCheckVersionUploadStateArgs = { ++ modId: Scalars['ModID']['input']; ++ versionId: Scalars['VersionID']['input']; ++}; ++ ++ ++export type QueryGetAnnouncementArgs = { ++ announcementId: Scalars['AnnouncementID']['input']; ++}; ++ ++ ++export type QueryGetAnnouncementsByImportanceArgs = { ++ importance: AnnouncementImportance; ++}; ++ ++ ++export type QueryGetGuideArgs = { ++ guideId: Scalars['GuideID']['input']; ++}; ++ ++ ++export type QueryGetGuidesArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetModArgs = { ++ modId: Scalars['ModID']['input']; ++}; ++ ++ ++export type QueryGetModAssetListArgs = { ++ modReference: Scalars['ModID']['input']; ++}; ++ ++ ++export type QueryGetModByIdOrReferenceArgs = { ++ modIdOrReference: Scalars['String']['input']; ++}; ++ ++ ++export type QueryGetModByReferenceArgs = { ++ modReference: Scalars['ModReference']['input']; ++}; ++ ++ ++export type QueryGetModsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetMyModsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetMyUnapprovedModsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetMyUnapprovedVersionsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetMyVersionsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetOAuthOptionsArgs = { ++ callback_url: Scalars['String']['input']; ++}; ++ ++ ++export type QueryGetSmlVersionArgs = { ++ smlVersionID: Scalars['SMLVersionID']['input']; ++}; ++ ++ ++export type QueryGetSmlVersionsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetSatisfactoryVersionArgs = { ++ id: Scalars['SatisfactoryVersionID']['input']; ++}; ++ ++ ++export type QueryGetTagArgs = { ++ tagID: Scalars['TagID']['input']; ++}; ++ ++ ++export type QueryGetTagsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetUnapprovedModsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetUnapprovedVersionsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryGetUserArgs = { ++ userId: Scalars['UserID']['input']; ++}; ++ ++ ++export type QueryGetUsersArgs = { ++ userIds: Array; ++}; ++ ++ ++export type QueryGetVersionArgs = { ++ versionId: Scalars['VersionID']['input']; ++}; ++ ++ ++export type QueryGetVersionsArgs = { ++ filter?: InputMaybe; ++}; ++ ++ ++export type QueryResolveModVersionsArgs = { ++ filter: Array; ++}; ++ ++export type SmlVersion = { ++ __typename?: 'SMLVersion'; ++ bootstrap_version?: Maybe; ++ changelog: Scalars['String']['output']; ++ created_at: Scalars['Date']['output']; ++ date: Scalars['Date']['output']; ++ engine_version: Scalars['String']['output']; ++ id: Scalars['SMLVersionID']['output']; ++ link: Scalars['String']['output']; ++ satisfactory_version: Scalars['Int']['output']; ++ stability: VersionStabilities; ++ targets: Array>; ++ updated_at: Scalars['Date']['output']; ++ version: Scalars['String']['output']; ++}; ++ ++export enum SmlVersionFields { ++ CreatedAt = 'created_at', ++ Date = 'date', ++ Name = 'name', ++ SatisfactoryVersion = 'satisfactory_version', ++ UpdatedAt = 'updated_at' ++} ++ ++export type SmlVersionFilter = { ++ ids?: InputMaybe>; ++ limit?: InputMaybe; ++ offset?: InputMaybe; ++ order?: InputMaybe; ++ order_by?: InputMaybe; ++ search?: InputMaybe; ++}; ++ ++export type SmlVersionTarget = { ++ __typename?: 'SMLVersionTarget'; ++ VersionID: Scalars['SMLVersionID']['output']; ++ link: Scalars['String']['output']; ++ targetName: TargetName; ++}; ++ ++export type SatisfactoryVersion = { ++ __typename?: 'SatisfactoryVersion'; ++ engine_version: Scalars['String']['output']; ++ id: Scalars['SatisfactoryVersionID']['output']; ++ version: Scalars['Int']['output']; ++}; ++ ++export type Tag = { ++ __typename?: 'Tag'; ++ description: Scalars['String']['output']; ++ id: Scalars['TagID']['output']; ++ name: Scalars['TagName']['output']; ++}; ++ ++export type TagFilter = { ++ ids?: InputMaybe>; ++ limit?: InputMaybe; ++ offset?: InputMaybe; ++ order?: InputMaybe; ++ search?: InputMaybe; ++}; ++ ++export enum TargetName { ++ LinuxServer = 'LinuxServer', ++ Windows = 'Windows', ++ WindowsServer = 'WindowsServer' ++} ++ ++export type UpdateAnnouncement = { ++ importance?: InputMaybe; ++ message?: InputMaybe; ++}; ++ ++export type UpdateGuide = { ++ guide?: InputMaybe; ++ name?: InputMaybe; ++ short_description?: InputMaybe; ++ tagIDs?: InputMaybe>; ++}; ++ ++export type UpdateMod = { ++ authors?: InputMaybe>; ++ compatibility?: InputMaybe; ++ full_description?: InputMaybe; ++ hidden?: InputMaybe; ++ logo?: InputMaybe; ++ mod_reference?: InputMaybe; ++ name?: InputMaybe; ++ short_description?: InputMaybe; ++ source_url?: InputMaybe; ++ tagIDs?: InputMaybe>; ++ toggle_explicit_content?: InputMaybe; ++ toggle_network_use?: InputMaybe; ++}; ++ ++export type UpdateSatisfactoryVersion = { ++ engine_version?: InputMaybe; ++ version?: InputMaybe; ++}; ++ ++export type UpdateUser = { ++ avatar?: InputMaybe; ++ groups?: InputMaybe>; ++ username?: InputMaybe; ++}; ++ ++export type UpdateUserMod = { ++ role: Scalars['String']['input']; ++ user_id: Scalars['UserID']['input']; ++}; ++ ++export type UpdateVersion = { ++ changelog?: InputMaybe; ++ stability?: InputMaybe; ++}; ++ ++export type User = { ++ __typename?: 'User'; ++ avatar?: Maybe; ++ avatar_thumbhash?: Maybe; ++ created_at: Scalars['Date']['output']; ++ email?: Maybe; ++ facebook_id?: Maybe; ++ github_id?: Maybe; ++ google_id?: Maybe; ++ groups: Array; ++ guides: Array; ++ id: Scalars['UserID']['output']; ++ mods: Array; ++ roles: UserRoles; ++ username: Scalars['String']['output']; ++}; ++ ++export type UserMod = { ++ __typename?: 'UserMod'; ++ mod: Mod; ++ mod_id: Scalars['ModID']['output']; ++ role: Scalars['String']['output']; ++ user: User; ++ user_id: Scalars['UserID']['output']; ++}; ++ ++export type UserRoles = { ++ __typename?: 'UserRoles'; ++ approveMods: Scalars['Boolean']['output']; ++ approveVersions: Scalars['Boolean']['output']; ++ deleteContent: Scalars['Boolean']['output']; ++ editAnyModCompatibility: Scalars['Boolean']['output']; ++ editBootstrapVersions: Scalars['Boolean']['output']; ++ editContent: Scalars['Boolean']['output']; ++ editSatisfactoryVersions: Scalars['Boolean']['output']; ++ editUsers: Scalars['Boolean']['output']; ++}; ++ ++export type UserSession = { ++ __typename?: 'UserSession'; ++ token: Scalars['String']['output']; ++}; ++ ++export type Version = { ++ __typename?: 'Version'; ++ approved: Scalars['Boolean']['output']; ++ changelog: Scalars['String']['output']; ++ created_at: Scalars['Date']['output']; ++ dependencies: Array; ++ downloads: Scalars['Int']['output']; ++ game_version: Scalars['String']['output']; ++ hash?: Maybe; ++ id: Scalars['VersionID']['output']; ++ link: Scalars['String']['output']; ++ metadata?: Maybe; ++ mod: Mod; ++ mod_id: Scalars['ModID']['output']; ++ required_on_remote: Scalars['Boolean']['output']; ++ size?: Maybe; ++ sml_version: Scalars['String']['output']; ++ stability: VersionStabilities; ++ targets: Array>; ++ updated_at: Scalars['Date']['output']; ++ version: Scalars['String']['output']; ++ virustotal_results: Array; ++}; ++ ++export type VersionDependency = { ++ __typename?: 'VersionDependency'; ++ condition: Scalars['String']['output']; ++ mod?: Maybe; ++ /** @deprecated soon will return actual mod id instead of reference. use mod_reference field instead! */ ++ mod_id: Scalars['ModID']['output']; ++ mod_reference: Scalars['String']['output']; ++ optional: Scalars['Boolean']['output']; ++ version?: Maybe; ++ version_id: Scalars['VersionID']['output']; ++}; ++ ++export enum VersionFields { ++ CreatedAt = 'created_at', ++ Downloads = 'downloads', ++ UpdatedAt = 'updated_at' ++} ++ ++export type VersionFilter = { ++ ids?: InputMaybe>; ++ limit?: InputMaybe; ++ offset?: InputMaybe; ++ order?: InputMaybe; ++ order_by?: InputMaybe; ++ search?: InputMaybe; ++}; ++ ++export enum VersionStabilities { ++ Alpha = 'alpha', ++ Beta = 'beta', ++ Release = 'release' ++} ++ ++export type VersionTarget = { ++ __typename?: 'VersionTarget'; ++ VersionID: Scalars['VersionID']['output']; ++ hash?: Maybe; ++ link: Scalars['String']['output']; ++ size?: Maybe; ++ targetName: TargetName; ++}; ++ ++export type VirustotalResult = { ++ __typename?: 'VirustotalResult'; ++ created_at: Scalars['Date']['output']; ++ file_name: Scalars['String']['output']; ++ hash: Scalars['VirustotalHash']['output']; ++ id?: Maybe; ++ safe: Scalars['Boolean']['output']; ++ updated_at?: Maybe; ++ version_id: Scalars['String']['output']; ++}; ++ ++export type GetAnnouncementsQueryVariables = Exact<{ [key: string]: never; }>; ++ ++ ++export type GetAnnouncementsQuery = { __typename?: 'Query', getAnnouncements: Array<{ __typename?: 'Announcement', id: string, message: string, importance: AnnouncementImportance }> }; ++ ++export type SmrHealthcheckQueryVariables = Exact<{ [key: string]: never; }>; ++ ++ ++export type SmrHealthcheckQuery = { __typename?: 'Query', getMods: { __typename?: 'GetMods', count: number } }; ++ ++export type GetModCountQueryVariables = Exact<{ [key: string]: never; }>; ++ ++ ++export type GetModCountQuery = { __typename?: 'Query', getMods: { __typename?: 'GetMods', count: number } }; ++ ++export type GetModDetailsQueryVariables = Exact<{ ++ modReference: Scalars['ModReference']['input']; ++}>; ++ ++ ++export type GetModDetailsQuery = { __typename?: 'Query', mod?: { __typename?: 'Mod', name: string, logo?: string | null, logo_thumbhash?: string | null, mod_reference: string, full_description?: string | null, created_at: any, last_version_date?: any | null, downloads: number, views: number, hidden: boolean, id: string, compatibility?: { __typename?: 'CompatibilityInfo', EA: { __typename?: 'Compatibility', state: CompatibilityState, note?: string | null }, EXP: { __typename?: 'Compatibility', state: CompatibilityState, note?: string | null } } | null, authors: Array<{ __typename?: 'UserMod', role: string, user: { __typename?: 'User', id: string, username: string, avatar?: string | null } }>, versions: Array<{ __typename?: 'Version', id: string, version: string, size?: number | null, changelog: string }> } | null }; ++ ++export type ModKeyFragment = { __typename?: 'Mod', id: string, mod_reference: string }; ++ ++export type GetModNameQueryVariables = Exact<{ ++ modReference: Scalars['ModReference']['input']; ++}>; ++ ++ ++export type GetModNameQuery = { __typename?: 'Query', getModByReference?: { __typename?: 'Mod', name: string, id: string, mod_reference: string } | null }; ++ ++export type GetModNamesQueryVariables = Exact<{ ++ modReferences: Array | Scalars['String']['input']; ++}>; ++ ++ ++export type GetModNamesQuery = { __typename?: 'Query', getMods: { __typename?: 'GetMods', mods: Array<{ __typename?: 'Mod', name: string, id: string, mod_reference: string }> } }; ++ ++export type GetModReferenceQueryVariables = Exact<{ ++ modIdOrReference: Scalars['String']['input']; ++}>; ++ ++ ++export type GetModReferenceQuery = { __typename?: 'Query', getModByIdOrReference?: { __typename?: 'Mod', mod_reference: string, id: string } | null }; ++ ++export type GetModSummaryQueryVariables = Exact<{ ++ modReference: Scalars['ModReference']['input']; ++}>; ++ ++ ++export type GetModSummaryQuery = { __typename?: 'Query', mod?: { __typename?: 'Mod', name: string, logo?: string | null, mod_reference: string, created_at: any, downloads: number, views: number, short_description: string, id: string } | null }; ++ ++export type GetModsQueryVariables = Exact<{ ++ offset: Scalars['Int']['input']; ++ limit: Scalars['Int']['input']; ++}>; ++ ++ ++export type GetModsQuery = { __typename?: 'Query', getMods: { __typename?: 'GetMods', count: number, mods: Array<{ __typename?: 'Mod', mod_reference: string, name: string, logo?: string | null, logo_thumbhash?: string | null, short_description: string, hidden: boolean, popularity: number, hotness: number, views: number, downloads: number, last_version_date?: any | null, id: string, tags?: Array<{ __typename?: 'Tag', id: string, name: any }> | null, authors: Array<{ __typename?: 'UserMod', role: string, user: { __typename?: 'User', id: string, username: string } }>, compatibility?: { __typename?: 'CompatibilityInfo', EA: { __typename?: 'Compatibility', state: CompatibilityState, note?: string | null }, EXP: { __typename?: 'Compatibility', state: CompatibilityState, note?: string | null } } | null, versions: Array<{ __typename?: 'Version', id: string, version: string, game_version: string, required_on_remote: boolean, dependencies: Array<{ __typename?: 'VersionDependency', mod_reference: string, condition: string }>, targets: Array<{ __typename?: 'VersionTarget', targetName: TargetName } | null> }> }> } }; ++ ++export type GetChangelogQueryVariables = Exact<{ ++ modReference: Scalars['ModReference']['input']; ++}>; ++ ++ ++export type GetChangelogQuery = { __typename?: 'Query', getModByReference?: { __typename?: 'Mod', name: string, id: string, mod_reference: string, versions: Array<{ __typename?: 'Version', id: string, version: string, changelog: string }> } | null }; ++ ++export type ModReportedCompatibilityQueryVariables = Exact<{ ++ modReference: Scalars['ModReference']['input']; ++}>; ++ ++ ++export type ModReportedCompatibilityQuery = { __typename?: 'Query', getModByReference?: { __typename?: 'Mod', id: string, mod_reference: string, compatibility?: { __typename?: 'CompatibilityInfo', EA: { __typename?: 'Compatibility', state: CompatibilityState, note?: string | null }, EXP: { __typename?: 'Compatibility', state: CompatibilityState, note?: string | null } } | null } | null }; ++ ++export type ModVersionsCompatibilityQueryVariables = Exact<{ ++ modReference: Scalars['ModReference']['input']; ++}>; ++ ++ ++export type ModVersionsCompatibilityQuery = { __typename?: 'Query', getModByReference?: { __typename?: 'Mod', id: string, mod_reference: string, versions: Array<{ __typename?: 'Version', id: string, version: string, game_version: string, required_on_remote: boolean, targets: Array<{ __typename?: 'VersionTarget', targetName: TargetName } | null> }> } | null }; ++ ++export const ModKeyFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const GetAnnouncementsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetAnnouncements"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getAnnouncements"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"message"}},{"kind":"Field","name":{"kind":"Name","value":"importance"}}]}}]}}]} as unknown as DocumentNode; ++export const SmrHealthcheckDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"SMRHealthcheck"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getMods"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"count"}}]}}]}}]} as unknown as DocumentNode; ++export const GetModCountDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetModCount"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getMods"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"count"}}]}}]}}]} as unknown as DocumentNode; ++export const GetModDetailsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetModDetails"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ModReference"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","alias":{"kind":"Name","value":"mod"},"name":{"kind":"Name","value":"getModByReference"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"modReference"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"logo"}},{"kind":"Field","name":{"kind":"Name","value":"logo_thumbhash"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}},{"kind":"Field","name":{"kind":"Name","value":"full_description"}},{"kind":"Field","name":{"kind":"Name","value":"created_at"}},{"kind":"Field","name":{"kind":"Name","value":"last_version_date"}},{"kind":"Field","name":{"kind":"Name","value":"downloads"}},{"kind":"Field","name":{"kind":"Name","value":"views"}},{"kind":"Field","name":{"kind":"Name","value":"hidden"}},{"kind":"Field","name":{"kind":"Name","value":"compatibility"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"EA"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"note"}}]}},{"kind":"Field","name":{"kind":"Name","value":"EXP"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"note"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"authors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"avatar"}}]}},{"kind":"Field","name":{"kind":"Name","value":"role"}}]}},{"kind":"Field","name":{"kind":"Name","value":"versions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"100"}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"changelog"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const GetModNameDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetModName"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ModReference"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getModByReference"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"modReference"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const GetModNamesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetModNames"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modReferences"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getMods"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"references"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modReferences"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mods"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const GetModReferenceDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetModReference"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modIdOrReference"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getModByIdOrReference"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"modIdOrReference"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modIdOrReference"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const GetModSummaryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetModSummary"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ModReference"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","alias":{"kind":"Name","value":"mod"},"name":{"kind":"Name","value":"getModByReference"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"modReference"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"logo"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}},{"kind":"Field","name":{"kind":"Name","value":"created_at"}},{"kind":"Field","name":{"kind":"Name","value":"downloads"}},{"kind":"Field","name":{"kind":"Name","value":"views"}},{"kind":"Field","name":{"kind":"Name","value":"short_description"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const GetModsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetMods"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"offset"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"limit"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getMods"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"limit"},"value":{"kind":"Variable","name":{"kind":"Name","value":"limit"}}},{"kind":"ObjectField","name":{"kind":"Name","value":"offset"},"value":{"kind":"Variable","name":{"kind":"Name","value":"offset"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"count"}},{"kind":"Field","name":{"kind":"Name","value":"mods"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"logo"}},{"kind":"Field","name":{"kind":"Name","value":"logo_thumbhash"}},{"kind":"Field","name":{"kind":"Name","value":"short_description"}},{"kind":"Field","name":{"kind":"Name","value":"hidden"}},{"kind":"Field","name":{"kind":"Name","value":"popularity"}},{"kind":"Field","name":{"kind":"Name","value":"hotness"}},{"kind":"Field","name":{"kind":"Name","value":"views"}},{"kind":"Field","name":{"kind":"Name","value":"downloads"}},{"kind":"Field","name":{"kind":"Name","value":"last_version_date"}},{"kind":"Field","name":{"kind":"Name","value":"tags"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"authors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"username"}}]}},{"kind":"Field","name":{"kind":"Name","value":"role"}}]}},{"kind":"Field","name":{"kind":"Name","value":"compatibility"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"EA"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"note"}}]}},{"kind":"Field","name":{"kind":"Name","value":"EXP"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"note"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"versions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"game_version"}},{"kind":"Field","name":{"kind":"Name","value":"required_on_remote"}},{"kind":"Field","name":{"kind":"Name","value":"dependencies"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}},{"kind":"Field","name":{"kind":"Name","value":"condition"}}]}},{"kind":"Field","name":{"kind":"Name","value":"targets"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"targetName"}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const GetChangelogDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetChangelog"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ModReference"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getModByReference"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"modReference"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"versions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"limit"},"value":{"kind":"IntValue","value":"100"}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"changelog"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const ModReportedCompatibilityDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ModReportedCompatibility"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ModReference"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getModByReference"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"modReference"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"compatibility"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"EA"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"note"}}]}},{"kind":"Field","name":{"kind":"Name","value":"EXP"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"note"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; ++export const ModVersionsCompatibilityDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ModVersionsCompatibility"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ModReference"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getModByReference"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"modReference"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modReference"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModKey"}},{"kind":"Field","name":{"kind":"Name","value":"versions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"game_version"}},{"kind":"Field","name":{"kind":"Name","value":"required_on_remote"}},{"kind":"Field","name":{"kind":"Name","value":"targets"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"targetName"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModKey"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Mod"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"mod_reference"}}]}}]} as unknown as DocumentNode; +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/de.json b/frontend/src/lib/generated/i18n/de.json +new file mode 100644 +index 0000000..111cdaf +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/de.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Offline gehen ", ++ "go-online" : "Online gehen", ++ "healthcheck" : "ficsit.app konnte nicht erreicht werden. Überprüfen deine Internetverbindung oder verwende den Offline-Modus. (Mod Manager-Einstellungen > Offline gehen)", ++ "offline" : "Du bist derzeit offline. Einige Funktionen sind möglicherweise nicht verfügbar. (Um die Verbindung wiederherzustellen, verwenden Sie Mod Manager-Einstellungen > Online gehen)" ++ }, ++ "common" : { ++ "add" : "hinzufügen", ++ "cancel" : "Abbrechen", ++ "close" : "schließen", ++ "delete" : "löschen", ++ "import" : "importieren", ++ "loading" : "Lade...", ++ "rename" : "umbenennen " ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "Beim Erzeugen der Debug-Datei ist ein Fehler aufgetreten. Bitte überprüfe die Logdateien Ihres Satisfactory Mod Managers manuell auf weitere Informationen und melde den Fehler im Discord. Verwende dafür die Schaltfläche unten, um die Dokumentation zu öffnen und zu erfahren, wie.", ++ "generate_debug_info" : "Debug-Informationen generieren", ++ "help" : "Scheint falsch zu sein? Klicke auf die Schaltfläche unten und sende die generierte Zip-Datei an den <1>modding discord in #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {{invalidInstalls} ungültige Satisfactory Installation gefunden } other {{invalidInstalls} ungültige Satisfactory Installationen gefunden }}", ++ "no_installs" : "Keine Satisfactory Installationen gefunden ", ++ "open_log_docs" : "Öffnen der Log Dateien ", ++ "open_modding_discord" : "Öfnne den Modding Discord", ++ "open_modding_discord.must_generate_debug_first" : "Du musst zuerst die Debug-Informationen erzeugen", ++ "reporting_directions" : "Scheint falsch zu sein? Klicke unten auf die Schaltfläche, um Logs zu sammeln, und sende dann die generierte Zip-Datei an den Modding-Discord in #help-using-mods.", ++ "title" : "Etwas ist schief gelaufen " ++ }, ++ "external-install-mod" : { ++ "already-installed" : "bereits installiert", ++ "error-loading" : "Fehler beim Laden der Mod Details ", ++ "in-queue" : "In der Warteschlange", ++ "install" : "Installieren", ++ "latest-version" : "Neuste Version", ++ "title" : "Mod installieren", ++ "version" : "Version {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Los geht's! ", ++ "change_later_hint" : "Diese Einstellungen kannst du jederzeit im Menü \"Mod-Manager-Einstellungen\" ändern.", ++ "intro" : "Wähle deine Präferenz um zu beginnen. ", ++ "open_welcome_guide" : "Öffne den Willkommens Leitfade.", ++ "option" : { ++ "language" : { ++ "title" : "Verwende diese Sprache, sofern verfügbar:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Warte, bis ich auf \"Übernehmen\" drücke.", ++ "enabled" : "Änderungen sofort anwenden", ++ "title" : "Wenn ich einen Mod hinzufüge oder entferne, oder das Profil wechsle..." ++ } ++ }, ++ "title" : "Willkommen beim Satisfactory Mod Manager!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Anwenden {profile}", ++ "apply-queued" : "Anwenden von {queued, plural, one {einer Änderung} other {# Änderungen}}", ++ "are-you-sure-warning" : "Bist du sicher, dass du starten willst?", ++ "cant-launch" : "SMM kann diese Installation nicht starten", ++ "cant-launch-tooltip" : "Der Mod Manager ist nicht in der Lage, diesen Installationstyp zu starten, aber er wird die Mod-Dateien für dich verwalten. Starte Satisfactory mit deinem gewohnten Spiel-Launcher.", ++ "changes-queued" : "Es wurden noch keine Änderungen an deinen Mod-Dateien vorgenommen. Klicke auf die Schaltfläche oben, um die Änderungen, die du in die Warteschlange gestellt hast, anzuwenden.", ++ "game-running" : "Dein Spiel Launcher meldet, dass das Spiel bereits läuft (oder noch dabei ist, sich zu schließen).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {{versionIncompatible} inkompatible Mod, die nicht geladen wird oder das Spiel zum Absturz bringt} other {{versionIncompatible} inkompatible Mods, die nicht geladen werden oder das Spiel zum Absturz bringen}}", ++ "launch-in-progress" : "startet...", ++ "operation-in-progress" : "Es ist bereits ein Vorgang im Gange.", ++ "play" : "spiel Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Eine Mod {versionPossiblyCompatible, plural, one {ist} other {sind}} wie es aussieht, nicht mit deinem Spiel kompatibel} other {# Mod {versionPossiblyCompatible, plural, one {ist} other {sind}} wie es aussieht, nicht mit deinem Spiel kompatibel}}", ++ "profile-change-queued" : "Es wurden noch keine Änderungen an deinen Mod-Dateien vorgenommen. Klicke auf die Schaltfläche oben, um das neue Profil anzuwenden.\n\n(Du befindest dich in der Warteschlange im Modus „Manuell starten“)", ++ "ready" : "Du bist \"ready to rumble\"!\n\nHinweis: Der Mod-Manager hat die Installation der Mod-Dateien für dich bereits abgeschlossen. Du könntest das Spiel mit deinem üblichen Spiel Launcher starten und die Mods würden trotzdem geladen werden.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {Eine Mod} other {# Mods}} that {reportedIncompatible, plural, one {ist} other {sind}} bei dieser Spielversion als fehlerhaft gemeldet. Lies die {versionIncompatible, plural, one {Mod's} other {Mod's}} Beschreibung oder Kompatibilitätshinweise für weitere Informationen.", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {Eine Mod} other {# Mods}} die {reportedPossiblyCompatible, plural, one {ist} other {sind}} bei dieser Spielversion als fehlerhaft gemeldet. Lesen Sie die {versionIncompatible, plural, one {Mod's} other {Mod's}} Beschreibung oder Kompatibilitätshinweise für weitere Informationen.", ++ "you-have-warning-mods" : "Du hast:" ++ }, ++ "left-bar" : { ++ "export" : "exportieren", ++ "ficsit-app" : "ficsit.app (Mod Verzeichnis)", ++ "game-version" : "Spielinstallation auswählen", ++ "help" : "Hilfe", ++ "install-invalid" : "ungültig", ++ "install-invalid-tooltip" : "Status: SMM kann diese Installation nicht verwalten", ++ "install-loading" : "Lade...", ++ "install-loading-tooltip" : "Status: Lade...", ++ "install-unknown" : "Unbekannt", ++ "install-unknown-tooltip" : "Status: Konnte keine Informationen über diese Installation erhalten", ++ "links" : "Links", ++ "manage-servers" : "Manage Server", ++ "mods-off" : "Mods aus", ++ "mods-on" : "Mods an", ++ "other" : "Andere", ++ "profile" : "Profil", ++ "queue-blocking-switching-tooltip" : "{number, plural, one {Du hast {number} Aktion in der Warteschlange. Wende {number, plural, one {sie} other {sie}} an oder breche {number, plural, one {sie} other {sie}} ab, bevor du die Installation oder das Profil wechselst.} other {Du hast {number} Aktionen in der Warteschlange. Wende {number, plural, one {sie} other {sie}} an oder breche {number, plural, one {sie} other {sie}} ab, bevor du die Installation oder das Profil wechselst.}}", ++ "satisfactory-modding-discord" : "Satisfactory Modding Discord", ++ "smm-github" : "SMM GitHub", ++ "updates" : "Updates" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod} Changelog" ++ }, ++ "mod-details" : { ++ "change-version" : "Version ändern ", ++ "change-version-any" : "Jede", ++ "change-version-or-newer" : "oder neuer", ++ "changelogs" : "Changelogs", ++ "compatibility" : "Kompatibilität", ++ "compatibility-branch" : "Diese Mod wurde gemeldet als {state} auf {branch}.", ++ "compatibility-unknown" : "unbekannt", ++ "compatibility-unknown-tooltip" : "Es wurden noch keine Kompatibilitätsinformationen für diese Mod gemeldet. Probiere es aus und kontaktiere uns im Discord, damit diese aktualisiert werden können!", ++ "contributors" : "Mitwirkende <1>{authors}", ++ "created" : "Erstellet ", ++ "downloads" : "Downloads insgesamt", ++ "installed-version" : "Installierte Version", ++ "latest-version" : "Letzte Version ", ++ "mod-author" : "Eine Mod von: ", ++ "offline-mode" : "Der Offline-Modus ist aktiviert. Changelogs und Beschreibungen sind nicht verfügbar.", ++ "size" : "Größe", ++ "updated" : "Aktualisiert", ++ "view-on-ficsit-app" : "anschauen auf ficsit.app", ++ "views" : "Aufrufe" ++ }, ++ "mod-list-item" : { ++ "by-author" : "von", ++ "compatibility-note" : "Diese Mod wurde für diese Spielversion als {state} gemeldet.", ++ "compatibility-note-none" : "(Keine Angabe)", ++ "compatibility-warning" : "Es wurden Probleme mit dieser Mod gemeldet, aber du kannst versuchen, sie trotzdem zu installieren. Details:", ++ "dependency" : "Diese Mod wurde in Abhängigkeit zu einer anderen Mod installiert. Sie kann nicht eigenständig installiert oder entfernt werden.", ++ "disable" : "Diese Mod ist in diesem Profil aktiviert. Klicke hier, um sie zu deaktivieren. Dadurch wird sie nicht mehr geladen, wenn du das Spiel startest, aber sie bleibt trotzdem Teil dieses Profils.", ++ "disable-queued" : "Diese Mod steht in der Warteschlange für die Deaktivierung. Klicken Sie, um den Vorgang abzubrechen.", ++ "disabled-tooltip" : "Diese Mod ist deaktiviert. Klicke auf das Pausensymbol, um sie zu aktivieren.", ++ "enable" : "Klicke, um diese Mod zu aktivieren.", ++ "enable-queued" : "Diese Mod steht in der Warteschlange für die Aktivierung. Klicke, um den Vorgang abzubrechen.", ++ "favorite" : "Klicke, um diese Mod zu Ihren Favoriten hinzuzufügen. Eine Mod als Favorit zu haben, hat nichts damit zu tun, ob sie installiert ist oder nicht - es ist eine Möglichkeit, eine Mod für später aufzubewahren, unabhängig davon, welches Profil du ausgewählt hast.", ++ "hidden" : "Diese Mod wurde vom Autor versteckt.", ++ "install" : "Klicke, um diese Mod zu installieren.", ++ "no-tags" : "(keine verfügbar)", ++ "not-installable" : "Du kannst diese Mod nicht installieren. Grund:", ++ "queued" : "Diese Mod steht bereits für einen anderen Vorgang in der Warteschlange.", ++ "queued-install" : "Diese Mod steht in der Warteschlange für die Installation. Klicke, um den Vorgang abzubrechen.", ++ "queued-uninstall" : "Diese Mod steht in der Warteschlange für die Deinstallation. Klicke, um den Vorgang abzubrechen.", ++ "unavailable" : "Diese Mod ist nicht mehr auf ficsit.app verfügbar. Möchtest du sie vielleicht entfernen? ", ++ "unfavorite" : "Klicken, um diese Mod aus deinen Favoriten zu entfernen.", ++ "uninstall" : "Diese Mod ist auf diesem Profil installiert. Klicke, um diese Mod zu deinstallieren.", ++ "wait" : "Warte bis der aktuelle Vorgang abgeschlossen ist." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(keine weiteren Anmerkungen vorhanden)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Alle Mods", ++ "compatible" : "Kompatibel", ++ "dependency" : "Abhängigkeit", ++ "disabled" : "Deaktiviert", ++ "enabled" : "Aktiviert", ++ "favorite" : "Favorit", ++ "installed" : "Installiert", ++ "not-installed" : "Nicht Installiert", ++ "queued" : "Warteschlange" ++ }, ++ "order-by" : { ++ "downloads" : "Downloads ", ++ "hotness" : "Angesagt ", ++ "last-updated" : "zuletzt aktuallisiert", ++ "name" : "Name", ++ "popularity" : "Bekanntheit", ++ "views" : "Aufrufe" ++ }, ++ "search" : "Durchsuche Mods" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "Keine Mods entsprechen deinen Filtern", ++ "no-mods-found" : "keine Mods gefunden ", ++ "show-all" : "Alle anzeigen " ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Profilname", ++ "profile-name-placeholder" : "neuer Profilname ", ++ "title" : "Profil hinzufügen " ++ }, ++ "delete" : { ++ "profile-name" : "Profilname", ++ "title" : "Profil löschen " ++ }, ++ "import" : { ++ "profile-file" : "Profil-Datei", ++ "profile-name" : "Profilname", ++ "profile-name-placeholder" : "neuer Profilname ", ++ "profile-version-warning" : "Dieses Profil wurde mit einer neueren Version des Spiels erstellt. Es ist möglicherweise nicht mit dieser Version kompatibel.", ++ "title" : "Profil importieren " ++ }, ++ "rename" : { ++ "new-profile" : "neuer Profilname ", ++ "new-profile-placeholder" : "neues Profil", ++ "old-profile" : "alter Profilname ", ++ "old-profile-placeholder" : "Altes Profil", ++ "title" : "Profil umbenennen " ++ } ++ }, ++ "server-manager" : { ++ "add" : "hinzufügen ", ++ "advanced-note" : "Beachte, dass du möglicherweise bestimmte Zeichen im Benutzernamen und im Passwort auslassen musst.", ++ "advanced-path-placeholder" : "user:pass@host:port/path", ++ "existing-servers" : { ++ "none-yet" : null, ++ "title" : null ++ }, ++ "failed-to-connect" : "Verbindung zum Server fehlgeschlagen, zum erneuten Versuch anklicken.", ++ "get-help" : "Hilfe bei der Verbindung zu Servern erhalten", ++ "host-placeholder" : "Host", ++ "invalid" : "SMM kann diese Installation nicht verwalten", ++ "loading" : "Lade...", ++ "local-path-placeholder" : "C:\\Pfad\\zum\\Server", ++ "name-placeholder" : "Name (Standard: {default})", ++ "new-server" : { ++ "title" : null ++ }, ++ "password-placeholder" : "Passwort", ++ "path-placeholder" : "Pfad", ++ "port-placeholder" : "Port (Standard: {default})", ++ "switch-to-advanced" : "In den erweiterten Modus wechseln", ++ "switch-to-simple" : "In den einfachen Modus wechseln", ++ "title" : "Dedizierte Server", ++ "username-placeholder" : "Benutzername ", ++ "validating" : "Prüfen..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Verzeichnis kann nicht aufgelistet werden", ++ "failed-valid-check" : "Es konnte nicht überprüft werden, ob der ausgewählte Pfad ein gültiger Server ist" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Cache-Speicherort", ++ "reset" : "Auf Standardwerte zurücksetzen", ++ "save" : "Speichern und verschieben", ++ "title" : "Download-Cache-Speicherort ändern" ++ }, ++ "change-cache-location" : "Cache-Speicherort ändern", ++ "copy-mod-list" : "Mod-Liste kopieren", ++ "debug" : "Debug", ++ "generate-debug-info" : "Debug-Informationen generieren", ++ "go-online-offline" : "Gehe {offline, select, true {online} other {offline}}", ++ "language" : "Sprache", ++ "launch-button" : "Start Button", ++ "launch-button.button" : "Button ", ++ "launch-button.cat" : "Nyan", ++ "launch-button.normal" : "Normal", ++ "proxy" : { ++ "proxy" : "Proxy", ++ "remove" : "Proxy entfernen ", ++ "save" : "Speichern und neu starten", ++ "title" : "Proxy festlegen" ++ }, ++ "queue" : "Warteschlange", ++ "queue.start-immediately" : "Sofort starten", ++ "queue.start-manually" : "Manuell starten ", ++ "save-window-position" : "Fensterposition speichern", ++ "secret-settings" : "Geheime Einstellungen", ++ "set-proxy" : "Proxy festlegen", ++ "settings" : "Einstellungen", ++ "smm-debug-logging" : "SMM-Debug-Protokollierung", ++ "start-view" : "Ansicht starten", ++ "start-view.compact" : "Kompakt", ++ "start-view.expanded" : "Erweitert", ++ "title" : "Mod Manager Einstellungen ", ++ "update-check" : "auf Updates prüfen ", ++ "update-check.ask" : "Nachfragen, wenn gefunden", ++ "update-check.on-exit" : "Am Ausgang", ++ "update-check.on-start" : "Beim Start" ++ }, ++ "smm-update" : { ++ "downloading" : "Herunterladen im Hintergrund", ++ "downloading-stats" : "Update wird heruntergeladen: {current} / {total}, {speed}/s, geschätzte Downloadzeit {eta}", ++ "title" : "SMM Update verfügbar - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "verbesserte Leistung", ++ "performance.description" : "Damit du effizient bleibst!", ++ "platform_support" : "Natives Linux Heroic, Steam Snap, Mac Unterstützung", ++ "platform_support.description" : "Hole dir eine Version aus den GitHub-Releases, wenn du es noch nicht getan hast!", ++ "profile_format" : "Neues Profilformat", ++ "profile_format.description" : "SMM2-Profile sind nicht mit SMM3 kompatibel! Deine bestehenden Profile wurden automatisch migriert, aber du kannst keine mit SMM2 erstellten Profile importieren.", ++ "queue" : "Aktions-Warteschlangen", ++ "queue.description" : "Mehrere Mod-Downloads/Deinstallationen auf einmal der Warteschlange hinzufügen.", ++ "servers" : "dediziertes Server Management ", ++ "servers.description" : "Einfaches Verwalten von Servern über filesystem, SFTP, FTP und SMB!", ++ "translation" : "Unterstützung bei der Übersetzung", ++ "translation.description" : "Tritt unserem Discord bei, um SMM in deine Sprache zu übersetzen!", ++ "ui" : "Aktualisierung der Benutzeroberfläche", ++ "ui.description" : "Ein frischer Farbanstrich zur Feier von Satisfactory 1.0!" ++ }, ++ "intro" : "Wir haben in dieser Version eine Menge Verbesserungen vorgenommen. Hier sind einige der Highlights:", ++ "open_guide" : "Öffne die SMM3-Dokumentation", ++ "title" : "Willkommen im Satisfactory Mod Manager Version 3!" ++ }, ++ "updates" : { ++ "changelog" : "Changelog", ++ "check-for-updates" : "Nach Updates suchen", ++ "checking-for-updates" : "Nach Updates suchen...", ++ "hide-ignored" : "ignoriert ausblenden ", ++ "ignore" : "ignorieren", ++ "mod-update-available" : "{updates, plural, one {{updates} Mod Update verfügbar} other {{updates} Mod Updates verfügbar }}", ++ "no-updates" : "Momentan keine Mod/SMM-Updates", ++ "show-ignored" : "ignoriert anzeigen ", ++ "smm-update-available" : "SMM Update verfügbar", ++ "title" : "Updates", ++ "unignore" : "nicht mehr ignorieren ", ++ "update-all" : "Alles aktualisieren ", ++ "update-selected" : "Auswahl aktualisieren " ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/en.json b/frontend/src/lib/generated/i18n/en.json +new file mode 100644 +index 0000000..b5ec7a7 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/en.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Go Offline", ++ "go-online" : "Go Online", ++ "healthcheck" : "Could not reach ficsit.app. Check your internet connection or consider using the offline mode. (Mod Manager Settings > Go Offline)", ++ "offline" : "You are currently offline. Some features may be unavailable. (To reconnect, use Mod Manager Settings > Go Online)" ++ }, ++ "common" : { ++ "add" : "Add", ++ "cancel" : "Cancel", ++ "close" : "Close", ++ "delete" : "Delete", ++ "import" : "Import", ++ "loading" : "Loading...", ++ "rename" : "Rename" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "An error occurred while generating the debug file. Please manually check your Satisfactory Mod Manager log files for more information and report this on the Discord. Use the button below to open the documentation and learn how.", ++ "generate_debug_info" : "Generate debug info", ++ "help" : "Seems wrong? Click the button below and send the generated zip file on the <1>modding discord in #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {{invalidInstalls} invalid Satisfactory install found} other {{invalidInstalls} invalid Satisfactory installs found}}", ++ "no_installs" : "No Satisfactory installs found", ++ "open_log_docs" : "Open the Logging Documentation", ++ "open_modding_discord" : "Open the Modding Discord", ++ "open_modding_discord.must_generate_debug_first" : "You must generate debug info first", ++ "reporting_directions" : "Seems wrong? Click the button below to gather logs, then send the generated zip file on the modding Discord in #help-using-mods.", ++ "title" : "Something went wrong" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Already installed", ++ "error-loading" : "Error loading mod details", ++ "in-queue" : "In queue", ++ "install" : "Install", ++ "latest-version" : "Latest version", ++ "title" : "Install mod", ++ "version" : "Version {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Get Started!", ++ "change_later_hint" : "Change these settings at any time in the \"Mod Manager Settings\" menu.", ++ "intro" : "Select your preferences to get started.", ++ "open_welcome_guide" : "Open the Welcome Guide", ++ "option" : { ++ "language" : { ++ "title" : "Use this language where available:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Wait for me to press \"Apply\"", ++ "enabled" : "Apply changes immediately", ++ "title" : "When I add or remove a mod, or switch profiles..." ++ } ++ }, ++ "title" : "Welcome to the Satisfactory Mod Manager!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Apply {profile}", ++ "apply-queued" : "Apply {queued, plural, one {one change} other {# changes}}", ++ "are-you-sure-warning" : "Are you sure you want to launch?", ++ "cant-launch" : "SMM can't launch this install", ++ "cant-launch-tooltip" : "The Mod Manager is not capable of launching this install type, but it will still manage the mod files for you. Launch Satisfactory using your usual game launcher.", ++ "changes-queued" : "Changes have not yet been made to your mod files. Click the button below to apply the changes you have queued.\n\n(You're in Queue \"Start manually\" mode)", ++ "game-running" : "Your game launcher is reporting that the game is already running (or still in the process of closing).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {{versionIncompatible} incompatible mod which will not load or crash our game} other {{versionIncompatible} incompatible mods which will not load or crash our game}}", ++ "launch-in-progress" : "Launch in progress...", ++ "operation-in-progress" : "An operation is already in progress.", ++ "play" : "Play Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {One mod that {versionPossiblyCompatible, plural, one {is} other {are}} likely incompatible with your game} other {# mods that {versionPossiblyCompatible, plural, one {is} other {are}} likely incompatible with your game}}", ++ "profile-change-queued" : "Changes have not yet been made to your mod files. Click the button below to apply the new profile.\n\n(You're in Queue \"Start manually\" mode)", ++ "ready" : "You're ready to rumble!\n\nNote: The Mod Manager has already finished installing the mod files for you. You could launch the game using your usual game launcher and mods would still be loaded.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {One mod} other {# mods}} that {reportedIncompatible, plural, one {is} other {are}} reported as Broken on this game version. Read the {versionIncompatible, plural, one {mod's} other {mods'}} description or compatibility notes for more information", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {One mod} other {# mods}} that {reportedPossiblyCompatible, plural, one {is} other {are}} reported as Damaged on this game version. Read the {versionIncompatible, plural, one {mod's} other {mods'}} description or compatibility notes for more information", ++ "you-have-warning-mods" : "You have:" ++ }, ++ "left-bar" : { ++ "export" : "Export", ++ "ficsit-app" : "ficsit.app (Mod Repository)", ++ "game-version" : "Select Game Installation", ++ "help" : "Help", ++ "install-invalid" : "Invalid", ++ "install-invalid-tooltip" : "Status: SMM cannot manage this install", ++ "install-loading" : "Loading...", ++ "install-loading-tooltip" : "Status: Loading...", ++ "install-unknown" : "Unknown", ++ "install-unknown-tooltip" : "Status: Could not get information about this install", ++ "links" : "Links", ++ "manage-servers" : "Manage Servers", ++ "mods-off" : "Mods off", ++ "mods-on" : "Mods on", ++ "other" : "Other", ++ "profile" : "Profile", ++ "queue-blocking-switching-tooltip" : "{number, plural, one {You have {number} action queued. Apply or cancel {number, plural, one {it} other {them}} before switching installs or profiles.} other {You have {number} actions queued. Apply or cancel {number, plural, one {it} other {them}} before switching installs or profiles.}}", ++ "satisfactory-modding-discord" : "Satisfactory Modding Discord", ++ "smm-github" : "SMM GitHub", ++ "updates" : "Updates" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod} Changelog" ++ }, ++ "mod-details" : { ++ "change-version" : "Change version", ++ "change-version-any" : "Any", ++ "change-version-or-newer" : "or newer", ++ "changelogs" : "Changelogs", ++ "compatibility" : "Compatibility", ++ "compatibility-branch" : "This mod has been reported as {state} on {branch}.", ++ "compatibility-unknown" : "Unknown", ++ "compatibility-unknown-tooltip" : "No compatibility information has been reported for this mod yet. Try it out and contact us on the Discord so it can be updated!", ++ "contributors" : "Contributors <1>({authors})", ++ "created" : "Created", ++ "downloads" : "Total downloads", ++ "installed-version" : "Installed version", ++ "latest-version" : "Latest version", ++ "mod-author" : "A mod by:", ++ "offline-mode" : "Offline mode is enabled. Changelogs and descriptions are not available.", ++ "size" : "Size", ++ "updated" : "Updated", ++ "view-on-ficsit-app" : "View on ficsit.app", ++ "views" : "Views" ++ }, ++ "mod-list-item" : { ++ "by-author" : "by", ++ "compatibility-note" : "This mod has been reported as {state} on this game version.", ++ "compatibility-note-none" : " (None specified)", ++ "compatibility-warning" : "There are problems reported with this mod, but you can try to install it anyways. Details:", ++ "dependency" : "This mod is already installed as a dependency of another mod. It cannot be uninstalled as long as other mods depend on it.", ++ "disable" : "This mod is Enabled on this profile. Click to Disable it, which prevents it from loading when you start the game, but still keeps it a part of this profile.", ++ "disable-queued" : "This mod is queued to be Disabled. Click to cancel the operation.", ++ "disabled-tooltip" : "This mod is Disabled. Click the pause icon to Enable it.", ++ "enable" : "Click to enable this mod.", ++ "enable-queued" : "This mod is queued to be Enabled. Click to cancel the operation.", ++ "favorite" : "Click to add this mod to your Favorites. Having a mod Favorited is unrelated to whether or not it's installed - it's a way to keep track of a mod for later regardless of what Profile you have selected.", ++ "hidden" : "This mod was hidden by the author.", ++ "install" : "Click to install this mod.", ++ "no-tags" : "(none available)", ++ "not-installable" : "You can't install this mod. Reason:", ++ "queued" : "This mod is already queued for another operation.", ++ "queued-install" : "This mod is queued to be installed. Click to cancel the operation.", ++ "queued-uninstall" : "This mod is queued to be uninstalled. Click to cancel the operation.", ++ "unavailable" : "This mod is no longer available on ficsit.app. You may want to remove it.", ++ "unfavorite" : "Click to remove this mod from your Favorites.", ++ "uninstall" : "This mod is installed on this profile. Click to uninstall this mod.", ++ "wait" : "Wait for the current operation to complete." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(No further notes provided)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "All mods", ++ "compatible" : "Compatible", ++ "dependency" : "Dependency", ++ "disabled" : "Disabled", ++ "enabled" : "Enabled", ++ "favorite" : "Favorite", ++ "installed" : "Installed", ++ "not-installed" : "Not installed", ++ "queued" : "Queued" ++ }, ++ "order-by" : { ++ "downloads" : "Downloads", ++ "hotness" : "Hotness", ++ "last-updated" : "Last updated", ++ "name" : "Name", ++ "popularity" : "Popularity", ++ "views" : "Views" ++ }, ++ "search" : "Search mods" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "No mods matching your filters", ++ "no-mods-found" : "No mods found", ++ "show-all" : "Show all" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Profile name", ++ "profile-name-placeholder" : "New Profile Name", ++ "title" : "Add profile" ++ }, ++ "delete" : { ++ "profile-name" : "Profile name", ++ "title" : "Delete profile" ++ }, ++ "import" : { ++ "profile-file" : "Profile file", ++ "profile-name" : "Profile name", ++ "profile-name-placeholder" : "New Profile Name", ++ "profile-version-warning" : "This profile was created with a newer version of the game. It may not be compatible with this version.", ++ "title" : "Import profile" ++ }, ++ "rename" : { ++ "new-profile" : "New profile name", ++ "new-profile-placeholder" : "New Profile", ++ "old-profile" : "Old profile name", ++ "old-profile-placeholder" : "Old Profile", ++ "title" : "Rename profile" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Add", ++ "advanced-note" : "Note that you might have to escape certain characters in the username and password", ++ "advanced-path-placeholder" : "user:pass@host:port/path", ++ "existing-servers" : { ++ "none-yet" : "No servers added yet. Add one below!", ++ "title" : "Manage Existing Servers" ++ }, ++ "failed-to-connect" : "Failed to connect to server, click to retry", ++ "get-help" : "Get help connecting to servers", ++ "host-placeholder" : "host", ++ "invalid" : "SMM cannot manage this install", ++ "loading" : "Loading...", ++ "local-path-placeholder" : "C:\\Path\\To\\Server", ++ "name-placeholder" : "Name (default: {default})", ++ "new-server" : { ++ "title" : "Add a New Server" ++ }, ++ "password-placeholder" : "password", ++ "path-placeholder" : "path", ++ "port-placeholder" : "port (default: {default})", ++ "switch-to-advanced" : "Switch to advanced mode", ++ "switch-to-simple" : "Switch to simple mode", ++ "title" : "Dedicated Servers", ++ "username-placeholder" : "username", ++ "validating" : "Validating..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Failed to list directory", ++ "failed-valid-check" : "Failed to check if selected path is a valid server" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Cache location", ++ "reset" : "Reset to default", ++ "save" : "Save and move", ++ "title" : "Change download cache location" ++ }, ++ "change-cache-location" : "Change cache location", ++ "copy-mod-list" : "Copy mod list", ++ "debug" : "Debug", ++ "generate-debug-info" : "Generate debug info", ++ "go-online-offline" : "Go {offline, select, true {online} other {offline}}", ++ "language" : "Language", ++ "launch-button" : "Launch button", ++ "launch-button.button" : "Button", ++ "launch-button.cat" : "Nyan", ++ "launch-button.normal" : "Normal", ++ "proxy" : { ++ "proxy" : "Proxy", ++ "remove" : "Remove proxy", ++ "save" : "Save and restart", ++ "title" : "Set Proxy" ++ }, ++ "queue" : "Queue", ++ "queue.start-immediately" : "Start immediately", ++ "queue.start-manually" : "Start manually", ++ "save-window-position" : "Save window position", ++ "secret-settings" : "Secret settings", ++ "set-proxy" : "Set proxy", ++ "settings" : "Settings", ++ "smm-debug-logging" : "SMM debug logging", ++ "start-view" : "Start view", ++ "start-view.compact" : "Compact", ++ "start-view.expanded" : "Expanded", ++ "title" : "Mod Manager Settings", ++ "update-check" : "Update check", ++ "update-check.ask" : "Ask when found", ++ "update-check.on-exit" : "On exit", ++ "update-check.on-start" : "On start" ++ }, ++ "smm-update" : { ++ "downloading" : "Downloading in background", ++ "downloading-stats" : "Downloading update: {current} / {total}, {speed}/s, ETA {eta}", ++ "title" : "SMM Update Available - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Improved performance", ++ "performance.description" : "Keeping you efficient!", ++ "platform_support" : "Native Linux Heroic, Steam Snap, Mac support", ++ "platform_support.description" : "Get a build from the GitHub releases if you haven't yet!", ++ "profile_format" : "New profile format", ++ "profile_format.description" : "SMM2 profiles are not compatible with SMM3! Your existing profiles have automatically been migrated, but you can't Import any profiles created with SMM2.", ++ "queue" : "Action queueing", ++ "queue.description" : "Queue up multiple mod downloads/uninstalls at once.", ++ "servers" : "Dedicated server management", ++ "servers.description" : "Easily manage servers via filesystem, SFTP, FTP and SMB!", ++ "translation" : "Translation support", ++ "translation.description" : "Join our Discord to translate SMM to your language!", ++ "ui" : "User interface refresh", ++ "ui.description" : "A fresh coat of paint to celebrate Satisfactory 1.0!" ++ }, ++ "intro" : "We've made a lot of improvements in this version. Here are some of the highlights:", ++ "open_guide" : "Open the SMM3 Documentation", ++ "title" : "Welcome to Satisfactory Mod Manager Version 3!" ++ }, ++ "updates" : { ++ "changelog" : "Changelog", ++ "check-for-updates" : "Check for updates", ++ "checking-for-updates" : "Checking for updates...", ++ "hide-ignored" : "Hide ignored", ++ "ignore" : "Ignore", ++ "mod-update-available" : "{updates, plural, one {{updates} mod update available} other {{updates} mod updates available}}", ++ "no-updates" : "No mod/SMM updates right now", ++ "show-ignored" : "Show ignored", ++ "smm-update-available" : "SMM update available", ++ "title" : "Updates", ++ "unignore" : "Unignore", ++ "update-all" : "Update All", ++ "update-selected" : "Update Selected" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/es.json b/frontend/src/lib/generated/i18n/es.json +new file mode 100644 +index 0000000..c204d60 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/es.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Desconectarse", ++ "go-online" : "Conectarse", ++ "healthcheck" : "No se ha podido acceder a ficsit.app. Comprueba tu conexión a internet o considera usar el modo offline. (Ajustes de Gestor de Mods > Desconectarse)", ++ "offline" : "Actualmente no estás conectado. Algunas funciones pueden no estar disponibles. (Para reconectar, vea a Ajustes del Gestor de Mods > Conectarse)" ++ }, ++ "common" : { ++ "add" : "Añadir", ++ "cancel" : "Cancelar", ++ "close" : "Cerrar", ++ "delete" : "Borrar", ++ "import" : "Importar", ++ "loading" : "Cargando...", ++ "rename" : "Renombrar" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "Se ha producido un error al generar el archivo de depuración. Comprueba manualmente los archivos de registro del Gestor de Mods de Satisfactory para obtener más información e informa de ello en Discord. Usa el botón de abajo para abrir la documentación y aprender cómo hacerlo.", ++ "generate_debug_info" : "Generar información de depuración", ++ "help" : "Si crees que se trata de un error, haz click en el botón de abajo y envía el archivo .zip generado al <1>discord de modding en #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {{invalidInstalls} Instalación de Satisfactory no válida encontrada} other {{invalidInstalls} Instalaciones de Satisfactory no válidas encontradas}}", ++ "no_installs" : "No se han encontrado instalaciones de Satisfactory", ++ "open_log_docs" : "Abrir la documentación de registro", ++ "open_modding_discord" : "Abrir el Discord de Mods", ++ "open_modding_discord.must_generate_debug_first" : "Primero debe generar información de depuración", ++ "reporting_directions" : "Si crees que se trata de un error, haz click en el botón de abajo para recopilar los registros, y después envía el archivo .zip generado al Discord de mods, en el canal de #help-using-mods.", ++ "title" : "Algo salió mal" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Ya instalado", ++ "error-loading" : "Error al cargar los detalles del mod", ++ "in-queue" : "En cola", ++ "install" : "Instalar", ++ "latest-version" : "Última versión", ++ "title" : "Instalar mod", ++ "version" : "Versión {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "¡Empieza ya!", ++ "change_later_hint" : "Cambia estos ajustes en cualquier momento en el menú \"Ajustes del Gestor de Mods\".", ++ "intro" : "Selecciona tus preferencias para empezar", ++ "open_welcome_guide" : "Abrir la Guía de Bienvenida", ++ "option" : { ++ "language" : { ++ "title" : "Utiliza este idioma cuando esté disponible:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Espera a la señal para pulsar \"Aplicar\"", ++ "enabled" : "Aplicar los cambios inmediatamente", ++ "title" : "Cuando añado o elimino un mod, o cambio de perfil..." ++ } ++ }, ++ "title" : "¡Bienvenido al Gestor de Mods de Satisfactory!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Aplicar {profile}", ++ "apply-queued" : "Aplicar {en cola, plural, un {un cambio} otro {# cambios}}", ++ "are-you-sure-warning" : "¿Estás seguro que quieres iniciar?", ++ "cant-launch" : "SMM no puede iniciar esta instalación", ++ "cant-launch-tooltip" : "El Gestor de Mods no es capaz de ejecutar este tipo de instalación, pero gestionará los archivos de los mods por ti. Inicia Satisfactory con tu launcher habitual.", ++ "changes-queued" : "Aún no se han realizado cambios en tus archivos de mod. Haz clic en el botón de abajo para aplicar los cambios que has puesto en cola.\n\n(Estás en el modo «Iniciar manualmente» de la cola)", ++ "game-running" : "Tu launcher está informando de que el juego ya se está ejecutando (o está en proceso de cerrarse).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {{versionIncompatible} mod incompatible que no carga o bloquea el juego} other {{versionIncompatible} mods incompatibles que no cargan o bloquean el juego}}", ++ "launch-in-progress" : "Inicio en curso...", ++ "operation-in-progress" : "Una operación ya está en curso.", ++ "play" : "Jugar a Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Un mod que '{versionPosiblementeCompatible, plurales, uno {es} otro {son}}' probablemente incompatible con tu juego} other {#mods que '{versionPosiblementeCompatible, plurales, uno {es} otro {son}}' probablemente incompatibles con tu juego}}", ++ "profile-change-queued" : "No se han realizado cambios a los archivos de tus mods. Haz clic en el botón de abajo para aplicar el nuevo perfil.\n\n(Estás en el modo \"Iniciar manualmente\" de la cola)", ++ "ready" : "¡Estás listo para la acción!\n\nNota: El Gestor de Mods ya ha terminado de instalar los archivos de mods por ti. Puedes iniciar el juego con tu launcher habitual y los mods seguirán cargados.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {Un mod} other {# mods}} que {reportedIncompatible, plural, one {is} other {are}} reportados como Rotos en esta versión del juego. Lee la descripción o las notas de compatibilidad de {versionIncompatible, plural, un {mod's} otro {mods'}} para obtener más información.", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {Un mod} other {# mods}} que {reportedPossiblyCompatible, plural, one {is} other {are}} reportados como Dañados en esta versión del juego. Lee la descripción o las notas de compatibilidad de {versionIncompatible, plural, un {mod's} otro {mods'}} para obtener más información.", ++ "you-have-warning-mods" : "Tienes:" ++ }, ++ "left-bar" : { ++ "export" : "Exportar", ++ "ficsit-app" : "ficsit.app (Repositorio de Mods)", ++ "game-version" : "Selecciona la instalación del juego", ++ "help" : "Ayuda", ++ "install-invalid" : "No válido", ++ "install-invalid-tooltip" : "Estado: SMM no puede gestionar esta instalación", ++ "install-loading" : "Cargando...", ++ "install-loading-tooltip" : "Estado: Cargando...", ++ "install-unknown" : "Desconocido", ++ "install-unknown-tooltip" : "Estado: No se pudo obtener información sobre esta instalación", ++ "links" : "Enlaces", ++ "manage-servers" : "Gestionar servidores", ++ "mods-off" : "Mods desactivados", ++ "mods-on" : "Mods activados", ++ "other" : "Otro", ++ "profile" : "Perfil", ++ "queue-blocking-switching-tooltip" : "{number, plural, one {Tiene '{number} acción en cola. Aplica o cancela {número, plurales, uno {él} otro {ellos}}' antes de cambiar de instalación o perfil.} other {Tiene '{number} acción en cola. Aplica o cancela {número, plurales, uno {él} otro {ellos}}' antes de cambiar de instalaciones o perfiles.}}", ++ "satisfactory-modding-discord" : "Discord de Modding de Satisfactory", ++ "smm-github" : "GitHub de SMM", ++ "updates" : "Actualizaciones" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod} Lista de cambios" ++ }, ++ "mod-details" : { ++ "change-version" : "Cambiar versión", ++ "change-version-any" : "Cualquiera", ++ "change-version-or-newer" : "o más nuevo", ++ "changelogs" : "Listas de cambios", ++ "compatibility" : "Compatibilidad", ++ "compatibility-branch" : "Este mod ha sido reportado como {state} en {branch}.", ++ "compatibility-unknown" : "Desconocido", ++ "compatibility-unknown-tooltip" : "Aún no se ha informado de la compatibilidad de este mod. ¡Pruébalo y ponte en contacto con nosotros en Discord para que podamos actualizarlo!", ++ "contributors" : "Colaboradores <1>({authors})", ++ "created" : "Creado", ++ "downloads" : "Descargas totales", ++ "installed-version" : "Versión instalada", ++ "latest-version" : "Última versión", ++ "mod-author" : "Mod hecho por:", ++ "offline-mode" : "El modo sin conexión está activado. Los registros de cambios y las descripciones no están disponibles.", ++ "size" : "Tamaño", ++ "updated" : "Actualizado", ++ "view-on-ficsit-app" : "Ver en ficsit.app", ++ "views" : "Visitas" ++ }, ++ "mod-list-item" : { ++ "by-author" : "por", ++ "compatibility-note" : "Este mod ha sido reportado como {state} en esta versión del juego.", ++ "compatibility-note-none" : "(Sin especificar)", ++ "compatibility-warning" : "Se han reportado problemas con este mod, pero puedes intentar instalarlo de todas formas. Detalles:", ++ "dependency" : "Este mod está instalado como una dependencia de otro mod. No puede ser instalado o borrado de manera independiente.", ++ "disable" : "Este mod está Activado en este perfil. Haz clic en Desactivar para que no se cargue al iniciar el juego, pero siga formando parte de este perfil.", ++ "disable-queued" : "Este mod está en cola para ser Desactivado. Haz clic para cancelar la operación.", ++ "disabled-tooltip" : "Este mod está Desactivado. Haz clic en el icono de pausa para Activarlo.", ++ "enable" : "Haz clic para activar este mod.", ++ "enable-queued" : "Este mod está en cola para ser Activado. Haz clic para cancelar la operación.", ++ "favorite" : "Haz clic para añadir este mod a Favoritos. Tener un mod en Favoritos no está relacionado con si está instalado o no - es una manera de tener un seguimiento de un mod independientemente de qué Perfil tengas seleccionado.", ++ "hidden" : "Este mod está oculto por el autor.", ++ "install" : "Haz clic para instalar este mod.", ++ "no-tags" : "(no disponible)", ++ "not-installable" : "No puedes instalar este mod. Razón:", ++ "queued" : "Este mod ya está en cola para otra operación.", ++ "queued-install" : "Este mod está en cola para ser instalado. Haz clic para cancelar la operación.", ++ "queued-uninstall" : "Este mod está en cola para ser desinstalado. Haz clic para cancelar la operación.", ++ "unavailable" : "Este mod ya no está disponible en ficsit.app. Es posible que desee eliminarlo.", ++ "unfavorite" : "Haz clic para borrar este mod de Favoritos.", ++ "uninstall" : "Este mod está instalado en este perfil. Haz clic para desinstalarlo.", ++ "wait" : "Espera a que finalice la operación en curso." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(No se han facilitado más notas)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Todos los mods", ++ "compatible" : "Compatible", ++ "dependency" : "Dependencia", ++ "disabled" : "Desactivado", ++ "enabled" : "Activado", ++ "favorite" : "Favorito", ++ "installed" : "Instalado", ++ "not-installed" : "No instalado", ++ "queued" : "En cola" ++ }, ++ "order-by" : { ++ "downloads" : "Descargas", ++ "hotness" : "En tendencia", ++ "last-updated" : "Últimos actualizados.", ++ "name" : "Nombre", ++ "popularity" : "Popularidad", ++ "views" : "Visitas" ++ }, ++ "search" : "Buscar mods" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "No hay mods que coincidan con tus filtros", ++ "no-mods-found" : "No se han encontrado mods", ++ "show-all" : "Mostrar todo" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Nombre de perfil", ++ "profile-name-placeholder" : "Nuevo nombre de perfil", ++ "title" : "Añadir perfil" ++ }, ++ "delete" : { ++ "profile-name" : "Nombre de perfil", ++ "title" : "Borrar perfil" ++ }, ++ "import" : { ++ "profile-file" : "Archivo del perfil", ++ "profile-name" : "Nombre de perfil", ++ "profile-name-placeholder" : "Nuevo nombre de perfil", ++ "profile-version-warning" : "Este perfil se creó con una versión más reciente del juego. Puede que no sea compatible con esta versión.", ++ "title" : "Importar perfil" ++ }, ++ "rename" : { ++ "new-profile" : "Nuevo nombre de perfil", ++ "new-profile-placeholder" : "Nuevo perfil", ++ "old-profile" : "Antiguo nombre de perfil", ++ "old-profile-placeholder" : "Antiguo perfil", ++ "title" : "Renombrar perfil" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Añadir", ++ "advanced-note" : "Tenga en cuenta que es posible que tenga que evitar ciertos caracteres en el nombre de usuario y la contraseña", ++ "advanced-path-placeholder" : "usuario:contraseña@host:puerto/ruta", ++ "existing-servers" : { ++ "none-yet" : "No hay servidores aún. ¡Añade uno abajo!", ++ "title" : "Gestionar servidores existentes" ++ }, ++ "failed-to-connect" : "No se ha podido conectar con el servidor, haga clic para volver a intentarlo.", ++ "get-help" : "Ayuda para conectarse a servidores", ++ "host-placeholder" : "host", ++ "invalid" : "SMM no puede gestionar esta instalación", ++ "loading" : "Cargando...", ++ "local-path-placeholder" : "C:\\Ruta\\Al\\Servidor", ++ "name-placeholder" : "Nombre (por defecto:{default})", ++ "new-server" : { ++ "title" : "Añadir un nuevo servidor" ++ }, ++ "password-placeholder" : "contraseña", ++ "path-placeholder" : "ruta", ++ "port-placeholder" : "puerto (por defecto:{default})", ++ "switch-to-advanced" : "Cambiar a modo avanzado", ++ "switch-to-simple" : "Cambiar a modo sencillo", ++ "title" : "Servidores dedicados", ++ "username-placeholder" : "nombre de usuario", ++ "validating" : "Validando..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Error al listar el directorio", ++ "failed-valid-check" : "Error al comprobar si la ruta seleccionada es un servidor válido" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Ubicación de la caché", ++ "reset" : "Restablecer valores por defecto", ++ "save" : "Guardar y mover", ++ "title" : "Cambiar la ubicación de la caché de descargas" ++ }, ++ "change-cache-location" : "Cambiar la ubicación de la caché", ++ "copy-mod-list" : "Copiar lista de mods", ++ "debug" : "Depurar", ++ "generate-debug-info" : "Generar información de depuración", ++ "go-online-offline" : "Go {offline, select, true {online} other {offline}}", ++ "language" : "Idioma", ++ "launch-button" : "Botón de inicio", ++ "launch-button.button" : "Botón", ++ "launch-button.cat" : "Nyan", ++ "launch-button.normal" : "Normal", ++ "proxy" : { ++ "proxy" : "Proxy", ++ "remove" : "Eliminar proxy", ++ "save" : "Guardar y reiniciar", ++ "title" : "Establecer proxy" ++ }, ++ "queue" : "Cola", ++ "queue.start-immediately" : "Empezar ya", ++ "queue.start-manually" : "Iniciar manualmente", ++ "save-window-position" : "Guardar posición de ventana", ++ "secret-settings" : "Ajustes secretos", ++ "set-proxy" : "Establecer proxy", ++ "settings" : "Ajustes", ++ "smm-debug-logging" : "Registros de depuración del SMM", ++ "start-view" : "Vista inicial", ++ "start-view.compact" : "Compacto", ++ "start-view.expanded" : "Expandida", ++ "title" : "Ajustes del Gestor de Mods", ++ "update-check" : "Comprobar actualización", ++ "update-check.ask" : "Consultar cuando se encuentre", ++ "update-check.on-exit" : "Al salir", ++ "update-check.on-start" : "Al inicio" ++ }, ++ "smm-update" : { ++ "downloading" : "Descarga en segundo plano", ++ "downloading-stats" : "Descargando actualización: {current} / {total},{speed}/s, Tiempo Estimado {eta} ", ++ "title" : "Actualización del SMM disponible - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Rendimiento mejorado", ++ "performance.description" : "¡Productividad a tope!", ++ "platform_support" : "Soporte nativo para Linux Heroic, Steam Snap y Mac", ++ "platform_support.description" : "¡Obtén una compilación de las versiones de GitHub si aún no lo has hecho!", ++ "profile_format" : "Nuevo formato de perfil", ++ "profile_format.description" : "¡Los perfiles de SMM2 no son compatibles con SMM3! Tus perfiles existentes han sido migrados automáticamente, pero no puedes Importar ningún perfil creado con SMM2.", ++ "queue" : "Acción en cola", ++ "queue.description" : "Pon en cola varias descargas/desinstalaciones de mods a la vez.", ++ "servers" : "Gestión de servidores dedicados", ++ "servers.description" : "¡Gestiona fácilmente servidores mediante: sistema de archivos, SFTP, FTP y SMB!", ++ "translation" : "Soporte de traducción", ++ "translation.description" : "¡Únete a nuestro Discord para traducir SMM a tu idioma!", ++ "ui" : "Actualización de la interfaz de usuario", ++ "ui.description" : "¡Una nueva capa de pintura para celebrar Satisfactory 1.0!" ++ }, ++ "intro" : "Hemos introducido muchas mejoras en esta versión. He aquí algunas de las más destacadas:", ++ "open_guide" : "Abrir la documentación de SMM3", ++ "title" : "¡Bienvenido a la versión 3 del Gestor de Mods de Satisfactory (SMM)!" ++ }, ++ "updates" : { ++ "changelog" : "Lista de cambios", ++ "check-for-updates" : "Comprobar actualizaciones", ++ "checking-for-updates" : "Comprobando actualizaciones...", ++ "hide-ignored" : "Ocultar ignorados", ++ "ignore" : "Ignorar", ++ "mod-update-available" : "{updates, plural, one {{updates} actualización de mod disponible} other {{updates} actualizaciones de mods disponibles}}", ++ "no-updates" : "No hay actualizaciones de mod/SMM en este momento", ++ "show-ignored" : "Mostrar ignorados", ++ "smm-update-available" : "Actualización disponible de SMM", ++ "title" : "Actualizaciones", ++ "unignore" : "No ignorar", ++ "update-all" : "Actualizar todo", ++ "update-selected" : "Actualización Seleccionada" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/fr.json b/frontend/src/lib/generated/i18n/fr.json +new file mode 100644 +index 0000000..ae9ee01 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/fr.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Passer hors-ligne", ++ "go-online" : "Passer en ligne", ++ "healthcheck" : "Impossible de joindre ficsit.app. Vérifiez votre connection internet ou essayer d'utiliser le mode hors-ligne. (Paramètres SMM > Passer en ligne)", ++ "offline" : "Vous êtes actuellement hors-ligne. Certaines fonctionnalités peuvent ne pas être disponibles. (Pour se reconnecter, aller dans Paramètres SMM > Passer en ligne) " ++ }, ++ "common" : { ++ "add" : "Ajouter", ++ "cancel" : "Annuler", ++ "close" : "Fermer", ++ "delete" : "Supprimer", ++ "import" : "Importer", ++ "loading" : "Chargement...", ++ "rename" : "Renommer" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "Une erreur est survenue lors de la génération du fichier de débogage. Veuillez vérifier manuellement les logs de SMM pour plus d'informations et le reporter sur le DIscord. Utilisez le bouton ci-dessous pour ouvrir la documentation savoir comment faire.", ++ "generate_debug_info" : "Générer les infos de débogage", ++ "help" : "Cela vous paraît faux ? Cliquez sur le bouton ci-dessous et envoyez le fichier zip généré sur le <1>discord modding dans #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {{invalidInstalls} installation invalide de Satisfactory trouvée} many {{invalidInstalls} installations invalide de Satisfactory trouvées} other {}}", ++ "no_installs" : "Aucune installations de Satisfactory trouvées", ++ "open_log_docs" : "Ouvrir la documentation des logs", ++ "open_modding_discord" : "Ouvrir le DIscord de Modding", ++ "open_modding_discord.must_generate_debug_first" : "Vous devez d'abord générer les infos de débogage", ++ "reporting_directions" : "Cela vous paraît faux ? Cliquez sur le bouton ci-dessous pour récupérer les logs et envoyez le fichier zip généré sur le Discord Modding dans #help-using-mods.", ++ "title" : "Un problème est survenu" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Déjà installé", ++ "error-loading" : "Erreur durant le chargement des détails du mod", ++ "in-queue" : "En attente", ++ "install" : "Installer", ++ "latest-version" : "Dernière version", ++ "title" : "Installer le mod", ++ "version" : "Version {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Commencer !", ++ "change_later_hint" : "Changez ces paramètres à tout moment dans le menu \"Paramètres SMM\"", ++ "intro" : "Choisissez vos préférences pour commencer.", ++ "open_welcome_guide" : "Ouvrir le Guide de Bienvenue", ++ "option" : { ++ "language" : { ++ "title" : "Utiliser cette langue quand disponible :" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Devoir cliquer sur \"Appliquer\"", ++ "enabled" : "Appliquer les changements immédiatement", ++ "title" : "Quand j'ajoute ou supprime un mode, ou change de profil..." ++ } ++ }, ++ "title" : "Bienvenue sur le Satisfactory Mod Manager (Gestionnaire de Mod de Satisfactory / SMM) !" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Appliquer {profile}", ++ "apply-queued" : "Appliquer {queued, plural, one {un changement} other {les # modifications}}", ++ "are-you-sure-warning" : "Êtes-vous sûr de vouloir lancer ?", ++ "cant-launch" : "SMM ne peut pas lancer cette installation", ++ "cant-launch-tooltip" : "Le Gestionnaire de Mods n'est pas capable de lancer ce type d'installation, mais va toujours gérer les fichiers de mods pour vous. Lancer Satisfactory avec votre lanceur habituel.", ++ "changes-queued" : "Les modifications n'ont pas encore été faites à vos fichiers. Cliquez sur le bouton ci-dessus pour appliquer les modification en attente. ", ++ "game-running" : "Votre lanceur du jeu nous rapporte que le jeu est déjà lancé (ou encore en train de se fermer)", ++ "incompatible-mods" : "{versionIncompatible, plural, one {{versionIncompatible} mod incompatible qui ne se chargera pas ou fera planter le jeu} other {{versionIncompatible} mods incompatibles qui ne se chargeront pas ou feront planter le jeu}}", ++ "launch-in-progress" : "Lancement en cours...", ++ "operation-in-progress" : "Une opération est déjà en cours.", ++ "play" : "Jouer à Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Un mod {versionPossiblyCompatible, plural, one {n'est} other {ne sont}} probablement pas compatibles avec votre jeu} other {# Des mods {versionPossiblyCompatible, plural, one {n'est} other {ne sont}} probablement pas compatibles avec votre jeu}}", ++ "profile-change-queued" : "Les modifications n'ont pas encore été faites à vos fichiers. Cliquez sur le bouton ci-dessus pour appliquer les modification en attente. ", ++ "ready" : "Vous êtes prêt pour jouer !\n\nNote : Le Gestionnaire de Mod à déjà fini d'installer les fichiers de mod pour vous. Vous pouvez désormais lancer le jeu avec votre lanceur habituel et vos mods se chargeront toujours.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {Un mod} other {# mods}} {reportedIncompatible, plural, one {est} other {sont}} signalé.s en tant qu'incompatible.s. Lisez la description ou les notes de comptabilité {versionIncompatible, plural, one {du mod} other {des mods}} pour plus d'informations.", ++ "reported-possibly-compatible-mods" : "{reportedIncompatible, plural, one {Un mod} other {# mods}} {reportedIncompatible, plural, one {est} other {sont}} signalé.s en tant qu'endommagé.s. Lisez la description ou les notes de comptabilité {versionIncompatible, plural, one {du mod} other {des mods}} pour plus d'informations.", ++ "you-have-warning-mods" : "Vous avez :" ++ }, ++ "left-bar" : { ++ "export" : "Exporter", ++ "ficsit-app" : "ficsit.app (Dépôt de Mods)", ++ "game-version" : "Sélectionnez l'installation du jeu", ++ "help" : "Aide", ++ "install-invalid" : "Invalide", ++ "install-invalid-tooltip" : "Statut : SMM ne peut pas gérer cette installation", ++ "install-loading" : "Chargement...", ++ "install-loading-tooltip" : "Statut : Chargement...", ++ "install-unknown" : "Inconnu", ++ "install-unknown-tooltip" : "Statut : Impossible de récupérer des informations sur cette installation", ++ "links" : "Liens", ++ "manage-servers" : "Gérer les serveurs", ++ "mods-off" : "Désactiver les mods", ++ "mods-on" : "Activer les mods", ++ "other" : "Autre", ++ "profile" : "Profile", ++ "queue-blocking-switching-tooltip" : "{number, plural, one {Vous avez {number} action en attentes. Appliquez ou annuler {number, plural, one {là} other {les}} avant de changer d'installation ou de profile.} other {Vous avez {number} actions en attentes. Appliquez ou annuler {number, plural, one {là} other {les}} avant de changer d'installation ou de profile.}}", ++ "satisfactory-modding-discord" : "Discord de Modding", ++ "smm-github" : "GitHub", ++ "updates" : "Mises à jour" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod} Journal des modifications" ++ }, ++ "mod-details" : { ++ "change-version" : "Changer la version", ++ "change-version-any" : "Toutes", ++ "change-version-or-newer" : "Ou plus récent", ++ "changelogs" : "Journal des modifications", ++ "compatibility" : "Comptabilité", ++ "compatibility-branch" : "Ce mod à été signalé en tant que {state} sur {branch}.", ++ "compatibility-unknown" : "Inconnu", ++ "compatibility-unknown-tooltip" : "Aucune information de comptabilité n'a encore été reporté pour ce mod. Essayez le et contacte-nous sur le Discord pour qu'il puisse être mis à jour !", ++ "contributors" : "Contributeurs <1>({authors})", ++ "created" : "Créé", ++ "downloads" : "Téléchargements", ++ "installed-version" : "Version installé", ++ "latest-version" : "Dernière version", ++ "mod-author" : "Auteur(s) : ", ++ "offline-mode" : "Le mode hors-ligne est activé. Les journaux des modification et les descriptions ne seront pas disponibles.", ++ "size" : "Taille", ++ "updated" : "Mis à jour le ", ++ "view-on-ficsit-app" : "Voir sur ficsit.app", ++ "views" : "Vues" ++ }, ++ "mod-list-item" : { ++ "by-author" : "Par", ++ "compatibility-note" : "Ce mod a été signalé en tant que {state} sur cette version du jeu.", ++ "compatibility-note-none" : "(Aucun spécifié)", ++ "compatibility-warning" : "Il y a eu des problèmes liés à ce mod, mais vous pouvez quand même essayer de l'installer. Détails :", ++ "dependency" : "Ce mod est installé en tant que dépendance d'un autre mod. Il ne peut pas être installé ou supprimé seul.", ++ "disable" : "Ce mod est activé dans le profil actuel. Cliquez pour le désactiver, ce qui l'empêchera de se charger quand vous lancerez le jeu, mais il sera toujours présent dans ce profil.", ++ "disable-queued" : "Ce mod est en attente de désactivation. Cliquez pour annuler.", ++ "disabled-tooltip" : "Le mod est désactivé. Cliquez sur l'icone de pause pour l'activer.", ++ "enable" : "Cliquez pour activer ce mod.", ++ "enable-queued" : "Ce mod est en attente d'activation. Cliquez pour annuler.", ++ "favorite" : "Cliquez pour ajouter ce mod en tant que favori. Avoir un mod en favori n'est pas lié au fait qu'il soit installé ou non, c'est un moyen de garder une trace d'un mod, peu importe quel Profile est séléctionné.", ++ "hidden" : "Ce mod à été caché par l'auteur.", ++ "install" : "Cliquez pour installer ce mod.", ++ "no-tags" : "(Aucuns tags)", ++ "not-installable" : "Vous ne pouvez pas installer ce mod car :", ++ "queued" : "Ce mod est déjà en attente pour une autre action.", ++ "queued-install" : "Ce mod est en attente d'être installé. Cliquez pour annuler.", ++ "queued-uninstall" : "Ce mod est en attente d'être désinstaller. Cliquez pour annuler.", ++ "unavailable" : "Ce mod n'est plus disponible sur ficsit.app. Vous pouvez le supprimer.", ++ "unfavorite" : "Cliquez pour enlever ce mod des Favoris.", ++ "uninstall" : "Ce mod est installé sur ce profil. Cliquez pour désinstaller ce mod.", ++ "wait" : "Veuillez attendre que l'opération en cours se termine." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(Aucunes autres informations données)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Tous les mods", ++ "compatible" : "Compatibles", ++ "dependency" : "Dépendances", ++ "disabled" : "Désactivés", ++ "enabled" : "Activés", ++ "favorite" : "Favoris", ++ "installed" : "Installés", ++ "not-installed" : "Non installés", ++ "queued" : "En attente" ++ }, ++ "order-by" : { ++ "downloads" : "Téléchargements", ++ "hotness" : "Tendance", ++ "last-updated" : "Dernier mis à jour", ++ "name" : "Nom", ++ "popularity" : "Popularité", ++ "views" : "Vues" ++ }, ++ "search" : "Rechercher un mod" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "Aucun mod trouvés avec ces filtres", ++ "no-mods-found" : "Aucuns mods trouvé", ++ "show-all" : "Tout montrer" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Nom du profil", ++ "profile-name-placeholder" : "Nouveau nom du profil", ++ "title" : "Ajouter un profil" ++ }, ++ "delete" : { ++ "profile-name" : "Nom du profil", ++ "title" : "Supprimer le profil" ++ }, ++ "import" : { ++ "profile-file" : "Fichier du profil", ++ "profile-name" : "Nom du profil", ++ "profile-name-placeholder" : "Nouveau nom du profil", ++ "profile-version-warning" : "Ce profil à été avec une version plus récente du jeu. Il est possible qu'il ne soit pas compatible avec cette version.", ++ "title" : "Importer un profil" ++ }, ++ "rename" : { ++ "new-profile" : "Nouveau nom du profil", ++ "new-profile-placeholder" : "Nouveau profile", ++ "old-profile" : "Ancien nom du profil", ++ "old-profile-placeholder" : "Ancien profil", ++ "title" : "Renommer le profil" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Ajouter", ++ "advanced-note" : "Notez que vous devrez peut être éviter certain caractères dans l'identifiant et le mot de passe", ++ "advanced-path-placeholder" : "utilisateur:MotDePasse@hôte:port/chemin", ++ "existing-servers" : { ++ "none-yet" : "Aucun serveur ajouté. Ajoutez en un ci-dessous!", ++ "title" : "Gérer les serveurs existants" ++ }, ++ "failed-to-connect" : "Impossible de se connecter au serveur, cliquez pour réessayer", ++ "get-help" : "Avoir de l'aide pour se connecter aux serveurs", ++ "host-placeholder" : "hôte", ++ "invalid" : "SMM ne peut pas gérer cette installation", ++ "loading" : "Chargement...", ++ "local-path-placeholder" : "C:\\Chemin\\Vers\\Serveur", ++ "name-placeholder" : "Nom (par défaut : {default})", ++ "new-server" : { ++ "title" : "Ajouter un Nouveau Serveur" ++ }, ++ "password-placeholder" : "mot de passe", ++ "path-placeholder" : "chemin", ++ "port-placeholder" : "port (par défaut : {default})", ++ "switch-to-advanced" : "Passer en mode avancé", ++ "switch-to-simple" : "Passer en mode simple", ++ "title" : "Serveurs Dédiés", ++ "username-placeholder" : "identifiant", ++ "validating" : "Validation..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Impossible de lister le répertoire", ++ "failed-valid-check" : "Impossible de vérifier si le chemin sélectionné est un serveur valide" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Localisation du cache", ++ "reset" : "Réinitialiser par défaut", ++ "save" : "Sauvegarder et déplacer", ++ "title" : "Changer la localisation du cache de téléchargement" ++ }, ++ "change-cache-location" : "Changer la localisation du cache ", ++ "copy-mod-list" : "Copier la liste des mod", ++ "debug" : "Débogage", ++ "generate-debug-info" : "Générer les infos de débogage", ++ "go-online-offline" : "passer {offline, select, true {en ligne} other {hors-ligne}}", ++ "language" : "Langue", ++ "launch-button" : "Bouton de lancement", ++ "launch-button.button" : "Bouton", ++ "launch-button.cat" : "Miaou", ++ "launch-button.normal" : "Normal", ++ "proxy" : { ++ "proxy" : "Proxy", ++ "remove" : "Enlever le proxy", ++ "save" : "Sauvegarder et redémarrer", ++ "title" : "Définir le proxy" ++ }, ++ "queue" : "File d'attente", ++ "queue.start-immediately" : "Démarrer immédiatement", ++ "queue.start-manually" : "Démarrer manuellement", ++ "save-window-position" : "Sauvegarder la position de la fenêtre", ++ "secret-settings" : "Paramètres secrets", ++ "set-proxy" : "Définir le proxy", ++ "settings" : "Paramètres", ++ "smm-debug-logging" : "log de débogage de SMM", ++ "start-view" : "Vue de départ", ++ "start-view.compact" : "Compact", ++ "start-view.expanded" : "Étendu", ++ "title" : "Paramètres", ++ "update-check" : "Vérification de la mise à jour", ++ "update-check.ask" : "Demander une fois trouvé", ++ "update-check.on-exit" : "En quittant", ++ "update-check.on-start" : "Au démarrage" ++ }, ++ "smm-update" : { ++ "downloading" : "Télécharger en arrière-plan", ++ "downloading-stats" : "Vitesse de téléchargement : {current} / {total}, {speed}/s, ETA {eta}", ++ "title" : "Mise à jour de SMM disponible - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Performances améliorées", ++ "performance.description" : "Vous garder productif !", ++ "platform_support" : "Support natif de Linux Heroic, Steam Snap et Mac", ++ "platform_support.description" : "Récupérer une version depuis la page GitHub si vous ne l'avez pas déjà fait !", ++ "profile_format" : "Nouveau format de profil", ++ "profile_format.description" : "Les profils de SMM2 ne sont pas compatibles avec SMM3 ! Vos profils existants ont automatiquement été migré, mais vous ne pouvez pas importer de profils créés avec SMM2.", ++ "queue" : "Action en attente", ++ "queue.description" : "Mettre en file d'attente plusieurs téléchargements/désinstallations de mod en même temps.", ++ "servers" : "Gestion de serveur dédié", ++ "servers.description" : "Gérer facilement des serveurs via filesystem, SFTP, FTP et SMB", ++ "translation" : "Problème de traduction ?", ++ "translation.description" : "Rejoignez notre Discord pour traduire SMM dans votre langue !", ++ "ui" : "Rafraichir l'interface utilisateur", ++ "ui.description" : "Une couche de peinture fraiche pour célébrer Satisfactory 1.0 !" ++ }, ++ "intro" : "On a amélioré beaucoup de points dans cette version. Voici quelques exemples :", ++ "open_guide" : "Ouvrir la documentation de SMM3", ++ "title" : "Bienvenue sur le Gestionnaire de Mod de Satisfactory Version 3 (SMM3)" ++ }, ++ "updates" : { ++ "changelog" : "Journal des modifications", ++ "check-for-updates" : "Vérifier les mises à jour", ++ "checking-for-updates" : "Vérification des mises à jour...", ++ "hide-ignored" : "Masquer ignorés", ++ "ignore" : "Ignorer", ++ "mod-update-available" : "{updates, plural, one {{updates} mise à jour de mod disponible} other {{updates} mises à jour de mod disponibles}}", ++ "no-updates" : "Aucunes mises à jour de mods/SMM actuellement", ++ "show-ignored" : "Montrer les MAJ ignorées", ++ "smm-update-available" : "Mise à jour de SMM disponible", ++ "title" : "Mises à jour", ++ "unignore" : "Annuler ignorer", ++ "update-all" : "Tout mettre à jour", ++ "update-selected" : "Mise à jour sélectionné" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/hu.json b/frontend/src/lib/generated/i18n/hu.json +new file mode 100644 +index 0000000..9b04401 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/hu.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Válts Offline módba", ++ "go-online" : "Válts Online módba", ++ "healthcheck" : "A ficsit.app nem elérhető. Ellenőrizd az internetkapcsolatodat, vagy próbáld meg az offline mód használatát. (Mod Manager Beállítások > Válts Offline módba)", ++ "offline" : "Jelenleg Offline módban vagy. Néhány funkció nem elérhető. (A visszacsatlakozáshoz használd a Mod Manager Beállítások > Válts Online módba)" ++ }, ++ "common" : { ++ "add" : "Hozzáadás", ++ "cancel" : "Visszavonás", ++ "close" : "Bezárás", ++ "delete" : "Kitörlés", ++ "import" : "Importálás", ++ "loading" : "Betöltés...", ++ "rename" : "Átnevezés" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "\nHiba történt a hibakereső fájl generálása során. Kérjük, manuálisan ellenőrizd a Satisfactory Mod Manager hibanapló fájljait további információkért, és jelentsd ezt a Discordon. Használd az alábbi gombot a dokumentáció megnyitásához és az útmutató megismeréséhez.", ++ "generate_debug_info" : "Hibakereső információ generálása\n\n\n\n\n\n\n", ++ "help" : "Úgy tűnik, hogy valami hiba történt? Kattints az alábbi gombra, és küldd el a létrehozott zip fájlt a <1>modding Discordon a #help-using-mods csatornába.\n", ++ "invalid_installs" : "{invalidInstalls, plural, one {{invalidInstalls}Érvénytelen Satisfactory telepítés található.} other {{invalidInstalls}Érvénytelen Satisfactory telepítések találhatók.}}", ++ "no_installs" : "Nem található Satisfactory telepítés.\n\n\n\n\n\n\n", ++ "open_log_docs" : "Nyisd meg a Naplózás dokumentációt.\n\n\n\n\n\n\n", ++ "open_modding_discord" : "Nyisd meg a Modding Discordot.\n\n\n\n\n\n\n", ++ "open_modding_discord.must_generate_debug_first" : "Először hibakereső információt kell generálnod.\n\n\n\n\n\n\n\n\n", ++ "reporting_directions" : "Úgy tűnik, hogy valami hiba történt? Kattints az alábbi gombra a naplók összegyűjtéséhez, majd küldd el a létrehozott zip fájlt a modding Discordon a #help-using-mods csatornába.\n\n\n\n\n\n\n", ++ "title" : "Valami hiba történt.\n\n\n\n\n\n\n" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Már telepítve van.", ++ "error-loading" : "Hiba történt a mod részleteinek betöltésekor.", ++ "in-queue" : "Várakozó sorban.\n\n\n\n\n\n\n\n\n", ++ "install" : "Telepítés", ++ "latest-version" : "Legújabb verzió", ++ "title" : "Mod telepítése\n\n\n\n\n\n\n", ++ "version" : "{version} Verzió" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Get Started!", ++ "change_later_hint" : "Ezeket a beállításokat bármikor módosíthatod a \"Mod Manager Beállítások\" menüben.\n\n\n\n", ++ "intro" : "Válaszd ki a preferenciáidat a kezdéshez.", ++ "open_welcome_guide" : "Nyisd meg a Üdvözlő útmutatót.", ++ "option" : { ++ "language" : { ++ "title" : "Használj ezt a nyelvet, ahol elérhető:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Várj, amíg megnyomom az \"Alkalmaz\" gombot.", ++ "enabled" : "Változtatások azonnali alkalmazása.\n\n\n\n\n\n\n", ++ "title" : "Amikor modot adok hozzá vagy távolítok el, vagy váltok profilokat..." ++ } ++ }, ++ "title" : "Üdvözlünk a Satisfactory Mod Managerben!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Alkalmaz {profile}", ++ "apply-queued" : "Alkalmazd a {queued, plural, one {változást} other {# változást}}.\n\n\n\n\n\n", ++ "are-you-sure-warning" : "Biztosan el szeretnéd indítani?", ++ "cant-launch" : "Az SMM nem tudja elindítani ezt a telepítést.", ++ "cant-launch-tooltip" : "A Mod Manager nem képes elindítani ezt a telepítési típust, de továbbra is kezeli a mod fájlokat számodra. Indítsd el a Satisfactory-t a megszokott játékindítód segítségével.", ++ "changes-queued" : "A módosítások még nem kerültek alkalmazásra a mod fájljaidon. Kattints a fenti gombra a várakozó változtatások alkalmazásához.", ++ "game-running" : "A játékindítód azt jelzi, hogy a játék már fut (vagy még mindig a bezárás folyamatában van).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {Inkompatibilis mod, amely nem fog betöltődni vagy összeomlik a játékunk.\n} other {Inkompatibilis modok, amelyek nem fognak betöltődni vagy összeomlanak a játékunk.}}", ++ "launch-in-progress" : "Indítás folyamatban...", ++ "operation-in-progress" : "Egy művelet már folyamatban van.", ++ "play" : "Satisfactory Indítása", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Egy mod, amely '{versionPossiblyCompatible, plural, one {valószínűleg inkompatibilis} other {valószínűleg inkompatibilisek}' a játékoddal.} other {# Modok, amelyek '{versionPossiblyCompatible, plural, one {valószínűleg inkompatibilisek} other {valószínűleg inkompatibilisek}' a játékoddal.}}", ++ "profile-change-queued" : "A mod fájljain még nem történt módosítás. Kattintson a fenti gombra az új profil alkalmazásához.\n\n(A \"Kézi indítás\" sor módban van)", ++ "ready" : "A játék készen áll!\n\nMegjegyzés: A Mod Manager már befejezte a mod fájlok telepítését számodra. Indíthatod a játékot a megszokott játékindítód segítségével, és a modok továbbra is betöltődnek.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {Egy mod} other {# mod}} amely {reportedIncompatible, plural, one {be van jelentve} other {be vannak jelentve} töröttnek ezen a játékverzión. Olvasd el a {versionIncompatible, plural, one {mod} other {modok}} leírását vagy kompatibilitási megjegyzéseit a további információkért.", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {Egy mod} other {# mod}} amely {reportedPossiblyCompatible, plural, one {be van jelentve} other {be vannak jelentve} sérültnek ezen a játékverzión. Olvasd el a {versionIncompatible, plural, one {mod} other {modok}} leírását vagy kompatibilitási megjegyzéseit a további információkért.", ++ "you-have-warning-mods" : "Neked van:\n\n" ++ }, ++ "left-bar" : { ++ "export" : "Exportálás\n\n\n\n\n\n\n", ++ "ficsit-app" : "ficsit.app (Mod tároló)", ++ "game-version" : "Válaszd ki a Játék Telepítést\n\n\n\n\n\n\n", ++ "help" : "Segítség", ++ "install-invalid" : "Érvénytelen", ++ "install-invalid-tooltip" : "Állapot: Az SMM nem tudja kezelni ezt a telepítést.\n\n\n\n\n\n\n", ++ "install-loading" : "Betöltés...", ++ "install-loading-tooltip" : "Állapot: Betöltés...", ++ "install-unknown" : "Ismeretlen\n\n\n\n\n\n\n", ++ "install-unknown-tooltip" : "Állapot: Nem sikerült információt szerezni erről a telepítésről.", ++ "links" : "Linkek", ++ "manage-servers" : "Szerverek kezelése", ++ "mods-off" : "Modok kikapcsolása", ++ "mods-on" : "Modok bekapcsolása", ++ "other" : "Több", ++ "profile" : "Profil", ++ "queue-blocking-switching-tooltip" : "{number, plural, other {Neked van {number} akció a várakozó sorban. Alkalmazd vagy töröld {number, plural, one {azt} other {azokat}} mielőtt telepítéseket vagy profilokat váltanál.} }", ++ "satisfactory-modding-discord" : "Satisfactory Modding Discord\n", ++ "smm-github" : "SMM GitHub", ++ "updates" : "Frissítések" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod} Változási naplója" ++ }, ++ "mod-details" : { ++ "change-version" : "Verzió változtatása", ++ "change-version-any" : "Bármennyi", ++ "change-version-or-newer" : "vagy újabb", ++ "changelogs" : "Változási naplók\n\n\n", ++ "compatibility" : "Kompatibilitás", ++ "compatibility-branch" : "Ez a mod be lett jelentve mint {state} {branch}-on.", ++ "compatibility-unknown" : "Ismeretlen", ++ "compatibility-unknown-tooltip" : "Még nincs bejelentett kompatibilitási információ erről a modról. Próbáld ki, és vedd fel velünk a kapcsolatot a Discordon, hogy frissíthessük!", ++ "contributors" : "Hozzájárulok <1>({authors})", ++ "created" : "Létrehozva", ++ "downloads" : "Összes letöltés", ++ "installed-version" : "Letöltött verziók", ++ "latest-version" : "Legújabb verzió", ++ "mod-author" : "A mod létrehozója: ", ++ "offline-mode" : "Az offline mód be van kapcsolva. Változási naplók és leírások nem elérhetők.\n", ++ "size" : "Méret", ++ "updated" : "Frissítve", ++ "view-on-ficsit-app" : "Nézd meg a ficsit.app-on", ++ "views" : "Megtekintések" ++ }, ++ "mod-list-item" : { ++ "by-author" : "általa", ++ "compatibility-note" : "Ez a mod be lett jelentve mint {state} ezen a játékverzión.\n\n", ++ "compatibility-note-none" : "(Nincs megadva)\n\n\n", ++ "compatibility-warning" : "Problémák lettek bejelentve ezzel a moddal kapcsolatban, de mindenképpen megpróbálhatod telepíteni. Részletek:", ++ "dependency" : "Ez a mod egy másik mod függőségeként van telepítve. Nem telepíthető vagy távolítható el önállóan.", ++ "disable" : "Ez a mod engedélyezve van ezen a profilon. Kattints a letiltásához, ami megakadályozza, hogy betöltődjön a játék indításakor, de továbbra is része marad ennek a profilnak.", ++ "disable-queued" : "Ez a mod letiltásra vár. Kattints a művelet törléséhez.", ++ "disabled-tooltip" : "Ez a mod le van tiltva. Kattints a szünet ikonra az engedélyezéséhez.", ++ "enable" : "Kattints a mod engedélyezéséhez.", ++ "enable-queued" : "Ez a mod engedélyezésre vár. Kattints a művelet törléséhez.", ++ "favorite" : "Kattints a mod kedvencekhez adásához. A mod kedvencként való megjelölése nem kapcsolódik ahhoz, hogy telepítve van-e vagy sem – ez egy módja annak, hogy nyomon követhesd a modot későbbi használatra, függetlenül attól, melyik profilt választottad.", ++ "hidden" : "Ez a mod el lett rejtve a szerző által.", ++ "install" : "Kattints a mod telepítéséhez.", ++ "no-tags" : "(nincs elérhető)", ++ "not-installable" : "Nem tudod telepíteni ezt a modot. Ok:", ++ "queued" : "Ez a mod már várakozik egy másik műveletre.", ++ "queued-install" : "Ez a mod telepítésre vár. Kattints a művelet törléséhez.", ++ "queued-uninstall" : "Ez a mod eltávolításra vár. Kattints a művelet törléséhez.", ++ "unavailable" : "Ez a mod már nem elérhető a ficsit.app-on. Lehet, hogy érdemes eltávolítanod.", ++ "unfavorite" : "Kattints a mod eltávolításához a kedvencek közül.", ++ "uninstall" : "Ez a mod telepítve van ezen a profilon. Kattints a mod eltávolításához.", ++ "wait" : "Várj meg a jelenlegi művelet befejezését." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(Nincs további megjegyzés)\n\n" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Összes mod", ++ "compatible" : "Kompatibilis", ++ "dependency" : "Függőség", ++ "disabled" : "Letiltva", ++ "enabled" : "Engedélyezve", ++ "favorite" : "Kedvenc", ++ "installed" : "Letöltve", ++ "not-installed" : "Nincs letöltve", ++ "queued" : "Várakozó" ++ }, ++ "order-by" : { ++ "downloads" : "Letöltések", ++ "hotness" : "Népszerűség", ++ "last-updated" : "Utolsó frissítés", ++ "name" : "Név", ++ "popularity" : "Népszerűség", ++ "views" : "Megtekintések" ++ }, ++ "search" : "Modok keresése" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "Nincsenek modok, amelyek megfelelnek a szűrőidnek.", ++ "no-mods-found" : "Nincs található mod.", ++ "show-all" : "Összes mutatása" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Profil név", ++ "profile-name-placeholder" : "Új profil név", ++ "title" : "Profil hozzáadása" ++ }, ++ "delete" : { ++ "profile-name" : "Profil név", ++ "title" : "Profil kitörlése" ++ }, ++ "import" : { ++ "profile-file" : "Profil fájl", ++ "profile-name" : "Profil név", ++ "profile-name-placeholder" : "Új profil név", ++ "profile-version-warning" : "Ez a profil egy újabb verzióval készült, mint a játék. Lehet, hogy nem kompatibilis ezzel a verzióval.", ++ "title" : "Profil betöltése" ++ }, ++ "rename" : { ++ "new-profile" : "Új profil név", ++ "new-profile-placeholder" : "Új profil", ++ "old-profile" : "Régi profil név", ++ "old-profile-placeholder" : "Régi profil", ++ "title" : "Profil név megváltoztatása" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Hozzáadás", ++ "advanced-note" : "Vedd figyelembe, hogy bizonyos karaktereket lehet, hogy escape-elni kell a felhasználónévben és a jelszóban.", ++ "advanced-path-placeholder" : "felhasználó:jelszó@host:port/út\n", ++ "existing-servers" : { ++ "none-yet" : null, ++ "title" : null ++ }, ++ "failed-to-connect" : "Sikerült a kapcsolat a szerverhez, kattints a próbálkozáshoz.", ++ "get-help" : "Segítség a szerverekhez való kapcsolódáshoz.", ++ "host-placeholder" : "host", ++ "invalid" : "Az SMM nem tudja kezelni ezt a telepítést.\n\n\n", ++ "loading" : "Betöltés...", ++ "local-path-placeholder" : "C:\\Szerver\\Fájlai\n\n", ++ "name-placeholder" : "Név (alapértelmezett: {default})", ++ "new-server" : { ++ "title" : null ++ }, ++ "password-placeholder" : "jelszó", ++ "path-placeholder" : "út", ++ "port-placeholder" : "port (alapértelmezett: {default})", ++ "switch-to-advanced" : "Válts haladó módra", ++ "switch-to-simple" : "Válts egyszerű módra", ++ "title" : "Dedikált Szerverek", ++ "username-placeholder" : "felhasználónév", ++ "validating" : "Érvényesítés...\n" ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Nem sikerült listázni a könyvtárat\n", ++ "failed-valid-check" : "Nem sikerült a könyvtár listázása." ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Gyorsítótár helye\n\n\n\n\n\n\n", ++ "reset" : "Alapértelmezettre állítás", ++ "save" : "Mentés és tovább", ++ "title" : "Gyorsítótár letöltésének helye változtatása" ++ }, ++ "change-cache-location" : "Gyorsítótár helyének változtatása", ++ "copy-mod-list" : "Mod lista másolása", ++ "debug" : "Hibakeresés", ++ "generate-debug-info" : "Hibakeresés indítása", ++ "go-online-offline" : "Menj {offline, select, true {online} other {offline}}", ++ "language" : "Nyelv", ++ "launch-button" : "Indító gomb", ++ "launch-button.button" : "Gomb", ++ "launch-button.cat" : "Nyan", ++ "launch-button.normal" : "Normális", ++ "proxy" : { ++ "proxy" : "Proxy", ++ "remove" : "Proxy eltávolítása", ++ "save" : "Mentés és újraindítás", ++ "title" : "Proxy beállítása" ++ }, ++ "queue" : "Várakozó", ++ "queue.start-immediately" : "Indítás rögtön", ++ "queue.start-manually" : "Manuális indítás", ++ "save-window-position" : null, ++ "secret-settings" : "Rejtett beállítások", ++ "set-proxy" : "Proxy beállítása", ++ "settings" : "Beállítások", ++ "smm-debug-logging" : "SMM hibakereső bejelentkezés", ++ "start-view" : "Indító nézet", ++ "start-view.compact" : "Kompakt", ++ "start-view.expanded" : "Kiterjesztve", ++ "title" : "Mod Kezelő Beállításai", ++ "update-check" : "Frissítés ellenőrzés", ++ "update-check.ask" : "Kérdezés amikor megtalálva", ++ "update-check.on-exit" : "Amikor kilépés", ++ "update-check.on-start" : "Amikor bekapcsolva" ++ }, ++ "smm-update" : { ++ "downloading" : "Letöltés a háttérben", ++ "downloading-stats" : "Frissítés letöltése folyamatban: {current}/{total}, {speed}/s, Becsölt idő {eta}", ++ "title" : "{version} - SMM Frissítés elérhető" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Fejlesztett teljesítmény", ++ "performance.description" : "Hatékonyság megőrzése!\n", ++ "platform_support" : "Natív Linux Heroic, Steam Snap, Mac támogatás\n", ++ "platform_support.description" : "Szerezzen be egy buildet a GitHub-kiadásokból, ha még nem tette meg!\n", ++ "profile_format" : "Új profil formátum", ++ "profile_format.description" : "Az SMM2 profilok nem kompatibilisek az SMM3-mal! Meglévő profiljait automatikusan áttelepítettük, de az SMM2-vel létrehozott profilokat nem importálhatja.\n", ++ "queue" : "Művelet sorban állás\n", ++ "queue.description" : "Állítson fel egyszerre több mod-letöltést/eltávolítást a sorba.\n", ++ "servers" : "Dedikált szerver kezelése", ++ "servers.description" : "Könnyeben kezeld a szervert, használj SFTP, FTP és SMB fálj kezelő programot!", ++ "translation" : "Fordítási támogatás\n", ++ "translation.description" : "Csatlakozz a Discordunkhoz ha le szeretnéd fordítani a nyelved a SMM-re", ++ "ui" : "Kezelő felület frissítése", ++ "ui.description" : "Friss festékréteg a Satisfactory 1.0 ünneplésére!\n" ++ }, ++ "intro" : "Rengeteg fejlesztést hajtottunk végre ezen a verzión. Íme néhány kiemelés:\n", ++ "open_guide" : "Nyissa meg az SMM3 dokumentációját\n", ++ "title" : "Üdvözöljük a Satisfactory Mod Manager 3-as verziójában!\n" ++ }, ++ "updates" : { ++ "changelog" : "Változási napló\n", ++ "check-for-updates" : "Ellenőrizd a frissítéseket", ++ "checking-for-updates" : "Frissítések ellenörzése", ++ "hide-ignored" : "Elrejtés figyelmen kívül hagyva\n", ++ "ignore" : "Figyelmen kívül hagyva\n", ++ "mod-update-available" : "{updates, plural, one {{updates} mod frissítés elérhető} other {{updates} modok frissítése elérhető}}", ++ "no-updates" : "Nincs elérhető mod/SMM frissítés", ++ "show-ignored" : "Mutasd a figyelmen kívül hagyottat", ++ "smm-update-available" : "SMM Frissítés elérhető!", ++ "title" : "Frissítések", ++ "unignore" : "Hagyja figyelmen kívül", ++ "update-all" : "Összes frissítése", ++ "update-selected" : "Kiválasztott frissítése" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/index.ts b/frontend/src/lib/generated/i18n/index.ts +new file mode 100644 +index 0000000..0685334 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/index.ts +@@ -0,0 +1,36 @@ ++/* eslint-disable */ ++import de from './de.json'; ++import en from './en.json'; ++import es from './es.json'; ++import fr from './fr.json'; ++import hu from './hu.json'; ++import it from './it.json'; ++import ja from './ja.json'; ++import ko from './ko.json'; ++import lt from './lt.json'; ++import mt from './mt.json'; ++import pl from './pl.json'; ++import pt_BR from './pt-BR.json'; ++import ru from './ru.json'; ++import tr from './tr.json'; ++import zh_Hans from './zh-Hans.json'; ++import zh_Hant from './zh-Hant.json'; ++ ++export const i18n = { ++ "de": de, ++ "en": en, ++ "es": es, ++ "fr": fr, ++ "hu": hu, ++ "it": it, ++ "ja": ja, ++ "ko": ko, ++ "lt": lt, ++ "mt": mt, ++ "pl": pl, ++ "pt-BR": pt_BR, ++ "ru": ru, ++ "tr": tr, ++ "zh-Hans": zh_Hans, ++ "zh-Hant": zh_Hant, ++}; +diff --git a/frontend/src/lib/generated/i18n/it.json b/frontend/src/lib/generated/i18n/it.json +new file mode 100644 +index 0000000..5245bd1 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/it.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Vai Offline", ++ "go-online" : "Vai Online", ++ "healthcheck" : "Impossibile raggiungere ficsit.app. Controlla la tua connessione a internet o considera di usare la modalità offline. (Impostazioni Mod Manager > Vai Offline) ", ++ "offline" : "Attualmente sei offline. Alcune funzionalità potrebbero non essere disponibili. (Per riconnetterti, vai su Impostazioni Mod Manager > Vai Online)" ++ }, ++ "common" : { ++ "add" : "Aggiungi", ++ "cancel" : "Annulla", ++ "close" : "Chiudi", ++ "delete" : "Elimina", ++ "import" : "Importa", ++ "loading" : "Caricamento...", ++ "rename" : "Rinomina" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "Si è verificato un errore durante la generazione del file di debug. Controlla manualmente i file di log del Satisfactory Mod Manager per ulteriori informazioni e segnala il problema su Discord. Usa il pulsante qui sotto per aprire la documentazione e scoprire come procedere.", ++ "generate_debug_info" : "Genera informazioni di debug", ++ "help" : "\nSembra sbagliato? Clicca il pulsante qui sotto e invia il file zip generato sul <1>Discord per il modding nel canale #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {{invalidInstalls} installazione di Satisfactory non valida} other {{invalidInstalls} installazioni di Satisfactory non valide} }", ++ "no_installs" : "Nessuna installazione di Satisfactory trovata", ++ "open_log_docs" : "Apri la Documentazione per il Logging", ++ "open_modding_discord" : "Apri il server Discord per il Modding", ++ "open_modding_discord.must_generate_debug_first" : "Devi prima generare le informazioni di debug", ++ "reporting_directions" : "\nSembra sbagliato? Clicca il pulsante qui sotto e invia il file zip generato sul Discord per il Modding nel canale #help-using-mods.", ++ "title" : "Qualcosa è andato storto" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Già installato", ++ "error-loading" : "Errore durante il caricamento dei dettagli della mod", ++ "in-queue" : "In coda", ++ "install" : "Installa", ++ "latest-version" : "Ultima versione", ++ "title" : "Installa mod", ++ "version" : "Versione {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Iniziamo!", ++ "change_later_hint" : "Cambia queste impostazioni in qualsiasi momento nel menu \"Impostazioni Mod Manager\"", ++ "intro" : "Seleziona le tue preferenze per iniziare.", ++ "open_welcome_guide" : "Apri la Guida di Benvenuto", ++ "option" : { ++ "language" : { ++ "title" : "Usa questa lingua quando disponibile:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Aspetta per premere \"Applica\"", ++ "enabled" : "Applica le modifiche immediatamente", ++ "title" : "Quando aggiungo o rimuovo una mod, o cambio profilo..." ++ } ++ }, ++ "title" : "Benvenuto sul Satisfactory Mod Manager!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Applica", ++ "apply-queued" : "Applica {queued, plural, one {una modifica} other {# modifiche}}", ++ "are-you-sure-warning" : "Sei sicuro di voler avviare?", ++ "cant-launch" : "SMM non può avviare questa installazione", ++ "cant-launch-tooltip" : "Il Mod Manager non è in grado di avviare questo tipo di installazione, ma gestirà comunque i file dei mod per te. Avvia Satisfactory utilizzando il tuo launcher di gioco abituale.", ++ "changes-queued" : "Le modifiche non sono state ancora applicate ai file delle mod. Clicca il pulsante sopra per applicare le modifiche che hai messo in coda.\n\n(Hai impostato la modalità coda in \"Avvia manualmente\")", ++ "game-running" : "Il launcher sta rilevando che il gioco è già in esecuzione (o è ancora in fase di chiusura).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {mod incompatibile che non verrà caricata o causerà il crash del gioco} other {mod incompatibili che non verranno caricate o causeranno il crash del gioco}}", ++ "launch-in-progress" : "Avvio in corso...", ++ "operation-in-progress" : "Un'operazione è già in corso.", ++ "play" : "Avvia Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Una mod {versionPossiblyCompatible, plural, one {è probabilmente incompatibile} other {sono probabilmente incompatibili}} con il tuo gioco} other {# mod {versionPossiblyCompatible, plural, one {è probabilmente incompatibile} other {sono probabilmente incompatibili}} con il tuo gioco}}", ++ "profile-change-queued" : "Le modifiche devono essere ancora confermate. Premi il pulsante qui sotto per applicarle al profilo.", ++ "ready" : "Sei pronto a rombare!\n\nNota: il Mod Manager ha finito di installare i file delle mod per te. Puoi lanciare il gioco usando il tuo solito launcher, le mod verranno comunque caricate.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {Una mod} other {# Alcune mods}} {reportedIncompatible, plural, one {è stata} other {sono state}}riportate NON FUNZIONANTI in questa versione di gioco. Leggi {versionIncompatible, plural, one {la descrizione della mod} other {le descrizioni delle mods'}} o le note di compatibilità per maggiori informazioni", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {Una mod} other {# Alcune mods}} {reportedPossiblyCompatible, plural, one {è stata} other {sono state}} riportate DANNEGGIATE in questa versione di gioco. Leggi {versionIncompatible, plural, one {la descrizione della mod} other {le descrizioni delle mods'}} o le note di compatibilità per maggiori informazioni", ++ "you-have-warning-mods" : "Hai:" ++ }, ++ "left-bar" : { ++ "export" : "Esporta", ++ "ficsit-app" : "ficsit.app (Repository delle Mod)", ++ "game-version" : "Seleziona Installazione del Gioco", ++ "help" : "Aiuto", ++ "install-invalid" : "Invalido", ++ "install-invalid-tooltip" : "Stato: SMM non può gestire questa installazione", ++ "install-loading" : "Caricamento...", ++ "install-loading-tooltip" : "Status: Caricamento...", ++ "install-unknown" : "Sconosciuto", ++ "install-unknown-tooltip" : "Status: Non è possibile ottenere informazioni su questa installazione", ++ "links" : "Link", ++ "manage-servers" : "Gestisci Server", ++ "mods-off" : "Mod off", ++ "mods-on" : "Mod on", ++ "other" : "Altro", ++ "profile" : "Profilo", ++ "queue-blocking-switching-tooltip" : "{number, plural, one {Hai {number} azione in coda. Applica o annulla {number, plural, one {l'azione} other {le azioni}} prima di cambiare installazione o profilo.} other {Hai {number} azioni in coda. Applica o annulla {number, plural, one {l'azione} other {le azioni}} prima di cambiare installazione o profilo.}}", ++ "satisfactory-modding-discord" : "Satisfactory Modding Discord", ++ "smm-github" : "SMM GitHub", ++ "updates" : "Aggiornamenti" ++ }, ++ "mod-changelog" : { ++ "title" : "Changelog di <1>{mod}" ++ }, ++ "mod-details" : { ++ "change-version" : "Cambia versione", ++ "change-version-any" : "Qualsiasi", ++ "change-version-or-newer" : "o più recente", ++ "changelogs" : "Modifiche", ++ "compatibility" : "Compatibilità", ++ "compatibility-branch" : "Questa mod è stata segnalata come {state} su {branch}", ++ "compatibility-unknown" : "Sconosciuto", ++ "compatibility-unknown-tooltip" : "Non sono ancora state riportate informazioni sulla compatibilità per questa mod. Provala e contattaci su Discord affinché possa essere aggiornata!", ++ "contributors" : "Autori <1>({authors})", ++ "created" : "Creata", ++ "downloads" : "Download totali", ++ "installed-version" : "Versione installata", ++ "latest-version" : "Ultima versione", ++ "mod-author" : "Una mod di:", ++ "offline-mode" : "La modalità offline è attiva. Changelog e descrizioni non sono disponibili.", ++ "size" : "Dimensione", ++ "updated" : "Aggiornata", ++ "view-on-ficsit-app" : "Vedi su ficsit.app", ++ "views" : "Visualizzazioni" ++ }, ++ "mod-list-item" : { ++ "by-author" : "di", ++ "compatibility-note" : "Questa mod è stata segnalata come {state} su questa versione del gioco.", ++ "compatibility-note-none" : "(Nessuna specificata)", ++ "compatibility-warning" : "Sono stati segnalati problemi con questa mod, ma puoi provare a installarla comunque. Dettagli:", ++ "dependency" : "Questa mod è installata come dipendenza di un'altra mod. Non può essere installata o rimossa separatamente.", ++ "disable" : "Questa mod è Abilitata su questo profilo. Clicca per Disabilitarla, il che impedirà il suo caricamento all'avvio del gioco, ma rimarrà comunque parte di questo profilo.", ++ "disable-queued" : "Questa mod è in coda per essere disabilitata. Clicca per annullare l'operazione.", ++ "disabled-tooltip" : "Questa mod è disabilitata. Clicca sull'icona di pausa per abilitarla.", ++ "enable" : "Clicca per abilitare questa mod.", ++ "enable-queued" : "Questa mod è in coda per essere abilitata. Clicca per annullare l'operazione.", ++ "favorite" : "Clicca per aggiungere questa mod ai Preferiti. Avere una mod tra i Preferiti non è legato al fatto che sia installata o meno: è un modo per tenerne traccia per dopo, indipendentemente dal profilo selezionato.", ++ "hidden" : "Questa mod è stata nascosta dall'autore.", ++ "install" : "Clicca per installare questa mod.", ++ "no-tags" : "(nessuno disponibile)", ++ "not-installable" : "Non puoi installare questa mod. Motivo:", ++ "queued" : "Questa mod è già in coda per un'altra operazione.", ++ "queued-install" : "Questa mod è in coda per essere installata. Clicca per annullare l'operazione.", ++ "queued-uninstall" : "Questa mod è in coda per essere disinstallata. Clicca per annullare l'operazione.", ++ "unavailable" : "Questa mod non è più disponibile su ficsit.app. Potresti volerla rimuovere.", ++ "unfavorite" : "Clicca per rimuovere questa mod dai Preferiti.", ++ "uninstall" : "Questa mod è installata su questo profilo. Clicca per disinstallarla.", ++ "wait" : "Attendi il completamento dell' operazione in corso." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(Nessuna ulteriore nota fornita)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Tutte le mod", ++ "compatible" : "Compatibile", ++ "dependency" : "Dipendenza", ++ "disabled" : "Disabilitata", ++ "enabled" : "Abilitata", ++ "favorite" : "Preferita", ++ "installed" : "Installata", ++ "not-installed" : "Non installata", ++ "queued" : "In Coda" ++ }, ++ "order-by" : { ++ "downloads" : "Download", ++ "hotness" : "Di tendenza", ++ "last-updated" : "Ultimo aggiornamento", ++ "name" : "Nome", ++ "popularity" : "Popolarità", ++ "views" : "Visualizzazioni" ++ }, ++ "search" : "Cerca mod" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "Nessuna mod corrisponde ai tuoi filtri", ++ "no-mods-found" : "Nessuna mod trovata", ++ "show-all" : "Mostra tutte" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Nome profilo", ++ "profile-name-placeholder" : "Nome del Nuovo Profilo", ++ "title" : "Aggiungi profilo" ++ }, ++ "delete" : { ++ "profile-name" : "Nome profilo", ++ "title" : "Elimina profilo" ++ }, ++ "import" : { ++ "profile-file" : "File del profilo", ++ "profile-name" : "Nome profilo", ++ "profile-name-placeholder" : "Nome del Nuovo Profilo", ++ "profile-version-warning" : "Questo profilo è stato creato con una versione più recente del gioco. Potrebbe non essere compatibile con questa versione.", ++ "title" : "Importa profilo" ++ }, ++ "rename" : { ++ "new-profile" : "Nuovo nome del profilo", ++ "new-profile-placeholder" : "Nuovo Profilo", ++ "old-profile" : "Nome precedente del profilo", ++ "old-profile-placeholder" : "Vecchio Profilo", ++ "title" : "Rinomina profilo" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Aggiungi", ++ "advanced-note" : "Tieni presente che potresti dover eseguire l'escape di alcuni caratteri nel nome utente e nella password", ++ "advanced-path-placeholder" : "utente:password@dominio:porta/percorso", ++ "existing-servers" : { ++ "none-yet" : "Nessun server esistente, aggiungilo qui sotto!", ++ "title" : "Gestisci i Server" ++ }, ++ "failed-to-connect" : "Tentativo di connessione al server fallito, clicca per riprovare", ++ "get-help" : "Richiedi assistenza per connetterti al server", ++ "host-placeholder" : "host", ++ "invalid" : "SMM non può gestire questa installazione", ++ "loading" : "Caricamento...", ++ "local-path-placeholder" : "C:\\Percorso\\del\\Server", ++ "name-placeholder" : "Nome (predefinito: {default})", ++ "new-server" : { ++ "title" : "Aggiungi un nuovo Server" ++ }, ++ "password-placeholder" : "password", ++ "path-placeholder" : "path", ++ "port-placeholder" : "porta (default: {default})", ++ "switch-to-advanced" : "Passa alla modalità avanzata", ++ "switch-to-simple" : "Passa alla modalità semplice", ++ "title" : "Server Dedicati", ++ "username-placeholder" : "username", ++ "validating" : "Validazione..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Impossibile trovare la cartella", ++ "failed-valid-check" : "Impossibile verificare se il percorso selezionato è un server valido" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Posizione della cache", ++ "reset" : "Reimposta predefinito", ++ "save" : "Salva e sposta", ++ "title" : "Cambia posizione di download della cache" ++ }, ++ "change-cache-location" : "Cambia posizione della cache", ++ "copy-mod-list" : "Copia lista delle mod", ++ "debug" : "Debug", ++ "generate-debug-info" : "Genera informazioni di debug", ++ "go-online-offline" : "Vai {offline, select, true {online} other {offline}}\n", ++ "language" : "Lingua", ++ "launch-button" : "Pulsante di avvio", ++ "launch-button.button" : "Pulsante", ++ "launch-button.cat" : "Nyan", ++ "launch-button.normal" : "Normale", ++ "proxy" : { ++ "proxy" : "Proxy", ++ "remove" : "Rimuovi proxy", ++ "save" : "Salva e riavvia", ++ "title" : "Imposta proxy" ++ }, ++ "queue" : "Coda", ++ "queue.start-immediately" : "Esegui immediatamente", ++ "queue.start-manually" : "Esegui manualmente", ++ "save-window-position" : "Salva la posizione della finestra", ++ "secret-settings" : "Impostazioni segrete", ++ "set-proxy" : "Imposta proxy", ++ "settings" : "Impostazioni", ++ "smm-debug-logging" : "SMM debug logging", ++ "start-view" : "Vista all'avvio", ++ "start-view.compact" : "Compatto", ++ "start-view.expanded" : "Espanso", ++ "title" : "Impostazioni Mod Manager", ++ "update-check" : "Check degli aggiornamenti", ++ "update-check.ask" : "Chiedi quando trovati", ++ "update-check.on-exit" : "All'uscita", ++ "update-check.on-start" : "All'avvio" ++ }, ++ "smm-update" : { ++ "downloading" : "Scaricamento in background", ++ "downloading-stats" : "Scaricamento della nuova versione: {current} / {total}, {speed}/s, Rimanente {eta}", ++ "title" : "Aggiornamento di SMM disponibile" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Prestazioni migliorate", ++ "performance.description" : "Sempre efficente!", ++ "platform_support" : "Compatibile con Linux Heroic, Steam Snap e Mac", ++ "platform_support.description" : "Scarica il programma da GitHub se ancora non l'hai fatto!", ++ "profile_format" : "Nuovo formato del profilo", ++ "profile_format.description" : "I profili di SMM2 non sono compatibili con SMM3! I tuoi profili esistenti sono stati migrati automaticamente, ma non puoi importare alcun profilo creato con SMM2.", ++ "queue" : "Coda delle azioni", ++ "queue.description" : "Metti in coda più download/disinstallazioni di mod contemporaneamente.", ++ "servers" : "Gestione dei server dedicati", ++ "servers.description" : "Gestisci facilmente i server tramite filesystem, SFTP, FTP e SMB!", ++ "translation" : "Supporto traduzioni", ++ "translation.description" : "Unisciti al nostro Discord per tradurre SMM nella tua lingua!", ++ "ui" : "Nuova interfaccia utente", ++ "ui.description" : "Nuovo design per celebrare Satisfactory 1.0!" ++ }, ++ "intro" : "Abbiamo fatto un sacco di miglioramenti in questa versione. Ecco alcuni dei piu importanti:", ++ "open_guide" : "Apri la Documentazione di SMM3", ++ "title" : "Benvenuto su Satisfactory Mod Manager versione 3!" ++ }, ++ "updates" : { ++ "changelog" : "Changelog", ++ "check-for-updates" : "Controlla gli aggiornamenti", ++ "checking-for-updates" : "Controllo gli aggiornamenti...", ++ "hide-ignored" : "Nascondi ignorati", ++ "ignore" : "Ignora", ++ "mod-update-available" : "{updates, plural, one {{updates} aggiornamento disponibile} other {{updates} aggiornamenti disponibili}}", ++ "no-updates" : "Nessun aggiornamento di mod/SMM", ++ "show-ignored" : "Mostra ignorati", ++ "smm-update-available" : "Aggiornamento di SMM disponibile", ++ "title" : "Aggiornamenti", ++ "unignore" : "Mostra", ++ "update-all" : "Aggiorna Tutte", ++ "update-selected" : "Aggiorna Selezionate" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/ja.json b/frontend/src/lib/generated/i18n/ja.json +new file mode 100644 +index 0000000..36a0d02 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/ja.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "オフラインモードにする", ++ "go-online" : "オンラインモードにする", ++ "healthcheck" : "ficsit.appに接続できませんでした。インターネットへの接続状況を確認するか、オフラインモードの使用を検討してください。(Modマネージャー設定 > オフラインモードにする)", ++ "offline" : "現在オフラインモードです。幾つかの機能が使用できないかもしれません。(再接続するには Modマネージャー設定 > オンラインモードにする を選択してください)" ++ }, ++ "common" : { ++ "add" : "追加", ++ "cancel" : "キャンセル", ++ "close" : "閉じる", ++ "delete" : "削除", ++ "import" : "取り込み", ++ "loading" : "ロード中…", ++ "rename" : "名称変更" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "デバッグファイルを生成中にエラーが発生しました。追加の情報を見るには Satisfactory Mod マネージャーのログを確認し、Discordにて不具合をお知らせください(会話は英語を使用すること)。不具合報告のやり方を確認するには、下部にあるボタンを押してドキュメントを開いてください。", ++ "generate_debug_info" : "Debug info (デバッグ情報)を生成する", ++ "help" : "何か変ですか? 下部のボタンを押して生成されたZipファイルを <1>modding discord の #help-using-mods チャンネルに送信してください。(会話は英語を使用すること)", ++ "invalid_installs" : "{invalidInstalls, plural, other {{invalidInstalls}つの無効なSatisfactoryのインストールを発見しました。}}", ++ "no_installs" : "Satisfactory (ゲーム本体)を発見できませんでした", ++ "open_log_docs" : "ログについてのドキュメントを開く", ++ "open_modding_discord" : "Modding Discordを開く", ++ "open_modding_discord.must_generate_debug_first" : "最初にデバッグ情報を生成してください。", ++ "reporting_directions" : "何か変ですか? 下部のボタンを押してログを収集し、生成されたZipファイルを modding Discord の #help-using-mods チャンネルに送信してください。(会話は英語を使用すること)", ++ "title" : "不具合が発生しました。" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "インストール済み", ++ "error-loading" : "Mod 詳細情報の取得に失敗", ++ "in-queue" : "キュー待ち", ++ "install" : "インストール", ++ "latest-version" : "最新バージョン", ++ "title" : "Mod をインストールする", ++ "version" : "バージョン {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "始める!", ++ "change_later_hint" : "これらの設定はいつでも \"Mod マネージャー設定\" から変更できます。", ++ "intro" : "使い始める前にあなたの好みを選択してください。", ++ "open_welcome_guide" : "\"初めに\"のガイドを表示する", ++ "option" : { ++ "language" : { ++ "title" : "使用する言語:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "”適用”を押すまで待つ", ++ "enabled" : "すぐに変更を適用する", ++ "title" : "Mod を追加、削除又はプロファイルを変更したときに…" ++ } ++ }, ++ "title" : "Satisfactory Mod マネージャーへようこそ!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "{profile}に適用する", ++ "apply-queued" : "{queued, plural, one {# つ} other {# つ}}の変更を適用する", ++ "are-you-sure-warning" : "本当に実行しますか?", ++ "cant-launch" : "SMMはこのインストールでは実行できません。", ++ "cant-launch-tooltip" : "Mod マネージャーはこのゲームのインストール方法に対応しておりません。Modは管理できますが、Satisfacotryを実行するにはあなたの使用しているランチャーをお使いください。", ++ "changes-queued" : "変更はまだ適用されていません。下部のボタンを押して変更を適用してください。(現在、キューが”手動”になっています)", ++ "game-running" : "ゲームランチャーはまだゲームが実行中と判断しているようです。(またはゲーム閉じている最中のようです)", ++ "incompatible-mods" : "{versionIncompatible, plural, other {読み込まれない又はクラッシュする可能性のある{versionIncompatible}つの互換性のないModが含まれています}}", ++ "launch-in-progress" : "ゲームを実行中…", ++ "operation-in-progress" : "処理中…", ++ "play" : "Satisfactory を実行する", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, other {#つのModがゲームと互換性の無い可能性があります。}}", ++ "profile-change-queued" : "変更はまだ適用されていません。下部のボタンを押してプロファイルに変更を適用してください。(現在、キューが”手動”になっています)", ++ "ready" : "準備ができました!\n\nメモ: ModマネージャーはModをインストールし終えました。ゲームをゲームランチャーを用いて起動してもModは読み込まれます。", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {# つ} other {# つ}} のModが現在のゲームのバージョンに対して”故障中”と報告されています。Modページの詳細情報か互換情報をご確認ください。", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {# つ} other {# つ}}のModが現在のゲームのバージョンに対して”一部故障中”と報告されています。Modページの詳細情報か互換情報をご確認ください。", ++ "you-have-warning-mods" : " " ++ }, ++ "left-bar" : { ++ "export" : "書き出し", ++ "ficsit-app" : "ficsit.app (Mod 保管所)", ++ "game-version" : "ゲームのインストール方法の選択", ++ "help" : "ヘルプ", ++ "install-invalid" : "無効", ++ "install-invalid-tooltip" : "状況: このインストール方法ではSMMは管理できません", ++ "install-loading" : "ロード中…", ++ "install-loading-tooltip" : "状況: ロード中…", ++ "install-unknown" : "不明", ++ "install-unknown-tooltip" : "状況: このインストール方法についての情報が取得できませんでした", ++ "links" : "リンク", ++ "manage-servers" : "サーバー管理", ++ "mods-off" : "Mod オフ", ++ "mods-on" : "Mod オン", ++ "other" : "その他", ++ "profile" : "プロファイル", ++ "queue-blocking-switching-tooltip" : "{number, plural, other {現在{number}つの処理が待機中です。プロファイルを変更する又はインストール方法を変更する前に、適用するかキャンセルしてください。}}", ++ "satisfactory-modding-discord" : "Satisfactory Modding Discord", ++ "smm-github" : "SMM GitHub", ++ "updates" : "アップデート" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod} 変更履歴" ++ }, ++ "mod-details" : { ++ "change-version" : "バージョンを変更", ++ "change-version-any" : "どれでも", ++ "change-version-or-newer" : "またはこれよりも最新", ++ "changelogs" : "変更履歴", ++ "compatibility" : "互換性", ++ "compatibility-branch" : "このModは{branch}ブランチで{state}と報告されています。", ++ "compatibility-unknown" : "不明", ++ "compatibility-unknown-tooltip" : "このModには互換情報が登録されていません。このModを試してから結果をDiscordにて報告して頂けると幸いです。", ++ "contributors" : "貢献者 <1>{authors}", ++ "created" : "作成日", ++ "downloads" : "全ダウンロード数", ++ "installed-version" : "インストール中のバージョン", ++ "latest-version" : "最新バージョン", ++ "mod-author" : "製作者:", ++ "offline-mode" : "現在オフラインモードです。変更履歴と詳細情報は利用できません。", ++ "size" : "容量", ++ "updated" : "最終更新日", ++ "view-on-ficsit-app" : "ficsit.app で閲覧する", ++ "views" : "閲覧数" ++ }, ++ "mod-list-item" : { ++ "by-author" : "製作者:", ++ "compatibility-note" : "このModは今のゲームバージョンに対して{state}と報告されています。", ++ "compatibility-note-none" : "(未指定)", ++ "compatibility-warning" : "このModは幾つかの問題を抱えているようですが、インストールすることはできます。詳細情報:", ++ "dependency" : "このModは他のModで必須とされています。単体でのインストールと削除はできません。", ++ "disable" : "このModはこのプロファイル内で有効化されています。ここを押して無効化します。無効化されたModはゲームに読み込まれませんがプロファイル内には残ります。", ++ "disable-queued" : "このModは無効化の適用待ちをしています。ここを押して無効化をキャンセルします。", ++ "disabled-tooltip" : "このModは無効化状態です。このポーズアイコンを押して有効化します。", ++ "enable" : "ここを押して有効化する", ++ "enable-queued" : "このModは有効化の適用待ちをしています。ここを押して有効化をキャンセルします。", ++ "favorite" : "ここを押してこのModをお気に入りに登録します。インストールに直接関係はありませんが、後にプロファイルを変更した際にこのModを探しやすくなります。", ++ "hidden" : "このModは製作者によって隠されています。", ++ "install" : "ここを押してこのModをインストールします。", ++ "no-tags" : "(タグなし)", ++ "not-installable" : "このModはインストールできません。理由:", ++ "queued" : "このModはまだ他の処理を待っています。", ++ "queued-install" : "このModはインストール待ちをしています。ここを押してキャンセルします。", ++ "queued-uninstall" : "このModはアンインストール待ちをしています。ここを押してキャンセルします。", ++ "unavailable" : "このModはもうficsit.app上で利用できません。削除することをお勧めします。", ++ "unfavorite" : "ここを押してお気に入りから外します。", ++ "uninstall" : "このModは現在のプロファイルにインストール済みです。ここを押してアンインストールします。", ++ "wait" : "処理が完了するまでお待ちください。" ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(詳細情報無し)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "全Mod", ++ "compatible" : "互換性有り", ++ "dependency" : "必須", ++ "disabled" : "無効化状態", ++ "enabled" : "有効化状態", ++ "favorite" : "お気に入り", ++ "installed" : "インストール済み", ++ "not-installed" : "未インストール", ++ "queued" : "キュー入り" ++ }, ++ "order-by" : { ++ "downloads" : "ダウンロード数", ++ "hotness" : "話題", ++ "last-updated" : "最終更新日", ++ "name" : "名前", ++ "popularity" : "人気", ++ "views" : "閲覧数" ++ }, ++ "search" : "Modを探す…" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "検索に該当するModがありませんでした", ++ "no-mods-found" : "該当Mod無し", ++ "show-all" : "全て表示する" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "プロファイル名", ++ "profile-name-placeholder" : "新しいプロファイル名", ++ "title" : "プロファイルの追加" ++ }, ++ "delete" : { ++ "profile-name" : "プロファイル名", ++ "title" : "プロファイルの削除" ++ }, ++ "import" : { ++ "profile-file" : "プロファイルのファイル", ++ "profile-name" : "プロファイル名", ++ "profile-name-placeholder" : "新しいプロファイル名", ++ "profile-version-warning" : "このプロファイルは新しいゲームバージョン用に作成されているようです。現在のゲームのバージョンと互換性が無い可能性があります。", ++ "title" : "プロファイルの取り込み" ++ }, ++ "rename" : { ++ "new-profile" : "新しいプロファイル名", ++ "new-profile-placeholder" : "新しいプロファイル", ++ "old-profile" : "前のプロファイル名", ++ "old-profile-placeholder" : "前のプロファイル", ++ "title" : "プロファイル名の変更" ++ } ++ }, ++ "server-manager" : { ++ "add" : "追加", ++ "advanced-note" : "ユーザー名とパスワードを入力する際に一部の文字前にエスケープ文字を入れる必要があります。", ++ "advanced-path-placeholder" : "ユーザー名:パスワード@ホストIP:ポート番号/パス", ++ "existing-servers" : { ++ "none-yet" : "サーバーが存在していません。下記を記入して追加してください。", ++ "title" : "サーバーの管理" ++ }, ++ "failed-to-connect" : "サーバーに接続できませんでした。ここを押して再試行します。", ++ "get-help" : "サーバーへの接続方法についてのヘルプを見る", ++ "host-placeholder" : "ホスト", ++ "invalid" : "このインストール方法はSMMでは管理できません", ++ "loading" : "ロード中…", ++ "local-path-placeholder" : "C:\\Path\\To\\Server", ++ "name-placeholder" : "サーバー名(デフォルト: {default})", ++ "new-server" : { ++ "title" : "サーバーの新規追加" ++ }, ++ "password-placeholder" : "パスワード", ++ "path-placeholder" : "パス", ++ "port-placeholder" : "ポート番号(デフォルト: {default})", ++ "switch-to-advanced" : "上級者モードに切り替える", ++ "switch-to-simple" : "シンプルモードに切り替える", ++ "title" : "専用サーバー", ++ "username-placeholder" : "ユーザー名", ++ "validating" : "検証中…" ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "ディレクトリのリスト化に失敗", ++ "failed-valid-check" : "指定されたパスが有効なサーバーかどうかの検証に失敗" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "キャッシュフォルダー", ++ "reset" : "デフォルトに戻す", ++ "save" : "保存して移動する", ++ "title" : "ダウンロード時の一時ファイルの保存場所を変更する" ++ }, ++ "change-cache-location" : "一時ファイル保存場所の変更", ++ "copy-mod-list" : "Modリストのコピー", ++ "debug" : "デバッグ", ++ "generate-debug-info" : "デバッグ情報を生成する", ++ "go-online-offline" : "{offline, select, true {オンライン} other {オフライン}}モードにする", ++ "language" : "言語", ++ "launch-button" : "起動ボタン", ++ "launch-button.button" : "ボタン", ++ "launch-button.cat" : "ニャン", ++ "launch-button.normal" : "通常", ++ "proxy" : { ++ "proxy" : "プロキシ", ++ "remove" : "プロキシを削除する", ++ "save" : "保存して再スタート", ++ "title" : "プロキシを設定する" ++ }, ++ "queue" : "キュー", ++ "queue.start-immediately" : "すぐに適用", ++ "queue.start-manually" : "手動で適用", ++ "save-window-position" : "ウィンドウ位置を記憶する", ++ "secret-settings" : "隠し設定", ++ "set-proxy" : "プロキシを設定する", ++ "settings" : "設定", ++ "smm-debug-logging" : "SMMのデバッグをログに書き込む", ++ "start-view" : "ウィンドウの大きさ", ++ "start-view.compact" : "コンパクト", ++ "start-view.expanded" : "拡大", ++ "title" : "Modマネージャー設定", ++ "update-check" : "アップデートの確認", ++ "update-check.ask" : "発見時に確認を取る", ++ "update-check.on-exit" : "終了時", ++ "update-check.on-start" : "起動時" ++ }, ++ "smm-update" : { ++ "downloading" : "バックグラウンドでダウンロード中", ++ "downloading-stats" : "アップデートをダウンロード中: {current} / {total}, {speed}/秒, 残り時間: {eta}", ++ "title" : "SMMのアップデートが利用可能 - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "パフォーマンスの向上", ++ "performance.description" : "もっと効率良く働けるようになりました!", ++ "platform_support" : "Linux Heroic, Steam Snap, Mac のサポート", ++ "platform_support.description" : "Githubにてダウンロード可能です。まだの際は是非!", ++ "profile_format" : "新しいプロファイルの書式", ++ "profile_format.description" : "SMM2のプロファイルはSMM3では使えません!現在残っている過去のプロファイルは自動的に更新されますが、SMM2からのプロファイルは取り込むことはできません。", ++ "queue" : "処理のキュー", ++ "queue.description" : "一斉にModのダウンロードとアンインストール等ができるようになりました。", ++ "servers" : "専用サーバーの管理", ++ "servers.description" : "ファイルシステム(SFTP, FTP, SMB)を通して簡単にサーバーの管理ができるように!", ++ "translation" : "翻訳のサポート", ++ "translation.description" : "我々のDiscordに入ってSMMをあなたの言語に翻訳しましょう!", ++ "ui" : "UIの抜本的改善", ++ "ui.description" : "新しいUIでSatisfactory1.0をお祝いします!" ++ }, ++ "intro" : "SMM3では我々は沢山の改善を致しました。その幾つかをご紹介します:", ++ "open_guide" : "SMM3のドキュメントを開く", ++ "title" : "Satisfactory Mod マネージャー バージョン 3へようこそ!" ++ }, ++ "updates" : { ++ "changelog" : "変更履歴", ++ "check-for-updates" : "アップデートの確認", ++ "checking-for-updates" : "アップデートの確認中…", ++ "hide-ignored" : "無視したModを隠す", ++ "ignore" : "無視する", ++ "mod-update-available" : "{updates, plural, other {{updates}つのModのアップデートが利用可能}}", ++ "no-updates" : "現在、アップデートはありません", ++ "show-ignored" : "無視したModを表示する", ++ "smm-update-available" : "SMMのアップデートが利用可能", ++ "title" : "アップデート", ++ "unignore" : "無視しない", ++ "update-all" : "全てをアップデート", ++ "update-selected" : "選択したModをアップデート" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/ko.json b/frontend/src/lib/generated/i18n/ko.json +new file mode 100644 +index 0000000..2b1b7bd +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/ko.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "오프라인으로 변경", ++ "go-online" : "온라인으로 변경", ++ "healthcheck" : "ficsit.app에 연결할 수 없습니다. 인터넷 연결을 확인하거나 오프라인 모드 사용을 고려해 주십시오. (모드 관리자 설정 > 오프라인으로 변경)", ++ "offline" : "현재 오프라인 상태입니다. 일부 기능이 제한될 수 있습니다. (모드 관리자 설정 > 온라인으로 변경을 통해 재연결)" ++ }, ++ "common" : { ++ "add" : "추가", ++ "cancel" : "취소", ++ "close" : "닫기", ++ "delete" : "삭제", ++ "import" : "불러오기", ++ "loading" : "불러오는 중...", ++ "rename" : "이름 변경" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "디버그 파일 생성 중 오류가 발생했습니다. 추가 정보 확인을 위해 Satisfactory 모드 관리자 로그 파일을 수동으로 확인 후 디스코드에 보고해 주십시오. 아래 버튼을 눌러 지침서를 엽니다.", ++ "generate_debug_info" : "디버그 정보 생성", ++ "help" : "잘못된 정보가 있습니까? 아래 버튼을 눌러 생성된 압축 파일을 <1>모딩 디스코드의 #help-using-mods 채널에 보내주십시오.", ++ "invalid_installs" : "{invalidInstalls, plural, other {설치된 Satisfactory {invalidInstalls}개가 유효하지 않음}}", ++ "no_installs" : "Satisfactory가 설치되지 않음", ++ "open_log_docs" : "기록 문서 열기", ++ "open_modding_discord" : "모딩 디스코드 열기", ++ "open_modding_discord.must_generate_debug_first" : "디버그 정보를 먼저 생성해야 합니다", ++ "reporting_directions" : "잘못된 정보가 있습니까? 아래 버튼을 눌러 로그를 수집 후 생성된 압축 파일을 모딩 디스코드의 #help-using-mods 채널에 보내주십시오.", ++ "title" : "문제 발생" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "이미 설치됨", ++ "error-loading" : "모드 세부정보를 불러오던 중 오류 발생", ++ "in-queue" : "대기 중", ++ "install" : "설치", ++ "latest-version" : "최신 버전", ++ "title" : "모드 설치", ++ "version" : "버전 {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "시작하기!", ++ "change_later_hint" : "이러한 설정들은 \"모드 관리자 설정\" 메뉴에서 언제든지 변경할 수 있습니다.", ++ "intro" : "기본 설정을 선택하여 시작합니다.", ++ "open_welcome_guide" : "환영 지침서 열기", ++ "option" : { ++ "language" : { ++ "title" : "가능한 경우 다음 언어 사용:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "\"적용\"을 누를 때까지 기다리기", ++ "enabled" : "변경 사항 즉시 적용", ++ "title" : "모드를 제거 또는 추가하거나 프로필을 변경할 때..." ++ } ++ }, ++ "title" : "Satisfactory 모드 관리자에 오신 것을 환영합니다!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "{profile} 적용", ++ "apply-queued" : "변경사항 {queued}개 적용", ++ "are-you-sure-warning" : "정말 실행하시겠습니까?", ++ "cant-launch" : "이 설치에서는 SMM를 구동할 수 없음", ++ "cant-launch-tooltip" : "모드 관리자가 이 설치 유형을 실행할 순 없지만 여전히 관리하고 있습니다. 평소 사용하는 게임 런처를 사용해 Satisfactory를 실행하십시오.", ++ "changes-queued" : "모드 파일이 아직 변경되지 않았습니다. 버튼을 클릭하여 대기 중인 변경 사항을 적용하십시오.\n\n(현재 대기열 \"수동 시작\" 모드에 있음)", ++ "game-running" : "게임 런처가 이미 게임을 실행 또는 종료 중입니다.", ++ "incompatible-mods" : "{versionIncompatible, plural, other {불러올 수 없거나 게임을 충돌시키는 호환되지 않는 모드 {versionIncompatible}개}}", ++ "launch-in-progress" : "실행 중...", ++ "operation-in-progress" : "작업이 이미 실행 중입니다.", ++ "play" : "Satisfactory 실행", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, other {게임과의 비호환이 의심되는 모드 #개}}", ++ "profile-change-queued" : "모드 파일이 아직 변경되지 않았습니다. 버튼을 클릭하여 대기 중인 변경 사항을 적용하십시오.\n\n(현재 대기열 \"수동 시작\" 모드에 있음)", ++ "ready" : "발사 준비 완료!\n\n참고: 모드 관리자가 이미 모드 파일 설치를 마쳤습니다. 일반적인 게임 실행기를 사용하여 실행해도 모드는 계속 불러와질 것입니다.", ++ "reported-incompatible-mods" : "현재 게임 버전에서 {reportedIncompatible}개의 모드가 작동하지 않는다고 확인됐습니다. 자세한 내용은 모드의 설명이나 호환성 정보를 확인해 주십시오", ++ "reported-possibly-compatible-mods" : "현재 게임 버전에서 {reportedIncompatible}개의 모드가 손상됐다고 확인됐습니다. 자세한 내용은 모드의 설명이나 호환성 정보를 확인해 주십시오", ++ "you-have-warning-mods" : "소유 중:" ++ }, ++ "left-bar" : { ++ "export" : "내보내기", ++ "ficsit-app" : "ficsit.app (모드 저장소)", ++ "game-version" : "게임 버전", ++ "help" : "도움말", ++ "install-invalid" : "잘못됨", ++ "install-invalid-tooltip" : "상태: SMM가 해당 설치를 관리할 수 없음", ++ "install-loading" : "불러오는 중...", ++ "install-loading-tooltip" : "상태: 불러오는 중...", ++ "install-unknown" : "알 수 없음", ++ "install-unknown-tooltip" : "상태: 해당 설치에 대한 정보를 얻을 수 없음", ++ "links" : "링크", ++ "manage-servers" : "서버 관리", ++ "mods-off" : "모드 비활성화", ++ "mods-on" : "모드 활성화", ++ "other" : "그 외", ++ "profile" : "프로필", ++ "queue-blocking-switching-tooltip" : "{number, plural, other {{number}개의 변경 사항이 있습니다. 설치 또는 프로필을 변경하기 전에 변경 사항을 처리해 주십시오.}}", ++ "satisfactory-modding-discord" : "Satisfactory 모딩 디스코드", ++ "smm-github" : "SMM 깃허브", ++ "updates" : "업데이트" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod} 변경사항" ++ }, ++ "mod-details" : { ++ "change-version" : "버전 변경", ++ "change-version-any" : "모두", ++ "change-version-or-newer" : "이상", ++ "changelogs" : "변경사항", ++ "compatibility" : "호환성", ++ "compatibility-branch" : "이 모드는 {branch} 버전에서 {state} 상태로 확인되었습니다.", ++ "compatibility-unknown" : "알 수 없음", ++ "compatibility-unknown-tooltip" : "아직 이 모드에 대한 호환성 보고가 없습니다. 시도 후 디스코드를 통해 연락해 업데이트할 수 있게 기여해 주십시오!", ++ "contributors" : "기여자 <1>({authors})", ++ "created" : "생성일", ++ "downloads" : "총 다운로드", ++ "installed-version" : "설치된 버전", ++ "latest-version" : "최신 버전", ++ "mod-author" : "모드 제작:", ++ "offline-mode" : "오프라인 모드가 활성화 되었습니다. 변경사항과 설명에 접근할 수 없습니다.", ++ "size" : "크기", ++ "updated" : "업데이트됨", ++ "view-on-ficsit-app" : "ficsit.app에서 보기", ++ "views" : "조회수" ++ }, ++ "mod-list-item" : { ++ "by-author" : "by", ++ "compatibility-note" : "이 모드는 현재 게임 버전에서 {state} 상태로 확인되었습니다.", ++ "compatibility-note-none" : "(제공된 추가 참고 없음)", ++ "compatibility-warning" : "모드에 문제가 보고되었지만 설치할 순 있습니다. 세부정보:", ++ "dependency" : "이 모드는 다른 모드의 의존성으로 설치되어 있습니다. 독립적으로 설치되거나 제거될 수 없습니다.", ++ "disable" : "이 모드는 현재 프로필에서 활성화되어 있습니다. 클릭하여 비활성화하면 게임을 시작할 때 불러와지지 않지만 프로필에는 유지할 수 있습니다.", ++ "disable-queued" : "이 모드는 비활성화 대기열에 있습니다. 클릭하여 작업을 취소합니다.", ++ "disabled-tooltip" : "이 모드는 비활성화 되었습니다. 일시정지 아이콘을 눌러 활성화합니다.", ++ "enable" : "클릭하여 모드를 활성화합니다.", ++ "enable-queued" : "이 모드는 활성화 대기열에 있습니다. 클릭하여 작업을 취소합니다.", ++ "favorite" : "클릭하여 모드를 즐겨찾기에 추가합니다. 이 기능은 모드에 직접적으로 영향을 주지 않습니다", ++ "hidden" : "이 모드는 소유자에 의해 숨겨졌습니다.", ++ "install" : "클릭하여 모드를 설치합니다.", ++ "no-tags" : "(항목 없음)", ++ "not-installable" : "다음 이유로 모드를 설치할 수 없음:", ++ "queued" : "이 모드는 이미 대기열에 있습니다.", ++ "queued-install" : "이 모드는 설치 대기열에 있습니다. 클릭하여 작업을 취소합니다.", ++ "queued-uninstall" : "이 모드는 삭제 대기열에 있습니다. 클릭하여 작업을 취소합니다.", ++ "unavailable" : "이 모드는 더 이상 ficsit.app에서 사용할 수 없습니다. 원한다면 제거할 수 있습니다.", ++ "unfavorite" : "클릭하여 모드를 즐겨찾기에서 제거합니다.", ++ "uninstall" : "이 모드는 현재 프로필에 설치되어 있습니다. 클릭하여 모드를 제거합니다.", ++ "wait" : "현재 작업이 완료될 때까지 기다려 주십시오." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(추가 참고 사항 없음)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "모든 모드", ++ "compatible" : "호환됨", ++ "dependency" : "의존성", ++ "disabled" : "비활성화됨", ++ "enabled" : "활성화됨", ++ "favorite" : "즐겨찾기", ++ "installed" : "설치됨", ++ "not-installed" : "미설치됨", ++ "queued" : "예약됨" ++ }, ++ "order-by" : { ++ "downloads" : "다운로드 수", ++ "hotness" : "인기", ++ "last-updated" : "최근 업데이트", ++ "name" : "이름", ++ "popularity" : "인기도", ++ "views" : "조회수" ++ }, ++ "search" : "모드 검색" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "필터 결과에 맞는 모드 없음", ++ "no-mods-found" : "모드 없음", ++ "show-all" : "전부 보기" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "프로필 이름", ++ "profile-name-placeholder" : "새 프로필 이름", ++ "title" : "프로필 추가" ++ }, ++ "delete" : { ++ "profile-name" : "프로필 이름", ++ "title" : "프로필 삭제" ++ }, ++ "import" : { ++ "profile-file" : "프로필 파일", ++ "profile-name" : "프로필 이름", ++ "profile-name-placeholder" : "새 프로필 이름", ++ "profile-version-warning" : "이 프로필은 상위 버전의 게임에서 생성되었습니다. 현재 버전에서 호환되지 않을 수 있습니다.", ++ "title" : "프로필 불러오기" ++ }, ++ "rename" : { ++ "new-profile" : "새 프로필 이름", ++ "new-profile-placeholder" : "새 프로필", ++ "old-profile" : "이전 프로필 이름", ++ "old-profile-placeholder" : "이전 프로필", ++ "title" : "프로필 이름 바꾸기" ++ } ++ }, ++ "server-manager" : { ++ "add" : "추가", ++ "advanced-note" : "참고: 사용자 이름과 비밀번호에는 특정 문자를 사용할 수 없습니다", ++ "advanced-path-placeholder" : "user:pass@host:port/path", ++ "existing-servers" : { ++ "none-yet" : "아무 서버나 하나 추가해 보는 건 어떻습니까?", ++ "title" : "추가한 서버 관리" ++ }, ++ "failed-to-connect" : "서버와 연결할 수 없습니다. 클릭하여 재시도합니다", ++ "get-help" : "서버 연결 도움 받기", ++ "host-placeholder" : "호스트", ++ "invalid" : "SMM이 해당 설치를 관리할 수 없음", ++ "loading" : "불러오는 중...", ++ "local-path-placeholder" : "C:", ++ "name-placeholder" : "이름 (기본: {default})", ++ "new-server" : { ++ "title" : "새 서버 추가" ++ }, ++ "password-placeholder" : "비밀번호", ++ "path-placeholder" : "경로", ++ "port-placeholder" : "포트 (기본: {default})", ++ "switch-to-advanced" : "고급 모드로 변경", ++ "switch-to-simple" : "간단 모드로 변경", ++ "title" : "전용 서버", ++ "username-placeholder" : "사용자 이름", ++ "validating" : "유효성 확인 중..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "경로를 나열할 수 없음", ++ "failed-valid-check" : "선택된 경로가 유효한 서버인지 확인할 수 없음" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "캐시 위치", ++ "reset" : "기본으로 재설정", ++ "save" : "저장 후 이동", ++ "title" : "다운로드 캐시 위치 변경" ++ }, ++ "change-cache-location" : "캐시 위치 변경", ++ "copy-mod-list" : "모드 목록 복사", ++ "debug" : "디버그", ++ "generate-debug-info" : "디버그 정보 생성", ++ "go-online-offline" : "{offline, select, true {온} other {오프}}라인으로 전환", ++ "language" : "언어", ++ "launch-button" : "실행 버튼", ++ "launch-button.button" : "버튼", ++ "launch-button.cat" : "냥", ++ "launch-button.normal" : "일반", ++ "proxy" : { ++ "proxy" : "프록시", ++ "remove" : "프록시 제거", ++ "save" : "저장 후 재시작", ++ "title" : "프록시 설정" ++ }, ++ "queue" : "대기열", ++ "queue.start-immediately" : "즉시 시작", ++ "queue.start-manually" : "수동 시작", ++ "save-window-position" : "창 위치 기억", ++ "secret-settings" : "비밀 설정", ++ "set-proxy" : "프록시 설정", ++ "settings" : "설정", ++ "smm-debug-logging" : "SMM 디버그 기록", ++ "start-view" : "시작 보기", ++ "start-view.compact" : "요약", ++ "start-view.expanded" : "확장", ++ "title" : "모드 관리자 설정", ++ "update-check" : "업데이트 확인", ++ "update-check.ask" : "찾으면 알림", ++ "update-check.on-exit" : "종료할 때", ++ "update-check.on-start" : "시작할 때" ++ }, ++ "smm-update" : { ++ "downloading" : "백그라운드에서 다운로드 중", ++ "downloading-stats" : "업데이트 다운로드 중: {current} / {total}, {speed}/초, {eta} 남음", ++ "title" : "SMM 업데이트 사용 가능 - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "개선된 성능", ++ "performance.description" : "항상 효율적으로 지내십시오!", ++ "platform_support" : "기본 Linux Heroic, Steam Snap, Mac 지원됨", ++ "platform_support.description" : "아직 받지 않았다면 깃허브에서 빌드를 받으십시오!", ++ "profile_format" : "새 프로필 형식", ++ "profile_format.description" : "SMM2 프로필은 SMM3과 호환되지 않습니다! 이미 존재하는 프로필은 자동으로 마이그레이션 되지만 SMM2에서 생성된 프로필을 불러올 순 없습니다.", ++ "queue" : "지시 추가 중", ++ "queue.description" : "한 번에 여러 모드의 다운로드/제거를 예약하십시오.", ++ "servers" : "전용 서버 관리", ++ "servers.description" : "filesystem, SFTP, FTP, SMB를 사용하여 서버를 쉽게 관리하십시오!", ++ "translation" : "번역 지원", ++ "translation.description" : "디스코드에 참여하여 SMM를 자신의 언어로 번역하십시오!", ++ "ui" : "사용자 인터페이스 새로고침", ++ "ui.description" : "Satisfactory 1.0을 기념하기 위한 새로운 페인트 코팅!" ++ }, ++ "intro" : "이 버전에서 많은 것을 개선했습니다. 주목할 만한 요소는:", ++ "open_guide" : "SMM3 문서 열기", ++ "title" : "Satisfactory 모드 관리자 버전 3에 오신 것을 환영합니다!" ++ }, ++ "updates" : { ++ "changelog" : "변경사항", ++ "check-for-updates" : "업데이트 확인", ++ "checking-for-updates" : "업데이트 확인 중...", ++ "hide-ignored" : "무시 항목 숨기기", ++ "ignore" : "무시", ++ "mod-update-available" : "{updates, plural, other {모드 업데이트 {updates}개 사용 가능}}", ++ "no-updates" : "모드/SMM 업데이트 없음", ++ "show-ignored" : "무시 항목 보이기", ++ "smm-update-available" : "SMM 업데이트 사용 가능", ++ "title" : "업데이트", ++ "unignore" : "무시 해제", ++ "update-all" : "전부 업데이트", ++ "update-selected" : "선택 항목 업데이트" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/lt.json b/frontend/src/lib/generated/i18n/lt.json +new file mode 100644 +index 0000000..58f9854 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/lt.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Atsijunkite", ++ "go-online" : "Prisijunkite", ++ "healthcheck" : "Nepavyko pasiekti ficsit.app. Patikrinkite interneto ryšį arba apsvarstykite galimybę naudoti neprisijungus režimą. (Modų Tvarkyklės Nustatymai > Atsijungti)", ++ "offline" : "Šiuo metu esate neprisijungę. Kai kurios funkcijos gali būti nepasiekiamos. (Kad prisijungti, naudokite Modų Tvarkyklės Nustatymai > Prisijungti)" ++ }, ++ "common" : { ++ "add" : "Pridėti", ++ "cancel" : "Atšaukti", ++ "close" : "Uždaryti", ++ "delete" : "Ištrinti", ++ "import" : "Importuoti", ++ "loading" : "Kraunama...", ++ "rename" : "Pervadinti" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "Įvyko klaida generuojant derinimo failą. Prašome rankiniu būdu patikrinti savo Satisfactory Modų Tvarkyklės žurnalo failus, kad gautumėte daugiau informacijos, ir pranešti apie tai Discordo platformoje. Naudokite žemiau esantį mygtuką, kad atidarytumėte dokumentaciją ir sužinotumėte, kaip tai padaryti.", ++ "generate_debug_info" : "Generuokite derinimo informaciją", ++ "help" : "Atrodo neteisinga? Spustelėkite žemiau esantį mygtuką ir nusiųskite sugeneruotą ZIP failą <1>modifikacijų Discorde, skyriuje #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {{invalidInstalls} rastas netinkamas Satisfactory įdiegimas} few {{invalidInstalls} rasta keletas netinkamų „Satisfactory“ įdiegimų} many {{invalidInstalls} rasta daug netinkamų „Satisfactory“ įdiegimų} other {{invalidInstalls} rastas kitas netinkamas „Satisfactory“ įdiegimas}}", ++ "no_installs" : "Nerasta jokiu Satisfactory įdiegimų", ++ "open_log_docs" : "Atidaryti Žurnalo Dokumentaciją", ++ "open_modding_discord" : "Atidaryti Modifikacijų Discordą", ++ "open_modding_discord.must_generate_debug_first" : "Pirmiausia turite sugeneruoti derinimo informaciją", ++ "reporting_directions" : "Kažkas ne taip? Spustelėkite mygtuką žemiau, kad surinktumėte žurnalus, tuomet nusiųskite sugeneruotą zip failą į modifikacijų Discordo kanalą #help-using-mods.", ++ "title" : "Kažkas nepavyko" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Jau įdiegtas", ++ "error-loading" : "Klaida įkeliant modo informaciją", ++ "in-queue" : "Eilėje", ++ "install" : "Įdiegti", ++ "latest-version" : "Naujausia versija", ++ "title" : "Įdiegti modą", ++ "version" : "Versija {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Pradėti!", ++ "change_later_hint" : "Šiuos nustatymus bet kada galite pakeisti meniu „Modų tvarkyklės nustatymai“.", ++ "intro" : "Pasirinkite šias nuostatas kad pradėtumėte.", ++ "open_welcome_guide" : "Atidarykite Pasveikinimo vadovą", ++ "option" : { ++ "language" : { ++ "title" : "Jei įmanoma, naudoti šią kalbą:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Palaukti, kol paspausiu „Taikyti“", ++ "enabled" : "Priimti pakeitimus iškarto", ++ "title" : "Kai pridedu arba pašalinu modą ar pakeičiu profilius..." ++ } ++ }, ++ "title" : "Sveiki atvykę į Satisfactory modifikacijų tvarkyklę!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "taikyti {profile}", ++ "apply-queued" : "Taikyti {queued, plural, one {vieną pakeitimą} other {# pakeitimus}}", ++ "are-you-sure-warning" : "Ar tikrai norite paleisti?", ++ "cant-launch" : "SMM negali paleisti šios instaliacijos", ++ "cant-launch-tooltip" : "Modų tvarkyklė negali paleisti šio instaliacijos tipo, tačiau ji vis tiek tvarkys modų failus už jus. Paleiskite Satisfactory naudodami savo įprastą žaidimo paleidiklį.", ++ "changes-queued" : "Pakeitimai dar nebuvo atlikti jūsų modų failuose. Spustelėkite žemiau esantį mygtuką, kad pritaikytumėte laukiančius pakeitimus.\n\n(Jūs esate „Pradėti rankiniu būdu“ režime)", ++ "game-running" : "Jūsų žaidimo paleidiklis praneša, kad žaidimas jau veikia (vis dar yra uždarymo procese).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {{versionIncompatible} vienas nesuderinamas modas, kuris nebus įkeltas arba sugadins mūsų žaidimą} other {{versionIncompatible} nesuderinami modai, kurie nebus įkelti arba sugadins mūsų žaidimą}}", ++ "launch-in-progress" : "Paleidimas vyksta...", ++ "operation-in-progress" : "Veikla jau vyksta.", ++ "play" : "Žaisti Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Vienas modas, kuris {versionPossiblyCompatible, plural, one {yra} other {yra}} greičiausiai nesuderinamas su jūsų žaidimu} other {# modai, kurie {versionPossiblyCompatible, plural, one {yra} other {yra}} greičiausiai nesuderinami su jūsų žaidimu.}}", ++ "profile-change-queued" : "Pakeitimai dar nebuvo atlikti jūsų modų failuose. Spustelėkite žemiau esantį mygtuką, kad pritaikytumėte naują profilį.\n\n(Jūs esate „Pradėti rankiniu būdu“ režime)", ++ "ready" : "Jūs esate pasiruošę veiksmui!\n\n\"Pastaba: Modų tvarkyklė jau baigė diegti modų failus už jus. Galite paleisti žaidimą naudodami savo įprastą žaidimo paleidiklį, o modai vis tiek bus įkelti.\"", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {Vienas modas praneštas} other {# modai pranešti}} kaip neveikiantys šioje žaidimo versijoje. Perskaitykite {versionIncompatible, plural, one {modo} other {modų}} aprašymą arba suderinamumo pastabas, kad sužinotumėte daugiau informacijos.", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {Vienas modas praneštas} other {# modai pranešti}} kaip pažeisti šioje žaidimo versijoje. Perskaitykite {versionIncompatible, plural, one {modo} other {modų}} aprašymą arba suderinamumo pastabas, kad sužinotumėte daugiau informacijos.", ++ "you-have-warning-mods" : "Jus turite:" ++ }, ++ "left-bar" : { ++ "export" : "Eksportuoti", ++ "ficsit-app" : "ficsit.app (Modų saugykla)", ++ "game-version" : "Pasirinkite Žaidimo Įdiegimą", ++ "help" : "Pagalba", ++ "install-invalid" : "Netinkamas", ++ "install-invalid-tooltip" : "Būsena: SMM negali valdyti šios diegimo versijos", ++ "install-loading" : "Kraunama...", ++ "install-loading-tooltip" : "Statusas: Kraunama...", ++ "install-unknown" : "Nežinoma", ++ "install-unknown-tooltip" : "Būsena: Nepavyko gauti informacijos apie šią diegimo versiją", ++ "links" : "Nuorados", ++ "manage-servers" : "Tvarkyti Serverius", ++ "mods-off" : "Modai išjungti", ++ "mods-on" : "Modai įjungti", ++ "other" : "Kitka", ++ "profile" : "Profilis", ++ "queue-blocking-switching-tooltip" : null, ++ "satisfactory-modding-discord" : "Satisfactory Modifikacijų Discordas", ++ "smm-github" : "SMM GitHubas", ++ "updates" : "Atnaujinimai" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod}Pakeitimų žurnalas" ++ }, ++ "mod-details" : { ++ "change-version" : "Pakeisti versija", ++ "change-version-any" : "Betkuris", ++ "change-version-or-newer" : "arba naujesnė", ++ "changelogs" : "Pakeitimų žurnalai", ++ "compatibility" : "Suderinamumas", ++ "compatibility-branch" : "Šis modas buvo praneštas kaip {state} ant {branch}.", ++ "compatibility-unknown" : "Nežinoma", ++ "compatibility-unknown-tooltip" : "Dar nėra pateikta suderinamumo informacijos apie šį modą. Išbandykite jį ir susisiekite su mumis Discord platformoje, kad galėtume ją atnaujinti!", ++ "contributors" : "Prisidėjėliai <1>{authors}", ++ "created" : "Sukurta", ++ "downloads" : "Bendrai atsisiūsta", ++ "installed-version" : "Įdiegta versija", ++ "latest-version" : "Naujausia versija", ++ "mod-author" : "Modas nuo:", ++ "offline-mode" : null, ++ "size" : "Dydis", ++ "updated" : "Atnaujinta", ++ "view-on-ficsit-app" : "Peržiūrėti ficsit.app", ++ "views" : "Peržiūros" ++ }, ++ "mod-list-item" : { ++ "by-author" : "nuo", ++ "compatibility-note" : "Šis modas buvo praneštas kaip {state} ant šios žaidimo versijos.", ++ "compatibility-note-none" : "(Nenurodyta)", ++ "compatibility-warning" : "Su šiuo modu pranešta problemų, tačiau galite pabandyti jį įdiegti vis tiek. Detalės:", ++ "dependency" : "Šis modas yra įdiegtas kaip kito modo priklausomybė. Jo negalima įdiegti ar pašalinti atskirai.", ++ "disable" : "Šis modas yra įjungtas šiame profilyje. Spustelėkite, kad jį išjungtumėte, kas neleis jam įsikrauti, kai paleidžiate žaidimą, tačiau jis vis tiek liks šio profilio dalimi.", ++ "disable-queued" : null, ++ "disabled-tooltip" : null, ++ "enable" : "Spustelėkite, kad įjungtumėte šį modą.", ++ "enable-queued" : null, ++ "favorite" : "Spustelėkite, kad pridėtumėte šį modą prie mėgstamiausių. Mėgstamo modo pasirinkimas nėra susijęs su tuo, ar jis įdiegtas, ar ne - tai būdas sekti modą vėliau, nepriklausomai nuo pasirinkto profilio.", ++ "hidden" : null, ++ "install" : "Spustelėkite, kad įdiegtumėte šį modą.", ++ "no-tags" : "(Nėra jokių žymų)", ++ "not-installable" : "Jūs negalite įdiegti šio modo dėl šios priežasties:", ++ "queued" : null, ++ "queued-install" : null, ++ "queued-uninstall" : null, ++ "unavailable" : "Šis modas nebegalimas ficsit.app svetainėje. Galbūt norėsite jį pašalinti.", ++ "unfavorite" : null, ++ "uninstall" : "Šis modas yra įdiegtas šiame profilyje. Spustelėkite, kad pašalintumėte šį modą.", ++ "wait" : null ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(Daugiau pastabų nepateikta)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Visi modai", ++ "compatible" : "Suderinta", ++ "dependency" : "Priklausomi", ++ "disabled" : "Išjungta", ++ "enabled" : "Įjungta", ++ "favorite" : "Mėgstamiausia", ++ "installed" : "Įdiegta", ++ "not-installed" : "Neįdiegta", ++ "queued" : "Eilėje" ++ }, ++ "order-by" : { ++ "downloads" : "Parsisiųsti", ++ "hotness" : "Karščiausi", ++ "last-updated" : "Paskutinį kartą atnaujinta", ++ "name" : "Pavadinimas", ++ "popularity" : "Populiarumas", ++ "views" : "Peržiūros" ++ }, ++ "search" : "Ieškoti modų" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : null, ++ "no-mods-found" : "Nerasta jokių modų", ++ "show-all" : "Rodyti visus" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Profilio vardas", ++ "profile-name-placeholder" : "Naujo Profilio Vardas", ++ "title" : "Pridėti profilį" ++ }, ++ "delete" : { ++ "profile-name" : "Profilio vardas", ++ "title" : "Ištrinti profilį" ++ }, ++ "import" : { ++ "profile-file" : "Profilio failas", ++ "profile-name" : "Profilio vardas", ++ "profile-name-placeholder" : "Naujo Profilio Vardas", ++ "profile-version-warning" : "Šis profilis buvo sukurtas naudojant naujesnę žaidimo versiją. Jis gali būti nesuderinamas su šia versija", ++ "title" : "Importuoti profilį" ++ }, ++ "rename" : { ++ "new-profile" : "Naujo Profilio Vardas", ++ "new-profile-placeholder" : "Naujas profilis", ++ "old-profile" : "Seno profilio vardas", ++ "old-profile-placeholder" : "Senas profilis", ++ "title" : "Pervadinti profilį" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Pridėti", ++ "advanced-note" : "Atkreipkite dėmesį, kad naudotojo varde ir slaptažodyje gali reikėti vengti tam tikrų simbolių", ++ "advanced-path-placeholder" : "vartotojas:slaptazodis@savininkas:prievadas/vieta", ++ "existing-servers" : { ++ "none-yet" : null, ++ "title" : null ++ }, ++ "failed-to-connect" : "Nepavyko prisijungti prie serverio, spustelėkite, kad bandytumėte dar kartą", ++ "get-help" : null, ++ "host-placeholder" : "Savininkas", ++ "invalid" : null, ++ "loading" : "Kraunama...", ++ "local-path-placeholder" : null, ++ "name-placeholder" : null, ++ "new-server" : { ++ "title" : "Pridėti Naują Serverį" ++ }, ++ "password-placeholder" : "slaptažodis", ++ "path-placeholder" : "vietovė", ++ "port-placeholder" : "prievadas (numatytasis: {default})", ++ "switch-to-advanced" : "Pereiti prie išplėstinio režimo", ++ "switch-to-simple" : "Pereiti prie paprasto režimo", ++ "title" : "Dedikuotas serveris", ++ "username-placeholder" : "Vartotojo vardas", ++ "validating" : "Validuojama..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Nepavyko išvardyti katalogo", ++ "failed-valid-check" : null ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Talpyklos vietą", ++ "reset" : "Atstatyti į numatytąsias reikšmes", ++ "save" : "Išsaugoti ir perkelti", ++ "title" : "Keisti atsisiuntimo talpyklos vietą" ++ }, ++ "change-cache-location" : "Keisti talpyklos vietą", ++ "copy-mod-list" : "Kopijuoti modų sarašą", ++ "debug" : "Derinimas", ++ "generate-debug-info" : "Generuokite derinimo informaciją", ++ "go-online-offline" : "Eiti {offline, select, true {prisijungus} other {neprisijungus}}", ++ "language" : "Kalba", ++ "launch-button" : "Paleidimo mygtukas", ++ "launch-button.button" : "Mygtukas", ++ "launch-button.cat" : "Nyan", ++ "launch-button.normal" : "Normalus", ++ "proxy" : { ++ "proxy" : "Tarpinis serveris", ++ "remove" : "Pašalinti tarpinį serverį", ++ "save" : "Išsaugoti ir perkrauti", ++ "title" : "Nustatyti tarpinį serverį" ++ }, ++ "queue" : "Eilė", ++ "queue.start-immediately" : "Pradėti nedelsiant", ++ "queue.start-manually" : "Pradėti rankiniu būdu", ++ "save-window-position" : "Išsaugoti lango padėtį", ++ "secret-settings" : "Slapti nustatymai", ++ "set-proxy" : "Nustatyti tarpinį serverį", ++ "settings" : "Nustatymai", ++ "smm-debug-logging" : "SMM derinimo įrašinėjimas", ++ "start-view" : "Pradėti peržiūrą", ++ "start-view.compact" : "Kompaktiškas", ++ "start-view.expanded" : "Išplėstas", ++ "title" : "Modų Tvarkyklės Nustatymai", ++ "update-check" : "Atnaujinimo patikrinimas", ++ "update-check.ask" : "Paklausti, kai randama", ++ "update-check.on-exit" : "Išeinant", ++ "update-check.on-start" : "Pradžioje" ++ }, ++ "smm-update" : { ++ "downloading" : "Atsisiunčiama fone", ++ "downloading-stats" : "Atsisiunčiama naujinys: {current} / {total}, {speed}/s, liko {eta}", ++ "title" : "SMM atnaujinimas prieinamas - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Patobulintas našumas", ++ "performance.description" : "Užtikrina jūsų efektyvumą!", ++ "platform_support" : "Gimtoji Linux Heroic, Steam Snap, Mac palaikymas", ++ "platform_support.description" : "Gaukite versiją iš GitHubo išleidimų, jei dar to nepadarėte!", ++ "profile_format" : "Naujas profilio formatas", ++ "profile_format.description" : "SMM2 profiliai nėra suderinami su SMM3! Esami profiliai buvo automatiškai perkelti, tačiau negalite importuoti profilių, sukurtų su SMM2.", ++ "queue" : "Veiksmo eilės sudarymas", ++ "queue.description" : "Vienu metu sudėkite į eilę kelis modų atsisiuntimus/pašalinimus.", ++ "servers" : "Dedikuoto serverio valdymas", ++ "servers.description" : "Lengvai valdykite serverius per failų sistemą, SFTP, FTP ir SMB!", ++ "translation" : "Vertimo pagalba", ++ "translation.description" : "Prisijunkite prie mūsų Discordo, kad išverstumėte SMM į savo kalbą!", ++ "ui" : "Naudotojo sąsajos atnaujinimas", ++ "ui.description" : "Naujas apdailos sluoksnis, skirtas Satisfactory 1.0 šventei!" ++ }, ++ "intro" : "Šioje versijoje padarėme daug patobulinimų. Štai keletas svarbiausių akcentų:", ++ "open_guide" : "Atidaryti SMM3 Documentaciją", ++ "title" : "Sveiki atvykę į Satisfactory Modifikacijų Tvarkyklę, 3 Versiją!" ++ }, ++ "updates" : { ++ "changelog" : "Pakeitimų žurnalas", ++ "check-for-updates" : "Patikrinti, ar yra atnaujinimų", ++ "checking-for-updates" : "Tikrinama, ar yra atnaujinimų...", ++ "hide-ignored" : "Paslėpti ignoruojamus", ++ "ignore" : "Ignoruoti", ++ "mod-update-available" : "{updates, plural, one {{updates} pasiekiamas modo atnaujinimas} few {{updates} pasiekiami keli modų atnaujinimai} many {{updates} pasiekiama daug modų atnaujinimų} other {{updates} pasiekiami kiti modų atnaujinimai}}", ++ "no-updates" : "Šiuo metu nėra modų ar SMM atnaujinimų", ++ "show-ignored" : "Rodyti ignoruojamus", ++ "smm-update-available" : "Yra SMM atnaujinimas", ++ "title" : "Atnaujinimai", ++ "unignore" : "Nebeignoruoti", ++ "update-all" : "Atnaujinti visus", ++ "update-selected" : "Atnaujinti pasirinktus" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/mt.json b/frontend/src/lib/generated/i18n/mt.json +new file mode 100644 +index 0000000..8abbb23 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/mt.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : null, ++ "go-online" : null, ++ "healthcheck" : null, ++ "offline" : null ++ }, ++ "common" : { ++ "add" : null, ++ "cancel" : null, ++ "close" : null, ++ "delete" : null, ++ "import" : null, ++ "loading" : null, ++ "rename" : null ++ }, ++ "error" : { ++ "failed_to_generate_debug" : null, ++ "generate_debug_info" : null, ++ "help" : null, ++ "invalid_installs" : null, ++ "no_installs" : null, ++ "open_log_docs" : null, ++ "open_modding_discord" : null, ++ "open_modding_discord.must_generate_debug_first" : null, ++ "reporting_directions" : null, ++ "title" : null ++ }, ++ "external-install-mod" : { ++ "already-installed" : null, ++ "error-loading" : null, ++ "in-queue" : null, ++ "install" : null, ++ "latest-version" : null, ++ "title" : null, ++ "version" : null ++ }, ++ "first_time_setup" : { ++ "acknowledge" : null, ++ "change_later_hint" : null, ++ "intro" : null, ++ "open_welcome_guide" : null, ++ "option" : { ++ "language" : { ++ "title" : null ++ }, ++ "queue-auto-start" : { ++ "disabled" : null, ++ "enabled" : null, ++ "title" : null ++ } ++ }, ++ "title" : null ++ }, ++ "launch-button" : { ++ "apply-profile-change" : null, ++ "apply-queued" : null, ++ "are-you-sure-warning" : null, ++ "cant-launch" : null, ++ "cant-launch-tooltip" : null, ++ "changes-queued" : null, ++ "game-running" : null, ++ "incompatible-mods" : null, ++ "launch-in-progress" : null, ++ "operation-in-progress" : null, ++ "play" : null, ++ "possibly-incompatible-mods" : null, ++ "profile-change-queued" : null, ++ "ready" : null, ++ "reported-incompatible-mods" : null, ++ "reported-possibly-compatible-mods" : null, ++ "you-have-warning-mods" : null ++ }, ++ "left-bar" : { ++ "export" : null, ++ "ficsit-app" : null, ++ "game-version" : null, ++ "help" : null, ++ "install-invalid" : null, ++ "install-invalid-tooltip" : null, ++ "install-loading" : null, ++ "install-loading-tooltip" : null, ++ "install-unknown" : null, ++ "install-unknown-tooltip" : null, ++ "links" : null, ++ "manage-servers" : null, ++ "mods-off" : null, ++ "mods-on" : null, ++ "other" : null, ++ "profile" : null, ++ "queue-blocking-switching-tooltip" : null, ++ "satisfactory-modding-discord" : null, ++ "smm-github" : null, ++ "updates" : null ++ }, ++ "mod-changelog" : { ++ "title" : null ++ }, ++ "mod-details" : { ++ "change-version" : null, ++ "change-version-any" : null, ++ "change-version-or-newer" : null, ++ "changelogs" : null, ++ "compatibility" : null, ++ "compatibility-branch" : null, ++ "compatibility-unknown" : null, ++ "compatibility-unknown-tooltip" : null, ++ "contributors" : null, ++ "created" : null, ++ "downloads" : null, ++ "installed-version" : null, ++ "latest-version" : null, ++ "mod-author" : null, ++ "offline-mode" : null, ++ "size" : null, ++ "updated" : null, ++ "view-on-ficsit-app" : null, ++ "views" : null ++ }, ++ "mod-list-item" : { ++ "by-author" : null, ++ "compatibility-note" : null, ++ "compatibility-note-none" : null, ++ "compatibility-warning" : null, ++ "dependency" : null, ++ "disable" : null, ++ "disable-queued" : null, ++ "disabled-tooltip" : null, ++ "enable" : null, ++ "enable-queued" : null, ++ "favorite" : null, ++ "hidden" : null, ++ "install" : null, ++ "no-tags" : null, ++ "not-installable" : null, ++ "queued" : null, ++ "queued-install" : null, ++ "queued-uninstall" : null, ++ "unavailable" : null, ++ "unfavorite" : null, ++ "uninstall" : null, ++ "wait" : null ++ }, ++ "mod" : { ++ "compatibility-no-notes" : null ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : null, ++ "compatible" : null, ++ "dependency" : null, ++ "disabled" : null, ++ "enabled" : null, ++ "favorite" : null, ++ "installed" : null, ++ "not-installed" : null, ++ "queued" : null ++ }, ++ "order-by" : { ++ "downloads" : null, ++ "hotness" : null, ++ "last-updated" : null, ++ "name" : null, ++ "popularity" : null, ++ "views" : null ++ }, ++ "search" : null ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : null, ++ "no-mods-found" : null, ++ "show-all" : null ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : null, ++ "profile-name-placeholder" : null, ++ "title" : null ++ }, ++ "delete" : { ++ "profile-name" : null, ++ "title" : null ++ }, ++ "import" : { ++ "profile-file" : null, ++ "profile-name" : null, ++ "profile-name-placeholder" : null, ++ "profile-version-warning" : null, ++ "title" : null ++ }, ++ "rename" : { ++ "new-profile" : null, ++ "new-profile-placeholder" : null, ++ "old-profile" : null, ++ "old-profile-placeholder" : null, ++ "title" : null ++ } ++ }, ++ "server-manager" : { ++ "add" : null, ++ "advanced-note" : null, ++ "advanced-path-placeholder" : null, ++ "existing-servers" : { ++ "none-yet" : null, ++ "title" : null ++ }, ++ "failed-to-connect" : null, ++ "get-help" : null, ++ "host-placeholder" : null, ++ "invalid" : null, ++ "loading" : null, ++ "local-path-placeholder" : null, ++ "name-placeholder" : null, ++ "new-server" : { ++ "title" : null ++ }, ++ "password-placeholder" : null, ++ "path-placeholder" : null, ++ "port-placeholder" : null, ++ "switch-to-advanced" : null, ++ "switch-to-simple" : null, ++ "title" : null, ++ "username-placeholder" : null, ++ "validating" : null ++ }, ++ "server-picker" : { ++ "failed-list-dir" : null, ++ "failed-valid-check" : null ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : null, ++ "reset" : null, ++ "save" : null, ++ "title" : null ++ }, ++ "change-cache-location" : null, ++ "copy-mod-list" : null, ++ "debug" : null, ++ "generate-debug-info" : null, ++ "go-online-offline" : null, ++ "language" : null, ++ "launch-button" : null, ++ "launch-button.button" : null, ++ "launch-button.cat" : null, ++ "launch-button.normal" : null, ++ "proxy" : { ++ "proxy" : null, ++ "remove" : null, ++ "save" : null, ++ "title" : null ++ }, ++ "queue" : null, ++ "queue.start-immediately" : null, ++ "queue.start-manually" : null, ++ "save-window-position" : null, ++ "secret-settings" : null, ++ "set-proxy" : null, ++ "settings" : null, ++ "smm-debug-logging" : null, ++ "start-view" : null, ++ "start-view.compact" : null, ++ "start-view.expanded" : null, ++ "title" : null, ++ "update-check" : null, ++ "update-check.ask" : null, ++ "update-check.on-exit" : null, ++ "update-check.on-start" : null ++ }, ++ "smm-update" : { ++ "downloading" : null, ++ "downloading-stats" : null, ++ "title" : null ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : null, ++ "performance.description" : null, ++ "platform_support" : null, ++ "platform_support.description" : null, ++ "profile_format" : null, ++ "profile_format.description" : null, ++ "queue" : null, ++ "queue.description" : null, ++ "servers" : null, ++ "servers.description" : null, ++ "translation" : null, ++ "translation.description" : null, ++ "ui" : null, ++ "ui.description" : null ++ }, ++ "intro" : null, ++ "open_guide" : null, ++ "title" : null ++ }, ++ "updates" : { ++ "changelog" : null, ++ "check-for-updates" : null, ++ "checking-for-updates" : null, ++ "hide-ignored" : null, ++ "ignore" : null, ++ "mod-update-available" : null, ++ "no-updates" : null, ++ "show-ignored" : null, ++ "smm-update-available" : null, ++ "title" : null, ++ "unignore" : null, ++ "update-all" : null, ++ "update-selected" : null ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/pl.json b/frontend/src/lib/generated/i18n/pl.json +new file mode 100644 +index 0000000..e4d1d46 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/pl.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Przejdź w Tryb Offline", ++ "go-online" : "Przejdź w Tryb Online", ++ "healthcheck" : "Nie można połączyć z ficsit.app. Sprawdź swoje połączenie internetowe, bądź użyj trybu offline. (Ustawienia Menadżera Modów > Przejdź w Tryb Offline)", ++ "offline" : "Jesteś aktualnie offline. Niektóre funkcje mogą być niedostępne. (Aby przywrócić połączenie, przejdź do Ustawienia Menadżera Modów > Przejdź w Tryb Online)" ++ }, ++ "common" : { ++ "add" : "Dodaj", ++ "cancel" : "Anuluj", ++ "close" : "Zamknij", ++ "delete" : "Usuń", ++ "import" : "Zaimportuj", ++ "loading" : "Ładowanie...", ++ "rename" : "Zmień Nazwę" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "Wystąpił błąd przy próbie wygenerowania pliku debugowania. Prosimy o manualne sprawdzenie plików logów Menadżera Modów, aby uzyskać więcej informacji, oraz o zgłoszenie tego problemu na Discord. Użyj przycisku poniżej, aby otworzyć dokumentacje i dowiedzieć się, jak to zrobić.", ++ "generate_debug_info" : "Wygeneruj informacje debugowania", ++ "help" : "Nie powinno tak być? Naciśnij przycisk poniżej i wyślij wygenerowany plik .zip na <1>discordzie od modowania na #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {Wykryto {invalidInstalls} błędną instalację Satisfactory} many {Wykryto {invalidInstalls} błędnych instalacji Satisfactory} other {Wykryto {invalidInstalls} błędne instalacje Satisfactory} }", ++ "no_installs" : "Nie znaleziono instalacji Satisfactory", ++ "open_log_docs" : "Otwórz Dokumentacje Logów", ++ "open_modding_discord" : "Otwórz Discord od Modowania", ++ "open_modding_discord.must_generate_debug_first" : "Musisz najpierw wygenerować informacje debugowania", ++ "reporting_directions" : "Nie powinno tak być? Naciśnij przycisk poniżej, aby zebrać logi, a następnie wyślij wygenerowany plik .zip na discordzie od modowania na #help-using-mods.", ++ "title" : "Coś poszło nie tak" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Już zainstalowany", ++ "error-loading" : "Wystąpił błąd przy ładowaniu szczegółów moda", ++ "in-queue" : "W kolejce", ++ "install" : "Zainstaluj", ++ "latest-version" : "Najnowsza wersja", ++ "title" : "Zainstaluj moda", ++ "version" : "Wersja {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Rozpocznij!", ++ "change_later_hint" : "Zmień te ustawienia kiedykolwiek w menu \"Ustawienia Menadżera Modów\".", ++ "intro" : "Wybierz swoje preferencje, aby rozpocząć.", ++ "open_welcome_guide" : "Otwórz Przewodnik Wprowadzający", ++ "option" : { ++ "language" : { ++ "title" : "Użyj tego języka kiedy dostępny:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Poczekaj, aż nacisnę \"Zastosuj\"", ++ "enabled" : "Zastosuj zmiany natychmiast", ++ "title" : "Kiedy dodam lub usunę moda, bądź zmienię profil..." ++ } ++ }, ++ "title" : "Witaj w Satisfactory - Menadżer Modów!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Zastosuj {profile}", ++ "apply-queued" : "Zastosuj {queued, plural, one {jedną zmianę} few {# zmiany} many {# zmian} other {# zmiany}}", ++ "are-you-sure-warning" : "Czy jesteś pewien, że chcesz uruchomić?", ++ "cant-launch" : "SMM nie może uruchomić tej instalacji", ++ "cant-launch-tooltip" : "Menadżer Modów nie jest w stanie uruchomić tego typu instalacji, ale nadal będzie zarządzać plikami modów dla Ciebie. Uruchom Satisfactory za pomocą twojego standardowego programu do uruchamiania gier.", ++ "changes-queued" : "Zmiany nie zostały jeszcze zastosowane dla twoich modów. Naciśnij przycisk poniżej, aby zastosować zmiany, które są w kolejce\n\n(Jesteś w trybie Kolejki \"Zastosuj manualnie\")", ++ "game-running" : "Twój program do uruchamiania gier zgłasza, że gra jest już uruchomiona (albo jest podczas procesu zamykania).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {{versionIncompatible} niekompatybilny mod, który się nie załaduje, bądź nieoczekiwanie zamknie naszą grę} many {{versionIncompatible} niekompatybilnych modów, które się nie załadują, bądź nieoczekiwanie zamkną naszą grę} other {{versionIncompatible} niekompatybilne mody, które się nie załadują, bądź nieoczekiwanie zamkną naszą grę} }", ++ "launch-in-progress" : "Uruchamianie w toku...", ++ "operation-in-progress" : "Operacja jest już w toku.", ++ "play" : "Zagraj w Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Jeden mod {versionPossiblyCompatible, plural, one {jest} few {są} many {jest} other {są}} prawdopodobnie niekompatybilny z twoją grą} many {# modów {versionPossiblyCompatible, plural, one {jest} few {są} many {jest} other {są}} prawdopodobnie niekompatybilnych z twoją grą} other {# mody {versionPossiblyCompatible, plural, one {jest} few {są} many {jest} other {są}} prawdopodobnie niekompatybilne z twoją grą} }", ++ "profile-change-queued" : "Zmiany nie zostały jeszcze zastosowane dla twoich modów. Naciśnij przycisk poniżej, aby zastosować nowy profil.\n\n(Jesteś w trybie Kolejki \"Zastosuj manualnie\")", ++ "ready" : "Jesteś gotów do akcji:\n\nInformacja: Menadżer modów już skończył instalować dla Ciebie mody. Możesz wystartować grę używając swojego standardowego programu do uruchamiania gier, a mody i tak się załadują.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {Jeden mod} few {# mody} many {# modów} other {# mody}} {reportedIncompatible, plural, one {został zgłoszony jako Niedziałający} few {zostały zgłoszone jako Niedziałające} many {zostało zgłoszonych jako Niedziałających} other {zostały zgłoszone jako Niedziałające}} na tej wersji gry. Przeczytaj opis lub informacje o kompatybilności {versionIncompatible, plural, one {moda} few {modów} many {modów} other {modów}} po więcej informacji", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {Jeden mod} few {# mody} many {# modów} other {# mody}} {reportedPossiblyCompatible, plural, one {został zgłoszony jako Uszkodzony} few {zostały zgłoszone jako Uszkodzone} many {zostało zgłoszonych jako Uszkodzone} other {zostały zgłoszone jako Uszkodzone}} na tej wersji gry. Przeczytaj opis lub informacje o kompatybilności {versionIncompatible, plural, one {moda} few {modów} many {modów} other {modów}} po więcej informacji", ++ "you-have-warning-mods" : "Masz:" ++ }, ++ "left-bar" : { ++ "export" : "Wyeksportuj", ++ "ficsit-app" : "ficsit.app (Repozytorium Modów)", ++ "game-version" : "Wybierz Instalacje Gry", ++ "help" : "Pomoc", ++ "install-invalid" : "Błędna", ++ "install-invalid-tooltip" : "Status: SMM nie może zarządzać tą instalacją", ++ "install-loading" : "Ładowanie...", ++ "install-loading-tooltip" : "Status: Ładowanie...", ++ "install-unknown" : "Nieznana", ++ "install-unknown-tooltip" : "Status: Nie mogliśmy zdobyć informacji na temat tej instalacji", ++ "links" : "Łącza", ++ "manage-servers" : "Zarządaj Serwerami", ++ "mods-off" : "Wyłącz Mody", ++ "mods-on" : "Włącz Mody", ++ "other" : "Inne", ++ "profile" : "Profil", ++ "queue-blocking-switching-tooltip" : "{number, plural, one {Masz {number} akcję w kolejce. Zastosuj albo anuluj {number, plural, one {ją} other {je}} zanim zmienisz instalacje lub profile.} many {Masz {number} akcji w kolejce. Zastosuj albo anuluj {number, plural, one {ją} other {je}} zanim zmienisz instalacje lub profile.} other {Masz {number} akcje w kolejce. Zastosuj albo anuluj {number, plural, one {ją} other {je}} zanim zmienisz instalacje lub profile.} }", ++ "satisfactory-modding-discord" : "Discord od Modowania Satisfactory", ++ "smm-github" : "GitHub SMM", ++ "updates" : "Aktualizacje" ++ }, ++ "mod-changelog" : { ++ "title" : "Lista Zmian <1>{mod}" ++ }, ++ "mod-details" : { ++ "change-version" : "Zmień wersje", ++ "change-version-any" : "Jakakolwiek", ++ "change-version-or-newer" : "lub nowsza", ++ "changelogs" : "Listy Zmian", ++ "compatibility" : "Kompatybilność", ++ "compatibility-branch" : "Mod został zgłoszony jako {state} na {branch}", ++ "compatibility-unknown" : "Nieznane", ++ "compatibility-unknown-tooltip" : "Informacja o kompatybilności nie została jeszcze zgłoszona. Przetestuj ją i skontaktuj się z nami na Discord, abyśmy mogli ją zaktualizować!", ++ "contributors" : "Autorzy <1>({authors})", ++ "created" : "Data Stworzenia", ++ "downloads" : "Ilość Pobrań", ++ "installed-version" : "Zainstalowana wersja", ++ "latest-version" : "Najnowsza wersja", ++ "mod-author" : "Mod autorstwa:", ++ "offline-mode" : "Tryb Offline jest włączony. Listy zmian i opisy są niedostępne.", ++ "size" : "Rozmiar", ++ "updated" : "Data Zaktualizowania:", ++ "view-on-ficsit-app" : "Zobacz na ficsit.app", ++ "views" : "Wyświetlenia" ++ }, ++ "mod-list-item" : { ++ "by-author" : "autorstwa", ++ "compatibility-note" : "Ten mod został zgłoszony jako {state} na tej wersji gry", ++ "compatibility-note-none" : "(Nie podano)", ++ "compatibility-warning" : "Zostały zgłoszone problemy z tym modem, ale nadal możesz spróbować go zainstalować. Detale:", ++ "dependency" : "Ten mod jest już zainstalowany jako dependencja innego moda. Nie może on zostać odinstalowany, dopóki inne mody na nim polegają.", ++ "disable" : "Ten mod jest Włączony na tym profilu. Naciśnij, aby go Wyłączyć, spowoduje to, że nie załaduje się on przy starcie gry, ale dalej będzie częścią tego profilu.", ++ "disable-queued" : "Ten mod jest w kolejce do Wyłączenia. Naciśnij, aby anulować tę operację.", ++ "disabled-tooltip" : "Ten mod jest Wyłączony. Naciśnij ikonkę pauzy, aby go Włączyć.", ++ "enable" : "Naciśnij, aby włączyć ten mod.", ++ "enable-queued" : "Ten mod jest w kolejce do Włączenia. Naciśnij, aby anulować tę operację.", ++ "favorite" : "Naciśnij, aby dodać ten mod do Ulubionych. Oznaczenie moda jako Ulubionego nie jest powiązane z tym czy jest zainstalowany - to sposób, aby śledzić moda, niezależnie od wybranego profilu.", ++ "hidden" : "Ten mod jest ukryty przez autora", ++ "install" : "Naciśnij, aby zainstalować ten mod.", ++ "no-tags" : "(nie podano)", ++ "not-installable" : "Nie możesz zainstalować tego moda. Powód:", ++ "queued" : "Ten mod jest już w kolejce do innej operacji.", ++ "queued-install" : "Ten mod jest w kolejce do zainstalowania. Naciśnij, aby anulować tę operację.", ++ "queued-uninstall" : "Ten mod jest w kolejce do odinstalowania. Naciśnij, aby anulować tę operację.", ++ "unavailable" : "Ten mod nie jest już dostępny na ficsit.app. Możesz chcieć go usunąć.", ++ "unfavorite" : "Naciśnij, aby usunąć tego moda z Ulubionych.", ++ "uninstall" : "Ten mod jest zainstalowany na tym profilu. Naciśnij, aby go odinstalować.", ++ "wait" : "Poczekaj, aż aktualna operacja zostanie ukończona." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(Nie podano uwagi)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Wszystkie", ++ "compatible" : "Kompatybilne", ++ "dependency" : "Dependencja", ++ "disabled" : "Wyłączone", ++ "enabled" : "Włączone", ++ "favorite" : "Ulubione", ++ "installed" : "Zainstalowane", ++ "not-installed" : "Niezainstalowane", ++ "queued" : "W kolejce" ++ }, ++ "order-by" : { ++ "downloads" : "Ilość Pobrań", ++ "hotness" : "Trendy", ++ "last-updated" : "Zaktualizowane", ++ "name" : "Nazwa", ++ "popularity" : "Popularność", ++ "views" : "Wyświetlenia" ++ }, ++ "search" : "Szukaj mody" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "Żadne mody nie pasują do wybranych filtrów.", ++ "no-mods-found" : "Nie znaleziono modów.", ++ "show-all" : "Pokaż wszystkie" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Nazwa Profilu", ++ "profile-name-placeholder" : "Nowa Nazwa Profilu", ++ "title" : "Dodaj Profil" ++ }, ++ "delete" : { ++ "profile-name" : "Nazwa Profilu", ++ "title" : "Usuń Profil" ++ }, ++ "import" : { ++ "profile-file" : "Plik Profilu", ++ "profile-name" : "Nazwa Profilu", ++ "profile-name-placeholder" : "Nowa Nazwa Profilu", ++ "profile-version-warning" : "Ten profil został stworzony dla nowszej wersji gry. Może on być niekompatybilny z tą wersją.", ++ "title" : "Zaimportuj profil" ++ }, ++ "rename" : { ++ "new-profile" : "Nowa nazwa profilu", ++ "new-profile-placeholder" : "Nowy Profil", ++ "old-profile" : "Stara nazwa profilu", ++ "old-profile-placeholder" : "Stary Profil", ++ "title" : "Zmień nazwę profilu" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Dodaj", ++ "advanced-note" : "Uwaga: niektóre znaki w nazwie użytkownika i haśle mogą wymagać poprzedzenia znakiem ucieczki (zazwyczaj znak odwrotnego ukośnika \"\\\").", ++ "advanced-path-placeholder" : "użytkownik:hasło@host:port/ścieżka", ++ "existing-servers" : { ++ "none-yet" : "Jeszcze nie zostały dodane żadne serwery. Dodaj jeden poniżej!", ++ "title" : "Zarządzaj Istniejącymi Serwerami" ++ }, ++ "failed-to-connect" : "Nie udało się połączyć z serwerem, naciśnij, aby spróbować ponownie", ++ "get-help" : "Uzyskaj pomoc z łączeniem do serwerów", ++ "host-placeholder" : "host", ++ "invalid" : "SMM nie może zarządzać tą instalacją", ++ "loading" : "Ładowanie...", ++ "local-path-placeholder" : "C:\\Ścieżka\\Do\\Serwera", ++ "name-placeholder" : "Nazwa (domyślna: {default})", ++ "new-server" : { ++ "title" : "Dodaj Nowy Serwer" ++ }, ++ "password-placeholder" : "hasło", ++ "path-placeholder" : "ścieżka", ++ "port-placeholder" : "port (domyślny: {default})", ++ "switch-to-advanced" : "Przełącz na tryb zaawansowany", ++ "switch-to-simple" : "Przełącz na tryb prosty", ++ "title" : "Dedykowane Serwery", ++ "username-placeholder" : "użytkownik", ++ "validating" : "Weryfikowanie..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Nie udało się wyświetlić katalogu.", ++ "failed-valid-check" : "Nie udało się sprawdzić czy wybrana ścieżka wskazuje na prawidłowy serwer" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Miejsce przechowywania pamięci podręcznej", ++ "reset" : "Zresetuj do domyślnych", ++ "save" : "Zapisz i przenieś", ++ "title" : "Zmień miejsce przechowywania pamięci podręcznej pobierania" ++ }, ++ "change-cache-location" : "Zmień miejsce przechowywania pamięci podręcznej", ++ "copy-mod-list" : "Skopiuj listę modów", ++ "debug" : "Debugowanie", ++ "generate-debug-info" : "Wygeneruj informacje debugowania", ++ "go-online-offline" : "Pójdź {offline, select, true {online} other {offline}}", ++ "language" : "Język", ++ "launch-button" : "Przycisk uruchamiania", ++ "launch-button.button" : "Przycisk", ++ "launch-button.cat" : "Nyan", ++ "launch-button.normal" : "Normalny", ++ "proxy" : { ++ "proxy" : "Serwer pośredniczący (Proxy)", ++ "remove" : "Usuń serwer pośredniczący (Proxy)", ++ "save" : "Zapisz i zrestartuj", ++ "title" : "Ustaw serwer pośredniczący (Proxy)" ++ }, ++ "queue" : "Kolejka", ++ "queue.start-immediately" : "Zastosuj natychmiastowo", ++ "queue.start-manually" : "Zastosuj manualnie", ++ "save-window-position" : "Zapisz pozycję okna", ++ "secret-settings" : "Sekretne ustawienia", ++ "set-proxy" : "Ustaw serwer pośredniczący (Proxy)", ++ "settings" : "Ustawienia", ++ "smm-debug-logging" : "logowanie debugowania SMM", ++ "start-view" : "Widok startowy", ++ "start-view.compact" : "Kompaktowy", ++ "start-view.expanded" : "Rozszerzony", ++ "title" : "Ustawienia Menadżera Modów", ++ "update-check" : "Sprawdzanie dostępności aktualizacji", ++ "update-check.ask" : "Zapytaj, gdy znaleziono", ++ "update-check.on-exit" : "Przy zamknięciu", ++ "update-check.on-start" : "Przy starcie" ++ }, ++ "smm-update" : { ++ "downloading" : "Pobieranie w tle", ++ "downloading-stats" : "Pobieranie aktualizacji: {current} / {total}, {speed}/s, szacowany czas: {eta}", ++ "title" : "Dostępna aktualizacja SMM - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Lepsza wydajność", ++ "performance.description" : "Pomaga ci być efektywnym!", ++ "platform_support" : "Natywne wsparcie dla: Linux Heroic, Steam Snap, Mac", ++ "platform_support.description" : "Pobierz nową wersję z GitHub releases, jeśli jeszcze jej nie masz!", ++ "profile_format" : "Nowy format Profili", ++ "profile_format.description" : "Profile z SMM2 nie są kompatybilne z SMM3! Twoje istniejące profile zostały automatycznie przeniesione, ale nie możesz Zaimportować żadnych profilów stworzonych za pomocą SMM2.", ++ "queue" : "Kolejka akcji", ++ "queue.description" : "Kolejkuj wiele pobrań/odinstalowań modów na raz.", ++ "servers" : "Zarządzanie dedykowanymi serwerami", ++ "servers.description" : "Łatwo zarządzaj serwerami za pomocą systemu plików, SFTP, FTP i SMB!", ++ "translation" : "Wsparcie tłumaczeń", ++ "translation.description" : "Dołącz na nasz Discord, aby przetłumaczyć SMM na twój język!", ++ "ui" : "Odświeżony wygląd interfejsu użytkownika", ++ "ui.description" : "Świeża warstwa farby, by uczcić Satisfactory 1.0!" ++ }, ++ "intro" : "Wprowadziliśmy w tej wersji wiele usprawnień. Oto kilka najważniejszych:", ++ "open_guide" : "Otwórz dokumentacje SMM3", ++ "title" : "Witamy w trzeciej wersji Satisfactory - Menadżer Modów!" ++ }, ++ "updates" : { ++ "changelog" : "Lista Zmian", ++ "check-for-updates" : "Sprawdź dostępność aktualizacji", ++ "checking-for-updates" : "Sprawdzanie dostępności aktualizacji...", ++ "hide-ignored" : "Ukryj ignorowane", ++ "ignore" : "Zignoruj", ++ "mod-update-available" : "{updates, plural, one {{updates} dostępna aktualizacja moda} many {{updates} dostępnych aktualizacji modów} other {{updates} dostępne aktualizacje modów} }", ++ "no-updates" : "Brak dostępnych aktualizacji", ++ "show-ignored" : "Pokaż ignorowane", ++ "smm-update-available" : "Dostępna aktualizacja SMM", ++ "title" : "Aktualizacje", ++ "unignore" : "Odignoruj", ++ "update-all" : "Zaktualizuj wszystko", ++ "update-selected" : "Zaktualizuj wybrane" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/pt-BR.json b/frontend/src/lib/generated/i18n/pt-BR.json +new file mode 100644 +index 0000000..9800328 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/pt-BR.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Ficar Offline", ++ "go-online" : "Ficar Online", ++ "healthcheck" : "Não foi possível acessar o ficsit.app. Verifique sua conexão com a internet ou considere utilizar o modo offline. (Configurações do Gerenciador de Mods > Ficar Offline)", ++ "offline" : "Você está offline no momento. Algumas funções podem estar indisponíveis. (Para reconectar, use Configurações do Gerenciador de Mods > Ficar Offline)" ++ }, ++ "common" : { ++ "add" : "Adicionar", ++ "cancel" : "Cancelar", ++ "close" : "Fechar", ++ "delete" : "Deletar", ++ "import" : "Importar", ++ "loading" : "Carregando...", ++ "rename" : "Renomear" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "Ocorreu um erro ao criar o arquivo de depuração. Por favor, cheque manualmente os arquivos de log do Satisfactory Mod Manager para mais informações e reporte isto em nosso Discord. Use o botão abaixo para abrir a documentação e saber como.", ++ "generate_debug_info" : "Gerar informações de depuração", ++ "help" : "Parece errado? Clique no botão abaixo e envie o arquivo zip gerado em #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {{invalidInstalls} instalação inválida de Satisfactory encontrada} other {{invalidInstalls} instalações inválidas de Satisfactory encontradas}}", ++ "no_installs" : "Nenhuma instalação do Satisfactory encontrada", ++ "open_log_docs" : "Abrir documentação de registro", ++ "open_modding_discord" : "Abrir Discord de Modificações", ++ "open_modding_discord.must_generate_debug_first" : "Você deve gerar informações de depuração primeiro", ++ "reporting_directions" : "Parece errado? Clique no botão abaixo para coletar os logs, em seguida, envie o arquivo zip gerado no Discord de mods em #help-using-mods.", ++ "title" : "Algo deu errado" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Já instalado", ++ "error-loading" : "Erro ao carregar os detalhes do mod", ++ "in-queue" : "Na fila", ++ "install" : "Instalar", ++ "latest-version" : "Versão mais recente", ++ "title" : "Instalar mod", ++ "version" : "Versão{version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Começar!", ++ "change_later_hint" : "Altere essas configurações a qualquer momento no menu “Configurações do Mod Manager”.", ++ "intro" : "Selecione suas preferências para começar.", ++ "open_welcome_guide" : "Abra o Guia de Boas-vindas", ++ "option" : { ++ "language" : { ++ "title" : "Use este idioma quando disponível:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Espere por mim para pressionar “Aplicar”", ++ "enabled" : "Aplicar alterações imediatamente", ++ "title" : "Quando adiciono ou removo um mod, ou troco de perfil..." ++ } ++ }, ++ "title" : "Bem-vindo ao Satisfactory Mod Manager!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Aplicar {profile}", ++ "apply-queued" : "Aplicar {queued, plural, one {one change} other {# changes}}", ++ "are-you-sure-warning" : "Tem certeza de que deseja iniciar?", ++ "cant-launch" : "SMM não pode iniciar esta instalação", ++ "cant-launch-tooltip" : "O Gerenciador de Mods não é capaz de iniciar este tipo de instalação, mas ele ainda gerenciará os arquivos dos mods para você. Inicie o Satisfactory usando seu launcher habitual de jogos.", ++ "changes-queued" : "Ainda não foram feitas alterações nos seus arquivos mod. Clique no botão acima para aplicar as alterações que você colocou na fila.", ++ "game-running" : "O inicializador do jogo está informando que o jogo já está em execução (ou ainda em processo de fechamento).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {{versionIncompatible}mod incompatível que não será carregado ou travará o nosso jogo} other {{versionIncompatible}mods incompatíveis que não serão carregados ou travarão o nosso jogo}}", ++ "launch-in-progress" : "Inicialização em progesso...", ++ "operation-in-progress" : "Uma operação já está em andamento.", ++ "play" : "Jogar Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Um mod que {versionPossiblyCompatible, plural, one {is} other {are}} provavelmente incompatível com seu jogo} other {# mods que {versionPossiblyCompatible, plural, one {is} other {are}} provavelmente incompatível com seu jogo}}", ++ "profile-change-queued" : "Mudanças ainda não foram feitas em seus arquivos mod. Clique no botão acima para aplicar o novo perfil.\n\n(Você está no modo de fila \"Iniciar manualmente\")", ++ "ready" : "Você está pronto para fazer barulho!\n\nNota: O Mod Manager já concluiu a instalação dos arquivos mod para você. Você poderia iniciar o jogo usando seu inicializador do jogo e os mods ainda seriam carregados.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {One mod} other {# mods}} that {reportedIncompatible, plural, one {is} other {are}} reportado como Quebrado nesta versão do jogo. Leia o {versionIncompatible, plural, one {mod's} other {mods'}} descrição ou notas de compatibilidade para obter mais informações", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {One mod} other {# mods}} that {reportedPossiblyCompatible, plural, one {is} other {are}} reportado como Danificado nesta versão do jogo. Leia o {versionIncompatible, plural, one {mod's} other {mods'}} descrição ou notas de compatibilidade para obter mais informações", ++ "you-have-warning-mods" : "Você tem:" ++ }, ++ "left-bar" : { ++ "export" : "Exportar", ++ "ficsit-app" : "ficsit.app (Repositório de Mods)", ++ "game-version" : "Selecione a instalação do jogo", ++ "help" : "Ajuda", ++ "install-invalid" : "Inválido", ++ "install-invalid-tooltip" : "Status: o SMM não pode gerenciar esta instalação", ++ "install-loading" : "Carregando...", ++ "install-loading-tooltip" : "Status: Carregando...", ++ "install-unknown" : "Desconhecido", ++ "install-unknown-tooltip" : "Status: Não foi possível obter informações sobre esta instalação", ++ "links" : "Links", ++ "manage-servers" : "Gerenciar servidores", ++ "mods-off" : "Mods desligados", ++ "mods-on" : "Mods ligados", ++ "other" : "Outros", ++ "profile" : "Perfil", ++ "queue-blocking-switching-tooltip" : "{number, plural, one {Você tem {number} ação em fila. Aplique ou cancele-a antes de trocar instalações ou perfis.} other {Você tem {número} ações em fila. Aplique ou cancele-as antes de trocar instalações ou perfis.}}", ++ "satisfactory-modding-discord" : "Discord de Modding do Satisfactory", ++ "smm-github" : "SMM GitHub", ++ "updates" : "Atualizações" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod}Registro de alterações" ++ }, ++ "mod-details" : { ++ "change-version" : "Alterar versão", ++ "change-version-any" : "Qualquer", ++ "change-version-or-newer" : "Ou mais recente", ++ "changelogs" : "Registros de alterações", ++ "compatibility" : "Compatibilidade", ++ "compatibility-branch" : "Este mod foi reportado como {state} na {branch}.", ++ "compatibility-unknown" : "Desconhecido", ++ "compatibility-unknown-tooltip" : "Nenhuma informação de compatibilidade foi reportada para este mod ainda. Experimente e entre em contato conosco no Discord para que possa ser atualizado!", ++ "contributors" : "Contribuidores <1>({authors})", ++ "created" : "Criado", ++ "downloads" : "Total de downloads", ++ "installed-version" : "Versão instalada", ++ "latest-version" : "Versão mais recente", ++ "mod-author" : "Um mod por:", ++ "offline-mode" : "O modo offline está ativado. Registros de alterações e descrições não estão disponíveis.", ++ "size" : "Tamanho", ++ "updated" : "Atualizado", ++ "view-on-ficsit-app" : "Ver em ficsit.app", ++ "views" : "Visualizações" ++ }, ++ "mod-list-item" : { ++ "by-author" : "Por", ++ "compatibility-note" : "Este mod foi reportado como {state} nesta versão do jogo.", ++ "compatibility-note-none" : "(Nenhum especificado)", ++ "compatibility-warning" : "Existem problemas relatados com este mod, mas você pode tentar instalá-lo assim mesmo. Detalhes:", ++ "dependency" : "Este mod está instalado como uma dependência de outro mod. Não pode ser instalado ou removido por conta própria.", ++ "disable" : "Este mod está habilitado neste perfil. Clique para desativá-lo, o que impede que ele carregue quando você inicia o jogo, mas ainda o mantém como parte deste perfil.", ++ "disable-queued" : "Este mod está na fila para ser desativado. Clique para cancelar a operação.", ++ "disabled-tooltip" : "Este mod está desativado. Clique no ícone de pausa para ativá-lo.", ++ "enable" : "Clique para ativar este mod.", ++ "enable-queued" : "Este mod está na fila para ser Ativado. Clique para cancelar a operação.", ++ "favorite" : "Clique para adicionar este mod aos seus Favoritos. Ter um mod como Favorito não está relacionado ao fato dele estar ou não instalado - é uma forma de acompanhar um mod para mais tarde, independentemente do perfil que você selecionou.", ++ "hidden" : "Este mod foi escondido pelo autor.", ++ "install" : "Clique para instalar este mod.", ++ "no-tags" : "(nenhuma disponível)", ++ "not-installable" : "Você não pode instalar este mod. Motivo:", ++ "queued" : "Este mod já está na fila para outra operação.", ++ "queued-install" : "Este mod está na fila para ser instalado. Clique para cancelar a operação.", ++ "queued-uninstall" : "Este mod está na fila para ser desinstalado. Clique para cancelar a operação.", ++ "unavailable" : "Este mod não está mais disponível em ficsit.app. Você pode querer removê-lo.", ++ "unfavorite" : "Clique para remover este mod dos seus Favoritos.", ++ "uninstall" : "Este mod está instalado neste perfil. Clique para desinstalar este mod.", ++ "wait" : "Aguarde a conclusão da operação atual." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(Nenhuma nota adicional fornecida)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Todos os mods", ++ "compatible" : "Compatível", ++ "dependency" : "Dependência", ++ "disabled" : "Desabilitado", ++ "enabled" : "Habilitado", ++ "favorite" : "Favorito", ++ "installed" : "Instalado", ++ "not-installed" : "Não instalado", ++ "queued" : "Na fila" ++ }, ++ "order-by" : { ++ "downloads" : "Downloads", ++ "hotness" : "Quentes", ++ "last-updated" : "Última atualização", ++ "name" : "Nome", ++ "popularity" : "Nome", ++ "views" : "Visualizações" ++ }, ++ "search" : "Pesquisar mods" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "Nenhum mod que corresponda aos seus filtros", ++ "no-mods-found" : "Nenhum mod encontrado", ++ "show-all" : "Mostrar tudo" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Nome do perfil", ++ "profile-name-placeholder" : "Novo nome do perfil", ++ "title" : "Adicionar perfil" ++ }, ++ "delete" : { ++ "profile-name" : "Nome do perfil", ++ "title" : "Deletar perfil" ++ }, ++ "import" : { ++ "profile-file" : "Arquivo do perfil", ++ "profile-name" : "Nome do perfil", ++ "profile-name-placeholder" : "Novo nome do perfil", ++ "profile-version-warning" : "Este perfil foi criado com uma versão mais recente do jogo. Pode não ser compatível com esta versão.", ++ "title" : "Importar perfil" ++ }, ++ "rename" : { ++ "new-profile" : "Novo nome do perfil", ++ "new-profile-placeholder" : "Novo perfil", ++ "old-profile" : "Nome do perfil antigo", ++ "old-profile-placeholder" : "Perfil antigo", ++ "title" : "Renomear perfil" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Adicionar", ++ "advanced-note" : "Observe que você pode ter que escapar certos caracteres no nome de usuário e na senha.", ++ "advanced-path-placeholder" : "user:pass@host:port/path", ++ "existing-servers" : { ++ "none-yet" : "Nenhum servidor adicionado ainda. Adicione um abaixo!", ++ "title" : "Gerenciar Servidores Existentes" ++ }, ++ "failed-to-connect" : "Falha ao conectar ao servidor, clique para tentar novamente", ++ "get-help" : "Obtenha ajuda para se conectar a servidores", ++ "host-placeholder" : "Host", ++ "invalid" : "SMM não pode gerenciar esta instalação", ++ "loading" : "Carregando...", ++ "local-path-placeholder" : "C:\\Path\\To\\Server", ++ "name-placeholder" : "Nome (default: {default})", ++ "new-server" : { ++ "title" : "Adicionar um Novo Servidor" ++ }, ++ "password-placeholder" : "senha", ++ "path-placeholder" : "Caminho", ++ "port-placeholder" : "porta (default: {default})", ++ "switch-to-advanced" : "Mudar para o modo avançado", ++ "switch-to-simple" : "Mudar para o modo simples", ++ "title" : "Servidores Dedicados", ++ "username-placeholder" : "Nome de Usuário", ++ "validating" : "Validando..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Falha ao listar o diretório", ++ "failed-valid-check" : "Falha ao verificar se o caminho selecionado é um servidor válido" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Localização do cache", ++ "reset" : "Redefinir para o padrão", ++ "save" : "Salvar e mover", ++ "title" : "Alterar a localização do cache de download" ++ }, ++ "change-cache-location" : "Alterar a localização do cache", ++ "copy-mod-list" : "Copiar lista de mods", ++ "debug" : "Depuração", ++ "generate-debug-info" : "Gerar informações de depuração", ++ "go-online-offline" : "Ir {offline, select, true {online} other {offline}}", ++ "language" : "Idioma", ++ "launch-button" : "Botão de iniciar", ++ "launch-button.button" : "Botão", ++ "launch-button.cat" : "Nyan", ++ "launch-button.normal" : "Normal", ++ "proxy" : { ++ "proxy" : "Proxy", ++ "remove" : "Remover Proxy", ++ "save" : "Salvar e reiniciar", ++ "title" : "Definir Proxy" ++ }, ++ "queue" : "Fila", ++ "queue.start-immediately" : "Iniciar imediatamente", ++ "queue.start-manually" : "Iniciar manualmente", ++ "save-window-position" : "Salvar posição da janela", ++ "secret-settings" : "Configurações secretas", ++ "set-proxy" : "Definir Proxy", ++ "settings" : "Configurações", ++ "smm-debug-logging" : "Registro de depuração SMM.", ++ "start-view" : "Iniciar visualização", ++ "start-view.compact" : "Compactar", ++ "start-view.expanded" : "Expandido", ++ "title" : "Configurações do Mod Manager ", ++ "update-check" : "Verificação de atualização", ++ "update-check.ask" : "Pergunte quando for encontrado", ++ "update-check.on-exit" : "Na saída", ++ "update-check.on-start" : "No início" ++ }, ++ "smm-update" : { ++ "downloading" : "Baixando em segundo plano", ++ "downloading-stats" : "Baixando atualização: {current} / {total}, {speed}/s, ETA {eta}", ++ "title" : "Atualização do SMM disponível - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Desempenho aprimorado", ++ "performance.description" : "Mantendo você eficiente!", ++ "platform_support" : "Nativo Linux Heroic, Steam Snap, suporte para Mac", ++ "platform_support.description" : "Obtenha uma versão das versões do GitHub, caso ainda não o tenha feito!", ++ "profile_format" : "Novo formato de perfil", ++ "profile_format.description" : "Perfis SMM2 não são compatíveis com SMM3! Seus perfis existentes foram migrados automaticamente, mas você não pode importar nenhum perfil criado com SMM2.", ++ "queue" : "Fila de ações", ++ "queue.description" : "Coloque na fila vários downloads/desinstalações de mod de uma só vez.", ++ "servers" : "Gerenciamento de servidor dedicado", ++ "servers.description" : "Gerencie facilmente servidores via sistema de arquivos, SFTP, FTP e SMB!", ++ "translation" : "Suporte de tradução", ++ "translation.description" : "Junte-se ao nosso Discord para traduzir SMM para o seu idioma!", ++ "ui" : "Atualização da interface do usuário", ++ "ui.description" : "Uma nova camada de tinta para celebrar o Satisfactory 1.0!" ++ }, ++ "intro" : "Fizemos muitas melhorias nesta versão. Aqui estão alguns dos destaques:", ++ "open_guide" : "Abra a documentação do SMM3", ++ "title" : "Bem-vindo ao Satisfactory Mod Manager Versão 3!" ++ }, ++ "updates" : { ++ "changelog" : "Registro de alterações", ++ "check-for-updates" : "Verificar atualizações", ++ "checking-for-updates" : "Verificando atualizações...", ++ "hide-ignored" : "Ocultar ignorados", ++ "ignore" : "Ignorar", ++ "mod-update-available" : "{updates, plural, one {{updates} atualização de mod disponível} other {{updates} atualizações de mods disponíveis}}", ++ "no-updates" : "Sem atualizações de mod/SMM no momento", ++ "show-ignored" : "Mostrar ignorados", ++ "smm-update-available" : "Atualização SMM disponível", ++ "title" : "Atualizações", ++ "unignore" : "Designorar", ++ "update-all" : "Atualizar tudo", ++ "update-selected" : "Atualização selecionada" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/ru.json b/frontend/src/lib/generated/i18n/ru.json +new file mode 100644 +index 0000000..3928afb +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/ru.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "Перейти в офлайн", ++ "go-online" : "Перейти в онлайн", ++ "healthcheck" : "Не удалось подключиться к ficsit.app. Проверьте ваше интернет-соединение или попробуйте использовать автономный режим. (Настройки Mod Manager > Играть Офлайн)", ++ "offline" : "Вы сейчас офлайн. Некоторые функции могут быть недоступны. (Чтобы снова подключиться, воспользуйтесь Настройки Mod Manager > Играть Онлайн)" ++ }, ++ "common" : { ++ "add" : "Добавить", ++ "cancel" : "Отмена", ++ "close" : "Закрыть", ++ "delete" : "Удалить", ++ "import" : "Импортировать", ++ "loading" : "Загрузка...", ++ "rename" : "Переименовать" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "Произошла ошибка при создании отладочного файла. Пожалуйста, вручную проверьте журналы Satisfactory Mod Manager для получения дополнительной информации и сообщите об этом на Discord. Используйте кнопку ниже, чтобы открыть документацию и узнать, как это сделать.", ++ "generate_debug_info" : "Создать отладочную информацию", ++ "help" : "Что-то не так? Нажмите кнопку ниже и отправьте сгенерированный zip-файл в <1>Discord сервер моддеров в канал #help-using-mods.", ++ "invalid_installs" : "{invalidInstalls, plural, one {Обнаружена неверная установка Satisfactory} other {Обнаружены неверные установки Satisfactory}}", ++ "no_installs" : "Установки Satisfactory не найдены", ++ "open_log_docs" : "Открыть документацию", ++ "open_modding_discord" : "Открыть Discord для моддеров", ++ "open_modding_discord.must_generate_debug_first" : "Сначала необходимо сгенерировать отладочную информацию", ++ "reporting_directions" : "Кажется, что что-то не так? Нажмите кнопку ниже, чтобы собрать журналы, а затем отправьте сгенерированный zip-файл в Discord для моддеров в канале #help-using-mods.", ++ "title" : "Что-то пошло не так" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "Уже установлено", ++ "error-loading" : "Ошибка при загрузке данных мода", ++ "in-queue" : "В очереди", ++ "install" : "Установить", ++ "latest-version" : "Последняя версия", ++ "title" : "Установить мод", ++ "version" : "Версия {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "Начать!", ++ "change_later_hint" : "Вы можете изменить эти настройки в любое время в меню \"Настройки Mod Manager\".", ++ "intro" : "Выберите свои предпочтения, чтобы начать.", ++ "open_welcome_guide" : "Открыть руководство", ++ "option" : { ++ "language" : { ++ "title" : "Использовать этот язык, если доступен:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "Ждать, пока я нажму \"Применить\"", ++ "enabled" : "Применить изменения сразу", ++ "title" : "Когда я добавляю или удаляю мод или переключаю профили..." ++ } ++ }, ++ "title" : "Добро пожаловать в Satisfactory Mod Manager!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "Применить {profile}", ++ "apply-queued" : "Применить {queued, plural, one {одно изменение} other {# изменений}}", ++ "are-you-sure-warning" : "Вы уверены, что хотите запустить?", ++ "cant-launch" : "SMM не может запустить эту установку", ++ "cant-launch-tooltip" : "Менеджер модов не может запустить этот тип установки, но он по-прежнему управляет файлами модов для вас. Запустите Satisfactory через свой обычный лаунчер.", ++ "changes-queued" : "Изменения в файлы модов ещё не внесены. Нажмите кнопку ниже, чтобы применить изменения, которые вы поставили в очередь.\n\nВы в режиме \"Запуск вручную\"", ++ "game-running" : "Ваш лаунчер сообщает, что игра уже запущена (или ещё закрывается).", ++ "incompatible-mods" : "{versionIncompatible, plural, one {несовместимый мод, который не загрузится или приведёт к сбою игры} other {несовместимые моды, которые не загрузятся или приведут к сбою игры}}", ++ "launch-in-progress" : "Запуск игры...", ++ "operation-in-progress" : "Операция уже выполняется.", ++ "play" : "Играть в Satisfactory", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, one {Один мод, который {versionPossiblyCompatible, plural, one {возможно} other {возможно}} несовместим с вашей игрой} other {# модов, которые {versionPossiblyCompatible, plural, one {возможно} other {возможно}} несовместимы с вашей игрой}}", ++ "profile-change-queued" : "Изменения в файлы модов ещё не внесены. Нажмите кнопку ниже, чтобы применить новый профиль.\n\nВы в режиме \"Запуск вручную\"", ++ "ready" : "Вы готовы к действию!\n\nПримечание: Менеджер модов уже завершил установку файлов модов. Вы можете запустить игру через обычный лаунчер, и моды всё равно будут загружены.", ++ "reported-incompatible-mods" : "{reportedIncompatible, plural, one {Один мод} other {# модов}} отмечен как неисправный для этой версии игры. Ознакомьтесь с описанием или примечаниями по совместимости {versionIncompatible, plural, one {этого мода} other {этих модов}} для получения дополнительной информации.", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible, plural, one {Один мод} other {# модов}} отмечен как повреждённый для этой версии игры. Ознакомьтесь с описанием или примечаниями по совместимости {versionIncompatible, plural, one {этого мода} other {этих модов}} для получения дополнительной информации.", ++ "you-have-warning-mods" : "У вас:" ++ }, ++ "left-bar" : { ++ "export" : "Экспортировать", ++ "ficsit-app" : "ficsit.app (Репозиторий модов)", ++ "game-version" : "Выберите установку игры", ++ "help" : "Помощь", ++ "install-invalid" : "Недействительный", ++ "install-invalid-tooltip" : "Статус: SMM не может управлять этой установкой", ++ "install-loading" : "Загрузка...", ++ "install-loading-tooltip" : "Статус: Загрузка...", ++ "install-unknown" : "Неизвестно", ++ "install-unknown-tooltip" : "Статус: Не удалось получить информацию об этой установке", ++ "links" : "Ссылки", ++ "manage-servers" : "Управление серверами", ++ "mods-off" : "Моды отключены", ++ "mods-on" : "Моды включены", ++ "other" : "Другое", ++ "profile" : "Профиль", ++ "queue-blocking-switching-tooltip" : "{number, plural, one { У вас в очереди {number} действие. Примените или отмените {number, plural, one {его} other {их}} перед сменой установок или профилей.} other {У вас в очереди {number} действия. Примените или отмените {number, plural, one {его} other {их}} перед сменой установок или профилей.}}", ++ "satisfactory-modding-discord" : "Discord для модификаций Satisfactory", ++ "smm-github" : "SMM на GitHub", ++ "updates" : "Обновления" ++ }, ++ "mod-changelog" : { ++ "title" : "История изменений <1>{mod}" ++ }, ++ "mod-details" : { ++ "change-version" : "Изменить версию", ++ "change-version-any" : "Любая", ++ "change-version-or-newer" : "или новее", ++ "changelogs" : "История изменений", ++ "compatibility" : "Совместимость", ++ "compatibility-branch" : "Этот мод был отмечен как {state} на {branch}.", ++ "compatibility-unknown" : "Неизвестно", ++ "compatibility-unknown-tooltip" : "Информация о совместимости для этого мода ещё не предоставлена. Попробуйте его и свяжитесь с нами в Discord, чтобы обновить данные!", ++ "contributors" : "Авторы <1>({authors})", ++ "created" : "Создан", ++ "downloads" : "Всего скачиваний", ++ "installed-version" : "Установленная версия", ++ "latest-version" : "Последняя версия", ++ "mod-author" : "Мод от:", ++ "offline-mode" : "Офлайн-режим включён. История изменений и описания недоступны.", ++ "size" : "Размер", ++ "updated" : "Обновлено", ++ "view-on-ficsit-app" : "Посмотреть на ficsit.app", ++ "views" : "Просмотры" ++ }, ++ "mod-list-item" : { ++ "by-author" : "от", ++ "compatibility-note" : "Этот мод отмечен как {state} на этой версии игры.", ++ "compatibility-note-none" : "(Не указано)", ++ "compatibility-warning" : "Обнаружены проблемы с этим модом, но вы всё равно можете попробовать его установить. Подробности:", ++ "dependency" : " Этот мод установлен как зависимость другого мода. Его нельзя установить или удалить отдельно.", ++ "disable" : "Этот мод включён в данном профиле. Нажмите, чтобы отключить его — это предотвратит его загрузку при запуске игры, но он останется частью профиля.", ++ "disable-queued" : "Этот мод поставлен в очередь на отключение. Нажмите, чтобы отменить операцию.", ++ "disabled-tooltip" : "Этот мод отключён. Нажмите на значок паузы, чтобы включить его.", ++ "enable" : "Нажмите, чтобы включить этот мод.", ++ "enable-queued" : "Этот мод поставлен в очередь на включение. Нажмите, чтобы отменить операцию.", ++ "favorite" : "Нажмите, чтобы добавить этот мод в избранное. Избранные моды не обязательно должны быть установлены — это просто способ отслеживать их для будущего, независимо от выбранного профиля.", ++ "hidden" : "Этот мод был скрыт автором.", ++ "install" : "Нажмите, чтобы установить этот мод.", ++ "no-tags" : "(не доступно)", ++ "not-installable" : "Вы не можете установить этот мод. Причина:", ++ "queued" : "Этот мод уже поставлен в очередь на другую операцию.", ++ "queued-install" : "Этот мод поставлен в очередь на установку. Нажмите, чтобы отменить операцию.", ++ "queued-uninstall" : "Этот мод поставлен в очередь на удаление. Нажмите, чтобы отменить операцию.", ++ "unavailable" : "Этот мод больше недоступен на ficsit.app. Возможно, вам стоит его удалить.", ++ "unfavorite" : "Нажмите, чтобы удалить этот мод из избранного.", ++ "uninstall" : "Этот мод установлен в данном профиле. Нажмите, чтобы удалить этот мод.", ++ "wait" : "Подождите завершения текущей операции." ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(Дополнительные заметки отсутствуют)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "Все моды", ++ "compatible" : "Совместимые", ++ "dependency" : "Зависимые", ++ "disabled" : "Отключённые", ++ "enabled" : "Включённые", ++ "favorite" : "Избранные", ++ "installed" : "Установленные", ++ "not-installed" : "Не установленные", ++ "queued" : "В очереди" ++ }, ++ "order-by" : { ++ "downloads" : "Загрузки", ++ "hotness" : "Популярность", ++ "last-updated" : "Последнее обновление", ++ "name" : "Название", ++ "popularity" : "Популярность", ++ "views" : "Просмотры" ++ }, ++ "search" : "Поиск модов" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : " Нет модов, соответствующих вашим фильтрам", ++ "no-mods-found" : "Моды не найдены", ++ "show-all" : "Показать все" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "Название профиля", ++ "profile-name-placeholder" : "Новое имя профиля", ++ "title" : "Добавить профиль" ++ }, ++ "delete" : { ++ "profile-name" : "Название профиля", ++ "title" : "Удалить профиль" ++ }, ++ "import" : { ++ "profile-file" : "Файл профиля", ++ "profile-name" : "Название профиля", ++ "profile-name-placeholder" : "Новое имя профиля", ++ "profile-version-warning" : "Этот профиль создан в более новой версии игры. Он может быть несовместим с данной версией.", ++ "title" : "Импортировать профиль" ++ }, ++ "rename" : { ++ "new-profile" : "Новое имя профиля", ++ "new-profile-placeholder" : "Новый профиль", ++ "old-profile" : "Старое имя профиля", ++ "old-profile-placeholder" : "Старый профиль", ++ "title" : "Переименовать профиль" ++ } ++ }, ++ "server-manager" : { ++ "add" : "Добавить", ++ "advanced-note" : "Учтите, что вам, возможно, придётся экранировать определённые символы в имени пользователя и пароле", ++ "advanced-path-placeholder" : "user:pass@host:port/path", ++ "existing-servers" : { ++ "none-yet" : null, ++ "title" : null ++ }, ++ "failed-to-connect" : "Не удалось подключиться к серверу, нажмите для повторной попытки", ++ "get-help" : "Получить помощь по подключению к серверам", ++ "host-placeholder" : "хост", ++ "invalid" : "SMM не может управлять этой установкой", ++ "loading" : "Загрзука...", ++ "local-path-placeholder" : "C:\\Путь\\До\\Сервера", ++ "name-placeholder" : "Имя (по умолчанию: {default})", ++ "new-server" : { ++ "title" : null ++ }, ++ "password-placeholder" : "пароль", ++ "path-placeholder" : "путь", ++ "port-placeholder" : "порт (по умолчанию: {default})", ++ "switch-to-advanced" : "Переключиться в расширенный режим", ++ "switch-to-simple" : "Переключиться в простой режим", ++ "title" : "Выделенные серверы", ++ "username-placeholder" : "имя пользователя", ++ "validating" : "Проверка..." ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "Не удалось получить список директории", ++ "failed-valid-check" : "Не удалось проверить, является ли выбранный путь корректным сервером" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "Расположение кеша", ++ "reset" : "Сбросить по умолчанию", ++ "save" : "Сохранить и переместить", ++ "title" : "Изменить расположение кеша загрузок" ++ }, ++ "change-cache-location" : "Изменить расположение кеша", ++ "copy-mod-list" : "Копировать список модов", ++ "debug" : "Отладка", ++ "generate-debug-info" : "Создать информацию для отладки", ++ "go-online-offline" : "Перейти {offline, select, true {в онлайн} other {в офлайн}}", ++ "language" : "Язык", ++ "launch-button" : "Кнопка запуска", ++ "launch-button.button" : "Кнопка", ++ "launch-button.cat" : "Ньян", ++ "launch-button.normal" : "Обычный", ++ "proxy" : { ++ "proxy" : "Прокси", ++ "remove" : "Удалить прокси", ++ "save" : "Сохранить и перезапустить", ++ "title" : "Установить прокси" ++ }, ++ "queue" : "Очередь", ++ "queue.start-immediately" : "Начать немедленно", ++ "queue.start-manually" : "Запуск вручную", ++ "save-window-position" : "Сохранить положение окна", ++ "secret-settings" : "Секретные настройки", ++ "set-proxy" : "Настроить прокси", ++ "settings" : "Настройки", ++ "smm-debug-logging" : "Логирование отладки SMM", ++ "start-view" : "Стартовый экран", ++ "start-view.compact" : "Компактный", ++ "start-view.expanded" : "Расширенный", ++ "title" : "Настройки менеджера модов", ++ "update-check" : "Проверка обновлений", ++ "update-check.ask" : "Спрашивать при обнаружении", ++ "update-check.on-exit" : "При выходе", ++ "update-check.on-start" : "При запуске" ++ }, ++ "smm-update" : { ++ "downloading" : "Загрузка в фоновом режиме", ++ "downloading-stats" : "Загрузка обновления: {current} / {total}, {speed}/с, ETA {eta}", ++ "title" : "Доступно обновление SMM - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "Улучшенная производительность", ++ "performance.description" : "Поддерживаем вашу эффективность!", ++ "platform_support" : "Родная поддержка Linux Heroic, Steam Snap, Mac", ++ "platform_support.description" : "Получите сборку из релизов на GitHub, если ещё не сделали этого!", ++ "profile_format" : "Новый формат профиля", ++ "profile_format.description" : "Профили SMM2 несовместимы с SMM3! Ваши текущие профили были автоматически перенесены, но вы не сможете импортировать профили, созданные в SMM2.", ++ "queue" : "Очередь действий", ++ "queue.description" : "Ставьте в очередь несколько загрузок/удалений модов одновременно.", ++ "servers" : "Управление выделенными серверами", ++ "servers.description" : "Легко управляйте серверами через файловую систему, SFTP, FTP и SMB!", ++ "translation" : "Поддержка переводов", ++ "translation.description" : "Присоединяйтесь к нашему Discord, чтобы помочь с переводом SMM на ваш язык!", ++ "ui" : "Обновление интерфейса пользователя", ++ "ui.description" : "Новый облик в честь релиза Satisfactory 1.0!" ++ }, ++ "intro" : "Мы внесли множество улучшений в этой версии. Вот основные моменты:", ++ "open_guide" : "Открыть документацию SMM3", ++ "title" : "Добро пожаловать в Satisfactory Mod Manager версии 3!" ++ }, ++ "updates" : { ++ "changelog" : "История изменений", ++ "check-for-updates" : "Проверить обновления", ++ "checking-for-updates" : "Проверка обновлений...", ++ "hide-ignored" : "Скрыть проигнорированные", ++ "ignore" : "Игнорировать", ++ "mod-update-available" : "{updates, plural, one {доступно обновление мода {updates}} other {доступны обновления модов {updates}}}", ++ "no-updates" : "Сейчас нет доступных обновлений модов или SMM", ++ "show-ignored" : "Показать проигнорированные", ++ "smm-update-available" : "Доступно обновление SMM", ++ "title" : "Обновления", ++ "unignore" : "Прекратить игнорировать", ++ "update-all" : "Обновить всё", ++ "update-selected" : "Обновить выбранные" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/tr.json b/frontend/src/lib/generated/i18n/tr.json +new file mode 100644 +index 0000000..8abbb23 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/tr.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : null, ++ "go-online" : null, ++ "healthcheck" : null, ++ "offline" : null ++ }, ++ "common" : { ++ "add" : null, ++ "cancel" : null, ++ "close" : null, ++ "delete" : null, ++ "import" : null, ++ "loading" : null, ++ "rename" : null ++ }, ++ "error" : { ++ "failed_to_generate_debug" : null, ++ "generate_debug_info" : null, ++ "help" : null, ++ "invalid_installs" : null, ++ "no_installs" : null, ++ "open_log_docs" : null, ++ "open_modding_discord" : null, ++ "open_modding_discord.must_generate_debug_first" : null, ++ "reporting_directions" : null, ++ "title" : null ++ }, ++ "external-install-mod" : { ++ "already-installed" : null, ++ "error-loading" : null, ++ "in-queue" : null, ++ "install" : null, ++ "latest-version" : null, ++ "title" : null, ++ "version" : null ++ }, ++ "first_time_setup" : { ++ "acknowledge" : null, ++ "change_later_hint" : null, ++ "intro" : null, ++ "open_welcome_guide" : null, ++ "option" : { ++ "language" : { ++ "title" : null ++ }, ++ "queue-auto-start" : { ++ "disabled" : null, ++ "enabled" : null, ++ "title" : null ++ } ++ }, ++ "title" : null ++ }, ++ "launch-button" : { ++ "apply-profile-change" : null, ++ "apply-queued" : null, ++ "are-you-sure-warning" : null, ++ "cant-launch" : null, ++ "cant-launch-tooltip" : null, ++ "changes-queued" : null, ++ "game-running" : null, ++ "incompatible-mods" : null, ++ "launch-in-progress" : null, ++ "operation-in-progress" : null, ++ "play" : null, ++ "possibly-incompatible-mods" : null, ++ "profile-change-queued" : null, ++ "ready" : null, ++ "reported-incompatible-mods" : null, ++ "reported-possibly-compatible-mods" : null, ++ "you-have-warning-mods" : null ++ }, ++ "left-bar" : { ++ "export" : null, ++ "ficsit-app" : null, ++ "game-version" : null, ++ "help" : null, ++ "install-invalid" : null, ++ "install-invalid-tooltip" : null, ++ "install-loading" : null, ++ "install-loading-tooltip" : null, ++ "install-unknown" : null, ++ "install-unknown-tooltip" : null, ++ "links" : null, ++ "manage-servers" : null, ++ "mods-off" : null, ++ "mods-on" : null, ++ "other" : null, ++ "profile" : null, ++ "queue-blocking-switching-tooltip" : null, ++ "satisfactory-modding-discord" : null, ++ "smm-github" : null, ++ "updates" : null ++ }, ++ "mod-changelog" : { ++ "title" : null ++ }, ++ "mod-details" : { ++ "change-version" : null, ++ "change-version-any" : null, ++ "change-version-or-newer" : null, ++ "changelogs" : null, ++ "compatibility" : null, ++ "compatibility-branch" : null, ++ "compatibility-unknown" : null, ++ "compatibility-unknown-tooltip" : null, ++ "contributors" : null, ++ "created" : null, ++ "downloads" : null, ++ "installed-version" : null, ++ "latest-version" : null, ++ "mod-author" : null, ++ "offline-mode" : null, ++ "size" : null, ++ "updated" : null, ++ "view-on-ficsit-app" : null, ++ "views" : null ++ }, ++ "mod-list-item" : { ++ "by-author" : null, ++ "compatibility-note" : null, ++ "compatibility-note-none" : null, ++ "compatibility-warning" : null, ++ "dependency" : null, ++ "disable" : null, ++ "disable-queued" : null, ++ "disabled-tooltip" : null, ++ "enable" : null, ++ "enable-queued" : null, ++ "favorite" : null, ++ "hidden" : null, ++ "install" : null, ++ "no-tags" : null, ++ "not-installable" : null, ++ "queued" : null, ++ "queued-install" : null, ++ "queued-uninstall" : null, ++ "unavailable" : null, ++ "unfavorite" : null, ++ "uninstall" : null, ++ "wait" : null ++ }, ++ "mod" : { ++ "compatibility-no-notes" : null ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : null, ++ "compatible" : null, ++ "dependency" : null, ++ "disabled" : null, ++ "enabled" : null, ++ "favorite" : null, ++ "installed" : null, ++ "not-installed" : null, ++ "queued" : null ++ }, ++ "order-by" : { ++ "downloads" : null, ++ "hotness" : null, ++ "last-updated" : null, ++ "name" : null, ++ "popularity" : null, ++ "views" : null ++ }, ++ "search" : null ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : null, ++ "no-mods-found" : null, ++ "show-all" : null ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : null, ++ "profile-name-placeholder" : null, ++ "title" : null ++ }, ++ "delete" : { ++ "profile-name" : null, ++ "title" : null ++ }, ++ "import" : { ++ "profile-file" : null, ++ "profile-name" : null, ++ "profile-name-placeholder" : null, ++ "profile-version-warning" : null, ++ "title" : null ++ }, ++ "rename" : { ++ "new-profile" : null, ++ "new-profile-placeholder" : null, ++ "old-profile" : null, ++ "old-profile-placeholder" : null, ++ "title" : null ++ } ++ }, ++ "server-manager" : { ++ "add" : null, ++ "advanced-note" : null, ++ "advanced-path-placeholder" : null, ++ "existing-servers" : { ++ "none-yet" : null, ++ "title" : null ++ }, ++ "failed-to-connect" : null, ++ "get-help" : null, ++ "host-placeholder" : null, ++ "invalid" : null, ++ "loading" : null, ++ "local-path-placeholder" : null, ++ "name-placeholder" : null, ++ "new-server" : { ++ "title" : null ++ }, ++ "password-placeholder" : null, ++ "path-placeholder" : null, ++ "port-placeholder" : null, ++ "switch-to-advanced" : null, ++ "switch-to-simple" : null, ++ "title" : null, ++ "username-placeholder" : null, ++ "validating" : null ++ }, ++ "server-picker" : { ++ "failed-list-dir" : null, ++ "failed-valid-check" : null ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : null, ++ "reset" : null, ++ "save" : null, ++ "title" : null ++ }, ++ "change-cache-location" : null, ++ "copy-mod-list" : null, ++ "debug" : null, ++ "generate-debug-info" : null, ++ "go-online-offline" : null, ++ "language" : null, ++ "launch-button" : null, ++ "launch-button.button" : null, ++ "launch-button.cat" : null, ++ "launch-button.normal" : null, ++ "proxy" : { ++ "proxy" : null, ++ "remove" : null, ++ "save" : null, ++ "title" : null ++ }, ++ "queue" : null, ++ "queue.start-immediately" : null, ++ "queue.start-manually" : null, ++ "save-window-position" : null, ++ "secret-settings" : null, ++ "set-proxy" : null, ++ "settings" : null, ++ "smm-debug-logging" : null, ++ "start-view" : null, ++ "start-view.compact" : null, ++ "start-view.expanded" : null, ++ "title" : null, ++ "update-check" : null, ++ "update-check.ask" : null, ++ "update-check.on-exit" : null, ++ "update-check.on-start" : null ++ }, ++ "smm-update" : { ++ "downloading" : null, ++ "downloading-stats" : null, ++ "title" : null ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : null, ++ "performance.description" : null, ++ "platform_support" : null, ++ "platform_support.description" : null, ++ "profile_format" : null, ++ "profile_format.description" : null, ++ "queue" : null, ++ "queue.description" : null, ++ "servers" : null, ++ "servers.description" : null, ++ "translation" : null, ++ "translation.description" : null, ++ "ui" : null, ++ "ui.description" : null ++ }, ++ "intro" : null, ++ "open_guide" : null, ++ "title" : null ++ }, ++ "updates" : { ++ "changelog" : null, ++ "check-for-updates" : null, ++ "checking-for-updates" : null, ++ "hide-ignored" : null, ++ "ignore" : null, ++ "mod-update-available" : null, ++ "no-updates" : null, ++ "show-ignored" : null, ++ "smm-update-available" : null, ++ "title" : null, ++ "unignore" : null, ++ "update-all" : null, ++ "update-selected" : null ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/zh-Hans.json b/frontend/src/lib/generated/i18n/zh-Hans.json +new file mode 100644 +index 0000000..ee8f53b +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/zh-Hans.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "进入离线模式", ++ "go-online" : "进入在线模式", ++ "healthcheck" : "无法访问模组仓库 ficsit.app。检查网络连接,或使用离线模式。(设置 > 进入离线模式)", ++ "offline" : "您目前处于离线状态。某些功能不可用。(设置 > 进入在线模式)" ++ }, ++ "common" : { ++ "add" : "添加", ++ "cancel" : "取消", ++ "close" : "关闭", ++ "delete" : "删除", ++ "import" : "导入", ++ "loading" : "加载中…", ++ "rename" : "重命名" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : "生成调试文件时发生错误。请手动查看模组管理器日志文件以获取更多信息,并在Discord上报告此信息。点击下方按钮可打开文档查看详细步骤。", ++ "generate_debug_info" : "生成调试信息", ++ "help" : "出错了?点击下方按钮并将生成的 zip 文件发送到 <1>模组 Discord 的 #help-using-mods 频道。", ++ "invalid_installs" : "{invalidInstalls, plural, other {已找到 {invalidInstalls} 个无效的幸福工厂安装路径}}", ++ "no_installs" : "未找到到幸福工厂安装路径", ++ "open_log_docs" : "打开日志说明文档", ++ "open_modding_discord" : "打开模组社区 Discord", ++ "open_modding_discord.must_generate_debug_first" : "需要首先生成调试信息", ++ "reporting_directions" : "出错了?点击下方按钮收集日志,然后将生成的 zip 文件发送到模组 Discord 的 #help-using-mods 频道。", ++ "title" : "出错了!" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "已安装", ++ "error-loading" : "加载模组详细信息时出错", ++ "in-queue" : "在队列中", ++ "install" : "安装", ++ "latest-version" : "最新版本", ++ "title" : "安装模组", ++ "version" : "版本 {version}" ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "开始使用!", ++ "change_later_hint" : "随时可在“模组管理器设置”菜单中更改这些设置。", ++ "intro" : "开始前,请选择您的使用偏好。", ++ "open_welcome_guide" : "开启欢迎指南", ++ "option" : { ++ "language" : { ++ "title" : "使用下列可用的语言:" ++ }, ++ "queue-auto-start" : { ++ "disabled" : "等待“应用”键按下", ++ "enabled" : "立即应用更改", ++ "title" : "当增删模组或切换配置文件时..." ++ } ++ }, ++ "title" : "欢迎使用幸福工程模组管理器!" ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "应用 {profile}", ++ "apply-queued" : "应用 {queued} 个更新", ++ "are-you-sure-warning" : "您确定要启动吗?", ++ "cant-launch" : "SMM 无法启动游戏", ++ "cant-launch-tooltip" : "模组管理器无法启动该游戏版本,但仍会管理您的模组文件。您可从游戏启动器正常启动幸福工厂。", ++ "changes-queued" : "模组文件尚未进行更改。单击下方按钮以应用已排队的更改。\n\n(队列模式为手动开始)", ++ "game-running" : "游戏启动器显示游戏已在运行(或在关闭中)", ++ "incompatible-mods" : "{versionIncompatible, plural, other {{versionIncompatible} 个不兼容的模组,游戏可能无法加载或崩溃}}", ++ "launch-in-progress" : "启动中…", ++ "operation-in-progress" : "正在进行操作。", ++ "play" : "幸福工厂 启动", ++ "possibly-incompatible-mods" : "{versionPossiblyCompatible, plural, other {{versionPossiblyCompatible} 个模组可能与您的游戏不兼容}}", ++ "profile-change-queued" : "模组文件尚未进行更改。单击以应用新配置。\n\n(队列模式为手动开始)", ++ "ready" : "准备就绪!\n\n注意:模组管理器已经为您完成了模组的安装。也可以从游戏启动器正常启动游戏,模组仍会加载。", ++ "reported-incompatible-mods" : "{reportedPossiblyCompatible} 个模组已被报告损坏,请阅读模组描述或兼容性说明", ++ "reported-possibly-compatible-mods" : "{reportedPossiblyCompatible} 个模组已被报告危险,请阅读模组描述或兼容性说明", ++ "you-have-warning-mods" : "您有:" ++ }, ++ "left-bar" : { ++ "export" : "导出", ++ "ficsit-app" : "ficsit.app(模组仓库)", ++ "game-version" : "选择已安装游戏", ++ "help" : "帮助", ++ "install-invalid" : "无效", ++ "install-invalid-tooltip" : "状态:SMM 无法管理此游戏版本", ++ "install-loading" : "加载中…", ++ "install-loading-tooltip" : "状态:加载中…", ++ "install-unknown" : "未知", ++ "install-unknown-tooltip" : "状态:无法获取有关此游戏版本的信息", ++ "links" : "链接", ++ "manage-servers" : "服务器管理", ++ "mods-off" : "关闭模组", ++ "mods-on" : "开启模组", ++ "other" : "其他选项", ++ "profile" : "配置文件", ++ "queue-blocking-switching-tooltip" : "{number, plural, other {您有 {number} 个已排队的操作。在切换游戏或配置前,请应用或取消这些操作。}}", ++ "satisfactory-modding-discord" : "幸福工厂模组 Discord", ++ "smm-github" : "SMM GitHub", ++ "updates" : "更新" ++ }, ++ "mod-changelog" : { ++ "title" : "<1>{mod} 更新日志" ++ }, ++ "mod-details" : { ++ "change-version" : "更改版本", ++ "change-version-any" : "任意版本", ++ "change-version-or-newer" : "或更新", ++ "changelogs" : "更新日志", ++ "compatibility" : "兼容性", ++ "compatibility-branch" : "该模组在 {branch} 中被报告 {state}。", ++ "compatibility-unknown" : "未知", ++ "compatibility-unknown-tooltip" : "目前没有报告兼容性信息。请测试并在 Discord 上联系我们,以保持更新。", ++ "contributors" : "贡献者 <1>({authors})", ++ "created" : "创建于", ++ "downloads" : "下载量", ++ "installed-version" : "已安装版本", ++ "latest-version" : "最新版本", ++ "mod-author" : "作者:", ++ "offline-mode" : "离线模式已启用。无法浏览更新日志和模组详情。", ++ "size" : "大小", ++ "updated" : "更新于", ++ "view-on-ficsit-app" : "在 ficsit.app 上查看", ++ "views" : "浏览量" ++ }, ++ "mod-list-item" : { ++ "by-author" : "by", ++ "compatibility-note" : "该模组在当前游戏版本中被报告 {state}。", ++ "compatibility-note-none" : "(无详情)", ++ "compatibility-warning" : "该模组被报告存在问题,但您仍然可以尝试安装它。详情:", ++ "dependency" : "该模组为其他模组的依赖项。无法单独安装或卸载。", ++ "disable" : "该模组已启用于本配置文件。单击以禁用模组,启动游戏时不加载此模组,但其仍将保留在本配置文件中。", ++ "disable-queued" : "该模组正在等待禁用。单击以取消操作。", ++ "disabled-tooltip" : "该模组已禁用。单击暂停图标以启用模组。", ++ "enable" : "单击以启用模组。", ++ "enable-queued" : "该模组正在等待启用。单击以取消操作。", ++ "favorite" : "单击以添加到收藏夹。模组收藏仅为当前配置档的标记,与它是否安装无关。", ++ "hidden" : "该模组已被作者隐藏。", ++ "install" : "单击以安装此模组。", ++ "no-tags" : "(暂无标签)", ++ "not-installable" : "无法安装此模组。原因:", ++ "queued" : "该模组已排队等候另一项操作。", ++ "queued-install" : "该模组正在等待安装。单击以取消操作。", ++ "queued-uninstall" : "该模组正在等待卸载。单击以取消操作。", ++ "unavailable" : "该模组在 ficsit.app 上不再可用。您或许可以将其删除。", ++ "unfavorite" : "单击以取消收藏。", ++ "uninstall" : "该模组已安装于本配置文件。单击以卸载模组。", ++ "wait" : "等待当前操作完成。" ++ }, ++ "mod" : { ++ "compatibility-no-notes" : "(未提供更多信息)" ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : "所有模组", ++ "compatible" : "版本兼容", ++ "dependency" : "依赖项", ++ "disabled" : "已禁用", ++ "enabled" : "已启用", ++ "favorite" : "已收藏", ++ "installed" : "已安装", ++ "not-installed" : "未安装", ++ "queued" : "准备安装" ++ }, ++ "order-by" : { ++ "downloads" : "下载量", ++ "hotness" : "近期热度", ++ "last-updated" : "最近更新", ++ "name" : "名称", ++ "popularity" : "近期人气", ++ "views" : "浏览量" ++ }, ++ "search" : "搜索模组" ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : "没有符合条件的模组", ++ "no-mods-found" : "未找到模组", ++ "show-all" : "展示所有" ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "配置名", ++ "profile-name-placeholder" : "新配置名称", ++ "title" : "添加配置文件" ++ }, ++ "delete" : { ++ "profile-name" : "配置名", ++ "title" : "删除配置文件" ++ }, ++ "import" : { ++ "profile-file" : "配置文件", ++ "profile-name" : "配置名", ++ "profile-name-placeholder" : "新配置名称", ++ "profile-version-warning" : "此配置文件是使用较新版本的游戏创建的。可能与此版本不兼容。", ++ "title" : "导入配置文件" ++ }, ++ "rename" : { ++ "new-profile" : "新配置", ++ "new-profile-placeholder" : "新配置名称", ++ "old-profile" : "旧配置", ++ "old-profile-placeholder" : "旧配置名称", ++ "title" : "重命名配置文件" ++ } ++ }, ++ "server-manager" : { ++ "add" : "添加", ++ "advanced-note" : "请注意转义用户名和密码中的某些字符", ++ "advanced-path-placeholder" : "user:pass@host:port/path", ++ "existing-servers" : { ++ "none-yet" : null, ++ "title" : null ++ }, ++ "failed-to-connect" : "服务器连接失败,请点击重试", ++ "get-help" : "获取连接到服务器的帮助", ++ "host-placeholder" : "主机地址", ++ "invalid" : "SMM 无法管理此服务器", ++ "loading" : "加载中…", ++ "local-path-placeholder" : "服务器路径 C:\\...", ++ "name-placeholder" : "用户名(默认:{default})", ++ "new-server" : { ++ "title" : null ++ }, ++ "password-placeholder" : "密码", ++ "path-placeholder" : "路径", ++ "port-placeholder" : "端口(默认:{default})", ++ "switch-to-advanced" : "切换到高级模式", ++ "switch-to-simple" : "切换到简单模式", ++ "title" : "独立服务器", ++ "username-placeholder" : "用户名", ++ "validating" : "验证中…" ++ }, ++ "server-picker" : { ++ "failed-list-dir" : "无法列出目录", ++ "failed-valid-check" : "无法检查所选路径是否为有效服务器" ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : "缓存路径", ++ "reset" : "重置为默认", ++ "save" : "保存并移动", ++ "title" : "更改下载缓存路径" ++ }, ++ "change-cache-location" : "更改缓存路径", ++ "copy-mod-list" : "复制模组列表", ++ "debug" : "调试", ++ "generate-debug-info" : "生成调试信息", ++ "go-online-offline" : "进入{offline, select, true {在线} other {离线}}模式", ++ "language" : "语言", ++ "launch-button" : "启动按钮", ++ "launch-button.button" : "按钮", ++ "launch-button.cat" : "彩虹猫", ++ "launch-button.normal" : "正常", ++ "proxy" : { ++ "proxy" : "代理", ++ "remove" : "删除代理", ++ "save" : "保存并重启", ++ "title" : "代理设置" ++ }, ++ "queue" : "更新队列", ++ "queue.start-immediately" : "立即开始", ++ "queue.start-manually" : "手动开始", ++ "save-window-position" : null, ++ "secret-settings" : "神秘设置", ++ "set-proxy" : "代理设置", ++ "settings" : "设置", ++ "smm-debug-logging" : "记录 SMM 调试日志", ++ "start-view" : "启动时样式", ++ "start-view.compact" : "紧凑", ++ "start-view.expanded" : "展开", ++ "title" : "模组管理器设置", ++ "update-check" : "检查更新", ++ "update-check.ask" : "查询到更新时", ++ "update-check.on-exit" : "退出时", ++ "update-check.on-start" : "启动时" ++ }, ++ "smm-update" : { ++ "downloading" : "后台下载", ++ "downloading-stats" : "更新下载中:{current}/{total},{speed}/s,预计 {eta}", ++ "title" : "有可用的 SMM 更新 - {version}" ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : "性能提升", ++ "performance.description" : "让您保持高效!", ++ "platform_support" : "原生支持Linux Heroic、Steam Snap 和 Mac", ++ "platform_support.description" : "没有的话可以从 GitHub releases 下载构建版。", ++ "profile_format" : "新的配置文件格式", ++ "profile_format.description" : "SMM2 配置文件与 SMM3 不兼容!您现有的配置文件已自动迁移,但无法导入任何 SMM2 创建的配置文件。", ++ "queue" : "行动队列", ++ "queue.description" : "一次性排队下载/卸载多个模组。", ++ "servers" : "独立服务器管理", ++ "servers.description" : "可通过文件系统、SFTP、FTP 和 SMB 轻松管理服务器!", ++ "translation" : "支持多语言翻译", ++ "translation.description" : "加入 Discord,将 SMM 翻译成您的语言!", ++ "ui" : "全新的用户界面", ++ "ui.description" : "焕然一新的皮肤,庆祝幸福工厂1.0!" ++ }, ++ "intro" : "我们在这个版本中做了很多改进。以下是其中的一些亮点:", ++ "open_guide" : "打开 SMM3 文档", ++ "title" : "欢迎使用幸福工厂模组管理器 v3!" ++ }, ++ "updates" : { ++ "changelog" : "更新日志", ++ "check-for-updates" : "检查更新", ++ "checking-for-updates" : "正在检查更新…", ++ "hide-ignored" : "隐藏已忽略", ++ "ignore" : "忽略", ++ "mod-update-available" : "{updates, plural, other {{updates} 个模组可更新}}", ++ "no-updates" : "暂无 SMM 和模组更新", ++ "show-ignored" : "显示已忽略", ++ "smm-update-available" : "已准备好 SMM 更新", ++ "title" : "更新", ++ "unignore" : "取消忽略", ++ "update-all" : "更新全部", ++ "update-selected" : "更新所选" ++ } ++} +\ No newline at end of file +diff --git a/frontend/src/lib/generated/i18n/zh-Hant.json b/frontend/src/lib/generated/i18n/zh-Hant.json +new file mode 100644 +index 0000000..2977a11 +--- /dev/null ++++ b/frontend/src/lib/generated/i18n/zh-Hant.json +@@ -0,0 +1,311 @@ ++{ ++ "announcement" : { ++ "go-offline" : "進入離線模式", ++ "go-online" : "進入在線模式", ++ "healthcheck" : null, ++ "offline" : null ++ }, ++ "common" : { ++ "add" : "添加", ++ "cancel" : "取消", ++ "close" : "關閉", ++ "delete" : "刪除", ++ "import" : "匯入", ++ "loading" : "載入中...", ++ "rename" : "重新命名" ++ }, ++ "error" : { ++ "failed_to_generate_debug" : null, ++ "generate_debug_info" : null, ++ "help" : null, ++ "invalid_installs" : null, ++ "no_installs" : null, ++ "open_log_docs" : null, ++ "open_modding_discord" : null, ++ "open_modding_discord.must_generate_debug_first" : null, ++ "reporting_directions" : null, ++ "title" : "出錯了!" ++ }, ++ "external-install-mod" : { ++ "already-installed" : "已安裝", ++ "error-loading" : null, ++ "in-queue" : null, ++ "install" : "安裝", ++ "latest-version" : null, ++ "title" : "安裝模組", ++ "version" : null ++ }, ++ "first_time_setup" : { ++ "acknowledge" : "開始使用!", ++ "change_later_hint" : null, ++ "intro" : null, ++ "open_welcome_guide" : "開啟歡迎指南", ++ "option" : { ++ "language" : { ++ "title" : null ++ }, ++ "queue-auto-start" : { ++ "disabled" : null, ++ "enabled" : "立即套用變更", ++ "title" : null ++ } ++ }, ++ "title" : null ++ }, ++ "launch-button" : { ++ "apply-profile-change" : "套用 {profile}", ++ "apply-queued" : "套用 {queued} 個更新", ++ "are-you-sure-warning" : null, ++ "cant-launch" : null, ++ "cant-launch-tooltip" : null, ++ "changes-queued" : null, ++ "game-running" : null, ++ "incompatible-mods" : null, ++ "launch-in-progress" : null, ++ "operation-in-progress" : null, ++ "play" : null, ++ "possibly-incompatible-mods" : null, ++ "profile-change-queued" : null, ++ "ready" : null, ++ "reported-incompatible-mods" : null, ++ "reported-possibly-compatible-mods" : null, ++ "you-have-warning-mods" : "您有:" ++ }, ++ "left-bar" : { ++ "export" : "匯出", ++ "ficsit-app" : "ficsit.app(模組儲存庫)", ++ "game-version" : "選擇已安裝遊戲", ++ "help" : "幫助", ++ "install-invalid" : null, ++ "install-invalid-tooltip" : null, ++ "install-loading" : null, ++ "install-loading-tooltip" : null, ++ "install-unknown" : null, ++ "install-unknown-tooltip" : null, ++ "links" : null, ++ "manage-servers" : null, ++ "mods-off" : null, ++ "mods-on" : null, ++ "other" : null, ++ "profile" : "設定檔", ++ "queue-blocking-switching-tooltip" : null, ++ "satisfactory-modding-discord" : null, ++ "smm-github" : "SMM GitHub", ++ "updates" : null ++ }, ++ "mod-changelog" : { ++ "title" : null ++ }, ++ "mod-details" : { ++ "change-version" : "變更版本", ++ "change-version-any" : null, ++ "change-version-or-newer" : null, ++ "changelogs" : "變更日誌", ++ "compatibility" : null, ++ "compatibility-branch" : null, ++ "compatibility-unknown" : null, ++ "compatibility-unknown-tooltip" : null, ++ "contributors" : null, ++ "created" : null, ++ "downloads" : null, ++ "installed-version" : null, ++ "latest-version" : null, ++ "mod-author" : null, ++ "offline-mode" : null, ++ "size" : null, ++ "updated" : null, ++ "view-on-ficsit-app" : null, ++ "views" : null ++ }, ++ "mod-list-item" : { ++ "by-author" : null, ++ "compatibility-note" : null, ++ "compatibility-note-none" : "(無詳情)", ++ "compatibility-warning" : null, ++ "dependency" : "此模組是其他模組的依賴。它不能單獨安裝或移除。", ++ "disable" : null, ++ "disable-queued" : null, ++ "disabled-tooltip" : null, ++ "enable" : null, ++ "enable-queued" : null, ++ "favorite" : null, ++ "hidden" : null, ++ "install" : null, ++ "no-tags" : null, ++ "not-installable" : "無法安裝該模組。原因:", ++ "queued" : null, ++ "queued-install" : null, ++ "queued-uninstall" : null, ++ "unavailable" : null, ++ "unfavorite" : null, ++ "uninstall" : null, ++ "wait" : null ++ }, ++ "mod" : { ++ "compatibility-no-notes" : null ++ }, ++ "mods-list-filter" : { ++ "filter" : { ++ "all" : null, ++ "compatible" : null, ++ "dependency" : null, ++ "disabled" : null, ++ "enabled" : null, ++ "favorite" : null, ++ "installed" : null, ++ "not-installed" : null, ++ "queued" : null ++ }, ++ "order-by" : { ++ "downloads" : null, ++ "hotness" : null, ++ "last-updated" : null, ++ "name" : null, ++ "popularity" : null, ++ "views" : null ++ }, ++ "search" : null ++ }, ++ "mods-list" : { ++ "no-mods-filtered" : null, ++ "no-mods-found" : null, ++ "show-all" : null ++ }, ++ "profiles" : { ++ "add" : { ++ "profile-name" : "設定檔名稱", ++ "profile-name-placeholder" : null, ++ "title" : null ++ }, ++ "delete" : { ++ "profile-name" : "設定檔名稱", ++ "title" : null ++ }, ++ "import" : { ++ "profile-file" : "設定檔檔案", ++ "profile-name" : "設定檔名稱", ++ "profile-name-placeholder" : null, ++ "profile-version-warning" : null, ++ "title" : null ++ }, ++ "rename" : { ++ "new-profile" : null, ++ "new-profile-placeholder" : null, ++ "old-profile" : null, ++ "old-profile-placeholder" : null, ++ "title" : null ++ } ++ }, ++ "server-manager" : { ++ "add" : null, ++ "advanced-note" : null, ++ "advanced-path-placeholder" : null, ++ "existing-servers" : { ++ "none-yet" : null, ++ "title" : null ++ }, ++ "failed-to-connect" : null, ++ "get-help" : "取得連線至伺服器的協助", ++ "host-placeholder" : null, ++ "invalid" : null, ++ "loading" : null, ++ "local-path-placeholder" : "伺服器路徑 C:\\...", ++ "name-placeholder" : null, ++ "new-server" : { ++ "title" : null ++ }, ++ "password-placeholder" : null, ++ "path-placeholder" : null, ++ "port-placeholder" : null, ++ "switch-to-advanced" : null, ++ "switch-to-simple" : null, ++ "title" : null, ++ "username-placeholder" : null, ++ "validating" : null ++ }, ++ "server-picker" : { ++ "failed-list-dir" : null, ++ "failed-valid-check" : null ++ }, ++ "settings" : { ++ "cache" : { ++ "cache-location" : null, ++ "reset" : null, ++ "save" : null, ++ "title" : null ++ }, ++ "change-cache-location" : null, ++ "copy-mod-list" : null, ++ "debug" : null, ++ "generate-debug-info" : null, ++ "go-online-offline" : null, ++ "language" : null, ++ "launch-button" : null, ++ "launch-button.button" : null, ++ "launch-button.cat" : null, ++ "launch-button.normal" : null, ++ "proxy" : { ++ "proxy" : null, ++ "remove" : null, ++ "save" : null, ++ "title" : null ++ }, ++ "queue" : null, ++ "queue.start-immediately" : null, ++ "queue.start-manually" : null, ++ "save-window-position" : null, ++ "secret-settings" : null, ++ "set-proxy" : null, ++ "settings" : null, ++ "smm-debug-logging" : null, ++ "start-view" : null, ++ "start-view.compact" : null, ++ "start-view.expanded" : null, ++ "title" : null, ++ "update-check" : null, ++ "update-check.ask" : null, ++ "update-check.on-exit" : null, ++ "update-check.on-start" : null ++ }, ++ "smm-update" : { ++ "downloading" : null, ++ "downloading-stats" : null, ++ "title" : null ++ }, ++ "smm2_migration" : { ++ "feature" : { ++ "performance" : null, ++ "performance.description" : null, ++ "platform_support" : null, ++ "platform_support.description" : null, ++ "profile_format" : null, ++ "profile_format.description" : null, ++ "queue" : null, ++ "queue.description" : null, ++ "servers" : null, ++ "servers.description" : null, ++ "translation" : null, ++ "translation.description" : null, ++ "ui" : null, ++ "ui.description" : null ++ }, ++ "intro" : null, ++ "open_guide" : null, ++ "title" : null ++ }, ++ "updates" : { ++ "changelog" : "變更日誌", ++ "check-for-updates" : null, ++ "checking-for-updates" : null, ++ "hide-ignored" : null, ++ "ignore" : null, ++ "mod-update-available" : null, ++ "no-updates" : null, ++ "show-ignored" : null, ++ "smm-update-available" : null, ++ "title" : null, ++ "unignore" : null, ++ "update-all" : null, ++ "update-selected" : null ++ } ++} +\ No newline at end of file diff --git a/pkgs/by-name/sa/satisfactorymodmanager/dont-vendor-remote-fonts.patch b/pkgs/by-name/sa/satisfactorymodmanager/dont-vendor-remote-fonts.patch new file mode 100644 index 000000000000..bdd785c9de30 --- /dev/null +++ b/pkgs/by-name/sa/satisfactorymodmanager/dont-vendor-remote-fonts.patch @@ -0,0 +1,19 @@ +diff --git a/frontend/postcss.config.cjs b/frontend/postcss.config.cjs +index b315cbc..06e5627 100644 +--- a/frontend/postcss.config.cjs ++++ b/frontend/postcss.config.cjs +@@ -1,4 +1,3 @@ +-const importUrl = require('postcss-import-url'); + const postcssPresetEnv = require('postcss-preset-env'); + const tailwindCSS = require('tailwindcss'); + const tailwindCSSNesting = require('tailwindcss/nesting'); +@@ -12,9 +11,6 @@ module.exports = { + }, + }), + +- importUrl({ +- modernBrowser: true, +- }), + tailwindCSSNesting(), + tailwindCSS(), + ], diff --git a/pkgs/by-name/sa/satisfactorymodmanager/package.nix b/pkgs/by-name/sa/satisfactorymodmanager/package.nix new file mode 100644 index 000000000000..db3b6e1414a5 --- /dev/null +++ b/pkgs/by-name/sa/satisfactorymodmanager/package.nix @@ -0,0 +1,112 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + nodejs, + pnpm_8, + wails, + wrapGAppsHook3, + glib-networking, + makeDesktopItem, + copyDesktopItems, +}: + +buildGoModule rec { + pname = "satisfactorymodmanager"; + version = "3.0.3"; + + src = fetchFromGitHub { + owner = "satisfactorymodding"; + repo = "SatisfactoryModManager"; + tag = "v${version}"; + hash = "sha256-ndvrgSRblm7pVwnGvxpwtGVMEGp+mqpC4kE87lmt36M="; + }; + + patches = [ + # disable postcss-import-url + ./dont-vendor-remote-fonts.patch + + # populates the lib/generated directory + ./add-generated-files.patch + ]; + + postPatch = '' + # don't generate i18n and graphql code + substituteInPlace frontend/package.json \ + --replace-fail '"postinstall":' '"_postinstall":' + ''; + + nativeBuildInputs = [ + nodejs + pnpm_8.configHook + wails + wrapGAppsHook3 + copyDesktopItems + ]; + + buildInputs = [ + glib-networking + ]; + + # we use env because buildGoModule doesn't forward all normal attrs + # this is pretty hacky + env = { + pnpmDeps = pnpm_8.fetchDeps { + inherit pname version src; + sourceRoot = "${src.name}/frontend"; + hash = "sha256-OP+3zsNlvqLFwvm2cnBd2bj2Kc3EghQZE3hpotoqqrQ="; + }; + + pnpmRoot = "frontend"; + }; + + # running this caches some additional dependencies for the FOD + overrideModAttrs = { + preBuild = '' + wails build + ''; + }; + + proxyVendor = true; + + vendorHash = "sha256-3nsJPuwL2Zw/yuHvd8rMSpj9DBBpYUaR19z9TSV/7jg="; + + buildPhase = '' + runHook preBuild + wails build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm755 build/bin/SatisfactoryModManager -t "$out/bin" + + for i in 16 32 64 128 256 512; do + install -D ./icons/"$i"x"$i".png "$out"/share/icons/hicolor/"$i"x"$i"/apps/SatisfactoryModManager.png + done + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "SatisfactoryModManager"; + desktopName = "Satisfactory Mod Manager"; + exec = "SatisfactoryModManager %u"; + mimeTypes = [ "x-scheme-handler/smmanager" ]; + icon = "SatisfactoryModManager"; + terminal = false; + categories = [ "Game" ]; + }) + ]; + + meta = { + broken = stdenv.hostPlatform.isDarwin; + description = "Mod manager and modloader for Satisfactory"; + homepage = "https://github.com/satisfactorymodding/SatisfactoryModManager"; + license = lib.licenses.gpl3Only; + mainProgram = "SatisfactoryModManager"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/sa/saucectl/package.nix b/pkgs/by-name/sa/saucectl/package.nix index a9c20acb0f05..517221e04231 100644 --- a/pkgs/by-name/sa/saucectl/package.nix +++ b/pkgs/by-name/sa/saucectl/package.nix @@ -5,7 +5,7 @@ }: let pname = "saucectl"; - version = "0.194.2"; + version = "0.194.3"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "saucelabs"; repo = "saucectl"; tag = "v${version}"; - hash = "sha256-DxTqhyDO7kA1uIToU3kePA/0rXLVIq58QK6tFE3dayw="; + hash = "sha256-ECOJ+8gAx/LoCV3l9Nl585E9b8MwptpmweJrwzFx2Vc="; }; ldflags = [ diff --git a/pkgs/by-name/sa/sauerbraten/package.nix b/pkgs/by-name/sa/sauerbraten/package.nix index 2951641fbf5f..49925da52112 100644 --- a/pkgs/by-name/sa/sauerbraten/package.nix +++ b/pkgs/by-name/sa/sauerbraten/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { cp -r "../docs/"* $out/share/doc/sauerbraten/ cp sauer_client sauer_server $out/share/sauerbraten/ cp -r ../packages ../data $out/share/sauerbraten/ - ln -s $out/share/sauerbraten/cube.png $out/share/icon/sauerbraten.png + ln -s $out/share/sauerbraten/data/cube.png $out/share/icon/sauerbraten.png makeWrapper $out/share/sauerbraten/sauer_server $out/bin/sauerbraten_server \ --chdir "$out/share/sauerbraten" diff --git a/pkgs/by-name/sc/scaleway-cli/package.nix b/pkgs/by-name/sc/scaleway-cli/package.nix index 1cf763df8793..e85690293277 100644 --- a/pkgs/by-name/sc/scaleway-cli/package.nix +++ b/pkgs/by-name/sc/scaleway-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.38.0"; + version = "2.39.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-3yte4gNl8uBSHfDp11HH+l3trN+d5YcEYajpruyOrKc="; + sha256 = "sha256-i4fEOcoizlCZbyUln8DYVbYcAXgnimCFHV0FdgeOjHE="; }; - vendorHash = "sha256-BYWuAzsfqNtswiNHWzNWusgh0SyxlEBEHdOrGjpd1/8="; + vendorHash = "sha256-dy8alr6DM0sNEWrqW+vATmVKbupbKOuMsAodwgPLHk4="; ldflags = [ "-w" diff --git a/pkgs/by-name/sc/scap-security-guide/package.nix b/pkgs/by-name/sc/scap-security-guide/package.nix old mode 100755 new mode 100644 diff --git a/pkgs/by-name/sc/sccache/package.nix b/pkgs/by-name/sc/sccache/package.nix index f5e89c173587..04a95c7e1bdd 100644 --- a/pkgs/by-name/sc/sccache/package.nix +++ b/pkgs/by-name/sc/sccache/package.nix @@ -4,8 +4,6 @@ rustPlatform, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,14 +23,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; # Tests fail because of client server setup which is not possible inside the # pure environment, see https://github.com/mozilla/sccache/issues/460 diff --git a/pkgs/by-name/sc/schemamap/package.nix b/pkgs/by-name/sc/schemamap/package.nix index 7705bd0d0746..d148bfe1123a 100644 --- a/pkgs/by-name/sc/schemamap/package.nix +++ b/pkgs/by-name/sc/schemamap/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, - darwin, }: let @@ -27,17 +25,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-8UmLAT7Etb9MARoGhvOHPhkdR/8jCEAjAK/mWRHL9hk="; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk; - [ - frameworks.Security - frameworks.CoreFoundation - frameworks.CoreServices - frameworks.SystemConfiguration - ] - ); + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sc/scite/package.nix b/pkgs/by-name/sc/scite/package.nix index a587e493e5fd..9a1bd6a3be0d 100644 --- a/pkgs/by-name/sc/scite/package.nix +++ b/pkgs/by-name/sc/scite/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "scite"; - version = "5.5.5"; + version = "5.5.6"; src = fetchurl { url = "https://www.scintilla.org/scite${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.tgz"; - hash = "sha256-PkXS0qdYYuU10jGO56RgKk/RrOo2GK+7PR7AfSZszOU="; + hash = "sha256-VmNP6NepkF7Ln9eh9pfStmch9nwIKKZTOYxkeduSxrI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sc/screen-pipe/package.nix b/pkgs/by-name/sc/screen-pipe/package.nix index 141eca8d82c7..36118fc16fdd 100644 --- a/pkgs/by-name/sc/screen-pipe/package.nix +++ b/pkgs/by-name/sc/screen-pipe/package.nix @@ -9,9 +9,9 @@ openssl, sqlite, stdenv, - darwin, alsa-lib, xorg, + apple-sdk_12, }: rustPlatform.buildRustPackage rec { pname = "screen-pipe"; @@ -49,22 +49,9 @@ rustPlatform.buildRustPackage rec { openssl sqlite ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_12_3.frameworks; - [ - CoreAudio - AudioUnit - CoreFoundation - CoreGraphics - CoreMedia - IOKit - Metal - MetalPerformanceShaders - Security - ScreenCaptureKit - SystemConfiguration - ] - ) + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_12 + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib xorg.libxcb diff --git a/pkgs/by-name/sc/screenly-cli/package.nix b/pkgs/by-name/sc/screenly-cli/package.nix index 191cfa461cfd..226000e3902c 100644 --- a/pkgs/by-name/sc/screenly-cli/package.nix +++ b/pkgs/by-name/sc/screenly-cli/package.nix @@ -1,12 +1,10 @@ { - darwin, fetchFromGitHub, lib, perl, pkg-config, openssl, rustPlatform, - stdenv, nix-update-script, }: @@ -29,14 +27,7 @@ rustPlatform.buildRustPackage rec { perl ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sc/scryer-prolog/package.nix b/pkgs/by-name/sc/scryer-prolog/package.nix index 3a7274f7af72..261e830134af 100644 --- a/pkgs/by-name/sc/scryer-prolog/package.nix +++ b/pkgs/by-name/sc/scryer-prolog/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,11 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; CARGO_FEATURE_USE_SYSTEM_LIBS = true; diff --git a/pkgs/by-name/sc/scspell/package.nix b/pkgs/by-name/sc/scspell/package.nix new file mode 100644 index 000000000000..4910e200fd9a --- /dev/null +++ b/pkgs/by-name/sc/scspell/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication scspell diff --git a/pkgs/by-name/sd/SDL2_Pango/package.nix b/pkgs/by-name/sd/SDL2_Pango/package.nix index 2746a5fe5d82..7a1575917302 100644 --- a/pkgs/by-name/sd/SDL2_Pango/package.nix +++ b/pkgs/by-name/sd/SDL2_Pango/package.nix @@ -2,7 +2,6 @@ lib, SDL2, autoreconfHook, - darwin, fetchFromGitHub, freetype, pango, @@ -27,15 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - [ - SDL2 - freetype - pango - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc - ]; + buildInputs = [ + SDL2 + freetype + pango + ]; outputs = [ "out" diff --git a/pkgs/by-name/sd/SDL2_classic/package.nix b/pkgs/by-name/sd/SDL2_classic/package.nix index 7af6f1a9cb81..e13b70c3a98d 100644 --- a/pkgs/by-name/sd/SDL2_classic/package.nix +++ b/pkgs/by-name/sd/SDL2_classic/package.nix @@ -3,7 +3,6 @@ stdenv, config, fetchFromGitHub, - fetchpatch, nix-update-script, pkg-config, mesa, @@ -44,12 +43,6 @@ pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio, - AudioUnit, - Cocoa, - CoreAudio, - CoreServices, - ForceFeedback, - OpenGL, audiofile, libiconv, withStatic ? stdenv.hostPlatform.isMinGW, @@ -71,13 +64,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.32.2"; + version = "2.32.4"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-Gtg8G1tRouGZbes1KhsXpYbItpNHYqJCiQKW/L77b+U="; + hash = "sha256-4yUJkttUAbDC/5IdcCFY5ZTIG1qsxEEOjTTuplXV/p4="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ @@ -92,11 +85,6 @@ stdenv.mkDerivation (finalAttrs: { # but on NixOS they're spread across different paths. # This patch + the setup-hook will ensure that `sdl2-config --cflags` works correctly. ./find-headers.patch - # https://github.com/libsdl-org/SDL/issues/12224 - (fetchpatch { - url = "https://github.com/libsdl-org/SDL/commit/9e079fe9c7931738ed63d257b1d7fb8a07b66824.diff"; - hash = "sha256-G8gAivCtw5zuPVI9wvEq2oIo/NxFdnPqyLwrmHG1EJ4="; - }) ]; postPatch = '' @@ -160,15 +148,7 @@ stdenv.mkDerivation (finalAttrs: { [ libiconv ] ++ finalAttrs.dlopenBuildInputs ++ lib.optional ibusSupport ibus - ++ lib.optionals waylandSupport [ wayland-protocols ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioUnit - Cocoa - CoreAudio - CoreServices - ForceFeedback - OpenGL - ]; + ++ lib.optionals waylandSupport [ wayland-protocols ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/sd/SDL2_gfx/package.nix b/pkgs/by-name/sd/SDL2_gfx/package.nix index 4d6f6d77bbd7..ac9332e0ed5b 100644 --- a/pkgs/by-name/sd/SDL2_gfx/package.nix +++ b/pkgs/by-name/sd/SDL2_gfx/package.nix @@ -1,7 +1,6 @@ { lib, SDL2, - darwin, fetchurl, pkg-config, stdenv, @@ -25,19 +24,19 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - [ - SDL2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc - ]; + buildInputs = [ + SDL2 + ]; outputs = [ "out" "dev" ]; + # Missing 'sincos()' implementation fails linking projects + # like 'freeciv_sdl2'. + env.NIX_LDFLAGS = "-lm"; + configureFlags = [ (lib.enableFeature enableMmx "mmx") (lib.enableFeature enableSdltest "sdltest") @@ -45,6 +44,8 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + enableParallelBuilding = true; + passthru = { tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix index 2672f76d3f8b..86a463897705 100644 --- a/pkgs/by-name/sd/SDL2_image/package.nix +++ b/pkgs/by-name/sd/SDL2_image/package.nix @@ -2,7 +2,6 @@ lib, SDL2, autoreconfHook, - darwin, fetchurl, giflib, libXpm, @@ -14,20 +13,18 @@ stdenv, zlib, # Boolean flags + enableSTB ? true, ## Darwin headless will hang when trying to run the SDL test program enableSdltest ? (!stdenv.hostPlatform.isDarwin), }: -let - inherit (darwin.apple_sdk.frameworks) Foundation; -in stdenv.mkDerivation (finalAttrs: { pname = "SDL2_image"; - version = "2.8.5"; + version = "2.8.8"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${finalAttrs.version}.tar.gz"; - hash = "sha256-i8TFf0HiwNt/m3SbJT72zs3G8LaJ7L427pe1ARX/9kU="; + hash = "sha256-IhO1b9r/IiDQ44yOQgy+GoPIc3QZDLqMcK8hVgl84wo="; }; nativeBuildInputs = [ @@ -36,16 +33,17 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = [ - SDL2 - giflib - libXpm - libjpeg - libpng - libtiff - libwebp - zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; + buildInputs = + [ + SDL2 + libtiff + libwebp + zlib + ] + ++ lib.optionals (!enableSTB) [ + libjpeg + libpng + ]; configureFlags = [ @@ -54,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature false "png-shared") (lib.enableFeature false "tif-shared") (lib.enableFeature false "webp-shared") + (lib.enableFeature enableSTB "stb-image") (lib.enableFeature enableSdltest "sdltest") ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/sd/SDL2_image_2_0/package.nix b/pkgs/by-name/sd/SDL2_image_2_0/package.nix deleted file mode 100644 index 4897ff5ad44a..000000000000 --- a/pkgs/by-name/sd/SDL2_image_2_0/package.nix +++ /dev/null @@ -1,17 +0,0 @@ -# Dependency of pygame, toppler -{ SDL2_image, fetchurl }: - -SDL2_image.overrideAttrs (oldAttrs: { - version = "2.0.5"; - src = fetchurl { - inherit (oldAttrs.src) url; - hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA"; - }; - - postPatch = - (oldAttrs.postPatch or "") - + '' - # allow newer autoreconf to run successfully - touch NEWS README AUTHORS ChangeLog - ''; -}) diff --git a/pkgs/by-name/sd/SDL2_mixer/package.nix b/pkgs/by-name/sd/SDL2_mixer/package.nix index 440a7f35ca8b..5c5ed84f87e8 100644 --- a/pkgs/by-name/sd/SDL2_mixer/package.nix +++ b/pkgs/by-name/sd/SDL2_mixer/package.nix @@ -1,7 +1,6 @@ { lib, SDL2, - darwin, fetchFromGitHub, flac, fluidsynth, @@ -19,9 +18,6 @@ enableSmpegtest ? (!stdenv.hostPlatform.isDarwin), }: -let - inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; -in stdenv.mkDerivation (finalAttrs: { pname = "SDL2_mixer"; version = "2.8.1"; @@ -38,12 +34,6 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - AudioUnit - CoreServices - ]; - propagatedBuildInputs = [ SDL2 flac diff --git a/pkgs/by-name/sd/SDL2_net/package.nix b/pkgs/by-name/sd/SDL2_net/package.nix index fb8d1eeedb3b..cb15e00bf4b9 100644 --- a/pkgs/by-name/sd/SDL2_net/package.nix +++ b/pkgs/by-name/sd/SDL2_net/package.nix @@ -1,7 +1,6 @@ { lib, SDL2, - darwin, fetchFromGitHub, pkg-config, stdenv, @@ -30,10 +29,6 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc - ]; - propagatedBuildInputs = [ SDL2 ]; configureFlags = [ diff --git a/pkgs/by-name/sd/SDL2_sound/package.nix b/pkgs/by-name/sd/SDL2_sound/package.nix index 9ec2ec4e3cff..19fb33b41129 100644 --- a/pkgs/by-name/sd/SDL2_sound/package.nix +++ b/pkgs/by-name/sd/SDL2_sound/package.nix @@ -9,15 +9,8 @@ libmikmod, libvorbis, timidity, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) - AudioToolbox - CoreAudio - ; -in stdenv.mkDerivation rec { pname = "SDL2_sound"; version = "2.0.1"; @@ -42,18 +35,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSDLSOUND_DECODER_MIDI=1" ]; - buildInputs = - [ - SDL2 - flac - libmikmod - libvorbis - timidity - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AudioToolbox - CoreAudio - ]; + buildInputs = [ + SDL2 + flac + libmikmod + libvorbis + timidity + ]; meta = with lib; { description = "SDL2 sound library"; diff --git a/pkgs/by-name/sd/SDL2_ttf/package.nix b/pkgs/by-name/sd/SDL2_ttf/package.nix index 88b5c8f8ba4a..5557ad12e69b 100644 --- a/pkgs/by-name/sd/SDL2_ttf/package.nix +++ b/pkgs/by-name/sd/SDL2_ttf/package.nix @@ -1,7 +1,6 @@ { lib, SDL2, - darwin, fetchurl, freetype, harfbuzz, @@ -35,9 +34,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libobjc ]; configureFlags = [ diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix index bdc63084a87e..cd4a241cafbf 100644 --- a/pkgs/by-name/sd/SDL_compat/package.nix +++ b/pkgs/by-name/sd/SDL_compat/package.nix @@ -17,7 +17,6 @@ }: let - inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin) autoSignDarwinBinariesHook; in stdenv.mkDerivation (finalAttrs: { @@ -50,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Cocoa ] ++ lib.optionals openglSupport [ libGLU ]; diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index cf9a89d5a125..772c7b52d399 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -1,7 +1,6 @@ { lib, sdl3, - darwin, libavif, libtiff, libwebp, @@ -44,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { libtiff libwebp libavif - ] ++ (lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation); + ]; cmakeFlags = [ # fail when a dependency could not be found diff --git a/pkgs/by-name/se/seagoat/package.nix b/pkgs/by-name/se/seagoat/package.nix index 2eedb9e44083..1333a7ed4f72 100644 --- a/pkgs/by-name/se/seagoat/package.nix +++ b/pkgs/by-name/se/seagoat/package.nix @@ -7,18 +7,21 @@ gitMinimal, ripgrep, writableTmpDirAsHomeHook, + + versionCheckHook, + nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "seagoat"; - version = "0.54.6"; + version = "0.54.9"; pyproject = true; src = fetchFromGitHub { owner = "kantord"; repo = "SeaGOAT"; tag = "v${version}"; - hash = "sha256-KEFA1DUfsJpeNkWui/WKazImGCSwTFlPD8qsGFJNtr0="; + hash = "sha256-BfZbYQ6ylMj8cn7q2AavU570/ci83ffdDbeB+F/wZlk="; }; build-system = [ python3Packages.poetry-core ]; @@ -26,6 +29,7 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "chromadb" "psutil" + "setuptools" ]; dependencies = with python3Packages; [ @@ -59,8 +63,10 @@ python3Packages.buildPythonApplication rec { ++ [ gitMinimal ripgrep + versionCheckHook writableTmpDirAsHomeHook ]; + versionCheckProgramArg = "--version"; disabledTests = import ./failing_tests.nix; @@ -80,6 +86,10 @@ python3Packages.buildPythonApplication rec { --prefix PATH : "${ripgrep}/bin" ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Local-first semantic code search engine"; homepage = "https://kantord.github.io/SeaGOAT/"; diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix index 31bf523f7900..c488e4b816ff 100644 --- a/pkgs/by-name/se/selene/package.nix +++ b/pkgs/by-name/se/selene/package.nix @@ -5,8 +5,6 @@ robloxSupport ? true, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,13 +25,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - lib.optionals robloxSupport [ - openssl - ] - ++ lib.optionals (robloxSupport && stdenv.hostPlatform.isDarwin) [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = lib.optionals robloxSupport [ + openssl + ]; buildNoDefaultFeatures = !robloxSupport; diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index 02ce397ea19a..15f5b3ff4960 100644 --- a/pkgs/by-name/se/selenium-manager/package.nix +++ b/pkgs/by-name/se/selenium-manager/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,10 +24,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-MgnmEJif4Z4CcmBFkC5BJR67DMGm1ttObtl4LhAFw4g="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - # TODO: enable tests # The test suite depends on a number of browsers and network requests, # check the Gentoo package for inspiration diff --git a/pkgs/by-name/se/selinux-python/package.nix b/pkgs/by-name/se/selinux-python/package.nix index 3d15b6dd502c..2d05e602d171 100644 --- a/pkgs/by-name/se/selinux-python/package.nix +++ b/pkgs/by-name/se/selinux-python/package.nix @@ -3,47 +3,67 @@ stdenv, fetchurl, python3, + gettext, libselinux, libsemanage, libsepol, setools, }: -# this is python3 only because setools only supports python3 -stdenv.mkDerivation rec { +let + selinuxPython3 = python3.withPackages ( + ps: with ps; [ + pip + setuptools + ] + ); +in +stdenv.mkDerivation (finalAttrs: { pname = "selinux-python"; - version = "3.3"; + version = "3.8.1"; inherit (libsepol) se_url; src = fetchurl { - url = "${se_url}/${version}/selinux-python-${version}.tar.gz"; - sha256 = "1v244hpb45my303793xa4kcn7qnxjgxn4ja7rdn9k1q361hi1nca"; + url = "${finalAttrs.se_url}/${finalAttrs.version}/selinux-python-${finalAttrs.version}.tar.gz"; + hash = "sha256-dJAlv6SqDgCb8//EVdVloY1Ntxz+eWvkQFghcXIGwlo="; }; strictDeps = true; nativeBuildInputs = [ - python3 - python3.pkgs.distutils + selinuxPython3 python3.pkgs.wrapPython + gettext ]; - buildInputs = [ libsepol ]; - propagatedBuildInputs = [ + + buildInputs = [ + python3 + libsepol libselinux - libsemanage + ]; + + pythonPath = [ + python3.pkgs.libselinux.py + libsemanage.py setools - python3.pkgs.ipy ]; postPatch = '' - substituteInPlace sepolicy/Makefile --replace "echo --root" "echo --prefix" - substituteInPlace sepolgen/src/share/Makefile --replace "/var/lib/sepolgen" \ - "\$PREFIX/var/lib/sepolgen" + # We would like to disable build isolation so we use the provided setuptools (this is part of a `pip install` command) + substituteInPlace sepolicy/Makefile --replace-fail 'echo --root' 'echo --no-build-isolation --root' + + # Replace hardcoded paths. + substituteInPlace sepolgen/src/share/Makefile --replace-fail "/var/lib/sepolgen" \ + '$(PREFIX)/var/lib/sepolgen' + substituteInPlace po/Makefile --replace-fail "/usr/bin/install" "install" ''; makeFlags = [ "PREFIX=$(out)" + # This makes pip successfully install it (note the test -n "$(DESTDIR)" nonsense) + # https://github.com/SELinuxProject/selinux/blob/d1e3170556e1023e07b3c071ce89543ead6ba6f8/python/sepolicy/Makefile#L30 + "DESTDIR=/" "LOCALEDIR=$(out)/share/locale" "BASHCOMPLETIONDIR=$(out)/share/bash-completion/completions" "PYTHON=python" @@ -51,15 +71,41 @@ stdenv.mkDerivation rec { "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" ]; + preFixup = '' + patchShebangs --host $out/bin/* + ''; + postFixup = '' wrapPythonPrograms ''; + doInstallCheck = true; + + installCheckPhase = '' + # Version hasn't changed in 17 years, if it suddenly does these tests deserve to break + $out/bin/audit2allow --version | grep -Fm1 'audit2allow .1' + $out/bin/audit2why --version | grep -Fm1 'audit2allow .1' + $out/bin/sepolgen-ifgen --version | grep -Fm1 'sepolgen-ifgen .1' + + # "chcat: Requires a mls enabled system" or help, which includes chcat + { $out/bin/chcat --help || true; } | grep -Fm1 'chcat' + + $out/bin/semanage --help | grep -Fm1 'semanage' + $out/bin/sepolgen --help | grep -Fm1 'sepolicy' + $out/bin/sepolicy --help | grep -Fm1 'sepolicy' + + # Should at least run, even if we can't provide it a policy file and need to provide /dev/zero + { $out/bin/sepolgen-ifgen-attr-helper test /dev/null 2>&1 || true; } | grep -Fm1 'error(s) encountered' >/dev/null + ''; + meta = with lib; { description = "SELinux policy core utilities written in Python"; license = licenses.gpl2Plus; homepage = "https://selinuxproject.org"; - maintainers = with lib.maintainers; [ RossComputerGuy ]; + maintainers = with lib.maintainers; [ + RossComputerGuy + numinit + ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index bc68f58f9745..432265d65ac7 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,13 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-8Ry3rpGTNcvMIA3Q10Cb3uJHOBQin9AhlLNRekaKw/0="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - SystemConfiguration - ] - ); - meta = with lib; { description = "Tool to send files and directories, based on iroh"; homepage = "https://iroh.computer/sendme"; diff --git a/pkgs/by-name/se/senpai/package.nix b/pkgs/by-name/se/senpai/package.nix index b0488b7ef307..9812e3d934f2 100644 --- a/pkgs/by-name/se/senpai/package.nix +++ b/pkgs/by-name/se/senpai/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "senpai"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromSourcehut { owner = "~delthas"; repo = "senpai"; rev = "v${version}"; - sha256 = "sha256-3DVy+7mMVFmPpGxwJqtt2+QwNEMrgZazynawE/Wf+UM="; + sha256 = "sha256-lwfhRnaHGOIp6NyugPEu6P+3WXkVgQEWaz7DUfHiJrQ="; }; vendorHash = "sha256-6glslBPjJr0TmrAkDGbOQ4sDzvODlavVeTugs6RXsCU="; diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index 73a8d0ca78dc..84f1938b6a4a 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; tag = version; - hash = "sha256-9jsn7oydaOYOAq6XYYlPjzzy6LSiKOpRtp+PxMlzwz0="; + hash = "sha256-0NLxu+aelp36m3ocPhyYz3LDeq310fkyu8WSpZML3Pc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix index 9f239af4f2f9..5d8084732036 100644 --- a/pkgs/by-name/se/sequoia-sq/package.nix +++ b/pkgs/by-name/se/sequoia-sq/package.nix @@ -1,8 +1,6 @@ { - stdenv, fetchFromGitLab, lib, - darwin, nettle, nix-update-script, rustPlatform, @@ -35,19 +33,11 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellFiles ]; - buildInputs = - [ - openssl - sqlite - nettle - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ + openssl + sqlite + nettle + ]; # Needed for tests to be able to create a ~/.local/share/sequoia directory # Needed for avoiding "OpenSSL error" since 1.2.0 diff --git a/pkgs/by-name/se/sequoia-wot/package.nix b/pkgs/by-name/se/sequoia-wot/package.nix index b9aaf9dc9a92..d949f6743ca0 100644 --- a/pkgs/by-name/se/sequoia-wot/package.nix +++ b/pkgs/by-name/se/sequoia-wot/package.nix @@ -8,7 +8,6 @@ nettle, openssl, sqlite, - darwin, gnupg, }: rustPlatform.buildRustPackage rec { @@ -36,10 +35,6 @@ rustPlatform.buildRustPackage rec { openssl sqlite ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - # See comment near sequoia-openpgp/crypto- buildFeatures - ] ++ lib.optionals (!stdenv.targetPlatform.isWindows) [ nettle ]; diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index 4f6840a43f06..5afc9a7aae1d 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, testers, gitMinimal, serie, @@ -23,14 +21,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-+5mUMB4rqLePimfgWlV7UP8B1lPoKzfWCXBBN1q2WIU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreGraphics - AppKit - ] - ); - nativeCheckInputs = [ gitMinimal ]; passthru.tests.version = testers.testVersion { package = serie; }; diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index 0dba3011bc0a..3b794c1d249c 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -28,7 +28,6 @@ freetype, gst_all_1, harfbuzz, - libcxx, libGL, libunwind, libxkbcommon, @@ -62,13 +61,13 @@ in rustPlatform.buildRustPackage { pname = "servo"; - version = "0-unstable-2025-04-08"; + version = "0-unstable-2025-04-18"; src = fetchFromGitHub { owner = "servo"; repo = "servo"; - rev = "4d4f94936f8859f039497df370083fd7ea35fb00"; - hash = "sha256-SI3HnKuh6zD07D7SUswfehwXEFkuaZQkqipH0Rlj9Gg="; + rev = "2ee8427665099987f715296d4d55b6388a480c08"; + hash = "sha256-fAUTBfoFGZqdZylXvY7h+0Ol0xd1CDNyJxx3rlhI7ss="; # Breaks reproducibility depending on whether the picked commit # has other ref-names or not, which may change over time, i.e. with # "ref-names: HEAD -> main" as long this commit is the branch HEAD @@ -79,7 +78,7 @@ rustPlatform.buildRustPackage { }; useFetchCargoVendor = true; - cargoHash = "sha256-toVo1QpeMeK8SoQaYU5d+VAd3s22iwRI4caJIpxPP6I="; + cargoHash = "sha256-hGLSGbT4089R7BP4pkIQL/YNQlVfIDqW9sUJv+yCUv8="; # set `HOME` to a temp dir for write access # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328) @@ -131,10 +130,9 @@ rustPlatform.buildRustPackage { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_14 - libcxx ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"; # copy resources into `$out` to be used during runtime # link runtime libraries diff --git a/pkgs/by-name/sh/sh4d0wup/package.nix b/pkgs/by-name/sh/sh4d0wup/package.nix new file mode 100644 index 000000000000..93ef3f73bd6e --- /dev/null +++ b/pkgs/by-name/sh/sh4d0wup/package.nix @@ -0,0 +1,77 @@ +{ + lib, + fetchFromGitHub, + gcc, + go, + makeWrapper, + nix-update-script, + openssl, + pcsclite, + pkg-config, + podman, + rustPlatform, + rustc, + sequoia-sq, + shared-mime-info, + versionCheckHook, + xz, # for liblzma + zstd, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "sh4d0wup"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = "sh4d0wup"; + tag = "v${finalAttrs.version}"; + hash = "sha256-gzkh+JYwuYvdNljB6agEVd7WxqJ5lI3sseY3BlkLmXs="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-FjRlKlOX78QClzhhFhkZuaOLA6XpFziSghJltlRPt20="; + + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + buildInputs = [ + openssl + pcsclite + xz + zstd + ]; + postInstall = '' + wrapProgram $out/bin/sh4d0wup \ + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ''; + + checkInputs = [ sequoia-sq ]; + preCheck = '' + export XDG_DATA_DIRS=$XDG_DATA_DIRS:${shared-mime-info}/share + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + passthru.updateScript = nix-update-script { }; + + env = { + OPENSSL_NO_VENDOR = 1; + SH4D0WUP_GCC_BINARY = lib.getExe gcc; + SH4D0WUP_GO_BINARY = lib.getExe go; + SH4D0WUP_PODMAN_BINARY = lib.getExe podman; + SH4D0WUP_RUSTC_BINARY = lib.getExe' rustc "rustc"; + SH4D0WUP_SQ_BINARY = lib.getExe sequoia-sq; + }; + + meta = { + description = "Signing-key abuse and update exploitation framework"; + homepage = "https://github.com/kpcyrd/sh4d0wup"; + changelog = "https://github.com/kpcyrd/sh4d0wup/releases/tag/v${finalAttrs.version}"; + mainProgram = "sh4d0wup"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ kpcyrd ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/sh/shadowsocks-rust/package.nix b/pkgs/by-name/sh/shadowsocks-rust/package.nix index 54d0a106a533..ee5c48b1a856 100644 --- a/pkgs/by-name/sh/shadowsocks-rust/package.nix +++ b/pkgs/by-name/sh/shadowsocks-rust/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "shadowsocks"; repo = "shadowsocks-rust"; tag = "v${version}"; - hash = "sha256-JcYf6Meq8iG7zcjQu240EKwlAPBriestKlz0RLpIAHg="; + hash = "sha256-lCm/Y0R4/Ti4Eq06/za4D2YanwQ79IkhCBK2TO9/Yfs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-RadM8sN7ePGNkTanClqgpsDg8fHIrYMHcjbHxDmzKdc="; + cargoHash = "sha256-//cEAeYSpsB429YaWBu+6T4dorV5OZFZuNxLgvqXxR8="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; diff --git a/pkgs/by-name/sh/share-preview/package.nix b/pkgs/by-name/sh/share-preview/package.nix index 961c6ca606bc..8c375f91e3a3 100644 --- a/pkgs/by-name/sh/share-preview/package.nix +++ b/pkgs/by-name/sh/share-preview/package.nix @@ -12,7 +12,6 @@ desktop-file-utils, libadwaita, openssl, - darwin, nix-update-script, }: @@ -44,15 +43,10 @@ stdenv.mkDerivation (finalAttrs: { desktop-file-utils ]; - buildInputs = - [ - libadwaita - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + libadwaita + openssl + ]; env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=incompatible-function-pointer-types" ] diff --git a/pkgs/by-name/sh/shh/fix_run_checks.patch b/pkgs/by-name/sh/shh/fix_run_checks.patch new file mode 100644 index 000000000000..63452965316e --- /dev/null +++ b/pkgs/by-name/sh/shh/fix_run_checks.patch @@ -0,0 +1,201 @@ +commit 070bf216bacf6ce1b473f2819a017d1be29716d0 +Author: kuflierl <41301536+kuflierl@users.noreply.github.com> +Date: Sun Apr 13 19:56:58 2025 +0200 + + add support for nix-build-system for tests + +diff --git a/Cargo.toml b/Cargo.toml +index eba0ef8..9153f00 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -58,6 +58,7 @@ default = [] + as-root = [] # for tests only + gen-man-pages = ["dep:clap_mangen"] + nightly = [] # for benchmarks only ++nix-build-env = [] # perform checks in a way compatable with nix build + + [lints.rust] + # https://doc.rust-lang.org/rustc/lints/listing/allowed-by-default.html +diff --git a/src/systemd/resolver.rs b/src/systemd/resolver.rs +index e2abbb7..1151592 100644 +--- a/src/systemd/resolver.rs ++++ b/src/systemd/resolver.rs +@@ -637,17 +637,14 @@ mod tests { + let OptionValue::List(opt_list) = &candidates[0].value else { + panic!(); + }; +- assert!(opt_list.values.contains(&"/boot".to_owned())); ++ // information gathering ++ // eprint!("{}\n", &candidates[0].to_string()); + assert!(opt_list.values.contains(&"/dev".to_owned())); + assert!(opt_list.values.contains(&"/etc".to_owned())); +- assert!(opt_list.values.contains(&"/home".to_owned())); +- assert!(opt_list.values.contains(&"/root".to_owned())); +- assert!(opt_list.values.contains(&"/sys".to_owned())); ++ assert!(opt_list.values.contains(&"/nix".to_owned())); ++ assert!(opt_list.values.contains(&"/bin".to_owned())); ++ assert!(opt_list.values.contains(&"/build".to_owned())); + assert!(opt_list.values.contains(&"/tmp".to_owned())); +- assert!(opt_list.values.contains(&"/usr".to_owned())); +- assert!(opt_list.values.contains(&"/var".to_owned())); +- assert!(!opt_list.values.contains(&"/proc".to_owned())); +- assert!(!opt_list.values.contains(&"/run".to_owned())); + + let actions = vec![ProgramAction::Read("/var/data".into())]; + let candidates = resolve(&opts, &actions, &hardening_opts); +diff --git a/tests/options.rs b/tests/options.rs +index 835ee14..cac55e5 100644 +--- a/tests/options.rs ++++ b/tests/options.rs +@@ -24,7 +24,7 @@ fn run_true() { + .assert() + .success() + .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) +- .stdout(if Uid::effective().is_root() { ++ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { + BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) + } else { + BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) +@@ -50,7 +50,7 @@ fn run_true() { + .stdout(predicate::str::contains("LockPersonality=true\n").count(1)) + .stdout(predicate::str::contains("RestrictRealtime=true\n").count(1)) + .stdout(predicate::str::contains("ProtectClock=true\n").count(1)) +- .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @process:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) ++ .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) + .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); + } + +@@ -97,7 +97,7 @@ fn run_ls_dev() { + .assert() + .success() + .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) +- .stdout(if Uid::effective().is_root() { ++ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { + BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) + } else { + BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) +@@ -130,12 +130,12 @@ fn run_ls_dev() { + fn run_ls_proc() { + Command::cargo_bin("shh") + .unwrap() +- .args(["run", "--", "busybox", "ls", "/proc/1/"]) ++ .args(["run", "--", "ls", "/proc/1/"]) + .unwrap() + .assert() + .success() + .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) +- .stdout(if Uid::effective().is_root() { ++ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { + BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) + } else { + BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) +@@ -166,7 +166,7 @@ fn run_ls_proc() { + .assert() + .success() + .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) +- .stdout(if Uid::effective().is_root() { ++ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { + BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) + } else { + BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) +@@ -188,7 +188,7 @@ fn run_ls_proc() { + .stdout(predicate::str::contains("LockPersonality=true\n").count(1)) + .stdout(predicate::str::contains("RestrictRealtime=true\n").count(1)) + .stdout(predicate::str::contains("ProtectClock=true\n").count(1)) +- .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @process:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) ++ .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) + .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); + } + +@@ -201,7 +201,7 @@ fn run_read_kallsyms() { + .assert() + .success() + .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) +- .stdout(if Uid::effective().is_root() { ++ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { + BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) + } else { + BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) +@@ -227,11 +227,12 @@ fn run_read_kallsyms() { + .stdout(predicate::str::contains("LockPersonality=true\n").count(1)) + .stdout(predicate::str::contains("RestrictRealtime=true\n").count(1)) + .stdout(predicate::str::contains("ProtectClock=true\n").count(1)) +- .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @process:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) ++ .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @network-io:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) + .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); + } + + #[test] ++#[cfg_attr(feature = "nix-build-env", ignore)] + fn run_ls_modules() { + Command::cargo_bin("shh") + .unwrap() +@@ -240,7 +241,7 @@ fn run_ls_modules() { + .assert() + .success() + .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) +- .stdout(if Uid::effective().is_root() { ++ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { + BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) + } else { + BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) +@@ -304,7 +305,7 @@ fn run_dmesg() { + } + + #[test] +-#[cfg_attr(feature = "as-root", ignore)] ++#[cfg_attr(any(feature = "nix-build-env", feature = "as-root"), ignore)] + fn run_systemctl() { + assert!(!Uid::effective().is_root()); + +@@ -344,6 +345,7 @@ fn run_systemctl() { + .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); + } + ++// patched due to nix build isolation + #[test] + fn run_ss() { + Command::cargo_bin("shh") +@@ -353,7 +355,7 @@ fn run_ss() { + .assert() + .success() + .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) +- .stdout(if Uid::effective().is_root() { ++ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { + BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) + } else { + BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) +@@ -369,7 +371,7 @@ fn run_ss() { + .stdout(predicate::str::contains("ProtectKernelModules=true\n").count(1)) + .stdout(predicate::str::contains("ProtectKernelLogs=true\n").count(1)) + .stdout(predicate::str::contains("ProtectControlGroups=true\n").count(1)) +- .stdout(predicate::str::contains("ProtectProc=").not()) ++ //.stdout(predicate::str::contains("ProtectProc=").not()) + .stdout(predicate::str::contains("MemoryDenyWriteExecute=true\n").count(1)) + .stdout(predicate::str::contains("RestrictAddressFamilies=AF_NETLINK AF_UNIX\n").count(1).or(predicate::str::contains("RestrictAddressFamilies=AF_NETLINK\n").count(1))) + .stdout(predicate::str::contains("SocketBindDeny=ipv4:tcp\n").count(1)) +@@ -379,7 +381,7 @@ fn run_ss() { + .stdout(predicate::str::contains("LockPersonality=true\n").count(1)) + .stdout(predicate::str::contains("RestrictRealtime=true\n").count(1)) + .stdout(predicate::str::contains("ProtectClock=true\n").count(1)) +- .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) ++ .stdout(predicate::str::contains("SystemCallFilter=~@aio:EPERM @chown:EPERM @clock:EPERM @cpu-emulation:EPERM @debug:EPERM @io-event:EPERM @ipc:EPERM @keyring:EPERM @memlock:EPERM @module:EPERM @mount:EPERM @obsolete:EPERM @pkey:EPERM @privileged:EPERM @process:EPERM @raw-io:EPERM @reboot:EPERM @resources:EPERM @sandbox:EPERM @setuid:EPERM @signal:EPERM @swap:EPERM @sync:EPERM @timer:EPERM\n").count(1)) + .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); + } + +@@ -741,6 +743,7 @@ fn run_mknod() { + } + + #[test] ++#[cfg_attr(feature = "nix-build-env", ignore)] // no raw socket cap in nix build + fn run_ping_4() { + Command::cargo_bin("shh") + .unwrap() +@@ -759,6 +762,7 @@ fn run_ping_4() { + } + + #[test] ++#[cfg_attr(feature = "nix-build-env", ignore)] // no raw socket cap in nix build + fn run_ping_6() { + Command::cargo_bin("shh") + .unwrap() diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix new file mode 100644 index 000000000000..d2f5e11cf215 --- /dev/null +++ b/pkgs/by-name/sh/shh/package.nix @@ -0,0 +1,58 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + python3, + strace, + systemd, + iproute2, +}: + +rustPlatform.buildRustPackage rec { + pname = "shh"; + version = "2025.4.12"; + + src = fetchFromGitHub { + owner = "desbma"; + repo = "shh"; + tag = "v${version}"; + hash = "sha256-+JWz0ya6gi8pPERnpAcQIe7zZUzWGxha+9/gizMVtEw="; + }; + + cargoHash = "sha256-TdP+1sb1GEFM57z+rc+gqhoWQhPAXzvMt/FCWf3wpr8="; + + patches = [ + ./fix_run_checks.patch + ./pr13-profile-path-fix-strace.patch + ]; + + # buildFeatures = [ /*"gen-man-pages"*/ ]; + + checkFeatures = [ "nix-build-env" ]; + + buildInputs = [ + strace + systemd + ]; + + nativeCheckInputs = [ + strace + systemd + python3 + iproute2 + ]; + + # RUST_BACKTRACE = 1; + + meta = { + description = "Automatic systemd service hardening guided by strace profiling"; + homepage = "https://github.com/desbma/shh"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + mainProgram = "shh"; + maintainers = with lib.maintainers; [ + erdnaxe + kuflierl + ]; + }; +} diff --git a/pkgs/by-name/sh/shh/pr13-profile-path-fix-strace.patch b/pkgs/by-name/sh/shh/pr13-profile-path-fix-strace.patch new file mode 100644 index 000000000000..2db49fe17177 --- /dev/null +++ b/pkgs/by-name/sh/shh/pr13-profile-path-fix-strace.patch @@ -0,0 +1,83 @@ +commit 4d2c1556d769695770c95a982e0dcda4d70eee57 +Author: kuflierl <41301536+kuflierl@users.noreply.github.com> +Date: Sun Apr 13 19:57:50 2025 +0200 + + service.rs: profile path fix for strace + Enable path env fixing when path env doesn't have strace to unbreak tool on unique systems and units. + This fixes handling on non FHS operating systems and systemd units that define their own PATH that doesn't include strace. + +diff --git a/src/systemd/service.rs b/src/systemd/service.rs +index 908fdf0..e9294cf 100644 +--- a/src/systemd/service.rs ++++ b/src/systemd/service.rs +@@ -7,6 +7,7 @@ use std::{ + ops::RangeInclusive, + path::{Path, PathBuf}, + process::{Command, Stdio}, ++ ffi::OsString, + }; + + use anyhow::Context as _; +@@ -99,6 +100,41 @@ impl Service { + ) + } + ++ // A function for locating the parent directory i.e. PATH of an executable ++ fn resolve_exec_path

(exe_name: &P, path_env: OsString) -> Option ++ where P: AsRef + ?Sized, ++ { ++ env::split_paths(&path_env).filter_map(|dir| { ++ let full_path = dir.join(&exe_name); ++ if full_path.is_file() { ++ Some(dir) ++ } else { ++ None ++ } ++ }).next() ++ } ++ ++ // determine PATH env used for unit ++ pub(crate) fn get_exec_path(config_paths: &Vec<&Path>) -> anyhow::Result { ++ let old_path_env_option = Self::config_vals("Environment", &config_paths)? ++ .into_iter().filter(|x| x.starts_with("\"PATH=")).last().map(|x| x.trim_matches('\"').get(5..).unwrap().to_owned()); ++ Ok(match old_path_env_option { ++ Some(path_env) => { ++ log::info!("Found hard coded PATH environment in unit: {path_env}"); ++ path_env ++ }, ++ None => { ++ let output = Command::new("systemd-path").arg("search-binaries-default").output()?; ++ if !output.status.success() { ++ anyhow::bail!("systemd-path invocation failed with code {:?}", output.status); ++ } ++ let default_systemd_path = output.stdout.lines().next().ok_or_else(|| anyhow::anyhow!("Unable to get global systemd default PATH"))??; ++ log::info!("Could not find hard coded PATH environment in unit, using systemd default: {default_systemd_path}"); ++ default_systemd_path ++ } ++ }) ++ } ++ + /// Get systemd "exposure level" for the service (0-100). + /// 100 means extremely exposed (no hardening), 0 means so sandboxed it can't do much. + /// Although this is a very crude heuristic, below 40-50 is generally good. +@@ -170,6 +206,20 @@ impl Service { + writeln!(fragment_file, "KillMode=control-group")?; + writeln!(fragment_file, "StandardOutput=journal")?; + ++ // Modifying Env Path for strace availability if needed ++ let old_path_env = Self::get_exec_path(&config_paths)?; ++ match Self::resolve_exec_path("strace", (&old_path_env).into()) { ++ Some(_) => log::info!("Found strace in previous path, no correction needed"), ++ None => { ++ let path_with_strace = Self::resolve_exec_path("strace", env::var_os("PATH").unwrap()).unwrap(); ++ log::info!("Found strace from local PATH in {}, inserting it into unit config!", path_with_strace.display()); ++ let mut paths = env::split_paths(&old_path_env).collect::>(); ++ paths.push(path_with_strace); ++ let new_path = env::join_paths(paths)?; ++ writeln!(fragment_file, "Environment=\"PATH={}\"", new_path.to_str().unwrap())?; ++ }, ++ } ++ + // Profile data dir + let mut rng = rand::rng(); + let profile_data_dir = PathBuf::from(format!( diff --git a/pkgs/by-name/sh/shibboleth-sp/package.nix b/pkgs/by-name/sh/shibboleth-sp/package.nix index 4a300718c737..8f1950d375ef 100644 --- a/pkgs/by-name/sh/shibboleth-sp/package.nix +++ b/pkgs/by-name/sh/shibboleth-sp/package.nix @@ -12,7 +12,6 @@ xercesc, xml-security-c, xml-tooling-c, - darwin, }: stdenv.mkDerivation rec { @@ -29,24 +28,16 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config ]; - buildInputs = - [ - boost - fcgi - openssl - opensaml-cpp - log4shib - xercesc - xml-security-c - xml-tooling-c - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ + boost + fcgi + openssl + opensaml-cpp + log4shib + xercesc + xml-security-c + xml-tooling-c + ]; configureFlags = [ "--without-apxs" diff --git a/pkgs/by-name/sh/shotcut/package.nix b/pkgs/by-name/sh/shotcut/package.nix index d58b91f080ad..0e1d20f3e69e 100644 --- a/pkgs/by-name/sh/shotcut/package.nix +++ b/pkgs/by-name/sh/shotcut/package.nix @@ -13,7 +13,6 @@ fftw, qt6, cmake, - darwin, gitUpdater, ffmpeg, }: @@ -47,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtmultimedia qt6.qtcharts qt6.qtwayland - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + ]; env.NIX_CFLAGS_COMPILE = "-DSHOTCUT_NOUPGRADE"; diff --git a/pkgs/by-name/si/signal-desktop-bin/generic.nix b/pkgs/by-name/si/signal-desktop-bin/generic.nix index 9478ac430f02..ea6e150ef94d 100644 --- a/pkgs/by-name/si/signal-desktop-bin/generic.nix +++ b/pkgs/by-name/si/signal-desktop-bin/generic.nix @@ -280,7 +280,7 @@ stdenv.mkDerivation rec { emily Gliczy ]; - mainProgram = pname; + mainProgram = "signal-desktop"; platforms = [ "x86_64-linux" "aarch64-linux" diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix index 9280347b8965..181b6d7b53b4 100644 --- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { } { - pname = "signal-desktop"; + pname = "signal-desktop-bin"; version = "7.47.0-1"; libdir = "usr/lib64/signal-desktop"; diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix index b0ab336efd86..046a290cdf1e 100644 --- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix @@ -5,7 +5,7 @@ _7zz, }: stdenv.mkDerivation (finalAttrs: { - pname = "signal-desktop"; + pname = "signal-desktop-bin"; version = "7.47.0"; src = fetchurl { diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix index 3f64c17b254a..a92b85e3db07 100644 --- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { } rec { - pname = "signal-desktop"; + pname = "signal-desktop-bin"; version = "7.47.0"; libdir = "opt/Signal"; diff --git a/pkgs/by-name/si/signal-desktop-bin/update.sh b/pkgs/by-name/si/signal-desktop-bin/update.sh index dc2c6864cec6..cca3e29ae12c 100755 --- a/pkgs/by-name/si/signal-desktop-bin/update.sh +++ b/pkgs/by-name/si/signal-desktop-bin/update.sh @@ -17,17 +17,17 @@ latestBuildAarch64=$(jq '.id' <<< $latestBuildInfoAarch64) latestVersionAarch64=$(jq -r '.source_package.version' <<< $latestBuildInfoAarch64) echo "Updating signal-desktop for x86_64-linux" -update-source-version signal-desktop "$latestVersion" \ +update-source-version signal-desktop-bin "$latestVersion" \ --system=x86_64-linux \ --file="$SCRIPT_DIR/signal-desktop.nix" echo "Updating signal-desktop for aarch64-linux" -update-source-version signal-desktop "$latestVersionAarch64" "" \ +update-source-version signal-desktop-bin "$latestVersionAarch64" "" \ "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/$(printf "%08d" $latestBuildAarch64)-signal-desktop/signal-desktop-$latestVersionAarch64.fc42.aarch64.rpm" \ --system=aarch64-linux \ --file="$SCRIPT_DIR/signal-desktop-aarch64.nix" echo "Updating signal-desktop for darwin" -update-source-version signal-desktop "$latestVersion" \ +update-source-version signal-desktop-bin "$latestVersion" \ --system=aarch64-darwin \ --file="$SCRIPT_DIR/signal-desktop-darwin.nix" diff --git a/pkgs/by-name/si/signal-desktop-source/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix similarity index 89% rename from pkgs/by-name/si/signal-desktop-source/libsignal-node.nix rename to pkgs/by-name/si/signal-desktop/libsignal-node.nix index a1d45fe6a3d0..b5c04be808bf 100644 --- a/pkgs/by-name/si/signal-desktop-source/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -24,23 +24,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-node"; - version = "0.67.4"; + version = "0.68.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-s7vTzAOWKvGCkrWcxDcKptsmxvW5VxrF5X9Vfkjj1jA="; + hash = "sha256-Bc9wsi+Y6PzNSt4+I8ULMUsrKDFLKaxZ/HqldlYOtoM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-wxBbq4WtqzHbdro+tm2hU6JVwTgC2X/Cx9po+ndgECg="; + cargoHash = "sha256-NmC/htksyrkaudVq3EuQ5gepmFZNQ7t/FVazfdxg8ds="; npmRoot = "node"; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-npm-deps"; inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-GJTNuVK1YGDpx89fF6hXXd+/fEqnFMG5FgJUJhp6344="; + hash = "sha256-hn7bfULZJTIJVU51Cuvj+9AAudSC/C3wBzkIEzlO3VQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signal-desktop-source/package.nix b/pkgs/by-name/si/signal-desktop/package.nix similarity index 96% rename from pkgs/by-name/si/signal-desktop-source/package.nix rename to pkgs/by-name/si/signal-desktop/package.nix index 0d8cdef5eaac..8e34eba56767 100644 --- a/pkgs/by-name/si/signal-desktop-source/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -65,13 +65,13 @@ let ''; }); - version = "7.50.0"; + version = "7.51.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-APdwETadRIQRJ/Wdxqnr2R5H/7Qqbacpp+SV16jesDw="; + hash = "sha256-q857FcZgBGjB7/IKr+oD7wmOCUV8lso6kch4nIYtrCA="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -103,7 +103,7 @@ let }); in stdenv.mkDerivation (finalAttrs: { - pname = "signal-desktop-source"; + pname = "signal-desktop"; inherit src version; nativeBuildInputs = [ @@ -131,15 +131,15 @@ stdenv.mkDerivation (finalAttrs: { ; hash = if withAppleEmojis then - "sha256-BcKHVMrD8b9u/5hNtAY5V2vjTVHItob0EG89soFSwa4=" + "sha256-cWXbymy+AqaqDvK8szRWzFPH9jrMjQ9WEw2lRFcCnz8=" else - "sha256-GdeCIUV0aTwnEV55/RnpESDBrkpcVVa+1XhUmUIgBPU="; + "sha256-oTH4wy5RIgrZcMuO/AB/561lvx6JZ4BM9xjjOzl/CA4="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1744232207; + SOURCE_DATE_EPOCH = 1744907672; }; preBuild = '' diff --git a/pkgs/by-name/si/signal-desktop-source/replace-apple-emoji-with-noto-emoji.patch b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch similarity index 100% rename from pkgs/by-name/si/signal-desktop-source/replace-apple-emoji-with-noto-emoji.patch rename to pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch diff --git a/pkgs/by-name/si/signal-desktop-source/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix similarity index 81% rename from pkgs/by-name/si/signal-desktop-source/ringrtc.nix rename to pkgs/by-name/si/signal-desktop/ringrtc.nix index 399ef7f00e75..011a4988ba2f 100644 --- a/pkgs/by-name/si/signal-desktop-source/ringrtc.nix +++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ringrtc"; - version = "2.50.3"; + version = "2.50.4"; src = fetchFromGitHub { owner = "signalapp"; repo = "ringrtc"; tag = "v${finalAttrs.version}"; - hash = "sha256-EuryWZMMTkrDPheVv0wBsH+zL3LylxSSPS+nNnn3cmM="; + hash = "sha256-r2HyhrYCCPdV5tFayHyY4R3qjK8ksF56Wq98GuQWmO0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-/c+tpTh5X05HLqAHsA/YvWxqy7TSUy49g6OtIQg+rMs="; + cargoHash = "sha256-QkEqtv/novbQOcaHKE51ivQjY4mf6Gju4uM7AT7j1P0="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/si/signal-desktop-source/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix similarity index 100% rename from pkgs/by-name/si/signal-desktop-source/signal-sqlcipher.nix rename to pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix diff --git a/pkgs/by-name/si/signal-desktop-source/update.sh b/pkgs/by-name/si/signal-desktop/update.sh similarity index 78% rename from pkgs/by-name/si/signal-desktop-source/update.sh rename to pkgs/by-name/si/signal-desktop/update.sh index 4614a7222861..d4dca6e74ef8 100755 --- a/pkgs/by-name/si/signal-desktop-source/update.sh +++ b/pkgs/by-name/si/signal-desktop/update.sh @@ -32,32 +32,32 @@ sed -E -i "s/(electron_)../\1$electronVersion/" $SCRIPT_DIR/package.nix sed -E -i "s/(SOURCE_DATE_EPOCH = )[0-9]+/\1$releaseEpoch/" $SCRIPT_DIR/package.nix sed -E -i "s/(withAppleEmojis \? )false/\1true/" $SCRIPT_DIR/package.nix -nix-update signal-desktop-source --subpackage sticker-creator --version="$latestVersion" +nix-update signal-desktop --subpackage sticker-creator --version="$latestVersion" sed -E -i "s/(withAppleEmojis \? )true/\1false/" $SCRIPT_DIR/package.nix -update-source-version signal-desktop-source \ +update-source-version signal-desktop \ --ignore-same-version \ --source-key=pnpmDeps -update-source-version signal-desktop-source.libsignal-node \ +update-source-version signal-desktop.libsignal-node \ "$libsignalClientVersion" -update-source-version signal-desktop-source.libsignal-node \ +update-source-version signal-desktop.libsignal-node \ --ignore-same-version \ --source-key=cargoDeps.vendorStaging -update-source-version signal-desktop-source.libsignal-node \ +update-source-version signal-desktop.libsignal-node \ --ignore-same-version \ --source-key=npmDeps -update-source-version signal-desktop-source.signal-sqlcipher \ +update-source-version signal-desktop.signal-sqlcipher \ "$signalSqlcipherVersion" -update-source-version signal-desktop-source.signal-sqlcipher \ +update-source-version signal-desktop.signal-sqlcipher \ --ignore-same-version \ --source-key=cargoDeps.vendorStaging -update-source-version signal-desktop-source.signal-sqlcipher \ +update-source-version signal-desktop.signal-sqlcipher \ --ignore-same-version \ --source-key=pnpmDeps -update-source-version signal-desktop-source.ringrtc "$ringrtcVersion" -update-source-version signal-desktop-source.ringrtc \ +update-source-version signal-desktop.ringrtc "$ringrtcVersion" +update-source-version signal-desktop.ringrtc \ --ignore-same-version \ --source-key=cargoDeps.vendorStaging diff --git a/pkgs/by-name/si/signal-desktop-source/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json similarity index 100% rename from pkgs/by-name/si/signal-desktop-source/webrtc-sources.json rename to pkgs/by-name/si/signal-desktop/webrtc-sources.json diff --git a/pkgs/by-name/si/signal-desktop-source/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix similarity index 100% rename from pkgs/by-name/si/signal-desktop-source/webrtc.nix rename to pkgs/by-name/si/signal-desktop/webrtc.nix diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index bfbf1a63929f..3605e063abc8 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20250410-2"; + version = "20250417"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-VnxqaZH9jTRnVgGOcUd8SaT+SndFGOWzNGZyFVa7Tlk="; + hash = "sha256-uGQ6VXFj8SyWRumwihXTwY/LL1PI4q2Vbnoopwbwyho="; }; nativeBuildInputs = diff --git a/pkgs/by-name/si/silicon/package.nix b/pkgs/by-name/si/silicon/package.nix index 9fbf5ac29326..9d3444805172 100644 --- a/pkgs/by-name/si/silicon/package.nix +++ b/pkgs/by-name/si/silicon/package.nix @@ -10,7 +10,6 @@ libxcb, python3, libiconv, - darwin, fira-code, fontconfig, harfbuzz, @@ -39,15 +38,9 @@ rustPlatform.buildRustPackage rec { harfbuzz ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - libiconv - AppKit - CoreText - Security - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index 37c97a8ba41b..fdc4f4257cde 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "6.4.2"; + version = "6.5.0"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-at1MBvbsgu7Z7UJQqVaakT1Ux16jJVP5JSVubrqF7VY="; + hash = "sha256-bZ4r62GMz2Dkd3fKTJhelitaA8jUBaDjG6jOysEg8Nk="; }; # Fix build on darwin diff --git a/pkgs/by-name/si/simple-http-server/package.nix b/pkgs/by-name/si/simple-http-server/package.nix index d13c5485db55..66e8bbcdc790 100644 --- a/pkgs/by-name/si/simple-http-server/package.nix +++ b/pkgs/by-name/si/simple-http-server/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,11 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ openssl ]; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/by-name/si/simple64/package.nix b/pkgs/by-name/si/simple64/package.nix index f98cc8732692..b593ec22dcc1 100644 --- a/pkgs/by-name/si/simple64/package.nix +++ b/pkgs/by-name/si/simple64/package.nix @@ -71,8 +71,6 @@ stdenv.mkDerivation (finalAttrs: { dontUseCmakeConfigure = true; - dontWrapQtApps = true; - buildPhase = '' runHook preInstall @@ -89,9 +87,10 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 ./simple64-gui/icons/simple64.svg -t $out/share/icons/hicolor/scalable/apps/ - makeWrapper $out/share/simple64/simple64-gui $out/bin/simple64-gui \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} \ - "''${qtWrapperArgs[@]}" + patchelf $out/share/simple64/simple64-gui \ + --add-needed libvulkan.so.1 --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} + + ln -s $out/share/simple64/simple64-gui $out/bin/simple64-gui runHook postInstall ''; diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index bad5b18ac8e0..f01f9147c548 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -7,11 +7,11 @@ let pname = "simplex-chat-desktop"; - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-jCBCZ5nzA8WxIQFsGpuuyZ1Jmt+PJmqybFHFOUkw9L0="; + hash = "sha256-zGF8K0Dqi79EYq8UptwD9kAvsuzdvdGrRxuS3z0Ve/c="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index a4a065084d27..7cb7cef01466 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.11.6"; + version = "1.11.8"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-/RTpdbDFCDk1sq7lBIXQ3ElgYqflDumffZy1DVP0zOY="; + hash = "sha256-Z9Fuvf/I0i38fymuh2v6M66EQT7KIOBeYj1aLoormwE="; }; - vendorHash = "sha256-+XDkza0rymQAWUCmHhKas7FFS8lRPSmGHwAV/072aeo="; + vendorHash = "sha256-lOQ+gZKNjFDXoV4olW7M4sitM8elA9I3ubwRyEX7FZY="; tags = [ "with_quic" diff --git a/pkgs/by-name/si/sitespeed-io/package.nix b/pkgs/by-name/si/sitespeed-io/package.nix index 886fe060694d..ba4399a9f0f0 100644 --- a/pkgs/by-name/si/sitespeed-io/package.nix +++ b/pkgs/by-name/si/sitespeed-io/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, buildNpmPackage, - nodejs_18, + systemdLibs, coreutils, ffmpeg-headless, imagemagick_light, @@ -26,17 +26,15 @@ assert (!withFirefox && !withChromium) -> throw "Either `withFirefox` or `withChromium` must be enabled."; buildNpmPackage rec { pname = "sitespeed-io"; - version = "34.0.1"; + version = "37.3.2"; src = fetchFromGitHub { owner = "sitespeedio"; repo = "sitespeed.io"; - rev = "v${version}"; - hash = "sha256-yC/TlAJa71hbPYYuqPV+k3syGuo/VhnNjXmmxh47ySQ="; + tag = "v${version}"; + hash = "sha256-sLRwNWAP83Lcnz39AkPc//NIGwRf70UqritTVJqMiws="; }; - nodejs = nodejs_18; - postPatch = '' ln -s npm-shrinkwrap.json package-lock.json ''; @@ -46,9 +44,13 @@ buildNpmPackage rec { GECKODRIVER_SKIP_DOWNLOAD = true; EDGEDRIVER_SKIP_DOWNLOAD = true; + buildInputs = [ + systemdLibs + ]; + dontNpmBuild = true; npmInstallFlags = [ "--omit=dev" ]; - npmDepsHash = "sha256-Q0cWxV5OOaG8Z3aM2j0HtD1e9yPFVDSRcMKBf/yscv4="; + npmDepsHash = "sha256-mDcvAvZgTJ4vEHb6ZAtZrBnmHglf1i4Yipl3bxIkw0s="; postInstall = '' mv $out/bin/sitespeed{.,-}io @@ -71,7 +73,7 @@ buildNpmPackage rec { '' wrapProgram $out/bin/sitespeed-io \ --set PATH ${ - lib.makeBinPath ([ + lib.makeBinPath [ (python3.withPackages (p: [ p.numpy p.opencv4 @@ -82,7 +84,7 @@ buildNpmPackage rec { xorg.xorgserver procps coreutils - ]) + ] } \ ${lib.optionalString withChromium "--add-flags '${chromiumArgs}'"} \ ${lib.optionalString withFirefox "--add-flags '${firefoxArgs}'"} \ @@ -94,11 +96,11 @@ buildNpmPackage rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Open source tool that helps you monitor, analyze and optimize your website speed and performance"; homepage = "https://sitespeed.io"; - license = licenses.mit; - maintainers = with maintainers; [ misterio77 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ misterio77 ]; platforms = lib.unique (geckodriver.meta.platforms ++ chromedriver.meta.platforms); mainProgram = "sitespeed-io"; }; diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 14d153817a62..2f731da1646f 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -35,20 +35,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.1.27"; + version = "3.1.28"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-QRj1MHGpSWD+X84CxAYCaVeXjreQHV4BI8KevQvdcqY="; + hash = "sha256-s36rtNmVAp17Okj71NE/jgIM/pEZNS+oOYZ8rnjv6Ow="; }; kernel = buildGo123Module { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-oy2t5IBn9JJY5cm16Yak6e9dDl0KAEVtCE6SJ205vok="; + vendorHash = "sha256-i/hpP9S9vGS/jP3gKceDY00wgnBDkmsfYRZtsYQOjck="; patches = [ (replaceVars ./set-pandoc-path.patch { @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - hash = "sha256-nmkoGsrF75k9AWFlBhIj+vO4e3eW1dJN+y2VWokKe4s="; + hash = "sha256-5KqMmpcI+4iy3Ff72D8aUvhPttW2vwTI8aTwXBJ7sqo="; }; sourceRoot = "${finalAttrs.src.name}/app"; diff --git a/pkgs/by-name/sk/skeditor/nuget-deps.json b/pkgs/by-name/sk/skeditor/nuget-deps.json index c8b40dc5ba61..d3f445b3cc4e 100644 --- a/pkgs/by-name/sk/skeditor/nuget-deps.json +++ b/pkgs/by-name/sk/skeditor/nuget-deps.json @@ -6,8 +6,8 @@ }, { "pname": "Avalonia", - "version": "11.2.2", - "hash": "sha256-lYWqgjYOyh4pg+TdkgqeFhi8OMI1p9IOvSntVXo5zvE=" + "version": "11.2.6", + "hash": "sha256-f+fuElhlc2dCUt/GD/Noh07JqPIA8ZtpFxdmetdPVVI=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -16,8 +16,8 @@ }, { "pname": "Avalonia.BuildServices", - "version": "0.0.29", - "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + "version": "0.0.31", + "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" }, { "pname": "Avalonia.Controls.ColorPicker", @@ -31,8 +31,8 @@ }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.2", - "hash": "sha256-Mmp7Mjy9Y6uvkfjE8KLWoJWcVZHiJwqmhQupsxYRExo=" + "version": "11.2.6", + "hash": "sha256-TeUwMcNIvXw/gMuApUODZ7nuymM6OF9cNUGSajlyfoQ=" }, { "pname": "Avalonia.Controls.DataGrid", @@ -46,8 +46,8 @@ }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.2", - "hash": "sha256-RbkISZEp55N9dtqvPp0Ej2/wpU/YzI4wgJjBCJnIGl4=" + "version": "11.2.6", + "hash": "sha256-69ZtybLdpGG28M6p1Cenz6PZEfdf1VKxA4wIrw5FJnI=" }, { "pname": "Avalonia.Controls.ItemsRepeater", @@ -56,33 +56,33 @@ }, { "pname": "Avalonia.Desktop", - "version": "11.2.2", - "hash": "sha256-ucd2SH0CAjwE5TSgwhhzYZqMD1zuTlR7qLQDl3mYGvg=" + "version": "11.2.6", + "hash": "sha256-PANuvQlAhDWjnv7VUzxOjz6XRmt4l/YKhVLSIP7YL24=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.2.2", - "hash": "sha256-aOji+/TYSP0l3dpn62bvWMdce2YkYi5xzRPC3nS6ZGc=" + "version": "11.2.6", + "hash": "sha256-Lc9qLIywzD06I9sPXQRjLLLijDoFOVmuO5qNh301gYQ=" }, { "pname": "Avalonia.Fonts.Inter", - "version": "11.2.2", - "hash": "sha256-H1h+PQBW8vrvJnKQZ+vcFaxCVssBcuHGBQw1Jj8dMR0=" + "version": "11.2.6", + "hash": "sha256-/FWIvrtDk6D8TO+fmgDPnV8KIOKHZVraxXafOGvwfhQ=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.2", - "hash": "sha256-c/u6TX1Hl2h8B5xe7Zo1AJ6cR5BazI19NRnw56a36y0=" + "version": "11.2.6", + "hash": "sha256-816li4Nj8+oNkfeMjOAtFSFS+DSo9e2S3K45xqyHJAQ=" }, { "pname": "Avalonia.Markup.Xaml.Loader", - "version": "11.2.2", - "hash": "sha256-H3Hv9BEsDuqIzVlZAtjE6/oJSFiTQffz4K1fRecfoQ4=" + "version": "11.2.6", + "hash": "sha256-pO5OA8JV9mxHIkJV7LmRVMSrGFZ6OhYZEd/nvjZWuAs=" }, { "pname": "Avalonia.Native", - "version": "11.2.2", - "hash": "sha256-2Scuc+OCtfLChDYCi4feCh9XUrgJpbVaek3xRnpOGDE=" + "version": "11.2.6", + "hash": "sha256-by589X1UIjeQNK0lJMLfNzF2dK+qTNT6CBJNLgG86Aw=" }, { "pname": "Avalonia.Remote.Protocol", @@ -96,8 +96,8 @@ }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.2", - "hash": "sha256-lMb3VvHXQGxn0dyEGkzKXxFocvPJUaNnOpRJpHF9ORU=" + "version": "11.2.6", + "hash": "sha256-Q2uPnR6tPFWExohhMJKnJGTet8IVpQn/HIcRurUPAHQ=" }, { "pname": "Avalonia.Skia", @@ -111,8 +111,8 @@ }, { "pname": "Avalonia.Skia", - "version": "11.2.2", - "hash": "sha256-YmOT+r4OfyOyg8epho6bVaEW2HImEfsZ5rNqhWIY5Fk=" + "version": "11.2.6", + "hash": "sha256-6CfDcJT707iSB9XUQRvSvr5YWMavhiYPnHwVudUl74c=" }, { "pname": "Avalonia.Svg.Skia", @@ -121,63 +121,63 @@ }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.2.2", - "hash": "sha256-+wBsbMAMDMRkZN/t94qwQgyew8eCY2RBreoTCgs3KJU=" + "version": "11.2.6", + "hash": "sha256-L664hbpCtbu8aDX7YLnqKybF/eQFfes8eQp4A+as8PY=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.2.2", - "hash": "sha256-HXkfpUuTN8hSBMXCCGW78+2GC5w3VdTUp1qm7HvUZPI=" + "version": "11.2.6", + "hash": "sha256-kE31/1tchMJ6XmEbjLr5Idc7uKBAbuhsroUMg0LQauA=" }, { "pname": "Avalonia.Win32", - "version": "11.2.2", - "hash": "sha256-pouvlprL9VeEi1dG5zR6nFj+I/4CIjH1rHbV3N9/FHg=" + "version": "11.2.6", + "hash": "sha256-e+DNtKz4UDNqOP1vvVRqbD67n5IG9PxmGkMz7B6b7AY=" }, { "pname": "Avalonia.X11", - "version": "11.2.2", - "hash": "sha256-86EIfm1zEvKleliP58xAs7KGxP/n7x2m8ca8C9W1XqA=" + "version": "11.2.6", + "hash": "sha256-atnfxY6vspMzvMFc9PzwWb/uPNkPx5tF3zDGKeqlGIw=" }, { "pname": "Avalonia.Xaml.Behaviors", - "version": "11.2.0.1", - "hash": "sha256-eGY1ib2nmeRNwCxjcY3xxCjL+hsw2f0iMl2ZH7UenpY=" + "version": "11.2.0.14", + "hash": "sha256-Ep/IOiZyLDoIKrymqXtFPw2hrXQBpu8Dn+4YZ3/3Z4I=" }, { "pname": "Avalonia.Xaml.Interactions", - "version": "11.2.0.1", - "hash": "sha256-5WLAl3gMywuGmLbrVDoZS0QxoMs5b5TaLCMk3itYROw=" + "version": "11.2.0.14", + "hash": "sha256-7bk1zc2hZdTg+Y7LaDSb1CmL6yv0GeZAWKh3gf9bVm8=" }, { "pname": "Avalonia.Xaml.Interactions.Custom", - "version": "11.2.0.1", - "hash": "sha256-lfyyVJ7Hh0bKj9oaV3MB/d5zi+Epv8QXHwKG3Y1SzXs=" + "version": "11.2.0.14", + "hash": "sha256-RSIczkm9V/fKoOavXJQd931b9r/GBvuz0hR4HD6Wgd4=" }, { "pname": "Avalonia.Xaml.Interactions.DragAndDrop", - "version": "11.2.0.1", - "hash": "sha256-h/UPHGQPESoUQII5s1wElvBUm9y/wZwBbx4hmjBVE/Y=" + "version": "11.2.0.14", + "hash": "sha256-kRx4GMzoHZULJoUUptt9Xa7+UFYoiirI+wE6JuBBklc=" }, { "pname": "Avalonia.Xaml.Interactions.Draggable", - "version": "11.2.0.1", - "hash": "sha256-7jWbllNaDCauQoMDKY/WxurVSSUekF50HowYLrFveJM=" + "version": "11.2.0.14", + "hash": "sha256-ywaaUhDqj+yHJjnRPCu3HXYr/sSPrrlwiqN30vYqRLk=" }, { "pname": "Avalonia.Xaml.Interactions.Events", - "version": "11.2.0.1", - "hash": "sha256-RowY0nh8O9BVF5X2GV+9pkVYoMDY20MtYCuWfqe+X/k=" + "version": "11.2.0.14", + "hash": "sha256-CE7nh1ld747CGoPYiu4KlQxwP9yiG9/OMHwq8GpL0so=" }, { "pname": "Avalonia.Xaml.Interactions.Responsive", - "version": "11.2.0.1", - "hash": "sha256-N/Hd4x0lMCrEzarkbb51h74PG1uU1geXuSKlV/ZEBNY=" + "version": "11.2.0.14", + "hash": "sha256-vyc/HXfDAEi1AbAwkphrlVpckrM5ykptXYp/l5ul8VQ=" }, { "pname": "Avalonia.Xaml.Interactivity", - "version": "11.2.0.1", - "hash": "sha256-B6JJn52Yxu/ncUyBMqBprY6RskzB5sZes/3I9mmo1Qc=" + "version": "11.2.0.14", + "hash": "sha256-SZIVuXdT1PN3zBCpVv3F6Y5vaOp8CTsq0/HVHXrbc6Y=" }, { "pname": "CommunityToolkit.Mvvm", @@ -316,38 +316,38 @@ }, { "pname": "NuGet.Common", - "version": "6.12.1", - "hash": "sha256-k6JAFqHFinTakwNuW666aXYPhR7TpI/rb+KbHm1S2TM=" + "version": "6.13.2", + "hash": "sha256-ASLa/Jigg5Eop0ZrXPl98RW2rxnJRC7pbbxhuV74hFw=" }, { "pname": "NuGet.Configuration", - "version": "6.12.1", - "hash": "sha256-e/4lvyl7o7g4aWTAtr9S2yiGgk7V0E9p6DXpsy7GgVw=" + "version": "6.13.2", + "hash": "sha256-z8VW1YdRDanyyRTDYRvRkSv/XPR3c/hMM1y8cNNjx0Y=" }, { "pname": "NuGet.Frameworks", - "version": "6.12.1", - "hash": "sha256-GGpkbas+PNLx35vvr3nyAVz5lY/aeoMx6qjmT368Lpg=" + "version": "6.13.2", + "hash": "sha256-caDyc+WgYOo43AUTjtbP0MyvYDb6JweEKDdIul61Cac=" }, { "pname": "NuGet.Packaging", - "version": "6.12.1", - "hash": "sha256-3h8Nmjpt383+dCg9GJ1BJ26UirwEQsWCPcTiT0+wGeI=" + "version": "6.13.2", + "hash": "sha256-lhO+SFwIYZ4aPHxIGm5ubkkE2a5Ve2xgtroRbNh7hpw=" }, { "pname": "NuGet.Protocol", - "version": "6.12.1", - "hash": "sha256-l+CHnAcit6Y9OjBxereRP5JzOuWbuZZQYkFOKsUkdQ8=" + "version": "6.13.2", + "hash": "sha256-5lnAHHZjy7A4vgv65AeBAs64mSNpuoUjxW3HnrMpuzY=" }, { "pname": "NuGet.Versioning", - "version": "6.12.1", - "hash": "sha256-f/ejCuzCAwKs4N4Ec6yf2RovrhBT0nj0hRDP+03/Iy4=" + "version": "6.13.2", + "hash": "sha256-gmpyBpKnt+GHqgx/2uFKp+J2csbxEAy1E7WdVT117sw=" }, { "pname": "Octokit", - "version": "13.0.1", - "hash": "sha256-uxQC+bbmWloIdwndqWUb+FY8iAUsPgxzqfw41EPWuAU=" + "version": "14.0.0", + "hash": "sha256-pTSI7Tz5VFd4Ydx1laE+VkZfhsl7Rbgw42PBqhyVvyI=" }, { "pname": "Serilog", @@ -366,13 +366,13 @@ }, { "pname": "SkAvaloniaEdit", - "version": "11.1.0", - "hash": "sha256-G1oQi7HC6w3WMprDzP6dDDofChLziV7Dij8IRkl/ZTY=" + "version": "11.1.2", + "hash": "sha256-CsJC3w4Fel9MUDPUEb3C0yqSE/m0TUnricMjNMecq2s=" }, { "pname": "SkFluentAvalonia", - "version": "2.1.2", - "hash": "sha256-3TG3GCMk8VW1/j6DYJO1FVSx1FylXjLDozafxa2bM2A=" + "version": "2.2.0", + "hash": "sha256-6I2QAkh7yd+T3sq6vx/Avk/KYCdemV/udJxagVLYrkM=" }, { "pname": "SkiaSharp", @@ -474,6 +474,11 @@ "version": "2.0.0.4", "hash": "sha256-xRB9GE2IxtV25py1S4y3R0Qk5lHYThu73O+YYu1VIoA=" }, + { + "pname": "System.Collections.Immutable", + "version": "8.0.0", + "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w=" + }, { "pname": "System.Formats.Asn1", "version": "8.0.1", @@ -511,8 +516,8 @@ }, { "pname": "System.Threading.AccessControl", - "version": "9.0.0", - "hash": "sha256-+Mmlp6kmbFt1U6GgpBO+raLgByTBn6ToYI2t4S9nN/4=" + "version": "9.0.3", + "hash": "sha256-tgrxRE3QNVERfr8M7NQruRKvi1mHJhab8Us7H1asECM=" }, { "pname": "Tmds.DBus.Protocol", diff --git a/pkgs/by-name/sk/skeditor/package.nix b/pkgs/by-name/sk/skeditor/package.nix index bdf4d2eee2e3..9d4bc7dd0508 100644 --- a/pkgs/by-name/sk/skeditor/package.nix +++ b/pkgs/by-name/sk/skeditor/package.nix @@ -9,13 +9,13 @@ }: buildDotnetModule rec { pname = "skeditor"; - version = "2.8.5"; + version = "2.8.6"; src = fetchFromGitHub { owner = "skeditorteam"; repo = "skeditor"; rev = "v${version}"; - hash = "sha256-e8mQTkTvR8RfC27VsONqf9UtkM/H8GebxrYVUdJw7PE="; + hash = "sha256-jmmGf/pSWzrX+niCO7SeoJIQ4zepHD8cE4D2eVeLPTk="; }; projectFile = "SkEditor/SkEditor.csproj"; diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix index 001996294a8d..e9796901dbf4 100644 --- a/pkgs/by-name/sl/slint-lsp/package.nix +++ b/pkgs/by-name/sl/slint-lsp/package.nix @@ -10,17 +10,20 @@ xorg, libxkbcommon, wayland, - # Darwin Frameworks - AppKit, - CoreGraphics, - CoreServices, - CoreText, - Foundation, - libiconv, - OpenGL, + versionCheckHook, + nix-update-script, }: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "slint-lsp"; + version = "1.10.0"; + + src = fetchCrate { + inherit (finalAttrs) pname version; + hash = "sha256-5LDEjJx+PC6pOem06DKFkPcjpIkF20gbxi/PAVZT1ns="; + }; + + cargoHash = "sha256-1/4dOlhByJDpduExu9ZOjb7JYFKehnLiLCboWUnmfp8="; -let rpathLibs = [ fontconfig @@ -34,52 +37,35 @@ let libxkbcommon wayland ]; -in -rustPlatform.buildRustPackage rec { - pname = "slint-lsp"; - version = "1.10.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-5LDEjJx+PC6pOem06DKFkPcjpIkF20gbxi/PAVZT1ns="; - }; - - useFetchCargoVendor = true; - cargoHash = "sha256-1/4dOlhByJDpduExu9ZOjb7JYFKehnLiLCboWUnmfp8="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; - buildInputs = - rpathLibs - ++ [ xorg.libxcb.dev ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - AppKit - CoreGraphics - CoreServices - CoreText - Foundation - libiconv - OpenGL - ]; + buildInputs = finalAttrs.rpathLibs ++ [ xorg.libxcb.dev ]; # Tests requires `i_slint_backend_testing` which is only a dev dependency doCheck = false; postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - patchelf --set-rpath ${lib.makeLibraryPath rpathLibs} $out/bin/slint-lsp + patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.rpathLibs} $out/bin/slint-lsp ''; dontPatchELF = true; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Language Server Protocol (LSP) for Slint UI language"; mainProgram = "slint-lsp"; homepage = "https://slint-ui.com/"; - changelog = "https://github.com/slint-ui/slint/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ xgroleau ]; + downloadPage = "https://github.com/slint-ui/slint/"; + changelog = "https://github.com/slint-ui/slint/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ xgroleau ]; }; -} +}) diff --git a/pkgs/by-name/sl/slippy/package.nix b/pkgs/by-name/sl/slippy/package.nix index 70e757d7c1a1..c50ce43067eb 100644 --- a/pkgs/by-name/sl/slippy/package.nix +++ b/pkgs/by-name/sl/slippy/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,13 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Markdown slideshows in Rust"; diff --git a/pkgs/by-name/sl/slowlorust/package.nix b/pkgs/by-name/sl/slowlorust/package.nix index 14b538ece5ae..71b74b20e646 100644 --- a/pkgs/by-name/sl/slowlorust/package.nix +++ b/pkgs/by-name/sl/slowlorust/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, versionCheckHook, @@ -27,8 +25,6 @@ rustPlatform.buildRustPackage rec { --replace-fail 'version = "1.0"' 'version = "${version}"' ''; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/sl/slskd/deps.json b/pkgs/by-name/sl/slskd/deps.json index 2229e5050cb4..afffb6a8d3dd 100644 --- a/pkgs/by-name/sl/slskd/deps.json +++ b/pkgs/by-name/sl/slskd/deps.json @@ -781,8 +781,8 @@ }, { "pname": "Soulseek", - "version": "7.0.1", - "hash": "sha256-sGs+AomE20UILH0+RcArkMAR/Xk7yewppMnvg2YZ1WQ=" + "version": "7.0.3", + "hash": "sha256-/GCUh4XJ4zs5etxQ0GjNJozkS2GZ/Qq1cot1+bRQack=" }, { "pname": "SQLitePCLRaw.bundle_e_sqlite3", diff --git a/pkgs/by-name/sl/slskd/package.nix b/pkgs/by-name/sl/slskd/package.nix index d022abfbc63c..a5bc3bedfc3c 100644 --- a/pkgs/by-name/sl/slskd/package.nix +++ b/pkgs/by-name/sl/slskd/package.nix @@ -6,26 +6,26 @@ fetchFromGitHub, fetchNpmDeps, mono, - nodejs_18, + nodejs_20, slskd, testers, nix-update-script, }: let - nodejs = nodejs_18; + nodejs = nodejs_20; # https://github.com/NixOS/nixpkgs/blob/d88947e91716390bdbefccdf16f7bebcc41436eb/pkgs/build-support/node/build-npm-package/default.nix#L62 npmHooks = buildPackages.npmHooks.override { inherit nodejs; }; in buildDotnetModule rec { pname = "slskd"; - version = "0.22.3"; + version = "0.22.5"; src = fetchFromGitHub { owner = "slskd"; repo = "slskd"; tag = version; - hash = "sha256-CXJ55mtNVaPZVxuzYyiMjnJJZPAUlRc/DHKt6+ZfWHo="; + hash = "sha256-gLPWbRffoCJAdg8zP9idfnzqT1nIZrI88cYUd/DyxZA="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildDotnetModule rec { name = "${pname}-${version}-npm-deps"; inherit src; sourceRoot = "${src.name}/${npmRoot}"; - hash = "sha256-I/rgSIFFCA47Y22zbmrrdUWS7mHCxKmFwO3QNBHTdCM="; + hash = "sha256-GACe+ufxiSlS1aD9R+I8VqbZqi2gCHUp+Dm/XMx2WZQ="; }; projectFile = "slskd.sln"; diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index 8323994dd7c8..adb434620a72 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -1,26 +1,22 @@ { lib, - stdenv, - darwin, fetchFromGitHub, rustPlatform, }: rustPlatform.buildRustPackage rec { pname = "slumber"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "LucasPickering"; repo = "slumber"; tag = "v${version}"; - hash = "sha256-7MPNs2vAzCo5TPJZFhd3xaZW0YbF724gfKNLB08IU8A="; + hash = "sha256-GFkssVTOohEdczIi4+OV7qKHBPqa2yFZNhAoMAIBZN0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-eWox5NrvZr+mEGGwxYbAW5EgEOQ8WQUy2pughBlpXgM="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + cargoHash = "sha256-4RDnIWr0Z6FGnUQxh+yk7L/mg/Jw6JROns4DXkYIbuE="; meta = with lib; { description = "Terminal-based HTTP/REST client"; diff --git a/pkgs/by-name/sl/slurm-nm/package.nix b/pkgs/by-name/sl/slurm-nm/package.nix index cee4e5ee8f75..13c617d79cd2 100644 --- a/pkgs/by-name/sl/slurm-nm/package.nix +++ b/pkgs/by-name/sl/slurm-nm/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Generic network load monitor"; homepage = "https://github.com/mattthias/slurm"; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ mikaelfangel ]; mainProgram = "slurm"; }; diff --git a/pkgs/by-name/sm/sm64coopdx/package.nix b/pkgs/by-name/sm/sm64coopdx/package.nix index 4727d240eed7..cc5a4cafa36a 100644 --- a/pkgs/by-name/sm/sm64coopdx/package.nix +++ b/pkgs/by-name/sm/sm64coopdx/package.nix @@ -10,6 +10,7 @@ SDL2, stdenv, zlib, + libGL, sm64baserom, enableCoopNet ? true, @@ -36,13 +37,13 @@ in # note: there is a generic builder in pkgs/games/sm64ex/generic.nix that is meant to help build sm64ex and its forks; however sm64coopdx has departed significantly enough in its build that it doesn't make sense to use that other than the baseRom derivation stdenv.mkDerivation (finalAttrs: { pname = "sm64coopdx"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "coop-deluxe"; repo = "sm64coopdx"; - rev = "v${finalAttrs.version}"; - hash = "sha256-QWxhu7wGIjOIJyqjqakUzhhF+WxQslZdX3aEWYdDZbw="; + rev = "v1.3"; # it seems coopdx has taken on some stylistic versioning... + hash = "sha256-ssbvNnBBxahzJRIX5Vhze+Nfh3ADoy+NrUIF2RZHye8="; }; nativeBuildInputs = [ makeWrapper ]; @@ -54,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { python3 SDL2 zlib + libGL ]; enableParallelBuilding = true; @@ -114,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ lib.maintainers.shelvacu ]; mainProgram = "sm64coopdx"; homepage = "https://sm64coopdx.com/"; - changelog = "https://github.com/coop-deluxe/sm64coopdx/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/coop-deluxe/sm64coopdx/releases/tag/v1.3"; sourceProvenance = with lib.sourceTypes; [ fromSource # The lua engine, discord sdk, and coopnet library are vendored pre-built. See https://github.com/coop-deluxe/sm64coopdx/tree/v1.0.3/lib diff --git a/pkgs/by-name/sm/sm64ex/package.nix b/pkgs/by-name/sm/sm64ex/package.nix index 7a2ea046d59a..b71395284a21 100644 --- a/pkgs/by-name/sm/sm64ex/package.nix +++ b/pkgs/by-name/sm/sm64ex/package.nix @@ -7,6 +7,7 @@ pkg-config, audiofile, SDL2, + libGL, hexdump, sm64baserom, region ? "us", @@ -18,13 +19,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "sm64ex"; - version = "0-unstable-2024-07-04"; + version = "0-unstable-2024-12-17"; src = fetchFromGitHub { owner = "sm64pc"; repo = "sm64ex"; - rev = "20bb444562aa1dba79cf6adcb5da632ba580eec3"; - hash = "sha256-nw+F0upTetLqib5r5QxmcOauSJccpTydV3soXz9CHLQ="; + rev = "d7ca2c04364a6dd0dac58b47151e04e26887e6f0"; + hash = "sha256-n3ecY97UB/fdTZpy78CB4DxyHyjK+L6AAuNpvnmVoss="; }; patches = lib.optionals _60fps [ @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ audiofile SDL2 + libGL ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/sm/smartcat/package.nix b/pkgs/by-name/sm/smartcat/package.nix index a06d2d8b151a..77f38f36f665 100644 --- a/pkgs/by-name/sm/smartcat/package.nix +++ b/pkgs/by-name/sm/smartcat/package.nix @@ -3,10 +3,8 @@ fetchFromGitHub, rustPlatform, - darwin, openssl, pkg-config, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -27,15 +25,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; meta = { description = "Integrate large language models into the command line"; diff --git a/pkgs/by-name/sm/smartgit/package.nix b/pkgs/by-name/sm/smartgit/package.nix index a6c3d9ac231d..15b19494541c 100644 --- a/pkgs/by-name/sm/smartgit/package.nix +++ b/pkgs/by-name/sm/smartgit/package.nix @@ -48,9 +48,7 @@ stdenv.mkDerivation (finalAttrs: { libXtst ] } \ - --prefix JRE_HOME : ${jre} \ - --prefix JAVA_HOME : ${jre} \ - --prefix SMARTGITHG_JAVA_HOME : ${jre} \ + --prefix SMARTGIT_JAVA_HOME : ${jre} \ ) # add missing shebang for start script sed -i $out/bin/smartgit \ @@ -106,9 +104,13 @@ stdenv.mkDerivation (finalAttrs: { Command line Git is required. ''; homepage = "https://www.syntevo.com/smartgit/"; - changelog = "https://www.syntevo.com/smartgit/changelog.txt"; + changelog = "https://www.syntevo.com/smartgit/changelog-${lib.versions.majorMinor finalAttrs.version}.txt"; license = lib.licenses.unfree; + mainProgram = "smartgit"; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jraygauthier ]; + maintainers = with lib.maintainers; [ + jraygauthier + tmssngr + ]; }; }) diff --git a/pkgs/by-name/sm/smartsynchronize/package.nix b/pkgs/by-name/sm/smartsynchronize/package.nix new file mode 100644 index 000000000000..5dffdf8e96b8 --- /dev/null +++ b/pkgs/by-name/sm/smartsynchronize/package.nix @@ -0,0 +1,104 @@ +{ + lib, + stdenv, + fetchurl, + makeDesktopItem, + openjdk21, + gtk3, + glib, + adwaita-icon-theme, + wrapGAppsHook3, + libXtst, + which, +}: +let + jre = openjdk21; +in +stdenv.mkDerivation (finalAttrs: { + pname = "smartsynchronize"; + version = "4.6.1"; + + src = fetchurl { + url = "https://www.syntevo.com/downloads/smartsynchronize/smartsynchronize-linux-${ + builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version + }.tar.gz"; + hash = "sha256-oc1GFwiA6LPbCsCsGGENEz9ktcu0NINfQ9dsL27VIpI="; + }; + + nativeBuildInputs = [ wrapGAppsHook3 ]; + + buildInputs = [ + jre + adwaita-icon-theme + gtk3 + ]; + + preFixup = '' + gappsWrapperArgs+=( \ + --prefix PATH : ${ + lib.makeBinPath [ + jre + which + ] + } \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + gtk3 + glib + libXtst + ] + } \ + --prefix JAVA_HOME : ${jre} \ + ) + ''; + + installPhase = '' + runHook preInstall + + mkdir -pv $out/{bin,share/applications,share/icons/hicolor/scalable/apps/} + cp -av ./lib $out/ + cp -av bin/smartsynchronize.sh $out/bin/smartsynchronize + + cp -av $desktopItem/share/applications/* $out/share/applications/ + for icon_size in 32 48 64 128 256; do + path=$icon_size'x'$icon_size + icon=bin/smartsynchronize-$icon_size.png + mkdir -p $out/share/icons/hicolor/$path/apps + cp $icon $out/share/icons/hicolor/$path/apps/smartsynchronize.png + done + + cp -av bin/smartsynchronize.svg $out/share/icons/hicolor/scalable/apps/ + + runHook postInstall + ''; + + desktopItem = makeDesktopItem { + name = "smartsynchronize"; + exec = "smartsynchronize"; + comment = finalAttrs.meta.description; + icon = "smartsynchronize"; + desktopName = "SmartSynchronize"; + categories = [ "Development" ]; + startupNotify = true; + startupWMClass = "smartsynchronize"; + keywords = [ + "compare" + "file manager" + ]; + }; + + meta = { + description = "File Manager, File/Directory Compare"; + longDescription = '' + SmartSynchronize is a dual-pane, keyboard-centric, multi-platform file manager. + It also is known for its file compare, directory compare and file merge. + SmartSynchronize is free to use for active Open Source developers and users from academic institutions. + ''; + homepage = "https://www.syntevo.com/smartsynchronize/"; + changelog = "https://www.syntevo.com/smartsynchronize/changelog-${lib.versions.majorMinor finalAttrs.version}.txt"; + license = lib.licenses.unfree; + mainProgram = "smartsynchronize"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ tmssngr ]; + }; +}) diff --git a/pkgs/by-name/sm/smc-fuzzer/package.nix b/pkgs/by-name/sm/smc-fuzzer/package.nix index 7d10da09bed5..255182141c8d 100644 --- a/pkgs/by-name/sm/smc-fuzzer/package.nix +++ b/pkgs/by-name/sm/smc-fuzzer/package.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation { hash = "sha256-FyiFSVeO46UnBrpC8AhSuGe7alo37pT8J1qQWGPqV2U="; }; - buildInputs = [ swiftPackages.apple_sdk.frameworks.AppKit ]; - installPhase = '' runHook preInstall diff --git a/pkgs/by-name/sm/smeagol/package.nix b/pkgs/by-name/sm/smeagol/package.nix new file mode 100644 index 000000000000..52aa642aee0a --- /dev/null +++ b/pkgs/by-name/sm/smeagol/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "smeagol"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "AustinWise"; + repo = "smeagol"; + tag = finalAttrs.version; + hash = "sha256-ILZ4TRL5yRGZuyyNPIpMgnlBGQAwbtTFlTaN3UYb5ls="; + }; + + cargoHash = "sha256-5OSrxm+NpuimE8Jwl5/VScKjuYNROX50KNiyBMZqCOw="; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/smeagol-wiki"; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Locally hosted wiki"; + homepage = "https://smeagol.dev/"; + changelog = "https://github.com/AustinWise/smeagol/blob/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + kachick + ]; + mainProgram = "smeagol-wiki"; + }; +}) diff --git a/pkgs/by-name/sm/smpeg2/package.nix b/pkgs/by-name/sm/smpeg2/package.nix index 983d28d30334..ad1912931c3e 100644 --- a/pkgs/by-name/sm/smpeg2/package.nix +++ b/pkgs/by-name/sm/smpeg2/package.nix @@ -3,7 +3,6 @@ stdenv, autoconf, automake, - darwin, fetchFromGitHub, makeWrapper, pkg-config, @@ -28,7 +27,7 @@ stdenv.mkDerivation { pkg-config ]; - buildInputs = [ SDL2 ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.libobjc; + buildInputs = [ SDL2 ]; outputs = [ "out" diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix index 98e03da7a41d..60e876a69e43 100644 --- a/pkgs/by-name/sn/sn0int/package.nix +++ b/pkgs/by-name/sn/sn0int/package.nix @@ -37,9 +37,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libseccomp - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - pkgs.darwin.apple_sdk.frameworks.Security ]; # One of the dependencies (chrootable-https) tries to read "/etc/resolv.conf" diff --git a/pkgs/applications/misc/snagboot/default.nix b/pkgs/by-name/sn/snagboot/package.nix similarity index 100% rename from pkgs/applications/misc/snagboot/default.nix rename to pkgs/by-name/sn/snagboot/package.nix diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix index b3d49ae7bc86..7904bc82687b 100644 --- a/pkgs/by-name/sn/snakemake/package.nix +++ b/pkgs/by-name/sn/snakemake/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "8.29.2"; + version = "9.3.0"; pyproject = true; src = fetchFromGitHub { owner = "snakemake"; repo = "snakemake"; tag = "v${version}"; - hash = "sha256-69NsbfHF29l92gwO8If9vp8Cdjac3BnO+hbY3b2bZ8E="; + hash = "sha256-C9XPoYoSxl58ddPe77ddgOaVfXSD1n0fgDhRciLH0uM="; }; postPatch = '' @@ -25,13 +25,13 @@ python3Packages.buildPythonApplication rec { substituteInPlace tests/common.py \ --replace-fail 'os.environ["PYTHONPATH"] = os.getcwd()' "pass" \ --replace-fail 'del os.environ["PYTHONPATH"]' "pass" - substituteInPlace snakemake/unit_tests/__init__.py \ + substituteInPlace src/snakemake/unit_tests/__init__.py \ --replace-fail '"unit_tests/templates"' '"'"$PWD"'/snakemake/unit_tests/templates"' - substituteInPlace snakemake/assets/__init__.py \ + substituteInPlace src/snakemake/assets/__init__.py \ --replace-fail "raise err" "return bytes('err','ascii')" ''; - build-system = with python3Packages; [ setuptools ]; + build-system = with python3Packages; [ setuptools-scm ]; dependencies = with python3Packages; [ appdirs @@ -55,6 +55,7 @@ python3Packages.buildPythonApplication rec { smart-open snakemake-interface-executor-plugins snakemake-interface-common + snakemake-interface-logger-plugins snakemake-interface-storage-plugins snakemake-interface-report-plugins stopit @@ -126,6 +127,20 @@ python3Packages.buildPythonApplication rec { "test_deploy_sources" "test_output_file_cache_storage" "test_storage" + + # Tries to access internet + "test_report_after_run" + + # Needs stress-ng + "test_benchmark" + "test_benchmark_jsonl" + + # Needs unshare + "test_nodelocal" + + # Requires snakemake-storage-plugin-http + "test_keep_local" + "test_retrieve" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Unclear failure: @@ -144,6 +159,14 @@ python3Packages.buildPythonApplication rec { "test_queue_input_forceall" "test_resources_submitted_to_cluster" "test_scopes_submitted_to_cluster" + + # Issue with /dev/stderr in sandbox + "test_protected_symlink_output" + + # Unclear issue: + # pulp.apis.core.PulpSolverError: Pulp: cannot execute cbc cwd: + # but pulp solver is not default + "test_access_patterns" ]; pythonImportsCheck = [ "snakemake" ]; diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix index 7f64f2fe7e1a..f8d82b213b31 100644 --- a/pkgs/by-name/sn/sniffnet/package.nix +++ b/pkgs/by-name/sn/sniffnet/package.nix @@ -13,7 +13,6 @@ vulkan-loader, wayland, xorg, - darwin, }: rustPlatform.buildRustPackage rec { @@ -48,7 +47,6 @@ rustPlatform.buildRustPackage rec { xorg.libXrandr ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/sn/snore/package.nix b/pkgs/by-name/sn/snore/package.nix index 5ad31a29ee35..7311f17fcfbe 100644 --- a/pkgs/by-name/sn/snore/package.nix +++ b/pkgs/by-name/sn/snore/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "clamiax"; repo = "snore"; - rev = version; + tag = version; hash = "sha256-bKPGSePzp4XEZFY0QQr37fm3R1v3hLD6FeySFd7zNJc="; }; diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 69328f7b3d05..be931652bd21 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -18,13 +18,13 @@ }: rustPlatform.buildRustPackage rec { pname = "snx-rs"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; tag = "v${version}"; - hash = "sha256-eWtoCU5JkpHGcOLzjzj9icDlnIW1y+fiEn5V/E5IQ4U="; + hash = "sha256-bLuIXd2pqqiyEP+lDTJYVDZkRZ0HcDkKFZd/qlpuf98="; }; passthru.updateScript = nix-update-script { }; @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-Hjc2wKkNmlVjZb5wz9fq9hzUsxXJyeFYq+4C+weUlq0="; + cargoHash = "sha256-E5OJVf9CkLn5mFtk4Yacs2OIvAuIw0idSs7QuTNvfgU="; meta = { description = "Open source Linux client for Checkpoint VPN tunnels"; diff --git a/pkgs/by-name/so/so/package.nix b/pkgs/by-name/so/so/package.nix index df39145c5973..ad1150c4b03e 100644 --- a/pkgs/by-name/so/so/package.nix +++ b/pkgs/by-name/so/so/package.nix @@ -1,6 +1,5 @@ { lib, - darwin, fetchFromGitHub, libiconv, openssl, @@ -11,7 +10,6 @@ }: let - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; self = rustPlatform.buildRustPackage { pname = "so"; version = "0.4.10"; @@ -34,9 +32,6 @@ let [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - CoreServices - Security - SystemConfiguration ]; strictDeps = true; diff --git a/pkgs/by-name/so/soapyplutosdr/package.nix b/pkgs/by-name/so/soapyplutosdr/package.nix index 07e4fda8cc76..8fc1c04ec6b5 100644 --- a/pkgs/by-name/so/soapyplutosdr/package.nix +++ b/pkgs/by-name/so/soapyplutosdr/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, pkg-config, - darwin, libad9361, libiio, libusb1, @@ -26,18 +25,12 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config ]; - buildInputs = - [ - libad9361 - libiio - libusb1 - soapysdr - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.IOKit - darwin.libobjc - ]; + buildInputs = [ + libad9361 + libiio + libusb1 + soapysdr + ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/by-name/so/soapyremote/package.nix b/pkgs/by-name/so/soapyremote/package.nix index 7fe21410cf50..b500b85c2da2 100644 --- a/pkgs/by-name/so/soapyremote/package.nix +++ b/pkgs/by-name/so/soapyremote/package.nix @@ -8,7 +8,7 @@ }: let - version = "0.5.2"; + version = "0.5.2-unstable-2024-01-24"; in stdenv.mkDerivation { @@ -18,8 +18,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "pothosware"; repo = "SoapyRemote"; - rev = "soapy-remote-${version}"; - sha256 = "124sy9v08fm51ds1yzrxspychn34y0rl6y48mzariianazvzmfax"; + rev = "54caa5b2af348906607c5516a112057650d0873d"; + sha256 = "sha256-uekElbcbX2P5TEufWEoP6tgUM/4vxgSQZu8qaBCSo18="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix index c1faaafceb28..cf8a4471b41b 100644 --- a/pkgs/by-name/so/solana-cli/package.nix +++ b/pkgs/by-name/so/solana-cli/package.nix @@ -3,10 +3,8 @@ fetchFromGitHub, lib, rustPlatform, - darwin, udev, protobuf, - libcxx, rocksdb_8_3, installShellFiles, pkg-config, @@ -42,14 +40,6 @@ let version = "1.18.26"; hash = "sha256-sJ0Zn5GMi64/S8zqomL/dYRVW8SOQWsP+bpcdatJC0A="; rocksdb = rocksdb_8_3; - - inherit (darwin.apple_sdk_11_0) Libsystem; - inherit (darwin.apple_sdk_11_0.frameworks) - System - IOKit - AppKit - Security - ; in rustPlatform.buildRustPackage rec { pname = "solana-cli"; @@ -92,20 +82,10 @@ rustPlatform.buildRustPackage rec { protobuf pkg-config ]; - buildInputs = - [ - openssl - rustPlatform.bindgenHook - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libcxx - IOKit - Security - AppKit - System - Libsystem - ]; + buildInputs = [ + openssl + rustPlatform.bindgenHook + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]; doInstallCheck = true; @@ -133,8 +113,8 @@ rustPlatform.buildRustPackage rec { # Require this on darwin otherwise the compiler starts rambling about missing # cmath functions - CPPFLAGS = lib.optionals stdenv.hostPlatform.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; - LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin "-L${lib.getLib libcxx}/lib"; + CPPFLAGS = lib.optionals stdenv.hostPlatform.isDarwin "-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"; + LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin "-L${lib.getLib stdenv.cc.libcxx}/lib"; # If set, always finds OpenSSL in the system, even if the vendored feature is enabled. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix index d3205fbccf88..1db982b38c7b 100644 --- a/pkgs/by-name/so/sonarlint-ls/package.nix +++ b/pkgs/by-name/so/sonarlint-ls/package.nix @@ -16,17 +16,17 @@ maven.buildMavenPackage rec { pname = "sonarlint-ls"; - version = "3.18.0.75982"; + version = "3.20.0.76057"; src = fetchFromGitHub { owner = "SonarSource"; repo = "sonarlint-language-server"; rev = version; - hash = "sha256-/SpooLAJutBJ/FakSUyXMtPLy3TaPxCU8KEMnnzgdBs="; + hash = "sha256-O02KxAIOKhHBkxjLSsc2Pw7VkR0IsyA/kpCu4f1urTE="; }; mvnJdk = jdk17; - mvnHash = "sha256-IMM3xXWTnYzD3415tMjuwiQD2NMGM2XkuxdMYpsaqfA="; + mvnHash = "sha256-yFzT0v7u23b/r8Pe+wuSXlwc4rN5DJ9ezmtlcWVMj7k="; # Disables failing tests which either need network access or are flaky. mvnParameters = lib.escapeShellArgs [ diff --git a/pkgs/by-name/so/sooperlooper/package.nix b/pkgs/by-name/so/sooperlooper/package.nix index 2dd184be7ecf..c849da803959 100644 --- a/pkgs/by-name/so/sooperlooper/package.nix +++ b/pkgs/by-name/so/sooperlooper/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, autoreconfHook, pkg-config, which, @@ -21,25 +20,17 @@ fftw, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sooperlooper"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "essej"; repo = "sooperlooper"; - rev = "v${version}"; - sha256 = "sha256-Lrsz/UDCgoac63FJ3CaPVaYwvBtzkGQQRLhUi6lUusE="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-bPu/VWTJLSIMoJSEQb+/nqtTpkPtCNVuXA17XsnFSP0="; }; - patches = [ - (fetchpatch { - name = "10-build_with_wx_32.patch"; - url = "https://sources.debian.org/data/main/s/sooperlooper/1.7.8~dfsg0-2/debian/patches/10-build_with_wx_32.patch"; - sha256 = "sha256-NF/w+zgRBNkSTqUJhfH9kQogXSYEF70pCN+loR0hjpg="; - }) - ]; - autoreconfPhase = '' patchShebangs ./autogen.sh ./autogen.sh @@ -67,9 +58,12 @@ stdenv.mkDerivation rec { fftw ]; + # see https://bugs.gentoo.org/925275 + CPPFLAGS = "-fpermissive"; + enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Live looping sampler capable of immediate loop recording, overdubbing, multiplying, reversing and more"; longDescription = '' It allows for multiple simultaneous multi-channel loops limited only by your computer's available memory. @@ -79,8 +73,9 @@ stdenv.mkDerivation rec { and the engine can be run standalone on a computer without a monitor. ''; homepage = "https://sonosaurus.com/sooperlooper/"; - license = licenses.gpl2; - maintainers = with maintainers; [ magnetophon ]; - platforms = platforms.linux; + downloadPage = "https://github.com/essej/sooperlooper"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ magnetophon ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix index 0a80ffce37f4..89492fbdf345 100644 --- a/pkgs/by-name/so/sops/package.nix +++ b/pkgs/by-name/so/sops/package.nix @@ -12,16 +12,16 @@ buildGoModule (final: { pname = "sops"; - version = "3.10.1"; + version = "3.10.2"; src = fetchFromGitHub { owner = "getsops"; repo = final.pname; tag = "v${final.version}"; - hash = "sha256-LdsuN243oQ/L6LYgynb7Kw60alXn5IfUfhY0WaZFVCU="; + hash = "sha256-IdQnxVBMAQpSAYB2S3D3lSULelFMBpjiBGOxeTgC10I="; }; - vendorHash = "sha256-I+iwimrNdKABZFP2etZTQJAXKigh+0g/Jhip86Cl5Rg="; + vendorHash = "sha256-7aHUIERVSxv3YGAMteGbqkAZQXXDVziV0rhUhjwch3U="; subPackages = [ "cmd/sops" ]; diff --git a/pkgs/by-name/so/sou/package.nix b/pkgs/by-name/so/sou/package.nix index 0ee536e93a07..56fd4f5d0e32 100644 --- a/pkgs/by-name/so/sou/package.nix +++ b/pkgs/by-name/so/sou/package.nix @@ -3,7 +3,8 @@ buildGoModule, fetchFromGitHub, nix-update-script, - versionCheckHook, + testers, + sou, }: buildGoModule (finalAttrs: { @@ -25,13 +26,16 @@ buildGoModule (finalAttrs: { "-X=main.version=${finalAttrs.version}" ]; - doInstallCheck = true; - nativeInstallCheck = [ versionCheckHook ]; - # Some of the tests use localhost networking __darwinAllowLocalNetworking = true; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + command = "HOME=$TMPDIR sou --version"; + package = sou; + }; + }; meta = { description = "Tool for exploring files in container image layers"; diff --git a/pkgs/by-name/so/souffle/package.nix b/pkgs/by-name/so/souffle/package.nix index d0f8a16c7342..8f359360ebf4 100644 --- a/pkgs/by-name/so/souffle/package.nix +++ b/pkgs/by-name/so/souffle/package.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice - copumpkin wchresta markusscherer ]; diff --git a/pkgs/by-name/so/source-meta-json-schema/package.nix b/pkgs/by-name/so/source-meta-json-schema/package.nix index afcf8fdd2273..ed8ab7021c7e 100644 --- a/pkgs/by-name/so/source-meta-json-schema/package.nix +++ b/pkgs/by-name/so/source-meta-json-schema/package.nix @@ -5,7 +5,7 @@ cmake, }: let - version = "8.0.0"; + version = "9.1.0"; in stdenv.mkDerivation (finalAttrs: { pname = "source-meta-json-schema"; @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "sourcemeta"; repo = "jsonschema"; rev = "v${version}"; - hash = "sha256-EH+wi8MAgAxTy7OPQK/faX6OVY38/Z5fXhaK92xKkyA="; + hash = "sha256-YxIRDTAAvkltT4HGUvPt/davarGRfE808OoI9UheqCA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/so/sourcegit/package.nix b/pkgs/by-name/so/sourcegit/package.nix index 7e599f8b8cf1..22d8dc56352b 100644 --- a/pkgs/by-name/so/sourcegit/package.nix +++ b/pkgs/by-name/so/sourcegit/package.nix @@ -19,13 +19,13 @@ buildDotnetModule (finalAttrs: { pname = "sourcegit"; - version = "2025.08"; + version = "2025.09"; src = fetchFromGitHub { owner = "sourcegit-scm"; repo = "sourcegit"; tag = "v${finalAttrs.version}"; - hash = "sha256-dX782yQMo5MFMZKbLor5Hk6SKc11Em0qdbIClUYOe3I="; + hash = "sha256-JjAF9y3wIb6ffI3alkj9I7kG6GLLtJEKNWLtLyVE4aE="; }; patches = [ ./fix-darwin-git-path.patch ]; diff --git a/pkgs/by-name/so/soxr/package.nix b/pkgs/by-name/so/soxr/package.nix index 61121b019e5f..156650a09ef1 100644 --- a/pkgs/by-name/so/soxr/package.nix +++ b/pkgs/by-name/so/soxr/package.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + # Workaround for upstream not using GNUInstallDirs. + "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" + ]; + meta = with lib; { description = "Audio resampling library"; homepage = "https://soxr.sourceforge.net"; diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix index cd8a5bae52ca..a14e5f750236 100644 --- a/pkgs/by-name/so/sozu/package.nix +++ b/pkgs/by-name/so/sozu/package.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - darwin, protobuf, nix-update-script, testers, @@ -26,8 +25,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ protobuf ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; - doCheck = false; passthru = { diff --git a/pkgs/by-name/sp/spacetimedb/package.nix b/pkgs/by-name/sp/spacetimedb/package.nix index c96a27fac831..b6bccdac05f6 100644 --- a/pkgs/by-name/sp/spacetimedb/package.nix +++ b/pkgs/by-name/sp/spacetimedb/package.nix @@ -9,17 +9,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "spacetimedb"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "clockworklabs"; repo = "spacetimedb"; tag = "v${finalAttrs.version}"; - hash = "sha256-yqBKZOUDdvBcW8OzO832P75miNKUluR+fR1FSOcDoSM="; + hash = "sha256-WBPH/vwko7Znh6yJi3DOwZ9SnfCpOcX1so/svBCjFQ8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-W3SbJE0tt391k6MscgaijCStSyzfTN2MR66a6K+Ui4s="; + cargoHash = "sha256-YObtesidnH0GMGD9ENS4YSrcBB4A4TAQmqV4NodSwfY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sp/speed-cloudflare-cli/package.nix b/pkgs/by-name/sp/speed-cloudflare-cli/package.nix new file mode 100644 index 000000000000..a1c1e27b33df --- /dev/null +++ b/pkgs/by-name/sp/speed-cloudflare-cli/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + stdenv, + nodejs, +}: +stdenv.mkDerivation { + pname = "speed-cloudflare-cli"; + version = "2.0.3-unstable-2024-05-15"; + + src = fetchFromGitHub { + owner = "KNawm"; + repo = "speed-cloudflare-cli"; + rev = "dd301195e7def359a39cceeba16b1c0bedac8f5d"; + sha256 = "sha256-kxLeQUdJbkmApf5Af3Mgd3WvS3GhXXOIvA4gNB55TGM="; + }; + + nativeBuildInputs = [ nodejs ]; + + installPhase = '' + mkdir -p $out/bin + + install -Dm755 $src/cli.js $out/bin/speed-cloudflare-cli + install -Dm644 $src/chalk.js $out/bin/chalk.js + install -Dm644 $src/stats.js $out/bin/stats.js + + patchShebangs $out/bin/speed-cloudflare-cli + ''; + + meta = { + description = "Measure the speed and consistency of your internet connection using speed.cloudflare.com"; + homepage = "https://github.com/KNawm/speed-cloudflare-cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ TheColorman ]; + mainProgram = "speed-cloudflare-cli"; + inherit (nodejs.meta) platforms; + }; +} diff --git a/pkgs/by-name/sp/speedtest-rs/package.nix b/pkgs/by-name/sp/speedtest-rs/package.nix index c28c1c8f52eb..e5d5b402b826 100644 --- a/pkgs/by-name/sp/speedtest-rs/package.nix +++ b/pkgs/by-name/sp/speedtest-rs/package.nix @@ -5,7 +5,6 @@ openssl, pkg-config, stdenv, - darwin, nix-update-script, testers, speedtest-rs, @@ -22,12 +21,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1FAFYiWDD/KG/7/UTv/EW6Nj2GnU0GZFFq6ouMc0URA="; }; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index be7a97d4b719..4eda4621eceb 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -6,31 +6,28 @@ replaceVars, spicetify-cli, }: -let - version = "2.39.6"; -in -buildGoModule { +buildGoModule (finalAttrs: { pname = "spicetify-cli"; - inherit version; + version = "2.39.7"; src = fetchFromGitHub { owner = "spicetify"; repo = "cli"; - tag = "v${version}"; - hash = "sha256-rdyHVHKVgl9fOviFYQuXY8Ko+/XwpKlKDfriQAgkusE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-iqx+bwq99xNUt2NEc3ZFxPdfE+WJPhmJXJ26sPCm8sk="; }; - vendorHash = "sha256-sC8HmszcH5fYnuoPW6aElB8UXPwk3Lpp2odsBaiP4mI="; + vendorHash = "sha256-wSmKzof3nAyA+wI8kXQu/t5Fz4l22JyW50PCuOrWK1k="; ldflags = [ "-s -w" - "-X 'main.version=${version}'" + "-X 'main.version=${finalAttrs.version}'" ]; patches = [ # Stops spicetify from attempting to fetch a newer css-map.json (replaceVars ./version.patch { - inherit version; + inherit (finalAttrs) version; }) ]; @@ -64,4 +61,4 @@ buildGoModule { ]; mainProgram = "spicetify"; }; -} +}) diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix index 9314b3a2a3bf..5e184afd3758 100644 --- a/pkgs/by-name/sp/spider/package.nix +++ b/pkgs/by-name/sp/spider/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "spider"; - version = "2.36.2"; + version = "2.36.73"; src = fetchFromGitHub { owner = "spider-rs"; repo = "spider"; tag = "v${finalAttrs.version}"; - hash = "sha256-Os94Q8RDaKc3jzir63nZ8dWgPwPZHxnvOZg2l/4v5EE="; + hash = "sha256-ad5WihYMCJ1TbZGO4pQwGYTUZ2K993bynT7+KFTLGwY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-v5zz9WLj2aLRUHJScVSFzoQhyOqExkN03j3N47f3lgA="; + cargoHash = "sha256-rCmuYRPxz29dKpIoC6fXB5h8+3fERMCcERm+C2juzZA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sq/sql-studio/package.nix b/pkgs/by-name/sq/sql-studio/package.nix index 1624d07f80aa..d0e0d18282d5 100644 --- a/pkgs/by-name/sq/sql-studio/package.nix +++ b/pkgs/by-name/sq/sql-studio/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, rustPlatform, buildNpmPackage, fetchFromGitHub, @@ -38,8 +36,6 @@ rustPlatform.buildRustPackage { cp -pr --reflink=auto -- ${ui} ui/dist ''; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; - meta = { description = "SQL Database Explorer [SQLite, libSQL, PostgreSQL, MySQL/MariaDB, ClickHouse, Microsoft SQL Server]"; homepage = "https://github.com/frectonz/sql-studio"; diff --git a/pkgs/by-name/sq/sqlc/package.nix b/pkgs/by-name/sq/sqlc/package.nix index 59b99f19cb28..01e8851627c3 100644 --- a/pkgs/by-name/sq/sqlc/package.nix +++ b/pkgs/by-name/sq/sqlc/package.nix @@ -9,17 +9,17 @@ buildGoModule (finalAttrs: { pname = "sqlc"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "sqlc-dev"; repo = "sqlc"; tag = "v${finalAttrs.version}"; - hash = "sha256-kACZusfwEIO78OooNGMXCXQO5iPYddmsHCsbJ3wkRQs="; + hash = "sha256-BaEvmvbo6OQ1T9lgIuNJMyvnvVZd/20mFEMQdFtxdZc="; }; proxyVendor = true; - vendorHash = "sha256-5KVCG92aWVx2J78whEwhEhqsRNlw4xSdIPbSqYM+1QI="; + vendorHash = "sha256-LpF94Jv7kukSa803WCmnO+y6kvHLPz0ZGEdbjwVFV40="; subPackages = [ "cmd/sqlc" ]; diff --git a/pkgs/by-name/sq/sqld/package.nix b/pkgs/by-name/sq/sqld/package.nix index f7934b44ebf8..b6812fe601a4 100644 --- a/pkgs/by-name/sq/sqld/package.nix +++ b/pkgs/by-name/sq/sqld/package.nix @@ -8,8 +8,6 @@ openssl, sqlite, zstd, - stdenv, - darwin, cmake, nix-update-script, @@ -56,7 +54,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite zstd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; env.ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix index edff3337e1fc..8c5b2a38c766 100644 --- a/pkgs/by-name/sq/sqlfluff/package.nix +++ b/pkgs/by-name/sq/sqlfluff/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "3.3.1"; + version = "3.4.0"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; tag = version; - hash = "sha256-PQSGB8723y0+cptoLHpXzXfSQFicf5tasbTEf0efA8c="; + hash = "sha256-9JitD46hMgCrUx+mtSoKm/8vKd6CfPngmVsaUb9vi+Q="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix index 3d34a3dc0547..f497f538e290 100644 --- a/pkgs/by-name/sq/sqruff/package.nix +++ b/pkgs/by-name/sq/sqruff/package.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, stdenv, - darwin, rust-jemalloc-sys, nix-update-script, versionCheckHook, @@ -24,7 +23,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rust-jemalloc-sys - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + ]; # Patch the tests to find the binary postPatch = '' diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix index 66065fd74588..1496229ad9e8 100644 --- a/pkgs/by-name/sq/squawk/package.nix +++ b/pkgs/by-name/sq/squawk/package.nix @@ -1,5 +1,4 @@ { - darwin, fetchFromGitHub, lib, libiconv, @@ -29,18 +28,10 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - lib.optionals (!stdenv.hostPlatform.isDarwin) [ - libiconv - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - Security - ] - ); + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libiconv + openssl + ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/sq/squeezelite/package.nix b/pkgs/by-name/sq/squeezelite/package.nix index b2b403461222..8980661212e7 100644 --- a/pkgs/by-name/sq/squeezelite/package.nix +++ b/pkgs/by-name/sq/squeezelite/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - darwin, fetchFromGitHub, flac, libgpiod, @@ -59,17 +58,7 @@ stdenv.mkDerivation { ++ optional pulseSupport libpulseaudio ++ optional alsaSupport alsa-lib ++ optional portaudioSupport portaudio - ++ optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - CoreVideo - VideoDecodeAcceleration - CoreAudio - AudioToolbox - AudioUnit - Carbon - ] - ) + ++ optional faad2Support faad2 ++ optional ffmpegSupport ffmpeg ++ optional opusSupport opusfile diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix index 3057f97ad5ae..f80017b8c57c 100644 --- a/pkgs/by-name/sr/src-cli/package.nix +++ b/pkgs/by-name/sr/src-cli/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, stdenv, xorg, - darwin, testers, src-cli, }: @@ -26,13 +25,9 @@ buildGoModule rec { "cmd/src" ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + xorg.libX11 + ]; ldflags = [ "-s" diff --git a/pkgs/by-name/ss/ssdfs-utils/package.nix b/pkgs/by-name/ss/ssdfs-utils/package.nix index cd07ee3f88de..19448ac187ea 100644 --- a/pkgs/by-name/ss/ssdfs-utils/package.nix +++ b/pkgs/by-name/ss/ssdfs-utils/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.53"; + version = "4.54"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "5cf623d11b41f2581923494142dcd5277af39093"; - hash = "sha256-Mud9KAd2nGY4A8l8EhJvmrK93oV2wO5RCsQIjmEAaeg="; + rev = "c7627ec88515da312570166e7590e1562b32353a"; + hash = "sha256-uIX+nA9+hpGDCFAlwzLCYkF96Ou0fimeoJxMxgfgmkQ="; }; strictDeps = true; diff --git a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix index 6de2efdc2821..b5a5ff2c8282 100644 --- a/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix +++ b/pkgs/by-name/ss/ssh-openpgp-auth/generic.nix @@ -11,8 +11,6 @@ nettle, openssl, sqlite, - stdenv, - darwin, openssh, # Arguments not supplied by callPackage pname, @@ -60,18 +58,11 @@ rustPlatform.buildRustPackage { --zsh shell_completions/_${pname} ''; - buildInputs = - [ - nettle - openssl - sqlite - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.frameworks.IOKit - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.frameworks.SystemConfiguration - ]; + buildInputs = [ + nettle + openssl + sqlite + ]; doCheck = true; nativeCheckInputs = [ diff --git a/pkgs/by-name/ss/sshocker/package.nix b/pkgs/by-name/ss/sshocker/package.nix index b8e573385dc0..73ab4de906e5 100644 --- a/pkgs/by-name/ss/sshocker/package.nix +++ b/pkgs/by-name/ss/sshocker/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "sshocker"; - version = "0.3.6"; + version = "0.3.8"; src = fetchFromGitHub { owner = "lima-vm"; repo = "sshocker"; tag = "v${version}"; - hash = "sha256-ehsQ/Z1LCSpnvIvABLCIR2aLG4DK33VJ9gidoSEoeqw="; + hash = "sha256-uLotIvFpJL5keVyazG+g2TOKqcZwTDqSoAOaswqliNo="; }; - vendorHash = "sha256-9le1ETAdMZ1s7Hl2STz76/9eU0YkI4yNM/PZVXOwndQ="; + vendorHash = "sha256-uzKLAHxRRw0Bx7HjANOsX0tvfmbJhclT8SP346yFGwc="; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/st/stabber/package.nix b/pkgs/by-name/st/stabber/package.nix index a2d3a8c6587e..5c269a2e8606 100644 --- a/pkgs/by-name/st/stabber/package.nix +++ b/pkgs/by-name/st/stabber/package.nix @@ -7,7 +7,6 @@ glib, expat, libmicrohttpd, - darwin, }: stdenv.mkDerivation { pname = "stabber-unstable"; @@ -37,7 +36,7 @@ stdenv.mkDerivation { glib expat libmicrohttpd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; meta = with lib; { description = "Stubbed XMPP Server"; diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 81f287696e5f..9b6675c2b09c 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -10,7 +10,6 @@ foundationdb, zstd, stdenv, - darwin, nix-update-script, nixosTests, rocksdb, @@ -37,19 +36,12 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - [ - bzip2 - openssl - sqlite - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ foundationdb ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + sqlite + zstd + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ foundationdb ]; # Issue: https://github.com/stalwartlabs/mail-server/issues/1104 buildNoDefaultFeatures = true; @@ -110,6 +102,8 @@ rustPlatform.buildRustPackage rec { "--skip=smtp::outbound::extensions::extensions" # panicked at tests/src/smtp/outbound/smtp.rs:173:5: "--skip=smtp::outbound::smtp::smtp_delivery" + # panicked at tests/src/smtp/outbound/lmtp.rs + "--skip=smtp::outbound::lmtp::lmtp_delivery" # thread 'smtp::queue::retry::queue_retry' panicked at tests/src/smtp/queue/retry.rs:119:5: # assertion `left == right` failed # left: [1, 2, 2] diff --git a/pkgs/by-name/st/star-history/package.nix b/pkgs/by-name/st/star-history/package.nix index bf082e1b358f..8701b9450836 100644 --- a/pkgs/by-name/st/star-history/package.nix +++ b/pkgs/by-name/st/star-history/package.nix @@ -1,11 +1,9 @@ { lib, rustPlatform, - darwin, fetchCrate, pkg-config, openssl, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -22,11 +20,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; meta = with lib; { description = "Command line program to generate a graph showing number of GitHub stars of a user, org or repo over time"; diff --git a/pkgs/by-name/st/starboard/package.nix b/pkgs/by-name/st/starboard/package.nix index a69598c32c5f..a14786838b63 100644 --- a/pkgs/by-name/st/starboard/package.nix +++ b/pkgs/by-name/st/starboard/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.15.24"; + version = "0.15.25"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - hash = "sha256-GZ+KOnQV/eXPt1QGaqWj4JAlPNhNKpVn7rlC7W4zfDo="; + hash = "sha256-mCYnJ1SFa3OuYQlPWTq9vWV9s/jtaQ6dOousV/UNR18="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-5TeiEGu5B+5uNnkxdBlPqLu/g9FZ4VWrbZFfp/JsJiA="; + vendorHash = "sha256-qujObGBxUFGxtrdlJmTOTW6HUbDCjNSElPqhQfYqId4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/st/stargazer/package.nix b/pkgs/by-name/st/stargazer/package.nix index 8da7c0576d5d..d825ba5dfd83 100644 --- a/pkgs/by-name/st/stargazer/package.nix +++ b/pkgs/by-name/st/stargazer/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "stargazer"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromSourcehut { owner = "~zethra"; repo = "stargazer"; rev = version; - hash = "sha256-0vbQDHuLrgrsWiOb2hb6lYylJm5o/wOzoDIw85H8Eh0="; + hash = "sha256-Yulm0XkVaN+yBKj8LDsn8pBYXEqTOSGLqbpIKDN0G2U="; }; useFetchCargoVendor = true; - cargoHash = "sha256-KdHYyuH1RMLRueqYbfADUktBx9aL8yTagB0KxEGQsCs="; + cargoHash = "sha256-MtpJTLKhlVF5AE3huL0JRWXtNCtc0Z5b/S28ekzirPA="; passthru = { tests.basic-functionality = nixosTests.stargazer; diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix index 5b795b307130..9a74f63c3b78 100644 --- a/pkgs/by-name/st/starlark/package.nix +++ b/pkgs/by-name/st/starlark/package.nix @@ -6,13 +6,13 @@ }: buildGoModule { pname = "starlark"; - version = "0-unstable-2025-03-18"; + version = "0-unstable-2025-04-17"; src = fetchFromGitHub { owner = "google"; repo = "starlark-go"; - rev = "d9371fef63fe912333a96a4e54ff72d071cb71ad"; - hash = "sha256-gbhn9bvt5SjOvdIEyQzMitLpS3KdOvvvR73l4E6Hap8="; + rev = "f57e51f710eb2662fb0866b2bfb87c218cecdc52"; + hash = "sha256-JuWdw0+SDcnfkEp4aUIUtI86dhEbZMBWNUibLEwQBek="; }; vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo="; diff --git a/pkgs/by-name/st/starry/package.nix b/pkgs/by-name/st/starry/package.nix index 244d19a3eed8..c51dc81506e3 100644 --- a/pkgs/by-name/st/starry/package.nix +++ b/pkgs/by-name/st/starry/package.nix @@ -4,8 +4,6 @@ fetchCrate, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -24,13 +22,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + ]; meta = with lib; { description = "Current stars history tells only half the story"; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/by-name/st/starship/package.nix similarity index 56% rename from pkgs/tools/misc/starship/default.nix rename to pkgs/by-name/st/starship/package.nix index 094be04ce9a3..22feec90455b 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/by-name/st/starship/package.nix @@ -5,21 +5,20 @@ rustPlatform, installShellFiles, cmake, + writableTmpDirAsHomeHook, git, nixosTests, - Security, - Foundation, - Cocoa, + buildPackages, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "starship"; version = "1.22.1"; src = fetchFromGitHub { owner = "starship"; repo = "starship"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-YoLi4wxBK9TFTtZRm+2N8HO5ZiC3V2GMqKFKKLHq++s="; }; @@ -28,16 +27,7 @@ rustPlatform.buildRustPackage rec { cmake ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Security - Foundation - Cocoa - ]; - - NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - "-framework" - "AppKit" - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ writableTmpDirAsHomeHook ]; # tries to access HOME only in aarch64-darwin environment when building mac-notification-sys preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' @@ -50,12 +40,17 @@ rustPlatform.buildRustPackage rec { mkdir -p $presetdir cp docs/public/presets/toml/*.toml $presetdir '' - + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd starship \ - --bash <($out/bin/starship completions bash) \ - --fish <($out/bin/starship completions fish) \ - --zsh <($out/bin/starship completions zsh) - ''; + + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + installShellCompletion --cmd starship \ + --bash <(${emulator} $out/bin/starship completions bash) \ + --fish <(${emulator} $out/bin/starship completions fish) \ + --zsh <(${emulator} $out/bin/starship completions zsh) + '' + ); useFetchCargoVendor = true; cargoHash = "sha256-B2CCrSH2aTcGEX96oBxl/27hNMdDpdd2vxdt0/nlN6I="; @@ -70,15 +65,18 @@ rustPlatform.buildRustPackage rec { inherit (nixosTests) starship; }; - meta = with lib; { + meta = { description = "Minimal, blazing fast, and extremely customizable prompt for any shell"; homepage = "https://starship.rs"; - license = licenses.isc; - maintainers = with maintainers; [ + downloadPage = "https://github.com/starship/starship"; + changelog = "https://github.com/starship/starship/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ danth Br1ght0ne Frostman + awwpotato ]; mainProgram = "starship"; }; -} +}) diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix index f31a7d1ccbec..83f1cb8cb49d 100644 --- a/pkgs/by-name/st/static-web-server/package.nix +++ b/pkgs/by-name/st/static-web-server/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, nixosTests, }: @@ -21,8 +19,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-Sri2NTCN5vIf/5KVI+BtyOBAjkXoGpOJjP2iOh/M5NU="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - # Some tests rely on timestamps newer than 18 Nov 1974 00:00:00 preCheck = '' find docker/public -exec touch -m {} \; diff --git a/pkgs/by-name/st/steel/package.nix b/pkgs/by-name/st/steel/package.nix index 7f4d88d8e562..2fe3359669a1 100644 --- a/pkgs/by-name/st/steel/package.nix +++ b/pkgs/by-name/st/steel/package.nix @@ -20,13 +20,13 @@ }: rustPlatform.buildRustPackage { pname = "steel"; - version = "0.6.0-unstable-2025-04-08"; + version = "0.6.0-unstable-2025-04-17"; src = fetchFromGitHub { owner = "mattwparas"; repo = "steel"; - rev = "764cc318dd427f7502f0c7f2a3bb9f1ba4705cd7"; - hash = "sha256-Uxqy8vzRgQ3B/aAUV04OQumWrD9l4RNx1BX20R6lfAE="; + rev = "2f28ab10523198726d343257d29d892864e897b0"; + hash = "sha256-GcbuuaevPK5EOh0/IVgoL2MPC9ukDc8VXkdgbPX4quE="; }; useFetchCargoVendor = true; diff --git a/pkgs/by-name/st/step-ca/package.nix b/pkgs/by-name/st/step-ca/package.nix index 92763dd75952..d0a241f2606c 100644 --- a/pkgs/by-name/st/step-ca/package.nix +++ b/pkgs/by-name/st/step-ca/package.nix @@ -8,7 +8,6 @@ pkg-config, hsmSupport ? true, nixosTests, - darwin, }: buildGoModule rec { @@ -31,9 +30,7 @@ buildGoModule rec { nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ]; - buildInputs = - lib.optionals (hsmSupport && stdenv.hostPlatform.isLinux) [ pcsclite ] - ++ lib.optionals (hsmSupport && stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.PCSC ]; + buildInputs = lib.optionals (hsmSupport && stdenv.hostPlatform.isLinux) [ pcsclite ]; postPatch = '' substituteInPlace authority/http_client_test.go --replace-fail 't.Run("SystemCertPool", func(t *testing.T) {' 't.Skip("SystemCertPool", func(t *testing.T) {' substituteInPlace systemd/step-ca.service --replace "/bin/kill" "${coreutils}/bin/kill" diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix index d7966caec68e..bd0250accc8e 100644 --- a/pkgs/by-name/st/stm32cubemx/package.nix +++ b/pkgs/by-name/st/stm32cubemx/package.nix @@ -52,6 +52,11 @@ let cat << EOF > $out/bin/${pname} #!${stdenvNoCC.shell} + updater_xml="\$HOME/.stm32cubemx/thirdparties/db/updaterThirdParties.xml" + if [ -e "\$updater_xml" ] && [ ! -w "\$updater_xml" ]; then + echo "Warning: Unwritable \$updater_xml prevents CubeMX software packages from working correctly. Fixing that." + (set -x; chmod u+w "\$updater_xml") + fi ${jdk21}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX "\$@" EOF chmod +x $out/bin/${pname} diff --git a/pkgs/by-name/st/storj-uplink/package.nix b/pkgs/by-name/st/storj-uplink/package.nix index 402147fc0122..adc06ef35ac1 100644 --- a/pkgs/by-name/st/storj-uplink/package.nix +++ b/pkgs/by-name/st/storj-uplink/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.125.4"; + version = "1.126.2"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-r0N9TpSlKkGy/hlVxKB+fMXFvQQOXC5L4Ryd5fP+Ud0="; + hash = "sha256-dt4OzkblMxduZJZhUHWzYGrOLs+rzI3JXa16SlRs3MI="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-OhYxrRTVbAbpPz25g27wgM30AQmQf3Uxh03ax8znFYY="; + vendorHash = "sha256-1TZmG008XhA9lt4Vj7jdF0wyDFQ65hql0r+kU+RAx78="; ldflags = [ "-s" diff --git a/pkgs/by-name/st/stormlib/package.nix b/pkgs/by-name/st/stormlib/package.nix index f7cd1b2b55d5..55b1badd1c83 100644 --- a/pkgs/by-name/st/stormlib/package.nix +++ b/pkgs/by-name/st/stormlib/package.nix @@ -3,7 +3,6 @@ stdenv, bzip2, cmake, - darwin, fetchFromGitHub, libtomcrypt, zlib, @@ -26,15 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - [ - bzip2 - libtomcrypt - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Carbon - ]; + buildInputs = [ + bzip2 + libtomcrypt + zlib + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) diff --git a/pkgs/by-name/st/streamrip/package.nix b/pkgs/by-name/st/streamrip/package.nix index 4b84727083bd..9fa90e8b6603 100644 --- a/pkgs/by-name/st/streamrip/package.nix +++ b/pkgs/by-name/st/streamrip/package.nix @@ -52,15 +52,9 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; - prePatch = '' - sed -i 's#aiofiles = ".*"#aiofiles = "*"#' pyproject.toml - sed -i 's#deezer-py = ".*"#deezer-py = "*"#' pyproject.toml - sed -i 's#m3u8 = ".*"#m3u8 = "*"#' pyproject.toml - sed -i 's#pathvalidate = ".*"#pathvalidate = "*"#' pyproject.toml - sed -i 's#Pillow = ".*"#Pillow = "*"#' pyproject.toml - sed -i 's#pytest-asyncio = ".*"#pytest-asyncio = "*"#' pyproject.toml - sed -i 's#tomlkit = ".*"#tomlkit = "*"#' pyproject.toml + pythonRelaxDeps = true; + prePatch = '' sed -i 's#"ffmpeg"#"${lib.getBin ffmpeg}/bin/ffmpeg"#g' streamrip/client/downloadable.py ''; diff --git a/pkgs/by-name/st/strongswan/package.nix b/pkgs/by-name/st/strongswan/package.nix index c014a2080be4..48c8c18b5676 100644 --- a/pkgs/by-name/st/strongswan/package.nix +++ b/pkgs/by-name/st/strongswan/package.nix @@ -28,7 +28,6 @@ tpm2-tss, enableNetworkManager ? false, networkmanager, - darwin, nixosTests, }: @@ -78,9 +77,6 @@ stdenv.mkDerivation rec { pam iptables ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; [ SystemConfiguration ] - ) ++ lib.optionals enableNetworkManager [ networkmanager glib diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix index c1b378d60a69..5e44efe1b338 100644 --- a/pkgs/by-name/st/stylance-cli/package.nix +++ b/pkgs/by-name/st/stylance-cli/package.nix @@ -5,15 +5,15 @@ }: rustPlatform.buildRustPackage rec { pname = "stylance-cli"; - version = "0.5.5"; + version = "0.6.0"; src = fetchCrate { inherit pname version; - hash = "sha256-/aTda9TOwC2spODMWQIaBzJJ17/8EoWIRZ7DjJE/ta4="; + hash = "sha256-uksDnxTBuzwpMDCO3HIg05IK1emba6BjbpN0TcWSOdQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ZMIbNQMZ7uCYFSIX2NTGY/31V6e0QWHjZvVaA8Vv7IQ="; + cargoHash = "sha256-iSE6SmqYXg9IAMJOb4/q80w+J2OEVd7oyxRpWcCps9U="; meta = with lib; { description = "Library and cli tool for working with scoped CSS in rust"; diff --git a/pkgs/by-name/su/subfont/package-lock.json b/pkgs/by-name/su/subfont/package-lock.json new file mode 100644 index 000000000000..f3403c5562a7 --- /dev/null +++ b/pkgs/by-name/su/subfont/package-lock.json @@ -0,0 +1,12562 @@ +{ + "name": "subfont", + "version": "7.2.1", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "subfont", + "version": "7.2.1", + "license": "MIT", + "dependencies": { + "@gustavnikolaj/async-main-wrap": "^3.0.1", + "@hookun/parse-animation-shorthand": "^0.1.5", + "assetgraph": "^7.8.1", + "browserslist": "^4.13.0", + "css-font-parser": "^2.0.0", + "css-font-weight-names": "^0.2.1", + "css-list-helpers": "^2.0.0", + "font-snapper": "^1.2.0", + "font-tracer": "^3.7.0", + "fontverter": "^2.0.0", + "gettemporaryfilepath": "^1.0.1", + "harfbuzzjs": "^0.3.3", + "lines-and-columns": "^1.1.6", + "lodash": "^4.17.15", + "memoizesync": "^1.1.1", + "postcss": "^8.3.11", + "postcss-value-parser": "^4.0.2", + "pretty-bytes": "^5.1.0", + "puppeteer-core": "^19.8.5", + "specificity": "^0.4.1", + "subset-font": "^2.3.0", + "urltools": "^0.4.1", + "yargs": "^15.4.0" + }, + "bin": { + "subfont": "lib/cli.js" + }, + "devDependencies": { + "combos": "^0.2.0", + "coveralls": "^3.0.9", + "css-generators": "^0.2.0", + "eslint": "^7.4.0", + "eslint-config-prettier": "^6.7.0", + "eslint-config-standard": "^14.0.0", + "eslint-plugin-import": "^2.22.0", + "eslint-plugin-mocha": "^7.0.1", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^4.0.1", + "eslint-plugin-standard": "^4.0.0", + "html-generators": "^1.0.3", + "httpception": "^3.0.0", + "magicpen-prism": "^3.0.2", + "mocha": "^8.0.1", + "nyc": "^15.1.0", + "offline-github-changelog": "^1.6.1", + "prettier": "~2.3.0", + "proxyquire": "^2.1.1", + "puppeteer": "^19.8.5", + "sinon": "^9.0.2", + "unexpected": "^11.8.1", + "unexpected-check": "^2.3.1", + "unexpected-resemble": "^5.0.1", + "unexpected-set": "^2.0.1", + "unexpected-sinon": "^10.11.2" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", + "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", + "license": "MIT", + "dependencies": { + "@babel/highlight": "^7.10.4" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz", + "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz", + "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.10", + "@babel/helper-compilation-targets": "^7.26.5", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.10", + "@babel/parser": "^7.26.10", + "@babel/template": "^7.26.9", + "@babel/traverse": "^7.26.10", + "@babel/types": "^7.26.10", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/core/node_modules/@babel/code-frame": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@babel/generator": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.10.tgz", + "integrity": "sha512-rRHT8siFIXQrAYOYqZQVsAr8vJ+cBNqcVAY6m5V8/4QqzaPl+zDBe6cLEPRDuNOUf3ww8RfJVlOyQMoSI+5Ang==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.26.10", + "@babel/types": "^7.26.10", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^3.0.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz", + "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/compat-data": "^7.26.5", + "@babel/helper-validator-option": "^7.25.9", + "browserslist": "^4.24.0", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true, + "license": "ISC" + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", + "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", + "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", + "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz", + "integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/template": "^7.26.9", + "@babel/types": "^7.26.10" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.9.tgz", + "integrity": "sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==", + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.25.9", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.10.tgz", + "integrity": "sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.26.10" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/runtime": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz", + "integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==", + "license": "MIT", + "dependencies": { + "regenerator-runtime": "^0.14.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/template": { + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz", + "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.26.2", + "@babel/parser": "^7.26.9", + "@babel/types": "^7.26.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/template/node_modules/@babel/code-frame": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.10.tgz", + "integrity": "sha512-k8NuDrxr0WrPH5Aupqb2LCVURP/S0vBEn5mK6iH+GIYob66U5EtoZvcdudR2jQ4cmTwhEwW1DLB+Yyas9zjF6A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.10", + "@babel/parser": "^7.26.10", + "@babel/template": "^7.26.9", + "@babel/types": "^7.26.10", + "debug": "^4.3.1", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/@babel/code-frame": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/types": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz", + "integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", + "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.1.1", + "espree": "^7.3.0", + "globals": "^13.9.0", + "ignore": "^4.0.6", + "import-fresh": "^3.2.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/@gustavnikolaj/async-main-wrap": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@gustavnikolaj/async-main-wrap/-/async-main-wrap-3.0.1.tgz", + "integrity": "sha512-FHh1Tz5Jk5xJphcYpFUMsxCTO+XbgQyCorlbztqBsYRnu5hmuoV/0Q+dJlcOtQCG6cJ5/EHX+VrSsoLBoaTJvQ==", + "license": "ISC" + }, + "node_modules/@hapi/address": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz", + "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==", + "deprecated": "Moved to 'npm install @sideway/address'", + "license": "BSD-3-Clause" + }, + "node_modules/@hapi/bourne": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz", + "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==", + "deprecated": "This version has been deprecated and is no longer supported or maintained", + "license": "BSD-3-Clause" + }, + "node_modules/@hapi/hoek": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz", + "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==", + "deprecated": "This version has been deprecated and is no longer supported or maintained", + "license": "BSD-3-Clause" + }, + "node_modules/@hapi/joi": { + "version": "15.1.1", + "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz", + "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==", + "deprecated": "Switch to 'npm install joi'", + "license": "BSD-3-Clause", + "dependencies": { + "@hapi/address": "2.x.x", + "@hapi/bourne": "1.x.x", + "@hapi/hoek": "8.x.x", + "@hapi/topo": "3.x.x" + } + }, + "node_modules/@hapi/topo": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz", + "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==", + "deprecated": "This version has been deprecated and is no longer supported or maintained", + "license": "BSD-3-Clause", + "dependencies": { + "@hapi/hoek": "^8.3.0" + } + }, + "node_modules/@hookun/parse-animation-shorthand": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@hookun/parse-animation-shorthand/-/parse-animation-shorthand-0.1.5.tgz", + "integrity": "sha512-/fnwYK9Tgllhtv2EpwZZVbwhCokAoGtfEz23mZtjHMHvih4YeiAeUuVpyjGrTGf6j6ymgrCxGwUiAkAfDsmUjw==", + "license": "Apache-2.0" + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", + "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", + "deprecated": "Use @eslint/config-array instead", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanwhocodes/object-schema": "^1.2.0", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", + "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "deprecated": "Use @eslint/object-schema instead", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", + "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", + "license": "MIT", + "dependencies": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", + "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", + "license": "MIT", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@puppeteer/browsers": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-0.5.0.tgz", + "integrity": "sha512-Uw6oB7VvmPRLE4iKsjuOh8zgDabhNX67dzo8U/BB0f9527qx+4eeUs+korU98OhG5C4ubg7ufBgVi63XYwS6TQ==", + "license": "Apache-2.0", + "dependencies": { + "debug": "4.3.4", + "extract-zip": "2.0.1", + "https-proxy-agent": "5.0.1", + "progress": "2.0.3", + "proxy-from-env": "1.1.0", + "tar-fs": "2.1.1", + "unbzip2-stream": "1.4.3", + "yargs": "17.7.1" + }, + "bin": { + "browsers": "lib/cjs/main-cli.js" + }, + "engines": { + "node": ">=14.1.0" + }, + "peerDependencies": { + "typescript": ">= 4.7.4" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@puppeteer/browsers/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@puppeteer/browsers/node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@puppeteer/browsers/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@puppeteer/browsers/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/@puppeteer/browsers/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@puppeteer/browsers/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "license": "MIT" + }, + "node_modules/@puppeteer/browsers/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/@puppeteer/browsers/node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/@puppeteer/browsers/node_modules/yargs": { + "version": "17.7.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz", + "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==", + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@puppeteer/browsers/node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/@rtsao/scc": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", + "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==", + "dev": true, + "license": "MIT" + }, + "node_modules/@sidvind/better-ajv-errors": { + "version": "0.6.10", + "resolved": "https://registry.npmjs.org/@sidvind/better-ajv-errors/-/better-ajv-errors-0.6.10.tgz", + "integrity": "sha512-vPv8ks6J1KQW1LPYgxmANxcHniE6LFuekxNpcoUUkotJ2srxP4qXZ+y9qpo5LAXhnLoNP0AH8cninimK68gS6A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "chalk": "^2.4.1", + "json-to-ast": "^2.0.3", + "jsonpointer": "^4.0.1", + "leven": "^3.1.0" + }, + "engines": { + "node": ">= 8.0" + }, + "peerDependencies": { + "ajv": "4.11.8 - 6" + } + }, + "node_modules/@sinonjs/commons": { + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", + "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz", + "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^1.7.0" + } + }, + "node_modules/@sinonjs/samsam": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz", + "integrity": "sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^1.6.0", + "lodash.get": "^4.4.2", + "type-detect": "^4.0.8" + } + }, + "node_modules/@sinonjs/text-encoding": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", + "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", + "dev": true, + "license": "(Unlicense OR Apache-2.0)" + }, + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "node_modules/@trysound/sax": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", + "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", + "license": "ISC", + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "22.13.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz", + "integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==", + "license": "MIT", + "optional": true, + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "node_modules/@types/normalize-package-data": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", + "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", + "license": "MIT" + }, + "node_modules/@types/yauzl": { + "version": "2.10.3", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", + "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", + "license": "MIT", + "optional": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@ungap/promise-all-settled": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", + "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", + "dev": true, + "license": "ISC" + }, + "node_modules/abab": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", + "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", + "deprecated": "Use your platform's native atob() and btoa() methods instead", + "license": "BSD-3-Clause" + }, + "node_modules/acorn": { + "version": "8.14.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", + "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "license": "MIT", + "dependencies": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + } + }, + "node_modules/acorn-globals/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-escapes/node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/append-transform": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", + "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", + "dev": true, + "license": "MIT", + "dependencies": { + "default-require-extensions": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==", + "dev": true, + "license": "MIT" + }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "license": "MIT", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz", + "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "is-array-buffer": "^3.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-changes": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/array-changes/-/array-changes-3.0.1.tgz", + "integrity": "sha512-UYXV+qUaTKJO3GUBVfD6b9Mu7wUzDvpfovZKtbxNJApwRUifgrJMidvE+/rbqV3wCffly5HXcbOW3/7shmmEag==", + "dev": true, + "license": "MIT", + "dependencies": { + "arraydiff-papandreou": "0.1.1-patch1" + } + }, + "node_modules/array-changes-async": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/array-changes-async/-/array-changes-async-3.0.1.tgz", + "integrity": "sha512-WNHLhMOTzntixkBxNm/MiWCNKuC4FMYXk6DKuzZUbkWXAe0Xomwv40SEUicfOuHHtW7Ue661Mc5AJA0AOfqApg==", + "dev": true, + "license": "MIT", + "dependencies": { + "arraydiff-async": "0.2.0" + } + }, + "node_modules/array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-includes": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz", + "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "es-shim-unscopables": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz", + "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz", + "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz", + "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==", + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/arraydiff-async": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/arraydiff-async/-/arraydiff-async-0.2.0.tgz", + "integrity": "sha512-i5QgybCLzbTyGlbdOd630AFwpradPgcbsdJ2XoXmgwaQ05lUC44Jn8Gs3EHklHVFoA6grV7ssJ9ExdHBu1C/nw==", + "dev": true + }, + "node_modules/arraydiff-papandreou": { + "version": "0.1.1-patch1", + "resolved": "https://registry.npmjs.org/arraydiff-papandreou/-/arraydiff-papandreou-0.1.1-patch1.tgz", + "integrity": "sha512-QPi68m5STvfROKohFfZb/yWH60UVdmbvCB2SJqcEiitriXRlrAU8Rhxc2PiU/x+htvdPW+jYlN1bhwhEOut9qg==", + "dev": true + }, + "node_modules/arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/asn1": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", + "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": "~2.1.0" + } + }, + "node_modules/assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/assetgraph": { + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/assetgraph/-/assetgraph-7.12.0.tgz", + "integrity": "sha512-U6g7Y4QsYg45PwZB8t105acX9kGFR0I4QH1JZswhe36ijwg3kUK0zNRBSWOM4faeGN0prX04TL8OK16Dq7Iejg==", + "license": "BSD-3-Clause", + "dependencies": { + "acorn": "^8.0.4", + "acorn-jsx": "^5.0.1", + "bluebird": "^3.5.1", + "chalk": "^2.0.1", + "common-path-prefix": "^1.0.0", + "createerror": "^1.3.0", + "cssnano": "^5.1.4", + "data-urls": "^1.0.0", + "domspace": "^1.2.1", + "esanimate": "^1.1.0", + "escodegen": "^2.0.0", + "espurify": "^2.0.1", + "estraverse": "^5.2.0", + "estraverse-fb": "^1.3.2", + "gettemporaryfilepath": "^1.0.0", + "glob": "^7.0.5", + "html-minifier": "^4.0.0", + "imageinfo": "^1.0.4", + "jsdom": "^16.5.3", + "lines-and-columns": "^1.1.6", + "lodash": "^4.17.20", + "memoizesync": "1.1.1", + "mkdirp": "^0.5.1", + "normalizeurl": "^1.0.0", + "perfectionist-dfd": "^3.0.0", + "postcss": "^8.4.12", + "qs": "^6.5.2", + "read-pkg-up": "^6.0.0", + "repeat-string": "^1.5.4", + "schemes": "^1.0.1", + "semver": "^6.0.0", + "sift": "^7.0.1", + "source-map": "~0.6.1", + "specificity": "^0.4.0", + "teepee": "^2.31.1", + "terser": "^5.30.3", + "urltools": "^0.4.1", + "workbox-build": "^4.3.1" + } + }, + "node_modules/astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/async-function": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz", + "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" + }, + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "license": "MIT", + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "*" + } + }, + "node_modules/aws4": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz", + "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==", + "dev": true, + "license": "MIT" + }, + "node_modules/babel-extract-comments": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz", + "integrity": "sha512-qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ==", + "license": "MIT", + "dependencies": { + "babylon": "^6.18.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/babel-plugin-syntax-object-rest-spread": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", + "integrity": "sha512-C4Aq+GaAj83pRQ0EFgTvw5YO6T3Qz2KGrNRwIj9mSoNHVvdZY4KO2uA6HNtNXCw993iSZnckY1aLW8nOi8i4+w==", + "license": "MIT" + }, + "node_modules/babel-plugin-transform-object-rest-spread": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz", + "integrity": "sha512-ocgA9VJvyxwt+qJB0ncxV8kb/CjfTcECUY4tQ5VT7nP6Aohzobm8CDFaQ5FHdvZQzLmf0sgDxB8iRXZXxwZcyA==", + "license": "MIT", + "dependencies": { + "babel-plugin-syntax-object-rest-spread": "^6.8.0", + "babel-runtime": "^6.26.0" + } + }, + "node_modules/babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==", + "license": "MIT", + "dependencies": { + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + } + }, + "node_modules/babel-runtime/node_modules/regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "license": "MIT" + }, + "node_modules/babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "license": "MIT", + "bin": { + "babylon": "bin/babylon.js" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "tweetnacl": "^0.14.3" + } + }, + "node_modules/better-ajv-errors": { + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/better-ajv-errors/-/better-ajv-errors-0.6.7.tgz", + "integrity": "sha512-PYgt/sCzR4aGpyNy5+ViSQ77ognMnWq7745zM+/flYO4/Yisdtp9wDQW2IKCyVYPUxQt3E/b5GBSwfhd1LPdlg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "@babel/runtime": "^7.0.0", + "chalk": "^2.4.1", + "core-js": "^3.2.1", + "json-to-ast": "^2.0.3", + "jsonpointer": "^4.0.1", + "leven": "^3.1.0" + }, + "peerDependencies": { + "ajv": "4.11.8 - 6" + } + }, + "node_modules/better-ajv-errors/node_modules/core-js": { + "version": "3.41.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.41.0.tgz", + "integrity": "sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "license": "MIT", + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", + "license": "MIT" + }, + "node_modules/boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", + "license": "ISC" + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", + "license": "BSD-2-Clause" + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true, + "license": "ISC" + }, + "node_modules/browserslist": { + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", + "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "caniuse-lite": "^1.0.30001688", + "electron-to-chromium": "^1.5.73", + "node-releases": "^2.0.19", + "update-browserslist-db": "^1.1.1" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "license": "MIT" + }, + "node_modules/builtins": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", + "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.0.0" + } + }, + "node_modules/builtins/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/caching-transform": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", + "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasha": "^5.0.0", + "make-dir": "^3.0.0", + "package-hash": "^4.0.0", + "write-file-atomic": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/call-bind": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.0", + "es-define-property": "^1.0.0", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsite": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", + "integrity": "sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camel-case": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", + "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==", + "license": "MIT", + "dependencies": { + "no-case": "^2.2.0", + "upper-case": "^1.1.1" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz", + "integrity": "sha512-Ej37YKYbFUI8QiYlvj9YHb6/Z60dZyPJW0Cs8sFilMbd2lP0bw3ylAq9yJkK4lcTA2dID5fG8LjmJYbO7kWb7Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "camelcase": "^4.1.0", + "map-obj": "^2.0.0", + "quick-lru": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/camelcase-keys/node_modules/camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/caniuse-api": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", + "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", + "license": "MIT", + "dependencies": { + "browserslist": "^4.0.0", + "caniuse-lite": "^1.0.0", + "lodash.memoize": "^4.1.2", + "lodash.uniq": "^4.5.0" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001705", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001705.tgz", + "integrity": "sha512-S0uyMMiYvA7CxNgomYBwwwPUnWzFD83f3B1ce5jHUfHTH//QL6hHsreI8RVC5606R4ssqravelYO5TU6t8sEyg==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" + }, + "node_modules/capitalize": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/capitalize/-/capitalize-2.0.4.tgz", + "integrity": "sha512-wcSyiFqXRYyCoqu0o0ekXzJAKCLMkqWS5QWGlgTJFJKwRmI6pzcN2hBl5VPq9RzLW5Uf4FF/V/lcFfjCtVak2w==", + "license": "MIT" + }, + "node_modules/caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chance": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/chance/-/chance-1.0.16.tgz", + "integrity": "sha512-2bgDHH5bVfAXH05SPtjqrsASzZ7h90yCuYT2z4mkYpxxYvJXiIydBFzVieVHZx7wLH1Ag2Azaaej2/zA1XUrNQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/chance-generators": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chance-generators/-/chance-generators-3.5.3.tgz", + "integrity": "sha512-8KIqKfuMevyHLp4uHI+m5AMaY1IPo4eYzX7sMV1xr7ulOYNWSTjW5ngB8kNMWHWbpuoVO1MwYonQ+HlBu5fcpQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "chance": "1.0.16" + } + }, + "node_modules/character-sets": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/character-sets/-/character-sets-1.0.8.tgz", + "integrity": "sha512-li7ydz40WtNT0vPZySSN1I0tW8BL5x37K8rcF2q/jjL4Yi6iOdrDstT2attXXLJWeKMEkyvmsYSFEex5RsfCZQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4.x.x" + } + }, + "node_modules/chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true, + "license": "MIT" + }, + "node_modules/chokidar": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", + "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", + "dev": true, + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.5.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.1" + } + }, + "node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "license": "ISC" + }, + "node_modules/chromium-bidi": { + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.7.tgz", + "integrity": "sha512-6+mJuFXwTMU6I3vYLs6IL8A1DyQTPjCfIL971X0aMPVGRbGnNfl6i6Cl0NMbxi2bRYLGESt9T2ZIMRM5PAEcIQ==", + "license": "Apache-2.0", + "dependencies": { + "mitt": "3.0.0" + }, + "peerDependencies": { + "devtools-protocol": "*" + } + }, + "node_modules/clean-css": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", + "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", + "license": "MIT", + "dependencies": { + "source-map": "~0.6.0" + }, + "engines": { + "node": ">= 4.0" + } + }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "restore-cursor": "^3.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cli-width": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 10" + } + }, + "node_modules/cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "node_modules/code-error-fragment": { + "version": "0.0.230", + "resolved": "https://registry.npmjs.org/code-error-fragment/-/code-error-fragment-0.0.230.tgz", + "integrity": "sha512-cadkfKp6932H8UkhzE/gcUqhRMNf8jHzkAN7+5Myabswaghu4xABTgPHDCjW+dBAJxj/SpkTYokpzDqY4pCzQw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "license": "MIT", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/color-diff": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/color-diff/-/color-diff-0.1.7.tgz", + "integrity": "sha512-Tuh3W2d3LdK3E8BhKltCuESgUva+oluFYqvzHg8a3tu5XzO/a4PF4W8islodUcqtiPgPdkg42PzL2bwtOUaJeQ==", + "dev": true, + "license": "BSD" + }, + "node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "license": "MIT" + }, + "node_modules/colord": { + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", + "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==", + "license": "MIT" + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/combos": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/combos/-/combos-0.2.0.tgz", + "integrity": "sha512-Z6YfvgiTCERWJTj3wQiXamFhssdvz1n4ok447rS330lw3uL72WAx8IvrLU7xiE71uyb5WF8JEP+BWB5KhOoGeg==", + "dev": true, + "license": "MIT" + }, + "node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "license": "MIT" + }, + "node_modules/common-path-prefix": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-1.0.0.tgz", + "integrity": "sha512-StWMCZw9nTO+RnxMCcapnQQqeZpaDvCD9+0Rrl8ZphFKWcJPyUGiEl64WoAkA+WJIxwKYzxldhYHU+EW1fQ2mQ==", + "license": "ISC" + }, + "node_modules/common-tags": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz", + "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==", + "license": "MIT", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", + "dev": true, + "license": "MIT" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "license": "MIT" + }, + "node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true, + "license": "MIT" + }, + "node_modules/core-js": { + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", + "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", + "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.", + "hasInstallScript": true, + "license": "MIT" + }, + "node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/cosmiconfig": { + "version": "8.1.3", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz", + "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "parse-json": "^5.0.0", + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + } + }, + "node_modules/cosmiconfig/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/cosmiconfig/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/counteraction": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/counteraction/-/counteraction-1.3.2.tgz", + "integrity": "sha512-CtFt/FSa3At/Wm8Hwo022KBSmLlYkvpTjW4B2wqTCKvvTx6ilnteBNmqIjRzGB4EaUmisPrTPYIkJQ1L7gTIdg==", + "license": "BSD-3-Clause" + }, + "node_modules/coveralls": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.1.1.tgz", + "integrity": "sha512-+dxnG2NHncSD1NrqbSM3dn/lE57O6Qf/koe9+I7c+wzkqRmEvcp0kgJdxKInzYzkICKkFMZsX3Vct3++tsF9ww==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "js-yaml": "^3.13.1", + "lcov-parse": "^1.0.0", + "log-driver": "^1.2.7", + "minimist": "^1.2.5", + "request": "^2.88.2" + }, + "bin": { + "coveralls": "bin/coveralls.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/createerror": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/createerror/-/createerror-1.3.0.tgz", + "integrity": "sha512-w9UZUtkaGd8MfS7eMG7Sa0lV5vCJghqQfiOnwNVrPhbZScUp5h0jwYoAF933MKlotlG1JAJOCCT3xU6r+SDKNw==", + "engines": { + "node": ">= 0.2.0" + } + }, + "node_modules/cross-fetch": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", + "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", + "license": "MIT", + "dependencies": { + "node-fetch": "2.6.7" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/css-declaration-sorter": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz", + "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==", + "license": "ISC", + "engines": { + "node": "^10 || ^12 || >=14" + }, + "peerDependencies": { + "postcss": "^8.0.9" + } + }, + "node_modules/css-font-parser": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/css-font-parser/-/css-font-parser-2.0.1.tgz", + "integrity": "sha512-C4aQOpCmQL/Arl68chQatNh7/Nfyty15kbLNZezGudjcKSqHHVoHQEeb9IJcjgQ6CiurrHZoEt47yce891vjGw==", + "license": "BSD-3-Clause" + }, + "node_modules/css-font-parser-papandreou": { + "version": "0.2.3-patch1", + "resolved": "https://registry.npmjs.org/css-font-parser-papandreou/-/css-font-parser-papandreou-0.2.3-patch1.tgz", + "integrity": "sha512-yVhlQDjEppcS9a91xPs1x7u3IYNb2HPfTXxsFoNW2Kr2ilqWOqhxpfBxS42yzo1FCu0IGg1vbt8aag9fChCwmA==", + "license": "BSD" + }, + "node_modules/css-font-weight-names": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/css-font-weight-names/-/css-font-weight-names-0.2.1.tgz", + "integrity": "sha512-2dDc3aYw5yE4IvlJ2Lhz5NGSc2P4lshLd1qImXUyb62r/07/0dr7njHwWlUIoanoTnrENa9tgceUKY5nYtL4pA==", + "license": "CC0-1.0" + }, + "node_modules/css-generators": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/css-generators/-/css-generators-0.2.3.tgz", + "integrity": "sha512-OrnM55sLIyizZ+pMEc2pSAEceFPCwSJah09Qc26r/ZeiBs7aaDc533CSKi9VNl5aXK0Ln1Wb1NhX9j9uW8S+yg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "chance-generators": "^3.5.2", + "character-sets": "^1.0.8", + "css-syntax-parser": "^1.5.1", + "html-validate": "3.0.0", + "iso-639-1": "^2.1.0", + "lodash": "^4.17.15", + "mdn-data-papandreou": "2.0.10-patch1", + "pegjs": "^0.10.0", + "postcss": "^7.0.23" + } + }, + "node_modules/css-generators/node_modules/picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true, + "license": "ISC" + }, + "node_modules/css-generators/node_modules/postcss": { + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picocolors": "^0.2.1", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + } + }, + "node_modules/css-list-helpers": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/css-list-helpers/-/css-list-helpers-2.0.0.tgz", + "integrity": "sha512-9Bj8tZ0jWbAM3u/U6m/boAzAwLPwtjzFvwivr2piSvyVa3K3rChJzQy4RIHkNkKiZCHrEMWDJWtTR8UyVhdDnQ==", + "license": "MIT" + }, + "node_modules/css-select": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", + "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0", + "css-what": "^6.0.1", + "domhandler": "^4.3.1", + "domutils": "^2.8.0", + "nth-check": "^2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/css-syntax-parser": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/css-syntax-parser/-/css-syntax-parser-1.5.1.tgz", + "integrity": "sha512-RT1YwEEYVuWsxvMFmcJwGvBTb922OnFoZmzasSfj6vAGUqPvCdWcpUFCUsIk04OPaePZ1QxBYI3hPLDdrZ/RiA==", + "dev": true, + "license": "ISC" + }, + "node_modules/css-tree": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", + "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", + "license": "MIT", + "dependencies": { + "mdn-data": "2.0.14", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/css-unit-converter": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz", + "integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==", + "license": "MIT" + }, + "node_modules/css-what": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", + "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "license": "MIT", + "bin": { + "cssesc": "bin/cssesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/cssnano": { + "version": "5.1.15", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz", + "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==", + "license": "MIT", + "dependencies": { + "cssnano-preset-default": "^5.2.14", + "lilconfig": "^2.0.3", + "yaml": "^1.10.2" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/cssnano" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/cssnano-preset-default": { + "version": "5.2.14", + "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz", + "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==", + "license": "MIT", + "dependencies": { + "css-declaration-sorter": "^6.3.1", + "cssnano-utils": "^3.1.0", + "postcss-calc": "^8.2.3", + "postcss-colormin": "^5.3.1", + "postcss-convert-values": "^5.1.3", + "postcss-discard-comments": "^5.1.2", + "postcss-discard-duplicates": "^5.1.0", + "postcss-discard-empty": "^5.1.1", + "postcss-discard-overridden": "^5.1.0", + "postcss-merge-longhand": "^5.1.7", + "postcss-merge-rules": "^5.1.4", + "postcss-minify-font-values": "^5.1.0", + "postcss-minify-gradients": "^5.1.1", + "postcss-minify-params": "^5.1.4", + "postcss-minify-selectors": "^5.2.1", + "postcss-normalize-charset": "^5.1.0", + "postcss-normalize-display-values": "^5.1.0", + "postcss-normalize-positions": "^5.1.1", + "postcss-normalize-repeat-style": "^5.1.1", + "postcss-normalize-string": "^5.1.0", + "postcss-normalize-timing-functions": "^5.1.0", + "postcss-normalize-unicode": "^5.1.1", + "postcss-normalize-url": "^5.1.0", + "postcss-normalize-whitespace": "^5.1.1", + "postcss-ordered-values": "^5.1.3", + "postcss-reduce-initial": "^5.1.2", + "postcss-reduce-transforms": "^5.1.0", + "postcss-svgo": "^5.1.0", + "postcss-unique-selectors": "^5.1.1" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/cssnano-utils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz", + "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==", + "license": "MIT", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/csso": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", + "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", + "license": "MIT", + "dependencies": { + "css-tree": "^1.1.2" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", + "license": "MIT" + }, + "node_modules/cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "license": "MIT", + "dependencies": { + "cssom": "~0.3.6" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "license": "MIT" + }, + "node_modules/currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-find-index": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/d": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz", + "integrity": "sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==", + "dev": true, + "license": "ISC", + "dependencies": { + "es5-ext": "^0.10.64", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", + "dev": true, + "license": "MIT", + "dependencies": { + "assert-plus": "^1.0.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/data-urls": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz", + "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==", + "license": "MIT", + "dependencies": { + "abab": "^2.0.0", + "whatwg-mimetype": "^2.2.0", + "whatwg-url": "^7.0.0" + } + }, + "node_modules/data-view-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", + "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz", + "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/inspect-js" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz", + "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/debug": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decamelize-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", + "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", + "dev": true, + "license": "MIT", + "dependencies": { + "decamelize": "^1.1.0", + "map-obj": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/decamelize-keys/node_modules/map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decimal.js": { + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz", + "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==", + "license": "MIT" + }, + "node_modules/deep-equal": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz", + "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-arguments": "^1.1.1", + "is-date-object": "^1.0.5", + "is-regex": "^1.1.4", + "object-is": "^1.1.5", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.5.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "license": "MIT" + }, + "node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/default-require-extensions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz", + "integrity": "sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==", + "dev": true, + "license": "MIT", + "dependencies": { + "strip-bom": "^4.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "license": "MIT", + "dependencies": { + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/defined": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz", + "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/detect-indent": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-3.0.1.tgz", + "integrity": "sha512-xo3WP66SNbr1Eim85s/qyH0ZL8PQUwp86HWm0S1l8WnJ/zjT6T3w1nwNA0yOZeuvOemupEYvpvF6BIdYRuERJQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-stdin": "^4.0.1", + "minimist": "^1.1.0", + "repeating": "^1.1.0" + }, + "bin": { + "detect-indent": "cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/detect-indent/node_modules/get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/devtools-protocol": { + "version": "0.0.1107588", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1107588.tgz", + "integrity": "sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg==", + "license": "BSD-3-Clause" + }, + "node_modules/diff": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/dnserrors": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/dnserrors/-/dnserrors-2.1.2.tgz", + "integrity": "sha512-m2bdi1p3YWTTEAMlN8HkB+pqeykpd7+znMa/Jxr47sk4KiTImtg350BMVeY7xnYNOWFyEoDEWft5aqNt3O5g4A==", + "license": "BSD-3-Clause", + "dependencies": { + "createerror": "^1.2.0", + "httperrors": "^2.2.0", + "lodash.defaults": "^4.2.0", + "lodash.omit": "^4.5.0" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/dom-serializer": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", + "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", + "license": "MIT", + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^4.2.0", + "entities": "^2.0.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/domelementtype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "BSD-2-Clause" + }, + "node_modules/domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "deprecated": "Use your platform's native DOMException instead", + "license": "MIT", + "dependencies": { + "webidl-conversions": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/domexception/node_modules/webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/domhandler": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", + "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", + "license": "BSD-2-Clause", + "dependencies": { + "domelementtype": "^2.2.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/domspace": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/domspace/-/domspace-1.2.2.tgz", + "integrity": "sha512-wonvpGbed9PlcvQ0xfb0ov8QoKR9Tk7GiIGrOto6ykPdAtmtQXFBUS10Ifm/1srPkrvcOB4Hsexb/Okt7CeOwg==", + "license": "BSD-3-Clause" + }, + "node_modules/domutils": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", + "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "license": "BSD-2-Clause", + "dependencies": { + "dom-serializer": "^1.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.2.0" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==", + "dev": true, + "license": "MIT", + "dependencies": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/electron-to-chromium": { + "version": "1.5.119", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.119.tgz", + "integrity": "sha512-Ku4NMzUjz3e3Vweh7PhApPrZSS4fyiCIbcIrG9eKrriYVLmbMepETR/v6SU7xPm98QTqMSYiCwfO89QNjXLkbQ==", + "license": "ISC" + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "license": "MIT", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/enquirer": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", + "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-colors": "^4.1.1", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "license": "BSD-2-Clause", + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/es-abstract": { + "version": "1.23.9", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz", + "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==", + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.2", + "arraybuffer.prototype.slice": "^1.0.4", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "data-view-buffer": "^1.0.2", + "data-view-byte-length": "^1.0.2", + "data-view-byte-offset": "^1.0.1", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-set-tostringtag": "^2.1.0", + "es-to-primitive": "^1.3.0", + "function.prototype.name": "^1.1.8", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.0", + "get-symbol-description": "^1.1.0", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "internal-slot": "^1.1.0", + "is-array-buffer": "^3.0.5", + "is-callable": "^1.2.7", + "is-data-view": "^1.0.2", + "is-regex": "^1.2.1", + "is-shared-array-buffer": "^1.0.4", + "is-string": "^1.1.1", + "is-typed-array": "^1.1.15", + "is-weakref": "^1.1.0", + "math-intrinsics": "^1.1.0", + "object-inspect": "^1.13.3", + "object-keys": "^1.1.1", + "object.assign": "^4.1.7", + "own-keys": "^1.0.1", + "regexp.prototype.flags": "^1.5.3", + "safe-array-concat": "^1.1.3", + "safe-push-apply": "^1.0.0", + "safe-regex-test": "^1.1.0", + "set-proto": "^1.0.0", + "string.prototype.trim": "^1.2.10", + "string.prototype.trimend": "^1.0.9", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.3", + "typed-array-byte-length": "^1.0.3", + "typed-array-byte-offset": "^1.0.4", + "typed-array-length": "^1.0.7", + "unbox-primitive": "^1.1.0", + "which-typed-array": "^1.1.18" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz", + "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-to-primitive": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", + "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7", + "is-date-object": "^1.0.5", + "is-symbol": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es5-ext": { + "version": "0.10.64", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz", + "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==", + "dev": true, + "hasInstallScript": true, + "license": "ISC", + "dependencies": { + "es6-iterator": "^2.0.3", + "es6-symbol": "^3.1.3", + "esniff": "^2.0.1", + "next-tick": "^1.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "dev": true, + "license": "MIT" + }, + "node_modules/es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==", + "dev": true, + "license": "MIT", + "dependencies": { + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" + } + }, + "node_modules/es6-set": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz", + "integrity": "sha512-TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==", + "dev": true, + "license": "ISC", + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.62", + "es6-iterator": "~2.0.3", + "es6-symbol": "^3.1.3", + "event-emitter": "^0.3.5", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/es6-symbol": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz", + "integrity": "sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==", + "dev": true, + "license": "ISC", + "dependencies": { + "d": "^1.0.2", + "ext": "^1.7.0" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/esanimate": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/esanimate/-/esanimate-1.1.1.tgz", + "integrity": "sha512-fIrM3uC3tgv3Vz6HuSOUmB/YtEcQ7PVMCHyl+r13KirqTQhigraedKzrBzNMcz1QieZ476K0AnMHEN/Ei1LDVQ==", + "license": "BSD-3-Clause", + "dependencies": { + "escodegen": "^1.11.1", + "esprima": "^4.0.1" + } + }, + "node_modules/esanimate/node_modules/escodegen": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "license": "BSD-2-Clause", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=4.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/esanimate/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esanimate/node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/esanimate/node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "license": "MIT", + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/esanimate/node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/esanimate/node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/escodegen": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", + "license": "BSD-2-Clause", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/eslint": { + "version": "7.32.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", + "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "7.12.11", + "@eslint/eslintrc": "^0.4.3", + "@humanwhocodes/config-array": "^0.5.0", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "enquirer": "^2.3.5", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^2.1.0", + "eslint-visitor-keys": "^2.0.0", + "espree": "^7.3.1", + "esquery": "^1.4.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.1.2", + "globals": "^13.6.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.0.4", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "progress": "^2.0.0", + "regexpp": "^3.1.0", + "semver": "^7.2.1", + "strip-ansi": "^6.0.0", + "strip-json-comments": "^3.1.0", + "table": "^6.0.9", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-prettier": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz", + "integrity": "sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-stdin": "^6.0.0" + }, + "bin": { + "eslint-config-prettier-check": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=3.14.1" + } + }, + "node_modules/eslint-config-standard": { + "version": "14.1.1", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz", + "integrity": "sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "eslint": ">=6.2.2", + "eslint-plugin-import": ">=2.18.0", + "eslint-plugin-node": ">=9.1.0", + "eslint-plugin-promise": ">=4.2.1", + "eslint-plugin-standard": ">=4.0.0" + } + }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7", + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-module-utils": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz", + "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7" + }, + "engines": { + "node": ">=4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } + } + }, + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-es": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz", + "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + }, + "engines": { + "node": ">=8.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=4.19.1" + } + }, + "node_modules/eslint-plugin-import": { + "version": "2.31.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz", + "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rtsao/scc": "^1.1.0", + "array-includes": "^3.1.8", + "array.prototype.findlastindex": "^1.2.5", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", + "debug": "^3.2.7", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.12.0", + "hasown": "^2.0.2", + "is-core-module": "^2.15.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.fromentries": "^2.0.8", + "object.groupby": "^1.0.3", + "object.values": "^1.2.0", + "semver": "^6.3.1", + "string.prototype.trimend": "^1.0.8", + "tsconfig-paths": "^3.15.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-mocha": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-7.0.1.tgz", + "integrity": "sha512-zkQRW9UigRaayGm/pK9TD5RjccKXSgQksNtpsXbG9b6L5I+jNx7m98VUbZ4w1H1ArlNA+K7IOH+z8TscN6sOYg==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-utils": "^2.0.0", + "ramda": "^0.27.0" + }, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-n": { + "version": "15.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", + "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "builtins": "^5.0.1", + "eslint-plugin-es": "^4.1.0", + "eslint-utils": "^3.0.0", + "ignore": "^5.1.1", + "is-core-module": "^2.11.0", + "minimatch": "^3.1.2", + "resolve": "^1.22.1", + "semver": "^7.3.8" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-n/node_modules/eslint-plugin-es": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", + "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + }, + "engines": { + "node": ">=8.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=4.19.1" + } + }, + "node_modules/eslint-plugin-n/node_modules/eslint-plugin-es/node_modules/eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/eslint-plugin-n/node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-n/node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-plugin-n/node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/eslint-plugin-n/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-plugin-node": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", + "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-plugin-es": "^3.0.0", + "eslint-utils": "^2.0.0", + "ignore": "^5.1.1", + "minimatch": "^3.0.4", + "resolve": "^1.10.1", + "semver": "^6.1.0" + }, + "engines": { + "node": ">=8.10.0" + }, + "peerDependencies": { + "eslint": ">=5.16.0" + } + }, + "node_modules/eslint-plugin-node/node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/eslint-plugin-promise": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.3.1.tgz", + "integrity": "sha512-bY2sGqyptzFBDLh/GMbAxfdJC+b0f23ME63FOE4+Jao0oZ3E1LEwFtWJX/1pGMJLiTtrSSern2CRM/g+dfc0eQ==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=6" + } + }, + "node_modules/eslint-plugin-standard": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz", + "integrity": "sha512-ZL7+QRixjTR6/528YNGyDotyffm5OQst/sGxKDwGb9Uqs4In5Egi4+jbobhqJoyoCM6/7v/1A5fhQ7ScMtDjaQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "peerDependencies": { + "eslint": ">=5.0.0" + } + }, + "node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/eslint-scope/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/eslint/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/eslint/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/eslint/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/eslint/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/esniff": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz", + "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==", + "dev": true, + "license": "ISC", + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.62", + "event-emitter": "^0.3.5", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/espree": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", + "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^7.4.0", + "acorn-jsx": "^5.3.1", + "eslint-visitor-keys": "^1.3.0" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/espree/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/espree/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=4" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/espurify": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/espurify/-/espurify-2.1.1.tgz", + "integrity": "sha512-zttWvnkhcDyGOhSH4vO2qCBILpdCMv/MX8lp4cqgRkQoDRGK2oZxi2GfWhlP2dIXmk7BaKeOTuzbHhyC68o8XQ==", + "license": "MIT" + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse-fb": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/estraverse-fb/-/estraverse-fb-1.3.2.tgz", + "integrity": "sha512-wp3lfRrWy5EQD9TqesuYM1SKVP4ERT0cUatb4e8Vznf4K5IOpREhuyXZxGj3a9s9mvX5vGZKNHA4R9D4kp9Q9A==", + "license": "MIT", + "peerDependencies": { + "estraverse": "*" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, + "node_modules/ext": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", + "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==", + "dev": true, + "license": "ISC", + "dependencies": { + "type": "^2.7.2" + } + }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "license": "MIT" + }, + "node_modules/external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dev": true, + "license": "MIT", + "dependencies": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/extract-zip": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", + "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", + "license": "BSD-2-Clause", + "dependencies": { + "debug": "^4.1.1", + "get-stream": "^5.1.0", + "yauzl": "^2.10.0" + }, + "bin": { + "extract-zip": "cli.js" + }, + "engines": { + "node": ">= 10.17.0" + }, + "optionalDependencies": { + "@types/yauzl": "^2.9.1" + } + }, + "node_modules/extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==", + "dev": true, + "engines": [ + "node >=0.6.0" + ], + "license": "MIT" + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "license": "MIT" + }, + "node_modules/fast-uri": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz", + "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], + "license": "BSD-3-Clause" + }, + "node_modules/fd-slicer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", + "license": "MIT", + "dependencies": { + "pend": "~1.2.0" + } + }, + "node_modules/figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "dev": true, + "license": "MIT", + "dependencies": { + "escape-string-regexp": "^1.0.5" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/fill-keys": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz", + "integrity": "sha512-tcgI872xXjwFF4xgQmLxi76GnwJG3g/3isB1l4/G5Z4zrbddGpBjqZCO9oEAcB5wX0Hj/5iQB3toxfO7in1hHA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-object": "~1.0.1", + "merge-descriptors": "~1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-cache-dir": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", + "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "dev": true, + "license": "MIT", + "dependencies": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/avajs/find-cache-dir?sponsor=1" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "license": "BSD-3-Clause", + "bin": { + "flat": "cli.js" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "dev": true, + "license": "ISC" + }, + "node_modules/font-family-papandreou": { + "version": "0.2.0-patch2", + "resolved": "https://registry.npmjs.org/font-family-papandreou/-/font-family-papandreou-0.2.0-patch2.tgz", + "integrity": "sha512-l/YiRdBSH/eWv6OF3sLGkwErL+n0MqCICi9mppTZBOCL5vixWGDqCYvRcuxB2h7RGCTzaTKOHT2caHvCXQPRlw==", + "license": "MIT" + }, + "node_modules/font-snapper": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/font-snapper/-/font-snapper-1.2.0.tgz", + "integrity": "sha512-TcqBpHV24iGPA2RvvMWCmwH/Zrz46OIaKOlvQoi6kZweSDtLwNCJihby10htMnSCncwFX8rQYDiaXJk2LvPHng==", + "license": "BSD-3-Clause", + "dependencies": { + "css-font-weight-names": "^0.2.1", + "font-family-papandreou": "^0.2.0-patch1" + } + }, + "node_modules/font-tracer": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/font-tracer/-/font-tracer-3.7.1.tgz", + "integrity": "sha512-+CetK78tyd5Q6lgDE7dJO9Q4fIt/oMY2dexNBU+++pSeUHNeSzhYj2ZSXZDYUvj/6zXCwTmi3YceG6QT178aMg==", + "license": "BSD-3-Clause", + "dependencies": { + "capitalize": "^2.0.3", + "counteraction": "^1.3.1", + "css-font-parser": "^2.0.0", + "css-font-parser-papandreou": "^0.2.3-patch1", + "css-font-weight-names": "^0.2.1", + "postcss-value-parser": "^4.1.0", + "reduce-css-calc": "^2.1.8", + "specificity": "^0.4.1" + } + }, + "node_modules/fontverter": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fontverter/-/fontverter-2.0.0.tgz", + "integrity": "sha512-DFVX5hvXuhi1Jven1tbpebYTCT9XYnvx6/Z+HFUPb7ZRMCW+pj2clU9VMhoTPgWKPhAs7JJDSk3CW1jNUvKCZQ==", + "license": "BSD-3-Clause", + "dependencies": { + "wawoff2": "^2.0.0", + "woff2sfnt-sfnt2woff": "^1.0.0" + } + }, + "node_modules/for-each": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", + "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", + "license": "MIT", + "dependencies": { + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/foreground-child": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", + "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", + "dev": true, + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "*" + } + }, + "node_modules/form-data": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.3.tgz", + "integrity": "sha512-q5YBMeWy6E2Un0nMGWMgI65MAKtaylxfNJGJxpGh45YDciZB4epbWpaAfImil6CPAPTYB4sh0URQNDRIZG5F2w==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "mime-types": "^2.1.35" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fromentries": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz", + "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "license": "MIT" + }, + "node_modules/fs-extra": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", + "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "node_modules/fs-extra/node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "license": "MIT", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "license": "ISC" + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/function.prototype.name": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz", + "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "functions-have-names": "^1.2.3", + "hasown": "^2.0.2", + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", + "dev": true, + "license": "MIT" + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gather-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz", + "integrity": "sha512-NspYMi3rN3EKmMdejUXbtluDYrcRlTEBBFhWzVRZVsOx94OPxlXp0AzyPKyLiT7iaurcoTE/KcHsHP/PowNEaA==", + "license": "ISC" + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-own-enumerable-property-symbols": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz", + "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==", + "license": "ISC" + }, + "node_modules/get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/get-stdin": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz", + "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "license": "MIT", + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-symbol-description": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz", + "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", + "dev": true, + "license": "MIT", + "dependencies": { + "assert-plus": "^1.0.0" + } + }, + "node_modules/gettemporaryfilepath": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gettemporaryfilepath/-/gettemporaryfilepath-1.0.1.tgz", + "integrity": "sha512-MVCSgF1blIZuIV3KYhMKOwU1OSxPF1s+ZcyqWMSGR5Fzl6fN7EjIXDFGu9PmWAAwyGjMjmkS2ruqPaj13J3SXA==", + "license": "BSD" + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globalthis": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", + "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", + "license": "MIT", + "dependencies": { + "define-properties": "^1.2.1", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "license": "ISC" + }, + "node_modules/grapheme-splitter": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", + "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/greedy-interval-packer": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/greedy-interval-packer/-/greedy-interval-packer-1.2.0.tgz", + "integrity": "sha512-4ap45COKmRa2BdeVTY9FXIlR5UIkQX/a0pGtEvk+DnZ7THF3n1UkUKB17AFo+5TMaXnwJkHDn9VH5ATXt/YzHA==", + "dev": true, + "license": "MIT" + }, + "node_modules/growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4.x" + } + }, + "node_modules/har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=4" + } + }, + "node_modules/har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "deprecated": "this library is no longer supported", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/harfbuzzjs": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/harfbuzzjs/-/harfbuzzjs-0.3.6.tgz", + "integrity": "sha512-dzf7y6NS8fiAIvPAL/VKwY8wx2HCzUB0vUfOo6h1J5UilFEEf7iYqFsvgwjHwvM3whbjfOMadNvQekU3KuRnWQ==", + "license": "MIT" + }, + "node_modules/has-bigints": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", + "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz", + "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasha": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz", + "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-stream": "^2.0.0", + "type-fest": "^0.8.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/hasha/node_modules/type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "license": "MIT", + "bin": { + "he": "bin/he" + } + }, + "node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "license": "ISC" + }, + "node_modules/html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "license": "MIT", + "dependencies": { + "whatwg-encoding": "^1.0.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true, + "license": "MIT" + }, + "node_modules/html-generators": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/html-generators/-/html-generators-1.0.3.tgz", + "integrity": "sha512-PAL3BipC1XEW3bnfNbkU6eRsMXHjCYoB9korutBBAGpH/UL2A1euD9IdvV35wdMhVcPzHo2oSH5b6nokAcLONw==", + "dev": true, + "license": "MIT", + "dependencies": { + "chance-generators": "^3.5.2", + "css-generators": "0.2.0", + "html-validate": "1.6.0" + } + }, + "node_modules/html-generators/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/html-generators/node_modules/ansi-regex": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/html-generators/node_modules/astral-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", + "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/html-generators/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/html-generators/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/html-generators/node_modules/cross-spawn": { + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz", + "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==", + "dev": true, + "license": "MIT", + "dependencies": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + }, + "engines": { + "node": ">=4.8" + } + }, + "node_modules/html-generators/node_modules/cross-spawn/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/html-generators/node_modules/css-generators": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/css-generators/-/css-generators-0.2.0.tgz", + "integrity": "sha512-LOi+OnnP0GCc9laN1b9k3uQ41T8OvA5mSCb7ZnKQwg35X6H0hGbS4aRTH2zaB2r7GvNP6WXTH00VZo9vOvTChg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "chance-generators": "^3.5.2", + "character-sets": "^1.0.8", + "css-syntax-parser": "^1.5.1", + "html-validate": "^2.0.1", + "iso-639-1": "^2.1.0", + "lodash": "^4.17.15", + "mdn-data": "2.0.7", + "pegjs": "^0.10.0", + "postcss": "^7.0.23" + } + }, + "node_modules/html-generators/node_modules/css-generators/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/html-generators/node_modules/css-generators/node_modules/chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/html-generators/node_modules/css-generators/node_modules/html-validate": { + "version": "2.23.1", + "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-2.23.1.tgz", + "integrity": "sha512-qOW7q45BZ0YvQBJMaKvttFuWGwSBRYqPE7xAnR+n4A+fKBqP+5XSGFTH+4XdbVoMQYwK3TntKC3ra7GCHApXTQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "@sidvind/better-ajv-errors": "^0.6.9", + "acorn-walk": "^7.0.0", + "ajv": "^6.10.0", + "chalk": "^3.0.0", + "deepmerge": "^4.0.0", + "eslint": "^6.0.0", + "espree": "^6.0.0", + "glob": "^7.1.3", + "inquirer": "^7.0.0", + "json-merge-patch": "^1.0.0", + "minimist": "^1.2.0" + }, + "bin": { + "html-validate": "bin/html-validate.js" + }, + "engines": { + "node": ">= 8.5" + } + }, + "node_modules/html-generators/node_modules/emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true, + "license": "MIT" + }, + "node_modules/html-generators/node_modules/eslint": { + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz", + "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "ajv": "^6.10.0", + "chalk": "^2.1.0", + "cross-spawn": "^6.0.5", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "eslint-scope": "^5.0.0", + "eslint-utils": "^1.4.3", + "eslint-visitor-keys": "^1.1.0", + "espree": "^6.1.2", + "esquery": "^1.0.1", + "esutils": "^2.0.2", + "file-entry-cache": "^5.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.0.0", + "globals": "^12.1.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "inquirer": "^7.0.0", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.14", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.3", + "progress": "^2.0.0", + "regexpp": "^2.0.1", + "semver": "^6.1.2", + "strip-ansi": "^5.2.0", + "strip-json-comments": "^3.0.1", + "table": "^5.2.3", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^8.10.0 || ^10.13.0 || >=11.10.1" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/html-generators/node_modules/eslint-utils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", + "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/html-generators/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=4" + } + }, + "node_modules/html-generators/node_modules/espree": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz", + "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^7.1.1", + "acorn-jsx": "^5.2.0", + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/html-generators/node_modules/file-entry-cache": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", + "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^2.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/html-generators/node_modules/flat-cache": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", + "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^2.0.0", + "rimraf": "2.6.3", + "write": "1.0.3" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/html-generators/node_modules/flatted": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz", + "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", + "dev": true, + "license": "ISC" + }, + "node_modules/html-generators/node_modules/globals": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.8.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/html-generators/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/html-generators/node_modules/html-validate": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-1.6.0.tgz", + "integrity": "sha512-7K9IjTmLzUoQm0ZhHP+rPcHw6zJsnRmyf79awVFhgw2o1ZBklKBcqscCuCk7I08YGpSTqp61eW0TdDKkmD5MHw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "acorn-walk": "^7.0.0", + "ajv": "^6.10.0", + "better-ajv-errors": "^0.6.2", + "chalk": "^2.4.2", + "deepmerge": "^4.0.0", + "eslint": "^6.0.0", + "espree": "^6.0.0", + "glob": "^7.1.3", + "json-merge-patch": "^0.2.3", + "minimist": "^1.2.0" + }, + "bin": { + "html-validate": "bin/html-validate.js" + }, + "engines": { + "node": ">= 8.5" + } + }, + "node_modules/html-generators/node_modules/html-validate/node_modules/json-merge-patch": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-merge-patch/-/json-merge-patch-0.2.3.tgz", + "integrity": "sha512-mjd5eObNGOhWkKCztwVuF25KOzLj2T4TJaWXLBgCQPeoPRJrMxKNgjNBE8sPmXoWRT0WDlo4Itd/gTlFh29TFw==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-equal": "^1.0.0" + } + }, + "node_modules/html-generators/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/html-generators/node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/html-generators/node_modules/mdn-data": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.7.tgz", + "integrity": "sha512-SRtFboZtRLXYjkS6wnzITo7UPlWJYcn8T2A8XXqEt5uXH1okVBpQOzo05XM17/rhiLXk7CmAQMJ/vM1QP/kuUA==", + "dev": true, + "license": "CC0-1.0" + }, + "node_modules/html-generators/node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/html-generators/node_modules/path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/html-generators/node_modules/picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true, + "license": "ISC" + }, + "node_modules/html-generators/node_modules/postcss": { + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picocolors": "^0.2.1", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + } + }, + "node_modules/html-generators/node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/html-generators/node_modules/regexpp": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", + "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.5.0" + } + }, + "node_modules/html-generators/node_modules/rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/html-generators/node_modules/shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/html-generators/node_modules/shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/html-generators/node_modules/slice-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", + "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^3.2.0", + "astral-regex": "^1.0.0", + "is-fullwidth-code-point": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/html-generators/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/html-generators/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/html-generators/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/html-generators/node_modules/table": { + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", + "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "ajv": "^6.10.2", + "lodash": "^4.17.14", + "slice-ansi": "^2.1.0", + "string-width": "^3.0.0" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/html-generators/node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/html-generators/node_modules/type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/html-generators/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/html-minifier": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz", + "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==", + "license": "MIT", + "dependencies": { + "camel-case": "^3.0.0", + "clean-css": "^4.2.1", + "commander": "^2.19.0", + "he": "^1.2.0", + "param-case": "^2.1.1", + "relateurl": "^0.2.7", + "uglify-js": "^3.5.1" + }, + "bin": { + "html-minifier": "cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/html-validate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-3.0.0.tgz", + "integrity": "sha512-4yipnAN9O33nW7K5qncSHXuP08mqROIvJVlgjLykgRVdx2/ufTe/t/td/8+48iuQMfiu0sgTd8lHJO5o45QByQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "@sidvind/better-ajv-errors": "^0.6.9", + "acorn-walk": "^7.0.0", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "deepmerge": "^4.0.0", + "eslint": "^7.0.0", + "espree": "^7.0.0", + "glob": "^7.1.3", + "inquirer": "^7.0.0", + "json-merge-patch": "^1.0.0", + "minimist": "^1.2.0" + }, + "bin": { + "html-validate": "bin/html-validate.js" + }, + "engines": { + "node": ">= 8.5" + } + }, + "node_modules/html-validate/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/html-validate/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/html-validate/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/html-validate/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/html-validate/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/html-validate/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "license": "MIT", + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + }, + "engines": { + "node": ">=0.8", + "npm": ">=1.3.7" + } + }, + "node_modules/httpception": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/httpception/-/httpception-3.0.0.tgz", + "integrity": "sha512-0N+aRwgXiU7DOWfpptBK5dWNC8EIw7oDJyC2nzFK4vFjdCJtRTyi+D/r/N68AIaCXbS2NotPGm9o9hCr+kaWjw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "unexpected": "^11.0.0", + "unexpected-mitm": "^12.0.0" + } + }, + "node_modules/httperrors": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/httperrors/-/httperrors-2.2.0.tgz", + "integrity": "sha512-bjFDd2l8pO7s/1gmxnoWf+qWsqgUdZR3kJcIZ/i8/7tJjvGG3Z2ybjEBSQoaMPGqan+2sT8ChGutRd1TiWrPZQ==", + "dependencies": { + "createerror": "1.2.0" + }, + "engines": { + "node": ">= 0.2.0" + } + }, + "node_modules/httperrors/node_modules/createerror": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/createerror/-/createerror-1.2.0.tgz", + "integrity": "sha512-EVt8Ao9RolJaWCsUOJ3ZGAVqc8SQiDg+JtDFjhuaZ5ep2G1ahdm7Gj/F3zNrqfv5SD8UdLuzHp1nBgMdDh9Y9g==", + "engines": { + "node": ">= 0.2.0" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "BSD-3-Clause" + }, + "node_modules/ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/imageinfo": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/imageinfo/-/imageinfo-1.0.4.tgz", + "integrity": "sha512-BJml4q/QCO2187F4UcO/b6hTYIhbq4nnd1XNs65jyCED9em4m6XmeGWDxjewjfJoC7VJABhOdmqb64KA24rLZw==", + "engines": { + "node": ">=0.4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, + "node_modules/inquirer": { + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", + "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.19", + "mute-stream": "0.0.8", + "run-async": "^2.4.0", + "rxjs": "^6.6.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/inquirer/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/inquirer/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/inquirer/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/inquirer/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/inquirer/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/inquirer/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/internal-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", + "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "hasown": "^2.0.2", + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-arguments": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz", + "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-array-buffer": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", + "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "license": "MIT" + }, + "node_modules/is-async-function": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz", + "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==", + "license": "MIT", + "dependencies": { + "async-function": "^1.0.0", + "call-bound": "^1.0.3", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz", + "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==", + "license": "MIT", + "dependencies": { + "has-bigints": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-boolean-object": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz", + "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-data-view": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz", + "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz", + "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-finalizationregistry": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz", + "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-finite": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", + "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-generator-function": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz", + "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-proto": "^1.0.0", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-number-object": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz", + "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-object": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz", + "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", + "license": "MIT" + }, + "node_modules/is-regex": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", + "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-regexp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", + "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-set": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz", + "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-string": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz", + "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz", + "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "has-symbols": "^1.1.0", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", + "license": "MIT", + "dependencies": { + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakref": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz", + "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz", + "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "license": "MIT" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/iso-639-1": { + "version": "2.1.15", + "resolved": "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.15.tgz", + "integrity": "sha512-7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0" + } + }, + "node_modules/isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==", + "dev": true, + "license": "MIT" + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-hook": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", + "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "append-transform": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", + "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@babel/core": "^7.7.5", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-processinfo": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz", + "integrity": "sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==", + "dev": true, + "license": "ISC", + "dependencies": { + "archy": "^1.0.0", + "cross-spawn": "^7.0.3", + "istanbul-lib-coverage": "^3.2.0", + "p-map": "^3.0.0", + "rimraf": "^3.0.0", + "uuid": "^8.3.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report/node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/istanbul-lib-report/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-reports": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", + "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==", + "dev": true, + "license": "MIT" + }, + "node_modules/jsdom": { + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", + "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", + "license": "MIT", + "dependencies": { + "abab": "^2.0.5", + "acorn": "^8.2.4", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.5.0", + "ws": "^7.4.6", + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jsdom/node_modules/data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "license": "MIT", + "dependencies": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jsdom/node_modules/tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "license": "MIT", + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jsdom/node_modules/whatwg-url": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", + "license": "MIT", + "dependencies": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jsesc": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", + "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", + "dev": true, + "license": "MIT", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-merge-patch": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-merge-patch/-/json-merge-patch-1.0.2.tgz", + "integrity": "sha512-M6Vp2GN9L7cfuMXiWOmHj9bEFbeC250iVtcKQbqVgEsDVYnIsrNsbU+h/Y/PkbBQCtEa4Bez+Ebv0zfbC8ObLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.3" + } + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "license": "MIT" + }, + "node_modules/json-schema": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", + "dev": true, + "license": "(AFL-2.1 OR BSD-3-Clause)" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", + "dev": true, + "license": "ISC" + }, + "node_modules/json-to-ast": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/json-to-ast/-/json-to-ast-2.1.0.tgz", + "integrity": "sha512-W9Lq347r8tA1DfMvAGn9QNcgYm4Wm7Yc+k8e6vezpMnRT+NHbtlxgNBXRVjXe9YM6eTn6+p/MKOlV/aABJcSnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "code-error-fragment": "0.0.230", + "grapheme-splitter": "^1.0.4" + }, + "engines": { + "node": ">= 4" + } + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "license": "MIT", + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/jsonpointer": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.1.0.tgz", + "integrity": "sha512-CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/jsprim": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", + "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", + "dev": true, + "license": "MIT", + "dependencies": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.4.0", + "verror": "1.10.0" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/just-extend": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz", + "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==", + "dev": true, + "license": "MIT" + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/lcov-parse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz", + "integrity": "sha512-aprLII/vPzuQvYZnDRU78Fns9I2Ag3gi4Ipga/hxnVMCZC8DnR2nI7XBqrPoywGfxqIx/DgarGvDJZAD3YBTgQ==", + "dev": true, + "license": "BSD-3-Clause", + "bin": { + "lcov-parse": "bin/cli.js" + } + }, + "node_modules/leven": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lilconfig": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", + "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "license": "MIT" + }, + "node_modules/load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/load-json-file/node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "dev": true, + "license": "MIT", + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/load-json-file/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "license": "MIT" + }, + "node_modules/lodash._reinterpolate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", + "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==", + "license": "MIT" + }, + "node_modules/lodash.assign": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", + "integrity": "sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==", + "license": "MIT" + }, + "node_modules/lodash.clone": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz", + "integrity": "sha512-GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg==", + "deprecated": "This package is deprecated. Use structuredClone instead.", + "license": "MIT" + }, + "node_modules/lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==", + "license": "MIT" + }, + "node_modules/lodash.flattendeep": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", + "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", + "deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", + "license": "MIT" + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.omit": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", + "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==", + "deprecated": "This package is deprecated. Use destructuring assignment syntax instead.", + "license": "MIT" + }, + "node_modules/lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==", + "license": "MIT" + }, + "node_modules/lodash.template": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz", + "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==", + "deprecated": "This package is deprecated. Use https://socket.dev/npm/package/eta instead.", + "license": "MIT", + "dependencies": { + "lodash._reinterpolate": "^3.0.0", + "lodash.templatesettings": "^4.0.0" + } + }, + "node_modules/lodash.templatesettings": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz", + "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==", + "license": "MIT", + "dependencies": { + "lodash._reinterpolate": "^3.0.0" + } + }, + "node_modules/lodash.truncate": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", + "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.uniq": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", + "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==", + "license": "MIT" + }, + "node_modules/log-driver": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", + "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=0.8.6" + } + }, + "node_modules/log-symbols": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz", + "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/log-symbols/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/log-symbols/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/log-symbols/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/log-symbols/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/log-symbols/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/log-symbols/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/lower-case": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", + "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==", + "license": "MIT" + }, + "node_modules/lru-cache": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz", + "integrity": "sha512-EjtmtXFUu+wXm6PW3T6RT1ekQUxobC7B5TDCU0CS0212wzpwKiXs6vLun+JI+OoWmmliWdYqnrpjrlK7W3ELdQ==", + "license": "MIT" + }, + "node_modules/magicpen": { + "version": "6.2.4", + "resolved": "https://registry.npmjs.org/magicpen/-/magicpen-6.2.4.tgz", + "integrity": "sha512-rT4JcgakSrmR9/qPY/EsDSvKH4+nQuFfSQ34Djnj0Zx9jJ+c3REOz+K3CITvRZcmAcCFM6jJO7wSiHlMEXYy3A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "2.0.0", + "color-diff": "0.1.7" + } + }, + "node_modules/magicpen-media": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/magicpen-media/-/magicpen-media-1.5.2.tgz", + "integrity": "sha512-CVg14B+MVvFUJI+Ce6XITyO6NI39oxn0EYfaZOMWC40T7jTwvMuvdHLA0o9uPdXfyUKaPjSbejxvbVSTFqMupQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "gettemporaryfilepath": "^1.0.0", + "lodash": "^4.17.11", + "mime": "^2.3.1" + } + }, + "node_modules/magicpen-prism": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/magicpen-prism/-/magicpen-prism-3.0.2.tgz", + "integrity": "sha512-qlKWjCDmmE4CjP99burmKe7r7TS3CBehY6c7W5fsppLAFI5PSKdSRiZpG3hrqxjX3yL1WbfoJjYsVCb8DTnh0A==", + "dev": true, + "dependencies": { + "prismjs": "^1.15.0" + } + }, + "node_modules/magicpen/node_modules/ansi-styles": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.0.tgz", + "integrity": "sha512-0kjBHdIQSa1iuh2rs8Md1GQNHAKrefcRSp2W5OKQU1oBZgCSqQ5aG4o+r69irBlhIPwA8wUaPdN/FWZVIHW7rA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/map-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz", + "integrity": "sha512-TzQSV2DiMYgoF5RycneKVUzIa9bQsj/B3tTgsE3dOGqlzHnGIDaC7XBE7grnA+8kZPnfqSGFe95VHc2oc0VFUQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/markdown-escape": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/markdown-escape/-/markdown-escape-1.1.0.tgz", + "integrity": "sha512-f1+ARFbzLrBdC0Lj30uREn+zthrK/h1PO5UhN5IMDQvI2lSFn+8U06a5LHaxxYMhHD0mJoJ2BROJ/Sju5aw6+g==", + "dev": true, + "license": "MIT" + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/mdn-data": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", + "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", + "license": "CC0-1.0" + }, + "node_modules/mdn-data-papandreou": { + "version": "2.0.10-patch1", + "resolved": "https://registry.npmjs.org/mdn-data-papandreou/-/mdn-data-papandreou-2.0.10-patch1.tgz", + "integrity": "sha512-B9xv4Lz0xcsxLxNCq2sTjwM263UgdvhWJNtqWnbE6SDiMNDREJowAKWEP9p48Ew1wIcESQJ+JB2Po6Ru4GH6ig==", + "dev": true, + "license": "CC0-1.0" + }, + "node_modules/memoizesync": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/memoizesync/-/memoizesync-1.1.1.tgz", + "integrity": "sha512-EEVBhL1Nnjbaauc4iUvPKZtQmV3NzSQJmjbzPswG1ZMGP/pVb+GdVzHOx5a+s+71qCDn8tbhKOxkyVVBC6cvmQ==", + "license": "BSD", + "dependencies": { + "lru-cache": "=2.3.1" + } + }, + "node_modules/meow": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz", + "integrity": "sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==", + "dev": true, + "license": "MIT", + "dependencies": { + "camelcase-keys": "^4.0.0", + "decamelize-keys": "^1.0.0", + "loud-rejection": "^1.0.0", + "minimist-options": "^3.0.1", + "normalize-package-data": "^2.3.4", + "read-pkg-up": "^3.0.0", + "redent": "^2.0.0", + "trim-newlines": "^2.0.0", + "yargs-parser": "^10.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/meow/node_modules/camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "dev": true, + "license": "MIT", + "dependencies": { + "pify": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/read-pkg": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/read-pkg-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", + "integrity": "sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^2.0.0", + "read-pkg": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/meow/node_modules/yargs-parser": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz", + "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "camelcase": "^4.1.0" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/messy": { + "version": "6.17.0", + "resolved": "https://registry.npmjs.org/messy/-/messy-6.17.0.tgz", + "integrity": "sha512-Cvnu5cZLitkuzuL+0v6FC04CPPC8scad7gcNf/OoBsGwc5cUyA3rT6+o0ozTX++ZL4dtdoAgzbyG4jGjq71n5g==", + "dev": true, + "license": "BSD", + "dependencies": { + "iconv-lite": "^0.4.13", + "quoted-printable": "1.0.0", + "rfc2047": "2.0.0", + "rfc2231": "1.3.0", + "underscore": "^1.6.0" + } + }, + "node_modules/mime": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", + "dev": true, + "license": "MIT", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minimist-options": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz", + "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0" + }, + "engines": { + "node": ">= 4" + } + }, + "node_modules/mitm-papandreou": { + "version": "1.7.0-patch1", + "resolved": "https://registry.npmjs.org/mitm-papandreou/-/mitm-papandreou-1.7.0-patch1.tgz", + "integrity": "sha512-ERzvAy0N/MXyy2206C3yM0prXgn527ZYNhY5o6qgOCHhiS+2GQPOipjvTABRbiXXcv7Y4SNu0rB+i/P1h3RTZQ==", + "dev": true, + "dependencies": { + "semver": ">= 5 < 6", + "underscore": ">= 1.1.6 < 1.6" + }, + "engines": { + "node": ">= 0.10.24" + } + }, + "node_modules/mitm-papandreou/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/mitm-papandreou/node_modules/underscore": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz", + "integrity": "sha512-yejOFsRnTJs0N9CK5Apzf6maDO2djxGoLLrlZlvGs2o9ZQuhIhDL18rtFyy4FBIbOkzA6+4hDgXbgz5EvDQCXQ==", + "dev": true + }, + "node_modules/mitt": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz", + "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==", + "license": "MIT" + }, + "node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "license": "MIT", + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "license": "MIT" + }, + "node_modules/mocha": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz", + "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ungap/promise-all-settled": "1.1.2", + "ansi-colors": "4.1.1", + "browser-stdout": "1.3.1", + "chokidar": "3.5.1", + "debug": "4.3.1", + "diff": "5.0.0", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", + "glob": "7.1.6", + "growl": "1.10.5", + "he": "1.2.0", + "js-yaml": "4.0.0", + "log-symbols": "4.0.0", + "minimatch": "3.0.4", + "ms": "2.1.3", + "nanoid": "3.1.20", + "serialize-javascript": "5.0.1", + "strip-json-comments": "3.1.1", + "supports-color": "8.1.1", + "which": "2.0.2", + "wide-align": "1.1.3", + "workerpool": "6.1.0", + "yargs": "16.2.0", + "yargs-parser": "20.2.4", + "yargs-unparser": "2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha" + }, + "engines": { + "node": ">= 10.12.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mochajs" + } + }, + "node_modules/mocha/node_modules/ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/mocha/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/mocha/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/mocha/node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/mocha/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/mocha/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/mocha/node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/mocha/node_modules/debug/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/mocha/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mocha/node_modules/glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/mocha/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/mocha/node_modules/js-yaml": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz", + "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/mocha/node_modules/minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/mocha/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/mocha/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/mocha/node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/mocha/node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/module-not-found-error": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz", + "integrity": "sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g==", + "dev": true, + "license": "MIT" + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true, + "license": "ISC" + }, + "node_modules/nanoid": { + "version": "3.1.20", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz", + "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==", + "dev": true, + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/next-tick": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", + "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/nice-try": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/nise": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/nise/-/nise-4.1.0.tgz", + "integrity": "sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^1.7.0", + "@sinonjs/fake-timers": "^6.0.0", + "@sinonjs/text-encoding": "^0.7.1", + "just-extend": "^4.0.2", + "path-to-regexp": "^1.7.0" + } + }, + "node_modules/no-case": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", + "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "license": "MIT", + "dependencies": { + "lower-case": "^1.1.1" + } + }, + "node_modules/node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "license": "MIT", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/node-fetch/node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "license": "MIT" + }, + "node_modules/node-fetch/node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "license": "BSD-2-Clause" + }, + "node_modules/node-fetch/node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, + "node_modules/node-preload": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", + "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "process-on-spawn": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/node-releases": { + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", + "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", + "license": "MIT" + }, + "node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/normalize-package-data/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/normalize-url": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", + "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/normalizeurl": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/normalizeurl/-/normalizeurl-1.0.0.tgz", + "integrity": "sha512-GyndB0rq1FmO49Vwy88c3jzp5G3OnjEbwVlm+vst+P5ANKQVtm+2682qgRptcZeZvU1I2E5RgCeZirqLuUQQEw==", + "license": "BSD" + }, + "node_modules/nth-check": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0" + }, + "funding": { + "url": "https://github.com/fb55/nth-check?sponsor=1" + } + }, + "node_modules/nwsapi": { + "version": "2.2.18", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.18.tgz", + "integrity": "sha512-p1TRH/edngVEHVbwqWnxUViEmq5znDvyB+Sik5cmuLpGOIfDf/39zLiq3swPF8Vakqn+gvNiOQAZu8djYlQILA==", + "license": "MIT" + }, + "node_modules/nyc": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", + "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==", + "dev": true, + "license": "ISC", + "dependencies": { + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "caching-transform": "^4.0.0", + "convert-source-map": "^1.7.0", + "decamelize": "^1.2.0", + "find-cache-dir": "^3.2.0", + "find-up": "^4.1.0", + "foreground-child": "^2.0.0", + "get-package-type": "^0.1.0", + "glob": "^7.1.6", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-hook": "^3.0.0", + "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-processinfo": "^2.0.2", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.2", + "make-dir": "^3.0.0", + "node-preload": "^0.2.1", + "p-map": "^3.0.0", + "process-on-spawn": "^1.0.0", + "resolve-from": "^5.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "spawn-wrap": "^2.0.0", + "test-exclude": "^6.0.0", + "yargs": "^15.0.2" + }, + "bin": { + "nyc": "bin/nyc.js" + }, + "engines": { + "node": ">=8.9" + } + }, + "node_modules/nyc/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nyc/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "*" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-is": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz", + "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", + "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0", + "has-symbols": "^1.1.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.fromentries": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", + "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.values": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz", + "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/offline-github-changelog": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/offline-github-changelog/-/offline-github-changelog-1.7.0.tgz", + "integrity": "sha512-XSPCt/I6AHBbvGQITFmjxIe6JdbCneKg8MFvU9xhgvF7oKFwa5YxyhbXNqPYOqWc6QNEgb2AvFGQXjxvtA8c/Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "markdown-escape": "^1.0.2", + "meow": "^5.0.0" + }, + "bin": { + "offline-github-changelog": "bin/offline-github-changelog" + }, + "engines": { + "node": ">=6.9.1" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/own-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", + "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==", + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.2.6", + "object-keys": "^1.1.1", + "safe-push-apply": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", + "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/package-hash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz", + "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "graceful-fs": "^4.1.15", + "hasha": "^5.0.0", + "lodash.flattendeep": "^4.4.0", + "release-zalgo": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "license": "(MIT AND Zlib)" + }, + "node_modules/param-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", + "integrity": "sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==", + "license": "MIT", + "dependencies": { + "no-case": "^2.2.0" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", + "license": "MIT" + }, + "node_modules/passerror": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/passerror/-/passerror-1.1.1.tgz", + "integrity": "sha512-PwrEQJBkJMxnxG+tdraz95vTstYnCRqiURNbGtg/vZHLgcAODc9hbiD5ZumGUoh3bpw0F0qKLje7Vd2Fd5Lx3g==", + "license": "BSD-3-Clause", + "engines": { + "node": "*" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "license": "MIT" + }, + "node_modules/path-to-regexp": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz", + "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==", + "dev": true, + "license": "MIT", + "dependencies": { + "isarray": "0.0.1" + } + }, + "node_modules/path-to-regexp/node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/pegjs": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz", + "integrity": "sha512-qI5+oFNEGi3L5HAxDwN2LA4Gg7irF70Zs25edhjld9QemOgp0CbvMtbFcMvFtEo1OityPrcCzkQFB8JP/hxgow==", + "dev": true, + "license": "MIT", + "bin": { + "pegjs": "bin/pegjs" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", + "license": "MIT" + }, + "node_modules/perfectionist-dfd": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/perfectionist-dfd/-/perfectionist-dfd-3.0.3.tgz", + "integrity": "sha512-ImEojwhikE2ltOMSKrLNHx4a+tkL+4CUPenvzTyU6m5KvJpPaiSVR8Bsqutw2beV2CD0dEzKwenNoxUCAVNJbg==", + "license": "MIT", + "dependencies": { + "defined": "^1.0.0", + "minimist": "^1.2.6", + "postcss-scss": "^4.0.3", + "postcss-value-parser": "^4.2.0", + "read-file-stdin": "^0.2.1", + "semver": "^7.5.4", + "string.prototype.repeat": "^1.0.0", + "write-file-stdout": "^0.0.2" + }, + "bin": { + "perfectionist-dfd": "bin/cmd.js" + }, + "peerDependencies": { + "postcss": "^8.4.12" + } + }, + "node_modules/perfectionist-dfd/node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==", + "dev": true, + "license": "MIT" + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-up": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", + "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-up/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-up/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-up/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-up/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-up/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/possible-typed-array-names": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", + "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/postcss": { + "version": "8.5.3", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz", + "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "nanoid": "^3.3.8", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/postcss-calc": { + "version": "8.2.4", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz", + "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==", + "license": "MIT", + "dependencies": { + "postcss-selector-parser": "^6.0.9", + "postcss-value-parser": "^4.2.0" + }, + "peerDependencies": { + "postcss": "^8.2.2" + } + }, + "node_modules/postcss-colormin": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz", + "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==", + "license": "MIT", + "dependencies": { + "browserslist": "^4.21.4", + "caniuse-api": "^3.0.0", + "colord": "^2.9.1", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-convert-values": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz", + "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==", + "license": "MIT", + "dependencies": { + "browserslist": "^4.21.4", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-discard-comments": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz", + "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==", + "license": "MIT", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-discard-duplicates": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", + "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", + "license": "MIT", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-discard-empty": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz", + "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==", + "license": "MIT", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-discard-overridden": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz", + "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==", + "license": "MIT", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-merge-longhand": { + "version": "5.1.7", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz", + "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0", + "stylehacks": "^5.1.1" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-merge-rules": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz", + "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==", + "license": "MIT", + "dependencies": { + "browserslist": "^4.21.4", + "caniuse-api": "^3.0.0", + "cssnano-utils": "^3.1.0", + "postcss-selector-parser": "^6.0.5" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-minify-font-values": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz", + "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-minify-gradients": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz", + "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==", + "license": "MIT", + "dependencies": { + "colord": "^2.9.1", + "cssnano-utils": "^3.1.0", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-minify-params": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz", + "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==", + "license": "MIT", + "dependencies": { + "browserslist": "^4.21.4", + "cssnano-utils": "^3.1.0", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-minify-selectors": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz", + "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==", + "license": "MIT", + "dependencies": { + "postcss-selector-parser": "^6.0.5" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-charset": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz", + "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==", + "license": "MIT", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-display-values": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz", + "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-positions": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz", + "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-repeat-style": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz", + "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-string": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz", + "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-timing-functions": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz", + "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-unicode": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz", + "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==", + "license": "MIT", + "dependencies": { + "browserslist": "^4.21.4", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-url": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz", + "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==", + "license": "MIT", + "dependencies": { + "normalize-url": "^6.0.1", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-whitespace": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz", + "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-ordered-values": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz", + "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==", + "license": "MIT", + "dependencies": { + "cssnano-utils": "^3.1.0", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-reduce-initial": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz", + "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==", + "license": "MIT", + "dependencies": { + "browserslist": "^4.21.4", + "caniuse-api": "^3.0.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-reduce-transforms": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz", + "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-scss": { + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz", + "integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss-scss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "engines": { + "node": ">=12.0" + }, + "peerDependencies": { + "postcss": "^8.4.29" + } + }, + "node_modules/postcss-selector-parser": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", + "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", + "license": "MIT", + "dependencies": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/postcss-svgo": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz", + "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.2.0", + "svgo": "^2.7.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-unique-selectors": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz", + "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==", + "license": "MIT", + "dependencies": { + "postcss-selector-parser": "^6.0.5" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-value-parser": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", + "license": "MIT" + }, + "node_modules/postcss/node_modules/nanoid": { + "version": "3.3.10", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.10.tgz", + "integrity": "sha512-vSJJTG+t/dIKAUhUDw/dLdZ9s//5OxcHqLaDWWrW4Cdq7o6tdLIczUkMXt2MBNmk6sJRZBZRXVixs7URY1CmIg==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prettier": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", + "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", + "dev": true, + "license": "MIT", + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/pretty-bytes": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", + "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/prismjs": { + "version": "1.30.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.30.0.tgz", + "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/process-on-spawn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.1.0.tgz", + "integrity": "sha512-JOnOPQ/8TZgjs1JIH/m9ni7FfimjNa/PRx7y/Wb5qdItsnhO0jE4AT7fC0HjC28DUQWDr50dwSYZLdRMlqDq3Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "fromentries": "^1.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, + "node_modules/proxyquire": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz", + "integrity": "sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-keys": "^1.0.2", + "module-not-found-error": "^1.0.1", + "resolve": "^1.11.1" + } + }, + "node_modules/psl": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz", + "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==", + "license": "MIT", + "dependencies": { + "punycode": "^2.3.1" + }, + "funding": { + "url": "https://github.com/sponsors/lupomontero" + } + }, + "node_modules/pump": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", + "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", + "license": "MIT", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/puppeteer": { + "version": "19.11.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-19.11.1.tgz", + "integrity": "sha512-39olGaX2djYUdhaQQHDZ0T0GwEp+5f9UB9HmEP0qHfdQHIq0xGQZuAZ5TLnJIc/88SrPLpEflPC+xUqOTv3c5g==", + "deprecated": "< 22.8.2 is no longer supported", + "dev": true, + "hasInstallScript": true, + "license": "Apache-2.0", + "dependencies": { + "@puppeteer/browsers": "0.5.0", + "cosmiconfig": "8.1.3", + "https-proxy-agent": "5.0.1", + "progress": "2.0.3", + "proxy-from-env": "1.1.0", + "puppeteer-core": "19.11.1" + } + }, + "node_modules/puppeteer-core": { + "version": "19.11.1", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.11.1.tgz", + "integrity": "sha512-qcuC2Uf0Fwdj9wNtaTZ2OvYRraXpAK+puwwVW8ofOhOgLPZyz1c68tsorfIZyCUOpyBisjr+xByu7BMbEYMepA==", + "license": "Apache-2.0", + "dependencies": { + "@puppeteer/browsers": "0.5.0", + "chromium-bidi": "0.4.7", + "cross-fetch": "3.1.5", + "debug": "4.3.4", + "devtools-protocol": "0.0.1107588", + "extract-zip": "2.0.1", + "https-proxy-agent": "5.0.1", + "proxy-from-env": "1.1.0", + "tar-fs": "2.1.1", + "unbzip2-stream": "1.4.3", + "ws": "8.13.0" + }, + "engines": { + "node": ">=14.14.0" + }, + "peerDependencies": { + "typescript": ">= 4.7.4" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/puppeteer-core/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/puppeteer-core/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "license": "MIT" + }, + "node_modules/puppeteer-core/node_modules/ws": { + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", + "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "license": "MIT", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/qs": { + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", + "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", + "license": "MIT" + }, + "node_modules/quick-lru": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz", + "integrity": "sha512-tRS7sTgyxMXtLum8L65daJnHUhfDUgboRdcWW2bR9vBfrj2+O5HSMbQOJfJJjIVSPFqbBCF37FpwWXGitDc5tA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/quoted-printable": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/quoted-printable/-/quoted-printable-1.0.0.tgz", + "integrity": "sha512-PDpa4cdrc9UfGW8UlMeaQYmY+b+dGdCjf+3rhSpv6X5U60XQ+rHgS0kMGdDriGs+TotUakgQjoPImkgTBRw9+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "utf8": "^2.0.0" + }, + "bin": { + "quoted-printable": "bin/quoted-printable" + } + }, + "node_modules/ramda": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.2.tgz", + "integrity": "sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA==", + "dev": true, + "license": "MIT" + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/read-file-stdin": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/read-file-stdin/-/read-file-stdin-0.2.1.tgz", + "integrity": "sha512-dAqysQ4kfj9m5aejZOPr+aRGXZJXdLkMOLZ3BXMwMBQHiO+aylGBFJPh88AYPQrOf+D43F4Uc2oUIW9kBlItLA==", + "license": "MIT", + "dependencies": { + "gather-stream": "^1.0.0" + } + }, + "node_modules/read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "license": "MIT", + "dependencies": { + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-6.0.0.tgz", + "integrity": "sha512-odtTvLl+EXo1eTsMnoUHRmg/XmXdTkwXVxy4VFE9Kp6cCq7b3l7QMdBndND3eAFzrbSAXC/WCUOQQ9rLjifKZw==", + "license": "MIT", + "dependencies": { + "find-up": "^4.0.0", + "read-pkg": "^5.1.1", + "type-fest": "^0.5.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg-up/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/type-fest": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz", + "integrity": "sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=6" + } + }, + "node_modules/read-pkg/node_modules/type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/readdirp": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/redent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz", + "integrity": "sha512-XNwrTx77JQCEMXTeb8movBKuK75MgH0RZkujNuDKCezemx/voapl9i2gCSi8WWm8+ox5ycJi1gxF22fR7c0Ciw==", + "dev": true, + "license": "MIT", + "dependencies": { + "indent-string": "^3.0.0", + "strip-indent": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/redent/node_modules/indent-string": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", + "integrity": "sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/reduce-css-calc": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz", + "integrity": "sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==", + "license": "MIT", + "dependencies": { + "css-unit-converter": "^1.1.1", + "postcss-value-parser": "^3.3.0" + } + }, + "node_modules/reduce-css-calc/node_modules/postcss-value-parser": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", + "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", + "license": "MIT" + }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz", + "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.1", + "which-builtin-type": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regenerator-runtime": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", + "license": "MIT" + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz", + "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "set-function-name": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/relateurl": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", + "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/release-zalgo": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", + "integrity": "sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==", + "dev": true, + "license": "ISC", + "dependencies": { + "es6-error": "^4.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", + "license": "MIT", + "engines": { + "node": ">=0.10" + } + }, + "node_modules/repeating": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz", + "integrity": "sha512-Nh30JLeMHdoI+AsQ5eblhZ7YlTsM9wiJQe/AHIunlK3KWzvXhXb36IJ7K1IOeRjIOtzMjdUHjwXUFxKJoPTSOg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-finite": "^1.0.0" + }, + "bin": { + "repeating": "cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/request/node_modules/form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/request/node_modules/qs": { + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", + "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/request/node_modules/tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/request/node_modules/uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "dev": true, + "license": "MIT", + "bin": { + "uuid": "bin/uuid" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "license": "ISC" + }, + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "license": "MIT" + }, + "node_modules/resemblejs": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/resemblejs/-/resemblejs-4.1.0.tgz", + "integrity": "sha512-s9/+nQ7bnT+C7XBdnMCcC/QppvJcTmJ7fXZMtuTZMFJycN2kj/tacleyx9O1mURPDYNZsgKMfcamImM9+X+keQ==", + "dev": true, + "license": "MIT", + "optionalDependencies": { + "canvas": "2.9.0" + } + }, + "node_modules/resolve": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/rfc2047": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/rfc2047/-/rfc2047-2.0.0.tgz", + "integrity": "sha512-IAZLLZ7ucMF8eRWOxQ3N5TqnwdxiOApvNt56rtxF1tBHTM+M5yxvNfflfOERgTSKROIgL/AzUuHwCpi/zqSGLw==", + "dev": true, + "license": "BSD", + "dependencies": { + "iconv-lite": "0.4.5" + } + }, + "node_modules/rfc2047/node_modules/iconv-lite": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.5.tgz", + "integrity": "sha512-LQ4GtDkFagYaac8u4rE73zWu7h0OUUmR0qVBOgzLyFSoJhoDG2xV9PZJWWyVVcYha/9/RZzQHUinFMbNKiOoAA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/rfc2231": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/rfc2231/-/rfc2231-1.3.0.tgz", + "integrity": "sha512-MuyZ6PPPKPmA9ifNmg7Jf/2jtyuSHC1Zwry26qMTz3pzbEDo+mvjCvot8b7BxWVZ3nCfWfeP8SHvGCO/bmbxTg==", + "dev": true, + "license": "BSD", + "dependencies": { + "iconv-lite": "0.4.5" + } + }, + "node_modules/rfc2231/node_modules/iconv-lite": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.5.tgz", + "integrity": "sha512-LQ4GtDkFagYaac8u4rE73zWu7h0OUUmR0qVBOgzLyFSoJhoDG2xV9PZJWWyVVcYha/9/RZzQHUinFMbNKiOoAA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "devOptional": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/run-async": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/safe-array-concat": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz", + "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "has-symbols": "^1.1.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/safe-push-apply": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", + "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-regex-test": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", + "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-regex": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, + "node_modules/saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "license": "ISC", + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/schemes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/schemes/-/schemes-1.4.0.tgz", + "integrity": "sha512-ImFy9FbCsQlVgnE3TCWmLPCFnVzx0lHL/l+umHplDqAKd0dzFpnS6lFZIpagBlYhKwzVmlV36ec0Y1XTu8JBAQ==", + "license": "MIT", + "dependencies": { + "extend": "^3.0.0" + } + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/serialize-javascript": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", + "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "license": "ISC" + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-proto": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz", + "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/sift": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/sift/-/sift-7.0.1.tgz", + "integrity": "sha512-oqD7PMJ+uO6jV9EQCl0LrRw1OwsiPsiFQR5AR30heR+4Dl7jBBbDLnNvWiak20tzZlSE1H7RB30SX/1j/YYT7g==", + "license": "MIT" + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "devOptional": true, + "license": "ISC" + }, + "node_modules/sinon": { + "version": "9.2.4", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz", + "integrity": "sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg==", + "deprecated": "16.1.1", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sinonjs/commons": "^1.8.1", + "@sinonjs/fake-timers": "^6.0.1", + "@sinonjs/samsam": "^5.3.1", + "diff": "^4.0.2", + "nise": "^4.0.4", + "supports-color": "^7.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/sinon" + } + }, + "node_modules/sinon/node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/sinon/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/sinon/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/slice-ansi/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/slice-ansi/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/slice-ansi/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/socketerrors": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/socketerrors/-/socketerrors-0.3.0.tgz", + "integrity": "sha512-N7VMAO/pIeDP5IqKcbzy5+ywWwZPnT7/fUjg6faKFxB9tVBo/J5xhIJKHJld0RWx1shlKrEy8fsoRm2Xt0GGGQ==", + "license": "BSD", + "dependencies": { + "createerror": "1.1.0", + "httperrors": "2.0.1" + } + }, + "node_modules/socketerrors/node_modules/createerror": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/createerror/-/createerror-1.1.0.tgz", + "integrity": "sha512-7zzU0CDuRVge0otam9eejW1m6qqKcSzBgR9lwoypaW7JU4bvsHhRzJlgmJfXGjKLrpjI6R7pY5DYc9b0w3DESw==", + "engines": { + "node": ">= 0.2.0" + } + }, + "node_modules/socketerrors/node_modules/httperrors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/httperrors/-/httperrors-2.0.1.tgz", + "integrity": "sha512-kZRKMAMirSxgKON0qIFXrcXbfFf8TMeP7zwzJd/RS7wQHZja07c1BQmkdjaO1OCef5qrbrYdiuhrdRhkgFClKg==", + "dependencies": { + "createerror": "1.1.0" + }, + "engines": { + "node": ">= 0.2.0" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/spawn-wrap": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz", + "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^2.0.0", + "is-windows": "^1.0.2", + "make-dir": "^3.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "which": "^2.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/spdx-correct": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", + "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", + "license": "Apache-2.0", + "dependencies": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-exceptions": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", + "license": "CC-BY-3.0" + }, + "node_modules/spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "license": "MIT", + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.21", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz", + "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==", + "license": "CC0-1.0" + }, + "node_modules/specificity": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz", + "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==", + "license": "MIT", + "bin": { + "specificity": "bin/specificity" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/sshpk": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz", + "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + }, + "bin": { + "sshpk-conv": "bin/sshpk-conv", + "sshpk-sign": "bin/sshpk-sign", + "sshpk-verify": "bin/sshpk-verify" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/stable": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", + "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", + "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility", + "license": "MIT" + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string.prototype.repeat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz", + "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==", + "license": "MIT", + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz", + "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-data-property": "^1.1.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-object-atoms": "^1.0.0", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz", + "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/stringify-object": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz", + "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==", + "license": "BSD-2-Clause", + "dependencies": { + "get-own-enumerable-property-symbols": "^3.0.0", + "is-obj": "^1.0.1", + "is-regexp": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-comments": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-1.0.2.tgz", + "integrity": "sha512-kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw==", + "license": "MIT", + "dependencies": { + "babel-extract-comments": "^1.0.0", + "babel-plugin-transform-object-rest-spread": "^6.26.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-indent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz", + "integrity": "sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/stylehacks": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz", + "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==", + "license": "MIT", + "dependencies": { + "browserslist": "^4.21.4", + "postcss-selector-parser": "^6.0.4" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/subset-font": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/subset-font/-/subset-font-2.4.0.tgz", + "integrity": "sha512-DA/45nIj4NiseVdfHxVdVGL7hvNo3Ol6HjEm3KSYtPyDcsr6jh8Q37vSgz+A722wMfUd6nL8kgsi7uGv9DExXQ==", + "license": "BSD-3-Clause", + "dependencies": { + "fontverter": "^2.0.0", + "harfbuzzjs": "^0.4.0", + "lodash": "^4.17.21", + "p-limit": "^3.1.0" + } + }, + "node_modules/subset-font/node_modules/harfbuzzjs": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/harfbuzzjs/-/harfbuzzjs-0.4.5.tgz", + "integrity": "sha512-dDMkI7mWWcYTJtyUZmS6A6SfzITEjJyxaFQCup8wGlli9eaWTEjoS/gDUGnv6PQlXExOXWhWY1Hq/h3J03Tfow==", + "license": "MIT" + }, + "node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/svgo": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz", + "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==", + "license": "MIT", + "dependencies": { + "@trysound/sax": "0.2.0", + "commander": "^7.2.0", + "css-select": "^4.1.3", + "css-tree": "^1.1.3", + "csso": "^4.2.0", + "picocolors": "^1.0.0", + "stable": "^0.1.8" + }, + "bin": { + "svgo": "bin/svgo" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/svgo/node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "license": "MIT" + }, + "node_modules/table": { + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/table/-/table-6.9.0.tgz", + "integrity": "sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "ajv": "^8.0.1", + "lodash.truncate": "^4.4.2", + "slice-ansi": "^4.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/table/node_modules/ajv": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/table/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true, + "license": "MIT" + }, + "node_modules/tar-fs": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", + "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "license": "MIT", + "dependencies": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" + } + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "license": "MIT", + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/teepee": { + "version": "2.31.2", + "resolved": "https://registry.npmjs.org/teepee/-/teepee-2.31.2.tgz", + "integrity": "sha512-Er4CNK1mccfc2uvN+QkJcAU+4j6QtMA9cHrdnxF9Y8VzuTKMRnnHyVrmxfyLLCK23SyPAYkWBe7EBjmwC7sRNQ==", + "license": "BSD-3-Clause", + "dependencies": { + "bluebird": "2.9.34", + "createerror": "1.2.0", + "dnserrors": "2.1.2", + "form-data": "2.1.4", + "httperrors": "2.2.0", + "is-stream": "1.1.0", + "lodash.assign": "^4.2.0", + "lodash.clone": "^4.5.0", + "lodash.defaults": "^4.2.0", + "lodash.omit": "^4.5.0", + "lodash.uniq": "^4.5.0", + "passerror": "1.1.1", + "socketerrors": "^0.3.0" + } + }, + "node_modules/teepee/node_modules/bluebird": { + "version": "2.9.34", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz", + "integrity": "sha512-ZDzCb87X7/IP1uzQ5eJZB+WoQRGTnKL5DHWvPw6kkMbQseouiQIrEi3P1UGE0D1k0N5/+aP/5GMCyHZ1xYJyHQ==", + "license": "MIT" + }, + "node_modules/teepee/node_modules/createerror": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/createerror/-/createerror-1.2.0.tgz", + "integrity": "sha512-EVt8Ao9RolJaWCsUOJ3ZGAVqc8SQiDg+JtDFjhuaZ5ep2G1ahdm7Gj/F3zNrqfv5SD8UdLuzHp1nBgMdDh9Y9g==", + "engines": { + "node": ">= 0.2.0" + } + }, + "node_modules/teepee/node_modules/form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha512-8HWGSLAPr+AG0hBpsqi5Ob8HrLStN/LWeqhpFl14d7FJgHK48TmgLoALPz69XSUR65YJzDfLUX/BM8+MLJLghQ==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.5", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/teepee/node_modules/is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/terser": { + "version": "5.39.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz", + "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==", + "license": "BSD-2-Clause", + "dependencies": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "license": "ISC", + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, + "license": "MIT" + }, + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "license": "MIT" + }, + "node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tough-cookie": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", + "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==", + "license": "BSD-3-Clause", + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tr46": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", + "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==", + "license": "MIT", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/trim-newlines": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz", + "integrity": "sha512-MTBWv3jhVjTU7XR3IQHllbiJs8sc75a80OEhB6or/q7pLTWgQ0bMGQXXYQSrSuXe6WiKWDZ5txXY5P59a/coVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/tsconfig-paths": { + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/tsconfig-paths/node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/tsconfig-paths/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true, + "license": "0BSD" + }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", + "dev": true, + "license": "Unlicense" + }, + "node_modules/type": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz", + "integrity": "sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typed-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz", + "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", + "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==", + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.15", + "reflect.getprototypeof": "^1.0.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", + "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0", + "reflect.getprototypeof": "^1.0.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-typedarray": "^1.0.0" + } + }, + "node_modules/uglify-js": { + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", + "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", + "license": "BSD-2-Clause", + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/ukkonen": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ukkonen/-/ukkonen-1.4.0.tgz", + "integrity": "sha512-g8SLGxflI0/VNH2C8j66KcfJXrU5StJglRQBYPNiChXFlOrqqYM1icOykOAAUgTeBpktaEuCm9hjpPinQ080PA==", + "dev": true, + "license": "MIT" + }, + "node_modules/unbox-primitive": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", + "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.3", + "has-bigints": "^1.0.2", + "has-symbols": "^1.1.0", + "which-boxed-primitive": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/unbzip2-stream": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", + "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", + "license": "MIT", + "dependencies": { + "buffer": "^5.2.1", + "through": "^2.3.8" + } + }, + "node_modules/underscore": { + "version": "1.13.7", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz", + "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==", + "license": "MIT" + }, + "node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "license": "MIT", + "optional": true + }, + "node_modules/unexpected": { + "version": "11.15.1", + "resolved": "https://registry.npmjs.org/unexpected/-/unexpected-11.15.1.tgz", + "integrity": "sha512-s3XfLMEKRPioyuC5cqOCl2oCgGEg4fLhIuFHcUf0IExkGXTafPlLrkcvWV76woFrXpdxWGShYpDDQXBA3lOUcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-changes": "3.0.1", + "array-changes-async": "3.0.1", + "detect-indent": "3.0.1", + "diff": "4.0.2", + "greedy-interval-packer": "1.2.0", + "magicpen": "^6.2.1", + "ukkonen": "^1.4.0", + "unexpected-bluebird": "2.9.34-longstack2" + } + }, + "node_modules/unexpected-bluebird": { + "version": "2.9.34-longstack2", + "resolved": "https://registry.npmjs.org/unexpected-bluebird/-/unexpected-bluebird-2.9.34-longstack2.tgz", + "integrity": "sha512-lAgr5q+ToN4cO+mCus6h9VLcnl27fCiWiCuDyx7Pcvf9IoFOaTRv0bauvikXRkg9+78c/1nDBbQxP+Wk9+uOCA==", + "dev": true, + "license": "MIT" + }, + "node_modules/unexpected-check": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/unexpected-check/-/unexpected-check-2.4.1.tgz", + "integrity": "sha512-80OaWuyDNr0K+XkAY2gKhfsT0dBsG2qQ1K+EdftiRCnxkMt7XZ6Zran+fi2CZD0q5NuXxkuXoPN29T5wcANbfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "escodegen": "^1.9.0", + "esprima": "^4.0.0", + "estraverse": "^4.2.0", + "ignore": "^5.0.3", + "pkg-up": "^3.0.1" + }, + "peerDependencies": { + "chance-generators": "^3.0.0", + "unexpected": "^10.40.0 || ^11.0.0-4" + } + }, + "node_modules/unexpected-check/node_modules/escodegen": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=4.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/unexpected-check/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/unexpected-check/node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/unexpected-check/node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/unexpected-check/node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/unexpected-check/node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/unexpected-check/node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/unexpected-messy": { + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/unexpected-messy/-/unexpected-messy-8.2.1.tgz", + "integrity": "sha512-tARmVE2m3PyL6x5WNL46C4r7o2jqlVdjt04SJhdxPqJN42FYzWL2gy95bQ2ulCkaiGlWrogZae5yRLvZqEN0jA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "magicpen-media": "^1.5.0", + "messy": "^6.16.0", + "minimist": "^1.2.0", + "qs": "^6.5.1", + "underscore": "^1.8.3" + }, + "peerDependencies": { + "messy": "^6.16.0", + "unexpected": "^10.27.0 || ^11.0.0-3" + } + }, + "node_modules/unexpected-mitm": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/unexpected-mitm/-/unexpected-mitm-12.4.0.tgz", + "integrity": "sha512-PAfwvOcinRoNtQtqaJDIY9t99I4KKn0Oivqjl5z/+97hwq689W1LKUkQsabM9knIxrDFB4dGk4PaUX+4I6oIlA==", + "dev": true, + "dependencies": { + "callsite": "^1.0.0", + "createerror": "1.1.0", + "detect-indent": "^5.0.0", + "memoizesync": "^1.1.1", + "messy": "^6.16.0", + "mitm-papandreou": "^1.7.0-patch1", + "underscore": "^1.8.3", + "unexpected-messy": "^8.2.0" + }, + "peerDependencies": { + "unexpected": "^10.27.0 || ^11.0.0-3" + } + }, + "node_modules/unexpected-mitm/node_modules/createerror": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/createerror/-/createerror-1.1.0.tgz", + "integrity": "sha512-7zzU0CDuRVge0otam9eejW1m6qqKcSzBgR9lwoypaW7JU4bvsHhRzJlgmJfXGjKLrpjI6R7pY5DYc9b0w3DESw==", + "dev": true, + "engines": { + "node": ">= 0.2.0" + } + }, + "node_modules/unexpected-mitm/node_modules/detect-indent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", + "integrity": "sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/unexpected-resemble": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/unexpected-resemble/-/unexpected-resemble-5.0.1.tgz", + "integrity": "sha512-9fhrQYvCrbseg8b24Mrhw4ubg/bcp0+sVOUobcg1WYxkeKz3+C/ht0qS6SW6qNBeHjBrvUwCeJQ4IhHHpZ73DA==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "eslint-plugin-n": "^15.1.0", + "gettemporaryfilepath": "1.0.1", + "magicpen-media": "^3.0.0", + "object-assign": "^4.1.1", + "resemblejs": "^4.0.0" + }, + "peerDependencies": { + "unexpected": "^10.27.0 || ^11.0.0 || ^12.0.0 || ^13.0.0" + } + }, + "node_modules/unexpected-resemble/node_modules/magicpen-media": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/magicpen-media/-/magicpen-media-3.0.2.tgz", + "integrity": "sha512-FJnM4w0qUO5ZqBm60z+JaiyZmStDRomEhpDbfO/rwp2WrGj2eT0X+MPt4FS3lfDz6vNrVEFmQWuHC8EpOm/NDg==", + "dev": true, + "license": "MIT", + "dependencies": { + "gettemporaryfilepath": "^1.0.0", + "lodash": "^4.17.11", + "mime": "^2.3.1" + } + }, + "node_modules/unexpected-set": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unexpected-set/-/unexpected-set-2.0.1.tgz", + "integrity": "sha512-SydpQwiUSAR+m2WHrK4LH4zcJosqzG3VA5XvDqLvxBgBOEZA3ftPjqF+IUj6NcvJUPAXt1NtbDehBNcX4EBJ/w==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "es6-set": "^0.1.5" + }, + "peerDependencies": { + "unexpected": "^10.37.4 || ^11.0.0-4" + } + }, + "node_modules/unexpected-sinon": { + "version": "10.11.2", + "resolved": "https://registry.npmjs.org/unexpected-sinon/-/unexpected-sinon-10.11.2.tgz", + "integrity": "sha512-N2KIKPweTVs6AK8cDKQTUwu0fGWyGt+cI/UJZ/eltAyOKgsHL9eILttdGfpZjI/iMYcHcbtUwIlXoHfmh6EcBw==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "sinon": "*", + "unexpected": "^10.8.0 || ^11.0.0-4" + } + }, + "node_modules/unexpected/node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "license": "MIT", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", + "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.2.0", + "picocolors": "^1.1.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/upper-case": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", + "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==", + "license": "MIT" + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/urijs": { + "version": "1.19.11", + "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.11.tgz", + "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==", + "license": "MIT" + }, + "node_modules/url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "license": "MIT", + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, + "node_modules/urltools": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/urltools/-/urltools-0.4.2.tgz", + "integrity": "sha512-nsAASNzc1+n8MZuQ335Oa9z8KOCtDNfiQzFOAYCiu+IPZQVD0FH6n9hP/NKygKxs5nmRYnj8ftYKgyNcJKlgUw==", + "license": "BSD-2-Clause", + "dependencies": { + "glob": "^7.0.3", + "underscore": "^1.8.3", + "urijs": "^1.18.2" + }, + "engines": { + "node": ">= 4" + } + }, + "node_modules/utf8": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", + "integrity": "sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg==", + "dev": true, + "license": "MIT" + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "license": "MIT" + }, + "node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "dev": true, + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/v8-compile-cache": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz", + "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==", + "dev": true, + "license": "MIT" + }, + "node_modules/validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "license": "Apache-2.0", + "dependencies": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "node_modules/verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", + "dev": true, + "engines": [ + "node >=0.6.0" + ], + "license": "MIT", + "dependencies": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "node_modules/w3c-hr-time": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", + "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.", + "license": "MIT", + "dependencies": { + "browser-process-hrtime": "^1.0.0" + } + }, + "node_modules/w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "license": "MIT", + "dependencies": { + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/wawoff2": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/wawoff2/-/wawoff2-2.0.1.tgz", + "integrity": "sha512-r0CEmvpH63r4T15ebFqeOjGqU4+EgTx4I510NtK35EMciSdcTxCw3Byy3JnBonz7iyIFZ0AbVo0bbFpEVuhCYA==", + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "woff2_compress.js": "bin/woff2_compress.js", + "woff2_decompress.js": "bin/woff2_decompress.js" + } + }, + "node_modules/wawoff2/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "license": "Python-2.0" + }, + "node_modules/webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=10.4" + } + }, + "node_modules/whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "license": "MIT", + "dependencies": { + "iconv-lite": "0.4.24" + } + }, + "node_modules/whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", + "license": "MIT" + }, + "node_modules/whatwg-url": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", + "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", + "license": "MIT", + "dependencies": { + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" + } + }, + "node_modules/whatwg-url/node_modules/webidl-conversions": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", + "license": "BSD-2-Clause" + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-boxed-primitive": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz", + "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==", + "license": "MIT", + "dependencies": { + "is-bigint": "^1.1.0", + "is-boolean-object": "^1.2.1", + "is-number-object": "^1.1.1", + "is-string": "^1.1.1", + "is-symbol": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz", + "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "function.prototype.name": "^1.1.6", + "has-tostringtag": "^1.0.2", + "is-async-function": "^2.0.0", + "is-date-object": "^1.1.0", + "is-finalizationregistry": "^1.1.0", + "is-generator-function": "^1.0.10", + "is-regex": "^1.2.1", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.1.0", + "which-collection": "^1.0.2", + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "license": "MIT", + "dependencies": { + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-module": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", + "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", + "license": "ISC" + }, + "node_modules/which-typed-array": { + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", + "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", + "license": "MIT", + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "devOptional": true, + "license": "ISC", + "dependencies": { + "string-width": "^1.0.2 || 2" + } + }, + "node_modules/wide-align/node_modules/ansi-regex": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz", + "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/wide-align/node_modules/is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==", + "devOptional": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/wide-align/node_modules/string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/wide-align/node_modules/strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/woff2sfnt-sfnt2woff": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/woff2sfnt-sfnt2woff/-/woff2sfnt-sfnt2woff-1.0.0.tgz", + "integrity": "sha512-edK4COc1c1EpRfMqCZO1xJOvdUtM5dbVb9iz97rScvnTevqEB3GllnLWCmMVp1MfQBdF1DFg/11I0rSyAdS4qQ==", + "license": "MIT", + "dependencies": { + "pako": "^1.0.7" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/workbox-background-sync": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-4.3.1.tgz", + "integrity": "sha512-1uFkvU8JXi7L7fCHVBEEnc3asPpiAL33kO495UMcD5+arew9IbKW2rV5lpzhoWcm/qhGB89YfO4PmB/0hQwPRg==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-broadcast-update": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-4.3.1.tgz", + "integrity": "sha512-MTSfgzIljpKLTBPROo4IpKjESD86pPFlZwlvVG32Kb70hW+aob4Jxpblud8EhNb1/L5m43DUM4q7C+W6eQMMbA==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-build": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-4.3.1.tgz", + "integrity": "sha512-UHdwrN3FrDvicM3AqJS/J07X0KXj67R8Cg0waq1MKEOqzo89ap6zh6LmaLnRAjpB+bDIz+7OlPye9iii9KBnxw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.3.4", + "@hapi/joi": "^15.0.0", + "common-tags": "^1.8.0", + "fs-extra": "^4.0.2", + "glob": "^7.1.3", + "lodash.template": "^4.4.0", + "pretty-bytes": "^5.1.0", + "stringify-object": "^3.3.0", + "strip-comments": "^1.0.2", + "workbox-background-sync": "^4.3.1", + "workbox-broadcast-update": "^4.3.1", + "workbox-cacheable-response": "^4.3.1", + "workbox-core": "^4.3.1", + "workbox-expiration": "^4.3.1", + "workbox-google-analytics": "^4.3.1", + "workbox-navigation-preload": "^4.3.1", + "workbox-precaching": "^4.3.1", + "workbox-range-requests": "^4.3.1", + "workbox-routing": "^4.3.1", + "workbox-strategies": "^4.3.1", + "workbox-streams": "^4.3.1", + "workbox-sw": "^4.3.1", + "workbox-window": "^4.3.1" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/workbox-cacheable-response": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-4.3.1.tgz", + "integrity": "sha512-Rp5qlzm6z8IOvnQNkCdO9qrDgDpoPNguovs0H8C+wswLuPgSzSp9p2afb5maUt9R1uTIwOXrVQMmPfPypv+npw==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-core": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-4.3.1.tgz", + "integrity": "sha512-I3C9jlLmMKPxAC1t0ExCq+QoAMd0vAAHULEgRZ7kieCdUd919n53WC0AfvokHNwqRhGn+tIIj7vcb5duCjs2Kg==", + "license": "MIT" + }, + "node_modules/workbox-expiration": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-4.3.1.tgz", + "integrity": "sha512-vsJLhgQsQouv9m0rpbXubT5jw0jMQdjpkum0uT+d9tTwhXcEZks7qLfQ9dGSaufTD2eimxbUOJfWLbNQpIDMPw==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-google-analytics": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-4.3.1.tgz", + "integrity": "sha512-xzCjAoKuOb55CBSwQrbyWBKqp35yg1vw9ohIlU2wTy06ZrYfJ8rKochb1MSGlnoBfXGWss3UPzxR5QL5guIFdg==", + "deprecated": "It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained", + "license": "MIT", + "dependencies": { + "workbox-background-sync": "^4.3.1", + "workbox-core": "^4.3.1", + "workbox-routing": "^4.3.1", + "workbox-strategies": "^4.3.1" + } + }, + "node_modules/workbox-navigation-preload": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-4.3.1.tgz", + "integrity": "sha512-K076n3oFHYp16/C+F8CwrRqD25GitA6Rkd6+qAmLmMv1QHPI2jfDwYqrytOfKfYq42bYtW8Pr21ejZX7GvALOw==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-precaching": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-4.3.1.tgz", + "integrity": "sha512-piSg/2csPoIi/vPpp48t1q5JLYjMkmg5gsXBQkh/QYapCdVwwmKlU9mHdmy52KsDGIjVaqEUMFvEzn2LRaigqQ==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-range-requests": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-4.3.1.tgz", + "integrity": "sha512-S+HhL9+iTFypJZ/yQSl/x2Bf5pWnbXdd3j57xnb0V60FW1LVn9LRZkPtneODklzYuFZv7qK6riZ5BNyc0R0jZA==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-routing": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-4.3.1.tgz", + "integrity": "sha512-FkbtrODA4Imsi0p7TW9u9MXuQ5P4pVs1sWHK4dJMMChVROsbEltuE79fBoIk/BCztvOJ7yUpErMKa4z3uQLX+g==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-strategies": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-4.3.1.tgz", + "integrity": "sha512-F/+E57BmVG8dX6dCCopBlkDvvhg/zj6VDs0PigYwSN23L8hseSRwljrceU2WzTvk/+BSYICsWmRq5qHS2UYzhw==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-streams": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-4.3.1.tgz", + "integrity": "sha512-4Kisis1f/y0ihf4l3u/+ndMkJkIT4/6UOacU3A4BwZSAC9pQ9vSvJpIi/WFGQRH/uPXvuVjF5c2RfIPQFSS2uA==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workbox-sw": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-4.3.1.tgz", + "integrity": "sha512-0jXdusCL2uC5gM3yYFT6QMBzKfBr2XTk0g5TPAV4y8IZDyVNDyj1a8uSXy3/XrvkVTmQvLN4O5k3JawGReXr9w==", + "license": "MIT" + }, + "node_modules/workbox-window": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-4.3.1.tgz", + "integrity": "sha512-C5gWKh6I58w3GeSc0wp2Ne+rqVw8qwcmZnQGpjiek8A2wpbxSJb1FdCoQVO+jDJs35bFgo/WETgl1fqgsxN0Hg==", + "license": "MIT", + "dependencies": { + "workbox-core": "^4.3.1" + } + }, + "node_modules/workerpool": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz", + "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/wrap-ansi/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" + }, + "node_modules/write": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", + "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", + "dev": true, + "license": "MIT", + "dependencies": { + "mkdirp": "^0.5.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "node_modules/write-file-stdout": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/write-file-stdout/-/write-file-stdout-0.0.2.tgz", + "integrity": "sha512-KofbSPeePSre3soWCMaqcWHVZy9t/rbJaEMa2h19cupODsvc4eh7390Se1TjzZEL77rS+D6dznu0TLXyCbR+sw==", + "license": "MIT" + }, + "node_modules/ws": { + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", + "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", + "license": "MIT", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", + "license": "Apache-2.0" + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "license": "MIT" + }, + "node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "license": "ISC" + }, + "node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, + "node_modules/yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "license": "MIT", + "dependencies": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "license": "MIT", + "dependencies": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser/node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yargs-unparser/node_modules/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yargs-unparser/node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yargs/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "license": "ISC", + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/yauzl": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", + "license": "MIT", + "dependencies": { + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.1.0" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/pkgs/by-name/su/subfont/package.nix b/pkgs/by-name/su/subfont/package.nix new file mode 100644 index 000000000000..58eafd3ed739 --- /dev/null +++ b/pkgs/by-name/su/subfont/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildNpmPackage, + fetchurl, + testers, +}: + +let + pname = "subfont"; + version = "7.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/subfont/-/subfont-${version}.tgz"; + hash = "sha256-8zfMO/3zEKkLI7nZShVpaJxxueM8amdsiIEGmcebLgQ="; + }; +in +buildNpmPackage (finalAttrs: { + inherit pname version src; + + npmDepsHash = "sha256-vqsm8/1I1HFo9IZdOqGQ/qFEyLTYY5uwtsnp1PJfPIk="; + + postPatch = '' + ln -s ${./package-lock.json} package-lock.json + ''; + + dontNpmBuild = true; + + env.PUPPETEER_SKIP_DOWNLOAD = true; + + passthru.tests.version = testers.testVersion { + inherit version; + package = finalAttrs.finalPackage; + }; + + meta = { + description = "Command line tool to optimize webfont loading by aggressively subsetting based on font use, self-hosting of Google fonts and preloading"; + mainProgram = "subfont"; + homepage = "https://github.com/Munter/subfont"; + changelog = "https://github.com/Munter/subfont/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ dav-wolff ]; + }; +}) diff --git a/pkgs/by-name/su/subtitleedit/package.nix b/pkgs/by-name/su/subtitleedit/package.nix index aff0cbda04b8..03aab4482d4d 100644 --- a/pkgs/by-name/su/subtitleedit/package.nix +++ b/pkgs/by-name/su/subtitleedit/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "subtitleedit"; - version = "4.0.11"; + version = "4.0.12"; src = fetchzip { url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${ lib.replaceStrings [ "." ] [ "" ] version }.zip"; - hash = "sha256-j024PnRie48M9vQMIduREF1W/DZhvOmmoppHN69svxk="; + hash = "sha256-UlkFTsdssrjrPA0oOXJuSckEf1uMxh+POojfDX7NUu8="; stripRoot = false; }; diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix index 53969233d425..1976b966ebf3 100644 --- a/pkgs/by-name/su/subxt/package.nix +++ b/pkgs/by-name/su/subxt/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, cmake, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,10 +28,6 @@ rustPlatform.buildRustPackage rec { # Needed by wabt-sys nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - # Requires a running substrate node doCheck = false; diff --git a/pkgs/by-name/su/sudo-font/package.nix b/pkgs/by-name/su/sudo-font/package.nix index d4dd350cba6e..7286c78d97fd 100644 --- a/pkgs/by-name/su/sudo-font/package.nix +++ b/pkgs/by-name/su/sudo-font/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "sudo-font"; - version = "2.2"; + version = "3.0.2"; src = fetchzip { url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - hash = "sha256-qI43FDDXcJby2EbEow0ZBzPVOQby3+WxvhJKyjrYUp8="; + hash = "sha256-KGAGa3UPxi5PcRUOXPfGHRay+8ZTHL1yTyNqKorDUa8="; }; installPhase = '' diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 0f8eb12068dc..78fe7df51084 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -13,20 +13,20 @@ buildNpmPackage rec { pname = "super-productivity"; - version = "12.0.3"; + version = "12.0.5"; src = fetchFromGitHub { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-6IR4oxucmbmAjAYl+QMEreyTp6aFn8lGzNxA3kNuJOs="; + hash = "sha256-+Xw1WZXvZUOdA/ZpLdLCQAy8cmQ9QTiSDRMgj5+jeNw="; postFetch = '' ${lib.getExe npm-lockfile-fix} -r $out/package-lock.json ''; }; - npmDepsHash = "sha256-42DK/03nxYq4iYVNwyFUXuE0lX7TJbdg0EUMKW1juhY="; + npmDepsHash = "sha256-SAmSvdPlJFDE6TQCr932MfPzlwDtGcm4YdHesVA6j8c="; npmFlags = [ "--legacy-peer-deps" ]; makeCacheWritable = true; diff --git a/pkgs/by-name/su/superlu_dist/package.nix b/pkgs/by-name/su/superlu_dist/package.nix index a2e5677ed2ef..2a92911d417f 100644 --- a/pkgs/by-name/su/superlu_dist/package.nix +++ b/pkgs/by-name/su/superlu_dist/package.nix @@ -5,6 +5,7 @@ fetchurl, llvmPackages, cmake, + pkg-config, gfortran, blas, lapack, @@ -13,7 +14,7 @@ metis, parmetis, withExamples ? false, - fortranSupport ? stdenv.hostPlatform.isLinux, + fortranSupport ? true, enableOpenMP ? true, # Todo: ask for permission of unfree parmetis withParmetis ? false, @@ -52,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + pkg-config ] ++ lib.optionals fortranSupport [ gfortran @@ -69,6 +71,9 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withParmetis [ metis parmetis + ] + ++ lib.optionals stdenv.cc.isClang [ + gfortran.cc.lib ]; propagatedBuildInputs = [ blas ]; @@ -80,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic) (lib.cmakeBool "XSDK_ENABLE_Fortran" fortranSupport) + (lib.cmakeBool "BLA_PREFER_PKGCONFIG" true) (lib.cmakeBool "TPL_ENABLE_INTERNAL_BLASLIB" false) (lib.cmakeBool "TPL_ENABLE_LAPACKLIB" true) (lib.cmakeBool "TPL_ENABLE_PARMETISLIB" withParmetis) diff --git a/pkgs/by-name/su/supermodel/package.nix b/pkgs/by-name/su/supermodel/package.nix index 15702e89aad8..f78444742fe2 100644 --- a/pkgs/by-name/su/supermodel/package.nix +++ b/pkgs/by-name/su/supermodel/package.nix @@ -4,25 +4,27 @@ libGLU, SDL2, SDL2_net, + xorg, stdenv, zlib, }: stdenv.mkDerivation { pname = "supermodel"; - version = "0-unstable-2024-11-07"; + version = "0-unstable-2025-04-17"; src = fetchFromGitHub { owner = "trzy"; repo = "supermodel"; - rev = "4e7356ab2c077aa3bc3d75fb6e164a1c943fe4c1"; - hash = "sha256-ajRbgs6oMFF+dYHPsKM7FU16vuZcSovaNk2thdsUWtk="; + rev = "2272893a0511c0b3b50f6dda64addb7014717dd3"; + hash = "sha256-3FdLBGxmi4Xj7ao2nvjLleJSTXvKQrhUWvnQr8DK/RY="; }; buildInputs = [ libGLU SDL2 SDL2_net + xorg.libX11 zlib ]; diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 934a2fe2374e..da901591c0a0 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -13,7 +13,6 @@ libxkbcommon, libglvnd, mpv-unwrapped, - darwin, waylandSupport ? false, }: @@ -21,13 +20,13 @@ assert waylandSupport -> stdenv.hostPlatform.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-U6J1L2KDAEhIrSpbS5wMSc1Q9y5YMahhFNe6ArbwV2s="; + hash = "sha256-TuZtOZJM7bz14kOGvptSWJ2t3sgUD9GGoZlSaCRs4M0="; }; vendorHash = "sha256-fc86z8bvdFI3LdlyHej2G42O554hpRszqre+e3WUOKI="; @@ -64,13 +63,6 @@ buildGoModule rec { wayland wayland-protocols libxkbcommon - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa - darwin.apple_sdk_11_0.frameworks.Kernel - darwin.apple_sdk_11_0.frameworks.OpenGL - darwin.apple_sdk_11_0.frameworks.UserNotifications - darwin.apple_sdk_11_0.frameworks.MediaPlayer ]; postInstall = diff --git a/pkgs/by-name/su/supertag/cargo-lock-update-lexical-core.patch b/pkgs/by-name/su/supertag/cargo-lock-update-lexical-core.patch deleted file mode 100644 index 70c941ddd125..000000000000 --- a/pkgs/by-name/su/supertag/cargo-lock-update-lexical-core.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,5 +1,7 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. -+version = 3 -+ - [[package]] - name = "adler32" - version = "1.2.0" -@@ -530,13 +532,13 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - - [[package]] - name = "lexical-core" --version = "0.7.4" -+version = "0.7.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" -+checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" - dependencies = [ - "arrayvec", - "bitflags 1.2.1", -- "cfg-if 0.1.10", -+ "cfg-if 1.0.0", - "ryu", - "static_assertions", - ] diff --git a/pkgs/by-name/su/supertag/package.nix b/pkgs/by-name/su/supertag/package.nix deleted file mode 100644 index 50ef178d470e..000000000000 --- a/pkgs/by-name/su/supertag/package.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - dbus, - fuse, - sqlite, -}: - -rustPlatform.buildRustPackage rec { - pname = "supertag"; - version = "0.1.4"; - - src = fetchFromGitHub { - owner = "amoffat"; - repo = "supertag"; - rev = "v${version}"; - sha256 = "0jzm7pn38hlr96n0z8gqfsfdbw48y0nnbsgjdq7hpgwmcgvgqdam"; - }; - - # lexical-core is outdated and incompatible with newer versions of rust - # patches Cargo.lock to include a more up-to-date version of lexical-core - cargoPatches = [ ./cargo-lock-update-lexical-core.patch ]; - - useFetchCargoVendor = true; - cargoHash = "sha256-i+v2PK07GHmTaLT0Bcpitd1g3Mrol28S2a2lBwBETb8="; - - nativeBuildInputs = [ - rustPlatform.bindgenHook - pkg-config - ]; - buildInputs = [ - dbus - fuse - sqlite - ]; - - # The test are requiring extended permissions. - doCheck = false; - - meta = with lib; { - description = "Tag-based filesystem"; - longDescription = '' - Supertag is a tag-based filesystem, written in Rust, for Linux and MacOS. - It provides a tag-based view of your files by removing the hierarchy - constraints typically imposed on files and folders. In other words, it - allows you to think about your files not as objects stored in folders, but - as objects that can be filtered by folders. - ''; - homepage = "https://github.com/amoffat/supertag"; - license = licenses.agpl3Plus; - platforms = [ - "i686-linux" - "x86_64-linux" - ]; - maintainers = with maintainers; [ oxzi ]; - }; -} diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix index 8cffcf7dd82d..bf145ff65ea4 100644 --- a/pkgs/by-name/su/surfer/package.nix +++ b/pkgs/by-name/su/surfer/package.nix @@ -12,7 +12,6 @@ libXcursor, libXi, stdenv, - darwin, makeWrapper, zenity, }: @@ -34,12 +33,10 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - openssl - (lib.getLib stdenv.cc.cc) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + (lib.getLib stdenv.cc.cc) + ]; # Wayland and X11 libs are required at runtime since winit uses dlopen runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 45140d977307..1f766445a6bc 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, @@ -8,7 +7,6 @@ rocksdb, testers, surrealdb, - darwin, protobuf, }: rustPlatform.buildRustPackage rec { @@ -45,7 +43,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; doCheck = false; diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix index 7c3435fc1d6e..94ce548bf251 100644 --- a/pkgs/by-name/sv/svix-server/package.nix +++ b/pkgs/by-name/sv/svix-server/package.nix @@ -6,37 +6,30 @@ openssl, protobuf, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "svix-server"; - version = "1.62.0"; + version = "1.64.1"; src = fetchFromGitHub { owner = "svix"; repo = "svix-webhooks"; rev = "v${version}"; - hash = "sha256-ft08skfLASgfZo3lrlN+nuF2FK78kEm2geRVg8cO5hM="; + hash = "sha256-ZaSUTGv/l54tKvXd2hUeQYKTUmQOUm2dpZE7J8auWb0="; }; sourceRoot = "${src.name}/server"; useFetchCargoVendor = true; - cargoHash = "sha256-0GuTIGWGeP7CG+CijjlRW9SPKfp7rPuZVuClLZC25dk="; + cargoHash = "sha256-h19xpILPudOMSC99wBB1CA/981eK+FHgsGJAJOFPeuw="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - protobuf - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + protobuf + ]; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/by-name/sw/swagger-cli/package.nix b/pkgs/by-name/sw/swagger-cli/package.nix index f78dd09b46a4..5b72e1e8d5d4 100644 --- a/pkgs/by-name/sw/swagger-cli/package.nix +++ b/pkgs/by-name/sw/swagger-cli/package.nix @@ -21,6 +21,10 @@ buildNpmPackage rec { npm run bump ''; + postInstall = '' + find $out/lib/node_modules -xtype l -delete + ''; + meta = with lib; { description = "Swagger 2.0 and OpenAPI 3.0 command-line tool"; homepage = "https://apitools.dev/swagger-cli/"; diff --git a/pkgs/tools/wayland/swaytools/default.nix b/pkgs/by-name/sw/swaytools/package.nix similarity index 57% rename from pkgs/tools/wayland/swaytools/default.nix rename to pkgs/by-name/sw/swaytools/package.nix index 3f994ef03eb2..45884093a7a2 100644 --- a/pkgs/tools/wayland/swaytools/default.nix +++ b/pkgs/by-name/sw/swaytools/package.nix @@ -1,15 +1,13 @@ { lib, - setuptools, - buildPythonApplication, + python3Packages, fetchFromGitHub, slurp, + nix-update-script, }: - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "swaytools"; version = "0.1.2"; - format = "pyproject"; src = fetchFromGitHub { @@ -19,15 +17,17 @@ buildPythonApplication rec { sha256 = "sha256-UoWK53B1DNmKwNLFwJW1ZEm9dwMOvQeO03+RoMl6M0Q="; }; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = with python3Packages; [ setuptools ]; propagatedBuildInputs = [ slurp ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { homepage = "https://github.com/tmccombs/swaytools"; description = "Collection of simple tools for sway (and i3)"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ atila ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ atila ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/sw/swim/package.nix b/pkgs/by-name/sw/swim/package.nix index bf8d01099dab..448d972eaa9d 100644 --- a/pkgs/by-name/sw/swim/package.nix +++ b/pkgs/by-name/sw/swim/package.nix @@ -5,8 +5,6 @@ pkg-config, openssl, spade, - stdenv, - darwin, git, }: @@ -35,14 +33,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; nativeCheckInputs = [ git ]; diff --git a/pkgs/by-name/sw/switcheroo/package.nix b/pkgs/by-name/sw/switcheroo/package.nix index 601e2c322bde..dc2ac68cb485 100644 --- a/pkgs/by-name/sw/switcheroo/package.nix +++ b/pkgs/by-name/sw/switcheroo/package.nix @@ -2,7 +2,6 @@ lib, blueprint-compiler, cargo, - darwin, desktop-file-utils, fetchFromGitLab, glib, @@ -48,15 +47,11 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook4 ]; - buildInputs = - [ - glib - gtk4 - libadwaita - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + glib + gtk4 + libadwaita + ]; preFixup = '' gappsWrapperArgs+=( diff --git a/pkgs/by-name/sy/symbolicator/package.nix b/pkgs/by-name/sy/symbolicator/package.nix index 4d70b1ee494e..c73dedb13297 100644 --- a/pkgs/by-name/sy/symbolicator/package.nix +++ b/pkgs/by-name/sy/symbolicator/package.nix @@ -6,8 +6,6 @@ bzip2, openssl, zstd, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -30,16 +28,11 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - [ - bzip2 - openssl - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + bzip2 + openssl + zstd + ]; env = { SYMBOLICATOR_GIT_VERSION = src.rev; diff --git a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix new file mode 100644 index 000000000000..8f445e0000f0 --- /dev/null +++ b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix @@ -0,0 +1,79 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + nodejs, + nix-update-script, + writers, + baseUrl ? null, +}: + +assert lib.asserts.assertMsg ( + baseUrl == null +) "The baseUrl parameter is deprecated, please use .withConfig instead"; + +stdenv.mkDerivation (finalAttrs: { + pname = "synapse-admin-etkecc"; + version = "0.10.3-etke39"; + + src = fetchFromGitHub { + owner = "etkecc"; + repo = "synapse-admin"; + tag = "v${finalAttrs.version}"; + hash = "sha256-1jE4QrHAnH27FrfpgM8rKd4I2AAJArtL0jgcWVc8TrU="; + }; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; + hash = "sha256-60rS/OfPEQmmZ5j7mUjMPyK9prgNOX7MkYpu9djdjxQ="; + }; + + nativeBuildInputs = [ + nodejs + yarnConfigHook + yarnBuildHook + ]; + + env = { + NODE_ENV = "production"; + SYNAPSE_ADMIN_VERSION = finalAttrs.version; + }; + + installPhase = '' + runHook preInstall + cp -r dist $out + runHook postInstall + ''; + + passthru = { + # https://github.com/etkecc/synapse-admin/blob/main/docs/config.md + withConfig = + config: + stdenv.mkDerivation { + inherit (finalAttrs) version meta; + pname = "synapse-admin-etkecc-with-config"; + dontUnpack = true; + configFile = writers.writeJSON "synapse-admin-config" config; + installPhase = '' + runHook preInstall + cp -r ${finalAttrs.finalPackage} $out + chmod -R +w $out + cp $configFile $out/config.json + runHook postInstall + ''; + }; + + updateScript = nix-update-script { }; + }; + + meta = { + description = "Maintained fork of the admin console for (Matrix) Synapse homeservers, including additional features"; + homepage = "https://github.com/etkecc/synapse-admin"; + changelog = "https://github.com/etkecc/synapse-admin/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ defelo ]; + }; +}) diff --git a/pkgs/by-name/sy/syndicate_utils/package.nix b/pkgs/by-name/sy/syndicate_utils/package.nix index c3a0ffb93ab2..ee314bdb22bb 100644 --- a/pkgs/by-name/sy/syndicate_utils/package.nix +++ b/pkgs/by-name/sy/syndicate_utils/package.nix @@ -17,7 +17,7 @@ buildNimSbom (finalAttrs: { owner = "ehmry"; repo = "syndicate_utils"; rev = finalAttrs.version; - hash = "sha256-X8sb/2mkhVp0jJpTk9uYSDhAVui4jHl355amRCnkNhA="; + hash = "sha256-zHVL2A5mAZX73Xk6Pcs02wHCAVfsOYxDO8/yKX0FvBs="; }; buildInputs = [ @@ -28,8 +28,6 @@ buildNimSbom (finalAttrs: { openssl ]; - nimFlags = [ "--define:nimPreviewHashRef" ]; - meta = finalAttrs.src.meta // { description = "Utilities for the Syndicated Actor Model"; homepage = "https://git.syndicate-lang.org/ehmry/syndicate_utils"; diff --git a/pkgs/by-name/sy/syndicate_utils/sbom.json b/pkgs/by-name/sy/syndicate_utils/sbom.json index 46a8e74877cf..c524b9cb0ec9 100644 --- a/pkgs/by-name/sy/syndicate_utils/sbom.json +++ b/pkgs/by-name/sy/syndicate_utils/sbom.json @@ -6,8 +6,8 @@ "type": "application", "bom-ref": "pkg:nim/syndicate_utils", "name": "syndicate_utils", - "description": "Utilites for Syndicated Actors and Synit", - "version": "20250110", + "description": "Utilities for Syndicated Actors and Synit", + "version": "20250422", "authors": [ { "name": "Emery Hemingway" @@ -96,7 +96,7 @@ "version": "trunk", "externalReferences": [ { - "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/eb3c522f9f051ceeef4c8518820fcd90fe2a2c2d.tar.gz", + "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/9c3dbbaa661dfc191ccb5be791a78cf977adec8b.tar.gz", "type": "source-distribution" }, { @@ -111,19 +111,19 @@ }, { "name": "nix:fod:path", - "value": "/nix/store/sg7dxaz3g2qgb2sp0lzyyl2iwddbxljl-source" + "value": "/nix/store/crza0j3plp9a0bw78cinyk6hwhn3llcf-source" }, { "name": "nix:fod:rev", - "value": "eb3c522f9f051ceeef4c8518820fcd90fe2a2c2d" + "value": "9c3dbbaa661dfc191ccb5be791a78cf977adec8b" }, { "name": "nix:fod:sha256", - "value": "1gjjybfgw99dm8m5i6nm5zsgs7bavkqw6pgia8pc4n41h4ppshiw" + "value": "08pa25f7d0x1228hmrpzn7g2jd1bwip4fvihvw4mx335ssx317kw" }, { "name": "nix:fod:url", - "value": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/eb3c522f9f051ceeef4c8518820fcd90fe2a2c2d.tar.gz" + "value": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/9c3dbbaa661dfc191ccb5be791a78cf977adec8b.tar.gz" }, { "name": "nix:fod:ref", @@ -139,10 +139,10 @@ "type": "library", "bom-ref": "pkg:nim/preserves", "name": "preserves", - "version": "20241221", + "version": "20250214", "externalReferences": [ { - "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/c9f5806b153b2fd3ed8f868f8cf36cdbc25cd3d5.tar.gz", + "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/21480c2fd0a6cc6ecfd34fb532ed975b135b0b8e.tar.gz", "type": "source-distribution" }, { @@ -157,23 +157,23 @@ }, { "name": "nix:fod:path", - "value": "/nix/store/jr5la48ywfs0ghn5v5256rjqwyxzmd7a-source" + "value": "/nix/store/1d8nbd5nfqpl6l3c7c783h6r0gc47vwf-source" }, { "name": "nix:fod:rev", - "value": "c9f5806b153b2fd3ed8f868f8cf36cdbc25cd3d5" + "value": "21480c2fd0a6cc6ecfd34fb532ed975b135b0b8e" }, { "name": "nix:fod:sha256", - "value": "1fh8r9mhr3f4mf45fc1shnqfxdrdlif1nsvqd016ni16vmcvclmc" + "value": "136kr6pj5rv3184ykishbkmg86ss85nzygy5wc1lr9l0pgwx6936" }, { "name": "nix:fod:url", - "value": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/c9f5806b153b2fd3ed8f868f8cf36cdbc25cd3d5.tar.gz" + "value": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/21480c2fd0a6cc6ecfd34fb532ed975b135b0b8e.tar.gz" }, { "name": "nix:fod:ref", - "value": "20241221" + "value": "20250214" }, { "name": "nix:fod:srcDir", diff --git a/pkgs/by-name/sy/synfigstudio/package.nix b/pkgs/by-name/sy/synfigstudio/package.nix index 3d5cee8a5931..c8dfde12d0c5 100644 --- a/pkgs/by-name/sy/synfigstudio/package.nix +++ b/pkgs/by-name/sy/synfigstudio/package.nix @@ -8,7 +8,6 @@ boost, cairo, - darwin, gettext, glibmm, gtk3, @@ -77,26 +76,22 @@ let gettext intltool ]; - buildInputs = - [ - ETL - boost - cairo - glibmm - mlt - libsigcxx - libxmlxx - pango - imagemagick - harfbuzz - freetype - fribidi - openexr - fftw - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; + buildInputs = [ + ETL + boost + cairo + glibmm + mlt + libsigcxx + libxmlxx + pango + imagemagick + harfbuzz + freetype + fribidi + openexr + fftw + ]; }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix index f45c1852f4a0..979f7616ab4a 100644 --- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix +++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix @@ -1,23 +1,23 @@ { - version = "1.22.0"; + version = "1.22.1"; x86_64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.0/linux/amd64/sysdig-cli-scanner"; - hash = "sha256-qGbQRiUvoynxUeYSmjrz5r9bunthcmQWDzLtTqPu4IU="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.1/linux/amd64/sysdig-cli-scanner"; + hash = "sha256-ogQ7NhpU0KZkcZXWSBX4VaTWwXz5WWMXhqZ9abHX6+Y="; }; aarch64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.0/linux/arm64/sysdig-cli-scanner"; - hash = "sha256-bfY5FRPU7rEVN0o/nf39q8qFP7zgffoEX1iPXbZ22pw="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.1/linux/arm64/sysdig-cli-scanner"; + hash = "sha256-apj4GqN7sdZSzpk+FvqcYJLgh+UlcJgPUdXhhurFENQ="; }; x86_64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.0/darwin/amd64/sysdig-cli-scanner"; - hash = "sha256-F5br4BJnB9yRWfpqEJgy79csjfYY/St1a/rPGXdvj6A="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.1/darwin/amd64/sysdig-cli-scanner"; + hash = "sha256-o5AYd3/8Ot7+EtQ2SXaV72JbR/hI/5Pu7g2jdHZYepo="; }; aarch64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.0/darwin/arm64/sysdig-cli-scanner"; - hash = "sha256-CsMZ8m9eJNcOxq77IVLuW1COOa2+mABoMGJ+xk/NARI="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.1/darwin/arm64/sysdig-cli-scanner"; + hash = "sha256-FDkqWstWMTtF0QLWk+iadJr7aRHRnpiatqAeoHftVDk="; }; } diff --git a/pkgs/by-name/sy/system76-power/package.nix b/pkgs/by-name/sy/system76-power/package.nix index 0ac266c014fd..02136a19fa32 100644 --- a/pkgs/by-name/sy/system76-power/package.nix +++ b/pkgs/by-name/sy/system76-power/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "system76-power"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "pop-os"; repo = "system76-power"; tag = finalAttrs.version; - hash = "sha256-fyatAoWw/4ORojayA90er+H5weRykg+2ZzTsGThpW5g="; + hash = "sha256-SHGfs3ZokPOM2nkd/8F/5zjxh9sPXVBtHWkCbmKwEMo="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; useFetchCargoVendor = true; - cargoHash = "sha256-/dhuWgHysJ2oWgJ6jc9u4tsUOxlFt/awlK/9Jk1GHCM="; + cargoHash = "sha256-Q/6OFNbqvRDTCT1MyJ3gqd4BTXXRouvnKSM3cm1jQ1g="; postInstall = '' install -D -m 0644 data/com.system76.PowerDaemon.conf $out/etc/dbus-1/system.d/com.system76.PowerDaemon.conf diff --git a/pkgs/by-name/sz/szyszka/package.nix b/pkgs/by-name/sz/szyszka/package.nix index 97cb882bff2c..17a9a6b342ee 100644 --- a/pkgs/by-name/sz/szyszka/package.nix +++ b/pkgs/by-name/sz/szyszka/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, @@ -11,7 +10,6 @@ gdk-pixbuf, gtk4, wrapGAppsHook4, - darwin, }: rustPlatform.buildRustPackage rec { @@ -33,21 +31,14 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook4 ]; - buildInputs = - [ - glib - cairo - pango - atk - gdk-pixbuf - gtk4 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Foundation - ] - ); + buildInputs = [ + glib + cairo + pango + atk + gdk-pixbuf + gtk4 + ]; postInstall = '' install -m 444 \ diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/by-name/t-/t-rec/package.nix similarity index 58% rename from pkgs/misc/t-rec/default.nix rename to pkgs/by-name/t-/t-rec/package.nix index 5e8ff5be7ed1..b9b13483c7f5 100644 --- a/pkgs/misc/t-rec/default.nix +++ b/pkgs/by-name/t-/t-rec/package.nix @@ -1,55 +1,58 @@ { lib, stdenv, - imagemagick, - ffmpeg, rustPlatform, fetchFromGitHub, makeWrapper, + imagemagick, libiconv, - Foundation, + ffmpeg, + versionCheckHook, + nix-update-script, }: - -let - binPath = lib.makeBinPath [ - imagemagick - ffmpeg - ]; -in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "t-rec"; version = "0.7.9"; src = fetchFromGitHub { owner = "sassman"; repo = "t-rec-rs"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-aQX+JJ2MwzzxJkA1vsE8JqvYpWtqyycvycPc2pyFU7g="; }; + cargoHash = "sha256-AgSYM2a9XGH2X4dcp5CSMnt0Bq/5XT8C3g1R2UX4mLY="; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ imagemagick ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - Foundation ]; postInstall = '' - wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" + wrapProgram "$out/bin/t-rec" --prefix PATH : "${ + lib.makeBinPath [ + imagemagick + ffmpeg + ] + }" ''; - useFetchCargoVendor = true; - cargoHash = "sha256-AgSYM2a9XGH2X4dcp5CSMnt0Bq/5XT8C3g1R2UX4mLY="; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; homepage = "https://github.com/sassman/t-rec-rs"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ + changelog = "https://github.com/sassman/t-rec-rs/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ gpl3Only ]; + maintainers = with lib.maintainers; [ hoverbear matthiasbeyer ]; mainProgram = "t-rec"; }; -} +}) diff --git a/pkgs/by-name/t-/t-rex/package.nix b/pkgs/by-name/t-/t-rex/package.nix index 3001f15a4a94..db83909fdb52 100644 --- a/pkgs/by-name/t-/t-rex/package.nix +++ b/pkgs/by-name/t-/t-rex/package.nix @@ -1,12 +1,10 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, gdal, openssl, - darwin, }: rustPlatform.buildRustPackage rec { @@ -31,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gdal openssl - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + ]; meta = with lib; { description = "Vector tile server specialized on publishing MVT tiles"; diff --git a/pkgs/by-name/ta/tail-tray/package.nix b/pkgs/by-name/ta/tail-tray/package.nix index 4b502245a003..79fbf5a6b481 100644 --- a/pkgs/by-name/ta/tail-tray/package.nix +++ b/pkgs/by-name/ta/tail-tray/package.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { description = "Tray icon to manage Tailscale"; homepage = "https://github.com/SneWs/tail-tray"; changelog = "https://github.com/SneWs/tail-tray/releases/tag/${version}"; + mainProgram = "tail-tray"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ Svenum ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index 40d1d302c0dd..03265b7bf6fc 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -24,7 +24,7 @@ }: let - version = "1.82.0"; + version = "1.82.5"; in buildGoModule { pname = "tailscale"; @@ -39,7 +39,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-/8MJE1Io0MRSUXiFirYDn6FH2qkWQHE7Fl3nJLjieDw="; + hash = "sha256-BFitj8A+TfNKTyXBB1YhsEs5NvLUfgJ2IbjB2ipf4xU="; }; vendorHash = "sha256-SiUkN6BQK1IQmLfkfPetzvYqRu9ENK6+6txtGxegF5Y="; @@ -134,6 +134,9 @@ buildGoModule { # test for a dev util which helps to fork golang.org/x/crypto/acme # not necessary and fails to match "TestSyncedToUpstream" # tempfork/acme + + # flaky: https://github.com/tailscale/tailscale/issues/7030 + "TestConcurrent" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # syscall default route interface en0 differs from netstat diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix index 287908ce87fe..2a3d43c70141 100644 --- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix +++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - nodejs_23, + nodejs_latest, pnpm_9, cacert, }: @@ -33,12 +33,12 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - nodejs_23 + nodejs_latest pnpm_9.configHook ]; buildInputs = [ - nodejs_23 + nodejs_latest ]; pnpmWorkspaces = [ "@tailwindcss/language-server..." ]; diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix index 28e8256b3dea..b1d9a336de53 100644 --- a/pkgs/by-name/ta/tailwindcss_4/package.nix +++ b/pkgs/by-name/ta/tailwindcss_4/package.nix @@ -7,7 +7,7 @@ makeWrapper, }: let - version = "4.1.3"; + version = "4.1.4"; inherit (stdenv.hostPlatform) system; throwSystem = throw "tailwindcss has not been packaged for ${system} yet."; @@ -22,10 +22,10 @@ let hash = { - aarch64-darwin = "sha256-kQyl5X6CkuXUJK7e8bLsaIJ2Bqbw23OLnrOaFwnI0ZY="; - aarch64-linux = "sha256-tF7Tr5EJk1zL0GJzLk+jGymEzaobcT+osBV+GGTs78E="; - x86_64-darwin = "sha256-MR2i+TGVI3L0O6/k/9LBgP+axu28hoVX3HwOJbyq1V4="; - x86_64-linux = "sha256-xAYhKKS3oEUPDwmAvE+3Gv4VZ6a88OftvzRburDuP2Q="; + aarch64-darwin = "sha256-x7piRWxtlEF3XJDKbwo9+AD4LO3k6SOJ+TRTbejPUuk="; + aarch64-linux = "sha256-oUU371GpnBpVw3ZLc7gWgdhP91GXrXZvmmYo1hDPJ08="; + x86_64-darwin = "sha256-zQ4adIfAuRip9LLSLTGHUhgeiRi4Z1cLQJCC9pR1zYg="; + x86_64-linux = "sha256-D6i7uL7KckL2RVvwG7410wg4ePYwjsSkzsMK7Ra8pG0="; } .${system} or throwSystem; in diff --git a/pkgs/by-name/ta/taizen/package.nix b/pkgs/by-name/ta/taizen/package.nix index ac4dbb58a009..5e43f0426b9d 100644 --- a/pkgs/by-name/ta/taizen/package.nix +++ b/pkgs/by-name/ta/taizen/package.nix @@ -6,8 +6,6 @@ pkg-config, ncurses, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage { @@ -35,14 +33,10 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - ncurses - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + ncurses + openssl + ]; meta = with lib; { description = "curses based mediawiki browser"; diff --git a/pkgs/by-name/ta/talecast/package.nix b/pkgs/by-name/ta/talecast/package.nix index 9d304d75d517..1b42df36c220 100644 --- a/pkgs/by-name/ta/talecast/package.nix +++ b/pkgs/by-name/ta/talecast/package.nix @@ -1,12 +1,10 @@ { lib, fetchCrate, - darwin, rustPlatform, pkg-config, openssl, nix-update-script, - stdenv, testers, talecast, }: @@ -27,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ta/taler-depolymerization/package.nix b/pkgs/by-name/ta/taler-depolymerization/package.nix index 5874223a44f0..06d1920ffeea 100644 --- a/pkgs/by-name/ta/taler-depolymerization/package.nix +++ b/pkgs/by-name/ta/taler-depolymerization/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchgit, - stdenv, - darwin, }: rustPlatform.buildRustPackage { pname = "taler-depolymerization"; @@ -36,15 +34,6 @@ rustPlatform.buildRustPackage { cp docs/*.conf $out/share/examples ''; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - Security - SystemConfiguration - ] - ); - meta = { description = "Wire gateway for Bitcoin/Ethereum"; homepage = "https://git.taler.net/depolymerization.git/"; diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index e748d95922cc..6e00d8f1c2b3 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -4,8 +4,6 @@ fetchCrate, pkg-config, openssl, - stdenv, - darwin, withLsp ? true, }: @@ -26,14 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; buildFeatures = lib.optional withLsp "lsp"; diff --git a/pkgs/development/tools/tarmac/default.nix b/pkgs/by-name/ta/tarmac/package.nix similarity index 100% rename from pkgs/development/tools/tarmac/default.nix rename to pkgs/by-name/ta/tarmac/package.nix diff --git a/pkgs/by-name/ta/taskflow/package.nix b/pkgs/by-name/ta/taskflow/package.nix index b445c0f03bc0..8cc90436fbd3 100644 --- a/pkgs/by-name/ta/taskflow/package.nix +++ b/pkgs/by-name/ta/taskflow/package.nix @@ -7,14 +7,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "taskflow"; version = "3.9.0"; src = fetchFromGitHub { owner = "taskflow"; repo = "taskflow"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-omon02xgf4vV7JzpLFtHgf2MXxR6JowI+pDyAswXMUY="; }; @@ -35,6 +35,11 @@ stdenv.mkDerivation rec { cmake ]; + cmakeFlags = [ + # building the tests implies running them in the buildPhase + (lib.cmakeBool "TF_BUILD_TESTS" finalAttrs.finalPackage.doCheck) + ]; + doCheck = true; meta = { @@ -42,11 +47,11 @@ stdenv.mkDerivation rec { homepage = "https://taskflow.github.io/"; changelog = let - release = lib.replaceStrings [ "." ] [ "-" ] version; + release = lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version; in "https://taskflow.github.io/taskflow/release-${release}.html"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/by-name/ta/taxi/package.nix b/pkgs/by-name/ta/taxi/package.nix index 4eb5e061f089..1daeb516ae5b 100644 --- a/pkgs/by-name/ta/taxi/package.nix +++ b/pkgs/by-name/ta/taxi/package.nix @@ -1,13 +1,13 @@ { lib, stdenv, + desktop-file-utils, fetchFromGitHub, gobject-introspection, - gtk3, - libgee, - libhandy, + gtk4, + libadwaita, libsecret, - libsoup_2_4, + libsoup_3, meson, ninja, nix-update-script, @@ -15,52 +15,46 @@ pkg-config, python3, vala, - wrapGAppsHook3, + wrapGAppsHook4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "taxi"; - version = "2.0.2"; + version = "2.0.2-unstable-2024-12-26"; src = fetchFromGitHub { - owner = "Alecaddd"; + owner = "ellie-commons"; repo = "taxi"; - rev = version; - sha256 = "1a4a14b2d5vqbk56drzbbldp0nngfqhwycpyv8d3svi2nchkvpqa"; + rev = "b1c81490641f102005d9451a33d21610c0637e22"; + sha256 = "sha256-boPwRSHzFpbrzRoSmNWf/fgi3cJDEt9qjZHWQWutL+o="; }; nativeBuildInputs = [ + desktop-file-utils gobject-introspection meson ninja pkg-config python3 vala - wrapGAppsHook3 + wrapGAppsHook4 ]; buildInputs = [ - gtk3 - libgee - libhandy + gtk4 + libadwaita libsecret - libsoup_2_4 - pantheon.granite + libsoup_3 + pantheon.granite7 ]; - - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru.updateScript = nix-update-script { }; meta = with lib; { - homepage = "https://github.com/Alecaddd/taxi"; + homepage = "https://github.com/ellie-commons/taxi"; description = "FTP Client that drives you anywhere"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ ] ++ teams.pantheon.members; platforms = platforms.linux; - mainProgram = "com.github.alecaddd.taxi"; + mainProgram = "io.github.ellie_commons.taxi"; }; } diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix index 1a94b765c7ef..d17bb2f496ea 100644 --- a/pkgs/by-name/tb/tbls/package.nix +++ b/pkgs/by-name/tb/tbls/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.84.1"; + version = "1.85.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; tag = "v${version}"; - hash = "sha256-c4LxntQhni6dHbjs0QZLWgioU2GT101x4lDC43buiwk="; + hash = "sha256-zXaygbcKUZ5BzTKur+K0gUGtoc4FFG0EPwl0KxaJGJo="; }; - vendorHash = "sha256-6b5JYWjJIbZakrOkB1Xgg4HyBBBecN31iutOMZpLeHc="; + vendorHash = "sha256-hARsbsy9us/knGg6dwNgDezjas5IC6GtL7neEZbwgvo="; excludedPackages = [ "scripts/jsonschema" ]; diff --git a/pkgs/by-name/tc/tcsh/package.nix b/pkgs/by-name/tc/tcsh/package.nix index f5fc4d82cd59..c5a90c61d5a6 100644 --- a/pkgs/by-name/tc/tcsh/package.nix +++ b/pkgs/by-name/tc/tcsh/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tcsh"; - version = "6.24.14"; + version = "6.24.15"; src = fetchurl { url = "mirror://tcsh/tcsh-${finalAttrs.version}.tar.gz"; - hash = "sha256-NogPJYpj/BH+cqZQmLWF68Ts3uJDiLjr7Jfmro5IUxg="; + hash = "sha256-1NCypN8yD1elGORMNZ7za7z4XWT1FG0MuP80mE4NI/0="; }; strictDeps = true; diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index eec2a9f6be8c..225a388a21b9 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -16,16 +16,16 @@ buildNpmPackage rec { pname = "teams-for-linux"; - version = "2.0.7"; + version = "2.0.8"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; tag = "v${version}"; - hash = "sha256-w7KY7qxsK512YuLw0Ms+kIsuDTou+ZvJ9wPGJx4fbt0="; + hash = "sha256-w5Mnn1L1qr8IrLx9IpZoiMd74qD8Gf7ODvtgApp71cQ="; }; - npmDepsHash = "sha256-oTS+ylkTf3a0B0pP1aEyxdTR4KL5gk8u+scEWZwyrwg="; + npmDepsHash = "sha256-sUdWzVe9FbC9ayj4UrdAAGC3QbmDSSnFaVrROG6Jxjo="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/te/telepathy-gabble/package.nix b/pkgs/by-name/te/telepathy-gabble/package.nix deleted file mode 100644 index 560d83c604bb..000000000000 --- a/pkgs/by-name/te/telepathy-gabble/package.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - libxslt, - telepathy-glib, - python3, - libxml2, - dbus-glib, - dbus, - sqlite, - libsoup_2_4, - libnice, - gnutls, - fetchpatch, -}: - -stdenv.mkDerivation rec { - pname = "telepathy-gabble"; - version = "0.18.4"; - - src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-${version}.tar.gz"; - sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i"; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/archlinux/svntogit-packages/raw/edcf78c831894000f2fbfd3e5818e363911c746a/trunk/telepathy-gabble-0.18.4-python3.patch"; - hash = "sha256-bvcZW6gbCNogqwPDaXHTbohe7c2GAYjXeHGyBEDVsB4="; - }) - ]; - - nativeBuildInputs = [ - pkg-config - libxslt - python3 - ]; - buildInputs = [ - libxml2 - dbus-glib - sqlite - libsoup_2_4 - libnice - telepathy-glib - gnutls - ]; - - nativeCheckInputs = [ dbus ]; - - configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; - - enableParallelBuilding = true; - doCheck = true; - - meta = with lib; { - description = "Jabber/XMPP connection manager for the Telepathy framework"; - mainProgram = "telepathy-gabble-xmpp-console"; - homepage = "https://telepathy.freedesktop.org/components/telepathy-gabble/"; - license = licenses.lgpl21Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/by-name/te/telepathy-logger/package.nix b/pkgs/by-name/te/telepathy-logger/package.nix deleted file mode 100644 index e60aca4e8bf0..000000000000 --- a/pkgs/by-name/te/telepathy-logger/package.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - dbus-glib, - libxml2, - sqlite, - telepathy-glib, - python3, - pkg-config, - dconf, - makeWrapper, - intltool, - libxslt, - gobject-introspection, - dbus, - fetchpatch, - darwin, -}: - -stdenv.mkDerivation rec { - pname = "telepathy-logger"; - version = "0.8.2"; - - src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-${version}.tar.bz2"; - sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg"; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/archlinux/svntogit-packages/raw/2b5bdbb4739d3517f5e7300edc8dab775743b96d/trunk/0001-tools-Fix-the-build-with-Python-3.patch"; - hash = "sha256-o1lfdZIIqaxn7ntQZnoOMqquc6efTHgSIxB5dpFWRgg="; - }) - ]; - - nativeBuildInputs = [ - makeWrapper - pkg-config - intltool - libxslt - gobject-introspection - python3 - ]; - buildInputs = - [ - dbus-glib - libxml2 - sqlite - telepathy-glib - dbus - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Foundation - ]; - - configureFlags = [ "--enable-call" ]; - - preFixup = '' - wrapProgram "$out/libexec/telepathy-logger" \ - --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with lib; { - description = "Logger service for Telepathy framework"; - homepage = "https://telepathy.freedesktop.org/components/telepathy-logger/"; - license = licenses.lgpl21Plus; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/by-name/te/telepresence2/package.nix b/pkgs/by-name/te/telepresence2/package.nix index e5aea69a6f1a..67a04bac7181 100644 --- a/pkgs/by-name/te/telepresence2/package.nix +++ b/pkgs/by-name/te/telepresence2/package.nix @@ -8,16 +8,16 @@ let fuseftp = buildGoModule rec { pname = "go-fuseftp"; - version = "0.4.2"; + version = "0.6.6"; src = fetchFromGitHub { owner = "datawire"; repo = "go-fuseftp"; rev = "v${version}"; - hash = "sha256-bkaC+EOqFPQA4fDkVhO6EqgGhOJy31yGwVbbPoRd+70="; + hash = "sha256-70VmT8F+RNiDk6fnrzDktdfNhZk20sXF+b3TBTAkNHo="; }; - vendorHash = "sha256-Dk4wvg2lTGTw8vP42+XuvmMXeMluR0SPwlVHLEB8yCQ="; + vendorHash = "sha256-wp4jOmeVdfuRwdclCzBonNCkhgsNUBOBL6gxlrznC1A="; buildInputs = [ fuse ]; @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.22.1"; + version = "2.22.3"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-Bae77Kzc2cWxIb1yYKXctffuiC3ICPfi0qYP6fgaqvQ="; + hash = "sha256-xrWlm5crDybvcOX3TevXcEq63Vuw0u9+4NvktIG6LxU="; }; propagatedBuildInputs = [ @@ -51,7 +51,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-toqQDa3hY2EvWjYpFXWafV9yj1U5CZXZOqQAQtOMITo="; + vendorHash = "sha256-spIdC2ZV+2tm3noyEhygoblN2BjE0w75n4I3jsrg6HI="; ldflags = [ "-s" @@ -68,6 +68,7 @@ buildGoModule rec { maintainers = with maintainers; [ mausch vilsol + wrbbz ]; mainProgram = "telepresence"; }; diff --git a/pkgs/by-name/te/televido/package.nix b/pkgs/by-name/te/televido/package.nix index 1a3e5ce4658c..fa02c90a65f3 100644 --- a/pkgs/by-name/te/televido/package.nix +++ b/pkgs/by-name/te/televido/package.nix @@ -14,7 +14,7 @@ desktop-file-utils, openssl, gst_all_1, - clapper, + clapper-unwrapped, }: stdenv.mkDerivation rec { @@ -49,10 +49,11 @@ stdenv.mkDerivation rec { buildInputs = [ libadwaita desktop-file-utils - clapper + clapper-unwrapped gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav + gst_all_1.gst-plugins-bad ]; meta = { diff --git a/pkgs/by-name/te/teller/package.nix b/pkgs/by-name/te/teller/package.nix index 1fcdbcd46ff7..f3b6564c1617 100644 --- a/pkgs/by-name/te/teller/package.nix +++ b/pkgs/by-name/te/teller/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, nix-update-script, protobuf, - stdenv, - darwin, pkg-config, openssl, }: @@ -34,7 +32,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + ]; doCheck = false; diff --git a/pkgs/by-name/te/tenacity/package.nix b/pkgs/by-name/te/tenacity/package.nix index 645549e63b36..2281a9f7237c 100644 --- a/pkgs/by-name/te/tenacity/package.nix +++ b/pkgs/by-name/te/tenacity/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { pname = "tenacity"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitea { domain = "codeberg.org"; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { repo = pname; fetchSubmodules = true; rev = "v${version}"; - hash = "sha256-UU3iKfab6en4IyGlpNLUhOil3snzaZ2nI6JMqoL6DUs="; + hash = "sha256-2gndOwgEJK2zDSbjcZigbhEpGv301/ygrf+EQhKp8PI="; }; postPatch = '' @@ -70,7 +70,6 @@ stdenv.mkDerivation rec { ''; postFixup = '' - rm $out/tenacity wrapProgram "$out/bin/tenacity" \ --suffix AUDACITY_PATH : "$out/share/tenacity" \ --suffix AUDACITY_MODULES_PATH : "$out/lib/tenacity/modules" \ diff --git a/pkgs/by-name/te/termbook/package.nix b/pkgs/by-name/te/termbook/package.nix index d6b450f6b7de..70b63b9daedd 100644 --- a/pkgs/by-name/te/termbook/package.nix +++ b/pkgs/by-name/te/termbook/package.nix @@ -6,7 +6,6 @@ pkg-config, oniguruma, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,13 +28,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - oniguruma - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + oniguruma + ]; env = { RUSTONIG_SYSTEM_LIBONIG = true; diff --git a/pkgs/by-name/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix index 97d563d6498c..eb584cd18cb1 100644 --- a/pkgs/by-name/te/termius/package.nix +++ b/pkgs/by-name/te/termius/package.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "9.17.1"; - revision = "218"; + version = "9.18.1"; + revision = "220"; src = fetchurl { # find the latest version with @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap"; - hash = "sha512-KmBBE+0gNq85Kb9ouynXTkC7mcTvYOMeBaW3jjBN1IK2hoCIELrwkypFWfhpPNuo2e3GA30haql0tRZ1LU/JMg=="; + hash = "sha512-IpFMTY161PlXtsr64YAdE21BupqYHxZZC7ZNbh3Zd10F1zJhVd+qAQOLOv6vdryu0HdhPv91Z1AEfz6BwLGVYA=="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index 10db36bc3bba..2411c7a9b3e2 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.77.7"; + version = "0.77.14"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; tag = "v${version}"; - hash = "sha256-LP6qy0IAO/vD4eDTX6bgUe5mpL3ao+R4wwVNjBsaXhI="; + hash = "sha256-bhIDYW6QWVQZSV8YaDUnThr3cSY1biSjezRLj+duZwg="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ buildGoModule rec { make generate-mocks ''; - vendorHash = "sha256-dxpb3tzVBlsZM6kAEvCVWxXVsuh6fkfxz0GpArtAi7g="; + vendorHash = "sha256-V0HFTZlgsA7PeXjjLDDLJkmuATo9ln7+N0sBjAvTb3k="; doCheck = false; diff --git a/pkgs/applications/editors/textadept/deps.nix b/pkgs/by-name/te/textadept/deps.nix similarity index 100% rename from pkgs/applications/editors/textadept/deps.nix rename to pkgs/by-name/te/textadept/deps.nix diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/by-name/te/textadept/package.nix similarity index 57% rename from pkgs/applications/editors/textadept/default.nix rename to pkgs/by-name/te/textadept/package.nix index da5ffb192a3f..44632c5797dd 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/by-name/te/textadept/package.nix @@ -5,12 +5,11 @@ fetchurl, cmake, withQt ? true, - qtbase, - wrapQtAppsHook, + libsForQt5, withCurses ? false, ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "12.4"; pname = "textadept"; @@ -18,13 +17,13 @@ stdenv.mkDerivation rec { name = "textadept11"; owner = "orbitalquark"; repo = "textadept"; - rev = "textadept_${version}"; - sha256 = "sha256-nPgpQeBq5Stv2o0Ke4W2Ltnx6qLe5TIC5a8HSYVkmfI="; + tag = "textadept_${finalAttrs.version}"; + hash = "sha256-nPgpQeBq5Stv2o0Ke4W2Ltnx6qLe5TIC5a8HSYVkmfI="; }; - nativeBuildInputs = [ cmake ] ++ lib.optionals withQt [ wrapQtAppsHook ]; + nativeBuildInputs = [ cmake ] ++ lib.optionals withQt [ libsForQt5.wrapQtAppsHook ]; - buildInputs = lib.optionals withQt [ qtbase ] ++ lib.optionals withCurses ncurses; + buildInputs = lib.optionals withQt [ libsForQt5.qtbase ] ++ lib.optionals withCurses ncurses; cmakeFlags = lib.optional withQt [ "-DQT=ON" ] @@ -44,16 +43,18 @@ stdenv.mkDerivation rec { ) (import ./deps.nix) ); - meta = with lib; { + meta = { description = "Extensible text editor based on Scintilla with Lua scripting"; homepage = "http://foicica.com/textadept"; - license = licenses.mit; - maintainers = with maintainers; [ + downloadPage = "https://github.com/orbitalquark/textadept"; + changelog = "https://github.com/orbitalquark/textadept/releases/tag/textadept_${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ raskin mirrexagon arcuru ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "textadept"; }; -} +}) diff --git a/pkgs/by-name/te/textcompare/package.nix b/pkgs/by-name/te/textcompare/package.nix new file mode 100644 index 000000000000..281aa11c48e8 --- /dev/null +++ b/pkgs/by-name/te/textcompare/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchFromGitHub, + desktop-file-utils, + gjs, + gobject-introspection, + gtksourceview5, + gtk4, + libadwaita, + meson, + ninja, + wrapGAppsHook4, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "textcompare"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "josephmawa"; + repo = "TextCompare"; + tag = "v${finalAttrs.version}"; + hash = "sha256-npF2kCYeW/RGaS7x2FrHEX3BdmO8CXj47biOw9IZ4nk="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + desktop-file-utils + gjs + gobject-introspection + gtk4 + meson + ninja + wrapGAppsHook4 + ]; + + buildInputs = [ + gjs + gtksourceview5 + libadwaita + ]; + + preFixup = '' + sed -i "1 a imports.package._findEffectiveEntryPointName = () => 'io.github.josephmawa.TextCompare';" $out/bin/io.github.josephmawa.TextCompare + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Simple desktop app to compare old and new text"; + homepage = "https://github.com/josephmawa/TextCompare"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ iamanaws ]; + mainProgram = "io.github.josephmawa.TextCompare"; + platforms = lib.lists.intersectLists lib.platforms.linux gjs.meta.platforms; + }; +}) diff --git a/pkgs/by-name/te/textlsp/package.nix b/pkgs/by-name/te/textlsp/package.nix index 24abaca86ef8..2b6ad6f59bf8 100644 --- a/pkgs/by-name/te/textlsp/package.nix +++ b/pkgs/by-name/te/textlsp/package.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pygls lsprotocol language-tool-python - tree-sitter_0_21 + tree-sitter gitpython appdirs openai diff --git a/pkgs/by-name/tf/tfmigrate/package.nix b/pkgs/by-name/tf/tfmigrate/package.nix new file mode 100644 index 000000000000..4afa23225005 --- /dev/null +++ b/pkgs/by-name/tf/tfmigrate/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "tfmigrate"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "minamijoyo"; + repo = "tfmigrate"; + tag = "v${finalAttrs.version}"; + hash = "sha256-hmNTtDYo6ldBbLKcvuorM5QHju1Na8W18+OAcawXSXg="; + }; + + vendorHash = "sha256-mm34U4nLow4lCz/AgfqYZJRb71GpQjR14+tm0hfmdDc="; + + checkFlags = [ + "-skip TestExecutorDir" # assumes /usr/bin to be present + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A Terraform / OpenTofu state migration tool for GitOps "; + homepage = "https://github.com/minamijoyo/tfmigrate"; + changelog = "https://github.com/minamijoyo/tfmigrate/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lykos153 ]; + mainProgram = "tfmigrate"; + }; +}) diff --git a/pkgs/applications/networking/cluster/tftui/default.nix b/pkgs/by-name/tf/tftui/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/tftui/default.nix rename to pkgs/by-name/tf/tftui/package.nix diff --git a/pkgs/by-name/th/the-powder-toy/package.nix b/pkgs/by-name/th/the-powder-toy/package.nix index 5e752571669e..4f05c970dfcb 100644 --- a/pkgs/by-name/th/the-powder-toy/package.nix +++ b/pkgs/by-name/th/the-powder-toy/package.nix @@ -1,6 +1,5 @@ { bzip2, - Cocoa, copyDesktopItems, curl, fetchFromGitHub, @@ -48,7 +47,7 @@ stdenv.mkDerivation rec { luajit SDL2 zlib - ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; + ]; mesonFlags = [ "-Dworkaround_elusive_bzip2=false" ]; diff --git a/pkgs/by-name/th/the-way/package.nix b/pkgs/by-name/th/the-way/package.nix index ca41c64a18c3..80adfe234002 100644 --- a/pkgs/by-name/th/the-way/package.nix +++ b/pkgs/by-name/th/the-way/package.nix @@ -3,8 +3,6 @@ rustPlatform, fetchCrate, installShellFiles, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -21,10 +19,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; - useNextest = true; postInstall = '' diff --git a/pkgs/by-name/ti/tickrs/package.nix b/pkgs/by-name/ti/tickrs/package.nix index 76af2e026e12..d9b682eb2160 100644 --- a/pkgs/by-name/ti/tickrs/package.nix +++ b/pkgs/by-name/ti/tickrs/package.nix @@ -5,8 +5,6 @@ pkg-config, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,14 +25,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + zlib + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix index ec86e406ba92..e02d2f847fd7 100644 --- a/pkgs/by-name/ti/tidal-hifi/package.nix +++ b/pkgs/by-name/ti/tidal-hifi/package.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tidal-hifi"; - version = "5.18.0"; + version = "5.18.2"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-R5Xw9uIptVPYEZ73TtdWarQNtn8nhAUN+zA5tnzTaCU="; + sha256 = "sha256-jo3vnq7ul7e+UsaBswil8EctUxVJMcTxo77YyQ2ncIM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix index a7842e63dd2a..a54bc0e3ca65 100644 --- a/pkgs/by-name/ti/tideways-daemon/package.nix +++ b/pkgs/by-name/ti/tideways-daemon/package.nix @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-daemon"; - version = "1.9.36"; + version = "1.9.38"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-+EnXHjFAD23jmG8IucnppjWeGNKX6yzWJypICECy3do="; + hash = "sha256-zQ8K0oHTZfQCEYAsnKsdgGaDTlRwEfCiJpd4lxy4Q5M="; }; "aarch64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz"; - hash = "sha256-p5/wzvr7EyvELADfA1X/mo8VdAT47SbAXZlIWdGZVb4="; + hash = "sha256-atRvSpc56z5Vxo5/YGz9QzCPEP79qjl2GN0vR3nkBAE="; }; "aarch64-darwin" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-uI7qOO7nj32BXrNFMmQlX32omT4Kxruf/J7A63QQ62w="; + hash = "sha256-+X+WbHtOFW4YGyRmj388bBH0jHezWnPfTBiiOw3LFFY="; }; }; updateScript = "${ diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix index 1ef79e5d1a51..7e8dad29ce55 100644 --- a/pkgs/by-name/ti/tigerbeetle/package.nix +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -10,14 +10,14 @@ let platform = if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system; hash = builtins.getAttr platform { - "universal-macos" = "sha256-ryYQyt+qjNKiT3XQuAwaG65I8KIMrkM2QeL9WvFkyik="; - "x86_64-linux" = "sha256-VgV+K6DDtoX5CjqGUlSAZYVakAs4GWX6+8Fi9v29HjY="; - "aarch64-linux" = "sha256-euyfFe9iXnAnePYd1u4ymtWqKGrf7vNuOeS0jFtChCA="; + "universal-macos" = "sha256-6GDD3lS8g2F7cOBoqi32tKO2klY7JHtqJq8NIjTiH04="; + "x86_64-linux" = "sha256-BiRIScj309vOU5TvA19RdhUeVaGd+ke6GhTlVocbMRE="; + "aarch64-linux" = "sha256-4MlbXJ8dIHDtoXsUsJD76/YlgKt8faKhQVEeEyFi/T0="; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.16.35"; + version = "0.16.36"; src = fetchzip { url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip"; diff --git a/pkgs/by-name/ti/tika/package.nix b/pkgs/by-name/ti/tika/package.nix index e137b2e2e95f..cbd1309bfbba 100644 --- a/pkgs/by-name/ti/tika/package.nix +++ b/pkgs/by-name/ti/tika/package.nix @@ -2,26 +2,41 @@ lib, stdenv, maven, - jdk8, + jdk17, + jre17_minimal, fetchFromGitHub, makeWrapper, mvnDepsHash ? null, + enableGui ? true, enableOcr ? true, + runCommand, tesseract, nixosTests, }: let mvnDepsHashes = { - "x86_64-linux" = "sha256-a2EIxok7Ov2QQntu3fpagzvMAQcBjKwcd1whDNdCm2E="; - "aarch64-linux" = "sha256-TUJmlnFJeYY4Pzrmd+9uKb07Tq7HYd4EnAXkbgGCFDk="; - "x86_64-darwin" = "sha256-OTctUd4lsH6Z6H7rDYbyAcrBmzpSzFELjPBRN8zUyhY="; - "aarch64-darwin" = "sha256-0tNFHEaxAEqrZTTrGCIX53K9MczkqIuDABD/bB6R1KU="; + "x86_64-linux" = "sha256-OTd51n6SSlFziqvvHmfyMAyQRwIzsHxFGuJ62zlX1Ec="; + "aarch64-linux" = "sha256-tPaGLqm0jgEoz0BD/C6AG9xupovQvib/v0kB/jjqwB8="; + "x86_64-darwin" = "sha256-Rs7nTiGazUW8oJJr6fbJKelzFqd2n278sJYoMy2/0N4="; + "aarch64-darwin" = "sha256-gnP+G33LPRMQ6HRzeZ8cEV9oSohrlPcMwlBB4rvH7+E="; }; knownMvnDepsHash = mvnDepsHashes.${stdenv.system} or (lib.warn "This platform doesn't have a default mvnDepsHash value, you'll need to specify it manually" lib.fakeHash); + + jdk = jre17_minimal.override { + modules = [ + "java.base" + "java.desktop" + "java.logging" + "java.management" + "java.naming" + "java.sql" + ]; + jdk = jdk17; + }; in maven.buildMavenPackage rec { pname = "tika"; @@ -43,30 +58,53 @@ maven.buildMavenPackage rec { "org.junit.platform:junit-platform-launcher:1.10.0" ]; - mvnJdk = jdk8; + mvnJdk = jdk17; mvnHash = if mvnDepsHash != null then mvnDepsHash else knownMvnDepsHash; - mvnParameters = toString [ - "-DskipTests=true" # skip tests (out of memory exceptions) - "-Dossindex.skip" # skip dependency with vulnerability (recommended by upstream) - ]; + mvnParameters = toString ( + [ + "-DskipTests=true" # skip tests (out of memory exceptions) + "-Dossindex.skip" # skip dependency with vulnerability (recommended by upstream) + ] + ++ lib.optionals (!enableGui) [ + "-am -pl :tika-server-standard" + ] + ); nativeBuildInputs = [ makeWrapper ]; installPhase = let - binPath = lib.makeBinPath ([ jdk8.jre ] ++ lib.optionals enableOcr [ tesseract ]); + flags = "--add-opens java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED"; + + binPath = lib.makeBinPath ( + [ + (runCommand "jdk-tika" + { + nativeBuildInputs = [ makeWrapper ]; + } + '' + makeWrapper ${jdk}/bin/java $out/bin/java \ + --add-flags "${flags}" + '' + ) + ] + ++ lib.optionals enableOcr [ tesseract ] + ); in '' runHook preInstall # Note: using * instead of version would match multiple files + '' + + lib.optionalString enableGui '' install -Dm644 tika-app/target/tika-app-${version}.jar $out/share/tika/tika-app.jar + makeWrapper ${jdk}/bin/java $out/bin/tika-app \ + --add-flags "${flags} -jar $out/share/tika/tika-app.jar" + '' + + '' install -Dm644 tika-server/tika-server-standard/target/tika-server-standard-${version}.jar $out/share/tika/tika-server.jar - - makeWrapper ${jdk8.jre}/bin/java $out/bin/tika-app \ - --add-flags "-jar $out/share/tika/tika-app.jar" - makeWrapper ${jdk8.jre}/bin/java $out/bin/tika-server \ + makeWrapper ${jdk}/bin/java $out/bin/tika-server \ --prefix PATH : ${binPath} \ --add-flags "-jar $out/share/tika/tika-server.jar" diff --git a/pkgs/by-name/ti/tile38/package.nix b/pkgs/by-name/ti/tile38/package.nix index 292199c15153..0768b620740d 100644 --- a/pkgs/by-name/ti/tile38/package.nix +++ b/pkgs/by-name/ti/tile38/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "tile38"; - version = "1.34.2"; + version = "1.34.3"; src = fetchFromGitHub { owner = "tidwall"; repo = "tile38"; tag = version; - hash = "sha256-F6mSIKivRkqbuixWyl9EmUskHsiQyzNrEt1ONvDVKrg="; + hash = "sha256-0kBSMoHo6RD6NIP4fGXe3K5B+FLEN5BuphViwa6KLSg="; }; vendorHash = "sha256-SJ80FSoG8RhsReDmSX120bxzcgZ3cD3vNvWt/HiV3/w="; diff --git a/pkgs/by-name/ti/timewarrior/package.nix b/pkgs/by-name/ti/timewarrior/package.nix index 054a32860248..a525b591c614 100644 --- a/pkgs/by-name/ti/timewarrior/package.nix +++ b/pkgs/by-name/ti/timewarrior/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "timewarrior"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "timewarrior"; rev = "v${version}"; - hash = "sha256-sc4AfdXLuA9evoGU6Z97+Hq7zj9nx093+nPALRkhziQ="; + hash = "sha256-6WZ5k9cxWe+eS9me700ITq0rKEiIuDhTtmuzhOnUM4k="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ti/tio/package.nix b/pkgs/by-name/ti/tio/package.nix index bb654032f60f..4fdf3dc622da 100644 --- a/pkgs/by-name/ti/tio/package.nix +++ b/pkgs/by-name/ti/tio/package.nix @@ -9,7 +9,6 @@ inih, lua, bash-completion, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -29,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { inih lua glib - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.IOKit ]; + ]; nativeBuildInputs = [ meson diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix index a1ff5926d464..87147b7fa4a7 100644 --- a/pkgs/by-name/tl/tlrc/package.nix +++ b/pkgs/by-name/tl/tlrc/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, installShellFiles, - darwin, }: rustPlatform.buildRustPackage rec { @@ -23,10 +21,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - postInstall = '' installManPage tldr.1 installShellCompletion completions/{tldr.bash,_tldr,tldr.fish} diff --git a/pkgs/by-name/tl/tlsinfo/package.nix b/pkgs/by-name/tl/tlsinfo/package.nix index 6c5a56257a89..f977279e9451 100644 --- a/pkgs/by-name/tl/tlsinfo/package.nix +++ b/pkgs/by-name/tl/tlsinfo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tlsinfo"; - version = "0.1.45"; + version = "0.1.47"; src = fetchFromGitHub { owner = "paepckehh"; repo = "tlsinfo"; tag = "v${version}"; - hash = "sha256-gVKB03Tv00c+vO9IgwESWCU1Vqh3iwkVuQLk3BEHlUk="; + hash = "sha256-9YOFsUDNxZi1C59ZSQ31QXE9comFa6DGEzvRah0bruY="; }; - vendorHash = "sha256-FFefmnXPCyTEOUkM8A0UCz0nZ0Ors8scxZIwVPnSiac="; + vendorHash = "sha256-f7Rkpz6qGiJNhxlYPJo2G3ykItj+55PvGnNPNOU1ftI="; ldflags = [ "-s" diff --git a/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix b/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix index 53fdc8e1be0f..9de391ab6e8c 100644 --- a/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix +++ b/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tmux-mem-cpu-load"; - version = "3.8.1"; + version = "3.8.2"; src = fetchFromGitHub { owner = "thewtex"; repo = "tmux-mem-cpu-load"; rev = "v${version}"; - sha256 = "sha256-8QUcEbgk3DSsWt9TRHHtDhQ7a1hkK8RZEX+0d3h/c0w="; + sha256 = "sha256-g++6n6OD9FAw8CtXArKBgNwFf+3v+SBCHmbma7RpMBA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/to/tootik/package.nix b/pkgs/by-name/to/tootik/package.nix index b5e9747b2db0..df0046ba591e 100644 --- a/pkgs/by-name/to/tootik/package.nix +++ b/pkgs/by-name/to/tootik/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "tootik"; - version = "0.15.5"; + version = "0.15.6"; src = fetchFromGitHub { owner = "dimkr"; repo = "tootik"; tag = version; - hash = "sha256-L37m8RFJZPKDg+lhn3Hr6V3JBWBTOziybv5+Uxxihos="; + hash = "sha256-pM8lMEdXuIBNXbWTXG8JIL9LZY0EuXR4ucrvGlxMMks="; }; - vendorHash = "sha256-l5u4ImpMASri+3ph/Q5gs0oWPAk81ZmFkNfiMnIHxuU="; + vendorHash = "sha256-04H2+O8gGaoHne/OhyBLgiwXEcL7pYPoHuw8t3C5aTE="; nativeBuildInputs = [ openssl ]; diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index afc326de05f6..5a834c1a961b 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -109,7 +109,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "14.0.9"; + version = "14.5"; sources = { x86_64-linux = fetchurl { @@ -119,7 +119,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-oTOTTB5tuAhzaQY3nlSUD4lZNHAGmURIf5XCzFB2xeg="; + hash = "sha256-wSxmNPPJsLRjDVimc2Rp1rBcIgYp/CtPKuU6+gZfVmw="; }; i686-linux = fetchurl { @@ -129,7 +129,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-Z/CDaO5eEPVwBnm3SJxBYvInyB7Oy6Ve8hNJunTJET0="; + hash = "sha256-upqpWUl5qmDj7Oc/wIGdNlgIJSaTbhxlq4X+zjCPHfA="; }; }; @@ -291,7 +291,7 @@ lib.warnIf (useHardenedMalloc != null) # FONTCONFIG_FILE is required to make fontconfig read the TBB # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 # indicates the system fonts.conf being used instead. - FONTCONFIG_FILE=$TBB_IN_STORE/fontconfig/fonts.conf + FONTCONFIG_FILE=$TBB_IN_STORE/fonts/fonts.conf substituteInPlace "$FONTCONFIG_FILE" \ --replace-fail '

fonts' "$TBB_IN_STORE/fonts" diff --git a/pkgs/by-name/tp/tpm2-pkcs11-esapi/package.nix b/pkgs/by-name/tp/tpm2-pkcs11-esapi/package.nix new file mode 100644 index 000000000000..140f12bba80f --- /dev/null +++ b/pkgs/by-name/tp/tpm2-pkcs11-esapi/package.nix @@ -0,0 +1,12 @@ +{ + tpm2-pkcs11, + ... +}@args: + +tpm2-pkcs11.override ( + args + // { + fapiSupport = false; + extraDescription = "Disables FAPI support, as if TPM2_PKCS11_BACKEND were always set to 'esysdb'."; + } +) diff --git a/pkgs/by-name/tp/tpm2-pkcs11-fapi/package.nix b/pkgs/by-name/tp/tpm2-pkcs11-fapi/package.nix new file mode 100644 index 000000000000..7fe3b48b961b --- /dev/null +++ b/pkgs/by-name/tp/tpm2-pkcs11-fapi/package.nix @@ -0,0 +1,13 @@ +{ + tpm2-pkcs11, + ... +}@args: + +tpm2-pkcs11.override ( + args + // { + fapiSupport = true; + defaultToFapi = true; + extraDescription = "Enables fapi by default, as if TPM2_PKCS11_BACKEND defaulted to 'fapi'."; + } +) diff --git a/pkgs/by-name/tp/tpm2-pkcs11/default-to-fapi.patch b/pkgs/by-name/tp/tpm2-pkcs11/default-to-fapi.patch new file mode 100644 index 000000000000..74a091660707 --- /dev/null +++ b/pkgs/by-name/tp/tpm2-pkcs11/default-to-fapi.patch @@ -0,0 +1,33 @@ +From 648f0d08953152185e13feaca4feda02f8665341 Mon Sep 17 00:00:00 2001 +From: Morgan Jones +Date: Wed, 9 Apr 2025 00:12:47 -0700 +Subject: [PATCH] backend: default to fapi + +--- + src/lib/backend.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/lib/backend.c b/src/lib/backend.c +index 128f58b..8404afe 100644 +--- a/src/lib/backend.c ++++ b/src/lib/backend.c +@@ -15,12 +15,12 @@ static enum backend get_backend(void) { + + const char *env = getenv("TPM2_PKCS11_BACKEND"); + +- if (!env || !strcasecmp(env, "esysdb")) { +- return backend_esysdb; ++ if (!env || !strcasecmp(env, "fapi")) { ++ return backend_fapi; + } + +- if (!strcasecmp(env, "fapi")) { +- return backend_fapi; ++ if (!strcasecmp(env, "esysdb")) { ++ return backend_esysdb; + } + + return backend_error; +-- +2.47.0 + diff --git a/pkgs/by-name/tp/tpm2-pkcs11/package.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix index 33effd81306e..ac79ea43d0cf 100644 --- a/pkgs/by-name/tp/tpm2-pkcs11/package.nix +++ b/pkgs/by-name/tp/tpm2-pkcs11/package.nix @@ -26,14 +26,18 @@ swtpm, tpm2-abrmd, tpm2-openssl, - tpm2-pkcs11, # for passthru abrmd tests + tpm2-pkcs11, # for passthru tests + tpm2-pkcs11-esapi, + tpm2-pkcs11-fapi, tpm2-tools, tpm2-tss, which, xxd, abrmdSupport ? false, fapiSupport ? true, + defaultToFapi ? false, enableFuzzing ? false, + extraDescription ? null, }: let @@ -51,7 +55,9 @@ chosenStdenv.mkDerivation (finalAttrs: { }; # Disable Java‐based tests because of missing dependencies - patches = [ ./disable-java-integration.patch ]; + patches = + lib.singleton ./disable-java-integration.patch + ++ lib.optional defaultToFapi ./default-to-fapi.patch; postPatch = '' echo ${lib.escapeShellArg finalAttrs.version} >VERSION @@ -80,12 +86,14 @@ chosenStdenv.mkDerivation (finalAttrs: { [ (lib.enableFeature finalAttrs.doCheck "unit") (lib.enableFeature finalAttrs.doCheck "integration") + + # Strangely, it uses --with-fapi=yes|no instead of a normal configure flag. + "--with-fapi=${if fapiSupport then "yes" else "no"}" ] ++ lib.optionals enableFuzzing [ "--enable-fuzzing" "--disable-hardening" - ] - ++ lib.optional fapiSupport "--with-fapi"; + ]; strictDeps = true; @@ -178,6 +186,10 @@ chosenStdenv.mkDerivation (finalAttrs: { # Enable tests to load TPM2 OpenSSL module export OPENSSL_MODULES="${openssl-modules}/lib/ossl-modules" + '' + + lib.optionalString defaultToFapi '' + # Need to change the default since the tests expect the other way. + export TPM2_PKCS11_BACKEND=esysdb ''; postInstall = '' @@ -211,13 +223,24 @@ chosenStdenv.mkDerivation (finalAttrs: { ''; passthru = { - tests.tpm2-pkcs11-abrmd = tpm2-pkcs11.override { - abrmdSupport = true; + tests = { + inherit tpm2-pkcs11-esapi tpm2-pkcs11-fapi; + tpm2-pkcs11-abrmd = tpm2-pkcs11.override { + abrmdSupport = true; + }; + tpm2-pkcs11-esapi-abrmd = tpm2-pkcs11-esapi.override { + abrmdSupport = true; + }; + tpm2-pkcs11-fapi-abrmd = tpm2-pkcs11-fapi.override { + abrmdSupport = true; + }; }; }; meta = { - description = "PKCS#11 interface for TPM2 hardware"; + description = + "PKCS#11 interface for TPM2 hardware." + + lib.optionalString (extraDescription != null) " ${extraDescription}"; homepage = "https://github.com/tpm2-software/tpm2-pkcs11"; license = lib.licenses.bsd2; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index 0a46eeb6575e..42223fba4777 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -1,12 +1,10 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, oniguruma, - darwin, installShellFiles, tpnote, testers, @@ -32,18 +30,9 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = - [ - oniguruma - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ + oniguruma + ]; postInstall = '' installManPage docs/build/man/man1/tpnote.1 diff --git a/pkgs/by-name/tr/trackballs/package.nix b/pkgs/by-name/tr/trackballs/package.nix index 1b21058149a1..fa1f14d7d06c 100644 --- a/pkgs/by-name/tr/trackballs/package.nix +++ b/pkgs/by-name/tr/trackballs/package.nix @@ -14,17 +14,21 @@ libGL, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "trackballs"; version = "1.3.4"; src = fetchFromGitHub { owner = "trackballs"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-JKSiNe5mu8rRztUhduGFY6IsSMx6VyBqKcGO5EssI+8="; + repo = "trackballs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-JKSiNe5mu8rRztUhduGFY6IsSMx6VyBqKcGO5EssI+8="; }; + postPatch = '' + substituteInPlace src/glHelp.h --replace-fail _TTF_Font TTF_Font + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib @@ -38,12 +42,12 @@ stdenv.mkDerivation rec { libGL ]; - meta = with lib; { + meta = { homepage = "https://trackballs.github.io/"; description = "3D Marble Madness clone"; mainProgram = "trackballs"; - platforms = platforms.linux; + platforms = lib.platforms.linux; # Music is licensed under Ethymonics Free Music License. - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix index 5916ac4cca4f..2fcf417165a0 100644 --- a/pkgs/by-name/tr/tracy/package.nix +++ b/pkgs/by-name/tr/tracy/package.nix @@ -9,7 +9,6 @@ wayland-scanner, capstone, - darwin, dbus, freetype, glfw, @@ -68,11 +67,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && !withWayland)) [ glfw - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ] - ++ lib.optionals ( - stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" - ) [ darwin.apple_sdk.frameworks.UniformTypeIdentifiers ]; + ]; cmakeFlags = [ diff --git a/pkgs/by-name/tr/traderepublic-portfolio-downloader/package.nix b/pkgs/by-name/tr/traderepublic-portfolio-downloader/package.nix index 414b1d0e8c05..44349b36d388 100644 --- a/pkgs/by-name/tr/traderepublic-portfolio-downloader/package.nix +++ b/pkgs/by-name/tr/traderepublic-portfolio-downloader/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "traderepublic-portfolio-downloader"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "dhojayev"; repo = "traderepublic-portfolio-downloader"; tag = "v${version}"; - hash = "sha256-U3cyQ449e7whFE5DnOlYL6qdOQgkpLPnd5ZxAG+WkRc="; + hash = "sha256-z+8VIN3rN1s8VFIGIJ6mwKbcajIcfN0TnB0Vfq5VXYM="; }; - vendorHash = "sha256-VzBBY1mNbT6qHnsy1GE+jWXHZcUo3TNefQixVFF+HYA="; + vendorHash = "sha256-MapulF+ppRW3ClI9RlVV5TEp/nNQz3LD5WdwN5AL8sw="; postInstall = '' mv $out/bin/public $out/bin/traderepublic-portfolio-downloader diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix index 99b9858999da..238d77561386 100644 --- a/pkgs/by-name/tr/traefik/package.nix +++ b/pkgs/by-name/tr/traefik/package.nix @@ -1,22 +1,23 @@ { lib, fetchzip, - buildGo123Module, + buildGo124Module, nixosTests, + nix-update-script, }: -buildGo123Module rec { +buildGo124Module (finalAttrs: { pname = "traefik"; - version = "3.3.4"; + version = "3.3.6"; # Archive with static assets for webui src = fetchzip { - url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - hash = "sha256-KXFpdk1VMYzGldFp/b5Ss6aJvL9yG4kSbM4LOIBUL5A="; + url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz"; + hash = "sha256-HA/JSwcss5ytGPqe2dqsKTZxuhWeC/yi8Mva4YVFeDs="; stripRoot = false; }; - vendorHash = "sha256-wtZFViVNvNuhHvI1YR2ome1rs2DIAd3Iurmpi9Y6F2w="; + vendorHash = "sha256-23BkkfJ6XLAygeeKipJk4puV5sGILb8rXEEA4qJWZS4="; subPackages = [ "cmd/traefik" ]; @@ -29,8 +30,8 @@ buildGo123Module rec { ldflags="-s" ldflags+=" -w" - ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Version=${version}" - ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Codename=$CODENAME" + ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major finalAttrs.version}/pkg/version.Version=${finalAttrs.version}" + ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major finalAttrs.version}/pkg/version.Codename=$CODENAME" ''; doCheck = false; @@ -39,15 +40,17 @@ buildGo123Module rec { inherit (nixosTests) traefik; }; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { homepage = "https://traefik.io"; description = "Modern reverse proxy"; - changelog = "https://github.com/traefik/traefik/raw/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ + changelog = "https://github.com/traefik/traefik/raw/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ djds vdemeester ]; mainProgram = "traefik"; }; -} +}) diff --git a/pkgs/by-name/tr/transmission-rss/package.nix b/pkgs/by-name/tr/transmission-rss/package.nix index 1fceafe35b86..e87517d42903 100644 --- a/pkgs/by-name/tr/transmission-rss/package.nix +++ b/pkgs/by-name/tr/transmission-rss/package.nix @@ -1,11 +1,9 @@ { - stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, - darwin, }: rustPlatform.buildRustPackage { @@ -25,15 +23,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-ETbWV5OjRzQuq/rVyu22YRFjeQcuNA1REyzg46s3q5A="; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ openssl ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/tr/trayscale/package.nix b/pkgs/by-name/tr/trayscale/package.nix index fc3844d274c1..bd6f2f2cf1bc 100644 --- a/pkgs/by-name/tr/trayscale/package.nix +++ b/pkgs/by-name/tr/trayscale/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "trayscale"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; - rev = "v${version}"; - hash = "sha256-Ct52IcRm44aDibiZfA1YySC7/jocHC4rB418DQvrp1s="; + tag = "v${version}"; + hash = "sha256-HIx3icecgu29jlrHpXfIXzJAxgKSgpeGexouiL2lYB8="; }; - vendorHash = "sha256-GA3jmj1/OruiaDT+q5ZQyZfhehRIMrc9+K9CCoQ1fsE="; + vendorHash = "sha256-hFUzFjQ8LWOKifDp3FiIUwdttX0FrPpRdtWj6fqE5uQ="; subPackages = [ "cmd/trayscale" ]; @@ -60,6 +60,6 @@ buildGoModule rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sikmir ]; mainProgram = "trayscale"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/tr/tre/package.nix b/pkgs/by-name/tr/tre/package.nix index ccfb9d4937c9..268f561fbaf5 100644 --- a/pkgs/by-name/tr/tre/package.nix +++ b/pkgs/by-name/tr/tre/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, autoconf, automake, - darwin, gettext, libiconv, libtool, diff --git a/pkgs/by-name/tr/treefmt/build-config.nix b/pkgs/by-name/tr/treefmt/build-config.nix index 65fe7ca8f089..c4eb298a051c 100644 --- a/pkgs/by-name/tr/treefmt/build-config.nix +++ b/pkgs/by-name/tr/treefmt/build-config.nix @@ -24,6 +24,7 @@ settingsFile.overrideAttrs { passthru = { format = settingsFormat; settings = configuration.config; - inherit (configuration) _module options type; + inherit (configuration) _module options; + optionType = configuration.type; }; } diff --git a/pkgs/by-name/tr/treefmt/with-config.nix b/pkgs/by-name/tr/treefmt/with-config.nix index 9d3f73c1e6b2..bf139f07d9dd 100644 --- a/pkgs/by-name/tr/treefmt/with-config.nix +++ b/pkgs/by-name/tr/treefmt/with-config.nix @@ -14,6 +14,7 @@ runCommand name nativeBuildInputs = [ makeBinaryWrapper ]; treefmtExe = lib.getExe treefmt; binPath = lib.makeBinPath runtimeInputs; + passthru = { inherit runtimeInputs; }; configFile = treefmt.buildConfig { # Wrap user's modules with a default file location _file = ""; diff --git a/pkgs/by-name/tr/treesheets/package.nix b/pkgs/by-name/tr/treesheets/package.nix index ba8766e6f068..06e9c18d4c0a 100644 --- a/pkgs/by-name/tr/treesheets/package.nix +++ b/pkgs/by-name/tr/treesheets/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2025-04-05"; + version = "0-unstable-2025-04-14"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "f42f3883dd98cb40d90a891d662c9ee9181089bf"; - hash = "sha256-+wHsWAaG9UvPHiSIKy93vUpi5gWiDeGmXis+EGaQqZ0="; + rev = "ac972674917e0241c0b2cf48a2616cce510d5437"; + hash = "sha256-QAdDfx/+8ZsDkKXeJjYTUIfKvYaF1Wl/t8jbQ1dANm4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tr/trilium-next-desktop/package.nix b/pkgs/by-name/tr/trilium-next-desktop/package.nix index 584b271af68e..dae3d5de6729 100644 --- a/pkgs/by-name/tr/trilium-next-desktop/package.nix +++ b/pkgs/by-name/tr/trilium-next-desktop/package.nix @@ -15,7 +15,7 @@ let pname = "trilium-next-desktop"; - version = "0.92.7"; + version = "0.93.0"; triliumSource = os: arch: sha256: { url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-${os}-${arch}.zip"; @@ -26,10 +26,10 @@ let darwinSource = triliumSource "macos"; # exposed like this for update.sh - x86_64-linux.sha256 = "0m907hc7bvamkvijsbxqg6ns7dv7qz02d5fsl6wgqx5vi6w02y9w"; - aarch64-linux.sha256 = "1hb3sjkzz3d9vrjramz47l4aqqm7ah2k7a9s14csxllcjqjmv8nz"; - x86_64-darwin.sha256 = "0qscjw2j0nyxvx9w6m4n9yb30wzk5xmg7ylf8yp0k58jxvi7b87q"; - aarch64-darwin.sha256 = "1ah25g41x7kpjvwih59mfcf2lylwppdklrmmm1s1p2fn4261jds4"; + x86_64-linux.sha256 = "02cz98bgv8l5c96irmxla93h9vpxpfh2l25q5h4r1wcyg00k0gqc"; + aarch64-linux.sha256 = "0ahkskdaggff34zn6ml8s3v3ig8fq3isrcrckpvy9acyhk2nm924"; + x86_64-darwin.sha256 = "0p1db3bij5pipwjjh0vyscvd6anq1qriny7y7yxx2sviksgyl0i8"; + aarch64-darwin.sha256 = "0fkqlxssrdz2g63yhs1l74h037xac04y3dng7kqnrzhn740p2wjc"; sources = { x86_64-linux = linuxSource "x64" x86_64-linux.sha256; diff --git a/pkgs/by-name/tr/trilium-next-server/package.nix b/pkgs/by-name/tr/trilium-next-server/package.nix index 2ee833043e27..1c7fb0d25739 100644 --- a/pkgs/by-name/tr/trilium-next-server/package.nix +++ b/pkgs/by-name/tr/trilium-next-server/package.nix @@ -7,12 +7,12 @@ }: let - version = "0.92.7"; + version = "0.93.0"; serverSource_x64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-x64.tar.xz"; - serverSource_x64.sha256 = "0ckwfk27wfskd8pk5blvcvn6pd4jmq0dys283gsqk271n8ca4537"; + serverSource_x64.sha256 = "0gm0j8w16ynwb1rsgxd7g4pa4vm47728d8393bazppxgf91gnh3d"; serverSource_arm64.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-Server-v${version}-linux-arm64.tar.xz"; - serverSource_arm64.sha256 = "1lk0mf4h74d9z1w5jdfwbxsdh1mbbjr6gx0q0w0wg6y3ylyjcii9"; + serverSource_arm64.sha256 = "0in1y3zsx4mni02lq17q0camn07p7fngl1qjmjnhkps7pr799d2q"; serverSource = if stdenv.hostPlatform.isx86_64 then diff --git a/pkgs/by-name/tr/trunk-ng/package.nix b/pkgs/by-name/tr/trunk-ng/package.nix index 47959e4eddbf..3a865c733f70 100644 --- a/pkgs/by-name/tr/trunk-ng/package.nix +++ b/pkgs/by-name/tr/trunk-ng/package.nix @@ -6,9 +6,6 @@ pkg-config, openssl, libiconv, - CoreServices, - Security, - SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -27,9 +24,6 @@ rustPlatform.buildRustPackage rec { if stdenv.hostPlatform.isDarwin then [ libiconv - CoreServices - Security - SystemConfiguration ] else [ openssl ]; diff --git a/pkgs/by-name/ts/tsduck/package.nix b/pkgs/by-name/ts/tsduck/package.nix index b58896719134..298b3c05c803 100644 --- a/pkgs/by-name/ts/tsduck/package.nix +++ b/pkgs/by-name/ts/tsduck/package.nix @@ -2,93 +2,87 @@ lib, stdenv, fetchFromGitHub, + # build and doc tooling + asciidoctor-with-extensions, + doxygen, + graphviz, + python3, + ruby, + qpdf, + # build deps curl, + glibcLocales, jdk, libedit, + librist, + openssl, srt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tsduck"; - version = "3.31-2761"; + version = "3.40-4165"; src = fetchFromGitHub { owner = "tsduck"; repo = "tsduck"; - rev = "v${version}"; - sha256 = "sha256-268TKCh3naebbw+sOQ6d4N/zl7UEVtc3l3flFAYHDU4="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-bFnsGoElXeStIX5KwonJuF0x7DDzhzq+3oygkUOmZE0="; }; + nativeBuildInputs = [ + asciidoctor-with-extensions + doxygen + graphviz + python3 + ruby + qpdf + ]; + buildInputs = [ curl - libedit - srt + glibcLocales jdk + libedit + librist + openssl + srt ]; - # remove tests which call out to https://tsduck.io/download/test/... + enableParallelBuilding = true; + postPatch = '' - sed -i \ - -e '/TSUNIT_TEST(testMasterPlaylist);/ d' \ - -e '/TSUNIT_TEST(testMasterPlaylistWithAlternate);/ d' \ - -e '/TSUNIT_TEST(testMediaPlaylist);/ d' \ - src/utest/utestHLS.cpp - - sed -i \ - -e '/TSUNIT_TEST(testBetterSystemRandomGenerator);/ d' \ - src/utest/utestSystemRandomGenerator.cpp - - sed -i \ - -e '/TSUNIT_ASSERT(request.downloadBinaryContent/ d' \ - -e '/TSUNIT_ASSERT(!request.downloadBinaryContent/ d' \ - -e '/TSUNIT_TEST(testGitHub);/ d' \ - -e '/TSUNIT_TEST(testGoogle);/ d' \ - -e '/TSUNIT_TEST(testNoRedirection);/ d' \ - -e '/TSUNIT_TEST(testReadMeFile);/ d' \ - src/utest/utestWebRequest.cpp - - sed -i \ - -e '/TSUNIT_TEST(testHomeDirectory);/ d' \ - src/utest/utestSysUtils.cpp - - sed -i \ - -e '/TSUNIT_TEST(testIPv4Address);/ d' \ - -e '/TSUNIT_TEST(testIPv4AddressConstructors);/ d' \ - -e '/TSUNIT_TEST(testIPv4SocketAddressConstructors);/ d' \ - -e '/TSUNIT_TEST(testTCPSocket);/ d' \ - -e '/TSUNIT_TEST(testUDPSocket);/ d' \ - src/utest/utestNetworking.cpp + patchShebangs scripts ''; - enableParallelBuilding = true; + # see CONFIG.txt in the sources makeFlags = [ + "CXXFLAGS_NO_WARNINGS=-Wno-deprecated-declarations" "NODEKTEC=1" + "NOGITHUB=1" "NOHIDES=1" "NOPCSC=1" - "NORIST=1" "NOVATEK=1" - ] ++ installFlags; + "SYSPREFIX=/" + "SYSROOT=${placeholder "out"}" + ]; + # remove tests which break the sandbox + patches = [ ./tests.patch ]; checkTarget = "test"; doCheck = true; - installFlags = [ - "SYSROOT=${placeholder "out"}" - "SYSPREFIX=/" - "USRLIBDIR=/lib" - ]; installTargets = [ "install-tools" "install-devel" ]; - meta = with lib; { + meta = { description = "MPEG Transport Stream Toolkit"; homepage = "https://github.com/tsduck/tsduck"; - license = licenses.bsd2; - maintainers = with maintainers; [ siriobalmelli ]; - platforms = platforms.all; - # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.hostPlatform.isDarwin; + mainProgram = "tsversion"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ siriobalmelli ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/ts/tsduck/tests.patch b/pkgs/by-name/ts/tsduck/tests.patch new file mode 100644 index 000000000000..65b270e506f1 --- /dev/null +++ b/pkgs/by-name/ts/tsduck/tests.patch @@ -0,0 +1,744 @@ +diff --git a/src/utest/utestHLS.cpp b/src/utest/utestHLS.cpp +index ebfe67f3d..dc023b636 100644 +--- a/src/utest/utestHLS.cpp ++++ b/src/utest/utestHLS.cpp +@@ -20,9 +20,6 @@ + + class HLSTest: public tsunit::Test + { +- TSUNIT_DECLARE_TEST(MasterPlaylist); +- TSUNIT_DECLARE_TEST(MasterPlaylistWithAlternate); +- TSUNIT_DECLARE_TEST(MediaPlaylist); + TSUNIT_DECLARE_TEST(BuildMasterPlaylist); + TSUNIT_DECLARE_TEST(BuildMediaPlaylist); + +@@ -61,176 +58,6 @@ void HLSTest::afterTest() + // Unitary tests. + //---------------------------------------------------------------------------- + +-TSUNIT_DEFINE_TEST(MasterPlaylist) +-{ +- // Test file downloaded from TSDuck web site. +- // Copied from Apple test file at +- // https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_ts/master.m3u8 +- +- ts::hls::PlayList pl; +- TSUNIT_ASSERT(pl.loadURL(u"https://tsduck.io/download/test/hls/img_bipbop_adv_example_ts/master.m3u8", true)); +- TSUNIT_ASSERT(pl.isValid()); +- TSUNIT_EQUAL(ts::hls::PlayListType::MASTER, pl.type()); +- TSUNIT_EQUAL(6, pl.version()); +- TSUNIT_EQUAL(u"https://tsduck.io/download/test/hls/img_bipbop_adv_example_ts/master.m3u8", pl.url()); +- ts::hls::MediaElement media; +- pl.buildURL(media, u"foo.bar"); +- TSUNIT_EQUAL(u"foo.bar", media.relative_uri); +- TSUNIT_EQUAL(u"/download/test/hls/img_bipbop_adv_example_ts/foo.bar", media.file_path); +- TSUNIT_EQUAL(u"https://tsduck.io/download/test/hls/img_bipbop_adv_example_ts/foo.bar", media.url.toString()); +- TSUNIT_EQUAL(u"https://tsduck.io/download/test/hls/img_bipbop_adv_example_ts/foo.bar", media.urlString()); +- TSUNIT_EQUAL(0, pl.segmentCount()); +- TSUNIT_EQUAL(24, pl.playListCount()); +- TSUNIT_EQUAL(5, pl.altPlayListCount()); +- TSUNIT_EQUAL(0, pl.targetDuration().count()); +- TSUNIT_EQUAL(0, pl.mediaSequence()); +- TSUNIT_ASSERT(!pl.endList()); +- TSUNIT_EQUAL(ts::hls::PlayListType::MASTER, pl.type()); +- +- TSUNIT_EQUAL(u"v5/prog_index.m3u8", pl.playList(0).relative_uri); +- TSUNIT_EQUAL(2227464, pl.playList(0).bandwidth.toInt()); +- TSUNIT_EQUAL(2218327, pl.playList(0).average_bandwidth.toInt()); +- TSUNIT_EQUAL(960, pl.playList(0).width); +- TSUNIT_EQUAL(540, pl.playList(0).height); +- TSUNIT_EQUAL(60000, pl.playList(0).frame_rate); +- TSUNIT_EQUAL(u"avc1.640020,mp4a.40.2", pl.playList(0).codecs); +- TSUNIT_EQUAL(u"", pl.playList(0).hdcp); +- TSUNIT_EQUAL(u"", pl.playList(0).video_range); +- TSUNIT_EQUAL(u"", pl.playList(0).video); +- TSUNIT_EQUAL(u"aud1", pl.playList(0).audio); +- TSUNIT_EQUAL(u"sub1", pl.playList(0).subtitles); +- TSUNIT_EQUAL(u"cc1", pl.playList(0).closed_captions); +- TSUNIT_EQUAL(u"v5/prog_index.m3u8, 960x540, 2,227,464 b/s, @60 fps", pl.playList(0).toString()); +- +- TSUNIT_EQUAL(u"v2/prog_index.m3u8", pl.playList(23).relative_uri); +- TSUNIT_EQUAL(582387, pl.playList(23).bandwidth.toInt()); +- TSUNIT_EQUAL(570616, pl.playList(23).average_bandwidth.toInt()); +- TSUNIT_EQUAL(480, pl.playList(23).width); +- TSUNIT_EQUAL(270, pl.playList(23).height); +- TSUNIT_EQUAL(30000, pl.playList(23).frame_rate); +- TSUNIT_EQUAL(u"avc1.640015,ec-3", pl.playList(23).codecs); +- TSUNIT_EQUAL(u"", pl.playList(23).hdcp); +- TSUNIT_EQUAL(u"", pl.playList(23).video_range); +- TSUNIT_EQUAL(u"", pl.playList(23).video); +- TSUNIT_EQUAL(u"aud3", pl.playList(23).audio); +- TSUNIT_EQUAL(u"sub1", pl.playList(23).subtitles); +- TSUNIT_EQUAL(u"cc1", pl.playList(23).closed_captions); +- TSUNIT_EQUAL(u"v2/prog_index.m3u8, 480x270, 582,387 b/s, @30 fps", pl.playList(23).toString()); +- +- TSUNIT_EQUAL(0, pl.selectPlayList(0, 0, 0, 0, 0, 0)); +- TSUNIT_EQUAL(ts::NPOS, pl.selectPlayList(10000000, 0, 0, 0, 0, 0)); +- TSUNIT_EQUAL(9, pl.selectPlayListHighestBitRate()); +- TSUNIT_EQUAL(7, pl.selectPlayListLowestBitRate()); +- TSUNIT_EQUAL(1, pl.selectPlayListHighestResolution()); +- TSUNIT_EQUAL(7, pl.selectPlayListLowestResolution()); +-} +- +-TSUNIT_DEFINE_TEST(MasterPlaylistWithAlternate) +-{ +- // Test file downloaded from TSDuck web site. +- +- ts::hls::PlayList pl; +- TSUNIT_ASSERT(pl.loadURL(u"https://tsduck.io/download/test/hls/alternative/index_hd.m3u8", true)); +- TSUNIT_ASSERT(pl.isValid()); +- TSUNIT_EQUAL(ts::hls::PlayListType::MASTER, pl.type()); +- TSUNIT_EQUAL(4, pl.version()); +- TSUNIT_EQUAL(u"https://tsduck.io/download/test/hls/alternative/index_hd.m3u8", pl.url()); +- TSUNIT_EQUAL(0, pl.segmentCount()); +- TSUNIT_EQUAL(7, pl.playListCount()); +- TSUNIT_EQUAL(2, pl.altPlayListCount()); +- TSUNIT_EQUAL(0, pl.targetDuration().count()); +- TSUNIT_EQUAL(0, pl.mediaSequence()); +- TSUNIT_ASSERT(!pl.endList()); +- TSUNIT_EQUAL(ts::hls::PlayListType::MASTER, pl.type()); +- +- TSUNIT_EQUAL(u"04_hd.m3u8", pl.playList(0).relative_uri); +- TSUNIT_EQUAL(1209781, pl.playList(0).bandwidth.toInt()); +- TSUNIT_EQUAL(768, pl.playList(0).width); +- TSUNIT_EQUAL(432, pl.playList(0).height); +- TSUNIT_EQUAL(25000, pl.playList(0).frame_rate); +- TSUNIT_EQUAL(u"avc1.4D4020,mp4a.40.2", pl.playList(0).codecs); +- TSUNIT_EQUAL(u"", pl.playList(0).hdcp); +- TSUNIT_EQUAL(u"", pl.playList(0).video_range); +- TSUNIT_EQUAL(u"", pl.playList(0).video); +- TSUNIT_EQUAL(u"audio2", pl.playList(0).audio); +- TSUNIT_EQUAL(u"", pl.playList(0).subtitles); +- TSUNIT_EQUAL(u"", pl.playList(0).closed_captions); +- TSUNIT_EQUAL(u"04_hd.m3u8, 768x432, 1,209,781 b/s, @25 fps", pl.playList(0).toString()); +- +- TSUNIT_EQUAL(u"09_hd.m3u8", pl.altPlayList(0).relative_uri); +- TSUNIT_EQUAL(u"AUDIO", pl.altPlayList(0).type); +- TSUNIT_EQUAL(u"audio2", pl.altPlayList(0).group_id); +- TSUNIT_EQUAL(u"ENG", pl.altPlayList(0).name); +- TSUNIT_EQUAL(u"ENG", pl.altPlayList(0).language); +- TSUNIT_EQUAL(u"", pl.altPlayList(0).stable_rendition_id); +- TSUNIT_EQUAL(u"", pl.altPlayList(0).assoc_language); +- TSUNIT_EQUAL(u"", pl.altPlayList(0).in_stream_id); +- TSUNIT_EQUAL(u"", pl.altPlayList(0).characteristics); +- TSUNIT_EQUAL(u"", pl.altPlayList(0).channels); +- TSUNIT_ASSERT(pl.altPlayList(0).is_default); +- TSUNIT_ASSERT(pl.altPlayList(0).auto_select); +- TSUNIT_ASSERT(!pl.altPlayList(0).forced); +- +- TSUNIT_EQUAL(u"01_hd.m3u8", pl.altPlayList(1).relative_uri); +- TSUNIT_EQUAL(u"AUDIO", pl.altPlayList(1).type); +- TSUNIT_EQUAL(u"audio1", pl.altPlayList(1).group_id); +- TSUNIT_EQUAL(u"FOO", pl.altPlayList(1).name); +- TSUNIT_EQUAL(u"FOO", pl.altPlayList(1).language); +- TSUNIT_EQUAL(u"", pl.altPlayList(1).stable_rendition_id); +- TSUNIT_EQUAL(u"", pl.altPlayList(1).assoc_language); +- TSUNIT_EQUAL(u"", pl.altPlayList(1).in_stream_id); +- TSUNIT_EQUAL(u"", pl.altPlayList(1).characteristics); +- TSUNIT_EQUAL(u"", pl.altPlayList(1).channels); +- TSUNIT_ASSERT(!pl.altPlayList(1).is_default); +- TSUNIT_ASSERT(!pl.altPlayList(1).auto_select); +- TSUNIT_ASSERT(!pl.altPlayList(1).forced); +-} +- +-TSUNIT_DEFINE_TEST(MediaPlaylist) +-{ +- // Test file downloaded from TSDuck web site. +- // Copied from Apple test file at +- // https://devstreaming-cdn.apple.com/videos/streaming/examples/img_bipbop_adv_example_ts/v5/prog_index.m3u8 +- +- ts::hls::PlayList pl; +- TSUNIT_ASSERT(pl.loadURL(u"https://tsduck.io/download/test/hls/img_bipbop_adv_example_ts/v5/prog_index.m3u8", true)); +- TSUNIT_ASSERT(pl.isValid()); +- TSUNIT_EQUAL(ts::hls::PlayListType::VOD, pl.type()); +- TSUNIT_EQUAL(3, pl.version()); +- TSUNIT_EQUAL(u"https://tsduck.io/download/test/hls/img_bipbop_adv_example_ts/v5/prog_index.m3u8", pl.url()); +- ts::hls::MediaElement media; +- pl.buildURL(media, u"foo.bar"); +- TSUNIT_EQUAL(u"https://tsduck.io/download/test/hls/img_bipbop_adv_example_ts/v5/foo.bar", media.urlString()); +- TSUNIT_EQUAL(100, pl.segmentCount()); +- TSUNIT_EQUAL(0, pl.playListCount()); +- TSUNIT_EQUAL(0, pl.altPlayListCount()); +- TSUNIT_EQUAL(6, pl.targetDuration().count()); +- TSUNIT_EQUAL(0, pl.mediaSequence()); +- TSUNIT_ASSERT(pl.endList()); +- +- TSUNIT_EQUAL(u"fileSequence0.ts", pl.segment(0).relative_uri); +- TSUNIT_EQUAL(u"", pl.segment(0).title); +- TSUNIT_EQUAL(2060 * 1024, pl.segment(0).bitrate.toInt()); +- TSUNIT_EQUAL(6000, pl.segment(0).duration.count()); +- TSUNIT_ASSERT(!pl.segment(0).gap); +- +- TSUNIT_EQUAL(u"fileSequence99.ts", pl.segment(99).relative_uri); +- TSUNIT_EQUAL(u"", pl.segment(99).title); +- TSUNIT_EQUAL(2055 * 1024, pl.segment(99).bitrate.toInt()); +- TSUNIT_EQUAL(6000, pl.segment(99).duration.count()); +- TSUNIT_ASSERT(!pl.segment(99).gap); +- +- ts::hls::MediaSegment seg; +- TSUNIT_ASSERT(pl.popFirstSegment(seg)); +- TSUNIT_EQUAL(99, pl.segmentCount()); +- +- TSUNIT_EQUAL(u"fileSequence0.ts", seg.relative_uri); +- TSUNIT_EQUAL(u"", seg.title); +- TSUNIT_EQUAL(2060 * 1024, seg.bitrate.toInt()); +- TSUNIT_EQUAL(6000, seg.duration.count()); +- TSUNIT_ASSERT(!seg.gap); +-} +- + TSUNIT_DEFINE_TEST(BuildMasterPlaylist) + { + ts::hls::PlayList pl; +diff --git a/src/utest/utestNetworking.cpp b/src/utest/utestNetworking.cpp +index 058d5eb4c..67e5610d5 100644 +--- a/src/utest/utestNetworking.cpp ++++ b/src/utest/utestNetworking.cpp +@@ -33,19 +33,13 @@ + class NetworkingTest: public tsunit::Test + { + TSUNIT_DECLARE_TEST(SystemStructures); +- TSUNIT_DECLARE_TEST(IPv4AddressConstructors); +- TSUNIT_DECLARE_TEST(IPv4Address); +- TSUNIT_DECLARE_TEST(IPv6Address); + TSUNIT_DECLARE_TEST(Conversion); + TSUNIT_DECLARE_TEST(IPAddressMask); + TSUNIT_DECLARE_TEST(MACAddress); + TSUNIT_DECLARE_TEST(LocalHost); + TSUNIT_DECLARE_TEST(GetLocalIPAddresses); +- TSUNIT_DECLARE_TEST(IPv4SocketAddressConstructors); + TSUNIT_DECLARE_TEST(IPv4SocketAddress); + TSUNIT_DECLARE_TEST(IPv6SocketAddress); +- TSUNIT_DECLARE_TEST(TCPSocket); +- TSUNIT_DECLARE_TEST(UDPSocket); + TSUNIT_DECLARE_TEST(IPHeader); + TSUNIT_DECLARE_TEST(IPProtocol); + TSUNIT_DECLARE_TEST(TCPPacket); +@@ -96,183 +90,6 @@ TSUNIT_DEFINE_TEST(SystemStructures) + << "NetworkingTest::SystemStructures: sizeof(::sockaddr_storage) = " << sizeof(::sockaddr_storage) << std::endl; + } + +-TSUNIT_DEFINE_TEST(IPv4AddressConstructors) +-{ +- TSUNIT_ASSERT(ts::IPInitialize()); +- +- TSUNIT_EQUAL(0, ts::IPAddress::AnyAddress4.address4()); +- TSUNIT_EQUAL(0x7F000001, ts::IPAddress::LocalHost4.address4()); // 127.0.0.1 +- +- ts::IPAddress a1; +- TSUNIT_EQUAL(0, a1.address4()); +- +- ts::IPAddress a2(0x01020304); +- TSUNIT_EQUAL(0x01020304, a2.address4()); +- +- ts::IPAddress a3(1, 2, 3, 4); +- TSUNIT_EQUAL(0x01020304, a3.address4()); +- +- ::in_addr ia4; +- ia4.s_addr = htonl(0x01020304); +- ts::IPAddress a4(ia4); +- TSUNIT_EQUAL(0x01020304, a4.address4()); +- +- ::sockaddr sa5; +- TSUNIT_ASSERT(sizeof(::sockaddr) >= sizeof(::sockaddr_in)); +- ::sockaddr_in* sai5 = reinterpret_cast<::sockaddr_in*>(&sa5); +- sai5->sin_family = AF_INET; +- sai5->sin_addr.s_addr = htonl(0x01020304); +- sai5->sin_port = 0; +- ts::IPAddress a5 (sa5); +- TSUNIT_EQUAL(0x01020304, a5.address4()); +- +- ::sockaddr_in sa6; +- sa6.sin_family = AF_INET; +- sa6.sin_addr.s_addr = htonl(0x01020304); +- sa6.sin_port = 0; +- ts::IPAddress a6 (sa6); +- TSUNIT_EQUAL(0x01020304, a6.address4()); +- +- ts::IPAddress a7(u"2.3.4.5", CERR); +- TSUNIT_EQUAL(0x02030405, a7.address4()); +-} +- +-TSUNIT_DEFINE_TEST(IPv4Address) +-{ +- TSUNIT_ASSERT(ts::IPInitialize()); +- +- ts::IPAddress a1 (1, 2, 3, 4); +- ts::IPAddress a2 (1, 2, 3, 4); +- ts::IPAddress a3 (2, 3, 4, 5); +- +- TSUNIT_EQUAL(u"IPv4", a1.familyName()); +- TSUNIT_ASSERT(a1 == a2); +- TSUNIT_ASSERT(a1 != a3); +- +- a1.setAddress4(0x02030405); +- TSUNIT_ASSERT(a1 == a3); +- +- a1.setAddress4(1, 2, 3, 4); +- TSUNIT_ASSERT(a1 == a2); +- +- a2.setAddress4(224, 1, 2, 3); +- TSUNIT_ASSERT(!a1.isMulticast()); +- TSUNIT_ASSERT(a2.isMulticast()); +- +- TSUNIT_ASSERT(a1.hasAddress()); +- a1.clear(); +- TSUNIT_ASSERT(!a1.hasAddress()); +- TSUNIT_EQUAL(0, a1.address4()); +- +- a1.setAddress4(1, 2, 3, 4); +- ::in_addr ia; +- a1.getAddress4(ia); +- TSUNIT_EQUAL(htonl(0x01020304), ia.s_addr); +- +- ::sockaddr_storage sa; +- TSUNIT_EQUAL(sizeof(::sockaddr_in), a1.getAddress(sa, 80)); +- const ::sockaddr_in* saip = reinterpret_cast(&sa); +- TSUNIT_EQUAL(AF_INET, saip->sin_family); +- TSUNIT_EQUAL(htonl(0x01020304), saip->sin_addr.s_addr); +- TSUNIT_EQUAL(htons(80), saip->sin_port); +- +- ::sockaddr_in sai; +- a1.getAddress4(sai, 80); +- TSUNIT_EQUAL(AF_INET, sai.sin_family); +- TSUNIT_EQUAL(htonl(0x01020304), sai.sin_addr.s_addr); +- TSUNIT_EQUAL(htons(80), sai.sin_port); +- +- TSUNIT_ASSERT(a1.resolve(u"2.3.4.5", CERR)); +- TSUNIT_EQUAL(0x02030405, a1.address4()); +- +- a1.setAddress4(2, 3, 4, 5); +- const ts::UString s1(a1.toString()); +- TSUNIT_EQUAL(u"2.3.4.5", s1); +- +- // Note: fail if not connected to a network. +- debug() << "NetworkingTest: www.google.com = " << ts::IPAddress(u"www.google.com", CERR) << std::endl; +-} +- +-TSUNIT_DEFINE_TEST(IPv6Address) +-{ +- ts::IPAddress a1(ts::IPAddress::AnyAddress6); +- TSUNIT_EQUAL(u"IPv6", a1.familyName()); +- TSUNIT_EQUAL(ts::IP::v6, a1.generation()); +- TSUNIT_ASSERT(!a1.hasAddress()); +- TSUNIT_ASSERT(!a1.isMulticast()); +- +- TSUNIT_ASSERT(!ts::IPAddress::AnyAddress6.hasAddress()); +- TSUNIT_ASSERT(ts::IPAddress::LocalHost6.hasAddress()); +- TSUNIT_EQUAL(0, ts::IPAddress::LocalHost6.networkPrefix6()); +- TSUNIT_EQUAL(1, ts::IPAddress::LocalHost6.interfaceIdentifier6()); +- +- TSUNIT_ASSERT(!a1.resolve(u":", NULLREP)); +- TSUNIT_ASSERT(!a1.hasAddress()); +- +- TSUNIT_ASSERT(a1.resolve(u"::", CERR)); +- TSUNIT_ASSERT(!a1.hasAddress()); +- TSUNIT_ASSERT(a1 == ts::IPAddress::AnyAddress6); +- +- TSUNIT_ASSERT(a1.resolve(u"::1", CERR)); +- TSUNIT_ASSERT(a1.hasAddress()); +- TSUNIT_ASSERT(a1 == ts::IPAddress::LocalHost6); +- +- TSUNIT_ASSERT(!a1.resolve(u"", NULLREP)); +- TSUNIT_ASSERT(!a1.hasAddress()); +- +- a1.setAddress6(0, 1, 2, 3, 4, 5, 6, 7); +- TSUNIT_ASSERT(a1.hasAddress()); +- TSUNIT_ASSERT(!a1.isIPv4Mapped()); +- TSUNIT_EQUAL(0x0000000100020003, a1.networkPrefix6()); +- TSUNIT_EQUAL(0x0004000500060007, a1.interfaceIdentifier6()); +- TSUNIT_EQUAL(u"0:1:2:3:4:5:6:7", a1.toString()); +- TSUNIT_EQUAL(u"0000:0001:0002:0003:0004:0005:0006:0007", a1.toFullString()); +- +- a1.setAddress6(0x12, 0x345, 0x6789, 0xFFFF, 0, 0, 0, 0xBEEF); +- TSUNIT_ASSERT(a1.hasAddress()); +- TSUNIT_ASSERT(!a1.isIPv4Mapped()); +- TSUNIT_EQUAL(0x001203456789FFFF, a1.networkPrefix6()); +- TSUNIT_EQUAL(0x000000000000BEEF, a1.interfaceIdentifier6()); +- TSUNIT_EQUAL(u"12:345:6789:ffff::beef", a1.toString()); +- TSUNIT_EQUAL(u"0012:0345:6789:ffff:0000:0000:0000:beef", a1.toFullString()); +- +- TSUNIT_ASSERT(a1.resolve(u"fe80::93a3:dea0:2108:b81e", CERR)); +- TSUNIT_ASSERT(a1.hasAddress()); +- TSUNIT_ASSERT(!a1.isIPv4Mapped()); +- TSUNIT_EQUAL(0xFE80000000000000, a1.networkPrefix6()); +- TSUNIT_EQUAL(0x93A3DEA02108B81E, a1.interfaceIdentifier6()); +- TSUNIT_EQUAL(u"fe80::93a3:dea0:2108:b81e", a1.toString()); +- TSUNIT_EQUAL(u"fe80:0000:0000:0000:93a3:dea0:2108:b81e", a1.toFullString()); +- +- TSUNIT_ASSERT(a1.convert(ts::IP::Any)); +- TSUNIT_ASSERT(a1.convert(ts::IP::v6)); +- TSUNIT_ASSERT(!a1.convert(ts::IP::v4)); +- TSUNIT_EQUAL(u"IPv6", a1.familyName()); +- TSUNIT_EQUAL(ts::IP::v6, a1.generation()); +- +- ts::IPAddress a2; +- TSUNIT_ASSERT(a2.resolve(u"0:0::ffff:12.13.14.15", CERR)); +- TSUNIT_ASSERT(a2.hasAddress()); +- TSUNIT_EQUAL(u"IPv6", a2.familyName()); +- TSUNIT_EQUAL(ts::IP::v6, a2.generation()); +- TSUNIT_ASSERT(a2.isIPv4Mapped()); +- TSUNIT_EQUAL(0x0000000000000000, a2.networkPrefix6()); +- TSUNIT_EQUAL(0x0000FFFF0C0D0E0F, a2.interfaceIdentifier6()); +- TSUNIT_EQUAL(u"::ffff:12.13.14.15", a2.toString()); +- TSUNIT_EQUAL(u"0000:0000:0000:0000:0000:ffff:0c0d:0e0f", a2.toFullString()); +- +- TSUNIT_ASSERT(a2.convert(ts::IP::Any)); +- TSUNIT_ASSERT(a2.convert(ts::IP::v6)); +- TSUNIT_ASSERT(a2.convert(ts::IP::v4)); +- +- TSUNIT_ASSERT(a2.hasAddress()); +- TSUNIT_EQUAL(u"IPv4", a2.familyName()); +- TSUNIT_EQUAL(ts::IP::v4, a2.generation()); +- TSUNIT_EQUAL(u"12.13.14.15", a2.toString()); +- TSUNIT_EQUAL(u"12.13.14.15", a2.toFullString()); +- TSUNIT_EQUAL(0x0C0D0E0F, a2.address4()); +-} +- + TSUNIT_DEFINE_TEST(Conversion) + { + ts::IPAddress a1(0x12345678); +@@ -437,101 +254,6 @@ TSUNIT_DEFINE_TEST(GetLocalIPAddresses) + } + } + +-TSUNIT_DEFINE_TEST(IPv4SocketAddressConstructors) +-{ +- TSUNIT_ASSERT(ts::IPInitialize()); +- +- TSUNIT_EQUAL(0, ts::IPSocketAddress::AnyAddress4.address4()); +- TSUNIT_EQUAL(0x7F000001, ts::IPSocketAddress::LocalHost4.address4()); // 127.0.0.1 +- +- ts::IPSocketAddress a1; +- TSUNIT_EQUAL(0, a1.address4()); +- TSUNIT_EQUAL(0, a1.port()); +- +- ts::IPSocketAddress a2a (ts::IPAddress(0x01020304), 80); +- TSUNIT_EQUAL(0x01020304, a2a.address4()); +- TSUNIT_EQUAL(80, a2a.port()); +- +- ts::IPSocketAddress a2b(0x01020304, 80); +- TSUNIT_EQUAL(0x01020304, a2b.address4()); +- TSUNIT_EQUAL(80, a2b.port()); +- +- ts::IPSocketAddress a3(1, 2, 3, 4, 80); +- TSUNIT_EQUAL(0x01020304, a3.address4()); +- TSUNIT_EQUAL(80, a3.port()); +- +- ::in_addr ia4; +- ia4.s_addr = htonl(0x01020304); +- ts::IPSocketAddress a4(ia4, 80); +- TSUNIT_EQUAL(0x01020304, a4.address4()); +- TSUNIT_EQUAL(80, a4.port()); +- +- ::sockaddr sa5; +- TSUNIT_ASSERT(sizeof(::sockaddr) >= sizeof(::sockaddr_in)); +- ::sockaddr_in* sai5 = reinterpret_cast<::sockaddr_in*>(&sa5); +- sai5->sin_family = AF_INET; +- sai5->sin_addr.s_addr = htonl(0x01020304); +- sai5->sin_port = htons (80); +- ts::IPSocketAddress a5 (sa5); +- TSUNIT_EQUAL(0x01020304, a5.address4()); +- TSUNIT_EQUAL(80, a5.port()); +- +- ::sockaddr_in sa6; +- sa6.sin_family = AF_INET; +- sa6.sin_addr.s_addr = htonl(0x01020304); +- sa6.sin_port = htons(80); +- ts::IPSocketAddress a6(sa6); +- TSUNIT_EQUAL(0x01020304, a6.address4()); +- TSUNIT_EQUAL(80, a6.port()); +- +- ts::IPSocketAddress a7(u"2.3.4.5", CERR); +- TSUNIT_EQUAL(0x02030405, a7.address4()); +- TSUNIT_EQUAL(ts::IPSocketAddress::AnyPort, a7.port()); +- +- // Some hosts can return localhost in IPv4 or IPv6. +- ts::IPSocketAddress a8(u"localhost", CERR); +- if (a8.generation() == ts::IP::v6) { +- TSUNIT_EQUAL(0, a8.hexlet6(0)); +- TSUNIT_EQUAL(0, a8.hexlet6(1)); +- TSUNIT_EQUAL(0, a8.hexlet6(2)); +- TSUNIT_EQUAL(0, a8.hexlet6(3)); +- TSUNIT_EQUAL(0, a8.hexlet6(4)); +- TSUNIT_EQUAL(0, a8.hexlet6(5)); +- TSUNIT_EQUAL(0, a8.hexlet6(8)); +- TSUNIT_EQUAL(1, a8.hexlet6(7)); +- TSUNIT_ASSERT(ts::IPAddress(a8) == ts::IPAddress::LocalHost6); +- } +- else { +- TSUNIT_EQUAL(0x7F000001, a8.address4()); // 127.0.0.1 +- TSUNIT_ASSERT(ts::IPAddress(a8) == ts::IPAddress::LocalHost4); +- } +- TSUNIT_EQUAL(ts::IPSocketAddress::AnyPort, a8.port()); +- +- ts::IPSocketAddress a9(u"2.3.4.5:80", CERR); +- TSUNIT_EQUAL(0x02030405, a9.address4()); +- TSUNIT_EQUAL(80, a9.port()); +- +- ts::IPSocketAddress a10(u":80", CERR); +- TSUNIT_EQUAL(0, a10.address4()); +- TSUNIT_EQUAL(80, a10.port()); +- +- ts::IPSocketAddress a11(u"83", CERR); +- TSUNIT_EQUAL(0, a11.address4()); +- TSUNIT_EQUAL(83, a11.port()); +- +- ts::IPSocketAddress a12(u"2.3.4.5:", CERR); +- TSUNIT_EQUAL(0x02030405, a12.address4()); +- TSUNIT_EQUAL(0, a12.port()); +- +- ts::IPSocketAddress a13(u":", CERR); +- TSUNIT_EQUAL(0, a13.address4()); +- TSUNIT_EQUAL(0, a13.port()); +- +- ts::IPSocketAddress a14(u"", CERR); +- TSUNIT_EQUAL(0, a14.address4()); +- TSUNIT_EQUAL(0, a14.port()); +-} +- + TSUNIT_DEFINE_TEST(IPv4SocketAddress) + { + TSUNIT_ASSERT(ts::IPInitialize()); +@@ -739,56 +461,6 @@ namespace { + }; + } + +-// Test cases +-TSUNIT_DEFINE_TEST(TCPSocket) +-{ +- TSUNIT_ASSERT(ts::IPInitialize()); +- +- const uint16_t portNumber = 12345; +- +- // Create server socket +- CERR.debug(u"TCPSocketTest: main thread: create server"); +- const ts::IPSocketAddress serverAddress(ts::IPAddress::LocalHost4, portNumber); +- ts::TCPServer server; +- TSUNIT_ASSERT(!server.isOpen()); +- TSUNIT_ASSERT(server.open(ts::IP::v4, CERR)); +- TSUNIT_ASSERT(server.isOpen()); +- TSUNIT_ASSERT(server.reusePort(true, CERR)); +- TSUNIT_ASSERT(server.setSendBufferSize(1024, CERR)); +- TSUNIT_ASSERT(server.setReceiveBufferSize(1024, CERR)); +- TSUNIT_ASSERT(server.setTTL(1, CERR)); +- TSUNIT_ASSERT(server.bind(serverAddress, CERR)); +- TSUNIT_ASSERT(server.listen(5, CERR)); +- +- CERR.debug(u"TCPSocketTest: main thread: starting client thread"); +- TCPClient client(portNumber); +- client.start(); +- +- CERR.debug(u"TCPSocketTest: main thread: waiting for a client"); +- ts::TCPConnection session; +- ts::IPSocketAddress clientAddress; +- TSUNIT_ASSERT(server.accept(session, clientAddress, CERR)); +- CERR.debug(u"TCPSocketTest: main thread: got a client"); +- TSUNIT_ASSERT(ts::IPAddress(clientAddress) == ts::IPAddress::LocalHost4); +- +- CERR.debug(u"TCPSocketTest: main thread: waiting for data"); +- ts::IPSocketAddress sender; +- char buffer [1024]; +- size_t size = 0; +- while (session.receive(buffer, sizeof(buffer), size, nullptr, CERR)) { +- CERR.debug(u"TCPSocketTest: main thread: data received, %d bytes", size); +- TSUNIT_ASSERT(session.send(buffer, size, CERR)); +- CERR.debug(u"TCPSocketTest: main thread: data sent back"); +- } +- +- CERR.debug(u"TCPSocketTest: main thread: end of client session"); +- session.disconnect(CERR); +- session.close(CERR); +- TSUNIT_ASSERT(server.close(CERR)); +- +- CERR.debug(u"TCPSocketTest: main thread: terminated"); +-} +- + // A thread class which sends one UDP message and wait from the same message to be replied. + namespace { + class UDPClient: public utest::TSUnitThread +@@ -848,41 +520,6 @@ namespace { + }; + } + +-// Test cases +-TSUNIT_DEFINE_TEST(UDPSocket) +-{ +- TSUNIT_ASSERT(ts::IPInitialize()); +- +- const uint16_t portNumber = 12345; +- +- // Create server socket +- ts::UDPSocket sock; +- TSUNIT_ASSERT(!sock.isOpen()); +- TSUNIT_ASSERT(sock.open(ts::IP::v4, CERR)); +- TSUNIT_ASSERT(sock.isOpen()); +- TSUNIT_ASSERT(sock.setSendBufferSize(1024, CERR)); +- TSUNIT_ASSERT(sock.setReceiveBufferSize(1024, CERR)); +- TSUNIT_ASSERT(sock.reusePort(true, CERR)); +- TSUNIT_ASSERT(sock.setTTL(1, false, CERR)); +- TSUNIT_ASSERT(sock.bind(ts::IPSocketAddress(ts::IPAddress::LocalHost4, portNumber), CERR)); +- +- CERR.debug(u"UDPSocketTest: main thread: starting client thread"); +- UDPClient client(portNumber); +- client.start(); +- +- CERR.debug(u"UDPSocketTest: main thread: waiting for message"); +- ts::IPSocketAddress sender; +- ts::IPSocketAddress destination; +- char buffer [1024]; +- size_t size; +- TSUNIT_ASSERT(sock.receive(buffer, sizeof(buffer), size, sender, destination, nullptr, CERR)); +- CERR.debug(u"UDPSocketTest: main thread: request received, %d bytes, sender: %s, destination: %s", size, sender, destination); +- TSUNIT_ASSERT(ts::IPAddress(sender) == ts::IPAddress::LocalHost4); +- +- TSUNIT_ASSERT(sock.send(buffer, size, sender, CERR)); +- CERR.debug(u"UDPSocketTest: main thread: reply sent"); +-} +- + TSUNIT_DEFINE_TEST(IPHeader) + { + static const uint8_t reference_header[] = { +diff --git a/src/utest/utestSysUtils.cpp b/src/utest/utestSysUtils.cpp +index e3434d45b..a609e05c7 100644 +--- a/src/utest/utestSysUtils.cpp ++++ b/src/utest/utestSysUtils.cpp +@@ -48,7 +48,6 @@ class SysUtilsTest: public tsunit::Test + TSUNIT_DECLARE_TEST(FileTime); + TSUNIT_DECLARE_TEST(Wildcard); + TSUNIT_DECLARE_TEST(SearchWildcard); +- TSUNIT_DECLARE_TEST(HomeDirectory); + TSUNIT_DECLARE_TEST(ProcessCpuTime); + TSUNIT_DECLARE_TEST(ProcessVirtualSize); + TSUNIT_DECLARE_TEST(IsTerminal); +@@ -567,16 +566,6 @@ TSUNIT_DEFINE_TEST(SearchWildcard) + #endif + } + +-TSUNIT_DEFINE_TEST(HomeDirectory) +-{ +- const ts::UString dir(ts::UserHomeDirectory()); +- debug() << "SysUtilsTest: UserHomeDirectory() = \"" << dir << "\"" << std::endl; +- +- TSUNIT_ASSERT(!dir.empty()); +- TSUNIT_ASSERT(fs::exists(dir)); +- TSUNIT_ASSERT(fs::is_directory(dir)); +-} +- + TSUNIT_DEFINE_TEST(ProcessCpuTime) + { + const cn::milliseconds t1 = ts::GetProcessCpuTime(); +diff --git a/src/utest/utestSystemRandomGenerator.cpp b/src/utest/utestSystemRandomGenerator.cpp +index 0d7ff13dd..7e9d5b6ef 100644 +--- a/src/utest/utestSystemRandomGenerator.cpp ++++ b/src/utest/utestSystemRandomGenerator.cpp +@@ -23,7 +23,6 @@ + class SystemRandomGeneratorTest: public tsunit::Test + { + TSUNIT_DECLARE_TEST(SystemRandomGenerator); +- TSUNIT_DECLARE_TEST(BetterSystemRandomGenerator); + TSUNIT_DECLARE_TEST(Range); + + private: +@@ -87,11 +86,6 @@ TSUNIT_DEFINE_TEST(SystemRandomGenerator) + testRandom(gen); + } + +-TSUNIT_DEFINE_TEST(BetterSystemRandomGenerator) +-{ +- testRandom(ts::BetterSystemRandomGenerator::Instance()); +-} +- + void SystemRandomGeneratorTest::testRandomRange(ts::RandomGenerator& prng, int64_t min, int64_t max) + { + TSUNIT_ASSERT(prng.ready()); +diff --git a/src/utest/utestWebRequest.cpp b/src/utest/utestWebRequest.cpp +index d496c8eca..a691910ca 100644 +--- a/src/utest/utestWebRequest.cpp ++++ b/src/utest/utestWebRequest.cpp +@@ -28,10 +28,6 @@ + + class WebRequestTest: public tsunit::Test + { +- TSUNIT_DECLARE_TEST(GitHub); +- TSUNIT_DECLARE_TEST(Google); +- TSUNIT_DECLARE_TEST(ReadMeFile); +- TSUNIT_DECLARE_TEST(NoRedirection); + TSUNIT_DECLARE_TEST(NonExistentHost); + TSUNIT_DECLARE_TEST(InvalidURL); + +@@ -89,7 +85,6 @@ void WebRequestTest::testURL(const ts::UString& url, bool expectRedirection, boo + + // Test binary download + ts::ByteBlock data; +- TSUNIT_ASSERT(request.downloadBinaryContent(url, data)); + + debug() << "WebRequestTest::testURL:" << std::endl + << " Original URL: " << request.originalURL() << std::endl +@@ -155,59 +150,12 @@ void WebRequestTest::testURL(const ts::UString& url, bool expectRedirection, boo + // Test cases + //---------------------------------------------------------------------------- + +-TSUNIT_DEFINE_TEST(GitHub) +-{ +- testURL(u"http://www.github.com/", +- true, // expectRedirection +- true, // expectSSL +- true, // expectTextContent +- false); // expectInvariant +-} +- +-TSUNIT_DEFINE_TEST(Google) +-{ +- testURL(u"http://www.google.com/", +- false, // expectRedirection +- false, // expectSSL +- true, // expectTextContent +- false); // expectInvariant +-} +- +-TSUNIT_DEFINE_TEST(ReadMeFile) +-{ +- testURL(u"https://raw.githubusercontent.com/tsduck/tsduck/master/README.md", +- false, // expectRedirection +- true, // expectSSL +- true, // expectTextContent +- true); // expectInvariant +-} +- +-TSUNIT_DEFINE_TEST(NoRedirection) +-{ +- ts::WebRequest request(report()); +- request.setAutoRedirect(false); +- +- ts::ByteBlock data; +- TSUNIT_ASSERT(request.downloadBinaryContent(u"http://www.github.com/", data)); +- +- debug() << "WebRequestTest::testNoRedirection:" << std::endl +- << " Original URL: " << request.originalURL() << std::endl +- << " Final URL: " << request.finalURL() << std::endl +- << " HTTP status: " << request.httpStatus() << std::endl +- << " Content size: " << request.contentSize() << std::endl; +- +- TSUNIT_EQUAL(3, request.httpStatus() / 100); +- TSUNIT_ASSERT(!request.finalURL().empty()); +- TSUNIT_ASSERT(request.finalURL() != request.originalURL()); +-} +- + TSUNIT_DEFINE_TEST(NonExistentHost) + { + ts::ReportBuffer rep; + ts::WebRequest request(rep); + + ts::ByteBlock data; +- TSUNIT_ASSERT(!request.downloadBinaryContent(u"http://non.existent.fake-domain/", data)); + + debug() << "WebRequestTest::testNonExistentHost: " << rep.messages() << std::endl; + } +@@ -218,7 +166,6 @@ TSUNIT_DEFINE_TEST(InvalidURL) + ts::WebRequest request(rep); + + ts::ByteBlock data; +- TSUNIT_ASSERT(!request.downloadBinaryContent(u"pouette://tagada/tsoin/tsoin", data)); + + debug() << "WebRequestTest::testInvalidURL: " << rep.messages() << std::endl; + } diff --git a/pkgs/by-name/tt/ttfb/package.nix b/pkgs/by-name/tt/ttfb/package.nix index 61414492cff0..31d4e2bc9212 100644 --- a/pkgs/by-name/tt/ttfb/package.nix +++ b/pkgs/by-name/tt/ttfb/package.nix @@ -1,9 +1,7 @@ { - darwin, fetchCrate, lib, rustPlatform, - stdenv, }: rustPlatform.buildRustPackage rec { @@ -15,10 +13,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OOVqCWeF5cHMweEGWYIiWWWsw1QlNDFgnia05Qxo7uo="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - useFetchCargoVendor = true; cargoHash = "sha256-4Nsg5/66enMgAfPrUQHuhOTTwG2OWyyvKMHIhPnlHko="; diff --git a/pkgs/by-name/tt/tts/package.nix b/pkgs/by-name/tt/tts/package.nix index 89ffb9f86f99..694d1901f376 100644 --- a/pkgs/by-name/tt/tts/package.nix +++ b/pkgs/by-name/tt/tts/package.nix @@ -8,32 +8,23 @@ writableTmpDirAsHomeHook, }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - torch = super.torch-bin; - torchvision = super.torchvision-bin; - tensorflow = super.tensorflow-bin; - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "coqui-tts"; - version = "0.25.1"; + version = "0.26.0"; pyproject = true; src = fetchFromGitHub { owner = "idiap"; repo = "coqui-ai-TTS"; tag = "v${version}"; - hash = "sha256-5w1Y9wdoJ+EV/WBwK3nqyY60NEsMjQsfE4g+sJB7VwQ="; + hash = "sha256-tLTurOwSzKvejb31yijmH3LFZGJHYp0OW0ckS7Ds5ig="; }; postPatch = let relaxedConstraints = [ "bnunicodenormalizer" + "coqpit-config" "cython" "gruut" "inflect" @@ -55,7 +46,7 @@ python.pkgs.buildPythonApplication rec { pyproject.toml ''; - nativeBuildInputs = with python.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ cython numpy packaging @@ -63,7 +54,7 @@ python.pkgs.buildPythonApplication rec { hatchling ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ anyascii bangla bnnumerizer @@ -92,8 +83,8 @@ python.pkgs.buildPythonApplication rec { scipy soundfile tensorflow - torch-bin - torchaudio-bin + torch + torchaudio tqdm trainer transformers @@ -104,7 +95,7 @@ python.pkgs.buildPythonApplication rec { ]; postInstall = '' - cp -r TTS/server/templates/ $out/${python.sitePackages}/TTS/server + cp -r TTS/server/templates/ $out/${python3.sitePackages}/TTS/server ''; # tests get stuck when run in nixpkgs-review, tested in passthru @@ -114,7 +105,7 @@ python.pkgs.buildPythonApplication rec { }); nativeCheckInputs = - with python.pkgs; + with python3.pkgs; [ espeak-ng pytestCheckHook @@ -130,7 +121,7 @@ python.pkgs.buildPythonApplication rec { for file in $(grep -rl 'python TTS/bin' tests); do substituteInPlace "$file" \ - --replace "python TTS/bin" "${python.interpreter} $out/${python.sitePackages}/TTS/bin" + --replace "python TTS/bin" "${python3.interpreter} $out/${python3.sitePackages}/TTS/bin" done ''; @@ -189,7 +180,7 @@ python.pkgs.buildPythonApplication rec { ]; passthru = { - inherit python; + inherit python3; }; meta = with lib; { @@ -198,6 +189,5 @@ python.pkgs.buildPythonApplication rec { description = "Deep learning toolkit for Text-to-Speech, battle-tested in research and production"; license = licenses.mpl20; maintainers = teams.tts.members; - broken = false; }; } diff --git a/pkgs/by-name/tu/tuba/package.nix b/pkgs/by-name/tu/tuba/package.nix index 93ff59a89383..d3f9e53b1c2e 100644 --- a/pkgs/by-name/tu/tuba/package.nix +++ b/pkgs/by-name/tu/tuba/package.nix @@ -27,7 +27,7 @@ webp-pixbuf-loader, icu, gst_all_1, - clapper, + clapper-unwrapped, # clapper support is still experimental and has bugs. # See https://github.com/GeopJr/Tuba/pull/931 clapperSupport ? false, @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { gst-plugins-bad ]) ++ lib.optionals clapperSupport [ - clapper + clapper-unwrapped ]; mesonFlags = [ diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix index cf11de57e07f..079e09d45ec9 100644 --- a/pkgs/by-name/tu/tui-journal/package.nix +++ b/pkgs/by-name/tu/tui-journal/package.nix @@ -6,8 +6,6 @@ libgit2, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -28,16 +26,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - libgit2 - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + libgit2 + openssl + zlib + ]; meta = with lib; { description = "Your journal app if you live in a terminal"; diff --git a/pkgs/by-name/tu/tuicam/package.nix b/pkgs/by-name/tu/tuicam/package.nix index 338519fbeea1..344478d30ab1 100644 --- a/pkgs/by-name/tu/tuicam/package.nix +++ b/pkgs/by-name/tu/tuicam/package.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/hlsxx/tuicam"; changelog = "https://github.com/hlsxx/tuicam/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ linuxmobile ]; + maintainers = with lib.maintainers; [ FKouhai ]; platforms = lib.platforms.linux; mainProgram = "tuicam"; }; diff --git a/pkgs/applications/audio/tunefish/default.nix b/pkgs/by-name/tu/tunefish/package.nix similarity index 56% rename from pkgs/applications/audio/tunefish/default.nix rename to pkgs/by-name/tu/tunefish/package.nix index a953f5960122..9f5772e5d8e1 100644 --- a/pkgs/applications/audio/tunefish/default.nix +++ b/pkgs/by-name/tu/tunefish/package.nix @@ -15,22 +15,23 @@ webkitgtk_4_0, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "tunefish"; - version = "unstable-2020-08-13"; + version = "0-unstable-2021-12-19"; src = fetchFromGitHub { owner = "jpcima"; repo = "tunefish"; - rev = "b3d83cc66201619f6399500f6897fbeb1786d9ed"; + rev = "c801c6cab63bb9e78e38ed69bd92024f2c667f00"; + hash = "sha256-ZH2VD0IydEFdbB3Ht5D6/lbcWLQHBuu9GyasVP7VefI="; fetchSubmodules = true; - sha256 = "0rjpq3s609fblzkvnc9729glcnfinmxljh0z8ldpzr245h367zxh"; }; nativeBuildInputs = [ pkg-config python3 ]; + buildInputs = [ alsa-lib curl @@ -43,28 +44,40 @@ stdenv.mkDerivation { webkitgtk_4_0 ]; - postPatch = '' - patchShebangs src/tunefish4/generate-lv2-ttl.py - ''; - makeFlags = [ "-C" "src/tunefish4/Builds/LinuxMakefile" "CONFIG=Release" ]; + # silences build warnings + HOME = "/build"; + + postPatch = '' + patchShebangs src/tunefish4/generate-lv2-ttl.py + ''; + installPhase = '' - mkdir -p $out/lib/lv2 - cp -r src/tunefish4/Builds/LinuxMakefile/build/Tunefish4.lv2 $out/lib/lv2 + runHook preInstall + + mkdir -p $out/lib/{lv2,vst,vst3/Tunefish4.vst3} + + pushd src/tunefish4/Builds/LinuxMakefile/build + cp -r "Tunefish4.lv2" $out/lib/lv2 + cp -r "Tunefish4.vst3/Contents/x86_64-linux"/* $out/lib/vst3/Tunefish4.vst3 + cp "Tunefish4.so" $out/lib/vst + popd + + runHook postInstall ''; enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://tunefish-synth.com/"; description = "Virtual analog synthesizer LV2 plugin"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ orivej ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ orivej ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/tu/tuner/package.nix b/pkgs/by-name/tu/tuner/package.nix index ce4dc34a82e2..5c3be6074447 100644 --- a/pkgs/by-name/tu/tuner/package.nix +++ b/pkgs/by-name/tu/tuner/package.nix @@ -12,8 +12,6 @@ desktop-file-utils, libsoup_3, json-glib, - geoclue2, - geocode-glib, libgee, gtk3, pantheon, @@ -45,8 +43,6 @@ stdenv.mkDerivation rec { buildInputs = [ libsoup_3 json-glib - geoclue2 - geocode-glib libgee glib gtk3 diff --git a/pkgs/by-name/tw/twitch-dl/package.nix b/pkgs/by-name/tw/twitch-dl/package.nix index 3bb334df819a..5bbfb1baed72 100644 --- a/pkgs/by-name/tw/twitch-dl/package.nix +++ b/pkgs/by-name/tw/twitch-dl/package.nix @@ -5,24 +5,21 @@ installShellFiles, scdoc, ffmpeg, + writableTmpDirAsHomeHook, }: python3Packages.buildPythonApplication rec { pname = "twitch-dl"; - version = "2.11.0"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "ihabunek"; repo = "twitch-dl"; tag = version; - hash = "sha256-L+IbcSUaxhTg2slNc5x1VJPnA5e2qrPEeWjspK2COAI="; + hash = "sha256-/TlJG6Mh8/Ax4bKKR/plhMMY2x6YXwcFP6zjClOPaD8="; }; - pythonRelaxDeps = [ - "m3u8" - ]; - nativeBuildInputs = [ python3Packages.setuptools python3Packages.setuptools-scm @@ -38,6 +35,7 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ python3Packages.pytestCheckHook + writableTmpDirAsHomeHook ]; disabledTestPaths = [ @@ -72,10 +70,6 @@ python3Packages.buildPythonApplication rec { installManPage twitch-dl.1 ''; - preInstallCheck = '' - export HOME="$(mktemp -d)" - ''; - meta = with lib; { description = "CLI tool for downloading videos from Twitch"; homepage = "https://github.com/ihabunek/twitch-dl"; diff --git a/pkgs/by-name/tw/twitch-hls-client/package.nix b/pkgs/by-name/tw/twitch-hls-client/package.nix index a0a2150e5189..cf7311e0c4c9 100644 --- a/pkgs/by-name/tw/twitch-hls-client/package.nix +++ b/pkgs/by-name/tw/twitch-hls-client/package.nix @@ -2,27 +2,21 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "twitch-hls-client"; - version = "1.3.14"; + version = "1.4.0"; src = fetchFromGitHub { owner = "2bc4"; repo = "twitch-hls-client"; rev = version; - hash = "sha256-g7pnTu6NHvtge7vUyG1Cms6hv4ozPgawMUKYGU7VRak="; + hash = "sha256-bMND6TFM2lpnUFE6BfrNF88JRImYJy/cGhbSjIWi974="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Suq+j4/lmkEMg6VlLT8UcPcVjDyBLyjUaqPXdqDo3dU="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + cargoHash = "sha256-TvgRj6OyDcL0/I0o14CD8t2+VYu37kFXMwrS093uA1o="; meta = with lib; { description = "Minimal CLI client for watching/recording Twitch streams"; diff --git a/pkgs/applications/networking/twtxt/default.nix b/pkgs/by-name/tw/twtxt/package.nix similarity index 100% rename from pkgs/applications/networking/twtxt/default.nix rename to pkgs/by-name/tw/twtxt/package.nix diff --git a/pkgs/by-name/ty/typst-live/package.nix b/pkgs/by-name/ty/typst-live/package.nix index 1dbb2ea22744..830ceb928b9d 100644 --- a/pkgs/by-name/ty/typst-live/package.nix +++ b/pkgs/by-name/ty/typst-live/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchCrate, - stdenv, - darwin, makeWrapper, typst, }: @@ -24,10 +22,6 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - postInstall = '' wrapProgram $out/bin/typst-live \ --suffix PATH : ${lib.makeBinPath [ typst ]} diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix index b01912559be4..cc22026c7462 100644 --- a/pkgs/by-name/ty/typst/package.nix +++ b/pkgs/by-name/ty/typst/package.nix @@ -7,6 +7,7 @@ openssl, nix-update-script, versionCheckHook, + callPackage, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -56,7 +57,11 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + packages = callPackage ./typst-packages.nix { }; + withPackages = callPackage ./with-packages.nix { }; + }; meta = { changelog = "https://github.com/typst/typst/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/ty/typst/typst-packages-from-universe.toml b/pkgs/by-name/ty/typst/typst-packages-from-universe.toml new file mode 100644 index 000000000000..fb1a54456677 --- /dev/null +++ b/pkgs/by-name/ty/typst/typst-packages-from-universe.toml @@ -0,0 +1,19718 @@ +[a2c-nums."0.0.1"] +url = "https://packages.typst.org/preview/a2c-nums-0.0.1.tar.gz" +hash = "sha256-pVziMcz9ubNuUaTm+s4nMb0d8dzwB+hb/DgnQKeKeWw=" +typstDeps = [] +description = "Convert a number to Chinese" +license = [ + "MIT", +] +homepage = "https://github.com/soarowl/a2c-nums.git" + +[abbr."0.2.3"] +url = "https://packages.typst.org/preview/abbr-0.2.3.tar.gz" +hash = "sha256-H4zgbFvX14uHH5o2WtCGMtOXxejzTUPgeaObwhy6eak=" +typstDeps = [] +description = "An Abbreviations package" +license = [ + "MIT", +] +homepage = "https://git.sr.ht/~slowjo/typst-abbr" + +[abbr."0.2.2"] +url = "https://packages.typst.org/preview/abbr-0.2.2.tar.gz" +hash = "sha256-fPVIInoFZ4NKyVJojIAH02NAit0CLyubzJh+iOiaPXc=" +typstDeps = [] +description = "An Abbreviations package" +license = [ + "MIT", +] +homepage = "https://git.sr.ht/~slowjo/typst-abbr" + +[abbr."0.2.1"] +url = "https://packages.typst.org/preview/abbr-0.2.1.tar.gz" +hash = "sha256-MrnZfinOhFIo8fbnkf481WkNStmncTeeosn1NAc9Wu0=" +typstDeps = [] +description = "An Abbreviations package" +license = [ + "MIT", +] +homepage = "https://git.sr.ht/~slowjo/typst-abbr" + +[abbr."0.1.1"] +url = "https://packages.typst.org/preview/abbr-0.1.1.tar.gz" +hash = "sha256-LzJlLKFEBA3p9dpy2UwiHD9n52+9iJ/hRWRs5nmsVtA=" +typstDeps = [] +description = "An Abbreviations package" +license = [ + "MIT", +] +homepage = "https://git.sr.ht/~slowjo/typst-abbr" + +[abbr."0.1.0"] +url = "https://packages.typst.org/preview/abbr-0.1.0.tar.gz" +hash = "sha256-WKJEK4TcSIuqPkHcPWB+zmiSZsinfJAy9IGdbXta0GQ=" +typstDeps = [] +description = "An Abbreviations package" +license = [ + "MIT", +] +homepage = "https://git.sr.ht/~slowjo/typst-abbr" + +[abiding-ifacconf."0.1.0"] +url = "https://packages.typst.org/preview/abiding-ifacconf-0.1.0.tar.gz" +hash = "sha256-Vmx78w1m78eX0tIoHZsyR/Kh61cP/l5YqlhSeWjwG28=" +typstDeps = [ + "ctheorems_1_1_0", +] +description = "An IFAC-style paper template to publish at conferences for International Federation of Automatic Control" +license = [ + "MIT-0", +] +homepage = "https://github.com/avonmoll/ifacconf-typst" + +[academic-conf-pre."0.1.0"] +url = "https://packages.typst.org/preview/academic-conf-pre-0.1.0.tar.gz" +hash = "sha256-12BrUly7fU/7c0ZB+OMY3UaV7ZpYUSWQUywc042ciL8=" +typstDeps = [ + "cuti_0_2_1", + "touying_0_4_2", + "unify_0_6_0", +] +description = "Slide Theme for Acadmic Presentations in Australia" +license = [ + "MIT", +] +homepage = "https://github.com/JL-ghcoder/Typst-Pre-Template" + +[academicv."1.0.0"] +url = "https://packages.typst.org/preview/academicv-1.0.0.tar.gz" +hash = "sha256-GHXDKGpD9JZIZbCmziNORHx4n6VjwY4R4nh8bUyGYQ4=" +typstDeps = [] +description = "A clean, flexible curriculum vitae (CV) template using Typst and YAML" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/roaldarbol/academicv" + +[accelerated-jacow."0.1.3"] +url = "https://packages.typst.org/preview/accelerated-jacow-0.1.3.tar.gz" +hash = "sha256-rdamQ3duwAyaQNJqdZ7QdOJ22fTs5l0aSVu5Ykv78bQ=" +typstDeps = [ + "glossy_0_7_0", + "lilaq_0_1_0", + "physica_0_9_5", + "unify_0_7_1", +] +description = "Paper template for conference proceedings in accelerator physics" +license = [ + "GPL-3.0-only", + "MIT-0", +] +homepage = "https://github.com/eltos/accelerated-jacow/" + +[accelerated-jacow."0.1.2"] +url = "https://packages.typst.org/preview/accelerated-jacow-0.1.2.tar.gz" +hash = "sha256-juQdPIDbJ6goVgn4HqgHp8gw+Ztx6QBjTo24jh6P3iw=" +typstDeps = [ + "glossy_0_4_0", + "unify_0_6_0", +] +description = "Paper template for conference proceedings in accelerator physics" +license = [ + "GPL-3.0-only", + "MIT-0", +] +homepage = "https://github.com/eltos/accelerated-jacow/" + +[accelerated-jacow."0.1.1"] +url = "https://packages.typst.org/preview/accelerated-jacow-0.1.1.tar.gz" +hash = "sha256-JzoBrYHlfZJiPGL6CRfskmyP0DL/qmb2q4anWD9ZhOc=" +typstDeps = [ + "unify_0_6_0", +] +description = "Paper template for conference proceedings in accelerator physics" +license = [ + "GPL-3.0-only", + "MIT-0", +] +homepage = "https://github.com/eltos/accelerated-jacow/" + +[accelerated-jacow."0.1.0"] +url = "https://packages.typst.org/preview/accelerated-jacow-0.1.0.tar.gz" +hash = "sha256-C64cbdHGiCJjMvmSuT+o7z2/+qGNXtjc+sAia7Uq5S8=" +typstDeps = [ + "unify_0_6_0", +] +description = "Paper template for conference proceedings in accelerator physics" +license = [ + "GPL-3.0-only", + "MIT-0", +] +homepage = "https://github.com/eltos/accelerated-jacow/" + +[acrostiche."0.5.1"] +url = "https://packages.typst.org/preview/acrostiche-0.5.1.tar.gz" +hash = "sha256-Zh/Q9tMunWN6X4jU47r/c7WPafIHA/9lBtuGJSumGO8=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.5.0"] +url = "https://packages.typst.org/preview/acrostiche-0.5.0.tar.gz" +hash = "sha256-mZouqJU14WXv39afAqIjnqIehyke+h9nm0qfomBIluI=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.4.1"] +url = "https://packages.typst.org/preview/acrostiche-0.4.1.tar.gz" +hash = "sha256-g1IEOVKr/Lvd4kuG1h8uKSY0oZXN98mJFZ9bXKDbV7E=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.4.0"] +url = "https://packages.typst.org/preview/acrostiche-0.4.0.tar.gz" +hash = "sha256-c8m7W3YoD66+BcUkEDRvyOBlLarAoFGwc/Ut07raXwE=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.3.5"] +url = "https://packages.typst.org/preview/acrostiche-0.3.5.tar.gz" +hash = "sha256-8pKpRPaNLts5s53vVKGb4M8HEhvLMcP85i4+9uAtu4Y=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.3.4"] +url = "https://packages.typst.org/preview/acrostiche-0.3.4.tar.gz" +hash = "sha256-qqq69YomURNJZiP17I/N64QR5wGmRyZpNEMfA8gyE5I=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.3.3"] +url = "https://packages.typst.org/preview/acrostiche-0.3.3.tar.gz" +hash = "sha256-h9TG1q+ms+sZ+h4yLdYebwy2llVqy0m4h4KagXCx3eE=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.3.2"] +url = "https://packages.typst.org/preview/acrostiche-0.3.2.tar.gz" +hash = "sha256-ovSxtKCuN5Y2DCMPxZeYngOw+c4YwGcES5gLYog6Q0E=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.3.1"] +url = "https://packages.typst.org/preview/acrostiche-0.3.1.tar.gz" +hash = "sha256-OkUgSNg/NZwoAdqAVNjeLT6NGgPTnEcJorfMsX2U83A=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.3.0"] +url = "https://packages.typst.org/preview/acrostiche-0.3.0.tar.gz" +hash = "sha256-pRMAUavDeMDD7VIp14ACHOksMBRy1dofIk9MmJxXhcI=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Grisely/packages" + +[acrostiche."0.2.0"] +url = "https://packages.typst.org/preview/acrostiche-0.2.0.tar.gz" +hash = "sha256-ZMtEfY96MiyL0lnpVwqSDgSmudSpx/+ouBcFt5fboVs=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] + +[acrostiche."0.1.0"] +url = "https://packages.typst.org/preview/acrostiche-0.1.0.tar.gz" +hash = "sha256-Os6fdu9kkF3sDObR7kdNYGeegG/BT40twOd+JIMXx6Q=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] + +[acrotastic."0.1.1"] +url = "https://packages.typst.org/preview/acrotastic-0.1.1.tar.gz" +hash = "sha256-UNkf8v0Po0DQGiCzQGUzB/CrS7f8Jt8aG0EsmpwvYRU=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Julian702/typst-packages" + +[acrotastic."0.1.0"] +url = "https://packages.typst.org/preview/acrotastic-0.1.0.tar.gz" +hash = "sha256-eINTyj03/hnXWAIjClpR0tCaWkDSrW3XSOv+Un61W98=" +typstDeps = [] +description = "Manage acronyms and their definitions in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Julian702/typst-packages" + +[adaptable-pset."0.1.1"] +url = "https://packages.typst.org/preview/adaptable-pset-0.1.1.tar.gz" +hash = "sha256-DAb7eSgVZe5gW92GB5byfOn4qUuzMOTmMotJtWjxR/c=" +typstDeps = [ + "showybox_2_0_2", +] +description = "A flexible problem set template, perfect for technical courses" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/adaptable-pset" + +[adaptable-pset."0.1.0"] +url = "https://packages.typst.org/preview/adaptable-pset-0.1.0.tar.gz" +hash = "sha256-VXFpXVc+W2Di6usqM8LZ1zlnFsDXudUEnsZ3bNiDrHg=" +typstDeps = [ + "showybox_2_0_2", +] +description = "A flexible problem set template, perfect for technical courses" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/adaptable-pset" + +[aero-check."0.1.1"] +url = "https://packages.typst.org/preview/aero-check-0.1.1.tar.gz" +hash = "sha256-rf9pPBnsXdxLW9r7iePL7VU61JP05g1m9L1Q6rsdmZQ=" +typstDeps = [] +description = "A simple template to create checklists with an aviation inspired style" +license = [ + "MIT", +] +homepage = "https://github.com/TomVer99/Typst-checklist-template" + +[aero-check."0.1.0"] +url = "https://packages.typst.org/preview/aero-check-0.1.0.tar.gz" +hash = "sha256-sdeWSE+jgnGK1hAe3EMC7iKlryzTrp4keVWtVTlQYtc=" +typstDeps = [] +description = "A simple template to create checklists with an aviation inspired style" +license = [ + "MIT", +] +homepage = "https://github.com/TomVer99/Typst-checklist-template" + +[ailab-isetbz."0.1.0"] +url = "https://packages.typst.org/preview/ailab-isetbz-0.1.0.tar.gz" +hash = "sha256-1VmymGotEYdX/RuIncMg7c61E3uC/KTgUNzFr0TWo7Q=" +typstDeps = [ + "octique_0_1_0", +] +description = "Typst template for lab reports tailored for engineering students at ISET Bizerte" +license = [ + "MIT", +] +homepage = "https://github.com/a-mhamdi/ailab-isetbz" + +[aio-studi-and-thesis."0.1.1"] +url = "https://packages.typst.org/preview/aio-studi-and-thesis-0.1.1.tar.gz" +hash = "sha256-k3w4PQ0GBP5g3WQ4mtv+M7L/S4wtcXrGEUPj7OiuZt4=" +typstDeps = [ + "codly_1_3_0", + "glossarium_0_5_4", + "linguify_0_4_2", +] +description = "All-in-one template for students and theses" +license = [ + "MIT", +] +homepage = "https://github.com/fuchs-fabian/typst-template-aio-studi-and-thesis" + +[aio-studi-and-thesis."0.1.0"] +url = "https://packages.typst.org/preview/aio-studi-and-thesis-0.1.0.tar.gz" +hash = "sha256-j7FkVDolCi+jb3y5mRKRzT3VshMs1aVV3fYVBbuNrRs=" +typstDeps = [ + "codly_1_0_0", + "glossarium_0_4_1", + "linguify_0_4_1", +] +description = "All-in-one template for students and theses" +license = [ + "MIT", +] +homepage = "https://github.com/fuchs-fabian/typst-template-aio-studi-and-thesis" + +[alchemist."0.1.5"] +url = "https://packages.typst.org/preview/alchemist-0.1.5.tar.gz" +hash = "sha256-2gwsoRkHkcKr6Skvi41yq5y53kD8vRMAyvzBS1NRWZY=" +typstDeps = [ + "cetz_0_3_4", +] +description = "A package to render skeletal formulas using CeTZ" +license = [ + "MIT", +] +homepage = "https://github.com/Typsium/alchemist" + +[alchemist."0.1.4"] +url = "https://packages.typst.org/preview/alchemist-0.1.4.tar.gz" +hash = "sha256-ZMcKmnCoVCgK3QM4UDz88RL8ng9f1boUq7Y6GbWSQqA=" +typstDeps = [ + "cetz_0_3_1", + "cetz_0_3_2", +] +description = "A package to render skeletal formulas using cetz" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/alchemist" + +[alchemist."0.1.3"] +url = "https://packages.typst.org/preview/alchemist-0.1.3.tar.gz" +hash = "sha256-5ISo43sBQUij+drAhp4SBb4KO4CDmnAVLtUf8X4ndgw=" +typstDeps = [ + "cetz_0_3_1", +] +description = "A package to render skeletal formulas using cetz" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/alchemist" + +[alchemist."0.1.2"] +url = "https://packages.typst.org/preview/alchemist-0.1.2.tar.gz" +hash = "sha256-ilt3DRxnIrl1Sa9/3HKpVmot0cWkbAgRfgRa6xrl+Uc=" +typstDeps = [ + "cetz_0_3_1", +] +description = "A package to render skeletal formulas using cetz" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/alchemist" + +[alchemist."0.1.1"] +url = "https://packages.typst.org/preview/alchemist-0.1.1.tar.gz" +hash = "sha256-/2mB7c8xBWY8qF9AX90980Gm+g370BhmwJ7zbtRniy0=" +typstDeps = [ + "cetz_0_2_2", +] +description = "A package to render skeletal formulas using cetz" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/alchemist" + +[alchemist."0.1.0"] +url = "https://packages.typst.org/preview/alchemist-0.1.0.tar.gz" +hash = "sha256-bst3ivSrzStuje2NqL7aVkKRZ8wrRTSqv0tIO4KnQb8=" +typstDeps = [ + "cetz_0_2_2", +] +description = "A package to render skeletal formulas using cetz" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/alchemist" + +[alexandria."0.1.3"] +url = "https://packages.typst.org/preview/alexandria-0.1.3.tar.gz" +hash = "sha256-gYQFCxmSzEyhAFM70sKuTJIbS81IAS6g/Qy/DSR0irs=" +typstDeps = [] +description = "Use multiple bibliographies in a single Typst document " +license = [ + "MIT", +] +homepage = "https://github.com/SillyFreak/typst-alexandria" + +[alexandria."0.1.2"] +url = "https://packages.typst.org/preview/alexandria-0.1.2.tar.gz" +hash = "sha256-5nblagG8KIJw8qL/bgW2/4Ltedv3NK6eORUqR6UQ268=" +typstDeps = [] +description = "Use multiple bibliographies in a single Typst document " +license = [ + "MIT", +] +homepage = "https://github.com/SillyFreak/typst-alexandria" + +[alexandria."0.1.1"] +url = "https://packages.typst.org/preview/alexandria-0.1.1.tar.gz" +hash = "sha256-hZtp81RmNnP1SiVue81LJsV+XHvPZxBD0Av9JmVPpnE=" +typstDeps = [] +description = "Use multiple bibliographies in a single Typst document " +license = [ + "MIT", +] +homepage = "https://github.com/SillyFreak/typst-alexandria" + +[alexandria."0.1.0"] +url = "https://packages.typst.org/preview/alexandria-0.1.0.tar.gz" +hash = "sha256-kwwZzoRvG54tLFKA7RAK7IYJYfo3qGmUYREHWds7k1g=" +typstDeps = [] +description = "Use multiple bibliographies in a single Typst document " +license = [ + "MIT", +] +homepage = "https://github.com/SillyFreak/typst-alexandria" + +[algo."0.3.6"] +url = "https://packages.typst.org/preview/algo-0.3.6.tar.gz" +hash = "sha256-n3qtUwnUdv5Xcm1FwlRRorKkhDKPFT5t3p8NMMLmb7k=" +typstDeps = [] +description = "Beautifully typeset algorithms" +license = [ + "MIT", +] +homepage = "https://github.com/platformer/typst-algorithms" + +[algo."0.3.5"] +url = "https://packages.typst.org/preview/algo-0.3.5.tar.gz" +hash = "sha256-rNhxgkz7Wh4R5BfHaLmRpLIkxIZAmIViNPD5wh5E3Kg=" +typstDeps = [] +description = "Beautifully typeset algorithms" +license = [ + "MIT", +] +homepage = "https://github.com/platformer/typst-algorithms" + +[algo."0.3.4"] +url = "https://packages.typst.org/preview/algo-0.3.4.tar.gz" +hash = "sha256-FAUfCdgE7wORCS+V7IvsUfsIzvhJxqqed4SrIyLK0uY=" +typstDeps = [] +description = "Beautifully typeset algorithms" +license = [ + "MIT", +] +homepage = "https://github.com/platformer/typst-algorithms" + +[algo."0.3.3"] +url = "https://packages.typst.org/preview/algo-0.3.3.tar.gz" +hash = "sha256-3VUCgUg/a9iMQn+Qf8lUYgAQzeTr1kUka419hoGk4sQ=" +typstDeps = [] +description = "Beautifully typeset algorithms" +license = [ + "MIT", +] +homepage = "https://github.com/platformer/typst-algorithms" + +[algo."0.3.2"] +url = "https://packages.typst.org/preview/algo-0.3.2.tar.gz" +hash = "sha256-TlGOK/i8l6loDziVoU/V00/OBvzvNQQN2Omiaodesh0=" +typstDeps = [] +description = "Beautifully typeset algorithms" +license = [ + "MIT", +] +homepage = "https://github.com/platformer/typst-algorithms" + +[algo."0.3.1"] +url = "https://packages.typst.org/preview/algo-0.3.1.tar.gz" +hash = "sha256-53EvArSUnCKZPTxBC0iOC3s+O55r5hTO24hqwwGwOUM=" +typstDeps = [] +description = "Beautifully typeset algorithms" +license = [ + "MIT", +] +homepage = "https://github.com/platformer/typst-algorithms" + +[algo."0.3.0"] +url = "https://packages.typst.org/preview/algo-0.3.0.tar.gz" +hash = "sha256-v7iLmW4LHnalEgBC7p3bguclj9kXLZoEwZ3U2efXb3Y=" +typstDeps = [] +description = "Beautifully typeset algorithms" +license = [ + "MIT", +] +homepage = "https://github.com/platformer/typst-algorithms" + +[algorithmic."0.1.0"] +url = "https://packages.typst.org/preview/algorithmic-0.1.0.tar.gz" +hash = "sha256-oN5Yl0cWJ5QgzdNIePdQd2hD+uFL+DWcAdPilQ+oM6U=" +typstDeps = [] +description = "Algorithm pseudocode typesetting for Typst, inspired by algorithmicx in LaTeX" +license = [ + "MIT", +] +homepage = "https://github.com/lf-/typst-algorithmic" + +[aloecius-aip."0.0.1"] +url = "https://packages.typst.org/preview/aloecius-aip-0.0.1.tar.gz" +hash = "sha256-Z2+ibMjXWOoyNgZyoBRd0KsObc0IVwZezhMz2lHg97M=" +typstDeps = [ + "cetz_0_2_2", + "physica_0_9_3", + "whalogen_0_2_0", +] +description = "Typst template for reproducing AIP - Journal of Chemical Physics paper (draft" +license = [ + "MIT", +] +homepage = "https://github.com/Raunak12775/aloecius-aip" + +[amlos."0.2.1"] +url = "https://packages.typst.org/preview/amlos-0.2.1.tar.gz" +hash = "sha256-8fo8mYIedny52OXlJ5M2ops8fTBRXOJ9auT27CWFPME=" +typstDeps = [] +description = "Amlos makes list of symbols" +license = [ + "MPL-2.0", +] +homepage = "https://github.com/uwni/Amlos" + +[amlos."0.2.0"] +url = "https://packages.typst.org/preview/amlos-0.2.0.tar.gz" +hash = "sha256-/d38oaKwHyI8iPaMFNKR8DtrlkOlYmpSASkUfh5rYnw=" +typstDeps = [] +description = "Amlos makes list of symbols" +license = [ + "MPL-2.0", +] +homepage = "https://github.com/uwni/Amlos" + +[amlos."0.1.0"] +url = "https://packages.typst.org/preview/amlos-0.1.0.tar.gz" +hash = "sha256-3VbQ6MFPCLhEwaRMSRQQxRyrSplZiH4zycHPL8cO57I=" +typstDeps = [] +description = "Amlos makes list of symbols" +license = [ + "MPL-2.0", +] + +[amsterdammetje-article."0.1.1"] +url = "https://packages.typst.org/preview/amsterdammetje-article-0.1.1.tar.gz" +hash = "sha256-q+shUXY1t9GuJOd6UaDWgqN4eDEQUZgVfpwixTWKxlg=" +typstDeps = [ + "cetz_0_3_4", + "wordometer_0_1_4", +] +description = "University of Amsterdam Computer Science article template" +license = [ + "MPL-2.0", +] +homepage = "https://github.com/qu1ncyk/amsterdammetje-article-typst" + +[amsterdammetje-article."0.1.0"] +url = "https://packages.typst.org/preview/amsterdammetje-article-0.1.0.tar.gz" +hash = "sha256-yuWd9g4lgXuIiaI4VedPdNPyzQZhav85Lul05x0KWqQ=" +typstDeps = [ + "cetz_0_3_4", + "wordometer_0_1_4", +] +description = "University of Amsterdam Computer Science article template" +license = [ + "MPL-2.0", +] +homepage = "https://github.com/qu1ncyk/amsterdammetje-article-typst" + +[anatomy."0.1.1"] +url = "https://packages.typst.org/preview/anatomy-0.1.1.tar.gz" +hash = "sha256-s9Efy1fAoZOfE+BTMe/bE8Z6J7e1+wQTwxASs7yV8cc=" +typstDeps = [] +description = "Anatomy of a Font. Visualise metrics" +license = [ + "MIT", +] + +[anatomy."0.1.0"] +url = "https://packages.typst.org/preview/anatomy-0.1.0.tar.gz" +hash = "sha256-Oz1kh1s6ozZ6OHBMiqkcBoXx8NHaMFX4hBF5bTQfjQk=" +typstDeps = [] +description = "Anatomy of a Font. Visualise metrics" +license = [ + "MIT", +] + +[ansi-render."0.8.0"] +url = "https://packages.typst.org/preview/ansi-render-0.8.0.tar.gz" +hash = "sha256-JAtWsp1lvhY+J9OIf5x+4ihEN2kcCoXg2R5HFI9r0nY=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.7.0"] +url = "https://packages.typst.org/preview/ansi-render-0.7.0.tar.gz" +hash = "sha256-TloscU5zmdvK1Mr91ZENQKtBKqBsO1OjtO+iTl0vkFw=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.6.1"] +url = "https://packages.typst.org/preview/ansi-render-0.6.1.tar.gz" +hash = "sha256-gQ4nrQfb492cN10LtfIFpRsYo+SBKLb8Uk2G5wApT0Y=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.6.0"] +url = "https://packages.typst.org/preview/ansi-render-0.6.0.tar.gz" +hash = "sha256-fLHm/ZP8uCrnmzUTrP/EipRuC71YH391pu3kpRDMEjM=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.5.1"] +url = "https://packages.typst.org/preview/ansi-render-0.5.1.tar.gz" +hash = "sha256-0SYxjhvXfOyHjRE5sWMG8uWt1DMbs+DFDY67EvEsd9o=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.5.0"] +url = "https://packages.typst.org/preview/ansi-render-0.5.0.tar.gz" +hash = "sha256-mLJ/jyCc2DTUGRc+YUpiI3/xU4Qx4GF3QpzOCNcP0Ps=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.4.2"] +url = "https://packages.typst.org/preview/ansi-render-0.4.2.tar.gz" +hash = "sha256-OYL675sQnr6PrhvOPj8Z1Fm8/FPzRBBACDcBonTlmjg=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.4.1"] +url = "https://packages.typst.org/preview/ansi-render-0.4.1.tar.gz" +hash = "sha256-4HdBgr9ao+nEzvAEmScFFdoWsTiHqutkEr6thzY0k80=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.4.0"] +url = "https://packages.typst.org/preview/ansi-render-0.4.0.tar.gz" +hash = "sha256-JyoQ2akR+CNKey0KQIHfqiwxG/5fP3LCrv66wOm6AZ8=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.3.0"] +url = "https://packages.typst.org/preview/ansi-render-0.3.0.tar.gz" +hash = "sha256-FVs/KtkDQ/zy7C9lWI4vd8FrtKPW6bY1hTt0n9X3kaM=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.2.0"] +url = "https://packages.typst.org/preview/ansi-render-0.2.0.tar.gz" +hash = "sha256-OAgUDNqXVFBiRgVMIZiTxPPaSyOYXWfkru30q5C0MqA=" +typstDeps = [] +description = "provides a simple way to render text with ANSI escape sequences in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi-render" + +[ansi-render."0.1.0"] +url = "https://packages.typst.org/preview/ansi-render-0.1.0.tar.gz" +hash = "sha256-foAzhIQPs64y+HQpuJRA5a87mXFyCrs+jMq+G/45Xtw=" +typstDeps = [] +description = "A simple way to render text with ANSI escape sequences in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/8LWXpg/typst-ansi_render" + +[anti-matter."0.1.1"] +url = "https://packages.typst.org/preview/anti-matter-0.1.1.tar.gz" +hash = "sha256-VtBqori+QENdbj3irQP7nhA7dUHJDS0v6k04z0hNH3w=" +typstDeps = [ + "hydra_0_2_0", + "oxifmt_0_2_0", + "tidy_0_1_0", +] +description = "Simple page numbering of front and back matter" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/anti-matter" + +[anti-matter."0.1.0"] +url = "https://packages.typst.org/preview/anti-matter-0.1.0.tar.gz" +hash = "sha256-1xQ14oJjYdcu6J2KqD/Id/WEn4Lnccw6XpROdviBBuw=" +typstDeps = [ + "hydra_0_2_0", + "oxifmt_0_2_0", + "tidy_0_1_0", +] +description = "Simple page numbering of front and back matter" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/anti-matter" + +[anti-matter."0.0.2"] +url = "https://packages.typst.org/preview/anti-matter-0.0.2.tar.gz" +hash = "sha256-mUUXp4h1iRo2jV/KnnD/QXLzFKcnLbaJ3CzfWhpBTZA=" +typstDeps = [] +description = "Simple page numbering of front and back matter" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/typst-anti-matter" + +[anti-matter."0.0.1"] +url = "https://packages.typst.org/preview/anti-matter-0.0.1.tar.gz" +hash = "sha256-eW9yS9bi6NO+vUKL9DXAfrpGIbNJGmmq18HKTxNEwMU=" +typstDeps = [] +description = "Simple page numbering of front and back matter" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/typst-anti-matter" + +[apa7-ish."0.2.0"] +url = "https://packages.typst.org/preview/apa7-ish-0.2.0.tar.gz" +hash = "sha256-v9wA1y7hwjfF3yxwaSETM7ifymTT/HasN02vE+0dMFo=" +typstDeps = [] +description = "Typst Template that (mostly) complies with APA7 Style (Work in Progress" +license = [ + "MIT", +] +homepage = "https://github.com/mrwunderbar666/typst-apa7ish" + +[apa7-ish."0.1.0"] +url = "https://packages.typst.org/preview/apa7-ish-0.1.0.tar.gz" +hash = "sha256-5YNCD7VkJ69/3idnZsw/GAFLoxrjzU2mFkcoGa7dQ4w=" +typstDeps = [] +description = "Typst Template that (mostly) complies with APA7 Style (Work in Progress" +license = [ + "MIT", +] +homepage = "https://github.com/mrwunderbar666/typst-apa7ish" + +[ape."0.3.2"] +url = "https://packages.typst.org/preview/ape-0.3.2.tar.gz" +hash = "sha256-XY+eBfWembY260n2YHH6xS+Nv/O2Z/XQNNafOXkinmg=" +typstDeps = [ + "cetz_0_3_2", + "cetz-plot_0_1_1", +] +description = "Stop monkeying around with your layouts! Get sophisticated with Ape for Typst" +license = [ + "MIT", +] + +[ape."0.3.1"] +url = "https://packages.typst.org/preview/ape-0.3.1.tar.gz" +hash = "sha256-0xi7RR0JrATYGKnShguD4dXzStGGg6dkrxRhuwUCerE=" +typstDeps = [ + "cetz_0_3_1", + "cetz-plot_0_1_0", +] +description = "Stop monkeying around with your layouts! Get sophisticated with Ape for Typst" +license = [ + "MIT", +] + +[ape."0.3.0"] +url = "https://packages.typst.org/preview/ape-0.3.0.tar.gz" +hash = "sha256-al4N3HPbHfAEFvLKfCYJanhsm+rzFBK7HCfN8jjcfD8=" +typstDeps = [ + "cetz_0_3_1", + "cetz-plot_0_1_0", +] +description = "Stop monkeying around with your layouts! Get sophisticated with Ape for Typst" +license = [ + "MIT", +] + +[ape."0.2.0"] +url = "https://packages.typst.org/preview/ape-0.2.0.tar.gz" +hash = "sha256-86xONC374bMptXF8tbobMs42yWsKStD7RCIRRVbCV5Y=" +typstDeps = [ + "cetz_0_3_1", + "cetz-plot_0_1_0", +] +description = "Stop monkeying around with your layouts! Get sophisticated with Ape for Typst" +license = [ + "MIT", +] + +[ape."0.1.0"] +url = "https://packages.typst.org/preview/ape-0.1.0.tar.gz" +hash = "sha256-9/Rdz1iL4Vw26e3JvaW6BTnyvArxZFttlsVB3deijmg=" +typstDeps = [ + "cetz_0_3_1", + "cetz-plot_0_1_0", +] +description = "Stop monkeying around with your layouts! Get sophisticated with Ape for Typst" +license = [ + "MIT", +] + +[appreciated-letter."0.1.0"] +url = "https://packages.typst.org/preview/appreciated-letter-0.1.0.tar.gz" +hash = "sha256-iDU0x6Hvs/S21MyOTtZf0IlUXo19Kkm4ry1M48F1yUY=" +typstDeps = [] +description = "Correspond with business associates and your friends via mail" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[arborly."0.2.0"] +url = "https://packages.typst.org/preview/arborly-0.2.0.tar.gz" +hash = "sha256-PotA4XfhbE8qPcPUgq4dtbwrGPnP1dT7i4bRqgj4SY4=" +typstDeps = [ + "mantys_1_0_0", +] +description = "A library for producing beautiful syntax tree graphs" +license = [ + "MIT", +] +homepage = "https://github.com/pearcebasmanm/arborly" + +[arborly."0.1.1"] +url = "https://packages.typst.org/preview/arborly-0.1.1.tar.gz" +hash = "sha256-KlOYYCAwJDxh/tL4DuhcZj+WIMI/yRggYFM01IA+Oik=" +typstDeps = [ + "mantys_1_0_0", +] +description = "A library for producing beautiful syntax tree graphs" +license = [ + "MIT", +] +homepage = "https://github.com/pearcebasmanm/arborly" + +[arborly."0.1.0"] +url = "https://packages.typst.org/preview/arborly-0.1.0.tar.gz" +hash = "sha256-RjjMMlT4bwmpUYOmMlct4R0PKgCcS/vxmNa4G0os2fw=" +typstDeps = [ + "mantys_1_0_0", +] +description = "A library for producing beautiful syntax tree graphs" +license = [ + "MIT", +] +homepage = "https://github.com/pearcebasmanm/arborly" + +[arkheion."0.1.0"] +url = "https://packages.typst.org/preview/arkheion-0.1.0.tar.gz" +hash = "sha256-6GxMbR4HDMCWsQDYWZnlcjcb5gpWtyMxReJ9BfGoCbM=" +typstDeps = [] +description = "A simple template reproducing popular arXiv templates" +license = [ + "MIT", +] +homepage = "https://github.com/mgoulao/arkheion" + +[ascii-ipa."2.0.0"] +url = "https://packages.typst.org/preview/ascii-ipa-2.0.0.tar.gz" +hash = "sha256-E/ookDGdRJh0Ac29xnNV+AJVALUW/uM7MyztcFJlKdg=" +typstDeps = [] +description = "Converter for ASCII representations of the International Phonetic Alphabet (IPA" +license = [ + "MIT", +] +homepage = "https://github.com/imatpot/typst-ascii-ipa" + +[ascii-ipa."1.1.1"] +url = "https://packages.typst.org/preview/ascii-ipa-1.1.1.tar.gz" +hash = "sha256-vrL1t4gc4Yw7smxqGmONzs7icjtduUOhbJn2pQEd1IE=" +typstDeps = [] +description = "Converter for ASCII representations of the International Phonetic Alphabet (IPA" +license = [ + "MIT", +] +homepage = "https://github.com/imatpot/typst-ascii-ipa" + +[ascii-ipa."1.1.0"] +url = "https://packages.typst.org/preview/ascii-ipa-1.1.0.tar.gz" +hash = "sha256-ME7AdjI+75c5LVATeYTXgULpQJmOx60tJXR8jypPwRw=" +typstDeps = [] +description = "Converter for ASCII representations of the International Phonetic Alphabet (IPA" +license = [ + "MIT", +] +homepage = "https://github.com/imatpot/typst-ascii-ipa" + +[ascii-ipa."1.0.0"] +url = "https://packages.typst.org/preview/ascii-ipa-1.0.0.tar.gz" +hash = "sha256-f88ysIeQS82G4849aBlbpS5MI2O1+q+JXYHgS4mCpVU=" +typstDeps = [] +description = "Converter for ASCII representations of the International Phonetic Alphabet (IPA" +license = [ + "MIT", +] +homepage = "https://github.com/imatpot/typst-ascii-ipa" + +[athena-tu-darmstadt-exercise."0.1.0"] +url = "https://packages.typst.org/preview/athena-tu-darmstadt-exercise-0.1.0.tar.gz" +hash = "sha256-xZafuXAwXLTvpJvzjeFwSCla1rJZGsBSJjNkZgIJzQY=" +typstDeps = [] +description = "Exercise template for TU Darmstadt (Technische Universität Darmstadt" +license = [ + "MIT", +] +homepage = "https://github.com/JeyRunner/tuda-typst-templates" + +[athena-tu-darmstadt-thesis."0.1.0"] +url = "https://packages.typst.org/preview/athena-tu-darmstadt-thesis-0.1.0.tar.gz" +hash = "sha256-xp2+xdOvfp4W49CAx7FAASLUMmwJ8YBx01m/zmdicO8=" +typstDeps = [ + "i-figured_0_2_3", +] +description = "Thesis template for TU Darmstadt (Technische Universität Darmstadt" +license = [ + "MIT", +] +homepage = "https://github.com/JeyRunner/tuda-typst-templates" + +[atomic."1.0.0"] +url = "https://packages.typst.org/preview/atomic-1.0.0.tar.gz" +hash = "sha256-HCigoT3cX1iZkC/2+WZl+1vIx9KKz7Uxm8k9LP121j4=" +typstDeps = [ + "cetz_0_3_2", +] +description = "Draw Atoms, their electron configurations, shells and orbitals in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/aargar1/atomic" + +[autofletcher."0.1.1"] +url = "https://packages.typst.org/preview/autofletcher-0.1.1.tar.gz" +hash = "sha256-ELyFlfYqV8unjzWmNs9FfDOifSAUYBOgt4R7ZzCQRdg=" +typstDeps = [ + "autofletcher_0_1_0", + "fletcher_0_4_3", + "fletcher_0_4_5", + "tidy_0_2_0", +] +description = "Easier diagrams with fletcher" +license = [ + "MIT", +] +homepage = "https://github.com/3akev/autofletcher" + +[autofletcher."0.1.0"] +url = "https://packages.typst.org/preview/autofletcher-0.1.0.tar.gz" +hash = "sha256-Sit9pzyCSJnZ858GorkIU3ji3bQb/RoGwb6xlMxJW7k=" +typstDeps = [ + "fletcher_0_4_3", + "tidy_0_2_0", +] +description = "Easier diagrams with fletcher" +license = [ + "MIT", +] +homepage = "https://github.com/3akev/autofletcher" + +[babble-bubbles."0.1.0"] +url = "https://packages.typst.org/preview/babble-bubbles-0.1.0.tar.gz" +hash = "sha256-orOm67ydNPmIangnUNiiHiPU6Y5ivQ4KEmCWkFdwdw0=" +typstDeps = [] +description = "A package to create callouts" +license = [ + "MIT", +] +homepage = "https://github.com/ShadowMitia/typst-babble-bubbles" + +[babel."0.1.1"] +url = "https://packages.typst.org/preview/babel-0.1.1.tar.gz" +hash = "sha256-quGTOatlxmnn5mzjvX+AcMBvYc4z4Rc/1IXjhURBJq8=" +typstDeps = [ + "fontawesome_0_4_0", + "mantys_0_1_4", + "metalogo_1_0_2", + "suiji_0_3_0", + "wrap-it_0_1_0", +] +description = "Redact text by replacing it with random characters" +license = [ + "MIT-0", +] +homepage = "https://codeberg.org/afiaith/babel" + +[backtrack."1.0.0"] +url = "https://packages.typst.org/preview/backtrack-1.0.0.tar.gz" +hash = "sha256-1r7+26JZm3w47iqKH25jfIPe4J8hqP5PLDmZzoaMm+k=" +typstDeps = [] +description = "A version-agnostic library for checking the compiler version" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/TheLukeGuy/backtrack" + +[badformer."0.1.0"] +url = "https://packages.typst.org/preview/badformer-0.1.0.tar.gz" +hash = "sha256-8UBr9Puw+5+/zyLyPZQG5Tqph5takTynIro1UT8jB6Y=" +typstDeps = [ + "cetz_0_1_2", +] +description = "Retro-gaming in Typst. Reach the goal and complete the mission" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[badgery."0.1.1"] +url = "https://packages.typst.org/preview/badgery-0.1.1.tar.gz" +hash = "sha256-JFTQJnp2uAng8rSAN7zERqj+kYze0j5YjxRYPalyDec=" +typstDeps = [] +description = "Adds styled badges, boxes and menu actions" +license = [ + "MIT", +] +homepage = "https://github.com/dogezen/badgery" + +[badgery."0.1.0"] +url = "https://packages.typst.org/preview/badgery-0.1.0.tar.gz" +hash = "sha256-efIgFA4s3Gdh8wLc9ovcmjufxSj2lRX2vszvnr1KdW0=" +typstDeps = [] +description = "Adds styled badges, boxes and menu actions" +license = [ + "MIT", +] +homepage = "https://github.com/dogezen/badgery" + +[bamdone-aiaa."0.1.2"] +url = "https://packages.typst.org/preview/bamdone-aiaa-0.1.2.tar.gz" +hash = "sha256-xamtt+nwE9up9i9I2R3ObIgdSq/HiCPfCYVM19rmq4Q=" +typstDeps = [ + "droplet_0_3_1", +] +description = "An American Institute of Aeronautics and Astronautics (AIAA) template for conferences" +license = [ + "MIT-0", +] +homepage = "https://github.com/isaacew/aiaa-typst" + +[bamdone-aiaa."0.1.1"] +url = "https://packages.typst.org/preview/bamdone-aiaa-0.1.1.tar.gz" +hash = "sha256-M7P3peIFeZcKTQmh6grRAVt4rdj8eNZfx7TOptJmvsU=" +typstDeps = [ + "bamdone-aiaa_0_1_0", + "droplet_0_2_0", +] +description = "An American Institute of Aeronautics and Astronautics (AIAA) template for conferences" +license = [ + "MIT-0", +] +homepage = "https://github.com/isaacew/aiaa-typst" + +[bamdone-aiaa."0.1.0"] +url = "https://packages.typst.org/preview/bamdone-aiaa-0.1.0.tar.gz" +hash = "sha256-U8pX27DywfWhIoqtFBzO2atEJF6b1dUyEt2aXiAIAFQ=" +typstDeps = [ + "droplet_0_2_0", +] +description = "An American Institute of Aeronautics and Astronautics (AIAA) template for conferences" +license = [ + "MIT-0", +] +homepage = "https://github.com/isaacew/aiaa-typst" + +[bamdone-ieeeconf."0.1.1"] +url = "https://packages.typst.org/preview/bamdone-ieeeconf-0.1.1.tar.gz" +hash = "sha256-X+LDenUMKXHY1F+cTomrprPA2HmP5YsD96XoApNG3uU=" +typstDeps = [] +description = "An IEEE-style paper template to publish at conferences and journals for Electrical Engineering, Computer Science, and Computer Engineering" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[bamdone-ieeeconf."0.1.0"] +url = "https://packages.typst.org/preview/bamdone-ieeeconf-0.1.0.tar.gz" +hash = "sha256-1pMnfSDHiRONxtUiJwXTpGJwMAyeXyMoGtaArb0bFnQ=" +typstDeps = [] +description = "An IEEE-style paper template to publish at conferences and journals for Electrical Engineering, Computer Science, and Computer Engineering" +license = [ + "MIT-0", +] +homepage = "https://github.com/isaacew/bamdone-ieeeconf" + +[bamdone-rebuttal."0.1.1"] +url = "https://packages.typst.org/preview/bamdone-rebuttal-0.1.1.tar.gz" +hash = "sha256-0bLWbhrVzFBC95gE6eNeRbMjh3mYHQyXQSBE+5gecIM=" +typstDeps = [] +description = "Rebuttal/response letter template that allows authors to respond to feedback given by reviewers in a peer-review process on a point-by-point basis" +license = [ + "MIT-0", +] +homepage = "https://github.com/avonmoll/bamdone-rebuttal" + +[bamdone-rebuttal."0.1.0"] +url = "https://packages.typst.org/preview/bamdone-rebuttal-0.1.0.tar.gz" +hash = "sha256-2Y5T94C/sSWWcn+WMQfASeDLgfpkKGceRhpd+CO9f+I=" +typstDeps = [] +description = "Rebuttal/response letter template that allows authors to respond to feedback given by reviewers in a peer-review process on a point-by-point basis" +license = [ + "MIT-0", +] +homepage = "https://github.com/avonmoll/bamdone-rebuttal" + +[basalt-backlinks."0.1.1"] +url = "https://packages.typst.org/preview/basalt-backlinks-0.1.1.tar.gz" +hash = "sha256-ynoLsV664bY6MyJF5BXM3/tBXO28g3ZxW567MKg1SgY=" +typstDeps = [] +description = "Generate and get backlinks" +license = [ + "MIT", +] +homepage = "https://github.com/GabrielDTB/basalt-backlinks" + +[basalt-backlinks."0.1.0"] +url = "https://packages.typst.org/preview/basalt-backlinks-0.1.0.tar.gz" +hash = "sha256-Zj2opKg06Dq+PUn4B89Q3FVVL+JEIUE8G6fTEAGax70=" +typstDeps = [] +description = "Generate and get backlinks" +license = [ + "MIT", +] +homepage = "https://github.com/GabrielDTB/basalt-backlinks" + +[basalt-lib."1.0.0"] +url = "https://packages.typst.org/preview/basalt-lib-1.0.0.tar.gz" +hash = "sha256-zZg+aIQ+7lEVlRfa8Twi+lOzkgaDJ4lwUl+IY+1UyIg=" +typstDeps = [] +description = "Note taking utilities / Zettelkasten framework" +license = [ + "AGPL-3.0-only", +] +homepage = "https://github.com/GabrielDTB/basalt-lib" + +[based."0.2.0"] +url = "https://packages.typst.org/preview/based-0.2.0.tar.gz" +hash = "sha256-UNk8tieGvuGY8Ue9T7r2eCb8Sb1lEe7s4fyV6iX4KYo=" +typstDeps = [] +description = "Encoder and decoder for base64, base32, and base16" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-based" + +[based."0.1.0"] +url = "https://packages.typst.org/preview/based-0.1.0.tar.gz" +hash = "sha256-5ojwPRdiFM/5r7MN05a1rWh8NRWR7zYh+liM2wNTTS4=" +typstDeps = [] +description = "Encoder and decoder for base64, base32, and base16" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-based" + +[basic-document-props."0.1.0"] +url = "https://packages.typst.org/preview/basic-document-props-0.1.0.tar.gz" +hash = "sha256-7gHvmsHDUtFNELBPzr2bqGYh+FTk2aI98i2f6n9+SZM=" +typstDeps = [] +description = "Simple document with header, footer, page numbering and mail-adress" +license = [ + "MIT", +] +homepage = "https://github.com/Notme112/typst-packages/" + +[basic-polylux."0.1.0"] +url = "https://packages.typst.org/preview/basic-polylux-0.1.0.tar.gz" +hash = "sha256-7ZhOZgiktjdN536BmRqx5QUtZvImXHkBUNP/lvVaLwM=" +typstDeps = [ + "polylux_0_4_0", +] +description = "Starter template for Polylux" +license = [ + "Unlicense", +] +homepage = "https://github.com/polylux-typ/basic" + +[basic-report."0.1.2"] +url = "https://packages.typst.org/preview/basic-report-0.1.2.tar.gz" +hash = "sha256-1gyKqdnYu/T7bJahuonb/f8N3tc+w8k3eVLAWo4SmFs=" +typstDeps = [ + "hydra_0_6_0", +] +description = "A simple template for reports" +license = [ + "MIT", +] +homepage = "https://github.com/roland-KA/basic-report-typst-template" + +[basic-report."0.1.1"] +url = "https://packages.typst.org/preview/basic-report-0.1.1.tar.gz" +hash = "sha256-kybjfPOj9fgI31fME8v36jsUYYD5deZxZUG9/MBL1sc=" +typstDeps = [ + "hydra_0_5_1", +] +description = "A simple template for reports" +license = [ + "MIT", +] +homepage = "https://github.com/roland-KA/basic-report-typst-template" + +[basic-report."0.1.0"] +url = "https://packages.typst.org/preview/basic-report-0.1.0.tar.gz" +hash = "sha256-1+pvstMEer6OjfiJN0D7u4hH6w6pZS+bHcmFykNgrDA=" +typstDeps = [ + "hydra_0_5_1", +] +description = "A simple template for reports" +license = [ + "MIT", +] +homepage = "https://github.com/roland-KA/basic-report-typst-template" + +[basic-resume."0.2.4"] +url = "https://packages.typst.org/preview/basic-resume-0.2.4.tar.gz" +hash = "sha256-5j37vf3Xa3Js6uf4z8/KldWbnxfzMz6kBlQ3gWxcw/o=" +typstDeps = [ + "scienceicons_0_0_6", +] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.2.3"] +url = "https://packages.typst.org/preview/basic-resume-0.2.3.tar.gz" +hash = "sha256-hiviO4tvUzChP+7PcGbswL5EKQ5USWCs2hdQbRIygog=" +typstDeps = [ + "scienceicons_0_0_6", +] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.2.2"] +url = "https://packages.typst.org/preview/basic-resume-0.2.2.tar.gz" +hash = "sha256-rH5FUHNt4HF+PCRkcavapTpmf+P3D5b8BnTsocswQwY=" +typstDeps = [ + "scienceicons_0_0_6", +] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.2.1"] +url = "https://packages.typst.org/preview/basic-resume-0.2.1.tar.gz" +hash = "sha256-mr/U5o2XsWwJx1/iMqDSqpgs3tv4Nci3bsDJbkNX5MY=" +typstDeps = [ + "scienceicons_0_0_6", +] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.2.0"] +url = "https://packages.typst.org/preview/basic-resume-0.2.0.tar.gz" +hash = "sha256-Wc8SSm0D4qf4s/UxSNYczdG8pyrVAmRyviYUXlakeug=" +typstDeps = [] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.1.4"] +url = "https://packages.typst.org/preview/basic-resume-0.1.4.tar.gz" +hash = "sha256-AgKKQ9hmyQGbTC6HyE8y5A0O4QFezibOLRgpXxQHbfY=" +typstDeps = [] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.1.3"] +url = "https://packages.typst.org/preview/basic-resume-0.1.3.tar.gz" +hash = "sha256-0+XSchadFrSRcFKlmQrlUVX3h/esIdsPoWkUkwIuAkM=" +typstDeps = [] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.1.2"] +url = "https://packages.typst.org/preview/basic-resume-0.1.2.tar.gz" +hash = "sha256-670UlPwj8JuCp0/DOCK/dgkTBfyzuf6dqs4phCIOK8Y=" +typstDeps = [ + "basic-resume_0_1_0", +] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[basic-resume."0.1.0"] +url = "https://packages.typst.org/preview/basic-resume-0.1.0.tar.gz" +hash = "sha256-O/a7vafRcwzB2wJCU0m69OlkU1KyS7DNLeEzLx2VEHw=" +typstDeps = [] +description = "A simple, standard resume, designed to work well with ATS" +license = [ + "Unlicense", +] +homepage = "https://github.com/stuxf/basic-typst-resume-template" + +[biceps."0.0.1"] +url = "https://packages.typst.org/preview/biceps-0.0.1.tar.gz" +hash = "sha256-w72oSOKuw72q7hK5mF78nwRsWVnI/mAXQvFWtdp89KM=" +typstDeps = [] +description = "Layout algorithm for CSS-style flex-wrap behavior. 💪" +license = [ + "MIT", +] +homepage = "https://github.com/pikaju/typst-biceps" + +[big-rati."0.1.0"] +url = "https://packages.typst.org/preview/big-rati-0.1.0.tar.gz" +hash = "sha256-g5YmNTI6FpHbGIOkexiBXVkZOWiw2ylvhmFyNhkVE+I=" +typstDeps = [] +description = "Utilities to work with big rational numbers in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/DanikVitek/typst-plugin-bigrational" + +[big-todo."0.2.0"] +url = "https://packages.typst.org/preview/big-todo-0.2.0.tar.gz" +hash = "sha256-0EFS2Uxzvcklih6cfaw9PNl0TfvEy/wHcbQm7ruqf3g=" +typstDeps = [] +description = "Package to insert clear TODOs, optionally with an outline" +license = [ + "Unlicense", +] + +[big-todo."0.1.0"] +url = "https://packages.typst.org/preview/big-todo-0.1.0.tar.gz" +hash = "sha256-7cw1KllbTWb2OUAIFl42p8rmrHbxRAB5+qEXck6qud8=" +typstDeps = [] +description = "Package to insert clear TODOs. Optionallay with an outline" +license = [ + "Unlicense", +] + +[blind-cvpr."0.5.0"] +url = "https://packages.typst.org/preview/blind-cvpr-0.5.0.tar.gz" +hash = "sha256-TQT7Zj0n7OJVfI9btjb/IRzS/1kXzETm6QGM0B5ldwI=" +typstDeps = [] +description = "CVPR-style paper template to publish at the Computer Vision and Pattern\nRecognition (CVPR) conferences" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[blindex."0.1.0"] +url = "https://packages.typst.org/preview/blindex-0.1.0.tar.gz" +hash = "sha256-/yYkghkgeF6yTm6fVK2Qj5HEf/XDeJ2oQ7M1jIW6TDU=" +typstDeps = [] +description = "Index-making of Biblical literature citations in Typst" +license = [ + "MIT", +] + +[blinky."0.2.0"] +url = "https://packages.typst.org/preview/blinky-0.2.0.tar.gz" +hash = "sha256-R00jeUxy1y/OwiDbknFbjxnxbD0JT1MnTIkkeeQTpa0=" +typstDeps = [] +description = "Typesets paper titles in bibliographies as hyperlinks" +license = [ + "MIT", +] +homepage = "https://github.com/alexanderkoller/typst-blinky" + +[blinky."0.1.1"] +url = "https://packages.typst.org/preview/blinky-0.1.1.tar.gz" +hash = "sha256-k3tKYhqvwH2Q85Wj+S8Pb6UHSKe8FqCbnlNjuAHPG78=" +typstDeps = [] +description = "Typesets paper titles in bibliographies as hyperlinks" +license = [ + "MIT", +] +homepage = "https://github.com/alexanderkoller/typst-blinky" + +[blinky."0.1.0"] +url = "https://packages.typst.org/preview/blinky-0.1.0.tar.gz" +hash = "sha256-2sSEMYDQuvdiTyXGM9wL5oda9h+fMFUvrhMAuUCSNU0=" +typstDeps = [] +description = "Typesets paper titles in bibliographies as hyperlinks" +license = [ + "MIT", +] +homepage = "https://github.com/alexanderkoller/typst-blinky" + +[bloated-neurips."0.7.0"] +url = "https://packages.typst.org/preview/bloated-neurips-0.7.0.tar.gz" +hash = "sha256-9keS/3dURmiljmkXje5HEnrGRclAPsclMFry8IEEA54=" +typstDeps = [] +description = "NeurIPS-style paper template to publish at the Conference and Workshop on\nNeural Information Processing Systems" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[bloated-neurips."0.5.1"] +url = "https://packages.typst.org/preview/bloated-neurips-0.5.1.tar.gz" +hash = "sha256-pTfWQlVy1bs1rYDpFKxSH2ZqMGJbg4yKUUAIHv2j/+0=" +typstDeps = [] +description = "NeurIPS-style paper template to publish at the Conference and Workshop on\nNeural Information Processing Systems" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[bloated-neurips."0.5.0"] +url = "https://packages.typst.org/preview/bloated-neurips-0.5.0.tar.gz" +hash = "sha256-Q9LFcl0BDic8LFxPAU1BOrBkifPjR/ssEMb5EFMmMwE=" +typstDeps = [] +description = "NeurIPS-style paper template to publish at the Conference and Workshop on\nNeural Information Processing Systems" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[bloated-neurips."0.2.1"] +url = "https://packages.typst.org/preview/bloated-neurips-0.2.1.tar.gz" +hash = "sha256-F140Gsyh0fqzEJMKo0+au1d19bwWxHmer5LvWA9M3fI=" +typstDeps = [ + "tablex_0_0_8", +] +description = "NeurIPS-style paper template to publish at the Conference and Workshop on Neural Information Processing Systems" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[board-n-pieces."0.6.0"] +url = "https://packages.typst.org/preview/board-n-pieces-0.6.0.tar.gz" +hash = "sha256-x2qB8ydJQeyLWmbaC+GGc8+OmLqzAXTS/jI7BVTp3AE=" +typstDeps = [] +description = "Display chessboards" +license = [ + "MIT", + "GPL-2.0-only", +] +homepage = "https://github.com/MDLC01/board-n-pieces" + +[board-n-pieces."0.5.0"] +url = "https://packages.typst.org/preview/board-n-pieces-0.5.0.tar.gz" +hash = "sha256-hAEH1xhOd5JIJNbxaBm6t07LCMTv7chkfCUArJCPD1I=" +typstDeps = [] +description = "Display chessboards" +license = [ + "MIT", + "GPL-2.0-only", +] +homepage = "https://github.com/MDLC01/board-n-pieces" + +[board-n-pieces."0.4.0"] +url = "https://packages.typst.org/preview/board-n-pieces-0.4.0.tar.gz" +hash = "sha256-ecnWsR8245TByY861tfNFIYqWl2ZZaMpcgOIOIKdtDw=" +typstDeps = [] +description = "Display chessboards" +license = [ + "MIT", + "GPL-2.0-only", +] +homepage = "https://github.com/MDLC01/board-n-pieces" + +[board-n-pieces."0.3.0"] +url = "https://packages.typst.org/preview/board-n-pieces-0.3.0.tar.gz" +hash = "sha256-A7xnWwYU9SBCC0YusEYeloMg1+LvKTGj4S2Im2CFUT4=" +typstDeps = [] +description = "Display chessboards in Typst" +license = [ + "MIT", + "GPL-2.0-only", +] +homepage = "https://github.com/MDLC01/board-n-pieces" + +[board-n-pieces."0.2.0"] +url = "https://packages.typst.org/preview/board-n-pieces-0.2.0.tar.gz" +hash = "sha256-Mpck3H4PG+xaWQRKThRXzNvIUKJJsCRJbn8+nSXLjYs=" +typstDeps = [] +description = "Display chessboards in Typst" +license = [ + "MIT", + "GPL-2.0-only", +] +homepage = "https://github.com/MDLC01/board-n-pieces" + +[board-n-pieces."0.1.0"] +url = "https://packages.typst.org/preview/board-n-pieces-0.1.0.tar.gz" +hash = "sha256-s9qRve872no4iYUQf7sqISZ9F5MeARHf90YBWApnCH0=" +typstDeps = [] +description = "Display chessboards in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/MDLC01/board-n-pieces" + +[bob-draw."0.1.0"] +url = "https://packages.typst.org/preview/bob-draw-0.1.0.tar.gz" +hash = "sha256-cIMRYn4olOWSMeG7Y7YuF28jx0J1HJv8ZocJ8GJiygc=" +typstDeps = [] +description = "svgbob for typst, powered by wasm" +license = [ + "MIT", +] +homepage = "https://github.com/LucaCiucci/bob-typ" + +[bone-resume."0.3.0"] +url = "https://packages.typst.org/preview/bone-resume-0.3.0.tar.gz" +hash = "sha256-K7aEUrw64QqZrxgjWhpEk/bf0lpC0BJ+0uVBhfduxkk=" +typstDeps = [ + "oxifmt_0_2_1", +] +description = "A colorful resume template for chinese" +license = [ + "Apache-2.0", +] + +[bone-resume."0.2.0"] +url = "https://packages.typst.org/preview/bone-resume-0.2.0.tar.gz" +hash = "sha256-QFKP+J3kdewBeevrlGmVnY5yPcvdclCeM9zcNqYnZB8=" +typstDeps = [] +description = "A colorful resume template for chinese" +license = [ + "Apache-2.0", +] + +[bone-resume."0.1.0"] +url = "https://packages.typst.org/preview/bone-resume-0.1.0.tar.gz" +hash = "sha256-7KEayyZt2MgFKDL9uUnqyNS7IeAqfYrBsRec4bD8RSQ=" +typstDeps = [] +description = "A colorful resume template for chinese" +license = [ + "Apache-2.0", +] + +[bookletic."0.3.0"] +url = "https://packages.typst.org/preview/bookletic-0.3.0.tar.gz" +hash = "sha256-U6mNxN+NdcUFcfF+b//TTFaOotLj9xM8KpCsI4snAlw=" +typstDeps = [] +description = "Create beautiful booklets with ease" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/harrellbm/Bookletic.git" + +[bookletic."0.2.0"] +url = "https://packages.typst.org/preview/bookletic-0.2.0.tar.gz" +hash = "sha256-HeDucS52jnzXuh4e8e7JiJoHBT4sVc4L+pmViEE9mgA=" +typstDeps = [] +description = "Create beautiful booklets with ease" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/harrellbm/Bookletic.git" + +[bookletic."0.1.0"] +url = "https://packages.typst.org/preview/bookletic-0.1.0.tar.gz" +hash = "sha256-aq4JGmoZFnAIxy9+l/WC1piuPfacLiCJhFO9Hj/V2ps=" +typstDeps = [] +description = "Create beautiful booklets with ease" +license = [ + "Apache-2.0", +] + +[boxr."0.1.0"] +url = "https://packages.typst.org/preview/boxr-0.1.0.tar.gz" +hash = "sha256-7/BI8so0a2VnjP99d7FR9SiMKN2MXrcH8gPX8UvV6Gg=" +typstDeps = [] +description = "A modular, and easy to use, package for creating cardboard cutouts in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Lypsilonx/boxr" + +[brilliant-cv."2.0.5"] +url = "https://packages.typst.org/preview/brilliant-cv-2.0.5.tar.gz" +hash = "sha256-55ldsGnrsDowYYz1mxIlcLXIna8gRteDikv6K56aXDo=" +typstDeps = [ + "fontawesome_0_2_1", + "tidy_0_3_0", +] +description = "💼 another CV template for your job application, yet powered by Typst and more" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/yunanwg/brilliant-CV" + +[brilliant-cv."2.0.4"] +url = "https://packages.typst.org/preview/brilliant-cv-2.0.4.tar.gz" +hash = "sha256-Pbsw/lH5VDsCbFRrlG6Yqxyp0yIkfDHr+NsPf7Df8ms=" +typstDeps = [ + "fontawesome_0_2_1", + "tidy_0_3_0", +] +description = "💼 another CV template for your job application, yet powered by Typst and more" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mintyfrankie/brilliant-CV" + +[brilliant-cv."2.0.3"] +url = "https://packages.typst.org/preview/brilliant-cv-2.0.3.tar.gz" +hash = "sha256-t7jvJ5itN0YZDdP7Qpd5/vYsKxgDZsfbXlGqL8G5HDw=" +typstDeps = [ + "fontawesome_0_2_1", + "tidy_0_3_0", +] +description = "💼 another CV template for your job application, yet powered by Typst and more" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mintyfrankie/brilliant-CV" + +[brilliant-cv."2.0.2"] +url = "https://packages.typst.org/preview/brilliant-cv-2.0.2.tar.gz" +hash = "sha256-bkP17C9TRbpHT5x6UOf8bUuP3wTBYnFrPgn5kpPKCwk=" +typstDeps = [ + "fontawesome_0_2_1", + "tidy_0_3_0", +] +description = "💼 another CV template for your job application, yet powered by Typst and more" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mintyfrankie/brilliant-CV" + +[brilliant-cv."2.0.1"] +url = "https://packages.typst.org/preview/brilliant-cv-2.0.1.tar.gz" +hash = "sha256-bTF80A4Aaq+e8rch7SyzbtyhdbL9j6S4bkPqq1XbwKk=" +typstDeps = [ + "fontawesome_0_2_1", + "tidy_0_3_0", +] +description = "💼 another CV template for your job application, yet powered by Typst and more" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mintyfrankie/brilliant-CV" + +[brilliant-cv."2.0.0"] +url = "https://packages.typst.org/preview/brilliant-cv-2.0.0.tar.gz" +hash = "sha256-xMA/JuuKdCcr6Nik8RebMYElOgoAOhUpu0h4FPgYilQ=" +typstDeps = [ + "fontawesome_0_2_1", + "tidy_0_3_0", +] +description = "💼 another CV template for your job application, yet powered by Typst and more" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mintyfrankie/brilliant-CV" + +[bubble."0.2.2"] +url = "https://packages.typst.org/preview/bubble-0.2.2.tar.gz" +hash = "sha256-XbhNC2LTKnWwtV4wvlAMcVlqcnnwDWxTawI1Wr9vsTQ=" +typstDeps = [] +description = "Simple and colorful template for Typst" +license = [ + "MIT-0", +] +homepage = "https://github.com/hzkonor/bubble-template" + +[bubble."0.2.1"] +url = "https://packages.typst.org/preview/bubble-0.2.1.tar.gz" +hash = "sha256-Andpw7TqPSbX606dVtKfhCN+6D1qlSsjFyJGc26nfpw=" +typstDeps = [ + "codelst_2_0_1", +] +description = "Simple and colorful template for Typst" +license = [ + "MIT-0", +] +homepage = "https://github.com/hzkonor/bubble-template" + +[bubble."0.2.0"] +url = "https://packages.typst.org/preview/bubble-0.2.0.tar.gz" +hash = "sha256-QfQFGzNvh6EDJ02El/c2iTj745uIFdpUpQwEkNz5/UU=" +typstDeps = [ + "codelst_2_0_0", +] +description = "Simple and colorful template for Typst" +license = [ + "MIT-0", +] +homepage = "https://github.com/hzkonor/bubble-template" + +[bubble."0.1.0"] +url = "https://packages.typst.org/preview/bubble-0.1.0.tar.gz" +hash = "sha256-/LgM9GSbbRPYjuTRFN/DpucMKgit2rfWP9/5NzvnGKY=" +typstDeps = [ + "codelst_2_0_0", +] +description = "Simple and colorful template for Typst" +license = [ + "MIT-0", +] +homepage = "https://github.com/hzkonor/bubble-template" + +[bytefield."0.0.7"] +url = "https://packages.typst.org/preview/bytefield-0.0.7.tar.gz" +hash = "sha256-9DfhrwSRR/W/YC5N0IdYyh/ILP+2n+C88tWdCekWnt0=" +typstDeps = [ + "oxifmt_0_2_1", +] +description = "A package to create network protocol headers, memory map, register definitions and more" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-bytefield" + +[bytefield."0.0.6"] +url = "https://packages.typst.org/preview/bytefield-0.0.6.tar.gz" +hash = "sha256-GlyGBt5J6Dtzku/0/9yN+3uvmJNpCaylDO0AF1+2B5U=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "A package to create network protocol headers, memory map, register definitions and more" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-bytefield" + +[bytefield."0.0.5"] +url = "https://packages.typst.org/preview/bytefield-0.0.5.tar.gz" +hash = "sha256-f/6NwbSO/fCV2MnKFJxR5ezdrC82MVcvqXYIOz5V1Aw=" +typstDeps = [ + "oxifmt_0_2_0", + "tablex_0_0_8", +] +description = "A package to create network protocol headers, memory map, register definitions and more" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-bytefield" + +[bytefield."0.0.4"] +url = "https://packages.typst.org/preview/bytefield-0.0.4.tar.gz" +hash = "sha256-09kDW0seiKYi0Na18ehhURhinpE61NaSBVQMvex0R3A=" +typstDeps = [ + "oxifmt_0_2_0", + "tablex_0_0_8", +] +description = "A package to create network protocol headers, memory map, register definitions and more" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-bytefield" + +[bytefield."0.0.3"] +url = "https://packages.typst.org/preview/bytefield-0.0.3.tar.gz" +hash = "sha256-zf06BmYkdSVUQqONPwXj6mJOjcPSX9Lszr5KtkIcZhw=" +typstDeps = [ + "tablex_0_0_6", +] +description = "A package to create network protocol headers" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-bytefield" + +[bytefield."0.0.2"] +url = "https://packages.typst.org/preview/bytefield-0.0.2.tar.gz" +hash = "sha256-QOlQaJ3k4fUkHKW1dN8E2npBchHbC7IPkljxKou5GzQ=" +typstDeps = [ + "tablex_0_0_4", +] +description = "A package to create network protocol headers" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-bytefield" + +[bytefield."0.0.1"] +url = "https://packages.typst.org/preview/bytefield-0.0.1.tar.gz" +hash = "sha256-OOLcy7PwmB4E903HoQ27FPaGYFpIsAwnyF6jC03vREo=" +typstDeps = [ + "tablex_0_0_4", +] +description = "A package to create network protocol headers" +license = [ + "MIT", +] + +[cades."0.3.0"] +url = "https://packages.typst.org/preview/cades-0.3.0.tar.gz" +hash = "sha256-zoBTB6qqLMwGqmSGb4TalcWpUwyt1ZG/GOHy8V/pmDA=" +typstDeps = [ + "jogs_0_2_0", +] +description = "Generate QR codes in typst" +license = [ + "MIT", +] +homepage = "https://github.com/Midbin/cades" + +[cades."0.2.0"] +url = "https://packages.typst.org/preview/cades-0.2.0.tar.gz" +hash = "sha256-JdW95eiWCeydfmg4nGY5BDYFB4CSef9HMyvY2BhdiIQ=" +typstDeps = [ + "jogs_0_2_0", +] +description = "Generate QR codes in typst" +license = [ + "MIT", +] +homepage = "https://github.com/Midbin/cades" + +[caidan."0.1.0"] +url = "https://packages.typst.org/preview/caidan-0.1.0.tar.gz" +hash = "sha256-W20oZOScx7dewZw4ee854jfhabq2cn1K3+sjS1JCvnI=" +typstDeps = [] +description = "A clean and minimal food menu template" +license = [ + "MIT", +] +homepage = "https://github.com/cu1ch3n/caidan" + +[callisto."0.1.0"] +url = "https://packages.typst.org/preview/callisto-0.1.0.tar.gz" +hash = "sha256-NFM3r0abms6sKHF5YEAm2DaxaN+Wo6UcclZviMAFTdc=" +typstDeps = [ + "based_0_2_0", + "cmarker_0_1_3", + "mitex_0_2_5", +] +description = "Import Jupyter notebooks" +license = [ + "MIT", +] +homepage = "https://github.com/knuesel/callisto" + +[canonical-nthu-thesis."0.2.0"] +url = "https://packages.typst.org/preview/canonical-nthu-thesis-0.2.0.tar.gz" +hash = "sha256-W58iv2XIWSUmMSjNzrW8fV0ZwDvaGZ4StHM3kEmMUW4=" +typstDeps = [] +description = "A template for master theses and doctoral dissertations for NTHU (National Tsing Hua University" +license = [ + "MIT", +] +homepage = "https://codeberg.org/kotatsuyaki/canonical-nthu-thesis" + +[canonical-nthu-thesis."0.1.0"] +url = "https://packages.typst.org/preview/canonical-nthu-thesis-0.1.0.tar.gz" +hash = "sha256-R08S8+CTNOlQuRPeDhWf9wmbMiScDAi3zTwF0VhE7oA=" +typstDeps = [] +description = "A template for master theses and doctoral dissertations for NTHU (National Tsing Hua University" +license = [ + "MIT", +] +homepage = "https://codeberg.org/kotatsuyaki/canonical-nthu-thesis" + +[cartao."0.1.0"] +url = "https://packages.typst.org/preview/cartao-0.1.0.tar.gz" +hash = "sha256-x1KHuXZo1e1OX3ZjGSVwnQmjSUGeOsaq37gywsUP0wY=" +typstDeps = [] +description = "Dead simple flashcards with Typst" +license = [ + "MIT", +] + +[casson-uom-thesis."0.1.0"] +url = "https://packages.typst.org/preview/casson-uom-thesis-0.1.0.tar.gz" +hash = "sha256-MskcdQvh8V3WhwTvKkm9rRKJ5fsvn8JoJwbCjLgMaVQ=" +typstDeps = [ + "wordometer_0_1_4", +] +description = "Typst template based upon The University of Manchester Presentation of Theses Policy. Responsibility for ensuring compliance with the presentation policy remains with the candidate" +license = [ + "MIT-0", +] +homepage = "https://github.com/ALEX-CASSON-LAB/uom_phd_thesis_typst_template" + +[casual-szu-report."0.1.0"] +url = "https://packages.typst.org/preview/casual-szu-report-0.1.0.tar.gz" +hash = "sha256-LCjN8DrVfS6Gvp+RciJ4Mlf9f1udc93OFBByFf0bDQU=" +typstDeps = [] +description = "A template for SZU course reports" +license = [ + "MIT", +] +homepage = "https://github.com/jiang131072/casual-szu-report" + +[ccicons."1.0.1"] +url = "https://packages.typst.org/preview/ccicons-1.0.1.tar.gz" +hash = "sha256-A0ANuek+bbtQKOlW39RVvTonfum33Cl3KEhhlWwRwmw=" +typstDeps = [] +description = "A port of the ccicon LaTeX package for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-ccicons" + +[ccicons."1.0.0"] +url = "https://packages.typst.org/preview/ccicons-1.0.0.tar.gz" +hash = "sha256-qQBHl8+XLP4YzU3d1HL31oykP7G6F0ADX1FBlatLcck=" +typstDeps = [] +description = "A port of the ccicon LaTeX package for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-ccicons" + +[cereal-words."0.1.0"] +url = "https://packages.typst.org/preview/cereal-words-0.1.0.tar.gz" +hash = "sha256-nfAUTurQid40lvLFmAZzEbVOaCLYVzcH32nEidrMTpU=" +typstDeps = [] +description = "Time to kill? Search for words in a box of letters" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[cetz."0.3.4"] +url = "https://packages.typst.org/preview/cetz-0.3.4.tar.gz" +hash = "sha256-UvHEY4klR5Wi0Pk8DYVcfUmLsOnxEGOcjNu6B9/Nr9s=" +typstDeps = [ + "oxifmt_0_2_1", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/cetz-package/cetz" + +[cetz."0.3.3"] +url = "https://packages.typst.org/preview/cetz-0.3.3.tar.gz" +hash = "sha256-F3Uyklc8haiSBHQfk9Xiq0L0NuoO8aEy7/xxoSypfuo=" +typstDeps = [ + "oxifmt_0_2_1", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/cetz-package/cetz" + +[cetz."0.3.2"] +url = "https://packages.typst.org/preview/cetz-0.3.2.tar.gz" +hash = "sha256-coMtQPXnloQ7PgxEhPSmRoiUUKl55mcjgioCu0UUgnQ=" +typstDeps = [ + "oxifmt_0_2_1", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/cetz-package/cetz" + +[cetz."0.3.1"] +url = "https://packages.typst.org/preview/cetz-0.3.1.tar.gz" +hash = "sha256-B2tDHVweLoNo6Iv6fX6NgVXc0upxI95RRd0DUp2/PaE=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/cetz-package/cetz" + +[cetz."0.3.0"] +url = "https://packages.typst.org/preview/cetz-0.3.0.tar.gz" +hash = "sha256-7fB7i4h/869yrpFVz9JSrPBpFPFXHY9Ez7+tNeiU6rM=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/cetz-package/cetz" + +[cetz."0.2.2"] +url = "https://packages.typst.org/preview/cetz-0.2.2.tar.gz" +hash = "sha256-4hjOUG21gKZ4rwJ49OJ/NlT8/2eG+EQpMe+Vb9tYbdA=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/cetz" + +[cetz."0.2.1"] +url = "https://packages.typst.org/preview/cetz-0.2.1.tar.gz" +hash = "sha256-zwbUwa3e/ZofblYKvqy4em0B1DW3I5VeTPNQ4WywgI4=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/cetz" + +[cetz."0.2.0"] +url = "https://packages.typst.org/preview/cetz-0.2.0.tar.gz" +hash = "sha256-BV1KgRCHSAdoTzpQc6utPMUoNr1VHBFHFoqEkUZ7KUw=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/cetz" + +[cetz."0.1.2"] +url = "https://packages.typst.org/preview/cetz-0.1.2.tar.gz" +hash = "sha256-fDTg4Lq+uMNkPW9B8iSBALnFL4XTH62Wti3SAz0QnM8=" +typstDeps = [] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/cetz" + +[cetz."0.1.1"] +url = "https://packages.typst.org/preview/cetz-0.1.1.tar.gz" +hash = "sha256-EFjojMkHmJXX5MpSS0jU+6kuoyRdM7q0b1J3Rn3MqAo=" +typstDeps = [ + "cetz_0_1_0", +] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/typst-canvas" + +[cetz."0.1.0"] +url = "https://packages.typst.org/preview/cetz-0.1.0.tar.gz" +hash = "sha256-HMoYoty4VR+MUmU9jQPgQg9v3CGdLttC4d56zfhzxBI=" +typstDeps = [] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/typst-canvas" + +[cetz."0.0.2"] +url = "https://packages.typst.org/preview/cetz-0.0.2.tar.gz" +hash = "sha256-W+Sa+Go1rxTFKOMmYRzv37E2jnO7evHYLS4BEKu7iBE=" +typstDeps = [] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/typst-canvas" + +[cetz."0.0.1"] +url = "https://packages.typst.org/preview/cetz-0.0.1.tar.gz" +hash = "sha256-lktrteyeK5/87rzF2B+AhgTTmDI4fNZS+pHtg0VNTxw=" +typstDeps = [] +description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/typst-canvas" + +[cetz-plot."0.1.1"] +url = "https://packages.typst.org/preview/cetz-plot-0.1.1.tar.gz" +hash = "sha256-Avs6kQAhaxY2OfnJgBx1Ywyo26Y+MUiE6/7aVd/12Ic=" +typstDeps = [ + "cetz_0_3_2", +] +description = "Plotting module for CeTZ" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/cetz-package/cetz-plot" + +[cetz-plot."0.1.0"] +url = "https://packages.typst.org/preview/cetz-plot-0.1.0.tar.gz" +hash = "sha256-Y6oLpLh8/MDbaDNyADpJ1zT1rE68RGQ0+E1UYioYVYg=" +typstDeps = [ + "cetz_0_3_1", +] +description = "Plotting module for CeTZ" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/cetz-package/cetz-plot" + +[cetz-venn."0.1.3"] +url = "https://packages.typst.org/preview/cetz-venn-0.1.3.tar.gz" +hash = "sha256-eoVVTVaKLn3qiRngQ4RYIE0yrDLawVr7KMx3NPqdfv4=" +typstDeps = [ + "cetz_0_3_2", +] +description = "CeTZ library for drawing venn diagrams for two or three sets" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/cetz-venn" + +[cetz-venn."0.1.2"] +url = "https://packages.typst.org/preview/cetz-venn-0.1.2.tar.gz" +hash = "sha256-o9rkI/qTcRPIayNZ6X0UDTQxgPqc8s9qtRc4PAYWCqI=" +typstDeps = [ + "cetz_0_3_1", +] +description = "CeTZ library for drawing venn diagrams for two or three sets" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/cetz-venn" + +[cetz-venn."0.1.1"] +url = "https://packages.typst.org/preview/cetz-venn-0.1.1.tar.gz" +hash = "sha256-AdStBAZrnPyea+/VNpUEmHqH0l4Sh9oVjk/omQkF9QA=" +typstDeps = [ + "cetz_0_2_2", +] +description = "CeTZ library for drawing venn diagrams for two or three sets" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/cetz-venn" + +[cetz-venn."0.1.0"] +url = "https://packages.typst.org/preview/cetz-venn-0.1.0.tar.gz" +hash = "sha256-7qVLFa82pFHNygxo3DtUC9DKgQtp1hyvvKlefo6UQn0=" +typstDeps = [ + "cetz_0_2_1", +] +description = "CeTZ library for drawing venn diagrams for two or three sets" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/johannes-wolf/cetz-venn" + +[charged-ieee."0.1.3"] +url = "https://packages.typst.org/preview/charged-ieee-0.1.3.tar.gz" +hash = "sha256-Ry2Xnw6YpWS9I3PzE+dj9ZRdZhtXDBLnVJKDAJY4au8=" +typstDeps = [] +description = "An IEEE-style paper template to publish at conferences and journals for Electrical Engineering, Computer Science, and Computer Engineering" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[charged-ieee."0.1.2"] +url = "https://packages.typst.org/preview/charged-ieee-0.1.2.tar.gz" +hash = "sha256-mCaM0nH3ly/cbKGFb9rdqttV1XBij+wdAXd14QwUWjU=" +typstDeps = [] +description = "An IEEE-style paper template to publish at conferences and journals for Electrical Engineering, Computer Science, and Computer Engineering" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[charged-ieee."0.1.1"] +url = "https://packages.typst.org/preview/charged-ieee-0.1.1.tar.gz" +hash = "sha256-bh0BxAHbb8p8MiASRRb+DJJJ+9/iRphHm9S4I12FJqg=" +typstDeps = [] +description = "An IEEE-style paper template to publish at conferences and journals for Electrical Engineering, Computer Science, and Computer Engineering" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[charged-ieee."0.1.0"] +url = "https://packages.typst.org/preview/charged-ieee-0.1.0.tar.gz" +hash = "sha256-5omVDYmvuC7rZ20YVZUFIRTVnmLz0XHpseqbp5qqLNg=" +typstDeps = [] +description = "An IEEE-style paper template to publish at conferences and journals for Electrical Engineering, Computer Science, and Computer Engineering" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[chatter."0.1.0"] +url = "https://packages.typst.org/preview/chatter-0.1.0.tar.gz" +hash = "sha256-WIVKpYwXsjAMF5Lc0pyPsLzo1IScpoJVV0qRr8WZNHA=" +typstDeps = [] +description = "Write dialog between any number of characters quickly and cleanly. Great for translations or short assignments" +license = [ + "MIT-0", +] +homepage = "https://github.com/sylvanfranklin/chatter" + +[cheda-seu-thesis."0.3.3"] +url = "https://packages.typst.org/preview/cheda-seu-thesis-0.3.3.tar.gz" +hash = "sha256-AkY3KcLDVSODiFyCFCFbC7PiUTYyqL2j8PBvvKTFj0U=" +typstDeps = [ + "a2c-nums_0_0_1", + "codelst_2_0_2", + "cuti_0_3_0", + "i-figured_0_2_4", +] +description = "东南大学本科毕设与研究生学位论文模板。UNOFFICIAL Southeast University Thesis Template" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/SEU-Typst-Template" + +[cheda-seu-thesis."0.3.2"] +url = "https://packages.typst.org/preview/cheda-seu-thesis-0.3.2.tar.gz" +hash = "sha256-LvDjUjYyVWiFZjjlA/TemBiHf6F86tq+euBGAGlhkrc=" +typstDeps = [ + "a2c-nums_0_0_1", + "codelst_2_0_2", + "cuti_0_3_0", + "i-figured_0_2_4", +] +description = "东南大学本科毕设与研究生学位论文模板。UNOFFICIAL Southeast University Thesis Template" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/SEU-Typst-Template" + +[cheda-seu-thesis."0.3.1"] +url = "https://packages.typst.org/preview/cheda-seu-thesis-0.3.1.tar.gz" +hash = "sha256-vbpbI1lu87MemMucjf1tSBsMjZ8SeobIjZDSwXUD7ZQ=" +typstDeps = [ + "a2c-nums_0_0_1", + "codelst_2_0_2", + "cuti_0_3_0", + "i-figured_0_2_4", +] +description = "东南大学本科毕设与研究生学位论文模板。UNOFFICIAL Southeast University Thesis Template" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/SEU-Typst-Template" + +[cheda-seu-thesis."0.3.0"] +url = "https://packages.typst.org/preview/cheda-seu-thesis-0.3.0.tar.gz" +hash = "sha256-mpPCAhjTcYPXEiu6UN6ALLujZZST9oLI5j4q8mwy77A=" +typstDeps = [ + "a2c-nums_0_0_1", + "cuti_0_2_1", + "i-figured_0_2_4", + "sourcerer_0_2_1", +] +description = "东南大学本科毕设与研究生学位论文模板。UNOFFICIAL Southeast University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/SEU-Typst-Template" + +[cheda-seu-thesis."0.2.2"] +url = "https://packages.typst.org/preview/cheda-seu-thesis-0.2.2.tar.gz" +hash = "sha256-DwoLvvVlUaH6uuHfGzpDSmB+jCaQvLVlkpSlN7rOviU=" +typstDeps = [ + "a2c-nums_0_0_1", + "cuti_0_2_1", + "sourcerer_0_2_1", +] +description = "东南大学本科毕设与研究生学位论文模板。UNOFFICIAL Southeast University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/SEU-Typst-Template" + +[cheda-seu-thesis."0.2.1"] +url = "https://packages.typst.org/preview/cheda-seu-thesis-0.2.1.tar.gz" +hash = "sha256-rrAJ4jHZh08M22nKw4bV1MFy1eJWg3KQXdGBNMNjFYM=" +typstDeps = [ + "a2c-nums_0_0_1", + "cuti_0_2_1", + "sourcerer_0_2_1", +] +description = "东南大学本科毕设与研究生学位论文模板。UNOFFICIAL Southeast University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/SEU-Typst-Template" + +[cheda-seu-thesis."0.2.0"] +url = "https://packages.typst.org/preview/cheda-seu-thesis-0.2.0.tar.gz" +hash = "sha256-jX+Hf3e64ZuH4Ke3FzDDRa/9aACdZoOND8afI8Dh+XI=" +typstDeps = [ + "a2c-nums_0_0_1", + "cuti_0_2_1", + "i-figured_0_2_4", + "sourcerer_0_2_1", + "tablex_0_0_8", +] +description = "东南大学本科毕设与研究生学位论文模板。UNOFFICIAL Southeast University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/SEU-Typst-Template" + +[chem-par."0.0.1"] +url = "https://packages.typst.org/preview/chem-par-0.0.1.tar.gz" +hash = "sha256-wcoZAnaDvGbhPjXFd/8kHVbHwWvMPv/YFjwc8Y7fpXI=" +typstDeps = [] +description = "Display chemical formulae and IUPAC nomenclature with ease" +license = [ + "MIT", +] +homepage = "https://github.com/JamesxX/typst-chem-par" + +[chemicoms-paper."0.1.0"] +url = "https://packages.typst.org/preview/chemicoms-paper-0.1.0.tar.gz" +hash = "sha256-7wdGjTwZm+6Sf4WyHS6Nyht519sgao6mPE8rTuta9vw=" +typstDeps = [ + "chic-hdr_0_4_0", + "fontawesome_0_1_0", + "valkyrie_0_2_0", +] +description = "An RSC-style paper template to publish at conferences and journals" +license = [ + "MIT-0", +] +homepage = "https://github.com/JamesxX/chemicoms-paper" + +[cheq."0.2.2"] +url = "https://packages.typst.org/preview/cheq-0.2.2.tar.gz" +hash = "sha256-YtoXDJaC3CdggMpuT8WeWmo+adyOag9SMrQ6P20XypI=" +typstDeps = [] +description = "Write markdown-like checklist easily" +license = [ + "MIT", +] +homepage = "https://github.com/OrangeX4/typst-cheq" + +[cheq."0.2.1"] +url = "https://packages.typst.org/preview/cheq-0.2.1.tar.gz" +hash = "sha256-ItxPDfZX0idr1tqaE7aITKvTrHktY3zNHD8McA6UYkQ=" +typstDeps = [] +description = "Write markdown-like checklist easily" +license = [ + "MIT", +] +homepage = "https://github.com/OrangeX4/typst-cheq" + +[cheq."0.2.0"] +url = "https://packages.typst.org/preview/cheq-0.2.0.tar.gz" +hash = "sha256-C7cGzmO1dOgInRqlaKdCY/AAojFHewWz/gIz3cy2ZEM=" +typstDeps = [] +description = "Write markdown-like checklist easily" +license = [ + "MIT", +] +homepage = "https://github.com/OrangeX4/typst-cheq" + +[cheq."0.1.0"] +url = "https://packages.typst.org/preview/cheq-0.1.0.tar.gz" +hash = "sha256-WyJoZEEgjukKD5I6KNjUWFBtGVs5RWUYkTR/PtZgCsE=" +typstDeps = [] +description = "Write markdown-like checklist easily" +license = [ + "MIT", +] +homepage = "https://github.com/OrangeX4/typst-cheq" + +[chic-hdr."0.5.0"] +url = "https://packages.typst.org/preview/chic-hdr-0.5.0.tar.gz" +hash = "sha256-tS5Cnu+1Lmkgzq9jklvui5vLFvlYuQg6pfEre0pf7gE=" +typstDeps = [] +description = "Typst package for creating elegant headers and footers" +license = [ + "MIT", +] +homepage = "https://github.com/Pablo-Gonzalez-Calderon/chic-header-package" + +[chic-hdr."0.4.0"] +url = "https://packages.typst.org/preview/chic-hdr-0.4.0.tar.gz" +hash = "sha256-rhdAS81nkPwQTWnmp5niPja7S9EJ6zXdPyhEsCmRMGQ=" +typstDeps = [ + "codelst_1_0_0", + "showybox_2_0_1", +] +description = "Typst package for creating elegant headers and footers" +license = [ + "MIT", +] +homepage = "https://github.com/Pablo-Gonzalez-Calderon/chic-header-package" + +[chic-hdr."0.3.0"] +url = "https://packages.typst.org/preview/chic-hdr-0.3.0.tar.gz" +hash = "sha256-zppJQ2wHID0BTZQGUhrT2er0bc4TjD8VIj9PSdmokDY=" +typstDeps = [] +description = "Typst package for creating elegant headers and footers" +license = [ + "MIT", +] +homepage = "https://github.com/Pablo-Gonzalez-Calderon/chic-header-package" + +[chic-hdr."0.2.0"] +url = "https://packages.typst.org/preview/chic-hdr-0.2.0.tar.gz" +hash = "sha256-0un0K/bOrw6h82eaeCN7MLoYrm136dnDb50DlchP44g=" +typstDeps = [] +description = "Typst package for creating elegant headers and footers" +license = [ + "MIT", +] +homepage = "https://github.com/Pablo-Gonzalez-Calderon/chic-header-package" + +[chic-hdr."0.1.0"] +url = "https://packages.typst.org/preview/chic-hdr-0.1.0.tar.gz" +hash = "sha256-jymXx4/eCazAOcc1qeXDjqJ0wC54petaXtTz2KIHIXI=" +typstDeps = [] +description = "Typst package for creating elegant headers and footers" +license = [ + "MIT", +] +homepage = "https://github.com/Pablo-Gonzalez-Calderon/chic-header-package" + +[chicv."0.1.0"] +url = "https://packages.typst.org/preview/chicv-0.1.0.tar.gz" +hash = "sha256-vBav/o7zVRFWADuw3mUXjhkQclQfwzrU6hA/92Qwp68=" +typstDeps = [] +description = "A minimal and fully-customizable CV template" +license = [ + "MIT", +] +homepage = "https://github.com/skyzh/chicv" + +[chordish."0.2.0"] +url = "https://packages.typst.org/preview/chordish-0.2.0.tar.gz" +hash = "sha256-s9uPjFDe86t68jLqTD6eXvzjmq3mAPDDkCosxVF1TPs=" +typstDeps = [ + "conchord_0_3_0", +] +description = "A simple template for creating guitar and ukulele chord sheets" +license = [ + "MIT", +] +homepage = "https://github.com/soxfox42/chordish" + +[chordish."0.1.0"] +url = "https://packages.typst.org/preview/chordish-0.1.0.tar.gz" +hash = "sha256-cFVTV04jyU5vCjwlrvskI3nbclYZWv3ctjNvyQBDeJ8=" +typstDeps = [ + "conchord_0_2_0", +] +description = "A simple template for creating guitar and ukulele chord sheets" +license = [ + "MIT", +] +homepage = "https://github.com/soxfox42/chordish" + +[chordx."0.6.0"] +url = "https://packages.typst.org/preview/chordx-0.6.0.tar.gz" +hash = "sha256-O65TggkpQmS4GkoO/SYMDSfwdF5J/NnMAGcPUoKZm2c=" +typstDeps = [] +description = "A package to write song lyrics with chord diagrams in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/ljgago/typst-chords" + +[chordx."0.5.0"] +url = "https://packages.typst.org/preview/chordx-0.5.0.tar.gz" +hash = "sha256-RkCVGlJafPrr6IKbpKL73yZOtdfJNva4afwdoFvrKZM=" +typstDeps = [] +description = "A package to write song lyrics with chord diagrams in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/ljgago/typst-chords" + +[chordx."0.4.0"] +url = "https://packages.typst.org/preview/chordx-0.4.0.tar.gz" +hash = "sha256-NYpCu9rRjIK7941kYHJnux444MmJjyEt9w21AOSlv0Q=" +typstDeps = [] +description = "A package to write song lyrics with chord diagrams in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/ljgago/typst-chords" + +[chordx."0.3.0"] +url = "https://packages.typst.org/preview/chordx-0.3.0.tar.gz" +hash = "sha256-uQbOVMsa6dGl2iQDi3DkdxEFATgx+vCNuh0cBDwzqJ4=" +typstDeps = [] +description = "A package to write song lyrics with chord diagrams in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/ljgago/typst-chords" + +[chordx."0.2.0"] +url = "https://packages.typst.org/preview/chordx-0.2.0.tar.gz" +hash = "sha256-LDe/W4RAqiW9zTfQcWVDePGNSIN9LGNN1NcIX6KxX10=" +typstDeps = [] +description = "A package to write song lyrics with chord diagrams in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/ljgago/typst-chords" + +[chordx."0.1.0"] +url = "https://packages.typst.org/preview/chordx-0.1.0.tar.gz" +hash = "sha256-no3xDZiroQghV591FPQnRrCFYa5h9EG803xmVdqB/nQ=" +typstDeps = [ + "cetz_0_0_1", +] +description = "A library to write song lyrics with chord diagrams in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/ljgago/typst-chords" + +[chromo."0.1.0"] +url = "https://packages.typst.org/preview/chromo-0.1.0.tar.gz" +hash = "sha256-oNDEPTHeTtnnfkhL2C0ewNLnBJJWqpWp7wyG4A+xrVM=" +typstDeps = [] +description = "Generate printer tests (likely CMYK) in typst" +license = [ + "MIT", +] +homepage = "https://github.com/julien-cpsn/typst-chromo" + +[chronos."0.2.1"] +url = "https://packages.typst.org/preview/chronos-0.2.1.tar.gz" +hash = "sha256-84RpRKxW2Vtnsrw90TR4IlQmXIf3ICnVsF3CaMLujZk=" +typstDeps = [ + "cetz_0_3_4", + "codly_1_2_0", + "codly-languages_0_1_8", + "tidy_0_4_2", +] +description = "A package to draw sequence diagrams with CeTZ" +license = [ + "Apache-2.0", +] +homepage = "https://git.kb28.ch/HEL/chronos" + +[chronos."0.2.0"] +url = "https://packages.typst.org/preview/chronos-0.2.0.tar.gz" +hash = "sha256-Mo40pqiXbuYU0TM1BaLgdC8XRK1nCctv6DQ+7x+uqJw=" +typstDeps = [ + "cetz_0_3_1", + "chronos_0_1_0", + "tidy_0_3_0", +] +description = "A package to draw sequence diagrams with CeTZ" +license = [ + "Apache-2.0", +] +homepage = "https://git.kb28.ch/HEL/chronos" + +[chronos."0.1.0"] +url = "https://packages.typst.org/preview/chronos-0.1.0.tar.gz" +hash = "sha256-qWrSOedzxmCGo9SWbl+a3mcJq6MvAIgxWVtJy/X+H/w=" +typstDeps = [ + "cetz_0_2_2", +] +description = "A package to draw sequence diagrams with CeTZ" +license = [ + "Apache-2.0", +] +homepage = "https://git.kb28.ch/HEL/chronos" + +[chuli-cv."0.1.0"] +url = "https://packages.typst.org/preview/chuli-cv-0.1.0.tar.gz" +hash = "sha256-DsawPi/T7MQbGqPXOAqyagn3Sswtqiic6mjMBpb/7CQ=" +typstDeps = [ + "cetz_0_2_2", + "fontawesome_0_1_0", +] +description = "Minimalistic and modern CV and cover letter templates" +license = [ + "MIT", +] +homepage = "https://github.com/npujol/chuli-cv" + +[cineca."0.5.0"] +url = "https://packages.typst.org/preview/cineca-0.5.0.tar.gz" +hash = "sha256-BFfN80r+0rn9HhJUTqP8ytcQxby12GHeSvtxZ8Xd5jE=" +typstDeps = [] +description = "A package to create calendar with events" +license = [ + "MIT", +] +homepage = "https://github.com/HPdell/typst-cineca" + +[cineca."0.4.0"] +url = "https://packages.typst.org/preview/cineca-0.4.0.tar.gz" +hash = "sha256-3jInINMVewI9RoyfrvGzTZV2rWytsvtOYkl8hR+WHJw=" +typstDeps = [] +description = "A package to create calendar with events" +license = [ + "MIT", +] +homepage = "https://github.com/HPdell/typst-cineca" + +[cineca."0.3.0"] +url = "https://packages.typst.org/preview/cineca-0.3.0.tar.gz" +hash = "sha256-mpuiSe3qfb/7d4kpL4M5uUUK2GunfKOa1h6jYtpqhcw=" +typstDeps = [] +description = "A package to create calendar with events" +license = [ + "MIT", +] +homepage = "https://github.com/HPdell/typst-cineca" + +[cineca."0.2.1"] +url = "https://packages.typst.org/preview/cineca-0.2.1.tar.gz" +hash = "sha256-kmogrKoLDMT0E65Kxo8iTjsGtJ20zu4+P0YYEYgpRpc=" +typstDeps = [] +description = "A package to create calendar with events" +license = [ + "MIT", +] +homepage = "https://github.com/HPdell/typst-cineca" + +[cineca."0.2.0"] +url = "https://packages.typst.org/preview/cineca-0.2.0.tar.gz" +hash = "sha256-BDIiMsATDgyrHum7ItGgH0xi5OG3fw0jZ+NNJco0NNk=" +typstDeps = [] +description = "A package to create calendar with events" +license = [ + "MIT", +] +homepage = "https://github.com/HPdell/typst-cineca" + +[cineca."0.1.0"] +url = "https://packages.typst.org/preview/cineca-0.1.0.tar.gz" +hash = "sha256-hfpXIeyRahvCLSNcynnerVMK4CgLuIxquABXpKrCyYU=" +typstDeps = [] +description = "A package to create calendar with events" +license = [ + "MIT", +] +homepage = "https://github.com/HPdell/typst-cineca" + +[circuiteria."0.2.0"] +url = "https://packages.typst.org/preview/circuiteria-0.2.0.tar.gz" +hash = "sha256-Ql3l9XV6sf94x2O6OJaedRusptFRINuNnCPF9DQDC84=" +typstDeps = [ + "cetz_0_3_2", + "tidy_0_3_0", + "tidy_0_4_1", +] +description = "Drawing block circuits with Typst made easy, using CeTZ" +license = [ + "Apache-2.0", +] +homepage = "https://git.kb28.ch/HEL/circuiteria" + +[circuiteria."0.1.0"] +url = "https://packages.typst.org/preview/circuiteria-0.1.0.tar.gz" +hash = "sha256-sMjfqvesHdjEhnC0qnuZKRiBhrk3X3j3ZENTlq+rIcM=" +typstDeps = [ + "cetz_0_2_2", + "tidy_0_3_0", +] +description = "Drawing block circuits with Typst made easy, using CeTZ" +license = [ + "Apache-2.0", +] +homepage = "https://git.kb28.ch/HEL/circuiteria" + +[citegeist."0.1.0"] +url = "https://packages.typst.org/preview/citegeist-0.1.0.tar.gz" +hash = "sha256-3tESfy/IyQSo2ubvAvm2BHwWPZQJVlJULndLjlVeSZo=" +typstDeps = [] +description = "Makes a Bibtex bibliography available as a Typst dictionary" +license = [ + "MIT", +] +homepage = "https://github.com/alexanderkoller/typst-citegeist" + +[classic-aau-report."0.3.0"] +url = "https://packages.typst.org/preview/classic-aau-report-0.3.0.tar.gz" +hash = "sha256-SqWI3LPyvv5nGWeLfrMD3rLOMXer2UT2djt/iA9NlSE=" +typstDeps = [ + "glossy_0_7_0", + "headcount_0_1_0", + "hydra_0_6_0", + "subpar_0_2_1", +] +description = "A report template for students at Aalborg University (AAU" +license = [ + "MIT", +] +homepage = "https://github.com/Tinggaard/classic-aau-report" + +[classic-aau-report."0.2.1"] +url = "https://packages.typst.org/preview/classic-aau-report-0.2.1.tar.gz" +hash = "sha256-aYw7r6pzMjS0jD1zIv+aT8Lrfp0697JFRWz5Y60B3Ow=" +typstDeps = [ + "glossy_0_5_2", + "headcount_0_1_0", + "hydra_0_5_2", + "subpar_0_2_0", + "subpar_0_2_1", + "t4t_0_4_1", +] +description = "A report template for students at Aalborg University (AAU" +license = [ + "MIT", +] +homepage = "https://github.com/Tinggaard/classic-aau-report" + +[classic-aau-report."0.2.0"] +url = "https://packages.typst.org/preview/classic-aau-report-0.2.0.tar.gz" +hash = "sha256-5M8qOlbGcCh0C+EUrp9SrkT3l9vhVYW+lTVqRDzbpz0=" +typstDeps = [ + "glossy_0_5_2", + "headcount_0_1_0", + "hydra_0_5_2", + "subpar_0_2_0", + "t4t_0_4_1", +] +description = "A report template for students at Aalborg University (AAU" +license = [ + "MIT", +] +homepage = "https://github.com/Tinggaard/classic-aau-report" + +[classic-aau-report."0.1.1"] +url = "https://packages.typst.org/preview/classic-aau-report-0.1.1.tar.gz" +hash = "sha256-2snVjrAOgKP+vkwSv7HlGh7WzRw1JkJrYNawt2zBpBg=" +typstDeps = [ + "hydra_0_5_1", + "t4t_0_3_2", +] +description = "A report template for students at Aalborg University (AAU" +license = [ + "MIT", +] +homepage = "https://github.com/Tinggaard/classic-aau-report" + +[classic-aau-report."0.1.0"] +url = "https://packages.typst.org/preview/classic-aau-report-0.1.0.tar.gz" +hash = "sha256-A27tEt6573poCF92/7MqrAWvzEiNAhds6h+4v4WhJsk=" +typstDeps = [ + "hydra_0_5_1", + "t4t_0_3_2", +] +description = "An example package" +license = [ + "MIT", +] +homepage = "https://github.com/Tinggaard/classic-aau-report" + +[classic-jmlr."0.4.0"] +url = "https://packages.typst.org/preview/classic-jmlr-0.4.0.tar.gz" +hash = "sha256-ataZOhYJA0GGAzZkY4jtLt0y0X5LoziBLPMLz9UodMM=" +typstDeps = [] +description = "Paper template for submission to Journal of Machine Learning Research (JMLR" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[classy-german-invoice."0.3.1"] +url = "https://packages.typst.org/preview/classy-german-invoice-0.3.1.tar.gz" +hash = "sha256-y7DUXmWHEjlRK3YxECtgaGGVidaA88piuLNDcJg96Mo=" +typstDeps = [ + "cades_0_3_0", + "ibanator_0_1_0", +] +description = "Minimalistic invoice for germany based freelancers" +license = [ + "MIT-0", +] +homepage = "https://github.com/erictapen/typst-invoice" + +[classy-german-invoice."0.3.0"] +url = "https://packages.typst.org/preview/classy-german-invoice-0.3.0.tar.gz" +hash = "sha256-TEmN13L7pfEjeWTvyqClJgeAx38VBLV+aoUw/WLY2eQ=" +typstDeps = [ + "cades_0_3_0", + "ibanator_0_1_0", + "tablex_0_0_8", +] +description = "Minimalistic invoice for germany based freelancers" +license = [ + "MIT-0", +] +homepage = "https://github.com/erictapen/typst-invoice" + +[classy-german-invoice."0.2.0"] +url = "https://packages.typst.org/preview/classy-german-invoice-0.2.0.tar.gz" +hash = "sha256-d+6LsAHRRYGvfbH7iAARBIPueaswI6uqufrME4xaa1Y=" +typstDeps = [ + "cades_0_3_0", + "ibanator_0_1_0", + "tablex_0_0_8", +] +description = "Minimalistic invoice for germany based freelancers" +license = [ + "MIT-0", +] +homepage = "https://github.com/erictapen/typst-invoice" + +[clatter."0.1.0"] +url = "https://packages.typst.org/preview/clatter-0.1.0.tar.gz" +hash = "sha256-us5EekkEvGF6K0VS71EtjcCTGFAi+ilqM+iQJ5Icg1g=" +typstDeps = [] +description = "Just the PDF417 generator from rxing" +license = [ + "MIT", +] +homepage = "https://github.com/Gowee/typst-clatter" + +[clean-dhbw."0.2.1"] +url = "https://packages.typst.org/preview/clean-dhbw-0.2.1.tar.gz" +hash = "sha256-JAF0qUnqAlKzVU2g8XYrRJRDX2whTeS5rq8Jfo/upk4=" +typstDeps = [ + "codelst_2_0_2", + "hydra_0_6_0", +] +description = "A Typst Template for DHBW" +license = [ + "MIT", +] +homepage = "https://github.com/roland-KA/clean-dhbw-typst-template" + +[clean-dhbw."0.1.1"] +url = "https://packages.typst.org/preview/clean-dhbw-0.1.1.tar.gz" +hash = "sha256-8m19RwBBzX+WW8THNa1BCJWSF8t3B24Rv53UNlTwTBI=" +typstDeps = [ + "codelst_2_0_2", + "hydra_0_5_1", +] +description = "A Typst Template for DHBW" +license = [ + "MIT", +] +homepage = "https://github.com/roland-KA/clean-dhbw-typst-template" + +[clean-dhbw."0.1.0"] +url = "https://packages.typst.org/preview/clean-dhbw-0.1.0.tar.gz" +hash = "sha256-kBcdm964UAOC/YZqVyK32vx15/vDiReHSPpg/Ceq2+c=" +typstDeps = [ + "codelst_2_0_2", + "hydra_0_5_1", +] +description = "A Typst Template for DHBW" +license = [ + "MIT", +] +homepage = "https://github.com/roland-KA/clean-dhbw-typst-template" + +[clean-math-paper."0.2.0"] +url = "https://packages.typst.org/preview/clean-math-paper-0.2.0.tar.gz" +hash = "sha256-c3pc80WKoTPUmavlZ8BLg/iU89wvuwiI4d0ousSY7oM=" +typstDeps = [ + "great-theorems_0_1_2", + "i-figured_0_2_4", + "rich-counters_0_2_2", +] +description = "A simple and good looking template for mathematical papers" +license = [ + "MIT", +] +homepage = "https://github.com/JoshuaLampert/clean-math-paper" + +[clean-math-paper."0.1.1"] +url = "https://packages.typst.org/preview/clean-math-paper-0.1.1.tar.gz" +hash = "sha256-6Uur+X4J9p0vFV9OR5NTB+po0tiEg7YaNVgdcf/xQw8=" +typstDeps = [ + "great-theorems_0_1_2", + "i-figured_0_2_4", + "rich-counters_0_2_2", +] +description = "A simple and good looking template for mathematical papers" +license = [ + "MIT", +] +homepage = "https://github.com/JoshuaLampert/clean-math-paper" + +[clean-math-paper."0.1.0"] +url = "https://packages.typst.org/preview/clean-math-paper-0.1.0.tar.gz" +hash = "sha256-J4EbmU5j/TuR+IK/bXUEEIFmrwQfgYYB06q4ayT8+dI=" +typstDeps = [ + "great-theorems_0_1_1", + "i-figured_0_2_4", + "rich-counters_0_2_2", +] +description = "A simple and good looking template for mathematical papers" +license = [ + "MIT", +] +homepage = "https://github.com/JoshuaLampert/clean-math-paper" + +[clean-math-presentation."0.1.1"] +url = "https://packages.typst.org/preview/clean-math-presentation-0.1.1.tar.gz" +hash = "sha256-IW0HQxjCrEseAIkgQPD0lrwzzeoFU62rh13BIzESxH8=" +typstDeps = [ + "great-theorems_0_1_1", + "touying_0_5_5", +] +description = "A simple and good looking template for mathematical presentations" +license = [ + "MIT", +] +homepage = "https://github.com/JoshuaLampert/clean-math-presentation" + +[clean-math-presentation."0.1.0"] +url = "https://packages.typst.org/preview/clean-math-presentation-0.1.0.tar.gz" +hash = "sha256-0axOzXVqeWsS7IlQrMyHewFA1z3W+kytX77YY7DuDsk=" +typstDeps = [ + "great-theorems_0_1_1", + "touying_0_5_3", +] +description = "A simple and good looking template for mathematical presentations" +license = [ + "MIT", +] +homepage = "https://github.com/JoshuaLampert/clean-math-presentation" + +[clean-math-thesis."0.3.0"] +url = "https://packages.typst.org/preview/clean-math-thesis-0.3.0.tar.gz" +hash = "sha256-67E7/gEnO9z7lnDLqcsEysCtVtbw5VA4BXVmG/QmpvQ=" +typstDeps = [ + "equate_0_3_1", + "great-theorems_0_1_2", + "hydra_0_5_2", + "i-figured_0_2_4", + "lovelace_0_3_0", + "rich-counters_0_2_2", +] +description = "A simple and good looking template for mathematical theses" +license = [ + "MIT", +] +homepage = "https://github.com/sebaseb98/clean-math-thesis" + +[clean-math-thesis."0.2.0"] +url = "https://packages.typst.org/preview/clean-math-thesis-0.2.0.tar.gz" +hash = "sha256-so0jiG9PYQ3LY66w+C4sT33OFL2tzK1VysIePk28OMo=" +typstDeps = [ + "equate_0_2_1", + "great-theorems_0_1_1", + "hydra_0_5_1", + "i-figured_0_2_4", + "lovelace_0_3_0", + "rich-counters_0_2_2", +] +description = "A simple and good looking template for mathematical theses" +license = [ + "MIT", +] +homepage = "https://github.com/sebaseb98/clean-math-thesis" + +[clean-math-thesis."0.1.0"] +url = "https://packages.typst.org/preview/clean-math-thesis-0.1.0.tar.gz" +hash = "sha256-MgFd4jY23ypujTnuOYLuxqCZFQj4L9YWbV/WH0vtcmY=" +typstDeps = [ + "great-theorems_0_1_1", + "headcount_0_1_0", + "hydra_0_5_1", + "lovelace_0_3_0", +] +description = "A simple and good looking template for mathematical theses" +license = [ + "MIT", +] +homepage = "https://github.com/sebaseb98/clean-math-thesis" + +[clear-iclr."0.4.0"] +url = "https://packages.typst.org/preview/clear-iclr-0.4.0.tar.gz" +hash = "sha256-hpHIcxCB5ZE8ZJITOzUYuiFEuV/Fs2UiSVhrX86r6MQ=" +typstDeps = [] +description = "Paper template for submission to International Conference on Learning Representations (ICLR" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[cmarker."0.1.3"] +url = "https://packages.typst.org/preview/cmarker-0.1.3.tar.gz" +hash = "sha256-0DdRW8WuX4kLZrPyWZOe7yhm77oX8IwrqrhOkbSjyKc=" +typstDeps = [] +description = "Transpile CommonMark Markdown to Typst, from within Typst" +license = [ + "MIT", +] +homepage = "https://github.com/SabrinaJewson/cmarker.typ" + +[cmarker."0.1.2"] +url = "https://packages.typst.org/preview/cmarker-0.1.2.tar.gz" +hash = "sha256-fSKjCjOr8Nr62CYu6osgimjdWVUc/9w6UULicNhElDs=" +typstDeps = [] +description = "Transpile CommonMark Markdown to Typst, from within Typst" +license = [ + "MIT", +] +homepage = "https://github.com/SabrinaJewson/cmarker.typ" + +[cmarker."0.1.1"] +url = "https://packages.typst.org/preview/cmarker-0.1.1.tar.gz" +hash = "sha256-snvSN81IPOQ7/x5Ju3l5x4oJZ08b6c/uSE9yJhijkqY=" +typstDeps = [ + "mitex_0_2_4", +] +description = "Transpile CommonMark Markdown to Typst, from within Typst" +license = [ + "MIT", +] +homepage = "https://github.com/SabrinaJewson/cmarker.typ" + +[cmarker."0.1.0"] +url = "https://packages.typst.org/preview/cmarker-0.1.0.tar.gz" +hash = "sha256-CI6suOtBN0klUN5/MUlLnmOq0gTHfOrIMTwfhXxIJHE=" +typstDeps = [] +description = "Transpile CommonMark Markdown to Typst, from within Typst" +license = [ + "MIT", +] +homepage = "https://github.com/SabrinaJewson/cmarker.typ" + +[codedis."0.1.0"] +url = "https://packages.typst.org/preview/codedis-0.1.0.tar.gz" +hash = "sha256-SWQUciVv3d7LY65zCYMq88JVnWWJsWV0WhW5wIf+UGw=" +typstDeps = [] +description = "A simple package for displaying code" +license = [ + "MIT", +] +homepage = "https://github.com/AugustinWinther/codedis" + +[codelst."2.0.2"] +url = "https://packages.typst.org/preview/codelst-2.0.2.tar.gz" +hash = "sha256-nroAmdKRY2YqxCC+/E+Ql/FxxFugPjjbOW3BwPBZLVU=" +typstDeps = [ + "showybox_2_0_1", +] +description = "A typst package to render sourcecode" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-codelst" + +[codelst."2.0.1"] +url = "https://packages.typst.org/preview/codelst-2.0.1.tar.gz" +hash = "sha256-It8DLusbRfujjaOigBMGc9NAqhe4Px+xuIVgmvF7ijo=" +typstDeps = [] +description = "A typst package to render sourcecode" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-codelst" + +[codelst."2.0.0"] +url = "https://packages.typst.org/preview/codelst-2.0.0.tar.gz" +hash = "sha256-TOT4hnyNWet0l8S3ndLevT8jpkz3aIxsJaWilO4c358=" +typstDeps = [] +description = "A typst package to render sourcecode" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-codelst" + +[codelst."1.0.0"] +url = "https://packages.typst.org/preview/codelst-1.0.0.tar.gz" +hash = "sha256-yG817BzNcQ1FAWPInAVWXLUY6WlNTLbW+4fStUmtrHI=" +typstDeps = [] +description = "A typst package to render sourcecode" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-codelst" + +[codelst."0.0.3"] +url = "https://packages.typst.org/preview/codelst-0.0.3.tar.gz" +hash = "sha256-6h5AbxkzcAWPVFqoMkJsDqNcYjVJUAw5IXMJCW3Z4uY=" +typstDeps = [] +description = "A typst package to render sourcecode" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-codelst" + +[codetastic."0.2.2"] +url = "https://packages.typst.org/preview/codetastic-0.2.2.tar.gz" +hash = "sha256-I5UEcPe76Ud5gYVfaTkZBpKYgZFFnIEvyv3Qn8wqe7s=" +typstDeps = [] +description = "Generate all sorts of codes in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-codetastic" + +[codetastic."0.2.0"] +url = "https://packages.typst.org/preview/codetastic-0.2.0.tar.gz" +hash = "sha256-FmY6+ZiSIzrxJWQuZa4D0dgO4KSFtBjIcJohubBwG6A=" +typstDeps = [] +description = "Generate all sorts of codes in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-codetastic" + +[codetastic."0.1.0"] +url = "https://packages.typst.org/preview/codetastic-0.1.0.tar.gz" +hash = "sha256-f6yhTgLtOfY9zRgP8Gwa+LZpMU4DFTAJDlmquTAt/JA=" +typstDeps = [ + "cetz_0_1_1", +] +description = "Generate all sorts of codes in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-codetastic" + +[codex-woltiensis."0.1.0"] +url = "https://packages.typst.org/preview/codex-woltiensis-0.1.0.tar.gz" +hash = "sha256-lNBYW8K+UDCKtLTkjg/WZ0AqGJEB+CKZiZpJVRJGvTE=" +typstDeps = [] +description = "Create student song books like the Codex Woltiensis. Full layout of classical songbook" +license = [ + "MIT", +] + +[codly."1.3.0"] +url = "https://packages.typst.org/preview/codly-1.3.0.tar.gz" +hash = "sha256-rbwurMz3kfF4+MJmpyjLHeW88RPclvqnGRfiTJVm5us=" +typstDeps = [ + "codly_1_2_0", +] +description = "Codly is a beautiful code presentation template with many features like smart indentation, line numbering, highlighting, etc" +license = [ + "MIT", +] +homepage = "https://github.com/Dherse/codly" + +[codly."1.2.0"] +url = "https://packages.typst.org/preview/codly-1.2.0.tar.gz" +hash = "sha256-OCuNt4TV/wfZgt+7LZs3liC5KlpYO//il8yzlX3/Pqs=" +typstDeps = [] +description = "Codly is a beautiful code presentation template with many features like smart indentation, line numbering, highlighting, etc" +license = [ + "MIT", +] +homepage = "https://github.com/Dherse/codly" + +[codly."1.1.1"] +url = "https://packages.typst.org/preview/codly-1.1.1.tar.gz" +hash = "sha256-GhTtNAHOqrJ6supZldy8qfygoGD/XSzl5LlQY03XCn4=" +typstDeps = [] +description = "Codly is a beautiful code presentation template with many features like smart indentation, line numbering, highlighting, etc" +license = [ + "MIT", +] +homepage = "https://github.com/Dherse/codly" + +[codly."1.1.0"] +url = "https://packages.typst.org/preview/codly-1.1.0.tar.gz" +hash = "sha256-R90vm9NZ+iIDljHuSwm8kl9/sw7cZ8FjG8fsbj/aGcs=" +typstDeps = [] +description = "Codly is a beautiful code presentation template with many features like smart indentation, line numbering, highlighting, etc" +license = [ + "MIT", +] +homepage = "https://github.com/Dherse/codly" + +[codly."1.0.0"] +url = "https://packages.typst.org/preview/codly-1.0.0.tar.gz" +hash = "sha256-MVNLsvkMZNKBaJol3WEjmFTK6HXKUarAimdwIkCdrqU=" +typstDeps = [] +description = "Codly is a beautiful code presentation template with many features like smart indentation, line numbering, highlighting, etc" +license = [ + "MIT", +] +homepage = "https://github.com/Dherse/codly" + +[codly."0.2.1"] +url = "https://packages.typst.org/preview/codly-0.2.1.tar.gz" +hash = "sha256-6V3A8MmMzTcClGfHWgEwTIIJ5OY2ZjKXncDMZmAJZFQ=" +typstDeps = [] +description = "Codly is a beautiful code presentation template" +license = [ + "MIT", +] +homepage = "https://github.com/Dherse/codly" + +[codly."0.2.0"] +url = "https://packages.typst.org/preview/codly-0.2.0.tar.gz" +hash = "sha256-AGEE/CuUnHnG0Jqr0YpkpI9cXKbGjn5FBH9Me4xyDSA=" +typstDeps = [] +description = "Codly is a beautiful code presentation template" +license = [ + "MIT", +] +homepage = "https://github.com/Dherse/codly" + +[codly."0.1.0"] +url = "https://packages.typst.org/preview/codly-0.1.0.tar.gz" +hash = "sha256-qbJTEQu2fF/aUR/uNLb7H2vnfdoucPGteNY+i1OTddE=" +typstDeps = [] +description = "Codly is a beautiful code presentation template" +license = [ + "MIT", +] +homepage = "https://github.com/Dherse/codly" + +[codly-languages."0.1.8"] +url = "https://packages.typst.org/preview/codly-languages-0.1.8.tar.gz" +hash = "sha256-v+EqrNkSqqqajdKhmO1i8n+UFmgJaZ8d0a1MCxGX5Qk=" +typstDeps = [ + "codly_1_2_0", +] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[codly-languages."0.1.7"] +url = "https://packages.typst.org/preview/codly-languages-0.1.7.tar.gz" +hash = "sha256-7xtZ8q93vIvMD7ph8xhnvECgMyG+t2aSRVdZIUIGWMo=" +typstDeps = [ + "codly_1_2_0", +] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[codly-languages."0.1.6"] +url = "https://packages.typst.org/preview/codly-languages-0.1.6.tar.gz" +hash = "sha256-F0TK2Dl1YoYQFRz4rHLVSKRw+jFXkIMXeznPaGF4azU=" +typstDeps = [ + "codly_1_2_0", +] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[codly-languages."0.1.5"] +url = "https://packages.typst.org/preview/codly-languages-0.1.5.tar.gz" +hash = "sha256-idDeHyyVXJfucLoCngYBkRbrTit6dNYB4MxFCuFAmbg=" +typstDeps = [ + "codly_1_1_1", +] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[codly-languages."0.1.4"] +url = "https://packages.typst.org/preview/codly-languages-0.1.4.tar.gz" +hash = "sha256-gMChs/bl30VSTwCbq85/PvSO+z4iadZS7DiCgfjv030=" +typstDeps = [ + "codly_1_1_1", +] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[codly-languages."0.1.3"] +url = "https://packages.typst.org/preview/codly-languages-0.1.3.tar.gz" +hash = "sha256-Oj9VpvBMQ3EdnJeG0JUyAoxOr9zkDBlXAwnh/SIS/08=" +typstDeps = [ + "codly_1_1_0", +] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[codly-languages."0.1.2"] +url = "https://packages.typst.org/preview/codly-languages-0.1.2.tar.gz" +hash = "sha256-uSZq8oOtTZAHAb7ddib8p2z0JtIIqhtNXMphgUFaBBA=" +typstDeps = [ + "codly_1_0_0", +] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[codly-languages."0.1.1"] +url = "https://packages.typst.org/preview/codly-languages-0.1.1.tar.gz" +hash = "sha256-f5d+mf4m+WXDtnGlWU8cSv0e/loJdVf46pIbhzCKUHA=" +typstDeps = [] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[codly-languages."0.1.0"] +url = "https://packages.typst.org/preview/codly-languages-0.1.0.tar.gz" +hash = "sha256-uLEXaWv2McD3ZReaohg1DzjPEqBY3R7pWPHFtlV/1KQ=" +typstDeps = [] +description = "A set of language configurations for use with codly" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[color-my-agda."0.1.0"] +url = "https://packages.typst.org/preview/color-my-agda-0.1.0.tar.gz" +hash = "sha256-szSNzxC9ffgDOPKC7t/1Ry6+8NnPkhCzGw7gOvncfKA=" +typstDeps = [] +description = "Syntax highlight for Agda on Typst" +license = [ + "AGPL-3.0-or-later", +] +homepage = "https://codeberg.org/foxy/color-my-agda" + +[colorful-boxes."1.4.2"] +url = "https://packages.typst.org/preview/colorful-boxes-1.4.2.tar.gz" +hash = "sha256-vX93MQBxkyIzL+lkR+GEEiVQqT7Bxd0RsY66KfRRnHM=" +typstDeps = [ + "showybox_2_0_3", +] +description = "Predefined colorful boxes to spice up your document" +license = [ + "MIT", +] +homepage = "https://github.com/lkoehl/typst-boxes" + +[colorful-boxes."1.4.1"] +url = "https://packages.typst.org/preview/colorful-boxes-1.4.1.tar.gz" +hash = "sha256-XyNK4/et6ZTYMVK7+E/PSspw6csHW9+EQL2piAnjEAo=" +typstDeps = [ + "showybox_2_0_3", +] +description = "Predefined colorful boxes to spice up your document" +license = [ + "MIT", +] +homepage = "https://github.com/lkoehl/typst-boxes" + +[colorful-boxes."1.4.0"] +url = "https://packages.typst.org/preview/colorful-boxes-1.4.0.tar.gz" +hash = "sha256-Zxl0BNtHsNgfiqMjH1SptDtklVSY4Lee6gv0Z1SBSpk=" +typstDeps = [ + "showybox_2_0_3", +] +description = "Predefined colorful boxes to spice up your document" +license = [ + "MIT", +] +homepage = "https://github.com/lkoehl/typst-boxes" + +[colorful-boxes."1.3.1"] +url = "https://packages.typst.org/preview/colorful-boxes-1.3.1.tar.gz" +hash = "sha256-3MM5jphAEjcPmQm0lV86FCcEgd6l6IpdGtqLtPwiDno=" +typstDeps = [] +description = "Predefined colorful boxes to spice up your document" +license = [ + "MIT", +] +homepage = "https://github.com/lkoehl/typst-boxes" + +[colorful-boxes."1.2.0"] +url = "https://packages.typst.org/preview/colorful-boxes-1.2.0.tar.gz" +hash = "sha256-b4WV6MoyAm/X+DP8I0ffqMrZmXUOUKJD96wNL7TOGYI=" +typstDeps = [ + "codetastic_0_1_0", +] +description = "Predefined colorful boxes" +license = [ + "MIT", +] +homepage = "https://github.com/lkoehl/typst-boxes" + +[colorful-boxes."1.1.0"] +url = "https://packages.typst.org/preview/colorful-boxes-1.1.0.tar.gz" +hash = "sha256-nO3b//yLPuuUn1YD+BlJj8yiQ1bAjQGVoOUUJhwwrSU=" +typstDeps = [] +description = "Predefined colorful boxes" +license = [ + "MIT", +] +homepage = "https://github.com/lkoehl/typst-boxes" + +[colorful-boxes."1.0.0"] +url = "https://packages.typst.org/preview/colorful-boxes-1.0.0.tar.gz" +hash = "sha256-WPdM81631SHwbrmnB55TIJgObvMDpBROXMxThID27Zs=" +typstDeps = [] +description = "Predefined colorful boxes" +license = [ + "MIT", +] +homepage = "https://github.com/lkoehl/typst-boxes" + +[commute."0.3.0"] +url = "https://packages.typst.org/preview/commute-0.3.0.tar.gz" +hash = "sha256-HmdNs0aGWjv76Fa6HvSc6xijfKIyQx/75TT9Ui5Uo04=" +typstDeps = [] +description = "A proof of concept library for commutative diagrams" +license = [ + "MIT", +] +homepage = "https://gitlab.com/giacomogallina/commute" + +[commute."0.2.0"] +url = "https://packages.typst.org/preview/commute-0.2.0.tar.gz" +hash = "sha256-TpwdsVsig+65Z9KGMzAdcVxRZVmBNNTZug25l30hsQQ=" +typstDeps = [] +description = "A proof of concept library for commutative diagrams" +license = [ + "MIT", +] +homepage = "https://gitlab.com/giacomogallina/commute" + +[commute."0.1.0"] +url = "https://packages.typst.org/preview/commute-0.1.0.tar.gz" +hash = "sha256-jBjZ28kFBGbjXVTVlxjJM98kIwk0ws1btf4DzBSJdpc=" +typstDeps = [] +description = "A proof of concept library for commutative diagrams" +license = [ + "MIT", +] +homepage = "https://gitlab.com/giacomogallina/commute" + +[conchord."0.3.0"] +url = "https://packages.typst.org/preview/conchord-0.3.0.tar.gz" +hash = "sha256-0hBsYDHBywChgFvPj4blEYfWTEYeDIFhtOB0FW9M53c=" +typstDeps = [ + "cetz_0_3_1", + "chordx_0_5_0", +] +description = "Easily write lyrics with chords, generate chord diagrams by chord names and draw tabs" +license = [ + "MIT", +] +homepage = "https://github.com/sitandr/conchord" + +[conchord."0.2.0"] +url = "https://packages.typst.org/preview/conchord-0.2.0.tar.gz" +hash = "sha256-X/wJUqprfU6gl13lNcmJedqMcPW33bc/gGwB9ftL99s=" +typstDeps = [ + "cetz_0_2_0", + "chordx_0_2_0", +] +description = "Easily write lyrics with chords, generate chord diagrams and tabs" +license = [ + "MIT", +] +homepage = "https://github.com/sitandr/conchord" + +[conchord."0.1.1"] +url = "https://packages.typst.org/preview/conchord-0.1.1.tar.gz" +hash = "sha256-4iNh95JtAslpCLelBR1E72Iw0B2FXsDbf4p0wTY8Q2Y=" +typstDeps = [ + "cetz_0_1_1", + "chordx_0_2_0", +] +description = "Easily write lyrics with chords, generate chord diagrams and tabs" +license = [ + "MIT", +] +homepage = "https://github.com/sitandr/conchord" + +[conchord."0.1.0"] +url = "https://packages.typst.org/preview/conchord-0.1.0.tar.gz" +hash = "sha256-82ZSrqgTY9Qi6j2WrhPEVHC9prGsa5m3kDqe8Hp8HhM=" +typstDeps = [ + "cetz_0_0_1", + "chordx_0_1_0", +] +description = "Easily write lyrics with chords and generate colorful chord diagrams" +license = [ + "MIT", +] +homepage = "https://github.com/sitandr/conchord" + +[cram-snap."0.2.2"] +url = "https://packages.typst.org/preview/cram-snap-0.2.2.tar.gz" +hash = "sha256-jnIWn0RjxOFLvh0TNJ/GBDr8YJGCq7gV6RCgFw3uZJY=" +typstDeps = [] +description = "Typst template for creating cheatsheets" +license = [ + "MIT", +] +homepage = "https://github.com/kamack38/cram-snap" + +[cram-snap."0.2.1"] +url = "https://packages.typst.org/preview/cram-snap-0.2.1.tar.gz" +hash = "sha256-pBqol5HFpbX08rq/Lbq+4B0qYw/km4Lpl98nQoc+QWs=" +typstDeps = [] +description = "Typst template for creating cheatsheets" +license = [ + "MIT", +] +homepage = "https://github.com/kamack38/cram-snap" + +[cram-snap."0.2.0"] +url = "https://packages.typst.org/preview/cram-snap-0.2.0.tar.gz" +hash = "sha256-jLUE9/SFZ4MAKVnyZX7ZjCNaebFsM2+cj3ga/3qWDrI=" +typstDeps = [] +description = "Typst template for creating cheatsheets" +license = [ + "MIT", +] +homepage = "https://github.com/kamack38/cram-snap" + +[cram-snap."0.1.0"] +url = "https://packages.typst.org/preview/cram-snap-0.1.0.tar.gz" +hash = "sha256-Q02r2u92wcVl+H82ViAgvnCJ9FUxFQi6kw3y4RRTAfE=" +typstDeps = [] +description = "Typst template for creating cheatsheets" +license = [ + "MIT", +] +homepage = "https://github.com/kamack38/cram-snap" + +[crossregex."0.2.0"] +url = "https://packages.typst.org/preview/crossregex-0.2.0.tar.gz" +hash = "sha256-5kmjwcOTuNgzuPLBNIQiH8H+81zibkW4v3i7yaCMJIo=" +typstDeps = [] +description = "A crossword-like regex game written in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/QuadnucYard/crossregex-typ" + +[crossregex."0.1.0"] +url = "https://packages.typst.org/preview/crossregex-0.1.0.tar.gz" +hash = "sha256-d47bh2MHQTnTznRvnR4iTo6w8VMXMyy8HvbcJ8IrcdY=" +typstDeps = [] +description = "A crossword-like regex game written in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/QuadnucYard/crossregex-typ" + +[crudo."0.1.1"] +url = "https://packages.typst.org/preview/crudo-0.1.1.tar.gz" +hash = "sha256-9FOCJzLTJYSoQT0d0kumxQIFEMWse+aCSBi7rwI/2Ns=" +typstDeps = [] +description = "Take slices from raw blocks" +license = [ + "MIT", +] +homepage = "https://github.com/SillyFreak/typst-crudo" + +[crudo."0.1.0"] +url = "https://packages.typst.org/preview/crudo-0.1.0.tar.gz" +hash = "sha256-hXrRakGAv7tc+XKQTiwQd9bbxiyc+SOH8fjM+iftffE=" +typstDeps = [ + "codly_0_2_1", + "crudo_0_0_1", + "tidy_0_3_0", +] +description = "Take slices from raw blocks" +license = [ + "MIT", +] +homepage = "https://github.com/SillyFreak/typst-crudo" + +[ctheorems."1.1.3"] +url = "https://packages.typst.org/preview/ctheorems-1.1.3.tar.gz" +hash = "sha256-34ri4aotL6PUrtAXaPhMb3arOGVq76hijHfJMgOyeY8=" +typstDeps = [] +description = "Numbered theorem environments for typst" +license = [ + "MIT", +] +homepage = "https://github.com/sahasatvik/typst-theorems" + +[ctheorems."1.1.2"] +url = "https://packages.typst.org/preview/ctheorems-1.1.2.tar.gz" +hash = "sha256-q/v/9tZ4ak43N3AKrwYdAwlX5sFCXSFfezcMqLBwUXk=" +typstDeps = [] +description = "Numbered theorem environments for typst" +license = [ + "MIT", +] +homepage = "https://github.com/sahasatvik/typst-theorems" + +[ctheorems."1.1.1"] +url = "https://packages.typst.org/preview/ctheorems-1.1.1.tar.gz" +hash = "sha256-vejSEdNXDhIv63qxYJSFkSA5Bgsjf5ioijS9N4c6CRk=" +typstDeps = [] +description = "Numbered theorem environments for typst" +license = [ + "MIT", +] +homepage = "https://github.com/sahasatvik/typst-theorems" + +[ctheorems."1.1.0"] +url = "https://packages.typst.org/preview/ctheorems-1.1.0.tar.gz" +hash = "sha256-wr9DPKJfOSaauhgm6/+N8wtDbCVDyYx1v4zz6S7jOIY=" +typstDeps = [] +description = "Numbered theorem environments for typst" +license = [ + "MIT", +] +homepage = "https://github.com/sahasatvik/typst-theorems" + +[ctheorems."1.0.0"] +url = "https://packages.typst.org/preview/ctheorems-1.0.0.tar.gz" +hash = "sha256-O+hhyIo1YT0dsRI/vxThCP0dcxGkmiP7n9hV/FkHm2k=" +typstDeps = [] +description = "Numbered theorem environments for typst" +license = [ + "MIT", +] +homepage = "https://github.com/sahasatvik/typst-theorems" + +[ctheorems."0.1.0"] +url = "https://packages.typst.org/preview/ctheorems-0.1.0.tar.gz" +hash = "sha256-H8s5x8SHKT83w0W7fVDiajg4CY7h4AiVgZdqm6FwEFQ=" +typstDeps = [ + "ctheorems_1_0_0", +] +description = "Theorem library based on (and compatible) with the classic typst-theorem module" +license = [ + "MIT", +] +homepage = "https://github.com/DVDTSB/ctheorems" + +[ctxjs."0.3.1"] +url = "https://packages.typst.org/preview/ctxjs-0.3.1.tar.gz" +hash = "sha256-hozwjG5V7TEOouUe6JgpjEVmxSiImaTIm3M0NNVuj9E=" +typstDeps = [] +description = "Run javascript in contexts" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-ctxjs-package" + +[ctxjs."0.3.0"] +url = "https://packages.typst.org/preview/ctxjs-0.3.0.tar.gz" +hash = "sha256-6FN8Wv7ZAagTMfoMhDpYIEz/n8iMD1cerIPQ0NbG5L4=" +typstDeps = [] +description = "Run javascript in contexts" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-ctxjs-package" + +[ctxjs."0.2.0"] +url = "https://packages.typst.org/preview/ctxjs-0.2.0.tar.gz" +hash = "sha256-osHXK/USNMjEiydPi9UKCzyoFaDcB7WuJ3H9lyjsiCQ=" +typstDeps = [] +description = "Run javascript in contexts" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-ctxjs-package" + +[ctxjs."0.1.1"] +url = "https://packages.typst.org/preview/ctxjs-0.1.1.tar.gz" +hash = "sha256-ZyNpJzHRjAxHJ8kXEXQX26WbDVTdpZqAZiUokdBlfWM=" +typstDeps = [] +description = "Run javascript in contexts" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-ctxjs-package" + +[ctxjs."0.1.0"] +url = "https://packages.typst.org/preview/ctxjs-0.1.0.tar.gz" +hash = "sha256-AGljjjK3KiWiG+JG2+0cBURJncUrLIqDvGsPDqA+HwY=" +typstDeps = [] +description = "Run javascript in contexts" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-ctxjs-package" + +[cumcm-muban."0.3.0"] +url = "https://packages.typst.org/preview/cumcm-muban-0.3.0.tar.gz" +hash = "sha256-C96mN6opUM3+w4g9iQBnVCuIHROfUvTU6vt5PDSLLbQ=" +typstDeps = [ + "ctheorems_1_1_2", +] +description = "为高教社杯全国大学生数学建模竞赛设计的 Typst 模板" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/a-kkiri/CUMCM-typst-template" + +[cumcm-muban."0.2.0"] +url = "https://packages.typst.org/preview/cumcm-muban-0.2.0.tar.gz" +hash = "sha256-RVIbpT02Bj/fi3MuU7B/WrCrl1GBQWecesx+JAy8Zb4=" +typstDeps = [ + "ctheorems_1_1_2", + "cumcm-muban_0_1_0", +] +description = "为高教社杯全国大学生数学建模竞赛设计的 Typst 模板" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/a-kkiri/CUMCM-typst-template" + +[cumcm-muban."0.1.0"] +url = "https://packages.typst.org/preview/cumcm-muban-0.1.0.tar.gz" +hash = "sha256-ddvdry232tP5iSc2gZ2/HrTtSEA1dIlCi+/e2ymKACw=" +typstDeps = [ + "ctheorems_1_1_2", +] +description = "为高教社杯全国大学生数学建模竞赛设计的 Typst 模板" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/a-kkiri/CUMCM-typst-template" + +[curli."0.1.0"] +url = "https://packages.typst.org/preview/curli-0.1.0.tar.gz" +hash = "sha256-4keObGQlLWVk5gX862jIzNrUwC/ML5lKNuzsGjzcaY8=" +typstDeps = [] +description = "Cursed ligatures for everyone" +license = [ + "MIT", +] +homepage = "https://github.com/Mc-Zen/curli" + +[curriculo-acad."0.1.0"] +url = "https://packages.typst.org/preview/curriculo-acad-0.1.0.tar.gz" +hash = "sha256-P2Ab3akFYBGq+STjUdKI+hEBnU/jInjskhkKObG4c0Y=" +typstDeps = [ + "datify_0_1_3", +] +description = "Creating a CV from your LATTES entries" +license = [ + "MIT", +] +homepage = "https://github.com/philkleer/create-lattes-cv" + +[curryst."0.5.0"] +url = "https://packages.typst.org/preview/curryst-0.5.0.tar.gz" +hash = "sha256-WBGZ8nmCrB8iihmkjzdrA7l2U3ff3TKpvQh/XAmTE8Y=" +typstDeps = [] +description = "Typeset trees of inference rules" +license = [ + "MIT", +] +homepage = "https://github.com/pauladam94/curryst" + +[curryst."0.4.0"] +url = "https://packages.typst.org/preview/curryst-0.4.0.tar.gz" +hash = "sha256-qDh32adcbMjXJqE2s9PUtvkTXwclIuyQZcQTtkbFOKs=" +typstDeps = [] +description = "Typeset trees of inference rules" +license = [ + "MIT", +] +homepage = "https://github.com/pauladam94/curryst" + +[curryst."0.3.0"] +url = "https://packages.typst.org/preview/curryst-0.3.0.tar.gz" +hash = "sha256-jrvI1D5ZfXKyQn4vrbcNf6joMX4BSphNY0ZOUkDEClM=" +typstDeps = [] +description = "Typeset trees of inference rules" +license = [ + "MIT", +] +homepage = "https://github.com/pauladam94/curryst" + +[curryst."0.2.0"] +url = "https://packages.typst.org/preview/curryst-0.2.0.tar.gz" +hash = "sha256-l6U/J/Xud5F6QZI+iUGp0nsNtSdTT8H0KS15VwS3XgY=" +typstDeps = [] +description = "Typeset trees of inference rules" +license = [ + "MIT", +] +homepage = "https://github.com/pauladam94/curryst" + +[curryst."0.1.1"] +url = "https://packages.typst.org/preview/curryst-0.1.1.tar.gz" +hash = "sha256-shGy6b+1W497huOXAHw6eFTHbx6nSLD9b1TzsRe2rNs=" +typstDeps = [] +description = "Typesetting of trees of inference rules in Typst" +license = [ + "MIT", +] + +[curryst."0.1.0"] +url = "https://packages.typst.org/preview/curryst-0.1.0.tar.gz" +hash = "sha256-gHxYD/5KxbF7cYwQ99stjh3oWZCRIHmoyACMhyWGpv0=" +typstDeps = [] +description = "Typesetting of trees of inference rules in Typst" +license = [ + "MIT", +] + +[curvly."0.1.0"] +url = "https://packages.typst.org/preview/curvly-0.1.0.tar.gz" +hash = "sha256-jO69yZaJiTILZyKnR+iCaHzhl8CIBp2iwCC2XzIrH/g=" +typstDeps = [] +description = "Typst package for curving text on an arc or circle" +license = [ + "MIT", +] +homepage = "https://github.com/cskeeters/typst-curvly" + +[cuti."0.3.0"] +url = "https://packages.typst.org/preview/cuti-0.3.0.tar.gz" +hash = "sha256-kjQ0B3nCoPULFU7y3xcXdtry+O5utn2qszw7eiNb/QM=" +typstDeps = [] +description = "Easily simulate (fake) bold, italic and small capital characters" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/cuti" + +[cuti."0.2.1"] +url = "https://packages.typst.org/preview/cuti-0.2.1.tar.gz" +hash = "sha256-NCmPXM1eD97k/5TgVuLC7zVv/0jIQ1lXxbwnmzA2dEI=" +typstDeps = [ + "sourcerer_0_2_1", +] +description = "Easily simulate (fake) bold and italic characters" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/cuti" + +[cuti."0.2.0"] +url = "https://packages.typst.org/preview/cuti-0.2.0.tar.gz" +hash = "sha256-/2GkJVTGVy90KecQ7pkvwT6F5txgE8Ym79kxNTvvyw4=" +typstDeps = [ + "sourcerer_0_2_1", +] +description = "Easily simulate (fake) bold and italic characters" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/cuti" + +[cuti."0.1.0"] +url = "https://packages.typst.org/preview/cuti-0.1.0.tar.gz" +hash = "sha256-FZpGfKuM2cHulPheE2Ubi+u+jKAHNmKRb9bvByM60TA=" +typstDeps = [ + "sourcerer_0_2_1", +] +description = "Easily simulate (fake) bold characters" +license = [ + "MIT", +] +homepage = "https://github.com/csimide/cuti" + +[cvssc."0.1.0"] +url = "https://packages.typst.org/preview/cvssc-0.1.0.tar.gz" +hash = "sha256-pCeczpz4B70NefSn79TL/zFjwZG5A+W2QsYedUjvg5o=" +typstDeps = [ + "codly_0_1_0", + "tidy_0_3_0", +] +description = "Common Vulnerability Scoring System Calculator" +license = [ + "MIT", +] + +[cyberschool-errorteaplate."0.1.3"] +url = "https://packages.typst.org/preview/cyberschool-errorteaplate-0.1.3.tar.gz" +hash = "sha256-k/zpxcsIv47M6YPy5eNl2YVh/RicIVJH595xbzSicqY=" +typstDeps = [ + "codly_1_2_0", + "codly-languages_0_1_1", +] +description = "This is a template originaly made for the Cyberschool of Rennes, a Cybersecurity school" +license = [ + "MIT", +] +homepage = "https://github.com/ErrorTeaPot/Cyberschool_template" + +[dashing-dept-news."0.1.1"] +url = "https://packages.typst.org/preview/dashing-dept-news-0.1.1.tar.gz" +hash = "sha256-lV1llDhUz5VkUppRdrVqWHKxjcaX4BP0dtGKCDQ5hfQ=" +typstDeps = [] +description = "Share the news with bold graphic design and a modern layout" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[dashing-dept-news."0.1.0"] +url = "https://packages.typst.org/preview/dashing-dept-news-0.1.0.tar.gz" +hash = "sha256-MYvPfCYTQ6YNqbVuS5VAcnHHIk5WlucZDEWPgUy7gn0=" +typstDeps = [] +description = "Share the news with bold graphic design and a modern layout" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[dashy-todo."0.0.3"] +url = "https://packages.typst.org/preview/dashy-todo-0.0.3.tar.gz" +hash = "sha256-PijpOpLWjVAvoabzsxNk9gZVMbgLPVgFUJ2LncJqrHA=" +typstDeps = [] +description = "A method to display TODOs at the side of the page" +license = [ + "MIT-0", +] +homepage = "https://github.com/Otto-AA/dashy-todo" + +[dashy-todo."0.0.2"] +url = "https://packages.typst.org/preview/dashy-todo-0.0.2.tar.gz" +hash = "sha256-asHQ/VkGl1whCYh+QhVN1PNtzvgxoj2iUaL0JJmkmNA=" +typstDeps = [] +description = "A method to display TODOs at the side of the page" +license = [ + "MIT-0", +] +homepage = "https://github.com/Otto-AA/dashy-todo" + +[dashy-todo."0.0.1"] +url = "https://packages.typst.org/preview/dashy-todo-0.0.1.tar.gz" +hash = "sha256-AnuEVa8LWu5YnuueGtrzobNfoy5uywMpNcpq6IhXfaU=" +typstDeps = [] +description = "A method to display TODOs at the side of the page" +license = [ + "MIT-0", +] +homepage = "https://github.com/Otto-AA/dashy-todo" + +[datify."0.1.3"] +url = "https://packages.typst.org/preview/datify-0.1.3.tar.gz" +hash = "sha256-mKkhBH3GiqoQ39/LcWOCrzPqZlaT1JUbXbmCST7f9N4=" +typstDeps = [] +description = "Datify is a simple date package that allows users to format dates in new ways and addresses the issue of lacking date formats in different languages" +license = [ + "MIT", +] +homepage = "https://github.com/Jeomhps/datify" + +[datify."0.1.2"] +url = "https://packages.typst.org/preview/datify-0.1.2.tar.gz" +hash = "sha256-V2Bx0riDDMf4oWE3TbpwH6g95E/7ZeeiZB2ijVlVoWo=" +typstDeps = [] +description = "Datify is a simple date package that allows users to format dates in new ways and addresses the issue of lacking date formats in different languages" +license = [ + "MIT", +] +homepage = "https://github.com/Jeomhps/datify" + +[datify."0.1.1"] +url = "https://packages.typst.org/preview/datify-0.1.1.tar.gz" +hash = "sha256-UXiZ9Rkwx5K3byK23KRkqN1sTx9V0Cutwz6ZeaO3D/A=" +typstDeps = [] +description = "Datify is a simple date package that allows users to format dates in new ways and addresses the issue of lacking date formats in different languages" +license = [ + "MIT", +] +homepage = "https://github.com/Jeomhps/datify" + +[decasify."0.10.1"] +url = "https://packages.typst.org/preview/decasify-0.10.1.tar.gz" +hash = "sha256-qW5gjrNSaK8xU9JIs1NxE2Bj1yB7g1WyHTR1bc3FlR0=" +typstDeps = [] +description = "Locale and style-guide aware text casing functions for natural language prose" +license = [ + "LGPL-3.0-only", +] +homepage = "https://github.com/alerque/decasify" + +[decasify."0.9.1"] +url = "https://packages.typst.org/preview/decasify-0.9.1.tar.gz" +hash = "sha256-mBbWqrusIThZ5aQdoPeftUyoIJYD2ygZz8Y1kk3nNX0=" +typstDeps = [] +description = "Locale and style-guide aware text casing functions for natural language prose" +license = [ + "LGPL-3.0-only", +] +homepage = "https://github.com/alerque/decasify" + +[decasify."0.9.0"] +url = "https://packages.typst.org/preview/decasify-0.9.0.tar.gz" +hash = "sha256-Kyv7YP2PSIrvmHE8aOiYsvF611806ijVQ4Iw9yteOfQ=" +typstDeps = [] +description = "Locale and style-guide aware text casing functions for natural language prose" +license = [ + "LGPL-3.0-only", +] +homepage = "https://github.com/alerque/decasify" + +[defined."0.1.0"] +url = "https://packages.typst.org/preview/defined-0.1.0.tar.gz" +hash = "sha256-4ON8im4nwdi8cydBmnwYRY7d8Qovu+X2+63G+Z8aEH4=" +typstDeps = [ + "valkyrie_0_2_1", +] +description = "typst package to make conditional compilation easily" +license = [ + "Unlicense", +] +homepage = "https://github.com/profetia/defined" + +[definitely-not-isec-thesis."2.0.0"] +url = "https://packages.typst.org/preview/definitely-not-isec-thesis-2.0.0.tar.gz" +hash = "sha256-VTdCWyOS5RCXQ0hQq+QPsn8T9vzDGv8dWLajNz89UT8=" +typstDeps = [] +description = "An unofficial ISEC TUGraz Master's Thesis template" +license = [ + "MIT", +] +homepage = "https://github.com/ecomaikgolf/typst-isec-master-thesis-template/" + +[definitely-not-isec-thesis."1.0.0"] +url = "https://packages.typst.org/preview/definitely-not-isec-thesis-1.0.0.tar.gz" +hash = "sha256-aLaXo2JxW+fNLh3cGXZeGADf4Sw4rNslGn9FphVcDE8=" +typstDeps = [] +description = "An unofficial ISEC TUGraz Master's Thesis template" +license = [ + "MIT", +] +homepage = "https://github.com/ecomaikgolf/typst-isec-master-thesis-template/" + +[definitely-not-tuw-thesis."0.1.0"] +url = "https://packages.typst.org/preview/definitely-not-tuw-thesis-0.1.0.tar.gz" +hash = "sha256-cVvHDgg9H95Npk91WMyWNKoXKO+zydRDKQkyx4nSmtM=" +typstDeps = [ + "linguify_0_4_1", +] +description = "An unofficial template for a thesis at the TU Wien informatics institute" +license = [ + "MIT-0", +] +homepage = "https://github.com/Otto-AA/definitely-not-tuw-thesis" + +[delegis."0.3.0"] +url = "https://packages.typst.org/preview/delegis-0.3.0.tar.gz" +hash = "sha256-NoMAAYxznL32LJ8dBsfSnCeM/huXx9HiL50DP7zoVbY=" +typstDeps = [] +description = "A package and template for drafting legislative content in a German-style structuring, such as for bylaws, etc" +license = [ + "MIT", +] +homepage = "https://github.com/wuespace/delegis" + +[delegis."0.2.0"] +url = "https://packages.typst.org/preview/delegis-0.2.0.tar.gz" +hash = "sha256-s2GQ6y5IJj9GG1UktRIH94Q3r5XnLIdxNbUXBgsNqTo=" +typstDeps = [] +description = "A package and template for drafting legislative content in a German-style structuring, such as for bylaws, etc" +license = [ + "MIT", +] +homepage = "https://github.com/wuespace/delegis" + +[delegis."0.1.0"] +url = "https://packages.typst.org/preview/delegis-0.1.0.tar.gz" +hash = "sha256-X1XB0CMtKRNS6jaQDgi9fORxunu9FMcQU4D5Ae4Zu4g=" +typstDeps = [] +description = "A package and template for drafting legislative content in a German-style structuring, such as for bylaws, etc" +license = [ + "MIT", +] +homepage = "https://github.com/wuespace/delegis" + +[delimitizer."0.1.0"] +url = "https://packages.typst.org/preview/delimitizer-0.1.0.tar.gz" +hash = "sha256-E5NK6h/dfel5QAtoyaXVD4SCN8+xzfQ2MOxFZQcgl6M=" +typstDeps = [] +description = "Customize the size of delimiters. Like \\big, \\Big, \\bigg, \\Bigg in LaTeX" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/delimitizer" + +[derive-it."0.1.3"] +url = "https://packages.typst.org/preview/derive-it-0.1.3.tar.gz" +hash = "sha256-HLNiQYeh55Kh1Kz5H/+/8LTAEG24zkI6XdAT/41Pw18=" +typstDeps = [] +description = "Simple functions for creating fitch-style natural deduction proofs and derivations" +license = [ + "MIT", +] +homepage = "https://github.com/0rphee/derive-it" + +[derive-it."0.1.2"] +url = "https://packages.typst.org/preview/derive-it-0.1.2.tar.gz" +hash = "sha256-S6S+PX4pUmSITXgfxaTkew1OivfWB9gGAIchkLxqyaw=" +typstDeps = [] +description = "Simple functions for creating fitch-style natural deduction proofs and derivations" +license = [ + "MIT", +] +homepage = "https://github.com/0rphee/derive-it" + +[derive-it."0.1.1"] +url = "https://packages.typst.org/preview/derive-it-0.1.1.tar.gz" +hash = "sha256-JkXZ5QLNR6+8pYyg9jSZiSJU9wC0Ia1x7pnAa/CohcM=" +typstDeps = [] +description = "Simple functions for creating fitch-style natural deduction proofs and derivations" +license = [ + "MIT", +] +homepage = "https://github.com/0rphee/derive-it" + +[derive-it."0.1.0"] +url = "https://packages.typst.org/preview/derive-it-0.1.0.tar.gz" +hash = "sha256-dw9BYHBb0mMx9WFzxiKHEWI2omaPs2Jxdye/1pIMc10=" +typstDeps = [] +description = "Simple functions for creating fitch-style natural deduction proofs and derivations" +license = [ + "MIT", +] +homepage = "https://github.com/0rphee/derive-it" + +[diagraph."0.3.3"] +url = "https://packages.typst.org/preview/diagraph-0.3.3.tar.gz" +hash = "sha256-RwNjmzaTCjMmBMeSd8WPRIQu44IkN+cYW27P18tqN+4=" +typstDeps = [] +description = "Draw graphs with Graphviz. Use mathematical formulas as labels" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.3.2"] +url = "https://packages.typst.org/preview/diagraph-0.3.2.tar.gz" +hash = "sha256-mr8/KrrmEZ0Yk53iqs6Y4UwEhkdExx1KptN8gMldf/Q=" +typstDeps = [] +description = "Draw graphs with Graphviz. Use mathematical formulas as labels" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.3.1"] +url = "https://packages.typst.org/preview/diagraph-0.3.1.tar.gz" +hash = "sha256-H693ABKs58NxzEIkf7rTzf4UImTyXxVpk8EeJe8V4yw=" +typstDeps = [] +description = "Draw graphs with Graphviz. Use mathematical formulas as labels" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.3.0"] +url = "https://packages.typst.org/preview/diagraph-0.3.0.tar.gz" +hash = "sha256-2qQ0yItPQnKFmR/x3FMadQIsPJD4MyLpdb1XQIJvrE4=" +typstDeps = [] +description = "Draw graphs with Graphviz. Use mathematical formulas as labels" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.2.5"] +url = "https://packages.typst.org/preview/diagraph-0.2.5.tar.gz" +hash = "sha256-UTmOsFHJDsgqbcKKez5OFI4P8MQ7OWDwCrhRK1zRO4Y=" +typstDeps = [] +description = "Draw graphs with Graphviz. Use mathematical formulas as labels" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.2.4"] +url = "https://packages.typst.org/preview/diagraph-0.2.4.tar.gz" +hash = "sha256-2yhWqdq8pw9nBaVMm+yzMjY2JY2iNwdAllrElDQvCig=" +typstDeps = [] +description = "Draw graphs with Graphviz. Use mathematical formulas as labels" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.2.3"] +url = "https://packages.typst.org/preview/diagraph-0.2.3.tar.gz" +hash = "sha256-ESNyD7o2QfhgYwNITd0Gvc+Zhm88jANPSCgUVQTKzy0=" +typstDeps = [] +description = "Draw graphs with Graphviz. Use mathematical formulas as labels" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.2.2"] +url = "https://packages.typst.org/preview/diagraph-0.2.2.tar.gz" +hash = "sha256-4kGjMzj8lPG7GLVgKZiKH9lSMWfRwg9bJFxMDstw7r8=" +typstDeps = [] +description = "Graphviz bindings for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.2.1"] +url = "https://packages.typst.org/preview/diagraph-0.2.1.tar.gz" +hash = "sha256-FdoNdv3k/EmVCafUtzJAWeJffV5Usab/8gMj0CcLhRg=" +typstDeps = [] +description = "Graphviz bindings for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.2.0"] +url = "https://packages.typst.org/preview/diagraph-0.2.0.tar.gz" +hash = "sha256-p/rTvdqrAHwbLpfhMsPkehWINO0FUk2kJFGJJTvRQjQ=" +typstDeps = [] +description = "Graphviz bindings for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.1.2"] +url = "https://packages.typst.org/preview/diagraph-0.1.2.tar.gz" +hash = "sha256-p+aiPsnfo+lK1R+K8wpASCGffseqI662B4ACv03oco0=" +typstDeps = [] +description = "Graphviz bindings for typst" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.1.1"] +url = "https://packages.typst.org/preview/diagraph-0.1.1.tar.gz" +hash = "sha256-ngeZ+sxcJA/bYiHwzH0VAcm+27xNV4ig5kUIRlCESSc=" +typstDeps = [] +description = "Graphviz bindings for typst" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diagraph."0.1.0"] +url = "https://packages.typst.org/preview/diagraph-0.1.0.tar.gz" +hash = "sha256-rAxw3J4azB+uFIrwXSkU8Skqw0rAOdxRFMdn+lg3Dx4=" +typstDeps = [] +description = "Graphviz bindings for typst" +license = [ + "MIT", +] +homepage = "https://github.com/Robotechnic/diagraph.git" + +[diatypst."0.5.0"] +url = "https://packages.typst.org/preview/diatypst-0.5.0.tar.gz" +hash = "sha256-OVbxSP8JMJAZXlVi+Sky5S7o66nImHPXW7/lDn0qVwk=" +typstDeps = [ + "diatypst_0_2_0", +] +description = "easy slides in typst - sensible defaults, easy syntax, well styled" +license = [ + "MIT-0", +] +homepage = "https://github.com/skriptum/Diatypst" + +[diatypst."0.4.0"] +url = "https://packages.typst.org/preview/diatypst-0.4.0.tar.gz" +hash = "sha256-EpSSFapDSHOZsAqNSpZCpRtwpGtaaSIcSfhuM2lh55M=" +typstDeps = [ + "diatypst_0_2_0", +] +description = "easy slides in typst - sensible defaults, easy syntax, well styled" +license = [ + "MIT-0", +] +homepage = "https://github.com/skriptum/Diatypst" + +[diatypst."0.3.0"] +url = "https://packages.typst.org/preview/diatypst-0.3.0.tar.gz" +hash = "sha256-HWGTqgOg/A3I+1VdiEfVJXXwIFsp2/bgy4zcHzqInAc=" +typstDeps = [ + "diatypst_0_2_0", +] +description = "easy slides in typst - sensible defaults, easy syntax, well styled" +license = [ + "MIT-0", +] +homepage = "https://github.com/skriptum/Diatypst" + +[diatypst."0.2.0"] +url = "https://packages.typst.org/preview/diatypst-0.2.0.tar.gz" +hash = "sha256-I1I+RSLNukq51EA8T9vVA73cOiwUNWSxaa/3/D+meck=" +typstDeps = [ + "diatypst_0_1_0", +] +description = "easy slides in typst - sensible defaults, easy syntax, well styled" +license = [ + "MIT-0", +] +homepage = "https://github.com/skriptum/Diatypst" + +[diatypst."0.1.0"] +url = "https://packages.typst.org/preview/diatypst-0.1.0.tar.gz" +hash = "sha256-//ZuvgYUMJ2h1F3Ho1eF5+Wi2UkJL1mq42QZOnaXKZ8=" +typstDeps = [] +description = "easy slides in typst - sensible defaults, easy syntax, well styled" +license = [ + "MIT-0", +] +homepage = "https://github.com/skriptum/Diatypst" + +[dining-table."0.1.0"] +url = "https://packages.typst.org/preview/dining-table-0.1.0.tar.gz" +hash = "sha256-JoZd2QGPf0JK6pPiaMTB88JEoBR/JUvgsXclq0gvhxE=" +typstDeps = [] +description = "Column-wise table definitions for big data" +license = [ + "Unlicense", +] +homepage = "https://github.com/JamesxX/dining-table" + +[diverential."0.2.0"] +url = "https://packages.typst.org/preview/diverential-0.2.0.tar.gz" +hash = "sha256-llW9ALoGx7qiILMIundWdv+YSkUpzlXQg1ctSMntuXA=" +typstDeps = [] +description = "Format differentials conveniently" +license = [ + "MIT", +] + +[divine-words."0.1.0"] +url = "https://packages.typst.org/preview/divine-words-0.1.0.tar.gz" +hash = "sha256-SZ4TbK1Ig2tmIq25r7jEurSOpcJBPMKmrrn+5FF/TN0=" +typstDeps = [] +description = "Just a template for a lab report" +license = [ + "MIT", +] +homepage = "https://github.com/tedius-git/divine-words" + +[down."0.1.0"] +url = "https://packages.typst.org/preview/down-0.1.0.tar.gz" +hash = "sha256-GA9mB7xmY68E8058uZ1RsNv1qJ+fhm6zaULfcAfd76A=" +typstDeps = [] +description = "Pass down arguments of `sum`, `integral`, etc. to the next line, which can generate shorthand to present reusable segments" +license = [ + "MIT", +] +homepage = "https://git.sr.ht/~toto/down" + +[drafting."0.2.2"] +url = "https://packages.typst.org/preview/drafting-0.2.2.tar.gz" +hash = "sha256-xJ3FdEiM1qPEhzZ4QkNdsysmMQ0GbY5l+EoWo2sbFdk=" +typstDeps = [] +description = "Helpful functions for content positioning and margin comments/notes" +license = [ + "Unlicense", +] +homepage = "https://github.com/ntjess/typst-drafting" + +[drafting."0.2.1"] +url = "https://packages.typst.org/preview/drafting-0.2.1.tar.gz" +hash = "sha256-PfpwLtjQSXtJBpjOF8I889Yz5fgM+22wyS9a4Rgdlzk=" +typstDeps = [] +description = "Helpful functions for content positioning and margin comments/notes" +license = [ + "Unlicense", +] +homepage = "https://github.com/ntjess/typst-drafting" + +[drafting."0.2.0"] +url = "https://packages.typst.org/preview/drafting-0.2.0.tar.gz" +hash = "sha256-pLBtMjCfRN3L9a53RKKkt5NCVVEmz8V4ROHvMlTTK6A=" +typstDeps = [] +description = "Helpful functions for content positioning and margin comments/notes" +license = [ + "Unlicense", +] +homepage = "https://github.com/ntjess/typst-drafting" + +[drafting."0.1.2"] +url = "https://packages.typst.org/preview/drafting-0.1.2.tar.gz" +hash = "sha256-xPz41aJVtJaCV7yq8cHtMC10uLh/UObEdpaMStrv9n4=" +typstDeps = [] +description = "Helpful functions for content positioning and margin comments/notes" +license = [ + "Unlicense", +] +homepage = "https://github.com/ntjess/typst-drafting" + +[drafting."0.1.1"] +url = "https://packages.typst.org/preview/drafting-0.1.1.tar.gz" +hash = "sha256-tdAybXIglAvYpALC2z0oYBgFt4XMytYvWzqW5RLWOgk=" +typstDeps = [] +description = "Helpful functions for content positioning and margin comments/notes" +license = [ + "Unlicense", +] +homepage = "https://github.com/ntjess/typst-drafting" + +[drafting."0.1.0"] +url = "https://packages.typst.org/preview/drafting-0.1.0.tar.gz" +hash = "sha256-iyUt4rjG4O61A3MR9FqTgy+F/Zge1msIuNvAMrfIwK4=" +typstDeps = [] +description = "Helpful functions during document drafting" +license = [ + "Unlicense", +] + +[droplet."0.3.1"] +url = "https://packages.typst.org/preview/droplet-0.3.1.tar.gz" +hash = "sha256-ngKk23tUePES0KJ8ywikO1xSDmYkJyr1VANLxV3ILVY=" +typstDeps = [] +description = "Customizable dropped capitals" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-droplet" + +[droplet."0.3.0"] +url = "https://packages.typst.org/preview/droplet-0.3.0.tar.gz" +hash = "sha256-ZRu5kk17aFhWF/TcfAeV/v2CwfyZiHSW1tLe7gvTeqI=" +typstDeps = [] +description = "Customizable dropped capitals" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-droplet" + +[droplet."0.2.0"] +url = "https://packages.typst.org/preview/droplet-0.2.0.tar.gz" +hash = "sha256-3K/8SK9My1Q4YKSnDbf+A3+9/i0FWCL9UORkYoYuE3Q=" +typstDeps = [] +description = "Customizable dropped capitals" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-droplet" + +[droplet."0.1.0"] +url = "https://packages.typst.org/preview/droplet-0.1.0.tar.gz" +hash = "sha256-zonpMX6mDSWOOIuBoy2G/nM7f+wdZfFCAopUJ4FuJwY=" +typstDeps = [] +description = "Customizable dropped capitals" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-droplet" + +[dvdtyp."1.0.1"] +url = "https://packages.typst.org/preview/dvdtyp-1.0.1.tar.gz" +hash = "sha256-vXA3xTFLRB6LVLKCjK6nt/tQS4Cl0btWrAhmVJpiJMQ=" +typstDeps = [ + "ctheorems_1_1_3", + "showybox_2_0_4", +] +description = "a colorful template for writting handouts or notes" +license = [ + "MIT-0", +] +homepage = "https://github.com/DVDTSB/dvdtyp" + +[dvdtyp."1.0.0"] +url = "https://packages.typst.org/preview/dvdtyp-1.0.0.tar.gz" +hash = "sha256-gNsKq88p6G7oRCzImZTsd/w8lP007pd8Hqyj0VioWAE=" +typstDeps = [ + "ctheorems_1_1_2", + "showybox_2_0_1", +] +description = "a colorful template for writting handouts or notes" +license = [ + "MIT-0", +] +homepage = "https://github.com/DVDTSB/dvdtyp" + +[easy-pinyin."0.1.0"] +url = "https://packages.typst.org/preview/easy-pinyin-0.1.0.tar.gz" +hash = "sha256-25XJa5ovmFzwwzmBrdF24okyajCWdduT9sHf5c/krDw=" +typstDeps = [] +description = "Write Chinese pinyin easily" +license = [ + "MIT", +] +homepage = "https://github.com/7sDream/typst-easy-pinyin" + +[easy-typography."0.1.0"] +url = "https://packages.typst.org/preview/easy-typography-0.1.0.tar.gz" +hash = "sha256-yj2teX9KuCz1cDbTFhuOkucrFlpHDaOhBq+MVeRpwoM=" +typstDeps = [ + "codly_1_2_0", + "codly-languages_0_1_1", +] +description = "Sets up sensible typography defaults" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[easytable."0.1.0"] +url = "https://packages.typst.org/preview/easytable-0.1.0.tar.gz" +hash = "sha256-W3FRYrjZ0u0Rdr8hYrwksuGwPjzF4ukX/EodJz0mSNE=" +typstDeps = [ + "tablex_0_0_8", +] +description = "Simple Table Package" +license = [ + "MIT", +] +homepage = "https://github.com/monaqa/typst-easytable" + +[echarm."0.2.1"] +url = "https://packages.typst.org/preview/echarm-0.2.1.tar.gz" +hash = "sha256-7msh2oSNLToUkDKIrDDkUs9Zj2im09EE1xcHxRgoXF4=" +typstDeps = [ + "ctxjs_0_3_1", +] +description = "Run echarts in typst with the use of CtxJS" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-echarm-package" + +[echarm."0.2.0"] +url = "https://packages.typst.org/preview/echarm-0.2.0.tar.gz" +hash = "sha256-RsI3gLmBGW+gip7974CbraCN3aIotUfYo1yGn2QKPSk=" +typstDeps = [ + "ctxjs_0_2_0", +] +description = "Run echarts in typst with the use of CtxJS" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-echarm-package" + +[echarm."0.1.1"] +url = "https://packages.typst.org/preview/echarm-0.1.1.tar.gz" +hash = "sha256-ePQrYFEkHsrT/TFQuSc6KfqHHb6D7OWjQ1Ysia1X28Q=" +typstDeps = [ + "ctxjs_0_2_0", +] +description = "Run echarts in typst with the use of CtxJS" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-echarm-package" + +[echarm."0.1.0"] +url = "https://packages.typst.org/preview/echarm-0.1.0.tar.gz" +hash = "sha256-vKTRw6QiKcIBRVaOjy0vO1eO0sQd0+bhi91J5X4UT+c=" +typstDeps = [ + "ctxjs_0_1_0", +] +description = "Run echarts in typst with the use of CtxJS" +license = [ + "MIT", +] +homepage = "https://github.com/lublak/typst-echarm-package" + +[edgeframe."0.1.0"] +url = "https://packages.typst.org/preview/edgeframe-0.1.0.tar.gz" +hash = "sha256-AVXSce2K+PcxHjtkm3PEChbsDIISnOqZmbA4Yl6i/J4=" +typstDeps = [] +description = "For quick paper setups" +license = [ + "MIT", +] +homepage = "https://github.com/neuralpain/edgeframe" + +[efilrst."0.3.1"] +url = "https://packages.typst.org/preview/efilrst-0.3.1.tar.gz" +hash = "sha256-Xrt6aikAZeV0KodY6qNELZ5STxZuVwflA6J+2ES4jz8=" +typstDeps = [] +description = "A simple referenceable list library for typst" +license = [ + "MIT", +] +homepage = "https://github.com/jmigual/typst-efilrst" + +[efilrst."0.3.0"] +url = "https://packages.typst.org/preview/efilrst-0.3.0.tar.gz" +hash = "sha256-YQK/52bwOabt2ZQeZNK+gHC6hKN0eEXd4Jxv8iWxuKM=" +typstDeps = [] +description = "A simple referenceable list library for typst" +license = [ + "MIT", +] +homepage = "https://github.com/jmigual/typst-efilrst" + +[efilrst."0.2.0"] +url = "https://packages.typst.org/preview/efilrst-0.2.0.tar.gz" +hash = "sha256-pBk8BZ7Bfjwy2xWUG75n0OMsq9CBFohJpqvRccSTZwE=" +typstDeps = [] +description = "A simple referenceable list library for typst" +license = [ + "MIT", +] +homepage = "https://github.com/jmigual/typst-efilrst" + +[efilrst."0.1.0"] +url = "https://packages.typst.org/preview/efilrst-0.1.0.tar.gz" +hash = "sha256-h9Nf0hdK/8pNsQSAOq/xF69vnX5GCTp26T/AXhXTHbY=" +typstDeps = [] +description = "A simple referenceable list library for typst" +license = [ + "MIT", +] +homepage = "https://github.com/jmigual/typst-efilrst" + +[electify."0.1.1"] +url = "https://packages.typst.org/preview/electify-0.1.1.tar.gz" +hash = "sha256-THxg8Rvy08WCwrOBAjAgyZXsxWtwr1QNgx5mZ3HZob0=" +typstDeps = [] +description = "A German Election Ballot Paper helping visualize the dual-voting system (Erststimme & Zweitstimme" +license = [ + "MIT", +] +homepage = "https://github.com/G0STG0D/electify" + +[electify."0.1.0"] +url = "https://packages.typst.org/preview/electify-0.1.0.tar.gz" +hash = "sha256-0yS+JpekyeSV5VrNVLqCIO90wG0bHYjJpJ05YiT8drs=" +typstDeps = [] +description = "A German Election Ballot Paper helping visualize the dual-voting system (Erststimme & Zweitstimme" +license = [ + "MIT", +] +homepage = "https://github.com/G0STG0D/typst-packages" + +[elsearticle."0.4.2"] +url = "https://packages.typst.org/preview/elsearticle-0.4.2.tar.gz" +hash = "sha256-QlnOgnxC5dBlFtBVKlgbdE/QnC3yeIUpT7Kn445HrXI=" +typstDeps = [ + "cheq_0_1_0", + "equate_0_2_1", + "mantys_0_1_4", + "subpar_0_1_1", +] +description = "Conversion of the LaTeX elsearticle.cls" +license = [ + "MIT", +] +homepage = "https://github.com/maucejo/elsearticle" + +[elsearticle."0.4.1"] +url = "https://packages.typst.org/preview/elsearticle-0.4.1.tar.gz" +hash = "sha256-froFVx2/nqEBcXUf8NecGHk/mxG0qvU4STCmQ6epiCM=" +typstDeps = [ + "cheq_0_1_0", + "equate_0_2_1", + "mantys_0_1_4", + "subpar_0_1_1", +] +description = "Conversion of the LaTeX elsearticle.cls" +license = [ + "MIT", +] +homepage = "https://github.com/maucejo/elsearticle" + +[elsearticle."0.4.0"] +url = "https://packages.typst.org/preview/elsearticle-0.4.0.tar.gz" +hash = "sha256-gi4kKD1T6mwjbQyiaW5dJUJlDo7wcbJk9fdjvSvH9sE=" +typstDeps = [ + "cheq_0_1_0", + "equate_0_2_1", + "mantys_0_1_4", + "subpar_0_1_1", +] +description = "Conversion of the LaTeX elsearticle.cls" +license = [ + "MIT", +] +homepage = "https://github.com/maucejo/elsearticle" + +[elsearticle."0.3.0"] +url = "https://packages.typst.org/preview/elsearticle-0.3.0.tar.gz" +hash = "sha256-v0Ft+VaJEsvcTEyNJARX4x/BBWjaD0S70exdSsvbVCU=" +typstDeps = [ + "subpar_0_1_1", +] +description = "Conversion of the LaTeX elsearticle.cls" +license = [ + "MIT", +] +homepage = "https://github.com/maucejo/elsearticle" + +[elsearticle."0.2.1"] +url = "https://packages.typst.org/preview/elsearticle-0.2.1.tar.gz" +hash = "sha256-G0FFXGQ6IRkvOf8TdaNxJcRFJ5jYU5QUWfsXo63INt4=" +typstDeps = [ + "cheq_0_1_0", + "mantys_0_1_4", + "subpar_0_1_1", +] +description = "Conversion of the LaTeX elsearticle.cls" +license = [ + "MIT", +] +homepage = "https://github.com/maucejo/elsearticle" + +[elsearticle."0.2.0"] +url = "https://packages.typst.org/preview/elsearticle-0.2.0.tar.gz" +hash = "sha256-p+LmaEHTOWEp5gPKCHF2zezuABnRBWyPOkBrO5ge3xs=" +typstDeps = [ + "cheq_0_1_0", + "elsearticle_0_1_0", + "mantys_0_1_4", + "subpar_0_1_1", +] +description = "Conversion of the LaTeX elsearticle.cls" +license = [ + "MIT", +] +homepage = "https://github.com/maucejo/elsearticle" + +[elsearticle."0.1.0"] +url = "https://packages.typst.org/preview/elsearticle-0.1.0.tar.gz" +hash = "sha256-Y3ad9oganv2MW89AUzuexWQxuluTaWn2cENHCRlvx1U=" +typstDeps = [ + "cheq_0_1_0", + "mantys_0_1_4", +] +description = "Conversion of the LaTeX elsearticle.cls" +license = [ + "MIT", +] + +[embiggen."0.0.1"] +url = "https://packages.typst.org/preview/embiggen-0.0.1.tar.gz" +hash = "sha256-6IDxLVIVGD7xVAJAjeWwuywUoxjPvVswb7GeT4bjhsg=" +typstDeps = [] +description = "LaTeX-like delimeter sizing in Typst" +license = [ + "GPL-3.0-or-later", +] + +[enja-bib."0.1.0"] +url = "https://packages.typst.org/preview/enja-bib-0.1.0.tar.gz" +hash = "sha256-JJNYAVj8FM+rf8EpjHiF3sPSjDKIjTn5UpDZ1Qqe5yI=" +typstDeps = [] +description = "A package for handling BibTeX that includes both English and Japanese" +license = [ + "MIT", +] +homepage = "https://github.com/tkrhsmt/enja-bib" + +[ennui-ur-report."0.1.0"] +url = "https://packages.typst.org/preview/ennui-ur-report-0.1.0.tar.gz" +hash = "sha256-bMxoOzSdvrO6o4i16lTdIDU9OHSyz59p6fk8CKSh/70=" +typstDeps = [] +description = "A customizable, non official template for University of Rennes" +license = [ + "GPL-3.0-or-later", +] +homepage = "https://github.com/leana8959/univ-rennes.typ" + +[enunciado-facil-fcfm."0.1.0"] +url = "https://packages.typst.org/preview/enunciado-facil-fcfm-0.1.0.tar.gz" +hash = "sha256-sJQRnJ7opLSbBWTcS9YNOCQlZ2lYiuMAGBSeeC3MChM=" +typstDeps = [] +description = "Documentos de ejercicios (controles, auxiliares, tareas, pautas) para la FCFM, UChile" +license = [ + "MIT", +] +homepage = "https://github.com/bkorecic/enunciado-facil-fcfm" + +[eqalc."0.1.3"] +url = "https://packages.typst.org/preview/eqalc-0.1.3.tar.gz" +hash = "sha256-8m31R/YQmCJTp3QC7czxIHvELcocZWLkcLgaZw5aYAk=" +typstDeps = [] +description = "Convert math equations to functions" +license = [ + "MIT", +] +homepage = "https://github.com/7ijme/eqalc" + +[eqalc."0.1.2"] +url = "https://packages.typst.org/preview/eqalc-0.1.2.tar.gz" +hash = "sha256-FIDuB1lqfK84/VMGJQbEE2Tziw2ECuPXiTqVUHOluno=" +typstDeps = [] +description = "Convert math equations to functions" +license = [ + "MIT", +] +homepage = "https://github.com/7ijme/eqalc" + +[eqalc."0.1.1"] +url = "https://packages.typst.org/preview/eqalc-0.1.1.tar.gz" +hash = "sha256-PP3qgn1zpAijsBI9QTFC+h8YxbllR975Kg6iJlOdjRY=" +typstDeps = [] +description = "Convert math equations to functions" +license = [ + "MIT", +] +homepage = "https://github.com/7ijme/eqalc" + +[eqalc."0.1.0"] +url = "https://packages.typst.org/preview/eqalc-0.1.0.tar.gz" +hash = "sha256-rcbXANJXwG57hAVYVgw6y+Aum8lKXxFEzDGVCsNuq6U=" +typstDeps = [] +description = "Convert math equations to functions" +license = [ + "MIT", +] +homepage = "https://github.com/7ijme/eqalc" + +[equate."0.3.1"] +url = "https://packages.typst.org/preview/equate-0.3.1.tar.gz" +hash = "sha256-nEUnNszy1cVaemsqdAmjvj34obYPH3fGfWHX6Rb7ajE=" +typstDeps = [] +description = "Various enhancements for mathematical expressions" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-equate" + +[equate."0.3.0"] +url = "https://packages.typst.org/preview/equate-0.3.0.tar.gz" +hash = "sha256-nlt6wgzIVMGUD88wdeYjRjOI7q04BV4sYE0xejxiv34=" +typstDeps = [] +description = "Various enhancements for mathematical expressions" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-equate" + +[equate."0.2.1"] +url = "https://packages.typst.org/preview/equate-0.2.1.tar.gz" +hash = "sha256-UD/J2c3Hs6i4SuEGSINYBTXUpcZULKFxi6HkSjtLgmQ=" +typstDeps = [] +description = "Breakable equations with improved numbering" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-equate" + +[equate."0.2.0"] +url = "https://packages.typst.org/preview/equate-0.2.0.tar.gz" +hash = "sha256-/okqIsUZO+qoelAwd6gDZ+3HdOUfXm+hnHbCXRJMppY=" +typstDeps = [] +description = "Breakable equations with improved numbering" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-equate" + +[equate."0.1.0"] +url = "https://packages.typst.org/preview/equate-0.1.0.tar.gz" +hash = "sha256-GZuUqB/bZTeg9ZdbrlSPvDdAIkx6eWsPV4L6S5qLiwY=" +typstDeps = [] +description = "Breakable equations with improved numbering" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-equate" + +[esotefy."1.0.0"] +url = "https://packages.typst.org/preview/esotefy-1.0.0.tar.gz" +hash = "sha256-Yaex2nIpddDiJoTyV0Sl7oWltnxD4MfSIHoNbQuFv+s=" +typstDeps = [] +description = "A brainfuck implementation in pure Typst" +license = [ + "MIT", +] +homepage = "git@github.com:Thumuss/brainfuck.git" + +[etykett."0.1.0"] +url = "https://packages.typst.org/preview/etykett-0.1.0.tar.gz" +hash = "sha256-V2ItL+yNg1RYTrv5NIBKGipTjwz+L33KK9/TpsQdwpw=" +typstDeps = [ + "valkyrie_0_2_2", +] +description = "a template for printing onto label sheets with rectangular grids of labels" +license = [ + "MIT", +] +homepage = "https://github.com/SillyFreak/typst-etykett" + +[examify."0.1.1"] +url = "https://packages.typst.org/preview/examify-0.1.1.tar.gz" +hash = "sha256-1dgSCLdqpxvX9/eVDAG83hkwlMpJfyrWEk2SqNFHjYQ=" +typstDeps = [] +description = "A simple typst template to create question papers for exams" +license = [ + "MIT", +] +homepage = "https://github.com/tarunjana/examify" + +[examify."0.1.0"] +url = "https://packages.typst.org/preview/examify-0.1.0.tar.gz" +hash = "sha256-RpvIZMnN1Nq0dnyHwf79aAs/4BNZsJFYkgTjRWVJOok=" +typstDeps = [] +description = "A simple typst template to create question papers for exams" +license = [ + "MIT", +] +homepage = "https://github.com/tarunjana/examify" + +[examit."0.1.1"] +url = "https://packages.typst.org/preview/examit-0.1.1.tar.gz" +hash = "sha256-vm0p0uFU943pCQqpAWZI3bIBruQr/ELNzrO5b/NRv3A=" +typstDeps = [ + "cetz_0_2_2", +] +description = "An exam template based on the MIT LaTeX exam.cls" +license = [ + "MIT", +] + +[example."0.1.0"] +url = "https://packages.typst.org/preview/example-0.1.0.tar.gz" +hash = "sha256-VH5lAZYFEGfo3FVKoKgiqvmVUjrTlX+MzQI1e/N7oEM=" +typstDeps = [] +description = "An example package" +license = [ + "Unlicense", +] + +[exmllent."0.1.0"] +url = "https://packages.typst.org/preview/exmllent-0.1.0.tar.gz" +hash = "sha256-9MCCdvY8ozy6LsYFq8dcskQydcrWE3wnsvZ8UAeLtWA=" +typstDeps = [] +description = "Pure typst implementation of converting XML Excel table to typst table" +license = [ + "MIT", +] +homepage = "https://github.com/hongjr03/typst-xml-table-parser" + +[exzellenz-tum-thesis."0.1.0"] +url = "https://packages.typst.org/preview/exzellenz-tum-thesis-0.1.0.tar.gz" +hash = "sha256-mHGSNkqvM8IzTKanFcPLybhaUn5+/bfe7nnN/Qha/4k=" +typstDeps = [ + "glossarium_0_2_6", +] +description = "Customizable template for a thesis at the TU Munich" +license = [ + "MIT-0", +] + +[ez-algo."0.1.1"] +url = "https://packages.typst.org/preview/ez-algo-0.1.1.tar.gz" +hash = "sha256-cx+xwb4cZZo8SM30c0G76KscdpGYRDqSOZXOjFQ4RJY=" +typstDeps = [] +description = "A package to set algorithms with ease" +license = [ + "MIT", +] +homepage = "https://github.com/the-mathing/ez-algo" + +[ez-algo."0.1.0"] +url = "https://packages.typst.org/preview/ez-algo-0.1.0.tar.gz" +hash = "sha256-UOA5xIEBOrNlhI+8Zgok9VVq0apD6JlUHOCjvvAEJ/Q=" +typstDeps = [] +description = "A package to set algorithms with ease" +license = [ + "MIT", +] +homepage = "https://github.com/the-mathing/ez-algo" + +[ez-today."1.1.0"] +url = "https://packages.typst.org/preview/ez-today-1.1.0.tar.gz" +hash = "sha256-voHxSdsDcXD5vDAS6/7763eFsO83d7kim8ePWWU5L+U=" +typstDeps = [] +description = "Simply displays the full current date" +license = [ + "MIT", +] +homepage = "https://github.com/CarloSchafflik12/typst-ez-today" + +[ez-today."1.0.0"] +url = "https://packages.typst.org/preview/ez-today-1.0.0.tar.gz" +hash = "sha256-nyfqJy0qzLMVXUM6DzyoexKdmxXq0ad0muDFXBMkIIQ=" +typstDeps = [] +description = "Simply displays the full current date" +license = [ + "MIT", +] +homepage = "https://github.com/CarloSchafflik12/typst-ez-today" + +[ez-today."0.3.0"] +url = "https://packages.typst.org/preview/ez-today-0.3.0.tar.gz" +hash = "sha256-C8dNy4ypI+o3H4DsOyonlWtl0Ug38qbQ4Ik24Sb1r6c=" +typstDeps = [] +description = "Simply displays the full current date" +license = [ + "MIT", +] +homepage = "https://github.com/CarloSchafflik12/typst-ez-today" + +[ez-today."0.2.0"] +url = "https://packages.typst.org/preview/ez-today-0.2.0.tar.gz" +hash = "sha256-rLtFkTN5Rl/Z0S8yRJMBkBWEeYt8eZGSb86tnZzNFMw=" +typstDeps = [] +description = "Simply displays the full current date" +license = [ + "MIT", +] +homepage = "https://github.com/CarloSchafflik12/typst-ez-today" + +[ez-today."0.1.0"] +url = "https://packages.typst.org/preview/ez-today-0.1.0.tar.gz" +hash = "sha256-BimtKMHDG45nbi2QxH+aBJjMCPqxYylM53Y4qCpU+QU=" +typstDeps = [] +description = "Simply displays the full current date" +license = [ + "MIT", +] +homepage = "https://github.com/CarloSchafflik12/typst-ez-today" + +[fancy-affil."0.1.0"] +url = "https://packages.typst.org/preview/fancy-affil-0.1.0.tar.gz" +hash = "sha256-3w4k0AfmEp+wvXIkC1koKjIQxkQm3zLBrNgNh7IfNw0=" +typstDeps = [] +description = "An auto affiliation tool" +license = [ + "LGPL-3.0-or-later", +] +homepage = "https://github.com/han190/fancy-affil" + +[fancy-units."0.1.1"] +url = "https://packages.typst.org/preview/fancy-units-0.1.1.tar.gz" +hash = "sha256-T5+jI23IzepSp4YHaPM4unZ547rvZieHmmYgjBz/ud0=" +typstDeps = [] +description = "Format numbers and units with style" +license = [ + "MIT", +] +homepage = "https://github.com/janekfleper/typst-fancy-units" + +[fancy-units."0.1.0"] +url = "https://packages.typst.org/preview/fancy-units-0.1.0.tar.gz" +hash = "sha256-nyRiVkZ2+Q/FUPSrz/EQMvHU3Jmqjr63ClB/rqKFIQ8=" +typstDeps = [ + "tidy_0_4_0", +] +description = "Format numbers and units with styling" +license = [ + "MIT", +] +homepage = "https://github.com/janekfleper/typst-fancy-units" + +[fauve-cdb."0.1.0"] +url = "https://packages.typst.org/preview/fauve-cdb-0.1.0.tar.gz" +hash = "sha256-vc61E1kMUSVpgpQDX3lfUnpFpjenTLVeWa5WuK6TEsA=" +typstDeps = [ + "cetz_0_2_2", + "suiji_0_3_0", +] +description = "The unofficial implementation of the Collège Doctoral de Bretagne thesis manuscript template" +license = [ + "MIT-0", +] + +[fauxreilly."0.1.1"] +url = "https://packages.typst.org/preview/fauxreilly-0.1.1.tar.gz" +hash = "sha256-kA25rR18MIt1BNMHRugD1vZMpqV1tFlePuz+COtrD8g=" +typstDeps = [] +description = "A package for creating O'Rly- / O'Reilly-type cover pages" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/dei-layborer/fauxreilly" + +[fauxreilly."0.1.0"] +url = "https://packages.typst.org/preview/fauxreilly-0.1.0.tar.gz" +hash = "sha256-IlLxBlAKVnBr6qzyozaT1LfZSaZpv/rdJzrmNNDAtM4=" +typstDeps = [] +description = "A package for creating O'Rly- / O'Reilly-type cover pages" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/dei-layborer/o-rly-typst" + +[fervojo."0.1.0"] +url = "https://packages.typst.org/preview/fervojo-0.1.0.tar.gz" +hash = "sha256-icOqJl4Gc0H88UBPbS5XWTzhA3XqtTdtYykJjEIDSaA=" +typstDeps = [] +description = "railroad for typst, powered by wasm" +license = [ + "MIT", +] +homepage = "https://github.com/leiserfg/fervojo" + +[fh-joanneum-iit-thesis."2.1.2"] +url = "https://packages.typst.org/preview/fh-joanneum-iit-thesis-2.1.2.tar.gz" +hash = "sha256-BfTqeHsL04xPFI2KWwW1HuUlyv5bpPIJhKpDXLwFFgk=" +typstDeps = [ + "glossarium_0_5_3", +] +description = "BA or MA thesis at FH JOANNEUM" +license = [ + "MIT", +] +homepage = "https://git-iit.fh-joanneum.at/oss/thesis-template" + +[fh-joanneum-iit-thesis."2.0.5"] +url = "https://packages.typst.org/preview/fh-joanneum-iit-thesis-2.0.5.tar.gz" +hash = "sha256-wiOzA8xHU2Q4q1B844I0Pfmx4T8AT4cAFyNqIvDb/Ts=" +typstDeps = [ + "glossarium_0_5_0", +] +description = "BA or MA thesis at FH JOANNEUM" +license = [ + "MIT", +] +homepage = "https://git-iit.fh-joanneum.at/oss/thesis-template" + +[fh-joanneum-iit-thesis."2.0.2"] +url = "https://packages.typst.org/preview/fh-joanneum-iit-thesis-2.0.2.tar.gz" +hash = "sha256-7w95vjqsvDSK85Wt5c+o17t9vHw93BfVIcfUg4EGOVg=" +typstDeps = [ + "glossarium_0_5_0", +] +description = "BA or MA thesis at FH JOANNEUM" +license = [ + "MIT", +] +homepage = "https://git-iit.fh-joanneum.at/oss/thesis-template" + +[fh-joanneum-iit-thesis."1.2.3"] +url = "https://packages.typst.org/preview/fh-joanneum-iit-thesis-1.2.3.tar.gz" +hash = "sha256-5nGoIbzwmqxR4dzqWd8d8V7FHTiAFkYL5dA6D4Z+euo=" +typstDeps = [ + "glossarium_0_4_1", +] +description = "BA or MA thesis at FH JOANNEUM" +license = [ + "MIT", +] +homepage = "https://git-iit.fh-joanneum.at/oss/thesis-template" + +[fh-joanneum-iit-thesis."1.2.2"] +url = "https://packages.typst.org/preview/fh-joanneum-iit-thesis-1.2.2.tar.gz" +hash = "sha256-a49IpbL6x/zCQzJdK+fN7VX0EihkiNC/ET01K9ObHNE=" +typstDeps = [ + "glossarium_0_4_1", +] +description = "BA or MA thesis at FH JOANNEUM" +license = [ + "MIT", +] +homepage = "https://git-iit.fh-joanneum.at/oss/thesis-template" + +[fh-joanneum-iit-thesis."1.2.0"] +url = "https://packages.typst.org/preview/fh-joanneum-iit-thesis-1.2.0.tar.gz" +hash = "sha256-ZbyGUqDj2vpDm8igZfmcj/uiiZViTKpcfitGLT5wFDI=" +typstDeps = [ + "glossarium_0_4_1", +] +description = "BA or MA thesis at FH JOANNEUM" +license = [ + "MIT", +] +homepage = "https://git-iit.fh-joanneum.at/oss/thesis-template" + +[fh-joanneum-iit-thesis."1.1.0"] +url = "https://packages.typst.org/preview/fh-joanneum-iit-thesis-1.1.0.tar.gz" +hash = "sha256-JpoKUqABymBzc/djF1dDRi4rEAkTWisZJZtKFwMuVJ4=" +typstDeps = [] +description = "BA or MA thesis at FH JOANNEUM" +license = [ + "MIT", +] + +[finely-crafted-cv."0.3.0"] +url = "https://packages.typst.org/preview/finely-crafted-cv-0.3.0.tar.gz" +hash = "sha256-FIFb++hf4R8p+xzRfAc03wq+i4c8HG+K072KBaPP/mA=" +typstDeps = [] +description = "A modern résumé/curriculum vitæ template with high attention to detail" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[finely-crafted-cv."0.2.0"] +url = "https://packages.typst.org/preview/finely-crafted-cv-0.2.0.tar.gz" +hash = "sha256-S1gsR078vN+u7pTzJRb6+R/p54Oppf+3i8ZtKMrpv3g=" +typstDeps = [] +description = "A modern résumé/curriculum vitæ template with high attention to detail" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[finely-crafted-cv."0.1.0"] +url = "https://packages.typst.org/preview/finely-crafted-cv-0.1.0.tar.gz" +hash = "sha256-BkWI3fi7LaW1oJ1kHxvB13jQU8LxaKvq6JLaB7xWerY=" +typstDeps = [] +description = "A modern résumé/curriculum vitæ template with high attention to detail" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[finite."0.4.1"] +url = "https://packages.typst.org/preview/finite-0.4.1.tar.gz" +hash = "sha256-wQe8Rb63gPqULtmKglYzJsXKNNZlgngwhGUPgQ0MpDQ=" +typstDeps = [ + "cetz_0_3_0", + "t4t_0_3_2", +] +description = "Typst-setting finite automata with CeTZ" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-finite" + +[finite."0.4.0"] +url = "https://packages.typst.org/preview/finite-0.4.0.tar.gz" +hash = "sha256-s7/MtSGbL8kJx0kI9QLMwul+PKbNj26EoM/+AMJd1Kc=" +typstDeps = [ + "cetz_0_3_0", + "t4t_0_3_2", +] +description = "Typst-setting finite automata with CeTZ" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-finite" + +[finite."0.3.2"] +url = "https://packages.typst.org/preview/finite-0.3.2.tar.gz" +hash = "sha256-7dirwm+luHIVlSBR2MxSkzlkavHMHSE8OH8Ygg78Dhs=" +typstDeps = [ + "cetz_0_1_1", + "t4t_0_3_2", +] +description = "Typst-setting finite automata with CeTZ" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-finite" + +[finite."0.3.0"] +url = "https://packages.typst.org/preview/finite-0.3.0.tar.gz" +hash = "sha256-8rY6KX/SxvLMdAM4izTzUdlvFolw38Rd3IPo3b8Ny3o=" +typstDeps = [ + "cetz_0_1_1", + "t4t_0_3_2", +] +description = "Typst-setting finite automata with CeTZ" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-finite" + +[finite."0.1.0"] +url = "https://packages.typst.org/preview/finite-0.1.0.tar.gz" +hash = "sha256-/hFoi8e9PszDKFrH+/Pci+UyOrryCdC28ZdMRmraItw=" +typstDeps = [ + "cetz_0_0_2", + "t4t_0_3_0", +] +description = "Typst-setting finite automata with CeTZ" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-finite" + +[fireside."1.0.0"] +url = "https://packages.typst.org/preview/fireside-1.0.0.tar.gz" +hash = "sha256-OD7X1OEU9OtcO0kw4bJT/WXrLJowFsuFE86JKB7Ln/k=" +typstDeps = [] +description = "A simple letter template with a touch of warmth" +license = [ + "MIT", +] + +[flagada."0.1.0"] +url = "https://packages.typst.org/preview/flagada-0.1.0.tar.gz" +hash = "sha256-tyDAcymyVhl9B+u5Abl5hU2vwB7D1uIDyZEnxwU18RQ=" +typstDeps = [] +description = "A package to generate countries flags, selecting country based on its ISO3166-1 code" +license = [ + "MIT", +] +homepage = "https://github.com/samrenault/flagada" + +[flautomat."0.1.0"] +url = "https://packages.typst.org/preview/flautomat-0.1.0.tar.gz" +hash = "sha256-9ks3JA5cO4kvl8odrVdqEvzfbdr+AjHrTzWjbuDFo+4=" +typstDeps = [ + "fletcher_0_5_3", +] +description = "Visualize abstract automata based on json input" +license = [ + "MIT", +] +homepage = "https://codeberg.org/Kuchenmampfer/flautomat" + +[fletcher."0.5.7"] +url = "https://packages.typst.org/preview/fletcher-0.5.7.tar.gz" +hash = "sha256-jsLbE6cHDTjDelrGkB2CSIqfGaeAeQ1RcQRDBx3hA9k=" +typstDeps = [ + "cetz_0_3_4", + "tidy_0_4_1", + "touying_0_5_5", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.5.6"] +url = "https://packages.typst.org/preview/fletcher-0.5.6.tar.gz" +hash = "sha256-cJS0PCD/LP+4EFwSO5TDlG8vCTJ+WMIxmPl9o+k7Aas=" +typstDeps = [ + "cetz_0_3_3", + "tidy_0_4_1", + "touying_0_5_5", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.5.5"] +url = "https://packages.typst.org/preview/fletcher-0.5.5.tar.gz" +hash = "sha256-W+peOeFKgdAjuvLCGUI/Wue0ce7p/3qBfgCrW16o4tc=" +typstDeps = [ + "cetz_0_3_2", + "tidy_0_2_0", + "tidy_0_3_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.5.4"] +url = "https://packages.typst.org/preview/fletcher-0.5.4.tar.gz" +hash = "sha256-U9CqdJlwoTl+SAOcTi3/ewTxliaejXVxtzpE1M1hPu4=" +typstDeps = [ + "cetz_0_3_1", + "tidy_0_2_0", + "tidy_0_3_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.5.3"] +url = "https://packages.typst.org/preview/fletcher-0.5.3.tar.gz" +hash = "sha256-4cP31T2qLuWE+NrWeQjCAV2QJnxTeHZW6BQHK12K7Nw=" +typstDeps = [ + "cetz_0_3_1", + "tidy_0_2_0", + "tidy_0_3_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.5.2"] +url = "https://packages.typst.org/preview/fletcher-0.5.2.tar.gz" +hash = "sha256-VkC9UHhubcOqnVAIL07sKm18WWMKqyzsC/hBWjP/X3Q=" +typstDeps = [ + "cetz_0_3_1", + "tidy_0_2_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.5.1"] +url = "https://packages.typst.org/preview/fletcher-0.5.1.tar.gz" +hash = "sha256-UDGKnu/L/G5ZG74tnTsHRCEpf5R5kA7UURIiNFReEv4=" +typstDeps = [ + "cetz_0_2_2", + "tidy_0_2_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.5.0"] +url = "https://packages.typst.org/preview/fletcher-0.5.0.tar.gz" +hash = "sha256-8Sjc8jwA4u4iWd+SvewEK/ccnCRlq7QvV6CSOLK04dw=" +typstDeps = [ + "cetz_0_2_2", + "tidy_0_2_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.4.5"] +url = "https://packages.typst.org/preview/fletcher-0.4.5.tar.gz" +hash = "sha256-YuxxbViY9/qskTaDL6RRaN3wiiDriMeOLCy6juRSutY=" +typstDeps = [ + "cetz_0_2_2", + "tidy_0_2_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.4.4"] +url = "https://packages.typst.org/preview/fletcher-0.4.4.tar.gz" +hash = "sha256-bXRIADvQfhoONL/GomtviPuJzKHvTQmZFIjfYLyjQpo=" +typstDeps = [ + "cetz_0_2_2", + "tidy_0_2_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.4.3"] +url = "https://packages.typst.org/preview/fletcher-0.4.3.tar.gz" +hash = "sha256-kQ8uQEXcPrZm/wNFRwFLZNIWXuDN5vvJ5DRp7emqnE4=" +typstDeps = [ + "cetz_0_2_1", + "fletcher_0_4_2", + "tidy_0_2_0", + "touying_0_2_1", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.4.2"] +url = "https://packages.typst.org/preview/fletcher-0.4.2.tar.gz" +hash = "sha256-vYFUogLKIMO/R/tIQO/Knf1EJ+eorsrY+9L4AEJRufM=" +typstDeps = [ + "cetz_0_2_0", + "tidy_0_2_0", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.4.1"] +url = "https://packages.typst.org/preview/fletcher-0.4.1.tar.gz" +hash = "sha256-UVXEfdzSVGPjFSsTCcwbWiRFSrkLn0ajKqqdQos71JY=" +typstDeps = [ + "cetz_0_2_0", + "tidy_0_1_0", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.4.0"] +url = "https://packages.typst.org/preview/fletcher-0.4.0.tar.gz" +hash = "sha256-djU6wcv5GBbJzHHKdhch7fePziDyNyuJ4SQldZ1PeDQ=" +typstDeps = [ + "cetz_0_1_2", + "tidy_0_1_0", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.3.0"] +url = "https://packages.typst.org/preview/fletcher-0.3.0.tar.gz" +hash = "sha256-SdXzVIqnJtrvR/7eQ5srHDRAfhlu7Dxdke9Q1uZ8tks=" +typstDeps = [ + "cetz_0_1_2", + "tidy_0_1_0", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.2.0"] +url = "https://packages.typst.org/preview/fletcher-0.2.0.tar.gz" +hash = "sha256-W5kT8nSUFnDQ+eGEs1DeUT/TnkhgzGaBGHhoTTpL9ts=" +typstDeps = [ + "cetz_0_1_2", + "tidy_0_1_0", +] +description = "Draw diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[fletcher."0.1.1"] +url = "https://packages.typst.org/preview/fletcher-0.1.1.tar.gz" +hash = "sha256-hLWIbBoIiNbXPc2XJGmNluTIseokI0Fk+oQESX2ETrs=" +typstDeps = [ + "cetz_0_1_2", + "tidy_0_1_0", +] +description = "Draw commutative diagrams with nodes and arrows" +license = [ + "MIT", +] +homepage = "https://github.com/Jollywatt/typst-fletcher" + +[flow."0.3.1"] +url = "https://packages.typst.org/preview/flow-0.3.1.tar.gz" +hash = "sha256-YwXzPmBurBdyOeuspshwbLRd4XSdiSlzK28J80k2+Fw=" +typstDeps = [] +description = "A few templates and too many scattered utils" +license = [ + "MIT", + "MIT-0", +] +homepage = "https://github.com/MultisampledNight/flow" + +[flow."0.3.0"] +url = "https://packages.typst.org/preview/flow-0.3.0.tar.gz" +hash = "sha256-iRu3SEYaX2QtcIwdsCRH1obS3eLC5CgFEIeVspPplHY=" +typstDeps = [] +description = "A few templates and too many scattered utils" +license = [ + "MIT", + "MIT-0", +] +homepage = "https://github.com/MultisampledNight/flow" + +[flow."0.2.0"] +url = "https://packages.typst.org/preview/flow-0.2.0.tar.gz" +hash = "sha256-fa0Cpawx5mWXtpt9EYSZ89e9rxZkpclH+7MgbUJenPs=" +typstDeps = [] +description = "A few templates and too many scattered utils" +license = [ + "MIT", + "MIT-0", +] +homepage = "https://github.com/MultisampledNight/flow" + +[flow."0.1.2"] +url = "https://packages.typst.org/preview/flow-0.1.2.tar.gz" +hash = "sha256-fr53skFBa5OyY2bhnsd9JQvaVhPEb/+Byh7/i/PESMM=" +typstDeps = [ + "polylux_0_3_1", +] +description = "A few templates and too many scattered utils" +license = [ + "MIT", + "MIT-0", +] +homepage = "https://github.com/MultisampledNight/flow" + +[flyingcircus."3.2.1"] +url = "https://packages.typst.org/preview/flyingcircus-3.2.1.tar.gz" +hash = "sha256-dmqOomiW/j5fNEyPqUho6Xsg/5qtQlfPwmMigqK+acg=" +typstDeps = [ + "cetz_0_3_3", + "cetz-plot_0_1_1", + "cuti_0_2_1", +] +description = "For creating homebrew documents with the same fancy style as the Flying Circus book? Provides simple commands to generate a whole aircraft stat page, vehicle, or even ship" +license = [ + "MIT", +] +homepage = "https://github.com/Tetragramm/flying-circus-typst-template" + +[flyingcircus."3.2.0"] +url = "https://packages.typst.org/preview/flyingcircus-3.2.0.tar.gz" +hash = "sha256-HQgoZ87KmcMBBuHQjYiwjtWAs19HXFC2ntMI0OvG/Lo=" +typstDeps = [ + "cetz_0_3_1", + "cetz-plot_0_1_0", + "cuti_0_2_1", +] +description = "For creating homebrew documents with the same fancy style as the Flying Circus book? Provides simple commands to generate a whole aircraft stat page, vehicle, or even ship" +license = [ + "MIT", +] +homepage = "https://github.com/Tetragramm/flying-circus-typst-template" + +[flyingcircus."3.0.0"] +url = "https://packages.typst.org/preview/flyingcircus-3.0.0.tar.gz" +hash = "sha256-YshyMVu8ph/hRaX7CNaIpJCfHFqh4omXdD6JkGR3cBg=" +typstDeps = [ + "cetz_0_2_2", + "cuti_0_2_1", + "tablex_0_0_8", +] +description = "For creating homebrew documents with the same fancy style as the Flying Circus book? Provides simple commands to generate a whole aircraft stat page, vehicle, or even ship" +license = [ + "MIT", +] +homepage = "https://github.com/Tetragramm/flying-circus-typst-template" + +[fontawesome."0.5.0"] +url = "https://packages.typst.org/preview/fontawesome-0.5.0.tar.gz" +hash = "sha256-deUJ24arS9YenlMNjUgxsq9cZ7R/TksgNDDblCcPT5Q=" +typstDeps = [] +description = "A Typst library for Font Awesome icons through the desktop fonts" +license = [ + "MIT", +] +homepage = "https://github.com/duskmoon314/typst-fontawesome" + +[fontawesome."0.4.0"] +url = "https://packages.typst.org/preview/fontawesome-0.4.0.tar.gz" +hash = "sha256-NRzVcTQP9nxOM0jhx/aIlUqOdMhkc6XPxHiXRCF5zFw=" +typstDeps = [] +description = "A Typst library for Font Awesome icons through the desktop fonts" +license = [ + "MIT", +] +homepage = "https://github.com/duskmoon314/typst-fontawesome" + +[fontawesome."0.3.0"] +url = "https://packages.typst.org/preview/fontawesome-0.3.0.tar.gz" +hash = "sha256-v7PUcuyzw9g74hNYUO8y5EhBYnGJcqQ6Ia2Cqsijmno=" +typstDeps = [] +description = "A Typst library for Font Awesome icons through the desktop fonts" +license = [ + "MIT", +] +homepage = "https://github.com/duskmoon314/typst-fontawesome" + +[fontawesome."0.2.1"] +url = "https://packages.typst.org/preview/fontawesome-0.2.1.tar.gz" +hash = "sha256-AUj1F9Z0Z6ETOsT9y7qMvC+Q4WZ75STIRAODf/wmf0Q=" +typstDeps = [] +description = "A Typst library for Font Awesome icons through the desktop fonts" +license = [ + "MIT", +] +homepage = "https://github.com/duskmoon314/typst-fontawesome" + +[fontawesome."0.2.0"] +url = "https://packages.typst.org/preview/fontawesome-0.2.0.tar.gz" +hash = "sha256-YOWFmjt6AEWaFybdOiokFYBL7GGW+PpTxlLw5ajmOaw=" +typstDeps = [] +description = "A Typst library for Font Awesome icons through the desktop fonts" +license = [ + "MIT", +] +homepage = "https://github.com/duskmoon314/typst-fontawesome" + +[fontawesome."0.1.1"] +url = "https://packages.typst.org/preview/fontawesome-0.1.1.tar.gz" +hash = "sha256-20THl+eH3LYjUoeNwmjqx9e/L7Ug0BZ9KZDuIf/DRqc=" +typstDeps = [] +description = "A Typst library for Font Awesome icons through the desktop fonts" +license = [ + "MIT", +] +homepage = "https://github.com/duskmoon314/typst-fontawesome" + +[fontawesome."0.1.0"] +url = "https://packages.typst.org/preview/fontawesome-0.1.0.tar.gz" +hash = "sha256-duYhendgcUntqBm/vyMDPwb4r7JFCai2Ws6V4qlf3Mw=" +typstDeps = [] +description = "A Typst library for Font Awesome icons through the desktop fonts" +license = [ + "MIT", +] +homepage = "https://github.com/duskmoon314/typst-fontawesome" + +[formalettre."0.1.2"] +url = "https://packages.typst.org/preview/formalettre-0.1.2.tar.gz" +hash = "sha256-pAfyUg/DQ0a8EoRPRc9rIV+URWHP8ea32R8gevkcjJQ=" +typstDeps = [] +description = "French formal letter template" +license = [ + "BSD-3-Clause", +] +homepage = "https://github.com/Brndan/lettre" + +[formalettre."0.1.1"] +url = "https://packages.typst.org/preview/formalettre-0.1.1.tar.gz" +hash = "sha256-8j/6S6MIiLWtrl8OZXG5ytjJCUrW3vdAf0jdvpMnEzU=" +typstDeps = [] +description = "French formal letter template" +license = [ + "BSD-3-Clause", +] +homepage = "https://github.com/Brndan/lettre" + +[formalettre."0.1.0"] +url = "https://packages.typst.org/preview/formalettre-0.1.0.tar.gz" +hash = "sha256-hrPn45hqV5Z0bpFEaBmOHAUZqAoimGb0rWwz2itYleI=" +typstDeps = [] +description = "French formal letter template" +license = [ + "BSD-3-Clause", +] +homepage = "https://github.com/Brndan/lettre" + +[frackable."0.2.0"] +url = "https://packages.typst.org/preview/frackable-0.2.0.tar.gz" +hash = "sha256-IbKUPIcWNBgzLCSyiw4hF2CEL6bVj6ygs2fyy3ZZB30=" +typstDeps = [] +description = "Vulgar Fractions" +license = [ + "Unlicense", +] +homepage = "https://www.github.com/jamesrswift/frackable" + +[frackable."0.1.0"] +url = "https://packages.typst.org/preview/frackable-0.1.0.tar.gz" +hash = "sha256-IRpnEGFKoHQeD8vFhj4NBjKggUj60eiN9V3iSDrN5oo=" +typstDeps = [] +description = "Vulgar Fractions" +license = [ + "Unlicense", +] +homepage = "https://www.github.com/jamesrswift/frackable" + +[fractus."0.1.0"] +url = "https://packages.typst.org/preview/fractus-0.1.0.tar.gz" +hash = "sha256-cR35144FfUGIV9PW9ceZOOSWJ4kTIRwl2jV5Ws/NKVU=" +typstDeps = [] +description = "Operations on fractions" +license = [ + "MIT", +] +homepage = "https://github.com/ejbasas/fractus" + +[fractusist."0.3.0"] +url = "https://packages.typst.org/preview/fractusist-0.3.0.tar.gz" +hash = "sha256-wwfAXz3v0fNXpfoAPwGrhnywurAbNRqteP5iXO2eNBY=" +typstDeps = [ + "suiji_0_3_0", +] +description = "Create a variety of wonderful fractals and curves in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/liuguangxi/fractusist" + +[fractusist."0.2.1"] +url = "https://packages.typst.org/preview/fractusist-0.2.1.tar.gz" +hash = "sha256-3LjypKw7K/1b6PdQl6nx7MEit3+RWIt5ajEy3R2zoSI=" +typstDeps = [ + "suiji_0_3_0", +] +description = "Create a variety of wonderful fractals and curves in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/liuguangxi/fractusist" + +[fractusist."0.2.0"] +url = "https://packages.typst.org/preview/fractusist-0.2.0.tar.gz" +hash = "sha256-0cO37CDCdROoMiiIMq4j5eSNfrYdV/SAzC6eSsuPWbk=" +typstDeps = [] +description = "Create a variety of wonderful fractals and curves in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/liuguangxi/fractusist" + +[fractusist."0.1.1"] +url = "https://packages.typst.org/preview/fractusist-0.1.1.tar.gz" +hash = "sha256-5M+tYjNToqWsg/2XKCcQZQ9ch0HVJDpoHnDfbcJ8zEo=" +typstDeps = [] +description = "Create a variety of wonderful fractals in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/liuguangxi/fractusist" + +[fractusist."0.1.0"] +url = "https://packages.typst.org/preview/fractusist-0.1.0.tar.gz" +hash = "sha256-P5SsaiLCPEW3Te6ellAeMOTNxsCrq1ju2qWmTRo2SxM=" +typstDeps = [] +description = "Create a variety of wonderful fractals in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/liuguangxi/fractusist" + +[frame-it."1.1.2"] +url = "https://packages.typst.org/preview/frame-it-1.1.2.tar.gz" +hash = "sha256-kQ3ThqquoBUsn9WW0R93FTAGnkdyGc4dOc9XfZNOzPg=" +typstDeps = [] +description = "Beautiful, flexible, and integrated. Display custom frames for theorems, environments, and more. Attractive visuals with syntax that blends seamlessly into the source" +license = [ + "MIT", +] +homepage = "https://github.com/marc-thieme/frame-it" + +[frame-it."1.1.1"] +url = "https://packages.typst.org/preview/frame-it-1.1.1.tar.gz" +hash = "sha256-pYwsLkD2Xo26SACm7EYqjMmXOU8GfP9qJ9XLrdLxPmY=" +typstDeps = [] +description = "Beautiful, flexible, and integrated. Display custom frames for theorems, environments, and more. Attractive visuals with syntax that blends seamlessly into the source" +license = [ + "MIT", +] +homepage = "https://github.com/marc-thieme/frame-it" + +[frame-it."1.1.0"] +url = "https://packages.typst.org/preview/frame-it-1.1.0.tar.gz" +hash = "sha256-FsZmkx94QgBad48kvThhxhyqyLQMElKECWvxNUYsh7Y=" +typstDeps = [] +description = "Beautiful, flexible, and integrated. Display custom frames for theorems, environments, and more. Attractive visuals with syntax that blends seamlessly into the source" +license = [ + "MIT", +] +homepage = "https://github.com/marc-thieme/frame-it" + +[frame-it."1.0.0"] +url = "https://packages.typst.org/preview/frame-it-1.0.0.tar.gz" +hash = "sha256-dFhV0E8tYVrjyM2Acj6GtkX9YUKimFkb4wZP9gR6tss=" +typstDeps = [] +description = "Beautiful, flexible, and integrated. Display custom frames for theorems, environments, and more. Attractive visuals with syntax that blends seamlessly into the source" +license = [ + "MIT", +] +homepage = "https://github.com/marc-thieme/frame-it" + +[friendly-polylux."0.1.0"] +url = "https://packages.typst.org/preview/friendly-polylux-0.1.0.tar.gz" +hash = "sha256-mgOwl7b2nkmvW5dtDpuoZih1AAWqgCB5S1QRcevtftU=" +typstDeps = [ + "polylux_0_4_0", + "tiaoma_0_2_1", +] +description = "Friendly and playful template for Polylux" +license = [ + "MIT", +] +homepage = "https://github.com/polylux-typ/friendly" + +[fruitify."0.1.1"] +url = "https://packages.typst.org/preview/fruitify-0.1.1.tar.gz" +hash = "sha256-CEvzympelzWxXFudpn/7w1noPcfrq7RWUxcVHw+FqIs=" +typstDeps = [] +description = "Replace letters in equations with fruit emoji" +license = [ + "MIT-0", +] +homepage = "https://codeberg.org/T0mstone/typst-fruitify" + +[fruitify."0.1.0"] +url = "https://packages.typst.org/preview/fruitify-0.1.0.tar.gz" +hash = "sha256-/djCVsBkp4Guve1AweraBPE01Zc0SB9RQ2DheZlwvBw=" +typstDeps = [] +description = "Replace letters in equations with fruit emojis" +license = [ + "MIT", +] +homepage = "https://codeberg.org/T0mstone/typst-fruitify" + +[funarray."0.4.0"] +url = "https://packages.typst.org/preview/funarray-0.4.0.tar.gz" +hash = "sha256-PSl/2p8rEH7KxYuzs/gnUcUfWTQUHj9wODNwv8xmwlk=" +typstDeps = [ + "funarray_0_3_0", + "idwtet_0_3_0", +] +description = "Package providing convenient functional functions to use on arrays" +license = [ + "MIT", +] +homepage = "https://github.com/ludwig-austermann/typst-funarray" + +[funarray."0.3.0"] +url = "https://packages.typst.org/preview/funarray-0.3.0.tar.gz" +hash = "sha256-KORxcflDROjQuOepZwAuoQECk2b7vikZsCDhgQMmCu0=" +typstDeps = [ + "idwtet_0_2_0", +] +description = "Package providing convenient functional functions to use on arrays" +license = [ + "MIT", +] +homepage = "https://github.com/ludwig-austermann/typst-funarray" + +[funarray."0.2.0"] +url = "https://packages.typst.org/preview/funarray-0.2.0.tar.gz" +hash = "sha256-PL7W4WQ2Y/BhAHdpNmfNWPpAvhbeFRYhcxSRZjsUBrw=" +typstDeps = [] +description = "Package providing convenient functional functions to use on arrays" +license = [ + "MIT", +] +homepage = "https://github.com/ludwig-austermann/typst-funarray" + +[fuzzy-cnoi-statement."0.1.3"] +url = "https://packages.typst.org/preview/fuzzy-cnoi-statement-0.1.3.tar.gz" +hash = "sha256-EfMSqNURTDIh84oP0RlvJjRxYsDa48qvD/4u6wXZP/k=" +typstDeps = [ + "codelst_2_0_0", +] +description = "A template for CNOI(Olympiad in Informatics in China)-style statements for competitive programming" +license = [ + "MIT-0", +] +homepage = "https://github.com/Wallbreaker5th/fuzzy-cnoi-statement" + +[fuzzy-cnoi-statement."0.1.2"] +url = "https://packages.typst.org/preview/fuzzy-cnoi-statement-0.1.2.tar.gz" +hash = "sha256-q9aDYaOu6do+VtxFiMagUJcx93Nn5bnyAVsWZrw8ZTE=" +typstDeps = [ + "codelst_2_0_0", +] +description = "A template for CNOI(Olympiad in Informatics in China)-style statements for competitive programming" +license = [ + "MIT-0", +] +homepage = "https://github.com/Wallbreaker5th/fuzzy-cnoi-statement" + +[fuzzy-cnoi-statement."0.1.1"] +url = "https://packages.typst.org/preview/fuzzy-cnoi-statement-0.1.1.tar.gz" +hash = "sha256-rhZCGzB78R0OKDVJvMmAttUOp8pr677A/muWK1IJv48=" +typstDeps = [ + "codelst_2_0_0", +] +description = "A template for CNOI(Olympiad in Informatics in China)-style statements for competitive programming" +license = [ + "MIT-0", +] +homepage = "https://github.com/Wallbreaker5th/fuzzy-cnoi-statement" + +[fuzzy-cnoi-statement."0.1.0"] +url = "https://packages.typst.org/preview/fuzzy-cnoi-statement-0.1.0.tar.gz" +hash = "sha256-LVUIrP8yHkMxdCI1dOEVIpX8R5BYYhq58V17eXoR4Rs=" +typstDeps = [ + "codelst_2_0_0", +] +description = "A template for CNOI(Olympiad in Informatics in China)-style statements for competitive programming" +license = [ + "MIT-0", +] +homepage = "https://github.com/Wallbreaker5th/fuzzy-cnoi-statement" + +[fyrst-ru-labreport."0.1.0"] +url = "https://packages.typst.org/preview/fyrst-ru-labreport-0.1.0.tar.gz" +hash = "sha256-RC/HAKUic0fHniU1UNL4lsTmd9d+l+ZseEU7f4cVv+c=" +typstDeps = [ + "cetz_0_3_1", + "cetz-plot_0_1_0", + "unify_0_7_0", +] +description = "Reykjavík University Lab Report Template" +license = [ + "GPL-3.0-or-later", +] + +[g-exam."0.4.2"] +url = "https://packages.typst.org/preview/g-exam-0.4.2.tar.gz" +hash = "sha256-PLlZ4+/CPccRlre8hTfe8/tNe/372pHPeX6ZuikuyCI=" +typstDeps = [ + "oxifmt_0_2_0", + "oxifmt_0_2_1", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[g-exam."0.4.1"] +url = "https://packages.typst.org/preview/g-exam-0.4.1.tar.gz" +hash = "sha256-8LIOhBCxrmTsX8DR0pSuGV7hGULvz2HAuIutPmJ2z5U=" +typstDeps = [ + "oxifmt_0_2_0", + "oxifmt_0_2_1", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[g-exam."0.4.0"] +url = "https://packages.typst.org/preview/g-exam-0.4.0.tar.gz" +hash = "sha256-9og+m/vp1pFckEnQvug6C3Si8MU2iP5Mo109df4K4h4=" +typstDeps = [ + "oxifmt_0_2_0", + "oxifmt_0_2_1", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[g-exam."0.3.2"] +url = "https://packages.typst.org/preview/g-exam-0.3.2.tar.gz" +hash = "sha256-lStEam+Du2Zfb8NzVciMfsm1hruB3Y7OOV17956+cyk=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[g-exam."0.3.1"] +url = "https://packages.typst.org/preview/g-exam-0.3.1.tar.gz" +hash = "sha256-ty9h9uZUccdyIzVoXZVJpq3cJgPyWUrIyBe5CUzrZpQ=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[g-exam."0.3.0"] +url = "https://packages.typst.org/preview/g-exam-0.3.0.tar.gz" +hash = "sha256-vi/ICLdb3X6kR8VKQL1/jhoPoooomg24AYIhQZ5j74A=" +typstDeps = [ + "g-exam_0_2_0", + "oxifmt_0_2_0", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[g-exam."0.2.0"] +url = "https://packages.typst.org/preview/g-exam-0.2.0.tar.gz" +hash = "sha256-oRP8AVNK5rS+3oEajim/3HrcmOOw8265SOvRTbDlUMQ=" +typstDeps = [ + "cetz_0_2_1", + "oxifmt_0_2_0", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[g-exam."0.1.1"] +url = "https://packages.typst.org/preview/g-exam-0.1.1.tar.gz" +hash = "sha256-AqqkJZtn7QJkLodiCjxV612JJ4dN8/OwKl3FO8uqdlg=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[g-exam."0.1.0"] +url = "https://packages.typst.org/preview/g-exam-0.1.0.tar.gz" +hash = "sha256-Mmwb6iyJT0FxJgVYdUY3xcJ5tTEAqMaY5ijeRM7Yz4w=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Create exams with student information, grade chart, score control, questions, and sub-questions" +license = [ + "MIT", +] +homepage = "https://github.com/MatheSchool/typst-g-exam" + +[game-theoryst."0.1.0"] +url = "https://packages.typst.org/preview/game-theoryst-0.1.0.tar.gz" +hash = "sha256-1FtNDcbP6TBXZQ9SlWzmHSrp6F8pTPEnjDKougnlCqI=" +typstDeps = [ + "pinit_0_1_4", +] +description = "A package for typesetting games in Typst" +license = [ + "AGPL-3.0-only", +] +homepage = "https://github.com/connortwiegand/game-theoryst" + +[gantty."0.1.0"] +url = "https://packages.typst.org/preview/gantty-0.1.0.tar.gz" +hash = "sha256-x2Pqz9YNFGBAPludpA8EcnQ6pizeRC2kes4gK5etqSc=" +typstDeps = [ + "cetz_0_3_1", +] +description = "Create gantt charts using datetimes" +license = [ + "LGPL-3.0-only", +] +homepage = "https://gitlab.com/john_t/typst-gantty" + +[genealotree."0.2.0"] +url = "https://packages.typst.org/preview/genealotree-0.2.0.tar.gz" +hash = "sha256-RvKMkv1h5huYkLTNdGOijBi+wBMZxud93f24WDhJ28s=" +typstDeps = [ + "cetz_0_3_1", + "t4t_0_3_2", +] +description = "A package to draw genealogical trees, based on CeTZ" +license = [ + "GPL-3.0-only", +] +homepage = "https://codeberg.org/drloiseau/genealogy" + +[genealotree."0.1.0"] +url = "https://packages.typst.org/preview/genealotree-0.1.0.tar.gz" +hash = "sha256-koLFbWm+rJPiO6Ki4g0GDu8fk3R+/+o9B3Mogn9iZ20=" +typstDeps = [ + "cetz_0_2_2", + "mantys_0_1_3", + "showman_0_1_1", + "tidy_0_2_0", +] +description = "A package to draw genealogical trees, based on CeTZ" +license = [ + "GPL-3.0-only", +] +homepage = "https://codeberg.org/drloiseau/genealogy" + +[gentle-clues."1.2.0"] +url = "https://packages.typst.org/preview/gentle-clues-1.2.0.tar.gz" +hash = "sha256-oQ/HcKJRijQPM450fNF7vF5WAQCu3bWLmy6bkmrnHfg=" +typstDeps = [ + "linguify_0_4_2", +] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-gentle-clues" + +[gentle-clues."1.1.0"] +url = "https://packages.typst.org/preview/gentle-clues-1.1.0.tar.gz" +hash = "sha256-dNu3KMkbnbaI2gb4yeVQ4dczNaEj63D0U1INwv+Nj6M=" +typstDeps = [ + "linguify_0_4_0", +] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-gentle-clues" + +[gentle-clues."1.0.0"] +url = "https://packages.typst.org/preview/gentle-clues-1.0.0.tar.gz" +hash = "sha256-/ht2Jxt2iGGyMJ5IlCdxTadp5cE1RXZ4x7nhcDCL4hQ=" +typstDeps = [ + "linguify_0_4_0", +] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-gentle-clues" + +[gentle-clues."0.9.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.9.0.tar.gz" +hash = "sha256-LuFJvWPZBIWGMs3VDYvnU3FBUhvmW+MnF/RnH+9PTnc=" +typstDeps = [ + "linguify_0_4_0", +] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-gentle-clues" + +[gentle-clues."0.8.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.8.0.tar.gz" +hash = "sha256-Ze1BkoxQNC4g+TuaOgE0liqg+fmKuxwrF+PS5HS5T80=" +typstDeps = [ + "linguify_0_4_0", +] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-gentle-clues" + +[gentle-clues."0.7.1"] +url = "https://packages.typst.org/preview/gentle-clues-0.7.1.tar.gz" +hash = "sha256-wXnn1yH08/WZ8BKjbckcCeMQpEp1NmpiycdQtS+/Up0=" +typstDeps = [ + "linguify_0_3_1", +] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-gentle-clues" + +[gentle-clues."0.7.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.7.0.tar.gz" +hash = "sha256-H185bbeAP4FRwjNqB1IilBrC9FjCcNYQKP9N4yiiIU4=" +typstDeps = [ + "linguify_0_3_0", +] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-gentle-clues" + +[gentle-clues."0.6.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.6.0.tar.gz" +hash = "sha256-F1v2ddEE8frEbUFmQXo4U5ErAr6piy3v9JK0ueBT26Y=" +typstDeps = [] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-gentle-clues" + +[gentle-clues."0.5.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.5.0.tar.gz" +hash = "sha256-nTL2Q+PmJpjMx+IONrARiEdeg1H134yg5Hs3/yHHPqQ=" +typstDeps = [] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-admonish" + +[gentle-clues."0.4.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.4.0.tar.gz" +hash = "sha256-FopJ9x0PwJ75FpZzJ6bWOGfKi+nEv33BG2JvKrwjWOU=" +typstDeps = [] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-admonish" + +[gentle-clues."0.3.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.3.0.tar.gz" +hash = "sha256-wM8+dJlt5sinHEfeukemU5GCpoSCgWLIPhlo9OgwUkM=" +typstDeps = [] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-admonish" + +[gentle-clues."0.2.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.2.0.tar.gz" +hash = "sha256-taOqroBAXxmLEmJ+vx8iDv8rQkxvTMOXH7QI+go2RDc=" +typstDeps = [] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] + +[gentle-clues."0.1.0"] +url = "https://packages.typst.org/preview/gentle-clues-0.1.0.tar.gz" +hash = "sha256-/ZfCEqiaSbo9Vp31LSccM1XUzYOey7ZwJEggfkK4YsU=" +typstDeps = [] +description = "A package to simply create and add some admonitions to your documents" +license = [ + "MIT", +] + +[georges-yetyp."0.2.0"] +url = "https://packages.typst.org/preview/georges-yetyp-0.2.0.tar.gz" +hash = "sha256-8D8yog9VhYEhXbOxV3aETd0MkfnM5dp3IxWXZbTa55Y=" +typstDeps = [] +description = "Unofficial template for Polytech Grenoble internship reports" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/elegaanz/georges-yetyp" + +[georges-yetyp."0.1.0"] +url = "https://packages.typst.org/preview/georges-yetyp-0.1.0.tar.gz" +hash = "sha256-FXlaaujhd4EGTEB4zxrldcVG6nveJOlJd87tBgLRwTE=" +typstDeps = [] +description = "Unofficial template for Polytech Grenoble internship reports" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/elegaanz/georges-yetyp" + +[gloss-awe."0.0.5"] +url = "https://packages.typst.org/preview/gloss-awe-0.0.5.tar.gz" +hash = "sha256-DVVxTx6TN3oZjWy1W9VZdAj0ymLpoFtEIaS0RO3KkE4=" +typstDeps = [] +description = "Awesome Glossary for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/gloss-awe" + +[gloss-awe."0.0.4"] +url = "https://packages.typst.org/preview/gloss-awe-0.0.4.tar.gz" +hash = "sha256-jPukTVrk1spgzTwzaDzWwJH7cbBdOsIHyIx53B7POJ0=" +typstDeps = [] +description = "Awesome Glossary for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/typst-glossary" + +[gloss-awe."0.0.3"] +url = "https://packages.typst.org/preview/gloss-awe-0.0.3.tar.gz" +hash = "sha256-CPgyPw5giFS1sQXgczM2Rzk5u6BPqZ4rDCsboFliC9k=" +typstDeps = [] +description = "An Awesome Glossary for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/typst-glossary" + +[glossarium."0.5.4"] +url = "https://packages.typst.org/preview/glossarium-0.5.4.tar.gz" +hash = "sha256-OXkASSsWbK2IjoRK6n8L1VLOLKqoj184+2Nl1KrAGh8=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/typst-community/glossarium" + +[glossarium."0.5.3"] +url = "https://packages.typst.org/preview/glossarium-0.5.3.tar.gz" +hash = "sha256-rStKB+t5GHdJlTW62hptnnR+jNQSfnum+EGXTJkY/4M=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/typst-community/glossarium" + +[glossarium."0.5.2"] +url = "https://packages.typst.org/preview/glossarium-0.5.2.tar.gz" +hash = "sha256-Tu2byG0g5gNYa4xfe+8wWO481+afQgKLHySyALDVgrw=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/typst-community/glossarium" + +[glossarium."0.5.1"] +url = "https://packages.typst.org/preview/glossarium-0.5.1.tar.gz" +hash = "sha256-f7BLwG+8U/YKnnNiUGACiPppa7mGEECBgOZYvLdQCrM=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/typst-community/glossarium" + +[glossarium."0.5.0"] +url = "https://packages.typst.org/preview/glossarium-0.5.0.tar.gz" +hash = "sha256-++xzXtsv4jDh6XH9cRuEJv9l37gesWYTl4uIub7hXBg=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/typst-community/glossarium" + +[glossarium."0.4.2"] +url = "https://packages.typst.org/preview/glossarium-0.4.2.tar.gz" +hash = "sha256-wT1rCzfcCwMPM6l9imA+JNzwzJsPf4SALVJ5QiaVF0k=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/typst-community/glossarium" + +[glossarium."0.4.1"] +url = "https://packages.typst.org/preview/glossarium-0.4.1.tar.gz" +hash = "sha256-zUSkga1UiInv79+3oZ0sGQ7gvwHOYm0q2fM/uJ3eFHQ=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/ENIB-Community/glossarium" + +[glossarium."0.4.0"] +url = "https://packages.typst.org/preview/glossarium-0.4.0.tar.gz" +hash = "sha256-gfKkatI389dGlLaq6pJN0AMYs96+t3LM2sCt7Q8x7pg=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/ENIB-Community/glossarium" + +[glossarium."0.3.0"] +url = "https://packages.typst.org/preview/glossarium-0.3.0.tar.gz" +hash = "sha256-uwgmxTeQCTxQGEJQyPGGDztE6++aA60WfUsTH9dOxJw=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/ENIB-Community/glossarium" + +[glossarium."0.2.6"] +url = "https://packages.typst.org/preview/glossarium-0.2.6.tar.gz" +hash = "sha256-tQ2YDPcJChJK/6MJO15/G5WOX1v/T+hJvfU0G5evTeQ=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/ENIB-Community/glossarium" + +[glossarium."0.2.5"] +url = "https://packages.typst.org/preview/glossarium-0.2.5.tar.gz" +hash = "sha256-B+4GykbLJXfDq3JRrtv39ODvg878ZdMKPmvkHRJuRH4=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/ENIB-Community/glossarium" + +[glossarium."0.2.4"] +url = "https://packages.typst.org/preview/glossarium-0.2.4.tar.gz" +hash = "sha256-7W2pXf4VDYmpS22hF9p3crsRd7NR0edXlh8F9Bb17Ao=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/ENIB-Community/glossarium" + +[glossarium."0.2.3"] +url = "https://packages.typst.org/preview/glossarium-0.2.3.tar.gz" +hash = "sha256-BMIZNhYt6otDeZBgxe0hqYZwu0kJ32u/XxeKh8NUtFY=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/slashformotion/glossarium" + +[glossarium."0.2.2"] +url = "https://packages.typst.org/preview/glossarium-0.2.2.tar.gz" +hash = "sha256-/cILLiIGo9MEDCYel2bgP43Jmd8pzJDxa1I87A7VKCc=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/ENIB-Community/glossarium" + +[glossarium."0.2.1"] +url = "https://packages.typst.org/preview/glossarium-0.2.1.tar.gz" +hash = "sha256-SK0Ighj+9GNlBVzqkWM3/ljJL2zZHrG3AQNGgX+yr2Q=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/slashformotion/glossarium" + +[glossarium."0.2.0"] +url = "https://packages.typst.org/preview/glossarium-0.2.0.tar.gz" +hash = "sha256-4V5RFcDeLW70KFjJstoNic9AmRrhXwEJBqJnamhcOhk=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/slashformotion/glossarium" + +[glossarium."0.1.0"] +url = "https://packages.typst.org/preview/glossarium-0.1.0.tar.gz" +hash = "sha256-O36TdR7DxoA6k3OHo39vrWX1nrSrsQq4b9VXhQspZaM=" +typstDeps = [] +description = "Glossarium is a simple, easily customizable typst glossary" +license = [ + "MIT", +] +homepage = "https://github.com/slashformotion/glossarium" + +[glossy."0.8.0"] +url = "https://packages.typst.org/preview/glossy-0.8.0.tar.gz" +hash = "sha256-7vhOwDSgwHCLwZ2h2MNn7dRYlyhCdB9rxG58SDunBBs=" +typstDeps = [ + "glossarium_0_5_3", + "valkyrie_0_2_2", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.7.0"] +url = "https://packages.typst.org/preview/glossy-0.7.0.tar.gz" +hash = "sha256-Qt2XoZeSw9w2oPpVmR7DxtpYgM+HBQroTck9KkE9qeY=" +typstDeps = [ + "glossarium_0_5_3", + "valkyrie_0_2_2", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.6.0"] +url = "https://packages.typst.org/preview/glossy-0.6.0.tar.gz" +hash = "sha256-GF+UKSxd/K57frAgzxpwhByAo2uZibbhl01KLAZD2Xw=" +typstDeps = [ + "glossarium_0_5_1", + "valkyrie_0_2_1", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.5.2"] +url = "https://packages.typst.org/preview/glossy-0.5.2.tar.gz" +hash = "sha256-afjFWWTSPRhUJwUPhYNkPQdaWNbGblZWXXMXIYgiMgE=" +typstDeps = [ + "glossarium_0_5_1", + "valkyrie_0_2_1", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.5.1"] +url = "https://packages.typst.org/preview/glossy-0.5.1.tar.gz" +hash = "sha256-UmXBNMBLHEckKl5FBvltim9UobPkYu6zlQyx9UA/WK4=" +typstDeps = [ + "valkyrie_0_2_1", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.5.0"] +url = "https://packages.typst.org/preview/glossy-0.5.0.tar.gz" +hash = "sha256-HKy8jiheIwO6g/R5eOmy55/Rhpt2Bnm6T+C+yVkvO+E=" +typstDeps = [ + "valkyrie_0_2_1", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.4.1"] +url = "https://packages.typst.org/preview/glossy-0.4.1.tar.gz" +hash = "sha256-kMKeM24y6sJ+kUi7E97Hm54tEdorMiHbNkgsW7Bkx40=" +typstDeps = [ + "valkyrie_0_2_1", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.4.0"] +url = "https://packages.typst.org/preview/glossy-0.4.0.tar.gz" +hash = "sha256-km8u8jInFksaNqT0j81+xFSy8BNCZjz4Uz0kNxCOET4=" +typstDeps = [ + "valkyrie_0_2_1", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.3.0"] +url = "https://packages.typst.org/preview/glossy-0.3.0.tar.gz" +hash = "sha256-KLNnhsZWGqQ0oUTp1rnzB6cN4fzBmVsXboj3NdXhhm4=" +typstDeps = [ + "valkyrie_0_2_1", +] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.2.2"] +url = "https://packages.typst.org/preview/glossy-0.2.2.tar.gz" +hash = "sha256-qFvx4q4kzu60/gLs7Y7ebkvhSUBs4pdDQLk/1tz1sg0=" +typstDeps = [] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.2.1"] +url = "https://packages.typst.org/preview/glossy-0.2.1.tar.gz" +hash = "sha256-hfbprk6x57XOcMa5HEXVs73PCpLeh2CJYeTjI4/m+BA=" +typstDeps = [] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.2.0"] +url = "https://packages.typst.org/preview/glossy-0.2.0.tar.gz" +hash = "sha256-cThfCe0IvWLboyqbnIravumLGpNeYXxQeAfOTvKAPaU=" +typstDeps = [] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.1.2"] +url = "https://packages.typst.org/preview/glossy-0.1.2.tar.gz" +hash = "sha256-lYsYNmBCp6YNSyyiZhy7k3W/cPcMRc0yRKVEi9nGbbU=" +typstDeps = [] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.1.1"] +url = "https://packages.typst.org/preview/glossy-0.1.1.tar.gz" +hash = "sha256-DjdPzAb4iUlXSX2UWsSzi9D4Oy8Cohk8Cb+YJ7bsS9I=" +typstDeps = [] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[glossy."0.1.0"] +url = "https://packages.typst.org/preview/glossy-0.1.0.tar.gz" +hash = "sha256-9HqjdNbWVz8VBWG4UWEGFyOH//7t5mHs/WySPas5yMg=" +typstDeps = [] +description = "A very simple glossary system with easily customizable output" +license = [ + "MIT", +] +homepage = "https://github.com/swaits/typst-collection" + +[gqe-lemoulon-presentation."0.0.5"] +url = "https://packages.typst.org/preview/gqe-lemoulon-presentation-0.0.5.tar.gz" +hash = "sha256-EKRM2pcccly4vMbMWCTOQednyIpPBet5RBOzrsZGLs4=" +typstDeps = [ + "showybox_2_0_3", + "tablem_0_1_0", + "touying_0_5_3", +] +description = "Quickly generate slides for a GQE-Le moulon presentation" +license = [ + "GPL-3.0-only", +] + +[gqe-lemoulon-presentation."0.0.4"] +url = "https://packages.typst.org/preview/gqe-lemoulon-presentation-0.0.4.tar.gz" +hash = "sha256-590iNmmEIwSceZA5tzWE+THuEiMUFvlVhkUADoVrzT4=" +typstDeps = [ + "showybox_2_0_3", + "touying_0_5_3", +] +description = "Quickly generate slides for a GQE-Le moulon presentation" +license = [ + "GPL-3.0-only", +] + +[graceful-genetics."0.2.0"] +url = "https://packages.typst.org/preview/graceful-genetics-0.2.0.tar.gz" +hash = "sha256-Dg1bG9drD3b0nM5Kso+pp8juWTIdiIM+K8okd0vQh+M=" +typstDeps = [ + "physica_0_9_3", +] +description = "A paper template with which to publish in journals and at conferences" +license = [ + "Unlicense", +] +homepage = "https://github.com/JamesxX/graceful-genetics" + +[graceful-genetics."0.1.0"] +url = "https://packages.typst.org/preview/graceful-genetics-0.1.0.tar.gz" +hash = "sha256-BvwgKR/yqHPm4GdThGnxcO54wZ40Grt7XSoqOLnsPHU=" +typstDeps = [ + "physica_0_9_3", +] +description = "A paper template with which to publish in journals and at conferences" +license = [ + "Unlicense", +] +homepage = "https://github.com/JamesxX/graceful-genetics" + +[gradslide."0.1.0"] +url = "https://packages.typst.org/preview/gradslide-0.1.0.tar.gz" +hash = "sha256-wM8Bj1PEWrm0mVNi+PPSKMWSukXZFRtMI27xQBKEVmc=" +typstDeps = [] +description = "Simple component to show a value between 0 and 1 on a nice gradient slider" +license = [ + "MIT", +] + +[grape-suite."2.0.0"] +url = "https://packages.typst.org/preview/grape-suite-2.0.0.tar.gz" +hash = "sha256-c0LlnyarxBx8LBmAk51QDuBPbMZRiHfRb7bcrUn9Zfw=" +typstDeps = [ + "polylux_0_4_0", +] +description = "Library of templates for exams, seminar papers, homeworks, etc" +license = [ + "MIT", +] +homepage = "https://github.com/piepert/grape-suite" + +[grape-suite."1.0.0"] +url = "https://packages.typst.org/preview/grape-suite-1.0.0.tar.gz" +hash = "sha256-HIiU/wUotObdv8W+tB0f/TqmpdQPxCnkfibDa/x2KUM=" +typstDeps = [ + "polylux_0_3_1", +] +description = "Library of templates for exams, seminar papers, homeworks, etc" +license = [ + "MIT", +] +homepage = "https://github.com/piepert/grape-suite" + +[grape-suite."0.1.0"] +url = "https://packages.typst.org/preview/grape-suite-0.1.0.tar.gz" +hash = "sha256-p4bIM8yr8oIC/45OhowBy2W60GNIIHzIN+BVPHZ6PFk=" +typstDeps = [ + "polylux_0_3_1", +] +description = "Library of templates for exams, seminar papers, homeworks, etc" +license = [ + "MIT", +] +homepage = "https://github.com/piepert/grape-suite" + +[grayness."0.3.0"] +url = "https://packages.typst.org/preview/grayness-0.3.0.tar.gz" +hash = "sha256-0mZHo4t/5q/rVkaM7YqKs7ugPADWcofFvYa2eeU59K8=" +typstDeps = [] +description = "Simple image editing capabilities like converting to grayscale and cropping via a WASM plugin" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/nineff/grayness" + +[grayness."0.2.0"] +url = "https://packages.typst.org/preview/grayness-0.2.0.tar.gz" +hash = "sha256-b7nG9wEHhvN3Hhx4VnjjWmAF6ymWAkhdYEWFMAxU2js=" +typstDeps = [] +description = "Simple image editing capabilities like converting to grayscale and cropping via a WASM plugin" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/nineff/grayness" + +[grayness."0.1.0"] +url = "https://packages.typst.org/preview/grayness-0.1.0.tar.gz" +hash = "sha256-f4OhkAg+/myZX1GOjZ9x50YNAE73xWlZJEU/p8OZvSI=" +typstDeps = [] +description = "Simple image editing capabilities like converting to grayscale and cropping via a WASM plugin" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/nineff/grayness" + +[great-theorems."0.1.2"] +url = "https://packages.typst.org/preview/great-theorems-0.1.2.tar.gz" +hash = "sha256-JQAsHkekAQDOHlZag2G0JX1beDe03wzP7bhZ/d0xCkY=" +typstDeps = [] +description = "Theorem/Proof environments. Straightforward, functional, clean" +license = [ + "MIT", +] +homepage = "https://github.com/jbirnick/typst-great-theorems" + +[great-theorems."0.1.1"] +url = "https://packages.typst.org/preview/great-theorems-0.1.1.tar.gz" +hash = "sha256-pSdEW5J9nrId1JGjLe/WkjV1ALGKJgBzBtdDNJyyPaY=" +typstDeps = [] +description = "Straightforward and functional theorem/proof environments" +license = [ + "MIT", +] +homepage = "https://github.com/jbirnick/typst-great-theorems" + +[great-theorems."0.1.0"] +url = "https://packages.typst.org/preview/great-theorems-0.1.0.tar.gz" +hash = "sha256-2O2HcqIsxMSDvrDUYUWmSvw98/xUv/OinsCUZ0AoNDc=" +typstDeps = [] +description = "Straightforward and functional theorem/proof environments" +license = [ + "MIT", +] +homepage = "https://github.com/jbirnick/typst-great-theorems" + +[gridlock."0.3.0"] +url = "https://packages.typst.org/preview/gridlock-0.3.0.tar.gz" +hash = "sha256-B/o48gnSfhS01A7MjfXdIkbGlPOLQ3ag6Pq02VDHccg=" +typstDeps = [] +description = "Grid typesetting in Typst" +license = [ + "Unlicense", +] +homepage = "https://github.com/ssotoen/gridlock" + +[gridlock."0.2.0"] +url = "https://packages.typst.org/preview/gridlock-0.2.0.tar.gz" +hash = "sha256-4PK74BSP2jzqpJ1QZhc6tN7FYcDuJqjF6zN2FO3wlnQ=" +typstDeps = [] +description = "Grid typesetting in Typst" +license = [ + "Unlicense", +] +homepage = "https://github.com/ssotoen/gridlock" + +[gridlock."0.1.0"] +url = "https://packages.typst.org/preview/gridlock-0.1.0.tar.gz" +hash = "sha256-DVeyfYxtDDuPSwkVRvIBlj0nrQ9Az51lD+jxeyU7WiQ=" +typstDeps = [] +description = "Grid typesetting in Typst" +license = [ + "Unlicense", +] +homepage = "https://github.com/ssotoen/gridlock" + +[grotesk-cv."1.0.2"] +url = "https://packages.typst.org/preview/grotesk-cv-1.0.2.tar.gz" +hash = "sha256-Vo+LH70Ny+28MxE06YXmg+YuCzLkiNHXP+ytUqL/DKg=" +typstDeps = [] +description = "A clean CV and cover letter template based on Brilliant-cv and fireside templates" +license = [ + "Unlicense", +] +homepage = "https://github.com/AsiSkarp/grotesk-cv" + +[grotesk-cv."1.0.1"] +url = "https://packages.typst.org/preview/grotesk-cv-1.0.1.tar.gz" +hash = "sha256-NztTYJYA+syZg21Ce+dvNyO/MhmAJvoWWMe74X0Xc0s=" +typstDeps = [ + "fontawesome_0_4_0", +] +description = "A clean CV and cover letter template based on Brilliant-cv and fireside templates" +license = [ + "Unlicense", +] +homepage = "https://github.com/AsiSkarp/grotesk-cv" + +[grotesk-cv."1.0.0"] +url = "https://packages.typst.org/preview/grotesk-cv-1.0.0.tar.gz" +hash = "sha256-1+ASdtTEvAT+jwTNgmdSJTIePo6L/oiwyEndH6NXjsM=" +typstDeps = [ + "fontawesome_0_4_0", +] +description = "A clean CV and cover letter template based on brilliant-cv and fireside templates" +license = [ + "Unlicense", +] +homepage = "https://github.com/AsiSkarp/grotesk-cv" + +[grotesk-cv."0.1.6"] +url = "https://packages.typst.org/preview/grotesk-cv-0.1.6.tar.gz" +hash = "sha256-+3g8uDV0kXxHJoAVTNxmO35SWvFIA2eP/VRAcGvBGME=" +typstDeps = [ + "fontawesome_0_4_0", +] +description = "Clean CV template based on the awesome-cv and Skywalker templates" +license = [ + "MIT", +] + +[grotesk-cv."0.1.5"] +url = "https://packages.typst.org/preview/grotesk-cv-0.1.5.tar.gz" +hash = "sha256-25kvb0Ym3xw/kSj49Khdmnza/X+UcEkyqcHVsQWzZB8=" +typstDeps = [ + "fontawesome_0_4_0", + "grotesk-cv_0_1_4", +] +description = "Clean CV template based on the awesome-cv and Skywalker templates" +license = [ + "MIT", +] + +[grotesk-cv."0.1.4"] +url = "https://packages.typst.org/preview/grotesk-cv-0.1.4.tar.gz" +hash = "sha256-zTuOlzcxxpPf1PL/JgJqUZNFc9UrUrOrDd1iRn3Up8c=" +typstDeps = [ + "fontawesome_0_4_0", +] +description = "Clean CV template based on the awesome-cv and Skywalker templates" +license = [ + "MIT", +] + +[grotesk-cv."0.1.3"] +url = "https://packages.typst.org/preview/grotesk-cv-0.1.3.tar.gz" +hash = "sha256-55BFXAX/oZrTg8PiAlKlyWwCb4kbuNxZWxG+H5k84WY=" +typstDeps = [ + "fontawesome_0_4_0", +] +description = "Clean CV template based on the awesome-cv and Skywalker templates" +license = [ + "MIT", +] + +[grotesk-cv."0.1.2"] +url = "https://packages.typst.org/preview/grotesk-cv-0.1.2.tar.gz" +hash = "sha256-6s8z8PhAXBLmip3D/9Rlcu5/lkvLd97r/bPk9sbFi0E=" +typstDeps = [ + "fontawesome_0_2_1", +] +description = "Clean CV template based on the awesome-cv and Skywalker templates" +license = [ + "MIT", +] + +[grotesk-cv."0.1.1"] +url = "https://packages.typst.org/preview/grotesk-cv-0.1.1.tar.gz" +hash = "sha256-hvMDjoUsepnu0s5fwcBdx4Lvfa9LZU28iDuzUTQO1eM=" +typstDeps = [ + "fontawesome_0_2_1", + "grotesk-cv_0_1_0", +] +description = "Clean CV template based on the awesome-cv and Skywalker templates" +license = [ + "MIT", +] + +[grotesk-cv."0.1.0"] +url = "https://packages.typst.org/preview/grotesk-cv-0.1.0.tar.gz" +hash = "sha256-bC1lpdzWU3ZixDMiFMU2utOTv9Ayhbk4pxcFHB0Y3ho=" +typstDeps = [ + "fontawesome_0_2_1", +] +description = "Clean CV template based on the awesome-cv and Skywalker templates" +license = [ + "MIT", +] + +[gru."0.1.0"] +url = "https://packages.typst.org/preview/gru-0.1.0.tar.gz" +hash = "sha256-1inkfx6ZLSBK6vUpQxqWmekETuRQ7ba0KdsBct0RyBI=" +typstDeps = [] +description = "A despicable Typst template" +license = [ + "MIT", +] +homepage = "https://github.com/EdwinChang24/typst-gru" + +[guided-resume-starter-cgc."2.0.0"] +url = "https://packages.typst.org/preview/guided-resume-starter-cgc-2.0.0.tar.gz" +hash = "sha256-vj/U0MOVCQBsw/5EJPraeyl3ifjrvMsgpoE26NC1xqM=" +typstDeps = [] +description = "A guided starter resume for people looking to focus on highlighting their experience -- without having to worry about the hassle of formatting" +license = [ + "Unlicense", +] +homepage = "https://github.com/chaoticgoodcomputing/typst-resume-starter" + +[gviz."0.1.0"] +url = "https://packages.typst.org/preview/gviz-0.1.0.tar.gz" +hash = "sha256-Yn7PVGMfOMIZTTALXYrevbFL5rKe2MTNdgHVYBWwa6g=" +typstDeps = [] +description = "Generate graphs using the graphviz dot language" +license = [ + "Unlicense", +] +homepage = "https://codeberg.org/Sekoia/gviz-typst" + +[handy-dora."0.1.0"] +url = "https://packages.typst.org/preview/handy-dora-0.1.0.tar.gz" +hash = "sha256-3cDtmhJjp2GgBMQGUyUrd8hq6SQ9ggKD7vsR9e1OUvQ=" +typstDeps = [] +description = "Handy-dora is a package visualizing mahjong tiles. It's powered by wasm and Riichi-hand-rs" +license = [ + "MIT", +] +homepage = "https://github.com/hongjr03/typst-mahjong-tiles" + +[hane."0.1.0"] +url = "https://packages.typst.org/preview/hane-0.1.0.tar.gz" +hash = "sha256-L/E/1d+kuJvi7hmfkhcbVhUE3AHsNK/kRHRG/47bpew=" +typstDeps = [] +description = "Draws go/baduk/weiqi diagrams" +license = [ + "MIT", +] + +[hanzi-calligraphy."0.1.0"] +url = "https://packages.typst.org/preview/hanzi-calligraphy-0.1.0.tar.gz" +hash = "sha256-fWpqyCuAZkmK/YY0qVGL4ohbjo2d6gn/Ot60tQj49aE=" +typstDeps = [] +description = "用于书法练习的田字格模板。A calligraphy practice template" +license = [ + "MIT", +] +homepage = "https://github.com/yuegeao/hanzi-calligraphy" + +[harvard-gsas-thesis-oat."0.1.4"] +url = "https://packages.typst.org/preview/harvard-gsas-thesis-oat-0.1.4.tar.gz" +hash = "sha256-yurD53i4zYGfYjTWd0NREli8bhRZZwvbBN8VZDBbyD4=" +typstDeps = [] +description = "PhD Thesis template for Harvard GSAS (Graduate School of Arts and Sciences" +license = [ + "MIT", +] +homepage = "https://github.com/Moelf/harvard-gsas-thesis-oat" + +[harvard-gsas-thesis-oat."0.1.3"] +url = "https://packages.typst.org/preview/harvard-gsas-thesis-oat-0.1.3.tar.gz" +hash = "sha256-x9/euXk9ao9W0bwHcUJmCW/OjjJ2fjMT45rmIJwZ4Wg=" +typstDeps = [] +description = "PhD Thesis template for Harvard GSAS (Graduate School of Arts and Sciences" +license = [ + "MIT", +] +homepage = "https://github.com/Moelf/harvard-gsas-thesis-oat" + +[harvard-gsas-thesis-oat."0.1.2"] +url = "https://packages.typst.org/preview/harvard-gsas-thesis-oat-0.1.2.tar.gz" +hash = "sha256-0jtA8keC7ycWdDv1nRuENUqPNG13pbb9njrruhecciI=" +typstDeps = [] +description = "PhD Thesis template for Harvard GSAS (Graduate School of Arts and Sciences" +license = [ + "MIT", +] +homepage = "https://github.com/Moelf/harvard-gsas-thesis-oat" + +[harvard-gsas-thesis-oat."0.1.1"] +url = "https://packages.typst.org/preview/harvard-gsas-thesis-oat-0.1.1.tar.gz" +hash = "sha256-cwz9opxNmFwVPJB/uV/te87jUZP7MsbNGUj6t6jDKqc=" +typstDeps = [] +description = "PhD Thesis template for Harvard GSAS (Graduate School of Arts and Sciences" +license = [ + "MIT", +] +homepage = "https://github.com/Moelf/harvard-gsas-thesis-oat" + +[harvard-gsas-thesis-oat."0.1.0"] +url = "https://packages.typst.org/preview/harvard-gsas-thesis-oat-0.1.0.tar.gz" +hash = "sha256-gAAGUQOGEgK2v1q3SYSEgdvvYToTIGvJNU5nowBnIzg=" +typstDeps = [] +description = "PhD Thesis template for Harvard GSAS (Graduate School of Arts and Sciences" +license = [ + "MIT", +] +homepage = "https://github.com/Moelf/harvard-gsas-thesis-oat" + +[haw-hamburg."0.5.1"] +url = "https://packages.typst.org/preview/haw-hamburg-0.5.1.tar.gz" +hash = "sha256-B9r2CqFlw7129Ow8y9aOQXe6y2O3/GKm2YSDP5pHU6k=" +typstDeps = [] +description = "Unofficial template for writing a report or thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg."0.5.0"] +url = "https://packages.typst.org/preview/haw-hamburg-0.5.0.tar.gz" +hash = "sha256-l06N1tESZzZSJhy1ZFs0SuMBOhe9lFLvkckFLXF0trg=" +typstDeps = [] +description = "Unofficial template for writing a report or thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg."0.4.0"] +url = "https://packages.typst.org/preview/haw-hamburg-0.4.0.tar.gz" +hash = "sha256-FnjX1RCgEkIoIquY4HfyrYcPN/FQngYMzmUgp6QvTrw=" +typstDeps = [] +description = "Unofficial template for writing a report or thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg."0.3.3"] +url = "https://packages.typst.org/preview/haw-hamburg-0.3.3.tar.gz" +hash = "sha256-c3/cGmh0qy/uy8XMNRYJ0tScyvg+MYPreCCPo91HJl8=" +typstDeps = [] +description = "Unofficial template for writing a report or thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg."0.3.1"] +url = "https://packages.typst.org/preview/haw-hamburg-0.3.1.tar.gz" +hash = "sha256-WOlXmn5qf+8B/HfFkXNXa8o2JlsrMfBtorpywXNgZ9A=" +typstDeps = [] +description = "Unofficial template for writing a report or thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg."0.3.0"] +url = "https://packages.typst.org/preview/haw-hamburg-0.3.0.tar.gz" +hash = "sha256-XweoFyX5U3plqBsD944Wcsi1ey+NUdLi6WoD/X8/vXs=" +typstDeps = [] +description = "Unofficial template for writing a report or thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg."0.2.0"] +url = "https://packages.typst.org/preview/haw-hamburg-0.2.0.tar.gz" +hash = "sha256-tMP2yDPAtRC6ul7acXuhIzN/gkCqTf1Ar8eLfUs+baA=" +typstDeps = [ + "glossarium_0_4_2", + "haw-hamburg_0_1_0", +] +description = "Unofficial template for writing a report or thesis in the `HAW Hamburg` department of `Computer Science` design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg."0.1.0"] +url = "https://packages.typst.org/preview/haw-hamburg-0.1.0.tar.gz" +hash = "sha256-7RcOokFNH6AOnR4NMzproy5T7cSC5Uafrnpgz/8rMDI=" +typstDeps = [ + "glossarium_0_4_1", +] +description = "Unofficial template for writing a report or thesis in the `HAW Hamburg` department of `Computer Science` design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-bachelor-thesis."0.5.1"] +url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.5.1.tar.gz" +hash = "sha256-keM157SF7OS0FT0HGgFbhhZhA7lUqDMaRDmNHU6CIzE=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_5_1", +] +description = "Unofficial template for writing a bachelor-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-bachelor-thesis."0.5.0"] +url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.5.0.tar.gz" +hash = "sha256-y3RuWHrhvO7IH0cPRM9s3k0dK628Kho4uvYE7jBVJeA=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_5_0", +] +description = "Unofficial template for writing a bachelor-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-bachelor-thesis."0.4.0"] +url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.4.0.tar.gz" +hash = "sha256-97iY2zDg42J8dm6PWqbGimZ/VJbB6B8JoCguJ60JSKs=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_4_0", +] +description = "Unofficial template for writing a bachelor-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-bachelor-thesis."0.3.3"] +url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.3.3.tar.gz" +hash = "sha256-t2bom6Pqqzwp9jfGGjltz23iihDUrgE3QOjqN1c0Y9M=" +typstDeps = [ + "glossarium_0_5_1", + "haw-hamburg_0_3_3", +] +description = "Unofficial template for writing a bachelor-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-bachelor-thesis."0.3.1"] +url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.3.1.tar.gz" +hash = "sha256-qAhBSYsZarPB5aacSJPg7foe9bPpeeRTDgABjwS0z7g=" +typstDeps = [ + "glossarium_0_5_1", + "haw-hamburg_0_3_1", +] +description = "Unofficial template for writing a bachelor-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-bachelor-thesis."0.3.0"] +url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.3.0.tar.gz" +hash = "sha256-v2+vDlSa5jDqX5wpW/diwT/2xqdKYkoY9e+6wvTUqm0=" +typstDeps = [ + "glossarium_0_4_2", + "haw-hamburg_0_3_0", +] +description = "Unofficial template for writing a bachelor-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-master-thesis."0.5.1"] +url = "https://packages.typst.org/preview/haw-hamburg-master-thesis-0.5.1.tar.gz" +hash = "sha256-UxzkkPmWO6frdPI57xxelpE3mqgnpZn9aobQAHBTjIQ=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_5_1", +] +description = "Unofficial template for writing a master-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-master-thesis."0.5.0"] +url = "https://packages.typst.org/preview/haw-hamburg-master-thesis-0.5.0.tar.gz" +hash = "sha256-6wa88OAo34ILx2jDNWEyR/6DVefWbpePKvcDn/v5E8M=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_5_0", +] +description = "Unofficial template for writing a master-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-master-thesis."0.4.0"] +url = "https://packages.typst.org/preview/haw-hamburg-master-thesis-0.4.0.tar.gz" +hash = "sha256-QL9McnRm2djgkCGYEewWu9Eh6Uqjk5pMCk4tVIJStX0=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_4_0", +] +description = "Unofficial template for writing a master-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-master-thesis."0.3.3"] +url = "https://packages.typst.org/preview/haw-hamburg-master-thesis-0.3.3.tar.gz" +hash = "sha256-P/fiBhIyjd7a3HLNVWOb9y0Tho1DlscQV1HAwpnFwbg=" +typstDeps = [ + "glossarium_0_5_1", + "haw-hamburg_0_3_3", +] +description = "Unofficial template for writing a master-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-master-thesis."0.3.1"] +url = "https://packages.typst.org/preview/haw-hamburg-master-thesis-0.3.1.tar.gz" +hash = "sha256-hC4cdLTlQ3Vvq6SetKM82W6cYJMaYNSKi9FLKMrOO7Y=" +typstDeps = [ + "glossarium_0_5_1", + "haw-hamburg_0_3_1", +] +description = "Unofficial template for writing a master-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-master-thesis."0.3.0"] +url = "https://packages.typst.org/preview/haw-hamburg-master-thesis-0.3.0.tar.gz" +hash = "sha256-DrocD6zk8vIdptSqng9xu6otMH/HS7Gu84itJqba8Ls=" +typstDeps = [ + "glossarium_0_4_2", + "haw-hamburg_0_3_0", +] +description = "Unofficial template for writing a master-thesis in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-report."0.5.1"] +url = "https://packages.typst.org/preview/haw-hamburg-report-0.5.1.tar.gz" +hash = "sha256-wKWew9SRGfaI1bvZ2HUGsIGNUWWS9Jc2DydoEs+4i9k=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_5_1", +] +description = "Unofficial template for writing a report in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-report."0.5.0"] +url = "https://packages.typst.org/preview/haw-hamburg-report-0.5.0.tar.gz" +hash = "sha256-CNG1/pXFaXwqDrtPbCkpKDtg8HfdIODNxix4W0zkS/s=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_5_0", +] +description = "Unofficial template for writing a report in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-report."0.4.0"] +url = "https://packages.typst.org/preview/haw-hamburg-report-0.4.0.tar.gz" +hash = "sha256-hHwHHg1Ql9zByfzntzZKuv4IA4uwh49BY4Qtmdd6Ek8=" +typstDeps = [ + "glossarium_0_5_3", + "haw-hamburg_0_4_0", +] +description = "Unofficial template for writing a report in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-report."0.3.3"] +url = "https://packages.typst.org/preview/haw-hamburg-report-0.3.3.tar.gz" +hash = "sha256-PIfbdjGqfmXUmYgXVuDRn3E+UGFDI/h2vxS8TEP4DF0=" +typstDeps = [ + "glossarium_0_5_1", + "haw-hamburg_0_3_3", +] +description = "Unofficial template for writing a report in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-report."0.3.1"] +url = "https://packages.typst.org/preview/haw-hamburg-report-0.3.1.tar.gz" +hash = "sha256-57hSsBYO9TQt9p8P/EfLuIi/wpoRx0y7HjsohKr9eX4=" +typstDeps = [ + "glossarium_0_5_1", + "haw-hamburg_0_3_1", +] +description = "Unofficial template for writing a report in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[haw-hamburg-report."0.3.0"] +url = "https://packages.typst.org/preview/haw-hamburg-report-0.3.0.tar.gz" +hash = "sha256-w9XpicTk+LgS4H/wxBJ2OOKtEPjMmfUV/AVzFjDZbxU=" +typstDeps = [ + "glossarium_0_4_2", + "haw-hamburg_0_3_0", +] +description = "Unofficial template for writing a report in the HAW Hamburg department of Computer Science design" +license = [ + "MIT", +] +homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template" + +[headcount."0.1.0"] +url = "https://packages.typst.org/preview/headcount-0.1.0.tar.gz" +hash = "sha256-LGvD9y3np3EI8C9hruxrSASG2/+oChvq8nShbunajS8=" +typstDeps = [] +description = "Make counters inherit from the heading counter" +license = [ + "MIT", +] +homepage = "https://github.com/jbirnick/typst-headcount" + +[hei-synd-report."0.1.1"] +url = "https://packages.typst.org/preview/hei-synd-report-0.1.1.tar.gz" +hash = "sha256-PkAWjiwXtwmJe7xC7hOTCe0E+gFQahjH+9MWcrtLZCw=" +typstDeps = [ + "codelst_2_0_2", + "fractusist_0_1_1", + "glossarium_0_5_3", + "wordometer_0_1_4", +] +description = "A report and project template tailored to the Systems Engineering (Synd) program at the HEI-Vs School of Engineering, Sion, Switzerland" +license = [ + "MIT", +] +homepage = "https://github.com/hei-templates/hei-synd-report" + +[hei-synd-report."0.1.0"] +url = "https://packages.typst.org/preview/hei-synd-report-0.1.0.tar.gz" +hash = "sha256-4L7AHddOM+84PccYazITd52vEJmdXZ0ULZTpIYwEF6k=" +typstDeps = [ + "codelst_2_0_2", + "fractusist_0_1_0", + "glossarium_0_5_1", + "wordometer_0_1_4", +] +description = "A report and project template tailored to the Systems Engineering (Synd) program at the HEI-Vs School of Engineering, Sion, Switzerland" +license = [ + "MIT", +] +homepage = "https://github.com/hei-templates/hei-synd-report" + +[hei-synd-thesis."0.1.1"] +url = "https://packages.typst.org/preview/hei-synd-thesis-0.1.1.tar.gz" +hash = "sha256-arCFWYx4S/nitZSMlrgRjXdzz1ro/eM1cEBk9gZUeUs=" +typstDeps = [ + "codelst_2_0_2", + "fractusist_0_1_1", + "glossarium_0_5_3", + "wordometer_0_1_4", +] +description = "A thesis template tailored to the Systems Engineering (Synd) program at the HEI-Vs School of Engineering, Sion, Switzerland" +license = [ + "MIT", +] +homepage = "https://github.com/hei-templates/hei-synd-thesis" + +[hei-synd-thesis."0.1.0"] +url = "https://packages.typst.org/preview/hei-synd-thesis-0.1.0.tar.gz" +hash = "sha256-Vmp4jfCmVF8nPkwv+vdakcstyPYgMOIfBTmEnt7sF4A=" +typstDeps = [ + "codelst_2_0_2", + "fractusist_0_1_0", + "glossarium_0_5_1", + "hei-synd-report_0_1_0", + "wordometer_0_1_4", +] +description = "A thesis template tailored to the Systems Engineering (Synd) program at the HEI-Vs School of Engineering, Sion, Switzerland" +license = [ + "MIT", +] +homepage = "https://github.com/hei-templates/hei-synd-thesis" + +[hhn-unitylab-thesis-template."0.0.1"] +url = "https://packages.typst.org/preview/hhn-unitylab-thesis-template-0.0.1.tar.gz" +hash = "sha256-nUUMm1vlguTyfcHyMZ3MwzFCwCRxtFo3VLiDYyUegYE=" +typstDeps = [ + "cetz_0_3_1", + "chronos_0_2_0", + "circuiteria_0_1_0", + "codly_1_0_0", + "codly-languages_0_1_1", + "dining-table_0_1_0", + "fletcher_0_5_2", + "glossarium_0_5_1", + "tablem_0_1_0", + "tablex_0_0_9", + "timeliney_0_1_0", + "wrap-it_0_1_1", +] +description = "The official Thesis Template from the Usability and Interaction Technology Laboratory (UniTyLab) of the Heilbronn University (HHN" +license = [ + "MIT", +] +homepage = "https://github.com/Ferrys93de/UniTyLab-Thesis-Template" + +[hidden-bib."0.1.1"] +url = "https://packages.typst.org/preview/hidden-bib-0.1.1.tar.gz" +hash = "sha256-oaWF6c4XQ8OFEnuPlWcFcK23BWKLK+dKhFcagGxDPs8=" +typstDeps = [] +description = "Create hidden bibliographies or bibliographies with unmentioned (hidden) citations" +license = [ + "MIT", +] +homepage = "https://github.com/pklaschka/typst-hidden-bib" + +[hidden-bib."0.1.0"] +url = "https://packages.typst.org/preview/hidden-bib-0.1.0.tar.gz" +hash = "sha256-+u63x5P1zxbszULG7gMS+4SpuBALVSTP31Y0rN9Oo4s=" +typstDeps = [] +description = "Create hidden bibliographies or bibliographies with unmentioned (hidden) citations" +license = [ + "MIT", +] +homepage = "https://github.com/pklaschka/typst-hidden-bib" + +[htl3r-da."2.0.0"] +url = "https://packages.typst.org/preview/htl3r-da-2.0.0.tar.gz" +hash = "sha256-QyKMVig4bHpd7zwFvofOKZWutQcuO4dKuKxcBcVLdBc=" +typstDeps = [ + "codly_1_2_0", + "codly-languages_0_1_7", +] +description = "HTL-Rennweg diploma thesis template" +license = [ + "0BSD", + "CC-BY-SA-4.0", +] +homepage = "https://github.com/HTL3R-Typst/htl3r-da" + +[htl3r-da."1.0.0"] +url = "https://packages.typst.org/preview/htl3r-da-1.0.0.tar.gz" +hash = "sha256-nisqWtSZYhbT1r4Nu2YbhKyjGdQ9MiDhMfxEdTautOY=" +typstDeps = [ + "codly_1_1_1", + "codly-languages_0_1_1", +] +description = "HTL-Rennweg diploma thesis template" +license = [ + "0BSD", + "CC-BY-SA-4.0", +] +homepage = "https://github.com/HTL3R-Typst/htl3r-da" + +[htlwienwest-da."0.2.1"] +url = "https://packages.typst.org/preview/htlwienwest-da-0.2.1.tar.gz" +hash = "sha256-3nU774Aby7wrhNgCm8H4cOdc6cj1OD+2o8DMr7rqknE=" +typstDeps = [ + "tablex_0_0_8", +] +description = "The diploma thesis template for students of the HTL Wien West" +license = [ + "MIT", +] +homepage = "https://github.com/htlwienwest/da-vorlage-typst" + +[htlwienwest-da."0.1.1"] +url = "https://packages.typst.org/preview/htlwienwest-da-0.1.1.tar.gz" +hash = "sha256-qDdDCbsWPy9T5dP6YH3m/02fE/IZxjKA4OBEfhWLGIE=" +typstDeps = [ + "tablex_0_0_8", +] +description = "The diploma thesis template for students of the HTL Wien West" +license = [ + "MIT", +] +homepage = "https://github.com/htlwienwest/da-vorlage-typst" + +[htlwienwest-da."0.1.0"] +url = "https://packages.typst.org/preview/htlwienwest-da-0.1.0.tar.gz" +hash = "sha256-EoO6xtcU5K66jr+4mZE3BEUgEpypWhK1ko+YC4DHi28=" +typstDeps = [ + "tablex_0_0_8", +] +description = "The diploma thesis template for students of the HTL Wien West" +license = [ + "MIT", +] +homepage = "https://github.com/htlwienwest/da-vorlage-typst" + +[humble-dtu-thesis."0.1.0"] +url = "https://packages.typst.org/preview/humble-dtu-thesis-0.1.0.tar.gz" +hash = "sha256-funwyW3LwcA4eCBdoyzDQ0AbAL9px3jTLsW21XocljI=" +typstDeps = [ + "acrostiche_0_5_1", +] +description = "DTU Thesis Template for Typst" +license = [ + "MIT", +] + +[hydra."0.6.1"] +url = "https://packages.typst.org/preview/hydra-0.6.1.tar.gz" +hash = "sha256-7gq7nGp7zzv4A0A1FbQWmDINEICEHps1HcbO+hi2GyA=" +typstDeps = [ + "oxifmt_0_2_1", +] +description = "Query and display headings in your documents and templates" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[hydra."0.6.0"] +url = "https://packages.typst.org/preview/hydra-0.6.0.tar.gz" +hash = "sha256-7zmGYza04bHwXy48Ru2IsX6kjJNlns4wDotbTgmMHqc=" +typstDeps = [ + "oxifmt_0_2_1", +] +description = "Query and display headings in your documents and templates" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[hydra."0.5.2"] +url = "https://packages.typst.org/preview/hydra-0.5.2.tar.gz" +hash = "sha256-WWK6EgaVXJiIg7HfQCNtgExBYVt4DaspQM/FoBo48yI=" +typstDeps = [ + "oxifmt_0_2_1", +] +description = "Query and display headings in your documents and templates" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[hydra."0.5.1"] +url = "https://packages.typst.org/preview/hydra-0.5.1.tar.gz" +hash = "sha256-Wbs7TB8yo8G28GWnhT0HpxXAABzOKvtIB116+2V1eJg=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Query and display headings in your documents and templates" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[hydra."0.5.0"] +url = "https://packages.typst.org/preview/hydra-0.5.0.tar.gz" +hash = "sha256-UxI5XZZq9yeWIRKlQMYfAAbQEgiB0NLL68YG4h13RyU=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Query and display headings in your documents and templates" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[hydra."0.4.0"] +url = "https://packages.typst.org/preview/hydra-0.4.0.tar.gz" +hash = "sha256-TXgT9MLhW1WTb+fQPr92HUYfYUTYBGbYB4lyqrsntvw=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Query and display headings in your documents and templates" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[hydra."0.3.0"] +url = "https://packages.typst.org/preview/hydra-0.3.0.tar.gz" +hash = "sha256-znoyYAgFo/Gh6f0KVtVp8tsN2EQ+ANPFlXiLYQR2PXY=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Query and display headings of the currently active section" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[hydra."0.2.0"] +url = "https://packages.typst.org/preview/hydra-0.2.0.tar.gz" +hash = "sha256-lMSAwhFknlTsdnJF5tEGpBntQOVYfn0jTenncswx9I8=" +typstDeps = [ + "oxifmt_0_2_0", +] +description = "Query and display headings of the currently active section" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[hydra."0.1.0"] +url = "https://packages.typst.org/preview/hydra-0.1.0.tar.gz" +hash = "sha256-GKoD535scGFwFeGMH/QaqQY1dZp9Fkq9h4NzvJ53RlU=" +typstDeps = [] +description = "Query and display headings of the currently active section" +license = [ + "MIT", +] +homepage = "https://github.com/tingerrr/hydra" + +[i-figured."0.2.4"] +url = "https://packages.typst.org/preview/i-figured-0.2.4.tar.gz" +hash = "sha256-508q3J4Sj5QnxexJndtbrvekcBpuLjyv9Bkt7QgdkPk=" +typstDeps = [] +description = "Configurable figure and equation numbering per section" +license = [ + "MIT", +] +homepage = "https://github.com/RubixDev/typst-i-figured" + +[i-figured."0.2.3"] +url = "https://packages.typst.org/preview/i-figured-0.2.3.tar.gz" +hash = "sha256-PihVPsLr4rRi5quYewioKs/iYM8sd+BVXNLQkAN6xjY=" +typstDeps = [] +description = "Configurable figure and equation numbering per section" +license = [ + "MIT", +] +homepage = "https://github.com/RubixDev/typst-i-figured" + +[i-figured."0.2.2"] +url = "https://packages.typst.org/preview/i-figured-0.2.2.tar.gz" +hash = "sha256-zXfi2hw5Da5Odnrrm0MOXbvsR0gjj5Wu5yv1q6rmIGc=" +typstDeps = [] +description = "Configurable figure and equation numbering per section" +license = [ + "MIT", +] +homepage = "https://github.com/RubixDev/typst-i-figured" + +[i-figured."0.2.1"] +url = "https://packages.typst.org/preview/i-figured-0.2.1.tar.gz" +hash = "sha256-KQxJk0I9wM9VSpFsbuxHSXHh3SW9lpKtNA/TYy2MLxs=" +typstDeps = [] +description = "Configurable figure and equation numbering per section" +license = [ + "MIT", +] +homepage = "https://github.com/RubixDev/typst-i-figured" + +[i-figured."0.2.0"] +url = "https://packages.typst.org/preview/i-figured-0.2.0.tar.gz" +hash = "sha256-hTNR57rOEQhtXIDAEqUdGIf+AlNI12uQq+IBBqqAgKg=" +typstDeps = [] +description = "Configurable figure numbering per section" +license = [ + "MIT", +] +homepage = "https://github.com/RubixDev/typst-i-figured" + +[i-figured."0.1.0"] +url = "https://packages.typst.org/preview/i-figured-0.1.0.tar.gz" +hash = "sha256-0AE9bAhIB1pf+ptwMt0DvKvRxk5hj+zwU2ymOTjoqQU=" +typstDeps = [] +description = "Configurable figure numbering per section" +license = [ + "MIT", +] +homepage = "https://github.com/RubixDev/typst-i-figured" + +[ibanator."0.1.0"] +url = "https://packages.typst.org/preview/ibanator-0.1.0.tar.gz" +hash = "sha256-d9H+0Cc03IzLCWHVSzqT41xYUTwN0qQryb4SAYtaQQU=" +typstDeps = [] +description = "A package for validating and formatting International Bank Account Numbers (IBANs) according to ISO 13616-1" +license = [ + "EUPL-1.2", +] +homepage = "https://github.com/mainrs/typst-iban-formatter.git" + +[ichigo."0.2.0"] +url = "https://packages.typst.org/preview/ichigo-0.2.0.tar.gz" +hash = "sha256-DPihND6Zrg6QA2wYDMQN0vNAsCrzYpKQer+hfFJAkV8=" +typstDeps = [ + "linguify_0_4_1", + "numbly_0_1_0", + "valkyrie_0_2_1", +] +description = "A customizable Typst template for homework" +license = [ + "MIT", +] +homepage = "https://github.com/PKU-Typst/ichigo" + +[ichigo."0.1.0"] +url = "https://packages.typst.org/preview/ichigo-0.1.0.tar.gz" +hash = "sha256-9w/eLi5XCps+QDkCeoyqwC6CDs0/b8csko3ubnWetzg=" +typstDeps = [ + "linguify_0_4_1", + "numbly_0_1_0", + "valkyrie_0_2_1", +] +description = "A customizable Typst template for homework" +license = [ + "MIT", +] +homepage = "https://github.com/PKU-Typst/ichigo" + +[icicle."0.1.0"] +url = "https://packages.typst.org/preview/icicle-0.1.0.tar.gz" +hash = "sha256-7AaLEdpagkOFzQnHtRBpKbUw5rA3PDQxJWG1ALJyyI4=" +typstDeps = [] +description = "Help the Typst Guys reach the helicopter pad and save Christmas" +license = [ + "MIT-0", +] +homepage = "https://github.com/typst/templates" + +[iconic-salmon-fa."1.0.0"] +url = "https://packages.typst.org/preview/iconic-salmon-fa-1.0.0.tar.gz" +hash = "sha256-7Pmqj+FuJXb8uercaHoW5bTGPYtYqyRdwa1ZLcZJlAY=" +typstDeps = [ + "fontawesome_0_1_0", +] +description = "A Typst library for Social Media references with icons based on Font Awesome" +license = [ + "MIT", +] +homepage = "https://github.com/Bi0T1N/typst-iconic-salmon-fa" + +[iconic-salmon-svg."3.0.0"] +url = "https://packages.typst.org/preview/iconic-salmon-svg-3.0.0.tar.gz" +hash = "sha256-/lx7rqCeKFWc9ec6pD+K6NRXAEcpxKVsyjk3VryPp14=" +typstDeps = [] +description = "A Typst library for Social Media references with scalable vector graphics icons" +license = [ + "MIT", +] +homepage = "https://github.com/Bi0T1N/typst-iconic-salmon-svg" + +[iconic-salmon-svg."2.1.0"] +url = "https://packages.typst.org/preview/iconic-salmon-svg-2.1.0.tar.gz" +hash = "sha256-lpELa+RQx1DdBZJwTiDilbae5CrMbP97+w5dJd0WQQ0=" +typstDeps = [] +description = "A Typst library for Social Media references with scalable vector graphics icons" +license = [ + "MIT", +] +homepage = "https://github.com/Bi0T1N/typst-iconic-salmon-svg" + +[iconic-salmon-svg."1.1.0"] +url = "https://packages.typst.org/preview/iconic-salmon-svg-1.1.0.tar.gz" +hash = "sha256-xalofKV3mck69Z94wkSMHNRwbJG0LBq7yJ2jF6o+VQA=" +typstDeps = [] +description = "A Typst library for Social Media references with scalable vector graphics icons" +license = [ + "MIT", +] +homepage = "https://github.com/Bi0T1N/typst-iconic-salmon-svg" + +[iconic-salmon-svg."1.0.0"] +url = "https://packages.typst.org/preview/iconic-salmon-svg-1.0.0.tar.gz" +hash = "sha256-gi+ikiE9ER2SPdfMfc4b2LU3iC4EVmrjhWWdt16fY0E=" +typstDeps = [] +description = "A Typst library for Social Media references with scalable vector graphics icons" +license = [ + "MIT", +] +homepage = "https://github.com/Bi0T1N/typst-iconic-salmon-svg" + +[icu-datetime."0.1.2"] +url = "https://packages.typst.org/preview/icu-datetime-0.1.2.tar.gz" +hash = "sha256-1dWi/4Cos6YwvR/6uUXIeXY5zREnJKWcpoS26va6jFs=" +typstDeps = [] +description = "Date and time formatting using ICU4X via WASM" +license = [ + "MIT", +] +homepage = "https://github.com/Nerixyz/icu-typ" + +[icu-datetime."0.1.1"] +url = "https://packages.typst.org/preview/icu-datetime-0.1.1.tar.gz" +hash = "sha256-6pHIy2iHE42W3S0U8q5Q1ZHJ/9nlqULO/SOrpWqciFE=" +typstDeps = [] +description = "Date and time formatting using ICU4X via WASM" +license = [ + "MIT", +] +homepage = "https://github.com/Nerixyz/icu-typ" + +[icu-datetime."0.1.0"] +url = "https://packages.typst.org/preview/icu-datetime-0.1.0.tar.gz" +hash = "sha256-4L2Jh4VJGENEiPHbl8muWNJQpINuEXB3nWVzBT4ifKE=" +typstDeps = [] +description = "Date and time formatting using ICU4X via WASM" +license = [ + "MIT", +] +homepage = "https://github.com/Nerixyz/icu-typ" + +[idwtet."0.3.0"] +url = "https://packages.typst.org/preview/idwtet-0.3.0.tar.gz" +hash = "sha256-EJpapwNV9RD50LXl0XBXsU8uF/NrR+uFCSBXb1lQ/10=" +typstDeps = [] +description = "Package for uniform, correct and simplified typst code demonstration" +license = [ + "MIT", +] +homepage = "https://github.com/ludwig-austermann/typst-idwtet" + +[idwtet."0.2.0"] +url = "https://packages.typst.org/preview/idwtet-0.2.0.tar.gz" +hash = "sha256-/IgwHz/eg8bNjfDQlDe6TQeDQIutYeE3+41YGwqaatg=" +typstDeps = [] +description = "Package for uniform, correct and simplified typst code demonstration" +license = [ + "MIT", +] +homepage = "https://github.com/ludwig-austermann/typst-idwtet" + +[ieee-monolith."0.1.0"] +url = "https://packages.typst.org/preview/ieee-monolith-0.1.0.tar.gz" +hash = "sha256-meRF2qrqs7Bx/iLX+o/TkM+DNr0nkaqQ1XuuUZiGI2w=" +typstDeps = [] +description = "Single column paper with IEEE-style references and bibliography" +license = [ + "MIT", +] +homepage = "https://github.com/Fricsion/typst-template_ieee-style-single-column" + +[ijimai."0.0.2"] +url = "https://packages.typst.org/preview/ijimai-0.0.2.tar.gz" +hash = "sha256-Uf+PQdL6RsBiKdkbWg+msGLwpkbwiBvBUnzk0MQow3M=" +typstDeps = [ + "datify_0_1_3", + "droplet_0_3_1", + "wrap-it_0_1_1", +] +description = "Template for writing articles for the International Journal of Interactive Multimedia and Artificial Intelligence (IJIMAI" +license = [ + "MIT", +] +homepage = "https://github.com/pammacdotnet/IJIMAI" + +[ijimai."0.0.1"] +url = "https://packages.typst.org/preview/ijimai-0.0.1.tar.gz" +hash = "sha256-kFxD8/Y9bNdIR9kreE6ieXAtjv5h41gH/sNTV07ljQM=" +typstDeps = [ + "datify_0_1_3", + "droplet_0_3_1", + "wrap-it_0_1_1", +] +description = "Template for writing articles for the International Journal of Interactive Multimedia and Artificial Intelligence (IJIMAI" +license = [ + "MIT", +] +homepage = "https://github.com/pammacdotnet/IJIMAI" + +[illc-mol-thesis."0.1.2"] +url = "https://packages.typst.org/preview/illc-mol-thesis-0.1.2.tar.gz" +hash = "sha256-9WBdTt4Mw+XrOzJ1F1QhT8dWB/g+XwLsUf+EaSFwJUE=" +typstDeps = [ + "great-theorems_0_1_2", + "rich-counters_0_2_2", +] +description = "Official Typst thesis template for Master of Logic students at the ILLC" +license = [ + "AGPL-3.0-or-later", +] +homepage = "https://codeberg.org/foxy/illc-mol-thesis" + +[illc-mol-thesis."0.1.1"] +url = "https://packages.typst.org/preview/illc-mol-thesis-0.1.1.tar.gz" +hash = "sha256-toU02wycScUaNgoep7JM7qj3CyrgUeT1Ob7Gz6ACDOo=" +typstDeps = [ + "great-theorems_0_1_1", + "rich-counters_0_2_1", +] +description = "Official Typst thesis template for Master of Logic students at the ILLC" +license = [ + "AGPL-3.0-or-later", +] +homepage = "https://codeberg.org/foxy/illc-mol-thesis" + +[illc-mol-thesis."0.1.0"] +url = "https://packages.typst.org/preview/illc-mol-thesis-0.1.0.tar.gz" +hash = "sha256-dy+4Z+c0WI+jX0Ce6YC5s164NbJn1ljJ6JRn/G+XLHA=" +typstDeps = [ + "great-theorems_0_1_1", + "rich-counters_0_2_1", +] +description = "Official Typst thesis template for Master of Logic students at the ILLC" +license = [ + "AGPL-3.0-or-later", +] +homepage = "https://codeberg.org/foxy/illc-mol-thesis" + +[ilm."1.4.1"] +url = "https://packages.typst.org/preview/ilm-1.4.1.tar.gz" +hash = "sha256-bNGWTEcDSqh2c/ziEEv3u92CWaFjjF6pe/2zhOv8OQg=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.4.0"] +url = "https://packages.typst.org/preview/ilm-1.4.0.tar.gz" +hash = "sha256-Wu2wBZoiPXzDytJUncFJnnpN+/m9ZNcSGkaulgx4Veo=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.3.1"] +url = "https://packages.typst.org/preview/ilm-1.3.1.tar.gz" +hash = "sha256-pBLAI7HLEtj8oANzzLP+CFjePvsYen1eF/VSN/kx1jU=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.3.0"] +url = "https://packages.typst.org/preview/ilm-1.3.0.tar.gz" +hash = "sha256-3mL+9h4jIztTdaSsVm5iDSi46oF3bz2kaPHumJwEips=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.2.1"] +url = "https://packages.typst.org/preview/ilm-1.2.1.tar.gz" +hash = "sha256-zdq7GDDfqi/xn5v8gLqzsCM+BrYhvRxTRIvxfzf/MVs=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.2.0"] +url = "https://packages.typst.org/preview/ilm-1.2.0.tar.gz" +hash = "sha256-3pdgzpe+AtYzEbKncrhU7tX6jILu7F8s8xPJO5ACAMg=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.1.3"] +url = "https://packages.typst.org/preview/ilm-1.1.3.tar.gz" +hash = "sha256-MuWkhqK6C9fq6bqnFQepVeaPyuyKko9eDEh40/Xv1hw=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.1.2"] +url = "https://packages.typst.org/preview/ilm-1.1.2.tar.gz" +hash = "sha256-iETNRl8W3WqBy/Jb1jgJuaFRipIVVkRgpjwz2oV/Y1k=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.1.1"] +url = "https://packages.typst.org/preview/ilm-1.1.1.tar.gz" +hash = "sha256-29Pz8aBx8eGhZMB1PX/gmGBJlU21Yyjv5TROUBxo8Ls=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, reports, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.1.0"] +url = "https://packages.typst.org/preview/ilm-1.1.0.tar.gz" +hash = "sha256-xBIOaQhabgiCERKlDIcDU5NoYr7bdOuPiD6keVdrObY=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, report, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."1.0.0"] +url = "https://packages.typst.org/preview/ilm-1.0.0.tar.gz" +hash = "sha256-tJh5S4ZTPJDdkkgBs2nrpevEgEppEFPZlKtsPiz3BUM=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, report, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."0.1.3"] +url = "https://packages.typst.org/preview/ilm-0.1.3.tar.gz" +hash = "sha256-sqVIgc9KsCGUDzJAIXTY7GhmpCOCMw/zJjpkqP7mJnM=" +typstDeps = [ + "ilm_0_1_2", +] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, report, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."0.1.2"] +url = "https://packages.typst.org/preview/ilm-0.1.2.tar.gz" +hash = "sha256-IpvMbQWR+I+d8KS972OcNiPepWFj+XavPLhOEX1pC/0=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, report, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."0.1.1"] +url = "https://packages.typst.org/preview/ilm-0.1.1.tar.gz" +hash = "sha256-JhExC3idGTCf69jC9cjeIm0cj0QdIT4yC7+1VS8ILjg=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, report, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[ilm."0.1.0"] +url = "https://packages.typst.org/preview/ilm-0.1.0.tar.gz" +hash = "sha256-07vyDs6QMXyeE4HlGD34X2pUHNaOPEZywBa3zY0aYEI=" +typstDeps = [] +description = "Versatile and minimal template for non-fiction writing. Ideal for class notes, report, and books" +license = [ + "MIT-0", +] +homepage = "https://github.com/talal/ilm" + +[imprecv."1.0.1"] +url = "https://packages.typst.org/preview/imprecv-1.0.1.tar.gz" +hash = "sha256-q0y6QunluYMFNTJKlUqFheRDKzkQ7L7cuOKCX37/PXU=" +typstDeps = [] +description = "A no-frills curriculum vitae (CV) template using Typst and YAML to version control CV data" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/jskherman/imprecv" + +[imprecv."1.0.0"] +url = "https://packages.typst.org/preview/imprecv-1.0.0.tar.gz" +hash = "sha256-UkyMtrjje7GfR2pT9q1zHqil12KptIeghny43T98utw=" +typstDeps = [] +description = "A no-frills curriculum vitae (CV) template using Typst and YAML to version control CV data" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/jskherman/imprecv" + +[in-dexter."0.7.0"] +url = "https://packages.typst.org/preview/in-dexter-0.7.0.tar.gz" +hash = "sha256-yzRnJe14VYyYWSYAs3pEDDZLU8QfBfC2sK1OP0Bkc50=" +typstDeps = [] +description = "Create an 'hand picked' Index" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.5.3"] +url = "https://packages.typst.org/preview/in-dexter-0.5.3.tar.gz" +hash = "sha256-9uC2p04LPZpyflniWuWA15fEl+NRKLxt19QL+Xkx5i0=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.5.2"] +url = "https://packages.typst.org/preview/in-dexter-0.5.2.tar.gz" +hash = "sha256-hNnw25kWvyClJkgRKXeDZX8njD3U1qSXwLC/cemtnxg=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.4.2"] +url = "https://packages.typst.org/preview/in-dexter-0.4.2.tar.gz" +hash = "sha256-CC+5kWaQUF0qD/25hMhKiPtZi+EAEc7SsHs/7bySp0E=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.3.0"] +url = "https://packages.typst.org/preview/in-dexter-0.3.0.tar.gz" +hash = "sha256-RKRYCc36nP57S4daR5IWT7klMicoZMkjijtyyyrv9vY=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.2.0"] +url = "https://packages.typst.org/preview/in-dexter-0.2.0.tar.gz" +hash = "sha256-tS6dUnpl4/MJGt5c9q1SlvufYJn6chqwIkF5gg9shGo=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.1.0"] +url = "https://packages.typst.org/preview/in-dexter-0.1.0.tar.gz" +hash = "sha256-gQ9O89PiNvrnTvrkH22FKfAY/ZOcN9WGxqB/EqYGubs=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.0.6"] +url = "https://packages.typst.org/preview/in-dexter-0.0.6.tar.gz" +hash = "sha256-C8ZctB6P7eQ9+fhp7aW+m+vcVLnk934zZR1kWtN0eco=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.0.5"] +url = "https://packages.typst.org/preview/in-dexter-0.0.5.tar.gz" +hash = "sha256-YhCLddQ2HrI9c/DgpmkT9ePezKzZYL6rMgJvZ9zUHg4=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.0.4"] +url = "https://packages.typst.org/preview/in-dexter-0.0.4.tar.gz" +hash = "sha256-cEmqXywlCkEbLL49xnyF4ppAl/jpOhvpc1x8EWKREJU=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[in-dexter."0.0.3"] +url = "https://packages.typst.org/preview/in-dexter-0.0.3.tar.gz" +hash = "sha256-77ol5CQKXrGoVS4LD0RBnhHLss6BLfQRTXY7dGuJHzY=" +typstDeps = [] +description = "Hand Picked Index for Typst" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/RolfBremer/in-dexter" + +[inboisu."0.1.0"] +url = "https://packages.typst.org/preview/inboisu-0.1.0.tar.gz" +hash = "sha256-0hPwa7JwI/NvbkW3O34w3kSFDIHGhfmCvrStqBYWRxo=" +typstDeps = [ + "tablex_0_0_9", +] +description = "Inboisu is a tool for creating Japanese invoices" +license = [ + "MIT-0", +] +homepage = "https://github.com/mkpoli/typst-inboisu" + +[indenta."0.0.3"] +url = "https://packages.typst.org/preview/indenta-0.0.3.tar.gz" +hash = "sha256-3xatpD/it9Q43n5Ow9X5esZBXXw5ZBMEktfhKd4AejA=" +typstDeps = [] +description = "Fix indent of first paragraph" +license = [ + "MIT", +] +homepage = "https://github.com/flaribbit/indenta" + +[indenta."0.0.2"] +url = "https://packages.typst.org/preview/indenta-0.0.2.tar.gz" +hash = "sha256-OEcO2y5xsNZqUw7o/2lUZk7u7c9uhffTyn4qJw48+/I=" +typstDeps = [] +description = "Fix indent of first paragraph" +license = [ + "MIT", +] +homepage = "https://github.com/flaribbit/indenta" + +[indenta."0.0.1"] +url = "https://packages.typst.org/preview/indenta-0.0.1.tar.gz" +hash = "sha256-UxLhZaFlp2UN/Y2kj7U2hGOF1NS5eeJVwEaF6Cv0lqU=" +typstDeps = [] +description = "Fix indent of first paragraph" +license = [ + "MIT", +] +homepage = "https://github.com/flaribbit/indenta" + +[indic-numerals."0.1.0"] +url = "https://packages.typst.org/preview/indic-numerals-0.1.0.tar.gz" +hash = "sha256-qL2C6OHjMRqVTUFYSjVus3iE9HR1CklJdwMjPQ97QHo=" +typstDeps = [] +description = "convert arabic numerals to indic numerals and vice versa" +license = [ + "MIT", +] +homepage = "https://github.com/cecoeco/indic-numerals" + +[invoice-maker."1.1.0"] +url = "https://packages.typst.org/preview/invoice-maker-1.1.0.tar.gz" +hash = "sha256-IT1P65mtzpgUUUHwOIDHoYG8x3GeP3MtSU+OzJFGFVs=" +typstDeps = [] +description = "Generate beautiful invoices from a simple data record" +license = [ + "ISC", +] +homepage = "https://github.com/ad-si/invoice-maker" + +[ionio-illustrate."0.2.0"] +url = "https://packages.typst.org/preview/ionio-illustrate-0.2.0.tar.gz" +hash = "sha256-p+Z4u91PvA2APXlk80ZikJTEk+JIhPpIn64Z6P+rLrY=" +typstDeps = [ + "cetz_0_1_2", +] +description = "Mass spectra with annotations for typst" +license = [ + "MIT", +] +homepage = "https://github.com/JamesxX/ionio-illustrate" + +[ionio-illustrate."0.1.0"] +url = "https://packages.typst.org/preview/ionio-illustrate-0.1.0.tar.gz" +hash = "sha256-Wa/tLkpXkfzBhGgeRnVip7oblihNpdXmcoIGKKqMGaw=" +typstDeps = [ + "cetz_0_1_2", +] +description = "Mass spectra with annotations for typst" +license = [ + "MIT", +] + +[iridis."0.1.0"] +url = "https://packages.typst.org/preview/iridis-0.1.0.tar.gz" +hash = "sha256-ryceOZ0JS+SN90DO7C1n5D2sqizhM9yrXgW+Oxuo8UA=" +typstDeps = [] +description = "A package to colors matching parenthesis" +license = [ + "MIT", +] + +[isc-hei-report."0.2.0"] +url = "https://packages.typst.org/preview/isc-hei-report-0.2.0.tar.gz" +hash = "sha256-z+XY4IaAOqxAZxjKDLVb/aou/RVOFSnnrTowcRVua60=" +typstDeps = [ + "acrostiche_0_5_1", + "codelst_2_0_2", + "showybox_2_0_3", +] +description = "An official report template for the 'Informatique et systèmes de communication' (ISC) bachelor degree programme at the School of Engineering (HEI) in Sion, Switzerland" +license = [ + "MIT", +] +homepage = "https://github.com/ISC-HEI/ISC-report" + +[isc-hei-report."0.1.5"] +url = "https://packages.typst.org/preview/isc-hei-report-0.1.5.tar.gz" +hash = "sha256-+z4/39eEZHqnzoQ335iCLJ2BXGuCPJMlPcXb86g48rE=" +typstDeps = [ + "acrostiche_0_3_0", + "acrostiche_0_3_1", + "codelst_2_0_1", + "showybox_2_0_1", +] +description = "An official report template for the 'Informatique et systèmes de communication' (ISC) bachelor degree programme at the School of Engineering (HEI) in Sion, Switzerland" +license = [ + "MIT", +] +homepage = "https://github.com/ISC-HEI/ISC-report" + +[isc-hei-report."0.1.3"] +url = "https://packages.typst.org/preview/isc-hei-report-0.1.3.tar.gz" +hash = "sha256-nuzvDLXZ7rfCCKui+K9w12SRFVwcde3nN+thvot6a6g=" +typstDeps = [ + "acrostiche_0_3_0", + "acrostiche_0_3_1", + "codelst_2_0_1", + "showybox_2_0_1", +] +description = "An official report template for the 'Informatique et systèmes de communication' (ISC) bachelor degree programme at the School of Engineering (HEI) in Sion, Switzerland" +license = [ + "MIT", +] +homepage = "https://github.com/ISC-HEI/ISC-report" + +[isc-hei-report."0.1.0"] +url = "https://packages.typst.org/preview/isc-hei-report-0.1.0.tar.gz" +hash = "sha256-vkDZBocPZJOPIyf2j1oZ5rvzMT0wMG/a2BURXTjv6DA=" +typstDeps = [ + "acrostiche_0_3_0", + "codelst_2_0_1", + "showybox_2_0_1", +] +description = "An official report template for the 'Informatique et systèmes de communication' (ISC) bachelor degree programme at the School of Engineering (HEI) in Sion, Switzerland" +license = [ + "MIT", +] +homepage = "https://github.com/ISC-HEI/ISC-report" + +[jaconf-mscs."0.1.0"] +url = "https://packages.typst.org/preview/jaconf-mscs-0.1.0.tar.gz" +hash = "sha256-Vvp2RFqMP2/Uho0VrA4ZE3DXJuj3cy5cPRaxv280x1o=" +typstDeps = [ + "codly_1_1_1", + "ctheorems_1_1_3", +] +description = "Template for Japanese conference paper of engineering. 工学系の日本語学会論文テンプレート" +license = [ + "MIT-0", +] +homepage = "https://github.com/kimushun1101/typst-jp-conf-template" + +[jlyfish."0.1.0"] +url = "https://packages.typst.org/preview/jlyfish-0.1.0.tar.gz" +hash = "sha256-h7WTNYT4tPbAEF7B50fUP7oHVnNIDJxedS3CMZxcbQ4=" +typstDeps = [ + "based_0_1_0", +] +description = "Julia code evaluation inside your Typst document" +license = [ + "MIT", +] +homepage = "https://github.com/andreasKroepelin/TypstJlyfish.jl" + +[jogs."0.2.4"] +url = "https://packages.typst.org/preview/jogs-0.2.4.tar.gz" +hash = "sha256-WZYXL2dKMK/B2LDDt9iRMkvJO0QZXRarEECNlF1QwTQ=" +typstDeps = [] +description = "QuickJS JavaScript runtime for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/jogs" + +[jogs."0.2.3"] +url = "https://packages.typst.org/preview/jogs-0.2.3.tar.gz" +hash = "sha256-XWXBYCki9munvKJGRrH+mN8gmba1PNN7dpR19HG9Hjk=" +typstDeps = [] +description = "QuickJS JavaScript runtime for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/jogs" + +[jogs."0.2.2"] +url = "https://packages.typst.org/preview/jogs-0.2.2.tar.gz" +hash = "sha256-VlhWrCmqphFJfraNaENwBElyyzGPuFTNax44BtlAr3k=" +typstDeps = [] +description = "QuickJS JavaScript runtime for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/jogs" + +[jogs."0.2.1"] +url = "https://packages.typst.org/preview/jogs-0.2.1.tar.gz" +hash = "sha256-z/MoF0l9qarxCL0dCNIRtYs05Grst1IyYAbIw/KEyxA=" +typstDeps = [] +description = "QuickJS JavaScript runtime for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/jogs" + +[jogs."0.2.0"] +url = "https://packages.typst.org/preview/jogs-0.2.0.tar.gz" +hash = "sha256-gNOZwfjHvz6R3r/FfLSM16jKu81vYK63ZAdpJMo2+Yg=" +typstDeps = [] +description = "QuickJS JavaScript runtime for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/jogs" + +[jogs."0.1.0"] +url = "https://packages.typst.org/preview/jogs-0.1.0.tar.gz" +hash = "sha256-nleCwdDbkqBdWElIoh5CVrszjYsicVAWFjGBb52vB5I=" +typstDeps = [] +description = "QuickJS JavaScript runtime for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/jogs" + +[js."0.1.3"] +url = "https://packages.typst.org/preview/js-0.1.3.tar.gz" +hash = "sha256-yf7bg3vx2h8KY/VSqL6lJhbiN0Vk0s/BHt7OIpIAUMw=" +typstDeps = [] +description = "Typst template based on LaTeX jsarticle/jsbook document classes" +license = [ + "MIT-0", +] +homepage = "https://github.com/okumuralab/typst-js" + +[js."0.1.2"] +url = "https://packages.typst.org/preview/js-0.1.2.tar.gz" +hash = "sha256-MXv0VPyEzMsuVNZhJXJzjlOJ4qYYeqHqbf3pxq6vyZ4=" +typstDeps = [] +description = "Typst template based on LaTeX jsarticle/jsbook document classes" +license = [ + "MIT-0", +] +homepage = "https://github.com/okumuralab/typst-js" + +[js."0.1.1"] +url = "https://packages.typst.org/preview/js-0.1.1.tar.gz" +hash = "sha256-MDWS5b81xz1LfQw0sWBQB8NC4G8Ol2GDnmBEIj/w89o=" +typstDeps = [] +description = "Typst template based on LaTeX jsarticle/jsbook document classes" +license = [ + "MIT-0", +] +homepage = "https://github.com/okumuralab/typst-js" + +[js."0.1.0"] +url = "https://packages.typst.org/preview/js-0.1.0.tar.gz" +hash = "sha256-DrsvfvaDGVcl+QkHjhnJYPCenBKQAZe47s2abtN/20c=" +typstDeps = [] +description = "Typst template based on LaTeX jsarticle/jsbook document classes" +license = [ + "MIT-0", +] +homepage = "https://github.com/okumuralab/typst-js" + +[jumble."0.0.1"] +url = "https://packages.typst.org/preview/jumble-0.0.1.tar.gz" +hash = "sha256-GnQdiXXCTIIILynOiWgbwmmovZ+6x99IjkiGzOnzVVA=" +typstDeps = [ + "tidy_0_4_0", +] +description = "A package providing some hash functions and related stuff" +license = [ + "Apache-2.0", +] +homepage = "https://git.kb28.ch/HEL/jumble" + +[jurz."0.1.0"] +url = "https://packages.typst.org/preview/jurz-0.1.0.tar.gz" +hash = "sha256-m/Mj05WArGW5YDoKNdyt1F0YQTS1Dz5Jw9er8w2vyas=" +typstDeps = [] +description = "Randziffern in Typst" +license = [ + "MIT", +] + +[k-mapper."1.2.0"] +url = "https://packages.typst.org/preview/k-mapper-1.2.0.tar.gz" +hash = "sha256-iJj/FMGu/4DAz6yqrUZ62WeFxhXVxszkVyqeS0NOnDg=" +typstDeps = [] +description = "A package to add Karnaugh maps into Typst projects" +license = [ + "MIT", +] +homepage = "https://github.com/derekchai/typst-karnaugh-map" + +[k-mapper."1.1.0"] +url = "https://packages.typst.org/preview/k-mapper-1.1.0.tar.gz" +hash = "sha256-2sqjAMkjCwcgI4OOLfrzwyUc4Rx28EoPHxFeFfYB80E=" +typstDeps = [] +description = "A package to add Karnaugh maps into Typst projects" +license = [ + "MIT", +] +homepage = "https://github.com/derekchai/typst-karnaugh-map" + +[k-mapper."1.0.0"] +url = "https://packages.typst.org/preview/k-mapper-1.0.0.tar.gz" +hash = "sha256-w8GanT6MurAkT3T6nKCWxLMIWwRxbsLSbGSCtcrOqAo=" +typstDeps = [] +description = "A package to add Karnaugh maps into Typst projects" +license = [ + "MIT", +] +homepage = "https://github.com/derekchai/typst-karnaugh-map" + +[kanjimo."0.1.0"] +url = "https://packages.typst.org/preview/kanjimo-0.1.0.tar.gz" +hash = "sha256-6caBsc8kZytwVe0XEPiX0qiw5xPe0lPWDwGJVZcRCzE=" +typstDeps = [] +description = "Create charts with selected kanji for practicing" +license = [ + "MIT", +] +homepage = "https://github.com/istudyatuni/kanjimo" + +[kdl-unofficial-template."0.1.0"] +url = "https://packages.typst.org/preview/kdl-unofficial-template-0.1.0.tar.gz" +hash = "sha256-GDTzRTc+9O/8QJ50qZZZlXUxhVYPzq2NRym6yKZ/3v4=" +typstDeps = [ + "cetz_0_3_3", + "droplet_0_3_1", + "suiji_0_3_0", +] +description = "An unofficial template for community scenarios for the TTRPG 'KULT: divinity lost" +license = [ + "MIT", +] + +[keyle."0.2.0"] +url = "https://packages.typst.org/preview/keyle-0.2.0.tar.gz" +hash = "sha256-RhC88JBzKG1muu+hoWB/Y8Q6/KUyeU72EU0OzllpUBA=" +typstDeps = [ + "codelst_2_0_0", + "mantys_0_1_4", + "showybox_2_0_1", +] +description = "This package provides a simple way to style keyboard shortcuts in your documentation" +license = [ + "MIT", +] +homepage = "https://github.com/magicwenli/keyle" + +[keyle."0.1.1"] +url = "https://packages.typst.org/preview/keyle-0.1.1.tar.gz" +hash = "sha256-GPTeNT5cFVzbMgmSZ/1U6+B+gWCkh+R1ppBMqsBtiKE=" +typstDeps = [ + "keyle_0_1_0", + "mantys_0_1_4", +] +description = "This package provides a simple way to style keyboard shortcuts in your documentation" +license = [ + "MIT", +] +homepage = "https://github.com/magicwenli/keyle" + +[keyle."0.1.0"] +url = "https://packages.typst.org/preview/keyle-0.1.0.tar.gz" +hash = "sha256-rCWePSV9alPZfuw8TBw1wYXMexBVepEgmjhbA1ehbKc=" +typstDeps = [ + "mantys_0_1_4", +] +description = "This package provides a simple way to style keyboard shortcuts in your documentation" +license = [ + "MIT", +] +homepage = "https://github.com/magicwenli/keyle" + +[kinase."0.1.0"] +url = "https://packages.typst.org/preview/kinase-0.1.0.tar.gz" +hash = "sha256-WRGyitKZga3XdXwF2MKgE81iVhAJCPJFd1Q+MWCv/6o=" +typstDeps = [ + "mantys_0_1_1", + "tidy_0_2_0", +] +description = "Easy styling for different link types like mails and urls" +license = [ + "MIT", +] + +[klaro-ifsc-sj."0.1.0"] +url = "https://packages.typst.org/preview/klaro-ifsc-sj-0.1.0.tar.gz" +hash = "sha256-ib34/i22ozy0OlhXaOTX5oQn2ITQVHVLYQqBYnDGQDA=" +typstDeps = [] +description = "Report Typst template for IFSC" +license = [ + "MIT-0", +] +homepage = "https://github.com/gabrielluizep/klaro-ifsc-sj" + +[km."0.1.0"] +url = "https://packages.typst.org/preview/km-0.1.0.tar.gz" +hash = "sha256-kWhaIc5GTBxodLNQcVP82mD7CKnuwKzLOnK8em3SLeI=" +typstDeps = [] +description = "Draw simple Karnaugh maps" +license = [ + "MIT", +] +homepage = "https://git.sr.ht/~toto/karnaugh" + +[knowledge-key."1.0.1"] +url = "https://packages.typst.org/preview/knowledge-key-1.0.1.tar.gz" +hash = "sha256-mpbfURVxssF0aVKPvvXRWpGUK9TyuXEoz8zdnJrPKP0=" +typstDeps = [ + "codelst_2_0_1", + "tablex_0_0_8", +] +description = "A compact cheat-sheet" +license = [ + "MIT-0", +] +homepage = "https://github.com/ngoetti/knowledge-key" + +[knowledge-key."1.0.0"] +url = "https://packages.typst.org/preview/knowledge-key-1.0.0.tar.gz" +hash = "sha256-L4eU2sqCSj31tMXBysjVU8i0aAoF9nVoIgqZffV6VKo=" +typstDeps = [ + "codelst_2_0_1", + "tablex_0_0_8", +] +description = "A compact cheat-sheet" +license = [ + "MIT-0", +] +homepage = "https://github.com/ngoetti/knowledge-key" + +[koma-labeling."0.2.0"] +url = "https://packages.typst.org/preview/koma-labeling-0.2.0.tar.gz" +hash = "sha256-vDy5t6MtKav29CgKA5gMyPzD0YRz/s/TIVt9oD6glGY=" +typstDeps = [] +description = "This package introduces a labeling feature to Typst, inspired by the KOMA-Script's labeling environment" +license = [ + "MIT", +] + +[koma-labeling."0.1.0"] +url = "https://packages.typst.org/preview/koma-labeling-0.1.0.tar.gz" +hash = "sha256-jAyBafmtttzpmDfz66HUdCLJ4hyOxqHtYvX7c5KTMrs=" +typstDeps = [] +description = "This package introduces a labeling feature to Typst, inspired by the KOMA-Script's labeling environment" +license = [ + "MIT", +] + +[kouhu."0.2.0"] +url = "https://packages.typst.org/preview/kouhu-0.2.0.tar.gz" +hash = "sha256-Q5qLfexfuH7oRNDiyff1/moFN7QplvzkPYdxpjgkR1A=" +typstDeps = [ + "cmarker_0_1_1", + "mantys_0_1_4", + "tidy_0_2_0", +] +description = "Chinese lipsum text generator; 中文乱数假文(Lorem Ipsum)生成器" +license = [ + "MIT", +] +homepage = "https://github.com/Harry-Chen/kouhu" + +[kouhu."0.1.1"] +url = "https://packages.typst.org/preview/kouhu-0.1.1.tar.gz" +hash = "sha256-kMnFLH3KPwmBE4jg/nFpkhshkSAuUBBcuIIF4Jn5580=" +typstDeps = [ + "mantys_0_1_4", + "tidy_0_2_0", +] +description = "Chinese lipsum text generator; 中文乱数假文(Lorem Ipsum)生成器" +license = [ + "MIT", +] +homepage = "https://github.com/Harry-Chen/kouhu" + +[kouhu."0.1.0"] +url = "https://packages.typst.org/preview/kouhu-0.1.0.tar.gz" +hash = "sha256-NQ5xPAnxc8zgM6cY9B364EU4mNDC6QQ8Z3yJDoSUpX8=" +typstDeps = [ + "mantys_0_1_4", + "tidy_0_2_0", +] +description = "Chinese lipsum text generator; 中文乱数假文(Lorem Ipsum)生成器" +license = [ + "MIT", +] +homepage = "https://github.com/Harry-Chen/kouhu" + +[kthesis."0.1.1"] +url = "https://packages.typst.org/preview/kthesis-0.1.1.tar.gz" +hash = "sha256-SEGkBuf1UtnO0/DA74gsbSH/BUkWjORsAj7UYb8EwEA=" +typstDeps = [ + "glossarium_0_5_4", + "headcount_0_1_0", + "hydra_0_6_0", + "linguify_0_4_2", +] +description = "Unofficial thesis template for KTH Royal Institute of Technology" +license = [ + "MIT", + "MIT-0", +] +homepage = "https://github.com/RafDevX/kthesis-typst" + +[kthesis."0.1.0"] +url = "https://packages.typst.org/preview/kthesis-0.1.0.tar.gz" +hash = "sha256-ZHaFDc5SIUbEuugwbiMi1ZnQfOK/oAjhihwIKlKqwDc=" +typstDeps = [ + "glossarium_0_5_1", + "headcount_0_1_0", + "hydra_0_5_2", + "linguify_0_4_1", +] +description = "Unofficial thesis template for KTH Royal Institute of Technology" +license = [ + "MIT", + "MIT-0", +] +homepage = "https://github.com/RafDevX/kthesis-typst" + +[kunskap."0.1.0"] +url = "https://packages.typst.org/preview/kunskap-0.1.0.tar.gz" +hash = "sha256-drCRPbJP5vdJ1/oAcEVVlt8/UO+eHVH+GYRAsvJQYlg=" +typstDeps = [] +description = "A template with generous spacing for reports, assignments, course documents, and similar (shorter) documents" +license = [ + "MIT-0", +] +homepage = "https://github.com/mbollmann/typst-kunskap" + +[lacy-ubc-math-project."0.1.1"] +url = "https://packages.typst.org/preview/lacy-ubc-math-project-0.1.1.tar.gz" +hash = "sha256-F8BESXsANR3yQ3Rjm1yb4fgVSxuNt6WhHkB6StNydPU=" +typstDeps = [ + "cetz_0_3_1", + "cetz-plot_0_1_0", + "equate_0_2_1", + "metro_0_3_0", + "mitex_0_2_4", + "physica_0_9_3", + "physica_0_9_4", + "showman_0_1_2", +] +description = "A UBC MATH 100/101 group project template" +license = [ + "MIT", +] +homepage = "https://github.com/lace-wing/lacy-ubc-math-project" + +[lacy-ubc-math-project."0.1.0"] +url = "https://packages.typst.org/preview/lacy-ubc-math-project-0.1.0.tar.gz" +hash = "sha256-eapcN5p7yKXxYU9RNMM2DYFxVdb7ZdaLUY0r8UgBMxk=" +typstDeps = [ + "cetz_0_3_1", + "cetz-plot_0_1_0", + "equate_0_2_1", + "metro_0_3_0", + "mitex_0_2_4", + "physica_0_9_3", + "physica_0_9_4", + "showman_0_1_2", +] +description = "A UBC MATH 100 group project template" +license = [ + "MIT", +] +homepage = "https://github.com/lace-wing/lacy-ubc-math-project" + +[lambdabus."0.1.0"] +url = "https://packages.typst.org/preview/lambdabus-0.1.0.tar.gz" +hash = "sha256-+6YRgcUR930JrAkv27NSM5fEKw4jC84wBCQXNBgSGuY=" +typstDeps = [] +description = "Easily parse, normalize and display simple λ-Calculus expressions" +license = [ + "MIT", +] +homepage = "https://github.com/luca-schlecker/typst-lambdabus" + +[lasagna."0.1.0"] +url = "https://packages.typst.org/preview/lasagna-0.1.0.tar.gz" +hash = "sha256-5wp2UXpeMAJepsYriZ8i2gSaIBtiSGpfkGVlTVzTkBc=" +typstDeps = [] +description = "Add layers, toggle them using tags easily" +license = [ + "MIT", +] +homepage = "https://github.com/IsaacTay/lasagna.git" + +[lasaveur."0.1.4"] +url = "https://packages.typst.org/preview/lasaveur-0.1.4.tar.gz" +hash = "sha256-rtbnsArQc2OnD9R62s+dCO1QKQqbW3DepOkyZ+vvjLc=" +typstDeps = [] +description = "Porting vim-latex's math shorthands to Typst. An accommendating vim syntax file is provided in the repo" +license = [ + "MIT", +] +homepage = "https://github.com/yangwenbo99/typst-lasaveur" + +[lasaveur."0.1.3"] +url = "https://packages.typst.org/preview/lasaveur-0.1.3.tar.gz" +hash = "sha256-ckpw5mZ21zDRV67vZR8yccZXwLzxNbntzZZaPpQhLIs=" +typstDeps = [] +description = "Porting vim-latex's math shorthands to Typst. An accommendating vim syntax file is provided in the repo" +license = [ + "MIT", +] +homepage = "https://github.com/yangwenbo99/typst-lasaveur" + +[latedef."0.1.0"] +url = "https://packages.typst.org/preview/latedef-0.1.0.tar.gz" +hash = "sha256-L1+lMDnYxw6IE6Gu3IOe7AmjUG0eAW/2fQ3MOJIFfo0=" +typstDeps = [] +description = "Use now, define later" +license = [ + "MIT-0", +] +homepage = "https://codeberg.org/T0mstone/typst-latedef" + +[layout-ltd."0.1.0"] +url = "https://packages.typst.org/preview/layout-ltd-0.1.0.tar.gz" +hash = "sha256-opKfAj/Ax3WWsjqUE4li6EVESgY0I3bSGjnpk4MvRqU=" +typstDeps = [] +description = "Limit layout iterations for debugging" +license = [ + "MIT", +] +homepage = "https://github.com/davystrong/layout-ltd" + +[leipzig-glossing."0.5.0"] +url = "https://packages.typst.org/preview/leipzig-glossing-0.5.0.tar.gz" +hash = "sha256-75TQDdX3XFIkPIGPfCorpM/JuHb7JNSURgJh/KxtvGE=" +typstDeps = [] +description = "Linguistic interlinear glosses according to the Leipzig Glossing rules" +license = [ + "MIT", +] +homepage = "https://code.everydayimshuflin.com/greg/typst-lepizig-glossing" + +[leipzig-glossing."0.4.0"] +url = "https://packages.typst.org/preview/leipzig-glossing-0.4.0.tar.gz" +hash = "sha256-gr6aJELM5fX4+/tbwEZCyIIwh6k1h+feOQkjjPXT2P4=" +typstDeps = [] +description = "Linguistic interlinear glosses according to the Leipzig Glossing rules" +license = [ + "MIT", +] +homepage = "https://code.everydayimshuflin.com/greg/typst-lepizig-glossing" + +[leipzig-glossing."0.3.0"] +url = "https://packages.typst.org/preview/leipzig-glossing-0.3.0.tar.gz" +hash = "sha256-oVLJXOb1cDLVsmfO2TP1RSUXfudjNxDVOdWHTZUmkCU=" +typstDeps = [] +description = "Linguistic interlinear glosses according to the Leipzig Glossing rules" +license = [ + "MIT", +] +homepage = "https://code.everydayimshuflin.com/greg/typst-lepizig-glossing" + +[leipzig-glossing."0.2.0"] +url = "https://packages.typst.org/preview/leipzig-glossing-0.2.0.tar.gz" +hash = "sha256-QaE7iQkqLKia3/11jLz0W/e3qwcSqEOyxIIaoCm6sP0=" +typstDeps = [] +description = "Linguistic interlinear glosses according to the Leipzig Glossing rules" +license = [ + "MIT", +] +homepage = "https://code.everydayimshuflin.com/greg/typst-lepizig-glossing" + +[leipzig-glossing."0.1.0"] +url = "https://packages.typst.org/preview/leipzig-glossing-0.1.0.tar.gz" +hash = "sha256-7OuUs3oTmFKhhPJ9Byiil9K3MYfk4PtqEevEq2Z+LpY=" +typstDeps = [] +description = "Linguistic interlinear glosses according to the Leipzig Glossing rules" +license = [ + "MIT", +] +homepage = "https://code.everydayimshuflin.com/greg/typst-lepizig-glossing" + +[lemmify."0.1.8"] +url = "https://packages.typst.org/preview/lemmify-0.1.8.tar.gz" +hash = "sha256-OUgZ657tLaEY0bGlN4RomRI7uh0WGXKDcAvgnxaDpNo=" +typstDeps = [] +description = "Theorem typesetting library" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[lemmify."0.1.7"] +url = "https://packages.typst.org/preview/lemmify-0.1.7.tar.gz" +hash = "sha256-wOOv1/zMELqct7xR9E8NhEkZrAUZjxrNpAmHC7GWpYk=" +typstDeps = [] +description = "Theorem typesetting library" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[lemmify."0.1.6"] +url = "https://packages.typst.org/preview/lemmify-0.1.6.tar.gz" +hash = "sha256-JTBSnexoFlfQtCT7l/WTpoUpea6qwSfjMwHCv48qf7k=" +typstDeps = [] +description = "Theorem typesetting library" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[lemmify."0.1.5"] +url = "https://packages.typst.org/preview/lemmify-0.1.5.tar.gz" +hash = "sha256-kXsxiXK4MtYns1oUeN1izlMIVi5e9x1YSTdOHZohLWI=" +typstDeps = [] +description = "Theorem typesetting library" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[lemmify."0.1.4"] +url = "https://packages.typst.org/preview/lemmify-0.1.4.tar.gz" +hash = "sha256-Yu0ZBUNt62NgWnusc1LMnvPG5im6xTGOGPrYokki73A=" +typstDeps = [] +description = "Theorem typesetting library" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[lemmify."0.1.3"] +url = "https://packages.typst.org/preview/lemmify-0.1.3.tar.gz" +hash = "sha256-WSqyHg2GmReHNpEKgT0pcNPlrPZLp/zSmAMm5CkdIg4=" +typstDeps = [] +description = "Theorem typesetting library" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[lemmify."0.1.2"] +url = "https://packages.typst.org/preview/lemmify-0.1.2.tar.gz" +hash = "sha256-l4ZV/LDvF50le6jfxePLNCzrwalMEhgtV1u5cKy0Klo=" +typstDeps = [] +description = "Theorem typesetting library" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[lemmify."0.1.1"] +url = "https://packages.typst.org/preview/lemmify-0.1.1.tar.gz" +hash = "sha256-AjWCj40qq0jEMe39R6bZFlWB2A37Tm1dc+O2pRq392U=" +typstDeps = [] +description = "Theorem typesetting library" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[lemmify."0.1.0"] +url = "https://packages.typst.org/preview/lemmify-0.1.0.tar.gz" +hash = "sha256-rC6ggMrQsfLEze25gAzZn3/wWa1o3HeVcAypw4+Yql8=" +typstDeps = [] +description = "A library for typesetting mathematical theorems" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/Marmare314/lemmify" + +[letter-pro."3.0.0"] +url = "https://packages.typst.org/preview/letter-pro-3.0.0.tar.gz" +hash = "sha256-Ow22loLjb/wiiB3iSmdZirbtfDR2XIveWgFcnWctBtI=" +typstDeps = [] +description = "DIN 5008 letter template for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Sematre/typst-letter-pro" + +[letter-pro."2.1.0"] +url = "https://packages.typst.org/preview/letter-pro-2.1.0.tar.gz" +hash = "sha256-kCPmuAZ7dwY1dsbpegyNS0cOjuIpV2DfFHSKBxi0SAE=" +typstDeps = [] +description = "DIN 5008 letter template for Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Sematre/typst-letter-pro" + +[light-cv."0.2.0"] +url = "https://packages.typst.org/preview/light-cv-0.2.0.tar.gz" +hash = "sha256-GYYEH6YzC+yWoItv6om5HruDMqe1DbhiCYQ65bV6VDc=" +typstDeps = [ + "fontawesome_0_5_0", +] +description = "Minimalistic CV template for your own CV. Please install the font awesome fonts on your system before using the template" +license = [ + "MIT", +] +homepage = "https://github.com/AnsgarLichter/cv-typst-template" + +[light-cv."0.1.1"] +url = "https://packages.typst.org/preview/light-cv-0.1.1.tar.gz" +hash = "sha256-Qou5K4e9AY9a8zPtTXZWvOmzdc8kpSnKhnvjSIBbSZg=" +typstDeps = [ + "fontawesome_0_1_0", + "light-cv_0_1_0", +] +description = "Minimalistic CV template for your own CV. Please install the font awesome fonts on your system before using the template" +license = [ + "MIT", +] +homepage = "https://github.com/AnsgarLichter/cv-typst-template" + +[light-cv."0.1.0"] +url = "https://packages.typst.org/preview/light-cv-0.1.0.tar.gz" +hash = "sha256-VErt6vjrvKCZ9ULxVwB8LQVfmO/gYB798nkklGXTcvA=" +typstDeps = [ + "fontawesome_0_1_0", +] +description = "Minimalistic CV template for your own CV. Please install the font awesome fonts on your system before using the template" +license = [ + "MIT", +] +homepage = "https://github.com/AnsgarLichter/cv-typst-template" + +[light-report-uia."0.1.0"] +url = "https://packages.typst.org/preview/light-report-uia-0.1.0.tar.gz" +hash = "sha256-7cu9FpnqoZZjtAkQlt0IGSdndnifRGTaPCSzf/60v7k=" +typstDeps = [ + "codly_1_0_0", +] +description = "Template for reports at the University of Agder" +license = [ + "MIT", +] +homepage = "https://github.com/sebastos1/light-report-uia" + +[lilaq."0.2.0"] +url = "https://packages.typst.org/preview/lilaq-0.2.0.tar.gz" +hash = "sha256-0wYB8LeODvJ6/ueItWAPP2D8i8ifFfpk7oR6Vp7rrWw=" +typstDeps = [ + "tiptoe_0_3_0", + "zero_0_3_3", +] +description = "Scientific data visualization" +license = [ + "MIT", +] +homepage = "https://github.com/lilaq-project/lilaq" + +[lilaq."0.1.0"] +url = "https://packages.typst.org/preview/lilaq-0.1.0.tar.gz" +hash = "sha256-y7GeVOIdEaOLEvSCJF1K028iRcR6kTmTlaWnsGx9Vw0=" +typstDeps = [ + "tiptoe_0_3_0", + "zero_0_3_3", +] +description = "Data visualization" +license = [ + "MIT", +] +homepage = "https://github.com/lilaq-project/lilaq" + +[lineal."0.1.0"] +url = "https://packages.typst.org/preview/lineal-0.1.0.tar.gz" +hash = "sha256-ZO+OooKSfnEmUKFyPykhd6Trpkn1m9CcwzSqcs0586Q=" +typstDeps = [ + "touying_0_5_3", +] +description = "Build elegent slide decks with Typst" +license = [ + "MIT", +] +homepage = "https://github.com/ellsphillips/lineal" + +[linguify."0.4.2"] +url = "https://packages.typst.org/preview/linguify-0.4.2.tar.gz" +hash = "sha256-ZwDpQZT19wqo2nrhIHaMHZPTyHam3/BhMlsYuPLR8a0=" +typstDeps = [] +description = "Load strings for different languages easily" +license = [ + "MIT", +] +homepage = "https://github.com/typst-community/linguify" + +[linguify."0.4.1"] +url = "https://packages.typst.org/preview/linguify-0.4.1.tar.gz" +hash = "sha256-OymscdQwJpTjaqyKEqJ5GyFrmSMmTwvPhnpfPE8XRWU=" +typstDeps = [] +description = "Load strings for different languages easily" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-linguify" + +[linguify."0.4.0"] +url = "https://packages.typst.org/preview/linguify-0.4.0.tar.gz" +hash = "sha256-3zEqzFbcXYYhUDLxvcqtpQsO7SbCCyu5CbhqP2Ew1W0=" +typstDeps = [] +description = "Load strings for different languages easily" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-linguify" + +[linguify."0.3.1"] +url = "https://packages.typst.org/preview/linguify-0.3.1.tar.gz" +hash = "sha256-7nmJn4vnG5BreqIrnWHKF9peAaSCHhuejVdXrgrdmKg=" +typstDeps = [] +description = "Load strings for different languages easily" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-linguify" + +[linguify."0.3.0"] +url = "https://packages.typst.org/preview/linguify-0.3.0.tar.gz" +hash = "sha256-zz0kirV1jWXcoX1Yv4Vk+16jDo5Cqqx7xvoyUlcbwBw=" +typstDeps = [] +description = "Load strings for different languages easily" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-linguify" + +[linguify."0.2.0"] +url = "https://packages.typst.org/preview/linguify-0.2.0.tar.gz" +hash = "sha256-3wf1ohs/an6QcwIDSi4qM0slu3O2cV6PuE/uxzTbI7s=" +typstDeps = [] +description = "Load strings for different languages easily" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-linguify" + +[linguify."0.1.0"] +url = "https://packages.typst.org/preview/linguify-0.1.0.tar.gz" +hash = "sha256-gBO7A5cArtcj7CFHJswykXBYEN5ZnSNc5gW9MsBwpE8=" +typstDeps = [] +description = "Load strings for different languages easily" +license = [ + "MIT", +] +homepage = "https://github.com/jomaway/typst-linguify" + +[linkst."0.1.0"] +url = "https://packages.typst.org/preview/linkst-0.1.0.tar.gz" +hash = "sha256-LVklnr/CcjK5TrZUlyWN8ovLsu33Oqn9RFhsn8X+DsE=" +typstDeps = [ + "cetz_0_3_3", +] +description = "A knot drawing package for knot theory" +license = [ + "MIT-0", +] + +[lovelace."0.3.0"] +url = "https://packages.typst.org/preview/lovelace-0.3.0.tar.gz" +hash = "sha256-thSCDGxcTfykwUYjUsxBC7Xnei6dXiGybA8wyUoqKjo=" +typstDeps = [] +description = "Algorithms in pseudocode, unopinionated and flexible" +license = [ + "MIT", +] +homepage = "https://github.com/andreasKroepelin/lovelace" + +[lovelace."0.2.0"] +url = "https://packages.typst.org/preview/lovelace-0.2.0.tar.gz" +hash = "sha256-FzsdguyMAGm+wTragSODfEd+S/+7WLaXJbpZW2rlkuw=" +typstDeps = [] +description = "Algorithms in pseudocode, unopinionated and flexible" +license = [ + "MIT", +] +homepage = "https://github.com/andreasKroepelin/lovelace" + +[lovelace."0.1.0"] +url = "https://packages.typst.org/preview/lovelace-0.1.0.tar.gz" +hash = "sha256-gN5Emx9/sl/ols4tQoiBLEjpVvI6oOaJmx5ehYZqhIM=" +typstDeps = [] +description = "Algorithms in pseudocode, unopinionated and flexible" +license = [ + "MIT", +] +homepage = "https://github.com/andreasKroepelin/lovelace" + +[lucky-icml."0.7.0"] +url = "https://packages.typst.org/preview/lucky-icml-0.7.0.tar.gz" +hash = "sha256-r9+WcDaDrRc1RozrwLFWbh8m7W0lXSn7Bsh2K0RM2FI=" +typstDeps = [ + "algorithmic_0_1_0", + "lemmify_0_1_7", +] +description = "ICML-style paper template to publish at conferences for International Conference on Machine Learning" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[lucky-icml."0.2.1"] +url = "https://packages.typst.org/preview/lucky-icml-0.2.1.tar.gz" +hash = "sha256-Dts44RoNPmKnA+/ZkEgy2Snjtrq4Gy9hPLRkiFJCIN4=" +typstDeps = [ + "algorithmic_0_1_0", + "tablex_0_0_7", +] +description = "ICML-style paper template to publish at conferences for International Conference on Machine Learning" +license = [ + "MIT", +] +homepage = "https://github.com/daskol/typst-templates" + +[lyceum."0.1.0"] +url = "https://packages.typst.org/preview/lyceum-0.1.0.tar.gz" +hash = "sha256-R9YJpG9Qh3Wfrad9kSZKLOJXMScffGX7adVigIb0mKs=" +typstDeps = [] +description = "Academic book template in Typst" +license = [ + "MIT", +] + +[m-jaxon."0.1.1"] +url = "https://packages.typst.org/preview/m-jaxon-0.1.1.tar.gz" +hash = "sha256-ye2dPp64nLk+FOupkPEOwdN8u2x7C5lDsfx5NfmNtTc=" +typstDeps = [ + "jogs_0_2_2", +] +description = "Render LaTeX equation in typst using MathJax" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/m-jaxon" + +[m-jaxon."0.1.0"] +url = "https://packages.typst.org/preview/m-jaxon-0.1.0.tar.gz" +hash = "sha256-quqhnnEqvtMKhLCdyneh/iR1CLTlQdX35cB4JqcL42E=" +typstDeps = [ + "jogs_0_2_1", +] +description = "Render LaTeX equation in typst using MathJax" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/m-jaxon" + +[mannot."0.2.3"] +url = "https://packages.typst.org/preview/mannot-0.2.3.tar.gz" +hash = "sha256-FByqhbapg8hXEr2F+LsIz9chdNXLHoiOaotB6JxT+jE=" +typstDeps = [ + "codly_1_2_0", + "tidy_0_4_0", + "tidy_0_4_2", +] +description = "A package for marking and annotating in math blocks" +license = [ + "MIT", +] +homepage = "https://github.com/ryuryu-ymj/mannot" + +[mannot."0.2.2"] +url = "https://packages.typst.org/preview/mannot-0.2.2.tar.gz" +hash = "sha256-RyfrlOhE3KfyWYAp2PaGVRKKk/k+phT356aXP5/Tpvk=" +typstDeps = [ + "codly_1_0_0", + "tidy_0_4_0", +] +description = "A package for marking and annotating in math blocks" +license = [ + "MIT", +] +homepage = "https://github.com/ryuryu-ymj/mannot" + +[mannot."0.2.1"] +url = "https://packages.typst.org/preview/mannot-0.2.1.tar.gz" +hash = "sha256-iVErp+ntOVBt5giK3gVhki+jEEjmaK26pPovf3J+zhM=" +typstDeps = [ + "codly_1_0_0", + "tidy_0_4_0", +] +description = "A package for marking and annotating in math blocks" +license = [ + "MIT", +] +homepage = "https://github.com/ryuryu-ymj/mannot" + +[mannot."0.2.0"] +url = "https://packages.typst.org/preview/mannot-0.2.0.tar.gz" +hash = "sha256-haBmKWWU2Iu6YEqNwd2c4O3rBiRLtwoeEtTHFJ1zmkQ=" +typstDeps = [ + "codly_1_0_0", + "tidy_0_4_0", +] +description = "A package for marking and annotating in math blocks" +license = [ + "MIT", +] +homepage = "https://github.com/ryuryu-ymj/mannot" + +[mannot."0.1.0"] +url = "https://packages.typst.org/preview/mannot-0.1.0.tar.gz" +hash = "sha256-Ytxmf0SPplbWpVIfCH3FTX5v5x9Fd5W4IO77Iq+FrRU=" +typstDeps = [ + "codly_1_0_0", + "tidy_0_3_0", +] +description = "A package for highlighting and annotating in math blocks" +license = [ + "MIT", +] +homepage = "https://github.com/ryuryu-ymj/mannot" + +[mantys."1.0.1"] +url = "https://packages.typst.org/preview/mantys-1.0.1.tar.gz" +hash = "sha256-4JVg0Z8j/k4GPIPyGGmTll5CPRbwRriPu8jJyJQysYU=" +typstDeps = [ + "codly_1_2_0", + "fauxreilly_0_1_1", + "gentle-clues_1_0_0", + "hydra_0_5_2", + "marginalia_0_1_2", + "octique_0_1_0", + "showybox_2_0_4", + "swank-tex_0_1_0", + "tidy_0_4_0", + "tidy_0_4_1", + "typearea_0_2_0", + "valkyrie_0_2_2", +] +description = "Helpers to build manuals for Typst packages and templates" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-mantys" + +[mantys."1.0.0"] +url = "https://packages.typst.org/preview/mantys-1.0.0.tar.gz" +hash = "sha256-8YXZbaTJpuuemUghlSuL4qQm1D9jmdon0FW/M9Re9Rk=" +typstDeps = [ + "codly_1_2_0", + "fauxreilly_0_1_1", + "gentle-clues_1_0_0", + "hydra_0_5_2", + "marginalia_0_1_1", + "octique_0_1_0", + "showybox_2_0_3", + "swank-tex_0_1_0", + "tidy_0_4_0", + "typearea_0_2_0", + "valkyrie_0_2_1", +] +description = "Helpers to build manuals for Typst packages and templates" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-mantys" + +[mantys."0.1.4"] +url = "https://packages.typst.org/preview/mantys-0.1.4.tar.gz" +hash = "sha256-2tKfCDi0NIhJxV6YVZOU9Ur9UjDs7jPZV4IdFWcBSFQ=" +typstDeps = [ + "codelst_2_0_0", + "hydra_0_4_0", + "showybox_2_0_1", + "t4t_0_3_2", + "tidy_0_2_0", +] +description = "Helpers to build manuals for Typst packages" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-mantys" + +[mantys."0.1.3"] +url = "https://packages.typst.org/preview/mantys-0.1.3.tar.gz" +hash = "sha256-xcgod2RE4f7UrK/vd+5Eb8VktQcquXhnzJ+JpVBjaXw=" +typstDeps = [ + "codelst_2_0_0", + "hydra_0_4_0", + "showybox_2_0_1", + "t4t_0_3_2", + "tidy_0_2_0", +] +description = "Helpers to build manuals for Typst packages" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-mantys" + +[mantys."0.1.1"] +url = "https://packages.typst.org/preview/mantys-0.1.1.tar.gz" +hash = "sha256-yt2eaewS/7SO4+wxkunhwiBkcnv1MBHYaDONBashZ7w=" +typstDeps = [ + "codelst_2_0_0", + "showybox_2_0_1", + "t4t_0_3_2", + "tidy_0_2_0", +] +description = "Helpers to build manuals for Typst packages" +license = [ + "MIT", +] +homepage = "https://github.com/jneug/typst-mantys" + +[manuscr-ismin."0.1.0"] +url = "https://packages.typst.org/preview/manuscr-ismin-0.1.0.tar.gz" +hash = "sha256-vHCxn7msNu6AsmaozKRrzdNCh/CnQEKiqdnpZZYKCEY=" +typstDeps = [] +description = "Template used for writing reports and/or various documents at the École des Mines de Saint-Étienne" +license = [ + "MIT", +] +homepage = "https://github.com/senaalem/ISMIN_reports_template" + +[marge."0.1.0"] +url = "https://packages.typst.org/preview/marge-0.1.0.tar.gz" +hash = "sha256-Vasq7cVjsSXn4xoqTN0gly+i5bZZV6bxOAjFVqkaQ2E=" +typstDeps = [] +description = "Easy-to-use but powerful and smart margin notes" +license = [ + "MIT", +] +homepage = "https://github.com/EpicEricEE/typst-marge" + +[marginalia."0.1.3"] +url = "https://packages.typst.org/preview/marginalia-0.1.3.tar.gz" +hash = "sha256-c93UkMnYriR+vakF2O2r+yy1NtH6yAQAk1x/1KQER1g=" +typstDeps = [] +description = "Configurable margin-notes and matching wide blocks" +license = [ + "Unlicense", +] +homepage = "https://github.com/nleanba/typst-marginalia" + +[marginalia."0.1.2"] +url = "https://packages.typst.org/preview/marginalia-0.1.2.tar.gz" +hash = "sha256-+8n5x7MLJlh9coSGMSszW4VfkLNtZcklqdxkX+4pfxU=" +typstDeps = [] +description = "Configurable margin-notes and matching wide blocks" +license = [ + "Unlicense", +] +homepage = "https://github.com/nleanba/typst-marginalia" + +[marginalia."0.1.1"] +url = "https://packages.typst.org/preview/marginalia-0.1.1.tar.gz" +hash = "sha256-9rQcC/u7b7VZ3kC4wjjwVeLF4/vWRmx0otWESJHwzbU=" +typstDeps = [] +description = "Configurable margin-notes and matching wide blocks" +license = [ + "Unlicense", +] +homepage = "https://github.com/nleanba/typst-marginalia" + +[marginalia."0.1.0"] +url = "https://packages.typst.org/preview/marginalia-0.1.0.tar.gz" +hash = "sha256-EsJHC3tDmx4mAtaV8ig+a2erb6avq0EPnEtog4p7Erk=" +typstDeps = [] +description = "Configurable margin-notes and matching wide blocks" +license = [ + "Unlicense", +] +homepage = "https://github.com/nleanba/typst-marginalia" + +[markly."0.3.0"] +url = "https://packages.typst.org/preview/markly-0.3.0.tar.gz" +hash = "sha256-tOTkwsozXxUaOPFWUhiMjltd6yNjMaJskdb869AJjdU=" +typstDeps = [ + "cetz_0_3_3", +] +description = "Typst package for bleed, cut and registration marks" +license = [ + "MIT", +] +homepage = "https://github.com/cskeeters/typst-markly" + +[markly."0.2.0"] +url = "https://packages.typst.org/preview/markly-0.2.0.tar.gz" +hash = "sha256-mZ3ROvJSXt5cvU9JcoHyuGoTqGfL5IE0ahqN+YD+iC8=" +typstDeps = [ + "cetz_0_3_1", +] +description = "Typst package for bleed, cut and registration marks" +license = [ + "MIT", +] +homepage = "https://github.com/cskeeters/typst-markly" + +[matset."0.1.0"] +url = "https://packages.typst.org/preview/matset-0.1.0.tar.gz" +hash = "sha256-PXzwRXLAH98V2L6TR/Y+9UZRgXxs4vKgXm1ciYZ7UCM=" +typstDeps = [] +description = "An ergonomic expression evaluator in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/OptimisticPeach/matset" + +[mcm-scaffold."0.2.0"] +url = "https://packages.typst.org/preview/mcm-scaffold-0.2.0.tar.gz" +hash = "sha256-4KSCC7XlZi9eJGm71Ui+dxDFKqkIcl1QYt0CfGXxSgg=" +typstDeps = [ + "mitex_0_2_5", +] +description = "A Typst template for COMAP's Mathematical Contest in MCM/ICM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/sxdl/MCM-Typst-template" + +[mcm-scaffold."0.1.0"] +url = "https://packages.typst.org/preview/mcm-scaffold-0.1.0.tar.gz" +hash = "sha256-9vB07x85EnOPFB1JKBiloo4MuSJxxHHdyUFdwACvifk=" +typstDeps = [ + "mitex_0_2_2", +] +description = "A Typst template for COMAP's Mathematical Contest in MCM/ICM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/sxdl/MCM-Typst-template" + +[mephistypsteles."0.3.0"] +url = "https://packages.typst.org/preview/mephistypsteles-0.3.0.tar.gz" +hash = "sha256-/XWM4SMGT+ZUAEb0QCNxNp8JkHqGInjwY3/zXWrQkls=" +typstDeps = [] +description = "The devil's reflection, using typst in typst" +license = [ + "MIT-0", +] +homepage = "https://codeberg.org/T0mstone/mephistypsteles" + +[mephistypsteles."0.2.0"] +url = "https://packages.typst.org/preview/mephistypsteles-0.2.0.tar.gz" +hash = "sha256-/hSShsjHrPIH+XqXDpAZvXXRr6bc7eBWWP9LttWzb18=" +typstDeps = [] +description = "The devil's reflection, using typst in typst" +license = [ + "MIT-0", +] +homepage = "https://codeberg.org/T0mstone/mephistypsteles" + +[mephistypsteles."0.1.0"] +url = "https://packages.typst.org/preview/mephistypsteles-0.1.0.tar.gz" +hash = "sha256-vwiyuUYAZInRyHUljVUZCZl4fTP2H/41zE3S5m5dmOM=" +typstDeps = [] +description = "The devil's reflection, using typst in typst" +license = [ + "MIT-0", +] +homepage = "https://codeberg.org/T0mstone/mephistypsteles" + +[meppp."0.2.1"] +url = "https://packages.typst.org/preview/meppp-0.2.1.tar.gz" +hash = "sha256-tvLTyqXGm9S51yXFuHglYjZc2c4CYsW5CA3qv95pnFI=" +typstDeps = [ + "cuti_0_2_1", +] +description = "Template for modern physics experiment reports at the Physics School of PKU" +license = [ + "MIT", +] +homepage = "https://github.com/pku-typst/meppp" + +[meppp."0.2.0"] +url = "https://packages.typst.org/preview/meppp-0.2.0.tar.gz" +hash = "sha256-OveaoE6hQeb/tgY9YF6yUTSREjPZ5LoEcEjrgYxKmy4=" +typstDeps = [] +description = "Template for modern physics experiment reports at the Physics School of PKU" +license = [ + "MIT", +] +homepage = "https://github.com/pku-typst/meppp" + +[meppp."0.1.0"] +url = "https://packages.typst.org/preview/meppp-0.1.0.tar.gz" +hash = "sha256-VLGPT6B5rNf6LX05TppT+ewTbRT6E6wh58LsJcrxHFY=" +typstDeps = [] +description = "Template for modern physics experiment reports at the Physics School of PKU" +license = [ + "MIT", +] +homepage = "https://github.com/CL4R3T/meppp" + +[metalogo."1.2.0"] +url = "https://packages.typst.org/preview/metalogo-1.2.0.tar.gz" +hash = "sha256-BY9rUnWqGp2LvKOscA8DIYSuLuBb4zDwgd/rpe/jIFs=" +typstDeps = [] +description = "Typeset various LaTeX compiler logos" +license = [ + "MIT", +] +homepage = "https://github.com/lonkaars/typst-metalogo" + +[metalogo."1.1.0"] +url = "https://packages.typst.org/preview/metalogo-1.1.0.tar.gz" +hash = "sha256-sQgXAzowpv9VGDq9FFl9fjSESyyRnkij2d5bjSEUzoU=" +typstDeps = [] +description = "Typeset various LaTeX logos" +license = [ + "MIT", +] +homepage = "https://github.com/lonkaars/typst-metalogo.git" + +[metalogo."1.0.2"] +url = "https://packages.typst.org/preview/metalogo-1.0.2.tar.gz" +hash = "sha256-4RF3uGrWbYpZGMStKPiTMPWkhrELMdo0WZos2DEEyUI=" +typstDeps = [] +description = "Typeset various LaTeX logos" +license = [ + "MIT", +] +homepage = "https://github.com/lonkaars/typst-metalogo.git" + +[metro."0.3.0"] +url = "https://packages.typst.org/preview/metro-0.3.0.tar.gz" +hash = "sha256-95MU3Zb9EL7sebXn9ddiemKnmu9iO7J9SgX5S5inrGg=" +typstDeps = [ + "oxifmt_0_2_0", + "t4t_0_3_2", +] +description = "Typset units and numbers with options" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/fenjalien/metro" + +[metro."0.2.0"] +url = "https://packages.typst.org/preview/metro-0.2.0.tar.gz" +hash = "sha256-HA6QHYRiWnwxEu1/rb7aqq1n05uZ+axAxuZPhDEmw0w=" +typstDeps = [ + "t4t_0_3_2", +] +description = "Typset units and numbers with options" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/fenjalien/metro" + +[metro."0.1.1"] +url = "https://packages.typst.org/preview/metro-0.1.1.tar.gz" +hash = "sha256-N2e6BRt1Tql6gyosr+w25T41sj55Xp0mvBqnMoVzvSY=" +typstDeps = [ + "t4t_0_2_0", + "t4t_0_3_2", +] +description = "Typset units and numbers with options" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/fenjalien/metro" + +[metro."0.1.0"] +url = "https://packages.typst.org/preview/metro-0.1.0.tar.gz" +hash = "sha256-RHu2RMnAUARKzCgkr8jbEC7/lKiqwR2/lAYveW5CXBg=" +typstDeps = [ + "t4t_0_2_0", +] +description = "Typset units and numbers with options" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/fenjalien/metro" + +[metronic."1.1.0"] +url = "https://packages.typst.org/preview/metronic-1.1.0.tar.gz" +hash = "sha256-rgHjw+wDHWFIb0NqVfmcOO+yXDlpgjiduR4U3KTbNDw=" +typstDeps = [ + "fontawesome_0_5_0", +] +description = "A clean, colorful, and modern CV template" +license = [ + "MIT", +] +homepage = "https://github.com/patrixr/metronic-cv" + +[metronic."1.0.0"] +url = "https://packages.typst.org/preview/metronic-1.0.0.tar.gz" +hash = "sha256-MuIZr+GV9ysLA5djgHa6XYSST4XIj9wosSiwDheCSqU=" +typstDeps = [ + "fontawesome_0_5_0", +] +description = "A clean, colorful, and modern CV template" +license = [ + "MIT", +] +homepage = "https://github.com/patrixr/metronic-cv" + +[metropolis-polylux."0.1.0"] +url = "https://packages.typst.org/preview/metropolis-polylux-0.1.0.tar.gz" +hash = "sha256-2e/etvchGyyih2CsOwBBeQYxe6Ak/H3o25k6wApEMWg=" +typstDeps = [ + "polylux_0_4_0", +] +description = "Metropolis style template for Polylux" +license = [ + "MIT", +] +homepage = "https://github.com/polylux-typ/metropolis" + +[miage-rapide-tp."0.1.2"] +url = "https://packages.typst.org/preview/miage-rapide-tp-0.1.2.tar.gz" +hash = "sha256-WmlEiIIg1THwzgDk3xcXEAIBd+ZTZYpb5fWT8kgQ35Q=" +typstDeps = [] +description = "Quickly generate a report for MIAGE practical work" +license = [ + "MIT-0", +] + +[miage-rapide-tp."0.1.1"] +url = "https://packages.typst.org/preview/miage-rapide-tp-0.1.1.tar.gz" +hash = "sha256-WLk2i1xOMnk/3dUBGamesMAbbStN9hQ/y7pSfEB5YMI=" +typstDeps = [] +description = "A template to quickly generate a report for MIAGE practical work" +license = [ + "MIT-0", +] + +[miage-rapide-tp."0.1.0"] +url = "https://packages.typst.org/preview/miage-rapide-tp-0.1.0.tar.gz" +hash = "sha256-iqnNBYwHnzpSf7PotKngB8t3PPxSKol4RhZKL2X4EfY=" +typstDeps = [] +description = "A template to quickly generate a report for MIAGE practical work" +license = [ + "MIT-0", +] + +[min-article."0.1.0"] +url = "https://packages.typst.org/preview/min-article-0.1.0.tar.gz" +hash = "sha256-vjjyAb39oC44sHWT3lBVw8G+V/cEaaaxSXssBYJeQmo=" +typstDeps = [ + "linguify_0_4_0", +] +description = "Simple and easy way to write ABNT-compliant articles" +license = [ + "MIT-0", +] +homepage = "https://github.com/mayconfmelo/min-article" + +[min-book."0.1.0"] +url = "https://packages.typst.org/preview/min-book-0.1.0.tar.gz" +hash = "sha256-pBfBF7HPoSj4k0fxv4FA0tA3jRiaKnGr5Bzy+BDxcJw=" +typstDeps = [ + "numbly_0_1_0", +] +description = "Simple and complete books without introducing new syntax" +license = [ + "MIT-0", +] +homepage = "https://github.com/mayconfmelo/min-book" + +[min-manual."0.1.0"] +url = "https://packages.typst.org/preview/min-manual-0.1.0.tar.gz" +hash = "sha256-jqwfu2iOgnoHPO3zvw8b/qo4Zq+dhoWcqFl0ljLoQg8=" +typstDeps = [ + "pkg-name_0_4_2", +] +description = "Simple and sober manuals inspired by the OG Linux manpages" +license = [ + "MIT-0", +] +homepage = "https://github.com/mayconfmelo/min-manual" + +[min-resume."0.1.0"] +url = "https://packages.typst.org/preview/min-resume-0.1.0.tar.gz" +hash = "sha256-mOtLc/qkZ/FoV4sFudhOOKMBxxxROWOeLYJGyeqYIkY=" +typstDeps = [ + "linguify_0_4_2", +] +description = "Simple and professional résumé for professional people" +license = [ + "MIT-0", +] +homepage = "https://github.com/mayconfmelo/min-resume" + +[minerva-report-fcfm."0.2.2"] +url = "https://packages.typst.org/preview/minerva-report-fcfm-0.2.2.tar.gz" +hash = "sha256-HK/jzmCXp6i6+Iy/7RfCrKPWp6J1NTb59oLi11SJmfw=" +typstDeps = [] +description = "Template de artículos, informes y tareas para la Facultad de Ciencias Físicas y Matemáticas (FCFM" +license = [ + "MIT-0", +] +homepage = "https://github.com/Dav1com/minerva-report-fcfm" + +[minerva-report-fcfm."0.2.1"] +url = "https://packages.typst.org/preview/minerva-report-fcfm-0.2.1.tar.gz" +hash = "sha256-+eKKL9iQ3Gw160T7qsQh75QB8iGbE8jYCAnnGU518zQ=" +typstDeps = [] +description = "Template de artículos, informes y tareas para la Facultad de Ciencias Físicas y Matemáticas (FCFM" +license = [ + "MIT-0", +] +homepage = "https://github.com/Dav1com/minerva-report-fcfm" + +[minerva-report-fcfm."0.2.0"] +url = "https://packages.typst.org/preview/minerva-report-fcfm-0.2.0.tar.gz" +hash = "sha256-AS6L5ynVGu6DdM2uEVMJhBYeQsn5WlpEW3PAbuL859Y=" +typstDeps = [ + "minerva-report-fcfm_0_1_0", +] +description = "Template de artículos, informes y tareas para la Facultad de Ciencias Físicas y Matemáticas (FCFM" +license = [ + "MIT-0", +] +homepage = "https://github.com/Dav1com/minerva-report-fcfm" + +[minerva-report-fcfm."0.1.0"] +url = "https://packages.typst.org/preview/minerva-report-fcfm-0.1.0.tar.gz" +hash = "sha256-l0Zf7A0wIRh2VdsEsDYBZAQSjIXaTK3/vuX6H/2zfpA=" +typstDeps = [] +description = "Template para crear artículos, informes y tareas para la Facultad de Ciencias Físicas y Matemáticas (FCFM), pero puede ser personalizado para cualquier universidad" +license = [ + "MIT-0", +] +homepage = "https://github.com/Dav1com/minerva-report-fcfm" + +[minideck."0.2.1"] +url = "https://packages.typst.org/preview/minideck-0.2.1.tar.gz" +hash = "sha256-UuH/zXlYpibGZaQgpiifTmmA/8swJ+OUAlgWkBghsYk=" +typstDeps = [ + "cetz_0_2_2", + "fletcher_0_5_0", + "pinit_0_1_4", +] +description = "Simple dynamic slides" +license = [ + "MIT", +] +homepage = "https://github.com/knuesel/typst-minideck" + +[minienvs."0.1.0"] +url = "https://packages.typst.org/preview/minienvs-0.1.0.tar.gz" +hash = "sha256-LN2bZyrDUJk+cYvaYDnp2cqvePZgZ79hTpcXlTUB04g=" +typstDeps = [] +description = "Theorem environments with minimal fuss" +license = [ + "MIT", +] + +[minimal-cv."0.1.0"] +url = "https://packages.typst.org/preview/minimal-cv-0.1.0.tar.gz" +hash = "sha256-YQrVb43sOKaG3kgNma2GVYT+xA5pmPlIfbrkAu/wtSA=" +typstDeps = [] +description = "A clean and customizable CV template" +license = [ + "MIT", +] +homepage = "https://github.com/lelimacon/typst-minimal-cv" + +[minimal-presentation."0.6.0"] +url = "https://packages.typst.org/preview/minimal-presentation-0.6.0.tar.gz" +hash = "sha256-OqITcVSkhql4T3oVctyE36f5Tm3eZ6JtrVYAYjvRl7M=" +typstDeps = [] +description = "A modern minimalistic presentation template ready to use" +license = [ + "MIT-0", +] +homepage = "https://github.com/flavio20002/typst-presentation-minimal-template" + +[minimal-presentation."0.5.0"] +url = "https://packages.typst.org/preview/minimal-presentation-0.5.0.tar.gz" +hash = "sha256-QbsFtdy+XKqyziFAZM+vJABItdTh2YD8X2UKNtbeqqw=" +typstDeps = [] +description = "A modern minimalistic presentation template ready to use" +license = [ + "MIT-0", +] +homepage = "https://github.com/flavio20002/typst-presentation-minimal-template" + +[minimal-presentation."0.4.0"] +url = "https://packages.typst.org/preview/minimal-presentation-0.4.0.tar.gz" +hash = "sha256-09AsVkZKpQJOjI0QcJvCp/pb6kjWfoBgfOMRUS4ARac=" +typstDeps = [] +description = "A modern minimalistic presentation template ready to use" +license = [ + "MIT-0", +] +homepage = "https://github.com/flavio20002/typst-presentation-minimal-template" + +[minimal-presentation."0.3.0"] +url = "https://packages.typst.org/preview/minimal-presentation-0.3.0.tar.gz" +hash = "sha256-XJILcfNHpFKubfFj5fPYRKR/+0L479x9VJuSBCS7TVA=" +typstDeps = [] +description = "A modern minimalistic presentation template ready to use" +license = [ + "MIT-0", +] +homepage = "https://github.com/flavio20002/typst-presentation-minimal-template" + +[minimal-presentation."0.2.0"] +url = "https://packages.typst.org/preview/minimal-presentation-0.2.0.tar.gz" +hash = "sha256-ANO8P8da2Vw67ehN+Hh+LpKSOu+eK+S94oYbivgydmQ=" +typstDeps = [] +description = "A modern minimalistic presentation template ready to use" +license = [ + "MIT-0", +] +homepage = "https://github.com/flavio20002/typst-presentation-minimal-template" + +[minimal-presentation."0.1.0"] +url = "https://packages.typst.org/preview/minimal-presentation-0.1.0.tar.gz" +hash = "sha256-MD0/ukxUD65zNk4C2/RXyKqHRCSmJRxKGyx2phGnNiE=" +typstDeps = [] +description = "A modern minimalistic presentation template ready to use" +license = [ + "MIT-0", +] +homepage = "https://github.com/flavio20002/typst-presentation-minimal-template" + +[minimal-thesis-luebeck."0.3.0"] +url = "https://packages.typst.org/preview/minimal-thesis-luebeck-0.3.0.tar.gz" +hash = "sha256-wnkoejwmSwl2Xy+Lca3QHOL9ng6vZ7sCoQ/T/obZRw8=" +typstDeps = [ + "abbr_0_2_1", +] +description = "A minimalistic template for writing a thesis" +license = [ + "MIT", +] +homepage = "https://github.com/fhemstra/minimal-thesis-luebeck" + +[minimal-thesis-luebeck."0.2.0"] +url = "https://packages.typst.org/preview/minimal-thesis-luebeck-0.2.0.tar.gz" +hash = "sha256-/FtKpzaAFft0PJehThEVSL665p+QWgE4CxZlN0HdjjI=" +typstDeps = [ + "abbr_0_1_1", +] +description = "A minimalistic template for writing a thesis" +license = [ + "MIT", +] +homepage = "https://github.com/fhemstra/minimal-thesis-luebeck" + +[minimal-thesis-luebeck."0.1.0"] +url = "https://packages.typst.org/preview/minimal-thesis-luebeck-0.1.0.tar.gz" +hash = "sha256-8wgdLxDtP2ZeWTRAvJQehADf35vPplC2MP34o5SJ/oc=" +typstDeps = [ + "abbr_0_1_1", +] +description = "A minimalistic template for writing a thesis" +license = [ + "MIT", +] + +[minimalbc."0.0.1"] +url = "https://packages.typst.org/preview/minimalbc-0.0.1.tar.gz" +hash = "sha256-JN6jgcnII6jPACdceOqtpnb9kx43fkyLK7Z21PmwvPg=" +typstDeps = [] +description = "Sleek, minimalist design for professional business cards. Emphasizing clarity and elegance" +license = [ + "MIT", +] +homepage = "https://github.com/sevehub/minimalbc" + +[minimalistic-latex-cv."0.1.1"] +url = "https://packages.typst.org/preview/minimalistic-latex-cv-0.1.1.tar.gz" +hash = "sha256-pvfADpumtC5wx/O70rT4TfOEsEQssL/uXEOsOLdhAzU=" +typstDeps = [] +description = "A minimalistic LaTeX-style CV template for professionals" +license = [ + "MIT-0", +] + +[minimalistic-latex-cv."0.1.0"] +url = "https://packages.typst.org/preview/minimalistic-latex-cv-0.1.0.tar.gz" +hash = "sha256-q1iqeCHDLdya8h9MDxFns03LyidWL2GLoLsRvdCLyfs=" +typstDeps = [] +description = "A minimalistic LaTeX-style CV template for professionals" +license = [ + "MIT-0", +] + +[minitoc."0.1.0"] +url = "https://packages.typst.org/preview/minitoc-0.1.0.tar.gz" +hash = "sha256-4VtBpY3MKbWtGZIkKnbPVm17ChcV53/MgIj+AkZ/X6I=" +typstDeps = [] +description = "An outline function just for one section and nothing else" +license = [ + "GPL-3.0-only", +] +homepage = "https://gitlab.com/human_person/typst-local-outline" + +[mino."0.1.2"] +url = "https://packages.typst.org/preview/mino-0.1.2.tar.gz" +hash = "sha256-6RODyq64Bvkl7AXQju2pL4A3Nq/NbO8VfZs9szuJJtM=" +typstDeps = [ + "jogs_0_2_3", +] +description = "Render tetris fumen in typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/mino" + +[mino."0.1.1"] +url = "https://packages.typst.org/preview/mino-0.1.1.tar.gz" +hash = "sha256-cl4dktVerwNhAgochCpXeOmNMNI0FERrzNiTtNGWBLs=" +typstDeps = [ + "jogs_0_2_1", +] +description = "Render tetris fumen in typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/mino" + +[mino."0.1.0"] +url = "https://packages.typst.org/preview/mino-0.1.0.tar.gz" +hash = "sha256-OwlYBdaeQzDAgr82l+AiOI4Fz9HWeG+NJ4yt7fn+oxg=" +typstDeps = [ + "jogs_0_2_1", +] +description = "Render tetris fumen in typst" +license = [ + "MIT", +] +homepage = "https://github.com/Enter-tainer/mino" + +[mitex."0.2.5"] +url = "https://packages.typst.org/preview/mitex-0.2.5.tar.gz" +hash = "sha256-kvVQT22lWFLxlfXwWC9wWgZXVJMJEf63Uuzri0/NnqY=" +typstDeps = [] +description = "LaTeX support for Typst, powered by Rust and WASM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mitex-rs/mitex" + +[mitex."0.2.4"] +url = "https://packages.typst.org/preview/mitex-0.2.4.tar.gz" +hash = "sha256-4NGNciNJQaMhE6AQneKqDzeh16jT2uxORCWEUuN4Lvc=" +typstDeps = [ + "xarrow_0_2_0", +] +description = "LaTeX support for Typst, powered by Rust and WASM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mitex-rs/mitex" + +[mitex."0.2.3"] +url = "https://packages.typst.org/preview/mitex-0.2.3.tar.gz" +hash = "sha256-ThPfdRH6cCkoMR58JQYOANTY4axtOIWhDh+OV+xKPO4=" +typstDeps = [ + "xarrow_0_2_0", +] +description = "LaTeX support for Typst, powered by Rust and WASM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mitex-rs/mitex" + +[mitex."0.2.2"] +url = "https://packages.typst.org/preview/mitex-0.2.2.tar.gz" +hash = "sha256-zCzfz3iS5Zko31QrI1Hd1qLBGETg2dgVwd4LHDq5njQ=" +typstDeps = [ + "xarrow_0_2_0", +] +description = "LaTeX support for Typst, powered by Rust and WASM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mitex-rs/mitex" + +[mitex."0.2.1"] +url = "https://packages.typst.org/preview/mitex-0.2.1.tar.gz" +hash = "sha256-0YonqnjL0+kQaLdOVi+JrzHTGX61F0yCPOYqGu9ntK0=" +typstDeps = [ + "xarrow_0_2_0", +] +description = "LaTeX support for Typst, powered by Rust and WASM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mitex-rs/mitex" + +[mitex."0.2.0"] +url = "https://packages.typst.org/preview/mitex-0.2.0.tar.gz" +hash = "sha256-Kh4uMywIoS7EFsQc4WQ23EmNDKD4qqErd6GjkyyO3+c=" +typstDeps = [ + "xarrow_0_2_0", +] +description = "LaTeX support for Typst, powered by Rust and WASM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/mitex-rs/mitex" + +[mitex."0.1.0"] +url = "https://packages.typst.org/preview/mitex-0.1.0.tar.gz" +hash = "sha256-94SandlTzLX+awqNrciJjuSbF9MVZ4hLT6dXQq+qJsM=" +typstDeps = [ + "xarrow_0_2_0", +] +description = "LaTeX support for Typst, powered by Rust and WASM" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/OrangeX4/mitex" + +[modern-acad-cv."0.1.3"] +url = "https://packages.typst.org/preview/modern-acad-cv-0.1.3.tar.gz" +hash = "sha256-md1GRHWOxDNNy4iavFGqSmgpxMKJR8KGsT0pR2XAPso=" +typstDeps = [ + "fontawesome_0_5_0", + "use-academicons_0_1_0", +] +description = "A CV template for academics based on moderncv LaTeX package" +license = [ + "MIT", +] +homepage = "https://github.com/philkleer/typst-modern-acad-cv" + +[modern-acad-cv."0.1.2"] +url = "https://packages.typst.org/preview/modern-acad-cv-0.1.2.tar.gz" +hash = "sha256-+XAabIM+vK0hVC3+5/7jwSnH+C+vH+EfuwhYS9q2XdM=" +typstDeps = [ + "fontawesome_0_5_0", + "use-academicons_0_1_0", +] +description = "A CV template for academics based on moderncv LaTeX package" +license = [ + "MIT", +] +homepage = "https://github.com/philkleer/typst-modern-acad-cv" + +[modern-acad-cv."0.1.1"] +url = "https://packages.typst.org/preview/modern-acad-cv-0.1.1.tar.gz" +hash = "sha256-XVzghoV6ZMbN38FKZK/V5izTKcBv+vnr4UhIywM7NX4=" +typstDeps = [ + "fontawesome_0_5_0", + "modern-acad-cv_0_1_0", + "use-academicons_0_1_0", +] +description = "A CV template for academics based on moderncv LaTeX package" +license = [ + "MIT", +] +homepage = "https://github.com/bpkleer/typst-modern-acad-cv" + +[modern-acad-cv."0.1.0"] +url = "https://packages.typst.org/preview/modern-acad-cv-0.1.0.tar.gz" +hash = "sha256-3plPylFuGxUSuFvdyj/RpbtvbIIlLAf/AFsXVl/59jc=" +typstDeps = [ + "fontawesome_0_4_0", + "use-academicons_0_1_0", +] +description = "A CV template for academics based on moderncv LaTeX package" +license = [ + "MIT", +] +homepage = "https://github.com/bpkleer/typst-modern-acad-cv" + +[modern-bnu-course-paper."0.1.0"] +url = "https://packages.typst.org/preview/modern-bnu-course-paper-0.1.0.tar.gz" +hash = "sha256-HC9zUal/ffbx7O0Ynsmb9OtgS9gJH+dxYfDSFmtiN5Q=" +typstDeps = [ + "algo_0_3_4", + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_2_4", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "北京师范大学课程论文模板。Modern Beijing Normal University Course Paper" +license = [ + "MIT", +] +homepage = "https://github.com/EuanTop/modern-bnu-course-paper" + +[modern-bnu-thesis."0.0.1"] +url = "https://packages.typst.org/preview/modern-bnu-thesis-0.0.1.tar.gz" +hash = "sha256-Zw7INRq6oBSgl7ip/e6SlUgqrAvgwzTmbW0ODOQBFOU=" +typstDeps = [ + "algo_0_3_4", + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "pinit_0_1_3", + "tablex_0_0_8", +] +description = "北京师范大学学位论文模板。Modern Beijing Normal University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/mosrat/modern-bnu-thesis" + +[modern-cqut-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-cqut-thesis-0.1.0.tar.gz" +hash = "sha256-75yWFP5K6VmsPKff/BvzKHK15Bch6CwRXEHsTIaZJYQ=" +typstDeps = [ + "ctheorems_1_1_3", + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "outrageous_0_3_0", + "pinit_0_2_2", + "showybox_2_0_3", + "tablex_0_0_8", +] +description = "重庆理工大学学位论文模板。 A Thesis Tamplate for CQUT" +license = [ + "MIT", +] +homepage = "https://github.com/aFei-CQUT/modern-cqut-thesis" + +[modern-cug-report."0.1.1"] +url = "https://packages.typst.org/preview/modern-cug-report-0.1.1.tar.gz" +hash = "sha256-tDNx5sL+we4WNxEFa+oHMNfe9nvbB717gKz87Jjobmk=" +typstDeps = [ + "cuti_0_2_1", + "mitex_0_2_4", + "physica_0_9_3", + "showybox_2_0_3", +] +description = "Chinese Technical report writing standards" +license = [ + "MIT", +] +homepage = "https://github.com/CUG-hydro/modern-cug-report.typ" + +[modern-cug-report."0.1.0"] +url = "https://packages.typst.org/preview/modern-cug-report-0.1.0.tar.gz" +hash = "sha256-j+wgh8EXdPjuWRYmfVnjhEIvYSGuAPeEclj5vD7HjVI=" +typstDeps = [ + "codly_1_0_0", + "cuti_0_2_1", + "mitex_0_2_4", + "physica_0_9_3", + "showybox_2_0_3", +] +description = "Chinese Technical report writing standards" +license = [ + "MIT", +] +homepage = "https://github.com/CUG-hydro/modern-cug-report.typ" + +[modern-cug-thesis."0.2.6"] +url = "https://packages.typst.org/preview/modern-cug-thesis-0.2.6.tar.gz" +hash = "sha256-HoN1j5PIQ0UxafuHgQNTRc0eaoIhTLMD+ejMyZwIcGQ=" +typstDeps = [ + "cuti_0_2_1", + "i-figured_0_2_4", + "subpar_0_2_1", + "tablex_0_0_8", + "wordometer_0_1_4", +] +description = "中国地质大学(武汉)学位论文模板。China University of Geosciences Thesis based on Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Rsweater/cug-thesis-typst" + +[modern-cug-thesis."0.2.5"] +url = "https://packages.typst.org/preview/modern-cug-thesis-0.2.5.tar.gz" +hash = "sha256-pTrPUNNss/RmAS+JE/F48lvpBQOg75gHhPQ8YMsxKak=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_2_4", + "outrageous_0_1_0", + "subpar_0_2_0", + "tablex_0_0_8", +] +description = "中国地质大学(武汉)学位论文模板。China University of Geosciences Thesis based on Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Rsweater/cug-thesis-typst" + +[modern-cug-thesis."0.2.4"] +url = "https://packages.typst.org/preview/modern-cug-thesis-0.2.4.tar.gz" +hash = "sha256-3SpjKehYDxl6YPWuJq1PZs4ZEutB464wAQ42XQEbeiQ=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_2_4", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中国地质大学(武汉)学位论文模板。China University of Geosciences Thesis based on Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Rsweater/cug-thesis-typst" + +[modern-cug-thesis."0.2.3"] +url = "https://packages.typst.org/preview/modern-cug-thesis-0.2.3.tar.gz" +hash = "sha256-3mZSi5/bcYVQWg+H9/nD2Tph3bMiEq0w491lIhD92QQ=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_2_4", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中国地质大学(武汉)学位论文模板。China University of Geosciences Thesis based on Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Rsweater/cug-thesis-typst" + +[modern-cug-thesis."0.2.2"] +url = "https://packages.typst.org/preview/modern-cug-thesis-0.2.2.tar.gz" +hash = "sha256-F50iaDduV2nS1brJO3s9BBUwGWqnAYgj17SXbd/Nzxo=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_2_4", + "indenta_0_0_3", + "modern-cug-thesis_0_2_1", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中国地质大学(武汉)学位论文模板。China University of Geosciences Thesis based on Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Rsweater/cug-thesis-typst" + +[modern-cug-thesis."0.2.1"] +url = "https://packages.typst.org/preview/modern-cug-thesis-0.2.1.tar.gz" +hash = "sha256-3ST8IuzSV4ZW/7y0e5C/vvjsnDnbUMHiUUXP+FxA4vc=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_2_4", + "indenta_0_0_3", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中国地质大学(武汉)学位论文模板。China University of Geosciences Thesis based on Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Rsweater/cug-thesis-typst" + +[modern-cug-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-cug-thesis-0.1.0.tar.gz" +hash = "sha256-2FIo2PUltG+8HVtIkxwOh1mlhvc902zlJ4qIzQvVALw=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_2_4", + "indenta_0_0_3", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中国地质大学(武汉)学位论文模板。China University of Geosciences Thesis based on Typst" +license = [ + "MIT", +] +homepage = "https://github.com/Rsweater/cug-thesis-typst" + +[modern-cv."0.8.0"] +url = "https://packages.typst.org/preview/modern-cv-0.8.0.tar.gz" +hash = "sha256-p8ZkhcYvO3vdidAYRYobapreiZSqE4Pihd0eEeLIQ24=" +typstDeps = [ + "fontawesome_0_5_0", + "linguify_0_4_1", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-cv."0.7.0"] +url = "https://packages.typst.org/preview/modern-cv-0.7.0.tar.gz" +hash = "sha256-AHUyHvNmcobnCGjfInft4i/JWnTQp+o5dSznx/xl6cU=" +typstDeps = [ + "fontawesome_0_5_0", + "linguify_0_4_1", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-cv."0.6.0"] +url = "https://packages.typst.org/preview/modern-cv-0.6.0.tar.gz" +hash = "sha256-3MRMAuavyQzggHtgd6g5LjfqeF1+26Y6+AUwAbGCmdk=" +typstDeps = [ + "fontawesome_0_2_1", + "linguify_0_4_0", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-cv."0.5.0"] +url = "https://packages.typst.org/preview/modern-cv-0.5.0.tar.gz" +hash = "sha256-iT4H5axgHaNQGDJzrla917YiqxFC6uNP7X9PmM2mAhY=" +typstDeps = [ + "fontawesome_0_2_1", + "linguify_0_4_0", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-cv."0.4.0"] +url = "https://packages.typst.org/preview/modern-cv-0.4.0.tar.gz" +hash = "sha256-o2G8VnzHVDxJ/ooJaewVfNWU6kvTAmJ+/H/Hb+pGlQc=" +typstDeps = [ + "fontawesome_0_2_1", + "linguify_0_4_0", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-cv."0.3.1"] +url = "https://packages.typst.org/preview/modern-cv-0.3.1.tar.gz" +hash = "sha256-2zE5Wa/4XQbzudDfxnh/SJudunnvVZh94QDc51IwAmM=" +typstDeps = [ + "fontawesome_0_1_0", + "linguify_0_4_0", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-cv."0.3.0"] +url = "https://packages.typst.org/preview/modern-cv-0.3.0.tar.gz" +hash = "sha256-0gMx15la5PddPO7gdwRZJDvMvGmJzmOZtDZ312VuDNE=" +typstDeps = [ + "fontawesome_0_1_0", + "linguify_0_4_0", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-cv."0.2.0"] +url = "https://packages.typst.org/preview/modern-cv-0.2.0.tar.gz" +hash = "sha256-VfsX6L1N7yYiDQ838lto6FSGomcSUSzqGTle81qP7OQ=" +typstDeps = [ + "fontawesome_0_1_0", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-cv."0.1.0"] +url = "https://packages.typst.org/preview/modern-cv-0.1.0.tar.gz" +hash = "sha256-htS0bAEgSfCnFt/BP6Hr/dY4gB0hvnxKWWOz1EEMtCI=" +typstDeps = [ + "fontawesome_0_1_0", +] +description = "A modern resume template based on the Awesome-CV Latex template" +license = [ + "MIT", +] +homepage = "https://github.com/DeveloperPaul123/modern-cv" + +[modern-ecnu-thesis."0.2.0"] +url = "https://packages.typst.org/preview/modern-ecnu-thesis-0.2.0.tar.gz" +hash = "sha256-d9JuuJUbBPELbgJ0KHVX+hcYzap41sd8CD023oPu1Jk=" +typstDeps = [ + "cuti_0_2_1", + "hydra_0_5_2", + "i-figured_0_1_0", + "i-figured_0_2_4", + "kouhu_0_1_0", + "outrageous_0_3_0", + "pinit_0_1_3", + "tablex_0_0_8", + "wordometer_0_1_4", +] +description = "华东师范大学本科 / 研究生学位论文模板。Modern East China Normal University Thesis Template" +license = [ + "MIT", +] +homepage = "https://github.com/jtchen2k/modern-ecnu-thesis" + +[modern-ecnu-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-ecnu-thesis-0.1.0.tar.gz" +hash = "sha256-S/x3L3NdnsH3J5QbpGUVc9MA6TFcRCugOnLVowfDsqA=" +typstDeps = [ + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "kouhu_0_1_0", + "outrageous_0_1_0", + "pinit_0_1_3", + "tablex_0_0_8", + "wordometer_0_1_4", +] +description = "华东师范大学学位论文模板。Modern East China Normal University Thesis Template" +license = [ + "MIT", +] +homepage = "https://github.com/jtchen2k/modern-ecnu-thesis" + +[modern-g7-32."0.1.0"] +url = "https://packages.typst.org/preview/modern-g7-32-0.1.0.tar.gz" +hash = "sha256-eueqW82lVMD0Ii45pLAlD4Rw7NuF9mdfuTWXgQ1Oylw=" +typstDeps = [ + "numberingx_0_0_1", +] +description = "Template for academic documents in compliance with GOST 7.32‑2017" +license = [ + "GPL-3.0-only", +] +homepage = "https://github.com/typst-g7-32/modern-g7-32" + +[modern-hsh-thesis."1.0.2"] +url = "https://packages.typst.org/preview/modern-hsh-thesis-1.0.2.tar.gz" +hash = "sha256-RXQYwYaz/mAXMuDX7DS+Wpr8Op6x6nF2G0KB88HCauM=" +typstDeps = [ + "big-todo_0_2_0", + "codly_1_2_0", + "gentle-clues_1_2_0", + "gloss-awe_0_0_5", + "hydra_0_6_0", + "treet_0_1_1", + "wrap-it_0_1_1", +] +description = "Template for writing a bachelors or masters thesis at the Hochschule Hannover, Faculty 4" +license = [ + "MIT", +] +homepage = "https://github.com/MrToWy/hsh-thesis" + +[modern-hsh-thesis."1.0.1"] +url = "https://packages.typst.org/preview/modern-hsh-thesis-1.0.1.tar.gz" +hash = "sha256-pLF1k5wwDtANkEDQ66Tqikn+Rsk6I8dPUez81DzizAY=" +typstDeps = [ + "big-todo_0_2_0", + "codly_1_0_0", + "gentle-clues_0_9_0", + "gloss-awe_0_0_5", + "hydra_0_5_1", + "treet_0_1_0", + "wrap-it_0_1_0", +] +description = "Template for writing a bachelors or masters thesis at the Hochschule Hannover, Faculty 4" +license = [ + "MIT", +] +homepage = "https://github.com/MrToWy/hsh-thesis" + +[modern-hsh-thesis."1.0.0"] +url = "https://packages.typst.org/preview/modern-hsh-thesis-1.0.0.tar.gz" +hash = "sha256-5XIOMC3hmc+5OhIOPnt4nmg2TyioSVZvxaZY8uj3j1g=" +typstDeps = [ + "big-todo_0_2_0", + "codly_1_0_0", + "gentle-clues_0_9_0", + "gloss-awe_0_0_5", + "hydra_0_3_0", + "treet_0_1_0", + "wrap-it_0_1_0", +] +description = "Template for writing a bachelors or masters thesis at the Hochschule Hannover, Faculty 4" +license = [ + "MIT", +] +homepage = "https://github.com/MrToWy/hsh-thesis" + +[modern-iu-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-iu-thesis-0.1.0.tar.gz" +hash = "sha256-xda/9KVnb8I0ob1mZMChzqEBw7uBoaUGTwdhFujeV5k=" +typstDeps = [] +description = "Modern Typst thesis template for Indiana University" +license = [ + "MIT", +] +homepage = "https://github.com/bojohnson5/modern-iu-thesis" + +[modern-nju-thesis."0.4.0"] +url = "https://packages.typst.org/preview/modern-nju-thesis-0.4.0.tar.gz" +hash = "sha256-3F1HXZfxlLgbcTNfe37YHIW5M/EY5zGy4thnlVFBfzU=" +typstDeps = [ + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "pinit_0_2_2", + "tablex_0_0_9", +] +description = "南京大学学位论文模板。Modern Nanjing University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/nju-lug/modern-nju-thesis" + +[modern-nju-thesis."0.3.4"] +url = "https://packages.typst.org/preview/modern-nju-thesis-0.3.4.tar.gz" +hash = "sha256-7LS1T5FEfT2wImsa4j/V3RyE0sgL7B1mskceyqw7XtM=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "pinit_0_1_3", + "tablex_0_0_8", +] +description = "南京大学学位论文模板。Modern Nanjing University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/nju-lug/modern-nju-thesis" + +[modern-nju-thesis."0.3.3"] +url = "https://packages.typst.org/preview/modern-nju-thesis-0.3.3.tar.gz" +hash = "sha256-/UwN2FHrMxqghpbpOvD6M70WkrINo+VMMXRqwjh5xgA=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "pinit_0_1_3", + "tablex_0_0_8", +] +description = "南京大学学位论文模板。Modern Nanjing University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/nju-lug/modern-nju-thesis" + +[modern-nju-thesis."0.3.2"] +url = "https://packages.typst.org/preview/modern-nju-thesis-0.3.2.tar.gz" +hash = "sha256-iOURaHUn+z7+83WGNWB+XI+d8x7m/kt69hOp2m7c8F8=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "pinit_0_1_3", + "tablex_0_0_8", +] +description = "南京大学学位论文模板。Modern Nanjing University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/touying-typ/touying" + +[modern-nju-thesis."0.3.1"] +url = "https://packages.typst.org/preview/modern-nju-thesis-0.3.1.tar.gz" +hash = "sha256-T/XZH/zAPYoZIo3bI6OHgx4rglyNmlD8g2Wvi08MBqc=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "pinit_0_1_3", + "tablex_0_0_8", +] +description = "南京大学学位论文模板。Modern Nanjing University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/touying-typ/touying" + +[modern-nju-thesis."0.3.0"] +url = "https://packages.typst.org/preview/modern-nju-thesis-0.3.0.tar.gz" +hash = "sha256-MIuxHhHVUAMsi+NWzZQtBMna4CqFwvZ2Ms9mx2PDrRs=" +typstDeps = [ + "anti-matter_0_0_2", + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "pinit_0_1_3", + "tablex_0_0_8", +] +description = "南京大学学位论文模板。Modern Nanjing University Thesis" +license = [ + "MIT", +] +homepage = "https://github.com/nju-lug/modern-nju-thesis" + +[modern-ovgu-fma-polylux."0.1.0"] +url = "https://packages.typst.org/preview/modern-ovgu-fma-polylux-0.1.0.tar.gz" +hash = "sha256-lNkmssNGU3A+07AyaRzY1oHn253I+xRKX59IJWkgf1s=" +typstDeps = [ + "ez-today_0_3_0", + "polylux_0_4_0", +] +description = "Unofficial template for creating presentations with Polylux in the style of the Faculty of Mathematics at the Otto-von-Guericke-University Magdeburg" +license = [ + "MIT", +] + +[modern-report-umfds."0.1.2"] +url = "https://packages.typst.org/preview/modern-report-umfds-0.1.2.tar.gz" +hash = "sha256-YVoSuE6U+FJFLTe71/8vFpd3oP6bRGQ6ovBAiniVUWU=" +typstDeps = [] +description = "A template for writing reports for the Faculty of Sciences of the University of Montpellier" +license = [ + "MIT-0", +] +homepage = "https://github.com/UM-nerds/modern-report-umfds" + +[modern-report-umfds."0.1.1"] +url = "https://packages.typst.org/preview/modern-report-umfds-0.1.1.tar.gz" +hash = "sha256-Vjuk1yYOCV5kfHebHrrhWxDeLVE4dOVokQ4WhnxwHJs=" +typstDeps = [] +description = "A template for writing reports for the Faculty of Sciences of the University of Montpellier" +license = [ + "MIT-0", +] +homepage = "https://github.com/UM-nerds/modern-report-umfds" + +[modern-report-umfds."0.1.0"] +url = "https://packages.typst.org/preview/modern-report-umfds-0.1.0.tar.gz" +hash = "sha256-Fgxyw6/BmeiB+oWabdoZ/8dmJbKau0ZKTXOmryi+OPE=" +typstDeps = [] +description = "A template for writing reports for the Faculty of Sciences of the University of Montpellier" +license = [ + "MIT-0", +] +homepage = "https://github.com/UM-nerds/modern-report-umfds" + +[modern-resume."0.1.0"] +url = "https://packages.typst.org/preview/modern-resume-0.1.0.tar.gz" +hash = "sha256-J7ACHS7XS/vTX5CBZW/Z+W2y87m+MR39StgBQu/A/wE=" +typstDeps = [] +description = "A modern resume/CV template" +license = [ + "Unlicense", +] +homepage = "https://github.com/peterpf/modern-typst-resume" + +[modern-russian-dissertation."0.0.1"] +url = "https://packages.typst.org/preview/modern-russian-dissertation-0.0.1.tar.gz" +hash = "sha256-dFgLnAx1rwcVmwu6vogKMmR8i+7wBntylDsZZcgXQ+U=" +typstDeps = [ + "codly_0_2_0", + "physica_0_9_3", + "tablex_0_0_8", + "unify_0_5_0", +] +description = "A russian phd thesis template" +license = [ + "MIT", +] +homepage = "https://github.com/SergeyGorchakov/russian-phd-thesis-template-typst" + +[modern-shu-thesis."0.3.1"] +url = "https://packages.typst.org/preview/modern-shu-thesis-0.3.1.tar.gz" +hash = "sha256-25P4yWiDyB1aKjaYjfSeZzJZr7RUuDacp87HQ0zQU/Y=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "lovelace_0_2_0", + "numbly_0_1_0", +] +description = "上海大学本科毕业论文模板" +license = [ + "Apache-2.0", +] +homepage = "https://github.com/XY-cpp/typst-shu-thesis" + +[modern-shu-thesis."0.3.0"] +url = "https://packages.typst.org/preview/modern-shu-thesis-0.3.0.tar.gz" +hash = "sha256-O2lL3iMeNhkev+ak2zz0KZs2Hjw0xXbRKd1TE6UxPqQ=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "lovelace_0_2_0", + "numbly_0_1_0", +] +description = "上海大学本科毕业论文模板" +license = [ + "MIT", +] +homepage = "https://github.com/XY-cpp/typst-shu-thesis" + +[modern-shu-thesis."0.2.0"] +url = "https://packages.typst.org/preview/modern-shu-thesis-0.2.0.tar.gz" +hash = "sha256-Bz9MLdymirQRwOSSu0+70eCJObRld4zdTnBXo+k9GV8=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "lovelace_0_2_0", + "numbly_0_1_0", +] +description = "上海大学本科毕业论文模板" +license = [ + "MIT", +] +homepage = "https://github.com/XY-cpp/typst-shu-thesis" + +[modern-shu-thesis."0.1.1"] +url = "https://packages.typst.org/preview/modern-shu-thesis-0.1.1.tar.gz" +hash = "sha256-RY73DkkPyJJuXnCgVYC8SDUW9YRMcWgifZjtDOlKTRw=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "numbly_0_1_0", +] +description = "上海大学本科毕业论文模板" +license = [ + "MIT", +] +homepage = "https://github.com/XY-cpp/typst-shu-thesis" + +[modern-shu-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-shu-thesis-0.1.0.tar.gz" +hash = "sha256-aae7Sx1ZM9AZHDV5nlEV8LT7m8A+4s5hrRJY1/l/kZg=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "numbly_0_1_0", +] +description = "上海大学本科毕业论文模板" +license = [ + "MIT", +] +homepage = "https://github.com/XY-cpp/typst-shu-thesis" + +[modern-sjtu-thesis."0.2.1"] +url = "https://packages.typst.org/preview/modern-sjtu-thesis-0.2.1.tar.gz" +hash = "sha256-OTr8YH7Z3ORoj8tsDgk/+0n76lromICUkY1RklChWTk=" +typstDeps = [ + "a2c-nums_0_0_1", + "cuti_0_3_0", + "i-figured_0_2_4", + "numbly_0_1_0", +] +description = "上海交通大学学位论文 Typst 模板。Shanghai Jiao Tong University Thesis Typst Template" +license = [ + "MIT", +] +homepage = "https://github.com/tzhTaylor/modern-sjtu-thesis" + +[modern-sjtu-thesis."0.2.0"] +url = "https://packages.typst.org/preview/modern-sjtu-thesis-0.2.0.tar.gz" +hash = "sha256-dfcBB5kKYE/5GyX/QA+f+rwMVBHooOOcyEvzFAdC7RY=" +typstDeps = [ + "a2c-nums_0_0_1", + "cuti_0_3_0", + "i-figured_0_2_4", + "numbly_0_1_0", +] +description = "上海交通大学学位论文 Typst 模板。Shanghai Jiao Tong University Thesis Typst Template" +license = [ + "MIT", +] +homepage = "https://github.com/tzhTaylor/modern-sjtu-thesis" + +[modern-sjtu-thesis."0.1.2"] +url = "https://packages.typst.org/preview/modern-sjtu-thesis-0.1.2.tar.gz" +hash = "sha256-ftyfROArD2TG5cZI0dcJ3ebfqdWnMNpWNDPRlbXlspc=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "numbly_0_1_0", +] +description = "上海交通大学研究生学位论文 Typst 模板。Shanghai Jiao Tong University Graduate Thesis Typst Template" +license = [ + "MIT", +] +homepage = "https://github.com/tzhTaylor/typst-sjtu-thesis-master" + +[modern-sjtu-thesis."0.1.1"] +url = "https://packages.typst.org/preview/modern-sjtu-thesis-0.1.1.tar.gz" +hash = "sha256-7NsuJtSawUWVu9cO848umWtMu27EXkfJ8v8Hz4boMhs=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "numbly_0_1_0", + "outrageous_0_3_0", +] +description = "上海交通大学硕士学位论文 Typst 模板。Shanghai Jiao Tong University Graduate Thesis Typst Template" +license = [ + "MIT", +] +homepage = "https://github.com/tzhTaylor/typst-sjtu-thesis-master" + +[modern-sjtu-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-sjtu-thesis-0.1.0.tar.gz" +hash = "sha256-2tj8RkbzC52W6VegrE+YavUYVfFBXfqTMO2WztefPtg=" +typstDeps = [ + "cuti_0_2_1", + "i-figured_0_2_4", + "numbly_0_1_0", + "outrageous_0_1_0", +] +description = "上海交通大学硕士学位论文 Typst 模板。Shanghai Jiao Tong University Master Thesis Typst Template" +license = [ + "MIT", +] +homepage = "https://github.com/tzhTaylor/typst-sjtu-thesis-master" + +[modern-sustech-thesis."0.1.1"] +url = "https://packages.typst.org/preview/modern-sustech-thesis-0.1.1.tar.gz" +hash = "sha256-QDo0ILNewya1ecyfMX1lcqzG5OvUkPOOZuTcEb2vfNQ=" +typstDeps = [] +description = "南方科技大学本科毕业设计(论文)模板. SUSTech Bachelor Thesis Template" +license = [ + "MIT", +] +homepage = "https://github.com/Duolei-Wang/sustech-thesis-typst" + +[modern-sustech-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-sustech-thesis-0.1.0.tar.gz" +hash = "sha256-dp2wyxgYMX2DJA1odakPKZusJ/4GeoOe9HT+YkKo2F0=" +typstDeps = [] +description = "南方科技大学本科毕业设计(论文)模板. SUSTech Bachelor Thesis Template" +license = [ + "MIT", +] +homepage = "https://github.com/Duolei-Wang/sustech-thesis-typst" + +[modern-sysu-thesis."0.4.0"] +url = "https://packages.typst.org/preview/modern-sysu-thesis-0.4.0.tar.gz" +hash = "sha256-bC2JvIBViitWFsBsswq6cyQ9tRQvRb+lKe6dgObmlIY=" +typstDeps = [ + "anti-matter_0_0_2", + "i-figured_0_1_0", + "i-figured_0_2_4", + "numblex_0_1_1", + "numbly_0_1_0", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中山大学学位论文 Typst 模板,A Typst template for SYSU thesis" +license = [ + "MIT", +] +homepage = "https://gitlab.com/sysu-gitlab/thesis-template/better-thesis" + +[modern-sysu-thesis."0.3.0"] +url = "https://packages.typst.org/preview/modern-sysu-thesis-0.3.0.tar.gz" +hash = "sha256-P1ay33X2fzmnK+FIO7/C7znU10QKKuGbQZctSysfJQw=" +typstDeps = [ + "anti-matter_0_0_2", + "i-figured_0_1_0", + "i-figured_0_2_4", + "numblex_0_1_1", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中山大学学位论文 Typst 模板,A Typst template for SYSU thesis" +license = [ + "MIT", +] +homepage = "https://gitlab.com/sysu-gitlab/thesis-template/better-thesis" + +[modern-sysu-thesis."0.2.0"] +url = "https://packages.typst.org/preview/modern-sysu-thesis-0.2.0.tar.gz" +hash = "sha256-FTvHq6q+Z7aDzFZknbB/ZEnp8gId44/6NOxnIYvyh0Q=" +typstDeps = [ + "anti-matter_0_0_2", + "i-figured_0_1_0", + "i-figured_0_2_4", + "numblex_0_1_1", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中山大学学位论文 Typst 模板,A Typst template for SYSU thesis" +license = [ + "MIT", +] +homepage = "https://gitlab.com/sysu-gitlab/thesis-template/better-thesis" + +[modern-sysu-thesis."0.1.1"] +url = "https://packages.typst.org/preview/modern-sysu-thesis-0.1.1.tar.gz" +hash = "sha256-exx84YlSALjILLaJ5MAR0elZXhuQuRqgJb6a1xDluqk=" +typstDeps = [ + "anti-matter_0_0_2", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中山大学学位论文 Typst 模板,A Typst template for SYSU thesis" +license = [ + "MIT", +] +homepage = "https://gitlab.com/sysu-gitlab/thesis-template/better-thesis" + +[modern-sysu-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-sysu-thesis-0.1.0.tar.gz" +hash = "sha256-/dJWKfvvPOA6m1+Oe6snpaVvfNPzWaQH34HKlN5wrBw=" +typstDeps = [ + "anti-matter_0_0_2", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "tablex_0_0_8", +] +description = "中山大学学位论文 Typst 模板,A Typst template for SYSU thesis" +license = [ + "MIT", +] +homepage = "https://gitlab.com/sysu-gitlab/thesis-template/better-thesis" + +[modern-szu-thesis."0.4.0"] +url = "https://packages.typst.org/preview/modern-szu-thesis-0.4.0.tar.gz" +hash = "sha256-Tz3zDaCYNfLGuzSSdTnrkV+pX/uo/MPGSGwfFiPlKEg=" +typstDeps = [ + "cuti_0_3_0", + "hydra_0_6_0", + "i-figured_0_2_4", + "numbly_0_1_0", + "pinit_0_2_2", + "tablex_0_0_9", +] +description = "深圳大学学位论文模板由南京大学学位论文模板修改而成。Modern Shenzhen University Thesis is modified from modern-nju-thesis" +license = [ + "MIT", +] +homepage = "https://gitee.com/yjdyamv/modern-szu-thesis" + +[modern-szu-thesis."0.3.0"] +url = "https://packages.typst.org/preview/modern-szu-thesis-0.3.0.tar.gz" +hash = "sha256-PAnKU0ccuZITAL+anqSACkYMzNqXKHmGS0kg5skjSgA=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "tablex_0_0_9", +] +description = "深圳大学学位论文模板由南京大学学位论文模板修改而成。Modern Shenzhen University Thesis is modified from modern-nju-thesis" +license = [ + "MIT", +] +homepage = "https://gitee.com/yjdyamv/modern-szu-thesis" + +[modern-szu-thesis."0.2.0"] +url = "https://packages.typst.org/preview/modern-szu-thesis-0.2.0.tar.gz" +hash = "sha256-BBQp5FizcgQgd4hfKfzXby+PG3TuhtmkoV2IiCgbZpo=" +typstDeps = [ + "cuti_0_3_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "outrageous_0_3_0", + "tablex_0_0_9", +] +description = "深圳大学学位论文模板由南京大学学位论文模板修改而成。Modern Shenzhen University Thesis is modified from modern-nju-thesis" +license = [ + "MIT", +] +homepage = "https://gitee.com/yjdyamv/modern-szu-thesis" + +[modern-szu-thesis."0.1.1"] +url = "https://packages.typst.org/preview/modern-szu-thesis-0.1.1.tar.gz" +hash = "sha256-EHCewSw0xT1cRPi6CH72IA0Hk7Kef6RoB5bdU4LGpws=" +typstDeps = [ + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "tablex_0_0_9", +] +description = "深圳大学学位论文模板由南京大学学位论文模板修改而成。Modern Shenzhen University Thesis is modified from modern-nju-thesis" +license = [ + "MIT", +] +homepage = "https://gitee.com/yjdyamv/modern-szu-thesis" + +[modern-szu-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-szu-thesis-0.1.0.tar.gz" +hash = "sha256-PbQVGaWqUM1KRVZnjK5a5PO/M1rSt2mdxpOgtSwO9F4=" +typstDeps = [ + "cuti_0_2_1", + "i-figured_0_1_0", + "i-figured_0_2_4", + "outrageous_0_1_0", + "tablex_0_0_9", +] +description = "深圳大学学位论文模板由南京大学学位论文模板修改而成。Modern Shenzhen University Thesis is modified from modern-nju-thesis" +license = [ + "MIT", +] + +[modern-technique-report."0.1.0"] +url = "https://packages.typst.org/preview/modern-technique-report-0.1.0.tar.gz" +hash = "sha256-QCgSPrgnKpvKPwzpbaAVO+at2MIlbGA58g2tgTFboqw=" +typstDeps = [] +description = "A template for creating modern-style technique report in Typst" +license = [ + "MIT", +] + +[modern-uit-thesis."0.1.4"] +url = "https://packages.typst.org/preview/modern-uit-thesis-0.1.4.tar.gz" +hash = "sha256-dmsNjOD9kf4PHggxX0r1Dzfra9h9T7EmzuIYG1T3ggM=" +typstDeps = [ + "codly_1_2_0", + "ctheorems_1_1_3", + "glossarium_0_5_4", + "physica_0_9_5", + "subpar_0_2_1", +] +description = "A Modern Thesis Template in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/mrtz-j/typst-thesis-template" + +[modern-uit-thesis."0.1.3"] +url = "https://packages.typst.org/preview/modern-uit-thesis-0.1.3.tar.gz" +hash = "sha256-xaxqLTU1F4kRzhUABdnb2E2A1xnNwNlRhaFhm5aJnQw=" +typstDeps = [ + "codly_1_2_0", + "ctheorems_1_1_3", + "glossarium_0_5_0", + "glossarium_0_5_1", + "outrageous_0_3_0", + "physica_0_9_4", + "subpar_0_2_0", +] +description = "A Modern Thesis Template in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/mrtz-j/typst-thesis-template" + +[modern-uit-thesis."0.1.2"] +url = "https://packages.typst.org/preview/modern-uit-thesis-0.1.2.tar.gz" +hash = "sha256-469FTTHCVdRKp8oxray2RAVsLTnvi0LneBc2z/I2nzk=" +typstDeps = [ + "codly_1_0_0", + "glossarium_0_5_0", + "outrageous_0_3_0", + "physica_0_9_3", + "subpar_0_1_1", +] +description = "A Modern Thesis Template in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/mrtz-j/typst-thesis-template" + +[modern-uit-thesis."0.1.1"] +url = "https://packages.typst.org/preview/modern-uit-thesis-0.1.1.tar.gz" +hash = "sha256-ZgQ3L4yHMKrl6EPvXqNUfdSm1fjAxXLyHAPzslPU5CQ=" +typstDeps = [ + "codly_1_0_0", + "outrageous_0_2_0", + "physica_0_9_3", + "subpar_0_1_1", +] +description = "A Modern Thesis Template in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/mrtz-j/typst-thesis-template" + +[modern-uit-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-uit-thesis-0.1.0.tar.gz" +hash = "sha256-JWDY8UufvD27QFu4haDyDvZAdnOKAheal+/YuSFHdRs=" +typstDeps = [ + "codly_1_0_0", + "outrageous_0_1_0", + "physica_0_9_3", + "subpar_0_1_1", +] +description = "A Modern Thesis Template in Typst" +license = [ + "MIT", +] +homepage = "https://github.com/mrtz-j/typst-thesis-template" + +[modern-unimib-thesis."0.1.1"] +url = "https://packages.typst.org/preview/modern-unimib-thesis-0.1.1.tar.gz" +hash = "sha256-JhW++7nk8wbg5Zvtr49OCH93p4y0aJCkEIQSPwtK+Mk=" +typstDeps = [] +description = "A thesis template of the University of Milano-Bicocca" +license = [ + "MIT", +] +homepage = "https://github.com/michelebanfi/unimib-typst-template" + +[modern-unimib-thesis."0.1.0"] +url = "https://packages.typst.org/preview/modern-unimib-thesis-0.1.0.tar.gz" +hash = "sha256-C1OcVKF1Bz9MDgg84Dack+35PUgYgEuy77m2+zFdfBY=" +typstDeps = [] +description = "A thesis template of the University of Milano-Bicocca heavily inspired by =3.7.0-0 <4.0.0" + } +} diff --git a/pkgs/by-name/un/unsure/update.sh b/pkgs/by-name/un/unsure/update.sh new file mode 100755 index 000000000000..e0620d22e354 --- /dev/null +++ b/pkgs/by-name/un/unsure/update.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p yq jq common-updater-scripts dart + +set -o errexit -o nounset -o pipefail + +# TODO: Expand to get new version automatically once implemented upstream + +package_dir="$(dirname "${BASH_SOURCE[0]}")" + +# Create new pubspec.lock.json +cleanup() { + rm --force --recursive "${tmpdir}" +} +trap cleanup EXIT +tmpdir="$(mktemp -d)" + +src="$(nix-build --no-link --attr unsure.src)" +cp "${src}"/pubspec.* "${tmpdir}" + +if ! [[ -f pubspec.lock ]]; then + dart pub --directory="${tmpdir}" update +fi + +yq . "${tmpdir}/pubspec.lock" >"${package_dir}/pubspec.lock.json" diff --git a/pkgs/by-name/up/upbound/sources-main.json b/pkgs/by-name/up/upbound/sources-main.json index 1b82f4122c09..5385dad36920 100644 --- a/pkgs/by-name/up/upbound/sources-main.json +++ b/pkgs/by-name/up/upbound/sources-main.json @@ -8,38 +8,38 @@ "fetchurlAttrSet": { "docker-credential-up": { "aarch64-darwin": { - "hash": "sha256-UT2zZNvgRKhntFAYnGFxth3bdpSdeVa1BFVRFlz4KTk=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.301.gaa3d1f39/bundle/docker-credential-up/darwin_arm64.tar.gz" + "hash": "sha256-/izZizyqsBJMYELKhU8KOXUeOv9l+gbmidq0EnBHpbY=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.319.gfbb14165/bundle/docker-credential-up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-KugJ8I6fpWLovBhfnnGBq+OgwGOi7VbWx+MhuwqEFKU=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.301.gaa3d1f39/bundle/docker-credential-up/linux_arm64.tar.gz" + "hash": "sha256-kc5d9hdKHWd8oys0x/+RBNvB5xHMCBB+YRTOQWw26PQ=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.319.gfbb14165/bundle/docker-credential-up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-PCd4qBLAktUNlGWtfJyT2P2mzteyhbLODhaharEHyhs=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.301.gaa3d1f39/bundle/docker-credential-up/darwin_amd64.tar.gz" + "hash": "sha256-7XRb35x5r9bqkJc4Hi9YbAAF7tK2tdyxTiYD0PQuwsY=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.319.gfbb14165/bundle/docker-credential-up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-lBvQ+37tQqGLwbSihZlY4egzr+4GyoOYfGEyxSnP8cU=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.301.gaa3d1f39/bundle/docker-credential-up/linux_amd64.tar.gz" + "hash": "sha256-peGrumeN6iD2Yl5RgBOdLdpkoiA2JMyGe1Z/OkmiogY=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.319.gfbb14165/bundle/docker-credential-up/linux_amd64.tar.gz" } }, "up": { "aarch64-darwin": { - "hash": "sha256-Fw6ucwazCy3VSTJ4vCFRQthp33dpbznqOfUq2UVBQHE=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.301.gaa3d1f39/bundle/up/darwin_arm64.tar.gz" + "hash": "sha256-VtuDCMA6C2oRcIGMFkWkftsOe9SwTNk7FXxFQfpA5sk=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.319.gfbb14165/bundle/up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-OEo0HvcsOH1hCz/cCMDoEhJO0mYKQd2gmFaHMztSvM8=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.301.gaa3d1f39/bundle/up/linux_arm64.tar.gz" + "hash": "sha256-5mrDsZUXiGzWK8I5P2fQZi3iNLGSy0OCxz8GdJH9wyU=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.319.gfbb14165/bundle/up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-S+hdh01O+lit/1AJz95mbZJugujRxwpxPlOjRpHAzj0=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.301.gaa3d1f39/bundle/up/darwin_amd64.tar.gz" + "hash": "sha256-EmD2YruVppeXMhbX9EVTr800MMHj36CtS/QVC3AasPk=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.319.gfbb14165/bundle/up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-l4Wz8Frj/3wmCKKwSy+jMklRJrw+Ca/YD6VApE5795k=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.301.gaa3d1f39/bundle/up/linux_amd64.tar.gz" + "hash": "sha256-EFfe70yKImxLqkWjMgjXEhoBbDu+kVJMy+Ladpxg2BU=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.319.gfbb14165/bundle/up/linux_amd64.tar.gz" } } }, @@ -49,5 +49,5 @@ "x86_64-darwin", "x86_64-linux" ], - "version": "0.39.0-0.rc.0.301.gaa3d1f39" + "version": "0.39.0-0.rc.0.319.gfbb14165" } diff --git a/pkgs/by-name/up/update-python-libraries/package.nix b/pkgs/by-name/up/update-python-libraries/package.nix index 46e0e3b7f772..0bf7b9b697ee 100644 --- a/pkgs/by-name/up/update-python-libraries/package.nix +++ b/pkgs/by-name/up/update-python-libraries/package.nix @@ -1,4 +1,5 @@ { + lib, python3, runCommand, git, @@ -9,8 +10,6 @@ runCommand "update-python-libraries" { buildInputs = [ - nix - nix-prefetch-git (python3.withPackages ( ps: with ps; [ packaging @@ -18,11 +17,14 @@ runCommand "update-python-libraries" toolz ] )) - git ]; } '' cp ${./update-python-libraries.py} $out patchShebangs $out - substituteInPlace $out --replace 'GIT = "git"' 'GIT = "${git}/bin/git"' + substituteInPlace $out \ + --replace-fail 'NIX = "nix"' 'NIX = "${lib.getExe nix}"' \ + --replace-fail 'NIX_PREFETCH_URL = "nix-prefetch-url"' 'NIX_PREFETCH_URL = "${lib.getExe' nix "nix-prefetch-url"}"' \ + --replace-fail 'NIX_PREFETCH_GIT = "nix-prefetch-git"' 'NIX_PREFETCH_GIT = "${lib.getExe nix-prefetch-git}"' \ + --replace-fail 'GIT = "git"' 'GIT = "${lib.getExe git}"' '' diff --git a/pkgs/by-name/up/update-python-libraries/update-python-libraries.py b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py index 6ee3d05c3465..0c8f81c763f6 100755 --- a/pkgs/by-name/up/update-python-libraries/update-python-libraries.py +++ b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py @@ -36,10 +36,13 @@ PRERELEASES = False BULK_UPDATE = False +NIX = "nix" +NIX_PREFETCH_URL = "nix-prefetch-url" +NIX_PREFETCH_GIT = "nix-prefetch-git" GIT = "git" NIXPKGS_ROOT = ( - subprocess.check_output(["git", "rev-parse", "--show-toplevel"]) + subprocess.check_output([GIT, "rev-parse", "--show-toplevel"]) .decode("utf-8") .strip() ) @@ -79,7 +82,7 @@ def _get_attr_value(attr_path: str) -> Optional[Any]: try: response = subprocess.check_output( [ - "nix", + NIX, "--extra-experimental-features", "nix-command", "eval", @@ -164,7 +167,7 @@ def _hash_to_sri(algorithm, value): return ( subprocess.check_output( [ - "nix", + NIX, "--extra-experimental-features", "nix-command", "hash", @@ -260,7 +263,7 @@ def _get_latest_version_github(attr_path, package, extension, current_version, t try: homepage = subprocess.check_output( [ - "nix", + NIX, "--extra-experimental-features", "nix-command", "eval", @@ -301,7 +304,7 @@ def _get_latest_version_github(attr_path, package, extension, current_version, t algorithm = "sha256" cmd = [ - "nix-prefetch-git", + NIX_PREFETCH_GIT, f"https://github.com/{owner}/{repo}.git", "--hash", algorithm, @@ -317,7 +320,7 @@ def _get_latest_version_github(attr_path, package, extension, current_version, t hash = ( subprocess.check_output( [ - "nix-prefetch-url", + NIX_PREFETCH_URL, "--type", "sha256", "--unpack", @@ -336,7 +339,7 @@ def _get_latest_version_github(attr_path, package, extension, current_version, t try: hash = ( subprocess.check_output( - ["nix-prefetch-url", "--type", "sha256", "--unpack", tag_url], + [NIX_PREFETCH_URL, "--type", "sha256", "--unpack", tag_url], stderr=subprocess.DEVNULL, ) .decode("utf-8") diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index 6fc2ca44b045..de140577146a 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "updatecli"; - version = "0.97.0"; + version = "0.98.0"; src = fetchFromGitHub { owner = "updatecli"; repo = "updatecli"; rev = "v${version}"; - hash = "sha256-3I7SRtbMKPm/j8bdIvVHkRy/5Jq8goZ0hyREsfsM5OU="; + hash = "sha256-yxVIYr/lQeiPRCG06jAjWMlIzRJ9nAkh7YvXtgxBkeQ="; }; - vendorHash = "sha256-LUc73GyBj72kwQXUEnwkkGPmkIXhAhiKJiLcc1IiAps="; + vendorHash = "sha256-A4+KcKxePtYqbBr2F4AArOsSkde6G5jy0Oljrok87ec="; # tests require network access doCheck = false; diff --git a/pkgs/by-name/ur/urn-timer/package.nix b/pkgs/by-name/ur/urn-timer/package.nix index 53f4526ce2e7..8222cac03c2b 100644 --- a/pkgs/by-name/ur/urn-timer/package.nix +++ b/pkgs/by-name/ur/urn-timer/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "urn-timer"; - version = "0-unstable-2025-02-07"; + version = "0-unstable-2025-04-17"; src = fetchFromGitHub { owner = "paoloose"; repo = "urn"; - rev = "0486ff9af0a404e73d66ea3d8ad7f9107efff35f"; - hash = "sha256-3fgKs0cWr972pYLTfIy6HLDP+GUdNog4FEQ70ACKYKI="; + rev = "5eea3f9efb03758bfafcd029406797d34e4c875b"; + hash = "sha256-rlUFZiA2fMa5QkKqKBRkiM8o2nioD0MPn6eJTJSJq3M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/us/usbfluxd/package.nix b/pkgs/by-name/us/usbfluxd/package.nix new file mode 100644 index 000000000000..db2d9490f68c --- /dev/null +++ b/pkgs/by-name/us/usbfluxd/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + libimobiledevice, + libusb1, + libusbmuxd, + usbmuxd, + libplist, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "usbfluxd"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "corellium"; + repo = "usbfluxd"; + tag = "v${finalAttrs.version}"; + hash = "sha256-tfAy3e2UssPlRB/8uReLS5f8N/xUUzbjs8sKNlr40T0="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libimobiledevice + libusb1 + libusbmuxd + usbmuxd + libplist + ]; + + postPatch = '' + substituteInPlace configure.ac \ + --replace-fail 'with_static_libplist=yes' 'with_static_libplist=no' + substituteInPlace usbfluxd/utils.h \ + --replace-fail PLIST_FORMAT_BINARY //PLIST_FORMAT_BINARY \ + --replace-fail PLIST_FORMAT_XML, NOT_PLIST_FORMAT_XML + ''; + + meta = { + homepage = "https://github.com/corellium/usbfluxd"; + description = "Redirects the standard usbmuxd socket to allow connections to local and remote usbmuxd instances so remote devices appear connected locally"; + license = lib.licenses.gpl2Plus; + mainProgram = "usbfluxctl"; + maintainers = with lib.maintainers; [ x807x ]; + }; +}) diff --git a/pkgs/by-name/ut/ut/package.nix b/pkgs/by-name/ut/ut/package.nix index 7e60398430d5..b1972404c58d 100644 --- a/pkgs/by-name/ut/ut/package.nix +++ b/pkgs/by-name/ut/ut/package.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ut"; - version = "2.3.0"; + version = "2.3.1"; cmakeFlags = [ "-DBOOST_UT_ALLOW_CPM_USE=OFF" @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "boost-ext"; repo = "ut"; rev = "v${finalAttrs.version}"; - hash = "sha256-3H3kyf58gy+VdNfj4gmIe+D1+douMwZQU7+iphO+utU="; + hash = "sha256-VCTrs0CMr4pUrJ2zEsO8s7j16zOkyDNhBc5zw0rAAZI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index c71abfeeca7d..54f9a1dd93fc 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -34,11 +34,11 @@ let in stdenv.mkDerivation rec { pname = "util-linux" + lib.optionalString isMinimal "-minimal"; - version = "2.40.4"; + version = "2.41"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz"; - hash = "sha256-XB2vczsE6YWa/cO9h8xIEYDuD4i1wJRrFv3skxl1+3k="; + hash = "sha256-ge6Ts8/f6318QJDO3rode7zpFB/QtQG2hrP+R13cpMY="; }; patches = [ @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { postPatch = '' - patchShebangs tests/run.sh tools/all_syscalls + patchShebangs tests/run.sh tools/all_syscalls tools/all_errnos substituteInPlace sys-utils/eject.c \ --replace "/bin/umount" "$bin/bin/umount" @@ -107,6 +107,7 @@ stdenv.mkDerivation rec { (lib.withFeature systemdSupport "systemd") (lib.withFeatureAs systemdSupport "systemdsystemunitdir" "${placeholder "bin"}/lib/systemd/system/") (lib.withFeatureAs systemdSupport "tmpfilesdir" "${placeholder "out"}/lib/tmpfiles.d") + (lib.withFeatureAs systemdSupport "sysusersdir" "${placeholder "out"}/lib/sysusers.d") (lib.enableFeature translateManpages "poman") "SYSCONFSTATICDIR=${placeholder "lib"}/lib" ] diff --git a/pkgs/by-name/uu/uuu/package.nix b/pkgs/by-name/uu/uuu/package.nix index 23a4d7625ab5..295063456c63 100644 --- a/pkgs/by-name/uu/uuu/package.nix +++ b/pkgs/by-name/uu/uuu/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uuu"; - version = "1.5.191"; + version = "1.5.201"; src = fetchFromGitHub { owner = "nxp-imx"; repo = "mfgtools"; rev = "uuu_${finalAttrs.version}"; - hash = "sha256-t9SvQrOpcJ646WyUqX//4Rv7M8Ix2NbjgAAlrR0e31E="; + hash = "sha256-G1Let5cJVzxKLs+4umnGfcSEvTeotqsgpZ0CDycBNEo="; }; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 6542c21fd422..10cab5638b88 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.6.14"; + version = "0.6.16"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-1ZmH757yqzXCYYRJoNGzh2Jy5ACWjNHugcY0szztBRQ="; + hash = "sha256-udghrau7ZpLngjwL4mOMvUJT8G609HuBL51Te+h66YY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-zE6WP5rFUvx6B3ti5mlXPD4Z+1VQM0qpaScszKjTNmY="; + cargoHash = "sha256-1eq5gsHcf8iAR2z89WnZNdcoToE0Cpl4HgsiffSg1wk="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix index 2989d934eb78..cb26889110e2 100644 --- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix +++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix @@ -9,12 +9,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20250326132209"; + version = "20250415151718"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-oxL9XgaTdMISdCQ37gAz4LtgV1bk09GirTtVbSOm8Z4="; + hash = "sha256-Q6/ZWwbsR8dFL6uBRFXKkuMGuWgH/VwHN3qxETbPq4k="; }; vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg="; meta = with lib; { diff --git a/pkgs/by-name/va/vale-ls/package.nix b/pkgs/by-name/va/vale-ls/package.nix index 056008249f69..1643a90ce1b5 100644 --- a/pkgs/by-name/va/vale-ls/package.nix +++ b/pkgs/by-name/va/vale-ls/package.nix @@ -6,7 +6,6 @@ rustPlatform, pkg-config, openssl, - darwin, vale, }: @@ -27,16 +26,9 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - SystemConfiguration - ] - ); + buildInputs = [ + openssl + ]; checkFlags = [ diff --git a/pkgs/by-name/va/vale/styles.nix b/pkgs/by-name/va/vale/styles.nix index c910014fbca0..72c9306f1bc1 100644 --- a/pkgs/by-name/va/vale/styles.nix +++ b/pkgs/by-name/va/vale/styles.nix @@ -61,12 +61,12 @@ in google = buildStyle rec { name = "Google"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "errata-ai"; repo = "Google"; rev = "v${version}"; - hash = "sha256-ldwK9tMA04H/jTd3dQeRX/sZOwZcyPb+I56cDg0vZDg="; + hash = "sha256-1aN7wCdShhMsBN83u7l+5Ffm2WKC8ltZyT3hPZCNWYo="; }; meta = { description = "Vale-compatible implementation of the Google Developer Documentation Style Guide"; @@ -93,12 +93,12 @@ in microsoft = buildStyle rec { name = "Microsoft"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "errata-ai"; repo = "Microsoft"; rev = "v${version}"; - hash = "sha256-4j05bIGAVEy6untUqtrUxdLKlhyOcJsbcsow8OxRp1A="; + hash = "sha256-Sie4bBeKPOFOJhgd+mLbiz4vG+xpKL0LnwnRQHzOw+Q="; }; meta = { description = "Vale-compatible implementation of the Microsoft Writing Style Guide"; diff --git a/pkgs/by-name/va/vault-bin/package.nix b/pkgs/by-name/va/vault-bin/package.nix index d8ffe3d123bb..210f6625176c 100644 --- a/pkgs/by-name/va/vault-bin/package.nix +++ b/pkgs/by-name/va/vault-bin/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.19.1"; + version = "1.19.2"; src = let @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-sKFUVnKG6NIsAI4seRaRQt/qh4MkjL0JSbjWBdeKpow="; - aarch64-linux = "sha256-k2142jQBtQPz79hr/GDae33j2bMbCi35BS2Qb4PpWKE="; - i686-linux = "sha256-edSKcSwb9rumMs7oTCOqEpGlmo07u7Nkzl4i5fB+/Hk="; - x86_64-darwin = "sha256-O1wEfn0EhLTUOXCpWaIIxCQku0Og+0i0SodMrnovPMc="; - aarch64-darwin = "sha256-3UBvZW+4rYR+ELQkwnV1Z/J409NTE+7rEZkP6ld1y7M="; + x86_64-linux = "sha256-11c1zmYHjefDX2bRXfFSzwzhOtAO4hbrbL9bTeAkvDM="; + aarch64-linux = "sha256-Y5KKw6IMNM9Zix98mRy4HNKBchGrQ3hLhWIlVZwNsK4="; + i686-linux = "sha256-iFldcD9Tr2oV//PhT3uvG9+xck5c5GWstbVobkyck8U="; + x86_64-darwin = "sha256-Z678lFCTXmbX4Dtsbrp9pwwP9Qfok01nHpet9yTbn8c="; + aarch64-darwin = "sha256-uKQHSekbuluRTrwWItQkAJFydsBolmLzCBQ9gMpDbt8="; }; in fetchzip { diff --git a/pkgs/by-name/vc/vcdimager/package.nix b/pkgs/by-name/vc/vcdimager/package.nix index af77f7532c30..22cc7d2101df 100644 --- a/pkgs/by-name/vc/vcdimager/package.nix +++ b/pkgs/by-name/vc/vcdimager/package.nix @@ -7,7 +7,6 @@ libxml2, popt, libiconv, - darwin, }: stdenv.mkDerivation rec { @@ -21,19 +20,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libxml2 - popt - libiconv - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - IOKit - DiskArbitration - ] - ); + buildInputs = [ + libxml2 + popt + libiconv + ]; propagatedBuildInputs = [ libcdio ]; diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix index 362a47ff0a81..9692f6ed11d9 100644 --- a/pkgs/by-name/ve/vector/package.nix +++ b/pkgs/by-name/ve/vector/package.nix @@ -25,7 +25,7 @@ let pname = "vector"; - version = "0.46.0"; + version = "0.46.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -34,11 +34,11 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-7zz2Kzl1Mg/Y/f9jAYk1QZ4QweHPwQfeRQkSPyRy354="; + hash = "sha256-ouPCBaG/wwjIyzXA5PgBRpAtOJ5IuOrS+k4p6/KRzzY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-XEr7Hhx/Aj7phL6mKY4TSjsQGf0C1QPYkNCnuu1s6uY="; + cargoHash = "sha256-Bl/dgkoF9Hx1hLt9+kZiyK42GNr+5UGJYy5QZOnHDV4="; nativeBuildInputs = [ diff --git a/pkgs/by-name/ve/vectorcode/package.nix b/pkgs/by-name/ve/vectorcode/package.nix index 5ab9bcbffb37..51d941d15c08 100644 --- a/pkgs/by-name/ve/vectorcode/package.nix +++ b/pkgs/by-name/ve/vectorcode/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "vectorcode"; - version = "0.5.5"; + version = "0.5.6"; pyproject = true; src = fetchFromGitHub { owner = "Davidyz"; repo = "VectorCode"; tag = version; - hash = "sha256-hoANo+CqGvMyFSPDVYVWJUf6UUo3n9C1Yu8xt5yrZUs="; + hash = "sha256-paFUgPf8zTtMli0qh2bXjnmny2bDQxDwWE03yn0rWUY="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix index ec4f19b3da86..8489eba95d05 100644 --- a/pkgs/by-name/ve/versatiles/package.nix +++ b/pkgs/by-name/ve/versatiles/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "versatiles"; - version = "0.15.4"; # When updating: Replace with current version + version = "0.15.5"; # When updating: Replace with current version src = fetchFromGitHub { owner = "versatiles-org"; repo = "versatiles-rs"; tag = "v${version}"; # When updating: Replace with long commit hash of new version - hash = "sha256-C9LTfRi6FRRg4yUIbs1DMtOtILTO/ItjWGnuKwUSHeU="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed. + hash = "sha256-j50KZBYNzO9YNq6Nu3hozBmR2+KHbpCZuowSWMZ4yk4="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed. }; useFetchCargoVendor = true; - cargoHash = "sha256-B9QCkAjyak2rX3waMG74KBbBVKn2veliMl7tAS41HQQ="; # When updating: Same as above + cargoHash = "sha256-SmN/E7vvf9aoopOyigiZJoYBp1mADter4gCwI/tsG0Q="; # When updating: Same as above __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix index 8c3340b508a9..906d68d38d48 100644 --- a/pkgs/by-name/ve/veryl/package.nix +++ b/pkgs/by-name/ve/veryl/package.nix @@ -6,7 +6,6 @@ installShellFiles, dbus, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -29,16 +28,9 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = - [ - dbus - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + dbus + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd veryl \ diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 9ceee9d8fff6..48c57c269c81 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -13,7 +13,7 @@ pipewire, libpulseaudio, autoPatchelfHook, - pnpm_9, + pnpm_10, nodejs, nix-update-script, withTTS ? true, @@ -24,29 +24,29 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; rev = "v${finalAttrs.version}"; - hash = "sha256-z2MKnCWDWUczoz39zzBYRB6wiSU1SRRHLpeUZeJqbLc="; + hash = "sha256-hY707k3kpfbDaRsLisVQFUeWgsxkYJ29GTdQtdeC0X4="; }; - pnpmDeps = pnpm_9.fetchDeps { + pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src patches ; - hash = "sha256-xn3yE2S6hfCijV+Edx3PYgGro8eF76/GqarOIRj9Tbg="; + hash = "sha256-pL4pxIB+tF9Lv5eQdLilvg/T4knjzPqBMbTxoZ3RqbI="; }; nativeBuildInputs = [ nodejs - pnpm_9.configHook + pnpm_10.configHook ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # vesktop uses venmic, which is a shipped as a prebuilt node module @@ -139,7 +139,10 @@ stdenv.mkDerivation (finalAttrs: { lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper ${electron}/bin/electron $out/bin/vesktop \ --add-flags $out/opt/Vesktop/resources/app.asar \ - ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ + ${lib.strings.optionalString withTTS '' + --run 'if [[ "''${NIXOS_SPEECH:-default}" != "False" ]]; then NIXOS_SPEECH=True; else unset NIXOS_SPEECH; fi' \ + --add-flags "\''${NIXOS_SPEECH:+--enable-speech-dispatcher}" \ + ''} \ ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" '' diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix index d322f6371f30..2e0e84274dcc 100644 --- a/pkgs/by-name/vg/vgmstream/package.nix +++ b/pkgs/by-name/vg/vgmstream/package.nix @@ -1,6 +1,7 @@ { stdenv, lib, + fetchzip, fetchFromGitHub, cmake, pkg-config, @@ -10,10 +11,8 @@ ffmpeg, libvorbis, libao, - jansson, speex, nix-update-script, - buildAudaciousPlugin ? false, # only build cli by default, pkgs.audacious-plugins sets this to enable plugin support }: stdenv.mkDerivation rec { @@ -27,6 +26,24 @@ stdenv.mkDerivation rec { hash = "sha256-TmaWC04XbtFfBYhmTO4ouh3NoByio1BCpDJGJy3r0NY="; }; + # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/atrac9.cmake + atrac9-src = fetchFromGitHub { + owner = "Thealexbarney"; + repo = "LibAtrac9"; + rev = "6a9e00f6c7abd74d037fd210b6670d3cdb313049"; + hash = "sha256-n47CzIbh8NxJ4GzKLjZQeS27k2lGx08trC1m4AOzVZc="; + }; + + # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/celt.cmake + celt-0_6_1-src = fetchzip { + url = "https://downloads.xiph.org/releases/celt/celt-0.6.1.tar.gz"; + hash = "sha256-DI1z10mTDQOn/R1FssaegmOa6ZNx3bXNiWHwLnytJWw="; + }; + celt-0_11_0-src = fetchzip { + url = "https://downloads.xiph.org/releases/celt/celt-0.11.0.tar.gz"; + hash = "sha256-JI3b44iCxQ29bqJGNH/L18pEuWiTFZ2132ceaqe8U0E="; + }; + passthru.updateScript = nix-update-script { attrPath = "vgmstream"; extraArgs = [ @@ -35,35 +52,56 @@ stdenv.mkDerivation rec { ]; }; + outputs = [ + "out" + "audacious" + ]; + nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optional buildAudaciousPlugin gtk3; + gtk3 + ]; buildInputs = [ mpg123 ffmpeg libvorbis libao - jansson speex - ] ++ lib.optional buildAudaciousPlugin audacious-bare; + audacious-bare + ]; - preConfigure = '' - substituteInPlace cmake/dependencies/audacious.cmake \ - --replace "pkg_get_variable(AUDACIOUS_PLUGIN_DIR audacious plugin_dir)" "set(AUDACIOUS_PLUGIN_DIR \"$out/lib/audacious\")" - ''; + preConfigure = + '' + substituteInPlace cmake/dependencies/audacious.cmake \ + --replace-fail "pkg_get_variable(AUDACIOUS_PLUGIN_DIR audacious plugin_dir)" "set(AUDACIOUS_PLUGIN_DIR \"$audacious/lib/audacious\")" + '' + + + # cmake/dependencies/celt.cmake uses configure_file to modify ${CELT_0110_PATH}/libcelt/ecintrin.h. + # Therefore, CELT_0110_PATH needs to point to a mutable directory. + '' + mkdir -p dependencies/celt-0.11.0/ + cp -r ${celt-0_11_0-src}/* dependencies/celt-0.11.0/ + chmod -R +w dependencies/celt-0.11.0/ + ''; cmakeFlags = [ - # It always tries to download it, no option to use the system one - "-DUSE_CELT=OFF" - ] ++ lib.optional (!buildAudaciousPlugin) "-DBUILD_AUDACIOUS=OFF"; + "-DATRAC9_PATH=${atrac9-src}" + "-DCELT_0061_PATH=${celt-0_6_1-src}" + "-DCELT_0110_PATH=../dependencies/celt-0.11.0" + # libg719_decode omitted because it doesn't have a free software license + ]; meta = with lib; { description = "Library for playback of various streamed audio formats used in video games"; homepage = "https://vgmstream.org"; maintainers = with maintainers; [ zane ]; - license = with licenses; isc; + license = with licenses; [ + isc # vgmstream itself + mit # atrac9 + bsd2 # celt + ]; platforms = with platforms; unix; }; } diff --git a/pkgs/by-name/vi/vi-mongo/package.nix b/pkgs/by-name/vi/vi-mongo/package.nix index f7f7c1b0ed15..0260bbcf575e 100644 --- a/pkgs/by-name/vi/vi-mongo/package.nix +++ b/pkgs/by-name/vi/vi-mongo/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "vi-mongo"; - version = "0.1.23"; + version = "0.1.24"; src = fetchFromGitHub { owner = "kopecmaciej"; repo = "vi-mongo"; tag = "v${version}"; - hash = "sha256-zQgGclK6iUtN1PMBSuYVYE8tS1qHTKcTDWDYqhVp3Hg="; + hash = "sha256-L4LbVeH8Fgz7RD0tcyyKpP7+/aTvn1zfl+RpsWwiSfA="; }; vendorHash = "sha256-rKXrmK0ns3FB6EGyCJ2nYrCUsQ7yPm8dmzJioiVzHIc="; diff --git a/pkgs/by-name/vi/vimb-unwrapped/package.nix b/pkgs/by-name/vi/vimb-unwrapped/package.nix index 269e78b8c05b..d01cb36edc07 100644 --- a/pkgs/by-name/vi/vimb-unwrapped/package.nix +++ b/pkgs/by-name/vi/vimb-unwrapped/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, pkg-config, - libsoup_2_4, + libsoup_3, webkitgtk_4_1, gtk3, glib-networking, @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - libsoup_2_4 + libsoup_3 webkitgtk_4_1 glib-networking gsettings-desktop-schemas diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix index 17ba8a23d8ad..66c9567b8ad6 100644 --- a/pkgs/by-name/vi/vintagestory/package.nix +++ b/pkgs/by-name/vi/vintagestory/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.20.6"; + version = "1.20.7"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; - hash = "sha256-/4ITVd/vdQaM9uWgpp1//XF2W+HgEBKkZlGvW2csECk="; + hash = "sha256-1SBJ4E3rQBFPSCgb2Z3knEO5Y+xyJE4kyJW4we75CWA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix index 0c1785e560a6..af787bed0bb0 100644 --- a/pkgs/by-name/vi/vips/package.nix +++ b/pkgs/by-name/vi/vips/package.nix @@ -13,9 +13,7 @@ buildPackages, # Build inputs - ApplicationServices, expat, - Foundation, glib, libxml2, python3, @@ -87,41 +85,36 @@ stdenv.mkDerivation (finalAttrs: { gtk-doc ]; - buildInputs = - [ - glib - libxml2 - expat - (python3.withPackages (p: [ p.pycairo ])) + buildInputs = [ + glib + libxml2 + expat + (python3.withPackages (p: [ p.pycairo ])) - # Optional dependencies - cfitsio - cgif - fftw - imagemagick - lcms2 - libarchive - libexif - libheif - libhwy - libimagequant - libjpeg - libjxl - librsvg - libspng - libtiff - libwebp - matio - openexr - openjpeg - openslide - pango - poppler - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - ApplicationServices - Foundation - ]; + # Optional dependencies + cfitsio + cgif + fftw + imagemagick + lcms2 + libarchive + libexif + libheif + libhwy + libimagequant + libjpeg + libjxl + librsvg + libspng + libtiff + libwebp + matio + openexr + openjpeg + openslide + pango + poppler + ]; # Required by .pc file propagatedBuildInputs = [ diff --git a/pkgs/by-name/vi/virglrenderer/package.nix b/pkgs/by-name/vi/virglrenderer/package.nix index f949538cff57..f6e57ea1d598 100644 --- a/pkgs/by-name/vi/virglrenderer/package.nix +++ b/pkgs/by-name/vi/virglrenderer/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "virglrenderer"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/${version}/virglrenderer-${version}.tar.bz2"; - hash = "sha256-XGgKst7ENLKCUv0jU/HiEtTYe+7b9sHnSufj0PZVsb0="; + hash = "sha256-D+SJqBL76z1nGBmcJ7Dzb41RvFxU2Ak6rVOwDRB94rM="; }; separateDebugInfo = true; @@ -51,7 +51,9 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 + (python3.withPackages (ps: [ + ps.pyyaml + ])) ]; mesonFlags = diff --git a/pkgs/by-name/vi/virtio-win/package.nix b/pkgs/by-name/vi/virtio-win/package.nix index 8e81a5c611e0..a9d2b641e014 100644 --- a/pkgs/by-name/vi/virtio-win/package.nix +++ b/pkgs/by-name/vi/virtio-win/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "virtio-win"; - version = "0.1.266-1"; + version = "0.1.271-1"; src = fetchurl { url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso"; - hash = "sha256-V7D23I3JLcKuhiH4sb+9ioc96b7ceIxMSzBeoorMd80="; + hash = "sha256-u+YWathqSQyu+tQ4/viqSUkmywobN/oSEpJc/YFlZCk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vi/virtualpg/package.nix b/pkgs/by-name/vi/virtualpg/package.nix index a32c0d46f1c6..094d74e3f5d2 100644 --- a/pkgs/by-name/vi/virtualpg/package.nix +++ b/pkgs/by-name/vi/virtualpg/package.nix @@ -5,7 +5,6 @@ validatePkgConfig, libpq, sqlite, - darwin, }: stdenv.mkDerivation rec { @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpq sqlite - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Kerberos ]; + ]; meta = with lib; { description = "Loadable dynamic extension to both SQLite and SpatiaLite"; diff --git a/pkgs/by-name/vi/visp/package.nix b/pkgs/by-name/vi/visp/package.nix index 35ffac76f144..d245e1162b45 100644 --- a/pkgs/by-name/vi/visp/package.nix +++ b/pkgs/by-name/vi/visp/package.nix @@ -1,7 +1,6 @@ { cmake, coin3d, - darwin, doxygen, eigen, fetchFromGitHub, @@ -88,8 +87,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ coin3d v4l-utils - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.IOKit ]; + ]; doCheck = true; diff --git a/pkgs/by-name/vl/vlang/package.nix b/pkgs/by-name/vl/vlang/package.nix index 2b3cdbaf80a0..8f5ca40616ce 100644 --- a/pkgs/by-name/vl/vlang/package.nix +++ b/pkgs/by-name/vl/vlang/package.nix @@ -10,7 +10,6 @@ boehmgc, xorg, binaryen, - darwin, }: let @@ -76,9 +75,6 @@ stdenv.mkDerivation { [ binaryen ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 xorg.libXau diff --git a/pkgs/by-name/vl/vlc/deterministic-plugin-cache.diff b/pkgs/by-name/vl/vlc/deterministic-plugin-cache.diff new file mode 100644 index 000000000000..becb547c1c39 --- /dev/null +++ b/pkgs/by-name/vl/vlc/deterministic-plugin-cache.diff @@ -0,0 +1,28 @@ +diff --git a/src/modules/bank.c b/src/modules/bank.c +index 52037d5b59..c94e71fef9 100644 +--- a/src/modules/bank.c ++++ b/src/modules/bank.c +@@ -461,6 +461,11 @@ static void AllocatePluginDir (module_bank_t *bank, unsigned maxdepth, + closedir (dh); + } + ++static int plugin_cmp(const void *first, const void *second) ++{ ++ return strcmp((*(vlc_plugin_t **) first)->path, (*(vlc_plugin_t **) second)->path); ++} ++ + /** + * Scans for plug-ins within a file system hierarchy. + * \param path base directory to browse +@@ -500,8 +505,10 @@ static void AllocatePluginPath(vlc_object_t *obj, const char *path, + vlc_plugin_store(plugin); + } + +- if (mode & CACHE_WRITE_FILE) ++ if (mode & CACHE_WRITE_FILE) { ++ qsort(bank.plugins, bank.size, sizeof(vlc_plugin_t *), plugin_cmp); + CacheSave(obj, path, bank.plugins, bank.size); ++ } + + free(bank.plugins); + } diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix index 38bb14b8b89c..6bfb919b9307 100644 --- a/pkgs/by-name/vl/vlc/package.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -245,6 +245,9 @@ stdenv.mkDerivation (finalAttrs: { url = "https://code.videolan.org/videolan/vlc/-/commit/ba5dc03aecc1d96f81b76838f845ebde7348cf62.diff"; hash = "sha256-s6AI9O0V3AKOyw9LbQ9CgjaCi5m5+nLacKNLl5ZLC6Q="; }) + # make the plugins.dat file generation reproducible + # upstream merge request: https://code.videolan.org/videolan/vlc/-/merge_requests/7149 + ./deterministic-plugin-cache.diff ]; postPatch = diff --git a/pkgs/by-name/vn/vnote/package.nix b/pkgs/by-name/vn/vnote/package.nix index 48d675880deb..de221b81de22 100644 --- a/pkgs/by-name/vn/vnote/package.nix +++ b/pkgs/by-name/vn/vnote/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "vnote"; - version = "3.18.2"; + version = "3.19.0"; src = fetchFromGitHub { owner = "vnotex"; repo = "vnote"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-2yNhWDExxg5A6DgGtKAtql3HsJuYG1YM/NjUJ718jRw="; + hash = "sha256-HR7ZxLxFMYaBrBuK7pWGxlCS6WoKITWn8s83fF3Cp/U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vo/vors/package.nix b/pkgs/by-name/vo/vors/package.nix new file mode 100644 index 000000000000..b8c6dc90f9e5 --- /dev/null +++ b/pkgs/by-name/vo/vors/package.nix @@ -0,0 +1,108 @@ +{ + curl, + fetchurl, + lib, + genericUpdater, + go, + perl, + stdenv, + writeShellScript, + zstd, + pkg-config, + opusfile, + sox, + makeWrapper, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vors"; + version = "3.1.0"; + + src = fetchurl { + url = "http://www.vors.stargrave.org/download/vors-${finalAttrs.version}.tar.zst"; + hash = "sha256-ZRQI96j0n00eh1qxO8NgJeOQPU9bfzHoHa45xQNuzv8="; + }; + + buildInputs = [ + go + opusfile + sox + ]; + + nativeBuildInputs = [ + zstd + pkg-config + perl + makeWrapper + ]; + + preConfigure = "export GOCACHE=$NIX_BUILD_TOP/gocache"; + + buildPhase = '' + runHook preBuild + ./mk-non-static + mkdir -p ./local/lib # Required to prevent building libopusfile + ./build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p "$out"/bin + cp -f bin/* "$out"/bin + chmod 755 "$out"/bin/* + runHook postInstall + ''; + + postInstall = '' + wrapProgram "$out"/bin/vors-client \ + --prefix PATH : ${lib.makeBinPath [ sox ]} + ''; + + enableParallelBuilding = true; + + passthru.updateScript = genericUpdater { + versionLister = writeShellScript "vors-versionLister" '' + ${curl}/bin/curl -s ${finalAttrs.meta.downloadPage} | ${perl}/bin/perl -lne 'print $1 if /td.*>([0-9.]+)=3.3.0 <4.0.0" + "dart": ">=3.7.0 <4.0.0" } } diff --git a/pkgs/by-name/vs/vscode-runner/update.sh b/pkgs/by-name/vs/vscode-runner/update.sh new file mode 100755 index 000000000000..faef7c5b66e6 --- /dev/null +++ b/pkgs/by-name/vs/vscode-runner/update.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p yq jq common-updater-scripts dart + +set -xeu -o pipefail + +PACKAGE_DIR="$(realpath "$(dirname "$0")")" +cd "$PACKAGE_DIR/.." +while ! test -f flake.nix; do cd ..; done +NIXPKGS_DIR="$PWD" + +# Get latest version number from GitHub +version="$( + curl --silent https://api.github.com/repos/Merrit/vscode-runner/releases/latest | + jq '.tag_name | ltrimstr("v")' --raw-output +)" + +# Update to latest version +cd "$NIXPKGS_DIR" +update-source-version vscode-runner "$version" + +# Create new pubspec.lock.json +TMPDIR="$(mktemp -d)" +cd "$TMPDIR" + +src=$(nix-build --no-link "$NIXPKGS_DIR" -A vscode-runner.src) +cp $src/pubspec.* . + +if ! test -f pubspec.lock; then + dart pub update +fi + +yq . pubspec.lock > "$PACKAGE_DIR/pubspec.lock.json" + +rm -rf "$TMPDIR" diff --git a/pkgs/by-name/vs/vsmartcard-pcsc-relay/package.nix b/pkgs/by-name/vs/vsmartcard-pcsc-relay/package.nix index 390eb579b0bf..db046be77a24 100644 --- a/pkgs/by-name/vs/vsmartcard-pcsc-relay/package.nix +++ b/pkgs/by-name/vs/vsmartcard-pcsc-relay/package.nix @@ -10,7 +10,6 @@ help2man, gengetopt, vsmartcard-vpcd, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -27,24 +26,20 @@ stdenv.mkDerivation (finalAttrs: { help2man ]; - buildInputs = - [ - pcsclite - libnfc - gengetopt - (python3.withPackages ( - pp: with pp; [ - pyscard - pycrypto - pbkdf2 - pillow - gnureadline - ] - )) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.PCSC - ]; + buildInputs = [ + pcsclite + libnfc + gengetopt + (python3.withPackages ( + pp: with pp; [ + pyscard + pycrypto + pbkdf2 + pillow + gnureadline + ] + )) + ]; meta = { description = "Relays a smart card using an contact-less interface"; diff --git a/pkgs/by-name/vs/vsmartcard-vpcd/package.nix b/pkgs/by-name/vs/vsmartcard-vpcd/package.nix index 490115a6ce8b..a3f78c82d9ab 100644 --- a/pkgs/by-name/vs/vsmartcard-vpcd/package.nix +++ b/pkgs/by-name/vs/vsmartcard-vpcd/package.nix @@ -9,7 +9,6 @@ qrencode, python3, help2man, - darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -32,23 +31,19 @@ stdenv.mkDerivation (finalAttrs: { help2man ]; - buildInputs = - [ - pcsclite - qrencode - (python3.withPackages ( - pp: with pp; [ - pyscard - pycrypto - pbkdf2 - pillow - gnureadline - ] - )) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.PCSC - ]; + buildInputs = [ + pcsclite + qrencode + (python3.withPackages ( + pp: with pp; [ + pyscard + pycrypto + pbkdf2 + pillow + gnureadline + ] + )) + ]; configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--enable-infoplist"; diff --git a/pkgs/by-name/vu/vulkan-cts/package.nix b/pkgs/by-name/vu/vulkan-cts/package.nix index 3312042202be..d5e752a47358 100644 --- a/pkgs/by-name/vu/vulkan-cts/package.nix +++ b/pkgs/by-name/vu/vulkan-cts/package.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.10.0"; + version = "1.4.2.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "vulkan-cts-${finalAttrs.version}"; - hash = "sha256-owa4Z/gu9+plPxeSfduS3gUk9WTOHSDoXLTBju6tTGc="; + hash = "sha256-+ydv67uQkoofU3GrSJWosb99DrGDGs80z+hq9MpFIpA="; }; prePatch = '' @@ -107,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: { # For vulkan-validation-layers "-DGLSLANG_INSTALL_DIR=${glslang}" "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" + "-DSELECTED_BUILD_TARGETS=deqp-vk" ]; postInstall = '' @@ -114,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { ! test -e $out mkdir -p $out/bin $out/archive-dir - cp -a external/vulkancts/modules/vulkan/deqp-vk external/vulkancts/modules/vulkan/deqp-vksc $out/bin/ + cp -a external/vulkancts/modules/vulkan/deqp-vk $out/bin/ cp -a external/vulkancts/modules/vulkan/vulkan $out/archive-dir/ cp -a external/vulkancts/modules/vulkan/vk-default $out/ diff --git a/pkgs/by-name/vu/vulkan-cts/sources.nix b/pkgs/by-name/vu/vulkan-cts/sources.nix index e220164a5039..34a9ab4effbe 100644 --- a/pkgs/by-name/vu/vulkan-cts/sources.nix +++ b/pkgs/by-name/vu/vulkan-cts/sources.nix @@ -4,15 +4,15 @@ rec { amber = fetchFromGitHub { owner = "google"; repo = "amber"; - rev = "67fea651b886460d7b72295e680528c059bbbe40"; - hash = "sha256-oDN7UdyfNMG4r36nnRJmYdbd0wyd1titGQQNa9e/3tU="; + rev = "6fa5ac1fb3b01c93eef3caa2aeb8841565e38d90"; + hash = "sha256-JUrOz+hpGk8rgxMLzrCrfbM60HsLyRnf6cG4j2BqMq0="; }; glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "c5b76b78c9dec95251e9c1840a671e19bf61abe3"; - hash = "sha256-N7vGPqQieWnr+mbrmdbvzz7n9q3bbRKLxkYt6OiaJvU="; + rev = "1b65bd602b23d401d1c4c86dfa90a36a52c66294"; + hash = "sha256-W1a6qeW4W4eNMl2UXEl0HpuLngtUjVsJI/MaiZ5wcWQ="; }; jsoncpp = fetchFromGitHub { @@ -25,40 +25,54 @@ rec { nvidia-video-samples = fetchFromGitHub { owner = "Igalia"; repo = "vk_video_samples"; - rev = "6821adf11eb4f84a2168264b954c170d03237699"; - hash = "sha256-prshOzxUHLYi64Pbyytsp+XvmtIIyhx/3n5IVimYH64="; + rev = "45fe88b456c683120138f052ea81f0a958ff3ec4"; + hash = "sha256-U5IoiRKXsdletVlnHVz8rgMEwDOZFAuld5Bzs0rvcR4="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801"; - hash = "sha256-o1yRTvP7a+XVwendTKBJKNnelVGWLD0gH258GGeUDhQ="; + rev = "767e901c986e9755a17e7939b3046fc2911a4bbd"; + hash = "sha256-mXj6HDIEEjvGLO3nJEIRxdJN28/xUA2W+r9SRnh71LU="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "44936c4a9d42f1c67e34babb5792adf5bce7f76b"; - hash = "sha256-kSiP94hMlblFod2mQhlAQDAENGOvBh7v8bCxxaiYWq4="; + rev = "3364b982713a0440d1d342dd5eec65b122a61b71"; + hash = "sha256-zVo1i/AgwPBXVXgKpdubX0TTu7gqoX88BzZfhRZ4Z2o="; + }; + + video_generator = fetchFromGitHub { + owner = "Igalia"; + repo = "video_generator"; + rev = "426300e12a5cc5d4676807039a1be237a2b68187"; + hash = "sha256-zdYYpX3hed7i5onY7c60LnM/e6PLa3VdrhXTV9oSlvg="; }; vulkan-docs = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Docs"; - rev = "486e4b289053a7d64784e7ce791711843c60c235"; - hash = "sha256-LGAHUeWF9X6Li1HcdD14pgnBUquWxA+bQpAL09JmwLQ="; + rev = "645c59c70e826d9738b6bb103316c03d887dfed3"; + hash = "sha256-r3JqAt0+JUwQS9JuWbKDx9L3ceDPQfYaAtnRz3l07ig="; }; vulkan-validationlayers = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; - rev = "9a46ae006fa5c92e2d2af7944187f7794210844b"; - hash = "sha256-qVQy3kKkZRWHjtj2YxJTZqKg1kwnmLa3bgVathisfOc="; + rev = "6cf616f131e9870c499a50441bca2d07ccda9733"; + hash = "sha256-nKamcLF17IA56tcxQLc8zUbkB9yQCW+Nag+Wn8pUqUg="; + }; + + vulkan-video-samples = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Video-Samples"; + rev = "0e87744edbb84c9c56c3fc8de9ea5150af5ee4ea"; + hash = "sha256-CZ1zoX9gI+Ac/jf2IxWk59NXPiW6qcMhj9laoZnQfd8="; }; prePatch = '' - mkdir -p external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/vulkan-docs external/vulkan-validationlayers + mkdir -p external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/video_generator external/vulkan-docs external/vulkan-validationlayers external/vulkan-video-samples cp -r ${amber} external/amber/src cp -r ${glslang} external/glslang/src @@ -66,7 +80,9 @@ rec { cp -r ${nvidia-video-samples} external/nvidia-video-samples/src cp -r ${spirv-headers} external/spirv-headers/src cp -r ${spirv-tools} external/spirv-tools/src + cp -r ${video_generator} external/video_generator/src cp -r ${vulkan-docs} external/vulkan-docs/src cp -r ${vulkan-validationlayers} external/vulkan-validationlayers/src + cp -r ${vulkan-video-samples} external/vulkan-video-samples/src ''; } diff --git a/pkgs/by-name/vu/vulkan-cts/vk-cts-sources.py b/pkgs/by-name/vu/vulkan-cts/vk-cts-sources.py index f3e42bd82e7a..c987b7b6467d 100755 --- a/pkgs/by-name/vu/vulkan-cts/vk-cts-sources.py +++ b/pkgs/by-name/vu/vulkan-cts/vk-cts-sources.py @@ -74,7 +74,7 @@ def main(): f.write(f" hash = \"{hash}\";\n"); f.write(f" }};\n"); - f.write("\n\n prePatch = ''\n"); + f.write("\n prePatch = ''\n"); f.write(" mkdir -p"); for pkg in pkgs: if isinstance(pkg, fetch_sources.GitRepo): diff --git a/pkgs/by-name/vv/vvvvvv/package.nix b/pkgs/by-name/vv/vvvvvv/package.nix index 94d1fcb6d377..e2519a1e5845 100644 --- a/pkgs/by-name/vv/vvvvvv/package.nix +++ b/pkgs/by-name/vv/vvvvvv/package.nix @@ -11,8 +11,6 @@ physfs, SDL2, tinyxml-2, - Foundation, - IOKit, makeAndPlay ? false, }: @@ -41,17 +39,12 @@ stdenv.mkDerivation rec { copyDesktopItems ]; - buildInputs = - [ - faudio - physfs - SDL2 - tinyxml-2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - IOKit - ]; + buildInputs = [ + faudio + physfs + SDL2 + tinyxml-2 + ]; cmakeDir = "../desktop_version"; diff --git a/pkgs/by-name/wa/wait4x/package.nix b/pkgs/by-name/wa/wait4x/package.nix index 7b531ed4fd84..c6f43568472c 100644 --- a/pkgs/by-name/wa/wait4x/package.nix +++ b/pkgs/by-name/wa/wait4x/package.nix @@ -5,7 +5,7 @@ }: let pname = "wait4x"; - version = "3.2.0"; + version = "3.3.0"; in buildGoModule { inherit pname version; @@ -14,10 +14,10 @@ buildGoModule { owner = "wait4x"; repo = pname; rev = "v${version}"; - hash = "sha256-UVs8tCOgPU/IwM3Z3/ehFnAbHTSOHGAO9VpcB/NItGM="; + hash = "sha256-QmuBoUHOZf6VKrh00BXFxT2e+gJL1gyv9BnhGaWVAD0="; }; - vendorHash = "sha256-lwNRRWpo2Fkpoc42URrqSLFKSGN7IfuD4759KB0uEgM="; + vendorHash = "sha256-EqJDw88BqKfIUE/YoDNoI249covv5bzEcx9ykfUkik8="; # Tests make network access doCheck = false; diff --git a/pkgs/by-name/wa/walker/package.nix b/pkgs/by-name/wa/walker/package.nix index c8f596c4e730..d16a6e6e5459 100644 --- a/pkgs/by-name/wa/walker/package.nix +++ b/pkgs/by-name/wa/walker/package.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "walker"; - version = "0.12.19"; + version = "0.12.21"; src = fetchFromGitHub { owner = "abenz1267"; repo = "walker"; rev = "v${version}"; - hash = "sha256-XOOYalJ+6V/O/fhC5gEDk2m1yZ2e5DofRRIi8ETHgoQ="; + hash = "sha256-wONW5CaPkLiVR5roGFx2SOcvcVDr9E9eCtojGBy3ErE="; }; vendorHash = "sha256-6PPNVnsH1eU4fLcZpxiBoHCzN/TUUxfTfmxDsBDPDKQ="; diff --git a/pkgs/by-name/wa/wapm/package.nix b/pkgs/by-name/wa/wapm/package.nix index d70166275e6b..385e9af0a2b1 100644 --- a/pkgs/by-name/wa/wapm/package.nix +++ b/pkgs/by-name/wa/wapm/package.nix @@ -5,8 +5,6 @@ libiconv, openssl, rustPlatform, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -25,18 +23,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ perl ]; - buildInputs = - [ - libiconv - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ + libiconv + openssl + ]; doCheck = false; diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index dd9b5f720314..b1383992a192 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-tPb4Vax6dJFrX5VV1BEq70K4OvQPfMfNjPJZ22IeKW4=", - "version": "0.2025.03.26.08.10.stable_02" + "hash": "sha256-ab4R/1Fe97mXPBBJ4OhgZaIDLBQr1nmA8lZsB2jVlRU=", + "version": "0.2025.04.16.08.11.stable_02" }, "linux_x86_64": { - "hash": "sha256-R3Z71iNpvEQ1KIh62XbuRelHIWwXzovOLuMpzAs+55Q=", - "version": "0.2025.03.26.08.10.stable_02" + "hash": "sha256-+/0PA8Z/IbgHNtk78v4d3cw0G8Kk1MQ+gN16/8nKmGg=", + "version": "0.2025.04.16.08.11.stable_02" }, "linux_aarch64": { - "hash": "sha256-sKfMab7iNsb0W+4jDPLeG3g7b2rnL6Py//kCjFltutI=", - "version": "0.2025.03.26.08.10.stable_02" + "hash": "sha256-QJsmiKyMhSD/39aBUqCQrQ5ANnFev0x+Pon7dH9XPBQ=", + "version": "0.2025.04.16.08.11.stable_02" } } diff --git a/pkgs/by-name/wa/wash-cli/package.nix b/pkgs/by-name/wa/wash-cli/package.nix index b01b2396a4bd..f3e1ff341860 100644 --- a/pkgs/by-name/wa/wash-cli/package.nix +++ b/pkgs/by-name/wa/wash-cli/package.nix @@ -1,11 +1,9 @@ { lib, - stdenv, fetchCrate, rustPlatform, pkg-config, openssl, - darwin, fetchurl, }: @@ -34,12 +32,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - darwin.apple_sdk.frameworks.CoreServices - ]; + buildInputs = [ openssl ]; preBuild = " export WASI_PREVIEW1_COMMAND_COMPONENT_ADAPTER=${wasiPreviewCommandComponentAdapter} diff --git a/pkgs/by-name/wa/wasm-pack/package.nix b/pkgs/by-name/wa/wasm-pack/package.nix index 7810cc4a08d2..24a86a73edef 100644 --- a/pkgs/by-name/wa/wasm-pack/package.nix +++ b/pkgs/by-name/wa/wasm-pack/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, cmake, pkg-config, zstd, @@ -28,9 +26,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security ++ [ - zstd - ]; + buildInputs = [ zstd ]; # Most tests rely on external resources and build artifacts. # Disabling check here to work with build sandboxing. diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix index f76ee2bb3183..8d567ddfd761 100644 --- a/pkgs/by-name/wa/wasm-tools/package.nix +++ b/pkgs/by-name/wa/wasm-tools/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.228.0"; + version = "1.229.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-tools"; rev = "v${version}"; - hash = "sha256-lVrZCjLhSCyD3aEr6IyRZejqwdiT89w0/ppmQE8Thto="; + hash = "sha256-fJQN5AKhILP7d+0GEtnHKuZtZEr/61TfGwpH1EbbSg4="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; useFetchCargoVendor = true; - cargoHash = "sha256-yUOgQRdducguVinceeIs9PGk8Pq9Y24I3KbsRcCWpAY="; + cargoHash = "sha256-OqQJ2jvceHPoSx7Iic/hsJWv8vJnEo9F1bbpqfL5HsM="; cargoBuildFlags = [ "--package" "wasm-tools" diff --git a/pkgs/by-name/wa/wasmer-pack/package.nix b/pkgs/by-name/wa/wasmer-pack/package.nix index 0536ed30e8f2..273be1c20296 100644 --- a/pkgs/by-name/wa/wasmer-pack/package.nix +++ b/pkgs/by-name/wa/wasmer-pack/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -20,10 +18,6 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-PZudXmdPz6fG7NDC/yN7qG+RQFSzNynXo6SpYJEku9A="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - cargoBuildFlags = [ "-p=wasmer-pack-cli" ]; # requires internet access diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/by-name/wa/wasmtime/package.nix similarity index 64% rename from pkgs/development/interpreters/wasmtime/default.nix rename to pkgs/by-name/wa/wasmtime/package.nix index 9201f0e9c947..d8a2e04ab4a1 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -1,21 +1,20 @@ { lib, - rustPlatform, - cmake, - rustfmt, - fetchFromGitHub, - Security, stdenv, + rustPlatform, + fetchFromGitHub, + cmake, + versionCheckHook, + nix-update-script, }: - -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "wasmtime"; version = "31.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; - repo = pname; - rev = "v${version}"; + repo = "wasmtime"; + tag = "v${finalAttrs.version}"; hash = "sha256-IQeYmqCXhzWsuufrLKeBI2sw86dXbn7c5DbmcoJTWvo="; fetchSubmodules = true; }; @@ -36,16 +35,7 @@ rustPlatform.buildRustPackage rec { "dev" ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - - # rustfmt is brought into scope to fix the following - # warning: cranelift-codegen@0.108.0: - # Failed to run `rustfmt` on ISLE-generated code: Os - # { code: 2, kind: NotFound, message: "No such file or directory" } - nativeBuildInputs = [ - cmake - rustfmt - ]; + nativeBuildInputs = [ cmake ]; doCheck = with stdenv.buildPlatform; @@ -59,15 +49,24 @@ rustPlatform.buildRustPackage rec { !isAarch64; postInstall = + let + inherit (stdenv.targetPlatform.rust) cargoShortTarget; + in '' # move libs from out to dev install -d -m 0755 $dev/lib install -m 0644 ''${!outputLib}/lib/* $dev/lib rm -r ''${!outputLib}/lib + # copy the build.rs generated c-api headers install -d -m0755 $dev/include/wasmtime - install -m0644 $src/crates/c-api/include/*.h $dev/include - install -m0644 $src/crates/c-api/include/wasmtime/*.h $dev/include/wasmtime + # https://github.com/rust-lang/cargo/issues/9661 + install -m0644 \ + target/${cargoShortTarget}/release/build/wasmtime-c-api-impl-*/out/include/*.h \ + $dev/include + install -m0644 \ + target/${cargoShortTarget}/release/build/wasmtime-c-api-impl-*/out/include/wasmtime/*.h \ + $dev/include/wasmtime '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id \ @@ -75,16 +74,26 @@ rustPlatform.buildRustPackage rec { $dev/lib/libwasmtime.dylib ''; - meta = with lib; { + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "Standalone JIT-style runtime for WebAssembly, using Cranelift"; homepage = "https://wasmtime.dev/"; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "wasmtime"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ ereslibre matthewbauer ]; - platforms = platforms.unix; - changelog = "https://github.com/bytecodealliance/wasmtime/blob/v${version}/RELEASES.md"; + platforms = lib.platforms.unix; + changelog = "https://github.com/bytecodealliance/wasmtime/blob/v${finalAttrs.version}/RELEASES.md"; }; -} +}) diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix index 3b8e300d2696..a1e24f12502c 100644 --- a/pkgs/by-name/wa/wastebin/package.nix +++ b/pkgs/by-name/wa/wastebin/package.nix @@ -5,8 +5,6 @@ pkg-config, sqlite, zstd, - stdenv, - darwin, nixosTests, }: @@ -28,14 +26,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - sqlite - zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + sqlite + zstd + ]; env = { ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/wa/wavebox/package.nix b/pkgs/by-name/wa/wavebox/package.nix index a8a0e0b29b58..fabb5162c298 100644 --- a/pkgs/by-name/wa/wavebox/package.nix +++ b/pkgs/by-name/wa/wavebox/package.nix @@ -156,11 +156,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "wavebox"; - version = "10.135.5-2"; + version = "10.135.15-2"; src = fetchurl { url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb"; - hash = "sha256-TTRTQI7CwAs4H47pkCo50yuoXsrD7DXyTyYQDycP9e8="; + hash = "sha256-nQWaPDHkwBjV7IUYf+e1NkYzXpnV15XZmqkT/Vz16Gc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/wavelog/package.nix b/pkgs/by-name/wa/wavelog/package.nix index c58471bed6d1..b98ce582c35c 100644 --- a/pkgs/by-name/wa/wavelog/package.nix +++ b/pkgs/by-name/wa/wavelog/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wavelog"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "wavelog"; repo = "wavelog"; tag = finalAttrs.version; - hash = "sha256-2cIUWrDOfKiTubS8l904dd5lJsNY9+MGtV2KBTa6fFM="; + hash = "sha256-eRig8W3H30qZUZEbE6pXaDX0fswNgnhi5nn+dwP+xSw="; }; installPhase = '' diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index e750a8f29ca6..6a6a851d765a 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -24,16 +24,14 @@ nss, nspr, vips, - wrapGAppsHook3, udev, libGL, unzip, - makeWrapper, }: let selectSystem = attrs: attrs.${stdenv.hostPlatform.system}; pname = "waveterm"; - version = "0.11.1"; + version = "0.11.2"; passthru.updateScript = ./update.sh; @@ -64,16 +62,14 @@ let fetchurl { url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/waveterm-linux-${arch}-${version}.deb"; hash = selectSystem { - x86_64-linux = "sha256-At6mNL1M0/zcDb+IbQi0+eUAGMcCmgLYk6XAlU1+8cw="; - aarch64-linux = "sha256-N6tTCfB9MqDX+OnFmuYbWs0XKEmQH7PSGuCadjM8Rmg="; + x86_64-linux = "sha256-KsE7/L5fRnpAdvcHkZGk3s0qKRDfyO00UtNH0uaCs78="; + aarch64-linux = "sha256-l2Uz2y4GQhU0UNtPMumWPPdpMqmZH1i79gg53V3wfA8="; }; }; nativeBuildInputs = [ dpkg autoPatchelfHook - wrapGAppsHook3 - makeWrapper ]; buildInputs = [ @@ -99,29 +95,27 @@ let vips ]; - runtimeDependencies = map lib.getLib [ - udev - ]; - installPhase = '' runHook preInstall - cp -r opt $out + mkdir -p $out/bin $out/app + cp -r opt/Wave $out/app/waveterm cp -r usr/share $out/share substituteInPlace $out/share/applications/waveterm.desktop \ --replace-fail "/opt/Wave/" "" + ln -s $out/app/waveterm/waveterm $out/bin/waveterm runHook postInstall ''; preFixup = '' - mkdir $out/bin - makeWrapper $out/Wave/waveterm $out/bin/waveterm \ - --prefix LD_LIBRARY_PATH : "${ + patchelf --add-needed libGL.so.1 \ + --add-rpath ${ lib.makeLibraryPath [ libGL + udev ] - }" + } $out/app/waveterm/waveterm ''; meta = metaCommon // { @@ -142,14 +136,12 @@ let fetchurl { url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip"; hash = selectSystem { - x86_64-darwin = "sha256-QkSsoMW0Ry4aLF9XtRpC7pIY84WAhtCbZGBZ1RCeMN8="; - aarch64-darwin = "sha256-mVVThER1h0EB0ONNTxaBrSvAU9PP35MSPc0eW4mfJXo="; + x86_64-darwin = "sha256-SWISlOG/NIrp7leCCSI4yH8k30Ky280yMY+yirLNGfA="; + aarch64-darwin = "sha256-9zNYpUP2KizYWUr3+o6lBgGP9S9VwIrfcY9E3L+o3KU="; }; }; - nativeBuildInputs = [ - unzip - ]; + nativeBuildInputs = [ unzip ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/wa/wayclip/package.nix b/pkgs/by-name/wa/wayclip/package.nix index 43e75ad16b87..d5279ddce99b 100644 --- a/pkgs/by-name/wa/wayclip/package.nix +++ b/pkgs/by-name/wa/wayclip/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromSourcehut, - nix-update-script, + gitUpdater, wayland, wayland-scanner, }: @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" ]; passthru = { - updateScript = nix-update-script { }; + updateScript = gitUpdater { }; }; meta = { diff --git a/pkgs/by-name/wa/waylyrics/package.nix b/pkgs/by-name/wa/waylyrics/package.nix index 5cb339592e66..4b1f4ba03ffa 100644 --- a/pkgs/by-name/wa/waylyrics/package.nix +++ b/pkgs/by-name/wa/waylyrics/package.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "waylyrics"; - version = "0.3.20"; + version = "0.3.21"; src = fetchFromGitHub { owner = "waylyrics"; repo = "waylyrics"; rev = "v${version}"; - hash = "sha256-NDdZH33tkY+TgDLkT7r+M9uHCeE9/NRQgVZhJ7EuxEc="; + hash = "sha256-uXAcoy5fnnkqtmGmaEC6Ceu+dwmZKDPOFzxC4COuDbk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dTyUPLwDcT2b3Kw4Q7/DyX6YfFcaOeDq6CCUpG9QUQQ="; + cargoHash = "sha256-moB2G/QxN3oAfCoTHXjFpIOSB2wRogEUjzup+MTfR6E="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix index 01d18f7fc169..158e1733aece 100644 --- a/pkgs/by-name/wa/waypipe/package.nix +++ b/pkgs/by-name/wa/waypipe/package.nix @@ -22,18 +22,18 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "waypipe"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; tag = "v${version}"; - hash = "sha256-E0NJTOK8wf42dXgBtsOmCKlfSLC/zEuUxLKVxwcb9Ig="; + hash = "sha256-O47b1CHCEwUSigjk0Ml3uLhRRxcPC6Phj2cnIlX1Hkg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-T2/su0DQt8KZ8diHTNz3jzeMZaW3cGcAFA6MYs1Qn3k="; + hash = "sha256-c561GpU2XENILSzk0Zka0qrtXZm7xaq/hiJA4Iv++QI="; }; strictDeps = true; diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix index ef0e55faacb4..587798733f30 100644 --- a/pkgs/by-name/we/weaviate/package.nix +++ b/pkgs/by-name/we/weaviate/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.29.1"; + version = "1.30.1"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-Akg0iY5M3X6ztKxhNEkhi03VnbNpNW7/Vcbv2KB6X54="; + hash = "sha256-Rxi21DifRnOzUgPO3U74LMQ/27NwvYzcj3INplTT1j4="; }; - vendorHash = "sha256-U2ean49ESKmcQ3fTtd6y9MwfWPr6tolvgioyKbQsBmU="; + vendorHash = "sha256-jXfVPdORMBOAl3Od3GknGo7Qtfb4H3RqGYdI6Jx1/5I="; subPackages = [ "cmd/weaviate-server" ]; diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 6eceade528b3..cbf965f8d0bc 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -17,7 +17,6 @@ let python = python3.override { packageOverrides = final: prev: { django = prev.django_5; - sentry-sdk = prev.sentry-sdk_2; djangorestframework = prev.djangorestframework.overridePythonAttrs (old: { # https://github.com/encode/django-rest-framework/discussions/9342 disabledTests = (old.disabledTests or [ ]) ++ [ "test_invalid_inputs" ]; @@ -27,7 +26,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "weblate"; - version = "5.10.4"; + version = "5.11"; pyproject = true; @@ -40,7 +39,7 @@ python.pkgs.buildPythonApplication rec { owner = "WeblateOrg"; repo = "weblate"; tag = "weblate-${version}"; - hash = "sha256-ReODTMaKMkvbaR8JETSeOrXxQIsL1Vy1pjKYWo5mw+A="; + hash = "sha256-A1XnXr97DhAZpDlttsMTBjOgdSO/bEN5jfOgZrzcxQo="; }; patches = [ @@ -89,6 +88,7 @@ python.pkgs.buildPythonApplication rec { cyrtranslit dateparser diff-match-patch + disposable-email-domains django-appconf django-celery-beat django-compressor @@ -152,6 +152,12 @@ python.pkgs.buildPythonApplication rec { postgres = with python.pkgs; [ psycopg ]; }; + pythonRelaxDeps = [ + "celery" + "rapidfuzz" + "weblate-schemas" + ]; + # We don't just use wrapGAppsNoGuiHook because we need to expose GI_TYPELIB_PATH GI_TYPELIB_PATH = lib.makeSearchPathOutput "out" "lib/girepository-1.0" [ pango @@ -171,14 +177,15 @@ python.pkgs.buildPythonApplication rec { }; }; - meta = with lib; { + meta = { description = "Web based translation tool with tight version control integration"; homepage = "https://weblate.org/"; - license = with licenses; [ + changelog = "https://github.com/WeblateOrg/weblate/releases/tag/weblate-${version}"; + license = with lib.licenses; [ gpl3Plus mit ]; - platforms = platforms.linux; - maintainers = with maintainers; [ erictapen ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ erictapen ]; }; } diff --git a/pkgs/by-name/we/websocat/package.nix b/pkgs/by-name/we/websocat/package.nix index 5e9b3602181e..f00d2aef05f3 100644 --- a/pkgs/by-name/we/websocat/package.nix +++ b/pkgs/by-name/we/websocat/package.nix @@ -2,7 +2,6 @@ lib, stdenv, bash, - darwin, fetchFromGitHub, libiconv, makeWrapper, @@ -35,7 +34,6 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security ]; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 98b7f159bd24..c40d3dcda16d 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "werf"; - version = "2.34.1"; + version = "2.35.3"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; tag = "v${finalAttrs.version}"; - hash = "sha256-hWkU3tyh0kQ9GNl5gQIs4wTRBQV0B3/0oOAhKLo1hOo="; + hash = "sha256-ebbc8pKZ8QkxGq9MttpulBkQLXcjH25Zoq8owxIamKg="; }; proxyVendor = true; - vendorHash = "sha256-x9ehxBfyk5sMg71yJcyjcrBAi5bzEnENAaqLXFoGQck="; + vendorHash = "sha256-Bgi8Pd7lON0DTSzHKaHHbqdS9S/i01tJV/x5bgmiWCo="; subPackages = [ "cmd/werf" ]; diff --git a/pkgs/by-name/wg/wgcf/package.nix b/pkgs/by-name/wg/wgcf/package.nix index 812630e6576f..8545eb51c80d 100644 --- a/pkgs/by-name/wg/wgcf/package.nix +++ b/pkgs/by-name/wg/wgcf/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "wgcf"; - version = "2.2.25"; + version = "2.2.26"; src = fetchFromGitHub { owner = "ViRb3"; repo = pname; tag = "v${version}"; - hash = "sha256-XlQ75sjMjwi7gBWHlKyYjfdtBhEw86cSH2bSHVP/qKo="; + hash = "sha256-5bVGW17zNc4sS/vwtXXWP8F4QuM+ldA00GD/z3llpCA="; }; subPackages = "."; - vendorHash = "sha256-lUC6m8nFXYUD1DJ3ODOCJ31ww0sdv2CDm6K/RAJWdWQ="; + vendorHash = "sha256-p58RrROMzkgGPDkxsfJJX3gbuglnArgqNiqXz4Y0yF8="; meta = with lib; { description = "Cross-platform, unofficial CLI for Cloudflare Warp"; diff --git a/pkgs/by-name/wg/wget2/package.nix b/pkgs/by-name/wg/wget2/package.nix index 5aa132e5ceba..f0c1c3eef7eb 100644 --- a/pkgs/by-name/wg/wget2/package.nix +++ b/pkgs/by-name/wg/wget2/package.nix @@ -11,7 +11,6 @@ # libraries brotli, bzip2, - darwin, gpgme, libhsts, libidn2, @@ -76,9 +75,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals sslSupport [ openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices ]; # TODO: include translation files diff --git a/pkgs/by-name/wg/wgpu-utils/package.nix b/pkgs/by-name/wg/wgpu-utils/package.nix index 05adb6c51a5b..0a1141b6319c 100644 --- a/pkgs/by-name/wg/wgpu-utils/package.nix +++ b/pkgs/by-name/wg/wgpu-utils/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, @@ -9,7 +8,6 @@ vulkan-loader, freetype, fontconfig, - darwin, }: rustPlatform.buildRustPackage rec { @@ -32,19 +30,10 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = - [ - freetype - fontconfig - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - QuartzCore - AppKit - ] - ); + buildInputs = [ + freetype + fontconfig + ]; # Tests fail, as the Nix sandbox doesn't provide an appropriate adapter (e.g. Vulkan). doCheck = false; diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix index 0ce94c4affe3..7f86ab0cdecc 100644 --- a/pkgs/by-name/wh/whistle/package.nix +++ b/pkgs/by-name/wh/whistle/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "whistle"; - version = "2.9.95"; + version = "2.9.96"; src = fetchFromGitHub { owner = "avwo"; repo = "whistle"; rev = "v${version}"; - hash = "sha256-yCFehRcMB5hxBRB2GjI/uTE+mA5Wfr5MeVrdj5xbJlA="; + hash = "sha256-+v+wuH/30egnBDMv/IbSIXvuFHaXLle7jvWgIA9n4YM="; }; - npmDepsHash = "sha256-uXIlQCnc1iD5rvPRCzCDWto+/5yIkuwOd96hc/Qv8OU="; + npmDepsHash = "sha256-5mxQOdHFUn/7el67stVb4B2TYGA9uC2/FQa7C/MyiTo="; dontNpmBuild = true; diff --git a/pkgs/by-name/wi/widelands/package.nix b/pkgs/by-name/wi/widelands/package.nix index 917c1f2d4370..e91f348c20f9 100644 --- a/pkgs/by-name/wi/widelands/package.nix +++ b/pkgs/by-name/wi/widelands/package.nix @@ -25,7 +25,6 @@ libSM, libICE, libXext, - darwin, }: stdenv.mkDerivation rec { @@ -62,32 +61,24 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = - [ - SDL2 - SDL2_image - SDL2_mixer - SDL2_net - SDL2_ttf - curl - glew - icu - libpng - lua - python3 - zlib - minizip - asio - libSM # XXX: these should be propagated by SDL2? - libICE - ] - ++ lib.optional stdenv.hostPlatform.isLinux libXext - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Cocoa - ] - ); + buildInputs = [ + SDL2 + SDL2_image + SDL2_mixer + SDL2_net + SDL2_ttf + curl + glew + icu + libpng + lua + python3 + zlib + minizip + asio + libSM # XXX: these should be propagated by SDL2? + libICE + ] ++ lib.optional stdenv.hostPlatform.isLinux libXext; postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/by-name/wi/wiki-tui/package.nix similarity index 88% rename from pkgs/misc/wiki-tui/default.nix rename to pkgs/by-name/wi/wiki-tui/package.nix index 2f9919ed7d42..7257c65b558e 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/by-name/wi/wiki-tui/package.nix @@ -1,12 +1,10 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, ncurses, openssl, pkg-config, - Security, }: rustPlatform.buildRustPackage rec { @@ -16,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Builditluc"; repo = "wiki-tui"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-eTDxRrTP9vX7F1lmDCuF6g1pfaZChqB8Pv1kfrd7I9w="; }; @@ -25,8 +23,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - + ]; useFetchCargoVendor = true; cargoHash = "sha256-Pe6mNbn4GFjhpFZeWMlaRt7Bj5BLiIy789hXWkII2ps="; diff --git a/pkgs/by-name/wi/winbox4/package.nix b/pkgs/by-name/wi/winbox4/package.nix index 8c2a74aa6af7..3a6b335969d7 100644 --- a/pkgs/by-name/wi/winbox4/package.nix +++ b/pkgs/by-name/wi/winbox4/package.nix @@ -18,12 +18,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "winbox"; - version = "4.0beta16"; + version = "4.0beta18"; src = fetchurl { name = "WinBox_Linux-${finalAttrs.version}.zip"; url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/WinBox_Linux.zip"; - hash = "sha256-RZpsKew3BaId6+tcwUV6fniUpCH4wIP9ab6P5oE7OAk="; + hash = "sha256-Eyvp1hCdYlyGQw+kQOZ4O2CdAMaI75GU4Uucp7RwY+0="; }; sourceRoot = "."; diff --git a/pkgs/by-name/wi/windsend-rs/package.nix b/pkgs/by-name/wi/windsend-rs/package.nix index 3b2f90726473..9d0912a7a987 100644 --- a/pkgs/by-name/wi/windsend-rs/package.nix +++ b/pkgs/by-name/wi/windsend-rs/package.nix @@ -16,18 +16,18 @@ rustPlatform.buildRustPackage rec { pname = "windsend-rs"; - version = "1.4.9"; + version = "1.5.1"; src = fetchFromGitHub { owner = "doraemonkeys"; repo = "WindSend"; tag = "v${version}"; - hash = "sha256-jmFhYCUE37yH+TTHq8Q0bO1Lp/p07PnSJDMAOGbhwOM="; + hash = "sha256-mE2pygb4o9gRUdgX/eVsr6WtZxIadxADg+3dpQgP0Ic="; }; useFetchCargoVendor = true; - cargoHash = "sha256-RmtKspTNTd3ZaucuzJk6yfDFRH7wZsOlEyJd2lNApBU="; + cargoHash = "sha256-t9J+Tu/50THWWdNdUzUH6waGUGrDc1E2GxWmb3YOt5g="; sourceRoot = "${src.name}/windSend-rs"; diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index 316eb343cda0..1fa1ddeca88b 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.6.2", + "version": "1.6.5", "vscodeVersion": "1.97.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/1eabbe10abd0f4843e53460086ba8422a1aebe02/Windsurf-darwin-arm64-1.6.2.zip", - "sha256": "42d071b20043eb16c8e23e82e4bd54115ef99e1a39f817538b9468d9467b2290" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/d87e525d4461b610eeaba26cba66153dd120ef47/Windsurf-darwin-arm64-1.6.5.zip", + "sha256": "3043acb2902d0ed9178a34591857ede56472527a5c2091a3500ef1e1537bfde7" }, "x86_64-darwin": { - "version": "1.6.2", + "version": "1.6.5", "vscodeVersion": "1.97.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/1eabbe10abd0f4843e53460086ba8422a1aebe02/Windsurf-darwin-x64-1.6.2.zip", - "sha256": "e181206a8dc6bc663afd14160ab1e4d6548ee2c99011b3a6e25b67c9f737376a" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/d87e525d4461b610eeaba26cba66153dd120ef47/Windsurf-darwin-x64-1.6.5.zip", + "sha256": "cdee5037ba3959cec5ab0cd6f18f699cf2724e19e6759e4bd180df728dc0362d" }, "x86_64-linux": { - "version": "1.6.2", + "version": "1.6.5", "vscodeVersion": "1.97.0", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/1eabbe10abd0f4843e53460086ba8422a1aebe02/Windsurf-linux-x64-1.6.2.tar.gz", - "sha256": "54b31fdafe8c8893d8eab5a2769cacc9f7e89bf4744a7f65d41dc9d7301d48c7" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/d87e525d4461b610eeaba26cba66153dd120ef47/Windsurf-linux-x64-1.6.5.tar.gz", + "sha256": "f95abc06787b8308bcfdca877049b1cd3251e8affac13d96ddbcdd2c4fa25574" } } diff --git a/pkgs/by-name/wi/windsurf/update/update.mts b/pkgs/by-name/wi/windsurf/update/update.mts index 5db74e3b5346..64fad0bbd59f 100755 --- a/pkgs/by-name/wi/windsurf/update/update.mts +++ b/pkgs/by-name/wi/windsurf/update/update.mts @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell /* -#!nix-shell -i node --pure --packages cacert nodejs_23 +#!nix-shell -i node --pure --packages cacert nodejs_latest */ import * as assert from "node:assert/strict"; import * as fsPromises from "node:fs/promises"; diff --git a/pkgs/by-name/wi/wipeout-rewrite/package.nix b/pkgs/by-name/wi/wipeout-rewrite/package.nix index 17f70e0ac692..99d3fed378fc 100644 --- a/pkgs/by-name/wi/wipeout-rewrite/package.nix +++ b/pkgs/by-name/wi/wipeout-rewrite/package.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "wipeout-rewrite"; - version = "0-unstable-2024-11-09"; + version = "0-unstable-2025-04-17"; src = fetchFromGitHub { owner = "phoboslab"; repo = "wipeout-rewrite"; - rev = "05e9c2d3a1272e631e256a76b89aca235b92e4a9"; - hash = "sha256-rzwh4JZNea5Wu/BEWGWpfxyPjY0GLrUPynPTbUC9Mak="; + rev = "c2b7f2cbac2bc6ce9d56876765a2351d1b1a3401"; + hash = "sha256-Z2AOXzpcBMSpM/zU4spIcoLBW59AHU1wQmOY9nT5mdc="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/wi/wiper/package.nix b/pkgs/by-name/wi/wiper/package.nix index bbf4eb8f3541..40772f3986bd 100644 --- a/pkgs/by-name/wi/wiper/package.nix +++ b/pkgs/by-name/wi/wiper/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - darwin, rustPlatform, fetchFromGitHub, }: @@ -22,8 +20,6 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoHash = "sha256-p2bUiRLI0vfOAAi4Cb8B9E8kMVS6aX4ksbF+H9gMsDs="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; - meta = { description = "Disk analyser and cleanup tool"; changelog = "https://github.com/ikebastuz/wiper/releases/tag/v${version}"; diff --git a/pkgs/by-name/wi/witness/package.nix b/pkgs/by-name/wi/witness/package.nix index 7bcf5d3369f3..be929ce90544 100644 --- a/pkgs/by-name/wi/witness/package.nix +++ b/pkgs/by-name/wi/witness/package.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "witness"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "in-toto"; repo = "witness"; rev = "v${version}"; - sha256 = "sha256-ylCUy44sX1KPfQqEldixmLcXkk+Uwca4q1gZRgxHdeg="; + sha256 = "sha256-taTK/b3HA18UPyi3zxGWBG6Wy4XtHcfTaA8NiYZaPA0="; }; - vendorHash = "sha256-CR95CsGthdjq/dtxmIjmZlQeyKimumCP9mWr6tNrBJI="; + vendorHash = "sha256-3/vn+rWVbljkPksiNXoTU0volV3xwxunMwCV9w9fAWo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix index a55ee1dc5cf4..178aed6fcbea 100644 --- a/pkgs/by-name/wi/wivrn/package.nix +++ b/pkgs/by-name/wi/wivrn/package.nix @@ -1,5 +1,4 @@ { - # Commented packages are not currently in nixpkgs. They don't appear to cause a problem when not present. config, lib, stdenv, @@ -8,82 +7,57 @@ applyPatches, autoAddDriverRunpath, avahi, - bluez, boost, - cjson, cli11, cmake, cudaPackages ? { }, cudaSupport ? config.cudaSupport, - dbus, - # depthai - doxygen, eigen, - elfutils, ffmpeg, freetype, git, glib, glm, glslang, - gst_all_1, harfbuzz, - hidapi, kdePackages, - # leapsdk - # leapv2 - libGL, - libX11, - libXrandr, - libbsd, libdrm, - libjpeg, - libmd, + libGL, libnotify, libpulseaudio, - librealsense, librsvg, - libsurvive, - libunwind, - libusb1, - libuvc, libva, + libX11, + libXrandr, makeDesktopItem, nix-update-script, nlohmann_json, onnxruntime, opencomposite, - opencv4, - openhmd, - openvr, openxr-loader, - orc, - # percetto + ovrCompatSearchPaths ? "${opencomposite}/lib/opencomposite:${xrizer}/lib/xrizer", pipewire, pkg-config, python3, qt6, - SDL2, shaderc, spdlog, systemd, udev, vulkan-headers, vulkan-loader, - wayland, - wayland-protocols, - wayland-scanner, x264, + xrizer, }: stdenv.mkDerivation (finalAttrs: { pname = "wivrn"; - version = "0.23.2"; + version = "0.24.1"; src = fetchFromGitHub { owner = "wivrn"; repo = "wivrn"; rev = "v${finalAttrs.version}"; - hash = "sha256-KpsS0XssSnE2Fj5rrXq1h+yNHhF7BzfPxwRUhZUZEaw="; + hash = "sha256-aWQcGIrBoDAO7XqWb3dQLBKg5RZYxC7JxwZ+OBSwmEs="; }; monado = applyPatches { @@ -106,8 +80,8 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + # Let's make sure our monado source revision matches what is used by WiVRn upstream postUnpack = '' - # Let's make sure our monado source revision matches what is used by WiVRn upstream ourMonadoRev="${finalAttrs.monado.src.rev}" theirMonadoRev=$(sed -n '/FetchContent_Declare(monado/,/)/p' ${finalAttrs.src.name}/CMakeLists.txt | grep "GIT_TAG" | awk '{print $2}') if [ ! "$theirMonadoRev" == "$ourMonadoRev" ]; then @@ -121,7 +95,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - doxygen git glib glslang @@ -138,62 +111,38 @@ stdenv.mkDerivation (finalAttrs: { [ avahi boost - bluez - cjson cli11 - dbus eigen - elfutils ffmpeg freetype - glib glm - gst_all_1.gst-plugins-base - gst_all_1.gstreamer harfbuzz - hidapi kdePackages.kcoreaddons kdePackages.ki18n kdePackages.kiconthemes kdePackages.kirigami kdePackages.qcoro kdePackages.qqc2-desktop-style - libbsd libdrm libGL - libjpeg - libmd libnotify - librealsense - libsurvive - libunwind - libusb1 - libuvc + libpulseaudio libva libX11 libXrandr - libpulseaudio nlohmann_json - opencv4 - openhmd - openvr openxr-loader onnxruntime - orc pipewire qt6.qtbase qt6.qtsvg qt6.qttools - SDL2 shaderc spdlog systemd udev vulkan-headers vulkan-loader - wayland - wayland-protocols - wayland-scanner x264 ] ++ lib.optionals cudaSupport [ @@ -214,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WIVRN_CHECK_CAPSYSNICE" false) (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) (lib.cmakeFeature "WIVRN_OPENXR_MANIFEST_TYPE" "absolute") - (lib.cmakeFeature "OPENCOMPOSITE_SEARCH_PATH" "${opencomposite}/lib/opencomposite") + (lib.cmakeFeature "OVR_COMPAT_SEARCH_PATH" ovrCompatSearchPaths) (lib.cmakeFeature "GIT_DESC" "v${finalAttrs.version}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}") ] diff --git a/pkgs/by-name/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix index 8d4897e0c5b6..58daf946004a 100644 --- a/pkgs/by-name/wo/workout-tracker/package.nix +++ b/pkgs/by-name/wo/workout-tracker/package.nix @@ -9,13 +9,13 @@ }: let pname = "workout-tracker"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "jovandeginste"; repo = "workout-tracker"; tag = "v${version}"; - hash = "sha256-m/mQRFBIlffw+o0exBCejU3F5nSQhGEu3PGrw/M9l7M="; + hash = "sha256-TSRHsVpl/qfu4Dwttj1pYhD+4zzxCt48y9FF4zP1drY="; }; assets = buildNpmPackage { diff --git a/pkgs/by-name/wo/wownero/package.nix b/pkgs/by-name/wo/wownero/package.nix index 5933810851dd..a35b9147e956 100644 --- a/pkgs/by-name/wo/wownero/package.nix +++ b/pkgs/by-name/wo/wownero/package.nix @@ -12,7 +12,6 @@ readline, unbound, zeromq, - darwin, }: let @@ -60,19 +59,15 @@ stdenv.mkDerivation rec { python3 ]; - buildInputs = - [ - boost186 - libsodium - openssl - rapidjson - readline - unbound - zeromq - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - ]; + buildInputs = [ + boost186 + libsodium + openssl + rapidjson + readline + unbound + zeromq + ]; postUnpack = '' rm -r $sourceRoot/external/miniupnp diff --git a/pkgs/by-name/ws/wsrepl/package.nix b/pkgs/by-name/ws/wsrepl/package.nix index 7ceb84628f59..3c4c12988942 100644 --- a/pkgs/by-name/ws/wsrepl/package.nix +++ b/pkgs/by-name/ws/wsrepl/package.nix @@ -1,10 +1,11 @@ { lib, + python3Packages, fetchFromGitHub, - python3, + nix-update-script, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "wsrepl"; version = "0.2.0"; pyproject = true; @@ -17,14 +18,15 @@ python3.pkgs.buildPythonApplication rec { }; pythonRelaxDeps = [ + "rich" "textual" ]; - build-system = with python3.pkgs; [ + build-system = with python3Packages; [ poetry-core ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ pygments pyperclip rich @@ -39,12 +41,16 @@ python3.pkgs.buildPythonApplication rec { "wsrepl" ]; - meta = with lib; { + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "WebSocket REPL"; homepage = "https://github.com/doyensec/wsrepl"; changelog = "https://github.com/doyensec/wsrepl/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "wsrepl"; }; } diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index cde6e4aa5548..c95feabf1d83 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -8,7 +8,7 @@ }: let - version = "10.1.10"; + version = "10.1.11"; in rustPlatform.buildRustPackage { @@ -19,11 +19,11 @@ rustPlatform.buildRustPackage { owner = "erebe"; repo = "wstunnel"; tag = "v${version}"; - hash = "sha256-7HW2AtMTNE05qSBhltj+ZxJhoMJmaMynko8+wIgpqCc="; + hash = "sha256-CtJws2O5ywR2prIlDoMbsPi6SH+ffxdqfCKUByukqpA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-NujasFigZ+BETg3J8fOKu5QAm68ZzP7uIXwv7bI+2uM="; + cargoHash = "sha256-YZrScEdRNZ/RU3PBRThw29Yu04N42nwe5DLLABRZtLw="; cargoBuildFlags = [ "--package wstunnel-cli" ]; diff --git a/pkgs/by-name/wt/wtfis/package.nix b/pkgs/by-name/wt/wtfis/package.nix index d12b44ed2792..2ac897360aaa 100644 --- a/pkgs/by-name/wt/wtfis/package.nix +++ b/pkgs/by-name/wt/wtfis/package.nix @@ -6,12 +6,12 @@ let pname = "wtfis"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "pirxthepilot"; repo = "wtfis"; tag = "v${version}"; - hash = "sha256-+BJmAFjmj3z/sKJ/L/y6hTClesulpQTpDL9cUNRi6e8="; + hash = "sha256-2p5xFNr08WCgCQY8socmZ5UsyGCMId3zXQhXTX909PE="; }; in python3.pkgs.buildPythonApplication { diff --git a/pkgs/by-name/wt/wthrr/package.nix b/pkgs/by-name/wt/wthrr/package.nix index be0b4608788e..622e19bf5ce4 100644 --- a/pkgs/by-name/wt/wthrr/package.nix +++ b/pkgs/by-name/wt/wthrr/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -26,15 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ + openssl + ]; checkFlags = [ # requires internet access diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix index b5bc96f793eb..6d334268964a 100644 --- a/pkgs/by-name/wt/wttrbar/package.nix +++ b/pkgs/by-name/wt/wttrbar/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, nix-update-script, }: @@ -18,14 +16,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+M0s6v9ULf+D2pPOE8KlHoyV+jBMbPsAXpYxGjms5DY="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk_11_0.frameworks; - [ - Security - SystemConfiguration - ] - ); - useFetchCargoVendor = true; cargoHash = "sha256-sv9hSTmq5J6s0PPBMJgaMUWBaRk0/NJV41nNDIj6MoY="; diff --git a/pkgs/by-name/wx/wxformbuilder/package.nix b/pkgs/by-name/wx/wxformbuilder/package.nix index 3a90c0d8e22d..b04d229c6667 100644 --- a/pkgs/by-name/wx/wxformbuilder/package.nix +++ b/pkgs/by-name/wx/wxformbuilder/package.nix @@ -48,14 +48,10 @@ stdenv.mkDerivation (finalAttrs: { shared-mime-info ]; - buildInputs = - [ - boost - wxGTK32 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - ]; + buildInputs = [ + boost + wxGTK32 + ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} diff --git a/pkgs/by-name/x3/x3270/package.nix b/pkgs/by-name/x3/x3270/package.nix index f1e182b28817..da3519ae0fd4 100644 --- a/pkgs/by-name/x3/x3270/package.nix +++ b/pkgs/by-name/x3/x3270/package.nix @@ -1,6 +1,5 @@ { stdenv, - darwin, lib, libiconv, fetchurl, @@ -74,7 +73,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - darwin.apple_sdk.frameworks.Security ]; meta = with lib; { diff --git a/pkgs/by-name/x4/x4/package.nix b/pkgs/by-name/x4/x4/package.nix index 26815dd7a0c7..c7a7e4108e5c 100644 --- a/pkgs/by-name/x4/x4/package.nix +++ b/pkgs/by-name/x4/x4/package.nix @@ -5,8 +5,6 @@ pkg-config, openssl, zlib, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -27,14 +25,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ + openssl + zlib + ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/xa/xan/package.nix b/pkgs/by-name/xa/xan/package.nix index f2587510a527..f74086e64433 100644 --- a/pkgs/by-name/xa/xan/package.nix +++ b/pkgs/by-name/xa/xan/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "xan"; - version = "0.48.0"; + version = "0.49.0"; src = fetchFromGitHub { owner = "medialab"; repo = "xan"; tag = version; - hash = "sha256-TBrPe4kmxLiyFfP6s4lAV3PjzXihqdBZ+emisd2Yjbs="; + hash = "sha256-tzbHIXmTyP7MQeIMVLV4soGg9oRL7bM73+kFqD5zIi0="; }; - cargoHash = "sha256-XKiYF619IEQEU7P5mRjnCEJSxr2G3t3cV4MpvBlWcNw="; + cargoHash = "sha256-kqgmfdRfuNhi8X5/oljrBTf4cg+tXuO5Uh7MtBsTtqg="; useFetchCargoVendor = true; # FIXME: tests fail and I do not have the time to investigate. Temporarily disable diff --git a/pkgs/by-name/xa/xar/package.nix b/pkgs/by-name/xa/xar/package.nix index a89b8104b8f8..42238c51e37f 100644 --- a/pkgs/by-name/xa/xar/package.nix +++ b/pkgs/by-name/xa/xar/package.nix @@ -183,9 +183,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/apple-oss-distributions/xar"; description = "An easily extensible archive format"; license = lib.licenses.bsd3; - maintainers = - lib.teams.darwin.members - ++ lib.attrValues { inherit (lib.maintainers) copumpkin tie; }; + maintainers = lib.teams.darwin.members ++ lib.attrValues { inherit (lib.maintainers) tie; }; platforms = lib.platforms.unix; mainProgram = "xar"; }; diff --git a/pkgs/by-name/xa/xastir/package.nix b/pkgs/by-name/xa/xastir/package.nix index 94e2681afe10..8c3c452a3b29 100644 --- a/pkgs/by-name/xa/xastir/package.nix +++ b/pkgs/by-name/xa/xastir/package.nix @@ -9,7 +9,7 @@ libgeotiff, xorg, motif, - pcre, + pcre2, perl, proj, graphicsmagick, @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { xorg.libXpm xorg.libXt motif - pcre + pcre2 perl proj graphicsmagick diff --git a/pkgs/by-name/xc/xcbuild/package.nix b/pkgs/by-name/xc/xcbuild/package.nix index 84383093528c..a2be67345401 100644 --- a/pkgs/by-name/xc/xcbuild/package.nix +++ b/pkgs/by-name/xc/xcbuild/package.nix @@ -10,11 +10,6 @@ stdenv, zlib, - # These arguments are obsolete but required to avoid evaluation errors (for now). - CoreGraphics ? null, - CoreServices ? null, - ImageIO ? null, - # These are deprecated and do nothing. They’re needed for compatibility and will # warn eventually once in-tree uses are cleaned up. xcodePlatform ? null, @@ -95,7 +90,11 @@ stdenv.mkDerivation (finalAttrs: { ''; postPatch = - lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + '' + substituteInPlace Libraries/pbxbuild/Sources/Tool/TouchResolver.cpp \ + --replace-fail "/usr/bin/touch" "touch" + '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # Fix build on gcc-13 due to missing includes sed -e '1i #include ' -i \ Libraries/libutil/Headers/libutil/Permissions.h \ diff --git a/pkgs/by-name/xd/xdvdfs-cli/package.nix b/pkgs/by-name/xd/xdvdfs-cli/package.nix new file mode 100644 index 000000000000..8dcc9dbdf6c7 --- /dev/null +++ b/pkgs/by-name/xd/xdvdfs-cli/package.nix @@ -0,0 +1,40 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "xdvdfs-cli"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "antangelo"; + repo = "xdvdfs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-58f9eznPKeUVnUvslcm0CQPC+1xU3Zto+R56IXPBKT4="; + }; + + cargoHash = "sha256-vNCqfXsPjb3mph28YuYKpWTs9VHbIcXs6GVn4XgQKtQ="; + + cargoBuildFlags = [ "--package xdvdfs-cli" ]; + cargoTestFlags = [ "--package xdvdfs-cli" ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/xdvdfs"; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + mainProgram = "xdvdfs"; + description = "Original Xbox DVD Filesystem library and management tool"; + homepage = "https://github.com/antangelo/xdvdfs"; + changelog = "https://github.com/antangelo/xdvdfs/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ federicoschonborn ]; + }; +}) diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix index 7d9433cc4221..73e497710209 100644 --- a/pkgs/by-name/xi/xiu/package.nix +++ b/pkgs/by-name/xi/xiu/package.nix @@ -1,7 +1,6 @@ { lib, cmake, - darwin, fetchFromGitHub, libopus, openssl, @@ -35,9 +34,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/xk/xk6/package.nix b/pkgs/by-name/xk/xk6/package.nix index 0ad9b244d0e0..62463375c89c 100644 --- a/pkgs/by-name/xk/xk6/package.nix +++ b/pkgs/by-name/xk/xk6/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "xk6"; - version = "0.16.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "grafana"; repo = "xk6"; tag = "v${version}"; - hash = "sha256-fUlK0/P64gCGPek79mYNbL/1PbrZxD9D3Werh9Oe/6k="; + hash = "sha256-Ob9H3EMEo611Ivyu2UoR7ZHXvWPjJAR4T0HBTRhmH+M="; }; vendorHash = null; diff --git a/pkgs/by-name/xm/xmage/package.nix b/pkgs/by-name/xm/xmage/package.nix index 31b4b0aa883c..2fb74e7215a9 100644 --- a/pkgs/by-name/xm/xmage/package.nix +++ b/pkgs/by-name/xm/xmage/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xmage"; - version = "1.4.51-dev_2024-01-30_19-35"; + version = "1.4.57-dev_2025-04-19_14-28"; src = fetchurl { url = "http://xmage.today/files/mage-full_${finalAttrs.version}.zip"; - sha256 = "sha256-ogi0hd2FoulTnc3gg5cpLwr4Jln71YA0WBBZFOT6apg="; + sha256 = "sha256-EeaUd81fqiPDqHiMP86E9gtdFi545PIBfCgb1i5Z5i0="; }; preferLocalBuild = true; @@ -23,10 +23,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = let - # upstream maintainers forgot to update version, so manual override for now - # strVersion = lib.substring 0 6 finalAttrs.version; - strVersion = "1.4.50"; - + strVersion = lib.substring 0 6 finalAttrs.version; in '' mkdir -p $out/bin diff --git a/pkgs/by-name/xm/xml-security-c/package.nix b/pkgs/by-name/xm/xml-security-c/package.nix index e198848d0fa2..6a446e80abb8 100644 --- a/pkgs/by-name/xm/xml-security-c/package.nix +++ b/pkgs/by-name/xm/xml-security-c/package.nix @@ -7,12 +7,8 @@ xalanc, xercesc, openssl, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices SystemConfiguration; -in stdenv.mkDerivation (finalAttrs: { pname = "xml-security-c"; version = "3.0.0"; @@ -34,17 +30,11 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = - [ - xalanc - xercesc - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - CoreServices - SystemConfiguration - ]; + buildInputs = [ + xalanc + xercesc + openssl + ]; meta = { homepage = "https://shibboleth.atlassian.net/wiki/spaces/DEV/pages/3726671873/Santuario"; diff --git a/pkgs/by-name/xm/xmlbeans/package.nix b/pkgs/by-name/xm/xmlbeans/package.nix index d761ac697d7b..cf465b645eea 100644 --- a/pkgs/by-name/xm/xmlbeans/package.nix +++ b/pkgs/by-name/xm/xmlbeans/package.nix @@ -5,41 +5,46 @@ jre_headless, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xmlbeans"; - version = "5.1.1-20220819"; + version = "5.3.0-20241203"; src = fetchzip { # old releases are deleted from the cdn - url = "https://web.archive.org/web/20230313151507/https://dlcdn.apache.org/poi/xmlbeans/release/bin/xmlbeans-bin-${version}.zip"; - sha256 = "sha256-TDnWo1uJWL6k6Z8/uaF2LBNzRVQMHYopYze/2Fb/0aI="; + url = "https://web.archive.org/web/20250404194918/https://dlcdn.apache.org/poi/xmlbeans/release/bin/apache-xmlbeans-bin-5.3.0-20241203.zip"; + hash = "sha256-AeV+s0VfBgb0YbsY6dNJeqcsguZhDmjuyqXT/415a3k="; + stripRoot = false; }; postPatch = '' + cp -r apache-xmlbeans-*/* . + rm -r apache-xmlbeans-* rm bin/*.cmd substituteInPlace bin/dumpxsb \ - --replace 'echo `dirname $0`' "" - + --replace-fail 'echo `dirname $0`' "" substituteInPlace bin/_setlib \ - --replace 'echo XMLBEANS_LIB=$XMLBEANS_LIB' "" - + --replace-fail 'echo XMLBEANS_LIB=$XMLBEANS_LIB' "" for file in bin/*; do substituteInPlace $file \ - --replace "java " "${jre_headless}/bin/java " + --replace-warn "java " "${jre_headless}/bin/java " done ''; installPhase = '' + runHook preInstall + mkdir -p $out chmod +x bin/* cp -r bin/ lib/ $out/ + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Java library for accessing XML by binding it to Java types"; homepage = "https://xmlbeans.apache.org/"; downloadPage = "https://dlcdn.apache.org/poi/xmlbeans/release/bin/"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/xp/xpad/package.nix b/pkgs/by-name/xp/xpad/package.nix index 42eb4fc6ccf8..1430aa34d13f 100644 --- a/pkgs/by-name/xp/xpad/package.nix +++ b/pkgs/by-name/xp/xpad/package.nix @@ -8,16 +8,16 @@ glib, intltool, gtk3, - gtksourceview, + gtksourceview4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xpad"; - version = "5.4.0"; + version = "5.8.0"; src = fetchurl { - url = "https://launchpad.net/xpad/trunk/${version}/+download/xpad-${version}.tar.bz2"; - sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3"; + url = "https://launchpad.net/xpad/trunk/${finalAttrs.version}/+download/xpad-${finalAttrs.version}.tar.bz2"; + hash = "sha256-8mBSMIhQxAaxWtuNhqzTli7xCvIrQnuxpc/07slvguk="; }; nativeBuildInputs = [ @@ -30,15 +30,15 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - gtksourceview + gtksourceview4 ]; - meta = with lib; { + meta = { description = "Sticky note application for jotting down things to remember"; mainProgram = "xpad"; homepage = "https://launchpad.net/xpad"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ michalrus ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ michalrus ]; }; -} +}) diff --git a/pkgs/tools/X11/xpra/0002-Constant-DPI.patch b/pkgs/by-name/xp/xpra/0002-Constant-DPI.patch similarity index 100% rename from pkgs/tools/X11/xpra/0002-Constant-DPI.patch rename to pkgs/by-name/xp/xpra/0002-Constant-DPI.patch diff --git a/pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch b/pkgs/by-name/xp/xpra/0003-fix-pointer-limits.patch similarity index 100% rename from pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch rename to pkgs/by-name/xp/xpra/0003-fix-pointer-limits.patch diff --git a/pkgs/tools/X11/xpra/fix-122159.patch b/pkgs/by-name/xp/xpra/fix-122159.patch similarity index 100% rename from pkgs/tools/X11/xpra/fix-122159.patch rename to pkgs/by-name/xp/xpra/fix-122159.patch diff --git a/pkgs/tools/X11/xpra/fix-41106.patch b/pkgs/by-name/xp/xpra/fix-41106.patch similarity index 100% rename from pkgs/tools/X11/xpra/fix-41106.patch rename to pkgs/by-name/xp/xpra/fix-41106.patch diff --git a/pkgs/tools/X11/xpra/nvenc.pc b/pkgs/by-name/xp/xpra/nvenc.pc similarity index 100% rename from pkgs/tools/X11/xpra/nvenc.pc rename to pkgs/by-name/xp/xpra/nvenc.pc diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/by-name/xp/xpra/package.nix similarity index 100% rename from pkgs/tools/X11/xpra/default.nix rename to pkgs/by-name/xp/xpra/package.nix diff --git a/pkgs/tools/X11/xpra/update.sh b/pkgs/by-name/xp/xpra/update.sh similarity index 100% rename from pkgs/tools/X11/xpra/update.sh rename to pkgs/by-name/xp/xpra/update.sh diff --git a/pkgs/by-name/xp/xpraWithNvenc/package.nix b/pkgs/by-name/xp/xpraWithNvenc/package.nix new file mode 100644 index 000000000000..169c3a657a19 --- /dev/null +++ b/pkgs/by-name/xp/xpraWithNvenc/package.nix @@ -0,0 +1,8 @@ +{ + xpra, + linuxPackages, +}: +xpra.override { + withNvenc = true; + nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; +} diff --git a/pkgs/by-name/xq/xqilla/package.nix b/pkgs/by-name/xq/xqilla/package.nix index 1287f301f26f..626cfe2d705c 100644 --- a/pkgs/by-name/xq/xqilla/package.nix +++ b/pkgs/by-name/xq/xqilla/package.nix @@ -3,7 +3,6 @@ stdenv, fetchurl, fetchpatch, - darwin, xercesc, }: @@ -30,17 +29,9 @@ stdenv.mkDerivation rec { "CXXFLAGS=-std=c++14" ]; - buildInputs = - [ - xercesc - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreServices - SystemConfiguration - ] - ); + buildInputs = [ + xercesc + ]; meta = with lib; { description = "XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library"; diff --git a/pkgs/by-name/xr/xreader/package.nix b/pkgs/by-name/xr/xreader/package.nix index d39cdd541b85..fc437035efe4 100644 --- a/pkgs/by-name/xr/xreader/package.nix +++ b/pkgs/by-name/xr/xreader/package.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "4.2.3"; + version = "4.2.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-qBnnxygkAn1wF3gtqR0At1e1e+sx1/2MoSWqmshW5Qg="; + hash = "sha256-4riTLU8ElWxxnigNAhmAv+7m1fNneDLCgS2Tj1V0UNk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/xyce/default.nix b/pkgs/by-name/xy/xyce/package.nix similarity index 92% rename from pkgs/applications/science/electronics/xyce/default.nix rename to pkgs/by-name/xy/xyce/package.nix index eaf54af16c7c..137ea22ce0ec 100644 --- a/pkgs/applications/science/electronics/xyce/default.nix +++ b/pkgs/by-name/xy/xyce/package.nix @@ -31,21 +31,21 @@ assert withMPI -> trilinos.withMPI; let - version = "7.8.0"; + version = "7.9.0"; # using fetchurl or fetchFromGitHub doesn't include the manuals # due to .gitattributes files xyce_src = fetchgit { url = "https://github.com/Xyce/Xyce.git"; rev = "Release-${version}"; - sha256 = "sha256-+aNy2bGuFQ517FZUvU0YqN0gmChRpVuFEmFGTCx9AgY="; + sha256 = "sha256-m8tHQYBs0hjepTDswrDJFRCPY941Ew98gYRPuQMdKZA="; }; regression_src = fetchFromGitHub { owner = "Xyce"; repo = "Xyce_Regression"; rev = "Release-${version}"; - sha256 = "sha256-Fxi/NpXXIw/bseWaLi2iQ4sg4S9Z+othGgSvQoxyJ9c="; + sha256 = "sha256-7Jvt2LUw2C201pMp9CHnhOwMzxU7imfrRKCb3wu3Okk="; }; in @@ -152,18 +152,18 @@ stdenv.mkDerivation rec { # Honor the TMP variable sed -i -E 's|/tmp|\$TMP|' $TEST_ROOT/TestScripts/suggestXyceTagList.sh - EXLUDE_TESTS_FILE=$TMP/exclude_tests.$$ + EXCLUDE_TESTS_FILE=$TMP/exclude_tests.$$ # Gold standard has additional ":R" suffix in result column label - echo "Output/HB/hb-step-tecplot.cir" >> $EXLUDE_TESTS_FILE + echo "Output/HB/hb-step-tecplot.cir" >> $EXCLUDE_TESTS_FILE # This test makes Xyce access /sys/class/net when run with MPI - ${lib.optionalString withMPI "echo \"CommandLine/command_line.cir\" >> $EXLUDE_TESTS_FILE"} + ${lib.optionalString withMPI "echo \"CommandLine/command_line.cir\" >> $EXCLUDE_TESTS_FILE"} $TEST_ROOT/TestScripts/run_xyce_regression \ --output="$(pwd)/Xyce_Test" \ --xyce_test="''${TEST_ROOT}" \ --taglist="$($TEST_ROOT/TestScripts/suggestXyceTagList.sh "$XYCE_BINARY" | sed -E -e 's/TAGLIST=([^ ]+).*/\1/' -e '2,$d')" \ --resultfile="$(pwd)/test_results" \ - --excludelist="$EXLUDE_TESTS_FILE" \ + --excludelist="$EXCLUDE_TESTS_FILE" \ "''${EXECSTRING}" ''; @@ -188,6 +188,7 @@ stdenv.mkDerivation rec { # Use a public document class sed -i -E 's/\\documentclass\[11pt,report\]\{SANDreport\}/\\documentclass\[11pt,letterpaper\]\{scrreprt\}/' $d.tex sed -i -E 's/\\usepackage\[sand\]\{optional\}/\\usepackage\[report\]\{optional\}/' $d.tex + sed -i -E 's/\\SANDauthor/\\author/' $d.tex pushd $(dirname $d) make install -t $doc/share/doc/${pname}-${version}/ $(basename $d.pdf) @@ -207,6 +208,6 @@ stdenv.mkDerivation rec { homepage = "https://xyce.sandia.gov"; license = licenses.gpl3; maintainers = with maintainers; [ fbeffa ]; - platforms = platforms.all; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/ya/yaak/package.nix b/pkgs/by-name/ya/yaak/package.nix index 5ac65e3922ae..a9e64db116a2 100644 --- a/pkgs/by-name/ya/yaak/package.nix +++ b/pkgs/by-name/ya/yaak/package.nix @@ -11,7 +11,6 @@ webkitgtk_4_1, glib, gtk3, - libsoup_2_4, openssl, pango, cairo, @@ -59,7 +58,6 @@ rustPlatform.buildRustPackage (finalAttrs: { glib gtk3 openssl - libsoup_2_4 webkitgtk_4_1 pango cairo diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index 828a7d8f2a20..bc8a22a94442 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -6,11 +6,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.95"; + version = "0.1.96"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; - hash = "sha256-8GmKMRMQ5YaCK0jJkLVlWHTngr5DJSN/Vm+0nMYBkr8="; + hash = "sha256-nwqZhGOtNEJ0qzOTFdHFWBSyt4hmLhn6nhdCz2jyUbg="; }; executable = "ys"; diff --git a/pkgs/by-name/ya/yandex-browser/package.nix b/pkgs/by-name/ya/yandex-browser/package.nix deleted file mode 100644 index 5c534dfd3f78..000000000000 --- a/pkgs/by-name/ya/yandex-browser/package.nix +++ /dev/null @@ -1,189 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - autoPatchelfHook, - wrapGAppsHook3, - flac, - gnome2, - harfbuzzFull, - nss, - snappy, - xdg-utils, - xorg, - alsa-lib, - atk, - cairo, - cups, - curl, - dbus, - expat, - fontconfig, - freetype, - gdk-pixbuf, - glib, - gtk3, - libX11, - libxcb, - libXScrnSaver, - libXcomposite, - libXcursor, - libXdamage, - libXext, - libXfixes, - libXi, - libXrandr, - libXrender, - libXtst, - libdrm, - libnotify, - libopus, - libpulseaudio, - libuuid, - libxshmfence, - libgbm, - nspr, - pango, - systemd, - at-spi2-atk, - at-spi2-core, - libsForQt5, - qt6, - vivaldi-ffmpeg-codecs, - edition ? "stable", -}: - -let - version = - { - corporate = "24.7.1.1195-1"; - beta = "24.7.1.1124-1"; - stable = "24.7.1.1120-1"; - } - .${edition}; - - hash = - { - corporate = "sha256-HPEUeIZl9nRhMzrMv4MzIOnbF8mJ789vCtTWf9TcCH4="; - beta = "sha256-vcX/9MWqeUd/YlczHivcL6+TignE8Nk6rO5DaCjf2SQ="; - stable = "sha256-wrYPQ8WrttF/tlafA0+e3eDZMq9SFmLk5NOIeHQr14U="; - } - .${edition}; - - app = - { - corporate = ""; - beta = "-beta"; - stable = ""; - } - .${edition}; - -in -stdenv.mkDerivation rec { - pname = "yandex-browser-${edition}"; - inherit version; - - src = fetchurl { - url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}/${pname}_${version}_amd64.deb"; - inherit hash; - }; - - nativeBuildInputs = [ - autoPatchelfHook - qt6.wrapQtAppsHook - wrapGAppsHook3 - ]; - - buildInputs = [ - flac - harfbuzzFull - nss - snappy - xdg-utils - xorg.libxkbfile - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - curl - dbus - expat - fontconfig.lib - freetype - gdk-pixbuf - glib - gnome2.GConf - gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libdrm - libnotify - libopus - libuuid - libxcb - libxshmfence - libgbm - nspr - nss - pango - (lib.getLib stdenv.cc.cc) - libsForQt5.libqtpas - qt6.qtbase - ]; - - unpackPhase = '' - mkdir $TMP/ya/ $out/bin/ -p - ar vx $src - tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/ya/ - ''; - - installPhase = '' - cp $TMP/ya/{usr/share,opt} $out/ -R - cp $out/share/applications/yandex-browser${app}.desktop $out/share/applications/${pname}.desktop || true - rm -f $out/share/applications/yandex-browser.desktop - substituteInPlace $out/share/applications/${pname}.desktop --replace /usr/ $out/ - substituteInPlace $out/share/menu/yandex-browser${app}.menu --replace /opt/ $out/opt/ - substituteInPlace $out/share/gnome-control-center/default-apps/yandex-browser${app}.xml --replace /opt/ $out/opt/ - ln -sf ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so $out/opt/yandex/browser${app}/libffmpeg.so - ln -sf $out/opt/yandex/browser${app}/yandex-browser${app} $out/bin/${pname} - ''; - - runtimeDependencies = - map lib.getLib [ - libpulseaudio - curl - systemd - vivaldi-ffmpeg-codecs - ] - ++ buildInputs; - - meta = with lib; { - description = "Yandex Web Browser"; - homepage = "https://browser.yandex.ru/"; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ - dan4ik605743 - ionutnechita - ]; - platforms = [ "x86_64-linux" ]; - - knownVulnerabilities = [ - '' - Trusts a Russian government issued CA certificate for some websites. - See https://habr.com/en/company/yandex/blog/655185/ (Russian) for details. - '' - ]; - }; -} diff --git a/pkgs/by-name/ya/yandex-music/package.nix b/pkgs/by-name/ya/yandex-music/package.nix index fa83fc56171a..e70102a9d05d 100644 --- a/pkgs/by-name/ya/yandex-music/package.nix +++ b/pkgs/by-name/ya/yandex-music/package.nix @@ -10,17 +10,32 @@ electron, fetchFromGitHub, electronArguments ? "", + + # Whether to enable tray menu by default trayEnabled ? true, + # Style of tray: 1 - default style, 2 - mono black, 3 - mono white + trayStyle ? 1, + # Whether to leave application in tray disregarding of its play state + trayAlways ? false, + # Whether to enable developers tools + devTools ? false, + # Vibe animation FPS can be from 0 (black screen) to any reasonable number. + # Recommended 25 - 144. Default 25. + vibeAnimationMaxFps ? 25, + # Yandex Music's custom Windows-styled titlebar. Also makes the window frameless. + customTitleBar ? false, }: +assert lib.assertMsg (trayStyle >= 1 && trayStyle <= 3) "Tray style must be withing 1 and 3"; +assert lib.assertMsg (vibeAnimationMaxFps >= 0) "Vibe animation max FPS must be greater then 0"; stdenvNoCC.mkDerivation rec { pname = "yandex-music"; - version = "5.39.0"; + version = "5.46.0"; src = fetchFromGitHub { owner = "cucumber-sp"; repo = "yandex-music-linux"; rev = "v${version}"; - hash = "sha256-oEbbQRqvnK521N3Kerv18h1frVLbioFeHfb/FCkHC6Y="; + hash = "sha256-JyDpJCNHmPV1l9+//3sgJGkD+pewuoAb33hgTUi5Ukc="; }; nativeBuildInputs = [ @@ -48,6 +63,27 @@ stdenvNoCC.mkDerivation rec { runHook postBuild ''; + config = + let + inherit (lib) optionalString; + in + '' + ELECTRON_ARGS="${electronArguments}" + VIBE_ANIMATION_MAX_FPS=${toString vibeAnimationMaxFps} + '' + + optionalString trayEnabled '' + TRAY_ENABLED=${toString trayStyle} + '' + + optionalString trayAlways '' + ALWAYS_LEAVE_TO_TRAY=1 + '' + + optionalString devTools '' + DEV_TOOLS=1 + '' + + optionalString customTitleBar '' + CUSTOM_TITLE_BAR=1 + ''; + installPhase = '' runHook preInstall @@ -55,9 +91,7 @@ stdenvNoCC.mkDerivation rec { mv app/yandex-music.asar "$out/share/nodejs" CONFIG_FILE="$out/share/yandex-music.conf" - echo "TRAY_ENABLED=${if trayEnabled then "1" else "0"}" >> "$CONFIG_FILE" - echo "ELECTRON_ARGS=\"${electronArguments}\"" >> "$CONFIG_FILE" - + echo "$config" >> "$CONFIG_FILE" install -Dm755 "$src/templates/yandex-music.sh" "$out/bin/yandex-music" substituteInPlace "$out/bin/yandex-music" \ diff --git a/pkgs/by-name/ya/yandex-music/ym_info.json b/pkgs/by-name/ya/yandex-music/ym_info.json index b5eeac27441b..d12a00180eb6 100644 --- a/pkgs/by-name/ya/yandex-music/ym_info.json +++ b/pkgs/by-name/ya/yandex-music/ym_info.json @@ -1,6 +1,6 @@ { - "version": "5.39.0", - "exe_name": "Yandex_Music_x64_5.39.0.exe", - "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.39.0.exe", - "exe_hash": "sha256-jOaxKDOkabsNQTXH5+UGwfdL+Srjm5gjQgHe/YuGiaQ=" + "version": "5.46.0", + "exe_name": "Yandex_Music_x64_5.46.0.exe", + "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.46.0.exe", + "exe_hash": "sha256-gvdJ/ucPeSG/oSD6ullFzWdRYzu0ovxo0qK8ZjLHi+g=" } diff --git a/pkgs/by-name/ya/yarn-berry/package.nix b/pkgs/by-name/ya/yarn-berry/package.nix index fd8caf96ea47..b9a125ad7120 100644 --- a/pkgs/by-name/ya/yarn-berry/package.nix +++ b/pkgs/by-name/ya/yarn-berry/package.nix @@ -5,17 +5,25 @@ stdenv, testers, yarn, + berryVersion ? 4, }: +let + version_4 = "4.9.1"; + version_3 = "3.8.7"; + hash_4 = "sha256-znxB827TFLAEfCeHrwBsmRlkZz1LVWsBFhjZANiIW/4="; + hash_3 = "sha256-vRrk+Fs/7dZha3h7yI5NpMfd1xezesnigpFgTRCACZo="; +in + stdenv.mkDerivation (finalAttrs: { pname = "yarn-berry"; - version = "4.8.1"; + version = if berryVersion == 4 then version_4 else version_3; src = fetchFromGitHub { owner = "yarnpkg"; repo = "berry"; tag = "@yarnpkg/cli/${finalAttrs.version}"; - hash = "sha256-JRQVUO5KsaGMmoC99cloW+hbFjgaFLNT3tqA29TVu34="; + hash = if berryVersion == 4 then hash_4 else hash_3; }; buildInputs = [ diff --git a/pkgs/by-name/ya/yarn-berry/update.sh b/pkgs/by-name/ya/yarn-berry/update.sh index 5ce8bc02c957..60c73bc0d3f3 100755 --- a/pkgs/by-name/ya/yarn-berry/update.sh +++ b/pkgs/by-name/ya/yarn-berry/update.sh @@ -17,5 +17,7 @@ EOF ) version=$(jq -r "[.data.repository.tag.nodes[].name | select(contains(\"-\")|not)] | max_by(split(\".\") | map(tonumber))" <<< "$payload") +version3=$(jq -r "[.data.repository.tag.nodes[].name | select(contains(\"-\")|not)] | map(select(. < \"4.0.0\")) | sort | last" <<< "$payload") -update-source-version yarn-berry "$version" +update-source-version yarn-berry_4 "$version" --version-key="version_4" +update-source-version yarn-berry_3 "$version3" --version-key="version_3" diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index efd8965208dc..6b5a3a724f28 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -4,8 +4,6 @@ lib, installShellFiles, - stdenv, - Foundation, rust-jemalloc-sys, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -24,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { env.VERGEN_BUILD_DATE = "2025-04-08"; nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; + buildInputs = [ rust-jemalloc-sys ]; postInstall = '' installShellCompletion --cmd yazi \ diff --git a/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix b/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix index 9e022261fbad..91c8f9e5f99d 100644 --- a/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "duckdb.yazi"; - version = "25.4.8-unstable-2025-04-09"; + version = "25.4.8-unstable-2025-04-20"; src = fetchFromGitHub { owner = "wylie102"; repo = "duckdb.yazi"; - rev = "eaa748c62e24f593104569d2dc15d50b1d48497b"; - hash = "sha256-snQ+n7n+71mqAsdzrXcI2v7Bg0trrbiHv3mIAxldqlc="; + rev = "6259e2d26236854b966ebc71d28de0397ddbe4d8"; + hash = "sha256-9DMqE/pihp4xT6Mo2xr51JJjudMRAesxD5JqQ4WXiM4="; }; meta = { diff --git a/pkgs/by-name/ya/yazi/plugins/piper/default.nix b/pkgs/by-name/ya/yazi/plugins/piper/default.nix new file mode 100644 index 000000000000..a3ccbff392ae --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/piper/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "piper.yazi"; + version = "25.4.8-unstable-2025-04-13"; + + src = fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "b12a9ab085a8c2fe2b921e1547ee667b714185f9"; + hash = "sha256-LWN0riaUazQl3llTNNUMktG+7GLAHaG/IxNj1gFhDRE="; + }; + + meta = { + description = "Pipe any shell command as a previewer"; + homepage = "https://yazi-rs.github.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +} diff --git a/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix b/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix index ae6e5e8be0f0..ddc7f3dd9264 100644 --- a/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "rich-preview.yazi"; - version = "0-unstable-2025-01-18"; + version = "0-unstable-2025-04-22"; src = fetchFromGitHub { owner = "AnirudhG07"; repo = "rich-preview.yazi"; - rev = "2559e5fa7c1651dbe7c5615ef6f3b5291347d81a"; - hash = "sha256-dW2gAAv173MTcQdqMV32urzfrsEX6STR+oCJoRVGGpA="; + rev = "fdcf37320e35f7c12e8087900eebffcdafaee8cb"; + hash = "sha256-HO9hTCfgGTDERClZaLnUEWDvsV9GMK1kwFpWNM1wq8I="; }; meta = { diff --git a/pkgs/by-name/ya/yazi/plugins/starship/default.nix b/pkgs/by-name/ya/yazi/plugins/starship/default.nix index f3cc5e0863c6..27ec12b801b3 100644 --- a/pkgs/by-name/ya/yazi/plugins/starship/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/starship/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "starship.yazi"; - version = "25.4.8-unstable-2025-04-09"; + version = "25.4.8-unstable-2025-04-20"; src = fetchFromGitHub { owner = "Rolv-Apneseth"; repo = "starship.yazi"; - rev = "c0707544f1d526f704dab2da15f379ec90d613c2"; - hash = "sha256-H8j+9jcdcpPFXVO/XQZL3zq1l5f/WiOm4YUxAMduSRs="; + rev = "6fde3b2d9dc9a12c14588eb85cf4964e619842e6"; + hash = "sha256-+CSdghcIl50z0MXmFwbJ0koIkWIksm3XxYvTAwoRlDY="; }; meta = { diff --git a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix index 5a1cefc8fda9..c01ac9a097da 100644 --- a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "toggle-pane.yazi"; - version = "25.2.26-unstable-2025-03-19"; + version = "25.2.26-unstable-2025-04-21"; src = fetchFromGitHub { owner = "yazi-rs"; repo = "plugins"; - rev = "273019910c1111a388dd20e057606016f4bd0d17"; - hash = "sha256-80mR86UWgD11XuzpVNn56fmGRkvj0af2cFaZkU8M31I="; + rev = "4b027c79371af963d4ae3a8b69e42177aa3fa6ee"; + hash = "sha256-auGNSn6tX72go7kYaH16hxRng+iZWw99dKTTUN91Cow="; }; meta = { diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix index f6e958b02d20..b506813ccf40 100644 --- a/pkgs/by-name/yc/ycmd/package.nix +++ b/pkgs/by-name/yc/ycmd/package.nix @@ -17,7 +17,6 @@ boost, llvmPackages, fixDarwinDylibNames, - Cocoa, }: stdenv.mkDerivation { @@ -51,8 +50,7 @@ stdenv.mkDerivation { jedi jedi-language-server pybind11 - ] - ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; + ]; buildPhase = '' export EXTRA_CMAKE_ARGS="-DPATH_TO_LLVM_ROOT=${llvmPackages.libllvm} -DUSE_SYSTEM_ABSEIL=true" diff --git a/pkgs/by-name/ye/yelp-xsl/cve-2025-3155.patch b/pkgs/by-name/ye/yelp-xsl/cve-2025-3155.patch new file mode 100644 index 000000000000..36886d7c4a2a --- /dev/null +++ b/pkgs/by-name/ye/yelp-xsl/cve-2025-3155.patch @@ -0,0 +1,79 @@ +diff --git a/xslt/common/html.xsl b/xslt/common/html.xsl +index 77aed075..82832fb4 100644 +--- a/xslt/common/html.xsl ++++ b/xslt/common/html.xsl +@@ -266,6 +266,16 @@ certain tokens, and you can add your own with {html.sidebar.mode}. See + --> + + ++ ++ + + +-