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